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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Trim Vendor ProductControllerTests to routing-only, delete superseded ProductViewModelServiceTests (ARCH-001 Phase 1)
KrzysztofPajak26888acb247c
diff --git a/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.ProductAttributeCombination_ToVendorModel.verified.txt b/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.ProductAttributeCombination_ToVendorModel.verified.txtdeleted file mode 100644index 8d4ae37e4..000000000--- a/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.ProductAttributeCombination_ToVendorModel.verified.txt+++ /dev/null@@ -1,8 +0,0 @@-{- Id: pac-v-1,- StockQuantity: 5,- AllowOutOfStockOrders: false,- Sku: COMB-SKU,- NotifyAdminForQuantityBelow: 1,- UseMultipleWarehouses: false-}\ No newline at end of filediff --git a/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.ProductAttributeMapping_ToVendorModel.verified.txt b/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.ProductAttributeMapping_ToVendorModel.verified.txtdeleted file mode 100644index 2e5ae0370..000000000--- a/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.ProductAttributeMapping_ToVendorModel.verified.txt+++ /dev/null@@ -1,12 +0,0 @@-{- ProductAttributeId: pa-1,- TextPrompt: Choose size,- IsRequired: true,- ShowOnCatalogPage: false,- AttributeControlTypeId: DropdownList,- Combination: false,- ShouldHaveValues: false,- ValidationRulesAllowed: false,- ConditionAllowed: false,- Id: pam-v-1-}\ No newline at end of filediff --git a/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.Product_ToVendorProductModel.verified.txt b/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.Product_ToVendorProductModel.verified.txtdeleted file mode 100644index b7826ea54..000000000--- a/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.Product_ToVendorProductModel.verified.txt+++ /dev/null@@ -1,57 +0,0 @@-{- Id: prod-v-1,- ProductTypeId: 5,- AuctionEnded: false,- VisibleIndividually: false,- Name: Vendor Product,- ShortDescription: Short desc,- FullDescription: Full description,- AllowCustomerReviews: false,- Sku: VSKU001,- IsGiftVoucher: false,- RequireOtherProducts: false,- AutoAddRequiredProducts: false,- IsRecurring: false,- CalendarModel: {- Interval: 1,- IncBothDate: false,- Quantity: 1,- Monday: false,- Tuesday: false,- Wednesday: false,- Thursday: false,- Friday: false,- Saturday: false,- Sunday: false- },- IsShipEnabled: false,- IsFreeShipping: false,- ShipSeparately: false,- IsTaxExempt: false,- IsTele: false,- UseMultipleWarehouses: false,- StockQuantity: 50,- StockAvailability: false,- DisplayStockQuantity: false,- AllowOutOfStockSubscriptions: false,- NotReturnable: false,- DisableBuyButton: false,- DisableWishlistButton: false,- AvailableForPreOrder: false,- CallForPrice: false,- Price: 49.99,- OldPrice: 59.99,- EnteredPrice: false,- BasepriceEnabled: false,- MarkAsNew: false,- Weight: 1.5,- DisplayOrder: 1,- Published: true,- AddPictureModel: {- IsDefault: false- },- CopyProductModel: {- CopyImages: false,- Published: false- }-}\ No newline at end of filediff --git a/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.VendorProductModel_ToProduct.verified.txt b/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.VendorProductModel_ToProduct.verified.txtdeleted file mode 100644index 0cb803d5f..000000000--- a/src/Tests/Grand.Mapping.Tests/Vendor/VendorMappingTests.VendorProductModel_ToProduct.verified.txt+++ /dev/null@@ -1,44 +0,0 @@-{- VisibleIndividually: false,- Name: New Product,- ShortDescription: Short,- FullDescription: Full,- ShowOnHomePage: false,- BestSeller: false,- AllowCustomerReviews: false,- Sku: SKU002,- IsGiftVoucher: false,- RequireOtherProducts: false,- AutoAddRequiredProducts: false,- IsDownload: false,- UnlimitedDownloads: false,- HasSampleDownload: false,- HasUserAgreement: false,- IsRecurring: false,- IncBothDate: false,- IsShipEnabled: false,- IsFreeShipping: false,- ShipSeparately: false,- IsTaxExempt: false,- IsTele: false,- UseMultipleWarehouses: false,- StockQuantity: 25,- StockAvailability: false,- DisplayStockQuantity: false,- LowStock: false,- AllowOutOfStockSubscriptions: false,- NotReturnable: false,- DisableBuyButton: false,- DisableWishlistButton: false,- AvailableForPreOrder: false,- CallForPrice: false,- Price: 39.99,- EnteredPrice: false,- BasepriceEnabled: false,- MarkAsNew: false,- AuctionEnded: false,- Published: true,- LimitedToGroups: false,- LimitedToStores: false,- Id: ObjectId_1-}\ No newline at end of filediff --git a/src/Tests/Grand.Web.Vendor.Tests/Controllers/ProductControllerTests.cs b/src/Tests/Grand.Web.Vendor.Tests/Controllers/ProductControllerTests.csindex ea727905a..bad6c6765 100644--- a/src/Tests/Grand.Web.Vendor.Tests/Controllers/ProductControllerTests.cs+++ b/src/Tests/Grand.Web.Vendor.Tests/Controllers/ProductControllerTests.cs@@ -1,138 +1,44 @@-using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Core.Interfaces.Common.Directory;-using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Common.Security;-using Grand.Business.Core.Interfaces.Storage;-using Grand.Domain.Catalog;-using Grand.Domain.Vendors;-using Grand.Infrastructure;-using Grand.Web.Common.Localization;+using Grand.Domain.Permissions;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Grand.Web.Vendor.Controllers;-using Grand.Web.Vendor.Interfaces;-using Grand.Web.Vendor.Models.Catalog;-using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;-using Microsoft.AspNetCore.Mvc.ViewFeatures;using Microsoft.VisualStudio.TestTools.UnitTesting;-using Moq;namespace Grand.Web.Vendor.Tests.Controllers;-// Characterization tests for the tenant-isolation checks in ProductController, ahead of the planned-// consolidation of the near-duplicate ProductController/ProductViewModelService copies in-// Grand.Web.Admin / Grand.Web.Store / Grand.Web.Vendor. These lock down the *current* behavior-// (including the redirect target chosen on access denial) so the refactor has something to fail against.+// Regression lock for the missing-authorization-attribute bug caught during ARCH-001 Phase 1 Task 11:+// the plan's own inline example code for the thin ProductController subclass omitted+// [AuthorizeVendor]/[AutoValidateAntiforgeryToken]/[AuthorizeMenu] entirely, because BaseProductController+// can't inherit any single host's base controller and so those attributes no longer arrive+// transitively. Following the plan literally would have shipped Vendor's product management with no+// CSRF protection and no authentication/authorization filter. This test makes that class of regression+// fail loudly instead of silently the next time this controller (or one like it) is touched.+//+// All scope/access-check behavior (including Vendor's own HasAccess semantics) is now covered by+// BaseProductControllerTests, parameterized over a mocked IAdminDataScope<Product> - see+// Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs. This file only keeps routing/+// attribute-only coverage, mirroring Admin's and Store's ProductControllerAttributesTests.cs.[TestClass]public class ProductControllerTests{- private const string OwnVendorId = "vendor-1";- private const string OtherVendorId = "vendor-2";-- private ProductController _controller;- private Mock<IProductService> _productServiceMock;- private Mock<IProductViewModelService> _productViewModelServiceMock;- private Mock<ITranslationService> _translationServiceMock;-- [TestInitialize]- public void Setup()- {- _productServiceMock = new Mock<IProductService>();- _productViewModelServiceMock = new Mock<IProductViewModelService>();- _translationServiceMock = new Mock<ITranslationService>();- _translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");-- var workContextMock = new Mock<IWorkContext>();- workContextMock.Setup(w => w.CurrentVendor).Returns(new Domain.Vendors.Vendor { Id = OwnVendorId });- var contextAccessorMock = new Mock<IContextAccessor>();- contextAccessorMock.Setup(c => c.WorkContext).Returns(workContextMock.Object);-- _controller = new ProductController(- _productViewModelServiceMock.Object,- _productServiceMock.Object,- new Mock<IInventoryManageService>().Object,- contextAccessorMock.Object,- new Mock<ILanguageService>().Object,- _translationServiceMock.Object,- new Mock<IProductReservationService>().Object,- new Mock<IAuctionService>().Object,- new Mock<IDateTimeService>().Object,- new Mock<IPermissionService>().Object,- new Mock<IEnumTranslationService>().Object);-- var httpContext = new DefaultHttpContext();- _controller.ControllerContext = new ControllerContext { HttpContext = httpContext };- _controller.TempData = new TempDataDictionary(httpContext, new Mock<ITempDataProvider>().Object);- }-- [TestMethod]- public async Task Delete_ProductNotFound_RedirectsToList()- {- _productServiceMock.Setup(p => p.GetProductById("missing", true)).ReturnsAsync((Product)null);-- var result = await _controller.Delete("missing");-- var redirect = result as RedirectToActionResult;- Assert.IsNotNull(redirect);- Assert.AreEqual("List", redirect.ActionName);- _productViewModelServiceMock.Verify(s => s.DeleteProduct(It.IsAny<Product>()), Times.Never);- }-- [TestMethod]- public async Task Delete_ProductOwnedByAnotherVendor_RedirectsToListWithoutDeleting()- {- var product = new Product { Id = "p1", VendorId = OtherVendorId };- _productServiceMock.Setup(p => p.GetProductById("p1", true)).ReturnsAsync(product);-- var result = await _controller.Delete("p1");-- var redirect = result as RedirectToActionResult;- Assert.IsNotNull(redirect);- Assert.AreEqual("List", redirect.ActionName);- _productViewModelServiceMock.Verify(s => s.DeleteProduct(product), Times.Never);- }-- [TestMethod]- public async Task Delete_ProductOwnedByCurrentVendor_DeletesAndRedirectsToList()- {- var product = new Product { Id = "p1", VendorId = OwnVendorId };- _productServiceMock.Setup(p => p.GetProductById("p1", true)).ReturnsAsync(product);-- var result = await _controller.Delete("p1");-- var redirect = result as RedirectToActionResult;- Assert.IsNotNull(redirect);- Assert.AreEqual("List", redirect.ActionName);- _productViewModelServiceMock.Verify(s => s.DeleteProduct(product), Times.Once);- }-[TestMethod]- public async Task EditGet_ProductOwnedByAnotherVendor_RedirectsToListWithoutPreparingModel()+ public void ProductController_CarriesRequiredAuthorizationAndCsrfAttributes(){- var product = new Product { Id = "p1", VendorId = OtherVendorId };- _productServiceMock.Setup(p => p.GetProductById("p1", true)).ReturnsAsync(product);-- var result = await _controller.Edit("p1");-- var redirect = result as RedirectToActionResult;- Assert.IsNotNull(redirect);- Assert.AreEqual("List", redirect.ActionName);- _productViewModelServiceMock.Verify(- s => s.PrepareProductModel(It.IsAny<ProductModel>(), It.IsAny<Product>(), It.IsAny<bool>()),- Times.Never);- }-- [TestMethod]- public async Task EditPost_ProductOwnedByAnotherVendor_RedirectsToListWithoutUpdating()- {- var product = new Product { Id = "p1", VendorId = OtherVendorId };- _productServiceMock.Setup(p => p.GetProductById("p1", true)).ReturnsAsync(product);-- var result = await _controller.Edit(new ProductModel { Id = "p1" }, continueEditing: false);-- var redirect = result as RedirectToActionResult;- Assert.IsNotNull(redirect);- Assert.AreEqual("List", redirect.ActionName);- _productViewModelServiceMock.Verify(- s => s.UpdateProductModel(It.IsAny<Product>(), It.IsAny<ProductModel>()), Times.Never);+ var type = typeof(ProductController);++ Assert.IsTrue(type.IsDefined(typeof(AuthorizeVendorAttribute), true), "Missing [AuthorizeVendor].");+ Assert.IsTrue(type.IsDefined(typeof(AutoValidateAntiforgeryTokenAttribute), true),+ "Missing [AutoValidateAntiforgeryToken] - CSRF protection would be lost.");+ Assert.IsTrue(type.IsDefined(typeof(AreaAttribute), true), "Missing [Area].");+ Assert.IsTrue(type.IsDefined(typeof(AuthorizeMenuAttribute), true), "Missing [AuthorizeMenu].");++ // Inherited from BaseProductController - PermissionAuthorizeAttribute has no+ // AttributeUsage(Inherited = false), so MVC's attribute discovery (inherit: true) picks it up+ // from the base class without the subclass needing to restate it.+ var permissionAttr = (PermissionAuthorizeAttribute)Attribute.GetCustomAttribute(type,+ typeof(PermissionAuthorizeAttribute), true);+ Assert.IsNotNull(permissionAttr, "Missing [PermissionAuthorize] (expected via inheritance from BaseProductController).");+ Assert.AreEqual(PermissionSystemName.Products, permissionAttr.Permission);}}diff --git a/src/Tests/Grand.Web.Vendor.Tests/Services/ProductViewModelServiceTests.cs b/src/Tests/Grand.Web.Vendor.Tests/Services/ProductViewModelServiceTests.csdeleted file mode 100644index a6306550d..000000000--- a/src/Tests/Grand.Web.Vendor.Tests/Services/ProductViewModelServiceTests.cs+++ /dev/null@@ -1,227 +0,0 @@-using Grand.Business.Core.Interfaces.Catalog.Categories;-using Grand.Business.Core.Interfaces.Catalog.Collections;-using Grand.Business.Core.Interfaces.Catalog.Directory;-using Grand.Business.Core.Interfaces.Catalog.Prices;-using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Core.Interfaces.Catalog.Tax;-using Grand.Business.Core.Interfaces.Checkout.Shipping;-using Grand.Business.Core.Interfaces.Common.Directory;-using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Common.Seo;-using Grand.Business.Core.Interfaces.Common.Stores;-using Grand.Business.Core.Interfaces.Customers;-using Grand.Business.Core.Interfaces.Storage;-using Grand.Domain;-using Grand.Domain.Catalog;-using Grand.Domain.Directory;-using Grand.Domain.Tax;-using Grand.Domain.Vendors;-using Grand.Infrastructure;-using Grand.Infrastructure.Mapper;-using Grand.Mapping;-using Grand.Web.Common.Localization;-using Grand.Web.Vendor.Mapper;-using Grand.Web.Vendor.Models.Catalog;-using Grand.Web.Vendor.Services;-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Moq;-using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;--namespace Grand.Web.Vendor.Tests.Services;--// Characterization tests for the vendor-specific behavior of this forked ProductViewModelService, ahead-// of the planned consolidation back into Grand.Web.AdminShared.Services.ProductViewModelService (the two-// classes are ~85% identical; the remainder is the tenant-isolation logic covered here). These tests must-// keep passing (or have their expectation deliberately revised in the same change) once the fork is-// removed and the AdminShared implementation is parameterized/extended for the Vendor area instead.-[TestClass]-public class ProductViewModelServiceTests-{- private const string CurrentVendorId = "vendor-1";- private const string OtherVendorId = "vendor-2";-- private Mock<IProductService> _productServiceMock;- private Mock<ISeNameService> _seNameServiceMock;- private ProductViewModelService _service;-- [TestInitialize]- public void Setup()- {- var mapperConfig = new MapperConfiguration(cfg => { cfg.AddProfile<ProductProfile>(); });- AutoMapperConfig.Init(mapperConfig);-- _productServiceMock = new Mock<IProductService>();- _seNameServiceMock = new Mock<ISeNameService>();- _seNameServiceMock- .Setup(s => s.TranslationSeNameProperties(It.IsAny<IList<ProductLocalizedModel>>(),- It.IsAny<Product>(), It.IsAny<System.Linq.Expressions.Expression<Func<ProductLocalizedModel, string>>>()))- .ReturnsAsync(new List<Domain.Localization.TranslationEntity>());- _seNameServiceMock- .Setup(s => s.ValidateSeName(It.IsAny<Product>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))- .ReturnsAsync("se-name");-- var workContextMock = new Mock<IWorkContext>();- workContextMock.Setup(w => w.CurrentVendor).Returns(new Grand.Domain.Vendors.Vendor { Id = CurrentVendorId });- var contextAccessorMock = new Mock<IContextAccessor>();- contextAccessorMock.Setup(c => c.WorkContext).Returns(workContextMock.Object);-- var translationServiceMock = new Mock<ITranslationService>();- translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");-- _service = new ProductViewModelService(- _productServiceMock.Object,- new Mock<IInventoryManageService>().Object,- new Mock<IPictureService>().Object,- new Mock<IProductAttributeService>().Object,- new Mock<ICurrencyService>().Object,- new Mock<IMeasureService>().Object,- new Mock<IDateTimeService>().Object,- new Mock<ICollectionService>().Object,- new Mock<IProductCollectionService>().Object,- new Mock<ICategoryService>().Object,- new Mock<IProductCategoryService>().Object,- translationServiceMock.Object,- new Mock<IProductLayoutService>().Object,- new Mock<ISpecificationAttributeService>().Object,- contextAccessorMock.Object,- new Mock<IWarehouseService>().Object,- new Mock<IDeliveryDateService>().Object,- new Mock<ITaxCategoryService>().Object,- new Mock<ICustomerService>().Object,- new Mock<IStoreService>().Object,- new Mock<IOutOfStockSubscriptionService>().Object,- new Mock<ILanguageService>().Object,- new Mock<IProductAttributeFormatter>().Object,- new Mock<IStockQuantityService>().Object,- new Mock<IAuctionService>().Object,- new Mock<IPriceFormatter>().Object,- new CurrencySettings(),- new MeasureSettings(),- new TaxSettings(),- _seNameServiceMock.Object,- new Mock<IEnumTranslationService>().Object);- }-- [TestMethod]- public async Task InsertProductModel_SetsVendorIdFromCurrentVendor()- {- var model = new ProductModel { Name = "New product" };-- var product = await _service.InsertProductModel(model);-- Assert.AreEqual(CurrentVendorId, product.VendorId);- _productServiceMock.Verify(p => p.InsertProduct(It.Is<Product>(x => x.VendorId == CurrentVendorId)),- Times.Once);- }-- [TestMethod]- public async Task PrepareProducts_FiltersSearchByCurrentVendor()- {- IPagedList<Product> paged = new PagedList<Product> { new() { Id = "p1", VendorId = CurrentVendorId } };- _productServiceMock.Setup(p => p.SearchProducts(- false, 0, int.MaxValue, It.IsAny<IList<string>>(), It.IsAny<string>(), It.IsAny<string>(),- It.IsAny<string>(), CurrentVendorId, It.IsAny<string>(), It.IsAny<ProductType?>(), false, false,- It.IsAny<bool?>(), It.IsAny<bool?>(), null, null, "", It.IsAny<string>(), false, true, false, "",- null, null, ProductSortingEnum.Position, true, It.IsAny<bool?>()))- .ReturnsAsync((paged, (IList<string>)null));-- var products = await _service.PrepareProducts(new ProductListModel());-- Assert.AreEqual(1, products.Count);- _productServiceMock.Verify(p => p.SearchProducts(- false, 0, int.MaxValue, It.IsAny<IList<string>>(), It.IsAny<string>(), It.IsAny<string>(),- It.IsAny<string>(), CurrentVendorId, It.IsAny<string>(), It.IsAny<ProductType?>(), false, false,- It.IsAny<bool?>(), It.IsAny<bool?>(), null, null, "", It.IsAny<string>(), false, true, false, "",- null, null, ProductSortingEnum.Position, true, It.IsAny<bool?>()), Times.Once);- }-- [TestMethod]- public async Task DeleteSelected_SkipsProductsNotOwnedByCurrentVendor()- {- var own = new Product { Id = "own", VendorId = CurrentVendorId };- var other = new Product { Id = "other", VendorId = OtherVendorId };- _productServiceMock.Setup(p => p.GetProductsByIds(new[] { "own", "other" }, true))- .ReturnsAsync(new List<Product> { own, other });-- await _service.DeleteSelected(new[] { "own", "other" });-- _productServiceMock.Verify(p => p.DeleteProduct(own), Times.Once);- _productServiceMock.Verify(p => p.DeleteProduct(other), Times.Never);- }-- [TestMethod]- public async Task InsertRelatedProductModel_SkipsCandidateNotOwnedByCurrentVendor()- {- var source = new Product { Id = "source", VendorId = CurrentVendorId };- var other = new Product { Id = "other", VendorId = OtherVendorId };- _productServiceMock.Setup(p => p.GetProductById("source", true)).ReturnsAsync(source);- _productServiceMock.Setup(p => p.GetProductById("other", false)).ReturnsAsync(other);-- await _service.InsertRelatedProductModel(new ProductModel.AddRelatedProductModel {- ProductId = "source",- SelectedProductIds = ["other"]- });-- Assert.IsFalse(source.RelatedProducts.Any(x => x.ProductId2 == "other"));- _productServiceMock.Verify(p => p.InsertRelatedProduct(It.IsAny<RelatedProduct>(), "source"), Times.Never);- }-- [TestMethod]- public async Task InsertSimilarProductModel_SkipsCandidateNotOwnedByCurrentVendor()- {- // Regression test for a fixed authorization bug: this used to check- // HasAccessToProduct(productId1) - the product already being edited, which the vendor is- // guaranteed to own - instead of HasAccessToProduct(product), the candidate being linked in- // via `id`. That made the check a no-op: any vendor could link any other vendor's product as- // "similar". Now it checks the candidate, matching InsertRelatedProductModel/- // InsertBundleProductModel.- var source = new Product { Id = "source", VendorId = CurrentVendorId };- var other = new Product { Id = "other", VendorId = OtherVendorId };- _productServiceMock.Setup(p => p.GetProductById("source", true)).ReturnsAsync(source);- _productServiceMock.Setup(p => p.GetProductById("other", false)).ReturnsAsync(other);-- await _service.InsertSimilarProductModel(new ProductModel.AddSimilarProductModel {- ProductId = "source",- SelectedProductIds = ["other"]- });-- Assert.IsFalse(source.SimilarProducts.Any(x => x.ProductId2 == "other"));- _productServiceMock.Verify(p => p.InsertSimilarProduct(It.IsAny<SimilarProduct>()), Times.Never);- }-- [TestMethod]- public async Task InsertSimilarProductModel_LinksCandidateOwnedByCurrentVendor()- {- var source = new Product { Id = "source", VendorId = CurrentVendorId };- var own = new Product { Id = "own", VendorId = CurrentVendorId };- _productServiceMock.Setup(p => p.GetProductById("source", true)).ReturnsAsync(source);- _productServiceMock.Setup(p => p.GetProductById("own", false)).ReturnsAsync(own);-- await _service.InsertSimilarProductModel(new ProductModel.AddSimilarProductModel {- ProductId = "source",- SelectedProductIds = ["own"]- });-- Assert.IsTrue(source.SimilarProducts.Any(x => x.ProductId2 == "own"));- _productServiceMock.Verify(p => p.InsertSimilarProduct(It.IsAny<SimilarProduct>()), Times.Once);- }-- [TestMethod]- public async Task InsertBundleProductModel_SkipsCandidateNotOwnedByCurrentVendor()- {- // Same fixed bug as InsertSimilarProductModel, same fix.- var source = new Product { Id = "source", VendorId = CurrentVendorId };- var other = new Product { Id = "other", VendorId = OtherVendorId };- _productServiceMock.Setup(p => p.GetProductById("source", true)).ReturnsAsync(source);- _productServiceMock.Setup(p => p.GetProductById("other", false)).ReturnsAsync(other);-- await _service.InsertBundleProductModel(new ProductModel.AddBundleProductModel {- ProductId = "source",- SelectedProductIds = ["other"]- });-- Assert.IsFalse(source.BundleProducts.Any(x => x.ProductId == "other"));- _productServiceMock.Verify(p => p.InsertBundleProduct(It.IsAny<BundleProduct>(), It.IsAny<string>()),- Times.Never);- }-}diff --git a/src/Web/Grand.Web.Vendor/Extensions/ProductsMappingExtensions.cs b/src/Web/Grand.Web.Vendor/Extensions/ProductsMappingExtensions.csdeleted file mode 100644index 1b9f70725..000000000--- a/src/Web/Grand.Web.Vendor/Extensions/ProductsMappingExtensions.cs+++ /dev/null@@ -1,118 +0,0 @@-using Grand.Business.Core.Interfaces.Common.Directory;-using Grand.Domain.Catalog;-using Grand.Infrastructure.Mapper;-using Grand.Web.Common.Extensions;-using Grand.Web.Vendor.Models.Catalog;--namespace Grand.Web.Vendor.Extensions;--public static class ProductsMappingExtensions-{- public static ProductModel ToModel(this Product entity, IDateTimeService dateTimeService)- {- var product = entity.MapTo<Product, ProductModel>();- product.MarkAsNewStartDateTime = entity.MarkAsNewStartDateTimeUtc.ConvertToUserTime(dateTimeService);- product.MarkAsNewEndDateTime = entity.MarkAsNewEndDateTimeUtc.ConvertToUserTime(dateTimeService);- product.AvailableStartDateTime = entity.AvailableStartDateTimeUtc.ConvertToUserTime(dateTimeService);- product.AvailableEndDateTime = entity.AvailableEndDateTimeUtc.ConvertToUserTime(dateTimeService);- product.PreOrderDateTime = entity.PreOrderDateTimeUtc.ConvertToUserTime(dateTimeService);- return product;- }-- public static Product ToEntity(this ProductModel model, IDateTimeService dateTimeService)- {- var product = model.MapTo<ProductModel, Product>();- product.MarkAsNewStartDateTimeUtc = model.MarkAsNewStartDateTime.ConvertToUtcTime(dateTimeService);- product.MarkAsNewEndDateTimeUtc = model.MarkAsNewEndDateTime.ConvertToUtcTime(dateTimeService);- product.AvailableStartDateTimeUtc = model.AvailableStartDateTime.ConvertToUtcTime(dateTimeService);- product.AvailableEndDateTimeUtc = model.AvailableEndDateTime.ConvertToUtcTime(dateTimeService);- product.PreOrderDateTimeUtc = model.PreOrderDateTime.ConvertToUtcTime(dateTimeService);-- return product;- }-- public static Product ToEntity(this ProductModel model, Product destination, IDateTimeService dateTimeService)- {- var product = model.MapTo(destination);- product.MarkAsNewStartDateTimeUtc = model.MarkAsNewStartDateTime.ConvertToUtcTime(dateTimeService);- product.MarkAsNewEndDateTimeUtc = model.MarkAsNewEndDateTime.ConvertToUtcTime(dateTimeService);- product.AvailableStartDateTimeUtc = model.AvailableStartDateTime.ConvertToUtcTime(dateTimeService);- product.AvailableEndDateTimeUtc = model.AvailableEndDateTime.ConvertToUtcTime(dateTimeService);- product.PreOrderDateTimeUtc = model.PreOrderDateTime.ConvertToUtcTime(dateTimeService);- return product;- }-- public static ProductModel.ProductAttributeMappingModel ToModel(this ProductAttributeMapping entity)- {- return entity.MapTo<ProductAttributeMapping, ProductModel.ProductAttributeMappingModel>();- }-- public static ProductAttributeMapping ToEntity(this ProductModel.ProductAttributeMappingModel model)- {- return model.MapTo<ProductModel.ProductAttributeMappingModel, ProductAttributeMapping>();- }-- public static ProductAttributeMapping ToEntity(this ProductModel.ProductAttributeMappingModel model,- ProductAttributeMapping destination)- {- return model.MapTo(destination);- }-- public static ProductAttributeCombinationModel ToModel(this ProductAttributeCombination entity)- {- return entity.MapTo<ProductAttributeCombination, ProductAttributeCombinationModel>();- }-- public static ProductModel.AddProductSpecificationAttributeModel ToModel(this ProductSpecificationAttribute entity)- {- return entity.MapTo<ProductSpecificationAttribute, ProductModel.AddProductSpecificationAttributeModel>();- }-- public static ProductSpecificationAttribute ToEntity(this ProductModel.AddProductSpecificationAttributeModel model)- {- return model.MapTo<ProductModel.AddProductSpecificationAttributeModel, ProductSpecificationAttribute>();- }-- public static ProductSpecificationAttribute ToEntity(this ProductModel.AddProductSpecificationAttributeModel model,- ProductSpecificationAttribute destination)- {- if (model.AttributeTypeId != SpecificationAttributeType.Option)- {- model.SpecificationAttributeId = "";- model.SpecificationAttributeOptionId = "";- model.AllowFiltering = false;- }-- return model.MapTo(destination);- }-- public static ProductAttributeValue ToEntity(this PredefinedProductAttributeValue model)- {- return model.MapTo<PredefinedProductAttributeValue, ProductAttributeValue>();- }-- public static ProductModel.TierPriceModel ToModel(this TierPrice entity, IDateTimeService dateTimeService)- {- var tierprice = entity.MapTo<TierPrice, ProductModel.TierPriceModel>();- tierprice.StartDateTime = entity.StartDateTimeUtc.ConvertToUserTime(dateTimeService);- tierprice.EndDateTime = entity.EndDateTimeUtc.ConvertToUserTime(dateTimeService);- return tierprice;- }-- public static TierPrice ToEntity(this ProductModel.TierPriceModel model, IDateTimeService dateTimeService)- {- var tierprice = model.MapTo<ProductModel.TierPriceModel, TierPrice>();- tierprice.StartDateTimeUtc = model.StartDateTime.ConvertToUtcTime(dateTimeService);- tierprice.EndDateTimeUtc = model.EndDateTime.ConvertToUtcTime(dateTimeService);- return tierprice;- }-- public static TierPrice ToEntity(this ProductModel.TierPriceModel model, TierPrice destination,- IDateTimeService dateTimeService)- {- var tierprice = model.MapTo(destination);- tierprice.StartDateTimeUtc = model.StartDateTime.ConvertToUtcTime(dateTimeService);- tierprice.EndDateTimeUtc = model.EndDateTime.ConvertToUtcTime(dateTimeService);- return tierprice;- }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Mapper/ProductProfile.cs b/src/Web/Grand.Web.Vendor/Mapper/ProductProfile.csdeleted file mode 100644index f83ddd89a..000000000--- a/src/Web/Grand.Web.Vendor/Mapper/ProductProfile.cs+++ /dev/null@@ -1,102 +0,0 @@-using Grand.Mapping;-using Grand.Business.Core.Extensions;-using Grand.Domain.Catalog;-using Grand.Infrastructure.Mapper;-using Grand.Web.Common.Extensions;-using Grand.Web.Vendor.Models.Catalog;--namespace Grand.Web.Vendor.Mapper;--public class ProductProfile : Profile, IAutoMapperProfile-{- public ProductProfile()- {- CreateMap<Product, ProductModel>()- .ForMember(dest => dest.Locales, mo => mo.Ignore())- .ForMember(dest => dest.ProductTypeName, mo => mo.Ignore())- .ForMember(dest => dest.AssociatedToProductId, mo => mo.Ignore())- .ForMember(dest => dest.AssociatedToProductName, mo => mo.Ignore())- .ForMember(dest => dest.StockQuantityStr, mo => mo.Ignore())- .ForMember(dest => dest.CreatedOn, mo => mo.Ignore())- .ForMember(dest => dest.UpdatedOn, mo => mo.Ignore())- .ForMember(dest => dest.PictureThumbnailUrl, mo => mo.Ignore())- .ForMember(dest => dest.AvailableProductLayouts, mo => mo.Ignore())- .ForMember(dest => dest.AvailableProductAttributes, mo => mo.Ignore())- .ForMember(dest => dest.AddPictureModel, mo => mo.Ignore())- .ForMember(dest => dest.ProductPictureModels, mo => mo.Ignore())- .ForMember(dest => dest.CopyProductModel, mo => mo.Ignore())- .ForMember(dest => dest.ProductWarehouseInventoryModels, mo => mo.Ignore())- .ForMember(dest => dest.SeName, mo => mo.MapFrom(src => src.GetSeName("", true)))- .ForMember(dest => dest.AvailableTaxCategories, mo => mo.Ignore())- .ForMember(dest => dest.AvailableUnits, mo => mo.Ignore())- .ForMember(dest => dest.PrimaryStoreCurrencyCode, mo => mo.Ignore())- .ForMember(dest => dest.BaseDimensionIn, mo => mo.Ignore())- .ForMember(dest => dest.BaseWeightIn, mo => mo.Ignore())- .ForMember(dest => dest.AvailableDeliveryDates, mo => mo.Ignore())- .ForMember(dest => dest.AvailableWarehouses, mo => mo.Ignore())- .ForMember(dest => dest.AvailableBasepriceUnits, mo => mo.Ignore())- .ForMember(dest => dest.AvailableBasepriceBaseUnits, mo => mo.Ignore())- .ForPath(dest => dest.CalendarModel.IncBothDate, mo => mo.MapFrom(x => x.IncBothDate));-- CreateMap<ProductModel, Product>()- .ForMember(dest => dest.Id, mo => mo.Ignore())- .ForMember(dest => dest.Locales, mo => mo.Ignore())- .ForMember(dest => dest.VendorId, mo => mo.Ignore())- .ForMember(dest => dest.UpdatedOnUtc, mo => mo.Ignore())- .ForMember(dest => dest.Coordinates, mo => mo.Ignore())- .ForMember(dest => dest.ParentGroupedProductId, mo => mo.Ignore())- .ForMember(dest => dest.ApprovedRatingSum, mo => mo.Ignore())- .ForMember(dest => dest.NotApprovedRatingSum, mo => mo.Ignore())- .ForMember(dest => dest.ApprovedTotalReviews, mo => mo.Ignore())- .ForMember(dest => dest.NotApprovedTotalReviews, mo => mo.Ignore())- .ForMember(dest => dest.ProductCategories, mo => mo.Ignore())- .ForMember(dest => dest.ProductCollections, mo => mo.Ignore())- .ForMember(dest => dest.ProductPictures, mo => mo.Ignore())- .ForMember(dest => dest.ProductSpecificationAttributes, mo => mo.Ignore())- .ForMember(dest => dest.ProductWarehouseInventory, mo => mo.Ignore())- .ForMember(dest => dest.Interval, mo => mo.Ignore())- .ForMember(dest => dest.ProductAttributeMappings, mo => mo.Ignore())- .ForMember(dest => dest.ProductAttributeCombinations, mo => mo.Ignore())- .ForMember(dest => dest.TierPrices, mo => mo.Ignore())- .ForMember(dest => dest.AppliedDiscounts, mo => mo.Ignore())- .ForPath(dest => dest.IncBothDate, mo => mo.MapFrom(x => x.CalendarModel.IncBothDate));-- CreateMap<ProductAttributeMapping, ProductModel.ProductAttributeMappingModel>();-- CreateMap<ProductModel.ProductAttributeMappingModel, ProductAttributeMapping>()- .ForMember(dest => dest.Id, mo => mo.Ignore());-- CreateMap<ProductAttributeCombination, ProductAttributeCombinationModel>()- .ForMember(dest => dest.UseMultipleWarehouses, mo => mo.Ignore())- .ForMember(dest => dest.PrimaryStoreCurrencyCode, mo => mo.Ignore())- .ForMember(dest => dest.WarehouseInventoryModels, mo => mo.Ignore());- CreateMap<ProductAttributeCombinationModel, ProductAttributeCombination>()- .ForMember(dest => dest.WarehouseInventory, mo => mo.Ignore())- .ForMember(dest => dest.Id, mo => mo.Ignore());-- CreateMap<PredefinedProductAttributeValue, ProductAttributeValue>()- .ForMember(dest => dest.Id, mo => mo.Ignore());-- CreateMap<PredefinedProductAttributeValue, PredefinedProductAttributeValueModel>()- .ForMember(dest => dest.Locales, mo => mo.Ignore())- .ForMember(dest => dest.PriceAdjustmentStr, mo => mo.MapFrom(x => x.PriceAdjustment.ToString("N2")))- .ForMember(dest => dest.WeightAdjustmentStr, mo => mo.MapFrom(x => x.WeightAdjustment.ToString("N2")));-- CreateMap<PredefinedProductAttributeValueModel, PredefinedProductAttributeValue>()- .ForMember(dest => dest.Id, mo => mo.Ignore())- .ForMember(dest => dest.Locales, mo => mo.MapFrom(x => x.Locales.ToTranslationProperty()));-- CreateMap<ProductSpecificationAttribute, ProductModel.AddProductSpecificationAttributeModel>()- .ForMember(dest => dest.AvailableAttributes, mo => mo.Ignore())- .ForMember(dest => dest.AvailableOptions, mo => mo.Ignore());- CreateMap<ProductModel.AddProductSpecificationAttributeModel, ProductSpecificationAttribute>();-- CreateMap<TierPrice, ProductModel.TierPriceModel>()- .ForMember(dest => dest.AvailableCurrencies, mo => mo.Ignore());-- CreateMap<ProductModel.TierPriceModel, TierPrice>()- .ForMember(dest => dest.Id, mo => mo.Ignore());- }-- public int Order => 0;-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/BulkEditListModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/BulkEditListModel.csdeleted file mode 100644index 5dc967f13..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/BulkEditListModel.cs+++ /dev/null@@ -1,29 +0,0 @@-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;-using Microsoft.AspNetCore.Mvc.Rendering;-using System.ComponentModel.DataAnnotations;--namespace Grand.Web.Vendor.Models.Catalog;--public class BulkEditListModel : BaseModel-{- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.List.SearchProductName")]- public string SearchProductName { get; set; }-- [UIHint("Category")]- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.List.SearchCategory")]- public string SearchCategoryId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.Brand")]- [UIHint("Brand")]- public string SearchBrandId { get; set; }-- [UIHint("Collection")]- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.List.SearchCollection")]- public string SearchCollectionId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchProductType")]- public int SearchProductTypeId { get; set; }-- public IList<SelectListItem> AvailableProductTypes { get; set; } = new List<SelectListItem>();-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/BulkEditProductModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/BulkEditProductModel.csdeleted file mode 100644index 19d5a5d22..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/BulkEditProductModel.cs+++ /dev/null@@ -1,33 +0,0 @@-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;--namespace Grand.Web.Vendor.Models.Catalog;--public class BulkEditProductModel : BaseEntityModel-{- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.Fields.Name")]-- public string Name { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.Fields.SKU")]-- public string Sku { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.Fields.Price")]- public double Price { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.Fields.OldPrice")]- public double OldPrice { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.Fields.ManageInventoryMethod")]- public int ManageInventoryMethodId { get; set; }-- public string ManageInventoryMethod { get; set; }--- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.Fields.StockQuantity")]- public int StockQuantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.BulkEdit.Fields.Published")]- public bool Published { get; set; }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/CopyProductModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/CopyProductModel.csdeleted file mode 100644index 16ae6ab0a..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/CopyProductModel.cs+++ /dev/null@@ -1,16 +0,0 @@-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;--namespace Grand.Web.Vendor.Models.Catalog;--public class CopyProductModel : BaseEntityModel-{- [GrandResourceDisplayName("Vendor.Catalog.Products.Copy.Name")]- public string Name { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Copy.CopyImages")]- public bool CopyImages { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Copy.Published")]- public bool Published { get; set; }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/IProductValidVendor.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/IProductValidVendor.csdeleted file mode 100644index 73b8c098a..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/IProductValidVendor.cs+++ /dev/null@@ -1,32 +0,0 @@-namespace Grand.Web.Vendor.Models.Catalog;--/// <summary>-/// Implement on any Vendor-area POST model that carries a product id. The global-/// <see cref="Grand.Infrastructure.Validators.ValidationFilter" /> resolves an-/// <c>IValidator<IProductValidVendor></c> for every such model and rejects the request unless-/// <see cref="ProductId" /> belongs to the current vendor - see-/// Grand.Web.Vendor.Validators.Catalog.ProductValidVendor.-/// IMPORTANT: if the model carries more than one product-id-shaped field (e.g. an owning/parent id-/// plus a referenced/component id), make sure <see cref="ProductId" /> is bound to whichever id the-/// action actually mutates. A mismatch silently authorizes the wrong product - see-/// ProductModel.BundleProductModel (ProductId vs ProductBundleId) for a bug of this exact shape that-/// was found and fixed.-/// </summary>-public interface IProductValidVendor-{- public string ProductId { get; set; }-}--/// <summary>-/// Implement on Vendor-area POST models that relate two products (e.g. related/similar products).-/// The paired validator (ProductRelatedValidVendor) requires ownership of <see cref="ProductId1" />-/// only, because the consuming actions only ever read/mutate ProductId1's mapping list. Do not widen-/// this to accept ownership of either id ("OR") unless the action is also changed to only ever-/// mutate whichever product is actually owned - an OR check let an attacker satisfy validation via-/// ProductId2 while mutating a ProductId1 they don't own.-/// </summary>-public interface IProductRelatedValidVendor-{- public string ProductId1 { get; set; }- public string ProductId2 { get; set; }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeCombinationModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeCombinationModel.csdeleted file mode 100644index 876b919d5..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeCombinationModel.cs+++ /dev/null@@ -1,111 +0,0 @@-using Grand.Domain.Catalog;-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;-using Grand.Web.Common.Binders;-using Grand.Web.Common.Models;-using Microsoft.AspNetCore.Mvc;-using System.ComponentModel.DataAnnotations;--namespace Grand.Web.Vendor.Models.Catalog;--public class ProductAttributeCombinationModel : BaseModel-{- public string Id { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.StockQuantity")]- public int StockQuantity { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.ReservedQuantity")]- public int ReservedQuantity { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.AllowOutOfStockOrders")]- public bool AllowOutOfStockOrders { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Text")]- public string Text { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Sku")]- public string Sku { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Mpn")]- public string Mpn { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Gtin")]- public string Gtin { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.OverriddenPrice")]- [UIHint("DoubleNullable")]- public double? OverriddenPrice { get; set; }-- public string PrimaryStoreCurrencyCode { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.NotifyAdminForQuantityBelow")]- public int NotifyAdminForQuantityBelow { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Picture")]- public string PictureId { get; set; }-- public string PictureThumbnailUrl { get; set; }-- public IList<ProductModel.ProductPictureModel> ProductPictureModels { get; set; } =- new List<ProductModel.ProductPictureModel>();-- public IList<ProductAttributeModel> ProductAttributes { get; set; } = new List<ProductAttributeModel>();-- [ModelBinder(BinderType = typeof(CustomAttributesBinder))]- public IList<CustomAttributeModel> SelectedAttributes { get; set; }-- public IList<string> Warnings { get; set; } = new List<string>();-- public string ProductId { get; set; }- public string Attributes { get; set; }-- public bool UseMultipleWarehouses { get; set; }-- public IList<WarehouseInventoryModel> WarehouseInventoryModels { get; set; } = new List<WarehouseInventoryModel>();-- #region Nested classes-- public class ProductAttributeModel : BaseEntityModel- {- public string ProductAttributeId { get; set; }- public string Name { get; set; }- public string TextPrompt { get; set; }- public bool IsRequired { get; set; }- public AttributeControlType AttributeControlType { get; set; }- public IList<ProductAttributeValueModel> Values { get; set; } = new List<ProductAttributeValueModel>();- }-- public class ProductAttributeValueModel : BaseEntityModel- {- public string Name { get; set; }-- public bool IsPreSelected { get; set; }- }-- public class WarehouseInventoryModel : BaseEntityModel- {- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombination.WarehouseInventory.Fields.Warehouse")]- public string WarehouseId { get; set; }-- public string WarehouseName { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombination.WarehouseInventory.Fields.WarehouseUsed")]- public bool WarehouseUsed { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombination.WarehouseInventory.Fields.StockQuantity")]- public int StockQuantity { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombination.WarehouseInventory.Fields.ReservedQuantity")]- public int ReservedQuantity { get; set; }- }-- #endregion-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeConditionModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeConditionModel.csdeleted file mode 100644index 6437c3029..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeConditionModel.cs+++ /dev/null@@ -1,51 +0,0 @@-using Grand.Domain.Catalog;-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;-using Grand.Web.Common.Binders;-using Grand.Web.Common.Models;-using Microsoft.AspNetCore.Mvc;--namespace Grand.Web.Vendor.Models.Catalog;--public class ProductAttributeConditionModel : BaseModel, IProductValidVendor-{- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Condition.EnableCondition")]- public bool EnableCondition { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Condition.Attributes")]- public string SelectedProductAttributeId { get; set; }-- public IList<ProductAttributeModel> ProductAttributes { get; set; } = new List<ProductAttributeModel>();-- [ModelBinder(BinderType = typeof(CustomAttributesBinder))]- public IList<CustomAttributeModel> SelectedAttributes { get; set; }-- public string ProductAttributeMappingId { get; set; }- public string ProductId { get; set; }-- #region Nested classes-- public class ProductAttributeModel : BaseEntityModel- {- public string ProductAttributeId { get; set; }-- public string Name { get; set; }-- public string TextPrompt { get; set; }-- public bool IsRequired { get; set; }-- public AttributeControlType AttributeControlType { get; set; }-- public IList<ProductAttributeValueModel> Values { get; set; } = new List<ProductAttributeValueModel>();- }-- public class ProductAttributeValueModel : BaseEntityModel- {- public string Name { get; set; }-- public bool IsPreSelected { get; set; }- }-- #endregion-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeModel.csdeleted file mode 100644index 19ad1555b..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductAttributeModel.cs+++ /dev/null@@ -1,64 +0,0 @@-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;-using Grand.Infrastructure.Validators;-using Grand.Web.Common.Models;--namespace Grand.Web.Vendor.Models.Catalog;--public class ProductAttributeLocalizedModel : ILocalizedModelLocal-{- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.Fields.Name")]-- public string Name { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.Fields.Description")]- [SanitizeHtml]- public string Description { get; set; }-- public string LanguageId { get; set; }-}--public class PredefinedProductAttributeValueModel : BaseEntityModel,- ILocalizedModel<PredefinedProductAttributeValueLocalizedModel>-{- public string ProductAttributeId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.Name")]-- public string Name { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.PriceAdjustment")]- public double PriceAdjustment { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.PriceAdjustment")]- //used only on the values list page- public string PriceAdjustmentStr { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.WeightAdjustment")]- public double WeightAdjustment { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.WeightAdjustment")]- //used only on the values list page- public string WeightAdjustmentStr { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.Cost")]- public double Cost { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.IsPreSelected")]- public bool IsPreSelected { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- public IList<PredefinedProductAttributeValueLocalizedModel> Locales { get; set; } =- new List<PredefinedProductAttributeValueLocalizedModel>();-}--public class PredefinedProductAttributeValueLocalizedModel : ILocalizedModelLocal-{- [GrandResourceDisplayName("Vendor.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.Name")]-- public string Name { get; set; }-- public string LanguageId { get; set; }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductListModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductListModel.csdeleted file mode 100644index 68bece177..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductListModel.cs+++ /dev/null@@ -1,44 +0,0 @@-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;-using Microsoft.AspNetCore.Mvc.Rendering;-using System.ComponentModel.DataAnnotations;--namespace Grand.Web.Vendor.Models.Catalog;--public class ProductListModel : BaseModel-{- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchProductName")]- public string SearchProductName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchCategory")]- [UIHint("Category")]- public string SearchCategoryId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchIncludeSubCategories")]- public bool SearchIncludeSubCategories { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.Brand")]- [UIHint("Brand")]- public string SearchBrandId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchCollection")]- [UIHint("Collection")]- public string SearchCollectionId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchWarehouse")]- public string SearchWarehouseId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchProductType")]- public int SearchProductTypeId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchPublished")]- public int SearchPublishedId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.GoDirectlyToSku")]-- public string GoDirectlyToSku { get; set; }-- public IList<SelectListItem> AvailableWarehouses { get; set; } = new List<SelectListItem>();- public IList<SelectListItem> AvailableProductTypes { get; set; } = new List<SelectListItem>();- public IList<SelectListItem> AvailablePublishedOptions { get; set; } = new List<SelectListItem>();-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.csdeleted file mode 100644index 4f87d65ee..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs+++ /dev/null@@ -1,992 +0,0 @@-using Grand.Domain.Catalog;-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;-using Grand.Web.Common.Models;-using Grand.Infrastructure.Validators;-using Microsoft.AspNetCore.Mvc.Rendering;-using System.ComponentModel.DataAnnotations;--namespace Grand.Web.Vendor.Models.Catalog;--public class ProductModel : BaseEntityModel, ILocalizedModel<ProductLocalizedModel>-{- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ID")]- public override string Id { get; set; }-- //picture thumbnail- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.PictureThumbnailUrl")]- public string PictureThumbnailUrl { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ProductType")]- public int ProductTypeId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ProductType")]- public string ProductTypeName { get; set; }-- public bool AuctionEnded { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AssociatedToProductName")]- public string AssociatedToProductId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AssociatedToProductName")]- public string AssociatedToProductName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.VisibleIndividually")]- public bool VisibleIndividually { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ProductLayout")]- public string ProductLayoutId { get; set; }-- public IList<SelectListItem> AvailableProductLayouts { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Name")]- public string Name { get; set; }-- [SanitizeHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ShortDescription")]- public string ShortDescription { get; set; }-- [SanitizeHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.FullDescription")]- public string FullDescription { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Flag")]- public string Flag { get; set; }-- [NoHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AdminComment")]- public string AdminComment { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Brand")]- [UIHint("Brand")]- public string BrandId { get; set; }--- [NoHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaKeywords")]- public string MetaKeywords { get; set; }-- [NoHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaDescription")]- public string MetaDescription { get; set; }-- [NoHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaTitle")]- public string MetaTitle { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.SeName")]- public string SeName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AllowCustomerReviews")]- public bool AllowCustomerReviews { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Sku")]- public string Sku { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Mpn")]- public string Mpn { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.GTIN")]- public virtual string Gtin { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.IsGiftVoucher")]- public bool IsGiftVoucher { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.GiftVoucherType")]- public int GiftVoucherTypeId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.OverriddenGiftVoucherAmount")]- [UIHint("DoubleNullable")]- public double? OverGiftAmount { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.RequireOtherProducts")]- public bool RequireOtherProducts { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.RequiredProductIds")]- public string RequiredProductIds { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AutomaticallyAddRequiredProducts")]- public bool AutoAddRequiredProducts { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.IsRecurring")]- public bool IsRecurring { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.RecurringCycleLength")]- public int RecurringCycleLength { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.RecurringCyclePeriod")]- public int RecurringCyclePeriodId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.RecurringTotalCycles")]- public int RecurringTotalCycles { get; set; }-- //calendar- public GenerateCalendarModel CalendarModel { get; set; } = new();-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.IsShipEnabled")]- public bool IsShipEnabled { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.IsFreeShipping")]- public bool IsFreeShipping { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ShipSeparately")]- public bool ShipSeparately { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AdditionalShippingCharge")]- public double AdditionalShippingCharge { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DeliveryDate")]- public string DeliveryDateId { get; set; }-- public IList<SelectListItem> AvailableDeliveryDates { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.IsTaxExempt")]- public bool IsTaxExempt { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.TaxCategory")]- public string TaxCategoryId { get; set; }-- public IList<SelectListItem> AvailableTaxCategories { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.IsTelecommunicationsOrBroadcastingOrElectronicServices")]- public bool IsTele { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ManageInventoryMethod")]- public int ManageInventoryMethodId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.UseMultipleWarehouses")]- public bool UseMultipleWarehouses { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Warehouse")]- public string WarehouseId { get; set; }-- public IList<SelectListItem> AvailableWarehouses { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.StockQuantity")]- public int StockQuantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ReservedQuantity")]- public int ReservedQuantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.StockQuantity")]- public string StockQuantityStr { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisplayStockAvailability")]- public bool StockAvailability { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisplayStockQuantity")]- public bool DisplayStockQuantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MinStockQuantity")]- public int MinStockQuantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.LowStockActivity")]- public int LowStockActivityId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.NotifyAdminForQuantityBelow")]- public int NotifyAdminForQuantityBelow { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.BackorderMode")]- public int BackorderModeId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AllowOutOfStockSubscriptions")]- public bool AllowOutOfStockSubscriptions { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.OrderMinimumQuantity")]- public int OrderMinimumQuantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.OrderMaximumQuantity")]- public int OrderMaximumQuantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AllowedQuantities")]- public string AllowedQuantities { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.NotReturnable")]- public bool NotReturnable { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisableBuyButton")]- public bool DisableBuyButton { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisableWishlistButton")]- public bool DisableWishlistButton { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AvailableForPreOrder")]- public bool AvailableForPreOrder { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.PreOrderDateTime")]- [UIHint("DateTimeNullable")]- public DateTime? PreOrderDateTime { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.CallForPrice")]- public bool CallForPrice { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Price")]- public double Price { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.OldPrice")]- public double OldPrice { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.CatalogPrice")]- public double CatalogPrice { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.StartPrice")]- public double StartPrice { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ProductCost")]- public double ProductCost { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.EnteredPrice")]- public bool EnteredPrice { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MinEnteredPrice")]- public double MinEnteredPrice { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MaxEnteredPrice")]- public double MaxEnteredPrice { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.BasepriceEnabled")]- public bool BasepriceEnabled { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.BasepriceAmount")]- public double BasepriceAmount { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.BasepriceUnit")]- public string BasepriceUnitId { get; set; }-- public IList<SelectListItem> AvailableBasepriceUnits { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.BasepriceBaseAmount")]- public double BasepriceBaseAmount { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.BasepriceBaseUnit")]- public string BasepriceBaseUnitId { get; set; }-- public IList<SelectListItem> AvailableBasepriceBaseUnits { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MarkAsNew")]- public bool MarkAsNew { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MarkAsNewStartDateTime")]- [UIHint("DateTimeNullable")]- public DateTime? MarkAsNewStartDateTime { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MarkAsNewEndDateTime")]- [UIHint("DateTimeNullable")]- public DateTime? MarkAsNewEndDateTime { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Unit")]- public string UnitId { get; set; }-- public IList<SelectListItem> AvailableUnits { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Weight")]- public double Weight { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Length")]- public double Length { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Width")]- public double Width { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Height")]- public double Height { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AvailableStartDateTime")]- [UIHint("DateTimeNullable")]- public DateTime? AvailableStartDateTime { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AvailableEndDateTime")]- [UIHint("DateTimeNullable")]- public DateTime? AvailableEndDateTime { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisplayOrderCategory")]- public int DisplayOrderCategory { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisplayOrderBrand")]- public int DisplayOrderBrand { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisplayOrderCollection")]- public int DisplayOrderCollection { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.DisplayOrderOnSale")]- public int OnSale { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Published")]- public bool Published { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.CreatedOn")]- public DateTime? CreatedOn { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.UpdatedOn")]- public DateTime? UpdatedOn { get; set; }-- public long Ticks { get; set; }-- public string PrimaryStoreCurrencyCode { get; set; }- public string BaseDimensionIn { get; set; }- public string BaseWeightIn { get; set; }-- //product attributes- public IList<SelectListItem> AvailableProductAttributes { get; set; } = new List<SelectListItem>();-- //pictures- public ProductPictureModel AddPictureModel { get; set; } = new();- public IList<ProductPictureModel> ProductPictureModels { get; set; } = new List<ProductPictureModel>();-- //multiple warehouses- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductWarehouseInventory")]- public IList<ProductWarehouseInventoryModel> ProductWarehouseInventoryModels { get; set; } =- new List<ProductWarehouseInventoryModel>();-- //copy product- public CopyProductModel CopyProductModel { get; set; } = new();-- public IList<ProductLocalizedModel> Locales { get; set; } = new List<ProductLocalizedModel>();-- #region Nested classes-- public class AddProductModel : BaseModel- {- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchProductName")]-- public string SearchProductName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchCategory")]- [UIHint("Category")]- public string SearchCategoryId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.Brand")]- [UIHint("Brand")]- public string SearchBrandId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchCollection")]- [UIHint("Collection")]- public string SearchCollectionId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.List.SearchProductType")]- public int SearchProductTypeId { get; set; }-- public IList<SelectListItem> AvailableProductTypes { get; set; } = new List<SelectListItem>();- }--- public class AddRequiredProductModel : AddProductModel;-- public class AddProductSpecificationAttributeModel : BaseModel, IProductValidVendor- {- public string Id { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttribute")]- public string SpecificationAttributeId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.AttributeType")]- public SpecificationAttributeType AttributeTypeId { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttributeOption")]- public string SpecificationAttributeOptionId { get; set; }-- [NoHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.CustomName")]- public string CustomName { get; set; }-- [NoHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.CustomValue")]- public string CustomValue { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.AllowFiltering")]- public bool AllowFiltering { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.ShowOnProductPage")]- public bool ShowOnProductPage { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- public IList<SelectListItem> AvailableAttributes { get; set; } = new List<SelectListItem>();- public IList<SelectListItem> AvailableOptions { get; set; } = new List<SelectListItem>();-- public string ProductId { get; set; }- }-- public class ProductPictureModel : BaseEntityModel,- ILocalizedModel<ProductPictureModel.ProductPictureLocalizedModel>, IProductValidVendor- {- [UIHint("MultiPicture")]- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.Picture")]- public string PictureId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.Picture")]- public string PictureUrl { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- [GrandResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.IsDefault")]- public bool IsDefault { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.OverrideAltAttribute")]- public string AltAttribute { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.OverrideTitleAttribute")]- public string TitleAttribute { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.Style")]- public string Style { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.ExtraField")]- public string ExtraField { get; set; }-- public IList<ProductPictureLocalizedModel> Locales { get; set; } = new List<ProductPictureLocalizedModel>();- public string ProductId { get; set; }-- public class ProductPictureLocalizedModel : ILocalizedModelLocal- {- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.OverrideAltAttribute")]- public string AltAttribute { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.OverrideTitleAttribute")]- public string TitleAttribute { get; set; }-- public string LanguageId { get; set; }- }- }-- public class ProductCategoryModel : BaseEntityModel, IProductValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.Categories.Fields.Category")]- public string Category { get; set; }-- public string CategoryId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Categories.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- public string ProductId { get; set; }- }-- public class ProductCollectionModel : BaseEntityModel, IProductValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.Collections.Fields.Collection")]- public string Collection { get; set; }-- public string CollectionId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Collections.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- public string ProductId { get; set; }- }-- public class RelatedProductModel : BaseEntityModel, IProductRelatedValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.RelatedProducts.Fields.Product")]- public string Product2Name { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.RelatedProducts.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- public string ProductId1 { get; set; }- public string ProductId2 { get; set; }- }-- public class AddRelatedProductModel : AddProductModel, IProductValidVendor- {- public string[] SelectedProductIds { get; set; }- public string ProductId { get; set; }- }-- public class SimilarProductModel : BaseEntityModel, IProductRelatedValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.SimilarProducts.Fields.Product")]- public string Product2Name { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.SimilarProducts.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- public string ProductId1 { get; set; }- public string ProductId2 { get; set; }- }-- public class AddSimilarProductModel : AddProductModel, IProductValidVendor- {- public string[] SelectedProductIds { get; set; }- public string ProductId { get; set; }- }-- public class BundleProductModel : BaseEntityModel, IProductValidVendor- {- public string ProductBundleId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.BundleProducts.Fields.Product")]- public string ProductName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.BundleProducts.Fields.Quantity")]- public int Quantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.BundleProducts.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- public string ProductId { get; set; }- }-- public class AddBundleProductModel : AddProductModel, IProductValidVendor- {- public string[] SelectedProductIds { get; set; }- public string ProductId { get; set; }- }-- public class AssociatedProductModel : BaseEntityModel, IProductValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.AssociatedProducts.Fields.Product")]- public string ProductName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.AssociatedProducts.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- public string ProductId { get; set; }- }-- public class AddAssociatedProductModel : AddProductModel, IProductValidVendor- {- public string[] SelectedProductIds { get; set; }- public string ProductId { get; set; }- }-- public class CrossSellProductModel : BaseEntityModel, IProductValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.CrossSells.Fields.Product")]- public string Product2Name { get; set; }-- public string ProductId { get; set; }- }-- public class AddCrossSellProductModel : AddProductModel, IProductValidVendor- {- public string[] SelectedProductIds { get; set; }- public string ProductId { get; set; }- }-- public class RecommendedProductModel : BaseEntityModel, IProductValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.Recommended.Fields.Product")]- public string Product2Name { get; set; }-- public string ProductId { get; set; }- }-- public class AddRecommendedProductModel : AddProductModel, IProductValidVendor- {- public string[] SelectedProductIds { get; set; }- public string ProductId { get; set; }- }-- public class ProductPriceModel : BaseEntityModel- {- public string CurrencyCode { get; set; }-- public double Price { get; set; }- }-- public class TierPriceModel : BaseEntityModel, IProductValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.TierPrices.Fields.CurrencyCode")]- public string CurrencyCode { get; set; }-- public IList<SelectListItem> AvailableCurrencies { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.TierPrices.Fields.Quantity")]- public int Quantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.TierPrices.Fields.Price")]- public double Price { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.TierPrices.Fields.StartDateTime")]- [UIHint("DateTimeNullable")]- public DateTime? StartDateTime { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.TierPrices.Fields.EndDateTime")]- [UIHint("DateTimeNullable")]- public DateTime? EndDateTime { get; set; }-- public string ProductId { get; set; }- }-- public class TierPriceDeleteModel : BaseEntityModel, IProductValidVendor- {- public string ProductId { get; set; }- }-- public class ProductWarehouseInventoryModel : BaseModel- {- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductWarehouseInventory.Fields.Warehouse")]- public string WarehouseId { get; set; }-- public string WarehouseCode { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductWarehouseInventory.Fields.Warehouse")]- public string WarehouseName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductWarehouseInventory.Fields.WarehouseUsed")]- public bool WarehouseUsed { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductWarehouseInventory.Fields.StockQuantity")]- public int StockQuantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductWarehouseInventory.Fields.ReservedQuantity")]- public int ReservedQuantity { get; set; }- }-- public class ReservationModel : BaseEntityModel, IProductValidVendor- {- public string ReservationId { get; set; }- public DateTime Date { get; set; }- public string Resource { get; set; }- public string Parameter { get; set; }- public string OrderId { get; set; }- public string Duration { get; set; }- public string ProductId { get; set; }- }-- public class BidModel : BaseEntityModel, IProductValidVendor- {- public string BidId { get; set; }- public DateTime Date { get; set; }- public string CustomerId { get; set; }- public string Email { get; set; }- public string Amount { get; set; }- public string OrderId { get; set; }- public string ProductId { get; set; }- }-- public class GenerateCalendarModel : BaseModel, IProductValidVendor- {- public GenerateCalendarModel()- {- Interval = 1;- Quantity = 1;- }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.StartDate")]- [UIHint("DateNullable")]- public DateTime? StartDate { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.StartTime")]- [UIHint("Time")]- public DateTime StartTime { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.EndDate")]- [UIHint("DateNullable")]- public DateTime? EndDate { get; set; }-- [UIHint("Time")]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.EndTime")]- public DateTime EndTime { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Interval")]- public int Interval { get; set; } = 1;-- public int IntervalUnit { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.IncBothDate")]- public bool IncBothDate { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Quantity")]- public int Quantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Resource")]- public string Resource { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Parameter")]- public string Parameter { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Monday")]- public bool Monday { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Tuesday")]- public bool Tuesday { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Wednesday")]- public bool Wednesday { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Thursday")]- public bool Thursday { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Friday")]- public bool Friday { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Saturday")]- public bool Saturday { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Calendar.Sunday")]- public bool Sunday { get; set; }-- public string ProductId { get; set; }- }-- public class ProductAttributeMappingModel : BaseEntityModel, IProductValidVendor- {- public string ProductAttributeId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Fields.Attribute")]- public string ProductAttribute { get; set; }-- public IList<SelectListItem> AvailableProductAttribute { get; set; } = new List<SelectListItem>();-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Fields.TextPrompt")]- public string TextPrompt { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Fields.IsRequired")]- public bool IsRequired { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Fields.ShowOnCatalogPage")]- public bool ShowOnCatalogPage { get; set; }-- public AttributeControlType AttributeControlTypeId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Fields.AttributeControlType")]- public string AttributeControlType { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Fields.Combination")]- public bool Combination { get; set; }-- public bool ShouldHaveValues { get; set; }- public int TotalValues { get; set; }-- //validation fields- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.ValidationRules")]- public bool ValidationRulesAllowed { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.ValidationRules.MinLength")]- [UIHint("Int32Nullable")]- public int? ValidationMinLength { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.ValidationRules.MaxLength")]- [UIHint("Int32Nullable")]- public int? ValidationMaxLength { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.ValidationRules.FileAllowedExtensions")]-- public string ValidationFileAllowedExtensions { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.ValidationRules.FileMaximumSize")]- [UIHint("Int32Nullable")]- public int? ValidationFileMaximumSize { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.ValidationRules.DefaultValue")]-- public string DefaultValue { get; set; }-- public string ValidationRulesString { get; set; }-- //condition- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Condition")]- public bool ConditionAllowed { get; set; }-- public string ConditionString { get; set; }- public string ProductId { get; set; }- }-- public class ProductAttributeValueListModel : BaseModel, IProductValidVendor- {- public string ProductName { get; set; }-- public string ProductAttributeMappingId { get; set; }-- public string ProductAttributeName { get; set; }- public string ProductId { get; set; }- }-- public class ProductAttributeValueModel : BaseEntityModel, ILocalizedModel<ProductAttributeValueLocalizedModel>,- IProductValidVendor- {- public string ProductAttributeMappingId { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.AttributeValueType")]- public AttributeValueType AttributeValueTypeId { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.AttributeValueType")]- public string AttributeValueTypeName { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.AssociatedProduct")]- public string AssociatedProductId { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.AssociatedProduct")]- public string AssociatedProductName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Name")]-- public string Name { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.ColorSquaresRgb")]-- public string ColorSquaresRgb { get; set; }-- public bool DisplayColorSquaresRgb { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.ImageSquaresPicture")]- [UIHint("Picture")]- public string ImageSquaresPictureId { get; set; }-- public bool DisplayImageSquaresPicture { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.PriceAdjustment")]- public double PriceAdjustment { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.PriceAdjustment")]- //used only on the values list page- public string PriceAdjustmentStr { get; set; }-- public string PrimaryStoreCurrencyCode { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.WeightAdjustment")]- public double WeightAdjustment { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.WeightAdjustment")]- //used only on the values list page- public string WeightAdjustmentStr { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Cost")]- public double Cost { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Quantity")]- public int Quantity { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.IsPreSelected")]- public bool IsPreSelected { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.DisplayOrder")]- public int DisplayOrder { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Picture")]- public string PictureId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Picture")]- public string PictureThumbnailUrl { get; set; }-- public IList<ProductPictureModel> ProductPictureModels { get; set; } = new List<ProductPictureModel>();-- public IList<ProductAttributeValueLocalizedModel> Locales { get; set; } =- new List<ProductAttributeValueLocalizedModel>();-- public string ProductId { get; set; }-- #region Nested classes-- public class AssociateProductToAttributeValueModel : AddProductModel- {- public string AssociatedToProductId { get; set; }- }-- #endregion- }-- public class ProductAttributeValueLocalizedModel : ILocalizedModelLocal- {- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Name")]-- public string Name { get; set; }-- public string LanguageId { get; set; }- }-- public class ProductAttributeCombinationModel : BaseEntityModel, IProductValidVendor- {- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Attributes")]- public string Attributes { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.StockQuantity")]- public int StockQuantity { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.AllowOutOfStockOrders")]- public bool AllowOutOfStockOrders { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Sku")]- public string Sku { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Mpn")]- public string Mpn { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.Gtin")]- public string Gtin { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.OverriddenPrice")]- [UIHint("DoubleNullable")]- public double? OverriddenPrice { get; set; }-- [GrandResourceDisplayName(- "Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Fields.NotifyAdminForQuantityBelow")]- public int NotifyAdminForQuantityBelow { get; set; }-- public string ProductId { get; set; }- }-- public class ProductAttributeCombinationTierPricesModel : BaseEntityModel, IProductValidVendor- {- public string ProductAttributeCombinationId { get; set; }-- /// <summary>- /// Gets or sets the quantity- /// </summary>- public int Quantity { get; set; }-- /// <summary>- /// Gets or sets the price- /// </summary>- public double Price { get; set; }-- public string ProductId { get; set; }- }-- #endregion-}--public class ProductLocalizedModel : ILocalizedModelLocal, ISlugModelLocal-{- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Name")]-- public string Name { get; set; }-- [SanitizeHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ShortDescription")]- public string ShortDescription { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.FullDescription")]- [SanitizeHtml]- public string FullDescription { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaKeywords")]- [NoHtml]- public string MetaKeywords { get; set; }-- [NoHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaDescription")]- public string MetaDescription { get; set; }-- [NoHtml]- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaTitle")]- public string MetaTitle { get; set; }-- public string LanguageId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.Products.Fields.SeName")]- public string SeName { get; set; }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductReviewModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductReviewModel.csdeleted file mode 100644index 05ef05ad2..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductReviewModel.cs+++ /dev/null@@ -1,44 +0,0 @@-using Grand.Infrastructure.ModelBinding;-using Grand.Infrastructure.Models;--namespace Grand.Web.Vendor.Models.Catalog;--public class ProductReviewModel : BaseEntityModel-{- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.Product")]- public string ProductId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.Product")]- public string ProductName { get; set; }--- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.Store")]- public string StoreName { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.Customer")]- public string CustomerId { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.Customer")]- public string CustomerInfo { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.Title")]- public string Title { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.ReviewText")]- public string ReviewText { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.ReplyText")]- public string ReplyText { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.Signature")]- public string Signature { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.Rating")]- public int Rating { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.IsApproved")]- public bool IsApproved { get; set; }-- [GrandResourceDisplayName("Vendor.Catalog.ProductReviews.Fields.CreatedOn")]- public DateTime CreatedOn { get; set; }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductSpecificationAttributeModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductSpecificationAttributeModel.csdeleted file mode 100644index ea811af69..000000000--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductSpecificationAttributeModel.cs+++ /dev/null@@ -1,26 +0,0 @@-using Grand.Infrastructure.Models;--namespace Grand.Web.Vendor.Models.Catalog;--public class ProductSpecificationAttributeModel : BaseEntityModel, IProductValidVendor-{- public int AttributeTypeId { get; set; }-- public string AttributeTypeName { get; set; }-- public string AttributeName { get; set; }-- public string AttributeId { get; set; }-- public string ValueRaw { get; set; }-- public bool AllowFiltering { get; set; }-- public bool ShowOnProductPage { get; set; }-- public int DisplayOrder { get; set; }-- public string SpecificationAttributeOptionId { get; set; }-- public string ProductId { get; set; }-}\ No newline at end of file