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
Import data - further improvements
supportd0714763b0b7
diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/ProductDto.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/ProductDto.csindex 58fa54722..e884ebeaf 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/ProductDto.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/ProductDto.cs@@ -37,13 +37,11 @@ namespace Grand.Business.Catalog.Services.ExportImport.Dtopublic string RequiredProductIds { get; set; }public bool? AutoAddRequiredProducts { get; set; }public bool? IsDownload { get; set; }- public string DownloadId { get; set; }public bool? UnlimitedDownloads { get; set; }public int? MaxNumberOfDownloads { get; set; }public int? DownloadExpirationDays { get; set; }public DownloadActivationType? DownloadActivationTypeId { get; set; }public bool? HasSampleDownload { get; set; }- public string SampleDownloadId { get; set; }public bool? HasUserAgreement { get; set; }public string UserAgreementText { get; set; }public bool? IsRecurring { get; set; }diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/BrandProfile.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/BrandProfile.csindex 5fdf4ba3c..c7b912c98 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/BrandProfile.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/BrandProfile.cs@@ -9,17 +9,26 @@ namespace Grand.Business.Catalog.Services.ExportImport.Mapper{public BrandProfile(){- CreateMap<BrandDto, Brand>()- .ForMember(x => x.UpdatedOnUtc, opt => opt.MapFrom(o => DateTime.UtcNow))+ CreateMap<BrandDto, Brand>().ForMember(x => x.UpdatedOnUtc, opt => opt.MapFrom(o => DateTime.UtcNow)).ForMember(x => x.PageSize, opt => opt.Condition(z => z.PageSize.HasValue)).ForMember(x => x.AllowCustomersToSelectPageSize, opt => opt.Condition(z => z.AllowCustomersToSelectPageSize.HasValue)).ForMember(x => x.ShowOnHomePage, opt => opt.Condition(z => z.ShowOnHomePage.HasValue))- .ForMember(x => x.ShowOnHomePage, opt => opt.Condition(z => z.ShowOnHomePage.HasValue)).ForMember(x => x.IncludeInMenu, opt => opt.Condition(z => z.IncludeInMenu.HasValue)).ForMember(x => x.DefaultSort, opt => opt.Condition(z => z.DefaultSort.HasValue)).ForMember(x => x.Published, opt => opt.Condition(z => z.Published.HasValue))- .ForMember(x => x.DisplayOrder, opt => opt.Condition(z => z.DisplayOrder.HasValue));+ .ForMember(x => x.DisplayOrder, opt => opt.Condition(z => z.DisplayOrder.HasValue))+ .ForMember(x => x.Name, opt => opt.Condition(z => z.Name != null))+ .ForMember(x => x.BottomDescription, opt => opt.Condition(z => z.BottomDescription != null))+ .ForMember(x => x.BrandLayoutId, opt => opt.Condition(z => z.BrandLayoutId != null))+ .ForMember(x => x.Description, opt => opt.Condition(z => z.Description != null))+ .ForMember(x => x.ExternalId, opt => opt.Condition(z => z.ExternalId != null))+ .ForMember(x => x.Icon, opt => opt.Condition(z => z.Icon != null))+ .ForMember(x => x.MetaDescription, opt => opt.Condition(z => z.MetaDescription != null))+ .ForMember(x => x.MetaKeywords, opt => opt.Condition(z => z.MetaKeywords != null))+ .ForMember(x => x.MetaTitle, opt => opt.Condition(z => z.MetaTitle != null))+ .ForMember(x => x.PageSizeOptions, opt => opt.Condition(z => z.PageSizeOptions != null))+ .ForMember(x => x.SeName, opt => opt.Condition(z => z.SeName != null));}public int Order => 0;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CategoryProfile.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CategoryProfile.csindex 12671c3a2..27e7d1771 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CategoryProfile.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CategoryProfile.cs@@ -14,7 +14,6 @@ namespace Grand.Business.Catalog.Services.ExportImport.Mapper.ForMember(x => x.PageSize, opt => opt.Condition(z => z.PageSize.HasValue)).ForMember(x => x.AllowCustomersToSelectPageSize, opt => opt.Condition(z => z.AllowCustomersToSelectPageSize.HasValue)).ForMember(x => x.ShowOnHomePage, opt => opt.Condition(z => z.ShowOnHomePage.HasValue))- .ForMember(x => x.ShowOnHomePage, opt => opt.Condition(z => z.ShowOnHomePage.HasValue)).ForMember(x => x.IncludeInMenu, opt => opt.Condition(z => z.IncludeInMenu.HasValue)).ForMember(x => x.DefaultSort, opt => opt.Condition(z => z.DefaultSort.HasValue)).ForMember(x => x.FeaturedProductsOnHomePage, opt => opt.Condition(z => z.FeaturedProductsOnHomePage.HasValue))@@ -22,7 +21,21 @@ namespace Grand.Business.Catalog.Services.ExportImport.Mapper.ForMember(x => x.SearchBoxDisplayOrder, opt => opt.Condition(z => z.SearchBoxDisplayOrder.HasValue)).ForMember(x => x.HideOnCatalog, opt => opt.Condition(z => z.HideOnCatalog.HasValue)).ForMember(x => x.Published, opt => opt.Condition(z => z.Published.HasValue))- .ForMember(x => x.DisplayOrder, opt => opt.Condition(z => z.DisplayOrder.HasValue));+ .ForMember(x => x.DisplayOrder, opt => opt.Condition(z => z.DisplayOrder.HasValue))+ .ForMember(x => x.Name, opt => opt.Condition(z => z.Name != null))+ .ForMember(x => x.BottomDescription, opt => opt.Condition(z => z.BottomDescription != null))+ .ForMember(x => x.CategoryLayoutId, opt => opt.Condition(z => z.CategoryLayoutId != null))+ .ForMember(x => x.Description, opt => opt.Condition(z => z.Description != null))+ .ForMember(x => x.ExternalId, opt => opt.Condition(z => z.ExternalId != null))+ .ForMember(x => x.Flag, opt => opt.Condition(z => z.Flag != null))+ .ForMember(x => x.FlagStyle, opt => opt.Condition(z => z.FlagStyle != null))+ .ForMember(x => x.Icon, opt => opt.Condition(z => z.Icon != null))+ .ForMember(x => x.MetaDescription, opt => opt.Condition(z => z.MetaDescription != null))+ .ForMember(x => x.MetaKeywords, opt => opt.Condition(z => z.MetaKeywords != null))+ .ForMember(x => x.MetaTitle, opt => opt.Condition(z => z.MetaTitle != null))+ .ForMember(x => x.PageSizeOptions, opt => opt.Condition(z => z.PageSizeOptions != null))+ .ForMember(x => x.ParentCategoryId, opt => opt.Condition(z => z.ParentCategoryId != null))+ .ForMember(x => x.SeName, opt => opt.Condition(z => z.SeName != null));}public int Order => 0;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CollectionProfile.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CollectionProfile.csindex f04a88bfa..62714ad77 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CollectionProfile.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CollectionProfile.cs@@ -14,13 +14,23 @@ namespace Grand.Business.Catalog.Services.ExportImport.Mapper.ForMember(x => x.PageSize, opt => opt.Condition(z => z.PageSize.HasValue)).ForMember(x => x.AllowCustomersToSelectPageSize, opt => opt.Condition(z => z.AllowCustomersToSelectPageSize.HasValue)).ForMember(x => x.ShowOnHomePage, opt => opt.Condition(z => z.ShowOnHomePage.HasValue))- .ForMember(x => x.ShowOnHomePage, opt => opt.Condition(z => z.ShowOnHomePage.HasValue)).ForMember(x => x.IncludeInMenu, opt => opt.Condition(z => z.IncludeInMenu.HasValue)).ForMember(x => x.DefaultSort, opt => opt.Condition(z => z.DefaultSort.HasValue)).ForMember(x => x.Published, opt => opt.Condition(z => z.Published.HasValue))- .ForMember(x => x.DisplayOrder, opt => opt.Condition(z => z.DisplayOrder.HasValue));+ .ForMember(x => x.FeaturedProductsOnHomePage, opt => opt.Condition(z => z.FeaturedProductsOnHomePage.HasValue))+ .ForMember(x => x.DisplayOrder, opt => opt.Condition(z => z.DisplayOrder.HasValue))+ .ForMember(x => x.Name, opt => opt.Condition(z => z.Name != null))+ .ForMember(x => x.BottomDescription, opt => opt.Condition(z => z.BottomDescription != null))+ .ForMember(x => x.CollectionLayoutId, opt => opt.Condition(z => z.CollectionLayoutId != null))+ .ForMember(x => x.Description, opt => opt.Condition(z => z.Description != null))+ .ForMember(x => x.ExternalId, opt => opt.Condition(z => z.ExternalId != null))+ .ForMember(x => x.Icon, opt => opt.Condition(z => z.Icon != null))+ .ForMember(x => x.MetaDescription, opt => opt.Condition(z => z.MetaDescription != null))+ .ForMember(x => x.MetaKeywords, opt => opt.Condition(z => z.MetaKeywords != null))+ .ForMember(x => x.MetaTitle, opt => opt.Condition(z => z.MetaTitle != null))+ .ForMember(x => x.PageSizeOptions, opt => opt.Condition(z => z.PageSizeOptions != null))+ .ForMember(x => x.SeName, opt => opt.Condition(z => z.SeName != null));}-public int Order => 0;}}diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/ProductProfile.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/ProductProfile.csindex 8ca59a251..32274e4d9 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/ProductProfile.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/ProductProfile.cs@@ -90,8 +90,35 @@ namespace Grand.Business.Catalog.Services.ExportImport.Mapper.ForMember(x => x.Sold, opt => opt.Condition(z => z.Sold.HasValue)).ForMember(x => x.Viewed, opt => opt.Condition(z => z.Viewed.HasValue)).ForMember(x => x.OnSale, opt => opt.Condition(z => z.OnSale.HasValue))- .ForMember(x => x.Published, opt => opt.Condition(z => z.Published.HasValue));-+ .ForMember(x => x.Published, opt => opt.Condition(z => z.Published.HasValue))+ .ForMember(x => x.IsShipEnabled, opt => opt.Condition(z => z.IsShipEnabled.HasValue))+ .ForMember(x => x.Name, opt => opt.Condition(z => z.Name != null))+ .ForMember(x => x.ShortDescription, opt => opt.Condition(z => z.ShortDescription != null))+ .ForMember(x => x.FullDescription, opt => opt.Condition(z => z.FullDescription != null))+ .ForMember(x => x.ExternalId, opt => opt.Condition(z => z.ExternalId != null))+ .ForMember(x => x.MetaDescription, opt => opt.Condition(z => z.MetaDescription != null))+ .ForMember(x => x.MetaKeywords, opt => opt.Condition(z => z.MetaKeywords != null))+ .ForMember(x => x.MetaTitle, opt => opt.Condition(z => z.MetaTitle != null))+ .ForMember(x => x.SeName, opt => opt.Condition(z => z.SeName != null))+ .ForMember(x => x.BrandId, opt => opt.Condition(z => z.BrandId != null))+ .ForMember(x => x.ProductLayoutId, opt => opt.Condition(z => z.ProductLayoutId != null))+ .ForMember(x => x.AdminComment, opt => opt.Condition(z => z.AdminComment != null))+ .ForMember(x => x.VendorId, opt => opt.Condition(z => z.VendorId != null))+ .ForMember(x => x.Sku, opt => opt.Condition(z => z.Sku != null))+ .ForMember(x => x.Mpn, opt => opt.Condition(z => z.Mpn != null))+ .ForMember(x => x.Gtin, opt => opt.Condition(z => z.Gtin != null))+ .ForMember(x => x.AllowedQuantities, opt => opt.Condition(z => z.AllowedQuantities != null))+ .ForMember(x => x.BasepriceBaseUnitId, opt => opt.Condition(z => z.BasepriceBaseUnitId != null))+ .ForMember(x => x.BasepriceUnitId, opt => opt.Condition(z => z.BasepriceUnitId != null))+ .ForMember(x => x.CourseId, opt => opt.Condition(z => z.CourseId != null))+ .ForMember(x => x.DeliveryDateId, opt => opt.Condition(z => z.DeliveryDateId != null))+ .ForMember(x => x.TaxCategoryId, opt => opt.Condition(z => z.TaxCategoryId != null))+ .ForMember(x => x.WarehouseId, opt => opt.Condition(z => z.WarehouseId != null))+ .ForMember(x => x.UnitId, opt => opt.Condition(z => z.UnitId != null))+ .ForMember(x => x.Flag, opt => opt.Condition(z => z.Flag != null))+ .ForMember(x => x.RequiredProductIds, opt => opt.Condition(z => z.RequiredProductIds != null))+ .ForMember(x => x.ParentGroupedProductId, opt => opt.Condition(z => z.ParentGroupedProductId != null))+ .ForMember(x => x.UserAgreementText, opt => opt.Condition(z => z.UserAgreementText != null));}public int Order => 0;