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
Remove trailing comma
supportba1ddd40345f
diff --git a/src/API/Grand.Api/ApiExplorer/ApiResponseTypeProvider.cs b/src/API/Grand.Api/ApiExplorer/ApiResponseTypeProvider.csindex e43d79bdf..f457f2164 100644--- a/src/API/Grand.Api/ApiExplorer/ApiResponseTypeProvider.cs+++ b/src/API/Grand.Api/ApiExplorer/ApiResponseTypeProvider.cs@@ -87,7 +87,7 @@ public class ApiResponseTypeProvider{responseTypes.Add(new ApiResponseType {StatusCode = StatusCodes.Status200OK,- Type = type,+ Type = type});}@@ -144,7 +144,7 @@ public class ApiResponseTypeProvidervar apiResponseType = new ApiResponseType {Type = metadataAttribute.Type,StatusCode = statusCode,- IsDefaultResponse = metadataAttribute is IApiDefaultResponseMetadataProvider,+ IsDefaultResponse = metadataAttribute is IApiDefaultResponseMetadataProvider};if (apiResponseType.Type == typeof(void))@@ -247,7 +247,7 @@ public class ApiResponseTypeProvider{apiResponse.ApiResponseFormats.Add(new ApiResponseFormat {Formatter = (IOutputFormatter)responseTypeMetadataProvider,- MediaType = formatterSupportedContentType,+ MediaType = formatterSupportedContentType});}}@@ -258,7 +258,7 @@ public class ApiResponseTypeProvider{// No output formatter was found that supports this content type. Add the user specified content type as-is to the result.apiResponse.ApiResponseFormats.Add(new ApiResponseFormat {- MediaType = contentType,+ MediaType = contentType});}}diff --git a/src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.cs b/src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.csindex 2541ac53a..db95ec2a8 100644--- a/src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.cs+++ b/src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.cs@@ -102,7 +102,7 @@ public class MetadataApiDescriptionProvider : IApiDescriptionProviderActionDescriptor = action,GroupName = groupName,HttpMethod = httpMethod,- RelativePath = path,+ RelativePath = path};var templateParameters = parsedTemplate?.Parameters.ToList() ?? new List<TemplatePart>();@@ -146,7 +146,7 @@ public class MetadataApiDescriptionProvider : IApiDescriptionProviderforeach (var contentType in contentTypes){apiDescription.SupportedRequestFormats.Add(new ApiRequestFormat {- MediaType = contentType,+ MediaType = contentType});}}@@ -284,7 +284,7 @@ public class MetadataApiDescriptionProvider : IApiDescriptionProvidercontext.Results.Add(new ApiParameterDescription {Name = routeParameter.Key,RouteInfo = routeParameter.Value,- Source = BindingSource.Path,+ Source = BindingSource.Path});}}@@ -349,7 +349,7 @@ public class MetadataApiDescriptionProvider : IApiDescriptionProviderreturn new ApiParameterRouteInfo {Constraints = constraints,DefaultValue = routeParameter.DefaultValue,- IsOptional = routeParameter.IsOptional || routeParameter.DefaultValue != null,+ IsOptional = routeParameter.IsOptional || routeParameter.DefaultValue != null};}@@ -402,7 +402,7 @@ public class MetadataApiDescriptionProvider : IApiDescriptionProviderif (contentTypes.Count == 0){contentTypes = new MediaTypeCollection {- "application/json",+ "application/json"};}@@ -421,7 +421,7 @@ public class MetadataApiDescriptionProvider : IApiDescriptionProvider{results.Add(new ApiRequestFormat {Formatter = formatter,- MediaType = supportedType,+ MediaType = supportedType});}}diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.csindex ec18f37f3..f4b9716ca 100644--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs@@ -19,7 +19,7 @@ namespace Grand.Api.Commands.Handlers.Catalogvar productCategory = new ProductCategory{CategoryId = request.Model.CategoryId,- IsFeaturedProduct = request.Model.IsFeaturedProduct,+ IsFeaturedProduct = request.Model.IsFeaturedProduct};await _productcategoryService.InsertProductCategory(productCategory, request.Product.Id);diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.csindex fef4bf3b3..52bc6f351 100644--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs@@ -19,7 +19,7 @@ namespace Grand.Api.Commands.Handlers.Catalogvar productCollection = new ProductCollection{CollectionId = request.Model.CollectionId,- IsFeaturedProduct = request.Model.IsFeaturedProduct,+ IsFeaturedProduct = request.Model.IsFeaturedProduct};await _productcollectionService.InsertProductCollection(productCollection, request.Product.Id);diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.csindex febe4b361..ce48d061d 100644--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs@@ -31,7 +31,7 @@ namespace Grand.Api.Commands.Handlers.Catalogawait _productService.InsertProductPicture(new ProductPicture {PictureId = picture.Id,- DisplayOrder = request.Model.DisplayOrder,+ DisplayOrder = request.Model.DisplayOrder}, product.Id);return true;diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.csindex a7786552d..f489daf98 100644--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs@@ -32,7 +32,7 @@ namespace Grand.Api.Commands.Handlers.CatalogCustomValue = request.Model.CustomValue,AllowFiltering = request.Model.AllowFiltering,ShowOnProductPage = request.Model.ShowOnProductPage,- DisplayOrder = request.Model.DisplayOrder,+ DisplayOrder = request.Model.DisplayOrder};await _specificationAttributeService.InsertProductSpecificationAttribute(psa, request.Product.Id);diff --git a/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs b/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.csindex 38197b159..7e5ff8f66 100644--- a/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs+++ b/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs@@ -61,7 +61,7 @@ namespace Grand.Api.Infrastructure{throw new Exception(ex.Message);}- },+ }};});@@ -112,7 +112,7 @@ namespace Grand.Api.Infrastructure{throw new Exception(ex.Message);}- },+ }};});diff --git a/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs b/src/API/Grand.Api/Infrastructure/SwaggerStartup.csindex 5fd469c86..d274f1a88 100644--- a/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs+++ b/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs@@ -101,7 +101,7 @@ namespace Grand.Api.Infrastructurereturn new OpenApiContact {Name = "Grandnode",Email = "[email protected]",- Url = new Uri("https://grancnode.com"),+ Url = new Uri("https://grancnode.com")};}@@ -109,7 +109,7 @@ namespace Grand.Api.Infrastructure{return new OpenApiLicense {Name = "GNU General Public License v3.0",- Url = new Uri("https://github.com/grandnode/grandnode2/blob/main/LICENSE"),+ Url = new Uri("https://github.com/grandnode/grandnode2/blob/main/LICENSE")};}}diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.csindex 01fdfab22..9ff245240 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs@@ -249,7 +249,7 @@ namespace Grand.Business.Catalog.Services.ExportImportDomain.Common.Reference.Product, product.Id);var productPicture = new ProductPicture {PictureId = picture.Id,- DisplayOrder = 1,+ DisplayOrder = 1};await _productService.InsertProductPicture(productPicture, product.Id);}@@ -261,7 +261,7 @@ namespace Grand.Business.Catalog.Services.ExportImportvar picture = await _pictureService.InsertPicture(fileBinary, mimeType, _pictureService.GetPictureSeName(product.Name), "", "", false, Domain.Common.Reference.Product, product.Id);var productPicture = new ProductPicture {PictureId = picture.Id,- DisplayOrder = 1,+ DisplayOrder = 1};await _productService.InsertProductPicture(productPicture, product.Id);}diff --git a/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs b/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.csindex d3afcd3b8..4dc468bf9 100644--- a/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs@@ -196,7 +196,7 @@ namespace Grand.Business.Catalog.Services.PricesallowedDiscounts.Add(new ApplyDiscount {CouponCode = validDiscount.CouponCode,DiscountId = discount.Id,- IsCumulative = discount.IsCumulative,+ IsCumulative = discount.IsCumulative});}return allowedDiscounts;@@ -264,7 +264,7 @@ namespace Grand.Business.Catalog.Services.PricesallowedDiscounts.Add(new ApplyDiscount {CouponCode = validDiscount.CouponCode,DiscountId = discount.Id,- IsCumulative = discount.IsCumulative,+ IsCumulative = discount.IsCumulative});}return allowedDiscounts;diff --git a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.csindex 53f24fed4..09f78ba0d 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs@@ -146,7 +146,7 @@ namespace Grand.Business.Catalog.Services.ProductsCustomerId = customer.Id,ProductId = product.Id,StoreId = store.Id,- WarehouseId = warehouseId,+ WarehouseId = warehouseId});if (latest != null)diff --git a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.csindex 3c4b584c5..b33afdfec 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs@@ -159,7 +159,7 @@ namespace Grand.Business.Catalog.Services.Productsvar subscriptions = await _mediator.Send(new SendNotificationsToSubscribersCommand(){Product = product,- Warehouse = warehouse,+ Warehouse = warehouse});for (var i = 0; i <= subscriptions.Count - 1; i++)diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.csindex fa1a5d9ef..075897a07 100644--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs@@ -855,7 +855,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.OrdersProductId = product.Id,StoreId = order.StoreId,Win = true,- Bin = true,+ Bin = true});}if (product.ProductTypeId == ProductType.Auction && _orderSettings.UnpublishAuctionProduct)@@ -981,7 +981,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.OrdersRecurringCycleLength = details.RecurringCycleLength,RecurringCyclePeriodId = details.RecurringCyclePeriodId,RecurringTotalCycles = details.RecurringTotalCycles,- CreatedOnUtc = DateTime.UtcNow,+ CreatedOnUtc = DateTime.UtcNow};foreach (var item in details.Taxes)@@ -1083,7 +1083,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders$"Order placed by a store owner ('{originalCustomerIfImpersonated.Email}'. ID = {originalCustomerIfImpersonated.Id}) impersonating the customer.",DisplayToCustomer = false,CreatedOnUtc = DateTime.UtcNow,- OrderId = order.Id,+ OrderId = order.Id});}else@@ -1092,7 +1092,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.OrdersNote = "Order placed",DisplayToCustomer = false,CreatedOnUtc = DateTime.UtcNow,- OrderId = order.Id,+ OrderId = order.Id});}diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.csindex 6ac568cee..d081bea93 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs@@ -141,7 +141,7 @@ namespace Grand.Business.Checkout.Services.OrdersallowedDiscounts.Add(new ApplyDiscount {DiscountId = discount.Id,IsCumulative = discount.IsCumulative,- CouponCode = validDiscount.CouponCode,+ CouponCode = validDiscount.CouponCode});}}@@ -182,7 +182,7 @@ namespace Grand.Business.Checkout.Services.OrdersallowedDiscounts.Add(new ApplyDiscount {DiscountId = discount.Id,IsCumulative = discount.IsCumulative,- CouponCode = validDiscount.CouponCode,+ CouponCode = validDiscount.CouponCode});}}diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.csindex 8729b4087..eb34f966b 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs@@ -258,7 +258,7 @@ namespace Grand.Business.Checkout.Services.OrdersShoppingCartItem = shoppingCartItem,RentalStartDate = rentalStartDate,RentalEndDate = rentalEndDate,- ReservationId = reservationId,+ ReservationId = reservationId});//reset checkout infoawait _customerService.ResetCheckoutData(customer, storeId);diff --git a/src/Business/Grand.Business.Common/Services/ExportImport/ExcelImportProvider.cs b/src/Business/Grand.Business.Common/Services/ExportImport/ExcelImportProvider.csindex 097c588c6..76c7d09c1 100644--- a/src/Business/Grand.Business.Common/Services/ExportImport/ExcelImportProvider.cs+++ b/src/Business/Grand.Business.Common/Services/ExportImport/ExcelImportProvider.cs@@ -8,7 +8,7 @@ namespace Grand.Business.Common.Services.ExportImportpublic async Task<IEnumerable<T>> Convert<T>(Stream stream){var excel = new PowerExcelMapper {- SkipBlankCells = false,+ SkipBlankCells = false};return await excel.FetchAsync<T>(stream);diff --git a/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs b/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.csindex 91bb1ea45..a4ab6170a 100644--- a/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs+++ b/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs@@ -249,7 +249,7 @@ namespace Grand.Business.Common.Services.Logging.Select(g => new ActivityStats {ActivityLogTypeId = g.Key.ActivityLogTypeId,EntityKeyId = g.Key.EntityKeyId,- Count = g.Count(),+ Count = g.Count()});gquery = gquery.OrderByDescending(x => x.Count);@@ -463,7 +463,7 @@ namespace Grand.Business.Common.Services.Logging{"PublicStore.ViewCategory","EditCategory",- "AddNewCategory",+ "AddNewCategory"};return tokens;}@@ -473,7 +473,7 @@ namespace Grand.Business.Common.Services.Logging{"PublicStore.ViewProduct","EditProduct",- "AddNewProduct",+ "AddNewProduct"};return tokens;}@@ -517,7 +517,7 @@ namespace Grand.Business.Common.Services.Logging{"CreateKnowledgebaseArticle","UpdateKnowledgebaseArticle",- "DeleteKnowledgebaseArticle",+ "DeleteKnowledgebaseArticle"};return tokens;}diff --git a/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs b/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.csindex 2bae5b43e..0007f5347 100644--- a/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs+++ b/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs@@ -103,7 +103,7 @@ namespace Grand.Business.Common.Services.Pdfvar download = new Download {Filename = fileName,Extension = ".pdf",- ContentType = "application/pdf",+ ContentType = "application/pdf"};download.DownloadObjectId = await _storeFilesContext.BucketUploadFromBytes(download.Filename, ms.ToArray());diff --git a/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs b/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.csindex 6f8c8d6ef..4900fe6e8 100644--- a/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs+++ b/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs@@ -77,7 +77,7 @@ namespace Grand.Business.Common.Utilitiesreturn cell.CellType switch {CellType.String => string.IsNullOrWhiteSpace(cell.StringCellValue),CellType.Blank => true,- _ => false,+ _ => false};}@@ -307,7 +307,7 @@ namespace Grand.Business.Common.UtilitiesCellType.Error => cell.ErrorCellValue,CellType.String => cell.StringCellValue,CellType.Blank => string.Empty,- _ => "<unknown>",+ _ => "<unknown>"};}}diff --git a/src/Business/Grand.Business.Core/Enums/Checkout/PaymentMethodType.cs b/src/Business/Grand.Business.Core/Enums/Checkout/PaymentMethodType.csindex 8f335e2aa..c7e8c0a4e 100644--- a/src/Business/Grand.Business.Core/Enums/Checkout/PaymentMethodType.cs+++ b/src/Business/Grand.Business.Core/Enums/Checkout/PaymentMethodType.cs@@ -7,6 +7,6 @@ namespace Grand.Business.Core.Enums.Checkout{Standard = 1,Redirection = 2,- Other = 3,+ Other = 3}}diff --git a/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionConfiguration.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionConfiguration.csindex 56a895050..cc3fd27d1 100644--- a/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionConfiguration.cs+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionConfiguration.cs@@ -74,7 +74,7 @@ namespace Grand.Business.Core.Utilities.Common.SecurityActions = new List<string> {PermissionActionName.Weights_List, PermissionActionName.Weights_Add, PermissionActionName.Weights_Edit, PermissionActionName.Weights_Delete,PermissionActionName.Units_List, PermissionActionName.Units_Add, PermissionActionName.Units_Edit, PermissionActionName.Units_Delete,- PermissionActionName.Dimensions_List, PermissionActionName.Dimensions_Add, PermissionActionName.Dimensions_Edit, PermissionActionName.Dimensions_Delete,+ PermissionActionName.Dimensions_List, PermissionActionName.Dimensions_Add, PermissionActionName.Dimensions_Edit, PermissionActionName.Dimensions_Delete}};public static readonly Permission ManageActivityLog = new()diff --git a/src/Business/Grand.Business.Messages/Services/EmailSender.cs b/src/Business/Grand.Business.Messages/Services/EmailSender.csindex 8abf9bf6d..8b56c5dfd 100644--- a/src/Business/Grand.Business.Messages/Services/EmailSender.cs+++ b/src/Business/Grand.Business.Messages/Services/EmailSender.cs@@ -94,7 +94,7 @@ namespace Grand.Business.Messages.ServicesReadDate = File.GetLastAccessTime(attachmentFilePath)},ContentTransferEncoding = ContentEncoding.Base64,- FileName = Path.GetFileName(attachmentFilePath),+ FileName = Path.GetFileName(attachmentFilePath)};builder.Attachments.Add(attachment);}@@ -117,7 +117,7 @@ namespace Grand.Business.Messages.ServicesReadDate = DateTime.UtcNow},ContentTransferEncoding = ContentEncoding.Base64,- FileName = fileName,+ FileName = fileName};builder.Attachments.Add(attachment);}diff --git a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.csindex 0bd61955d..8eade3e1b 100644--- a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs+++ b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs@@ -90,7 +90,7 @@ namespace Grand.Business.Storage.Servicesvar s3Region = S3Region.FindValue(_config.AmazonRegion);var putBucketRequest = new PutBucketRequest {BucketName = _bucketName,- BucketRegion = s3Region,+ BucketRegion = s3Region};try@@ -203,7 +203,7 @@ namespace Grand.Business.Storage.ServicesBucketName = _bucketName,InputStream = stream,Key = thumbFileName,- StorageClass = S3StorageClass.Standard,+ StorageClass = S3StorageClass.Standard};_s3Client.PutObjectAsync(putObjectRequest).Wait();}diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.csindex 59dda0a1a..285bceb66 100644--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs@@ -567,7 +567,7 @@ namespace Grand.Business.Storage.ServicesTitleAttribute = titleAttribute,Reference = reference,ObjectId = objectId,- IsNew = isNew,+ IsNew = isNew};await _pictureRepository.InsertAsync(picture);diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.csindex 4139ac6aa..033e63817 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs@@ -21,7 +21,7 @@ namespace Grand.Business.System.Services.InstallationPhoneNumber = "123456789",StateProvinceId = country?.StateProvinces.FirstOrDefault(sp => sp.Name == "New York")?.Id,CountryId = country.Id,- CreatedOnUtc = DateTime.UtcNow,+ CreatedOnUtc = DateTime.UtcNow};var affilate = new Affiliate{diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.csindex 173fabcc1..413ab6bcf 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs@@ -18,7 +18,7 @@ namespace Grand.Business.System.Services.InstallationBodyOverview = "<p>There are many e-commerce solutions on the market. Is everyone open-source? No, and even if they say yes, it may turn out to be a lie. GrandNode is a true open-source based on .NET Core and MongoDB. No hidden license fees, no additional licensing conditions. Pure open-source and GPL-3 license.</p>",Body = "<p>There are many e-commerce solutions on the market. Is every open-source? No, and even if they say yes, it may turn out to be a lie. GrandNode is a true open-source platform based on .NET Core and MongoDB. No hidden license fees, no additional licensing conditions. Pure open-source and GPL-3 license.</p><p>An open-source platform shouldn't block your development. Forcing the leaving of information about the platform, paid licenses, obtaining paid license keys is an artificial invention that makes the platform paid and complicated.</p>",Tags = "e-commerce, blog, moey",- CreatedOnUtc = DateTime.UtcNow,+ CreatedOnUtc = DateTime.UtcNow},new BlogPost{@@ -27,8 +27,8 @@ namespace Grand.Business.System.Services.InstallationBodyOverview = "<p>GrandNode is one of a kind open-source e-commerce platform. Thanks to most advanced ASP.NET Core framework and out of the box set of features it makes a perfect fit for multiple e-business models.</p>",Body = "<p>Meet the flexible, the most versatile open-source e-commerce platform on the market. Use GrandNode and its ready-to-use integrations to sell everywhere with a single platform. GrandNode guarantees functionalities for now and for the future. We ensure both, the base needs of each e-commerce, and future features needed for expansion. GrandNode is one platform that suits various business models. It can successfully empower traditional B2C & B2B stores, helping local brands expand globally. Our solution supports booking processes, facilitates the management of the availability calendar and even enables the sale of online courses.</p>",Tags = "e-commerce, grandnode, sample tag, money",- CreatedOnUtc = DateTime.UtcNow.AddSeconds(1),- },+ CreatedOnUtc = DateTime.UtcNow.AddSeconds(1)+ }};await _blogPostRepository.InsertAsync(blogPosts);diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.csindex 82f2ed4f1..e68809fa0 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs@@ -14,7 +14,7 @@ namespace Grand.Business.System.Services.InstallationName = "Grid or Lines",ViewPath = "BrandLayout.GridOrLines",DisplayOrder = 1- },+ }};await _brandLayoutRepository.InsertAsync(brandLayouts);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.csindex 9e78c446e..6735a0549 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs@@ -303,7 +303,7 @@ namespace Grand.Business.System.Services.InstallationEntityName = "Category",LanguageId = "",IsActive = true,- Slug = category.SeName,+ Slug = category.SeName});await _categoryRepository.UpdateAsync(category);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.csindex b649fcf43..abeeadab0 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs@@ -14,7 +14,7 @@ namespace Grand.Business.System.Services.InstallationName = "Grid or Lines",ViewPath = "CategoryLayout.GridOrLines",DisplayOrder = 1- },+ }};await _categoryLayoutRepository.InsertAsync(categoryLayouts);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.csindex 406f0b55a..cc64eef1c 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs@@ -14,7 +14,7 @@ namespace Grand.Business.System.Services.InstallationIsRequired = true,ShippableProductRequired = true,AttributeControlTypeId = AttributeControlType.DropdownList,- DisplayOrder = 1,+ DisplayOrder = 1};await _checkoutAttributeRepository.InsertAsync(ca1);ca1.CheckoutAttributeValues.Add(new CheckoutAttributeValue@@ -23,7 +23,7 @@ namespace Grand.Business.System.Services.InstallationPriceAdjustment = 0,DisplayOrder = 1,IsPreSelected = true,- CheckoutAttributeId = ca1.Id,+ CheckoutAttributeId = ca1.Id});ca1.CheckoutAttributeValues.Add(new CheckoutAttributeValue@@ -31,7 +31,7 @@ namespace Grand.Business.System.Services.InstallationName = "Yes",PriceAdjustment = 10,DisplayOrder = 2,- CheckoutAttributeId = ca1.Id,+ CheckoutAttributeId = ca1.Id});await _checkoutAttributeRepository.UpdateAsync(ca1);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.csindex 62b58ead2..9105cd993 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs@@ -14,7 +14,7 @@ namespace Grand.Business.System.Services.InstallationName = "Grid or Lines",ViewPath = "CollectionLayout.GridOrLines",DisplayOrder = 1- },+ }};await _collectionLayoutRepository.InsertAsync(collectionLayouts);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.csindex 794228e51..da8841e91 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs@@ -17,7 +17,7 @@ namespace Grand.Business.System.Services.InstallationNumericIsoCode = 840,SubjectToVat = false,DisplayOrder = 1,- Published = true,+ Published = true};cUsa.StateProvinces.Add(new StateProvince@@ -25,434 +25,434 @@ namespace Grand.Business.System.Services.InstallationName = "AA (Armed Forces Americas)",Abbreviation = "AA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "AE (Armed Forces Europe)",Abbreviation = "AE",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Alabama",Abbreviation = "AL",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Alaska",Abbreviation = "AK",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "American Samoa",Abbreviation = "AS",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "AP (Armed Forces Pacific)",Abbreviation = "AP",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Arizona",Abbreviation = "AZ",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Arkansas",Abbreviation = "AR",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "California",Abbreviation = "CA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Colorado",Abbreviation = "CO",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Connecticut",Abbreviation = "CT",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Delaware",Abbreviation = "DE",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "District of Columbia",Abbreviation = "DC",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Federated States of Micronesia",Abbreviation = "FM",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Florida",Abbreviation = "FL",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Georgia",Abbreviation = "GA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Guam",Abbreviation = "GU",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Hawaii",Abbreviation = "HI",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Idaho",Abbreviation = "ID",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Illinois",Abbreviation = "IL",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Indiana",Abbreviation = "IN",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Iowa",Abbreviation = "IA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Kansas",Abbreviation = "KS",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Kentucky",Abbreviation = "KY",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Louisiana",Abbreviation = "LA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Maine",Abbreviation = "ME",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Marshall Islands",Abbreviation = "MH",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Maryland",Abbreviation = "MD",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Massachusetts",Abbreviation = "MA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Michigan",Abbreviation = "MI",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Minnesota",Abbreviation = "MN",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Mississippi",Abbreviation = "MS",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Missouri",Abbreviation = "MO",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Montana",Abbreviation = "MT",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Nebraska",Abbreviation = "NE",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Nevada",Abbreviation = "NV",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "New Hampshire",Abbreviation = "NH",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "New Jersey",Abbreviation = "NJ",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "New Mexico",Abbreviation = "NM",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "New York",Abbreviation = "NY",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "North Carolina",Abbreviation = "NC",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "North Dakota",Abbreviation = "ND",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Northern Mariana Islands",Abbreviation = "MP",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Ohio",Abbreviation = "OH",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Oklahoma",Abbreviation = "OK",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Oregon",Abbreviation = "OR",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Palau",Abbreviation = "PW",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Pennsylvania",Abbreviation = "PA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Puerto Rico",Abbreviation = "PR",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Rhode Island",Abbreviation = "RI",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "South Carolina",Abbreviation = "SC",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "South Dakota",Abbreviation = "SD",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Tennessee",Abbreviation = "TN",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Texas",Abbreviation = "TX",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Utah",Abbreviation = "UT",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Vermont",Abbreviation = "VT",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Virgin Islands",Abbreviation = "VI",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Virginia",Abbreviation = "VA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Washington",Abbreviation = "WA",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "West Virginia",Abbreviation = "WV",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Wisconsin",Abbreviation = "WI",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cUsa.StateProvinces.Add(new StateProvince{Name = "Wyoming",Abbreviation = "WY",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});await _countryRepository.InsertAsync(cUsa);@@ -468,98 +468,98 @@ namespace Grand.Business.System.Services.InstallationNumericIsoCode = 124,SubjectToVat = false,DisplayOrder = 100,- Published = true,+ Published = true};cCanada.StateProvinces.Add(new StateProvince{Name = "Alberta",Abbreviation = "AB",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "British Columbia",Abbreviation = "BC",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Manitoba",Abbreviation = "MB",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "New Brunswick",Abbreviation = "NB",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Newfoundland and Labrador",Abbreviation = "NL",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Northwest Territories",Abbreviation = "NT",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Nova Scotia",Abbreviation = "NS",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Nunavut",Abbreviation = "NU",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Ontario",Abbreviation = "ON",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Prince Edward Island",Abbreviation = "PE",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Quebec",Abbreviation = "QC",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Saskatchewan",Abbreviation = "SK",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});cCanada.StateProvinces.Add(new StateProvince{Name = "Yukon Territory",Abbreviation = "YT",Published = true,- DisplayOrder = 1,+ DisplayOrder = 1});await _countryRepository.InsertAsync(cCanada);@@ -572,7 +572,7 @@ namespace Grand.Business.System.Services.InstallationNumericIsoCode = 616,SubjectToVat = true,DisplayOrder = 100,- Published = true,+ Published = true};cPoland.StateProvinces.Add(new () {DisplayOrder = 0,@@ -3481,7 +3481,7 @@ namespace Grand.Business.System.Services.InstallationSubjectToVat = false,DisplayOrder = 100,Published = true- },+ }};await _countryRepository.InsertAsync(countries);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.csindex 1418da31e..48c98c6f6 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs@@ -22,7 +22,7 @@ namespace Grand.Business.System.Services.InstallationRoundingTypeId = RoundingType.Rounding001,MidpointRoundId = MidpointRounding.ToEven,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,+ UpdatedOnUtc = DateTime.UtcNow},new Currency{@@ -37,7 +37,7 @@ namespace Grand.Business.System.Services.InstallationRoundingTypeId = RoundingType.Rounding001,MidpointRoundId = MidpointRounding.AwayFromZero,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,+ UpdatedOnUtc = DateTime.UtcNow},new Currency{@@ -52,7 +52,7 @@ namespace Grand.Business.System.Services.InstallationRoundingTypeId = RoundingType.Rounding001,MidpointRoundId = MidpointRounding.AwayFromZero,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,+ UpdatedOnUtc = DateTime.UtcNow},new Currency{@@ -67,7 +67,7 @@ namespace Grand.Business.System.Services.InstallationRoundingTypeId = RoundingType.Rounding001,MidpointRoundId = MidpointRounding.ToEven,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,+ UpdatedOnUtc = DateTime.UtcNow},new Currency{@@ -82,7 +82,7 @@ namespace Grand.Business.System.Services.InstallationRoundingTypeId = RoundingType.Rounding001,MidpointRoundId = MidpointRounding.ToEven,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,+ UpdatedOnUtc = DateTime.UtcNow},new Currency{@@ -97,8 +97,8 @@ namespace Grand.Business.System.Services.InstallationRoundingTypeId = RoundingType.Rounding001,MidpointRoundId = MidpointRounding.AwayFromZero,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,- },+ UpdatedOnUtc = DateTime.UtcNow+ }};await _currencyRepository.InsertAsync(currencies);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.csindex 28f0c706e..93cdfdf3b 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs@@ -13,7 +13,7 @@ namespace Grand.Business.System.Services.InstallationName = "Administrators",Active = true,IsSystem = true,- SystemName = SystemCustomerGroupNames.Administrators,+ SystemName = SystemCustomerGroupNames.Administrators};await _customerGroupRepository.InsertAsync(crAdministrators);@@ -22,7 +22,7 @@ namespace Grand.Business.System.Services.InstallationName = "Registered",Active = true,IsSystem = true,- SystemName = SystemCustomerGroupNames.Registered,+ SystemName = SystemCustomerGroupNames.Registered};await _customerGroupRepository.InsertAsync(crRegistered);@@ -31,7 +31,7 @@ namespace Grand.Business.System.Services.InstallationName = "Guests",Active = true,IsSystem = true,- SystemName = SystemCustomerGroupNames.Guests,+ SystemName = SystemCustomerGroupNames.Guests};await _customerGroupRepository.InsertAsync(crGuests);@@ -40,7 +40,7 @@ namespace Grand.Business.System.Services.InstallationName = "Vendors",Active = true,IsSystem = true,- SystemName = SystemCustomerGroupNames.Vendors,+ SystemName = SystemCustomerGroupNames.Vendors};await _customerGroupRepository.InsertAsync(crVendors);@@ -49,7 +49,7 @@ namespace Grand.Business.System.Services.InstallationName = "Staff",Active = true,IsSystem = true,- SystemName = SystemCustomerGroupNames.Staff,+ SystemName = SystemCustomerGroupNames.Staff};await _customerGroupRepository.InsertAsync(crStaff);@@ -58,7 +58,7 @@ namespace Grand.Business.System.Services.InstallationName = "Sales manager",Active = true,IsSystem = true,- SystemName = SystemCustomerGroupNames.SalesManager,+ SystemName = SystemCustomerGroupNames.SalesManager};await _customerGroupRepository.InsertAsync(crSalesManager);@@ -74,7 +74,7 @@ namespace Grand.Business.System.Services.InstallationActive = true,CreatedOnUtc = DateTime.UtcNow,LastActivityDateUtc = DateTime.UtcNow,- PasswordChangeDateUtc = DateTime.UtcNow,+ PasswordChangeDateUtc = DateTime.UtcNow};var country = _countryRepository.Table.FirstOrDefault(c => c.ThreeLetterIsoCode == "USA");var defaultAdminUserAddress = new Address@@ -91,7 +91,7 @@ namespace Grand.Business.System.Services.InstallationStateProvinceId = country?.StateProvinces.FirstOrDefault(sp => sp.Name == "New York")?.Id,CountryId = country?.Id,ZipPostalCode = "10021",- CreatedOnUtc = DateTime.UtcNow,+ CreatedOnUtc = DateTime.UtcNow};adminUser.Addresses.Add(defaultAdminUserAddress);adminUser.BillingAddress = defaultAdminUserAddress;@@ -113,7 +113,7 @@ namespace Grand.Business.System.Services.InstallationIsSystemAccount = true,SystemName = SystemCustomerNames.Anonymous,CreatedOnUtc = DateTime.UtcNow,- LastActivityDateUtc = DateTime.UtcNow,+ LastActivityDateUtc = DateTime.UtcNow};anonymousUser.Groups.Add(crGuests.Id);await _customerRepository.InsertAsync(anonymousUser);@@ -129,7 +129,7 @@ namespace Grand.Business.System.Services.InstallationIsSystemAccount = true,SystemName = SystemCustomerNames.SearchEngine,CreatedOnUtc = DateTime.UtcNow,- LastActivityDateUtc = DateTime.UtcNow,+ LastActivityDateUtc = DateTime.UtcNow};searchEngineUser.Groups.Add(crGuests.Id);await _customerRepository.InsertAsync(searchEngineUser);@@ -146,7 +146,7 @@ namespace Grand.Business.System.Services.InstallationIsSystemAccount = true,SystemName = SystemCustomerNames.BackgroundTask,CreatedOnUtc = DateTime.UtcNow,- LastActivityDateUtc = DateTime.UtcNow,+ LastActivityDateUtc = DateTime.UtcNow};backgroundTaskUser.Groups.Add(crGuests.Id);await _customerRepository.InsertAsync(backgroundTaskUser);diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.csindex b552e4504..d49c83746 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs@@ -23,7 +23,7 @@ namespace Grand.Business.System.Services.Installation{Name = "1 week",DisplayOrder = 10- },+ }};await _deliveryDateRepository.InsertAsync(deliveryDates);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.csindex b3e6a0ef8..b5504e662 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs@@ -32,7 +32,7 @@ namespace Grand.Business.System.Services.InstallationRequiresCouponCode = true,IsEnabled = true,CurrencyCode = "USD"- },+ }};await _discountRepository.InsertAsync(discounts);var coupon1 = new DiscountCoupondiff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.csindex f444871d1..7b1347ffe 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs@@ -19,7 +19,7 @@ namespace Grand.Business.System.Services.InstallationPassword = "123",SecureSocketOptionsId = 1,UseServerCertificateValidation = true- },+ }};await _emailAccountRepository.InsertAsync(emailAccounts);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.csindex d3e5469b2..a2cfcfd84 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs@@ -14,21 +14,21 @@ namespace Grand.Business.System.Services.InstallationName = "centimetre(s)",SystemKeyword = "centimetres",Ratio = 1,- DisplayOrder = 1,+ DisplayOrder = 1},new MeasureDimension{Name = "inch(es)",SystemKeyword = "inches",Ratio = 0.393701,- DisplayOrder = 2,+ DisplayOrder = 2},new MeasureDimension{Name = "feet",SystemKeyword = "feet",Ratio = 0.0328084,- DisplayOrder = 3,+ DisplayOrder = 3}};@@ -41,28 +41,28 @@ namespace Grand.Business.System.Services.InstallationName = "ounce(s)",SystemKeyword = "ounce",Ratio = 16,- DisplayOrder = 1,+ DisplayOrder = 1},new MeasureWeight{Name = "lb(s)",SystemKeyword = "lb",Ratio = 1,- DisplayOrder = 2,+ DisplayOrder = 2},new MeasureWeight{Name = "kg(s)",SystemKeyword = "kg",Ratio = 0.45359237,- DisplayOrder = 3,+ DisplayOrder = 3},new MeasureWeight{Name = "gram(s)",SystemKeyword = "grams",Ratio = 453.59237,- DisplayOrder = 4,+ DisplayOrder = 4}};@@ -73,17 +73,17 @@ namespace Grand.Business.System.Services.Installationnew MeasureUnit{Name = "pcs.",- DisplayOrder = 1,+ DisplayOrder = 1},new MeasureUnit{Name = "pair",- DisplayOrder = 2,+ DisplayOrder = 2},new MeasureUnit{Name = "set",- DisplayOrder = 3,+ DisplayOrder = 3}};diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.csindex 1399175a9..44d135cdb 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs@@ -165,7 +165,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Auction ended.",Body = "<p>Hello, {{Customer.FullName}}!</p><p></p><p>At {{Auctions.EndTime}} you have won <a href=\"{{Store.URL}}{{Auctions.ProductSeName}}\">{{Auctions.ProductName}}</a> for {{Auctions.Price}}. Visit <a href=\"{{Store.URL}}/cart\">cart</a> to finish checkout process. </p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -173,7 +173,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Auction ended.",Body = "<p>Hello, {{Customer.FullName}}!</p><p></p><p>Unfortunately you did not win the bid {{Auctions.ProductName}}</p> <p>End price: {{Auctions.Price}} </p> <p>End date auction {{Auctions.EndTime}} </p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -181,7 +181,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Auction ended.",Body = "<p>Hello, {{Customer.FullName}}!</p><p></p><p>Unfortunately you did not win the bid {{Product.Name}}</p> <p>Product was bought by option Buy it now for price: {{Product.Price}} </p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -189,7 +189,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Auction ended.",Body = "<p>At {{Auctions.EndTime}} {{Customer.FullName}} have won <a href=\"{{Store.URL}}{{Auctions.ProductSeName}}\">{{Auctions.ProductName}}</a> for {{Auctions.Price}}.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -197,7 +197,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "Your auction to product {{Product.Name}} has expired.",Body = "Hello, <br> Your auction to product {{Product.Name}} has expired without bid.",IsActive = false,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -205,7 +205,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Your offer has been outbid.",Body = "<p>Hi {{Customer.FullName}}!</p><p>Your offer for product <a href=\"{{Store.URL}}{{Auctions.ProductSeName}}\">{{Auctions.ProductName}}</a> has been outbid. Your price was {{Auctions.Price}}.<br />\r\nRaise a price by raising one's offer. Auction will be ended on {{Auctions.EndTime}}</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -213,7 +213,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New blog comment.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nA new blog comment has been created for blog post \"{{BlogComment.BlogPostTitle}}\".</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -221,7 +221,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New article comment.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nA new article comment has been created for article \"{{Knowledgebase.ArticleCommentTitle}}\".</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -229,7 +229,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Back in stock notification",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Customer.FullName}}, <br />\r\nProduct <a target=\"_blank\" href=\"{{OutOfStockSubscription.ProductUrl}}\">{{OutOfStockSubscription.ProductName}}</a> is in stock.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -237,7 +237,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Customer has been deleted.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> ,<br />\r\n{{Customer.FullName}} ({{Customer.Email}}) has just deleted from your database. </p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -245,7 +245,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}} - Email Verification Code",Body = "Hello {{Customer.FullName}}, <br /><br />\r\n Enter this 6 digit code on the sign in page to confirm your identity:<br /><br /> \r\n <b>{{Customer.Token}}</b><br /><br />\r\n Yours securely, <br /> \r\n Team",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -253,7 +253,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Email validation",Body = "<a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n <br />\r\n To activate your account <a href=\"{{Customer.AccountActivationURL}}\">click here</a>. <br />\r\n <br />\r\n {{Store.Name}}",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -261,7 +261,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. You have received a new private message",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nYou have received a new private message.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -269,7 +269,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Password recovery",Body = "<a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n <br />\r\n To change your password <a href=\"{{Customer.PasswordRecoveryURL}}\">click here</a>. <br />\r\n <br />\r\n {{Store.Name}}",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -277,7 +277,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "Welcome to {{Store.Name}}",Body = "We welcome you to <a href=\"{{Store.URL}}\"> {{Store.Name}}</a>.<br />\r\n<br />\r\nYou can now take part in the various services we have to offer you. Some of these services include:<br />\r\n<br />\r\nPermanent Cart - Any products added to your online cart remain there until you remove them, or check them out.<br />\r\nAddress Book - We can now deliver your products to another address other than yours! This is perfect to send birthday gifts direct to the birthday-person themselves.<br />\r\nOrder History - View your history of purchases that you have made with us.<br />\r\nProducts Reviews - Share your opinions on products with our other customers.<br />\r\n<br />\r\nFor help with any of our online services, please email the store-owner: <a href=\"mailto:{{Store.Email}}\">{{Store.Email}}</a>.<br />\r\n<br />\r\nNote: This email address was provided on our registration page. If you own the email and did not register on our site, please send an email to <a href=\"mailto:{{Store.Email}}\">{{Store.Email}}</a>.",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -285,7 +285,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{GiftVoucher.SenderName}} has sent you a gift voucher for {{Store.Name}}",Body = "<p>You have received a gift voucher for {{Store.Name}}</p><p>Dear {{GiftVoucher.RecipientName}}, <br />\r\n<br />\r\n{{GiftVoucher.SenderName}} ({{GiftVoucher.SenderEmail}}) has sent you a {{GiftVoucher.Amount}} gift cart for <a href=\"{{Store.URL}}\"> {{Store.Name}}</a></p><p>You gift voucher code is {{GiftVoucher.CouponCode}}</p><p>{{GiftVoucher.Message}}</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -293,7 +293,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New customer registration",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nA new customer registered with your store. Below are the customer's details:<br />\r\nFull name: {{Customer.FullName}}<br />\r\nEmail: {{Customer.Email}}</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -301,7 +301,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New merchandise return.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Customer.FullName}}!<br />\r\n You have just submitted a new merchandise return. Details are below:<br />\r\nRequest ID: {{MerchandiseReturn.ReturnNumber}}<br />\r\nCustomer comments: {{MerchandiseReturn.CustomerComment}}<br />\r\n<br />\r\nPickup date: {{MerchandiseReturn.PickupDate}}<br />\r\n<br />\r\nPickup address:<br />\r\n{{MerchandiseReturn.PickupAddressFirstName}} {{MerchandiseReturn.PickupAddressLastName}}<br />\r\n{{MerchandiseReturn.PickupAddressAddress1}}<br />\r\n{{MerchandiseReturn.PickupAddressCity}} {{MerchandiseReturn.PickupAddressZipPostalCode}}<br />\r\n{{MerchandiseReturn.PickupAddressStateProvince}} {{MerchandiseReturn.PickupAddressCountry}}<br />\r\n</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -309,7 +309,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New merchandise return.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\n{{Customer.FullName}} has just submitted a new merchandise return. Details are below:<br />\r\nRequest ID: {{MerchandiseReturn.ReturnNumber}}<br />\r\nCustomer comments: {{MerchandiseReturn.CustomerComment}}<br />\r\n<br />\r\nPickup date: {{MerchandiseReturn.PickupDate}}<br />\r\n<br />\r\nPickup address:<br />\r\n{{MerchandiseReturn.PickupAddressFirstName}} {{MerchandiseReturn.PickupAddressLastName}}<br />\r\n{{MerchandiseReturn.PickupAddressAddress1}}<br />\r\n{{MerchandiseReturn.PickupAddressCity}} {{MerchandiseReturn.PickupAddressZipPostalCode}}<br />\r\n{{MerchandiseReturn.PickupAddressStateProvince}} {{MerchandiseReturn.PickupAddressCountry}}<br />\r\n</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -317,7 +317,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New news comment.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nA new news comment has been created for news \"{{NewsComment.NewsTitle}}\".</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -325,7 +325,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Subscription activation message.",Body = "<p><a href=\"{{NewsLetterSubscription.ActivationUrl}}\">Click here to confirm your subscription to our list.</a></p><p>If you received this email by mistake, simply delete it.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -333,7 +333,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Subscription deactivation message.",Body = "<p><a href=\"{{NewsLetterSubscription.DeactivationUrl}}\">Click here to unsubscribe from our newsletter.</a></p><p>If you received this email by mistake, simply delete it.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -341,7 +341,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Customer cancelled an order",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\n<br />\r\nCustomer cancelled an order. Below is the summary of the order. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nOrder Details: <a target=\"_blank\" href=\"{{Order.OrderURLForCustomer}}\">{{Order.OrderURLForCustomer}}</a><br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nBilling Address<br />\r\n{{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n{{Order.BillingAddress1}}<br />\r\n{{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n{{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nShipping Address<br />\r\n{{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n{{Order.ShippingAddress1}}<br />\r\n{{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n{{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n<br />\r\nShipping Method: {{Order.ShippingMethod}}<br />\r\n<br />\r\n" + OrderProducts + "</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -349,7 +349,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Your order cancelled",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Order.CustomerFullName}}, <br />\r\nYour order has been cancelled. Below is the summary of the order. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nOrder Details: <a target=\"_blank\" href=\"{{Order.OrderURLForCustomer}}\">{{Order.OrderURLForCustomer}}</a><br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nBilling Address<br />\r\n{{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n{{Order.BillingAddress1}}<br />\r\n{{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n{{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nShipping Address<br />\r\n{{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n{{Order.ShippingAddress1}}<br />\r\n{{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n{{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n<br />\r\nShipping Method: {{Order.ShippingMethod}}<br />\r\n<br />\r\n" + OrderProducts + "</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -357,7 +357,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Order #{{Order.OrderNumber}} cancelled",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br /><br />Order #{{Order.OrderNumber}} has been cancelled. <br /><br />Order Number: {{Order.OrderNumber}} <br /> Date Ordered: {{Order.CreatedOn}} <br /><br /> ",IsActive = false,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -365,7 +365,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Your order completed",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Order.CustomerFullName}}, <br />\r\nYour order has been completed. Below is the summary of the order. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nOrder Details: <a target=\"_blank\" href=\"{{Order.OrderURLForCustomer}}\">{{Order.OrderURLForCustomer}}</a><br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nBilling Address<br />\r\n{{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n{{Order.BillingAddress1}}<br />\r\n{{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n{{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nShipping Address<br />\r\n{{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n{{Order.ShippingAddress1}}<br />\r\n{{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n{{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n<br />\r\nShipping Method: {{Order.ShippingMethod}}<br />\r\n<br />\r\n" + OrderProducts + "</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -373,7 +373,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "Your order from {{Store.Name}} has been delivered.",Body = "<p><a href=\"{{Store.URL}}\"> {{Store.Name}}</a> <br />\r\n <br />\r\n Hello {{Order.CustomerFullName}}, <br />\r\n Good news! You order has been delivered. <br />\r\n Order Number: {{Order.OrderNumber}}<br />\r\n Order Details: <a href=\"{{Order.OrderURLForCustomer}}\" target=\"_blank\">{{Order.OrderURLForCustomer}}</a><br />\r\n Date Ordered: {{Order.CreatedOn}}<br />\r\n <br />\r\n <br />\r\n <br />\r\n Billing Address<br />\r\n {{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n {{Order.BillingAddress1}}<br />\r\n {{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n {{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n <br />\r\n <br />\r\n <br />\r\n Shipping Address<br />\r\n {{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n {{Order.ShippingAddress1}}<br />\r\n {{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n {{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n <br />\r\n Shipping Method: {{Order.ShippingMethod}} <br />\r\n <br />\r\n Delivered Products: <br />\r\n <br />\r\n" + ShipmentProducts + "</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -381,7 +381,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "Order receipt from {{Store.Name}}.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Order.CustomerFullName}}, <br />\r\nThanks for buying from <a href=\"{{Store.URL}}\">{{Store.Name}}</a>. Below is the summary of the order. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nOrder Details: <a target=\"_blank\" href=\"{{Order.OrderURLForCustomer}}\">{{Order.OrderURLForCustomer}}</a><br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nBilling Address<br />\r\n{{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n{{Order.BillingAddress1}}<br />\r\n{{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n{{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nShipping Address<br />\r\n{{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n{{Order.ShippingAddress1}}<br />\r\n{{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n{{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n<br />\r\nShipping Method: {{Order.ShippingMethod}}<br />\r\n<br />\r\n" + OrderProducts + "</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -389,7 +389,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Purchase Receipt for Order #{{Order.OrderNumber}}",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\n{{Order.CustomerFullName}} ({{Order.CustomerEmail}}) has just placed an order from your store. Below is the summary of the order. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nBilling Address<br />\r\n{{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n{{Order.BillingAddress1}}<br />\r\n{{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n{{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nShipping Address<br />\r\n{{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n{{Order.ShippingAddress1}}<br />\r\n{{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n{{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n<br />\r\nShipping Method: {{Order.ShippingMethod}}<br />\r\n<br />\r\n" + OrderProducts + "</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -397,7 +397,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "Your order from {{Store.Name}} has been shipped.",Body = "<p><a href=\"{{Store.URL}}\"> {{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Order.CustomerFullName}}!, <br />\r\nGood news! You order has been shipped. <br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nOrder Details: <a href=\"{{Order.OrderURLForCustomer}}\" target=\"_blank\">{{Order.OrderURLForCustomer}}</a><br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nBilling Address<br />\r\n{{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n{{Order.BillingAddress1}}<br />\r\n{{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n{{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nShipping Address<br />\r\n{{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n{{Order.ShippingAddress1}}<br />\r\n{{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n{{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n<br />\r\nShipping Method: {{Order.ShippingMethod}} <br />\r\n <br />\r\n Shipped Products: <br />\r\n <br />\r\n" + ShipmentProducts + "</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -405,7 +405,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New product review.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nA new product review has been written for product \"{{ProductReview.ProductName}}\".</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -413,7 +413,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Quantity below notification. {{Product.Name}}",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\n{{Product.Name}} (ID: {{Product.Id}}) low quantity. <br />\r\n<br />\r\nQuantity: {{Product.StockQuantity}}<br />\r\n</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -421,7 +421,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Quantity below notification. {{Product.Name}}",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\n{{Product.Name}} (ID: {{Product.Id}}) low quantity. <br />\r\n{{AttributeCombination.Formatted}}<br />\r\nQuantity: {{AttributeCombination.StockQuantity}}<br />\r\n</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -429,7 +429,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Merchandise return status was changed.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Customer.FullName}},<br />\r\nYour merchandise return #{{MerchandiseReturn.ReturnNumber}} status has been changed.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -437,7 +437,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Referred Item",Body = "<p><a href=\"{{Store.URL}}\"> {{Store.Name}}</a> <br />\r\n<br />\r\n{{EmailAFriend.Email}} was shopping on {{Store.Name}} and wanted to share the following item with you. <br />\r\n<br />\r\n<b><a target=\"_blank\" href=\"{{Product.ProductURLForCustomer}}\">{{Product.Name}}</a></b> <br />\r\n{{Product.ShortDescription}} <br />\r\n<br />\r\nFor more info click <a target=\"_blank\" href=\"{{Product.ProductURLForCustomer}}\">here</a> <br />\r\n<br />\r\n<br />\r\n{{EmailAFriend.PersonalMessage}}<br />\r\n<br />\r\n{{Store.Name}}</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -445,7 +445,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Question about a product",Body = "<p><a href=\"{{Store.URL}}\"> {{Store.Name}}</a> <br />\r\n<br />\r\n{{AskQuestion.Email}} wanted to ask question about a product {{Product.Name}}. <br />\r\n<br />\r\n<b><a target=\"_blank\" href=\"{{Product.ProductURLForCustomer}}\">{{Product.Name}}</a></b> <br />\r\n{{Product.ShortDescription}} <br />\r\n{{AskQuestion.Message}}<br />\r\n {{AskQuestion.Email}} <br />\r\n {{AskQuestion.FullName}} <br />\r\n {{AskQuestion.Phone}} <br />\r\n{{Store.Name}}</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -453,7 +453,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Contact us",Body = "<p>From {{ContactUs.SenderName}} - {{ContactUs.SenderEmail}}<br /><br />{{ContactUs.Body}}<br />{{ContactUs.AttributeDescription}}</p><br />",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -461,7 +461,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Contact us",Body = "<p>From {{ContactUs.SenderName}} - {{ContactUs.SenderEmail}}<br /><br />{{ContactUs.Body}}</p><br />",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate@@ -470,7 +470,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Wishlist",Body = "<p><a href=\"{{Store.URL}}\"> {{Store.Name}}</a> <br />\r\n<br />\r\n{{EmailAFriend.Email}} was shopping on {{Store.Name}} and wanted to share a wishlist with you <br />\r\n<br />\r\n<br />\r\nFor more info click <a target=\"_blank\" href=\"{{Customer.WishlistURLForCustomer}}\">here</a> <br />\r\n<br />\r\n<br />\r\n{{EmailAFriend.PersonalMessage}}<br />\r\n<br />\r\n{{Store.Name}}</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -478,7 +478,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New order note has been added",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Customer.FullName}}, <br />\r\nNew order note has been added to your account:<br />\r\n\"{{Order.NewNoteText}}\".<br />\r\n<a target=\"_blank\" href=\"{{Order.OrderURLForCustomer}}\">{{Order.OrderURLForCustomer}}</a></p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -486,7 +486,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "New customer note has been added",Body = "<p><br />\r\nHello {{Customer.FullName}}, <br />\r\nNew customer note has been added to your account:<br />\r\n\"{{Customer.NewTitleText}}\".<br />\r\n</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -494,7 +494,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New merchandise return note has been added",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Customer.FullName}},<br />\r\nYour merchandise return #{{MerchandiseReturn.ReturnNumber}} has a new note.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -503,7 +503,7 @@ namespace Grand.Business.System.Services.InstallationBody = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\n{{Customer.FullName}} ({{Customer.Email}}) has just placed an order. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n" + OrderVendorProducts + "</p>",//this template is disabled by defaultIsActive = false,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -512,7 +512,7 @@ namespace Grand.Business.System.Services.InstallationBody = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nOrder #{{Order.OrderNumber}} has been just paid<br />\r\nDate Ordered: {{Order.CreatedOn}}</p>",//this template is disabled by defaultIsActive = false,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -521,7 +521,7 @@ namespace Grand.Business.System.Services.InstallationBody = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Order.CustomerFullName}}, <br />\r\nThanks for buying from <a href=\"{{Store.URL}}\">{{Store.Name}}</a>. Order #{{Order.OrderNumber}} has been just paid. Below is the summary of the order. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nOrder Details: <a href=\"{{Order.OrderURLForCustomer}}\" target=\"_blank\">{{Order.OrderURLForCustomer}}</a><br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nBilling Address<br />\r\n{{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n{{Order.BillingAddress1}}<br />\r\n{{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n{{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nShipping Address<br />\r\n{{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n{{Order.ShippingAddress1}}<br />\r\n{{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n{{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n<br />\r\nShipping Method: {{Order.ShippingMethod}}<br />\r\n<br />\r\n" + OrderProducts + "</p>",//this template is disabled by defaultIsActive = false,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -530,7 +530,7 @@ namespace Grand.Business.System.Services.InstallationBody = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nOrder #{{Order.OrderNumber}} has been just paid. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n" + OrderVendorProducts + "</p>",//this template is disabled by defaultIsActive = false,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -539,8 +539,8 @@ namespace Grand.Business.System.Services.InstallationBody = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nHello {{Order.CustomerFullName}}, <br />\r\nThanks for buying from <a href=\"{{Store.URL}}\">{{Store.Name}}</a>. Order #{{Order.OrderNumber}} has been has been refunded. Please allow 7-14 days for the refund to be reflected in your account.<br />\r\n<br />\r\nAmount refunded: {{Order.AmountRefunded}}<br />\r\n<br />\r\nBelow is the summary of the order. <br />\r\n<br />\r\nOrder Number: {{Order.OrderNumber}}<br />\r\nOrder Details: <a href=\"{{Order.OrderURLForCustomer}}\" target=\"_blank\">{{Order.OrderURLForCustomer}}</a><br />\r\nDate Ordered: {{Order.CreatedOn}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nBilling Address<br />\r\n{{Order.BillingFirstName}} {{Order.BillingLastName}}<br />\r\n{{Order.BillingAddress1}}<br />\r\n{{Order.BillingCity}} {{Order.BillingZipPostalCode}}<br />\r\n{{Order.BillingStateProvince}} {{Order.BillingCountry}}<br />\r\n<br />\r\n<br />\r\n<br />\r\nShipping Address<br />\r\n{{Order.ShippingFirstName}} {{Order.ShippingLastName}}<br />\r\n{{Order.ShippingAddress1}}<br />\r\n{{Order.ShippingCity}} {{Order.ShippingZipPostalCode}}<br />\r\n{{Order.ShippingStateProvince}} {{Order.ShippingCountry}}<br />\r\n<br />\r\nShipping Method: {{Order.ShippingMethod}}<br />\r\n<br />\r\n" + OrderProducts + "</p>",//this template is disabled by defaultIsActive = false,- EmailAccountId = eaGeneral.Id,- },+ EmailAccountId = eaGeneral.Id+ },new MessageTemplate{Name = "OrderRefunded.StoreOwnerNotification",@@ -548,15 +548,15 @@ namespace Grand.Business.System.Services.InstallationBody = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nOrder #{{Order.OrderNumber}} has been just refunded<br />\r\n<br />\r\nAmount refunded: {{Order.AmountRefunded}}<br />\r\n<br />\r\nDate Ordered: {{Order.CreatedOn}}</p>",//this template is disabled by defaultIsActive = false,- EmailAccountId = eaGeneral.Id,- },+ EmailAccountId = eaGeneral.Id+ },new MessageTemplate{Name = "VendorAccountApply.StoreOwnerNotification",Subject = "{{Store.Name}}. New vendor account submitted.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\n{{Customer.FullName}} ({{Customer.Email}}) has just submitted for a vendor account. Details are below:<br />\r\nVendor name: {{Vendor.Name}}<br />\r\nVendor email: {{Vendor.Email}}<br />\r\n<br />\r\nYou can activate it in admin area.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -564,7 +564,7 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. New vendor review.",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\nA new vendor review has been written.</p>",IsActive = true,- EmailAccountId = eaGeneral.Id,+ EmailAccountId = eaGeneral.Id},new MessageTemplate{@@ -572,8 +572,8 @@ namespace Grand.Business.System.Services.InstallationSubject = "{{Store.Name}}. Vendor {{Vendor.Name}} changed provided information",Body = "<p><a href=\"{{Store.URL}}\">{{Store.Name}}</a> <br />\r\n<br />\r\n{{Vendor.Name}} changed provided information.</p>",IsActive = false,- EmailAccountId = eaGeneral.Id,- },+ EmailAccountId = eaGeneral.Id+ }};await _messageTemplateRepository.InsertAsync(messageTemplates);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.csindex 5788ef69b..6b5ccf9d7 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs@@ -19,7 +19,7 @@ namespace Grand.Business.System.Services.InstallationShort = "It's stable and highly usable. From downloads to documentation, www.grandnode.com offers a comprehensive base of information, resources, and support to the grandnode community.",Full = "<p>For full feature list go to <a href=\"https://grandnode.com\">grandnode.com</a></p><p>Providing outstanding custom search engine optimization, web development services and e-commerce development solutions to our clients at a fair price in a professional manner.</p>",Published = true,- CreatedOnUtc = DateTime.UtcNow,+ CreatedOnUtc = DateTime.UtcNow},new NewsItem{@@ -28,7 +28,7 @@ namespace Grand.Business.System.Services.InstallationShort = "grandnode includes everything you need to begin your e-commerce online store. We have thought of everything and it's all included! grandnode is a fully customizable shopping cart",Full = "<p>Grandnode includes everything you need to begin your e-commerce online store. We have thought of everything and it's all included!</p>",Published = true,- CreatedOnUtc = DateTime.UtcNow.AddSeconds(1),+ CreatedOnUtc = DateTime.UtcNow.AddSeconds(1)},new NewsItem{@@ -37,8 +37,8 @@ namespace Grand.Business.System.Services.InstallationShort = "The new grandnode store is open now! We are very excited to offer our new range of products. We will be constantly adding to our range so please register on our site.",Full = "<p>Our online store is officially up and running. Stock up for the holiday season! We have a great selection of items. We will be constantly adding to our range so please register on our site, this will enable you to keep up to date with any new products.</p><p>All shipping is worldwide and will leave the same day an order is placed! Happy Shopping and spread the word!!</p>",Published = true,- CreatedOnUtc = DateTime.UtcNow.AddSeconds(2),- },+ CreatedOnUtc = DateTime.UtcNow.AddSeconds(2)+ }};await _newsItemRepository.InsertAsync(news);diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.csindex 107cad069..920716d80 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs@@ -14,29 +14,29 @@ namespace Grand.Business.System.Services.InstallationIsSystem = true,StatusId = 10,Name = "Pending",- DisplayOrder = 0,+ DisplayOrder = 0},new OrderStatus{IsSystem = true,StatusId = 20,Name = "Processing",- DisplayOrder = 1,+ DisplayOrder = 1},new OrderStatus{IsSystem = true,StatusId = 30,Name = "Complete",- DisplayOrder = 2,+ DisplayOrder = 2},new OrderStatus{IsSystem = true,StatusId = 40,Name = "Cancelled",- DisplayOrder = 3,- },+ DisplayOrder = 3+ }};await _orderStatusRepository.InsertManyAsync(statuses);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.csindex 30c4ad2ed..27e60b5f5 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs@@ -14,7 +14,7 @@ namespace Grand.Business.System.Services.InstallationName = "Default layout",ViewPath = "PageDetails",DisplayOrder = 1- },+ }};await _pageLayoutRepository.InsertAsync(pageLayouts);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.csindex 36c459169..38891321a 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs@@ -161,7 +161,7 @@ namespace Grand.Business.System.Services.InstallationBody = "<p>Knowledgebase homepage. You can edit this in the admin site.</p>",PageLayoutId = defaultPageLayout.Id,Published = true- },+ }};await _pageRepository.InsertAsync(pages);diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.csindex ed7083465..f132e3926 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs@@ -16,13 +16,13 @@ namespace Grand.Business.System.Services.InstallationStateProvinceId = country?.StateProvinces.FirstOrDefault(sp => sp.Name == "New York")?.Id,CountryId = country?.Id,ZipPostalCode = "10021",- CreatedOnUtc = DateTime.UtcNow,+ CreatedOnUtc = DateTime.UtcNow};var point = new PickupPoint(){Address = addresspoint,- Name = "My Store - New York",+ Name = "My Store - New York"};await _pickupPointsRepository.InsertAsync(point);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.csindex 211f37f71..48b543508 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs@@ -48,7 +48,7 @@ namespace Grand.Business.System.Services.Installation{Name = "Software",SeName = "software"- },+ }};await _productAttributeRepository.InsertAsync(productAttributes);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.csindex bc19f03e2..24146e1df 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs@@ -20,7 +20,7 @@ namespace Grand.Business.System.Services.InstallationName = "Grouped product (with variants)",ViewPath = "ProductLayout.Grouped",DisplayOrder = 100- },+ }};await _productLayoutRepository.InsertAsync(productLayouts);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.csindex fa67a37f6..8ac4fda85 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs@@ -75,7 +75,7 @@ namespace Grand.Business.System.Services.InstallationEnabled = false,StopOnError = false,TimeInterval = 1440- },+ }};await _scheduleTaskRepository.InsertAsync(tasks);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.csindex 105bf325e..e3bc67186 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs@@ -48,7 +48,7 @@ namespace Grand.Business.System.Services.Installationawait _settingService.SaveSetting(new PdfSettings {LogoPictureId = "",InvoiceHeaderText = null,- InvoiceFooterText = null,+ InvoiceFooterText = null});await _settingService.SaveSetting(new CommonSettings {@@ -60,10 +60,10 @@ namespace Grand.Business.System.Services.InstallationSitemapIncludeProducts = false,Log404Errors = true,PopupForTermsOfServiceLinks = true,- AllowToSelectStore = false,+ AllowToSelectStore = false});await _settingService.SaveSetting(new SystemSettings {- DeleteGuestTaskOlderThanMinutes = 1440,+ DeleteGuestTaskOlderThanMinutes = 1440});await _settingService.SaveSetting(new SecuritySettings {AdminAreaAllowedIpAddresses = null@@ -89,7 +89,7 @@ namespace Grand.Business.System.Services.InstallationImageQuality = 100,DefaultPictureZoomEnabled = true,AllowedFileTypes = ".gif, .jpg, .jpeg, .png, .bmp, .webp",- StoreLocation = "/",+ StoreLocation = "/"});await _settingService.SaveSetting(new StorageSettings {@@ -161,14 +161,14 @@ namespace Grand.Business.System.Services.Installation"null","prn","aux"- },+ }});await _settingService.SaveSetting(new AdminAreaSettings {DefaultGridPageSize = 15,GridPageSizes = "10, 15, 20, 50, 100",UseIsoDateTimeConverterInJson = true,- HideStoreColumn = true,+ HideStoreColumn = true});await _settingService.SaveSetting(new CatalogSettings {@@ -249,7 +249,7 @@ namespace Grand.Business.System.Services.Installationawait _settingService.SaveSetting(new LanguageSettings {DefaultAdminLanguageId = _languageRepository.Table.Single(l => l.Name == "English").Id,AutomaticallyDetectLanguage = false,- IgnoreRtlPropertyForAdminArea = false,+ IgnoreRtlPropertyForAdminArea = false});await _settingService.SaveSetting(new CustomerSettings {@@ -303,7 +303,7 @@ namespace Grand.Business.System.Services.InstallationSaveVisitedPage = false,AllowUsersToDeleteAccount = false,AllowUsersToExportData = false,- TwoFactorAuthenticationEnabled = false,+ TwoFactorAuthenticationEnabled = false});await _settingService.SaveSetting(new AddressSettings {@@ -321,7 +321,7 @@ namespace Grand.Business.System.Services.InstallationPhoneEnabled = true,PhoneRequired = true,FaxEnabled = false,- NoteEnabled = false,+ NoteEnabled = false});await _settingService.SaveSetting(new StoreInformationSettings {@@ -336,7 +336,7 @@ namespace Grand.Business.System.Services.InstallationInstagramLink = "https://www.instagram.com/grandnode/",LinkedInLink = "https://www.linkedin.com/company/grandnode.com/",PinterestLink = "",- VoiceNavigation = false,+ VoiceNavigation = false});await _settingService.SaveSetting(new LoyaltyPointsSettings {@@ -348,7 +348,7 @@ namespace Grand.Business.System.Services.InstallationPointsForPurchases_Awarded = (int)OrderStatusSystem.Complete,ReduceLoyaltyPointsAfterCancelOrder = true,DisplayHowMuchWillBeEarned = true,- PointsAccumulatedForAllStores = true,+ PointsAccumulatedForAllStores = true});await _settingService.SaveSetting(new CurrencySettings {@@ -360,7 +360,7 @@ namespace Grand.Business.System.Services.Installationawait _settingService.SaveSetting(new MeasureSettings {BaseDimensionId = _measureDimensionRepository.Table.Single(m => m.SystemKeyword == "centimetres").Id,- BaseWeightId = _measureWeightRepository.Table.Single(m => m.SystemKeyword == "lb").Id,+ BaseWeightId = _measureWeightRepository.Table.Single(m => m.SystemKeyword == "lb").Id});await _settingService.SaveSetting(new ShoppingCartSettings {@@ -383,7 +383,7 @@ namespace Grand.Business.System.Services.InstallationRoundPrices = true,GroupTierPrices = false,AllowCartItemEditing = true,- AllowOnHoldCart = true,+ AllowOnHoldCart = true});await _settingService.SaveSetting(new OrderSettings {@@ -421,11 +421,11 @@ namespace Grand.Business.System.Services.InstallationEstimateShippingEnabled = false,DisplayShipmentEventsToCustomers = false,DisplayShipmentEventsToStoreOwner = false,- SkipShippingMethodSelectionIfOnlyOne = false,+ SkipShippingMethodSelectionIfOnlyOne = false});await _settingService.SaveSetting(new ShippingProviderSettings {- ActiveSystemNames = new List<string> { "Shipping.FixedRate" },+ ActiveSystemNames = new List<string> { "Shipping.FixedRate" }});await _settingService.SaveSetting(new PaymentSettings {@@ -433,12 +433,12 @@ namespace Grand.Business.System.Services.Installation{"Payments.CashOnDelivery","Payments.PayPalStandard",- "Payments.BrainTree",+ "Payments.BrainTree"},AllowRePostingPayments = true,SkipPaymentIfOnlyOne = true,ShowPaymentDescriptions = true,- SkipPaymentInfo = false,+ SkipPaymentInfo = false});await _settingService.SaveSetting(new TaxSettings {@@ -468,11 +468,11 @@ namespace Grand.Business.System.Services.Installation});await _settingService.SaveSetting(new TaxProviderSettings {- ActiveTaxProviderSystemName = "Tax.FixedRate",+ ActiveTaxProviderSystemName = "Tax.FixedRate"});await _settingService.SaveSetting(new DateTimeSettings {- DefaultStoreTimeZoneId = "",+ DefaultStoreTimeZoneId = ""});await _settingService.SaveSetting(new BlogSettings {@@ -522,7 +522,7 @@ namespace Grand.Business.System.Services.InstallationBrandSizeLimit = 100,CollectionSizeLimit = 100,VendorSizeLimit = 100,- CustomerGroupSizeLimit = 100,+ CustomerGroupSizeLimit = 100});await _settingService.SaveSetting(new NewsSettings {@@ -545,7 +545,7 @@ namespace Grand.Business.System.Services.InstallationNumberOfReview = 10,VendorReviewsMustBeApproved = true,VendorReviewPossibleOnlyAfterPurchasing = true,- NotifyVendorAboutNewVendorReviews = true,+ NotifyVendorAboutNewVendorReviews = true});var eaGeneral = _emailAccountRepository.Table.FirstOrDefault();@@ -556,7 +556,7 @@ namespace Grand.Business.System.Services.Installation});await _settingService.SaveSetting(new WidgetSettings {- ActiveWidgetSystemNames = new List<string> { "Widgets.Slider" },+ ActiveWidgetSystemNames = new List<string> { "Widgets.Slider" }});}}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.csindex 0d26656c6..0fc17c9cd 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs@@ -12,7 +12,7 @@ namespace Grand.Business.System.Services.Installation{Name = "Screensize",DisplayOrder = 1,- SeName = SeoExtensions.GenerateSlug("Screensize", false, false, false),+ SeName = SeoExtensions.GenerateSlug("Screensize", false, false, false)};await _specificationAttributeRepository.InsertAsync(sa1);@@ -20,31 +20,31 @@ namespace Grand.Business.System.Services.Installation{Name = "13.0''",DisplayOrder = 2,- SeName = SeoExtensions.GenerateSlug("13.0''", false, false, false),+ SeName = SeoExtensions.GenerateSlug("13.0''", false, false, false)});sa1.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "13.3''",DisplayOrder = 3,- SeName = SeoExtensions.GenerateSlug("13.3''", false, false, false),+ SeName = SeoExtensions.GenerateSlug("13.3''", false, false, false)});sa1.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "14.0''",DisplayOrder = 4,- SeName = SeoExtensions.GenerateSlug("14.0''", false, false, false),+ SeName = SeoExtensions.GenerateSlug("14.0''", false, false, false)});sa1.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "15.0''",DisplayOrder = 4,- SeName = SeoExtensions.GenerateSlug("15.0''", false, false, false),+ SeName = SeoExtensions.GenerateSlug("15.0''", false, false, false)});sa1.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "15.6''",DisplayOrder = 5,- SeName = SeoExtensions.GenerateSlug("15.6''", false, false, false),+ SeName = SeoExtensions.GenerateSlug("15.6''", false, false, false)});await _specificationAttributeRepository.UpdateAsync(sa1);@@ -52,7 +52,7 @@ namespace Grand.Business.System.Services.Installation{Name = "CPU Type",DisplayOrder = 2,- SeName = SeoExtensions.GenerateSlug("CPU Type", false, false, false),+ SeName = SeoExtensions.GenerateSlug("CPU Type", false, false, false)};await _specificationAttributeRepository.InsertAsync(sa2);@@ -60,14 +60,14 @@ namespace Grand.Business.System.Services.Installation{Name = "Intel Core i5",DisplayOrder = 1,- SeName = SeoExtensions.GenerateSlug("Intel Core i5", false, false, false),+ SeName = SeoExtensions.GenerateSlug("Intel Core i5", false, false, false)});sa2.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "Intel Core i7",DisplayOrder = 2,- SeName = SeoExtensions.GenerateSlug("Intel Core i7", false, false, false),+ SeName = SeoExtensions.GenerateSlug("Intel Core i7", false, false, false)});await _specificationAttributeRepository.UpdateAsync(sa2);@@ -75,7 +75,7 @@ namespace Grand.Business.System.Services.Installation{Name = "Memory",DisplayOrder = 3,- SeName = SeoExtensions.GenerateSlug("Memory", false, false, false),+ SeName = SeoExtensions.GenerateSlug("Memory", false, false, false)};await _specificationAttributeRepository.InsertAsync(sa3);@@ -83,19 +83,19 @@ namespace Grand.Business.System.Services.Installation{Name = "4 GB",DisplayOrder = 1,- SeName = SeoExtensions.GenerateSlug("4 GB", false, false, false),+ SeName = SeoExtensions.GenerateSlug("4 GB", false, false, false)});sa3.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "8 GB",DisplayOrder = 2,- SeName = SeoExtensions.GenerateSlug("8 GB", false, false, false),+ SeName = SeoExtensions.GenerateSlug("8 GB", false, false, false)});sa3.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "16 GB",DisplayOrder = 3,- SeName = SeoExtensions.GenerateSlug("16 GB", false, false, false),+ SeName = SeoExtensions.GenerateSlug("16 GB", false, false, false)});await _specificationAttributeRepository.UpdateAsync(sa3);@@ -103,7 +103,7 @@ namespace Grand.Business.System.Services.Installation{Name = "Hardrive",DisplayOrder = 5,- SeName = SeoExtensions.GenerateSlug("Hardrive", false, false, false),+ SeName = SeoExtensions.GenerateSlug("Hardrive", false, false, false)};await _specificationAttributeRepository.InsertAsync(sa4);@@ -111,19 +111,19 @@ namespace Grand.Business.System.Services.Installation{Name = "128 GB",DisplayOrder = 7,- SeName = SeoExtensions.GenerateSlug("128 GB", false, false, false),+ SeName = SeoExtensions.GenerateSlug("128 GB", false, false, false)});sa4.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "500 GB",DisplayOrder = 4,- SeName = SeoExtensions.GenerateSlug("500 GB", false, false, false),+ SeName = SeoExtensions.GenerateSlug("500 GB", false, false, false)});sa4.SpecificationAttributeOptions.Add(new SpecificationAttributeOption{Name = "1 TB",DisplayOrder = 3,- SeName = SeoExtensions.GenerateSlug("1 TB", false, false, false),+ SeName = SeoExtensions.GenerateSlug("1 TB", false, false, false)});await _specificationAttributeRepository.UpdateAsync(sa4);}diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.csindex 2da8a4847..413d50279 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs@@ -12,28 +12,28 @@ namespace Grand.Business.System.Services.Installationnew TaxCategory{Name = "Lego",- DisplayOrder = 1,+ DisplayOrder = 1},new TaxCategory{Name = "Electronics & Software",- DisplayOrder = 5,+ DisplayOrder = 5},new TaxCategory{Name = "Downloadable Products",- DisplayOrder = 10,+ DisplayOrder = 10},new TaxCategory{Name = "Balls",- DisplayOrder = 15,+ DisplayOrder = 15},new TaxCategory{Name = "Apparel",- DisplayOrder = 20,- },+ DisplayOrder = 20+ }};await _taxCategoryRepository.InsertAsync(taxCategories);diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.csindex 5dd5190a7..9a226133c 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs@@ -22,7 +22,7 @@ namespace Grand.Business.System.Services.InstallationDisplayOrder = 1,PageSize = 6,AllowCustomersToSelectPageSize = true,- PageSizeOptions = "6, 3, 9, 18",+ PageSizeOptions = "6, 3, 9, 18"},new Vendor{@@ -35,7 +35,7 @@ namespace Grand.Business.System.Services.InstallationDisplayOrder = 2,PageSize = 6,AllowCustomersToSelectPageSize = true,- PageSizeOptions = "6, 3, 9, 18",+ PageSizeOptions = "6, 3, 9, 18"}};diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.csindex 2400f60ac..45bfe8872 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs@@ -16,7 +16,7 @@ namespace Grand.Business.System.Services.InstallationStateProvinceId = country?.StateProvinces.FirstOrDefault(sp => sp.Name == "New York")?.Id,CountryId = country?.Id,ZipPostalCode = "10021",- CreatedOnUtc = DateTime.UtcNow,+ CreatedOnUtc = DateTime.UtcNow};var warehouse2address = new Address@@ -26,7 +26,7 @@ namespace Grand.Business.System.Services.InstallationStateProvinceId = country?.StateProvinces.FirstOrDefault(sp => sp.Name == "California").Id,CountryId = country.Id,ZipPostalCode = "90013",- CreatedOnUtc = DateTime.UtcNow,+ CreatedOnUtc = DateTime.UtcNow};var warehouses = new List<Warehouse>@@ -36,14 +36,14 @@ namespace Grand.Business.System.Services.InstallationCode = "WHS01",Name = "Warehouse 1",Address = warehouse1address,- DisplayOrder = 0,+ DisplayOrder = 0},new Warehouse{Code = "WHS02",Name = "Warehouse 2",Address = warehouse2address,- DisplayOrder = 1,+ DisplayOrder = 1}};diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.csindex ac8acb676..8d04d56e8 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs@@ -110,7 +110,7 @@ namespace Grand.Business.System.Services.InstallationCode = languageCode,Name = languageName,IsDefault = isDefault,- IsRightToLeft = isRightToLeft,+ IsRightToLeft = isRightToLeft};//load resources@@ -174,7 +174,7 @@ namespace Grand.Business.System.Services.Installation_availableCollation.Add(new InstallationCollation() {Name = resourceName,- Value = resourceValue,+ Value = resourceValue});}diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.csindex e704e0c5e..906a8c80f 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs@@ -37,7 +37,7 @@ namespace Grand.Business.System.Services.Migrations._1._1Name = "Manage System",SystemName = PermissionSystemName.System,Area = "Admin area",- Category = "System",+ Category = "System"};permission.CustomerGroups.Add(groupService.GetCustomerGroupBySystemName(SystemCustomerGroupNames.Administrators).GetAwaiter().GetResult().Id);diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs b/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.csindex 90fbd365a..c63c610dd 100644--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs@@ -45,7 +45,7 @@ namespace Grand.Business.System.Services.Migrations{var model = new MigrationResult {Success = migration.UpgradeProcess(_databaseContext, _serviceProvider),- Migration = migration,+ Migration = migration};return model;}diff --git a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.csindex 80aaed815..18d639cf0 100644--- a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs+++ b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs@@ -177,13 +177,13 @@ namespace Grand.Business.System.Services.Reports.Select(g => new CustomerStats {Year = g.Key.Year,Month = g.Key.Month,- Count = g.Count(),+ Count = g.Count()}).ToList();foreach (var item in query){report.Add(new CustomerByTimeReportLine() {Time = item.Year + "-" + item.Month.ToString().PadLeft(2, '0'),- Registered = item.Count,+ Registered = item.Count});}}@@ -195,13 +195,13 @@ namespace Grand.Business.System.Services.ReportsYear = g.Key.Year,Month = g.Key.Month,Day = g.Key.Day,- Count = g.Count(),+ Count = g.Count()}).ToList();foreach (var item in query){report.Add(new CustomerByTimeReportLine() {Time = item.Year + "-" + item.Month.ToString().PadLeft(2, '0') + "-" + item.Day.ToString().PadLeft(2, '0'),- Registered = item.Count,+ Registered = item.Count});}}diff --git a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.csindex 3dd27fdb8..9330f9891 100644--- a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs+++ b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs@@ -141,7 +141,7 @@ namespace Grand.Business.System.Services.Reportsreport.Add(new OrderByTimeReportLine() {Time = item.Year.ToString().PadLeft(2, '0') + "-" + item.Month.ToString().PadLeft(2, '0'),SumOrders = Math.Round(item.Amount, 2),- TotalOrders = item.Count,+ TotalOrders = item.Count});}}@@ -162,7 +162,7 @@ namespace Grand.Business.System.Services.Reportsreport.Add(new OrderByTimeReportLine() {Time = item.Year.ToString().PadLeft(2, '0') + "-" + item.Month.ToString().PadLeft(2, '0') + "-" + item.Day.ToString().PadLeft(2, '0'),SumOrders = Math.Round(item.Amount, 2),- TotalOrders = item.Count,+ TotalOrders = item.Count});}}@@ -267,7 +267,7 @@ namespace Grand.Business.System.Services.ReportsCountOrders = 0,SumShippingExclTax = 0,SumTax = 0,- SumOrders = 0,+ SumOrders = 0};return await Task.FromResult(item2);}@@ -463,7 +463,7 @@ namespace Grand.Business.System.Services.Reportsselect new{ProductId = g.Key,- ProductsPurchased = g.Sum(x => x.Quantity),+ ProductsPurchased = g.Sum(x => x.Quantity)};product = product.OrderByDescending(x => x.ProductsPurchased);if (recordsToReturn > 0)diff --git a/src/Core/Grand.Domain/Catalog/AttributeControlType.cs b/src/Core/Grand.Domain/Catalog/AttributeControlType.csindex 315a4b5d5..0f1ee2ed4 100644--- a/src/Core/Grand.Domain/Catalog/AttributeControlType.cs+++ b/src/Core/Grand.Domain/Catalog/AttributeControlType.cs@@ -48,6 +48,6 @@ namespace Grand.Domain.Catalog/// <summary>/// Read-only checkboxes/// </summary>- ReadonlyCheckboxes = 50,+ ReadonlyCheckboxes = 50}}\ No newline at end of filediff --git a/src/Core/Grand.Domain/Catalog/AttributeValueType.cs b/src/Core/Grand.Domain/Catalog/AttributeValueType.csindex 523a887fd..ef205147a 100644--- a/src/Core/Grand.Domain/Catalog/AttributeValueType.cs+++ b/src/Core/Grand.Domain/Catalog/AttributeValueType.cs@@ -12,6 +12,6 @@ namespace Grand.Domain.Catalog/// <summary>/// Associated to a product (used when configuring bundled products)/// </summary>- AssociatedToProduct = 10,+ AssociatedToProduct = 10}}diff --git a/src/Core/Grand.Domain/Catalog/DownloadActivationType.cs b/src/Core/Grand.Domain/Catalog/DownloadActivationType.csindex 1b57ceba3..202a318bb 100644--- a/src/Core/Grand.Domain/Catalog/DownloadActivationType.cs+++ b/src/Core/Grand.Domain/Catalog/DownloadActivationType.cs@@ -12,6 +12,6 @@ namespace Grand.Domain.Catalog/// <summary>/// Manually/// </summary>- Manually = 10,+ Manually = 10}}diff --git a/src/Core/Grand.Domain/Catalog/GiftVoucherType.cs b/src/Core/Grand.Domain/Catalog/GiftVoucherType.csindex 32ac10215..de6ce0a59 100644--- a/src/Core/Grand.Domain/Catalog/GiftVoucherType.cs+++ b/src/Core/Grand.Domain/Catalog/GiftVoucherType.cs@@ -12,6 +12,6 @@ namespace Grand.Domain.Catalog/// <summary>/// Physical/// </summary>- Physical = 1,+ Physical = 1}}diff --git a/src/Core/Grand.Domain/Catalog/LowStockActivity.cs b/src/Core/Grand.Domain/Catalog/LowStockActivity.csindex 9b9c39ab7..1f24b1f8d 100644--- a/src/Core/Grand.Domain/Catalog/LowStockActivity.cs+++ b/src/Core/Grand.Domain/Catalog/LowStockActivity.cs@@ -16,6 +16,6 @@ namespace Grand.Domain.Catalog/// <summary>/// Unpublish/// </summary>- Unpublish = 2,+ Unpublish = 2}}diff --git a/src/Core/Grand.Domain/Catalog/ManageInventoryMethod.cs b/src/Core/Grand.Domain/Catalog/ManageInventoryMethod.csindex 0e63033f7..b33571509 100644--- a/src/Core/Grand.Domain/Catalog/ManageInventoryMethod.cs+++ b/src/Core/Grand.Domain/Catalog/ManageInventoryMethod.cs@@ -20,6 +20,6 @@ namespace Grand.Domain.Catalog/// <summary>/// Track inventory for product by bundle products/// </summary>- ManageStockByBundleProducts = 3,+ ManageStockByBundleProducts = 3}}diff --git a/src/Core/Grand.Domain/Catalog/RecurringCyclePeriod.cs b/src/Core/Grand.Domain/Catalog/RecurringCyclePeriod.csindex 675fa761d..bcef08548 100644--- a/src/Core/Grand.Domain/Catalog/RecurringCyclePeriod.cs+++ b/src/Core/Grand.Domain/Catalog/RecurringCyclePeriod.cs@@ -20,6 +20,6 @@ namespace Grand.Domain.Catalog/// <summary>/// Years/// </summary>- Years = 30,+ Years = 30}}diff --git a/src/Core/Grand.Domain/Customers/TwoFactorAuthenticationType.cs b/src/Core/Grand.Domain/Customers/TwoFactorAuthenticationType.csindex 6cb8ccf05..4bed2b797 100644--- a/src/Core/Grand.Domain/Customers/TwoFactorAuthenticationType.cs+++ b/src/Core/Grand.Domain/Customers/TwoFactorAuthenticationType.cs@@ -13,6 +13,6 @@/// <summary>/// SMS verification/// </summary>- SMSVerification = 2,+ SMSVerification = 2}}diff --git a/src/Core/Grand.Domain/Customers/UserRegistrationType.cs b/src/Core/Grand.Domain/Customers/UserRegistrationType.csindex 078481b59..e0dc2c186 100644--- a/src/Core/Grand.Domain/Customers/UserRegistrationType.cs+++ b/src/Core/Grand.Domain/Customers/UserRegistrationType.cs@@ -20,6 +20,6 @@ namespace Grand.Domain.Customers/// <summary>/// Registration is disabled/// </summary>- Disabled = 4,+ Disabled = 4}}diff --git a/src/Core/Grand.Domain/Discounts/DiscountLimitationType.cs b/src/Core/Grand.Domain/Discounts/DiscountLimitationType.csindex d8cc09ccf..103e1bcb9 100644--- a/src/Core/Grand.Domain/Discounts/DiscountLimitationType.cs+++ b/src/Core/Grand.Domain/Discounts/DiscountLimitationType.cs@@ -16,6 +16,6 @@ namespace Grand.Domain.Discounts/// <summary>/// N Times Per user/// </summary>- NTimesPerUser = 2,+ NTimesPerUser = 2}}diff --git a/src/Core/Grand.Domain/Discounts/DiscountType.cs b/src/Core/Grand.Domain/Discounts/DiscountType.csindex 379a47ea6..5dcf2e723 100644--- a/src/Core/Grand.Domain/Discounts/DiscountType.cs+++ b/src/Core/Grand.Domain/Discounts/DiscountType.cs@@ -40,6 +40,6 @@ namespace Grand.Domain.Discounts/// <summary>/// Assigned to all product/// </summary>- AssignedToAllProducts = 30,+ AssignedToAllProducts = 30}}diff --git a/src/Core/Grand.Domain/Payments/PaymentStatus.cs b/src/Core/Grand.Domain/Payments/PaymentStatus.csindex 6abe38101..27d75bb99 100644--- a/src/Core/Grand.Domain/Payments/PaymentStatus.cs+++ b/src/Core/Grand.Domain/Payments/PaymentStatus.cs@@ -36,6 +36,6 @@ namespace Grand.Domain.Payments/// <summary>/// Voided/// </summary>- Voided = 50,+ Voided = 50}}diff --git a/src/Core/Grand.Domain/Payments/TransactionStatus.cs b/src/Core/Grand.Domain/Payments/TransactionStatus.csindex 9463a8b16..9c87182a9 100644--- a/src/Core/Grand.Domain/Payments/TransactionStatus.cs+++ b/src/Core/Grand.Domain/Payments/TransactionStatus.cs@@ -33,6 +33,6 @@/// <summary>/// Canceled/// </summary>- Canceled = 50,+ Canceled = 50}}diff --git a/src/Core/Grand.Domain/Shipping/ShippingStatus.cs b/src/Core/Grand.Domain/Shipping/ShippingStatus.csindex 226b3568c..84307b910 100644--- a/src/Core/Grand.Domain/Shipping/ShippingStatus.cs+++ b/src/Core/Grand.Domain/Shipping/ShippingStatus.cs@@ -28,6 +28,6 @@ namespace Grand.Domain.Shipping/// <summary>/// Delivered/// </summary>- Delivered = 40,+ Delivered = 40}}diff --git a/src/Core/Grand.Domain/Tax/TaxBasedOn.cs b/src/Core/Grand.Domain/Tax/TaxBasedOn.csindex cdca9a510..ea0185659 100644--- a/src/Core/Grand.Domain/Tax/TaxBasedOn.cs+++ b/src/Core/Grand.Domain/Tax/TaxBasedOn.cs@@ -16,6 +16,6 @@ namespace Grand.Domain.Tax/// <summary>/// Default address/// </summary>- DefaultAddress = 3,+ DefaultAddress = 3}}diff --git a/src/Core/Grand.Domain/Tax/TaxDisplayType.cs b/src/Core/Grand.Domain/Tax/TaxDisplayType.csindex 882b8f2a9..9ab5e1d2a 100644--- a/src/Core/Grand.Domain/Tax/TaxDisplayType.cs+++ b/src/Core/Grand.Domain/Tax/TaxDisplayType.cs@@ -12,6 +12,6 @@ namespace Grand.Domain.Tax/// <summary>/// Excluding tax/// </summary>- ExcludingTax = 10,+ ExcludingTax = 10}}diff --git a/src/Core/Grand.Domain/Vendors/VendorSettings.cs b/src/Core/Grand.Domain/Vendors/VendorSettings.csindex 6393017de..e0278161f 100644--- a/src/Core/Grand.Domain/Vendors/VendorSettings.cs+++ b/src/Core/Grand.Domain/Vendors/VendorSettings.cs@@ -199,7 +199,7 @@ namespace Grand.Domain.VendorsStreetAddressEnabled = StreetAddressEnabled,StreetAddressRequired = StreetAddressRequired,ZipPostalCodeEnabled = ZipPostalCodeEnabled,- ZipPostalCodeRequired = ZipPostalCodeRequired,+ ZipPostalCodeRequired = ZipPostalCodeRequired};#endregiondiff --git a/src/Plugins/Widgets.Slider/Extensions.cs b/src/Plugins/Widgets.Slider/Extensions.csindex 6a8a77f0d..c4fa0fc75 100644--- a/src/Plugins/Widgets.Slider/Extensions.cs+++ b/src/Plugins/Widgets.Slider/Extensions.cs@@ -63,7 +63,7 @@ namespace Widgets.Slider{LanguageId = item.LanguageId,LocaleKey = prop.Name,- LocaleValue = prop.GetValue(item)?.ToString(),+ LocaleValue = prop.GetValue(item)?.ToString()});}}diff --git a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.csindex a22430330..d55c4c5d6 100644--- a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs+++ b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs@@ -67,7 +67,7 @@ namespace Widgets.SliderName = "Sample slider 2",FullWidth = true,Published = true,- Description = "<div class=\"row slideRow\"><div class=\"col-md-6 offset-md-6 col-12 offset-0 d-flex flex-column justify-content-center align-items-start px-0 pr-md-3\"><div class=\"slide-title text-dark animate__animated animate__fadeInRight animate__delay-05s\"><h2 class=\"mt-0\">Redmi Note 9</h2></div><div class=\"slide-content animate__animated animate__fadeInRight animate__delay-1s\"><p class=\"mb-0\"><span>Equipped with a high-performance octa-core processor <br/> with a maximum clock frequency of 2.0 GHz.</span></p></div><div class=\"slide-price animate__animated animate__fadeInRight animate__delay-15s d-inline-flex align-items-center justify-content-start w-100 mt-2\"><p class=\"actual\">$249.00</p><p class=\"old-price\">$399.00</p></div><div class=\"slide-button animate__animated animate__fadeInRight animate__delay-2s mt-3\"><a class=\"btn btn-outline-info\" href=\"/redmi-note-9\">BUY REDMI NOTE 9</a></div></div></div>",+ Description = "<div class=\"row slideRow\"><div class=\"col-md-6 offset-md-6 col-12 offset-0 d-flex flex-column justify-content-center align-items-start px-0 pr-md-3\"><div class=\"slide-title text-dark animate__animated animate__fadeInRight animate__delay-05s\"><h2 class=\"mt-0\">Redmi Note 9</h2></div><div class=\"slide-content animate__animated animate__fadeInRight animate__delay-1s\"><p class=\"mb-0\"><span>Equipped with a high-performance octa-core processor <br/> with a maximum clock frequency of 2.0 GHz.</span></p></div><div class=\"slide-price animate__animated animate__fadeInRight animate__delay-15s d-inline-flex align-items-center justify-content-start w-100 mt-2\"><p class=\"actual\">$249.00</p><p class=\"old-price\">$399.00</p></div><div class=\"slide-button animate__animated animate__fadeInRight animate__delay-2s mt-3\"><a class=\"btn btn-outline-info\" href=\"/redmi-note-9\">BUY REDMI NOTE 9</a></div></div></div>"};var pic2 = await _pictureService.InsertPicture(byte2, "image/png", "banner_2", reference: Grand.Domain.Common.Reference.Widget, objectId: pictureSlider2.Id, validateBinary: false);pictureSlider2.PictureId = pic2.Id;diff --git a/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs b/src/Plugins/Widgets.Slider/SliderWidgetProvider.csindex 9d66345c9..2e23b1926 100644--- a/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs+++ b/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs@@ -37,7 +37,7 @@ namespace Widgets.SliderSliderWidgetDefaults.WidgetZoneHomePage,SliderWidgetDefaults.WidgetZoneCategoryPage,SliderWidgetDefaults.WidgetZoneCollectionPage,- SliderWidgetDefaults.WidgetZoneBrandPage,+ SliderWidgetDefaults.WidgetZoneBrandPage});}diff --git a/src/Tests/Grand.Business.Authentication.Tests/Services/ApiAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Services/ApiAuthenticationServiceTests.csindex 33b382939..aa312d205 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Services/ApiAuthenticationServiceTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Services/ApiAuthenticationServiceTests.cs@@ -57,7 +57,7 @@ namespace Grand.Business.Authentication.Tests.Servicesvar context = new TokenValidatedContext(httpContext.Object, new AuthenticationScheme("", "", typeof(AuthSchemaMock)), new JwtBearerOptions());IList<Claim> claims = new List<Claim>{- new Claim("Email", "[email protected]"),+ new Claim("Email", "[email protected]")};context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, ""));var result = await _jwtBearerAuthenticationService.Valid(context);diff --git a/src/Tests/Grand.Business.Authentication.Tests/Services/JwtBearerCustomerAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Services/JwtBearerCustomerAuthenticationServiceTests.csindex 9aea15f15..f26c857ea 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Services/JwtBearerCustomerAuthenticationServiceTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Services/JwtBearerCustomerAuthenticationServiceTests.cs@@ -46,7 +46,7 @@ namespace Grand.Business.Authentication.Tests.Services{new Claim("Token", "123"),new Claim("Email", "[email protected]"),- new Claim("RefreshId", "567"),+ new Claim("RefreshId", "567")};context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, ""));var result = await _jwtBearerCustomerAuthenticationService.Valid(context);@@ -64,7 +64,7 @@ namespace Grand.Business.Authentication.Tests.Servicesvar context = new TokenValidatedContext(httpContext.Object, new AuthenticationScheme("", "", typeof(AuthSchemaMock)), new JwtBearerOptions());IList<Claim> claims = new List<Claim>{- new Claim("Email", "[email protected]"),+ new Claim("Email", "[email protected]")};context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, ""));var result = await _jwtBearerCustomerAuthenticationService.Valid(context);@@ -106,7 +106,7 @@ namespace Grand.Business.Authentication.Tests.Services{new Claim("Email", "[email protected]"),new Claim("Token", "123"),- new Claim("RefreshId", "567"),+ new Claim("RefreshId", "567")};context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, ""));@@ -128,7 +128,7 @@ namespace Grand.Business.Authentication.Tests.Services{new Claim("Email", "[email protected]"),new Claim("Token", "123"),- new Claim("RefreshId", "567"),+ new Claim("RefreshId", "567")};context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, ""));diff --git a/src/Tests/Grand.Business.Authentication.Tests/Services/RefreshTokenServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Services/RefreshTokenServiceTests.csindex 7e080afa8..5154dcc26 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Services/RefreshTokenServiceTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Services/RefreshTokenServiceTests.cs@@ -27,7 +27,7 @@ namespace Grand.Business.Authentication.Tests.ServicesExpiryInMinutes = 1440,RefreshTokenExpiryInMinutes = 1440,Enabled = true,- ValidateIssuer = false,+ ValidateIssuer = false});}diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.csindex fb7ce01ad..c9a6eb2a2 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs@@ -34,7 +34,7 @@ namespace Grand.Business.Catalog.Tests.Events.HandlersIsFreeShipping = !product.IsFreeShipping,IsShipEnabled = !product.IsShipEnabled,IsTaxExempt = !product.IsTaxExempt,- IsGiftVoucher = !product.IsGiftVoucher,+ IsGiftVoucher = !product.IsGiftVoucher});//Actawait _handler.Handle(new Core.Events.Catalog.UpdateProductOnCartEvent(product), CancellationToken.None);diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.csindex b0af17d64..12bd1ae93 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs@@ -232,7 +232,7 @@ namespace Grand.Business.Catalog.Tests.Services.Categoriesnew Category(){ Id="2" ,Name="cat2",Published=true,IncludeInMenu = true},new Category(){ Id="3" ,Name="cat3",Published=true,ShowOnHomePage=true,ShowOnSearchBox=true},new Category(){ Id="4" ,Name="cat4",Published=true,ShowOnHomePage=true,ShowOnSearchBox=true},- new Category(){ Id="5" ,Name="cat5",Published=true,FeaturedProductsOnHomePage=true},+ new Category(){ Id="5" ,Name="cat5",Published=true,FeaturedProductsOnHomePage=true}};}diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.csindex 2892cb117..643162a71 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs@@ -183,7 +183,7 @@ namespace Grand.Business.Catalog.Tests.Services.Categoriesnew Category(){ Id="2" ,Name="cat2",Published=true},new Category(){ Id="3" ,Name="cat3",Published=true},new Category(){ Id="4" ,Name="cat4",Published=true},- new Category(){ Id="5" ,Name="cat5",Published=true},+ new Category(){ Id="5" ,Name="cat5",Published=true}};}diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountProviderTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountProviderTest.csindex f6e6c14b7..0aea49ebc 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountProviderTest.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountProviderTest.cs@@ -40,7 +40,7 @@ namespace Grand.Business.Catalog.Tests.Services.Discountspublic async Task<DiscountRuleValidationResult> CheckRequirement(DiscountRuleValidationRequest request){var result = new DiscountRuleValidationResult() {- IsValid = true,+ IsValid = true};return await Task.FromResult(result);}diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.csindex 7e4a78ac6..991528455 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs@@ -78,13 +78,13 @@ namespace Grand.Business.Catalog.Tests.Services.Discounts//Arrangevar discount1 = new Discount() {Name = "test1",- IsEnabled = true,+ IsEnabled = true};await _dicountService.InsertDiscount(discount1);var discount2 = new Discount() {Name = "test2",- IsEnabled = true,+ IsEnabled = true};await _dicountService.InsertDiscount(discount2);@@ -185,7 +185,7 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discountCoupon = new DiscountCoupon() {CouponCode = "TEST123",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon);@@ -209,7 +209,7 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discountCoupon = new DiscountCoupon() {CouponCode = "TEST123",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon);@@ -232,17 +232,17 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discountCoupon = new DiscountCoupon() {CouponCode = "TEST123",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon);var discountCoupon1 = new DiscountCoupon() {CouponCode = "TEST124",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon1);var discountCoupon2 = new DiscountCoupon() {CouponCode = "TEST125",- DiscountId = "id",+ DiscountId = "id"};await _discountCouponRepository.InsertAsync(discountCoupon2);//Act@@ -263,17 +263,17 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discountCoupon = new DiscountCoupon() {CouponCode = "TEST123",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon);var discountCoupon1 = new DiscountCoupon() {CouponCode = "TEST124",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon1);var discountCoupon2 = new DiscountCoupon() {CouponCode = "TEST125",- DiscountId = "id",+ DiscountId = "id"};await _discountCouponRepository.InsertAsync(discountCoupon2);//Act@@ -295,17 +295,17 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discountCoupon = new DiscountCoupon() {CouponCode = "TEST123",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon);var discountCoupon1 = new DiscountCoupon() {CouponCode = "TEST124",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon1);var discountCoupon2 = new DiscountCoupon() {CouponCode = "TEST125",- DiscountId = "id",+ DiscountId = "id"};await _discountCouponRepository.InsertAsync(discountCoupon2);//Act@@ -327,17 +327,17 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discountCoupon = new DiscountCoupon() {CouponCode = "TEST123",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon);var discountCoupon1 = new DiscountCoupon() {CouponCode = "TEST124",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon1);var discountCoupon2 = new DiscountCoupon() {CouponCode = "TEST125",- DiscountId = "id",+ DiscountId = "id"};await _discountCouponRepository.InsertAsync(discountCoupon2);@@ -359,7 +359,7 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discountCoupon = new DiscountCoupon() {CouponCode = "TEST123",- DiscountId = discount.Id,+ DiscountId = discount.Id};//Actawait _discountCouponRepository.InsertAsync(discountCoupon);@@ -380,7 +380,7 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discountCoupon = new DiscountCoupon() {CouponCode = "TEST123",- DiscountId = discount.Id,+ DiscountId = discount.Id};await _discountCouponRepository.InsertAsync(discountCoupon);@@ -478,7 +478,7 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discount = new Discount() {Name = "test",IsEnabled = true,- CurrencyCode = "EUR",+ CurrencyCode = "EUR"};await _dicountService.InsertDiscount(discount);var discountCoupon = new DiscountCoupon() {@@ -503,7 +503,7 @@ namespace Grand.Business.Catalog.Tests.Services.DiscountsName = "test",IsEnabled = true,CurrencyCode = "USD",- EndDateUtc = DateTime.UtcNow.AddDays(-1),+ EndDateUtc = DateTime.UtcNow.AddDays(-1)};await _dicountService.InsertDiscount(discount);var discountCoupon = new DiscountCoupon() {@@ -526,7 +526,7 @@ namespace Grand.Business.Catalog.Tests.Services.Discountsvar discount = new Discount() {Name = "test",IsEnabled = false,- CurrencyCode = "USD",+ CurrencyCode = "USD"};await _dicountService.InsertDiscount(discount);var discountCoupon = new DiscountCoupon() {diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.csindex becbf98eb..0ea99ed26 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs@@ -142,7 +142,7 @@ namespace Grand.Business.Catalog.Tests.Services.PricesName = "US Dollar",CurrencyCode = "USD",DisplayLocale = "en-US",- MidpointRoundId = MidpointRounding.AwayFromZero,+ MidpointRoundId = MidpointRounding.AwayFromZero};var gbp_currency = new Currency {@@ -150,14 +150,14 @@ namespace Grand.Business.Catalog.Tests.Services.PricesName = "great british pound",CurrencyCode = "GBP",DisplayLocale = "en-GB",- MidpointRoundId = MidpointRounding.AwayFromZero,+ MidpointRoundId = MidpointRounding.AwayFromZero};var euro_currency = new Currency {Id = "3",Name = "Euro",CurrencyCode = "EUR",DisplayLocale = "en_150",- MidpointRoundId = MidpointRounding.AwayFromZero,+ MidpointRoundId = MidpointRounding.AwayFromZero};var language = new Language {Id = "1",@@ -180,7 +180,7 @@ namespace Grand.Business.Catalog.Tests.Services.PricesName = "US Dollar",CurrencyCode = "USD",DisplayLocale = "en-US",- MidpointRoundId = MidpointRounding.AwayFromZero,+ MidpointRoundId = MidpointRounding.AwayFromZero};var language = new Language {Id = "1",@@ -206,7 +206,7 @@ namespace Grand.Business.Catalog.Tests.Services.PricesId = "1",Name = "US Dollar",CurrencyCode = "USD",- DisplayLocale = "en-US",+ DisplayLocale = "en-US"};var language = new Language {Id = "1",diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.csindex b6ffa6551..b7658ece4 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs@@ -134,7 +134,7 @@ namespace Grand.Business.Catalog.Tests.Services.PricesName = "product name 01",Price = 49.99,EnteredPrice = false,- Published = true,+ Published = true};product.ProductPrices.Add(new ProductPrice() { CurrencyCode = "USD", Price = 49.99 });@@ -154,7 +154,7 @@ namespace Grand.Business.Catalog.Tests.Services.PricesName = "product name 01",Price = 49.99,EnteredPrice = false,- Published = true,+ Published = true};product.ProductPrices.Add(new ProductPrice() { CurrencyCode = "USD", Price = 49.99 });//TierPrice is simply "the more you buy, the less you pay"@@ -212,7 +212,7 @@ namespace Grand.Business.Catalog.Tests.Services.PricesName = "product name 01",Price = 49.99,EnteredPrice = false,- Published = true,+ Published = true};product.ProductPrices.Add(new ProductPrice() { CurrencyCode = "USD", Price = 49.99 });var customer = new Customer();@@ -257,7 +257,7 @@ namespace Grand.Business.Catalog.Tests.Services.PricesName = "product name 01",Price = 49.99,EnteredPrice = false,- Published = true,+ Published = true};product001.ProductPrices.Add(new ProductPrice() { CurrencyCode = "USD", Price = 49.99 });tempProductService.Setup(x => x.GetProductById("242422", false)).ReturnsAsync(product001);@@ -285,7 +285,7 @@ namespace Grand.Business.Catalog.Tests.Services.PricesName = "product name 01",Price = 55.11,EnteredPrice = false,- Published = true,+ Published = true};product001.ProductPrices.Add(new ProductPrice() { CurrencyCode = "USD", Price = 55.11 });tempProductService.Setup(x => x.GetProductById("242422", false)).ReturnsAsync(product001);diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.csindex d9bc0e7e2..ee922fc2f 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs@@ -204,12 +204,12 @@ namespace Grand.Business.Catalog.Tests.Services.Products//Arrangevar product1 = new Product() {ProductTypeId = ProductType.Auction,- AvailableEndDateTimeUtc = DateTime.UtcNow.AddDays(1),+ AvailableEndDateTimeUtc = DateTime.UtcNow.AddDays(1)};_productrepository.Insert(product1);var product2 = new Product() {ProductTypeId = ProductType.Auction,- AvailableEndDateTimeUtc = DateTime.UtcNow.AddDays(-1),+ AvailableEndDateTimeUtc = DateTime.UtcNow.AddDays(-1)};_productrepository.Insert(product2);@@ -226,7 +226,7 @@ namespace Grand.Business.Catalog.Tests.Services.Products//Arrangevar product1 = new Product() {ProductTypeId = ProductType.Auction,- AvailableEndDateTimeUtc = DateTime.UtcNow.AddDays(1),+ AvailableEndDateTimeUtc = DateTime.UtcNow.AddDays(1)};_productrepository.Insert(product1);diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.csindex 3db37d60c..81f4b8791 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs@@ -57,7 +57,7 @@ namespace Grand.Business.Catalog.Tests.Services.Products//Arrangevar product = new Product() {ManageInventoryMethodId = ManageInventoryMethod.ManageStock,- ReservedQuantity = 5,+ ReservedQuantity = 5};await _repository.InsertAsync(product);//Act@@ -73,7 +73,7 @@ namespace Grand.Business.Catalog.Tests.Services.Products//Arrangevar product = new Product() {ManageInventoryMethodId = ManageInventoryMethod.ManageStock,- ReservedQuantity = 10,+ ReservedQuantity = 10};await _repository.InsertAsync(product);//Act@@ -90,7 +90,7 @@ namespace Grand.Business.Catalog.Tests.Services.Productsvar product = new Product() {ManageInventoryMethodId = ManageInventoryMethod.ManageStock,StockQuantity = 10,- ReservedQuantity = 10,+ ReservedQuantity = 10};await _repository.InsertAsync(product);@@ -112,7 +112,7 @@ namespace Grand.Business.Catalog.Tests.Services.Productsvar product = new Product() {ManageInventoryMethodId = ManageInventoryMethod.ManageStock,StockQuantity = 10,- ReservedQuantity = 10,+ ReservedQuantity = 10};await _repository.InsertAsync(product);@@ -137,7 +137,7 @@ namespace Grand.Business.Catalog.Tests.Services.Productsvar product = new Product() {ManageInventoryMethodId = ManageInventoryMethod.ManageStock,StockQuantity = 0,- ReservedQuantity = 0,+ ReservedQuantity = 0};await _repository.InsertAsync(product);diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.csindex 58b9bd84e..5faf6c835 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs@@ -36,13 +36,13 @@ namespace Grand.Business.Catalog.Tests.Services.Products{//Arangevar outOfStockSubscription1 = new OutOfStockSubscription() {- CustomerId = "1",+ CustomerId = "1"};var outOfStockSubscription2 = new OutOfStockSubscription() {- CustomerId = "1",+ CustomerId = "1"};var outOfStockSubscription3 = new OutOfStockSubscription() {- CustomerId = "2",+ CustomerId = "2"};await _repository.InsertManyAsync(new[] { outOfStockSubscription1, outOfStockSubscription2, outOfStockSubscription3 });@@ -61,19 +61,19 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription2 = new OutOfStockSubscription() {CustomerId = "1",ProductId = "2",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription3 = new OutOfStockSubscription() {CustomerId = "2",ProductId = "3",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};await _repository.InsertManyAsync(new[] { outOfStockSubscription1, outOfStockSubscription2, outOfStockSubscription3 });@@ -91,19 +91,19 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription2 = new OutOfStockSubscription() {CustomerId = "1",ProductId = "2",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription3 = new OutOfStockSubscription() {CustomerId = "2",ProductId = "3",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};await _repository.InsertManyAsync(new[] { outOfStockSubscription1, outOfStockSubscription2, outOfStockSubscription3 });@@ -121,19 +121,19 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription2 = new OutOfStockSubscription() {CustomerId = "1",ProductId = "2",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription3 = new OutOfStockSubscription() {CustomerId = "2",ProductId = "3",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};await _repository.InsertManyAsync(new[] { outOfStockSubscription1, outOfStockSubscription2, outOfStockSubscription3 });@@ -153,7 +153,7 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};//Actawait _outOfStockSubscriptionService.InsertSubscription(outOfStockSubscription1);@@ -171,7 +171,7 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};await _outOfStockSubscriptionService.InsertSubscription(outOfStockSubscription1);outOfStockSubscription1.CustomerId = "2";@@ -189,7 +189,7 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};await _outOfStockSubscriptionService.InsertSubscription(outOfStockSubscription1);//Act@@ -208,19 +208,19 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription2 = new OutOfStockSubscription() {CustomerId = "1",ProductId = "2",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription3 = new OutOfStockSubscription() {CustomerId = "2",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};await _repository.InsertManyAsync(new[] { outOfStockSubscription1, outOfStockSubscription2, outOfStockSubscription3 });@@ -239,7 +239,7 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};outOfStockSubscription1.Attributes.Add(new CustomAttribute() { Key = "MyKey", Value = "1" });@@ -247,13 +247,13 @@ namespace Grand.Business.Catalog.Tests.Services.ProductsCustomerId = "1",ProductId = "2",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};var outOfStockSubscription3 = new OutOfStockSubscription() {CustomerId = "2",ProductId = "1",StoreId = "",- WarehouseId = "",+ WarehouseId = ""};await _repository.InsertManyAsync(new[] { outOfStockSubscription1, outOfStockSubscription2, outOfStockSubscription3 });diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.csindex a966e8789..a500f5f20 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs@@ -75,7 +75,7 @@ namespace Grand.Business.Catalog.Tests.Services.Productsnew CustomAttribute() { Key = "RecipientEmail", Value = "[email protected]" },new CustomAttribute() { Key = "SenderName", Value = "Will" },new CustomAttribute() { Key = "SenderEmail", Value = "[email protected]" },- new CustomAttribute() { Key = "Message", Value = "" },+ new CustomAttribute() { Key = "Message", Value = "" }});//AssertAssert.AreEqual("Name Will, Email [email protected]<br />RecName John, RecEmail [email protected]", result);@@ -91,7 +91,7 @@ namespace Grand.Business.Catalog.Tests.Services.Products//Actvar result = await _productAttributeFormatter.FormatAttributes(product, new List<CustomAttribute>(){- new CustomAttribute() { Key = "1", Value = "1" },+ new CustomAttribute() { Key = "1", Value = "1" }});//AssertAssert.AreEqual("test: aa", result);diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeParserTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeParserTests.csindex 88ec84e8b..bc599da0c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeParserTests.cs@@ -17,7 +17,7 @@ namespace Grand.Business.Catalog.Tests.Services.Productsnew CustomAttribute(){Key="key1",Value="value1" },new CustomAttribute(){Key="key2",Value="value2" },new CustomAttribute(){Key="key3",Value="value3" },- new CustomAttribute(){Key="key4",Value="value4" },+ new CustomAttribute(){Key="key4",Value="value4" }};}diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.csindex 0d49a095f..c0febef8c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs@@ -32,7 +32,7 @@ namespace Grand.Business.Catalog.Tests.Services.Productsnew ProductReview(){ CustomerId = "1" },new ProductReview(){ CustomerId = "1"},new ProductReview(){ },- new ProductReview(){ },+ new ProductReview(){ }});//Actdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.csindex a735633ce..31f40f95c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs@@ -53,9 +53,9 @@ namespace Grand.Business.Catalog.Tests.Services.Productsawait _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true, BestSeller = true });await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true, BestSeller = true });await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true });- await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true, });- await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true, });- await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true, });+ await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true });+ await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true });+ await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true });await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true, Sku = "test123" });await _productRepository.InsertAsync(new Product() { Published = true, VisibleIndividually = true, ParentGroupedProductId = "1" });@@ -434,7 +434,7 @@ namespace Grand.Business.Catalog.Tests.Services.Productsawait _productService.InsertProduct(product);//Actawait _productService.InsertBundleProduct(new BundleProduct {- ProductId = "2",+ ProductId = "2"}, product.Id);var result = await _productService.GetProductById(product.Id);@@ -492,7 +492,7 @@ namespace Grand.Business.Catalog.Tests.Services.Products//Actawait _productService.InsertCrossSellProduct(new CrossSellProduct {ProductId1 = product.Id,- ProductId2 = "2",+ ProductId2 = "2"});var result = await _productService.GetProductById(product.Id);@@ -510,7 +510,7 @@ namespace Grand.Business.Catalog.Tests.Services.Productsawait _productService.InsertProduct(product);var crossSellProduct = new CrossSellProduct {ProductId1 = product.Id,- ProductId2 = "2",+ ProductId2 = "2"};await _productService.InsertCrossSellProduct(crossSellProduct);@@ -537,12 +537,12 @@ namespace Grand.Business.Catalog.Tests.Services.Products//Actawait _productService.InsertCrossSellProduct(new CrossSellProduct {ProductId1 = product.Id,- ProductId2 = product2.Id,+ ProductId2 = product2.Id});//Actawait _productService.InsertCrossSellProduct(new CrossSellProduct {ProductId1 = product.Id,- ProductId2 = product3.Id,+ ProductId2 = product3.Id});var result = await _productService.GetCrossSellProductsByShoppingCart(new List<ShoppingCartItem> { new ShoppingCartItem() { ProductId = product.Id } }, 2);diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.csindex e9e12cd80..2cfa780a6 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs@@ -40,21 +40,21 @@ namespace Grand.Business.Checkout.Tests.Services.CheckoutAttributesTextPrompt = "Select color:",IsRequired = true,AttributeControlTypeId = AttributeControlType.DropdownList,- DisplayOrder = 1,+ DisplayOrder = 1};cav1_1 = new CheckoutAttributeValue {Id = "11",Name = "Green",DisplayOrder = 1,//CheckoutAttribute = ca1,- CheckoutAttributeId = ca1.Id,+ CheckoutAttributeId = ca1.Id};cav1_2 = new CheckoutAttributeValue {Id = "12",Name = "Red",DisplayOrder = 2,//CheckoutAttribute = ca1,- CheckoutAttributeId = ca1.Id,+ CheckoutAttributeId = ca1.Id};ca1.CheckoutAttributeValues.Add(cav1_1);ca1.CheckoutAttributeValues.Add(cav1_2);@@ -66,7 +66,7 @@ namespace Grand.Business.Checkout.Tests.Services.CheckoutAttributesTextPrompt = "Select custom option:",IsRequired = true,AttributeControlTypeId = AttributeControlType.Checkboxes,- DisplayOrder = 2,+ DisplayOrder = 2//CheckoutAttributeValues};@@ -75,14 +75,14 @@ namespace Grand.Business.Checkout.Tests.Services.CheckoutAttributesName = "Option 1",DisplayOrder = 1,//CheckoutAttribute = ca2,- CheckoutAttributeId = ca2.Id,+ CheckoutAttributeId = ca2.Id};cav2_2 = new CheckoutAttributeValue {Id = "22",Name = "Option 2",DisplayOrder = 2,//CheckoutAttribute = ca2,- CheckoutAttributeId = ca2.Id,+ CheckoutAttributeId = ca2.Id};ca2.CheckoutAttributeValues.Add(cav2_1);ca2.CheckoutAttributeValues.Add(cav2_2);@@ -94,7 +94,7 @@ namespace Grand.Business.Checkout.Tests.Services.CheckoutAttributesTextPrompt = "Enter custom text:",IsRequired = true,AttributeControlTypeId = AttributeControlType.MultilineTextbox,- DisplayOrder = 3,+ DisplayOrder = 3};var tempEventPublisher = new Mock<IMediator>();diff --git a/src/Tests/Grand.Business.Checkout.Tests/Validators/ShoppingCartValidatorsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Validators/ShoppingCartValidatorsTests.csindex a07d8d495..d358cc23f 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Validators/ShoppingCartValidatorsTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Validators/ShoppingCartValidatorsTests.cs@@ -485,7 +485,7 @@ namespace Grand.Business.Checkout.Tests.Validatorsvar product = new Product() {Id = "1",- Published = true,+ Published = true};var customer = new Domain.Customers.Customer();//Act@@ -508,7 +508,7 @@ namespace Grand.Business.Checkout.Tests.Validatorsvar product = new Product() {Id = "1",- Published = true,+ Published = true};var customer = new Domain.Customers.Customer();//Actdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.csindex 6a43fe3ee..74db6457f 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs@@ -26,7 +26,7 @@ namespace Grand.Business.Common.Tests.Services.Addressesnew CustomAttribute(){Key="key1",Value="value1" },new CustomAttribute(){Key="key2",Value="value2" },new CustomAttribute(){Key="key3",Value="value3" },- new CustomAttribute(){Key="key4",Value="value4" },+ new CustomAttribute(){Key="key4",Value="value4" }};}diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.csindex 739ada864..84f2c84a3 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs@@ -45,7 +45,7 @@ namespace Grand.Business.Common.Tests.Services.DirectoryPublished = true,DisplayOrder = 1,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,+ UpdatedOnUtc = DateTime.UtcNow};currencyEUR = new Currency {Id = "2",@@ -57,7 +57,7 @@ namespace Grand.Business.Common.Tests.Services.DirectoryPublished = true,DisplayOrder = 2,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,+ UpdatedOnUtc = DateTime.UtcNow};currencyRUR = new Currency {Id = "3",@@ -69,7 +69,7 @@ namespace Grand.Business.Common.Tests.Services.DirectoryPublished = true,DisplayOrder = 3,CreatedOnUtc = DateTime.UtcNow,- UpdatedOnUtc = DateTime.UtcNow,+ UpdatedOnUtc = DateTime.UtcNow};tempCurrencyRepository = new Mock<IRepository<Currency>>();diff --git a/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoggedInNotificationHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoggedInNotificationHandlerTests.csindex d37e9d5c4..085dc82d0 100644--- a/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoggedInNotificationHandlerTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoggedInNotificationHandlerTests.cs@@ -30,7 +30,7 @@ namespace Grand.Business.Customers.Tests.Handler//Arrangevar customer = new Customer {FailedLoginAttempts = 1,- CannotLoginUntilDateUtc = DateTime.Now,+ CannotLoginUntilDateUtc = DateTime.Now};//Actawait _handler.Handle(new CustomerLoggedInEvent(customer), CancellationToken.None);diff --git a/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoginFailedNotificationHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoginFailedNotificationHandlerTests.csindex 82fae4f81..2d2802b12 100644--- a/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoginFailedNotificationHandlerTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoginFailedNotificationHandlerTests.cs@@ -28,7 +28,7 @@ namespace Grand.Business.Customers.Tests.Handler//Arrangevar customer = new Customer {FailedLoginAttempts = 1,- CannotLoginUntilDateUtc = null,+ CannotLoginUntilDateUtc = null};//Actawait _handler.Handle(new CustomerLoginFailedEvent(customer), CancellationToken.None);@@ -43,7 +43,7 @@ namespace Grand.Business.Customers.Tests.Handler//Arrangevar customer = new Customer {FailedLoginAttempts = 10,- CannotLoginUntilDateUtc = null,+ CannotLoginUntilDateUtc = null};//Actawait _handler.Handle(new CustomerLoginFailedEvent(customer), CancellationToken.None);diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.csindex 4ef34c214..fdb1b4247 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs@@ -31,7 +31,7 @@ namespace Grand.Business.Customers.Tests.Servicesnew CustomAttribute(){Key="key1",Value="value1" },new CustomAttribute(){Key="key2",Value="value2" },new CustomAttribute(){Key="key3",Value="value3" },- new CustomAttribute(){Key="key4",Value="value4" },+ new CustomAttribute(){Key="key4",Value="value4" }};_customerAtr = new List<CustomerAttribute>()@@ -40,7 +40,7 @@ namespace Grand.Business.Customers.Tests.Servicesnew CustomerAttribute(){Id="key2", Name="name2"},new CustomerAttribute(){Id="key3", Name="name3"},new CustomerAttribute(){Id="key4", Name="name4"},- new CustomerAttribute(){Id="key5", Name="name5"},+ new CustomerAttribute(){Id="key5", Name="name5"}};_customerAtr.ForEach(c => c.CustomerAttributeValues.Add(new CustomerAttributeValue() { Id = "value" + c.Id.Last() }));}diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeParserTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeParserTests.csindex a1ab314f0..119bcb838 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeParserTests.cs@@ -35,7 +35,7 @@ namespace Grand.Business.Marketing.Tests.Services.Contactsnew CustomAttribute(){Key="key1",Value="value1" },new CustomAttribute(){Key="key2",Value="value2" },new CustomAttribute(){Key="key3",Value="value3" },- new CustomAttribute(){Key="key4",Value="value4" },+ new CustomAttribute(){Key="key4",Value="value4" }};_contactAtr = new List<ContactAttribute>()@@ -44,7 +44,7 @@ namespace Grand.Business.Marketing.Tests.Services.Contactsnew ContactAttribute(){Id="key2", Name="name2"},new ContactAttribute(){Id="key3", Name="name3"},new ContactAttribute(){Id="key4", Name="name4"},- new ContactAttribute(){Id="key5", Name="name5"},+ new ContactAttribute(){Id="key5", Name="name5"}};_contactAtr.ForEach(c => c.ContactAttributeValues.Add(new ContactAttributeValue() { Id = "value" + c.Id.Last() }));}diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.csindex 84f97d9ee..1d553782d 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs@@ -63,7 +63,7 @@ namespace Grand.Business.Marketing.Tests.Services.Courses{//Arrangevar courseLesson = new CourseLesson() {- Name = "test",+ Name = "test"};await _courseLessonService.Insert(courseLesson);@@ -80,7 +80,7 @@ namespace Grand.Business.Marketing.Tests.Services.Courses{//Actvar courseLesson = new CourseLesson() {- Name = "test",+ Name = "test"};await _courseLessonService.Insert(courseLesson);@@ -93,7 +93,7 @@ namespace Grand.Business.Marketing.Tests.Services.Courses{//Arrangevar courseLesson = new CourseLesson() {- Name = "test",+ Name = "test"};await _courseLessonService.Insert(courseLesson);courseLesson.Name = "test2";diff --git a/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryTests.cs b/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryTests.csindex f2f93c8ad..d1afc0c33 100644--- a/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryTests.cs+++ b/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryTests.cs@@ -40,7 +40,7 @@ namespace Grand.Data.Tests.LiteDbvar products = new List<SampleCollection>() {new SampleCollection(){ Id = "1" },new SampleCollection(){ Id = "2" },- new SampleCollection(){ Id = "3" },+ new SampleCollection(){ Id = "3" }};await _myRepository.InsertManyAsync(products);@@ -128,7 +128,7 @@ namespace Grand.Data.Tests.LiteDbvar products = new List<SampleCollection>() {new SampleCollection(){ Id = "1", Name = "Test" },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test2" },+ new SampleCollection(){ Id = "3", Name = "Test2" }};await _myRepository.InsertManyAsync(products);@@ -144,7 +144,7 @@ namespace Grand.Data.Tests.LiteDbvar products = new List<SampleCollection>() {new SampleCollection(){ Id = "1", Name = "Test" },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -165,7 +165,7 @@ namespace Grand.Data.Tests.LiteDbnew SampleCollection(){ Id = "2", Name = "Test2",Phones = new [] { "Phone1", "Phone2", "Phone3" }},- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -186,7 +186,7 @@ namespace Grand.Data.Tests.LiteDbnew SampleCollection(){ Id = "2", Name = "Test2",Phones = new [] { "Phone1", "Phone2", "Phone3" }},- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -212,7 +212,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -236,7 +236,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -266,7 +266,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }}},- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -292,7 +292,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -318,7 +318,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -345,7 +345,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -382,7 +382,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -406,7 +406,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -429,7 +429,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -453,7 +453,7 @@ namespace Grand.Data.Tests.LiteDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);diff --git a/src/Tests/Grand.Data.Tests/MongoDb/MongoRepositoryTests.cs b/src/Tests/Grand.Data.Tests/MongoDb/MongoRepositoryTests.csindex 65fec31f7..1c9d4a3a4 100644--- a/src/Tests/Grand.Data.Tests/MongoDb/MongoRepositoryTests.cs+++ b/src/Tests/Grand.Data.Tests/MongoDb/MongoRepositoryTests.cs@@ -40,7 +40,7 @@ namespace Grand.Data.Tests.MongoDbvar products = new List<SampleCollection>() {new SampleCollection(){ Id = "1" },new SampleCollection(){ Id = "2" },- new SampleCollection(){ Id = "3" },+ new SampleCollection(){ Id = "3" }};await _myRepository.InsertManyAsync(products);@@ -128,7 +128,7 @@ namespace Grand.Data.Tests.MongoDbvar products = new List<SampleCollection>() {new SampleCollection(){ Id = "1", Name = "Test" },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test2" },+ new SampleCollection(){ Id = "3", Name = "Test2" }};await _myRepository.InsertManyAsync(products);@@ -144,7 +144,7 @@ namespace Grand.Data.Tests.MongoDbvar products = new List<SampleCollection>() {new SampleCollection(){ Id = "1", Name = "Test" },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -165,7 +165,7 @@ namespace Grand.Data.Tests.MongoDbnew SampleCollection(){ Id = "2", Name = "Test2",Phones = new [] { "Phone1", "Phone2", "Phone3" }},- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -186,7 +186,7 @@ namespace Grand.Data.Tests.MongoDbnew SampleCollection(){ Id = "2", Name = "Test2",Phones = new [] { "Phone1", "Phone2", "Phone3" }},- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -212,7 +212,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -236,7 +236,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -266,7 +266,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }}},- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -292,7 +292,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -318,7 +318,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -345,7 +345,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test2" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -384,7 +384,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -408,7 +408,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);@@ -431,7 +431,7 @@ namespace Grand.Data.Tests.MongoDbnew Domain.Common.UserField() { Key = "key2", Value = "value2", StoreId = "" }} },new SampleCollection(){ Id = "2", Name = "Test" },- new SampleCollection(){ Id = "3", Name = "Test3" },+ new SampleCollection(){ Id = "3", Name = "Test3" }};await _myRepository.InsertManyAsync(products);diff --git a/src/Tests/Grand.Domain.Tests/Blogs/BlogExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Blogs/BlogExtensionsTests.csindex 662389880..3604aee08 100644--- a/src/Tests/Grand.Domain.Tests/Blogs/BlogExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Blogs/BlogExtensionsTests.cs@@ -22,7 +22,7 @@ namespace Grand.Domain.Tests.Blogsvar blogPosts = new List<BlogPost>() {new BlogPost(){ StartDateUtc = new DateTime(2010,01,01) },new BlogPost(){ StartDateUtc = new DateTime(2010,02,01) },- new BlogPost(){ StartDateUtc = new DateTime(2010,03,01) },+ new BlogPost(){ StartDateUtc = new DateTime(2010,03,01) }};Assert.AreEqual(2, blogPosts.GetPostsByDate(new DateTime(2010, 01, 01), new DateTime(2010, 02, 28)).Count());}diff --git a/src/Tests/Grand.Domain.Tests/Catalog/TierPriceExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Catalog/TierPriceExtensionsTests.csindex 77aa6eadc..32f1ce26b 100644--- a/src/Tests/Grand.Domain.Tests/Catalog/TierPriceExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Catalog/TierPriceExtensionsTests.cs@@ -16,14 +16,14 @@ namespace Grand.Domain.Tests.CatalogCustomerGroupId = null,Price = 10,Quantity = 1,- StoreId = "1",+ StoreId = "1"});_tierPrices.Add(new TierPrice() {CurrencyCode = "USD",CustomerGroupId = "1",Price = 12,Quantity = 1,- StoreId = "1",+ StoreId = "1"});_tierPrices.Add(new TierPrice() {CurrencyCode = "USD",@@ -31,7 +31,7 @@ namespace Grand.Domain.Tests.CatalogPrice = 10,Quantity = 1,StoreId = "2",- EndDateTimeUtc = DateTime.UtcNow.AddDays(1),+ EndDateTimeUtc = DateTime.UtcNow.AddDays(1)});_tierPrices.Add(new TierPrice() {CurrencyCode = "EUR",@@ -39,7 +39,7 @@ namespace Grand.Domain.Tests.CatalogPrice = 10,Quantity = 1,StoreId = "3",- StartDateTimeUtc = DateTime.UtcNow,+ StartDateTimeUtc = DateTime.UtcNow});}diff --git a/src/Tests/Grand.Domain.Tests/Common/AddressExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Common/AddressExtensionsTests.csindex bb1e386c8..532d58de2 100644--- a/src/Tests/Grand.Domain.Tests/Common/AddressExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Common/AddressExtensionsTests.cs@@ -13,7 +13,7 @@ namespace Grand.Domain.Tests.Commonnew Address(){ Address1 = "address1", Address2 = "address11", FirstName = "name1", LastName = "namelast1" },new Address(){ Address1 = "address2", Address2 = "address12", FirstName = "name2", LastName = "namelast2" },new Address(){ Address1 = "address3", Address2 = "address13", FirstName = "name3", LastName = "namelast3" },- new Address(){ Address1 = "address4", Address2 = "address14", FirstName = "name4", LastName = "namelast4" },+ new Address(){ Address1 = "address4", Address2 = "address14", FirstName = "name4", LastName = "namelast4" }};var address = addresses.FindAddress("name1", "namelast1", string.Empty, string.Empty, string.Empty,string.Empty, "address1", "address11", string.Empty, string.Empty, string.Empty, string.Empty);@@ -26,7 +26,7 @@ namespace Grand.Domain.Tests.Commonnew Address(){ Address1 = "address1", Address2 = "address11", FirstName = "name1", LastName = "namelast1" },new Address(){ Address1 = "address2", Address2 = "address12", FirstName = "name2", LastName = "namelast2" },new Address(){ Address1 = "address3", Address2 = "address13", FirstName = "name3", LastName = "namelast3" },- new Address(){ Address1 = "address4", Address2 = "address14", FirstName = "name4", LastName = "namelast4" },+ new Address(){ Address1 = "address4", Address2 = "address14", FirstName = "name4", LastName = "namelast4" }};var address = addresses.FindAddress("name1", "namelast1", string.Empty, string.Empty, string.Empty,string.Empty, "address1", "address2", "city", string.Empty, string.Empty, string.Empty);diff --git a/src/Tests/Grand.Domain.Tests/Orders/ShoppingCartExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Orders/ShoppingCartExtensionsTests.csindex 2827bfd97..aa301d6e1 100644--- a/src/Tests/Grand.Domain.Tests/Orders/ShoppingCartExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Orders/ShoppingCartExtensionsTests.cs@@ -12,7 +12,7 @@ namespace Grand.Domain.Tests.Ordersvar shoppingCartItems = new List<ShoppingCartItem>(){new ShoppingCartItem(){IsShipEnabled=false },- new ShoppingCartItem(){IsShipEnabled=false },+ new ShoppingCartItem(){IsShipEnabled=false }};Assert.IsFalse(shoppingCartItems.RequiresShipping());@@ -26,7 +26,7 @@ namespace Grand.Domain.Tests.Ordersvar shoppingCartItems = new List<ShoppingCartItem>(){new ShoppingCartItem(){IsShipEnabled=false },- new ShoppingCartItem(){IsShipEnabled=false },+ new ShoppingCartItem(){IsShipEnabled=false }};Assert.IsTrue(shoppingCartItems.LimitPerStore(false, "id").ToList().Count == 0);shoppingCartItems.Add(new ShoppingCartItem() { StoreId = "id" });diff --git a/src/Tests/Grand.Infrastructure.Tests/Validators/FluentValidationFilterTests.cs b/src/Tests/Grand.Infrastructure.Tests/Validators/FluentValidationFilterTests.csindex d4df9acc1..416a3b6b5 100644--- a/src/Tests/Grand.Infrastructure.Tests/Validators/FluentValidationFilterTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Validators/FluentValidationFilterTests.cs@@ -44,7 +44,7 @@ namespace Grand.Infrastructure.Tests.Validatorsvar source = new SourceTest {FirstName = "ABCD",- LastName = "ABCD",+ LastName = "ABCD"};actionExecutingContext.ActionArguments["model"] = source;@@ -86,7 +86,7 @@ namespace Grand.Infrastructure.Tests.Validatorscontroller: null);var source = new SourceTest {- FirstName = "ABCD",+ FirstName = "ABCD"};actionExecutingContext.ActionArguments["model"] = source;@@ -103,7 +103,7 @@ namespace Grand.Infrastructure.Tests.Validatorsprivate static ActionExecutedContext CreateActionExecutedContext(ActionExecutingContext context){return new ActionExecutedContext(context, context.Filters, context.Controller) {- Result = context.Result,+ Result = context.Result};}}diff --git a/src/Tests/Grand.SharedKernel.Tests/SampleEnum.cs b/src/Tests/Grand.SharedKernel.Tests/SampleEnum.csindex 825b837c2..1d1afac7b 100644--- a/src/Tests/Grand.SharedKernel.Tests/SampleEnum.cs+++ b/src/Tests/Grand.SharedKernel.Tests/SampleEnum.cs@@ -3,5 +3,5 @@ public enum SampleEnum{Test0 = 0,Test1 = 1,- Test2 = 2,+ Test2 = 2}diff --git a/src/Web/Grand.Web.Common/Page/ResourceLocation.cs b/src/Web/Grand.Web.Common/Page/ResourceLocation.csindex b9de33a14..e7afe32b8 100644--- a/src/Web/Grand.Web.Common/Page/ResourceLocation.cs+++ b/src/Web/Grand.Web.Common/Page/ResourceLocation.cs@@ -9,6 +9,6 @@/// <summary>/// Footer/// </summary>- Footer,+ Footer}}diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultDisplayTemplates.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultDisplayTemplates.csindex 4ec06fe5e..2ad019ad2 100644--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultDisplayTemplates.cs+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultDisplayTemplates.cs@@ -66,7 +66,7 @@ namespace Grand.Web.Common.TagHelpers.Admin.Extend{new SelectListItem("Not Set", string.Empty, !value.HasValue),new SelectListItem("True", "true", value == true),- new SelectListItem("False", "false", value == false),+ new SelectListItem("False", "false", value == false)};}diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultHtmlGenerator.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultHtmlGenerator.csindex e1b972fed..fecc00fe9 100644--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultHtmlGenerator.cs+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultHtmlGenerator.cs@@ -1211,7 +1211,7 @@ namespace Grand.Web.Common.TagHelpers.Admin.Extendvar inputTypeString = GetInputTypeString(inputType);var tagBuilder = new TagBuilder("input") {- TagRenderMode = TagRenderMode.SelfClosing,+ TagRenderMode = TagRenderMode.SelfClosing};tagBuilder.MergeAttributes(htmlAttributes);@@ -1596,7 +1596,7 @@ namespace Grand.Web.Common.TagHelpers.Admin.Extendnew SelectListItem() {Text = optionLabel,Value = string.Empty,- Selected = false,+ Selected = false},currentValues: null));}diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.csindex a7bba9583..789c9bcfe 100644--- a/src/Web/Grand.Web/Controllers/AccountController.cs+++ b/src/Web/Grand.Web/Controllers/AccountController.cs@@ -751,7 +751,7 @@ namespace Grand.Web.ControllersAddress = address,ExcludeProperties = false,Customer = _workContext.CurrentCustomer,- LoadCountries = () => countries,+ LoadCountries = () => countries});return View(model);diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.csindex 1771423d9..400a24269 100644--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs@@ -908,7 +908,7 @@ namespace Grand.Web.Controllersreturn Json(new {update_section = new UpdateSectionJsonModel {name = "payment-info",- model = paymentInfoModel,+ model = paymentInfoModel},warnings = warnings.ToArray()});