From fd1d80f7191b96b5b57108c912a740a3c1c376d3 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 5 Aug 2020 16:27:25 +0200 Subject: [PATCH 001/695] API: trying to get OData 4 hell to work (in progress) --- .../Media/MediaFileInfo.cs | 7 +- .../Controllers/OData/CurrenciesController.cs | 10 +- .../Controllers/OData/CustomersController.cs | 7 + .../Controllers/OData/OrdersController.cs | 2 +- .../Controllers/OData/PicturesController.cs | 4 +- .../Controllers/OData/ProductsController.cs | 2 +- .../Extensions/MiscExtensions.cs | 2 +- .../Swagger/SwaggerOdataDocumentFilter.cs | 4 +- .../SmartStore.WebApi.csproj | 36 +- .../WebApiConfigurationProvider.cs | 8 +- src/Plugins/SmartStore.WebApi/packages.config | 22 +- .../SmartStore.Web.Framework.csproj | 28 +- .../WebApiConfigurationBroadcaster.cs | 4 +- .../WebApi/OData/WebApiQueryableAttribute.cs | 6 +- .../WebApi/WebApiEntityController.cs | 1621 ++++++++++++----- .../WebApi/WebApiExtension.cs | 57 +- .../WebApi/WebApiStartupTask.cs | 35 +- .../SmartStore.Web.Framework/packages.config | 23 +- 18 files changed, 1301 insertions(+), 577 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs index bff031e5bb..5ce0f0657e 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs @@ -35,7 +35,12 @@ public MediaFileInfo(MediaFile file, IMediaStorageProvider storageProvider, IMed public MediaFile File { get; } [JsonProperty("id")] - public int Id => File.Id; + public int Id + { + get { return File.Id; } + set { } + } + //public int Id => File.Id; [JsonProperty("folderId")] public int? FolderId => File.FolderId; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index 72c01b8e8e..c2cdc39ee3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -1,4 +1,5 @@ -using System.Web.Http; +using System.Linq; +using System.Web.Http; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; @@ -28,6 +29,13 @@ protected override void Delete(Currency entity) Service.DeleteCurrency(entity); } + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] + public IQueryable Get() + { + return GetEntitySet(); + } + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] public SingleResult GetCurrency(int key) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 599661b11c..17c9865367 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -52,6 +52,13 @@ protected override void Delete(Customer entity) Service.DeleteCustomer(entity); } + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IQueryable Get() + { + return GetEntitySet(); + } + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] public SingleResult GetCustomer(int key) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index c98d8e5096..eef665f97d 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Net.Http; using System.Web.Http; -using System.Web.Http.OData; +using Microsoft.AspNet.OData; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs index 35b6119431..c92054c8ba 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs @@ -4,7 +4,7 @@ using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; -using System.Web.Http.OData; +using Microsoft.AspNet.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Media; using SmartStore.Services.Media; @@ -26,7 +26,7 @@ public MediaController(IMediaService mediaService) public static void Init(WebApiConfigurationBroadcaster configData) { - var entityConfig = configData.ModelBuilder.Entity(); + var entityConfig = configData.ModelBuilder.EntityType(); entityConfig.Collection .Action("FileExists") diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 5c81703cac..536eb86889 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Web.Http; using System.Web.Http.ModelBinding; -using System.Web.Http.OData; +using Microsoft.AspNet.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Discounts; diff --git a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs index 375cb6cdb4..834e98b1cf 100644 --- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs @@ -1,6 +1,6 @@ using System.Text; -using System.Web.Http.OData; using System.Web.Mvc; +using Microsoft.AspNet.OData; using SmartStore.Core.Infrastructure; using SmartStore.Services.Localization; diff --git a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs index d75e592a1a..15359e30eb 100644 --- a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs +++ b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs @@ -3,8 +3,8 @@ using System.Reflection; using System.Web.Http; using System.Web.Http.Description; -using System.Web.Http.OData; -using System.Web.Http.OData.Routing; +using Microsoft.AspNet.OData; +using Microsoft.AspNet.OData.Routing; using Swashbuckle.Swagger; namespace SmartStore.WebApi.Services.Swagger diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 8fea27bebf..9a4a662f07 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -103,16 +103,32 @@ ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll False + + ..\..\packages\Microsoft.AspNet.OData.7.4.1\lib\net45\Microsoft.AspNet.OData.dll + True + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - ..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll - False + + ..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll + True - - ..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll - False + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + True + + + ..\..\packages\Microsoft.OData.Core.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll + True + + + ..\..\packages\Microsoft.OData.Edm.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll + True + + + ..\..\packages\Microsoft.Spatial.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll + True ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -140,10 +156,6 @@ - - ..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll - False - @@ -166,10 +178,6 @@ ..\..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll False - - ..\..\packages\Microsoft.AspNet.WebApi.OData.5.7.0\lib\net45\System.Web.Http.OData.dll - False - ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll False diff --git a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs index fe9844ed28..ce90a72f30 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using System.Web.Http.OData.Builder; +using Microsoft.AspNet.OData.Builder; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; @@ -94,9 +94,9 @@ public void Configure(WebApiConfigurationBroadcaster configData) m.EntitySet("UrlRecords"); m.EntitySet("SyncMappings"); - AddActionsToOrder(m.Entity()); - AddActionsToOrderItem(m.Entity()); - AddActionsToProduct(m.Entity()); + AddActionsToOrder(m.EntityType()); + AddActionsToOrderItem(m.EntityType()); + AddActionsToProduct(m.EntityType()); Controllers.OData.MediaController.Init(configData); diff --git a/src/Plugins/SmartStore.WebApi/packages.config b/src/Plugins/SmartStore.WebApi/packages.config index b645dda46e..ff71ebcf50 100644 --- a/src/Plugins/SmartStore.WebApi/packages.config +++ b/src/Plugins/SmartStore.WebApi/packages.config @@ -6,18 +6,32 @@ + - - - + + + + + - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 4cac4a1212..27cd2a80c5 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -113,14 +113,23 @@ ..\..\packages\LibSassHost.1.2.2\lib\net45\LibSassHost.dll - - ..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll + + ..\..\packages\Microsoft.AspNet.OData.7.4.1\lib\net45\Microsoft.AspNet.OData.dll - - ..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll + + ..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - - ..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + ..\..\packages\Microsoft.OData.Core.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll + + + ..\..\packages\Microsoft.OData.Edm.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll + + + ..\..\packages\Microsoft.Spatial.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll True @@ -145,9 +154,6 @@ - - ..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll @@ -165,10 +171,6 @@ ..\..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll - - ..\..\packages\Microsoft.AspNet.WebApi.OData.5.7.0\lib\net45\System.Web.Http.OData.dll - True - ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs index f7b711d78c..36a8fa781f 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Web.Http; -using System.Web.Http.OData.Builder; -using System.Web.Http.OData.Routing.Conventions; +using Microsoft.AspNet.OData.Builder; +using Microsoft.AspNet.OData.Routing.Conventions; namespace SmartStore.Web.Framework.WebApi.Configuration { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs index 45dd3f653a..45d2e50481 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs @@ -3,7 +3,7 @@ using System.Net.Http; using System.Web.Http; using System.Web.Http.Filters; -using System.Web.Http.OData; +using Microsoft.AspNet.OData; using SmartStore.Web.Framework.WebApi.Caching; namespace SmartStore.Web.Framework.WebApi.OData @@ -59,8 +59,8 @@ protected virtual bool MissingClientPaging(HttpActionExecutedContext actionExecu public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext) { - if (MissingClientPaging(actionExecutedContext)) - return; + //if (MissingClientPaging(actionExecutedContext)) + // return; base.OnActionExecuted(actionExecutedContext); } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 451c727d13..d5b9d88c19 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -1,18 +1,18 @@ using System; using System.Collections.Generic; using System.Data.Entity; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Infrastructure; using System.Linq; using System.Linq.Expressions; using System.Net; using System.Net.Http; using System.Web.Http; -using System.Web.Http.OData; -using System.Web.Http.OData.Extensions; -using System.Web.Http.OData.Formatter; -using System.Web.Http.OData.Routing; +//using System.Web.Http.OData; +//using System.Web.Http.OData.Extensions; +//using System.Web.Http.OData.Formatter; +//using System.Web.Http.OData.Routing; using Autofac; +using Microsoft.AspNet.OData; +using Microsoft.AspNet.OData.Formatter; using SmartStore.ComponentModel; using SmartStore.Core; using SmartStore.Core.Data; @@ -22,505 +22,1166 @@ namespace SmartStore.Web.Framework.WebApi { - public abstract class WebApiEntityController : EntitySetController - where TEntity : BaseEntity, new() - { - - protected internal HttpResponseException ExceptionEntityNotFound(TKey key) - { - var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, - WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - - return new HttpResponseException(response); - } - - protected internal HttpResponseException ExceptionNotExpanded(Expression> path) - { - // NotFound cause of nullable properties - var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, - WebApiGlobal.Error.PropertyNotExpanded.FormatInvariant(path.ToString())); - - return new HttpResponseException(response); - } - - public override HttpResponseMessage HandleUnmappedRequest(ODataPath odataPath) - { - if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/property") || - odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/cast/property") || - odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/unresolved")) - { - if (Request.Method == HttpMethod.Get || Request.Method == HttpMethod.Post) - { - return UnmappedGetProperty(odataPath); - } - } - else if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/navigation/key")) - { - if (Request.Method == HttpMethod.Get || Request.Method == HttpMethod.Post || Request.Method == HttpMethod.Delete) - { - // we ignore standard odata path cause they differ: - // ~/entityset/key/$links/navigation (odata 3 "link"), ~/entityset/key/navigation/$ref (odata 4 "reference") - - return UnmappedGetNavigation(odataPath); - } - } - else if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/navigation")) - { - if (Request.Method == HttpMethod.Delete) - { - return UnmappedGetNavigation(odataPath); - } - } - - return base.HandleUnmappedRequest(odataPath); - } - - protected virtual internal HttpResponseMessage UnmappedGetProperty(ODataPath odataPath) - { - int key; - - if (!odataPath.GetNormalizedKey(1, out key)) - return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoKeyFromPath); - - var entity = GetEntityByKey(key); - - if (entity == null) - return Request.CreateErrorResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - - FastProperty prop = null; - string propertyName = null; - var lastSegment = odataPath.Segments.Last(); - var propertySegment = (lastSegment as PropertyAccessPathSegment); - - if (propertySegment == null) - propertyName = lastSegment.ToString(); - else - propertyName = propertySegment.PropertyName; - - if (propertyName.HasValue()) - prop = FastProperty.GetProperty(entity.GetType(), propertyName); - - if (prop == null) - return UnmappedGetProperty(entity, propertyName ?? ""); - - var propertyValue = prop.GetValue(entity); - - return Request.CreateResponse(HttpStatusCode.OK, prop.Property.PropertyType, propertyValue); - } - - protected virtual internal HttpResponseMessage UnmappedGetProperty(TEntity entity, string propertyName) - { - return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName)); - } - - protected virtual internal HttpResponseMessage UnmappedGetNavigation(ODataPath odataPath) - { - int key, relatedKey; - - if (!odataPath.GetNormalizedKey(1, out key)) - return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoKeyFromPath); - - var navigationProperty = odataPath.GetNavigation(2); - - if (navigationProperty.IsEmpty()) - return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoNavigationFromPath); - - if (!odataPath.GetNormalizedKey(3, out relatedKey) && Request.Method != HttpMethod.Delete) - return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoRelatedKeyFromPath); - - var methodName = string.Concat("Navigation", navigationProperty); - var methodInfo = GetType().GetMethod(methodName); - - if (methodInfo != null) - { - HttpResponseMessage response = null; - - this.ProcessEntity(() => - { - response = (HttpResponseMessage)methodInfo.Invoke(this, new object[] { key, relatedKey }); - }); - - return response; - } - return base.HandleUnmappedRequest(odataPath); - } - - /// - /// Auto injected by Autofac - /// - public virtual IRepository Repository - { - get; - set; - } - - /// - /// Auto injected by Autofac - /// - public virtual TService Service - { - get; - set; - } - - /// - /// Auto injected by Autofac - /// - public virtual ICommonServices Services - { - get; - set; - } + public abstract class WebApiEntityController : ODataController + where TEntity : BaseEntity, new() + { + // TODO: overrides !!!??? + // public override HttpResponseMessage HandleUnmappedRequest(ODataPath odataPath) + // protected override int GetKey(TEntity entity) + // protected override TEntity GetEntityByKey(int key) + // public override HttpResponseMessage Post(TEntity entity) + // protected override TEntity CreateEntity(TEntity entity) + // public override HttpResponseMessage Put(int key, TEntity update) + // protected override TEntity UpdateEntity(int key, TEntity update) + // public override HttpResponseMessage Patch(int key, Delta patch) + // protected override TEntity PatchEntity(int key, Delta patch) + // public override void Delete(int key) + + /// + /// Auto injected by Autofac + /// + public virtual IRepository Repository { get; set; } + + /// + /// Auto injected by Autofac + /// + public virtual TService Service { get; set; } + + /// + /// Auto injected by Autofac + /// + public virtual ICommonServices Services { get; set; } - public override IQueryable Get() - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - return this.GetEntitySet(); - } + protected internal HttpResponseException ExceptionEntityNotFound(TKey key) + { + var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - protected internal virtual IQueryable GetEntitySet() - { - return this.Repository.Table; - } - - protected internal virtual IQueryable GetExpandedEntitySet(Expression> path) - { - var query = GetEntitySet().Expand(path); - return query; - } + return new HttpResponseException(response); + } - protected internal virtual IQueryable GetExpandedEntitySet(string properties) - { - var query = GetEntitySet(); + protected internal HttpResponseException ExceptionNotExpanded(Expression> path) + { + // NotFound cause of nullable properties. + var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.PropertyNotExpanded.FormatInvariant(path.ToString())); - foreach (var property in properties.SplitSafe(",")) - { - query = query.Expand(property.Trim()); - } + return new HttpResponseException(response); + } - return query; - } + protected internal virtual IQueryable GetEntitySet() + { + return this.Repository.Table; + } - protected override int GetKey(TEntity entity) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - return entity.Id; - } - - protected override TEntity GetEntityByKey(int key) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - return this.Repository.GetById(key); - } - - protected internal virtual TEntity GetEntityByKeyNotNull(int key) - { - var entity = GetEntityByKey(key); - - if (entity == null) - throw ExceptionEntityNotFound(key); - - return entity; - } - - protected internal virtual SingleResult GetSingleResult(int key) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - return SingleResult.Create(GetEntitySet().Where(x => x.Id == key)); - } - - protected internal virtual TEntity GetExpandedEntity(int key, Expression> path) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - var query = GetExpandedEntitySet(path); - - var entity = query.FirstOrDefault(x => x.Id == key); - - if (entity == null) - throw ExceptionEntityNotFound(key); - - return entity; - } - protected internal virtual TEntity GetExpandedEntity(int key, string properties) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - var query = GetExpandedEntitySet(properties); - - var entity = query.FirstOrDefault(x => x.Id == key); - - if (entity == null) - throw ExceptionEntityNotFound(key); - - return entity; - } - - protected internal virtual TEntity GetExpandedEntity(int key, SingleResult result, string path) - { - var query = result.Queryable; + protected internal virtual IQueryable GetExpandedEntitySet(Expression> path) + { + var query = GetEntitySet().Expand(path); + return query; + } - foreach (var property in path.SplitSafe(",")) - { - query = query.Expand(property.Trim()); - } + protected internal virtual IQueryable GetExpandedEntitySet(string properties) + { + var query = GetEntitySet(); - var entity = query.FirstOrDefault(x => x.Id == key); + foreach (var property in properties.SplitSafe(",")) + { + query = query.Expand(property.Trim()); + } - if (entity == null) - throw ExceptionEntityNotFound(key); + return query; + } - return entity; - } + protected internal virtual TEntity GetEntityByKeyNotNull(int key) + { + if (!ModelState.IsValid) + throw this.ExceptionInvalidModelState(); - protected internal virtual TProperty GetExpandedProperty(int key, Expression> path) - { - var entity = GetExpandedEntity(key, path); + var entity = this.Repository.GetById(key); - var expression = path.CompileFast(PropertyCachingStrategy.EagerCached); - var property = expression.Invoke(entity); + if (entity == null) + throw ExceptionEntityNotFound(key); - if (property == null) - throw ExceptionNotExpanded(path); + return entity; + } - return property; - } + protected internal virtual SingleResult GetSingleResult(int key) + { + if (!ModelState.IsValid) + throw this.ExceptionInvalidModelState(); - protected internal virtual IQueryable GetRelatedCollection( - int key, - Expression>> navigationProperty) - { - Guard.NotNull(navigationProperty, nameof(navigationProperty)); + return SingleResult.Create(GetEntitySet().Where(x => x.Id == key)); + } - var query = GetEntitySet().Where(x => x.Id.Equals(key)); - return query.SelectMany(navigationProperty); - } + protected internal virtual TEntity GetExpandedEntity(int key, Expression> path) + { + if (!ModelState.IsValid) + throw this.ExceptionInvalidModelState(); - protected internal virtual IQueryable GetRelatedCollection( - int key, - string navigationProperty) - { - Guard.NotEmpty(navigationProperty, nameof(navigationProperty)); + var query = GetExpandedEntitySet(path); + + var entity = query.FirstOrDefault(x => x.Id == key); - var ctx = (DbContext)Repository.Context; - var product = GetEntityByKey(key); - var entry = ctx.Entry(product); - var query = entry.Collection(navigationProperty).Query(); + if (entity == null) + throw ExceptionEntityNotFound(key); + + return entity; + } - return query.Cast(); - } + protected internal virtual TEntity GetExpandedEntity(int key, string properties) + { + if (!ModelState.IsValid) + throw this.ExceptionInvalidModelState(); - protected internal virtual SingleResult GetRelatedEntity( - int key, - Expression> navigationProperty) - { - Guard.NotNull(navigationProperty, nameof(navigationProperty)); + var query = GetExpandedEntitySet(properties); - var query = GetEntitySet().Where(x => x.Id.Equals(key)).Select(navigationProperty); - return SingleResult.Create(query); - } + var entity = query.FirstOrDefault(x => x.Id == key); - protected internal virtual SingleResult GetRelatedEntity( - int key, - string navigationProperty) - { - Guard.NotEmpty(navigationProperty, nameof(navigationProperty)); + if (entity == null) + throw ExceptionEntityNotFound(key); - var ctx = (DbContext)Repository.Context; - var product = GetEntityByKey(key); - var entry = ctx.Entry(product); - var query = entry.Reference(navigationProperty).Query().Cast(); + return entity; + } - return SingleResult.Create(query); - } + protected internal virtual TEntity GetExpandedEntity(int key, SingleResult result, string path) + { + var query = result.Queryable; - public override HttpResponseMessage Post(TEntity entity) - { - var response = Request.CreateResponse(HttpStatusCode.OK, CreateEntity(entity)); + foreach (var property in path.SplitSafe(",")) + { + query = query.Expand(property.Trim()); + } - try - { - var entityUrl = Url.CreateODataLink( - new EntitySetPathSegment(entity.GetType().Name.EnsureEndsWith("s")), - new KeyValuePathSegment(entity.Id.ToString()) - ); + var entity = query.FirstOrDefault(x => x.Id == key); - response.Headers.Location = new Uri(entityUrl); - } - catch { } - - return response; - } - - protected override TEntity CreateEntity(TEntity entity) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - if (entity == null) - throw this.ExceptionBadRequest(WebApiGlobal.Error.NoDataToInsert); - - Insert(FulfillPropertiesOn(entity)); - - return entity; - } - - protected internal virtual void Insert(TEntity entity) - { - Repository.Insert(entity); - } - - public override HttpResponseMessage Put(int key, TEntity update) - { - return Request.CreateResponse(HttpStatusCode.OK, UpdateEntity(key, update)); - } - - protected override TEntity UpdateEntity(int key, TEntity update) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - var originalEntity = GetEntityByKeyNotNull(key); - - var context = ((IObjectContextAdapter)this.Repository.Context).ObjectContext; - var container = context.MetadataWorkspace.GetEntityContainer(context.DefaultContainerName, DataSpace.CSpace); - - string entityName = typeof(TEntity).Name; - string entitySetName = container.BaseEntitySets.First(x => x.ElementType.Name == entityName).Name; - - update.Id = key; - var entity = context.ApplyCurrentValues(entitySetName, update); - - Update(FulfillPropertiesOn(entity)); - - return entity; - } - - protected internal virtual void Update(TEntity entity) - { - Repository.Update(entity); - } - - public override HttpResponseMessage Patch(int key, Delta patch) - { - return Request.CreateResponse(HttpStatusCode.OK, PatchEntity(key, patch)); - } - - protected override TEntity PatchEntity(int key, Delta patch) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - var entity = GetEntityByKeyNotNull(key); - - if (patch != null) - patch.Patch(entity); - - Update(FulfillPropertiesOn(entity)); - - return entity; - } - - public override void Delete(int key) - { - if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); - - var entity = GetEntityByKeyNotNull(key); - - Delete(entity); - } - - protected internal virtual void Delete(TEntity entity) - { - Repository.Delete(entity); - } - - protected internal virtual object FulfillPropertyOn(TEntity entity, string propertyName, string queryValue) - { - var container = Services.Container; - - if (propertyName.IsCaseInsensitiveEqual("Country")) - { - return container.Resolve().GetCountryByTwoOrThreeLetterIsoCode(queryValue); - } - else if (propertyName.IsCaseInsensitiveEqual("StateProvince")) - { - return container.Resolve().GetStateProvinceByAbbreviation(queryValue); - } - else if (propertyName.IsCaseInsensitiveEqual("Language")) - { - return container.Resolve().GetLanguageByCulture(queryValue); - } - else if (propertyName.IsCaseInsensitiveEqual("Currency")) - { - return container.Resolve().GetCurrencyByCode(queryValue); - } - - return null; - } - - protected internal virtual TEntity FulfillPropertiesOn(TEntity entity) - { - try - { - if (entity == null) - return entity; - - var queries = Request.RequestUri.ParseQueryString(); - - if (queries == null || queries.Count <= 0) - return entity; - - foreach (string key in queries.AllKeys.Where(x => x.StartsWith(WebApiGlobal.QueryOption.Fulfill))) - { - string propertyName = key.Substring(WebApiGlobal.QueryOption.Fulfill.Length); - string queryValue = queries.Get(key); - - if (propertyName.HasValue() && queryValue.HasValue()) - { - var prop = FastProperty.GetProperty(entity.GetType(), propertyName); - if (prop != null) - { - var propertyValue = prop.GetValue(entity); - if (propertyValue == null) - { - object value = FulfillPropertyOn(entity, propertyName, queryValue); - - // there's no requirement to set a property value of null - if (value != null) - { - prop.SetValue(entity, value); - } - } - } - } - } - } - catch (Exception ex) - { - throw this.ExceptionUnprocessableEntity(ex.Message); - } - - return entity; - } - - protected internal virtual T ReadContent() - { - var formatters = ODataMediaTypeFormatters.Create() - .Select(formatter => formatter.GetPerRequestFormatterInstance(typeof(T), Request, Request.Content.Headers.ContentType)); - - return Request.Content.ReadAsAsync(formatters).Result; - } - } + if (entity == null) + throw ExceptionEntityNotFound(key); + + return entity; + } + + protected internal virtual TProperty GetExpandedProperty(int key, Expression> path) + { + var entity = GetExpandedEntity(key, path); + + var expression = path.CompileFast(PropertyCachingStrategy.EagerCached); + var property = expression.Invoke(entity); + + if (property == null) + throw ExceptionNotExpanded(path); + + return property; + } + + protected internal virtual IQueryable GetRelatedCollection( + int key, + Expression>> navigationProperty) + { + Guard.NotNull(navigationProperty, nameof(navigationProperty)); + + var query = GetEntitySet().Where(x => x.Id.Equals(key)); + return query.SelectMany(navigationProperty); + } + + protected internal virtual IQueryable GetRelatedCollection( + int key, + string navigationProperty) + { + Guard.NotEmpty(navigationProperty, nameof(navigationProperty)); + + if (!ModelState.IsValid) + throw this.ExceptionInvalidModelState(); + + + var ctx = (DbContext)Repository.Context; + var product = this.Repository.GetById(key); + var entry = ctx.Entry(product); + var query = entry.Collection(navigationProperty).Query(); + + return query.Cast(); + } + + protected internal virtual SingleResult GetRelatedEntity( + int key, + Expression> navigationProperty) + { + Guard.NotNull(navigationProperty, nameof(navigationProperty)); + + var query = GetEntitySet().Where(x => x.Id.Equals(key)).Select(navigationProperty); + return SingleResult.Create(query); + } + + protected internal virtual void Insert(TEntity entity) + { + Repository.Insert(entity); + } + + protected internal virtual void Update(TEntity entity) + { + Repository.Update(entity); + } + + protected internal virtual void Delete(TEntity entity) + { + Repository.Delete(entity); + } + + protected internal virtual object FulfillPropertyOn(TEntity entity, string propertyName, string queryValue) + { + var container = Services.Container; + + if (propertyName.IsCaseInsensitiveEqual("Country")) + { + return container.Resolve().GetCountryByTwoOrThreeLetterIsoCode(queryValue); + } + else if (propertyName.IsCaseInsensitiveEqual("StateProvince")) + { + return container.Resolve().GetStateProvinceByAbbreviation(queryValue); + } + else if (propertyName.IsCaseInsensitiveEqual("Language")) + { + return container.Resolve().GetLanguageByCulture(queryValue); + } + else if (propertyName.IsCaseInsensitiveEqual("Currency")) + { + return container.Resolve().GetCurrencyByCode(queryValue); + } + + return null; + } + + protected internal virtual TEntity FulfillPropertiesOn(TEntity entity) + { + try + { + if (entity == null) + return entity; + + var queries = Request.RequestUri.ParseQueryString(); + + if (queries == null || queries.Count <= 0) + return entity; + + foreach (string key in queries.AllKeys.Where(x => x.StartsWith(WebApiGlobal.QueryOption.Fulfill))) + { + string propertyName = key.Substring(WebApiGlobal.QueryOption.Fulfill.Length); + string queryValue = queries.Get(key); + + if (propertyName.HasValue() && queryValue.HasValue()) + { + var prop = FastProperty.GetProperty(entity.GetType(), propertyName); + if (prop != null) + { + var propertyValue = prop.GetValue(entity); + if (propertyValue == null) + { + object value = FulfillPropertyOn(entity, propertyName, queryValue); + + // there's no requirement to set a property value of null + if (value != null) + { + prop.SetValue(entity, value); + } + } + } + } + } + } + catch (Exception ex) + { + throw this.ExceptionUnprocessableEntity(ex.Message); + } + + return entity; + } + + protected internal virtual T ReadContent() + { + var formatters = ODataMediaTypeFormatters + .Create() + .Select(formatter => formatter.GetPerRequestFormatterInstance(typeof(T), Request, Request.Content.Headers.ContentType)); + + return Request.Content.ReadAsAsync(formatters).Result; + } + } + + #region Old WebApiEntityController + + //public abstract class WebApiEntityController : EntitySetController + // where TEntity : BaseEntity, new() + //{ + + // protected internal HttpResponseException ExceptionEntityNotFound(TKey key) + // { + // var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, + // WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + + // return new HttpResponseException(response); + // } + + // protected internal HttpResponseException ExceptionNotExpanded(Expression> path) + // { + // // NotFound cause of nullable properties + // var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, + // WebApiGlobal.Error.PropertyNotExpanded.FormatInvariant(path.ToString())); + + // return new HttpResponseException(response); + // } + + // public override HttpResponseMessage HandleUnmappedRequest(ODataPath odataPath) + // { + // if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/property") || + // odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/cast/property") || + // odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/unresolved")) + // { + // if (Request.Method == HttpMethod.Get || Request.Method == HttpMethod.Post) + // { + // return UnmappedGetProperty(odataPath); + // } + // } + // else if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/navigation/key")) + // { + // if (Request.Method == HttpMethod.Get || Request.Method == HttpMethod.Post || Request.Method == HttpMethod.Delete) + // { + // // we ignore standard odata path cause they differ: + // // ~/entityset/key/$links/navigation (odata 3 "link"), ~/entityset/key/navigation/$ref (odata 4 "reference") + + // return UnmappedGetNavigation(odataPath); + // } + // } + // else if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/navigation")) + // { + // if (Request.Method == HttpMethod.Delete) + // { + // return UnmappedGetNavigation(odataPath); + // } + // } + + // return base.HandleUnmappedRequest(odataPath); + // } + + // protected virtual internal HttpResponseMessage UnmappedGetProperty(ODataPath odataPath) + // { + // int key; + + // if (!odataPath.GetNormalizedKey(1, out key)) + // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoKeyFromPath); + + // var entity = GetEntityByKey(key); + + // if (entity == null) + // return Request.CreateErrorResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + + // FastProperty prop = null; + // string propertyName = null; + // var lastSegment = odataPath.Segments.Last(); + // var propertySegment = (lastSegment as PropertyAccessPathSegment); + + // if (propertySegment == null) + // propertyName = lastSegment.ToString(); + // else + // propertyName = propertySegment.PropertyName; + + // if (propertyName.HasValue()) + // prop = FastProperty.GetProperty(entity.GetType(), propertyName); + + // if (prop == null) + // return UnmappedGetProperty(entity, propertyName ?? ""); + + // var propertyValue = prop.GetValue(entity); + + // return Request.CreateResponse(HttpStatusCode.OK, prop.Property.PropertyType, propertyValue); + // } + + // protected virtual internal HttpResponseMessage UnmappedGetProperty(TEntity entity, string propertyName) + // { + // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName)); + // } + + // protected virtual internal HttpResponseMessage UnmappedGetNavigation(ODataPath odataPath) + // { + // int key, relatedKey; + + // if (!odataPath.GetNormalizedKey(1, out key)) + // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoKeyFromPath); + + // var navigationProperty = odataPath.GetNavigation(2); + + // if (navigationProperty.IsEmpty()) + // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoNavigationFromPath); + + // if (!odataPath.GetNormalizedKey(3, out relatedKey) && Request.Method != HttpMethod.Delete) + // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoRelatedKeyFromPath); + + // var methodName = string.Concat("Navigation", navigationProperty); + // var methodInfo = GetType().GetMethod(methodName); + + // if (methodInfo != null) + // { + // HttpResponseMessage response = null; + + // this.ProcessEntity(() => + // { + // response = (HttpResponseMessage)methodInfo.Invoke(this, new object[] { key, relatedKey }); + // }); + + // return response; + // } + // return base.HandleUnmappedRequest(odataPath); + // } + + // /// + // /// Auto injected by Autofac + // /// + // public virtual IRepository Repository + // { + // get; + // set; + // } + + // /// + // /// Auto injected by Autofac + // /// + // public virtual TService Service + // { + // get; + // set; + // } + + // /// + // /// Auto injected by Autofac + // /// + // public virtual ICommonServices Services + // { + // get; + // set; + // } + + // public override IQueryable Get() + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // return this.GetEntitySet(); + // } + + // protected internal virtual IQueryable GetEntitySet() + // { + // return this.Repository.Table; + // } + + // protected internal virtual IQueryable GetExpandedEntitySet(Expression> path) + // { + // var query = GetEntitySet().Expand(path); + // return query; + // } + + // protected internal virtual IQueryable GetExpandedEntitySet(string properties) + // { + // var query = GetEntitySet(); + + // foreach (var property in properties.SplitSafe(",")) + // { + // query = query.Expand(property.Trim()); + // } + + // return query; + // } + + // protected override int GetKey(TEntity entity) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // return entity.Id; + // } + + // protected override TEntity GetEntityByKey(int key) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // return this.Repository.GetById(key); + // } + + // protected internal virtual TEntity GetEntityByKeyNotNull(int key) + // { + // var entity = GetEntityByKey(key); + + // if (entity == null) + // throw ExceptionEntityNotFound(key); + + // return entity; + // } + + // protected internal virtual SingleResult GetSingleResult(int key) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // return SingleResult.Create(GetEntitySet().Where(x => x.Id == key)); + // } + + // protected internal virtual TEntity GetExpandedEntity(int key, Expression> path) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // var query = GetExpandedEntitySet(path); + + // var entity = query.FirstOrDefault(x => x.Id == key); + + // if (entity == null) + // throw ExceptionEntityNotFound(key); + + // return entity; + // } + // protected internal virtual TEntity GetExpandedEntity(int key, string properties) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // var query = GetExpandedEntitySet(properties); + + // var entity = query.FirstOrDefault(x => x.Id == key); + + // if (entity == null) + // throw ExceptionEntityNotFound(key); + + // return entity; + // } + + // protected internal virtual TEntity GetExpandedEntity(int key, SingleResult result, string path) + // { + // var query = result.Queryable; + + // foreach (var property in path.SplitSafe(",")) + // { + // query = query.Expand(property.Trim()); + // } + + // var entity = query.FirstOrDefault(x => x.Id == key); + + // if (entity == null) + // throw ExceptionEntityNotFound(key); + + // return entity; + // } + + // protected internal virtual TProperty GetExpandedProperty(int key, Expression> path) + // { + // var entity = GetExpandedEntity(key, path); + + // var expression = path.CompileFast(PropertyCachingStrategy.EagerCached); + // var property = expression.Invoke(entity); + + // if (property == null) + // throw ExceptionNotExpanded(path); + + // return property; + // } + + // protected internal virtual IQueryable GetRelatedCollection( + // int key, + // Expression>> navigationProperty) + // { + // Guard.NotNull(navigationProperty, nameof(navigationProperty)); + + // var query = GetEntitySet().Where(x => x.Id.Equals(key)); + // return query.SelectMany(navigationProperty); + // } + + // protected internal virtual IQueryable GetRelatedCollection( + // int key, + // string navigationProperty) + // { + // Guard.NotEmpty(navigationProperty, nameof(navigationProperty)); + + // var ctx = (DbContext)Repository.Context; + // var product = GetEntityByKey(key); + // var entry = ctx.Entry(product); + // var query = entry.Collection(navigationProperty).Query(); + + // return query.Cast(); + // } + + // protected internal virtual SingleResult GetRelatedEntity( + // int key, + // Expression> navigationProperty) + // { + // Guard.NotNull(navigationProperty, nameof(navigationProperty)); + + // var query = GetEntitySet().Where(x => x.Id.Equals(key)).Select(navigationProperty); + // return SingleResult.Create(query); + // } + + // protected internal virtual SingleResult GetRelatedEntity( + // int key, + // string navigationProperty) + // { + // Guard.NotEmpty(navigationProperty, nameof(navigationProperty)); + + // var ctx = (DbContext)Repository.Context; + // var product = GetEntityByKey(key); + // var entry = ctx.Entry(product); + // var query = entry.Reference(navigationProperty).Query().Cast(); + + // return SingleResult.Create(query); + // } + + // public override HttpResponseMessage Post(TEntity entity) + // { + // var response = Request.CreateResponse(HttpStatusCode.OK, CreateEntity(entity)); + + // try + // { + // var entityUrl = Url.CreateODataLink( + // new EntitySetPathSegment(entity.GetType().Name.EnsureEndsWith("s")), + // new KeyValuePathSegment(entity.Id.ToString()) + // ); + + // response.Headers.Location = new Uri(entityUrl); + // } + // catch { } + + // return response; + // } + + // protected override TEntity CreateEntity(TEntity entity) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // if (entity == null) + // throw this.ExceptionBadRequest(WebApiGlobal.Error.NoDataToInsert); + + // Insert(FulfillPropertiesOn(entity)); + + // return entity; + // } + + // protected internal virtual void Insert(TEntity entity) + // { + // Repository.Insert(entity); + // } + + // public override HttpResponseMessage Put(int key, TEntity update) + // { + // return Request.CreateResponse(HttpStatusCode.OK, UpdateEntity(key, update)); + // } + + // protected override TEntity UpdateEntity(int key, TEntity update) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // var originalEntity = GetEntityByKeyNotNull(key); + + // var context = ((IObjectContextAdapter)this.Repository.Context).ObjectContext; + // var container = context.MetadataWorkspace.GetEntityContainer(context.DefaultContainerName, DataSpace.CSpace); + + // string entityName = typeof(TEntity).Name; + // string entitySetName = container.BaseEntitySets.First(x => x.ElementType.Name == entityName).Name; + + // update.Id = key; + // var entity = context.ApplyCurrentValues(entitySetName, update); + + // Update(FulfillPropertiesOn(entity)); + + // return entity; + // } + + // protected internal virtual void Update(TEntity entity) + // { + // Repository.Update(entity); + // } + + // public override HttpResponseMessage Patch(int key, Delta patch) + // { + // return Request.CreateResponse(HttpStatusCode.OK, PatchEntity(key, patch)); + // } + + // protected override TEntity PatchEntity(int key, Delta patch) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // var entity = GetEntityByKeyNotNull(key); + + // if (patch != null) + // patch.Patch(entity); + + // Update(FulfillPropertiesOn(entity)); + + // return entity; + // } + + // public override void Delete(int key) + // { + // if (!ModelState.IsValid) + // throw this.ExceptionInvalidModelState(); + + // var entity = GetEntityByKeyNotNull(key); + + // Delete(entity); + // } + + // protected internal virtual void Delete(TEntity entity) + // { + // Repository.Delete(entity); + // } + + // protected internal virtual object FulfillPropertyOn(TEntity entity, string propertyName, string queryValue) + // { + // var container = Services.Container; + + // if (propertyName.IsCaseInsensitiveEqual("Country")) + // { + // return container.Resolve().GetCountryByTwoOrThreeLetterIsoCode(queryValue); + // } + // else if (propertyName.IsCaseInsensitiveEqual("StateProvince")) + // { + // return container.Resolve().GetStateProvinceByAbbreviation(queryValue); + // } + // else if (propertyName.IsCaseInsensitiveEqual("Language")) + // { + // return container.Resolve().GetLanguageByCulture(queryValue); + // } + // else if (propertyName.IsCaseInsensitiveEqual("Currency")) + // { + // return container.Resolve().GetCurrencyByCode(queryValue); + // } + + // return null; + // } + + // protected internal virtual TEntity FulfillPropertiesOn(TEntity entity) + // { + // try + // { + // if (entity == null) + // return entity; + + // var queries = Request.RequestUri.ParseQueryString(); + + // if (queries == null || queries.Count <= 0) + // return entity; + + // foreach (string key in queries.AllKeys.Where(x => x.StartsWith(WebApiGlobal.QueryOption.Fulfill))) + // { + // string propertyName = key.Substring(WebApiGlobal.QueryOption.Fulfill.Length); + // string queryValue = queries.Get(key); + + // if (propertyName.HasValue() && queryValue.HasValue()) + // { + // var prop = FastProperty.GetProperty(entity.GetType(), propertyName); + // if (prop != null) + // { + // var propertyValue = prop.GetValue(entity); + // if (propertyValue == null) + // { + // object value = FulfillPropertyOn(entity, propertyName, queryValue); + + // // there's no requirement to set a property value of null + // if (value != null) + // { + // prop.SetValue(entity, value); + // } + // } + // } + // } + // } + // } + // catch (Exception ex) + // { + // throw this.ExceptionUnprocessableEntity(ex.Message); + // } + + // return entity; + // } + + // protected internal virtual T ReadContent() + // { + // var formatters = ODataMediaTypeFormatters.Create() + // .Select(formatter => formatter.GetPerRequestFormatterInstance(typeof(T), Request, Request.Content.Headers.ContentType)); + + // return Request.Content.ReadAsAsync(formatters).Result; + // } + //} + + #endregion + + #region Old Odata3 EntitySetController + + //[CLSCompliant(false)] + //[ODataNullValue] + //public abstract class EntitySetController : ODataController + //where TEntity : class + //{ + // /// Gets the OData path of the current request. + // public ODataPath ODataPath + // { + // get + // { + // return EntitySetControllerHelpers.GetODataPath(this); + // } + // } + + // /// Gets the OData query options of the current request. + // public ODataQueryOptions QueryOptions + // { + // get + // { + // return EntitySetControllerHelpers.CreateQueryOptions(this); + // } + // } + + // protected EntitySetController() + // { + // } + + // /// This method should be overridden to create a new entity in the entity set. + // /// The created entity. + // /// The entity to add to the entity set. + // protected internal virtual TEntity CreateEntity(TEntity entity) + // { + // throw EntitySetControllerHelpers.CreateEntityNotImplementedResponse(base.get_Request()); + // } + + // /// This method should be overridden to handle POST and PUT requests that attempt to create a link between two entities. + // /// The key of the entity with the navigation property. + // /// The name of the navigation property. + // /// The URI of the entity to link. + // [AcceptVerbs(new string[] { "POST", "PUT" })] + // public virtual void CreateLink([FromODataUri] TKey key, string navigationProperty, [FromBody] Uri link) + // { + // throw EntitySetControllerHelpers.CreateLinkNotImplementedResponse(base.get_Request(), navigationProperty); + // } + + // /// This method should be overriden to handle DELETE requests for deleting existing entities from the entity set. + // /// The entity key of the entity to delete. + // public virtual void Delete([FromODataUri] TKey key) + // { + // throw EntitySetControllerHelpers.DeleteEntityNotImplementedResponse(base.get_Request()); + // } + + // /// This method should be overridden to handle DELETE requests that attempt to break a relationship between two entities. + // /// The key of the entity with the navigation property. + // /// The name of the navigation property. + // /// The URI of the entity to remove from the navigation property. + // public virtual void DeleteLink([FromODataUri] TKey key, string navigationProperty, [FromBody] Uri link) + // { + // throw EntitySetControllerHelpers.DeleteLinkNotImplementedResponse(base.get_Request(), navigationProperty); + // } + + // /// This method should be overridden to handle DELETE requests that attempt to break a relationship between two entities. + // /// The key of the entity with the navigation property. + // /// The key of the related entity. + // /// The name of the navigation property. + // public virtual void DeleteLink([FromODataUri] TKey key, string relatedKey, string navigationProperty) + // { + // throw EntitySetControllerHelpers.DeleteLinkNotImplementedResponse(base.get_Request(), navigationProperty); + // } + + // /// This method should be overridden to handle GET requests that attempt to retrieve entities from the entity set. + // /// The matching entities from the entity set. + // public virtual IQueryable Get() + // { + // throw EntitySetControllerHelpers.GetNotImplementedResponse(base.get_Request()); + // } + + // /// Handles GET requests that attempt to retrieve an individual entity by key from the entity set. + // /// The response message to send back to the client. + // /// The entity key of the entity to retrieve. + // public virtual HttpResponseMessage Get([FromODataUri] TKey key) + // { + // TEntity entityByKey = this.GetEntityByKey(key); + // return EntitySetControllerHelpers.GetByKeyResponse(base.get_Request(), entityByKey); + // } + + // /// This method should be overridden to retrieve an entity by key from the entity set. + // /// The retrieved entity, or null if an entity with the specified entity key cannot be found in the entity set. + // /// The entity key of the entity to retrieve. + // protected internal virtual TEntity GetEntityByKey(TKey key) + // { + // throw EntitySetControllerHelpers.GetEntityByKeyNotImplementedResponse(base.get_Request()); + // } + + // /// This method should be overridden to get the entity key of the specified entity. + // /// The entity key value + // /// The entity. + // protected internal virtual TKey GetKey(TEntity entity) + // { + // throw EntitySetControllerHelpers.GetKeyNotImplementedResponse(base.get_Request()); + // } + + // /// This method should be overridden to handle all unmapped OData requests. + // /// The response message to send back to the client. + // /// The OData path of the request. + // [AcceptVerbs(new string[] { "GET", "POST", "PUT", "PATCH", "MERGE", "DELETE" })] + // public virtual HttpResponseMessage HandleUnmappedRequest(ODataPath odataPath) + // { + // throw EntitySetControllerHelpers.UnmappedRequestResponse(base.get_Request(), odataPath); + // } + + // /// Handles PATCH and MERGE requests to partially update a single entity in the entity set. + // /// The response message to send back to the client. + // /// The entity key of the entity to update. + // /// The patch representing the partial update. + // [AcceptVerbs(new string[] { "PATCH", "MERGE" })] + // public virtual HttpResponseMessage Patch([FromODataUri] TKey key, Delta patch) + // { + // TEntity tEntity = this.PatchEntity(key, patch); + // return EntitySetControllerHelpers.PatchResponse(base.get_Request(), tEntity); + // } + + // /// This method should be overridden to apply a partial update to an existing entity in the entity set. + // /// The updated entity. + // /// The entity key of the entity to update. + // /// The patch representing the partial update. + // protected internal virtual TEntity PatchEntity(TKey key, Delta patch) + // { + // throw EntitySetControllerHelpers.PatchEntityNotImplementedResponse(base.get_Request()); + // } + + // /// Handles POST requests that create new entities in the entity set. + // /// The response message to send back to the client. + // /// The entity to insert into the entity set. + // public virtual HttpResponseMessage Post([FromBody] TEntity entity) + // { + // TEntity tEntity = this.CreateEntity(entity); + // return EntitySetControllerHelpers.PostResponse(this, tEntity, this.GetKey(entity)); + // } + + // /// Handles PUT requests that attempt to replace a single entity in the entity set. + // /// The response message to send back to the client. + // /// The entity key of the entity to replace. + // /// The updated entity. + // public virtual HttpResponseMessage Put([FromODataUri] TKey key, [FromBody] TEntity update) + // { + // TEntity tEntity = this.UpdateEntity(key, update); + // return EntitySetControllerHelpers.PutResponse(base.get_Request(), tEntity); + // } + + // /// This method should be overridden to update an existing entity in the entity set. + // /// The updated entity. + // /// The entity key of the entity to update. + // /// The updated entity. + // protected internal virtual TEntity UpdateEntity(TKey key, TEntity update) + // { + // throw EntitySetControllerHelpers.UpdateEntityNotImplementedResponse(base.get_Request()); + // } + //} + + + //internal static class EntitySetControllerHelpers + //{ + // private const string PreferHeaderName = "Prefer"; + + // private const string PreferenceAppliedHeaderName = "Preference-Applied"; + + // private const string ReturnContentHeaderValue = "return-content"; + + // private const string ReturnNoContentHeaderValue = "return-no-content"; + + // public static HttpResponseException CreateEntityNotImplementedResponse(HttpRequestMessage request) + // { + // ODataError oDataError = new ODataError(); + // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedCreate); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; + // object[] objArray = new object[] { "POST" }; + // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static HttpResponseException CreateLinkNotImplementedResponse(HttpRequestMessage request, string navigationProperty) + // { + // ODataError oDataError = new ODataError(); + // string entitySetControllerUnsupportedCreateLink = SRResources.EntitySetControllerUnsupportedCreateLink; + // object[] objArray = new object[] { navigationProperty }; + // oDataError.set_Message(Error.Format(entitySetControllerUnsupportedCreateLink, objArray)); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // oDataError.set_ErrorCode(SRResources.EntitySetControllerUnsupportedCreateLinkErrorCode); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static ODataQueryOptions CreateQueryOptions(ApiController controller) + // { + // ODataQueryContext oDataQueryContext = new ODataQueryContext(controller.get_Request().ODataProperties().Model, typeof(TEntity)); + // return new ODataQueryOptions(oDataQueryContext, controller.get_Request()); + // } + + // public static HttpResponseException DeleteEntityNotImplementedResponse(HttpRequestMessage request) + // { + // ODataError oDataError = new ODataError(); + // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedDelete); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; + // object[] objArray = new object[] { "DELETE" }; + // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static HttpResponseException DeleteLinkNotImplementedResponse(HttpRequestMessage request, string navigationProperty) + // { + // ODataError oDataError = new ODataError(); + // string entitySetControllerUnsupportedDeleteLink = SRResources.EntitySetControllerUnsupportedDeleteLink; + // object[] objArray = new object[] { navigationProperty }; + // oDataError.set_Message(Error.Format(entitySetControllerUnsupportedDeleteLink, objArray)); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // oDataError.set_ErrorCode(SRResources.EntitySetControllerUnsupportedDeleteLinkErrorCode); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static HttpResponseMessage GetByKeyResponse(HttpRequestMessage request, TEntity entity) + // { + // if (entity == null) + // { + // return HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotFound); + // } + // return HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.OK, entity); + // } + + // public static HttpResponseException GetEntityByKeyNotImplementedResponse(HttpRequestMessage request) + // { + // ODataError oDataError = new ODataError(); + // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedGetByKey); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // oDataError.set_ErrorCode(SRResources.EntitySetControllerUnsupportedGetByKeyErrorCode); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static HttpResponseException GetKeyNotImplementedResponse(HttpRequestMessage request) + // { + // ODataError oDataError = new ODataError(); + // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedGetKey); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; + // object[] objArray = new object[] { "POST" }; + // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static HttpResponseException GetNotImplementedResponse(HttpRequestMessage request) + // { + // ODataError oDataError = new ODataError(); + // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedGet); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; + // object[] objArray = new object[] { "GET" }; + // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static ODataPath GetODataPath(ApiController controller) + // { + // return controller.get_Request().ODataProperties().Path; + // } + + // public static HttpResponseException PatchEntityNotImplementedResponse(HttpRequestMessage request) + // { + // ODataError oDataError = new ODataError(); + // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedPatch); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; + // object[] objArray = new object[] { "PATCH" }; + // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static HttpResponseMessage PatchResponse(HttpRequestMessage request, TEntity patchedEntity) + // { + // if (!EntitySetControllerHelpers.RequestPrefersReturnContent(request)) + // { + // return HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NoContent); + // } + // HttpResponseMessage httpResponseMessage = HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.OK, patchedEntity); + // httpResponseMessage.Headers.Add("Preference-Applied", "return-content"); + // return httpResponseMessage; + // } + + // public static HttpResponseMessage PostResponse(ApiController controller, TEntity createdEntity, TKey entityKey) + // { + // HttpResponseMessage httpResponseMessage = null; + // HttpRequestMessage request = controller.get_Request(); + // if (!EntitySetControllerHelpers.RequestPrefersReturnNoContent(request)) + // { + // httpResponseMessage = HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.Created, createdEntity); + // } + // else + // { + // httpResponseMessage = HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NoContent); + // httpResponseMessage.Headers.Add("Preference-Applied", "return-no-content"); + // } + // ODataPath path = request.ODataProperties().Path; + // if (path == null) + // { + // throw Error.InvalidOperation(SRResources.LocationHeaderMissingODataPath, new object[0]); + // } + // EntitySetPathSegment entitySetPathSegment = path.Segments.FirstOrDefault() as EntitySetPathSegment; + // if (entitySetPathSegment == null) + // { + // throw Error.InvalidOperation(SRResources.LocationHeaderDoesNotStartWithEntitySet, new object[0]); + // } + // UrlHelper url = controller.get_Url() ?? new UrlHelper(request); + // HttpResponseHeaders headers = httpResponseMessage.Headers; + // ODataPathSegment[] keyValuePathSegment = new ODataPathSegment[] { entitySetPathSegment, new KeyValuePathSegment(ODataUriUtils.ConvertToUriLiteral(entityKey, 2)) }; + // headers.Location = new Uri(url.CreateODataLink(keyValuePathSegment)); + // return httpResponseMessage; + // } + + // public static HttpResponseMessage PutResponse(HttpRequestMessage request, TEntity updatedEntity) + // { + // if (!EntitySetControllerHelpers.RequestPrefersReturnContent(request)) + // { + // return HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NoContent); + // } + // HttpResponseMessage httpResponseMessage = HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.OK, updatedEntity); + // httpResponseMessage.Headers.Add("Preference-Applied", "return-content"); + // return httpResponseMessage; + // } + + // internal static bool RequestPrefersReturnContent(HttpRequestMessage request) + // { + // IEnumerable strs = null; + // if (!request.Headers.TryGetValues("Prefer", out strs)) + // { + // return false; + // } + // return strs.Contains("return-content"); + // } + + // internal static bool RequestPrefersReturnNoContent(HttpRequestMessage request) + // { + // IEnumerable strs = null; + // if (!request.Headers.TryGetValues("Prefer", out strs)) + // { + // return false; + // } + // return strs.Contains("return-no-content"); + // } + + // public static HttpResponseException UnmappedRequestResponse(HttpRequestMessage request, ODataPath odataPath) + // { + // ODataError oDataError = new ODataError(); + // string entitySetControllerUnmappedRequest = SRResources.EntitySetControllerUnmappedRequest; + // object[] pathTemplate = new object[] { odataPath.PathTemplate }; + // oDataError.set_Message(Error.Format(entitySetControllerUnmappedRequest, pathTemplate)); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // oDataError.set_ErrorCode(SRResources.EntitySetControllerUnmappedRequestErrorCode); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + + // public static HttpResponseException UpdateEntityNotImplementedResponse(HttpRequestMessage request) + // { + // ODataError oDataError = new ODataError(); + // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedUpdate); + // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); + // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; + // object[] objArray = new object[] { "PUT" }; + // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); + // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); + // } + //} + + #endregion } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiExtension.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiExtension.cs index 300b11cce0..1813acf708 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiExtension.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiExtension.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.Dependencies; -using System.Web.Http.OData.Routing; using SmartStore.Utilities; namespace SmartStore.Web.Framework.WebApi @@ -144,34 +143,34 @@ public static T GetQueryStringValue(this ApiController apiController, string return defaultValue; } - public static bool GetNormalizedKey(this ODataPath odataPath, int segmentIndex, out int key) - { - if (odataPath.Segments.Count > segmentIndex) - { - string rawKey = (odataPath.Segments[segmentIndex] as KeyValuePathSegment).Value; - if (rawKey.HasValue()) - { - if (rawKey.StartsWith("'")) - rawKey = rawKey.Substring(1, rawKey.Length - 2); - - if (int.TryParse(rawKey, out key)) - return true; - } - } - key = 0; - return false; - } - - public static string GetNavigation(this ODataPath odataPath, int segmentIndex) - { - if (odataPath.Segments.Count > segmentIndex) - { - string navigationProperty = (odataPath.Segments[segmentIndex] as NavigationPathSegment).NavigationPropertyName; - - return navigationProperty; - } - return null; - } + // public static bool GetNormalizedKey(this ODataPath odataPath, int segmentIndex, out int key) + //{ + // if (odataPath.Segments.Count > segmentIndex) + // { + // string rawKey = (odataPath.Segments[segmentIndex] as KeyValuePathSegment).Value; + // if (rawKey.HasValue()) + // { + // if (rawKey.StartsWith("'")) + // rawKey = rawKey.Substring(1, rawKey.Length - 2); + + // if (int.TryParse(rawKey, out key)) + // return true; + // } + // } + // key = 0; + // return false; + //} + + //public static string GetNavigation(this ODataPath odataPath, int segmentIndex) + //{ + // if (odataPath.Segments.Count > segmentIndex) + // { + // string navigationProperty = (odataPath.Segments[segmentIndex] as NavigationPathSegment).NavigationPropertyName; + + // return navigationProperty; + // } + // return null; + //} public static void DeleteLocalFiles(this MultipartFormDataStreamProvider provider) { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 331a2f65a3..034b0001a8 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -2,10 +2,11 @@ using System.Net.Http.Formatting; using System.Web.Http; using System.Web.Http.Cors; -using System.Web.Http.OData.Builder; -using System.Web.Http.OData.Extensions; -using System.Web.Http.OData.Routing; -using System.Web.Http.OData.Routing.Conventions; +using Microsoft.AspNet.OData.Builder; +using Microsoft.AspNet.OData.Extensions; +using Microsoft.AspNet.OData.Formatter; +using Microsoft.AspNet.OData.Routing; +using Microsoft.AspNet.OData.Routing.Conventions; using Newtonsoft.Json; using SmartStore.Core.Infrastructure; using SmartStore.Web.Framework.WebApi.Configuration; @@ -26,8 +27,12 @@ public void Start() RoutingConventions = ODataRoutingConventions.CreateDefault() }; + config.EnableDependencyInjection(); config.DependencyResolver = new AutofacWebApiDependencyResolver(); + var odataFormatters = ODataMediaTypeFormatters.Create(); + config.Formatters.InsertRange(0, odataFormatters); + config.Formatters.JsonFormatter.SerializerSettings.Formatting = Formatting.Indented; config.Formatters.JsonFormatter.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; config.Formatters.JsonFormatter.SerializerSettings.ContractResolver = new WebApiContractResolver(config.Formatters.JsonFormatter); @@ -44,6 +49,8 @@ public void Start() var configPublisher = (IWebApiConfigurationPublisher)config.DependencyResolver.GetService(typeof(IWebApiConfigurationPublisher)); configPublisher.Configure(configBroadcaster); + config.Select().Expand().Filter().OrderBy().MaxTop(WebApiGlobal.DefaultMaxTop).Count(); + //config.Services.Insert(typeof(ModelBinderProvider), 0, // new SimpleModelBinderProvider(typeof(Address), new AddressModelBinder())); @@ -61,20 +68,20 @@ public void Start() new { version = "v1", controller = "Home", id = RouteParameter.Optional }); } } - catch (Exception) { } + catch { } try { - if (!config.Routes.ContainsKey(WebApiGlobal.RouteNameDefaultOdata)) - { - config.Routes.MapODataServiceRoute(WebApiGlobal.RouteNameDefaultOdata, WebApiGlobal.MostRecentOdataPath, - configBroadcaster.ModelBuilder.GetEdmModel(), new DefaultODataPathHandler(), configBroadcaster.RoutingConventions); - } - } - catch (Exception) { } - } + if (!config.Routes.ContainsKey(WebApiGlobal.RouteNameDefaultOdata)) + { + config.MapODataServiceRoute(WebApiGlobal.RouteNameDefaultOdata, WebApiGlobal.MostRecentOdataPath, + configBroadcaster.ModelBuilder.GetEdmModel(), new DefaultODataPathHandler(), configBroadcaster.RoutingConventions); + } + } + catch { } + } - public int Order + public int Order { get { return 0; } } diff --git a/src/Presentation/SmartStore.Web.Framework/packages.config b/src/Presentation/SmartStore.Web.Framework/packages.config index c678081470..26c77b0ca5 100644 --- a/src/Presentation/SmartStore.Web.Framework/packages.config +++ b/src/Presentation/SmartStore.Web.Framework/packages.config @@ -16,25 +16,38 @@ + - - - - + + + + + + + + + + + + + + + - + + \ No newline at end of file From 83671cad93a49fd5d0397af1fa0c638cadb12221 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 6 Aug 2020 13:26:31 +0200 Subject: [PATCH 002/695] API: using Microsoft.AspNet.OData 5.10.0 --- .../Controllers/OData/CurrenciesController.cs | 119 +++++++++++++++--- .../Controllers/OData/OrdersController.cs | 2 +- .../Controllers/OData/PicturesController.cs | 2 +- .../Controllers/OData/ProductsController.cs | 2 +- .../Extensions/MiscExtensions.cs | 2 +- .../Swagger/SwaggerOdataDocumentFilter.cs | 4 +- .../SmartStore.WebApi.csproj | 28 ++--- .../WebApiConfigurationProvider.cs | 2 +- src/Plugins/SmartStore.WebApi/packages.config | 22 +--- .../SmartStore.Web.Framework.csproj | 24 ++-- .../WebApiConfigurationBroadcaster.cs | 4 +- .../WebApi/OData/WebApiQueryableAttribute.cs | 16 ++- .../WebApi/WebApiEntityController.cs | 32 +++-- .../WebApi/WebApiStartupTask.cs | 27 ++-- .../SmartStore.Web.Framework/packages.config | 22 +--- 15 files changed, 182 insertions(+), 126 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index c2cdc39ee3..86b5b2b10b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -1,5 +1,9 @@ -using System.Linq; +using System.Data.Entity.Infrastructure; +using System.Linq; +using System.Net; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; @@ -11,36 +15,115 @@ namespace SmartStore.WebApi.Controllers.OData { public class CurrenciesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Create)] - protected override void Insert(Currency entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] + public IQueryable Get() { - Service.InsertCurrency(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Update)] - protected override void Update(Currency entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] + public SingleResult Get(int key) { - Service.UpdateCurrency(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Delete)] - protected override void Delete(Currency entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Create)] + public IHttpActionResult Post(Currency entity) { - Service.DeleteCurrency(entity); + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + entity = FulfillPropertiesOn(entity); + Service.InsertCurrency(entity); + + return Created(entity); } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] - public IQueryable Get() + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Update)] + public async Task Put(int key, Currency entity) { - return GetEntitySet(); + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + if (key != entity.Id) + { + return BadRequest(); + } + + entity = FulfillPropertiesOn(entity); + + try + { + Service.UpdateCurrency(entity); + } + catch (DbUpdateConcurrencyException) + { + if (await Repository.GetByIdAsync(key) == null) + { + return NotFound(); + } + else + { + throw; + } + } + + return Updated(entity); } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] - public SingleResult GetCurrency(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Update)] + public async Task Patch(int key, Delta model) { - return GetSingleResult(key); + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + var entity = await Repository.GetByIdAsync(key); + if (entity == null) + { + return NotFound(); + } + + model?.Patch(entity); + entity = FulfillPropertiesOn(entity); + + try + { + Service.UpdateCurrency(entity); + } + catch (DbUpdateConcurrencyException) + { + if (await Repository.GetByIdAsync(key) == null) + { + return NotFound(); + } + else + { + throw; + } + } + + return Updated(entity); + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Delete)] + public async Task Delete(int key) + { + var entity = await Repository.GetByIdAsync(key); + if (entity == null) + { + return NotFound(); + } + + Service.DeleteCurrency(entity); + + return StatusCode(HttpStatusCode.NoContent); } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index eef665f97d..e9ad7ea3a6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Net.Http; using System.Web.Http; -using Microsoft.AspNet.OData; +using System.Web.OData; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs index c92054c8ba..bad29f51be 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs @@ -4,7 +4,7 @@ using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; -using Microsoft.AspNet.OData; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Media; using SmartStore.Services.Media; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 536eb86889..c606b90257 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Web.Http; using System.Web.Http.ModelBinding; -using Microsoft.AspNet.OData; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Discounts; diff --git a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs index 834e98b1cf..2b9a045eff 100644 --- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs @@ -1,6 +1,6 @@ using System.Text; using System.Web.Mvc; -using Microsoft.AspNet.OData; +using System.Web.OData; using SmartStore.Core.Infrastructure; using SmartStore.Services.Localization; diff --git a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs index 15359e30eb..1b5d7065a7 100644 --- a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs +++ b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs @@ -3,8 +3,8 @@ using System.Reflection; using System.Web.Http; using System.Web.Http.Description; -using Microsoft.AspNet.OData; -using Microsoft.AspNet.OData.Routing; +using System.Web.OData; +using System.Web.OData.Routing; using Swashbuckle.Swagger; namespace SmartStore.WebApi.Services.Swagger diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 9a4a662f07..ebe283312f 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -103,31 +103,19 @@ ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll False - - ..\..\packages\Microsoft.AspNet.OData.7.4.1\lib\net45\Microsoft.AspNet.OData.dll - True - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - ..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - True - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll True - - ..\..\packages\Microsoft.OData.Core.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll + + ..\..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll True - - ..\..\packages\Microsoft.OData.Edm.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll - True - - - ..\..\packages\Microsoft.Spatial.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll + + ..\..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll True @@ -186,6 +174,10 @@ ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll False + + ..\..\packages\Microsoft.AspNet.OData.5.10.0\lib\net45\System.Web.OData.dll + True + ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll False diff --git a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs index ce90a72f30..971baef874 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using Microsoft.AspNet.OData.Builder; +using System.Web.OData.Builder; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; diff --git a/src/Plugins/SmartStore.WebApi/packages.config b/src/Plugins/SmartStore.WebApi/packages.config index ff71ebcf50..df454e7331 100644 --- a/src/Plugins/SmartStore.WebApi/packages.config +++ b/src/Plugins/SmartStore.WebApi/packages.config @@ -6,7 +6,7 @@ - + @@ -14,24 +14,10 @@ - - - - - + + + - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 27cd2a80c5..7c046c61c1 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -113,23 +113,14 @@ ..\..\packages\LibSassHost.1.2.2\lib\net45\LibSassHost.dll - - ..\..\packages\Microsoft.AspNet.OData.7.4.1\lib\net45\Microsoft.AspNet.OData.dll + + ..\..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll - - ..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll + + ..\..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - ..\..\packages\Microsoft.OData.Core.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll - - - ..\..\packages\Microsoft.OData.Edm.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll - - - ..\..\packages\Microsoft.Spatial.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll + + ..\..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll True @@ -177,6 +168,9 @@ ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + + ..\..\packages\Microsoft.AspNet.OData.5.10.0\lib\net45\System.Web.OData.dll + False ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs index 36a8fa781f..2074c164b1 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Web.Http; -using Microsoft.AspNet.OData.Builder; -using Microsoft.AspNet.OData.Routing.Conventions; +using System.Web.OData.Builder; +using System.Web.OData.Routing.Conventions; namespace SmartStore.Web.Framework.WebApi.Configuration { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs index 45d2e50481..424f52df82 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs @@ -3,11 +3,15 @@ using System.Net.Http; using System.Web.Http; using System.Web.Http.Filters; -using Microsoft.AspNet.OData; +using System.Web.OData; using SmartStore.Web.Framework.WebApi.Caching; namespace SmartStore.Web.Framework.WebApi.OData { + /// + /// The [EnableQuery] attribute enables clients to modify the query, by using query options such as $filter, $sort, and $page. + /// + /// public class WebApiQueryableAttribute : EnableQueryAttribute { public bool PagingOptional { get; set; } @@ -15,7 +19,9 @@ public class WebApiQueryableAttribute : EnableQueryAttribute protected virtual bool MissingClientPaging(HttpActionExecutedContext actionExecutedContext) { if (PagingOptional) + { return false; + } try { @@ -49,9 +55,9 @@ protected virtual bool MissingClientPaging(HttpActionExecutedContext actionExecu return true; } } - catch (Exception exception) + catch (Exception ex) { - exception.Dump(); + ex.Dump(); } return false; @@ -59,8 +65,8 @@ protected virtual bool MissingClientPaging(HttpActionExecutedContext actionExecu public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext) { - //if (MissingClientPaging(actionExecutedContext)) - // return; + if (MissingClientPaging(actionExecutedContext)) + return; base.OnActionExecuted(actionExecutedContext); } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index d5b9d88c19..034bdc8ac8 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -6,13 +6,13 @@ using System.Net; using System.Net.Http; using System.Web.Http; +using System.Web.OData; +using System.Web.OData.Formatter; //using System.Web.Http.OData; //using System.Web.Http.OData.Extensions; //using System.Web.Http.OData.Formatter; //using System.Web.Http.OData.Routing; using Autofac; -using Microsoft.AspNet.OData; -using Microsoft.AspNet.OData.Formatter; using SmartStore.ComponentModel; using SmartStore.Core; using SmartStore.Core.Data; @@ -25,10 +25,13 @@ namespace SmartStore.Web.Framework.WebApi public abstract class WebApiEntityController : ODataController where TEntity : BaseEntity, new() { - // TODO: overrides !!!??? + // TODO: Implement custom routing convention(s): // public override HttpResponseMessage HandleUnmappedRequest(ODataPath odataPath) + + // TODO: Needs to be handled by the respective controller: // protected override int GetKey(TEntity entity) // protected override TEntity GetEntityByKey(int key) + // public override HttpResponseMessage Post(TEntity entity) // protected override TEntity CreateEntity(TEntity entity) // public override HttpResponseMessage Put(int key, TEntity update) @@ -37,18 +40,21 @@ public abstract class WebApiEntityController : ODataControlle // protected override TEntity PatchEntity(int key, Delta patch) // public override void Delete(int key) + // TODO: + // XML serialization issues. + /// - /// Auto injected by Autofac + /// Auto injected by Autofac. /// public virtual IRepository Repository { get; set; } /// - /// Auto injected by Autofac + /// Auto injected by Autofac. /// public virtual TService Service { get; set; } /// - /// Auto injected by Autofac + /// Auto injected by Autofac. /// public virtual ICommonServices Services { get; set; } @@ -106,9 +112,19 @@ protected internal virtual TEntity GetEntityByKeyNotNull(int key) protected internal virtual SingleResult GetSingleResult(int key) { if (!ModelState.IsValid) + { throw this.ExceptionInvalidModelState(); + } - return SingleResult.Create(GetEntitySet().Where(x => x.Id == key)); + var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); + + return GetSingleResult(entity); + //return SingleResult.Create(GetEntitySet().Where(x => x.Id == key)); + } + + protected internal virtual SingleResult GetSingleResult(TEntity entity) + { + return SingleResult.Create(new[] { entity }.AsQueryable()); } protected internal virtual TEntity GetExpandedEntity(int key, Expression> path) @@ -809,7 +825,7 @@ protected internal virtual T ReadContent() #endregion - #region Old Odata3 EntitySetController + #region Old OData3 EntitySetController //[CLSCompliant(false)] //[ODataNullValue] diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 034b0001a8..04edd4fa8c 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -1,12 +1,11 @@ -using System; -using System.Net.Http.Formatting; +using System.Net.Http.Formatting; using System.Web.Http; using System.Web.Http.Cors; -using Microsoft.AspNet.OData.Builder; -using Microsoft.AspNet.OData.Extensions; -using Microsoft.AspNet.OData.Formatter; -using Microsoft.AspNet.OData.Routing; -using Microsoft.AspNet.OData.Routing.Conventions; +using System.Web.OData.Builder; +using System.Web.OData.Extensions; +using System.Web.OData.Formatter; +using System.Web.OData.Routing; +using System.Web.OData.Routing.Conventions; using Newtonsoft.Json; using SmartStore.Core.Infrastructure; using SmartStore.Web.Framework.WebApi.Configuration; @@ -15,8 +14,10 @@ namespace SmartStore.Web.Framework.WebApi { public class WebApiStartupTask : IApplicationStart - { - public void Start() + { + public int Order => 0; + + public void Start() { var config = GlobalConfiguration.Configuration; @@ -27,7 +28,6 @@ public void Start() RoutingConventions = ODataRoutingConventions.CreateDefault() }; - config.EnableDependencyInjection(); config.DependencyResolver = new AutofacWebApiDependencyResolver(); var odataFormatters = ODataMediaTypeFormatters.Create(); @@ -49,8 +49,6 @@ public void Start() var configPublisher = (IWebApiConfigurationPublisher)config.DependencyResolver.GetService(typeof(IWebApiConfigurationPublisher)); configPublisher.Configure(configBroadcaster); - config.Select().Expand().Filter().OrderBy().MaxTop(WebApiGlobal.DefaultMaxTop).Count(); - //config.Services.Insert(typeof(ModelBinderProvider), 0, // new SimpleModelBinderProvider(typeof(Address), new AddressModelBinder())); @@ -80,10 +78,5 @@ public void Start() } catch { } } - - public int Order - { - get { return 0; } - } } } diff --git a/src/Presentation/SmartStore.Web.Framework/packages.config b/src/Presentation/SmartStore.Web.Framework/packages.config index 26c77b0ca5..d2da9a8e5e 100644 --- a/src/Presentation/SmartStore.Web.Framework/packages.config +++ b/src/Presentation/SmartStore.Web.Framework/packages.config @@ -16,7 +16,7 @@ - + @@ -24,30 +24,16 @@ - - - - - + + + - - - - - - - - - - - - \ No newline at end of file From a8e958383722b45530ee0b12bbc50584236bf8ad Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 6 Aug 2020 16:14:43 +0200 Subject: [PATCH 003/695] API: CurrenciesController now shows a simple OData4 implementation --- .../Controllers/OData/CurrenciesController.cs | 89 ++--------------- .../WebApi/WebApiEntityController.cs | 97 +++++++++++++++++++ 2 files changed, 106 insertions(+), 80 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index 86b5b2b10b..6abbd30456 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -1,6 +1,4 @@ -using System.Data.Entity.Infrastructure; -using System.Linq; -using System.Net; +using System.Linq; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -32,98 +30,29 @@ public SingleResult Get(int key) [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Create)] public IHttpActionResult Post(Currency entity) { - if (!ModelState.IsValid) - { - return BadRequest(ModelState); - } - - entity = FulfillPropertiesOn(entity); - Service.InsertCurrency(entity); - - return Created(entity); + var result = Insert(entity, () => Service.InsertCurrency(entity)); + return result; } [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Update)] public async Task Put(int key, Currency entity) { - if (!ModelState.IsValid) - { - return BadRequest(ModelState); - } - if (key != entity.Id) - { - return BadRequest(); - } - - entity = FulfillPropertiesOn(entity); - - try - { - Service.UpdateCurrency(entity); - } - catch (DbUpdateConcurrencyException) - { - if (await Repository.GetByIdAsync(key) == null) - { - return NotFound(); - } - else - { - throw; - } - } - - return Updated(entity); + var result = await UpdateAsync(entity, key, () => Service.UpdateCurrency(entity)); + return result; } [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Update)] public async Task Patch(int key, Delta model) { - if (!ModelState.IsValid) - { - return BadRequest(ModelState); - } - - var entity = await Repository.GetByIdAsync(key); - if (entity == null) - { - return NotFound(); - } - - model?.Patch(entity); - entity = FulfillPropertiesOn(entity); - - try - { - Service.UpdateCurrency(entity); - } - catch (DbUpdateConcurrencyException) - { - if (await Repository.GetByIdAsync(key) == null) - { - return NotFound(); - } - else - { - throw; - } - } - - return Updated(entity); + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateCurrency(entity)); + return result; } [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Delete)] public async Task Delete(int key) { - var entity = await Repository.GetByIdAsync(key); - if (entity == null) - { - return NotFound(); - } - - Service.DeleteCurrency(entity); - - return StatusCode(HttpStatusCode.NoContent); + var result = await DeleteAsync(key, entity => Service.DeleteCurrency(entity)); + return result; } } } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 034bdc8ac8..25a77960fc 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -1,10 +1,12 @@ using System; using System.Collections.Generic; using System.Data.Entity; +using System.Data.Entity.Infrastructure; using System.Linq; using System.Linq.Expressions; using System.Net; using System.Net.Http; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using System.Web.OData.Formatter; @@ -240,6 +242,101 @@ protected internal virtual void Delete(TEntity entity) Repository.Delete(entity); } + protected internal virtual IHttpActionResult Insert(TEntity entity, Action insert) + { + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + entity = FulfillPropertiesOn(entity); + insert(); + + return Created(entity); + } + + protected internal virtual async Task UpdateAsync(TEntity entity, int key, Action update) + { + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + if (key != entity.Id) + { + return BadRequest($"Missing or differing key {key}."); + } + + entity = FulfillPropertiesOn(entity); + + try + { + update(); + } + catch (DbUpdateConcurrencyException) + { + if (await Repository.GetByIdAsync(key) == null) + { + return NotFound(); + } + else + { + throw; + } + } + + // Returns HTTP 204 No Content by default. + // Consumers can choose response through "Prefer" header. + return Updated(entity); + } + + protected internal virtual async Task PartiallyUpdateAsync(int key, Delta model, Action update) + { + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + var entity = await Repository.GetByIdAsync(key); + if (entity == null) + { + return NotFound(); + } + + model?.Patch(entity); + entity = FulfillPropertiesOn(entity); + + try + { + update(entity); + } + catch (DbUpdateConcurrencyException) + { + if (await Repository.GetByIdAsync(key) == null) + { + return NotFound(); + } + else + { + throw; + } + } + + return Updated(entity); + } + + protected internal virtual async Task DeleteAsync(int key, Action delete) + { + var entity = await Repository.GetByIdAsync(key); + if (entity == null) + { + return NotFound(); + } + + delete(entity); + + return StatusCode(HttpStatusCode.NoContent); + } + protected internal virtual object FulfillPropertyOn(TEntity entity, string propertyName, string queryValue) { var container = Services.Container; From 707d07823c10ab4b1c7ec1e56b6a0115dc94c840 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 6 Aug 2020 21:38:53 +0200 Subject: [PATCH 004/695] API: Allow OData actions and functions without the need for namespaces (backward compatibility) --- .../SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 04edd4fa8c..c938463ecd 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -46,6 +46,9 @@ public void Start() config.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always; + // Allow OData actions and functions without the need for namespaces (OData V3 backward compatibility). + config.EnableUnqualifiedNameCall(true); + var configPublisher = (IWebApiConfigurationPublisher)config.DependencyResolver.GetService(typeof(IWebApiConfigurationPublisher)); configPublisher.Configure(configBroadcaster); From f53b2f55d48ce67b3e2568a2f2c25681ff5f2007 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 7 Aug 2020 16:35:27 +0200 Subject: [PATCH 005/695] API: CRUD endpoints refactoring due to removal of EntitySetController (in progress) --- .../Controllers/OData/AddressesController.cs | 106 ++++++++++++------ .../OData/BlogCommentsController.cs | 93 ++++++++++----- .../Controllers/OData/BlogPostsController.cs | 82 ++++++++++---- .../Controllers/OData/CategoriesController.cs | 80 +++++++++---- .../Controllers/OData/CountriesController.cs | 49 +++++--- .../OData/CustomerRoleMappingsController.cs | 42 +++++-- .../OData/CustomerRolesController.cs | 77 +++++++++---- .../Controllers/OData/CustomersController.cs | 87 +++++++++----- .../OData/DeliveryTimesController.cs | 48 +++++--- .../Controllers/OData/DiscountsController.cs | 49 +++++--- .../Controllers/OData/DownloadsController.cs | 48 +++++--- .../OData/GenericAttributesController.cs | 38 +++++-- .../Controllers/OData/LanguagesController.cs | 48 +++++--- .../OData/LocalizedPropertiesController.cs | 41 ++++++- .../OData/ManufacturersController.cs | 76 +++++++++---- .../OData/MeasureDimensionsController.cs | 48 +++++--- .../OData/MeasureWeightsController.cs | 42 ++++++- .../NewsLetterSubscriptionsController.cs | 80 +++++++++---- .../Controllers/OData/OrderItemsController.cs | 53 ++++++--- .../Controllers/OData/OrderNotesController.cs | 59 +++++++++- .../Controllers/OData/OrdersController.cs | 44 +++++--- .../OData/PaymentMethodsController.cs | 51 ++++++--- .../ProductAttributeOptionsController.cs | 54 ++++++--- .../ProductAttributeOptionsSetsController.cs | 51 ++++++--- .../OData/ProductAttributesController.cs | 51 ++++++--- .../OData/ProductBundleItemsController.cs | 54 ++++++--- .../OData/ProductCategoriesController.cs | 57 +++++++--- .../OData/ProductManufacturersController.cs | 57 +++++++--- .../OData/ProductPicturesController.cs | 57 +++++++--- .../Controllers/OData/ProductsController.cs | 85 ++++++++++---- .../Extensions/MiscExtensions.cs | 23 ++-- .../WebApi/WebApiEntityController.cs | 1 + .../WebApi/WebApiStartupTask.cs | 2 + 33 files changed, 1350 insertions(+), 483 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs index 10d8ef940c..1eef895022 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs @@ -1,6 +1,8 @@ using System; using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Directory; @@ -28,55 +30,71 @@ public AddressesController( _eventPublisher = eventPublisher; } - private void PublishOrderUpdated(int addressId) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IQueryable
Get() { - this.ProcessEntity(() => - { - if (addressId != 0) - { - var orders = _orderRepository.Value.TableUntracked - .Where(x => x.BillingAddressId == addressId || x.ShippingAddressId == addressId) - .ToList(); - - foreach (var order in orders) - { - _eventPublisher.Value.PublishOrderUpdated(order); - } - } - }); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Customer.Create)] - protected override void Insert(Address entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public SingleResult
Get(int key) { - Service.InsertAddress(entity); - PublishOrderUpdated(entity.Id); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Customer.Update)] - protected override void Update(Address entity) + [WebApiAuthenticate(Permission = Permissions.Customer.Create)] + public IHttpActionResult Post(Address entity) { - Service.UpdateAddress(entity); - PublishOrderUpdated(entity.Id); + var result = Insert(entity, () => + { + Service.InsertAddress(entity); + PublishOrderUpdated(entity.Id); + }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Customer.Delete)] - protected override void Delete(Address entity) + [WebApiAuthenticate(Permission = Permissions.Customer.Update)] + public async Task Put(int key, Address entity) { - int entityId = (entity == null ? 0 : entity.Id); + var result = await UpdateAsync(entity, key, () => + { + Service.UpdateAddress(entity); + PublishOrderUpdated(entity.Id); + }); - Service.DeleteAddress(entity); - PublishOrderUpdated(entityId); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult
GetAddress(int key) + [WebApiAuthenticate(Permission = Permissions.Customer.Update)] + public async Task Patch(int key, Delta
model) { - return GetSingleResult(key); + var result = await PartiallyUpdateAsync(key, model, entity => + { + Service.UpdateAddress(entity); + PublishOrderUpdated(entity.Id); + }); + + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Customer.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => + { + var entityId = entity?.Id ?? 0; + + Service.DeleteAddress(entity); + PublishOrderUpdated(entityId); + }); + + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] @@ -91,5 +109,27 @@ public SingleResult GetStateProvince(int key) { return GetRelatedEntity(key, x => x.StateProvince); } + + #endregion + + private void PublishOrderUpdated(int addressId) + { + if (addressId == 0) + { + return; + } + + this.ProcessEntity(() => + { + var orders = _orderRepository.Value.TableUntracked + .Where(x => x.BillingAddressId == addressId || x.ShippingAddressId == addressId) + .ToList(); + + foreach (var order in orders) + { + _eventPublisher.Value.PublishOrderUpdated(order); + } + }); + } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs index fb05076f75..7fbdcc6651 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs @@ -1,6 +1,8 @@ using System; using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Data; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Domain.Customers; @@ -26,16 +28,6 @@ public BlogCommentsController( _blogService = blogService; } - private void FulfillCrudOperation(BlogComment entity) - { - this.ProcessEntity(() => - { - var blogPost = _blogService.Value.GetBlogPostById(entity.BlogPostId); - - _blogService.Value.UpdateCommentTotals(blogPost); - }); - } - protected override IQueryable GetEntitySet() { var query = _contentRepository.Table @@ -45,38 +37,73 @@ protected override IQueryable GetEntitySet() return query; } - [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Create)] - protected override void Insert(BlogComment entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] + public IQueryable Get() { - Service.InsertCustomerContent(entity); + return GetEntitySet(); + } - FulfillCrudOperation(entity); + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] + public SingleResult Get(int key) + { + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Update)] - protected override void Update(BlogComment entity) + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Create)] + public IHttpActionResult Post(BlogComment entity) { - Service.UpdateCustomerContent(entity); + var result = Insert(entity, () => + { + Service.InsertCustomerContent(entity); + UpdateCommentTotals(entity); + }); - FulfillCrudOperation(entity); + return result; } - [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Delete)] - protected override void Delete(BlogComment entity) + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Update)] + public async Task Put(int key, BlogComment entity) { - Service.DeleteCustomerContent(entity); + var result = await UpdateAsync(entity, key, () => + { + Service.UpdateCustomerContent(entity); + + // Actually not necessary, but does not hurt in terms of synchronization. + UpdateCommentTotals(entity); + }); - FulfillCrudOperation(entity); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public SingleResult GetBlogComment(int key) + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Update)] + public async Task Patch(int key, Delta model) { - return GetSingleResult(key); + var result = await PartiallyUpdateAsync(key, model, entity => + { + Service.UpdateCustomerContent(entity); + + // Actually not necessary, but does not hurt in terms of synchronization. + UpdateCommentTotals(entity); + }); + + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => + { + Service.DeleteCustomerContent(entity); + UpdateCommentTotals(entity); + }); + + return result; } - // Navigation properties. + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] @@ -84,5 +111,17 @@ public SingleResult GetBlogPost(int key) { return GetRelatedEntity(key, x => x.BlogPost); } + + #endregion + + private void UpdateCommentTotals(BlogComment entity) + { + this.ProcessEntity(() => + { + var blogPost = _blogService.Value.GetBlogPostById(entity.BlogPostId); + + _blogService.Value.UpdateCommentTotals(blogPost); + }); + } } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs index 1f01560194..2f5c151f3e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs @@ -1,6 +1,8 @@ using System; using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Security; @@ -31,42 +33,80 @@ orderby x.CreatedOnUtc descending return query; } - [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Create)] - protected override void Insert(BlogPost entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] + public IQueryable Get() { - Service.InsertBlogPost(entity); + return GetEntitySet(); + } - this.ProcessEntity(() => + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] + public SingleResult Get(int key) + { + return GetSingleResult(key); + } + + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Create)] + public IHttpActionResult Post(BlogPost entity) + { + var result = Insert(entity, () => { - _urlRecordService.Value.SaveSlug(entity, x => x.Title); + Service.InsertBlogPost(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Title); + }); }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Update)] - protected override void Update(BlogPost entity) + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Update)] + public async Task Put(int key, BlogPost entity) { - Service.UpdateBlogPost(entity); - - this.ProcessEntity(() => + var result = await UpdateAsync(entity, key, () => { - _urlRecordService.Value.SaveSlug(entity, x => x.Title); + Service.UpdateBlogPost(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Title); + }); }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Delete)] - protected override void Delete(BlogPost entity) + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Update)] + public async Task Patch(int key, Delta model) { - Service.DeleteBlogPost(entity); + var result = await PartiallyUpdateAsync(key, model, entity => + { + Service.UpdateBlogPost(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Title); + }); + }); + + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public SingleResult GetBlogPost(int key) + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Delete)] + public async Task Delete(int key) { - return GetSingleResult(key); + var result = await DeleteAsync(key, entity => + { + Service.DeleteBlogPost(entity); + }); + + return result; } - // Navigation properties. + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] @@ -81,5 +121,7 @@ public IQueryable GetBlogComments(int key) { return GetRelatedCollection(key, x => x.BlogComments); } - } + + #endregion + } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs index c81a3d9937..da335af975 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs @@ -1,6 +1,8 @@ using System; using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Security; @@ -31,42 +33,80 @@ from x in this.Repository.Table return query; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Create)] - protected override void Insert(Category entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] + public IQueryable Get() { - Service.InsertCategory(entity); + return GetEntitySet(); + } - this.ProcessEntity(() => + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] + public SingleResult Get(int key) + { + return GetSingleResult(key); + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Create)] + public IHttpActionResult Post(Category entity) + { + var result = Insert(entity, () => { - _urlRecordService.Value.SaveSlug(entity, x => x.Name); + Service.InsertCategory(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Update)] - protected override void Update(Category entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Update)] + public async Task Put(int key, Category entity) { - Service.UpdateCategory(entity); - - this.ProcessEntity(() => + var result = await UpdateAsync(entity, key, () => { - _urlRecordService.Value.SaveSlug(entity, x => x.Name); + Service.UpdateCategory(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Delete)] - protected override void Delete(Category entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Update)] + public async Task Patch(int key, Delta model) { - Service.DeleteCategory(entity); + var result = await PartiallyUpdateAsync(key, model, entity => + { + Service.UpdateCategory(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); + }); + + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] - public SingleResult GetCategory(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Delete)] + public async Task Delete(int key) { - return GetSingleResult(key); + var result = await DeleteAsync(key, entity => + { + Service.DeleteCategory(entity); + }); + + return result; } - // Navigation properties. + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] @@ -74,5 +114,7 @@ public IQueryable GetAppliedDiscounts(int key) { return GetRelatedCollection(key, x => x.AppliedDiscounts); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs index 3d96ae6b87..0c0599a620 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; @@ -11,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class CountriesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Create)] - protected override void Insert(Country entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] + public IQueryable Get() { - Service.InsertCountry(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Update)] - protected override void Update(Country entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] + public SingleResult Get(int key) { - Service.UpdateCountry(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Delete)] - protected override void Delete(Country entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Create)] + public IHttpActionResult Post(Country entity) { - Service.DeleteCountry(entity); + var result = Insert(entity, () => Service.InsertCountry(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] - public SingleResult GetCountry(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Update)] + public async Task Put(int key, Country entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateCountry(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateCountry(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteCountry(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] @@ -44,5 +63,7 @@ public IQueryable GetStateProvinces(int key) { return GetRelatedCollection(key, x => x.StateProvinces); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs index aaaafb42e0..9c21dc55cf 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; using SmartStore.Services.Customers; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class CustomerRoleMappingsController : WebApiEntityController { + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] + public IQueryable Get() + { + return GetEntitySet(); + } + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] + public SingleResult Get(int key) + { + return GetSingleResult(key); + } + [WebApiAuthenticate(Permission = Permissions.Customer.EditRole)] - protected override void Insert(CustomerRoleMapping entity) + public IHttpActionResult Post(CustomerRoleMapping entity) { - Service.InsertCustomerRoleMapping(entity); + var result = Insert(entity, () => Service.InsertCustomerRoleMapping(entity)); + return result; } [WebApiAuthenticate(Permission = Permissions.Customer.EditRole)] - protected override void Update(CustomerRoleMapping entity) + public async Task Put(int key, CustomerRoleMapping entity) { - Service.UpdateCustomerRoleMapping(entity); + var result = await UpdateAsync(entity, key, () => Service.UpdateCustomerRoleMapping(entity)); + return result; } [WebApiAuthenticate(Permission = Permissions.Customer.EditRole)] - protected override void Delete(CustomerRoleMapping entity) + public async Task Patch(int key, Delta model) { - Service.DeleteCustomerRoleMapping(entity); + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateCustomerRoleMapping(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] - public SingleResult GetCustomerRoleMapping(int key) + [WebApiAuthenticate(Permission = Permissions.Customer.EditRole)] + public async Task Delete(int key) { - return GetSingleResult(key); + var result = await DeleteAsync(key, entity => Service.DeleteCustomerRoleMapping(entity)); + return result; } #region Navigation properties diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs index 9d52e76410..8bf7acbd14 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; using SmartStore.Services.Customers; @@ -10,39 +13,73 @@ namespace SmartStore.WebApi.Controllers.OData { public class CustomerRolesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Customer.Role.Create)] - protected override void Insert(CustomerRole entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] + public IQueryable Get() + { + return GetEntitySet(); + } + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] + public SingleResult Get(int key) + { + return GetSingleResult(key); + } + + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Create)] + public IHttpActionResult Post(CustomerRole entity) { - Service.InsertCustomerRole(entity); + var result = Insert(entity, () => Service.InsertCustomerRole(entity)); + return result; } - [WebApiAuthenticate(Permission = Permissions.Customer.Role.Update)] - protected override void Update(CustomerRole entity) + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Update)] + public async Task Put(int key, CustomerRole entity) { - if (entity != null && entity.IsSystemRole) + var result = await UpdateAsync(entity, key, () => { - throw this.ExceptionForbidden(); - } + if (entity != null && entity.IsSystemRole) + { + throw this.ExceptionForbidden(); + } + + Service.UpdateCustomerRole(entity); + }); - Service.UpdateCustomerRole(entity); + return result; } - [WebApiAuthenticate(Permission = Permissions.Customer.Role.Delete)] - protected override void Delete(CustomerRole entity) + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Update)] + public async Task Patch(int key, Delta model) { - if (entity != null && entity.IsSystemRole) + var result = await PartiallyUpdateAsync(key, model, entity => { - throw this.ExceptionForbidden(); - } + if (entity != null && entity.IsSystemRole) + { + throw this.ExceptionForbidden(); + } + + Service.UpdateCustomerRole(entity); + }); - Service.DeleteCustomerRole(entity); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] - public SingleResult GetCustomerRole(int key) + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Delete)] + public async Task Delete(int key) { - return GetSingleResult(key); + var result = await DeleteAsync(key, entity => + { + if (entity != null && entity.IsSystemRole) + { + throw this.ExceptionForbidden(); + } + + Service.DeleteCustomerRole(entity); + }); + + return result; } } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 17c9865367..68c14283e2 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -2,7 +2,9 @@ using System.Linq; using System.Net; using System.Net.Http; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; @@ -34,47 +36,82 @@ from x in this.Repository.Table return query; } - [WebApiAuthenticate(Permission = Permissions.Customer.Create)] - protected override void Insert(Customer entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IQueryable Get() { - Service.InsertCustomer(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Customer.Update)] - protected override void Update(Customer entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public SingleResult Get(int key) { - Service.UpdateCustomer(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Customer.Delete)] - protected override void Delete(Customer entity) + [WebApiAuthenticate(Permission = Permissions.Customer.Create)] + public IHttpActionResult Post(Customer entity) { - Service.DeleteCustomer(entity); + var result = Insert(entity, () => Service.InsertCustomer(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public IQueryable Get() + [WebApiAuthenticate(Permission = Permissions.Customer.Update)] + public async Task Put(int key, Customer entity) { - return GetEntitySet(); + var result = await UpdateAsync(entity, key, () => + { + if (entity != null && entity.IsSystemAccount) + { + throw this.ExceptionForbidden(); + } + + Service.UpdateCustomer(entity); + }); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult GetCustomer(int key) + [WebApiAuthenticate(Permission = Permissions.Customer.Update)] + public async Task Patch(int key, Delta model) { - return GetSingleResult(key); + var result = await PartiallyUpdateAsync(key, model, entity => + { + if (entity != null && entity.IsSystemAccount) + { + throw this.ExceptionForbidden(); + } + + Service.UpdateCustomer(entity); + }); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Customer.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => + { + if (entity != null && entity.IsSystemAccount) + { + throw this.ExceptionForbidden(); + } + + Service.DeleteCustomer(entity); + }); + + return result; } - #region Navigation properties + #region Navigation properties - /// - /// Handle address assignments - /// - /// Customer id - /// Address id - /// Address - [WebApiAuthenticate(Permission = Permissions.Customer.EditAddress)] + /// + /// Handle address assignments + /// + /// Customer id + /// Address id + /// Address + [WebApiAuthenticate(Permission = Permissions.Customer.EditAddress)] public HttpResponseMessage NavigationAddresses(int key, int relatedKey) { Address address = null; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs index 673dbff19b..649ce3194f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class DeliveryTimesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Create)] - protected override void Insert(DeliveryTime entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] + public IQueryable Get() { - Service.InsertDeliveryTime(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Update)] - protected override void Update(DeliveryTime entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] + public SingleResult Get(int key) { - Service.UpdateDeliveryTime(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Delete)] - protected override void Delete(DeliveryTime entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Create)] + public IHttpActionResult Post(DeliveryTime entity) { - Service.DeleteDeliveryTime(entity); + var result = Insert(entity, () => Service.InsertDeliveryTime(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] - public SingleResult GetDeliveryTime(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Update)] + public async Task Put(int key, DeliveryTime entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateDeliveryTime(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateDeliveryTime(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteDeliveryTime(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs index 535600062f..1dd70f414f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Security; @@ -12,32 +14,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class DiscountsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Create)] - protected override void Insert(Discount entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] + public IQueryable Get() + { + return GetEntitySet(); + } + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] + public SingleResult Get(int key) { - Service.InsertDiscount(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Update)] - protected override void Update(Discount entity) + [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Create)] + public IHttpActionResult Post(Discount entity) { - Service.UpdateDiscount(entity); + var result = Insert(entity, () => Service.InsertDiscount(entity)); + return result; } - [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Delete)] - protected override void Delete(Discount entity) + [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Update)] + public async Task Put(int key, Discount entity) { - Service.DeleteDiscount(entity); + var result = await UpdateAsync(entity, key, () => Service.UpdateDiscount(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] - public SingleResult GetDiscount(int key) + [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Update)] + public async Task Patch(int key, Delta model) { - return GetSingleResult(key); + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateDiscount(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteDiscount(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] @@ -59,5 +78,7 @@ public IQueryable GetAppliedToProducts(int key) { return GetRelatedCollection(key, x => x.AppliedToProducts); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs index 09f8eb365b..ea82ca2836 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; using SmartStore.Services.Media; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class DownloadsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Media.Download.Create)] - protected override void Insert(Download entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] + public IQueryable Get() { - Service.InsertDownload(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Media.Download.Update)] - protected override void Update(Download entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] + public SingleResult Get(int key) { - Service.UpdateDownload(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Media.Download.Delete)] - protected override void Delete(Download entity) + [WebApiAuthenticate(Permission = Permissions.Media.Download.Create)] + public IHttpActionResult Post(Download entity) { - Service.DeleteDownload(entity); + var result = Insert(entity, () => Service.InsertDownload(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] - public SingleResult GetDownload(int key) + [WebApiAuthenticate(Permission = Permissions.Media.Download.Update)] + public async Task Put(int key, Download entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateDownload(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Media.Download.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateDownload(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Media.Download.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteDownload(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs index 32587f6620..7aedad51ae 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Common; using SmartStore.Services.Common; using SmartStore.Web.Framework.WebApi; @@ -10,25 +13,40 @@ namespace SmartStore.WebApi.Controllers.OData [WebApiAuthenticate] public class GenericAttributesController : WebApiEntityController { - protected override void Insert(GenericAttribute entity) + [WebApiQueryable] + public IQueryable Get() { - Service.InsertAttribute(entity); + return GetEntitySet(); } - protected override void Update(GenericAttribute entity) + [WebApiQueryable] + public SingleResult Get(int key) { - Service.UpdateAttribute(entity); + return GetSingleResult(key); } - protected override void Delete(GenericAttribute entity) + public IHttpActionResult Post(GenericAttribute entity) { - Service.DeleteAttribute(entity); + var result = Insert(entity, () => Service.InsertAttribute(entity)); + return result; } - [WebApiQueryable] - public SingleResult GetGenericAttribute(int key) + public async Task Put(int key, GenericAttribute entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateAttribute(entity)); + return result; + } + + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateAttribute(entity)); + return result; + } + + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteAttribute(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs index 98030b83fb..2d1f4afaf6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Security; using SmartStore.Services.Localization; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class LanguagesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Create)] - protected override void Insert(Language entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] + public IQueryable Get() { - Service.InsertLanguage(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Update)] - protected override void Update(Language entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] + public SingleResult Get(int key) { - Service.UpdateLanguage(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Delete)] - protected override void Delete(Language entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Create)] + public IHttpActionResult Post(Language entity) { - Service.DeleteLanguage(entity); + var result = Insert(entity, () => Service.InsertLanguage(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] - public SingleResult GetLanguage(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Update)] + public async Task Put(int key, Language entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateLanguage(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateLanguage(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteLanguage(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index 28f434b207..46b522d7af 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Localization; using SmartStore.Services.Localization; using SmartStore.Web.Framework.WebApi; @@ -24,17 +27,49 @@ protected override void Delete(LocalizedProperty entity) } [WebApiQueryable] - public SingleResult GetLocalizedProperty(int key) + public IQueryable Get() + { + return GetEntitySet(); + } + + [WebApiQueryable] + public SingleResult Get(int key) { return GetSingleResult(key); } - // Navigation properties. + public IHttpActionResult Post(LocalizedProperty entity) + { + var result = Insert(entity, () => Service.InsertLocalizedProperty(entity)); + return result; + } + + public async Task Put(int key, LocalizedProperty entity) + { + var result = await UpdateAsync(entity, key, () => Service.UpdateLocalizedProperty(entity)); + return result; + } + + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateLocalizedProperty(entity)); + return result; + } + + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteLocalizedProperty(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] public SingleResult GetLanguage(int key) { return GetRelatedEntity(key, x => x.Language); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs index 78be6a75e1..67d7a85b59 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs @@ -1,6 +1,8 @@ using System; using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Security; @@ -31,42 +33,76 @@ from x in this.Repository.Table return query; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Create)] - protected override void Insert(Manufacturer entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IQueryable Get() { - Service.InsertManufacturer(entity); + return GetEntitySet(); + } - this.ProcessEntity(() => + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] + public SingleResult Get(int key) + { + return GetSingleResult(key); + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Create)] + public IHttpActionResult Post(Manufacturer entity) + { + var result = Insert(entity, () => { - _urlRecordService.Value.SaveSlug(entity, x => x.Name); + Service.InsertManufacturer(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Update)] - protected override void Update(Manufacturer entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Update)] + public async Task Put(int key, Manufacturer entity) { - Service.UpdateManufacturer(entity); - - this.ProcessEntity(() => + var result = await UpdateAsync(entity, key, () => { - _urlRecordService.Value.SaveSlug(entity, x => x.Name); + Service.UpdateManufacturer(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Delete)] - protected override void Delete(Manufacturer entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Update)] + public async Task Patch(int key, Delta model) { - Service.DeleteManufacturer(entity); + var result = await PartiallyUpdateAsync(key, model, entity => + { + Service.UpdateManufacturer(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); + }); + + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] - public SingleResult GetManufacturer(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Delete)] + public async Task Delete(int key) { - return GetSingleResult(key); + var result = await DeleteAsync(key, entity => Service.DeleteManufacturer(entity)); + return result; } - // Navigation properties. + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] @@ -74,5 +110,7 @@ public IQueryable GetAppliedDiscounts(int key) { return GetRelatedCollection(key, x => x.AppliedDiscounts); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs index 3abee6ab41..10e83615f7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class MeasureDimensionsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] - protected override void Insert(MeasureDimension entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IQueryable Get() { - Service.InsertMeasureDimension(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] - protected override void Update(MeasureDimension entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] + public SingleResult Get(int key) { - Service.UpdateMeasureDimension(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Delete)] - protected override void Delete(MeasureDimension entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] + public IHttpActionResult Post(MeasureDimension entity) { - Service.DeleteMeasureDimension(entity); + var result = Insert(entity, () => Service.InsertMeasureDimension(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public SingleResult GetMeasureDimension(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] + public async Task Put(int key, MeasureDimension entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateMeasureDimension(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateMeasureDimension(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteMeasureDimension(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs index df9c159fe2..df850a51c1 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; @@ -28,11 +31,46 @@ protected override void Delete(MeasureWeight entity) Service.DeleteMeasureWeight(entity); } + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IQueryable Get() + { + return GetEntitySet(); + } + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public SingleResult GetMeasureWeight(int key) + public SingleResult Get(int key) { return GetSingleResult(key); } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] + public IHttpActionResult Post(MeasureWeight entity) + { + var result = Insert(entity, () => Service.InsertMeasureWeight(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] + public async Task Put(int key, MeasureWeight entity) + { + var result = await UpdateAsync(entity, key, () => Service.UpdateMeasureWeight(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateMeasureWeight(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteMeasureWeight(entity)); + return result; + } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs index 0eb4c944d2..e950390cce 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Messages; using SmartStore.Core.Security; using SmartStore.Services.Messages; @@ -10,33 +13,64 @@ namespace SmartStore.WebApi.Controllers.OData { public class NewsLetterSubscriptionsController : WebApiEntityController { - // There is no insert permission because a subscription is always created by customer. - [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Update)] - protected override void Insert(NewsLetterSubscription entity) - { - var publishEvent = this.GetQueryStringValue("publishevent", true); - - Service.InsertNewsLetterSubscription(entity, publishEvent); - } - - [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Update)] - protected override void Update(NewsLetterSubscription entity) - { - var publishEvent = this.GetQueryStringValue("publishevent", true); - - Service.UpdateNewsLetterSubscription(entity, publishEvent); - } - - [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Delete)] - protected override void Delete(NewsLetterSubscription entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IQueryable Get() { - Service.DeleteNewsLetterSubscription(entity); + return GetEntitySet(); } [WebApiQueryable] - public SingleResult GetNewsLetterSubscription(int key) + public SingleResult Get(int key) { return GetSingleResult(key); } - } + + // There is no insert permission because a subscription is always created by customer. + [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Update)] + public IHttpActionResult Post(NewsLetterSubscription entity) + { + var result = Insert(entity, () => + { + var publishEvent = this.GetQueryStringValue("publishevent", true); + + Service.InsertNewsLetterSubscription(entity, publishEvent); + }); + + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Update)] + public async Task Put(int key, NewsLetterSubscription entity) + { + var result = await UpdateAsync(entity, key, () => + { + var publishEvent = this.GetQueryStringValue("publishevent", true); + + Service.UpdateNewsLetterSubscription(entity, publishEvent); + }); + + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => + { + var publishEvent = this.GetQueryStringValue("publishevent", true); + + Service.UpdateNewsLetterSubscription(entity, publishEvent); + }); + + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteNewsLetterSubscription(entity)); + return result; + } + } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index 9a039ba14a..b730f70293 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; @@ -16,38 +18,53 @@ public class OrderItemsController : WebApiEntityController GetEntitySet() { var query = - from x in this.Repository.Table + from x in Repository.Table + where !x.Order.Deleted select x; return query; } - - [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] - protected override void Insert(OrderItem entity) + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public IQueryable Get() + { + return GetEntitySet(); + } + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public SingleResult Get(int key) + { + return GetSingleResult(key); + } + + [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] + public IHttpActionResult Post(OrderItem entity) { throw this.ExceptionNotImplemented(); } - [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] - protected override void Update(OrderItem entity) + [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] + public IHttpActionResult Put(int key, OrderItem entity) { throw this.ExceptionNotImplemented(); } - [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] - protected override void Delete(OrderItem entity) + [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] + public IHttpActionResult Patch(int key, Delta model) { - Service.DeleteOrderItem(entity); + throw this.ExceptionNotImplemented(); } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult GetOrderItem(int key) + [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] + public async Task Delete(int key) { - return GetSingleResult(key); + var result = await DeleteAsync(key, entity => Service.DeleteOrderItem(entity)); + return result; } - // Navigation properties. + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] @@ -63,7 +80,11 @@ public SingleResult GetProduct(int key) return GetRelatedEntity(key, x => x.Product); } - [HttpPost] + #endregion + + #region Actions + + [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Read)] public OrderItemInfo Infos(int key) { @@ -82,5 +103,7 @@ public OrderItemInfo Infos(int key) return result; } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index 84a96321c0..5e7af7704b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; using SmartStore.Services.Orders; @@ -10,10 +13,11 @@ namespace SmartStore.WebApi.Controllers.OData { public class OrderNotesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Order.Update)] - protected override void Delete(OrderNote entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public IQueryable Get() { - Service.DeleteOrderNote(entity); + return GetEntitySet(); } [WebApiQueryable] @@ -23,7 +27,48 @@ public SingleResult GetOrderNote(int key) return GetSingleResult(key); } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Order.Update)] + public IHttpActionResult Post(OrderNote entity) + { + var result = Insert(entity, () => + { + var order = Service.GetOrderById(entity.OrderId); + if (order == null || order.Deleted) + { + throw ExceptionEntityNotFound(entity.OrderId); + } + + Service.AddOrderNote(order, entity.Note, entity.DisplayToCustomer); + + if (entity.DisplayToCustomer && this.GetQueryStringValue("customernotification", true)) + { + Services.MessageFactory.SendNewOrderNoteAddedCustomerNotification(entity, order.CustomerLanguageId); + } + }); + + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Order.Update)] + public IHttpActionResult Put(int key, OrderNote entity) + { + throw this.ExceptionNotImplemented(); + } + + [WebApiAuthenticate(Permission = Permissions.Order.Update)] + public IHttpActionResult Patch(int key, Delta model) + { + throw this.ExceptionNotImplemented(); + } + + [WebApiAuthenticate(Permission = Permissions.Order.Update)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteOrderNote(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] @@ -31,5 +76,7 @@ public SingleResult GetOrder(int key) { return GetRelatedEntity(key, x => x.Order); } - } + + #endregion + } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index e9ad7ea3a6..408e301735 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Net.Http; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Common; @@ -41,29 +42,46 @@ from x in Repository.Table return query; } - [WebApiAuthenticate(Permission = Permissions.Order.Create)] - protected override void Insert(Order entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public IQueryable Get() { - Service.InsertOrder(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Order.Update)] - protected override void Update(Order entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public SingleResult Get(int key) { - Service.UpdateOrder(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Order.Delete)] - protected override void Delete(Order entity) + [WebApiAuthenticate(Permission = Permissions.Order.Create)] + public IHttpActionResult Post(Order entity) { - Service.DeleteOrder(entity); + var result = Insert(entity, () => Service.InsertOrder(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult GetOrder(int key) + [WebApiAuthenticate(Permission = Permissions.Order.Update)] + public async Task Put(int key, Order entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateOrder(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Order.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateOrder(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Order.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteOrder(entity)); + return result; } #region Navigation properties diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index 27a7c96ba4..507a13e230 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Payments; using SmartStore.Core.Security; using SmartStore.Services.Payments; @@ -10,30 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class PaymentMethodsController : WebApiEntityController { - // Update permission sufficient here. - [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Update)] - protected override void Insert(PaymentMethod entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] + public IQueryable Get() { - Service.InsertPaymentMethod(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Update)] - protected override void Update(PaymentMethod entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] + public SingleResult Get(int key) { - Service.UpdatePaymentMethod(entity); + return GetSingleResult(key); } - [WebApiAuthenticate] - protected override void Delete(PaymentMethod entity) + // Update permission sufficient here. + [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Update)] + public IHttpActionResult Post(PaymentMethod entity) { - throw this.ExceptionForbidden(); - } + var result = Insert(entity, () => Service.InsertPaymentMethod(entity)); + return result; + } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] - public SingleResult GetPaymentMethod(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Update)] + public async Task Put(int key, PaymentMethod entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdatePaymentMethod(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdatePaymentMethod(entity)); + return result; + } + + [WebApiAuthenticate] + public IHttpActionResult Delete(int key) + { + throw this.ExceptionForbidden(); } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs index 15344399d9..a820cf0e27 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -10,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductAttributeOptionsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] - protected override void Insert(ProductAttributeOption entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public IQueryable Get() { - Service.InsertProductAttributeOption(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] - protected override void Update(ProductAttributeOption entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public SingleResult Get(int key) { - Service.UpdateProductAttributeOption(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] - protected override void Delete(ProductAttributeOption entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] + public IHttpActionResult Post(ProductAttributeOption entity) { - Service.DeleteProductAttributeOption(entity); + var result = Insert(entity, () => Service.InsertProductAttributeOption(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public SingleResult GetProductAttributeOption(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] + public async Task Put(int key, ProductAttributeOption entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateProductAttributeOption(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductAttributeOption(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductAttributeOption(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] @@ -43,5 +63,7 @@ public SingleResult GetProductAttributeOptionsSet(in { return GetRelatedEntity(key, x => x.ProductAttributeOptionsSet); } - } + + #endregion + } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs index 530218147f..c5dbdc8e7b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -11,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductAttributeOptionsSetsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] - protected override void Insert(ProductAttributeOptionsSet entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public IQueryable Get() { - Service.InsertProductAttributeOptionsSet(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] - protected override void Update(ProductAttributeOptionsSet entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public SingleResult Get(int key) { - Service.UpdateProductAttributeOptionsSet(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] - protected override void Delete(ProductAttributeOptionsSet entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] + public IHttpActionResult Post(ProductAttributeOptionsSet entity) { - Service.DeleteProductAttributeOptionsSet(entity); + var result = Insert(entity, () => Service.InsertProductAttributeOptionsSet(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public SingleResult GetProductAttributeOptionsSet(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] + public async Task Put(int key, ProductAttributeOptionsSet entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateProductAttributeOptionsSet(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductAttributeOptionsSet(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductAttributeOptionsSet(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] @@ -51,5 +70,7 @@ public IQueryable GetProductAttributeOptions(int key) { return GetRelatedCollection(key, x => x.ProductAttributeOptions); } - } + + #endregion + } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs index f212c6c039..fc828f1e23 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -11,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductAttributesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Create)] - protected override void Insert(ProductAttribute entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public IQueryable Get() { - Service.InsertProductAttribute(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Update)] - protected override void Update(ProductAttribute entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public SingleResult Get(int key) { - Service.UpdateProductAttribute(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Delete)] - protected override void Delete(ProductAttribute entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Create)] + public IHttpActionResult Post(ProductAttribute entity) { - Service.DeleteProductAttribute(entity); + var result = Insert(entity, () => Service.InsertProductAttribute(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public SingleResult GetProductAttribute(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Update)] + public async Task Put(int key, ProductAttribute entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateProductAttribute(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductAttribute(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductAttribute(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] @@ -44,5 +63,7 @@ public IQueryable GetProductAttributeOptionsSets(int { return GetRelatedCollection(key, x => x.ProductAttributeOptionsSets); } - } + + #endregion + } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs index 77ea055753..b70f6ce115 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -10,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductBundleItemsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditBundle)] - protected override void Insert(ProductBundleItem entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertBundleItem(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditBundle)] - protected override void Update(ProductBundleItem entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateBundleItem(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditBundle)] - protected override void Delete(ProductBundleItem entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditBundle)] + public IHttpActionResult Post(ProductBundleItem entity) { - Service.DeleteBundleItem(entity); + var result = Insert(entity, () => Service.InsertBundleItem(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProductBundleItem(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditBundle)] + public async Task Put(int key, ProductBundleItem entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateBundleItem(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditBundle)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateBundleItem(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditBundle)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteBundleItem(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] @@ -50,5 +70,7 @@ public SingleResult GetBundleProduct(int key) { return GetRelatedEntity(key, x => x.BundleProduct); } - } + + #endregion + } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs index a76cc55d5f..2dad9fb4ac 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -10,27 +13,51 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductCategoriesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] - protected override void Insert(ProductCategory entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertProductCategory(entity); - } + return GetEntitySet(); + } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] - protected override void Update(ProductCategory entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateProductCategory(entity); - } + return GetSingleResult(key); + } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] - protected override void Delete(ProductCategory entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] + public IHttpActionResult Post(ProductCategory entity) { - Service.DeleteProductCategory(entity); + var result = Insert(entity, () => Service.InsertProductCategory(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] + public async Task Put(int key, ProductCategory entity) + { + var result = await UpdateAsync(entity, key, () => Service.UpdateProductCategory(entity)); + return result; + } - [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductCategory(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductCategory(entity)); + return result; + } + + #region Navigation properties + + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] public SingleResult GetCategory(int key) { @@ -43,5 +70,7 @@ public SingleResult GetProduct(int key) { return GetRelatedEntity(key, x => x.Product); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs index 65a5246db3..d56460f60e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -10,27 +13,51 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductManufacturersController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] - protected override void Insert(ProductManufacturer entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertProductManufacturer(entity); - } + return GetEntitySet(); + } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] - protected override void Update(ProductManufacturer entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateProductManufacturer(entity); - } + return GetSingleResult(key); + } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] - protected override void Delete(ProductManufacturer entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] + public IHttpActionResult Post(ProductManufacturer entity) { - Service.DeleteProductManufacturer(entity); + var result = Insert(entity, () => Service.InsertProductManufacturer(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] + public async Task Put(int key, ProductManufacturer entity) + { + var result = await UpdateAsync(entity, key, () => Service.UpdateProductManufacturer(entity)); + return result; + } - [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductManufacturer(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductManufacturer(entity)); + return result; + } + + #region Navigation properties + + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] public SingleResult GetManufacturer(int key) { @@ -43,5 +70,7 @@ public SingleResult GetProduct(int key) { return GetRelatedEntity(key, x => x.Product); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs index c2036ee392..3203b4f6fe 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; @@ -11,27 +14,51 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductPicturesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] - protected override void Insert(ProductMediaFile entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertProductPicture(entity); - } + return GetEntitySet(); + } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] - protected override void Update(ProductMediaFile entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateProductPicture(entity); - } + return GetSingleResult(key); + } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] - protected override void Delete(ProductMediaFile entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] + public IHttpActionResult Post(ProductMediaFile entity) { - Service.DeleteProductPicture(entity); + var result = Insert(entity, () => Service.InsertProductPicture(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] + public async Task Put(int key, ProductMediaFile entity) + { + var result = await UpdateAsync(entity, key, () => Service.UpdateProductPicture(entity)); + return result; + } - [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductPicture(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductPicture(entity)); + return result; + } + + #region Navigation properties + + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public SingleResult GetPicture(int key) { @@ -44,5 +71,7 @@ public SingleResult GetProduct(int key) { return GetRelatedEntity(key, x => x.Product); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index c606b90257..455d85a113 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Net; using System.Net.Http; +using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.ModelBinding; using System.Web.OData; @@ -53,51 +54,85 @@ public ProductsController( protected override IQueryable GetEntitySet() { var query = - from x in this.Repository.Table + from x in Repository.Table where !x.Deleted && !x.IsSystemProduct select x; return query; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Create)] - protected override void Insert(Product entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertProduct(entity); + return GetEntitySet(); + } - this.ProcessEntity(() => + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) + { + return GetSingleResult(key); + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Create)] + public IHttpActionResult Post(Product entity) + { + var result = Insert(entity, () => { - _urlRecordService.Value.SaveSlug(entity, x => x.Name); + Service.InsertProduct(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Update)] - protected override void Update(Product entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Update)] + public async Task Put(int key, Product entity) { - Service.UpdateProduct(entity); - - this.ProcessEntity(() => + var result = await UpdateAsync(entity, key, () => { - _urlRecordService.Value.SaveSlug(entity, x => x.Name); + Service.UpdateProduct(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); }); + + return result; } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Delete)] - protected override void Delete(Product entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Update)] + public async Task Patch(int key, Delta model) { - Service.DeleteProduct(entity); + var result = await PartiallyUpdateAsync(key, model, entity => + { + Service.UpdateProduct(entity); + + this.ProcessEntity(() => + { + _urlRecordService.Value.SaveSlug(entity, x => x.Name); + }); + }); + + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProduct(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Delete)] + public async Task Delete(int key) { - return GetSingleResult(key); + var result = await DeleteAsync(key, entity => Service.DeleteProduct(entity)); + return result; } - // Navigation properties. + #region Navigation properties - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] public HttpResponseMessage NavigationProductCategories(int key, int relatedKey) { ProductCategory productCategory = null; @@ -312,7 +347,9 @@ public IQueryable GetProductBundleItems(int key) return GetRelatedCollection(key, x => x.ProductBundleItems); } - // Actions. + #endregion + + #region Actions [HttpPost, WebApiQueryable(PagingOptional = true)] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] @@ -515,5 +552,7 @@ public IQueryable ManageAttributes(int key, ODataAction return entity.ProductVariantAttributes.AsQueryable(); } - } + + #endregion + } } diff --git a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs index 2b9a045eff..50a75bd6e9 100644 --- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs @@ -35,16 +35,6 @@ public static string GridApiInfo(this HtmlHelper helper) return sb.ToString(); } - - public static T GetValueSafe(this ODataActionParameters parameters, string key) - { - if (parameters != null && key.HasValue() && parameters.TryGetValue(key, out var value)) - { - return value.Convert(); - } - - return default(T); - } } internal static class MiscExtensions @@ -54,9 +44,22 @@ public static string ToUnquoted(this string value) if (value.HasValue() && value.Length > 1) { if ((value.StartsWith("\"") && value.EndsWith("\"")) || (value.StartsWith("'") && value.EndsWith("'"))) + { return value.Substring(1, value.Length - 2); + } } + return value; } + + public static T GetValueSafe(this ODataActionParameters parameters, string key) + { + if (parameters != null && key.HasValue() && parameters.TryGetValue(key, out var value)) + { + return value.Convert(); + } + + return default; + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 25a77960fc..afb1e39d8e 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -44,6 +44,7 @@ public abstract class WebApiEntityController : ODataControlle // TODO: // XML serialization issues. + // Don't use service models like MediaFileInfo. API must encapsulate and model independently. /// /// Auto injected by Autofac. diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index c938463ecd..88d58be4bb 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -47,6 +47,8 @@ public void Start() config.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always; // Allow OData actions and functions without the need for namespaces (OData V3 backward compatibility). + // A namespace URL world be for example: /Products(123)/ProductService.FinalPrice + // Note: the dot in this URL will cause IIS to return error 404. See ExtensionlessUrlHandler-Integrated-4.0. config.EnableUnqualifiedNameCall(true); var configPublisher = (IWebApiConfigurationPublisher)config.DependencyResolver.GetService(typeof(IWebApiConfigurationPublisher)); From a967ffe7057b5f03d2669b813ebc061d0b2e41ad Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 7 Aug 2020 19:41:40 +0200 Subject: [PATCH 006/695] Updated Newtonsoft.Json package to 12.0.3 --- src/Libraries/SmartStore.Core/Plugins/PluginManager.cs | 2 +- src/Libraries/SmartStore.Core/SmartStore.Core.csproj | 2 +- src/Libraries/SmartStore.Core/packages.config | 2 +- src/Libraries/SmartStore.Data/SmartStore.Data.csproj | 2 +- src/Libraries/SmartStore.Data/packages.config | 2 +- .../SmartStore.Services/SmartStore.Services.csproj | 2 +- src/Libraries/SmartStore.Services/app.config | 3 +-- src/Libraries/SmartStore.Services/packages.config | 2 +- .../SmartStore.AmazonPay/SmartStore.AmazonPay.csproj | 3 ++- src/Plugins/SmartStore.AmazonPay/packages.config | 2 +- .../SmartStore.Clickatell/SmartStore.Clickatell.csproj | 3 ++- src/Plugins/SmartStore.Clickatell/packages.config | 2 +- .../SmartStore.DevTools/SmartStore.DevTools.csproj | 3 ++- src/Plugins/SmartStore.DevTools/packages.config | 2 +- .../SmartStore.FacebookAuth.csproj | 3 ++- src/Plugins/SmartStore.FacebookAuth/packages.config | 2 +- .../SmartStore.GoogleAnalytics.csproj | 1 + .../SmartStore.GoogleMerchantCenter.csproj | 3 ++- .../SmartStore.GoogleMerchantCenter/packages.config | 2 +- .../SmartStore.OfflinePayment.csproj | 3 ++- src/Plugins/SmartStore.OfflinePayment/packages.config | 2 +- src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj | 3 ++- src/Plugins/SmartStore.PayPal/packages.config | 2 +- .../SmartStore.Shipping/SmartStore.Shipping.csproj | 1 + .../SmartStore.ShippingByWeight.csproj | 1 + src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj | 3 ++- src/Plugins/SmartStore.Tax/packages.config | 2 +- src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj | 3 ++- src/Plugins/SmartStore.WebApi/packages.config | 2 +- .../SmartStore.Web.Framework.csproj | 2 +- src/Presentation/SmartStore.Web.Framework/packages.config | 2 +- .../SmartStore.Web/Administration/SmartStore.Admin.csproj | 2 +- .../SmartStore.Web/Administration/packages.config | 2 +- src/Presentation/SmartStore.Web/SmartStore.Web.csproj | 2 +- src/Presentation/SmartStore.Web/Web.config | 8 +------- src/Presentation/SmartStore.Web/packages.config | 2 +- .../SmartStore.Core.Tests/SmartStore.Core.Tests.csproj | 2 +- src/Tests/SmartStore.Core.Tests/packages.config | 2 +- .../SmartStore.WebApi.Client.csproj | 2 +- src/Tools/SmartStore.WebApi.Client/packages.config | 2 +- 40 files changed, 49 insertions(+), 44 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs index 86fe45ff3c..f0ed27ac57 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs @@ -231,7 +231,7 @@ void FinalizePlugin(PluginDescriptor p) } if (firstFailedAssembly != null) { - Logger.ErrorFormat("Assembly probing failed for '{0}': {1}", firstFailedAssembly.File.Name, firstFailedAssembly.ActivationException.Message); + Logger.ErrorFormat("Assembly probing failed for '{0}': {1}", firstFailedAssembly.File?.Name.EmptyNull(), firstFailedAssembly.ActivationException.Message); p.Incompatible = true; incompatiblePlugins.Add(p.SystemName); } diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index a86991b79e..3a58c137f2 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -95,7 +95,7 @@ ..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll diff --git a/src/Libraries/SmartStore.Core/packages.config b/src/Libraries/SmartStore.Core/packages.config index 19d5cd9737..d796fbd153 100644 --- a/src/Libraries/SmartStore.Core/packages.config +++ b/src/Libraries/SmartStore.Core/packages.config @@ -12,7 +12,7 @@ - + diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index 3f8eee232b..bd87aae610 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -95,7 +95,7 @@ ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Smo.dll - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/src/Libraries/SmartStore.Data/packages.config b/src/Libraries/SmartStore.Data/packages.config index a063941a5e..caaa2b6499 100644 --- a/src/Libraries/SmartStore.Data/packages.config +++ b/src/Libraries/SmartStore.Data/packages.config @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index ca2e36862d..2ac1065af7 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -116,7 +116,7 @@ True - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\packages\NReco.PdfGenerator.1.1.15\lib\net20\NReco.PdfGenerator.dll diff --git a/src/Libraries/SmartStore.Services/app.config b/src/Libraries/SmartStore.Services/app.config index 463e354afb..16aef9ec68 100644 --- a/src/Libraries/SmartStore.Services/app.config +++ b/src/Libraries/SmartStore.Services/app.config @@ -9,8 +9,7 @@ - + http://ec.europa.eu/taxation_customs/vies/services/checkVatService diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index be5db3727d..c879853538 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -17,7 +17,7 @@ - + diff --git a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj index 8d6b74f6b6..01baf98b7b 100644 --- a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj +++ b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj @@ -95,13 +95,14 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.AmazonPay/packages.config b/src/Plugins/SmartStore.AmazonPay/packages.config index a8d00c17d2..d6e63a10cf 100644 --- a/src/Plugins/SmartStore.AmazonPay/packages.config +++ b/src/Plugins/SmartStore.AmazonPay/packages.config @@ -10,5 +10,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj index 6a96ac359a..3a1b76bde7 100644 --- a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj +++ b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj @@ -87,13 +87,14 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.Clickatell/packages.config b/src/Plugins/SmartStore.Clickatell/packages.config index b00b3cc8dc..dfe5e2740a 100644 --- a/src/Plugins/SmartStore.Clickatell/packages.config +++ b/src/Plugins/SmartStore.Clickatell/packages.config @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj index 8c43d89520..730aad63ee 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -102,6 +102,7 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -117,7 +118,7 @@ True - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.DevTools/packages.config b/src/Plugins/SmartStore.DevTools/packages.config index ca9ebcd893..57a42b5851 100644 --- a/src/Plugins/SmartStore.DevTools/packages.config +++ b/src/Plugins/SmartStore.DevTools/packages.config @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj index 5a2774492f..b9f6bfbf81 100644 --- a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj +++ b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj @@ -125,13 +125,14 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.FacebookAuth/packages.config b/src/Plugins/SmartStore.FacebookAuth/packages.config index d1171484d7..c30173272e 100644 --- a/src/Plugins/SmartStore.FacebookAuth/packages.config +++ b/src/Plugins/SmartStore.FacebookAuth/packages.config @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj index 0bc3b5871b..9f985db672 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj +++ b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj @@ -87,6 +87,7 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj index b8bfd5df32..2cdba3d2d3 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj @@ -107,13 +107,14 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config b/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config index 1b8cbc1400..fdc270f9cd 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config @@ -9,5 +9,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj index a84ef07ca4..1a8e7b55a5 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -95,13 +95,14 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.OfflinePayment/packages.config b/src/Plugins/SmartStore.OfflinePayment/packages.config index 2b077bf78c..940a1c2036 100644 --- a/src/Plugins/SmartStore.OfflinePayment/packages.config +++ b/src/Plugins/SmartStore.OfflinePayment/packages.config @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj index 0154ac2f43..a13e30fcb4 100644 --- a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj +++ b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj @@ -73,13 +73,14 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.PayPal/packages.config b/src/Plugins/SmartStore.PayPal/packages.config index dab5fcfca2..5294b5ff78 100644 --- a/src/Plugins/SmartStore.PayPal/packages.config +++ b/src/Plugins/SmartStore.PayPal/packages.config @@ -9,5 +9,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj index 25f253f043..fa68da3247 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -103,6 +103,7 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll diff --git a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj index 3f85cc8b9d..09e985e9e9 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj +++ b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj @@ -103,6 +103,7 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll diff --git a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj index b7306247a7..9da2507797 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -99,13 +99,14 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.Tax/packages.config b/src/Plugins/SmartStore.Tax/packages.config index 2c185251cc..c2904f28a5 100644 --- a/src/Plugins/SmartStore.Tax/packages.config +++ b/src/Plugins/SmartStore.Tax/packages.config @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 8fea27bebf..5403bc55ca 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -105,6 +105,7 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + False ..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll @@ -119,7 +120,7 @@ False - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Plugins/SmartStore.WebApi/packages.config b/src/Plugins/SmartStore.WebApi/packages.config index b645dda46e..24b7e62ffc 100644 --- a/src/Plugins/SmartStore.WebApi/packages.config +++ b/src/Plugins/SmartStore.WebApi/packages.config @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 4cac4a1212..a98aa5d8d1 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -127,7 +127,7 @@ ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/src/Presentation/SmartStore.Web.Framework/packages.config b/src/Presentation/SmartStore.Web.Framework/packages.config index c678081470..0f2ee8c5c1 100644 --- a/src/Presentation/SmartStore.Web.Framework/packages.config +++ b/src/Presentation/SmartStore.Web.Framework/packages.config @@ -28,7 +28,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index fc810cdf6c..cad98fd581 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -97,7 +97,7 @@ ..\..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - ..\..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll diff --git a/src/Presentation/SmartStore.Web/Administration/packages.config b/src/Presentation/SmartStore.Web/Administration/packages.config index 5c76fbfdc0..a6b9edf1e5 100644 --- a/src/Presentation/SmartStore.Web/Administration/packages.config +++ b/src/Presentation/SmartStore.Web/Administration/packages.config @@ -15,7 +15,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index ab4cd628bf..efaa1658b3 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -148,7 +148,7 @@ ..\..\packages\MsieJavaScriptEngine.3.0.1\lib\net45\MsieJavaScriptEngine.dll - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\packages\NUglify.1.5.14\lib\net40\NUglify.dll diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index f9f35331fe..8a981478ff 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -445,13 +445,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/packages.config b/src/Presentation/SmartStore.Web/packages.config index f4eb818521..c2ebf7619d 100644 --- a/src/Presentation/SmartStore.Web/packages.config +++ b/src/Presentation/SmartStore.Web/packages.config @@ -31,7 +31,7 @@ - + diff --git a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj index ccc78925cc..b95df39b91 100644 --- a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj +++ b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj @@ -72,7 +72,7 @@ ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/src/Tests/SmartStore.Core.Tests/packages.config b/src/Tests/SmartStore.Core.Tests/packages.config index f4baf1e494..078c3a2cff 100644 --- a/src/Tests/SmartStore.Core.Tests/packages.config +++ b/src/Tests/SmartStore.Core.Tests/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj b/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj index 556fa2a9d4..9bd1f1cf9f 100644 --- a/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj +++ b/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj @@ -61,7 +61,7 @@ - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/src/Tools/SmartStore.WebApi.Client/packages.config b/src/Tools/SmartStore.WebApi.Client/packages.config index 466ab7648c..8ab13a9023 100644 --- a/src/Tools/SmartStore.WebApi.Client/packages.config +++ b/src/Tools/SmartStore.WebApi.Client/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From a392f5a89d3ee6044bd928c52b3b8adaa8a11cf6 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 7 Aug 2020 19:44:09 +0200 Subject: [PATCH 007/695] Updated CommonServiceLocator package to v2.0.5 --- .../SmartStore.Web.Framework/SmartStore.Web.Framework.csproj | 4 ++-- src/Presentation/SmartStore.Web.Framework/packages.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index a98aa5d8d1..1af2838abd 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -90,8 +90,8 @@ ..\..\packages\BundleTransformer.SassAndScss.1.10.0\lib\net40\BundleTransformer.SassAndScss.dll - - ..\..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll + + ..\..\packages\CommonServiceLocator.2.0.5\lib\net46\CommonServiceLocator.dll ..\..\packages\DotLiquid.2.0.254\lib\net45\DotLiquid.dll diff --git a/src/Presentation/SmartStore.Web.Framework/packages.config b/src/Presentation/SmartStore.Web.Framework/packages.config index 0f2ee8c5c1..8bba36e6b6 100644 --- a/src/Presentation/SmartStore.Web.Framework/packages.config +++ b/src/Presentation/SmartStore.Web.Framework/packages.config @@ -8,7 +8,7 @@ - + From 0e2d48f66b46b33020b46495f1f7cb9b4a8107fc Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 7 Aug 2020 20:02:27 +0200 Subject: [PATCH 008/695] Updated MaxMind.Db package to v2.6.1 --- .../SmartStore.Services/Directory/GeoCountryLookup.cs | 3 ++- src/Libraries/SmartStore.Services/SmartStore.Services.csproj | 2 +- src/Libraries/SmartStore.Services/packages.config | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs index 33bd851f16..c2dfaeac4e 100644 --- a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs +++ b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs @@ -1,5 +1,6 @@ using System; using System.Net; +using MaxMind.Db; using MaxMind.GeoIP2; using SmartStore.Core; using SmartStore.Core.Caching; @@ -16,7 +17,7 @@ public GeoCountryLookup() { // Old database not usable anymore due to US (Florida?) legal issues from 01 Jan 2020 on. //_reader = new DatabaseReader(CommonHelper.MapPath("~/App_Data/GeoLite2/GeoLite2-Country.mmdb")); - + _reader = new DatabaseReader(CommonHelper.MapPath("~/App_Data/Geo/dbip-country-lite.mmdb")); } diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 2ac1065af7..52114ebc15 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -98,7 +98,7 @@ ..\..\packages\LumenWorksCsvReader.4.0.0\lib\net461\LumenWorks.Framework.IO.dll - ..\..\packages\MaxMind.Db.2.4.0\lib\net45\MaxMind.Db.dll + ..\..\packages\MaxMind.Db.2.6.1\lib\net45\MaxMind.Db.dll ..\..\packages\MaxMind.GeoIP2.3.0.0\lib\net45\MaxMind.GeoIP2.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index c879853538..7f4458b0d6 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -8,7 +8,7 @@ - + From 1ac98190bb14abaddb1e8c610c76c7815e257285 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 7 Aug 2020 20:25:31 +0200 Subject: [PATCH 009/695] Updated MaxMind.GeoIP2 package to v3.2.0 --- .../SmartStore.Services/Directory/GeoCountryLookup.cs | 4 ---- src/Libraries/SmartStore.Services/SmartStore.Services.csproj | 2 +- src/Libraries/SmartStore.Services/packages.config | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs index c2dfaeac4e..3926d52189 100644 --- a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs +++ b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs @@ -1,11 +1,7 @@ using System; using System.Net; -using MaxMind.Db; using MaxMind.GeoIP2; -using SmartStore.Core; -using SmartStore.Core.Caching; using SmartStore.Utilities; -using SmDir = SmartStore.Core.Domain.Directory; namespace SmartStore.Services.Directory { diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 52114ebc15..5144725707 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -101,7 +101,7 @@ ..\..\packages\MaxMind.Db.2.6.1\lib\net45\MaxMind.Db.dll - ..\..\packages\MaxMind.GeoIP2.3.0.0\lib\net45\MaxMind.GeoIP2.dll + ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 7f4458b0d6..3967b92824 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -9,11 +9,11 @@ - + - + From 3497127dff66e95527704e3172bf846bc730fc2d Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 7 Aug 2020 20:28:41 +0200 Subject: [PATCH 010/695] Reverse commit --- src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs | 2 +- src/Libraries/SmartStore.Services/SmartStore.Services.csproj | 2 +- src/Libraries/SmartStore.Services/packages.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs index 3926d52189..0c0d3f7764 100644 --- a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs +++ b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs @@ -13,7 +13,7 @@ public GeoCountryLookup() { // Old database not usable anymore due to US (Florida?) legal issues from 01 Jan 2020 on. //_reader = new DatabaseReader(CommonHelper.MapPath("~/App_Data/GeoLite2/GeoLite2-Country.mmdb")); - + _reader = new DatabaseReader(CommonHelper.MapPath("~/App_Data/Geo/dbip-country-lite.mmdb")); } diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 5144725707..b5b5c8f087 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -98,7 +98,7 @@ ..\..\packages\LumenWorksCsvReader.4.0.0\lib\net461\LumenWorks.Framework.IO.dll - ..\..\packages\MaxMind.Db.2.6.1\lib\net45\MaxMind.Db.dll + ..\..\packages\MaxMind.Db.2.4.0\lib\net45\MaxMind.Db.dll ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 3967b92824..2a22157f8c 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -8,7 +8,7 @@ - + From 6e55460acad60cfccb111f7bd131c7d30fbdf8a2 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 7 Aug 2020 20:30:51 +0200 Subject: [PATCH 011/695] Reverse commit --- .../SmartStore.Services/Directory/GeoCountryLookup.cs | 4 ++++ src/Libraries/SmartStore.Services/SmartStore.Services.csproj | 2 +- src/Libraries/SmartStore.Services/packages.config | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs index 0c0d3f7764..45f7d35241 100644 --- a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs +++ b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs @@ -1,7 +1,11 @@ using System; using System.Net; +using MaxMind.Db; using MaxMind.GeoIP2; +using SmartStore.Core; +using SmartStore.Core.Caching; using SmartStore.Utilities; +using SmDir = SmartStore.Core.Domain.Directory; namespace SmartStore.Services.Directory { diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index b5b5c8f087..2ac1065af7 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -101,7 +101,7 @@ ..\..\packages\MaxMind.Db.2.4.0\lib\net45\MaxMind.Db.dll - ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll + ..\..\packages\MaxMind.GeoIP2.3.0.0\lib\net45\MaxMind.GeoIP2.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 2a22157f8c..c879853538 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -9,11 +9,11 @@ - + - + From a3c8a15b8ee3c3f7370a228dde1704a93200dd90 Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Fri, 7 Aug 2020 21:36:42 +0200 Subject: [PATCH 012/695] pb > gallery block: GalleryMediaFile --- .../Domain/Catalog/ProductMediaFile.cs | 12 ++++++++++-- .../Scripts/smartstore.dropzoneWrapper.js | 5 ++++- .../Views/Shared/Components/FileUploader.cshtml | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs index 630f5cf754..bbf8b12cf1 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs @@ -19,11 +19,19 @@ public interface IMediaFile /// MediaFile MediaFile { get; set; } } - + + public class GalleryMediaFile : IMediaFile + { + public int MediaFileId { get; set; } + public string Title { get; set; } + public int DisplayOrder { get; set; } + public MediaFile MediaFile { get; set; } + } + /// /// Represents a product media file mapping /// - [DataContract] + [DataContract] public partial class ProductMediaFile : BaseEntity, IMediaFile { /// diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js index 40fb415f4b..30d0b92be4 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js @@ -451,9 +451,11 @@ entityId: $el.data('entity-id') }, success: function (response) { + console.log(response.response); $.each(response.response, function (i, value) { + console.log("adasdsa"); var file = assignableFiles.find(x => x.media.id === value.MediaFileId); - + console.log(file); if (!file) { // Try get renamed file. var name = value.Name; @@ -519,6 +521,7 @@ entityId: $el.data('entity-id') }, success: function (response) { + console.log(response); // Set EntityMediaId & current DisplayOrder. $.each(response.response, function (index, value) { var preview = $(".dz-image-preview[data-media-id='" + value.MediaFileId + "']"); diff --git a/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml index 41db0b280b..6159bdb862 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml @@ -108,7 +108,7 @@ - +
From 82debbbb367667b22543cc71434372e5e6e23333 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 8 Aug 2020 01:10:26 +0200 Subject: [PATCH 013/695] Updated target .NET Framework to 4.7.2 (!!!) --- .../SmartStore.Core/SmartStore.Core.csproj | 5 +- src/Libraries/SmartStore.Core/app.config | 2 +- src/Libraries/SmartStore.Core/packages.config | 1 - .../SmartStore.Data/SmartStore.Data.csproj | 5 +- src/Libraries/SmartStore.Data/app.config | 2 +- src/Libraries/SmartStore.Data/packages.config | 1 - .../Properties/Settings.Designer.cs | 8 +- .../SmartStore.Services.csproj | 5 +- .../EuropeCheckVatService/Reference.cs | 10 +- src/Libraries/SmartStore.Services/app.config | 2 +- .../SmartStore.Services/packages.config | 1 - .../SmartStore.AmazonPay.csproj | 4 +- src/Plugins/SmartStore.AmazonPay/web.config | 18 +- .../SmartStore.Clickatell.csproj | 4 +- src/Plugins/SmartStore.Clickatell/web.config | 18 +- .../SmartStore.DevTools.csproj | 4 +- src/Plugins/SmartStore.DevTools/Web.config | 18 +- .../SmartStore.FacebookAuth.csproj | 4 +- .../SmartStore.FacebookAuth/web.config | 18 +- .../SmartStore.GoogleAnalytics.csproj | 4 +- .../SmartStore.GoogleAnalytics/web.config | 18 +- .../SmartStore.GoogleMerchantCenter.csproj | 4 +- .../web.config | 18 +- .../SmartStore.OfflinePayment.csproj | 4 +- .../SmartStore.OfflinePayment/web.config | 18 +- .../Properties/Settings.Designer.cs | 2 +- .../SmartStore.PayPal.csproj | 2 +- .../Web References/PayPalSvc/Reference.cs | 1052 ++++++++--------- src/Plugins/SmartStore.PayPal/web.config | 18 +- .../SmartStore.Shipping.csproj | 4 +- src/Plugins/SmartStore.Shipping/web.config | 18 +- .../SmartStore.ShippingByWeight.csproj | 4 +- .../SmartStore.ShippingByWeight/web.config | 18 +- .../SmartStore.Tax/SmartStore.Tax.csproj | 4 +- src/Plugins/SmartStore.Tax/web.config | 18 +- .../SmartStore.WebApi.csproj | 2 +- src/Plugins/SmartStore.WebApi/web.config | 23 +- .../SmartStore.Web.Framework.csproj | 29 +- .../SmartStore.Web.Framework/app.config | 10 +- .../SmartStore.Web.Framework/packages.config | 13 +- .../Administration/SmartStore.Admin.csproj | 5 +- .../SmartStore.Web/Administration/Web.config | 20 +- .../Administration/packages.config | 1 - .../EditorLocalization.designer.cs | 2 +- .../GridLocalization.designer.cs | 2 +- .../MvcLocalization.Designer.cs | 2 +- .../SmartStore.Web/SmartStore.Web.csproj | 67 +- src/Presentation/SmartStore.Web/Web.config | 368 +++--- .../SmartStore.Web/packages.config | 29 +- src/Tests/SmartStore.Core.Tests/App.config | 2 +- .../SmartStore.Core.Tests.csproj | 2 +- src/Tests/SmartStore.Data.Tests/App.config | 4 +- .../SmartStore.Data.Tests.csproj | 2 +- .../SmartStore.Services.Tests/App.config | 2 +- .../SmartStore.Services.Tests.csproj | 2 +- src/Tests/SmartStore.Tests/App.config | 2 +- .../SmartStore.Tests/SmartStore.Tests.csproj | 2 +- src/Tests/SmartStore.Web.MVC.Tests/App.config | 16 +- .../SmartStore.Web.MVC.Tests.csproj | 5 +- .../SmartStore.Web.MVC.Tests/packages.config | 1 - src/Tools/SmartStore.Packager/App.config | 2 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../SmartStore.Packager.csproj | 2 +- src/Tools/SmartStore.WebApi.Client/App.config | 2 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../SmartStore.WebApi.Client.csproj | 2 +- 68 files changed, 1001 insertions(+), 964 deletions(-) diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 3a58c137f2..130f467935 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -10,7 +10,7 @@ Properties SmartStore.Core SmartStore.Core - v4.6.1 + v4.7.2 512 @@ -119,9 +119,6 @@ - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll diff --git a/src/Libraries/SmartStore.Core/app.config b/src/Libraries/SmartStore.Core/app.config index f9acd6487c..1e2654dc0e 100644 --- a/src/Libraries/SmartStore.Core/app.config +++ b/src/Libraries/SmartStore.Core/app.config @@ -20,4 +20,4 @@ - + diff --git a/src/Libraries/SmartStore.Core/packages.config b/src/Libraries/SmartStore.Core/packages.config index d796fbd153..e43ef279d7 100644 --- a/src/Libraries/SmartStore.Core/packages.config +++ b/src/Libraries/SmartStore.Core/packages.config @@ -15,5 +15,4 @@ - \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index bd87aae610..b1c7331ec9 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -10,7 +10,7 @@ Properties SmartStore.Data SmartStore.Data - v4.6.1 + v4.7.2 512 @@ -105,9 +105,6 @@ ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - diff --git a/src/Libraries/SmartStore.Data/app.config b/src/Libraries/SmartStore.Data/app.config index 63141836b9..a89e0781b5 100644 --- a/src/Libraries/SmartStore.Data/app.config +++ b/src/Libraries/SmartStore.Data/app.config @@ -20,4 +20,4 @@ - + diff --git a/src/Libraries/SmartStore.Data/packages.config b/src/Libraries/SmartStore.Data/packages.config index caaa2b6499..a7e5d59fea 100644 --- a/src/Libraries/SmartStore.Data/packages.config +++ b/src/Libraries/SmartStore.Data/packages.config @@ -6,5 +6,4 @@ - \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Properties/Settings.Designer.cs b/src/Libraries/SmartStore.Services/Properties/Settings.Designer.cs index 499ab870a5..89246c6f2e 100644 --- a/src/Libraries/SmartStore.Services/Properties/Settings.Designer.cs +++ b/src/Libraries/SmartStore.Services/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 2ac1065af7..df8e4ecff7 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -10,7 +10,7 @@ Properties SmartStore.Services SmartStore.Services - v4.6.1 + v4.7.2 512 @@ -144,9 +144,6 @@ - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll diff --git a/src/Libraries/SmartStore.Services/Web References/EuropeCheckVatService/Reference.cs b/src/Libraries/SmartStore.Services/Web References/EuropeCheckVatService/Reference.cs index 83c2471430..ce14537202 100644 --- a/src/Libraries/SmartStore.Services/Web References/EuropeCheckVatService/Reference.cs +++ b/src/Libraries/SmartStore.Services/Web References/EuropeCheckVatService/Reference.cs @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ // -// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000. +// Der Quellcode wurde automatisch mit Microsoft.VSDesigner generiert. Version 4.0.30319.42000. // #pragma warning disable 1591 diff --git a/src/Libraries/SmartStore.Services/app.config b/src/Libraries/SmartStore.Services/app.config index 16aef9ec68..10ff5d2982 100644 --- a/src/Libraries/SmartStore.Services/app.config +++ b/src/Libraries/SmartStore.Services/app.config @@ -48,4 +48,4 @@ - + diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index c879853538..618d223d67 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -22,6 +22,5 @@ - \ No newline at end of file diff --git a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj index 01baf98b7b..7365b57355 100644 --- a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj +++ b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj @@ -18,7 +18,7 @@ Properties SmartStore.AmazonPay SmartStore.AmazonPay - v4.6.1 + v4.7.2 512 @@ -113,9 +113,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.AmazonPay/web.config b/src/Plugins/SmartStore.AmazonPay/web.config index 0982081bf2..803ea9b9aa 100644 --- a/src/Plugins/SmartStore.AmazonPay/web.config +++ b/src/Plugins/SmartStore.AmazonPay/web.config @@ -14,7 +14,7 @@ --> - + @@ -84,10 +84,6 @@ - - - - @@ -126,7 +122,7 @@ - + @@ -160,6 +156,14 @@ + + + + + + + + @@ -167,4 +171,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj index 3a1b76bde7..01628968ed 100644 --- a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj +++ b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj @@ -20,7 +20,7 @@ Properties SmartStore.Clickatell SmartStore.Clickatell - v4.6.1 + v4.7.2 512 @@ -106,9 +106,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.Clickatell/web.config b/src/Plugins/SmartStore.Clickatell/web.config index 81f0867c5c..552e56025b 100644 --- a/src/Plugins/SmartStore.Clickatell/web.config +++ b/src/Plugins/SmartStore.Clickatell/web.config @@ -15,7 +15,7 @@ --> - + @@ -81,10 +81,6 @@ - - - - @@ -111,7 +107,7 @@ - + @@ -145,6 +141,14 @@ + + + + + + + + @@ -152,4 +156,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj index 730aad63ee..3a0ad889a8 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -20,7 +20,7 @@ Properties SmartStore.DevTools SmartStore.DevTools - v4.6.1 + v4.7.2 512 ..\..\ @@ -128,9 +128,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.DevTools/Web.config b/src/Plugins/SmartStore.DevTools/Web.config index 21a2c8be1f..936ba70d6f 100644 --- a/src/Plugins/SmartStore.DevTools/Web.config +++ b/src/Plugins/SmartStore.DevTools/Web.config @@ -15,7 +15,7 @@ --> - + @@ -85,10 +85,6 @@ - - - - @@ -119,7 +115,7 @@ - + @@ -153,6 +149,14 @@ + + + + + + + + @@ -160,4 +164,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj index b9f6bfbf81..8045732912 100644 --- a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj +++ b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj @@ -20,7 +20,7 @@ Properties SmartStore.FacebookAuth SmartStore.FacebookAuth - v4.6.1 + v4.7.2 512 @@ -152,9 +152,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.FacebookAuth/web.config b/src/Plugins/SmartStore.FacebookAuth/web.config index 5e5393a498..d3ef8d4db1 100644 --- a/src/Plugins/SmartStore.FacebookAuth/web.config +++ b/src/Plugins/SmartStore.FacebookAuth/web.config @@ -15,7 +15,7 @@ --> - + @@ -85,10 +85,6 @@ - - - - @@ -119,7 +115,7 @@ - + @@ -153,6 +149,14 @@ + + + + + + + + @@ -160,4 +164,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj index 9f985db672..bc12815ad2 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj +++ b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj @@ -20,7 +20,7 @@ Properties SmartStore.GoogleAnalytics SmartStore.GoogleAnalytics - v4.6.1 + v4.7.2 512 @@ -99,9 +99,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.GoogleAnalytics/web.config b/src/Plugins/SmartStore.GoogleAnalytics/web.config index 63451742ac..21fe12fec3 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/web.config +++ b/src/Plugins/SmartStore.GoogleAnalytics/web.config @@ -14,7 +14,7 @@ --> - + @@ -80,10 +80,6 @@ - - - - @@ -110,7 +106,7 @@ - + @@ -144,6 +140,14 @@ + + + + + + + + @@ -151,4 +155,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj index 2cdba3d2d3..56ad46f35a 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj @@ -20,7 +20,7 @@ Properties SmartStore.GoogleMerchantCenter SmartStore.GoogleMerchantCenter - v4.6.1 + v4.7.2 512 @@ -124,9 +124,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config index 81f0867c5c..552e56025b 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config @@ -15,7 +15,7 @@ --> - + @@ -81,10 +81,6 @@ - - - - @@ -111,7 +107,7 @@ - + @@ -145,6 +141,14 @@ + + + + + + + + @@ -152,4 +156,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj index 1a8e7b55a5..5b6689d041 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -20,7 +20,7 @@ Properties SmartStore.OfflinePayment SmartStore.OfflinePayment - v4.6.1 + v4.7.2 512 @@ -112,9 +112,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.OfflinePayment/web.config b/src/Plugins/SmartStore.OfflinePayment/web.config index 81f0867c5c..552e56025b 100644 --- a/src/Plugins/SmartStore.OfflinePayment/web.config +++ b/src/Plugins/SmartStore.OfflinePayment/web.config @@ -15,7 +15,7 @@ --> - + @@ -81,10 +81,6 @@ - - - - @@ -111,7 +107,7 @@ - + @@ -145,6 +141,14 @@ + + + + + + + + @@ -152,4 +156,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.PayPal/Properties/Settings.Designer.cs b/src/Plugins/SmartStore.PayPal/Properties/Settings.Designer.cs index 919a54792a..7f4015c5da 100644 --- a/src/Plugins/SmartStore.PayPal/Properties/Settings.Designer.cs +++ b/src/Plugins/SmartStore.PayPal/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace SmartStore.PayPal.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj index a13e30fcb4..5e49a320b9 100644 --- a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj +++ b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj @@ -20,7 +20,7 @@ Properties SmartStore.PayPal SmartStore.PayPal - v4.6.1 + v4.7.2 512 ..\..\ diff --git a/src/Plugins/SmartStore.PayPal/Web References/PayPalSvc/Reference.cs b/src/Plugins/SmartStore.PayPal/Web References/PayPalSvc/Reference.cs index cc0825153e..fce0b55bb7 100644 --- a/src/Plugins/SmartStore.PayPal/Web References/PayPalSvc/Reference.cs +++ b/src/Plugins/SmartStore.PayPal/Web References/PayPalSvc/Reference.cs @@ -23,7 +23,7 @@ namespace SmartStore.PayPal.PayPalSvc { /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="PayPalAPISoapBinding", Namespace="urn:ebay:api:PayPalAPI")] @@ -1000,7 +1000,7 @@ private bool IsLocalFileSystemWebService(string url) { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="PayPalAPIAASoapBinding", Namespace="urn:ebay:api:PayPalAPI")] @@ -2229,7 +2229,7 @@ private bool IsLocalFileSystemWebService(string url) { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2275,7 +2275,7 @@ public UserIdPasswordType Credentials { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2380,7 +2380,7 @@ public string AuthToken { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2414,7 +2414,7 @@ public string Status { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2435,7 +2435,7 @@ public string ProfileID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2456,7 +2456,7 @@ public string ProfileID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2477,7 +2477,7 @@ public string ProfileID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2596,7 +2596,7 @@ public BasicAmountType LastPaymentAmount { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2631,7 +2631,7 @@ public string Value { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum CurrencyCodeType { @@ -3163,7 +3163,7 @@ public enum CurrencyCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3377,7 +3377,7 @@ public bool FinalPaymentDueDateSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum RecurringPaymentsProfileStatusType { @@ -3399,7 +3399,7 @@ public enum RecurringPaymentsProfileStatusType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum AutoBillType { @@ -3412,7 +3412,7 @@ public enum AutoBillType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3469,7 +3469,7 @@ public string ProfileReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3734,7 +3734,7 @@ public bool AddressNormalizationStatusSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum CountryCodeType { @@ -4500,7 +4500,7 @@ public enum CountryCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum AddressOwnerCodeType { @@ -4516,7 +4516,7 @@ public enum AddressOwnerCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum AddressStatusCodeType { @@ -4532,7 +4532,7 @@ public enum AddressStatusCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum AddressNormalizationStatusCodeType { @@ -4551,7 +4551,7 @@ public enum AddressNormalizationStatusCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4645,7 +4645,7 @@ public BasicAmountType TaxAmount { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum BillingPeriodType { @@ -4670,7 +4670,7 @@ public enum BillingPeriodType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4864,7 +4864,7 @@ public ThreeDSecureRequestType ThreeDSecureRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum CreditCardTypeType { @@ -4892,7 +4892,7 @@ public enum CreditCardTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5047,7 +5047,7 @@ public EnhancedPayerInfoType EnhancedPayerInfo { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PayPalUserStatusCodeType { @@ -5060,7 +5060,7 @@ public enum PayPalUserStatusCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5129,7 +5129,7 @@ public string Suffix { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5162,7 +5162,7 @@ public string TaxId { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5171,7 +5171,7 @@ public partial class EnhancedPayerInfoType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5240,7 +5240,7 @@ public string AuthStatus3ds { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5322,7 +5322,7 @@ public string DCCReturnCode { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5355,7 +5355,7 @@ public string TransactionID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5460,7 +5460,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5990,7 +5990,7 @@ public string BinEligibility { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PaymentTransactionCodeType { @@ -6066,7 +6066,7 @@ public enum PaymentTransactionCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PaymentCodeType { @@ -6082,7 +6082,7 @@ public enum PaymentCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum RefundSourceCodeType { @@ -6101,7 +6101,7 @@ public enum RefundSourceCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PaymentStatusCodeType { @@ -6163,7 +6163,7 @@ public enum PaymentStatusCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PendingStatusCodeType { @@ -6212,7 +6212,7 @@ public enum PendingStatusCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ReversalReasonCodeType { @@ -6238,7 +6238,7 @@ public enum ReversalReasonCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum POSTransactionCodeType { @@ -6251,7 +6251,7 @@ public enum POSTransactionCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6333,7 +6333,7 @@ public string SecureMerchantAccountID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6394,7 +6394,7 @@ public RiskFilterDetailsType[] ReportFilters { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6439,7 +6439,7 @@ public string Description { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6448,7 +6448,7 @@ public partial class EnhancedPaymentInfoType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6519,7 +6519,7 @@ public ErrorParameterType[] ErrorParameters { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum SeverityCodeType { @@ -6538,7 +6538,7 @@ public enum SeverityCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6572,7 +6572,7 @@ public string ParamID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6605,7 +6605,7 @@ public string InstrumentID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6638,7 +6638,7 @@ public BMLOfferInfoType BMLOfferInfo { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6659,7 +6659,7 @@ public string OfferTrackingID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6692,7 +6692,7 @@ public AddressType BillingAddress { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6749,7 +6749,7 @@ public PaymentInfoType PaymentInfo { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6819,7 +6819,7 @@ public string ProtectionEligibilityType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6876,7 +6876,7 @@ public string PartnerFundingSourceID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -6909,7 +6909,7 @@ public string CoupledPaymentID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -7016,7 +7016,7 @@ public CoupledPaymentInfoType[] CoupledPaymentInfo { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -7085,7 +7085,7 @@ public string ShippingOptionName { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -7131,7 +7131,7 @@ public string ImmutableID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -7165,7 +7165,7 @@ public string ExternalRememberMeID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -7210,7 +7210,7 @@ public ErrorType PaymentError { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -7279,7 +7279,7 @@ public string SubType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -7388,7 +7388,7 @@ public IncentiveAppliedDetailsType[] IncentiveAppliedDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum IncentiveSiteAppliedOnType { @@ -7407,7 +7407,7 @@ public enum IncentiveSiteAppliedOnType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum IncentiveAppliedStatusType { @@ -7422,7 +7422,7 @@ public enum IncentiveAppliedStatusType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -7736,7 +7736,7 @@ public RefreshTokenStatusDetailsType RefreshTokenStatusDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8246,7 +8246,7 @@ public bool PaymentReasonSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PaymentCategoryType { @@ -8259,7 +8259,7 @@ public enum PaymentCategoryType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ShippingServiceCodeType { @@ -8314,7 +8314,7 @@ public enum ShippingServiceCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8542,7 +8542,7 @@ public bool ItemCategorySpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8599,7 +8599,7 @@ public string CartID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ProductCategoryType { @@ -8675,7 +8675,7 @@ public enum ProductCategoryType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8710,7 +8710,7 @@ public double Value { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8719,7 +8719,7 @@ public partial class EnhancedItemDataType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ItemCategoryType { @@ -8732,7 +8732,7 @@ public enum ItemCategoryType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum AllowedPaymentMethodType { @@ -8751,7 +8751,7 @@ public enum AllowedPaymentMethodType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8760,7 +8760,7 @@ public partial class EnhancedPaymentDataType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PaymentActionCodeType { @@ -8779,7 +8779,7 @@ public enum PaymentActionCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum RecurringFlagType { @@ -8792,7 +8792,7 @@ public enum RecurringFlagType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PaymentReasonType { @@ -8808,7 +8808,7 @@ public enum PaymentReasonType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8842,7 +8842,7 @@ public ErrorType[] AuthorizationError { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum AckCodeType { @@ -8870,7 +8870,7 @@ public enum AckCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8917,7 +8917,7 @@ public ErrorType[] SetDataError { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -8950,7 +8950,7 @@ public AuthorizationResponseType AuthorizationResponse { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9007,7 +9007,7 @@ public string SubType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9126,7 +9126,7 @@ public string ErrorCode { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum IncentiveTypeCodeType { @@ -9151,7 +9151,7 @@ public enum IncentiveTypeCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9185,7 +9185,7 @@ public string RequestId { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9268,7 +9268,7 @@ public string PayerID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9325,7 +9325,7 @@ public string PayerID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9394,7 +9394,7 @@ public APIAuthenticationType Type { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum APIAuthenticationType { @@ -9411,7 +9411,7 @@ public enum APIAuthenticationType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9613,7 +9613,7 @@ public string BankAccountVerificationStatus { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum BoardingStatusType { @@ -9632,7 +9632,7 @@ public enum BoardingStatusType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum UserWithdrawalLimitTypeType { @@ -9648,7 +9648,7 @@ public enum UserWithdrawalLimitTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9741,7 +9741,7 @@ public AddressType BillingAddress { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum MerchantPullStatusCodeType { @@ -9754,7 +9754,7 @@ public enum MerchantPullStatusCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9883,7 +9883,7 @@ public BasicAmountType NetAmount { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -9976,7 +9976,7 @@ public string PaymentSourceID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10021,7 +10021,7 @@ public MerchantPullInfoType MerchantPullInfo { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10054,7 +10054,7 @@ public string EciSubmitted3DS { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10087,7 +10087,7 @@ public ThreeDSecureResponseType ThreeDSecureResponse { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10144,7 +10144,7 @@ public string AmountCurrency { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10203,7 +10203,7 @@ public string multiItem { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10237,7 +10237,7 @@ public string period { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10408,7 +10408,7 @@ public string recurring { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10443,7 +10443,7 @@ public string value { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10633,7 +10633,7 @@ public OptionType[] Options { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -10937,7 +10937,7 @@ public string StyleNumber { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum UnitOfMeasure { @@ -11017,7 +11017,7 @@ public enum UnitOfMeasure { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11099,7 +11099,7 @@ public string RedeemedOfferID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum RedeemedOfferType { @@ -11118,7 +11118,7 @@ public enum RedeemedOfferType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11151,7 +11151,7 @@ public BasicAmountType Amount { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11245,7 +11245,7 @@ public AuctionInfoType Auction { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11290,7 +11290,7 @@ public string ReceiverID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11480,7 +11480,7 @@ public string[] SurveyChoiceSelected { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11489,7 +11489,7 @@ public partial class EnhancedCompleteRecoupResponseDetailsType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11548,7 +11548,7 @@ public bool PendingReasonSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11675,7 +11675,7 @@ public bool ModifyDateSpecified { [System.Xml.Serialization.XmlIncludeAttribute(typeof(BMManageButtonStatusResponseType))] [System.Xml.Serialization.XmlIncludeAttribute(typeof(BMUpdateButtonResponseType))] [System.Xml.Serialization.XmlIncludeAttribute(typeof(BMCreateButtonResponseType))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11776,7 +11776,7 @@ public string Build { } /// - [System.Xml.Serialization.XmlIgnoreAttribute()] + [System.Xml.Serialization.XmlAnyElementAttribute(Order=6)] public System.Xml.XmlElement Any { get { return this.anyField; @@ -11788,7 +11788,7 @@ public System.Xml.XmlElement Any { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11797,7 +11797,7 @@ public partial class ExternalRememberMeOptOutResponseType : AbstractResponseType } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11819,7 +11819,7 @@ public ReverseTransactionResponseDetailsType ReverseTransactionResponseDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11854,7 +11854,7 @@ public string Locale { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11876,7 +11876,7 @@ public UpdateRecurringPaymentsProfileResponseDetailsType UpdateRecurringPayments } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11898,7 +11898,7 @@ public BillOutstandingAmountResponseDetailsType BillOutstandingAmountResponseDet } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11920,7 +11920,7 @@ public ManageRecurringPaymentsProfileStatusResponseDetailsType ManageRecurringPa } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11942,7 +11942,7 @@ public GetRecurringPaymentsProfileDetailsResponseDetailsType GetRecurringPayment } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11964,7 +11964,7 @@ public CreateRecurringPaymentsProfileResponseDetailsType CreateRecurringPayments } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -11986,7 +11986,7 @@ public DoNonReferencedCreditResponseDetailsType DoNonReferencedCreditResponseDet } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12021,7 +12021,7 @@ public FMFDetailsType FMFDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12043,7 +12043,7 @@ public string BillingAgreementID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12065,7 +12065,7 @@ public GetBillingAgreementCustomerDetailsResponseDetailsType GetBillingAgreement } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12087,7 +12087,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12135,7 +12135,7 @@ public BasicAmountType[] BalanceHoldings { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12157,7 +12157,7 @@ public DoMobileCheckoutPaymentResponseDetailsType DoMobileCheckoutPaymentRespons } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12179,7 +12179,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12227,7 +12227,7 @@ public string PaymentPending { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12236,7 +12236,7 @@ public partial class CreateMobilePaymentResponseType : AbstractResponseType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12272,7 +12272,7 @@ public AuthorizationInfoType AuthorizationInfo { /// [System.Xml.Serialization.XmlIncludeAttribute(typeof(DoUATPAuthorizationResponseType))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12333,7 +12333,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12394,7 +12394,7 @@ public string MsgSubID1 { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12439,7 +12439,7 @@ public int ExpYear { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12474,7 +12474,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12522,7 +12522,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12544,7 +12544,7 @@ public DoCaptureResponseDetailsType DoCaptureResponseDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12566,7 +12566,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12718,7 +12718,7 @@ public string PaymentAdviceCode { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12754,7 +12754,7 @@ public string Status { /// [System.Xml.Serialization.XmlIncludeAttribute(typeof(DoUATPExpressCheckoutPaymentResponseType))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12789,7 +12789,7 @@ public FMFDetailsType FMFDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12811,7 +12811,7 @@ public UATPDetailsType UATPDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12833,7 +12833,7 @@ public GetExpressCheckoutDetailsResponseDetailsType GetExpressCheckoutDetailsRes } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12855,7 +12855,7 @@ public ExecuteCheckoutOperationsResponseDetailsType ExecuteCheckoutOperationsRes } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12877,7 +12877,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12899,7 +12899,7 @@ public GetIncentiveEvaluationResponseDetailsType GetIncentiveEvaluationResponseD } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12921,7 +12921,7 @@ public GetAccessPermissionDetailsResponseDetailsType GetAccessPermissionDetailsR } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12943,7 +12943,7 @@ public string Status { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12965,7 +12965,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -12987,7 +12987,7 @@ public GetAuthDetailsResponseDetailsType GetAuthDetailsResponseDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13009,7 +13009,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13031,7 +13031,7 @@ public GetBoardingDetailsResponseDetailsType GetBoardingDetailsResponseDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13053,7 +13053,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13153,7 +13153,7 @@ public string PayPalToken { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum MatchStatusCodeType { @@ -13169,7 +13169,7 @@ public enum MatchStatusCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13191,7 +13191,7 @@ public BAUpdateResponseDetailsType BAUpdateResponseDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13200,7 +13200,7 @@ public partial class MassPayResponseType : AbstractResponseType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13222,7 +13222,7 @@ public PaymentTransactionSearchResultType[] PaymentTransactions { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13257,7 +13257,7 @@ public FMFDetailsType FMFDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13292,7 +13292,7 @@ public ThreeDSecureInfoType ThreeDSecureDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13301,7 +13301,7 @@ public partial class CancelRecoupResponseType : AbstractResponseType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13323,7 +13323,7 @@ public EnhancedCompleteRecoupResponseDetailsType EnhancedCompleteRecoupResponseD } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13332,7 +13332,7 @@ public partial class InitiateRecoupResponseType : AbstractResponseType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13445,7 +13445,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13467,7 +13467,7 @@ public ButtonSearchResultType[] ButtonSearchResult { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13593,7 +13593,7 @@ public string[] DigitalDownloadKeys { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13662,7 +13662,7 @@ public string ItemCost { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13743,7 +13743,7 @@ public string OptionCost { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -13752,7 +13752,7 @@ public partial class BMSetInventoryResponseType : AbstractResponseType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14060,7 +14060,7 @@ public string ButtonLanguage { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ButtonTypeType { @@ -14097,7 +14097,7 @@ public enum ButtonTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ButtonCodeType { @@ -14116,7 +14116,7 @@ public enum ButtonCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ButtonSubTypeType { @@ -14129,7 +14129,7 @@ public enum ButtonSubTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14163,7 +14163,7 @@ public OptionSelectionDetailsType[] OptionSelectionDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14234,7 +14234,7 @@ public InstallmentDetailsType[] PaymentPeriod { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum OptionTypeListType { @@ -14253,7 +14253,7 @@ public enum OptionTypeListType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14373,7 +14373,7 @@ public string TaxAmount { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ButtonImageType { @@ -14389,7 +14389,7 @@ public enum ButtonImageType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum BuyNowTextType { @@ -14402,7 +14402,7 @@ public enum BuyNowTextType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum SubscribeTextType { @@ -14415,7 +14415,7 @@ public enum SubscribeTextType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14424,7 +14424,7 @@ public partial class BMManageButtonStatusResponseType : AbstractResponseType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14485,7 +14485,7 @@ public string HostedButtonID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14546,7 +14546,7 @@ public string HostedButtonID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14567,7 +14567,7 @@ public string TransactionID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14687,7 +14687,7 @@ public BasicAmountType TaxAmount { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14952,7 +14952,7 @@ public BillingPeriodDetailsType_Update PaymentPeriod { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -14997,7 +14997,7 @@ public string Note { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15042,7 +15042,7 @@ public string Note { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum StatusChangeActionType { @@ -15058,7 +15058,7 @@ public enum StatusChangeActionType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15104,7 +15104,7 @@ public bool FailedInitialAmountActionSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum FailedPaymentActionType { @@ -15117,7 +15117,7 @@ public enum FailedPaymentActionType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15224,7 +15224,7 @@ public bool AutoBillOutstandingAmountSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15294,7 +15294,7 @@ public PaymentDetailsItemType[] PaymentDetailsItem { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15387,7 +15387,7 @@ public string Comment { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15408,7 +15408,7 @@ public string DeviceID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15429,7 +15429,7 @@ public DeviceDetailsType DeviceDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15475,7 +15475,7 @@ public string CreditCardNumber { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15644,7 +15644,7 @@ public string IssueNumber { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15798,7 +15798,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum MerchantPullPaymentCodeType { @@ -15814,7 +15814,7 @@ public enum MerchantPullPaymentCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -15959,7 +15959,7 @@ public string ReqBillingAddress { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -16029,7 +16029,7 @@ public string BillingAgreementCustom { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum BillingCodeType { @@ -16051,7 +16051,7 @@ public enum BillingCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -16254,7 +16254,7 @@ public string BuyerEmail { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -16299,7 +16299,7 @@ public string Extension { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -16320,7 +16320,7 @@ public PhoneNumberType Phone { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -16511,7 +16511,7 @@ public string ShareHomeAddress { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum MobilePaymentCodeType { @@ -16530,7 +16530,7 @@ public enum MobilePaymentCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum MobileRecipientCodeType { @@ -16543,7 +16543,7 @@ public enum MobileRecipientCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -16576,7 +16576,7 @@ public string Value { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -16670,7 +16670,7 @@ public bool ReturnFMFDetailsSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -16883,7 +16883,7 @@ public string EndorsementOrRestrictions { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17061,7 +17061,7 @@ public FlightDetailsType[] FlightDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17082,7 +17082,7 @@ public AirlineItineraryType AirlineItinerary { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17360,7 +17360,7 @@ public CoupledBucketsType[] CoupledBuckets { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17419,7 +17419,7 @@ public string[] PaymentRequestID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum CoupleType { @@ -17429,7 +17429,7 @@ public enum CoupleType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17450,7 +17450,7 @@ public bool IsRequested { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17471,7 +17471,7 @@ public string ReqBillingAddress { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17492,7 +17492,7 @@ public IdentificationInfoType IdentificationInfo { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17537,7 +17537,7 @@ public IdentityTokenInfoType IdentityTokenInfo { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17558,7 +17558,7 @@ public string SessionToken { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17579,7 +17579,7 @@ public string ExternalRememberMeID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17600,7 +17600,7 @@ public string AccessToken { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17634,7 +17634,7 @@ public bool PaymentTypeSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17667,7 +17667,7 @@ public BasicAmountType MaxAmount { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17749,7 +17749,7 @@ public string Custom { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ApprovalTypeType { @@ -17762,7 +17762,7 @@ public enum ApprovalTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ApprovalSubTypeType { @@ -17781,7 +17781,7 @@ public enum ApprovalSubTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17927,7 +17927,7 @@ public ExternalPartnerTrackingDetailsType ExternalPartnerTrackingDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum UserChannelCodeType { @@ -17958,7 +17958,7 @@ public enum UserChannelCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -17979,7 +17979,7 @@ public string ExternalPartnerSegmentID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18024,7 +18024,7 @@ public AuthorizationRequestType AuthorizationRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18045,7 +18045,7 @@ public string InContextPaymentButtonImage { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18078,7 +18078,7 @@ public string InContextReturnURL { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18111,7 +18111,7 @@ public string ExternalRememberMeOwnerID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18144,7 +18144,7 @@ public ExternalRememberMeOwnerDetailsType ExternalRememberMeOwnerDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18178,7 +18178,7 @@ public IncentiveApplyIndicationType[] ApplyIndication { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18211,7 +18211,7 @@ public string ItemId { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18256,7 +18256,7 @@ public string ShippingOptionName { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18338,7 +18338,7 @@ public IdentificationInfoType IdentificationInfo { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18456,7 +18456,7 @@ public bool OtherPaymentMethodHideLabelSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18465,7 +18465,7 @@ public partial class EnhancedCheckoutDataType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -18511,7 +18511,7 @@ public bool UserSelectedFundingSourceSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum UserSelectedFundingSourceType { @@ -18530,7 +18530,7 @@ public enum UserSelectedFundingSourceType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -19461,7 +19461,7 @@ public CoupledBucketsType[] CoupledBuckets { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum SolutionTypeType { @@ -19474,7 +19474,7 @@ public enum SolutionTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum LandingPageType { @@ -19490,7 +19490,7 @@ public enum LandingPageType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ChannelType { @@ -19503,7 +19503,7 @@ public enum ChannelType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum TotalType { @@ -19516,7 +19516,7 @@ public enum TotalType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -19587,7 +19587,7 @@ public bool RequestDetailLevelSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum IncentiveRequestCodeType { @@ -19600,7 +19600,7 @@ public enum IncentiveRequestCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum IncentiveRequestDetailLevelCodeType { @@ -19613,7 +19613,7 @@ public enum IncentiveRequestDetailLevelCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -19696,7 +19696,7 @@ public string ItemQuantity { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -19814,7 +19814,7 @@ public BasicAmountType BucketTotalAmt { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -19898,7 +19898,7 @@ public IncentiveRequestDetailsType RequestDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -20105,7 +20105,7 @@ public AddressType Address { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -20334,7 +20334,7 @@ public AddressType Address { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -20391,7 +20391,7 @@ public string AccountNumber { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum BankAccountTypeType { @@ -20404,7 +20404,7 @@ public enum BankAccountTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -20461,7 +20461,7 @@ public string SSN { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -20742,7 +20742,7 @@ public string CustomerServicePhone { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum BusinessTypeType { @@ -20770,7 +20770,7 @@ public enum BusinessTypeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum BusinessCategoryType { @@ -20890,7 +20890,7 @@ public enum BusinessCategoryType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum BusinessSubCategoryType { @@ -21965,7 +21965,7 @@ public enum BusinessSubCategoryType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum AverageTransactionPriceType { @@ -22016,7 +22016,7 @@ public enum AverageTransactionPriceType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum AverageMonthlyVolumeType { @@ -22051,7 +22051,7 @@ public enum AverageMonthlyVolumeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum SalesVenueType { @@ -22074,7 +22074,7 @@ public enum SalesVenueType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PercentageRevenueFromOnlineSalesType { @@ -22101,7 +22101,7 @@ public enum PercentageRevenueFromOnlineSalesType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22219,7 +22219,7 @@ public BankAccountDetailsType BankAccount { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum MarketingCategoryType { @@ -22310,7 +22310,7 @@ public enum MarketingCategoryType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22391,7 +22391,7 @@ public string Note { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22581,7 +22581,7 @@ public string SoftDescriptor { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22590,7 +22590,7 @@ public partial class EnhancedCancelRecoupRequestDetailsType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22599,7 +22599,7 @@ public partial class EnhancedCompleteRecoupRequestDetailsType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22608,7 +22608,7 @@ public partial class EnhancedInitiateRecoupRequestDetailsType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22698,7 +22698,7 @@ public string TerminalID { [System.Xml.Serialization.XmlIncludeAttribute(typeof(BMManageButtonStatusRequestType))] [System.Xml.Serialization.XmlIncludeAttribute(typeof(BMUpdateButtonRequestType))] [System.Xml.Serialization.XmlIncludeAttribute(typeof(BMCreateButtonRequestType))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22745,7 +22745,7 @@ public string Version { } /// - [System.Xml.Serialization.XmlIgnoreAttribute()] + [System.Xml.Serialization.XmlAnyElementAttribute()] public System.Xml.XmlElement Any { get { return this.anyField; @@ -22757,7 +22757,7 @@ public System.Xml.XmlElement Any { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum DetailLevelCodeType { @@ -22773,7 +22773,7 @@ public enum DetailLevelCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22806,7 +22806,7 @@ public ExternalRememberMeOwnerDetailsType ExternalRememberMeOwnerDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22828,7 +22828,7 @@ public ReverseTransactionRequestDetailsType ReverseTransactionRequestDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22837,7 +22837,7 @@ public partial class GetPalDetailsRequestType : AbstractRequestType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22859,7 +22859,7 @@ public UpdateRecurringPaymentsProfileRequestDetailsType UpdateRecurringPaymentsP } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22881,7 +22881,7 @@ public BillOutstandingAmountRequestDetailsType BillOutstandingAmountRequestDetai } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22903,7 +22903,7 @@ public ManageRecurringPaymentsProfileStatusRequestDetailsType ManageRecurringPay } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22924,7 +22924,7 @@ public string ProfileID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22946,7 +22946,7 @@ public CreateRecurringPaymentsProfileRequestDetailsType CreateRecurringPaymentsP } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -22968,7 +22968,7 @@ public DoNonReferencedCreditRequestDetailsType DoNonReferencedCreditRequestDetai } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23015,7 +23015,7 @@ public bool ReturnFMFDetailsSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23036,7 +23036,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23057,7 +23057,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23079,7 +23079,7 @@ public SetCustomerBillingAgreementRequestDetailsType SetCustomerBillingAgreement } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23100,7 +23100,7 @@ public string ReturnAllCurrencies { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23121,7 +23121,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23143,7 +23143,7 @@ public SetMobileCheckoutRequestDetailsType SetMobileCheckoutRequestDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23165,7 +23165,7 @@ public GetMobileStatusRequestDetailsType GetMobileStatusRequestDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23187,7 +23187,7 @@ public CreateMobilePaymentRequestDetailsType CreateMobilePaymentRequestDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23270,7 +23270,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum TransactionEntityType { @@ -23292,7 +23292,7 @@ public enum TransactionEntityType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23338,7 +23338,7 @@ public string IPAddress { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23542,7 +23542,7 @@ public string IPAddress { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23587,7 +23587,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23632,7 +23632,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23765,7 +23765,7 @@ public TupleType[] MerchantData { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum CompleteCodeType { @@ -23778,7 +23778,7 @@ public enum CompleteCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23823,7 +23823,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum APIType { @@ -23836,7 +23836,7 @@ public enum APIType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23883,7 +23883,7 @@ public bool ReturnFMFDetailsSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23916,7 +23916,7 @@ public FMFPendingTransactionActionType Action { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum FMFPendingTransactionActionType { @@ -23930,7 +23930,7 @@ public enum FMFPendingTransactionActionType { /// [System.Xml.Serialization.XmlIncludeAttribute(typeof(DoUATPExpressCheckoutPaymentRequestType))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23977,7 +23977,7 @@ public bool ReturnFMFDetailsSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -23986,7 +23986,7 @@ public partial class DoUATPExpressCheckoutPaymentRequestType : DoExpressCheckout } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24007,7 +24007,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24029,7 +24029,7 @@ public ExecuteCheckoutOperationsRequestDetailsType ExecuteCheckoutOperationsRequ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24051,7 +24051,7 @@ public SetExpressCheckoutRequestDetailsType SetExpressCheckoutRequestDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24073,7 +24073,7 @@ public GetIncentiveEvaluationRequestDetailsType GetIncentiveEvaluationRequestDet } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24094,7 +24094,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24115,7 +24115,7 @@ public string PayerID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24137,7 +24137,7 @@ public SetAccessPermissionsRequestDetailsType SetAccessPermissionsRequestDetails } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24158,7 +24158,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24180,7 +24180,7 @@ public SetAuthFlowParamRequestDetailsType SetAuthFlowParamRequestDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24201,7 +24201,7 @@ public string Token { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24223,7 +24223,7 @@ public EnterBoardingRequestDetailsType EnterBoardingRequestDetails { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24268,7 +24268,7 @@ public string Zip { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24338,7 +24338,7 @@ public string BillingAgreementCustom { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24409,7 +24409,7 @@ public MassPayRequestItemType[] MassPayItem { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ReceiverInfoCodeType { @@ -24425,7 +24425,7 @@ public enum ReceiverInfoCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24666,7 +24666,7 @@ public bool StatusSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PaymentTransactionClassCodeType { @@ -24739,7 +24739,7 @@ public enum PaymentTransactionClassCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum PaymentTransactionStatusCodeType { @@ -24761,7 +24761,7 @@ public enum PaymentTransactionStatusCodeType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24808,7 +24808,7 @@ public bool ReturnFMFDetailsSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24829,7 +24829,7 @@ public string TransactionID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24851,7 +24851,7 @@ public EnhancedCancelRecoupRequestDetailsType EnhancedCancelRecoupRequestDetails } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24873,7 +24873,7 @@ public EnhancedCompleteRecoupRequestDetailsType EnhancedCompleteRecoupRequestDet } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -24895,7 +24895,7 @@ public EnhancedInitiateRecoupRequestDetailsType EnhancedInitiateRecoupRequestDet } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25102,7 +25102,7 @@ public string MsgSubID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum RefundType { @@ -25121,7 +25121,7 @@ public enum RefundType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25180,7 +25180,7 @@ public bool EndDateSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25201,7 +25201,7 @@ public string HostedButtonID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25333,7 +25333,7 @@ public string[] DigitalDownloadKeys { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25354,7 +25354,7 @@ public string HostedButtonID { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25400,7 +25400,7 @@ public bool ButtonStatusSpecified { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:ebay:apis:eBLBaseComponents")] public enum ButtonStatusType { @@ -25410,7 +25410,7 @@ public enum ButtonStatusType { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25669,7 +25669,7 @@ public string ButtonLanguage { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25916,7 +25916,7 @@ public string ButtonLanguage { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25937,7 +25937,7 @@ public RefundTransactionRequestType RefundTransactionRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25958,7 +25958,7 @@ public InitiateRecoupRequestType InitiateRecoupRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -25979,7 +25979,7 @@ public CompleteRecoupRequestType CompleteRecoupRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26000,7 +26000,7 @@ public CancelRecoupRequestType CancelRecoupRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26021,7 +26021,7 @@ public GetTransactionDetailsRequestType GetTransactionDetailsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26042,7 +26042,7 @@ public BMCreateButtonRequestType BMCreateButtonRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26063,7 +26063,7 @@ public BMUpdateButtonRequestType BMUpdateButtonRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26084,7 +26084,7 @@ public BMManageButtonStatusRequestType BMManageButtonStatusRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26105,7 +26105,7 @@ public BMGetButtonDetailsRequestType BMGetButtonDetailsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26126,7 +26126,7 @@ public BMSetInventoryRequestType BMSetInventoryRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26147,7 +26147,7 @@ public BMGetInventoryRequestType BMGetInventoryRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26168,7 +26168,7 @@ public BMButtonSearchRequestType BMButtonSearchRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26189,7 +26189,7 @@ public BillUserRequestType BillUserRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26210,7 +26210,7 @@ public TransactionSearchRequestType TransactionSearchRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26231,7 +26231,7 @@ public MassPayRequestType MassPayRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26252,7 +26252,7 @@ public BAUpdateRequestType BAUpdateRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26273,7 +26273,7 @@ public AddressVerifyRequestType AddressVerifyRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26294,7 +26294,7 @@ public EnterBoardingRequestType EnterBoardingRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26315,7 +26315,7 @@ public GetBoardingDetailsRequestType GetBoardingDetailsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26336,7 +26336,7 @@ public CreateMobilePaymentRequestType CreateMobilePaymentRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26357,7 +26357,7 @@ public GetMobileStatusRequestType GetMobileStatusRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26378,7 +26378,7 @@ public SetMobileCheckoutRequestType SetMobileCheckoutRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26399,7 +26399,7 @@ public DoMobileCheckoutPaymentRequestType DoMobileCheckoutPaymentRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26420,7 +26420,7 @@ public GetBalanceRequestType GetBalanceRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26441,7 +26441,7 @@ public GetPalDetailsRequestType GetPalDetailsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26462,7 +26462,7 @@ public DoExpressCheckoutPaymentRequestType DoExpressCheckoutPaymentRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26483,7 +26483,7 @@ public DoUATPExpressCheckoutPaymentRequestType DoUATPExpressCheckoutPaymentReque } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26504,7 +26504,7 @@ public SetAuthFlowParamRequestType SetAuthFlowParamRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26525,7 +26525,7 @@ public GetAuthDetailsRequestType GetAuthDetailsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26546,7 +26546,7 @@ public SetAccessPermissionsRequestType SetAccessPermissionsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26567,7 +26567,7 @@ public UpdateAccessPermissionsRequestType UpdateAccessPermissionsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26588,7 +26588,7 @@ public GetAccessPermissionDetailsRequestType GetAccessPermissionDetailsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26609,7 +26609,7 @@ public GetIncentiveEvaluationRequestType GetIncentiveEvaluationRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26630,7 +26630,7 @@ public SetExpressCheckoutRequestType SetExpressCheckoutRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26651,7 +26651,7 @@ public ExecuteCheckoutOperationsRequestType ExecuteCheckoutOperationsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26672,7 +26672,7 @@ public GetExpressCheckoutDetailsRequestType GetExpressCheckoutDetailsRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26693,7 +26693,7 @@ public DoDirectPaymentRequestType DoDirectPaymentRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26714,7 +26714,7 @@ public ManagePendingTransactionStatusRequestType ManagePendingTransactionStatusR } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26735,7 +26735,7 @@ public DoCancelRequestType DoCancelRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26756,7 +26756,7 @@ public DoCaptureRequestType DoCaptureRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26777,7 +26777,7 @@ public DoReauthorizationRequestType DoReauthorizationRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26798,7 +26798,7 @@ public DoVoidRequestType DoVoidRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26819,7 +26819,7 @@ public DoAuthorizationRequestType DoAuthorizationRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26840,7 +26840,7 @@ public UpdateAuthorizationRequestType UpdateAuthorizationRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26861,7 +26861,7 @@ public SetCustomerBillingAgreementRequestType SetCustomerBillingAgreementRequest } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26882,7 +26882,7 @@ public GetBillingAgreementCustomerDetailsRequestType GetBillingAgreementCustomer } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26903,7 +26903,7 @@ public CreateBillingAgreementRequestType CreateBillingAgreementRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26924,7 +26924,7 @@ public DoReferenceTransactionRequestType DoReferenceTransactionRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26945,7 +26945,7 @@ public DoNonReferencedCreditRequestType DoNonReferencedCreditRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26966,7 +26966,7 @@ public DoUATPAuthorizationRequestType DoUATPAuthorizationRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -26987,7 +26987,7 @@ public CreateRecurringPaymentsProfileRequestType CreateRecurringPaymentsProfileR } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -27008,7 +27008,7 @@ public GetRecurringPaymentsProfileDetailsRequestType GetRecurringPaymentsProfile } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -27029,7 +27029,7 @@ public ManageRecurringPaymentsProfileStatusRequestType ManageRecurringPaymentsPr } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -27050,7 +27050,7 @@ public BillOutstandingAmountRequestType BillOutstandingAmountRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -27071,7 +27071,7 @@ public UpdateRecurringPaymentsProfileRequestType UpdateRecurringPaymentsProfileR } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -27092,7 +27092,7 @@ public ReverseTransactionRequestType ReverseTransactionRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -27113,11 +27113,11 @@ public ExternalRememberMeOptOutRequestType ExternalRememberMeOptOutRequest { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void RefundTransactionCompletedEventHandler(object sender, RefundTransactionCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class RefundTransactionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27139,11 +27139,11 @@ public RefundTransactionResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void InitiateRecoupCompletedEventHandler(object sender, InitiateRecoupCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class InitiateRecoupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27165,11 +27165,11 @@ public InitiateRecoupResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void CompleteRecoupCompletedEventHandler(object sender, CompleteRecoupCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class CompleteRecoupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27191,11 +27191,11 @@ public CompleteRecoupResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void CancelRecoupCompletedEventHandler(object sender, CancelRecoupCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class CancelRecoupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27217,11 +27217,11 @@ public CancelRecoupResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetTransactionDetailsCompletedEventHandler(object sender, GetTransactionDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetTransactionDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27243,11 +27243,11 @@ public GetTransactionDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BMCreateButtonCompletedEventHandler(object sender, BMCreateButtonCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BMCreateButtonCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27269,11 +27269,11 @@ public BMCreateButtonResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BMUpdateButtonCompletedEventHandler(object sender, BMUpdateButtonCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BMUpdateButtonCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27295,11 +27295,11 @@ public BMUpdateButtonResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BMManageButtonStatusCompletedEventHandler(object sender, BMManageButtonStatusCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BMManageButtonStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27321,11 +27321,11 @@ public BMManageButtonStatusResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BMGetButtonDetailsCompletedEventHandler(object sender, BMGetButtonDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BMGetButtonDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27347,11 +27347,11 @@ public BMGetButtonDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BMSetInventoryCompletedEventHandler(object sender, BMSetInventoryCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BMSetInventoryCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27373,11 +27373,11 @@ public BMSetInventoryResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BMGetInventoryCompletedEventHandler(object sender, BMGetInventoryCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BMGetInventoryCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27399,11 +27399,11 @@ public BMGetInventoryResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BMButtonSearchCompletedEventHandler(object sender, BMButtonSearchCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BMButtonSearchCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27425,11 +27425,11 @@ public BMButtonSearchResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BillUserCompletedEventHandler(object sender, BillUserCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BillUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27451,11 +27451,11 @@ public BillUserResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void TransactionSearchCompletedEventHandler(object sender, TransactionSearchCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class TransactionSearchCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27477,11 +27477,11 @@ public TransactionSearchResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void MassPayCompletedEventHandler(object sender, MassPayCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class MassPayCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27503,11 +27503,11 @@ public MassPayResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BillAgreementUpdateCompletedEventHandler(object sender, BillAgreementUpdateCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BillAgreementUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27529,11 +27529,11 @@ public BAUpdateResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void AddressVerifyCompletedEventHandler(object sender, AddressVerifyCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class AddressVerifyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27555,11 +27555,11 @@ public AddressVerifyResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void EnterBoardingCompletedEventHandler(object sender, EnterBoardingCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class EnterBoardingCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27581,11 +27581,11 @@ public EnterBoardingResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetBoardingDetailsCompletedEventHandler(object sender, GetBoardingDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetBoardingDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27607,11 +27607,11 @@ public GetBoardingDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void CreateMobilePaymentCompletedEventHandler(object sender, CreateMobilePaymentCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class CreateMobilePaymentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27633,11 +27633,11 @@ public CreateMobilePaymentResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetMobileStatusCompletedEventHandler(object sender, GetMobileStatusCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetMobileStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27659,11 +27659,11 @@ public GetMobileStatusResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void SetMobileCheckoutCompletedEventHandler(object sender, SetMobileCheckoutCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SetMobileCheckoutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27685,11 +27685,11 @@ public SetMobileCheckoutResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoMobileCheckoutPaymentCompletedEventHandler(object sender, DoMobileCheckoutPaymentCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoMobileCheckoutPaymentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27711,11 +27711,11 @@ public DoMobileCheckoutPaymentResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetBalanceCompletedEventHandler(object sender, GetBalanceCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetBalanceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27737,11 +27737,11 @@ public GetBalanceResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetPalDetailsCompletedEventHandler(object sender, GetPalDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetPalDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27763,11 +27763,11 @@ public GetPalDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoExpressCheckoutPaymentCompletedEventHandler(object sender, DoExpressCheckoutPaymentCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoExpressCheckoutPaymentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27789,11 +27789,11 @@ public DoExpressCheckoutPaymentResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoUATPExpressCheckoutPaymentCompletedEventHandler(object sender, DoUATPExpressCheckoutPaymentCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoUATPExpressCheckoutPaymentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27815,11 +27815,11 @@ public DoUATPExpressCheckoutPaymentResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void SetAuthFlowParamCompletedEventHandler(object sender, SetAuthFlowParamCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SetAuthFlowParamCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27841,11 +27841,11 @@ public SetAuthFlowParamResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetAuthDetailsCompletedEventHandler(object sender, GetAuthDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetAuthDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27867,11 +27867,11 @@ public GetAuthDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void SetAccessPermissionsCompletedEventHandler(object sender, SetAccessPermissionsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SetAccessPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27893,11 +27893,11 @@ public SetAccessPermissionsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void UpdateAccessPermissionsCompletedEventHandler(object sender, UpdateAccessPermissionsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class UpdateAccessPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27919,11 +27919,11 @@ public UpdateAccessPermissionsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetAccessPermissionDetailsCompletedEventHandler(object sender, GetAccessPermissionDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetAccessPermissionDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27945,11 +27945,11 @@ public GetAccessPermissionDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetIncentiveEvaluationCompletedEventHandler(object sender, GetIncentiveEvaluationCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetIncentiveEvaluationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27971,11 +27971,11 @@ public GetIncentiveEvaluationResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void SetExpressCheckoutCompletedEventHandler(object sender, SetExpressCheckoutCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SetExpressCheckoutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -27997,11 +27997,11 @@ public SetExpressCheckoutResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void ExecuteCheckoutOperationsCompletedEventHandler(object sender, ExecuteCheckoutOperationsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ExecuteCheckoutOperationsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28023,11 +28023,11 @@ public ExecuteCheckoutOperationsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetExpressCheckoutDetailsCompletedEventHandler(object sender, GetExpressCheckoutDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetExpressCheckoutDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28049,11 +28049,11 @@ public GetExpressCheckoutDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoDirectPaymentCompletedEventHandler(object sender, DoDirectPaymentCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoDirectPaymentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28075,11 +28075,11 @@ public DoDirectPaymentResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void ManagePendingTransactionStatusCompletedEventHandler(object sender, ManagePendingTransactionStatusCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ManagePendingTransactionStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28101,11 +28101,11 @@ public ManagePendingTransactionStatusResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoCancelCompletedEventHandler(object sender, DoCancelCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoCancelCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28127,11 +28127,11 @@ public DoCancelResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoCaptureCompletedEventHandler(object sender, DoCaptureCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoCaptureCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28153,11 +28153,11 @@ public DoCaptureResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoReauthorizationCompletedEventHandler(object sender, DoReauthorizationCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoReauthorizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28179,11 +28179,11 @@ public DoReauthorizationResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoVoidCompletedEventHandler(object sender, DoVoidCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoVoidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28205,11 +28205,11 @@ public DoVoidResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoAuthorizationCompletedEventHandler(object sender, DoAuthorizationCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoAuthorizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28231,11 +28231,11 @@ public DoAuthorizationResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void UpdateAuthorizationCompletedEventHandler(object sender, UpdateAuthorizationCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class UpdateAuthorizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28257,11 +28257,11 @@ public UpdateAuthorizationResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void SetCustomerBillingAgreementCompletedEventHandler(object sender, SetCustomerBillingAgreementCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SetCustomerBillingAgreementCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28283,11 +28283,11 @@ public SetCustomerBillingAgreementResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetBillingAgreementCustomerDetailsCompletedEventHandler(object sender, GetBillingAgreementCustomerDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetBillingAgreementCustomerDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28309,11 +28309,11 @@ public GetBillingAgreementCustomerDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void CreateBillingAgreementCompletedEventHandler(object sender, CreateBillingAgreementCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class CreateBillingAgreementCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28335,11 +28335,11 @@ public CreateBillingAgreementResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoReferenceTransactionCompletedEventHandler(object sender, DoReferenceTransactionCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoReferenceTransactionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28361,11 +28361,11 @@ public DoReferenceTransactionResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoNonReferencedCreditCompletedEventHandler(object sender, DoNonReferencedCreditCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoNonReferencedCreditCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28387,11 +28387,11 @@ public DoNonReferencedCreditResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void DoUATPAuthorizationCompletedEventHandler(object sender, DoUATPAuthorizationCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DoUATPAuthorizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28413,11 +28413,11 @@ public DoUATPAuthorizationResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void CreateRecurringPaymentsProfileCompletedEventHandler(object sender, CreateRecurringPaymentsProfileCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class CreateRecurringPaymentsProfileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28439,11 +28439,11 @@ public CreateRecurringPaymentsProfileResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void GetRecurringPaymentsProfileDetailsCompletedEventHandler(object sender, GetRecurringPaymentsProfileDetailsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetRecurringPaymentsProfileDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28465,11 +28465,11 @@ public GetRecurringPaymentsProfileDetailsResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void ManageRecurringPaymentsProfileStatusCompletedEventHandler(object sender, ManageRecurringPaymentsProfileStatusCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ManageRecurringPaymentsProfileStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28491,11 +28491,11 @@ public ManageRecurringPaymentsProfileStatusResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void BillOutstandingAmountCompletedEventHandler(object sender, BillOutstandingAmountCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class BillOutstandingAmountCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28517,11 +28517,11 @@ public BillOutstandingAmountResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void UpdateRecurringPaymentsProfileCompletedEventHandler(object sender, UpdateRecurringPaymentsProfileCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class UpdateRecurringPaymentsProfileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28543,11 +28543,11 @@ public UpdateRecurringPaymentsProfileResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void ReverseTransactionCompletedEventHandler(object sender, ReverseTransactionCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ReverseTransactionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -28569,11 +28569,11 @@ public ReverseTransactionResponseType Result { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] public delegate void ExternalRememberMeOptOutCompletedEventHandler(object sender, ExternalRememberMeOptOutCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ExternalRememberMeOptOutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/src/Plugins/SmartStore.PayPal/web.config b/src/Plugins/SmartStore.PayPal/web.config index f0e8bf3314..d5de44336a 100644 --- a/src/Plugins/SmartStore.PayPal/web.config +++ b/src/Plugins/SmartStore.PayPal/web.config @@ -27,7 +27,7 @@ --> - + @@ -97,10 +97,6 @@ - - - - @@ -139,7 +135,7 @@ - + @@ -173,6 +169,14 @@ + + + + + + + + @@ -180,4 +184,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj index fa68da3247..d6cefba6be 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -20,7 +20,7 @@ Properties SmartStore.Shipping SmartStore.Shipping - v4.6.1 + v4.7.2 512 @@ -116,9 +116,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.Shipping/web.config b/src/Plugins/SmartStore.Shipping/web.config index 63451742ac..21fe12fec3 100644 --- a/src/Plugins/SmartStore.Shipping/web.config +++ b/src/Plugins/SmartStore.Shipping/web.config @@ -14,7 +14,7 @@ --> - + @@ -80,10 +80,6 @@ - - - - @@ -110,7 +106,7 @@ - + @@ -144,6 +140,14 @@ + + + + + + + + @@ -151,4 +155,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj index 09e985e9e9..a36d46d41f 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj +++ b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj @@ -20,7 +20,7 @@ Properties SmartStore.ShippingByWeight SmartStore.ShippingByWeight - v4.6.1 + v4.7.2 512 @@ -116,9 +116,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.ShippingByWeight/web.config b/src/Plugins/SmartStore.ShippingByWeight/web.config index 63451742ac..21fe12fec3 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/web.config +++ b/src/Plugins/SmartStore.ShippingByWeight/web.config @@ -14,7 +14,7 @@ --> - + @@ -80,10 +80,6 @@ - - - - @@ -110,7 +106,7 @@ - + @@ -144,6 +140,14 @@ + + + + + + + + @@ -151,4 +155,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj index 9da2507797..10615a9aa4 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -20,7 +20,7 @@ Properties SmartStore.Tax SmartStore.Tax - v4.6.1 + v4.7.2 512 @@ -116,9 +116,9 @@ - + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll False diff --git a/src/Plugins/SmartStore.Tax/web.config b/src/Plugins/SmartStore.Tax/web.config index 81f0867c5c..552e56025b 100644 --- a/src/Plugins/SmartStore.Tax/web.config +++ b/src/Plugins/SmartStore.Tax/web.config @@ -15,7 +15,7 @@ --> - + @@ -81,10 +81,6 @@ - - - - @@ -111,7 +107,7 @@ - + @@ -145,6 +141,14 @@ + + + + + + + + @@ -152,4 +156,4 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 5403bc55ca..a7f6111bfd 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -27,7 +27,7 @@ Properties SmartStore.WebApi SmartStore.WebApi - v4.6.1 + v4.7.2 512 diff --git a/src/Plugins/SmartStore.WebApi/web.config b/src/Plugins/SmartStore.WebApi/web.config index 04c57de4ac..9eb24d4874 100644 --- a/src/Plugins/SmartStore.WebApi/web.config +++ b/src/Plugins/SmartStore.WebApi/web.config @@ -6,16 +6,8 @@ - - + @@ -53,10 +45,6 @@ - - - - @@ -117,9 +105,16 @@ + + + + + + + + - diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 1af2838abd..0a2848140c 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -10,7 +10,7 @@ Properties SmartStore.Web.Framework SmartStore.Web.Framework - v4.6.1 + v4.7.2 512 @@ -81,17 +81,20 @@ ..\..\packages\Autofac.WebApi2.4.2.0\lib\net45\Autofac.Integration.WebApi.dll - - ..\..\packages\BundleTransformer.Autoprefixer.1.10.2\lib\net40\BundleTransformer.Autoprefixer.dll + + ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll + + + ..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll ..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll - - ..\..\packages\BundleTransformer.SassAndScss.1.10.0\lib\net40\BundleTransformer.SassAndScss.dll + + ..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll - ..\..\packages\CommonServiceLocator.2.0.5\lib\net46\CommonServiceLocator.dll + ..\..\packages\CommonServiceLocator.2.0.5\lib\net47\CommonServiceLocator.dll ..\..\packages\DotLiquid.2.0.254\lib\net45\DotLiquid.dll @@ -107,11 +110,11 @@ ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - - ..\..\packages\JavaScriptEngineSwitcher.Core.3.0.0\lib\net45\JavaScriptEngineSwitcher.Core.dll + + ..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll - - ..\..\packages\LibSassHost.1.2.2\lib\net45\LibSassHost.dll + + ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll ..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll @@ -130,6 +133,9 @@ ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\System.Buffers.4.0.0\lib\netstandard1.1\System.Buffers.dll + @@ -148,9 +154,6 @@ ..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - diff --git a/src/Presentation/SmartStore.Web.Framework/app.config b/src/Presentation/SmartStore.Web.Framework/app.config index c75a4b4348..3cf6309ecc 100644 --- a/src/Presentation/SmartStore.Web.Framework/app.config +++ b/src/Presentation/SmartStore.Web.Framework/app.config @@ -16,7 +16,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -74,6 +74,10 @@ + + + + - + diff --git a/src/Presentation/SmartStore.Web.Framework/packages.config b/src/Presentation/SmartStore.Web.Framework/packages.config index 8bba36e6b6..3a994957a8 100644 --- a/src/Presentation/SmartStore.Web.Framework/packages.config +++ b/src/Presentation/SmartStore.Web.Framework/packages.config @@ -5,15 +5,16 @@ - + + - - + + - - + + @@ -29,12 +30,12 @@ + - \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index cad98fd581..d1146ddf9a 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -13,7 +13,7 @@ Properties SmartStore.Admin SmartStore.Admin - v4.6.1 + v4.7.2 false true @@ -120,9 +120,6 @@ - - ..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - diff --git a/src/Presentation/SmartStore.Web/Administration/Web.config b/src/Presentation/SmartStore.Web/Administration/Web.config index 61dbd23e15..19498da48d 100644 --- a/src/Presentation/SmartStore.Web/Administration/Web.config +++ b/src/Presentation/SmartStore.Web/Administration/Web.config @@ -18,7 +18,7 @@ --> - + @@ -101,17 +101,9 @@ - - - - - - - - - + @@ -141,6 +133,14 @@ + + + + + + + + diff --git a/src/Presentation/SmartStore.Web/Administration/packages.config b/src/Presentation/SmartStore.Web/Administration/packages.config index a6b9edf1e5..0d7426974d 100644 --- a/src/Presentation/SmartStore.Web/Administration/packages.config +++ b/src/Presentation/SmartStore.Web/Administration/packages.config @@ -17,6 +17,5 @@ - \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/App_GlobalResources/EditorLocalization.designer.cs b/src/Presentation/SmartStore.Web/App_GlobalResources/EditorLocalization.designer.cs index d3305bbc4d..be7a96c2ae 100644 --- a/src/Presentation/SmartStore.Web/App_GlobalResources/EditorLocalization.designer.cs +++ b/src/Presentation/SmartStore.Web/App_GlobalResources/EditorLocalization.designer.cs @@ -19,7 +19,7 @@ namespace Resources { // mit einem Tool wie ResGen oder Visual Studio automatisch generiert. // Bearbeiten Sie zum Hinzufügen oder Entfernen eines Members die RESX-Datei, und führen Sie dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen das Visual Studio-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class EditorLocalization { diff --git a/src/Presentation/SmartStore.Web/App_GlobalResources/GridLocalization.designer.cs b/src/Presentation/SmartStore.Web/App_GlobalResources/GridLocalization.designer.cs index 06b0c263a4..b1c1d87e61 100644 --- a/src/Presentation/SmartStore.Web/App_GlobalResources/GridLocalization.designer.cs +++ b/src/Presentation/SmartStore.Web/App_GlobalResources/GridLocalization.designer.cs @@ -19,7 +19,7 @@ namespace Resources { // mit einem Tool wie ResGen oder Visual Studio automatisch generiert. // Bearbeiten Sie zum Hinzufügen oder Entfernen eines Members die RESX-Datei, und führen Sie dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen das Visual Studio-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class GridLocalization { diff --git a/src/Presentation/SmartStore.Web/App_GlobalResources/MvcLocalization.Designer.cs b/src/Presentation/SmartStore.Web/App_GlobalResources/MvcLocalization.Designer.cs index d1492374cc..3991bc8a42 100644 --- a/src/Presentation/SmartStore.Web/App_GlobalResources/MvcLocalization.Designer.cs +++ b/src/Presentation/SmartStore.Web/App_GlobalResources/MvcLocalization.Designer.cs @@ -19,7 +19,7 @@ namespace Resources { // mit einem Tool wie ResGen oder Visual Studio automatisch generiert. // Bearbeiten Sie zum Hinzufügen oder Entfernen eines Members die RESX-Datei, und führen Sie dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen das Visual Studio-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class MvcLocalization { diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index efaa1658b3..7351d74410 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -1,9 +1,9 @@  - - - - + + + + @@ -18,7 +18,7 @@ Properties SmartStore.Web SmartStore.Web - v4.6.1 + v4.7.2 false true @@ -86,8 +86,11 @@ ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll True - - ..\..\packages\BundleTransformer.Autoprefixer.1.10.2\lib\net40\BundleTransformer.Autoprefixer.dll + + ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll + + + ..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll ..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll @@ -95,14 +98,14 @@ ..\..\packages\BundleTransformer.JsMin.1.12.6\lib\net40\BundleTransformer.JsMin.dll - - ..\..\packages\BundleTransformer.NUglify.1.12.9\lib\net40\BundleTransformer.NUglify.dll + + ..\..\packages\BundleTransformer.NUglify.1.12.16\lib\net40\BundleTransformer.NUglify.dll - - ..\..\packages\BundleTransformer.SassAndScss.1.10.0\lib\net40\BundleTransformer.SassAndScss.dll + + ..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll - - ..\..\packages\JavaScriptEngineSwitcher.V8.3.0.5\lib\net45\ClearScript.dll + + ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\ClearScript.dll ..\..\packages\DouglasCrockford.JsMin.2.1.0\lib\net45\DouglasCrockford.JsMin.dll @@ -125,17 +128,17 @@ ..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll - - ..\..\packages\JavaScriptEngineSwitcher.Core.3.0.0\lib\net45\JavaScriptEngineSwitcher.Core.dll + + ..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll - - ..\..\packages\JavaScriptEngineSwitcher.Msie.3.0.2\lib\net45\JavaScriptEngineSwitcher.Msie.dll + + ..\..\packages\JavaScriptEngineSwitcher.Msie.3.4.3\lib\net45\JavaScriptEngineSwitcher.Msie.dll - - ..\..\packages\JavaScriptEngineSwitcher.V8.3.0.5\lib\net45\JavaScriptEngineSwitcher.V8.dll + + ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\JavaScriptEngineSwitcher.V8.dll - - ..\..\packages\LibSassHost.1.2.2\lib\net45\LibSassHost.dll + + ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -144,14 +147,17 @@ True ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\packages\MsieJavaScriptEngine.3.0.1\lib\net45\MsieJavaScriptEngine.dll + + ..\..\packages\MsieJavaScriptEngine.3.0.7\lib\net45\MsieJavaScriptEngine.dll ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\NUglify.1.5.14\lib\net40\NUglify.dll + + ..\..\packages\NUglify.1.6.4\lib\net40\NUglify.dll + + + ..\..\packages\System.Buffers.4.0.0\lib\netstandard1.1\System.Buffers.dll @@ -168,9 +174,6 @@ - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - @@ -2090,9 +2093,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index 8a981478ff..005758563b 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -1,47 +1,47 @@ - + -
+
-
-
-
-
+
+
+
+
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - - - - - - - + + + + + + + - - + + - + - + - - + + - - - - + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + - + - - - - + + + + - - - - - - - + + + + + + + - - + + - - + + - - - + + + - - + + - - + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - + + + + + + + + + + - + - - - + - + - + @@ -296,7 +294,7 @@ - + @@ -348,7 +346,7 @@ - + @@ -368,89 +366,93 @@ - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - + - + - + - - + + - - - - - - - - - - + + + + + + + + + + - + - - + + - + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/packages.config b/src/Presentation/SmartStore.Web/packages.config index c2ebf7619d..39f816c7b4 100644 --- a/src/Presentation/SmartStore.Web/packages.config +++ b/src/Presentation/SmartStore.Web/packages.config @@ -4,24 +4,25 @@ - + + - - + + - - - - - - - - + + + + + + + + @@ -30,10 +31,10 @@ - + - + + - \ No newline at end of file diff --git a/src/Tests/SmartStore.Core.Tests/App.config b/src/Tests/SmartStore.Core.Tests/App.config index 3ace789a89..d8c6b8d753 100644 --- a/src/Tests/SmartStore.Core.Tests/App.config +++ b/src/Tests/SmartStore.Core.Tests/App.config @@ -10,7 +10,7 @@ - + diff --git a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj index b95df39b91..d5724e561f 100644 --- a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj +++ b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj @@ -10,7 +10,7 @@ Properties SmartStore.Core.Tests SmartStore.Core.Tests - v4.6.1 + v4.7.2 512 diff --git a/src/Tests/SmartStore.Data.Tests/App.config b/src/Tests/SmartStore.Data.Tests/App.config index cac607e919..1378872e0d 100644 --- a/src/Tests/SmartStore.Data.Tests/App.config +++ b/src/Tests/SmartStore.Data.Tests/App.config @@ -41,7 +41,7 @@ - + @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/src/Tests/SmartStore.Data.Tests/SmartStore.Data.Tests.csproj b/src/Tests/SmartStore.Data.Tests/SmartStore.Data.Tests.csproj index d399f9157b..0ef4a9806c 100644 --- a/src/Tests/SmartStore.Data.Tests/SmartStore.Data.Tests.csproj +++ b/src/Tests/SmartStore.Data.Tests/SmartStore.Data.Tests.csproj @@ -10,7 +10,7 @@ Properties SmartStore.Data.Tests SmartStore.Data.Tests - v4.6.1 + v4.7.2 512 diff --git a/src/Tests/SmartStore.Services.Tests/App.config b/src/Tests/SmartStore.Services.Tests/App.config index b8e59c41ac..42628e2c61 100644 --- a/src/Tests/SmartStore.Services.Tests/App.config +++ b/src/Tests/SmartStore.Services.Tests/App.config @@ -20,7 +20,7 @@ - + diff --git a/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj b/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj index 9dce818842..007dedcf87 100644 --- a/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj +++ b/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj @@ -12,7 +12,7 @@ Properties SmartStore.Services.Tests SmartStore.Services.Tests - v4.6.1 + v4.7.2 512 diff --git a/src/Tests/SmartStore.Tests/App.config b/src/Tests/SmartStore.Tests/App.config index 147b958fff..a9530d0756 100644 --- a/src/Tests/SmartStore.Tests/App.config +++ b/src/Tests/SmartStore.Tests/App.config @@ -27,4 +27,4 @@ - + diff --git a/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj b/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj index 84a62a73ae..dbbbb741db 100644 --- a/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj +++ b/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj @@ -10,7 +10,7 @@ Properties SmartStore.Tests SmartStore.Tests - v4.6.1 + v4.7.2 512 diff --git a/src/Tests/SmartStore.Web.MVC.Tests/App.config b/src/Tests/SmartStore.Web.MVC.Tests/App.config index e985d56475..6ebf5eff27 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/App.config +++ b/src/Tests/SmartStore.Web.MVC.Tests/App.config @@ -9,7 +9,7 @@ - + @@ -41,10 +41,6 @@ - - - - @@ -83,7 +79,7 @@ - + @@ -101,6 +97,14 @@ + + + + + + + + diff --git a/src/Tests/SmartStore.Web.MVC.Tests/SmartStore.Web.MVC.Tests.csproj b/src/Tests/SmartStore.Web.MVC.Tests/SmartStore.Web.MVC.Tests.csproj index af2dc660ab..f11482fa6c 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/SmartStore.Web.MVC.Tests.csproj +++ b/src/Tests/SmartStore.Web.MVC.Tests/SmartStore.Web.MVC.Tests.csproj @@ -10,7 +10,7 @@ Properties SmartStore.Web.MVC.Tests SmartStore.Web.MVC.Tests - v4.6.1 + v4.7.2 512 @@ -81,9 +81,6 @@ - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll diff --git a/src/Tests/SmartStore.Web.MVC.Tests/packages.config b/src/Tests/SmartStore.Web.MVC.Tests/packages.config index 3ec293ad35..18ac8e0f1f 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/packages.config +++ b/src/Tests/SmartStore.Web.MVC.Tests/packages.config @@ -8,5 +8,4 @@ - \ No newline at end of file diff --git a/src/Tools/SmartStore.Packager/App.config b/src/Tools/SmartStore.Packager/App.config index 279248918b..5ce5d12972 100644 --- a/src/Tools/SmartStore.Packager/App.config +++ b/src/Tools/SmartStore.Packager/App.config @@ -6,7 +6,7 @@ - + diff --git a/src/Tools/SmartStore.Packager/Properties/Resources.Designer.cs b/src/Tools/SmartStore.Packager/Properties/Resources.Designer.cs index 3749231b86..b09e936e1a 100644 --- a/src/Tools/SmartStore.Packager/Properties/Resources.Designer.cs +++ b/src/Tools/SmartStore.Packager/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SmartStore.Packager.Properties { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/Tools/SmartStore.Packager/Properties/Settings.Designer.cs b/src/Tools/SmartStore.Packager/Properties/Settings.Designer.cs index 052518ec04..1532ba2b99 100644 --- a/src/Tools/SmartStore.Packager/Properties/Settings.Designer.cs +++ b/src/Tools/SmartStore.Packager/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace SmartStore.Packager.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/Tools/SmartStore.Packager/SmartStore.Packager.csproj b/src/Tools/SmartStore.Packager/SmartStore.Packager.csproj index 794db96f12..b6bc6a6e41 100644 --- a/src/Tools/SmartStore.Packager/SmartStore.Packager.csproj +++ b/src/Tools/SmartStore.Packager/SmartStore.Packager.csproj @@ -9,7 +9,7 @@ Properties SmartStore.Packager SmartStore.Packager - v4.6.1 + v4.7.2 512 diff --git a/src/Tools/SmartStore.WebApi.Client/App.config b/src/Tools/SmartStore.WebApi.Client/App.config index 0e577fb077..bc30a5e783 100644 --- a/src/Tools/SmartStore.WebApi.Client/App.config +++ b/src/Tools/SmartStore.WebApi.Client/App.config @@ -6,7 +6,7 @@ - + diff --git a/src/Tools/SmartStore.WebApi.Client/Properties/Resources.Designer.cs b/src/Tools/SmartStore.WebApi.Client/Properties/Resources.Designer.cs index 8d9bc7c5f5..c31baa9266 100644 --- a/src/Tools/SmartStore.WebApi.Client/Properties/Resources.Designer.cs +++ b/src/Tools/SmartStore.WebApi.Client/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SmartStoreNetWebApiClient.Properties { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs index 461b1a2987..8d0f1103b9 100644 --- a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs +++ b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace SmartStoreNetWebApiClient.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj b/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj index 9bd1f1cf9f..426ea67e53 100644 --- a/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj +++ b/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj @@ -9,7 +9,7 @@ Properties SmartStoreNetWebApiClient SmartStoreNetWebApiClient - v4.6.1 + v4.7.2 512 false veröffentlichen\ From 8022743517a826ca6907b5540e6116494a16527e Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 8 Aug 2020 02:06:41 +0200 Subject: [PATCH 014/695] Updated MaxMind packages --- .../SmartStore.Services/SmartStore.Services.csproj | 4 ++-- src/Libraries/SmartStore.Services/packages.config | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index df8e4ecff7..82e77a9138 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -98,10 +98,10 @@ ..\..\packages\LumenWorksCsvReader.4.0.0\lib\net461\LumenWorks.Framework.IO.dll - ..\..\packages\MaxMind.Db.2.4.0\lib\net45\MaxMind.Db.dll + ..\..\packages\MaxMind.Db.2.6.1\lib\net45\MaxMind.Db.dll - ..\..\packages\MaxMind.GeoIP2.3.0.0\lib\net45\MaxMind.GeoIP2.dll + ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 618d223d67..efaa7e009b 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -8,12 +8,12 @@ - - + + - + From f52f12de523525acff1b1143a223a9cf9185970b Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 10 Aug 2020 10:07:24 +0200 Subject: [PATCH 015/695] API: CRUD endpoints refactoring due to removal of EntitySetController --- .../OData/LocalizedPropertiesController.cs | 13 ---- .../OData/MeasureWeightsController.cs | 18 ----- .../Controllers/OData/OrderItemsController.cs | 14 +++- .../Controllers/OData/OrdersController.cs | 40 +++++++++++ .../Controllers/OData/PicturesController.cs | 64 ++++++------------ ...roductSpecificationAttributesController.cs | 52 +++++++++----- ...tVariantAttributeCombinationsController.cs | 52 +++++++++----- ...ProductVariantAttributeValuesController.cs | 52 +++++++++----- .../ProductVariantAttributesController.cs | 49 ++++++++++---- .../Controllers/OData/ProductsController.cs | 28 ++++++++ .../OData/QuantityUnitsController.cs | 48 +++++++++---- .../OData/RelatedProductsController.cs | 48 +++++++++---- .../OData/ReturnRequestsController.cs | 43 ++++++++++-- .../Controllers/OData/SettingsController.cs | 48 +++++++++---- .../OData/ShipmentItemsController.cs | 48 +++++++++---- .../Controllers/OData/ShipmentsController.cs | 48 +++++++++---- .../OData/ShippingMethodsController.cs | 48 +++++++++---- ...SpecificationAttributeOptionsController.cs | 49 ++++++++++---- .../SpecificationAttributesController.cs | 49 ++++++++++---- .../OData/StateProvincesController.cs | 52 +++++++++----- .../OData/StoreMappingsController.cs | 38 ++++++++--- .../Controllers/OData/StoresController.cs | 48 +++++++++---- .../OData/SyncMappingsController.cs | 38 ++++++++--- .../OData/TaxCategoriesController.cs | 48 +++++++++---- .../Controllers/OData/TierPricesController.cs | 48 +++++++++---- .../Controllers/OData/UrlRecordsController.cs | 31 ++++++--- .../WebApiConfigurationProvider.cs | 67 ++----------------- .../WebApi/WebApiEntityController.cs | 34 ---------- 28 files changed, 780 insertions(+), 435 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index 46b522d7af..e24b3ab85f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -13,19 +13,6 @@ namespace SmartStore.WebApi.Controllers.OData [WebApiAuthenticate] public class LocalizedPropertiesController : WebApiEntityController { - protected override void Insert(LocalizedProperty entity) - { - Service.InsertLocalizedProperty(entity); - } - protected override void Update(LocalizedProperty entity) - { - Service.UpdateLocalizedProperty(entity); - } - protected override void Delete(LocalizedProperty entity) - { - Service.DeleteLocalizedProperty(entity); - } - [WebApiQueryable] public IQueryable Get() { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs index df850a51c1..7170408664 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs @@ -13,24 +13,6 @@ namespace SmartStore.WebApi.Controllers.OData { public class MeasureWeightsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] - protected override void Insert(MeasureWeight entity) - { - Service.InsertMeasureWeight(entity); - } - - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] - protected override void Update(MeasureWeight entity) - { - Service.UpdateMeasureWeight(entity); - } - - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Delete)] - protected override void Delete(MeasureWeight entity) - { - Service.DeleteMeasureWeight(entity); - } - [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] public IQueryable Get() diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index b730f70293..65a97ffa38 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -7,6 +7,7 @@ using SmartStore.Core.Security; using SmartStore.Services.Orders; using SmartStore.Web.Framework.WebApi; +using SmartStore.Web.Framework.WebApi.Configuration; using SmartStore.Web.Framework.WebApi.OData; using SmartStore.Web.Framework.WebApi.Security; using SmartStore.WebApi.Models.OData; @@ -80,11 +81,18 @@ public SingleResult GetProduct(int key) return GetRelatedEntity(key, x => x.Product); } - #endregion + #endregion + + #region Actions - #region Actions + public static void Init(WebApiConfigurationBroadcaster configData) + { + var entityConfig = configData.ModelBuilder.EntityType(); + + entityConfig.Action("Infos").Returns(); + } - [HttpPost] + [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Read)] public OrderItemInfo Infos(int key) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index 408e301735..8abc376d50 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -12,6 +12,7 @@ using SmartStore.Core.Security; using SmartStore.Services.Orders; using SmartStore.Web.Framework.WebApi; +using SmartStore.Web.Framework.WebApi.Configuration; using SmartStore.Web.Framework.WebApi.OData; using SmartStore.Web.Framework.WebApi.Security; using SmartStore.WebApi.Models.OData; @@ -133,6 +134,45 @@ public IQueryable GetOrderItems(int key) #region Actions + public static void Init(WebApiConfigurationBroadcaster configData) + { + var entityConfig = configData.ModelBuilder.EntityType(); + + entityConfig + .Action("Infos") + .Returns(); + + entityConfig.Action("Pdf"); + + entityConfig + .Action("PaymentPending") + .ReturnsFromEntitySet("Orders"); + + entityConfig + .Action("PaymentPaid") + .ReturnsFromEntitySet("Orders") + .Parameter("PaymentMethodName"); + + entityConfig + .Action("PaymentRefund") + .ReturnsFromEntitySet("Orders") + .Parameter("Online"); + + entityConfig + .Action("Cancel") + .ReturnsFromEntitySet("Orders"); + + var addShipment = entityConfig + .Action("AddShipment") + .ReturnsFromEntitySet("Orders"); + addShipment.Parameter("TrackingNumber"); + addShipment.Parameter("SetAsShipped"); + + entityConfig + .Action("CompleteOrder") + .ReturnsFromEntitySet("Orders"); + } + [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Read)] public OrderInfo Infos(int key) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs index bad29f51be..7cfe69cfd0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs @@ -24,6 +24,28 @@ public MediaController(IMediaService mediaService) _mediaService = mediaService; } + // TODO: readonly properties of MediaFileInfo cannot be serialized! + + // GET /Media(123) + [WebApiAuthenticate] + public MediaFileInfo Get(int key) + { + MediaFileInfo file = null; + + this.ProcessEntity(() => + { + file = _mediaService.GetFileById(key); + if (file == null) + { + throw this.ExceptionNotFound($"Cannot find file by ID {key}."); + } + }); + + return file; + } + + #region Actions + public static void Init(WebApiConfigurationBroadcaster configData) { var entityConfig = configData.ModelBuilder.EntityType(); @@ -68,28 +90,6 @@ public static void Init(WebApiConfigurationBroadcaster configData) countFiles.CollectionParameter("Extensions"); } - // TODO: readonly properties of MediaFileInfo cannot be serialized! - - // GET /Media(123) - [WebApiAuthenticate] - public MediaFileInfo Get(int key) - { - MediaFileInfo file = null; - - this.ProcessEntity(() => - { - file = _mediaService.GetFileById(key); - if (file == null) - { - throw this.ExceptionNotFound($"Cannot find file by ID {key}."); - } - }); - - return file; - } - - #region Actions - /// POST /Media/FileExists {"Path":"content/my-file.jpg"} [HttpPost, WebApiAuthenticate] public bool FileExists(ODataActionParameters parameters) @@ -236,32 +236,12 @@ from x in Repository.Table return query; } - //[WebApiAuthenticate(Permission = Permissions.Media.Upload)] - protected override void Insert(MediaFile entity) - { - throw this.ExceptionNotImplemented(); - } - - //[WebApiAuthenticate(Permission = Permissions.Media.Update)] - protected override void Update(MediaFile entity) - { - throw this.ExceptionNotImplemented(); - } - - //[WebApiAuthenticate(Permission = Permissions.Media.Delete)] - protected override void Delete(MediaFile entity) - { - throw this.ExceptionNotImplemented(); - } - [WebApiQueryable] public SingleResult GetPicture(int key) { return GetSingleResult(key); } - // Navigation properties. - [WebApiQueryable] public IQueryable GetProductPictures(int key) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs index 381c2176da..ce1d3f528b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -10,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductSpecificationAttributesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditAttribute)] - protected override void Insert(ProductSpecificationAttribute entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertProductSpecificationAttribute(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditAttribute)] - protected override void Update(ProductSpecificationAttribute entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateProductSpecificationAttribute(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditAttribute)] - protected override void Delete(ProductSpecificationAttribute entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditAttribute)] + public IHttpActionResult Post(ProductSpecificationAttribute entity) { - Service.DeleteProductSpecificationAttribute(entity); + var result = Insert(entity, () => Service.InsertProductSpecificationAttribute(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProductSpecificationAttribute(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditAttribute)] + public async Task Put(int key, ProductSpecificationAttribute entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateProductSpecificationAttribute(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditAttribute)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductSpecificationAttribute(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditAttribute)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductSpecificationAttribute(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] @@ -43,5 +63,7 @@ public SingleResult GetSpecificationAttributeOptio { return GetRelatedEntity(key, x => x.SpecificationAttributeOption); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs index 0a3b1d4ca1..545df638d8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; @@ -11,32 +14,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductVariantAttributeCombinationsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Insert(ProductVariantAttributeCombination entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertProductVariantAttributeCombination(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Update(ProductVariantAttributeCombination entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateProductVariantAttributeCombination(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Delete(ProductVariantAttributeCombination entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public IHttpActionResult Post(ProductVariantAttributeCombination entity) { - Service.DeleteProductVariantAttributeCombination(entity); + var result = Insert(entity, () => Service.InsertProductVariantAttributeCombination(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProductVariantAttributeCombination(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Put(int key, ProductVariantAttributeCombination entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateProductVariantAttributeCombination(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductVariantAttributeCombination(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductVariantAttributeCombination(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] @@ -44,5 +64,7 @@ public SingleResult GetDeliveryTime(int key) { return GetRelatedEntity(key, x => x.DeliveryTime); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs index 9e68b445a9..5b42d5be4c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -10,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductVariantAttributeValuesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Insert(ProductVariantAttributeValue entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertProductVariantAttributeValue(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Update(ProductVariantAttributeValue entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateProductVariantAttributeValue(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Delete(ProductVariantAttributeValue entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public IHttpActionResult Post(ProductVariantAttributeValue entity) { - Service.DeleteProductVariantAttributeValue(entity); + var result = Insert(entity, () => Service.InsertProductVariantAttributeValue(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProductVariantAttributeValue(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Put(int key, ProductVariantAttributeValue entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateProductVariantAttributeValue(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductVariantAttributeValue(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductVariantAttributeValue(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] @@ -43,5 +63,7 @@ public SingleResult GetProductVariantAttribute(int key) { return GetRelatedEntity(key, x => x.ProductVariantAttribute); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs index d92e320058..449d3274e8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -11,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class ProductVariantAttributesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Insert(ProductVariantAttribute entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertProductVariantAttribute(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Update(ProductVariantAttribute entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateProductVariantAttribute(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - protected override void Delete(ProductVariantAttribute entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public IHttpActionResult Post(ProductVariantAttribute entity) { - Service.DeleteProductVariantAttribute(entity); + var result = Insert(entity, () => Service.InsertProductVariantAttribute(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProductVariantAttribute(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Put(int key, ProductVariantAttribute entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateProductVariantAttribute(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateProductVariantAttribute(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteProductVariantAttribute(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] @@ -51,5 +70,7 @@ public IQueryable GetProductVariantAttributeValues { return GetRelatedCollection(key, x => x.ProductVariantAttributeValues); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 455d85a113..aebea290c1 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -17,6 +17,7 @@ using SmartStore.Services.Search; using SmartStore.Services.Seo; using SmartStore.Web.Framework.WebApi; +using SmartStore.Web.Framework.WebApi.Configuration; using SmartStore.Web.Framework.WebApi.OData; using SmartStore.Web.Framework.WebApi.Security; using SmartStore.WebApi.Services; @@ -351,6 +352,33 @@ public IQueryable GetProductBundleItems(int key) #region Actions + public static void Init(WebApiConfigurationBroadcaster configData) + { + var entityConfig = configData.ModelBuilder.EntityType(); + + entityConfig.Collection + .Action("Search") + .ReturnsCollectionFromEntitySet("Products"); + + entityConfig + .Action("FinalPrice") + .Returns(); + + entityConfig + .Action("LowestPrice") + .Returns(); + + entityConfig + .Action("CreateAttributeCombinations") + .ReturnsCollectionFromEntitySet("ProductVariantAttributeCombinations"); + + var manageAttributes = entityConfig + .Action("ManageAttributes") + .ReturnsCollectionFromEntitySet("ProductVariantAttributes"); + manageAttributes.Parameter("Synchronize"); + manageAttributes.CollectionParameter("Attributes"); + } + [HttpPost, WebApiQueryable(PagingOptional = true)] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IQueryable Search([ModelBinder(typeof(WebApiCatalogSearchQueryModelBinder))] CatalogSearchQuery query) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs index 13c9a0ded3..bc73ed1586 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class QuantityUnitsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] - protected override void Insert(QuantityUnit entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] + public IQueryable Get() { - Service.InsertQuantityUnit(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] - protected override void Update(QuantityUnit entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] + public SingleResult Get(int key) { - Service.UpdateQuantityUnit(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Delete)] - protected override void Delete(QuantityUnit entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] + public IHttpActionResult Post(QuantityUnit entity) { - Service.DeleteQuantityUnit(entity); + var result = Insert(entity, () => Service.InsertQuantityUnit(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public SingleResult GetQuantityUnit(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] + public async Task Put(int key, QuantityUnit entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateQuantityUnit(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateQuantityUnit(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteQuantityUnit(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs index 760934f8f0..adeee5d791 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class RelatedProductsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPromotion)] - protected override void Insert(RelatedProduct entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertRelatedProduct(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPromotion)] - protected override void Update(RelatedProduct entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateRelatedProduct(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPromotion)] - protected override void Delete(RelatedProduct entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPromotion)] + public IHttpActionResult Post(RelatedProduct entity) { - Service.DeleteRelatedProduct(entity); + var result = Insert(entity, () => Service.InsertRelatedProduct(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetRelatedProduct(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPromotion)] + public async Task Put(int key, RelatedProduct entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateRelatedProduct(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPromotion)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateRelatedProduct(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPromotion)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteRelatedProduct(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs index 47febeda9c..859b13a53f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; @@ -11,20 +14,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class ReturnRequestsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Delete)] - protected override void Delete(ReturnRequest entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] + public IQueryable Get() { - Service.DeleteReturnRequest(entity); + return GetEntitySet(); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] - public SingleResult GetReturnRequest(int key) + public SingleResult Get(int key) { return GetSingleResult(key); } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Customer.Create)] + public IHttpActionResult Post(ReturnRequest entity) + { + throw this.ExceptionNotImplemented(); + } + + [WebApiAuthenticate(Permission = Permissions.Customer.Update)] + public IHttpActionResult Put(int key, ReturnRequest entity) + { + throw this.ExceptionNotImplemented(); + } + + [WebApiAuthenticate(Permission = Permissions.Customer.Update)] + public IHttpActionResult Patch(int key, Delta model) + { + throw this.ExceptionNotImplemented(); + } + + [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteReturnRequest(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] @@ -32,5 +61,7 @@ public SingleResult GetCustomer(int key) { return GetRelatedEntity(key, x => x.Customer); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs index f355225178..9e19004f8a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Security; using SmartStore.Services.Configuration; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class SettingsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Create)] - protected override void Insert(Setting entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] + public IQueryable Get() { - Service.InsertSetting(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Update)] - protected override void Update(Setting entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] + public SingleResult Get(int key) { - Service.UpdateSetting(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Delete)] - protected override void Delete(Setting entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Create)] + public IHttpActionResult Post(Setting entity) { - Service.DeleteSetting(entity); + var result = Insert(entity, () => Service.InsertSetting(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] - public SingleResult GetSetting(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Update)] + public async Task Put(int key, Setting entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateSetting(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateSetting(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteSetting(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs index e42781ab3a..0be2285599 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; using SmartStore.Services.Shipping; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class ShipmentItemsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] - protected override void Insert(ShipmentItem entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public IQueryable Get() { - Service.InsertShipmentItem(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] - protected override void Update(ShipmentItem entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public SingleResult Get(int key) { - Service.UpdateShipmentItem(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] - protected override void Delete(ShipmentItem entity) + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] + public IHttpActionResult Post(ShipmentItem entity) { - Service.DeleteShipmentItem(entity); + var result = Insert(entity, () => Service.InsertShipmentItem(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult GetShipmentItem(int key) + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] + public async Task Put(int key, ShipmentItem entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateShipmentItem(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateShipmentItem(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteShipmentItem(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs index 42631b925c..12b02ef6dd 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; using SmartStore.Services.Shipping; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class ShipmentsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] - protected override void Insert(Shipment entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public IQueryable Get() { - Service.InsertShipment(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] - protected override void Update(Shipment entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public SingleResult Get(int key) { - Service.UpdateShipment(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] - protected override void Delete(Shipment entity) + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] + public IHttpActionResult Post(Shipment entity) { - Service.DeleteShipment(entity); + var result = Insert(entity, () => Service.InsertShipment(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult GetShipment(int key) + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] + public async Task Put(int key, Shipment entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateShipment(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateShipment(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteShipment(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs index f158720ffc..bb9928fb93 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; using SmartStore.Services.Shipping; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class ShippingMethodsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Create)] - protected override void Insert(ShippingMethod entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] + public IQueryable Get() { - Service.InsertShippingMethod(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Update)] - protected override void Update(ShippingMethod entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] + public SingleResult Get(int key) { - Service.UpdateShippingMethod(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Delete)] - protected override void Delete(ShippingMethod entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Create)] + public IHttpActionResult Post(ShippingMethod entity) { - Service.DeleteShippingMethod(entity); + var result = Insert(entity, () => Service.InsertShippingMethod(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] - public SingleResult GetShippingMethod(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Update)] + public async Task Put(int key, ShippingMethod entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateShippingMethod(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateShippingMethod(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteShippingMethod(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs index 63c633ad77..8c54098f66 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -11,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class SpecificationAttributeOptionsController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.EditOption)] - protected override void Insert(SpecificationAttributeOption entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] + public IQueryable Get() { - Service.InsertSpecificationAttributeOption(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.EditOption)] - protected override void Update(SpecificationAttributeOption entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] + public SingleResult Get(int key) { - Service.UpdateSpecificationAttributeOption(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.EditOption)] - protected override void Delete(SpecificationAttributeOption entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.EditOption)] + public IHttpActionResult Post(SpecificationAttributeOption entity) { - Service.DeleteSpecificationAttributeOption(entity); + var result = Insert(entity, () => Service.InsertSpecificationAttributeOption(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] - public SingleResult GetSpecificationAttributeOption(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.EditOption)] + public async Task Put(int key, SpecificationAttributeOption entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateSpecificationAttributeOption(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.EditOption)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateSpecificationAttributeOption(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.EditOption)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteSpecificationAttributeOption(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] @@ -51,5 +70,7 @@ public IQueryable GetProductSpecificationAttribut { return GetRelatedCollection(key, x => x.ProductSpecificationAttributes); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs index ea23b2a556..2994d7c258 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -11,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class SpecificationAttributesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Create)] - protected override void Insert(SpecificationAttribute entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] + public IQueryable Get() { - Service.InsertSpecificationAttribute(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Update)] - protected override void Update(SpecificationAttribute entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] + public SingleResult Get(int key) { - Service.UpdateSpecificationAttribute(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Delete)] - protected override void Delete(SpecificationAttribute entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Create)] + public IHttpActionResult Post(SpecificationAttribute entity) { - Service.DeleteSpecificationAttribute(entity); + var result = Insert(entity, () => Service.InsertSpecificationAttribute(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] - public SingleResult GetSpecificationAttribute(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Update)] + public async Task Put(int key, SpecificationAttribute entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateSpecificationAttribute(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateSpecificationAttribute(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteSpecificationAttribute(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] @@ -44,5 +63,7 @@ public IQueryable GetSpecificationAttributeOptions { return GetRelatedCollection(key, x => x.SpecificationAttributeOptions); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs index 6434dc46a0..b450dba788 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; @@ -10,32 +13,49 @@ namespace SmartStore.WebApi.Controllers.OData { public class StateProvincesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Create)] - protected override void Insert(StateProvince entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] + public IQueryable Get() { - Service.InsertStateProvince(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Update)] - protected override void Update(StateProvince entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] + public SingleResult Get(int key) { - Service.UpdateStateProvince(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Delete)] - protected override void Delete(StateProvince entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Create)] + public IHttpActionResult Post(StateProvince entity) { - Service.DeleteStateProvince(entity); + var result = Insert(entity, () => Service.InsertStateProvince(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] - public SingleResult GetStateProvince(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Update)] + public async Task Put(int key, StateProvince entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateStateProvince(entity)); + return result; } - // Navigation properties. + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateStateProvince(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteStateProvince(entity)); + return result; + } + + #region Navigation properties [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] @@ -43,5 +63,7 @@ public SingleResult GetCountry(int key) { return GetRelatedEntity(key, x => x.Country); } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs index 1ea66b7a57..82c20ecb18 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Stores; using SmartStore.Services.Stores; using SmartStore.Web.Framework.WebApi; @@ -10,25 +13,40 @@ namespace SmartStore.WebApi.Controllers.OData [WebApiAuthenticate] public class StoreMappingsController : WebApiEntityController { - protected override void Insert(StoreMapping entity) + [WebApiQueryable] + public IQueryable Get() { - Service.InsertStoreMapping(entity); + return GetEntitySet(); } - protected override void Update(StoreMapping entity) + [WebApiQueryable] + public SingleResult Get(int key) { - Service.UpdateStoreMapping(entity); + return GetSingleResult(key); } - protected override void Delete(StoreMapping entity) + public IHttpActionResult Post(StoreMapping entity) { - Service.DeleteStoreMapping(entity); + var result = Insert(entity, () => Service.InsertStoreMapping(entity)); + return result; } - [WebApiQueryable] - public SingleResult GetStoreMapping(int key) + public async Task Put(int key, StoreMapping entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateStoreMapping(entity)); + return result; + } + + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateStoreMapping(entity)); + return result; + } + + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteStoreMapping(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs index e5dd2b2325..715dccbd3c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Stores; using SmartStore.Core.Security; using SmartStore.Services.Stores; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class StoresController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Create)] - protected override void Insert(Store entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] + public IQueryable Get() { - Service.InsertStore(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Update)] - protected override void Update(Store entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] + public SingleResult Get(int key) { - Service.UpdateStore(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Delete)] - protected override void Delete(Store entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Create)] + public IHttpActionResult Post(Store entity) { - Service.DeleteStore(entity); + var result = Insert(entity, () => Service.InsertStore(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] - public SingleResult GetStore(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Update)] + public async Task Put(int key, Store entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateStore(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateStore(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteStore(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs index 497c4c5788..5fbd37ba7a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.DataExchange; using SmartStore.Services.DataExchange; using SmartStore.Web.Framework.WebApi; @@ -10,25 +13,40 @@ namespace SmartStore.WebApi.Controllers.OData [WebApiAuthenticate] public class SyncMappingsController : WebApiEntityController { - protected override void Insert(SyncMapping entity) + [WebApiQueryable] + public IQueryable Get() { - Service.InsertSyncMapping(entity); + return GetEntitySet(); } - protected override void Update(SyncMapping entity) + [WebApiQueryable] + public SingleResult Get(int key) { - Service.UpdateSyncMapping(entity); + return GetSingleResult(key); } - protected override void Delete(SyncMapping entity) + public IHttpActionResult Post(SyncMapping entity) { - Service.DeleteSyncMapping(entity); + var result = Insert(entity, () => Service.InsertSyncMapping(entity)); + return result; } - [WebApiQueryable] - public SingleResult GetSyncMapping(int key) + public async Task Put(int key, SyncMapping entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateSyncMapping(entity)); + return result; + } + + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateSyncMapping(entity)); + return result; + } + + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteSyncMapping(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs index dfc2410601..dfc94d598c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Tax; using SmartStore.Core.Security; using SmartStore.Services.Tax; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class TaxCategoriesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Create)] - protected override void Insert(TaxCategory entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] + public IQueryable Get() { - Service.InsertTaxCategory(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Update)] - protected override void Update(TaxCategory entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] + public SingleResult Get(int key) { - Service.UpdateTaxCategory(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Delete)] - protected override void Delete(TaxCategory entity) + [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Create)] + public IHttpActionResult Post(TaxCategory entity) { - Service.DeleteTaxCategory(entity); + var result = Insert(entity, () => Service.InsertTaxCategory(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] - public SingleResult GetTaxCategory(int key) + [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Update)] + public async Task Put(int key, TaxCategory entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateTaxCategory(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Update)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateTaxCategory(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Delete)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteTaxCategory(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs index b071e3570c..543dc6a7e3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs @@ -1,4 +1,7 @@ -using System.Web.Http; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -10,29 +13,46 @@ namespace SmartStore.WebApi.Controllers.OData { public class TierPricesController : WebApiEntityController { - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditTierPrice)] - protected override void Insert(TierPrice entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public IQueryable Get() { - Service.InsertTierPrice(entity); + return GetEntitySet(); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditTierPrice)] - protected override void Update(TierPrice entity) + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult Get(int key) { - Service.UpdateTierPrice(entity); + return GetSingleResult(key); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditTierPrice)] - protected override void Delete(TierPrice entity) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditTierPrice)] + public IHttpActionResult Post(TierPrice entity) { - Service.DeleteTierPrice(entity); + var result = Insert(entity, () => Service.InsertTierPrice(entity)); + return result; } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetTierPrice(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditTierPrice)] + public async Task Put(int key, TierPrice entity) { - return GetSingleResult(key); + var result = await UpdateAsync(entity, key, () => Service.UpdateTierPrice(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditTierPrice)] + public async Task Patch(int key, Delta model) + { + var result = await PartiallyUpdateAsync(key, model, entity => Service.UpdateTierPrice(entity)); + return result; + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditTierPrice)] + public async Task Delete(int key) + { + var result = await DeleteAsync(key, entity => Service.DeleteTierPrice(entity)); + return result; } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs index bb34ba66b7..04ac3f0303 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs @@ -1,32 +1,47 @@ -using System.Web.Http; +using System.Linq; +using System.Web.Http; +using System.Web.OData; using SmartStore.Core.Domain.Seo; using SmartStore.Services.Seo; using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.OData; +using SmartStore.Web.Framework.WebApi.Security; namespace SmartStore.WebApi.Controllers.OData { - public class UrlRecordsController : WebApiEntityController + [WebApiAuthenticate] + public class UrlRecordsController : WebApiEntityController { - protected override void Insert(UrlRecord entity) + [WebApiQueryable] + public IQueryable Get() + { + return GetEntitySet(); + } + + [WebApiQueryable] + public SingleResult Get(int key) + { + return GetSingleResult(key); + } + + public IHttpActionResult Post(UrlRecord entity) { throw this.ExceptionForbidden(); } - protected override void Update(UrlRecord entity) + public IHttpActionResult Put(int key, UrlRecord entity) { throw this.ExceptionForbidden(); } - protected override void Delete(UrlRecord entity) + public IHttpActionResult Patch(int key, Delta model) { throw this.ExceptionForbidden(); } - [WebApiQueryable] - public SingleResult GetUrlRecord(int key) + public IHttpActionResult Delete(int key) { - return GetSingleResult(key); + throw this.ExceptionForbidden(); } } } diff --git a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs index 971baef874..4f2ddd8aa9 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Web.OData.Builder; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; @@ -22,8 +21,6 @@ using SmartStore.Services.Media; using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.Configuration; -using SmartStore.WebApi.Models.OData; -using SmartStore.WebApi.Services; using SmartStore.WebApi.Services.Swagger; using Swashbuckle.Application; @@ -94,10 +91,10 @@ public void Configure(WebApiConfigurationBroadcaster configData) m.EntitySet("UrlRecords"); m.EntitySet("SyncMappings"); - AddActionsToOrder(m.EntityType()); - AddActionsToOrderItem(m.EntityType()); - AddActionsToProduct(m.EntityType()); - + // Register OData actions and functions. + Controllers.OData.OrdersController.Init(configData); + Controllers.OData.OrderItemsController.Init(configData); + Controllers.OData.ProductsController.Init(configData); Controllers.OData.MediaController.Init(configData); // Swagger integration, see http://www.my-store.com/swagger/ui/index @@ -144,61 +141,5 @@ public void Configure(WebApiConfigurationBroadcaster configData) ex.Dump(); } } - - private void AddActionsToOrder(EntityTypeConfiguration config) - { - config.Action("Infos").Returns(); - - config.Action("Pdf"); - - config.Action("PaymentPending") - .ReturnsFromEntitySet("Orders"); - - config.Action("PaymentPaid") - .ReturnsFromEntitySet("Orders") - .Parameter("PaymentMethodName"); - - config.Action("PaymentRefund") - .ReturnsFromEntitySet("Orders") - .Parameter("Online"); - - config.Action("Cancel") - .ReturnsFromEntitySet("Orders"); - - var addShipment = config.Action("AddShipment") - .ReturnsFromEntitySet("Orders"); - - var completeOrder = config.Action("CompleteOrder") - .ReturnsFromEntitySet("Orders"); - - addShipment.Parameter("TrackingNumber"); - addShipment.Parameter("SetAsShipped"); - } - - private void AddActionsToOrderItem(EntityTypeConfiguration config) - { - config.Action("Infos").Returns(); - } - - private void AddActionsToProduct(EntityTypeConfiguration config) - { - config.Collection.Action("Search") - .ReturnsCollectionFromEntitySet("Products"); - - config.Action("FinalPrice") - .Returns(); - - config.Action("LowestPrice") - .Returns(); - - config.Action("CreateAttributeCombinations") - .ReturnsCollectionFromEntitySet("ProductVariantAttributeCombinations"); - - var manageAttributes = config.Action("ManageAttributes") - .ReturnsCollectionFromEntitySet("ProductVariantAttributes"); - - manageAttributes.Parameter("Synchronize"); - manageAttributes.CollectionParameter("Attributes"); - } } } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index afb1e39d8e..8e17b53554 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -27,25 +27,6 @@ namespace SmartStore.Web.Framework.WebApi public abstract class WebApiEntityController : ODataController where TEntity : BaseEntity, new() { - // TODO: Implement custom routing convention(s): - // public override HttpResponseMessage HandleUnmappedRequest(ODataPath odataPath) - - // TODO: Needs to be handled by the respective controller: - // protected override int GetKey(TEntity entity) - // protected override TEntity GetEntityByKey(int key) - - // public override HttpResponseMessage Post(TEntity entity) - // protected override TEntity CreateEntity(TEntity entity) - // public override HttpResponseMessage Put(int key, TEntity update) - // protected override TEntity UpdateEntity(int key, TEntity update) - // public override HttpResponseMessage Patch(int key, Delta patch) - // protected override TEntity PatchEntity(int key, Delta patch) - // public override void Delete(int key) - - // TODO: - // XML serialization issues. - // Don't use service models like MediaFileInfo. API must encapsulate and model independently. - /// /// Auto injected by Autofac. /// @@ -228,21 +209,6 @@ protected internal virtual SingleResult GetRelatedEntity( return SingleResult.Create(query); } - protected internal virtual void Insert(TEntity entity) - { - Repository.Insert(entity); - } - - protected internal virtual void Update(TEntity entity) - { - Repository.Update(entity); - } - - protected internal virtual void Delete(TEntity entity) - { - Repository.Delete(entity); - } - protected internal virtual IHttpActionResult Insert(TEntity entity, Action insert) { if (!ModelState.IsValid) From caa87367631fc84ecc1ed110ab56dccfaeec2d6d Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 10 Aug 2020 10:43:14 +0200 Subject: [PATCH 016/695] API: minor update of the API client --- src/Tools/SmartStore.WebApi.Client/App.config | 9 +++--- .../MainForm.Designer.cs | 10 +++---- .../SmartStore.WebApi.Client/MainForm.cs | 5 ++-- .../Misc/Extensions.cs | 2 +- .../Misc/HourGlass.cs | 2 +- src/Tools/SmartStore.WebApi.Client/Program.cs | 6 ++-- .../Properties/AssemblyInfo.cs | 10 +++---- .../Properties/Resources.Designer.cs | 28 +++++++++---------- .../Properties/Settings.Designer.cs | 10 +++---- .../Properties/Settings.settings | 2 +- .../SmartStore.WebApi.Client/Settings.cs | 2 +- .../SmartStore.WebApi.Client.csproj | 10 +++---- .../WebApi/HmacAuthentication.cs | 2 +- .../WebApi/WebApiConsumer.cs | 3 +- .../WebApi/WebApiConsumerResponse.cs | 2 +- .../WebApi/WebApiCore.cs | 2 +- .../WebApi/WebApiExtensions.cs | 26 ++++++++++------- 17 files changed, 68 insertions(+), 63 deletions(-) diff --git a/src/Tools/SmartStore.WebApi.Client/App.config b/src/Tools/SmartStore.WebApi.Client/App.config index bc30a5e783..0f1b5ffc08 100644 --- a/src/Tools/SmartStore.WebApi.Client/App.config +++ b/src/Tools/SmartStore.WebApi.Client/App.config @@ -2,14 +2,14 @@ -
+
- + @@ -34,6 +34,7 @@ - - + + + diff --git a/src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs b/src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs index be51428354..7b379875c2 100644 --- a/src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs +++ b/src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace SmartStoreNetWebApiClient +namespace SmartStore.WebApi.Client { partial class MainForm { @@ -407,21 +407,21 @@ private void InitializeComponent() // // txtVersion // - this.txtVersion.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::SmartStoreNetWebApiClient.Properties.Settings.Default, "ApiVersion", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.txtVersion.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::SmartStore.WebApi.Client.Properties.Settings.Default, "ApiVersion", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.txtVersion.Location = new System.Drawing.Point(370, 36); this.txtVersion.Name = "txtVersion"; this.txtVersion.Size = new System.Drawing.Size(89, 21); this.txtVersion.TabIndex = 4; - this.txtVersion.Text = global::SmartStoreNetWebApiClient.Properties.Settings.Default.ApiVersion; + this.txtVersion.Text = global::SmartStore.WebApi.Client.Properties.Settings.Default.ApiVersion; // // txtUrl // - this.txtUrl.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::SmartStoreNetWebApiClient.Properties.Settings.Default, "ApiUrl", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.txtUrl.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::SmartStore.WebApi.Client.Properties.Settings.Default, "ApiUrl", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.txtUrl.Location = new System.Drawing.Point(84, 62); this.txtUrl.Name = "txtUrl"; this.txtUrl.Size = new System.Drawing.Size(225, 21); this.txtUrl.TabIndex = 2; - this.txtUrl.Text = global::SmartStoreNetWebApiClient.Properties.Settings.Default.ApiUrl; + this.txtUrl.Text = global::SmartStore.WebApi.Client.Properties.Settings.Default.ApiUrl; // // btnFileOpen // diff --git a/src/Tools/SmartStore.WebApi.Client/MainForm.cs b/src/Tools/SmartStore.WebApi.Client/MainForm.cs index 1ec67ae20a..72d341f8b1 100644 --- a/src/Tools/SmartStore.WebApi.Client/MainForm.cs +++ b/src/Tools/SmartStore.WebApi.Client/MainForm.cs @@ -3,10 +3,9 @@ using System.Diagnostics; using System.Text; using System.Windows.Forms; -using SmartStore.Net.WebApi; -using SmartStoreNetWebApiClient.Properties; +using SmartStore.WebApi.Client.Properties; -namespace SmartStoreNetWebApiClient +namespace SmartStore.WebApi.Client { public partial class MainForm : Form { diff --git a/src/Tools/SmartStore.WebApi.Client/Misc/Extensions.cs b/src/Tools/SmartStore.WebApi.Client/Misc/Extensions.cs index 67c22c0114..d2d7faea62 100644 --- a/src/Tools/SmartStore.WebApi.Client/Misc/Extensions.cs +++ b/src/Tools/SmartStore.WebApi.Client/Misc/Extensions.cs @@ -4,7 +4,7 @@ using System.Text; using System.Windows.Forms; -namespace SmartStoreNetWebApiClient +namespace SmartStore.WebApi.Client { public static class Extensions { diff --git a/src/Tools/SmartStore.WebApi.Client/Misc/HourGlass.cs b/src/Tools/SmartStore.WebApi.Client/Misc/HourGlass.cs index c2c80a7230..645dd92295 100644 --- a/src/Tools/SmartStore.WebApi.Client/Misc/HourGlass.cs +++ b/src/Tools/SmartStore.WebApi.Client/Misc/HourGlass.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace SmartStoreNetWebApiClient +namespace SmartStore.WebApi.Client { public class HourGlass : IDisposable { diff --git a/src/Tools/SmartStore.WebApi.Client/Program.cs b/src/Tools/SmartStore.WebApi.Client/Program.cs index 804bee7412..77a79af8e3 100644 --- a/src/Tools/SmartStore.WebApi.Client/Program.cs +++ b/src/Tools/SmartStore.WebApi.Client/Program.cs @@ -1,12 +1,12 @@ using System; using System.Windows.Forms; -namespace SmartStoreNetWebApiClient +namespace SmartStore.WebApi.Client { static class Program { - public static string AppName { get { return "SmartStore.Net Web API Client v.1.6"; } } - public static string ConsumerName { get { return "My shopping data consumer v.1.6"; } } + public static string AppName { get { return "SmartStore Web API Client v.1.7"; } } + public static string ConsumerName { get { return "My shopping data consumer v.1.7"; } } [STAThread] static void Main() diff --git a/src/Tools/SmartStore.WebApi.Client/Properties/AssemblyInfo.cs b/src/Tools/SmartStore.WebApi.Client/Properties/AssemblyInfo.cs index 9c64d97f98..d8cdab27b8 100644 --- a/src/Tools/SmartStore.WebApi.Client/Properties/AssemblyInfo.cs +++ b/src/Tools/SmartStore.WebApi.Client/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("SmartStore.Net WebApi Client")] +[assembly: AssemblyTitle("SmartStore WebApi Client")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SmartStoreNetWebApiClient")] -[assembly: AssemblyCopyright("Copyright © SmartStore AG 2017")] +[assembly: AssemblyProduct("SmartStoreWebApiClient")] +[assembly: AssemblyCopyright("Copyright © SmartStore AG 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.7.0.0")] +[assembly: AssemblyFileVersion("1.7.0.0")] diff --git a/src/Tools/SmartStore.WebApi.Client/Properties/Resources.Designer.cs b/src/Tools/SmartStore.WebApi.Client/Properties/Resources.Designer.cs index c31baa9266..886e9e37c7 100644 --- a/src/Tools/SmartStore.WebApi.Client/Properties/Resources.Designer.cs +++ b/src/Tools/SmartStore.WebApi.Client/Properties/Resources.Designer.cs @@ -1,24 +1,24 @@ //------------------------------------------------------------------------------ // -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace SmartStoreNetWebApiClient.Properties { +namespace SmartStore.WebApi.Client.Properties { using System; /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,13 +33,13 @@ internal Resources() { } /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SmartStoreNetWebApiClient.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SmartStore.WebApi.Client.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs index 8d0f1103b9..ac2aa8c85f 100644 --- a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs +++ b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace SmartStoreNetWebApiClient.Properties { +namespace SmartStore.WebApi.Client.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] diff --git a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings index 0c9a0fecf9..3ba352ea4f 100644 --- a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings +++ b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings @@ -1,5 +1,5 @@  - + diff --git a/src/Tools/SmartStore.WebApi.Client/Settings.cs b/src/Tools/SmartStore.WebApi.Client/Settings.cs index 33cef85710..058c435335 100644 --- a/src/Tools/SmartStore.WebApi.Client/Settings.cs +++ b/src/Tools/SmartStore.WebApi.Client/Settings.cs @@ -1,4 +1,4 @@ -namespace SmartStoreNetWebApiClient.Properties +namespace SmartStore.WebApi.Client.Properties { internal sealed partial class Settings { diff --git a/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj b/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj index 426ea67e53..4e20cc2a42 100644 --- a/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj +++ b/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj @@ -7,11 +7,14 @@ {CD28D50C-38C3-4371-80B3-71FE7853D61D} WinExe Properties - SmartStoreNetWebApiClient - SmartStoreNetWebApiClient + SmartStore.WebApi.Client + SmartStoreWebApiClient v4.7.2 512 false + ..\..\ + true + veröffentlichen\ true Disk @@ -26,9 +29,6 @@ 1.0.0.%2a false true - ..\..\ - true - AnyCPU diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs index 9e96243456..6501d83121 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs @@ -4,7 +4,7 @@ using System.Text; using System.Web; -namespace SmartStore.Net.WebApi +namespace SmartStore.WebApi.Client { public class HmacAuthentication { diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs index 2bd2ff0afd..3ce18ef41d 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs @@ -7,9 +7,8 @@ using System.Text; using System.Web; using System.Windows.Forms; -using SmartStoreNetWebApiClient; -namespace SmartStore.Net.WebApi +namespace SmartStore.WebApi.Client { public class ApiConsumer : HmacAuthentication { diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumerResponse.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumerResponse.cs index bdfab463ae..250cb0f297 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumerResponse.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumerResponse.cs @@ -1,4 +1,4 @@ -namespace SmartStore.Net.WebApi +namespace SmartStore.WebApi.Client { public class WebApiConsumerResponse { diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiCore.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiCore.cs index 6aef864d6b..043d1b2d73 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiCore.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiCore.cs @@ -1,6 +1,6 @@ using System.Text; -namespace SmartStore.Net.WebApi +namespace SmartStore.WebApi.Client { public class WebApiRequestContext { diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiExtensions.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiExtensions.cs index dcb281f1d1..61f7245660 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiExtensions.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiExtensions.cs @@ -4,9 +4,9 @@ using System.Text; using Newtonsoft.Json.Linq; -namespace SmartStore.Net.WebApi +namespace SmartStore.WebApi.Client { - public static class WebApiExtensions + public static class WebApiExtensions { private static readonly DateTime BeginOfEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); @@ -26,7 +26,9 @@ public static DateTime FromUnixTime(this long unixTime) public static string ToHexString(this byte[] bytes, int length = 0) { if (bytes == null || bytes.Length <= 0) + { return ""; + } var sb = new StringBuilder(); @@ -37,6 +39,7 @@ public static string ToHexString(this byte[] bytes, int length = 0) if (length > 0 && sb.Length >= length) break; } + return sb.ToString(); } @@ -46,18 +49,20 @@ public static string ToHexString(this byte[] bytes, int length = 0) public static List TryParseCustomers(this WebApiConsumerResponse response) { if (response == null || string.IsNullOrWhiteSpace(response.Content)) + { return null; + } - //dynamic dynamicJson = JObject.Parse(response.Content); + // dynamic dynamicJson = JObject.Parse(response.Content); - //foreach (dynamic customer in dynamicJson.value) - //{ - // string str = string.Format("{0} {1} {2}", customer.Id, customer.CustomerGuid, customer.Email); - // Debug.WriteLine(str); - //} + // foreach (dynamic customer in dynamicJson.value) + // { + // string str = string.Format("{0} {1} {2}", customer.Id, customer.CustomerGuid, customer.Email); + //str.Dump(); + // } - var json = JObject.Parse(response.Content); - string metadata = (string)json["odata.metadata"]; + var json = JObject.Parse(response.Content); + string metadata = (string)json["@odata.context"]; if (!string.IsNullOrWhiteSpace(metadata) && metadata.EndsWith("#Customers")) { @@ -65,6 +70,7 @@ public static List TryParseCustomers(this WebApiConsumerResponse respo return customers; } + return null; } } From 2bd50dfcf1086aa8d300c280374ee406eae76d02 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 10 Aug 2020 15:44:34 +0200 Subject: [PATCH 017/695] API: fixes "The 'ObjectContent`1' type failed to serialize the response body for content type 'application/xml; charset=utf-8'" --- .../SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 88d58be4bb..184c532976 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -3,7 +3,6 @@ using System.Web.Http.Cors; using System.Web.OData.Builder; using System.Web.OData.Extensions; -using System.Web.OData.Formatter; using System.Web.OData.Routing; using System.Web.OData.Routing.Conventions; using Newtonsoft.Json; @@ -30,8 +29,9 @@ public void Start() config.DependencyResolver = new AutofacWebApiDependencyResolver(); - var odataFormatters = ODataMediaTypeFormatters.Create(); - config.Formatters.InsertRange(0, odataFormatters); + // Causes error messages during XML serialization: + //var oDataFormatters = ODataMediaTypeFormatters.Create(); + //config.Formatters.InsertRange(0, oDataFormatters); config.Formatters.JsonFormatter.SerializerSettings.Formatting = Formatting.Indented; config.Formatters.JsonFormatter.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; From 8805097f870e0714877aefd35d1a78d8812a3302 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 10 Aug 2020 20:10:23 +0200 Subject: [PATCH 018/695] API: minor changes --- ...cturesController.cs => MediaController.cs} | 55 +++++++++---------- .../Controllers/OData/ProductsController.cs | 14 +++-- .../Models/Api/UploadImage.cs | 3 + .../OData/ManageAttributeType.cs} | 5 +- .../Models/OData/OrderInfo.cs | 3 + .../Models/OData/OrderItemInfo.cs | 3 + .../SmartStore.WebApi.csproj | 4 +- .../WebApiConfigurationProvider.cs | 1 - 8 files changed, 50 insertions(+), 38 deletions(-) rename src/Plugins/SmartStore.WebApi/Controllers/OData/{PicturesController.cs => MediaController.cs} (89%) rename src/Plugins/SmartStore.WebApi/{Services/WebApiCore.cs => Models/OData/ManageAttributeType.cs} (85%) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs similarity index 89% rename from src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs rename to src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 7cfe69cfd0..1bdceadf94 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -5,8 +5,6 @@ using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; -using SmartStore.Core.Domain.Catalog; -using SmartStore.Core.Domain.Media; using SmartStore.Services.Media; using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.Configuration; @@ -15,6 +13,7 @@ namespace SmartStore.WebApi.Controllers.OData { + // TODO: readonly properties of MediaFileInfo cannot be serialized! public class MediaController : ODataController { private readonly IMediaService _mediaService; @@ -24,8 +23,6 @@ public MediaController(IMediaService mediaService) _mediaService = mediaService; } - // TODO: readonly properties of MediaFileInfo cannot be serialized! - // GET /Media(123) [WebApiAuthenticate] public MediaFileInfo Get(int key) @@ -222,30 +219,28 @@ await this.ProcessEntityAsync(async () => } - // TODO: do not support direct MediaFile entity editing through API. - // Add MediaController for IMediaService methods instead. - public class PicturesController : WebApiEntityController - { - protected override IQueryable GetEntitySet() - { - var query = - from x in Repository.Table - where !x.Deleted && !x.Hidden - select x; - - return query; - } - - [WebApiQueryable] - public SingleResult GetPicture(int key) - { - return GetSingleResult(key); - } - - [WebApiQueryable] - public IQueryable GetProductPictures(int key) - { - return GetRelatedCollection(key, x => x.ProductMediaFiles); - } - } + // public class PicturesController : WebApiEntityController + //{ + // protected override IQueryable GetEntitySet() + // { + // var query = + // from x in Repository.Table + // where !x.Deleted && !x.Hidden + // select x; + + // return query; + // } + + // [WebApiQueryable] + // public SingleResult GetPicture(int key) + // { + // return GetSingleResult(key); + // } + + // [WebApiQueryable] + // public IQueryable GetProductPictures(int key) + // { + // return GetRelatedCollection(key, x => x.ProductMediaFiles); + // } + //} } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index aebea290c1..a1afbbe125 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -20,6 +20,7 @@ using SmartStore.Web.Framework.WebApi.Configuration; using SmartStore.Web.Framework.WebApi.OData; using SmartStore.Web.Framework.WebApi.Security; +using SmartStore.WebApi.Models.OData; using SmartStore.WebApi.Services; namespace SmartStore.WebApi.Controllers.OData @@ -466,7 +467,7 @@ public IQueryable CreateAttributeCombination [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] public IQueryable ManageAttributes(int key, ODataActionParameters parameters) { - var entity = GetExpandedEntity(key, x => x.ProductVariantAttributes); + var entity = GetExpandedEntity(key, x => x.ProductVariantAttributes.Select(y => y.ProductAttribute)); var result = new List(); this.ProcessEntity(() => @@ -476,7 +477,7 @@ public IQueryable ManageAttributes(int key, ODataAction .Where(x => x.Name.HasValue()) .ToList(); - var attributeNames = new HashSet(data.Select(x => x.Name), StringComparer.InvariantCultureIgnoreCase); + var attributeNames = new HashSet(data.Select(x => x.Name), StringComparer.OrdinalIgnoreCase); var pagedAttributes = _productAttributeService.Value.GetAllProductAttributes(0, 1); var attributesData = pagedAttributes.SourceQuery .Where(x => attributeNames.Contains(x.Name)) @@ -484,8 +485,9 @@ public IQueryable ManageAttributes(int key, ODataAction .ToList(); var allAttributesDic = attributesData.ToDictionarySafe(x => x.Name, x => x, StringComparer.OrdinalIgnoreCase); - foreach (var srcAttr in data) + foreach (var srcAttr in data) { + // Product attribute. var attributeId = 0; if (allAttributesDic.TryGetValue(srcAttr.Name, out var attributeData)) { @@ -498,9 +500,11 @@ public IQueryable ManageAttributes(int key, ODataAction attributeId = attribute.Id; } - var productAttribute = entity.ProductVariantAttributes.FirstOrDefault(x => x.ProductAttribute.Name.IsCaseInsensitiveEqual(srcAttr.Name)); + // Product attribute mapping. + var productAttribute = entity.ProductVariantAttributes.FirstOrDefault(x => x.ProductAttribute?.Name.IsCaseInsensitiveEqual(srcAttr.Name) ?? false); if (productAttribute == null) { + // No mapping to attribute yet. productAttribute = new ProductVariantAttribute { ProductId = entity.Id, @@ -515,6 +519,7 @@ public IQueryable ManageAttributes(int key, ODataAction } else if (synchronize) { + // Has already an attribute mapping. if (srcAttr.Values.Count <= 0 && productAttribute.ShouldHaveValues()) { _productAttributeService.Value.DeleteProductVariantAttribute(productAttribute); @@ -528,6 +533,7 @@ public IQueryable ManageAttributes(int key, ODataAction } } + // Values. var maxDisplayOrder = productAttribute.ProductVariantAttributeValues .OrderByDescending(x => x.DisplayOrder) .Select(x => x.DisplayOrder) diff --git a/src/Plugins/SmartStore.WebApi/Models/Api/UploadImage.cs b/src/Plugins/SmartStore.WebApi/Models/Api/UploadImage.cs index a7e03e7e40..e00ab08035 100644 --- a/src/Plugins/SmartStore.WebApi/Models/Api/UploadImage.cs +++ b/src/Plugins/SmartStore.WebApi/Models/Api/UploadImage.cs @@ -5,6 +5,9 @@ namespace SmartStore.WebApi.Models.Api { + /// + /// Information about an uploaded image returned by the API. + /// [DataContract] public partial class UploadImage : UploadFileBase { diff --git a/src/Plugins/SmartStore.WebApi/Services/WebApiCore.cs b/src/Plugins/SmartStore.WebApi/Models/OData/ManageAttributeType.cs similarity index 85% rename from src/Plugins/SmartStore.WebApi/Services/WebApiCore.cs rename to src/Plugins/SmartStore.WebApi/Models/OData/ManageAttributeType.cs index aa956af9f5..e4fec45a59 100644 --- a/src/Plugins/SmartStore.WebApi/Services/WebApiCore.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/ManageAttributeType.cs @@ -2,8 +2,11 @@ using System.Collections.Generic; using SmartStore.Core.Domain.Catalog; -namespace SmartStore.WebApi.Services +namespace SmartStore.WebApi.Models.OData { + /// + /// Data send by the consumer to manage product attributes. + /// [Serializable] internal class ManageAttributeType { diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/OrderInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/OrderInfo.cs index fc2fb0ec3e..a9d5ec5ca8 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/OrderInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/OrderInfo.cs @@ -2,6 +2,9 @@ namespace SmartStore.WebApi.Models.OData { + /// + /// Extra information about an order returned by the API. + /// [DataContract] public partial class OrderInfo { diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/OrderItemInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/OrderItemInfo.cs index bd7e46ad8b..8cd95001a8 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/OrderItemInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/OrderItemInfo.cs @@ -2,6 +2,9 @@ namespace SmartStore.WebApi.Models.OData { + /// + /// Extra information about an order item returned by the API. + /// [DataContract] public partial class OrderItemInfo { diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 0d525831e8..b993a6b15d 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -240,7 +240,7 @@ - + @@ -286,7 +286,7 @@ - + diff --git a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs index 4f2ddd8aa9..653856adb7 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs @@ -52,7 +52,6 @@ public void Configure(WebApiConfigurationBroadcaster configData) m.EntitySet("Manufacturers"); m.EntitySet("MeasureDimensions"); m.EntitySet("MeasureWeights"); - m.EntitySet("Pictures"); m.EntitySet("Media"); m.EntitySet("MediaTags"); m.EntitySet("MediaTracks"); From fc464112ef226f825717865d0b20e919680b284f Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Mon, 10 Aug 2020 21:00:07 +0200 Subject: [PATCH 019/695] Minor fixes --- src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs | 4 ++-- .../SmartStore.Web/Themes/Flex/Content/_menu.scss | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs index 5b53ce3b15..e7ea34b16c 100644 --- a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs +++ b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs @@ -197,14 +197,14 @@ public int RunPendingMigrations(TContext context) private void RunSeeders(IEnumerable seederEntries, T ctx) where T : DbContext { + var eventPublisher = EngineContext.Current.Resolve(); + foreach (var seederEntry in seederEntries) { var seeder = (IDataSeeder)seederEntry.DataSeeder; try { - var eventPublisher = EngineContext.Current.Resolve(); - // Pre seed event eventPublisher.Publish(new SeedingDbMigrationEvent { MigrationName = seederEntry.MigrationName, DbContext = ctx }); diff --git a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_menu.scss b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_menu.scss index 5c2273bd53..bbc538cda6 100644 --- a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_menu.scss +++ b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_menu.scss @@ -21,13 +21,13 @@ $ocm-selected-color: $warning; .catmenu-path-item.expanded, .catmenu-item.parent { - padding-right: $list-group-item-padding-x * 1.5; + padding-right: $list-group-item-padding-x * 1.2; &:after { - @include fontawesome("\f105", 1.2rem); + @include fontawesome("\f054", 0.75rem); display: block; position: absolute; - right: 1rem; + right: 0.625rem; top: 50%; transform: translateY(-50%); } From d38adea8736d6311c4ab6dd0a517a121a76c46a8 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Mon, 10 Aug 2020 21:43:14 +0200 Subject: [PATCH 020/695] Updated EntityFramework packages to v3.4.4 --- src/Libraries/SmartStore.Core/SmartStore.Core.csproj | 4 ++-- src/Libraries/SmartStore.Core/packages.config | 2 +- src/Libraries/SmartStore.Data/SmartStore.Data.csproj | 6 +++--- src/Libraries/SmartStore.Data/packages.config | 4 ++-- .../SmartStore.Services/SmartStore.Services.csproj | 4 ++-- src/Libraries/SmartStore.Services/packages.config | 2 +- src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj | 4 ++-- src/Plugins/SmartStore.DevTools/packages.config | 2 +- .../SmartStore.GoogleMerchantCenter.csproj | 4 ++-- src/Plugins/SmartStore.GoogleMerchantCenter/packages.config | 2 +- src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj | 4 ++-- src/Plugins/SmartStore.Shipping/packages.config | 2 +- .../SmartStore.ShippingByWeight.csproj | 4 ++-- src/Plugins/SmartStore.ShippingByWeight/packages.config | 2 +- src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj | 4 ++-- src/Plugins/SmartStore.Tax/packages.config | 2 +- src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj | 4 ++-- src/Plugins/SmartStore.WebApi/packages.config | 2 +- .../SmartStore.Web.Framework.csproj | 4 ++-- src/Presentation/SmartStore.Web.Framework/packages.config | 2 +- .../SmartStore.Web/Administration/packages.config | 2 +- src/Presentation/SmartStore.Web/SmartStore.Web.csproj | 6 +++--- src/Presentation/SmartStore.Web/packages.config | 4 ++-- .../SmartStore.Core.Tests/SmartStore.Core.Tests.csproj | 4 ++-- src/Tests/SmartStore.Core.Tests/packages.config | 2 +- .../SmartStore.Data.Tests/SmartStore.Data.Tests.csproj | 6 +++--- src/Tests/SmartStore.Data.Tests/packages.config | 4 ++-- .../SmartStore.Services.Tests.csproj | 4 ++-- src/Tests/SmartStore.Services.Tests/packages.config | 2 +- src/Tests/SmartStore.Tests/SmartStore.Tests.csproj | 4 ++-- src/Tests/SmartStore.Tests/packages.config | 2 +- 31 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 130f467935..1bbc86c10d 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -73,11 +73,11 @@ True - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll True - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll True diff --git a/src/Libraries/SmartStore.Core/packages.config b/src/Libraries/SmartStore.Core/packages.config index e43ef279d7..f8558c42cd 100644 --- a/src/Libraries/SmartStore.Core/packages.config +++ b/src/Libraries/SmartStore.Core/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index b1c7331ec9..6d014f01c7 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -71,15 +71,15 @@ ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll True - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll True - ..\..\packages\EntityFramework.SqlServerCompact.6.2.0\lib\net45\EntityFramework.SqlServerCompact.dll + ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll True diff --git a/src/Libraries/SmartStore.Data/packages.config b/src/Libraries/SmartStore.Data/packages.config index a7e5d59fea..a913d74148 100644 --- a/src/Libraries/SmartStore.Data/packages.config +++ b/src/Libraries/SmartStore.Data/packages.config @@ -1,8 +1,8 @@  - - + + diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 82e77a9138..503fe52789 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -81,11 +81,11 @@ True - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll True - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll True diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index efaa7e009b..9218c41be9 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj index 3a0ad889a8..940f54c632 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -85,11 +85,11 @@ False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False diff --git a/src/Plugins/SmartStore.DevTools/packages.config b/src/Plugins/SmartStore.DevTools/packages.config index 57a42b5851..1898961fd7 100644 --- a/src/Plugins/SmartStore.DevTools/packages.config +++ b/src/Plugins/SmartStore.DevTools/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj index 56ad46f35a..06368ab51d 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj @@ -94,11 +94,11 @@ False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config b/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config index fdc270f9cd..6f0d685c52 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj index d6cefba6be..a4f65fe396 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -94,11 +94,11 @@ False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False diff --git a/src/Plugins/SmartStore.Shipping/packages.config b/src/Plugins/SmartStore.Shipping/packages.config index 481f956237..775e294d7d 100644 --- a/src/Plugins/SmartStore.Shipping/packages.config +++ b/src/Plugins/SmartStore.Shipping/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj index a36d46d41f..ca1310024f 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj +++ b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj @@ -94,11 +94,11 @@ False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False diff --git a/src/Plugins/SmartStore.ShippingByWeight/packages.config b/src/Plugins/SmartStore.ShippingByWeight/packages.config index dadad11e6d..775e294d7d 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/packages.config +++ b/src/Plugins/SmartStore.ShippingByWeight/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj index 10615a9aa4..36f3d57b73 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -90,11 +90,11 @@ False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False diff --git a/src/Plugins/SmartStore.Tax/packages.config b/src/Plugins/SmartStore.Tax/packages.config index c2904f28a5..36d0a9ec66 100644 --- a/src/Plugins/SmartStore.Tax/packages.config +++ b/src/Plugins/SmartStore.Tax/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index a7f6111bfd..56670be120 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -96,11 +96,11 @@ False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll False - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False diff --git a/src/Plugins/SmartStore.WebApi/packages.config b/src/Plugins/SmartStore.WebApi/packages.config index 24b7e62ffc..70f1cfe266 100644 --- a/src/Plugins/SmartStore.WebApi/packages.config +++ b/src/Plugins/SmartStore.WebApi/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 0a2848140c..4358766610 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -100,11 +100,11 @@ ..\..\packages\DotLiquid.2.0.254\lib\net45\DotLiquid.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll True - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll True diff --git a/src/Presentation/SmartStore.Web.Framework/packages.config b/src/Presentation/SmartStore.Web.Framework/packages.config index 3a994957a8..8ad306cfc9 100644 --- a/src/Presentation/SmartStore.Web.Framework/packages.config +++ b/src/Presentation/SmartStore.Web.Framework/packages.config @@ -11,7 +11,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/Administration/packages.config b/src/Presentation/SmartStore.Web/Administration/packages.config index 0d7426974d..7c34e63d21 100644 --- a/src/Presentation/SmartStore.Web/Administration/packages.config +++ b/src/Presentation/SmartStore.Web/Administration/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index 7351d74410..fda78974db 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -111,15 +111,15 @@ ..\..\packages\DouglasCrockford.JsMin.2.1.0\lib\net45\DouglasCrockford.JsMin.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll True - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll True - ..\..\packages\EntityFramework.SqlServerCompact.6.2.0\lib\net45\EntityFramework.SqlServerCompact.dll + ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll True diff --git a/src/Presentation/SmartStore.Web/packages.config b/src/Presentation/SmartStore.Web/packages.config index 39f816c7b4..4c8b1b1872 100644 --- a/src/Presentation/SmartStore.Web/packages.config +++ b/src/Presentation/SmartStore.Web/packages.config @@ -11,8 +11,8 @@ - - + + diff --git a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj index d5724e561f..65432f54b0 100644 --- a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj +++ b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj @@ -66,10 +66,10 @@ ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/src/Tests/SmartStore.Core.Tests/packages.config b/src/Tests/SmartStore.Core.Tests/packages.config index 078c3a2cff..464049c76b 100644 --- a/src/Tests/SmartStore.Core.Tests/packages.config +++ b/src/Tests/SmartStore.Core.Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/Tests/SmartStore.Data.Tests/SmartStore.Data.Tests.csproj b/src/Tests/SmartStore.Data.Tests/SmartStore.Data.Tests.csproj index 0ef4a9806c..1c6900cef7 100644 --- a/src/Tests/SmartStore.Data.Tests/SmartStore.Data.Tests.csproj +++ b/src/Tests/SmartStore.Data.Tests/SmartStore.Data.Tests.csproj @@ -63,13 +63,13 @@ - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - ..\..\packages\EntityFramework.SqlServerCompact.6.2.0\lib\net45\EntityFramework.SqlServerCompact.dll + ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll False diff --git a/src/Tests/SmartStore.Data.Tests/packages.config b/src/Tests/SmartStore.Data.Tests/packages.config index 71048b7d00..ca2235437e 100644 --- a/src/Tests/SmartStore.Data.Tests/packages.config +++ b/src/Tests/SmartStore.Data.Tests/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj b/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj index 007dedcf87..46ac88b8ca 100644 --- a/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj +++ b/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj @@ -67,10 +67,10 @@ - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll True diff --git a/src/Tests/SmartStore.Services.Tests/packages.config b/src/Tests/SmartStore.Services.Tests/packages.config index 64cae807e1..b7dc70b980 100644 --- a/src/Tests/SmartStore.Services.Tests/packages.config +++ b/src/Tests/SmartStore.Services.Tests/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj b/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj index dbbbb741db..656767cf8c 100644 --- a/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj +++ b/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj @@ -66,10 +66,10 @@ ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False diff --git a/src/Tests/SmartStore.Tests/packages.config b/src/Tests/SmartStore.Tests/packages.config index 7df795ca0d..e08776c4ed 100644 --- a/src/Tests/SmartStore.Tests/packages.config +++ b/src/Tests/SmartStore.Tests/packages.config @@ -1,7 +1,7 @@  - + \ No newline at end of file From deec2a83eeabe70fdcca7c706bf4efb9b60db8bf Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Mon, 10 Aug 2020 21:47:48 +0200 Subject: [PATCH 021/695] fu > display main badge only for product pictures --- .../SmartStore.Web/Content/skinning/_fileupload.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Content/skinning/_fileupload.scss b/src/Presentation/SmartStore.Web/Content/skinning/_fileupload.scss index a830afbaa9..59a068a5cc 100644 --- a/src/Presentation/SmartStore.Web/Content/skinning/_fileupload.scss +++ b/src/Presentation/SmartStore.Web/Content/skinning/_fileupload.scss @@ -207,7 +207,7 @@ border-bottom-right-radius: 0; } - &:first-child .main-pic-badge { + #product-edit &:first-child .main-pic-badge { display: block; } From db1c2c1f4aed61cd8aa7428c8064235c01ee23e1 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 10 Aug 2020 21:55:14 +0200 Subject: [PATCH 022/695] API: custom routing convention (in progress) --- .../Controllers/Api/PaymentsController.cs | 2 +- .../Controllers/Api/UploadsController.cs | 15 +- .../OData/CustomerRolesController.cs | 7 +- .../Controllers/OData/CustomersController.cs | 6 +- .../Controllers/OData/MediaController.cs | 4 +- .../Controllers/OData/OrderItemsController.cs | 7 +- .../Controllers/OData/OrderNotesController.cs | 5 +- .../OData/PaymentMethodsController.cs | 3 +- .../OData/ReturnRequestsController.cs | 7 +- .../Controllers/OData/UrlRecordsController.cs | 9 +- .../Extensions/MiscExtensions.cs | 16 +- .../Services/CustomRoutingConvention.cs | 73 +++++++ .../WebApiCatalogSearchQueryModelBinder.cs | 5 +- .../SmartStore.WebApi.csproj | 1 + .../WebApiConfigurationProvider.cs | 4 + .../SmartStore.Web.Framework.csproj | 3 +- .../Extensions/ApiControllerExtensions.cs | 86 ++++++++ .../HttpRequestMessageExtensions.cs | 58 ++++++ .../Security/WebApiAuthenticateAttribute.cs | 8 +- .../WebApi/WebApiEntityController.cs | 12 +- .../WebApi/WebApiExtension.cs | 192 ------------------ 21 files changed, 287 insertions(+), 236 deletions(-) create mode 100644 src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs create mode 100644 src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs create mode 100644 src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs delete mode 100644 src/Presentation/SmartStore.Web.Framework/WebApi/WebApiExtension.cs diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs index e9858981e0..08cd9c73d6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs @@ -24,7 +24,7 @@ public PaymentsController(Lazy providerManager) public IQueryable GetMethods() { if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); + throw this.InvalidModelStateException(); var query = _providerManager.Value .GetAllProviders() diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs index 1a49be6a07..a6a6e3fd42 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs @@ -3,6 +3,7 @@ using System.IO; using System.IO.Compression; using System.Linq; +using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Threading; @@ -93,7 +94,7 @@ public async Task> ProductImages() { if (!Request.Content.IsMimeMultipartContent()) { - throw this.ExceptionUnsupportedMediaType(); + throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType); } Product entity = null; @@ -108,7 +109,7 @@ public async Task> ProductImages() catch (Exception ex) { provider.DeleteLocalFiles(); - throw this.ExceptionInternalServerError(ex); + throw Request.InternalServerErrorException(ex); } // Find product entity. @@ -131,7 +132,7 @@ public async Task> ProductImages() if (entity == null) { provider.DeleteLocalFiles(); - throw this.ExceptionNotFound(WebApiGlobal.Error.EntityNotFound.FormatInvariant(identifier.NaIfEmpty())); + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(identifier.NaIfEmpty())); } // Process images. @@ -169,7 +170,7 @@ public async Task> ProductImages() if (existingFile == null || existingFile.Id != image.Picture.Id) { - throw this.ExceptionInternalServerError(new Exception($"Failed to update existing product image: id {image.Picture.Id}, path '{path.NaIfEmpty()}'.")); + throw Request.InternalServerErrorException(new Exception($"Failed to update existing product image: id {image.Picture.Id}, path '{path.NaIfEmpty()}'.")); } } else @@ -222,7 +223,7 @@ public async Task> ImportFiles() { if (!Request.Content.IsMimeMultipartContent()) { - throw this.ExceptionUnsupportedMediaType(); + throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType); } ImportProfile profile = null; @@ -237,7 +238,7 @@ public async Task> ImportFiles() catch (Exception ex) { FileSystemHelper.ClearDirectory(tempDir, true); - throw this.ExceptionInternalServerError(ex); + throw Request.InternalServerErrorException(ex); } // Find import profile. @@ -255,7 +256,7 @@ public async Task> ImportFiles() if (profile == null) { FileSystemHelper.ClearDirectory(tempDir, true); - throw this.ExceptionNotFound(WebApiGlobal.Error.EntityNotFound.FormatInvariant(identifier.NaIfEmpty())); + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(identifier.NaIfEmpty())); } var startImport = false; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs index 8bf7acbd14..bd7a3d1091 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -41,7 +42,7 @@ public async Task Put(int key, CustomerRole entity) { if (entity != null && entity.IsSystemRole) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } Service.UpdateCustomerRole(entity); @@ -57,7 +58,7 @@ public async Task Patch(int key, Delta model) { if (entity != null && entity.IsSystemRole) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } Service.UpdateCustomerRole(entity); @@ -73,7 +74,7 @@ public async Task Delete(int key) { if (entity != null && entity.IsSystemRole) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } Service.DeleteCustomerRole(entity); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 68c14283e2..1065d36d18 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -64,7 +64,7 @@ public async Task Put(int key, Customer entity) { if (entity != null && entity.IsSystemAccount) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } Service.UpdateCustomer(entity); @@ -79,7 +79,7 @@ public async Task Patch(int key, Delta model) { if (entity != null && entity.IsSystemAccount) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } Service.UpdateCustomer(entity); @@ -94,7 +94,7 @@ public async Task Delete(int key) { if (entity != null && entity.IsSystemAccount) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } Service.DeleteCustomer(entity); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 1bdceadf94..ad8d87063f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -34,7 +34,7 @@ public MediaFileInfo Get(int key) file = _mediaService.GetFileById(key); if (file == null) { - throw this.ExceptionNotFound($"Cannot find file by ID {key}."); + throw Request.NotFoundException($"Cannot find file by ID {key}."); } }); @@ -141,7 +141,7 @@ public MediaFileInfo GetFileByPath(ODataActionParameters parameters) file = _mediaService.GetFileByPath(path); if (file == null) { - throw this.ExceptionNotFound($"The file with the path '{path ?? string.Empty}' does not exist."); + throw Request.NotFoundException($"The file with the path '{path ?? string.Empty}' does not exist."); } }); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index 65a97ffa38..f73fc2a2ca 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -43,19 +44,19 @@ public SingleResult Get(int key) [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] public IHttpActionResult Post(OrderItem entity) { - throw this.ExceptionNotImplemented(); + throw new HttpResponseException(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] public IHttpActionResult Put(int key, OrderItem entity) { - throw this.ExceptionNotImplemented(); + throw new HttpResponseException(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] public IHttpActionResult Patch(int key, Delta model) { - throw this.ExceptionNotImplemented(); + throw new HttpResponseException(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index 5e7af7704b..c539d054a7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -52,13 +53,13 @@ public IHttpActionResult Post(OrderNote entity) [WebApiAuthenticate(Permission = Permissions.Order.Update)] public IHttpActionResult Put(int key, OrderNote entity) { - throw this.ExceptionNotImplemented(); + throw new HttpResponseException(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.Update)] public IHttpActionResult Patch(int key, Delta model) { - throw this.ExceptionNotImplemented(); + throw new HttpResponseException(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.Update)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index 507a13e230..53c6c18136 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -52,7 +53,7 @@ public async Task Patch(int key, Delta model) [WebApiAuthenticate] public IHttpActionResult Delete(int key) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs index 859b13a53f..91f5467cfc 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -31,19 +32,19 @@ public SingleResult Get(int key) [WebApiAuthenticate(Permission = Permissions.Customer.Create)] public IHttpActionResult Post(ReturnRequest entity) { - throw this.ExceptionNotImplemented(); + throw new HttpResponseException(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Customer.Update)] public IHttpActionResult Put(int key, ReturnRequest entity) { - throw this.ExceptionNotImplemented(); + throw new HttpResponseException(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Customer.Update)] public IHttpActionResult Patch(int key, Delta model) { - throw this.ExceptionNotImplemented(); + throw new HttpResponseException(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Delete)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs index 04ac3f0303..bbc1aca985 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Seo; @@ -26,22 +27,22 @@ public SingleResult Get(int key) public IHttpActionResult Post(UrlRecord entity) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } public IHttpActionResult Put(int key, UrlRecord entity) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } public IHttpActionResult Patch(int key, Delta model) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } public IHttpActionResult Delete(int key) { - throw this.ExceptionForbidden(); + throw new HttpResponseException(HttpStatusCode.Forbidden); } } } diff --git a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs index 50a75bd6e9..d4ef779249 100644 --- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs @@ -1,8 +1,10 @@ -using System.Text; +using System.Net.Http; +using System.Text; using System.Web.Mvc; using System.Web.OData; using SmartStore.Core.Infrastructure; using SmartStore.Services.Localization; +using SmartStore.Utilities; namespace SmartStore.WebApi { @@ -61,5 +63,17 @@ public static T GetValueSafe(this ODataActionParameters parameters, string ke return default; } + + public static void DeleteLocalFiles(this MultipartFormDataStreamProvider provider) + { + try + { + foreach (var file in provider.FileData) + { + FileSystemHelper.DeleteFile(file.LocalFileName); + } + } + catch { } + } } } diff --git a/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs new file mode 100644 index 0000000000..893d9bb112 --- /dev/null +++ b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs @@ -0,0 +1,73 @@ +using System.Linq; +using System.Net.Http; +using System.Web.Http.Controllers; +using System.Web.OData.Routing; +using System.Web.OData.Routing.Conventions; +using SmartStore.Web.Framework.WebApi; + +namespace SmartStore.WebApi.Services +{ + public class CustomRoutingConvention : EntitySetRoutingConvention + { + public override string SelectAction(ODataPath odataPath, HttpControllerContext context, ILookup actionMap) + { + var method = context.Request.Method; + + if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/navigation/key")) + { + if (method == HttpMethod.Get || method == HttpMethod.Post || method == HttpMethod.Delete) + { + // We ignore standard OData path cause they differ: + // ~/entityset/key/$links/navigation (OData 3 "link"), ~/entityset/key/navigation/$ref (OData 4 "reference") + + var navigationProperty = GetNavigation(odataPath, 2); + + if (navigationProperty.IsEmpty()) + { + throw context.Request.BadRequestException(WebApiGlobal.Error.NoNavigationFromPath); + } + + var methodName = string.Concat("Navigation", navigationProperty); + + $"process custom path {methodName}".Dump(); + } + } + + // Not a match. + return null; + } + + #region Utilities + + // public static bool GetNormalizedKey(this ODataPath odataPath, int segmentIndex, out int key) + //{ + // if (odataPath.Segments.Count > segmentIndex) + // { + // string rawKey = (odataPath.Segments[segmentIndex] as KeyValuePathSegment).Value; + // if (rawKey.HasValue()) + // { + // if (rawKey.StartsWith("'")) + // rawKey = rawKey.Substring(1, rawKey.Length - 2); + + // if (int.TryParse(rawKey, out key)) + // return true; + // } + // } + // key = 0; + // return false; + //} + + private static string GetNavigation(ODataPath odataPath, int segmentIndex) + { + if (odataPath.Segments.Count > segmentIndex) + { + var navigationProperty = (odataPath.Segments[segmentIndex] as NavigationPathSegment).NavigationPropertyName; + return navigationProperty; + } + + return null; + } + + #endregion + } +} \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs b/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs index eef56d904f..bfb5d05f73 100644 --- a/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs +++ b/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs @@ -4,12 +4,11 @@ using System.Web.Http.ModelBinding; using SmartStore.Services.Search; using SmartStore.Services.Search.Modelling; -using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.Caching; namespace SmartStore.WebApi.Services { - public class WebApiCatalogSearchQueryModelBinder : IModelBinder + public class WebApiCatalogSearchQueryModelBinder : IModelBinder { private CatalogSearchQuery NormalizeQuery(CatalogSearchQuery query) { @@ -32,7 +31,7 @@ public bool BindModel(HttpActionContext actionContext, ModelBindingContext bindi } var dependencyScope = actionContext.Request.GetDependencyScope(); - var factory = dependencyScope.GetService(); + var factory = (ICatalogSearchQueryFactory)dependencyScope.GetService(typeof(ICatalogSearchQueryFactory)); if (factory.Current != null) { diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index b993a6b15d..f2fe3a6b8f 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -280,6 +280,7 @@ + diff --git a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs index 653856adb7..4a1bed9ab8 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs @@ -21,6 +21,7 @@ using SmartStore.Services.Media; using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.Configuration; +using SmartStore.WebApi.Services; using SmartStore.WebApi.Services.Swagger; using Swashbuckle.Application; @@ -96,6 +97,9 @@ public void Configure(WebApiConfigurationBroadcaster configData) Controllers.OData.ProductsController.Init(configData); Controllers.OData.MediaController.Init(configData); + // Custom routing convention. + configData.RoutingConventions.Insert(0, new CustomRoutingConvention()); + // Swagger integration, see http://www.my-store.com/swagger/ui/index var thisAssembly = typeof(WebApiConfigurationProvider).Assembly; var pluginFinder = configData.Configuration.DependencyResolver.GetService(typeof(IPluginFinder)) as IPluginFinder; diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 7dbe2a97db..3d5f388106 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -462,6 +462,8 @@ + + @@ -470,7 +472,6 @@ - diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs new file mode 100644 index 0000000000..a48d6ed651 --- /dev/null +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs @@ -0,0 +1,86 @@ +using System; +using System.Globalization; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using System.Web.Http; + +namespace SmartStore.Web.Framework.WebApi +{ + public static class ApiControllerExtensions + { + public static HttpResponseException InvalidModelStateException(this ApiController apiController) + { + return new HttpResponseException(apiController.Request.CreateErrorResponse(HttpStatusCode.BadRequest, apiController.ModelState)); + } + + /// + /// Further entity processing typically used by OData actions. + /// + /// Action for entity processing. + public static void ProcessEntity(this ApiController apiController, Action process) + { + if (!apiController.ModelState.IsValid) + { + throw apiController.InvalidModelStateException(); + } + + try + { + process(); + } + catch (HttpResponseException hrEx) + { + throw hrEx; + } + catch (Exception ex) + { + throw apiController.Request.UnprocessableEntityException(ex.Message); + } + } + + public static async Task ProcessEntityAsync(this ApiController apiController, Func process) + { + if (!apiController.ModelState.IsValid) + { + throw apiController.InvalidModelStateException(); + } + + try + { + await process(); + } + catch (HttpResponseException hrEx) + { + throw hrEx; + } + catch (Exception ex) + { + throw apiController.Request.UnprocessableEntityException(ex.Message); + } + } + + /// + /// Gets a query string value from API request URL. + /// + /// Value type. + /// API controller. + /// Name of the query string value. + /// Default value. + /// Query string value. + public static T GetQueryStringValue(this ApiController apiController, string name, T defaultValue = default) + { + Guard.NotEmpty(name, nameof(name)); + + var queries = apiController?.Request?.RequestUri?.ParseQueryString(); + + if (queries?.AllKeys?.Contains(name) ?? false) + { + return queries[name].Convert(defaultValue, CultureInfo.InvariantCulture); + } + + return defaultValue; + } + } +} diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs new file mode 100644 index 0000000000..9467caa675 --- /dev/null +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs @@ -0,0 +1,58 @@ +using System; +using System.Linq.Expressions; +using System.Net; +using System.Net.Http; +using System.Reflection; +using System.Web.Http; + +namespace SmartStore.Web.Framework.WebApi +{ + public static class HttpRequestMessageExtensions + { + private static MethodInfo _createResponse = InitCreateResponse(); + + private static MethodInfo InitCreateResponse() + { + Expression> expr = (request) => request.CreateResponse(HttpStatusCode.OK, default(object)); + + return (expr.Body as MethodCallExpression).Method.GetGenericMethodDefinition(); + } + + /// https://gist.github.com/raghuramn/5084608 + public static HttpResponseMessage CreateResponse(this HttpRequestMessage request, HttpStatusCode status, Type type, object value) + { + return _createResponse.MakeGenericMethod(type).Invoke(null, new[] { request, status, value }) as HttpResponseMessage; + } + + public static HttpResponseMessage CreateResponseForEntity(this HttpRequestMessage request, object entity, int key) + { + if (entity == null) + { + return request.CreateResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } + + return request.CreateResponse(HttpStatusCode.OK, entity.GetType(), entity); + } + + public static HttpResponseException BadRequestException(this HttpRequestMessage request, string message) + { + return new HttpResponseException(request.CreateErrorResponse(HttpStatusCode.BadRequest, message)); + } + + public static HttpResponseException UnprocessableEntityException(this HttpRequestMessage request, string message) + { + return new HttpResponseException(request.CreateErrorResponse((HttpStatusCode)422, message)); + } + + public static HttpResponseException NotFoundException(this HttpRequestMessage request, string message) + { + return new HttpResponseException(request.CreateErrorResponse(HttpStatusCode.NotFound, message)); + } + + public static HttpResponseException InternalServerErrorException(this HttpRequestMessage request, Exception ex) + { + return new HttpResponseException(request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex)); + } + + } +} diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs index 61f78fe25f..5ca22de7de 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs @@ -51,7 +51,7 @@ protected virtual bool HasPermission(IDependencyScope dependencyScope, Customer { try { - var permissionService = dependencyScope.GetService(); + var permissionService = (IPermissionService)dependencyScope.GetService(typeof(IPermissionService)); result = permissionService.Authorize(Permission, customer); } catch { } @@ -64,8 +64,8 @@ protected virtual void LogUnauthorized(HttpActionContext actionContext, IDepende { try { - var localization = dependencyScope.GetService(); - var loggerFactory = dependencyScope.GetService(); + var localization = (ILocalizationService)dependencyScope.GetService(typeof(ILocalizationService)); + var loggerFactory = (ILoggerFactory)dependencyScope.GetService(typeof(ILoggerFactory)); var logger = loggerFactory.GetLogger(this.GetType()); var strResult = result.ToString(); @@ -88,7 +88,7 @@ protected virtual Customer GetCustomer(IDependencyScope dependencyScope, int cus try { - var customerService = dependencyScope.GetService(); + var customerService = (ICustomerService)dependencyScope.GetService(typeof(ICustomerService)); customer = customerService.GetCustomerById(customerId); } catch (Exception ex) diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 8e17b53554..3f164e0760 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -83,7 +83,7 @@ protected internal virtual IQueryable GetExpandedEntitySet(string prope protected internal virtual TEntity GetEntityByKeyNotNull(int key) { if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); + throw this.InvalidModelStateException(); var entity = this.Repository.GetById(key); @@ -97,7 +97,7 @@ protected internal virtual SingleResult GetSingleResult(int key) { if (!ModelState.IsValid) { - throw this.ExceptionInvalidModelState(); + throw this.InvalidModelStateException(); } var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); @@ -114,7 +114,7 @@ protected internal virtual SingleResult GetSingleResult(TEntity entity) protected internal virtual TEntity GetExpandedEntity(int key, Expression> path) { if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); + throw this.InvalidModelStateException(); var query = GetExpandedEntitySet(path); @@ -129,7 +129,7 @@ protected internal virtual TEntity GetExpandedEntity(int key, Express protected internal virtual TEntity GetExpandedEntity(int key, string properties) { if (!ModelState.IsValid) - throw this.ExceptionInvalidModelState(); + throw this.InvalidModelStateException(); var query = GetExpandedEntitySet(properties); @@ -188,7 +188,7 @@ protected internal virtual IQueryable GetRelatedCollection> expr = (request) => request.CreateResponse(HttpStatusCode.OK, default(object)); - - return (expr.Body as MethodCallExpression).Method.GetGenericMethodDefinition(); - } - - /// https://gist.github.com/raghuramn/5084608 - public static HttpResponseMessage CreateResponse(this HttpRequestMessage request, HttpStatusCode status, Type type, object value) - { - return _createResponse.MakeGenericMethod(type).Invoke(null, new[] { request, status, value }) as HttpResponseMessage; - } - public static HttpResponseMessage CreateResponseForEntity(this HttpRequestMessage request, object entity, int key) - { - if (entity == null) - { - return request.CreateResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - } - - return request.CreateResponse(HttpStatusCode.OK, entity.GetType(), entity); - } - - public static HttpResponseException ExceptionInvalidModelState(this ApiController apiController) - { - return new HttpResponseException(apiController.Request.CreateErrorResponse(HttpStatusCode.BadRequest, apiController.ModelState)); - } - public static HttpResponseException ExceptionBadRequest(this ApiController apiController, string message) - { - return new HttpResponseException(apiController.Request.CreateErrorResponse(HttpStatusCode.BadRequest, message)); - } - public static HttpResponseException ExceptionUnprocessableEntity(this ApiController apiController, string message) - { - return new HttpResponseException(apiController.Request.CreateErrorResponse((HttpStatusCode)422, message)); - } - public static HttpResponseException ExceptionNotImplemented(this ApiController apiController) - { - return new HttpResponseException(HttpStatusCode.NotImplemented); - } - public static HttpResponseException ExceptionForbidden(this ApiController apiController) - { - return new HttpResponseException(HttpStatusCode.Forbidden); - } - public static HttpResponseException ExceptionForbidden(this ApiController apiController, string message) - { - return new HttpResponseException(apiController.Request.CreateErrorResponse(HttpStatusCode.Forbidden, message)); - } - public static HttpResponseException ExceptionUnsupportedMediaType(this ApiController apiController) - { - return new HttpResponseException(HttpStatusCode.UnsupportedMediaType); - } - public static HttpResponseException ExceptionNotFound(this ApiController apiController, string message) - { - return new HttpResponseException(apiController.Request.CreateErrorResponse(HttpStatusCode.NotFound, message)); - } - public static HttpResponseException ExceptionInternalServerError(this ApiController apiController, Exception ex) - { - return new HttpResponseException(apiController.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex)); - } - - /// - /// Further entity processing typically used by OData actions. - /// - /// Action for entity processing. - public static void ProcessEntity(this ApiController apiController, Action process) - { - if (!apiController.ModelState.IsValid) - { - throw apiController.ExceptionInvalidModelState(); - } - - try - { - process(); - } - catch (HttpResponseException hrEx) - { - throw hrEx; - } - catch (Exception ex) - { - throw apiController.ExceptionUnprocessableEntity(ex.Message); - } - } - - public static async Task ProcessEntityAsync(this ApiController apiController, Func process) - { - if (!apiController.ModelState.IsValid) - { - throw apiController.ExceptionInvalidModelState(); - } - - try - { - await process(); - } - catch (HttpResponseException hrEx) - { - throw hrEx; - } - catch (Exception ex) - { - throw apiController.ExceptionUnprocessableEntity(ex.Message); - } - } - - /// - /// Gets a query string value from API request URL. - /// - /// Value type. - /// API controller. - /// Name of the query string value. - /// Default value. - /// Query string value. - public static T GetQueryStringValue(this ApiController apiController, string name, T defaultValue = default) - { - Guard.NotEmpty(name, nameof(name)); - - var queries = apiController?.Request?.RequestUri?.ParseQueryString(); - - if (queries?.AllKeys?.Contains(name) ?? false) - { - return queries[name].Convert(defaultValue, CultureInfo.InvariantCulture); - } - - return defaultValue; - } - - // public static bool GetNormalizedKey(this ODataPath odataPath, int segmentIndex, out int key) - //{ - // if (odataPath.Segments.Count > segmentIndex) - // { - // string rawKey = (odataPath.Segments[segmentIndex] as KeyValuePathSegment).Value; - // if (rawKey.HasValue()) - // { - // if (rawKey.StartsWith("'")) - // rawKey = rawKey.Substring(1, rawKey.Length - 2); - - // if (int.TryParse(rawKey, out key)) - // return true; - // } - // } - // key = 0; - // return false; - //} - - //public static string GetNavigation(this ODataPath odataPath, int segmentIndex) - //{ - // if (odataPath.Segments.Count > segmentIndex) - // { - // string navigationProperty = (odataPath.Segments[segmentIndex] as NavigationPathSegment).NavigationPropertyName; - - // return navigationProperty; - // } - // return null; - //} - - public static void DeleteLocalFiles(this MultipartFormDataStreamProvider provider) - { - try - { - foreach (var file in provider.FileData) - { - FileSystemHelper.DeleteFile(file.LocalFileName); - } - } - catch { } - } - - public static T GetService(this IDependencyScope dependencyScope) - { - return (T)dependencyScope.GetService(typeof(T)); - } - } -} From e7db3c417f83969106b5b828a5dccbc01ca38a24 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Mon, 10 Aug 2020 22:07:22 +0200 Subject: [PATCH 023/695] Updated UAParser package to v3.1.44 --- .../Common/UAParserUserAgent.cs | 7 +- .../SmartStore.Services.csproj | 5 +- .../SmartStore.Services/packages.config | 2 +- .../App_Data/ua-parser.regexes.yaml | 5587 ----------------- .../SmartStore.Web/SmartStore.Web.csproj | 1 - 5 files changed, 8 insertions(+), 5594 deletions(-) delete mode 100644 src/Presentation/SmartStore.Web/App_Data/ua-parser.regexes.yaml diff --git a/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs b/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs index 03f767cc9d..f83db41703 100644 --- a/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs +++ b/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Text.RegularExpressions; using System.Web; using SmartStore.Utilities; @@ -118,8 +119,10 @@ public class UAParserUserAgent : IUserAgent static UAParserUserAgent() { - //s_uap = uap.Parser.GetDefault(); - s_uap = uap.Parser.FromYamlFile(CommonHelper.MapPath("~/App_Data/ua-parser.regexes.yaml")); + var path = CommonHelper.MapPath("~/App_Data/UAParser.regexes.yaml"); + s_uap = File.Exists(path) + ? uap.Parser.FromYaml(path) + : uap.Parser.GetDefault(); } public UAParserUserAgent(HttpContextBase httpContext) diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 503fe52789..a7e54c6e61 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -168,9 +168,8 @@ - - ..\..\packages\UAParser.2.1.0.0\lib\net40-Client\UAParser.dll - True + + ..\..\packages\UAParser.3.1.44\lib\net45\UAParser.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 9218c41be9..0b21ff4a14 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -22,5 +22,5 @@ - + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/App_Data/ua-parser.regexes.yaml b/src/Presentation/SmartStore.Web/App_Data/ua-parser.regexes.yaml deleted file mode 100644 index e7ca02b055..0000000000 --- a/src/Presentation/SmartStore.Web/App_Data/ua-parser.regexes.yaml +++ /dev/null @@ -1,5587 +0,0 @@ -user_agent_parsers: - #### SPECIAL CASES TOP #### - - # ESRI Server products - - regex: '(GeoEvent Server) (\d+)(?:\.(\d+)(?:\.(\d+)|)|)' - - # ESRI ArcGIS Desktop Products - - regex: '(ArcGIS Pro)(?: (\d+)\.(\d+)\.([^ ]+)|)' - - - regex: 'ArcGIS Client Using WinInet' - family_replacement: 'ArcMap' - - - regex: '(OperationsDashboard)-(?:Windows)-(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Operations Dashboard for ArcGIS' - - - regex: '(arcgisearth)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'ArcGIS Earth' - - - regex: 'com.esri.(earth).phone/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'ArcGIS Earth' - - # ESRI ArcGIS Mobile Products - - regex: '(arcgis-explorer)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Explorer for ArcGIS' - - - regex: 'arcgis-(collector|aurora)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Collector for ArcGIS' - - - regex: '(arcgis-workforce)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Workforce for ArcGIS' - - - regex: '(Collector|Explorer|Workforce)-(?:Android|iOS)-(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: '$1 for ArcGIS' - - - regex: '(Explorer|Collector)/(\d+) CFNetwork' - family_replacement: '$1 for ArcGIS' - - # ESRI ArcGIS Runtimes - - regex: 'ArcGISRuntime-(Android|iOS|NET|Qt)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'ArcGIS Runtime SDK for $1' - - - regex: 'ArcGIS\.?(iOS|Android|NET|Qt)(?:-|\.)(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'ArcGIS Runtime SDK for $1' - - - regex: 'ArcGIS\.Runtime\.(Qt)\.(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'ArcGIS Runtime SDK for $1' - - # CFNetwork Podcast catcher Applications - - regex: '^(Luminary)[Stage]+/(\d+) CFNetwork' - - regex: '(ESPN)[%20| ]+Radio/(\d+)\.(\d+)\.(\d+) CFNetwork' - - regex: '(Antenna)/(\d+) CFNetwork' - family_replacement: 'AntennaPod' - - regex: '(TopPodcasts)Pro/(\d+) CFNetwork' - - regex: '(MusicDownloader)Lite/(\d+)\.(\d+)\.(\d+) CFNetwork' - - regex: '^(.*)-iPad\/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)(?:\.(\d+)|) CFNetwork' - - regex: '^(.*)-iPhone/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)(?:\.(\d+)|) CFNetwork' - - regex: '^(.*)/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)(?:\.(\d+)|) CFNetwork' - - # Podcast catchers - - regex: '^(Luminary)/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - - regex: '(espn\.go)' - family_replacement: 'ESPN' - - regex: '(espnradio\.com)' - family_replacement: 'ESPN' - - regex: 'ESPN APP$' - family_replacement: 'ESPN' - - regex: '(audioboom\.com)' - family_replacement: 'AudioBoom' - - regex: ' (Rivo) RHYTHM' - - # @note: iOS / OSX Applications - - regex: '(CFNetwork)(?:/(\d+)\.(\d+)(?:\.(\d+)|)|)' - family_replacement: 'CFNetwork' - - # Pingdom - - regex: '(Pingdom\.com_bot_version_)(\d+)\.(\d+)' - family_replacement: 'PingdomBot' - # 'Mozilla/5.0 (Unknown; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) PingdomTMS/0.8.5 Safari/534.34' - - regex: '(PingdomTMS)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'PingdomBot' - - # PTST / WebPageTest.org crawlers - - regex: ' (PTST)/(\d+)(?:\.(\d+)|)$' - family_replacement: 'WebPageTest.org bot' - - # Datanyze.com spider - - regex: 'X11; (Datanyze); Linux' - - # New Relic Pinger - - regex: '(NewRelicPinger)/(\d+)\.(\d+)' - family_replacement: 'NewRelicPingerBot' - - # Tableau - - regex: '(Tableau)/(\d+)\.(\d+)' - family_replacement: 'Tableau' - - # Adobe CreativeCloud - - regex: 'AppleWebKit/\d+\.\d+.* Safari.* (CreativeCloud)/(\d+)\.(\d+).(\d+)' - family_replacement: 'Adobe CreativeCloud' - - # Salesforce - - regex: '(Salesforce)(?:.)\/(\d+)\.(\d?)' - - #StatusCake - - regex: '(\(StatusCake\))' - family_replacement: 'StatusCakeBot' - - # Facebook - - regex: '(facebookexternalhit)/(\d+)\.(\d+)' - family_replacement: 'FacebookBot' - - # Google Plus - - regex: 'Google.*/\+/web/snippet' - family_replacement: 'GooglePlusBot' - - # Gmail - - regex: 'via ggpht\.com GoogleImageProxy' - family_replacement: 'GmailImageProxy' - - # Yahoo - - regex: 'YahooMailProxy; https://help\.yahoo\.com/kb/yahoo-mail-proxy-SLN28749\.html' - family_replacement: 'YahooMailProxy' - - # Twitter - - regex: '(Twitterbot)/(\d+)\.(\d+)' - family_replacement: 'Twitterbot' - - # Bots Pattern 'name/0.0.0' - - regex: '/((?:Ant-|)Nutch|[A-z]+[Bb]ot|[A-z]+[Ss]pider|Axtaris|fetchurl|Isara|ShopSalad|Tailsweep)[ \-](\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - # Bots Pattern 'name/0.0.0' - - regex: '\b(008|Altresium|Argus|BaiduMobaider|BoardReader|DNSGroup|DataparkSearch|EDI|Goodzer|Grub|INGRID|Infohelfer|LinkedInBot|LOOQ|Nutch|OgScrper|PathDefender|Peew|PostPost|Steeler|Twitterbot|VSE|WebCrunch|WebZIP|Y!J-BR[A-Z]|YahooSeeker|envolk|sproose|wminer)/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - - # MSIECrawler - - regex: '(MSIE) (\d+)\.(\d+)([a-z]\d|[a-z]|);.* MSIECrawler' - family_replacement: 'MSIECrawler' - - # DAVdroid - - regex: '(DAVdroid)/(\d+)\.(\d+)(?:\.(\d+)|)' - - # Downloader ... - - regex: '(Google-HTTP-Java-Client|Apache-HttpClient|Go-http-client|scalaj-http|http%20client|Python-urllib|HttpMonitor|TLSProber|WinHTTP|JNLP|okhttp|aihttp|reqwest|axios|unirest-(?:java|python|ruby|nodejs|php|net))(?:[ /](\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)' - - # Pinterestbot - - regex: '(Pinterest(?:bot|))/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)[;\s(]+\+https://www.pinterest.com/bot.html' - family_replacement: 'Pinterestbot' - - # Bots - - regex: '(CSimpleSpider|Cityreview Robot|CrawlDaddy|CrawlFire|Finderbots|Index crawler|Job Roboter|KiwiStatus Spider|Lijit Crawler|QuerySeekerSpider|ScollSpider|Trends Crawler|USyd-NLP-Spider|SiteCat Webbot|BotName\/\$BotVersion|123metaspider-Bot|1470\.net crawler|50\.nu|8bo Crawler Bot|Aboundex|Accoona-[A-z]{1,30}-Agent|AdsBot-Google(?:-[a-z]{1,30}|)|altavista|AppEngine-Google|archive.{0,30}\.org_bot|archiver|Ask Jeeves|[Bb]ai[Dd]u[Ss]pider(?:-[A-Za-z]{1,30})(?:-[A-Za-z]{1,30}|)|bingbot|BingPreview|blitzbot|BlogBridge|Bloglovin|BoardReader Blog Indexer|BoardReader Favicon Fetcher|boitho.com-dc|BotSeer|BUbiNG|\b\w{0,30}favicon\w{0,30}\b|\bYeti(?:-[a-z]{1,30}|)|Catchpoint(?: bot|)|[Cc]harlotte|Checklinks|clumboot|Comodo HTTP\(S\) Crawler|Comodo-Webinspector-Crawler|ConveraCrawler|CRAWL-E|CrawlConvera|Daumoa(?:-feedfetcher|)|Feed Seeker Bot|Feedbin|findlinks|Flamingo_SearchEngine|FollowSite Bot|furlbot|Genieo|gigabot|GomezAgent|gonzo1|(?:[a-zA-Z]{1,30}-|)Googlebot(?:-[a-zA-Z]{1,30}|)|Google SketchUp|grub-client|gsa-crawler|heritrix|HiddenMarket|holmes|HooWWWer|htdig|ia_archiver|ICC-Crawler|Icarus6j|ichiro(?:/mobile|)|IconSurf|IlTrovatore(?:-Setaccio|)|InfuzApp|Innovazion Crawler|InternetArchive|IP2[a-z]{1,30}Bot|jbot\b|KaloogaBot|Kraken|Kurzor|larbin|LEIA|LesnikBot|Linguee Bot|LinkAider|LinkedInBot|Lite Bot|Llaut|lycos|Mail\.RU_Bot|masscan|masidani_bot|Mediapartners-Google|Microsoft .{0,30} Bot|mogimogi|mozDex|MJ12bot|msnbot(?:-media {0,2}|)|msrbot|Mtps Feed Aggregation System|netresearch|Netvibes|NewsGator[^/]{0,30}|^NING|Nutch[^/]{0,30}|Nymesis|ObjectsSearch|OgScrper|Orbiter|OOZBOT|PagePeeker|PagesInventory|PaxleFramework|Peeplo Screenshot Bot|PlantyNet_WebRobot|Pompos|Qwantify|Read%20Later|Reaper|RedCarpet|Retreiver|Riddler|Rival IQ|scooter|Scrapy|Scrubby|searchsight|seekbot|semanticdiscovery|SemrushBot|Simpy|SimplePie|SEOstats|SimpleRSS|SiteCon|Slackbot-LinkExpanding|Slack-ImgProxy|Slurp|snappy|Speedy Spider|Squrl Java|Stringer|TheUsefulbot|ThumbShotsBot|Thumbshots\.ru|Tiny Tiny RSS|Twitterbot|WhatsApp|URL2PNG|Vagabondo|VoilaBot|^vortex|Votay bot|^voyager|WASALive.Bot|Web-sniffer|WebThumb|WeSEE:[A-z]{1,30}|WhatWeb|WIRE|WordPress|Wotbox|www\.almaden\.ibm\.com|Xenu(?:.s|) Link Sleuth|Xerka [A-z]{1,30}Bot|yacy(?:bot|)|YahooSeeker|Yahoo! Slurp|Yandex\w{1,30}|YodaoBot(?:-[A-z]{1,30}|)|YottaaMonitor|Yowedo|^Zao|^Zao-Crawler|ZeBot_www\.ze\.bz|ZooShot|ZyBorg|ArcGIS Hub Indexer)(?:[ /]v?(\d+)(?:\.(\d+)(?:\.(\d+)|)|)|)' - - # AWS S3 Clients - # must come before "Bots General matcher" to catch "boto"/"boto3" before "bot" - - regex: '\b(Boto3?|JetS3t|aws-(?:cli|sdk-(?:cpp|go|java|nodejs|ruby2?|dotnet-(?:\d{1,2}|core)))|s3fs)/(\d+)\.(\d+)(?:\.(\d+)|)' - - # SAFE FME - - regex: '(FME)\/(\d+\.\d+)\.(\d+)\.(\d+)' - - # QGIS - - regex: '(QGIS)\/(\d)\.?0?(\d{1,2})\.?0?(\d{1,2})' - - # JOSM - - regex: '(JOSM)/(\d+)\.(\d+)' - - # Tygron Platform - - regex: '(Tygron Platform) \((\d+)\.(\d+)\.(\d+(?:\.\d+| RC \d+\.\d+))' - - # Facebook - # Must come before "Bots General matcher" to catch OrangeBotswana - # Facebook Messenger must go before Facebook - - regex: '\[(FBAN/MessengerForiOS|FB_IAB/MESSENGER);FBAV/(\d+)(?:\.(\d+)(?:\.(\d+)|)|)' - family_replacement: 'Facebook Messenger' - # Facebook - - regex: '\[FB.*;(FBAV)/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - family_replacement: 'Facebook' - # Sometimes Facebook does not specify a version (FBAV) - - regex: '\[FB.*;' - family_replacement: 'Facebook' - - # Bots General matcher 'name/0.0' - - regex: '(?:\/[A-Za-z0-9\.]+|) {0,5}([A-Za-z0-9 \-_\!\[\]:]{0,50}(?:[Aa]rchiver|[Ii]ndexer|[Ss]craper|[Bb]ot|[Ss]pider|[Cc]rawl[a-z]{0,50}))[/ ](\d+)(?:\.(\d+)(?:\.(\d+)|)|)' - # Bots containing bot(but not CUBOT) - - regex: '((?:[A-Za-z][A-Za-z0-9 -]{0,50}|)[^C][^Uu][Bb]ot)\b(?:(?:[ /]| v)(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)' - # Bots containing spider|scrape|Crawl - - regex: '((?:[A-z0-9]{1,50}|[A-z\-]{1,50} ?|)(?: the |)(?:[Ss][Pp][Ii][Dd][Ee][Rr]|[Ss]crape|[Cc][Rr][Aa][Ww][Ll])[A-z0-9]{0,50})(?:(?:[ /]| v)(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)' - - # HbbTV standard defines what features the browser should understand. - # but it's like targeting "HTML5 browsers", effective browser support depends on the model - # See os_parsers if you want to target a specific TV - - regex: '(HbbTV)/(\d+)\.(\d+)\.(\d+) \(' - - # must go before Firefox to catch Chimera/SeaMonkey/Camino/Waterfox - - regex: '(Chimera|SeaMonkey|Camino|Waterfox)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*|)' - - # must be before Firefox / Gecko to catch SailfishBrowser properly - - regex: '(SailfishBrowser)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Sailfish Browser' - - # Social Networks (non-Facebook) - # Pinterest - - regex: '\[(Pinterest)/[^\]]+\]' - - regex: '(Pinterest)(?: for Android(?: Tablet|)|)/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - # Instagram app - - regex: 'Mozilla.*Mobile.*(Instagram).(\d+)\.(\d+)\.(\d+)' - # Flipboard app - - regex: 'Mozilla.*Mobile.*(Flipboard).(\d+)\.(\d+)\.(\d+)' - # Flipboard-briefing app - - regex: 'Mozilla.*Mobile.*(Flipboard-Briefing).(\d+)\.(\d+)\.(\d+)' - # Onefootball app - - regex: 'Mozilla.*Mobile.*(Onefootball)\/Android.(\d+)\.(\d+)\.(\d+)' - # Snapchat - - regex: '(Snapchat)\/(\d+)\.(\d+)\.(\d+)\.(\d+)' - # Twitter - - regex: '(Twitter for (?:iPhone|iPad)|TwitterAndroid)(?:\/(\d+)\.(\d+)|)' - family_replacement: 'Twitter' - - # aspiegel.com spider (owned by Huawei) - - regex: 'Mozilla.*Mobile.*AspiegelBot' - family_replacement: 'Spider' - brand_replacement: 'Spider' - model_replacement: 'Smartphone' - - - regex: 'AspiegelBot' - family_replacement: 'Spider' - brand_replacement: 'Spider' - model_replacement: 'Desktop' - - # Basilisk - - regex: '(Firefox)/(\d+)\.(\d+) Basilisk/(\d+)' - family_replacement: 'Basilisk' - - # Pale Moon - - regex: '(PaleMoon)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Pale Moon' - - # Firefox - - regex: '(Fennec)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*)' - family_replacement: 'Firefox Mobile' - - regex: '(Fennec)/(\d+)\.(\d+)(pre)' - family_replacement: 'Firefox Mobile' - - regex: '(Fennec)/(\d+)\.(\d+)' - family_replacement: 'Firefox Mobile' - - regex: '(?:Mobile|Tablet);.*(Firefox)/(\d+)\.(\d+)' - family_replacement: 'Firefox Mobile' - - regex: '(Namoroka|Shiretoko|Minefield)/(\d+)\.(\d+)\.(\d+(?:pre|))' - family_replacement: 'Firefox ($1)' - - regex: '(Firefox)/(\d+)\.(\d+)(a\d+[a-z]*)' - family_replacement: 'Firefox Alpha' - - regex: '(Firefox)/(\d+)\.(\d+)(b\d+[a-z]*)' - family_replacement: 'Firefox Beta' - - regex: '(Firefox)-(?:\d+\.\d+|)/(\d+)\.(\d+)(a\d+[a-z]*)' - family_replacement: 'Firefox Alpha' - - regex: '(Firefox)-(?:\d+\.\d+|)/(\d+)\.(\d+)(b\d+[a-z]*)' - family_replacement: 'Firefox Beta' - - regex: '(Namoroka|Shiretoko|Minefield)/(\d+)\.(\d+)([ab]\d+[a-z]*|)' - family_replacement: 'Firefox ($1)' - - regex: '(Firefox).*Tablet browser (\d+)\.(\d+)\.(\d+)' - family_replacement: 'MicroB' - - regex: '(MozillaDeveloperPreview)/(\d+)\.(\d+)([ab]\d+[a-z]*|)' - - regex: '(FxiOS)/(\d+)\.(\d+)(\.(\d+)|)(\.(\d+)|)' - family_replacement: 'Firefox iOS' - - # e.g.: Flock/2.0b2 - - regex: '(Flock)/(\d+)\.(\d+)(b\d+?)' - - # RockMelt - - regex: '(RockMelt)/(\d+)\.(\d+)\.(\d+)' - - # e.g.: Fennec/0.9pre - - regex: '(Navigator)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Netscape' - - - regex: '(Navigator)/(\d+)\.(\d+)([ab]\d+)' - family_replacement: 'Netscape' - - - regex: '(Netscape6)/(\d+)\.(\d+)\.?([ab]?\d+|)' - family_replacement: 'Netscape' - - - regex: '(MyIBrow)/(\d+)\.(\d+)' - family_replacement: 'My Internet Browser' - - # UC Browser - # we need check it before opera. In other case case UC Browser detected look like Opera Mini - - regex: '(UC? ?Browser|UCWEB|U3)[ /]?(\d+)\.(\d+)\.(\d+)' - family_replacement: 'UC Browser' - - # Opera will stop at 9.80 and hide the real version in the Version string. - # see: http://dev.opera.com/articles/view/opera-ua-string-changes/ - - regex: '(Opera Tablet).*Version/(\d+)\.(\d+)(?:\.(\d+)|)' - - regex: '(Opera Mini)(?:/att|)/?(\d+|)(?:\.(\d+)|)(?:\.(\d+)|)' - - regex: '(Opera)/.+Opera Mobi.+Version/(\d+)\.(\d+)' - family_replacement: 'Opera Mobile' - - regex: '(Opera)/(\d+)\.(\d+).+Opera Mobi' - family_replacement: 'Opera Mobile' - - regex: 'Opera Mobi.+(Opera)(?:/|\s+)(\d+)\.(\d+)' - family_replacement: 'Opera Mobile' - - regex: 'Opera Mobi' - family_replacement: 'Opera Mobile' - - regex: '(Opera)/9.80.*Version/(\d+)\.(\d+)(?:\.(\d+)|)' - - # Opera 14 for Android uses a WebKit render engine. - - regex: '(?:Mobile Safari).*(OPR)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Opera Mobile' - - # Opera >=15 for Desktop is similar to Chrome but includes an "OPR" Version string. - - regex: '(?:Chrome).*(OPR)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Opera' - - # Opera Coast - - regex: '(Coast)/(\d+).(\d+).(\d+)' - family_replacement: 'Opera Coast' - - # Opera Mini for iOS (from version 8.0.0) - - regex: '(OPiOS)/(\d+).(\d+).(\d+)' - family_replacement: 'Opera Mini' - - # Opera Neon - - regex: 'Chrome/.+( MMS)/(\d+).(\d+).(\d+)' - family_replacement: 'Opera Neon' - - # Palm WebOS looks a lot like Safari. - - regex: '(hpw|web)OS/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'webOS Browser' - - # LuaKit has no version info. - # http://luakit.org/projects/luakit/ - - regex: '(luakit)' - family_replacement: 'LuaKit' - - # Snowshoe - - regex: '(Snowshoe)/(\d+)\.(\d+).(\d+)' - - # Lightning (for Thunderbird) - # http://www.mozilla.org/projects/calendar/lightning/ - - regex: 'Gecko/\d+ (Lightning)/(\d+)\.(\d+)\.?((?:[ab]?\d+[a-z]*)|(?:\d*))' - - # Swiftfox - - regex: '(Firefox)/(\d+)\.(\d+)\.(\d+(?:pre|)) \(Swiftfox\)' - family_replacement: 'Swiftfox' - - regex: '(Firefox)/(\d+)\.(\d+)([ab]\d+[a-z]*|) \(Swiftfox\)' - family_replacement: 'Swiftfox' - - # Rekonq - - regex: '(rekonq)/(\d+)\.(\d+)(?:\.(\d+)|) Safari' - family_replacement: 'Rekonq' - - regex: 'rekonq' - family_replacement: 'Rekonq' - - # Conkeror lowercase/uppercase - # http://conkeror.org/ - - regex: '(conkeror|Conkeror)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Conkeror' - - # catches lower case konqueror - - regex: '(konqueror)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Konqueror' - - - regex: '(WeTab)-Browser' - - - regex: '(Comodo_Dragon)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Comodo Dragon' - - - regex: '(Symphony) (\d+).(\d+)' - - - regex: 'PLAYSTATION 3.+WebKit' - family_replacement: 'NetFront NX' - - regex: 'PLAYSTATION 3' - family_replacement: 'NetFront' - - regex: '(PlayStation Portable)' - family_replacement: 'NetFront' - - regex: '(PlayStation Vita)' - family_replacement: 'NetFront NX' - - - regex: 'AppleWebKit.+ (NX)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'NetFront NX' - - regex: '(Nintendo 3DS)' - family_replacement: 'NetFront NX' - - # Amazon Silk, should go before Safari and Chrome Mobile - - regex: '(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+)|)' - family_replacement: 'Amazon Silk' - - # @ref: http://www.puffinbrowser.com - - regex: '(Puffin)/(\d+)\.(\d+)(?:\.(\d+)|)' - - # Edge Mobile - - regex: 'Windows Phone .*(Edge)/(\d+)\.(\d+)' - family_replacement: 'Edge Mobile' - - regex: '(EdgiOS|EdgA)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Edge Mobile' - - # Samsung Internet (based on Chrome, but lacking some features) - - regex: '(SamsungBrowser)/(\d+)\.(\d+)' - family_replacement: 'Samsung Internet' - - # Seznam.cz browser (based on WebKit) - - regex: '(SznProhlizec)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Seznam prohlížeč' - - # Coc Coc browser, based on Chrome (used in Vietnam) - - regex: '(coc_coc_browser)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Coc Coc' - - # Baidu Browsers (desktop spoofs chrome & IE, explorer is mobile) - - regex: '(baidubrowser)[/\s](\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - family_replacement: 'Baidu Browser' - - regex: '(FlyFlow)/(\d+)\.(\d+)' - family_replacement: 'Baidu Explorer' - - # MxBrowser is Maxthon. Must go before Mobile Chrome for Android - - regex: '(MxBrowser)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Maxthon' - - # Crosswalk must go before Mobile Chrome for Android - - regex: '(Crosswalk)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - - # LINE https://line.me/en/ - # Must go before Mobile Chrome for Android - - regex: '(Line)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'LINE' - - # MiuiBrowser should got before Mobile Chrome for Android - - regex: '(MiuiBrowser)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'MiuiBrowser' - - # Mint Browser should got before Mobile Chrome for Android - - regex: '(Mint Browser)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Mint Browser' - - # TopBuzz Android must go before Chrome Mobile WebView - - regex: '(TopBuzz)/(\d+).(\d+).(\d+)' - family_replacement: 'TopBuzz' - - # Google Search App on Android, eg: - - regex: 'Mozilla.+Android.+(GSA)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Google' - - # QQ Browsers - - regex: '(MQQBrowser/Mini)(?:(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)' - family_replacement: 'QQ Browser Mini' - - regex: '(MQQBrowser)(?:/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)' - family_replacement: 'QQ Browser Mobile' - - regex: '(QQBrowser)(?:/(\d+)(?:\.(\d+)\.(\d+)(?:\.(\d+)|)|)|)' - family_replacement: 'QQ Browser' - - # Chrome Mobile - - regex: 'Version/.+(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Chrome Mobile WebView' - - regex: '; wv\).+(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Chrome Mobile WebView' - - regex: '(CrMo)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Chrome Mobile' - - regex: '(CriOS)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Chrome Mobile iOS' - - regex: '(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+) Mobile(?:[ /]|$)' - family_replacement: 'Chrome Mobile' - - regex: ' Mobile .*(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Chrome Mobile' - - # Chrome Frame must come before MSIE. - - regex: '(chromeframe)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Chrome Frame' - - # Tizen Browser (second case included in browser/major.minor regex) - - regex: '(SLP Browser)/(\d+)\.(\d+)' - family_replacement: 'Tizen Browser' - - # Sogou Explorer 2.X - - regex: '(SE 2\.X) MetaSr (\d+)\.(\d+)' - family_replacement: 'Sogou Explorer' - - # Rackspace Monitoring - - regex: '(Rackspace Monitoring)/(\d+)\.(\d+)' - family_replacement: 'RackspaceBot' - - # PRTG Network Monitoring - - regex: '(PRTG Network Monitor)' - - # PyAMF - - regex: '(PyAMF)/(\d+)\.(\d+)\.(\d+)' - - # Yandex Browser - - regex: '(YaBrowser)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Yandex Browser' - - # Mail.ru Amigo/Internet Browser (Chromium-based) - - regex: '(Chrome)/(\d+)\.(\d+)\.(\d+).* MRCHROME' - family_replacement: 'Mail.ru Chromium Browser' - - # AOL Browser (IE-based) - - regex: '(AOL) (\d+)\.(\d+); AOLBuild (\d+)' - - # Podcast catcher Applications using iTunes - - regex: '(PodCruncher|Downcast)[ /]?(\d+)(?:\.(\d+)|)(?:\.(\d+)|)(?:\.(\d+)|)' - - # Box Notes https://www.box.com/resources/downloads - # Must be before Electron - - regex: ' (BoxNotes)/(\d+)\.(\d+)\.(\d+)' - - # Whale - - regex: '(Whale)/(\d+)\.(\d+)\.(\d+)\.(\d+) Mobile(?:[ /]|$)' - family_replacement: 'Whale' - - - regex: '(Whale)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Whale' - - # 1Password - - regex: '(1Password)/(\d+)\.(\d+)\.(\d+)' - - # Ghost - # @ref: http://www.ghost.org - - regex: '(Ghost)/(\d+)\.(\d+)\.(\d+)' - - #### END SPECIAL CASES TOP #### - - #### MAIN CASES - this catches > 50% of all browsers #### - - - # Slack desktop client (needs to be before Apple Mail, Electron, and Chrome as it gets wrongly detected on Mac OS otherwise) - - regex: '(Slack_SSB)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Slack Desktop Client' - - # HipChat provides a version on Mac, but not on Windows. - # Needs to be before Chrome on Windows, and AppleMail on Mac. - - regex: '(HipChat)/?(\d+|)' - family_replacement: 'HipChat Desktop Client' - - # Browser/major_version.minor_version.beta_version - - regex: '\b(MobileIron|FireWeb|Jasmine|ANTGalio|Midori|Fresco|Lobo|PaleMoon|Maxthon|Lynx|OmniWeb|Dillo|Camino|Demeter|Fluid|Fennec|Epiphany|Shiira|Sunrise|Spotify|Flock|Netscape|Lunascape|WebPilot|NetFront|Netfront|Konqueror|SeaMonkey|Kazehakase|Vienna|Iceape|Iceweasel|IceWeasel|Iron|K-Meleon|Sleipnir|Galeon|GranParadiso|Opera Mini|iCab|NetNewsWire|ThunderBrowse|Iris|UP\.Browser|Bunjalloo|Google Earth|Raven for Mac|Openwave|MacOutlook|Electron|OktaMobile)/(\d+)\.(\d+)\.(\d+)' - - # Outlook 2007 - - regex: 'Microsoft Office Outlook 12\.\d+\.\d+|MSOffice 12' - family_replacement: 'Outlook' - v1_replacement: '2007' - - # Outlook 2010 - - regex: 'Microsoft Outlook 14\.\d+\.\d+|MSOffice 14' - family_replacement: 'Outlook' - v1_replacement: '2010' - - # Outlook 2013 - - regex: 'Microsoft Outlook 15\.\d+\.\d+' - family_replacement: 'Outlook' - v1_replacement: '2013' - - # Outlook 2016 - - regex: 'Microsoft Outlook (?:Mail )?16\.\d+\.\d+|MSOffice 16' - family_replacement: 'Outlook' - v1_replacement: '2016' - - # Word 2014 - - regex: 'Microsoft Office (Word) 2014' - - # Windows Live Mail - - regex: 'Outlook-Express\/7\.0.*' - family_replacement: 'Windows Live Mail' - - # Apple Air Mail - - regex: '(Airmail) (\d+)\.(\d+)(?:\.(\d+)|)' - - # Thunderbird - - regex: '(Thunderbird)/(\d+)\.(\d+)(?:\.(\d+(?:pre|))|)' - family_replacement: 'Thunderbird' - - # Postbox - - regex: '(Postbox)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Postbox' - - # Barca - - regex: '(Barca(?:Pro)?)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Barca' - - # Lotus Notes - - regex: '(Lotus-Notes)/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Lotus Notes' - - # Superhuman Mail Client - # @ref: https://www.superhuman.com - - regex: 'Superhuman' - family_replacement: 'Superhuman' - - # Vivaldi uses "Vivaldi" - - regex: '(Vivaldi)/(\d+)\.(\d+)\.(\d+)' - - # Edge/major_version.minor_version - # Edge with chromium Edg/major_version.minor_version.patch.minor_patch - - regex: '(Edge?)/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)(?:\.(\d+)|)' - family_replacement: 'Edge' - - # Brave Browser https://brave.com/ - - regex: '(brave)/(\d+)\.(\d+)\.(\d+) Chrome' - family_replacement: 'Brave' - - # Iron Browser ~since version 50 - - regex: '(Chrome)/(\d+)\.(\d+)\.(\d+)[\d.]* Iron[^/]' - family_replacement: 'Iron' - - # Dolphin Browser - # @ref: http://www.dolphin.com - - regex: '\b(Dolphin)(?: |HDCN/|/INT\-)(\d+)\.(\d+)(?:\.(\d+)|)' - - # Headless Chrome - # https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md - - regex: '(HeadlessChrome)(?:/(\d+)\.(\d+)\.(\d+)|)' - - # Evolution Mail CardDav/CalDav integration - - regex: '(Evolution)/(\d+)\.(\d+)\.(\d+\.\d+)' - - # Roundcube Mail CardDav plugin - - regex: '(RCM CardDAV plugin)/(\d+)\.(\d+)\.(\d+(?:-dev|))' - - # Browser/major_version.minor_version - - regex: '(bingbot|Bolt|AdobeAIR|Jasmine|IceCat|Skyfire|Midori|Maxthon|Lynx|Arora|IBrowse|Dillo|Camino|Shiira|Fennec|Phoenix|Flock|Netscape|Lunascape|Epiphany|WebPilot|Opera Mini|Opera|NetFront|Netfront|Konqueror|Googlebot|SeaMonkey|Kazehakase|Vienna|Iceape|Iceweasel|IceWeasel|Iron|K-Meleon|Sleipnir|Galeon|GranParadiso|iCab|iTunes|MacAppStore|NetNewsWire|Space Bison|Stainless|Orca|Dolfin|BOLT|Minimo|Tizen Browser|Polaris|Abrowser|Planetweb|ICE Browser|mDolphin|qutebrowser|Otter|QupZilla|MailBar|kmail2|YahooMobileMail|ExchangeWebServices|ExchangeServicesClient|Dragon|Outlook-iOS-Android)/(\d+)\.(\d+)(?:\.(\d+)|)' - - # Chrome/Chromium/major_version.minor_version - - regex: '(Chromium|Chrome)/(\d+)\.(\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - - ########## - # IE Mobile needs to happen before Android to catch cases such as: - # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920)... - # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; ANZ821)... - # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; Orange)... - # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; Vodafone)... - ########## - - # IE Mobile - - regex: '(IEMobile)[ /](\d+)\.(\d+)' - family_replacement: 'IE Mobile' - - # Baca Berita App News Reader - - regex: '(BacaBerita App)\/(\d+)\.(\d+)\.(\d+)' - - # Podcast catchers - - regex: '^(bPod|Pocket Casts|Player FM)$' - - regex: '^(AlexaMediaPlayer|VLC)/(\d+)\.(\d+)\.([^.\s]+)' - - regex: '^(AntennaPod|WMPlayer|Zune|Podkicker|Radio|ExoPlayerDemo|Overcast|PocketTunes|NSPlayer|okhttp|DoggCatcher|QuickNews|QuickTime|Peapod|Podcasts|GoldenPod|VLC|Spotify|Miro|MediaGo|Juice|iPodder|gPodder|Banshee)/(\d+)\.(\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - - regex: '^(Peapod|Liferea)/([^.\s]+)\.([^.\s]+|)\.?([^.\s]+|)' - - regex: '^(bPod|Player FM) BMID/(\S+)' - - regex: '^(Podcast ?Addict)/v(\d+) ' - - regex: '^(Podcast ?Addict) ' - family_replacement: 'PodcastAddict' - - regex: '(Replay) AV' - - regex: '(VOX) Music Player' - - regex: '(CITA) RSS Aggregator/(\d+)\.(\d+)' - - regex: '(Pocket Casts)$' - - regex: '(Player FM)$' - - regex: '(LG Player|Doppler|FancyMusic|MediaMonkey|Clementine) (\d+)\.(\d+)\.?([^.\s]+|)\.?([^.\s]+|)' - - regex: '(philpodder)/(\d+)\.(\d+)\.?([^.\s]+|)\.?([^.\s]+|)' - - regex: '(Player FM|Pocket Casts|DoggCatcher|Spotify|MediaMonkey|MediaGo|BashPodder)' - - regex: '(QuickTime)\.(\d+)\.(\d+)\.(\d+)' - - regex: '(Kinoma)(\d+)' - - regex: '(Fancy) Cloud Music (\d+)\.(\d+)' - family_replacement: 'FancyMusic' - - regex: 'EspnDownloadManager' - family_replacement: 'ESPN' - - regex: '(ESPN) Radio (\d+)\.(\d+)(?:\.(\d+)|) ?(?:rv:(\d+)|) ' - - regex: '(podracer|jPodder) v ?(\d+)\.(\d+)(?:\.(\d+)|)' - - regex: '(ZDM)/(\d+)\.(\d+)[; ]?' - - regex: '(Zune|BeyondPod) (\d+)(?:\.(\d+)|)[\);]' - - regex: '(WMPlayer)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - - regex: '^(Lavf)' - family_replacement: 'WMPlayer' - - regex: '^(RSSRadio)[ /]?(\d+|)' - - regex: '(RSS_Radio) (\d+)\.(\d+)' - family_replacement: 'RSSRadio' - - regex: '(Podkicker) \S+/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Podkicker' - - regex: '^(HTC) Streaming Player \S+ / \S+ / \S+ / (\d+)\.(\d+)(?:\.(\d+)|)' - - regex: '^(Stitcher)/iOS' - - regex: '^(Stitcher)/Android' - - regex: '^(VLC) .*version (\d+)\.(\d+)\.(\d+)' - - regex: ' (VLC) for' - - regex: '(vlc)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'VLC' - - regex: '^(foobar)\S+/([^.\s]+)\.([^.\s]+|)\.?([^.\s]+|)' - - regex: '^(Clementine)\S+ ([^.\s]+)\.([^.\s]+|)\.?([^.\s]+|)' - - regex: '(amarok)/([^.\s]+)\.([^.\s]+|)\.?([^.\s]+|)' - family_replacement: 'Amarok' - - regex: '(Custom)-Feed Reader' - - # Browser major_version.minor_version.beta_version (space instead of slash) - - regex: '(iRider|Crazy Browser|SkipStone|iCab|Lunascape|Sleipnir|Maemo Browser) (\d+)\.(\d+)\.(\d+)' - # Browser major_version.minor_version (space instead of slash) - - regex: '(iCab|Lunascape|Opera|Android|Jasmine|Polaris|Microsoft SkyDriveSync|The Bat!) (\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - - # Kindle WebKit - - regex: '(Kindle)/(\d+)\.(\d+)' - - # weird android UAs - - regex: '(Android) Donut' - v1_replacement: '1' - v2_replacement: '2' - - - regex: '(Android) Eclair' - v1_replacement: '2' - v2_replacement: '1' - - - regex: '(Android) Froyo' - v1_replacement: '2' - v2_replacement: '2' - - - regex: '(Android) Gingerbread' - v1_replacement: '2' - v2_replacement: '3' - - - regex: '(Android) Honeycomb' - v1_replacement: '3' - - # desktop mode - # http://www.anandtech.com/show/3982/windows-phone-7-review - - regex: '(MSIE) (\d+)\.(\d+).*XBLWP7' - family_replacement: 'IE Large Screen' - - # Nextcloud desktop sync client - - regex: '(Nextcloud)' - - # Generic mirall client - - regex: '(mirall)/(\d+)\.(\d+)\.(\d+)' - - # Nextcloud/Owncloud android client - - regex: '(ownCloud-android)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Owncloud' - - # Skype for Business - - regex: '(OC)/(\d+)\.(\d+)\.(\d+)\.(\d+) \(Skype for Business\)' - family_replacement: 'Skype' - - #### END MAIN CASES #### - - #### SPECIAL CASES #### - - regex: '(Obigo)InternetBrowser' - - regex: '(Obigo)\-Browser' - - regex: '(Obigo|OBIGO)[^\d]*(\d+)(?:.(\d+)|)' - family_replacement: 'Obigo' - - - regex: '(MAXTHON|Maxthon) (\d+)\.(\d+)' - family_replacement: 'Maxthon' - - regex: '(Maxthon|MyIE2|Uzbl|Shiira)' - v1_replacement: '0' - - - regex: '(BrowseX) \((\d+)\.(\d+)\.(\d+)' - - - regex: '(NCSA_Mosaic)/(\d+)\.(\d+)' - family_replacement: 'NCSA Mosaic' - - # Polaris/d.d is above - - regex: '(POLARIS)/(\d+)\.(\d+)' - family_replacement: 'Polaris' - - regex: '(Embider)/(\d+)\.(\d+)' - family_replacement: 'Polaris' - - - regex: '(BonEcho)/(\d+)\.(\d+)\.?([ab]?\d+|)' - family_replacement: 'Bon Echo' - - # topbuzz on IOS - - regex: '(TopBuzz) com.alex.NewsMaster/(\d+).(\d+).(\d+)' - family_replacement: 'TopBuzz' - - regex: '(TopBuzz) com.mobilesrepublic.newsrepublic/(\d+).(\d+).(\d+)' - family_replacement: 'TopBuzz' - - regex: '(TopBuzz) com.topbuzz.videoen/(\d+).(\d+).(\d+)' - family_replacement: 'TopBuzz' - - # @note: iOS / OSX Applications - - regex: '(iPod|iPhone|iPad).+GSA/(\d+)\.(\d+)\.(\d+)(?:\.(\d+)|) Mobile' - family_replacement: 'Google' - - regex: '(iPod|iPhone|iPad).+Version/(\d+)\.(\d+)(?:\.(\d+)|).*[ +]Safari' - family_replacement: 'Mobile Safari' - - regex: '(iPod|iPod touch|iPhone|iPad);.*CPU.*OS[ +](\d+)_(\d+)(?:_(\d+)|).* AppleNews\/\d+\.\d+\.\d+?' - family_replacement: 'Mobile Safari UI/WKWebView' - - regex: '(iPod|iPhone|iPad).+Version/(\d+)\.(\d+)(?:\.(\d+)|)' - family_replacement: 'Mobile Safari UI/WKWebView' - - regex: '(iPod|iPod touch|iPhone|iPad).* Safari' - family_replacement: 'Mobile Safari' - - regex: '(iPod|iPod touch|iPhone|iPad)' - family_replacement: 'Mobile Safari UI/WKWebView' - - regex: '(Watch)(\d+),(\d+)' - family_replacement: 'Apple $1 App' - - ########################## - # Outlook on iOS >= 2.62.0 - ########################## - - regex: '(Outlook-iOS)/\d+\.\d+\.prod\.iphone \((\d+)\.(\d+)\.(\d+)\)' - - - regex: '(AvantGo) (\d+).(\d+)' - - - regex: '(OneBrowser)/(\d+).(\d+)' - family_replacement: 'ONE Browser' - - - regex: '(Avant)' - v1_replacement: '1' - - # This is the Tesla Model S (see similar entry in device parsers) - - regex: '(QtCarBrowser)' - v1_replacement: '1' - - - regex: '^(iBrowser/Mini)(\d+).(\d+)' - family_replacement: 'iBrowser Mini' - - regex: '^(iBrowser|iRAPP)/(\d+).(\d+)' - - # nokia browsers - # based on: http://www.developer.nokia.com/Community/Wiki/User-Agent_headers_for_Nokia_devices - - regex: '^(Nokia)' - family_replacement: 'Nokia Services (WAP) Browser' - - regex: '(NokiaBrowser)/(\d+)\.(\d+).(\d+)\.(\d+)' - family_replacement: 'Nokia Browser' - - regex: '(NokiaBrowser)/(\d+)\.(\d+).(\d+)' - family_replacement: 'Nokia Browser' - - regex: '(NokiaBrowser)/(\d+)\.(\d+)' - family_replacement: 'Nokia Browser' - - regex: '(BrowserNG)/(\d+)\.(\d+).(\d+)' - family_replacement: 'Nokia Browser' - - regex: '(Series60)/5\.0' - family_replacement: 'Nokia Browser' - v1_replacement: '7' - v2_replacement: '0' - - regex: '(Series60)/(\d+)\.(\d+)' - family_replacement: 'Nokia OSS Browser' - - regex: '(S40OviBrowser)/(\d+)\.(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Ovi Browser' - - regex: '(Nokia)[EN]?(\d+)' - - # BlackBerry devices - - regex: '(PlayBook).+RIM Tablet OS (\d+)\.(\d+)\.(\d+)' - family_replacement: 'BlackBerry WebKit' - - regex: '(Black[bB]erry|BB10).+Version/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'BlackBerry WebKit' - - regex: '(Black[bB]erry)\s?(\d+)' - family_replacement: 'BlackBerry' - - - regex: '(OmniWeb)/v(\d+)\.(\d+)' - - - regex: '(Blazer)/(\d+)\.(\d+)' - family_replacement: 'Palm Blazer' - - - regex: '(Pre)/(\d+)\.(\d+)' - family_replacement: 'Palm Pre' - - # fork of Links - - regex: '(ELinks)/(\d+)\.(\d+)' - - regex: '(ELinks) \((\d+)\.(\d+)' - - regex: '(Links) \((\d+)\.(\d+)' - - - regex: '(QtWeb) Internet Browser/(\d+)\.(\d+)' - - #- regex: '\(iPad;.+(Version)/(\d+)\.(\d+)(?:\.(\d+)|).*Safari/' - # family_replacement: 'iPad' - - # Phantomjs, should go before Safari - - regex: '(PhantomJS)/(\d+)\.(\d+)\.(\d+)' - - # WebKit Nightly - - regex: '(AppleWebKit)/(\d+)(?:\.(\d+)|)\+ .* Safari' - family_replacement: 'WebKit Nightly' - - # Safari - - regex: '(Version)/(\d+)\.(\d+)(?:\.(\d+)|).*Safari/' - family_replacement: 'Safari' - # Safari didn't provide "Version/d.d.d" prior to 3.0 - - regex: '(Safari)/\d+' - - - regex: '(OLPC)/Update(\d+)\.(\d+)' - - - regex: '(OLPC)/Update()\.(\d+)' - v1_replacement: '0' - - - regex: '(SEMC\-Browser)/(\d+)\.(\d+)' - - - regex: '(Teleca)' - family_replacement: 'Teleca Browser' - - - regex: '(Phantom)/V(\d+)\.(\d+)' - family_replacement: 'Phantom Browser' - - - regex: '(Trident)/(7|8)\.(0)' - family_replacement: 'IE' - v1_replacement: '11' - - - regex: '(Trident)/(6)\.(0)' - family_replacement: 'IE' - v1_replacement: '10' - - - regex: '(Trident)/(5)\.(0)' - family_replacement: 'IE' - v1_replacement: '9' - - - regex: '(Trident)/(4)\.(0)' - family_replacement: 'IE' - v1_replacement: '8' - - # Espial - - regex: '(Espial)/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - - # Apple Mail - - # apple mail - not directly detectable, have it after Safari stuff - - regex: '(AppleWebKit)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Apple Mail' - - # AFTER THE EDGE CASES ABOVE! - # AFTER IE11 - # BEFORE all other IE - - regex: '(Firefox)/(\d+)\.(\d+)\.(\d+)' - - regex: '(Firefox)/(\d+)\.(\d+)(pre|[ab]\d+[a-z]*|)' - - - regex: '([MS]?IE) (\d+)\.(\d+)' - family_replacement: 'IE' - - - regex: '(python-requests)/(\d+)\.(\d+)' - family_replacement: 'Python Requests' - - # headless user-agents - - regex: '\b(Windows-Update-Agent|WindowsPowerShell|Microsoft-CryptoAPI|SophosUpdateManager|SophosAgent|Debian APT-HTTP|Ubuntu APT-HTTP|libcurl-agent|libwww-perl|urlgrabber|curl|PycURL|Wget|wget2|aria2|Axel|OpenBSD ftp|lftp|jupdate|insomnia|fetch libfetch|akka-http|got)(?:[ /](\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)' - - # Asynchronous HTTP Client/Server for asyncio and Python (https://aiohttp.readthedocs.io/) - - regex: '(Python/3\.\d{1,3} aiohttp)/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Python aiohttp' - - - regex: '(Java)[/ ]?\d+\.(\d+)\.(\d+)[_-]*([a-zA-Z0-9]+|)' - - # Cloud Storage Clients - - regex: '^(Cyberduck)/(\d+)\.(\d+)\.(\d+)(?:\.\d+|)' - - regex: '^(S3 Browser) (\d+)-(\d+)-(\d+)(?:\s*http://s3browser\.com|)' - - regex: '(S3Gof3r)' - # IBM COS (Cloud Object Storage) API - - regex: '\b(ibm-cos-sdk-(?:core|java|js|python))/(\d+)\.(\d+)(?:\.(\d+)|)' - # rusoto - Rusoto - AWS SDK for Rust - https://github.com/rusoto/rusoto - - regex: '^(rusoto)/(\d+)\.(\d+)\.(\d+)' - # rclone - rsync for cloud storage - https://rclone.org/ - - regex: '^(rclone)/v(\d+)\.(\d+)' - - # Roku Digital-Video-Players https://www.roku.com/ - - regex: '^(Roku)/DVP-(\d+)\.(\d+)' - - # Kurio App News Reader https://kurio.co.id/ - - regex: '(Kurio)\/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'Kurio App' - - # Box Drive and Box Sync https://www.box.com/resources/downloads - - regex: '^(Box(?: Sync)?)/(\d+)\.(\d+)\.(\d+)' - - # ViaFree streaming app https://www.viafree.{dk|se|no} - - regex: '^(ViaFree|Viafree)-(?:tvOS-)?[A-Z]{2}/(\d+)\.(\d+)\.(\d+)' - family_replacement: 'ViaFree' - -os_parsers: - ########## - # HbbTV vendors - ########## - - # starts with the easy one : Panasonic seems consistent across years, hope it will continue - #HbbTV/1.1.1 (;Panasonic;VIERA 2011;f.532;0071-0802 2000-0000;) - #HbbTV/1.1.1 (;Panasonic;VIERA 2012;1.261;0071-3103 2000-0000;) - #HbbTV/1.2.1 (;Panasonic;VIERA 2013;3.672;4101-0003 0002-0000;) - #- regex: 'HbbTV/\d+\.\d+\.\d+ \(;(Panasonic);VIERA ([0-9]{4});' - - # Sony is consistent too but do not place year like the other - # Opera/9.80 (Linux armv7l; HbbTV/1.1.1 (; Sony; KDL32W650A; PKG3.211EUA; 2013;); ) Presto/2.12.362 Version/12.11 - # Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Sony; KDL40HX751; PKG1.902EUA; 2012;);; en) Presto/2.10.250 Version/11.60 - # Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Sony; KDL22EX320; PKG4.017EUA; 2011;);; en) Presto/2.7.61 Version/11.00 - #- regex: 'HbbTV/\d+\.\d+\.\d+ \(; (Sony);.*;.*; ([0-9]{4});\)' - - - # LG is consistent too, but we need to add manually the year model - #Mozilla/5.0 (Unknown; Linux armv7l) AppleWebKit/537.1+ (KHTML, like Gecko) Safari/537.1+ HbbTV/1.1.1 ( ;LGE ;NetCast 4.0 ;03.20.30 ;1.0M ;) - #Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ HbbTV/1.1.1 ( ;LGE ;NetCast 3.0 ;1.0 ;1.0M ;) - - regex: 'HbbTV/\d+\.\d+\.\d+ \( ;(LG)E ;NetCast 4.0' - os_v1_replacement: '2013' - - regex: 'HbbTV/\d+\.\d+\.\d+ \( ;(LG)E ;NetCast 3.0' - os_v1_replacement: '2012' - - # Samsung is on its way of normalizing their user-agent - # HbbTV/1.1.1 (;Samsung;SmartTV2013;T-FXPDEUC-1102.2;;) WebKit - # HbbTV/1.1.1 (;Samsung;SmartTV2013;T-MST12DEUC-1102.1;;) WebKit - # HbbTV/1.1.1 (;Samsung;SmartTV2012;;;) WebKit - # HbbTV/1.1.1 (;;;;;) Maple_2011 - - regex: 'HbbTV/1.1.1 \(;;;;;\) Maple_2011' - os_replacement: 'Samsung' - os_v1_replacement: '2011' - # manage the two models of 2013 - - regex: 'HbbTV/\d+\.\d+\.\d+ \(;(Samsung);SmartTV([0-9]{4});.*FXPDEUC' - os_v2_replacement: 'UE40F7000' - - regex: 'HbbTV/\d+\.\d+\.\d+ \(;(Samsung);SmartTV([0-9]{4});.*MST12DEUC' - os_v2_replacement: 'UE32F4500' - # generic Samsung (works starting in 2012) - #- regex: 'HbbTV/\d+\.\d+\.\d+ \(;(Samsung);SmartTV([0-9]{4});' - - # Philips : not found any other way than a manual mapping - # Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/4.1.3 PHILIPSTV/1.1.1; en) Presto/2.10.250 Version/11.60 - # Opera/9.80 (Linux mips ; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.2.1; en) Presto/2.6.33 Version/10.70 - - regex: 'HbbTV/1\.1\.1 \(; (Philips);.*NETTV/4' - os_v1_replacement: '2013' - - regex: 'HbbTV/1\.1\.1 \(; (Philips);.*NETTV/3' - os_v1_replacement: '2012' - - regex: 'HbbTV/1\.1\.1 \(; (Philips);.*NETTV/2' - os_v1_replacement: '2011' - - # the HbbTV emulator developers use HbbTV/1.1.1 (;;;;;) firetv-firefox-plugin 1.1.20 - - regex: 'HbbTV/\d+\.\d+\.\d+.*(firetv)-firefox-plugin (\d+).(\d+).(\d+)' - os_replacement: 'FireHbbTV' - - # generic HbbTV, hoping to catch manufacturer name (always after 2nd comma) and the first string that looks like a 2011-2019 year - - regex: 'HbbTV/\d+\.\d+\.\d+ \(.*; ?([a-zA-Z]+) ?;.*(201[1-9]).*\)' - - # aspiegel.com spider (owned by Huawei) - - regex: 'AspiegelBot' - os_replacement: 'Other' - - ########## - # @note: Windows Phone needs to come before Windows NT 6.1 *and* before Android to catch cases such as: - # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920)... - # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; ANZ821)... - # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; Orange)... - # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; Vodafone)... - ########## - - - regex: '(Windows Phone) (?:OS[ /])?(\d+)\.(\d+)' - - # Again a MS-special one: iPhone.*Outlook-iOS-Android/x.x is erroneously detected as Android - - regex: '(CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone)[ +]+(\d+)[_\.](\d+)(?:[_\.](\d+)|).*Outlook-iOS-Android' - os_replacement: 'iOS' - - # Special case for old ArcGIS Mobile products - - regex: 'ArcGIS\.?(iOS|Android)-\d+\.\d+(?:\.\d+|)(?:[^\/]+|)\/(\d+)(?:\.(\d+)(?:\.(\d+)|)|)' - - # Special case for new ArcGIS Mobile products - - regex: 'ArcGISRuntime-(?:Android|iOS)\/\d+\.\d+(?:\.\d+|) \((Android|iOS) (\d+)(?:\.(\d+)(?:\.(\d+)|)|);' - - ########## - # Android - # can actually detect rooted android os. do we care? - ########## - - regex: '(Android)[ \-/](\d+)(?:\.(\d+)|)(?:[.\-]([a-z0-9]+)|)' - - - regex: '(Android) Donut' - os_v1_replacement: '1' - os_v2_replacement: '2' - - - regex: '(Android) Eclair' - os_v1_replacement: '2' - os_v2_replacement: '1' - - - regex: '(Android) Froyo' - os_v1_replacement: '2' - os_v2_replacement: '2' - - - regex: '(Android) Gingerbread' - os_v1_replacement: '2' - os_v2_replacement: '3' - - - regex: '(Android) Honeycomb' - os_v1_replacement: '3' - - # Android 9; Android 10; - - regex: '(Android) (\d+);' - - # UCWEB - - regex: '^UCWEB.*; (Adr) (\d+)\.(\d+)(?:[.\-]([a-z0-9]+)|);' - os_replacement: 'Android' - - regex: '^UCWEB.*; (iPad|iPh|iPd) OS (\d+)_(\d+)(?:_(\d+)|);' - os_replacement: 'iOS' - - regex: '^UCWEB.*; (wds) (\d+)\.(\d+)(?:\.(\d+)|);' - os_replacement: 'Windows Phone' - # JUC - - regex: '^(JUC).*; ?U; ?(?:Android|)(\d+)\.(\d+)(?:[\.\-]([a-z0-9]+)|)' - os_replacement: 'Android' - - # Salesforce - - regex: '(android)\s(?:mobile\/)(\d+)(?:\.(\d+)(?:\.(\d+)|)|)' - os_replacement: 'Android' - - ########## - # Kindle Android - ########## - - regex: '(Silk-Accelerated=[a-z]{4,5})' - os_replacement: 'Android' - - # Citrix Chrome App on Chrome OS - # Note, this needs to come before the windows parsers as the app doesn't - # properly identify as Chrome OS - # - # ex: Mozilla/5.0 (X11; Windows aarch64 10718.88.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.118 Safari/537.36 CitrixChromeApp - - regex: '(x86_64|aarch64)\ (\d+)\.(\d+)\.(\d+).*Chrome.*(?:CitrixChromeApp)$' - os_replacement: 'Chrome OS' - - ########## - # Windows - # http://en.wikipedia.org/wiki/Windows_NT#Releases - # possibility of false positive when different marketing names share same NT kernel - # e.g. windows server 2003 and windows xp - # lots of ua strings have Windows NT 4.1 !?!?!?!? !?!? !? !????!?! !!! ??? !?!?! ? - # (very) roughly ordered in terms of frequency of occurence of regex (win xp currently most frequent, etc) - ########## - - # ie mobile desktop mode - # spoofs nt 6.1. must come before windows 7 - - regex: '(XBLWP7)' - os_replacement: 'Windows Phone' - - # @note: This needs to come before Windows NT 6.1 - - regex: '(Windows ?Mobile)' - os_replacement: 'Windows Mobile' - - - regex: '(Windows 10)' - os_replacement: 'Windows' - os_v1_replacement: '10' - - - regex: '(Windows (?:NT 5\.2|NT 5\.1))' - os_replacement: 'Windows' - os_v1_replacement: 'XP' - - - regex: '(Win(?:dows NT |32NT\/)6\.1)' - os_replacement: 'Windows' - os_v1_replacement: '7' - - - regex: '(Win(?:dows NT |32NT\/)6\.0)' - os_replacement: 'Windows' - os_v1_replacement: 'Vista' - - - regex: '(Win 9x 4\.90)' - os_replacement: 'Windows' - os_v1_replacement: 'ME' - - - regex: '(Windows NT 6\.2; ARM;)' - os_replacement: 'Windows' - os_v1_replacement: 'RT' - - - regex: '(Win(?:dows NT |32NT\/)6\.2)' - os_replacement: 'Windows' - os_v1_replacement: '8' - - - regex: '(Windows NT 6\.3; ARM;)' - os_replacement: 'Windows' - os_v1_replacement: 'RT 8' - os_v2_replacement: '1' - - - regex: '(Win(?:dows NT |32NT\/)6\.3)' - os_replacement: 'Windows' - os_v1_replacement: '8' - os_v2_replacement: '1' - - - regex: '(Win(?:dows NT |32NT\/)6\.4)' - os_replacement: 'Windows' - os_v1_replacement: '10' - - - regex: '(Windows NT 10\.0)' - os_replacement: 'Windows' - os_v1_replacement: '10' - - - regex: '(Windows NT 5\.0)' - os_replacement: 'Windows' - os_v1_replacement: '2000' - - - regex: '(WinNT4.0)' - os_replacement: 'Windows' - os_v1_replacement: 'NT 4.0' - - - regex: '(Windows ?CE)' - os_replacement: 'Windows' - os_v1_replacement: 'CE' - - - regex: 'Win(?:dows)? ?(95|98|3.1|NT|ME|2000|XP|Vista|7|CE)' - os_replacement: 'Windows' - os_v1_replacement: '$1' - - - regex: 'Win16' - os_replacement: 'Windows' - os_v1_replacement: '3.1' - - - regex: 'Win32' - os_replacement: 'Windows' - os_v1_replacement: '95' - - # Box apps (Drive, Sync, Notes) on Windows https://www.box.com/resources/downloads - - regex: '^Box.*Windows/([\d.]+);' - os_replacement: 'Windows' - os_v1_replacement: '$1' - - ########## - # Tizen OS from Samsung - # spoofs Android so pushing it above - ########## - - regex: '(Tizen)[/ ](\d+)\.(\d+)' - - ########## - # Mac OS - # @ref: http://en.wikipedia.org/wiki/Mac_OS_X#Versions - # @ref: http://www.puredarwin.org/curious/versions - ########## - - regex: '((?:Mac[ +]?|; )OS[ +]X)[\s+/](?:(\d+)[_.](\d+)(?:[_.](\d+)|)|Mach-O)' - os_replacement: 'Mac OS X' - - regex: '\w+\s+Mac OS X\s+\w+\s+(\d+).(\d+).(\d+).*' - os_replacement: 'Mac OS X' - os_v1_replacement: '$1' - os_v2_replacement: '$2' - os_v3_replacement: '$3' - # Leopard - - regex: ' (Dar)(win)/(9).(\d+).*\((?:i386|x86_64|Power Macintosh)\)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '5' - # Snow Leopard - - regex: ' (Dar)(win)/(10).(\d+).*\((?:i386|x86_64)\)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '6' - # Lion - - regex: ' (Dar)(win)/(11).(\d+).*\((?:i386|x86_64)\)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '7' - # Mountain Lion - - regex: ' (Dar)(win)/(12).(\d+).*\((?:i386|x86_64)\)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '8' - # Mavericks - - regex: ' (Dar)(win)/(13).(\d+).*\((?:i386|x86_64)\)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '9' - # Yosemite is Darwin/14.x but patch versions are inconsistent in the Darwin string; - # more accurately covered by CFNetwork regexes downstream - - # IE on Mac doesn't specify version number - - regex: 'Mac_PowerPC' - os_replacement: 'Mac OS' - - # builds before tiger don't seem to specify version? - - # ios devices spoof (mac os x), so including intel/ppc prefixes - - regex: '(?:PPC|Intel) (Mac OS X)' - - # Box Drive and Box Sync on Mac OS X use OSX version numbers, not Darwin - - regex: '^Box.*;(Darwin)/(10)\.(1\d)(?:\.(\d+)|)' - os_replacement: 'Mac OS X' - - ########## - # iOS - # http://en.wikipedia.org/wiki/IOS_version_history - ########## - # keep this above generic iOS, since AppleTV UAs contain 'CPU OS' - - regex: '(Apple\s?TV)(?:/(\d+)\.(\d+)|)' - os_replacement: 'ATV OS X' - - - regex: '(CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(\d+)[_\.](\d+)(?:[_\.](\d+)|)' - os_replacement: 'iOS' - - # remaining cases are mostly only opera uas, so catch opera as to not catch iphone spoofs - - regex: '(iPhone|iPad|iPod); Opera' - os_replacement: 'iOS' - - # few more stragglers - - regex: '(iPhone|iPad|iPod).*Mac OS X.*Version/(\d+)\.(\d+)' - os_replacement: 'iOS' - - # CFNetwork/Darwin - The specific CFNetwork or Darwin version determines - # whether the os maps to Mac OS, or iOS, or just Darwin. - # See: http://user-agents.me/cfnetwork-version-list - - regex: '(CFNetwork)/(5)48\.0\.3.* Darwin/11\.0\.0' - os_replacement: 'iOS' - - regex: '(CFNetwork)/(5)48\.(0)\.4.* Darwin/(1)1\.0\.0' - os_replacement: 'iOS' - - regex: '(CFNetwork)/(5)48\.(1)\.4' - os_replacement: 'iOS' - - regex: '(CFNetwork)/(4)85\.1(3)\.9' - os_replacement: 'iOS' - - regex: '(CFNetwork)/(6)09\.(1)\.4' - os_replacement: 'iOS' - - regex: '(CFNetwork)/(6)(0)9' - os_replacement: 'iOS' - - regex: '(CFNetwork)/6(7)2\.(1)\.13' - os_replacement: 'iOS' - - regex: '(CFNetwork)/6(7)2\.(1)\.(1)4' - os_replacement: 'iOS' - - regex: '(CF)(Network)/6(7)(2)\.1\.15' - os_replacement: 'iOS' - os_v1_replacement: '7' - os_v2_replacement: '1' - - regex: '(CFNetwork)/6(7)2\.(0)\.(?:2|8)' - os_replacement: 'iOS' - - regex: '(CFNetwork)/709\.1' - os_replacement: 'iOS' - os_v1_replacement: '8' - os_v2_replacement: '0.b5' - - regex: '(CF)(Network)/711\.(\d)' - os_replacement: 'iOS' - os_v1_replacement: '8' - - regex: '(CF)(Network)/(720)\.(\d)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '10' - - regex: '(CF)(Network)/(760)\.(\d)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '11' - - regex: 'CFNetwork/7.* Darwin/15\.4\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '9' - os_v2_replacement: '3' - os_v3_replacement: '1' - - regex: 'CFNetwork/7.* Darwin/15\.5\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '9' - os_v2_replacement: '3' - os_v3_replacement: '2' - - regex: 'CFNetwork/7.* Darwin/15\.6\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '9' - os_v2_replacement: '3' - os_v3_replacement: '5' - - regex: '(CF)(Network)/758\.(\d)' - os_replacement: 'iOS' - os_v1_replacement: '9' - - regex: 'CFNetwork/808\.3 Darwin/16\.3\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '10' - os_v2_replacement: '2' - os_v3_replacement: '1' - - regex: '(CF)(Network)/808\.(\d)' - os_replacement: 'iOS' - os_v1_replacement: '10' - - ########## - # CFNetwork macOS Apps (must be before CFNetwork iOS Apps - # @ref: https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history - ########## - - regex: 'CFNetwork/.* Darwin/17\.\d+.*\(x86_64\)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '13' - - regex: 'CFNetwork/.* Darwin/16\.\d+.*\(x86_64\)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '12' - - regex: 'CFNetwork/8.* Darwin/15\.\d+.*\(x86_64\)' - os_replacement: 'Mac OS X' - os_v1_replacement: '10' - os_v2_replacement: '11' - ########## - # CFNetwork iOS Apps - # @ref: https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history - ########## - - regex: 'CFNetwork/.* Darwin/(9)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '1' - - regex: 'CFNetwork/.* Darwin/(10)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '4' - - regex: 'CFNetwork/.* Darwin/(11)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '5' - - regex: 'CFNetwork/.* Darwin/(13)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '6' - - regex: 'CFNetwork/6.* Darwin/(14)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '7' - - regex: 'CFNetwork/7.* Darwin/(14)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '8' - os_v2_replacement: '0' - - regex: 'CFNetwork/7.* Darwin/(15)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '9' - os_v2_replacement: '0' - - regex: 'CFNetwork/8.* Darwin/16\.5\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '10' - os_v2_replacement: '3' - - regex: 'CFNetwork/8.* Darwin/16\.6\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '10' - os_v2_replacement: '3' - os_v3_replacement: '2' - - regex: 'CFNetwork/8.* Darwin/16\.7\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '10' - os_v2_replacement: '3' - os_v3_replacement: '3' - - regex: 'CFNetwork/8.* Darwin/(16)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '10' - - regex: 'CFNetwork/8.* Darwin/17\.0\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '11' - os_v2_replacement: '0' - - regex: 'CFNetwork/8.* Darwin/17\.2\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '11' - os_v2_replacement: '1' - - regex: 'CFNetwork/8.* Darwin/17\.3\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '11' - os_v2_replacement: '2' - - regex: 'CFNetwork/8.* Darwin/17\.4\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '11' - os_v2_replacement: '2' - os_v3_replacement: '6' - - regex: 'CFNetwork/8.* Darwin/17\.5\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '11' - os_v2_replacement: '3' - - regex: 'CFNetwork/9.* Darwin/17\.6\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '11' - os_v2_replacement: '4' - - regex: 'CFNetwork/9.* Darwin/17\.7\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '11' - os_v2_replacement: '4' - os_v3_replacement: '1' - - regex: 'CFNetwork/8.* Darwin/(17)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '11' - - regex: 'CFNetwork/9.* Darwin/18\.0\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '12' - os_v2_replacement: '0' - - regex: 'CFNetwork/9.* Darwin/(18)\.\d+' - os_replacement: 'iOS' - os_v1_replacement: '12' - - regex: 'CFNetwork/.* Darwin/' - os_replacement: 'iOS' - - # iOS Apps - - regex: '\b(iOS[ /]|iOS; |iPhone(?:/| v|[ _]OS[/,]|; | OS : |\d,\d/|\d,\d; )|iPad/)(\d{1,2})[_\.](\d{1,2})(?:[_\.](\d+)|)' - os_replacement: 'iOS' - - regex: '\((iOS);' - - ########## - # Apple Watch - ########## - - regex: '(watchOS)/(\d+)\.(\d+)(?:\.(\d+)|)' - os_replacement: 'WatchOS' - - ########################## - # Outlook on iOS >= 2.62.0 - ########################## - - regex: 'Outlook-(iOS)/\d+\.\d+\.prod\.iphone' - - ########################## - # iOS devices, the same regex matches mobile safari webviews - ########################## - - regex: '(iPod|iPhone|iPad)' - os_replacement: 'iOS' - - ########## - # Apple TV - ########## - - regex: '(tvOS)[/ ](\d+)\.(\d+)(?:\.(\d+)|)' - os_replacement: 'tvOS' - - ########## - # Chrome OS - # if version 0.0.0, probably this stuff: - # http://code.google.com/p/chromium-os/issues/detail?id=11573 - # http://code.google.com/p/chromium-os/issues/detail?id=13790 - ########## - - regex: '(CrOS) [a-z0-9_]+ (\d+)\.(\d+)(?:\.(\d+)|)' - os_replacement: 'Chrome OS' - - ########## - # Linux distros - ########## - - regex: '([Dd]ebian)' - os_replacement: 'Debian' - - regex: '(Linux Mint)(?:/(\d+)|)' - - regex: '(Mandriva)(?: Linux|)/(?:[\d.-]+m[a-z]{2}(\d+).(\d)|)' - - ########## - # Symbian + Symbian OS - # http://en.wikipedia.org/wiki/History_of_Symbian - ########## - - regex: '(Symbian[Oo][Ss])[/ ](\d+)\.(\d+)' - os_replacement: 'Symbian OS' - - regex: '(Symbian/3).+NokiaBrowser/7\.3' - os_replacement: 'Symbian^3 Anna' - - regex: '(Symbian/3).+NokiaBrowser/7\.4' - os_replacement: 'Symbian^3 Belle' - - regex: '(Symbian/3)' - os_replacement: 'Symbian^3' - - regex: '\b(Series 60|SymbOS|S60Version|S60V\d|S60\b)' - os_replacement: 'Symbian OS' - - regex: '(MeeGo)' - - regex: 'Symbian [Oo][Ss]' - os_replacement: 'Symbian OS' - - regex: 'Series40;' - os_replacement: 'Nokia Series 40' - - regex: 'Series30Plus;' - os_replacement: 'Nokia Series 30 Plus' - - ########## - # BlackBerry devices - ########## - - regex: '(BB10);.+Version/(\d+)\.(\d+)\.(\d+)' - os_replacement: 'BlackBerry OS' - - regex: '(Black[Bb]erry)[0-9a-z]+/(\d+)\.(\d+)\.(\d+)(?:\.(\d+)|)' - os_replacement: 'BlackBerry OS' - - regex: '(Black[Bb]erry).+Version/(\d+)\.(\d+)\.(\d+)(?:\.(\d+)|)' - os_replacement: 'BlackBerry OS' - - regex: '(RIM Tablet OS) (\d+)\.(\d+)\.(\d+)' - os_replacement: 'BlackBerry Tablet OS' - - regex: '(Play[Bb]ook)' - os_replacement: 'BlackBerry Tablet OS' - - regex: '(Black[Bb]erry)' - os_replacement: 'BlackBerry OS' - - ########## - # KaiOS - ########## - - regex: '(K[Aa][Ii]OS)\/(\d+)\.(\d+)(?:\.(\d+)|)' - os_replacement: 'KaiOS' - - ########## - # Firefox OS - ########## - - regex: '\((?:Mobile|Tablet);.+Gecko/18.0 Firefox/\d+\.\d+' - os_replacement: 'Firefox OS' - os_v1_replacement: '1' - os_v2_replacement: '0' - os_v3_replacement: '1' - - - regex: '\((?:Mobile|Tablet);.+Gecko/18.1 Firefox/\d+\.\d+' - os_replacement: 'Firefox OS' - os_v1_replacement: '1' - os_v2_replacement: '1' - - - regex: '\((?:Mobile|Tablet);.+Gecko/26.0 Firefox/\d+\.\d+' - os_replacement: 'Firefox OS' - os_v1_replacement: '1' - os_v2_replacement: '2' - - - regex: '\((?:Mobile|Tablet);.+Gecko/28.0 Firefox/\d+\.\d+' - os_replacement: 'Firefox OS' - os_v1_replacement: '1' - os_v2_replacement: '3' - - - regex: '\((?:Mobile|Tablet);.+Gecko/30.0 Firefox/\d+\.\d+' - os_replacement: 'Firefox OS' - os_v1_replacement: '1' - os_v2_replacement: '4' - - - regex: '\((?:Mobile|Tablet);.+Gecko/32.0 Firefox/\d+\.\d+' - os_replacement: 'Firefox OS' - os_v1_replacement: '2' - os_v2_replacement: '0' - - - regex: '\((?:Mobile|Tablet);.+Gecko/34.0 Firefox/\d+\.\d+' - os_replacement: 'Firefox OS' - os_v1_replacement: '2' - os_v2_replacement: '1' - - # Firefox OS Generic - - regex: '\((?:Mobile|Tablet);.+Firefox/\d+\.\d+' - os_replacement: 'Firefox OS' - - - ########## - # BREW - # yes, Brew is lower-cased for Brew MP - ########## - - regex: '(BREW)[ /](\d+)\.(\d+)\.(\d+)' - - regex: '(BREW);' - - regex: '(Brew MP|BMP)[ /](\d+)\.(\d+)\.(\d+)' - os_replacement: 'Brew MP' - - regex: 'BMP;' - os_replacement: 'Brew MP' - - ########## - # Google TV - ########## - - regex: '(GoogleTV)(?: (\d+)\.(\d+)(?:\.(\d+)|)|/[\da-z]+)' - - - regex: '(WebTV)/(\d+).(\d+)' - - ########## - # Chromecast - ########## - - regex: '(CrKey)(?:[/](\d+)\.(\d+)(?:\.(\d+)|)|)' - os_replacement: 'Chromecast' - - ########## - # Misc mobile - ########## - - regex: '(hpw|web)OS/(\d+)\.(\d+)(?:\.(\d+)|)' - os_replacement: 'webOS' - - regex: '(VRE);' - - ########## - # Generic patterns - # since the majority of os cases are very specific, these go last - ########## - - regex: '(Fedora|Red Hat|PCLinuxOS|Puppy|Ubuntu|Kindle|Bada|Sailfish|Lubuntu|BackTrack|Slackware|(?:Free|Open|Net|\b)BSD)[/ ](\d+)\.(\d+)(?:\.(\d+)|)(?:\.(\d+)|)' - - # Gentoo Linux + Kernel Version - - regex: '(Linux)[ /](\d+)\.(\d+)(?:\.(\d+)|).*gentoo' - os_replacement: 'Gentoo' - - # Opera Mini Bada - - regex: '\((Bada);' - - # just os - - regex: '(Windows|Android|WeTab|Maemo|Web0S)' - - regex: '(Ubuntu|Kubuntu|Arch Linux|CentOS|Slackware|Gentoo|openSUSE|SUSE|Red Hat|Fedora|PCLinuxOS|Mageia|(?:Free|Open|Net|\b)BSD)' - # Linux + Kernel Version - - regex: '(Linux)(?:[ /](\d+)\.(\d+)(?:\.(\d+)|)|)' - - regex: 'SunOS' - os_replacement: 'Solaris' - # Wget/x.x.x (linux-gnu) - - regex: '\(linux-gnu\)' - os_replacement: 'Linux' - - regex: '\(x86_64-redhat-linux-gnu\)' - os_replacement: 'Red Hat' - - regex: '\((freebsd)(\d+)\.(\d+)\)' - os_replacement: 'FreeBSD' - - regex: 'linux' - os_replacement: 'Linux' - - # Roku Digital-Video-Players https://www.roku.com/ - - regex: '^(Roku)/DVP-(\d+)\.(\d+)' - -device_parsers: - - ######### - # Mobile Spiders - # Catch the mobile crawler before checking for iPhones / Androids. - ######### - - regex: '(?:(?:iPhone|Windows CE|Windows Phone|Android).*(?:(?:Bot|Yeti)-Mobile|YRSpider|BingPreview|bots?/\d|(?:bot|spider)\.html)|AdsBot-Google-Mobile.*iPhone)' - regex_flag: 'i' - device_replacement: 'Spider' - brand_replacement: 'Spider' - model_replacement: 'Smartphone' - - regex: '(?:DoCoMo|\bMOT\b|\bLG\b|Nokia|Samsung|SonyEricsson).*(?:(?:Bot|Yeti)-Mobile|bots?/\d|(?:bot|crawler)\.html|(?:jump|google|Wukong)bot|ichiro/mobile|/spider|YahooSeeker)' - regex_flag: 'i' - device_replacement: 'Spider' - brand_replacement: 'Spider' - model_replacement: 'Feature Phone' - - # PTST / WebPageTest.org crawlers - - regex: ' PTST/\d+(?:\.)?\d+$' - device_replacement: 'Spider' - brand_replacement: 'Spider' - - # Datanyze.com spider - - regex: 'X11; Datanyze; Linux' - device_replacement: 'Spider' - brand_replacement: 'Spider' - - # aspiegel.com spider (owned by Huawei) - - regex: 'Mozilla.*Mobile.*AspiegelBot' - device_replacement: 'Spider' - brand_replacement: 'Spider' - model_replacement: 'Smartphone' - - regex: 'Mozilla.*AspiegelBot' - device_replacement: 'Spider' - brand_replacement: 'Spider' - model_replacement: 'Desktop' - - ######### - # WebBrowser for SmartWatch - # @ref: https://play.google.com/store/apps/details?id=se.vaggan.webbrowser&hl=en - ######### - - regex: '\bSmartWatch {0,2}\( {0,2}([^;]+) {0,2}; {0,2}([^;]+) {0,2};' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ###################################################################### - # Android parsers - # - # @ref: https://support.google.com/googleplay/answer/1727131?hl=en - ###################################################################### - - # Android Application - - regex: 'Android Application[^\-]+ - (Sony) ?(Ericsson|) (.+) \w+ - ' - device_replacement: '$1 $2' - brand_replacement: '$1$2' - model_replacement: '$3' - - regex: 'Android Application[^\-]+ - (?:HTC|HUAWEI|LGE|LENOVO|MEDION|TCT) (HTC|HUAWEI|LG|LENOVO|MEDION|ALCATEL)[ _\-](.+) \w+ - ' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - regex: 'Android Application[^\-]+ - ([^ ]+) (.+) \w+ - ' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ######### - # 3Q - # @ref: http://www.3q-int.com/ - ######### - - regex: '; *([BLRQ]C\d{4}[A-Z]+?)(?: Build|\) AppleWebKit)' - device_replacement: '3Q $1' - brand_replacement: '3Q' - model_replacement: '$1' - - regex: '; *(?:3Q_)([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '3Q $1' - brand_replacement: '3Q' - model_replacement: '$1' - - ######### - # Acer - # @ref: http://us.acer.com/ac/en/US/content/group/tablets - ######### - - regex: 'Android [34].*; *(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700(?: Lite| 3G|)|A701|B1-A71|A1-\d{3}|B1-\d{3}|V360|V370|W500|W500P|W501|W501P|W510|W511|W700|Slider SL101|DA22[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Acer' - model_replacement: '$1' - - regex: '; *Acer Iconia Tab ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Acer' - model_replacement: '$1' - - regex: '; *(Z1[1235]0|E320[^/]*|S500|S510|Liquid[^;/]*|Iconia A\d+)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Acer' - model_replacement: '$1' - - regex: '; *(Acer |ACER )([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Acer' - model_replacement: '$2' - - ######### - # Advent - # @ref: https://en.wikipedia.org/wiki/Advent_Vega - # @note: VegaBean and VegaComb (names derived from jellybean, honeycomb) are - # custom ROM builds for Vega - ######### - - regex: '; *(Advent |)(Vega(?:Bean|Comb|)).*?(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Advent' - model_replacement: '$2' - - ######### - # Ainol - # @ref: http://www.ainol.com/plugin.php?identifier=ainol&module=product - ######### - - regex: '; *(Ainol |)((?:NOVO|[Nn]ovo)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Ainol' - model_replacement: '$2' - - ######### - # Airis - # @ref: http://airis.es/Tienda/Default.aspx?idG=001 - ######### - - regex: '; *AIRIS[ _\-]?([^/;\)]+) *(?:;|\)|Build)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Airis' - model_replacement: '$1' - - regex: '; *(OnePAD[^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Airis' - model_replacement: '$1' - - ######### - # Airpad - # @ref: ?? - ######### - - regex: '; *Airpad[ \-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Airpad $1' - brand_replacement: 'Airpad' - model_replacement: '$1' - - ######### - # Alcatel - TCT - # @ref: http://www.alcatelonetouch.com/global-en/products/smartphones.html - ######### - - regex: '; *(one ?touch) (EVO7|T10|T20)(?: Build|\) AppleWebKit)' - device_replacement: 'Alcatel One Touch $2' - brand_replacement: 'Alcatel' - model_replacement: 'One Touch $2' - - regex: '; *(?:alcatel[ _]|)(?:(?:one[ _]?touch[ _])|ot[ \-])([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Alcatel One Touch $1' - brand_replacement: 'Alcatel' - model_replacement: 'One Touch $1' - - regex: '; *(TCL)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - # operator specific models - - regex: '; *(Vodafone Smart II|Optimus_Madrid)(?: Build|\) AppleWebKit)' - device_replacement: 'Alcatel $1' - brand_replacement: 'Alcatel' - model_replacement: '$1' - - regex: '; *BASE_Lutea_3(?: Build|\) AppleWebKit)' - device_replacement: 'Alcatel One Touch 998' - brand_replacement: 'Alcatel' - model_replacement: 'One Touch 998' - - regex: '; *BASE_Varia(?: Build|\) AppleWebKit)' - device_replacement: 'Alcatel One Touch 918D' - brand_replacement: 'Alcatel' - model_replacement: 'One Touch 918D' - - ######### - # Allfine - # @ref: http://www.myallfine.com/Products.asp - ######### - - regex: '; *((?:FINE|Fine)\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Allfine' - model_replacement: '$1' - - ######### - # Allview - # @ref: http://www.allview.ro/produse/droseries/lista-tablete-pc/ - ######### - - regex: '; *(ALLVIEW[ _]?|Allview[ _]?)((?:Speed|SPEED).*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Allview' - model_replacement: '$2' - - regex: '; *(ALLVIEW[ _]?|Allview[ _]?|)(AX1_Shine|AX2_Frenzy)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Allview' - model_replacement: '$2' - - regex: '; *(ALLVIEW[ _]?|Allview[ _]?)([^;/]*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Allview' - model_replacement: '$2' - - ######### - # Allwinner - # @ref: http://www.allwinner.com/ - # @models: A31 (13.3"),A20,A10, - ######### - - regex: '; *(A13-MID)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Allwinner' - model_replacement: '$1' - - regex: '; *(Allwinner)[ _\-]?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Allwinner' - model_replacement: '$1' - - ######### - # Amaway - # @ref: http://www.amaway.cn/ - ######### - - regex: '; *(A651|A701B?|A702|A703|A705|A706|A707|A711|A712|A713|A717|A722|A785|A801|A802|A803|A901|A902|A1002|A1003|A1006|A1007|A9701|A9703|Q710|Q80)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Amaway' - model_replacement: '$1' - - ######### - # Amoi - # @ref: http://www.amoi.com/en/prd/prd_index.jspx - ######### - - regex: '; *(?:AMOI|Amoi)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Amoi $1' - brand_replacement: 'Amoi' - model_replacement: '$1' - - regex: '^(?:AMOI|Amoi)[ _]([^;/]+?) Linux' - device_replacement: 'Amoi $1' - brand_replacement: 'Amoi' - model_replacement: '$1' - - ######### - # Aoc - # @ref: http://latin.aoc.com/media_tablet - ######### - - regex: '; *(MW(?:0[789]|10)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Aoc' - model_replacement: '$1' - - ######### - # Aoson - # @ref: http://www.luckystar.com.cn/en/mid.aspx?page=1 - # @ref: http://www.luckystar.com.cn/en/mobiletel.aspx?page=1 - # @note: brand owned by luckystar - ######### - - regex: '; *(G7|M1013|M1015G|M11[CG]?|M-?12[B]?|M15|M19[G]?|M30[ACQ]?|M31[GQ]|M32|M33[GQ]|M36|M37|M38|M701T|M710|M712B|M713|M715G|M716G|M71(?:G|GS|T|)|M72[T]?|M73[T]?|M75[GT]?|M77G|M79T|M7L|M7LN|M81|M810|M81T|M82|M92|M92KS|M92S|M717G|M721|M722G|M723|M725G|M739|M785|M791|M92SK|M93D)(?: Build|\) AppleWebKit)' - device_replacement: 'Aoson $1' - brand_replacement: 'Aoson' - model_replacement: '$1' - - regex: '; *Aoson ([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Aoson $1' - brand_replacement: 'Aoson' - model_replacement: '$1' - - ######### - # Apanda - # @ref: http://www.apanda.com.cn/ - ######### - - regex: '; *[Aa]panda[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Apanda $1' - brand_replacement: 'Apanda' - model_replacement: '$1' - - ######### - # Archos - # @ref: http://www.archos.com/de/products/tablets.html - # @ref: http://www.archos.com/de/products/smartphones/index.html - ######### - - regex: '; *(?:ARCHOS|Archos) ?(GAMEPAD.*?)(?: Build|\) AppleWebKit)' - device_replacement: 'Archos $1' - brand_replacement: 'Archos' - model_replacement: '$1' - - regex: 'ARCHOS; GOGI; ([^;]+);' - device_replacement: 'Archos $1' - brand_replacement: 'Archos' - model_replacement: '$1' - - regex: '(?:ARCHOS|Archos)[ _]?(.*?)(?: Build|[;/\(\)\-]|$)' - device_replacement: 'Archos $1' - brand_replacement: 'Archos' - model_replacement: '$1' - - regex: '; *(AN(?:7|8|9|10|13)[A-Z0-9]{1,4})(?: Build|\) AppleWebKit)' - device_replacement: 'Archos $1' - brand_replacement: 'Archos' - model_replacement: '$1' - - regex: '; *(A28|A32|A43|A70(?:BHT|CHT|HB|S|X)|A101(?:B|C|IT)|A7EB|A7EB-WK|101G9|80G9)(?: Build|\) AppleWebKit)' - device_replacement: 'Archos $1' - brand_replacement: 'Archos' - model_replacement: '$1' - - ######### - # A-rival - # @ref: http://www.a-rival.de/de/ - ######### - - regex: '; *(PAD-FMD[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Arival' - model_replacement: '$1' - - regex: '; *(BioniQ) ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Arival' - model_replacement: '$1 $2' - - ######### - # Arnova - # @ref: http://arnovatech.com/ - ######### - - regex: '; *(AN\d[^;/]+|ARCHM\d+)(?: Build|\) AppleWebKit)' - device_replacement: 'Arnova $1' - brand_replacement: 'Arnova' - model_replacement: '$1' - - regex: '; *(?:ARNOVA|Arnova) ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Arnova $1' - brand_replacement: 'Arnova' - model_replacement: '$1' - - ######### - # Assistant - # @ref: http://www.assistant.ua - ######### - - regex: '; *(?:ASSISTANT |)(AP)-?([1789]\d{2}[A-Z]{0,2}|80104)(?: Build|\) AppleWebKit)' - device_replacement: 'Assistant $1-$2' - brand_replacement: 'Assistant' - model_replacement: '$1-$2' - - ######### - # Asus - # @ref: http://www.asus.com/uk/Tablets_Mobile/ - ######### - - regex: '; *(ME17\d[^;/]*|ME3\d{2}[^;/]+|K00[A-Z]|Nexus 10|Nexus 7(?: 2013|)|PadFone[^;/]*|Transformer[^;/]*|TF\d{3}[^;/]*|eeepc)(?: Build|\) AppleWebKit)' - device_replacement: 'Asus $1' - brand_replacement: 'Asus' - model_replacement: '$1' - - regex: '; *ASUS[ _]*([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Asus $1' - brand_replacement: 'Asus' - model_replacement: '$1' - - ######### - # Garmin-Asus - ######### - - regex: '; *Garmin-Asus ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Garmin-Asus $1' - brand_replacement: 'Garmin-Asus' - model_replacement: '$1' - - regex: '; *(Garminfone)(?: Build|\) AppleWebKit)' - device_replacement: 'Garmin $1' - brand_replacement: 'Garmin-Asus' - model_replacement: '$1' - - ######### - # Attab - # @ref: http://www.theattab.com/ - ######### - - regex: '; (@TAB-[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Attab' - model_replacement: '$1' - - ######### - # Audiosonic - # @ref: ?? - # @note: Take care with Docomo T-01 Toshiba - ######### - - regex: '; *(T-(?:07|[^0]\d)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Audiosonic' - model_replacement: '$1' - - ######### - # Axioo - # @ref: http://www.axiooworld.com/ww/index.php - ######### - - regex: '; *(?:Axioo[ _\-]([^;/]+?)|(picopad)[ _\-]([^;/]+?))(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Axioo $1$2 $3' - brand_replacement: 'Axioo' - model_replacement: '$1$2 $3' - - ######### - # Azend - # @ref: http://azendcorp.com/index.php/products/portable-electronics - ######### - - regex: '; *(V(?:100|700|800)[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Azend' - model_replacement: '$1' - - ######### - # Bak - # @ref: http://www.bakinternational.com/produtos.php?cat=80 - ######### - - regex: '; *(IBAK\-[^;/]*)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Bak' - model_replacement: '$1' - - ######### - # Bedove - # @ref: http://www.bedove.com/product.html - # @models: HY6501|HY5001|X12|X21|I5 - ######### - - regex: '; *(HY5001|HY6501|X12|X21|I5)(?: Build|\) AppleWebKit)' - device_replacement: 'Bedove $1' - brand_replacement: 'Bedove' - model_replacement: '$1' - - ######### - # Benss - # @ref: http://www.benss.net/ - ######### - - regex: '; *(JC-[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Benss $1' - brand_replacement: 'Benss' - model_replacement: '$1' - - ######### - # Blackberry - # @ref: http://uk.blackberry.com/ - # @note: Android Apps seams to be used here - ######### - - regex: '; *(BB) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Blackberry' - model_replacement: '$2' - - ######### - # Blackbird - # @ref: http://iblackbird.co.kr - ######### - - regex: '; *(BlackBird)[ _](I8.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - regex: '; *(BlackBird)[ _](.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ######### - # Blaupunkt - # @ref: http://www.blaupunkt.com - ######### - # Endeavour - - regex: '; *([0-9]+BP[EM][^;/]*|Endeavour[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Blaupunkt $1' - brand_replacement: 'Blaupunkt' - model_replacement: '$1' - - ######### - # Blu - # @ref: http://bluproducts.com - ######### - - regex: '; *((?:BLU|Blu)[ _\-])([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Blu' - model_replacement: '$2' - # BMOBILE = operator branded device - - regex: '; *(?:BMOBILE )?(Blu|BLU|DASH [^;/]+|VIVO 4\.3|TANK 4\.5)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Blu' - model_replacement: '$1' - - ######### - # Blusens - # @ref: http://www.blusens.com/es/?sg=1&sv=al&roc=1 - ######### - # tablet - - regex: '; *(TOUCH\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Blusens' - model_replacement: '$1' - - ######### - # Bmobile - # @ref: http://bmobile.eu.com/?categoria=smartphones-2 - # @note: Might collide with Maxx as AX is used also there. - ######### - # smartphone - - regex: '; *(AX5\d+)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Bmobile' - model_replacement: '$1' - - ######### - # bq - # @ref: http://bqreaders.com - ######### - - regex: '; *([Bb]q) ([^;/]+?);?(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'bq' - model_replacement: '$2' - - regex: '; *(Maxwell [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'bq' - model_replacement: '$1' - - ######### - # Braun Phototechnik - # @ref: http://www.braun-phototechnik.de/en/products/list/~pcat.250/Tablet-PC.html - ######### - - regex: '; *((?:B-Tab|B-TAB) ?\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Braun' - model_replacement: '$1' - - ######### - # Broncho - # @ref: http://www.broncho.cn/ - ######### - - regex: '; *(Broncho) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ######### - # Captiva - # @ref: http://www.captiva-power.de - ######### - - regex: '; *CAPTIVA ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Captiva $1' - brand_replacement: 'Captiva' - model_replacement: '$1' - - ######### - # Casio - # @ref: http://www.casiogzone.com/ - ######### - - regex: '; *(C771|CAL21|IS11CA)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Casio' - model_replacement: '$1' - - ######### - # Cat - # @ref: http://www.cat-sound.com - ######### - - regex: '; *(?:Cat|CAT) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Cat $1' - brand_replacement: 'Cat' - model_replacement: '$1' - - regex: '; *(?:Cat)(Nova.*?)(?: Build|\) AppleWebKit)' - device_replacement: 'Cat $1' - brand_replacement: 'Cat' - model_replacement: '$1' - - regex: '; *(INM8002KP|ADM8000KP_[AB])(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Cat' - model_replacement: 'Tablet PHOENIX 8.1J0' - - ######### - # Celkon - # @ref: http://www.celkonmobiles.com/?_a=products - # @models: A10, A19Q, A101, A105, A107, A107\+, A112, A118, A119, A119Q, A15, A19, A20, A200, A220, A225, A22 Race, A27, A58, A59, A60, A62, A63, A64, A66, A67, A69, A75, A77, A79, A8\+, A83, A85, A86, A87, A89 Ultima, A9\+, A90, A900, A95, A97i, A98, AR 40, AR 45, AR 50, ML5 - ######### - - regex: '; *(?:[Cc]elkon[ _\*]|CELKON[ _\*])([^;/\)]+) ?(?:Build|;|\))' - device_replacement: '$1' - brand_replacement: 'Celkon' - model_replacement: '$1' - - regex: 'Build/(?:[Cc]elkon)+_?([^;/_\)]+)' - device_replacement: '$1' - brand_replacement: 'Celkon' - model_replacement: '$1' - - regex: '; *(CT)-?(\d+)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Celkon' - model_replacement: '$1$2' - # smartphones - - regex: '; *(A19|A19Q|A105|A107[^;/\)]*) ?(?:Build|;|\))' - device_replacement: '$1' - brand_replacement: 'Celkon' - model_replacement: '$1' - - ######### - # ChangJia - # @ref: http://www.cjshowroom.com/eproducts.aspx?classcode=004001001 - # @brief: China manufacturer makes tablets for different small brands - # (eg. http://www.zeepad.net/index.html) - ######### - - regex: '; *(TPC[0-9]{4,5})(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'ChangJia' - model_replacement: '$1' - - ######### - # Cloudfone - # @ref: http://www.cloudfonemobile.com/ - ######### - - regex: '; *(Cloudfone)[ _](Excite)([^ ][^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2 $3' - brand_replacement: 'Cloudfone' - model_replacement: '$1 $2 $3' - - regex: '; *(Excite|ICE)[ _](\d+[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Cloudfone $1 $2' - brand_replacement: 'Cloudfone' - model_replacement: 'Cloudfone $1 $2' - - regex: '; *(Cloudfone|CloudPad)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Cloudfone' - model_replacement: '$1 $2' - - ######### - # Cmx - # @ref: http://cmx.at/de/ - ######### - - regex: '; *((?:Aquila|Clanga|Rapax)[^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Cmx' - model_replacement: '$1' - - ######### - # CobyKyros - # @ref: http://cobykyros.com - # @note: Be careful with MID\d{3} from MpMan or Manta - ######### - - regex: '; *(?:CFW-|Kyros )?(MID[0-9]{4}(?:[ABC]|SR|TV)?)(\(3G\)-4G| GB 8K| 3G| 8K| GB)? *(?:Build|[;\)])' - device_replacement: 'CobyKyros $1$2' - brand_replacement: 'CobyKyros' - model_replacement: '$1$2' - - ######### - # Coolpad - # @ref: ?? - ######### - - regex: '; *([^;/]*)Coolpad[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Coolpad' - model_replacement: '$1$2' - - ######### - # Cube - # @ref: http://www.cube-tablet.com/buy-products.html - ######### - - regex: '; *(CUBE[ _])?([KU][0-9]+ ?GT.*?|A5300)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1$2' - brand_replacement: 'Cube' - model_replacement: '$2' - - ######### - # Cubot - # @ref: http://www.cubotmall.com/ - ######### - - regex: '; *CUBOT ([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Cubot' - model_replacement: '$1' - - regex: '; *(BOBBY)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Cubot' - model_replacement: '$1' - - ######### - # Danew - # @ref: http://www.danew.com/produits-tablette.php - ######### - - regex: '; *(Dslide [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Danew' - model_replacement: '$1' - - ######### - # Dell - # @ref: http://www.dell.com - # @ref: http://www.softbank.jp/mobile/support/product/101dl/ - # @ref: http://www.softbank.jp/mobile/support/product/001dl/ - # @ref: http://developer.emnet.ne.jp/android.html - # @ref: http://www.dell.com/in/p/mobile-xcd28/pd - # @ref: http://www.dell.com/in/p/mobile-xcd35/pd - ######### - - regex: '; *(XCD)[ _]?(28|35)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1$2' - brand_replacement: 'Dell' - model_replacement: '$1$2' - - regex: '; *(001DL)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: 'Streak' - - regex: '; *(?:Dell|DELL) (Streak)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: 'Streak' - - regex: '; *(101DL|GS01|Streak Pro[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: 'Streak Pro' - - regex: '; *([Ss]treak ?7)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: 'Streak 7' - - regex: '; *(Mini-3iX)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: '$1' - - regex: '; *(?:Dell|DELL)[ _](Aero|Venue|Thunder|Mini.*?|Streak[ _]Pro)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: '$1' - - regex: '; *Dell[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: '$1' - - regex: '; *Dell ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: '$1' - - ######### - # Denver - # @ref: http://www.denver-electronics.com/tablets1/ - ######### - - regex: '; *(TA[CD]-\d+[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Denver' - model_replacement: '$1' - - ######### - # Dex - # @ref: http://dex.ua/ - ######### - - regex: '; *(iP[789]\d{2}(?:-3G)?|IP10\d{2}(?:-8GB)?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Dex' - model_replacement: '$1' - - ######### - # DNS AirTab - # @ref: http://www.dns-shop.ru/ - ######### - - regex: '; *(AirTab)[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'DNS' - model_replacement: '$1 $2' - - ######### - # Docomo (Operator Branded Device) - # @ref: http://www.ipentec.com/document/document.aspx?page=android-useragent - ######### - - regex: '; *(F\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Fujitsu' - model_replacement: '$1' - - regex: '; *(HT-03A)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: 'Magic' - - regex: '; *(HT\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: '$1' - - regex: '; *(L\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'LG' - model_replacement: '$1' - - regex: '; *(N\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Nec' - model_replacement: '$1' - - regex: '; *(P\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Panasonic' - model_replacement: '$1' - - regex: '; *(SC\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - regex: '; *(SH\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Sharp' - model_replacement: '$1' - - regex: '; *(SO\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'SonyEricsson' - model_replacement: '$1' - - regex: '; *(T\-0[12][^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Toshiba' - model_replacement: '$1' - - ######### - # DOOV - # @ref: http://www.doov.com.cn/ - ######### - - regex: '; *(DOOV)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'DOOV' - model_replacement: '$2' - - ######### - # Enot - # @ref: http://www.enot.ua/ - ######### - - regex: '; *(Enot|ENOT)[ -]?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Enot' - model_replacement: '$2' - - ######### - # Evercoss - # @ref: http://evercoss.com/android/ - ######### - - regex: '; *[^;/]+ Build/(?:CROSS|Cross)+[ _\-]([^\)]+)' - device_replacement: 'CROSS $1' - brand_replacement: 'Evercoss' - model_replacement: 'Cross $1' - - regex: '; *(CROSS|Cross)[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Evercoss' - model_replacement: 'Cross $2' - - ######### - # Explay - # @ref: http://explay.ru/ - ######### - - regex: '; *Explay[_ ](.+?)(?:[\)]| Build)' - device_replacement: '$1' - brand_replacement: 'Explay' - model_replacement: '$1' - - ######### - # Fly - # @ref: http://www.fly-phone.com/ - ######### - - regex: '; *(IQ.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Fly' - model_replacement: '$1' - - regex: '; *(Fly|FLY)[ _](IQ[^;]+?|F[34]\d+[^;]*?);?(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Fly' - model_replacement: '$2' - - ######### - # Fujitsu - # @ref: http://www.fujitsu.com/global/ - ######### - - regex: '; *(M532|Q572|FJL21)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Fujitsu' - model_replacement: '$1' - - ######### - # Galapad - # @ref: http://www.galapad.net/product.html - ######### - - regex: '; *(G1)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Galapad' - model_replacement: '$1' - - ######### - # Geeksphone - # @ref: http://www.geeksphone.com/ - ######### - - regex: '; *(Geeksphone) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ######### - # Gfive - # @ref: http://www.gfivemobile.com/en - ######### - #- regex: '; *(G\'?FIVE) ([^;/]+) Build' # there is a problem with python yaml parser here - - regex: '; *(G[^F]?FIVE) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Gfive' - model_replacement: '$2' - - ######### - # Gionee - # @ref: http://www.gionee.com/ - ######### - - regex: '; *(Gionee)[ _\-]([^;/]+?)(?:/[^;/]+|)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'Gionee' - model_replacement: '$2' - - regex: '; *(GN\d+[A-Z]?|INFINITY_PASSION|Ctrl_V1)(?: Build|\) AppleWebKit)' - device_replacement: 'Gionee $1' - brand_replacement: 'Gionee' - model_replacement: '$1' - - regex: '; *(E3) Build/JOP40D' - device_replacement: 'Gionee $1' - brand_replacement: 'Gionee' - model_replacement: '$1' - - regex: '\sGIONEE[-\s_](\w*)' - regex_flag: 'i' - device_replacement: 'Gionee $1' - brand_replacement: 'Gionee' - model_replacement: '$1' - - ######### - # GoClever - # @ref: http://www.goclever.com - ######### - - regex: '; *((?:FONE|QUANTUM|INSIGNIA) \d+[^;/]*|PLAYTAB)(?: Build|\) AppleWebKit)' - device_replacement: 'GoClever $1' - brand_replacement: 'GoClever' - model_replacement: '$1' - - regex: '; *GOCLEVER ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'GoClever $1' - brand_replacement: 'GoClever' - model_replacement: '$1' - - ######### - # Google - # @ref: http://www.google.de/glass/start/ - ######### - - regex: '; *(Glass \d+)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Google' - model_replacement: '$1' - - regex: '; *(Pixel.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Google' - model_replacement: '$1' - - ######### - # Gigabyte - # @ref: http://gsmart.gigabytecm.com/en/ - ######### - - regex: '; *(GSmart)[ -]([^/]+)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Gigabyte' - model_replacement: '$1 $2' - - ######### - # Freescale development boards - # @ref: http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX53QSB - ######### - - regex: '; *(imx5[13]_[^/]+)(?: Build|\) AppleWebKit)' - device_replacement: 'Freescale $1' - brand_replacement: 'Freescale' - model_replacement: '$1' - - ######### - # Haier - # @ref: http://www.haier.com/ - # @ref: http://www.haier.com/de/produkte/tablet/ - ######### - - regex: '; *Haier[ _\-]([^/]+)(?: Build|\) AppleWebKit)' - device_replacement: 'Haier $1' - brand_replacement: 'Haier' - model_replacement: '$1' - - regex: '; *(PAD1016)(?: Build|\) AppleWebKit)' - device_replacement: 'Haipad $1' - brand_replacement: 'Haipad' - model_replacement: '$1' - - ######### - # Haipad - # @ref: http://www.haipad.net/ - # @models: V7P|M7SM7S|M9XM9X|M7XM7X|M9|M8|M7-M|M1002|M7|M701 - ######### - - regex: '; *(M701|M7|M8|M9)(?: Build|\) AppleWebKit)' - device_replacement: 'Haipad $1' - brand_replacement: 'Haipad' - model_replacement: '$1' - - ######### - # Hannspree - # @ref: http://www.hannspree.eu/ - # @models: SN10T1|SN10T2|SN70T31B|SN70T32W - ######### - - regex: '; *(SN\d+T[^;\)/]*)(?: Build|[;\)])' - device_replacement: 'Hannspree $1' - brand_replacement: 'Hannspree' - model_replacement: '$1' - - ######### - # HCLme - # @ref: http://www.hclmetablet.com/india/ - ######### - - regex: 'Build/HCL ME Tablet ([^;\)]+)[\);]' - device_replacement: 'HCLme $1' - brand_replacement: 'HCLme' - model_replacement: '$1' - - regex: '; *([^;\/]+) Build/HCL' - device_replacement: 'HCLme $1' - brand_replacement: 'HCLme' - model_replacement: '$1' - - ######### - # Hena - # @ref: http://www.henadigital.com/en/product/index.asp?id=6 - ######### - - regex: '; *(MID-?\d{4}C[EM])(?: Build|\) AppleWebKit)' - device_replacement: 'Hena $1' - brand_replacement: 'Hena' - model_replacement: '$1' - - ######### - # Hisense - # @ref: http://www.hisense.com/ - ######### - - regex: '; *(EG\d{2,}|HS-[^;/]+|MIRA[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Hisense $1' - brand_replacement: 'Hisense' - model_replacement: '$1' - - regex: '; *(andromax[^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Hisense $1' - brand_replacement: 'Hisense' - model_replacement: '$1' - - ######### - # hitech - # @ref: http://www.hitech-mobiles.com/ - ######### - - regex: '; *(?:AMAZE[ _](S\d+)|(S\d+)[ _]AMAZE)(?: Build|\) AppleWebKit)' - device_replacement: 'AMAZE $1$2' - brand_replacement: 'hitech' - model_replacement: 'AMAZE $1$2' - - ######### - # HP - # @ref: http://www.hp.com/ - ######### - - regex: '; *(PlayBook)(?: Build|\) AppleWebKit)' - device_replacement: 'HP $1' - brand_replacement: 'HP' - model_replacement: '$1' - - regex: '; *HP ([^/]+)(?: Build|\) AppleWebKit)' - device_replacement: 'HP $1' - brand_replacement: 'HP' - model_replacement: '$1' - - regex: '; *([^/]+_tenderloin)(?: Build|\) AppleWebKit)' - device_replacement: 'HP TouchPad' - brand_replacement: 'HP' - model_replacement: 'TouchPad' - - ######### - # Huawei - # @ref: http://www.huaweidevice.com - # @note: Needs to be before HTC due to Desire HD Build on U8815 - ######### - - regex: '; *(HUAWEI |Huawei-|)([UY][^;/]+) Build/(?:Huawei|HUAWEI)([UY][^\);]+)\)' - device_replacement: '$1$2' - brand_replacement: 'Huawei' - model_replacement: '$2' - - regex: '; *([^;/]+) Build[/ ]Huawei(MT1-U06|[A-Z]+\d+[^\);]+)\)' - device_replacement: '$1' - brand_replacement: 'Huawei' - model_replacement: '$2' - - regex: '; *(S7|M860) Build' - device_replacement: '$1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - regex: '; *((?:HUAWEI|Huawei)[ \-]?)(MediaPad) Build' - device_replacement: '$1$2' - brand_replacement: 'Huawei' - model_replacement: '$2' - - regex: '; *((?:HUAWEI[ _]?|Huawei[ _]|)Ascend[ _])([^;/]+) Build' - device_replacement: '$1$2' - brand_replacement: 'Huawei' - model_replacement: '$2' - - regex: '; *((?:HUAWEI|Huawei)[ _\-]?)((?:G700-|MT-)[^;/]+) Build' - device_replacement: '$1$2' - brand_replacement: 'Huawei' - model_replacement: '$2' - - regex: '; *((?:HUAWEI|Huawei)[ _\-]?)([^;/]+) Build' - device_replacement: '$1$2' - brand_replacement: 'Huawei' - model_replacement: '$2' - - regex: '; *(MediaPad[^;]+|SpringBoard) Build/Huawei' - device_replacement: '$1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - regex: '; *([^;]+) Build/(?:Huawei|HUAWEI)' - device_replacement: '$1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - regex: '; *([Uu])([89]\d{3}) Build' - device_replacement: '$1$2' - brand_replacement: 'Huawei' - model_replacement: 'U$2' - - regex: '; *(?:Ideos |IDEOS )(S7) Build' - device_replacement: 'Huawei Ideos$1' - brand_replacement: 'Huawei' - model_replacement: 'Ideos$1' - - regex: '; *(?:Ideos |IDEOS )([^;/]+\s*|\s*)Build' - device_replacement: 'Huawei Ideos$1' - brand_replacement: 'Huawei' - model_replacement: 'Ideos$1' - - regex: '; *(Orange Daytona|Pulse|Pulse Mini|Vodafone 858|C8500|C8600|C8650|C8660|Nexus 6P|ATH-.+?) Build[/ ]' - device_replacement: 'Huawei $1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - regex: '; *((?:[A-Z]{3})\-L[A-Za0-9]{2})[\)]' - device_replacement: 'Huawei $1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - ######### - # HTC - # @ref: http://www.htc.com/www/products/ - # @ref: http://en.wikipedia.org/wiki/List_of_HTC_phones - ######### - - - regex: '; *HTC[ _]([^;]+); Windows Phone' - device_replacement: 'HTC $1' - brand_replacement: 'HTC' - model_replacement: '$1' - - # Android HTC with Version Number matcher - # ; HTC_0P3Z11/1.12.161.3 Build - # ;HTC_A3335 V2.38.841.1 Build - - regex: '; *(?:HTC[ _/])+([^ _/]+)(?:[/\\]1\.0 | V|/| +)\d+\.\d[\d\.]*(?: *Build|\))' - device_replacement: 'HTC $1' - brand_replacement: 'HTC' - model_replacement: '$1' - - regex: '; *(?:HTC[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)|)(?:[/\\]1\.0 | V|/| +)\d+\.\d[\d\.]*(?: *Build|\))' - device_replacement: 'HTC $1 $2' - brand_replacement: 'HTC' - model_replacement: '$1 $2' - - regex: '; *(?:HTC[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/]+)|)|)(?:[/\\]1\.0 | V|/| +)\d+\.\d[\d\.]*(?: *Build|\))' - device_replacement: 'HTC $1 $2 $3' - brand_replacement: 'HTC' - model_replacement: '$1 $2 $3' - - regex: '; *(?:HTC[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/]+)|)|)|)(?:[/\\]1\.0 | V|/| +)\d+\.\d[\d\.]*(?: *Build|\))' - device_replacement: 'HTC $1 $2 $3 $4' - brand_replacement: 'HTC' - model_replacement: '$1 $2 $3 $4' - - # Android HTC without Version Number matcher - - regex: '; *(?:(?:HTC|htc)(?:_blocked|)[ _/])+([^ _/;]+)(?: *Build|[;\)]| - )' - device_replacement: 'HTC $1' - brand_replacement: 'HTC' - model_replacement: '$1' - - regex: '; *(?:(?:HTC|htc)(?:_blocked|)[ _/])+([^ _/]+)(?:[ _/]([^ _/;\)]+)|)(?: *Build|[;\)]| - )' - device_replacement: 'HTC $1 $2' - brand_replacement: 'HTC' - model_replacement: '$1 $2' - - regex: '; *(?:(?:HTC|htc)(?:_blocked|)[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/;\)]+)|)|)(?: *Build|[;\)]| - )' - device_replacement: 'HTC $1 $2 $3' - brand_replacement: 'HTC' - model_replacement: '$1 $2 $3' - - regex: '; *(?:(?:HTC|htc)(?:_blocked|)[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ /;]+)|)|)|)(?: *Build|[;\)]| - )' - device_replacement: 'HTC $1 $2 $3 $4' - brand_replacement: 'HTC' - model_replacement: '$1 $2 $3 $4' - - # HTC Streaming Player - - regex: 'HTC Streaming Player [^\/]*/[^\/]*/ htc_([^/]+) /' - device_replacement: 'HTC $1' - brand_replacement: 'HTC' - model_replacement: '$1' - # general matcher for anything else - - regex: '(?:[;,] *|^)(?:htccn_chs-|)HTC[ _-]?([^;]+?)(?: *Build|clay|Android|-?Mozilla| Opera| Profile| UNTRUSTED|[;/\(\)]|$)' - regex_flag: 'i' - device_replacement: 'HTC $1' - brand_replacement: 'HTC' - model_replacement: '$1' - # Android matchers without HTC - - regex: '; *(A6277|ADR6200|ADR6300|ADR6350|ADR6400[A-Z]*|ADR6425[A-Z]*|APX515CKT|ARIA|Desire[^_ ]*|Dream|EndeavorU|Eris|Evo|Flyer|HD2|Hero|HERO200|Hero CDMA|HTL21|Incredible|Inspire[A-Z0-9]*|Legend|Liberty|Nexus ?(?:One|HD2)|One|One S C2|One[ _]?(?:S|V|X\+?)\w*|PC36100|PG06100|PG86100|S31HT|Sensation|Wildfire)(?: Build|[/;\(\)])' - regex_flag: 'i' - device_replacement: 'HTC $1' - brand_replacement: 'HTC' - model_replacement: '$1' - - regex: '; *(ADR6200|ADR6400L|ADR6425LVW|Amaze|DesireS?|EndeavorU|Eris|EVO|Evo\d[A-Z]+|HD2|IncredibleS?|Inspire[A-Z0-9]*|Inspire[A-Z0-9]*|Sensation[A-Z0-9]*|Wildfire)[ _-](.+?)(?:[/;\)]|Build|MIUI|1\.0)' - regex_flag: 'i' - device_replacement: 'HTC $1 $2' - brand_replacement: 'HTC' - model_replacement: '$1 $2' - - ######### - # Hyundai - # @ref: http://www.hyundaitechnologies.com - ######### - - regex: '; *HYUNDAI (T\d[^/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Hyundai $1' - brand_replacement: 'Hyundai' - model_replacement: '$1' - - regex: '; *HYUNDAI ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Hyundai $1' - brand_replacement: 'Hyundai' - model_replacement: '$1' - # X900? http://www.amazon.com/Hyundai-X900-Retina-Android-Bluetooth/dp/B00AO07H3O - - regex: '; *(X700|Hold X|MB-6900)(?: Build|\) AppleWebKit)' - device_replacement: 'Hyundai $1' - brand_replacement: 'Hyundai' - model_replacement: '$1' - - ######### - # iBall - # @ref: http://www.iball.co.in/Category/Mobiles/22 - ######### - - regex: '; *(?:iBall[ _\-]|)(Andi)[ _]?(\d[^;/]*)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'iBall' - model_replacement: '$1 $2' - - regex: '; *(IBall)(?:[ _]([^;/]+?)|)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'iBall' - model_replacement: '$2' - - ######### - # IconBIT - # @ref: http://www.iconbit.com/catalog/tablets/ - ######### - - regex: '; *(NT-\d+[^ ;/]*|Net[Tt]AB [^;/]+|Mercury [A-Z]+|iconBIT)(?: S/N:[^;/]+|)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'IconBIT' - model_replacement: '$1' - - ######### - # IMO - # @ref: http://www.ponselimo.com/ - ######### - - regex: '; *(IMO)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'IMO' - model_replacement: '$2' - - ######### - # i-mobile - # @ref: http://www.i-mobilephone.com/ - ######### - - regex: '; *i-?mobile[ _]([^/]+)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'i-mobile $1' - brand_replacement: 'imobile' - model_replacement: '$1' - - regex: '; *(i-(?:style|note)[^/]*)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'i-mobile $1' - brand_replacement: 'imobile' - model_replacement: '$1' - - ######### - # Impression - # @ref: http://impression.ua/planshetnye-kompyutery - ######### - - regex: '; *(ImPAD) ?(\d+(?:.)*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Impression' - model_replacement: '$1 $2' - - ######### - # Infinix - # @ref: http://www.infinixmobility.com/index.html - ######### - - regex: '; *(Infinix)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Infinix' - model_replacement: '$2' - - ######### - # Informer - # @ref: ?? - ######### - - regex: '; *(Informer)[ \-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Informer' - model_replacement: '$2' - - ######### - # Intenso - # @ref: http://www.intenso.de - # @models: 7":TAB 714,TAB 724;8":TAB 814,TAB 824;10":TAB 1004 - ######### - - regex: '; *(TAB) ?([78][12]4)(?: Build|\) AppleWebKit)' - device_replacement: 'Intenso $1' - brand_replacement: 'Intenso' - model_replacement: '$1 $2' - - ######### - # Intex - # @ref: http://intexmobile.in/index.aspx - # @note: Zync also offers a "Cloud Z5" device - ######### - # smartphones - - regex: '; *(?:Intex[ _]|)(AQUA|Aqua)([ _\.\-])([^;/]+?) *(?:Build|;)' - device_replacement: '$1$2$3' - brand_replacement: 'Intex' - model_replacement: '$1 $3' - # matches "INTEX CLOUD X1" - - regex: '; *(?:INTEX|Intex)(?:[_ ]([^\ _;/]+))(?:[_ ]([^\ _;/]+)|) *(?:Build|;)' - device_replacement: '$1 $2' - brand_replacement: 'Intex' - model_replacement: '$1 $2' - # tablets - - regex: '; *([iI]Buddy)[ _]?(Connect)(?:_|\?_| |)([^;/]*) *(?:Build|;)' - device_replacement: '$1 $2 $3' - brand_replacement: 'Intex' - model_replacement: 'iBuddy $2 $3' - - regex: '; *(I-Buddy)[ _]([^;/]+?) *(?:Build|;)' - device_replacement: '$1 $2' - brand_replacement: 'Intex' - model_replacement: 'iBuddy $2' - - ######### - # iOCEAN - # @ref: http://www.iocean.cc/ - ######### - - regex: '; *(iOCEAN) ([^/]+)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'iOCEAN' - model_replacement: '$2' - - ######### - # i.onik - # @ref: http://www.i-onik.de/ - ######### - - regex: '; *(TP\d+(?:\.\d+|)\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'ionik $1' - brand_replacement: 'ionik' - model_replacement: '$1' - - ######### - # IRU.ru - # @ref: http://www.iru.ru/catalog/soho/planetable/ - ######### - - regex: '; *(M702pro)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Iru' - model_replacement: '$1' - - ######### - # Itel Mobile - # @ref: https://www.itel-mobile.com/global/products/ - ######### - - regex: '; *itel ([^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Itel $1' - brand_replacement: 'Itel' - model_replacement: '$1' - - ######### - # Ivio - # @ref: http://www.ivio.com/mobile.php - # @models: DG80,DG20,DE38,DE88,MD70 - ######### - - regex: '; *(DE88Plus|MD70)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Ivio' - model_replacement: '$1' - - regex: '; *IVIO[_\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Ivio' - model_replacement: '$1' - - ######### - # Jaytech - # @ref: http://www.jay-tech.de/jaytech/servlet/frontend/ - ######### - - regex: '; *(TPC-\d+|JAY-TECH)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Jaytech' - model_replacement: '$1' - - ######### - # Jiayu - # @ref: http://www.ejiayu.com/en/Product.html - ######### - - regex: '; *(JY-[^;/]+|G[234]S?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Jiayu' - model_replacement: '$1' - - ######### - # JXD - # @ref: http://www.jxd.hk/ - ######### - - regex: '; *(JXD)[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'JXD' - model_replacement: '$2' - - ######### - # Karbonn - # @ref: http://www.karbonnmobiles.com/products_tablet.php - ######### - - regex: '; *Karbonn[ _]?([^;/]+) *(?:Build|;)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Karbonn' - model_replacement: '$1' - - regex: '; *([^;]+) Build/Karbonn' - device_replacement: '$1' - brand_replacement: 'Karbonn' - model_replacement: '$1' - - regex: '; *(A11|A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2|Titanium S\d) +Build' - device_replacement: '$1' - brand_replacement: 'Karbonn' - model_replacement: '$1' - - ######### - # KDDI (Operator Branded Device) - # @ref: http://www.ipentec.com/document/document.aspx?page=android-useragent - ######### - - regex: '; *(IS01|IS03|IS05|IS\d{2}SH)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Sharp' - model_replacement: '$1' - - regex: '; *(IS04)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Regza' - model_replacement: '$1' - - regex: '; *(IS06|IS\d{2}PT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Pantech' - model_replacement: '$1' - - regex: '; *(IS11S)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'SonyEricsson' - model_replacement: 'Xperia Acro' - - regex: '; *(IS11CA)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Casio' - model_replacement: 'GzOne $1' - - regex: '; *(IS11LG)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'LG' - model_replacement: 'Optimus X' - - regex: '; *(IS11N)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Medias' - model_replacement: '$1' - - regex: '; *(IS11PT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Pantech' - model_replacement: 'MIRACH' - - regex: '; *(IS12F)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Fujitsu' - model_replacement: 'Arrows ES' - # @ref: https://ja.wikipedia.org/wiki/IS12M - - regex: '; *(IS12M)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Motorola' - model_replacement: 'XT909' - - regex: '; *(IS12S)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'SonyEricsson' - model_replacement: 'Xperia Acro HD' - - regex: '; *(ISW11F)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Fujitsu' - model_replacement: 'Arrowz Z' - - regex: '; *(ISW11HT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: 'EVO' - - regex: '; *(ISW11K)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Kyocera' - model_replacement: 'DIGNO' - - regex: '; *(ISW11M)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Motorola' - model_replacement: 'Photon' - - regex: '; *(ISW11SC)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Samsung' - model_replacement: 'GALAXY S II WiMAX' - - regex: '; *(ISW12HT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: 'EVO 3D' - - regex: '; *(ISW13HT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: 'J' - - regex: '; *(ISW?[0-9]{2}[A-Z]{0,2})(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'KDDI' - model_replacement: '$1' - - regex: '; *(INFOBAR [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'KDDI' - model_replacement: '$1' - - ######### - # Kingcom - # @ref: http://www.e-kingcom.com - ######### - - regex: '; *(JOYPAD|Joypad)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Kingcom' - model_replacement: '$1 $2' - - ######### - # Kobo - # @ref: https://en.wikipedia.org/wiki/Kobo_Inc. - # @ref: http://www.kobo.com/devices#tablets - ######### - - regex: '; *(Vox|VOX|Arc|K080)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Kobo' - model_replacement: '$1' - - regex: '\b(Kobo Touch)\b' - device_replacement: '$1' - brand_replacement: 'Kobo' - model_replacement: '$1' - - ######### - # K-Touch - # @ref: ?? - ######### - - regex: '; *(K-Touch)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'Ktouch' - model_replacement: '$2' - - ######### - # KT Tech - # @ref: http://www.kttech.co.kr - ######### - - regex: '; *((?:EV|KM)-S\d+[A-Z]?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'KTtech' - model_replacement: '$1' - - ######### - # Kyocera - # @ref: http://www.android.com/devices/?country=all&m=kyocera - ######### - - regex: '; *(Zio|Hydro|Torque|Event|EVENT|Echo|Milano|Rise|URBANO PROGRESSO|WX04K|WX06K|WX10K|KYL21|101K|C5[12]\d{2})(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Kyocera' - model_replacement: '$1' - - ######### - # Lava - # @ref: http://www.lavamobiles.com/ - ######### - - regex: '; *(?:LAVA[ _]|)IRIS[ _\-]?([^/;\)]+) *(?:;|\)|Build)' - regex_flag: 'i' - device_replacement: 'Iris $1' - brand_replacement: 'Lava' - model_replacement: 'Iris $1' - - regex: '; *LAVA[ _]([^;/]+) Build' - device_replacement: '$1' - brand_replacement: 'Lava' - model_replacement: '$1' - - ######### - # Lemon - # @ref: http://www.lemonmobiles.com/products.php?type=1 - ######### - - regex: '; *(?:(Aspire A1)|(?:LEMON|Lemon)[ _]([^;/]+))_?(?: Build|\) AppleWebKit)' - device_replacement: 'Lemon $1$2' - brand_replacement: 'Lemon' - model_replacement: '$1$2' - - ######### - # Lenco - # @ref: http://www.lenco.com/c/tablets/ - ######### - - regex: '; *(TAB-1012)(?: Build|\) AppleWebKit)' - device_replacement: 'Lenco $1' - brand_replacement: 'Lenco' - model_replacement: '$1' - - regex: '; Lenco ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Lenco $1' - brand_replacement: 'Lenco' - model_replacement: '$1' - - ######### - # Lenovo - # @ref: http://support.lenovo.com/en_GB/downloads/default.page?# - ######### - - regex: '; *(A1_07|A2107A-H|S2005A-H|S1-37AH0) Build' - device_replacement: '$1' - brand_replacement: 'Lenovo' - model_replacement: '$1' - - regex: '; *(Idea[Tp]ab)[ _]([^;/]+);? Build' - device_replacement: 'Lenovo $1 $2' - brand_replacement: 'Lenovo' - model_replacement: '$1 $2' - - regex: '; *(Idea(?:Tab|pad)) ?([^;/]+) Build' - device_replacement: 'Lenovo $1 $2' - brand_replacement: 'Lenovo' - model_replacement: '$1 $2' - - regex: '; *(ThinkPad) ?(Tablet) Build/' - device_replacement: 'Lenovo $1 $2' - brand_replacement: 'Lenovo' - model_replacement: '$1 $2' - - regex: '; *(?:LNV-|)(?:=?[Ll]enovo[ _\-]?|LENOVO[ _])(.+?)(?:Build|[;/\)])' - device_replacement: 'Lenovo $1' - brand_replacement: 'Lenovo' - model_replacement: '$1' - - regex: '[;,] (?:Vodafone |)(SmartTab) ?(II) ?(\d+) Build/' - device_replacement: 'Lenovo $1 $2 $3' - brand_replacement: 'Lenovo' - model_replacement: '$1 $2 $3' - - regex: '; *(?:Ideapad |)K1 Build/' - device_replacement: 'Lenovo Ideapad K1' - brand_replacement: 'Lenovo' - model_replacement: 'Ideapad K1' - - regex: '; *(3GC101|3GW10[01]|A390) Build/' - device_replacement: '$1' - brand_replacement: 'Lenovo' - model_replacement: '$1' - - regex: '\b(?:Lenovo|LENOVO)+[ _\-]?([^,;:/ ]+)' - device_replacement: 'Lenovo $1' - brand_replacement: 'Lenovo' - model_replacement: '$1' - - ######### - # Lexibook - # @ref: http://www.lexibook.com/fr - ######### - - regex: '; *(MFC\d+)[A-Z]{2}([^;,/]*),?(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Lexibook' - model_replacement: '$1$2' - - ######### - # LG - # @ref: http://www.lg.com/uk/mobile - ######### - - regex: '; *(E[34][0-9]{2}|LS[6-8][0-9]{2}|VS[6-9][0-9]+[^;/]+|Nexus 4|Nexus 5X?|GT540f?|Optimus (?:2X|G|4X HD)|OptimusX4HD) *(?:Build|;)' - device_replacement: '$1' - brand_replacement: 'LG' - model_replacement: '$1' - - regex: '[;:] *(L-\d+[A-Z]|LGL\d+[A-Z]?)(?:/V\d+|) *(?:Build|[;\)])' - device_replacement: '$1' - brand_replacement: 'LG' - model_replacement: '$1' - - regex: '; *(LG-)([A-Z]{1,2}\d{2,}[^,;/\)\(]*?)(?:Build| V\d+|[,;/\)\(]|$)' - device_replacement: '$1$2' - brand_replacement: 'LG' - model_replacement: '$2' - - regex: '; *(LG[ \-]|LG)([^;/]+)[;/]? Build' - device_replacement: '$1$2' - brand_replacement: 'LG' - model_replacement: '$2' - - regex: '^(LG)-([^;/]+)/ Mozilla/.*; Android' - device_replacement: '$1 $2' - brand_replacement: 'LG' - model_replacement: '$2' - - regex: '(Web0S); Linux/(SmartTV)' - device_replacement: 'LG $1 $2' - brand_replacement: 'LG' - model_replacement: '$1 $2' - - ######### - # Malata - # @ref: http://www.malata.com/en/products.aspx?classid=680 - ######### - - regex: '; *((?:SMB|smb)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Malata' - model_replacement: '$1' - - regex: '; *(?:Malata|MALATA) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Malata' - model_replacement: '$1' - - ######### - # Manta - # @ref: http://www.manta.com.pl/en - ######### - - regex: '; *(MS[45][0-9]{3}|MID0[568][NS]?|MID[1-9]|MID[78]0[1-9]|MID970[1-9]|MID100[1-9])(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Manta' - model_replacement: '$1' - - ######### - # Match - # @ref: http://www.match.net.cn/products.asp - ######### - - regex: '; *(M1052|M806|M9000|M9100|M9701|MID100|MID120|MID125|MID130|MID135|MID140|MID701|MID710|MID713|MID727|MID728|MID731|MID732|MID733|MID735|MID736|MID737|MID760|MID800|MID810|MID820|MID830|MID833|MID835|MID860|MID900|MID930|MID933|MID960|MID980)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Match' - model_replacement: '$1' - - ######### - # Maxx - # @ref: http://www.maxxmobile.in/ - # @models: Maxx MSD7-Play, Maxx MX245+ Trance, Maxx AX8 Race, Maxx MSD7 3G- AX50, Maxx Genx Droid 7 - AX40, Maxx AX5 Duo, - # Maxx AX3 Duo, Maxx AX3, Maxx AX8 Note II (Note 2), Maxx AX8 Note I, Maxx AX8, Maxx AX5 Plus, Maxx MSD7 Smarty, - # Maxx AX9Z Race, - # Maxx MT150, Maxx MQ601, Maxx M2020, Maxx Sleek MX463neo, Maxx MX525, Maxx MX192-Tune, Maxx Genx Droid 7 AX353, - # @note: Need more User-Agents!!! - ######### - - regex: '; *(GenxDroid7|MSD7.*?|AX\d.*?|Tab 701|Tab 722)(?: Build|\) AppleWebKit)' - device_replacement: 'Maxx $1' - brand_replacement: 'Maxx' - model_replacement: '$1' - - ######### - # Mediacom - # @ref: http://www.mediacomeurope.it/ - ######### - - regex: '; *(M-PP[^;/]+|PhonePad ?\d{2,}[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Mediacom $1' - brand_replacement: 'Mediacom' - model_replacement: '$1' - - regex: '; *(M-MP[^;/]+|SmartPad ?\d{2,}[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Mediacom $1' - brand_replacement: 'Mediacom' - model_replacement: '$1' - - ######### - # Medion - # @ref: http://www.medion.com/en/ - ######### - - regex: '; *(?:MD_|)LIFETAB[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Medion Lifetab $1' - brand_replacement: 'Medion' - model_replacement: 'Lifetab $1' - - regex: '; *MEDION ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Medion $1' - brand_replacement: 'Medion' - model_replacement: '$1' - - ######### - # Meizu - # @ref: http://www.meizu.com - ######### - - regex: '; *(M030|M031|M035|M040|M065|m9)(?: Build|\) AppleWebKit)' - device_replacement: 'Meizu $1' - brand_replacement: 'Meizu' - model_replacement: '$1' - - regex: '; *(?:meizu_|MEIZU )(.+?) *(?:Build|[;\)])' - device_replacement: 'Meizu $1' - brand_replacement: 'Meizu' - model_replacement: '$1' - - ######### - # Micromax - # @ref: http://www.micromaxinfo.com - ######### - - regex: '; *(?:Micromax[ _](A111|A240)|(A111|A240)) Build' - regex_flag: 'i' - device_replacement: 'Micromax $1$2' - brand_replacement: 'Micromax' - model_replacement: '$1$2' - - regex: '; *Micromax[ _](A\d{2,3}[^;/]*) Build' - regex_flag: 'i' - device_replacement: 'Micromax $1' - brand_replacement: 'Micromax' - model_replacement: '$1' - # be carefull here with Acer e.g. A500 - - regex: '; *(A\d{2}|A[12]\d{2}|A90S|A110Q) Build' - regex_flag: 'i' - device_replacement: 'Micromax $1' - brand_replacement: 'Micromax' - model_replacement: '$1' - - regex: '; *Micromax[ _](P\d{3}[^;/]*) Build' - regex_flag: 'i' - device_replacement: 'Micromax $1' - brand_replacement: 'Micromax' - model_replacement: '$1' - - regex: '; *(P\d{3}|P\d{3}\(Funbook\)) Build' - regex_flag: 'i' - device_replacement: 'Micromax $1' - brand_replacement: 'Micromax' - model_replacement: '$1' - - ######### - # Mito - # @ref: http://new.mitomobile.com/ - ######### - - regex: '; *(MITO)[ _\-]?([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'Mito' - model_replacement: '$2' - - ######### - # Mobistel - # @ref: http://www.mobistel.com/ - ######### - - regex: '; *(Cynus)[ _](F5|T\d|.+?) *(?:Build|[;/\)])' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'Mobistel' - model_replacement: '$1 $2' - - ######### - # Modecom - # @ref: http://www.modecom.eu/tablets/portal/ - ######### - - regex: '; *(MODECOM |)(FreeTab) ?([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1$2 $3' - brand_replacement: 'Modecom' - model_replacement: '$2 $3' - - regex: '; *(MODECOM )([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'Modecom' - model_replacement: '$2' - - ######### - # Motorola - # @ref: http://www.motorola.com/us/shop-all-mobile-phones/ - ######### - - regex: '; *(MZ\d{3}\+?|MZ\d{3} 4G|Xoom|XOOM[^;/]*) Build' - device_replacement: 'Motorola $1' - brand_replacement: 'Motorola' - model_replacement: '$1' - - regex: '; *(Milestone )(XT[^;/]*) Build' - device_replacement: 'Motorola $1$2' - brand_replacement: 'Motorola' - model_replacement: '$2' - - regex: '; *(Motoroi ?x|Droid X|DROIDX) Build' - regex_flag: 'i' - device_replacement: 'Motorola $1' - brand_replacement: 'Motorola' - model_replacement: 'DROID X' - - regex: '; *(Droid[^;/]*|DROID[^;/]*|Milestone[^;/]*|Photon|Triumph|Devour|Titanium) Build' - device_replacement: 'Motorola $1' - brand_replacement: 'Motorola' - model_replacement: '$1' - - regex: '; *(A555|A85[34][^;/]*|A95[356]|ME[58]\d{2}\+?|ME600|ME632|ME722|MB\d{3}\+?|MT680|MT710|MT870|MT887|MT917|WX435|WX453|WX44[25]|XT\d{3,4}[A-Z\+]*|CL[iI]Q|CL[iI]Q XT) Build' - device_replacement: '$1' - brand_replacement: 'Motorola' - model_replacement: '$1' - - regex: '; *(Motorola MOT-|Motorola[ _\-]|MOT\-?)([^;/]+) Build' - device_replacement: '$1$2' - brand_replacement: 'Motorola' - model_replacement: '$2' - - regex: '; *(Moto[_ ]?|MOT\-)([^;/]+) Build' - device_replacement: '$1$2' - brand_replacement: 'Motorola' - model_replacement: '$2' - - ######### - # MpMan - # @ref: http://www.mpmaneurope.com - ######### - - regex: '; *((?:MP[DQ]C|MPG\d{1,4}|MP\d{3,4}|MID(?:(?:10[234]|114|43|7[247]|8[24]|7)C|8[01]1))[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Mpman' - model_replacement: '$1' - - ######### - # MSI - # @ref: http://www.msi.com/product/windpad/ - ######### - - regex: '; *(?:MSI[ _]|)(Primo\d+|Enjoy[ _\-][^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'Msi' - model_replacement: '$1' - - ######### - # Multilaser - # http://www.multilaser.com.br/listagem_produtos.php?cat=5 - ######### - - regex: '; *Multilaser[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Multilaser' - model_replacement: '$1' - - ######### - # MyPhone - # @ref: http://myphone.com.ph/ - ######### - - regex: '; *(My)[_]?(Pad)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2 $3' - brand_replacement: 'MyPhone' - model_replacement: '$1$2 $3' - - regex: '; *(My)\|?(Phone)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2 $3' - brand_replacement: 'MyPhone' - model_replacement: '$3' - - regex: '; *(A\d+)[ _](Duo|)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'MyPhone' - model_replacement: '$1 $2' - - ######### - # Mytab - # @ref: http://www.mytab.eu/en/category/mytab-products/ - ######### - - regex: '; *(myTab[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Mytab' - model_replacement: '$1' - - ######### - # Nabi - # @ref: https://www.nabitablet.com - ######### - - regex: '; *(NABI2?-)([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Nabi' - model_replacement: '$2' - - ######### - # Nec Medias - # @ref: http://www.n-keitai.com/ - ######### - - regex: '; *(N-\d+[CDE])(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Nec' - model_replacement: '$1' - - regex: '; ?(NEC-)(.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Nec' - model_replacement: '$2' - - regex: '; *(LT-NA7)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Nec' - model_replacement: 'Lifetouch Note' - - ######### - # Nextbook - # @ref: http://nextbookusa.com - ######### - - regex: '; *(NXM\d+[A-Za-z0-9_]*|Next\d[A-Za-z0-9_ \-]*|NEXT\d[A-Za-z0-9_ \-]*|Nextbook [A-Za-z0-9_ ]*|DATAM803HC|M805)(?: Build|[\);])' - device_replacement: '$1' - brand_replacement: 'Nextbook' - model_replacement: '$1' - - ######### - # Nokia - # @ref: http://www.nokia.com - ######### - - regex: '; *(Nokia)([ _\-]*)([^;/]*) Build' - regex_flag: 'i' - device_replacement: '$1$2$3' - brand_replacement: 'Nokia' - model_replacement: '$3' - - regex: '; *(TA\-\d{4})(?: Build|\) AppleWebKit)' - device_replacement: 'Nokia $1' - brand_replacement: 'Nokia' - model_replacement: '$1' - - ######### - # Nook - # @ref: - # TODO nook browser/1.0 - ######### - - regex: '; *(Nook ?|Barnes & Noble Nook |BN )([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Nook' - model_replacement: '$2' - - regex: '; *(NOOK |)(BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Nook' - model_replacement: '$2' - - regex: '; Build/(Nook)' - device_replacement: '$1' - brand_replacement: 'Nook' - model_replacement: 'Tablet' - - ######### - # Olivetti - # @ref: http://www.olivetti.de/EN/Page/t02/view_html?idp=348 - ######### - - regex: '; *(OP110|OliPad[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Olivetti $1' - brand_replacement: 'Olivetti' - model_replacement: '$1' - - ######### - # Omega - # @ref: http://omega-technology.eu/en/produkty/346/tablets - # @note: MID tablets might get matched by CobyKyros first - # @models: (T107|MID(?:700[2-5]|7031|7108|7132|750[02]|8001|8500|9001|971[12]) - ######### - - regex: '; *OMEGA[ _\-](MID[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Omega $1' - brand_replacement: 'Omega' - model_replacement: '$1' - - regex: '^(MID7500|MID\d+) Mozilla/5\.0 \(iPad;' - device_replacement: 'Omega $1' - brand_replacement: 'Omega' - model_replacement: '$1' - - ######### - # OpenPeak - # @ref: https://support.google.com/googleplay/answer/1727131?hl=en - ######### - - regex: '; *((?:CIUS|cius)[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Openpeak $1' - brand_replacement: 'Openpeak' - model_replacement: '$1' - - ######### - # Oppo - # @ref: http://en.oppo.com/products/ - ######### - - regex: '; *(Find ?(?:5|7a)|R8[012]\d{1,2}|T703\d?|U70\d{1,2}T?|X90\d{1,2}|[AFR]\d{1,2}[a-z]{1,2})(?: Build|\) AppleWebKit)' - device_replacement: 'Oppo $1' - brand_replacement: 'Oppo' - model_replacement: '$1' - - regex: '; *OPPO ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Oppo $1' - brand_replacement: 'Oppo' - model_replacement: '$1' - - regex: '; *(CPH\d{1,4}|RMX\d{1,4}|P[A-Z]{3}\d{2})(?: Build|\) AppleWebKit)' - device_replacement: 'Oppo $1' - brand_replacement: 'Oppo' - - regex: '; *(A1601)(?: Build|\) AppleWebKit)' - device_replacement: 'Oppo F1s' - brand_replacement: 'Oppo' - model_replacement: '$1' - - ######### - # Odys - # @ref: http://odys.de - ######### - - regex: '; *(?:Odys\-|ODYS\-|ODYS )([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Odys $1' - brand_replacement: 'Odys' - model_replacement: '$1' - - regex: '; *(SELECT) ?(7)(?: Build|\) AppleWebKit)' - device_replacement: 'Odys $1 $2' - brand_replacement: 'Odys' - model_replacement: '$1 $2' - - regex: '; *(PEDI)_(PLUS)_(W)(?: Build|\) AppleWebKit)' - device_replacement: 'Odys $1 $2 $3' - brand_replacement: 'Odys' - model_replacement: '$1 $2 $3' - # Weltbild - Tablet PC 4 = Cat Phoenix = Odys Tablet PC 4? - - regex: '; *(AEON|BRAVIO|FUSION|FUSION2IN1|Genio|EOS10|IEOS[^;/]*|IRON|Loox|LOOX|LOOX Plus|Motion|NOON|NOON_PRO|NEXT|OPOS|PEDI[^;/]*|PRIME[^;/]*|STUDYTAB|TABLO|Tablet-PC-4|UNO_X8|XELIO[^;/]*|Xelio ?\d+ ?[Pp]ro|XENO10|XPRESS PRO)(?: Build|\) AppleWebKit)' - device_replacement: 'Odys $1' - brand_replacement: 'Odys' - model_replacement: '$1' - - ######### - # OnePlus - # @ref https://oneplus.net/ - ######### - - regex: '; (ONE [a-zA-Z]\d+)(?: Build|\) AppleWebKit)' - device_replacement: 'OnePlus $1' - brand_replacement: 'OnePlus' - model_replacement: '$1' - - regex: '; (ONEPLUS [a-zA-Z]\d+)(?: Build|\) AppleWebKit)' - device_replacement: 'OnePlus $1' - brand_replacement: 'OnePlus' - model_replacement: '$1' - - ######### - # Orion - # @ref: http://www.orion.ua/en/products/computer-products/tablet-pcs.html - ######### - - regex: '; *(TP-\d+)(?: Build|\) AppleWebKit)' - device_replacement: 'Orion $1' - brand_replacement: 'Orion' - model_replacement: '$1' - - ######### - # PackardBell - # @ref: http://www.packardbell.com/pb/en/AE/content/productgroup/tablets - ######### - - regex: '; *(G100W?)(?: Build|\) AppleWebKit)' - device_replacement: 'PackardBell $1' - brand_replacement: 'PackardBell' - model_replacement: '$1' - - ######### - # Panasonic - # @ref: http://panasonic.jp/mobile/ - # @models: T11, T21, T31, P11, P51, Eluga Power, Eluga DL1 - # @models: (tab) Toughpad FZ-A1, Toughpad JT-B1 - ######### - - regex: '; *(Panasonic)[_ ]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - # Toughpad - - regex: '; *(FZ-A1B|JT-B1)(?: Build|\) AppleWebKit)' - device_replacement: 'Panasonic $1' - brand_replacement: 'Panasonic' - model_replacement: '$1' - # Eluga Power - - regex: '; *(dL1|DL1)(?: Build|\) AppleWebKit)' - device_replacement: 'Panasonic $1' - brand_replacement: 'Panasonic' - model_replacement: '$1' - - ######### - # Pantech - # @href: http://www.pantech.co.kr/en/prod/prodList.do?gbrand=PANTECH - # @href: http://www.pantech.co.kr/en/prod/prodList.do?gbrand=VEGA - # @models: ADR8995, ADR910L, ADR930VW, C790, CDM8992, CDM8999, IS06, IS11PT, P2000, P2020, P2030, P4100, P5000, P6010, P6020, P6030, P7000, P7040, P8000, P8010, P9020, P9050, P9060, P9070, P9090, PT001, PT002, PT003, TXT8040, TXT8045, VEGA PTL21 - ######### - - regex: '; *(SKY[ _]|)(IM\-[AT]\d{3}[^;/]+).* Build/' - device_replacement: 'Pantech $1$2' - brand_replacement: 'Pantech' - model_replacement: '$1$2' - - regex: '; *((?:ADR8995|ADR910L|ADR930L|ADR930VW|PTL21|P8000)(?: 4G|)) Build/' - device_replacement: '$1' - brand_replacement: 'Pantech' - model_replacement: '$1' - - regex: '; *Pantech([^;/]+).* Build/' - device_replacement: 'Pantech $1' - brand_replacement: 'Pantech' - model_replacement: '$1' - - ######### - # Papayre - # @ref: http://grammata.es/ - ######### - - regex: '; *(papyre)[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'Papyre' - model_replacement: '$2' - - ######### - # Pearl - # @ref: http://www.pearl.de/c-1540.shtml - ######### - - regex: '; *(?:Touchlet )?(X10\.[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Pearl $1' - brand_replacement: 'Pearl' - model_replacement: '$1' - - ######### - # Phicomm - # @ref: http://www.phicomm.com.cn/ - ######### - - regex: '; PHICOMM (i800)(?: Build|\) AppleWebKit)' - device_replacement: 'Phicomm $1' - brand_replacement: 'Phicomm' - model_replacement: '$1' - - regex: '; PHICOMM ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Phicomm $1' - brand_replacement: 'Phicomm' - model_replacement: '$1' - - regex: '; *(FWS\d{3}[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Phicomm $1' - brand_replacement: 'Phicomm' - model_replacement: '$1' - - ######### - # Philips - # @ref: http://www.support.philips.com/support/catalog/products.jsp?_dyncharset=UTF-8&country=&categoryid=MOBILE_PHONES_SMART_SU_CN_CARE&userLanguage=en&navCount=2&groupId=PC_PRODUCTS_AND_PHONES_GR_CN_CARE&catalogType=&navAction=push&userCountry=cn&title=Smartphones&cateId=MOBILE_PHONES_CA_CN_CARE - # @TODO: Philips Tablets User-Agents missing! - # @ref: http://www.support.philips.com/support/catalog/products.jsp?_dyncharset=UTF-8&country=&categoryid=ENTERTAINMENT_TABLETS_SU_CN_CARE&userLanguage=en&navCount=0&groupId=&catalogType=&navAction=push&userCountry=cn&title=Entertainment+Tablets&cateId=TABLETS_CA_CN_CARE - ######### - # @note: this a best guess according to available philips models. Need more User-Agents - - regex: '; *(D633|D822|D833|T539|T939|V726|W335|W336|W337|W3568|W536|W5510|W626|W632|W6350|W6360|W6500|W732|W736|W737|W7376|W820|W832|W8355|W8500|W8510|W930)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Philips' - model_replacement: '$1' - - regex: '; *(?:Philips|PHILIPS)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Philips $1' - brand_replacement: 'Philips' - model_replacement: '$1' - - ######### - # Pipo - # @ref: http://www.pipo.cn/En/ - ######### - - regex: 'Android 4\..*; *(M[12356789]|U[12368]|S[123])\ ?(pro)?(?: Build|\) AppleWebKit)' - device_replacement: 'Pipo $1$2' - brand_replacement: 'Pipo' - model_replacement: '$1$2' - - ######### - # Ployer - # @ref: http://en.ployer.cn/ - ######### - - regex: '; *(MOMO[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Ployer' - model_replacement: '$1' - - ######### - # Polaroid/ Acho - # @ref: http://polaroidstore.com/store/start.asp?category_id=382&category_id2=0&order=title&filter1=&filter2=&filter3=&view=all - ######### - - regex: '; *(?:Polaroid[ _]|)((?:MIDC\d{3,}|PMID\d{2,}|PTAB\d{3,})[^;/]*?)(\/[^;/]*|)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Polaroid' - model_replacement: '$1' - - regex: '; *(?:Polaroid )(Tablet)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Polaroid' - model_replacement: '$1' - - ######### - # Pomp - # @ref: http://pompmobileshop.com/ - ######### - #~ TODO - - regex: '; *(POMP)[ _\-](.+?) *(?:Build|[;/\)])' - device_replacement: '$1 $2' - brand_replacement: 'Pomp' - model_replacement: '$2' - - ######### - # Positivo - # @ref: http://www.positivoinformatica.com.br/www/pessoal/tablet-ypy/ - ######### - - regex: '; *(TB07STA|TB10STA|TB07FTA|TB10FTA)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Positivo' - model_replacement: '$1' - - regex: '; *(?:Positivo |)((?:YPY|Ypy)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Positivo' - model_replacement: '$1' - - ######### - # POV - # @ref: http://www.pointofview-online.com/default2.php - # @TODO: Smartphone Models MOB-3515, MOB-5045-B missing - ######### - - regex: '; *(MOB-[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'POV' - model_replacement: '$1' - - regex: '; *POV[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'POV $1' - brand_replacement: 'POV' - model_replacement: '$1' - - regex: '; *((?:TAB-PLAYTAB|TAB-PROTAB|PROTAB|PlayTabPro|Mobii[ _\-]|TAB-P)[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'POV $1' - brand_replacement: 'POV' - model_replacement: '$1' - - ######### - # Prestigio - # @ref: http://www.prestigio.com/catalogue/MultiPhones - # @ref: http://www.prestigio.com/catalogue/MultiPads - ######### - - regex: '; *(?:Prestigio |)((?:PAP|PMP)\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Prestigio $1' - brand_replacement: 'Prestigio' - model_replacement: '$1' - - ######### - # Proscan - # @ref: http://www.proscanvideo.com/products-search.asp?itemClass=TABLET&itemnmbr= - ######### - - regex: '; *(PLT[0-9]{4}.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Proscan' - model_replacement: '$1' - - ######### - # QMobile - # @ref: http://www.qmobile.com.pk/ - ######### - - regex: '; *(A2|A5|A8|A900)_?(Classic|)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Qmobile' - model_replacement: '$1 $2' - - regex: '; *(Q[Mm]obile)_([^_]+)_([^_]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Qmobile $2 $3' - brand_replacement: 'Qmobile' - model_replacement: '$2 $3' - - regex: '; *(Q\-?[Mm]obile)[_ ](A[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Qmobile $2' - brand_replacement: 'Qmobile' - model_replacement: '$2' - - ######### - # Qmobilevn - # @ref: http://qmobile.vn/san-pham.html - ######### - - regex: '; *(Q\-Smart)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Qmobilevn' - model_replacement: '$2' - - regex: '; *(Q\-?[Mm]obile)[ _\-](S[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Qmobilevn' - model_replacement: '$2' - - ######### - # Quanta - # @ref: ? - ######### - - regex: '; *(TA1013)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Quanta' - model_replacement: '$1' - - ######### - # RCA - # @ref: http://rcamobilephone.com/ - ######### - - regex: '; (RCT\w+)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'RCA' - model_replacement: '$1' - - regex: '; RCA (\w+)(?: Build|\) AppleWebKit)' - device_replacement: 'RCA $1' - brand_replacement: 'RCA' - model_replacement: '$1' - - ######### - # Rockchip - # @ref: http://www.rock-chips.com/a/cn/product/index.html - # @note: manufacturer sells chipsets - I assume that these UAs are dev-boards - ######### - - regex: '; *(RK\d+),?(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Rockchip' - model_replacement: '$1' - - regex: ' Build/(RK\d+)' - device_replacement: '$1' - brand_replacement: 'Rockchip' - model_replacement: '$1' - - ######### - # Samsung Android Devices - # @ref: http://www.samsung.com/us/mobile/cell-phones/all-products - ######### - - regex: '; *(SAMSUNG |Samsung |)((?:Galaxy (?:Note II|S\d)|GT-I9082|GT-I9205|GT-N7\d{3}|SM-N9005)[^;/]*)\/?[^;/]* Build/' - device_replacement: 'Samsung $1$2' - brand_replacement: 'Samsung' - model_replacement: '$2' - - regex: '; *(Google |)(Nexus [Ss](?: 4G|)) Build/' - device_replacement: 'Samsung $1$2' - brand_replacement: 'Samsung' - model_replacement: '$2' - - regex: '; *(SAMSUNG |Samsung )([^\/]*)\/[^ ]* Build/' - device_replacement: 'Samsung $2' - brand_replacement: 'Samsung' - model_replacement: '$2' - - regex: '; *(Galaxy(?: Ace| Nexus| S ?II+|Nexus S| with MCR 1.2| Mini Plus 4G|)) Build/' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - regex: '; *(SAMSUNG[ _\-]|)(?:SAMSUNG[ _\-])([^;/]+) Build' - device_replacement: 'Samsung $2' - brand_replacement: 'Samsung' - model_replacement: '$2' - - regex: '; *(SAMSUNG-|)(GT\-[BINPS]\d{4}[^\/]*)(\/[^ ]*) Build' - device_replacement: 'Samsung $1$2$3' - brand_replacement: 'Samsung' - model_replacement: '$2' - - regex: '(?:; *|^)((?:GT\-[BIiNPS]\d{4}|I9\d{2}0[A-Za-z\+]?\b)[^;/\)]*?)(?:Build|Linux|MIUI|[;/\)])' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - regex: '; (SAMSUNG-)([A-Za-z0-9\-]+).* Build/' - device_replacement: 'Samsung $1$2' - brand_replacement: 'Samsung' - model_replacement: '$2' - - regex: '; *((?:SCH|SGH|SHV|SHW|SPH|SC|SM)\-[A-Za-z0-9 ]+)(/?[^ ]*|) Build' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - regex: '; *((?:SC)\-[A-Za-z0-9 ]+)(/?[^ ]*|)\)' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - regex: ' ((?:SCH)\-[A-Za-z0-9 ]+)(/?[^ ]*|) Build' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - regex: '; *(Behold ?(?:2|II)|YP\-G[^;/]+|EK-GC100|SCL21|I9300) Build' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - regex: '; *((?:SCH|SGH|SHV|SHW|SPH|SC|SM)\-[A-Za-z0-9]{5,6})[\)]' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - ######### - # Sharp - # @ref: http://www.sharp-phone.com/en/index.html - # @ref: http://www.android.com/devices/?country=all&m=sharp - ######### - - regex: '; *(SH\-?\d\d[^;/]+|SBM\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Sharp' - model_replacement: '$1' - - regex: '; *(SHARP[ -])([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Sharp' - model_replacement: '$2' - - ######### - # Simvalley - # @ref: http://www.simvalley-mobile.de/ - ######### - - regex: '; *(SPX[_\-]\d[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Simvalley' - model_replacement: '$1' - - regex: '; *(SX7\-PEARL\.GmbH)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Simvalley' - model_replacement: '$1' - - regex: '; *(SP[T]?\-\d{2}[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Simvalley' - model_replacement: '$1' - - ######### - # SK Telesys - # @ref: http://www.sk-w.com/phone/phone_list.jsp - # @ref: http://www.android.com/devices/?country=all&m=sk-telesys - ######### - - regex: '; *(SK\-.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'SKtelesys' - model_replacement: '$1' - - ######### - # Skytex - # @ref: http://skytex.com/android - ######### - - regex: '; *(?:SKYTEX|SX)-([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Skytex' - model_replacement: '$1' - - regex: '; *(IMAGINE [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Skytex' - model_replacement: '$1' - - ######### - # SmartQ - # @ref: http://en.smartdevices.com.cn/Products/ - # @models: Z8, X7, U7H, U7, T30, T20, Ten3, V5-II, T7-3G, SmartQ5, K7, S7, Q8, T19, Ten2, Ten, R10, T7, R7, V5, V7, SmartQ7 - ######### - - regex: '; *(SmartQ) ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ######### - # Smartbitt - # @ref: http://www.smartbitt.com/ - # @missing: SBT Useragents - ######### - - regex: '; *(WF7C|WF10C|SBT[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Smartbitt' - model_replacement: '$1' - - ######### - # Softbank (Operator Branded Devices) - # @ref: http://www.ipentec.com/document/document.aspx?page=android-useragent - ######### - - regex: '; *(SBM(?:003SH|005SH|006SH|007SH|102SH)) Build' - device_replacement: '$1' - brand_replacement: 'Sharp' - model_replacement: '$1' - - regex: '; *(003P|101P|101P11C|102P) Build' - device_replacement: '$1' - brand_replacement: 'Panasonic' - model_replacement: '$1' - - regex: '; *(00\dZ) Build/' - device_replacement: '$1' - brand_replacement: 'ZTE' - model_replacement: '$1' - - regex: '; HTC(X06HT) Build' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: '$1' - - regex: '; *(001HT|X06HT) Build' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: '$1' - - regex: '; *(201M) Build' - device_replacement: '$1' - brand_replacement: 'Motorola' - model_replacement: 'XT902' - - ######### - # Trekstor - # @ref: http://www.trekstor.co.uk/surftabs-en.html - # @note: Must come before SonyEricsson - ######### - - regex: '; *(ST\d{4}.*)Build/ST' - device_replacement: 'Trekstor $1' - brand_replacement: 'Trekstor' - model_replacement: '$1' - - regex: '; *(ST\d{4}.*?)(?: Build|\) AppleWebKit)' - device_replacement: 'Trekstor $1' - brand_replacement: 'Trekstor' - model_replacement: '$1' - - ######### - # SonyEricsson - # @note: Must come before nokia since they also use symbian - # @ref: http://www.android.com/devices/?country=all&m=sony-ericssons - # @TODO: type! - ######### - # android matchers - - regex: '; *(Sony ?Ericsson ?)([^;/]+) Build' - device_replacement: '$1$2' - brand_replacement: 'SonyEricsson' - model_replacement: '$2' - - regex: '; *((?:SK|ST|E|X|LT|MK|MT|WT)\d{2}[a-z0-9]*(?:-o|)|R800i|U20i) Build' - device_replacement: '$1' - brand_replacement: 'SonyEricsson' - model_replacement: '$1' - # TODO X\d+ is wrong - - regex: '; *(Xperia (?:A8|Arc|Acro|Active|Live with Walkman|Mini|Neo|Play|Pro|Ray|X\d+)[^;/]*) Build' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'SonyEricsson' - model_replacement: '$1' - - ######### - # Sony - # @ref: http://www.sonymobile.co.jp/index.html - # @ref: http://www.sonymobile.com/global-en/products/phones/ - # @ref: http://www.sony.jp/tablet/ - ######### - - regex: '; Sony (Tablet[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Sony $1' - brand_replacement: 'Sony' - model_replacement: '$1' - - regex: '; Sony ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Sony $1' - brand_replacement: 'Sony' - model_replacement: '$1' - - regex: '; *(Sony)([A-Za-z0-9\-]+)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - regex: '; *(Xperia [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Sony' - model_replacement: '$1' - - regex: '; *(C(?:1[0-9]|2[0-9]|53|55|6[0-9])[0-9]{2}|D[25]\d{3}|D6[56]\d{2})(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Sony' - model_replacement: '$1' - - regex: '; *(SGP\d{3}|SGPT\d{2})(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Sony' - model_replacement: '$1' - - regex: '; *(NW-Z1000Series)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Sony' - model_replacement: '$1' - - ########## - # Sony PlayStation - # @ref: http://playstation.com - # The Vita spoofs the Kindle - ########## - - regex: 'PLAYSTATION 3' - device_replacement: 'PlayStation 3' - brand_replacement: 'Sony' - model_replacement: 'PlayStation 3' - - regex: '(PlayStation (?:Portable|Vita|\d+))' - device_replacement: '$1' - brand_replacement: 'Sony' - model_replacement: '$1' - - ######### - # Spice - # @ref: http://www.spicemobilephones.co.in/ - ######### - - regex: '; *((?:CSL_Spice|Spice|SPICE|CSL)[ _\-]?|)([Mm][Ii])([ _\-]|)(\d{3}[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2$3$4' - brand_replacement: 'Spice' - model_replacement: 'Mi$4' - - ######### - # Sprint (Operator Branded Devices) - # @ref: - ######### - - regex: '; *(Sprint )(.+?) *(?:Build|[;/])' - device_replacement: '$1$2' - brand_replacement: 'Sprint' - model_replacement: '$2' - - regex: '\b(Sprint)[: ]([^;,/ ]+)' - device_replacement: '$1$2' - brand_replacement: 'Sprint' - model_replacement: '$2' - - ######### - # Tagi - # @ref: ?? - ######### - - regex: '; *(TAGI[ ]?)(MID) ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2$3' - brand_replacement: 'Tagi' - model_replacement: '$2$3' - - ######### - # Tecmobile - # @ref: http://www.tecmobile.com/ - ######### - - regex: '; *(Oyster500|Opal 800)(?: Build|\) AppleWebKit)' - device_replacement: 'Tecmobile $1' - brand_replacement: 'Tecmobile' - model_replacement: '$1' - - ######### - # Tecno - # @ref: www.tecno-mobile.com/‎ - ######### - - regex: '; *(TECNO[ _])([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Tecno' - model_replacement: '$2' - - ######### - # Telechips, Techvision evaluation boards - # @ref: - ######### - - regex: '; *Android for (Telechips|Techvision) ([^ ]+) ' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ######### - # Telstra - # @ref: http://www.telstra.com.au/home-phone/thub-2/ - # @ref: https://support.google.com/googleplay/answer/1727131?hl=en - ######### - - regex: '; *(T-Hub2)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Telstra' - model_replacement: '$1' - - ######### - # Terra - # @ref: http://www.wortmann.de/ - ######### - - regex: '; *(PAD) ?(100[12])(?: Build|\) AppleWebKit)' - device_replacement: 'Terra $1$2' - brand_replacement: 'Terra' - model_replacement: '$1$2' - - ######### - # Texet - # @ref: http://www.texet.ru/tablet/ - ######### - - regex: '; *(T[BM]-\d{3}[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Texet' - model_replacement: '$1' - - ######### - # Thalia - # @ref: http://www.thalia.de/shop/tolino-shine-ereader/show/ - ######### - - regex: '; *(tolino [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Thalia' - model_replacement: '$1' - - regex: '; *Build/.* (TOLINO_BROWSER)' - device_replacement: '$1' - brand_replacement: 'Thalia' - model_replacement: 'Tolino Shine' - - ######### - # Thl - # @ref: http://en.thl.com.cn/Mobile - # @ref: http://thlmobilestore.com - ######### - - regex: '; *(?:CJ[ -])?(ThL|THL)[ -]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Thl' - model_replacement: '$2' - - regex: '; *(T100|T200|T5|W100|W200|W8s)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Thl' - model_replacement: '$1' - - ######### - # T-Mobile (Operator Branded Devices) - ######### - # @ref: https://en.wikipedia.org/wiki/HTC_Hero - - regex: '; *(T-Mobile[ _]G2[ _]Touch) Build' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: 'Hero' - # @ref: https://en.wikipedia.org/wiki/HTC_Desire_Z - - regex: '; *(T-Mobile[ _]G2) Build' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: 'Desire Z' - - regex: '; *(T-Mobile myTouch Q) Build' - device_replacement: '$1' - brand_replacement: 'Huawei' - model_replacement: 'U8730' - - regex: '; *(T-Mobile myTouch) Build' - device_replacement: '$1' - brand_replacement: 'Huawei' - model_replacement: 'U8680' - - regex: '; *(T-Mobile_Espresso) Build' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: 'Espresso' - - regex: '; *(T-Mobile G1) Build' - device_replacement: '$1' - brand_replacement: 'HTC' - model_replacement: 'Dream' - - regex: '\b(T-Mobile ?|)(myTouch)[ _]?([34]G)[ _]?([^\/]*) (?:Mozilla|Build)' - device_replacement: '$1$2 $3 $4' - brand_replacement: 'HTC' - model_replacement: '$2 $3 $4' - - regex: '\b(T-Mobile)_([^_]+)_(.*) Build' - device_replacement: '$1 $2 $3' - brand_replacement: 'Tmobile' - model_replacement: '$2 $3' - - regex: '\b(T-Mobile)[_ ]?(.*?)Build' - device_replacement: '$1 $2' - brand_replacement: 'Tmobile' - model_replacement: '$2' - - ######### - # Tomtec - # @ref: http://www.tom-tec.eu/pages/tablets.php - ######### - - regex: ' (ATP[0-9]{4})(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Tomtec' - model_replacement: '$1' - - ######### - # Tooky - # @ref: http://www.tookymobile.com/ - ######### - - regex: ' *(TOOKY)[ _\-]([^;/]+?) ?(?:Build|;)' - regex_flag: 'i' - device_replacement: '$1 $2' - brand_replacement: 'Tooky' - model_replacement: '$2' - - ######### - # Toshiba - # @ref: http://www.toshiba.co.jp/ - # @missing: LT170, Thrive 7, TOSHIBA STB10 - ######### - - regex: '\b(TOSHIBA_AC_AND_AZ|TOSHIBA_FOLIO_AND_A|FOLIO_AND_A)' - device_replacement: '$1' - brand_replacement: 'Toshiba' - model_replacement: 'Folio 100' - - regex: '; *([Ff]olio ?100)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Toshiba' - model_replacement: 'Folio 100' - - regex: '; *(AT[0-9]{2,3}(?:\-A|LE\-A|PE\-A|SE|a|)|AT7-A|AT1S0|Hikari-iFrame/WDPF-[^;/]+|THRiVE|Thrive)(?: Build|\) AppleWebKit)' - device_replacement: 'Toshiba $1' - brand_replacement: 'Toshiba' - model_replacement: '$1' - - ######### - # Touchmate - # @ref: http://touchmatepc.com/new/ - ######### - - regex: '; *(TM-MID\d+[^;/]+|TOUCHMATE|MID-750)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Touchmate' - model_replacement: '$1' - # @todo: needs verification user-agents missing - - regex: '; *(TM-SM\d+[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Touchmate' - model_replacement: '$1' - - ######### - # Treq - # @ref: http://www.treq.co.id/product - ######### - - regex: '; *(A10 [Bb]asic2?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Treq' - model_replacement: '$1' - - regex: '; *(TREQ[ _\-])([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1$2' - brand_replacement: 'Treq' - model_replacement: '$2' - - ######### - # Umeox - # @ref: http://umeox.com/ - # @models: A936|A603|X-5|X-3 - ######### - # @todo: guessed markers - - regex: '; *(X-?5|X-?3)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Umeox' - model_replacement: '$1' - # @todo: guessed markers - - regex: '; *(A502\+?|A936|A603|X1|X2)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Umeox' - model_replacement: '$1' - - ######### - # Versus - # @ref: http://versusuk.com/support.html - ######### - - regex: '(TOUCH(?:TAB|PAD).+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Versus $1' - brand_replacement: 'Versus' - model_replacement: '$1' - - ######### - # Vertu - # @ref: http://www.vertu.com/ - ######### - - regex: '(VERTU) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'Vertu' - model_replacement: '$2' - - ######### - # Videocon - # @ref: http://www.videoconmobiles.com - ######### - - regex: '; *(Videocon)[ _\-]([^;/]+?) *(?:Build|;)' - device_replacement: '$1 $2' - brand_replacement: 'Videocon' - model_replacement: '$2' - - regex: ' (VT\d{2}[A-Za-z]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Videocon' - model_replacement: '$1' - - ######### - # Viewsonic - # @ref: http://viewsonic.com - ######### - - regex: '; *((?:ViewPad|ViewPhone|VSD)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Viewsonic' - model_replacement: '$1' - - regex: '; *(ViewSonic-)([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'Viewsonic' - model_replacement: '$2' - - regex: '; *(GTablet.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Viewsonic' - model_replacement: '$1' - - ######### - # vivo - # @ref: http://vivo.cn/ - ######### - - regex: '; *([Vv]ivo)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'vivo' - model_replacement: '$2' - - ######### - # Vodafone (Operator Branded Devices) - # @ref: ?? - ######### - - regex: '(Vodafone) (.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ######### - # Walton - # @ref: http://www.waltonbd.com/ - ######### - - regex: '; *(?:Walton[ _\-]|)(Primo[ _\-][^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Walton $1' - brand_replacement: 'Walton' - model_replacement: '$1' - - ######### - # Wiko - # @ref: http://fr.wikomobile.com/collection.php?s=Smartphones - ######### - - regex: '; *(?:WIKO[ \-]|)(CINK\+?|BARRY|BLOOM|DARKFULL|DARKMOON|DARKNIGHT|DARKSIDE|FIZZ|HIGHWAY|IGGY|OZZY|RAINBOW|STAIRWAY|SUBLIM|WAX|CINK [^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Wiko $1' - brand_replacement: 'Wiko' - model_replacement: '$1' - - ######### - # WellcoM - # @ref: ?? - ######### - - regex: '; *WellcoM-([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Wellcom $1' - brand_replacement: 'Wellcom' - model_replacement: '$1' - - ########## - # WeTab - # @ref: http://wetab.mobi/ - ########## - - regex: '(?:(WeTab)-Browser|; (wetab) Build)' - device_replacement: '$1' - brand_replacement: 'WeTab' - model_replacement: 'WeTab' - - ######### - # Wolfgang - # @ref: http://wolfgangmobile.com/ - ######### - - regex: '; *(AT-AS[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Wolfgang $1' - brand_replacement: 'Wolfgang' - model_replacement: '$1' - - ######### - # Woxter - # @ref: http://www.woxter.es/es-es/categories/index - ######### - - regex: '; *(?:Woxter|Wxt) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Woxter $1' - brand_replacement: 'Woxter' - model_replacement: '$1' - - ######### - # Yarvik Zania - # @ref: http://yarvik.com - ######### - - regex: '; *(?:Xenta |Luna |)(TAB[234][0-9]{2}|TAB0[78]-\d{3}|TAB0?9-\d{3}|TAB1[03]-\d{3}|SMP\d{2}-\d{3})(?: Build|\) AppleWebKit)' - device_replacement: 'Yarvik $1' - brand_replacement: 'Yarvik' - model_replacement: '$1' - - ######### - # Yifang - # @note: Needs to be at the very last as manufacturer builds for other brands. - # @ref: http://www.yifangdigital.com/ - # @models: M1010, M1011, M1007, M1008, M1005, M899, M899LP, M909, M8000, - # M8001, M8002, M8003, M849, M815, M816, M819, M805, M878, M780LPW, - # M778, M7000, M7000AD, M7000NBD, M7001, M7002, M7002KBD, M777, M767, - # M789, M799, M769, M757, M755, M753, M752, M739, M729, M723, M712, M727 - ######### - - regex: '; *([A-Z]{2,4})(M\d{3,}[A-Z]{2})([^;\)\/]*)(?: Build|[;\)])' - device_replacement: 'Yifang $1$2$3' - brand_replacement: 'Yifang' - model_replacement: '$2' - - ######### - # XiaoMi - # @ref: http://www.xiaomi.com/event/buyphone - ######### - - regex: '; *((Mi|MI|HM|MI-ONE|Redmi)[ -](NOTE |Note |)[^;/]*) (Build|MIUI)/' - device_replacement: 'XiaoMi $1' - brand_replacement: 'XiaoMi' - model_replacement: '$1' - - regex: '; *((Mi|MI|HM|MI-ONE|Redmi)[ -](NOTE |Note |)[^;/\)]*)' - device_replacement: 'XiaoMi $1' - brand_replacement: 'XiaoMi' - model_replacement: '$1' - - regex: '; *(MIX) (Build|MIUI)/' - device_replacement: 'XiaoMi $1' - brand_replacement: 'XiaoMi' - model_replacement: '$1' - - regex: '; *((MIX) ([^;/]*)) (Build|MIUI)/' - device_replacement: 'XiaoMi $1' - brand_replacement: 'XiaoMi' - model_replacement: '$1' - - ######### - # Xolo - # @ref: http://www.xolo.in/ - ######### - - regex: '; *XOLO[ _]([^;/]*tab.*)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Xolo $1' - brand_replacement: 'Xolo' - model_replacement: '$1' - - regex: '; *XOLO[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Xolo $1' - brand_replacement: 'Xolo' - model_replacement: '$1' - - regex: '; *(q\d0{2,3}[a-z]?)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: 'Xolo $1' - brand_replacement: 'Xolo' - model_replacement: '$1' - - ######### - # Xoro - # @ref: http://www.xoro.de/produkte/ - ######### - - regex: '; *(PAD ?[79]\d+[^;/]*|TelePAD\d+[^;/])(?: Build|\) AppleWebKit)' - device_replacement: 'Xoro $1' - brand_replacement: 'Xoro' - model_replacement: '$1' - - ######### - # Zopo - # @ref: http://www.zopomobiles.com/products.html - ######### - - regex: '; *(?:(?:ZOPO|Zopo)[ _]([^;/]+?)|(ZP ?(?:\d{2}[^;/]+|C2))|(C[2379]))(?: Build|\) AppleWebKit)' - device_replacement: '$1$2$3' - brand_replacement: 'Zopo' - model_replacement: '$1$2$3' - - ######### - # ZiiLabs - # @ref: http://www.ziilabs.com/products/platforms/androidreferencetablets.php - ######### - - regex: '; *(ZiiLABS) (Zii[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'ZiiLabs' - model_replacement: '$2' - - regex: '; *(Zii)_([^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'ZiiLabs' - model_replacement: '$2' - - ######### - # ZTE - # @ref: http://www.ztedevices.com/ - ######### - - regex: '; *(ARIZONA|(?:ATLAS|Atlas) W|D930|Grand (?:[SX][^;]*?|Era|Memo[^;]*?)|JOE|(?:Kis|KIS)\b[^;]*?|Libra|Light [^;]*?|N8[056][01]|N850L|N8000|N9[15]\d{2}|N9810|NX501|Optik|(?:Vip )Racer[^;]*?|RacerII|RACERII|San Francisco[^;]*?|V9[AC]|V55|V881|Z[679][0-9]{2}[A-z]?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'ZTE' - model_replacement: '$1' - - regex: '; *([A-Z]\d+)_USA_[^;]*(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'ZTE' - model_replacement: '$1' - - regex: '; *(SmartTab\d+)[^;]*(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'ZTE' - model_replacement: '$1' - - regex: '; *(?:Blade|BLADE|ZTE-BLADE)([^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'ZTE Blade$1' - brand_replacement: 'ZTE' - model_replacement: 'Blade$1' - - regex: '; *(?:Skate|SKATE|ZTE-SKATE)([^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'ZTE Skate$1' - brand_replacement: 'ZTE' - model_replacement: 'Skate$1' - - regex: '; *(Orange |Optimus )(Monte Carlo|San Francisco)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' - brand_replacement: 'ZTE' - model_replacement: '$1$2' - - regex: '; *(?:ZXY-ZTE_|ZTE\-U |ZTE[\- _]|ZTE-C[_ ])([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'ZTE $1' - brand_replacement: 'ZTE' - model_replacement: '$1' - # operator specific - - regex: '; (BASE) (lutea|Lutea 2|Tab[^;]*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' - brand_replacement: 'ZTE' - model_replacement: '$1 $2' - - regex: '; (Avea inTouch 2|soft stone|tmn smart a7|Movistar[ _]Link)(?: Build|\) AppleWebKit)' - regex_flag: 'i' - device_replacement: '$1' - brand_replacement: 'ZTE' - model_replacement: '$1' - - regex: '; *(vp9plus)\)' - device_replacement: '$1' - brand_replacement: 'ZTE' - model_replacement: '$1' - - ########## - # Zync - # @ref: http://www.zync.in/index.php/our-products/tablet-phablets - ########## - - regex: '; ?(Cloud[ _]Z5|z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900)(?: Build|\) AppleWebKit)' - device_replacement: '$1' - brand_replacement: 'Zync' - model_replacement: '$1' - - ########## - # Kindle - # @note: Needs to be after Sony Playstation Vita as this UA contains Silk/3.2 - # @ref: https://developer.amazon.com/sdk/fire/specifications.html - # @ref: http://amazonsilk.wordpress.com/useful-bits/silk-user-agent/ - ########## - - regex: '; ?(KFOT|Kindle Fire) Build\b' - device_replacement: 'Kindle Fire' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire' - - regex: '; ?(KFOTE|Amazon Kindle Fire2) Build\b' - device_replacement: 'Kindle Fire 2' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire 2' - - regex: '; ?(KFTT) Build\b' - device_replacement: 'Kindle Fire HD' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire HD 7"' - - regex: '; ?(KFJWI) Build\b' - device_replacement: 'Kindle Fire HD 8.9" WiFi' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire HD 8.9" WiFi' - - regex: '; ?(KFJWA) Build\b' - device_replacement: 'Kindle Fire HD 8.9" 4G' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire HD 8.9" 4G' - - regex: '; ?(KFSOWI) Build\b' - device_replacement: 'Kindle Fire HD 7" WiFi' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire HD 7" WiFi' - - regex: '; ?(KFTHWI) Build\b' - device_replacement: 'Kindle Fire HDX 7" WiFi' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire HDX 7" WiFi' - - regex: '; ?(KFTHWA) Build\b' - device_replacement: 'Kindle Fire HDX 7" 4G' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire HDX 7" 4G' - - regex: '; ?(KFAPWI) Build\b' - device_replacement: 'Kindle Fire HDX 8.9" WiFi' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire HDX 8.9" WiFi' - - regex: '; ?(KFAPWA) Build\b' - device_replacement: 'Kindle Fire HDX 8.9" 4G' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire HDX 8.9" 4G' - - regex: '; ?Amazon ([^;/]+) Build\b' - device_replacement: '$1' - brand_replacement: 'Amazon' - model_replacement: '$1' - - regex: '; ?(Kindle) Build\b' - device_replacement: 'Kindle' - brand_replacement: 'Amazon' - model_replacement: 'Kindle' - - regex: '; ?(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+)|) Build\b' - device_replacement: 'Kindle Fire' - brand_replacement: 'Amazon' - model_replacement: 'Kindle Fire$2' - - regex: ' (Kindle)/(\d+\.\d+)' - device_replacement: 'Kindle' - brand_replacement: 'Amazon' - model_replacement: '$1 $2' - - regex: ' (Silk|Kindle)/(\d+)\.' - device_replacement: 'Kindle' - brand_replacement: 'Amazon' - model_replacement: 'Kindle' - - ######### - # Devices from chinese manufacturer(s) - # @note: identified by x-wap-profile http://218.249.47.94/Xianghe/.* - ######### - - regex: '(sprd)\-([^/]+)/' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - # @ref: http://eshinechina.en.alibaba.com/ - - regex: '; *(H\d{2}00\+?) Build' - device_replacement: '$1' - brand_replacement: 'Hero' - model_replacement: '$1' - - regex: '; *(iphone|iPhone5) Build/' - device_replacement: 'Xianghe $1' - brand_replacement: 'Xianghe' - model_replacement: '$1' - - regex: '; *(e\d{4}[a-z]?_?v\d+|v89_[^;/]+)[^;/]+ Build/' - device_replacement: 'Xianghe $1' - brand_replacement: 'Xianghe' - model_replacement: '$1' - - ######### - # Cellular - # @ref: - # @note: Operator branded devices - ######### - - regex: '\bUSCC[_\-]?([^ ;/\)]+)' - device_replacement: '$1' - brand_replacement: 'Cellular' - model_replacement: '$1' - - ###################################################################### - # Windows Phone Parsers - ###################################################################### - - ######### - # Alcatel Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:ALCATEL)[^;]*; *([^;,\)]+)' - device_replacement: 'Alcatel $1' - brand_replacement: 'Alcatel' - model_replacement: '$1' - - ######### - # Asus Windows Phones - ######### - #~ - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:ASUS|Asus)[^;]*; *([^;,\)]+)' - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:ASUS|Asus)[^;]*; *([^;,\)]+)' - device_replacement: 'Asus $1' - brand_replacement: 'Asus' - model_replacement: '$1' - - ######### - # Dell Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:DELL|Dell)[^;]*; *([^;,\)]+)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: '$1' - - ######### - # HTC Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:HTC|Htc|HTC_blocked[^;]*)[^;]*; *(?:HTC|)([^;,\)]+)' - device_replacement: 'HTC $1' - brand_replacement: 'HTC' - model_replacement: '$1' - - ######### - # Huawei Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:HUAWEI)[^;]*; *(?:HUAWEI |)([^;,\)]+)' - device_replacement: 'Huawei $1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - ######### - # LG Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:LG|Lg)[^;]*; *(?:LG[ \-]|)([^;,\)]+)' - device_replacement: 'LG $1' - brand_replacement: 'LG' - model_replacement: '$1' - - ######### - # Noka Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:rv:11; |)(?:NOKIA|Nokia)[^;]*; *(?:NOKIA ?|Nokia ?|LUMIA ?|[Ll]umia ?|)(\d{3,10}[^;\)]*)' - device_replacement: 'Lumia $1' - brand_replacement: 'Nokia' - model_replacement: 'Lumia $1' - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:NOKIA|Nokia)[^;]*; *(RM-\d{3,})' - device_replacement: 'Nokia $1' - brand_replacement: 'Nokia' - model_replacement: '$1' - - regex: '(?:Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)]|WPDesktop;) ?(?:ARM; ?Touch; ?|Touch; ?|)(?:NOKIA|Nokia)[^;]*; *(?:NOKIA ?|Nokia ?|LUMIA ?|[Ll]umia ?|)([^;\)]+)' - device_replacement: 'Nokia $1' - brand_replacement: 'Nokia' - model_replacement: '$1' - - ######### - # Microsoft Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:Microsoft(?: Corporation|))[^;]*; *([^;,\)]+)' - device_replacement: 'Microsoft $1' - brand_replacement: 'Microsoft' - model_replacement: '$1' - - ######### - # Samsung Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:SAMSUNG)[^;]*; *(?:SAMSUNG |)([^;,\.\)]+)' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - ######### - # Toshiba Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:TOSHIBA|FujitsuToshibaMobileCommun)[^;]*; *([^;,\)]+)' - device_replacement: 'Toshiba $1' - brand_replacement: 'Toshiba' - model_replacement: '$1' - - ######### - # Generic Windows Phones - ######### - - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)([^;]+); *([^;,\)]+)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ###################################################################### - # Other Devices Parser - ###################################################################### - - ######### - # Samsung Bada Phones - ######### - - regex: '(?:^|; )SAMSUNG\-([A-Za-z0-9\-]+).* Bada/' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - ######### - # Firefox OS - ######### - - regex: '\(Mobile; ALCATEL ?(One|ONE) ?(Touch|TOUCH) ?([^;/]+?)(?:/[^;]+|); rv:[^\)]+\) Gecko/[^\/]+ Firefox/' - device_replacement: 'Alcatel $1 $2 $3' - brand_replacement: 'Alcatel' - model_replacement: 'One Touch $3' - - regex: '\(Mobile; (?:ZTE([^;]+)|(OpenC)); rv:[^\)]+\) Gecko/[^\/]+ Firefox/' - device_replacement: 'ZTE $1$2' - brand_replacement: 'ZTE' - model_replacement: '$1$2' - - ######### - # KaiOS - ######### - - regex: '\(Mobile; ALCATEL([A-Za-z0-9\-]+); rv:[^\)]+\) Gecko/[^\/]+ Firefox/[^\/]+ KaiOS/' - device_replacement: 'Alcatel $1' - brand_replacement: 'Alcatel' - model_replacement: '$1' - - regex: '\(Mobile; LYF\/([A-Za-z0-9\-]+)\/.+;.+rv:[^\)]+\) Gecko/[^\/]+ Firefox/[^\/]+ KAIOS/' - device_replacement: 'LYF $1' - brand_replacement: 'LYF' - model_replacement: '$1' - - regex: '\(Mobile; Nokia_([A-Za-z0-9\-]+)_.+; rv:[^\)]+\) Gecko/[^\/]+ Firefox/[^\/]+ KAIOS/' - device_replacement: 'Nokia $1' - brand_replacement: 'Nokia' - model_replacement: '$1' - - ########## - # NOKIA - # @note: NokiaN8-00 comes before iphone. Sometimes spoofs iphone - ########## - - regex: 'Nokia(N[0-9]+)([A-Za-z_\-][A-Za-z0-9_\-]*)' - device_replacement: 'Nokia $1' - brand_replacement: 'Nokia' - model_replacement: '$1$2' - - regex: '(?:NOKIA|Nokia)(?:\-| *)(?:([A-Za-z0-9]+)\-[0-9a-f]{32}|([A-Za-z0-9\-]+)(?:UCBrowser)|([A-Za-z0-9\-]+))' - device_replacement: 'Nokia $1$2$3' - brand_replacement: 'Nokia' - model_replacement: '$1$2$3' - - regex: 'Lumia ([A-Za-z0-9\-]+)' - device_replacement: 'Lumia $1' - brand_replacement: 'Nokia' - model_replacement: 'Lumia $1' - # UCWEB Browser on Symbian - - regex: '\(Symbian; U; S60 V5; [A-z]{2}\-[A-z]{2}; (SonyEricsson|Samsung|Nokia|LG)([^;/]+?)\)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - # Nokia Symbian - - regex: '\(Symbian(?:/3|); U; ([^;]+);' - device_replacement: 'Nokia $1' - brand_replacement: 'Nokia' - model_replacement: '$1' - - ########## - # BlackBerry - # @ref: http://www.useragentstring.com/pages/BlackBerry/ - ########## - - regex: 'BB10; ([A-Za-z0-9\- ]+)\)' - device_replacement: 'BlackBerry $1' - brand_replacement: 'BlackBerry' - model_replacement: '$1' - - regex: 'Play[Bb]ook.+RIM Tablet OS' - device_replacement: 'BlackBerry Playbook' - brand_replacement: 'BlackBerry' - model_replacement: 'Playbook' - - regex: 'Black[Bb]erry ([0-9]+);' - device_replacement: 'BlackBerry $1' - brand_replacement: 'BlackBerry' - model_replacement: '$1' - - regex: 'Black[Bb]erry([0-9]+)' - device_replacement: 'BlackBerry $1' - brand_replacement: 'BlackBerry' - model_replacement: '$1' - - regex: 'Black[Bb]erry;' - device_replacement: 'BlackBerry' - brand_replacement: 'BlackBerry' - - ########## - # PALM / HP - # @note: some palm devices must come before iphone. sometimes spoofs iphone in ua - ########## - - regex: '(Pre|Pixi)/\d+\.\d+' - device_replacement: 'Palm $1' - brand_replacement: 'Palm' - model_replacement: '$1' - - regex: 'Palm([0-9]+)' - device_replacement: 'Palm $1' - brand_replacement: 'Palm' - model_replacement: '$1' - - regex: 'Treo([A-Za-z0-9]+)' - device_replacement: 'Palm Treo $1' - brand_replacement: 'Palm' - model_replacement: 'Treo $1' - - regex: 'webOS.*(P160U(?:NA|))/(\d+).(\d+)' - device_replacement: 'HP Veer' - brand_replacement: 'HP' - model_replacement: 'Veer' - - regex: '(Touch[Pp]ad)/\d+\.\d+' - device_replacement: 'HP TouchPad' - brand_replacement: 'HP' - model_replacement: 'TouchPad' - - regex: 'HPiPAQ([A-Za-z0-9]+)/\d+.\d+' - device_replacement: 'HP iPAQ $1' - brand_replacement: 'HP' - model_replacement: 'iPAQ $1' - - regex: 'PDA; (PalmOS)/sony/model ([a-z]+)/Revision' - device_replacement: '$1' - brand_replacement: 'Sony' - model_replacement: '$1 $2' - - ########## - # AppleTV - # No built in browser that I can tell - # Stack Overflow indicated iTunes-AppleTV/4.1 as a known UA for app available and I'm seeing it in live traffic - ########## - - regex: '(Apple\s?TV)' - device_replacement: 'AppleTV' - brand_replacement: 'Apple' - model_replacement: 'AppleTV' - - ######### - # Tesla Model S - ######### - - regex: '(QtCarBrowser)' - device_replacement: 'Tesla Model S' - brand_replacement: 'Tesla' - model_replacement: 'Model S' - - ########## - # iSTUFF - # @note: complete but probably catches spoofs - # ipad and ipod must be parsed before iphone - # cannot determine specific device type from ua string. (3g, 3gs, 4, etc) - ########## - # @note: on some ua the device can be identified e.g. iPhone5,1 - - regex: '(iPhone|iPad|iPod)(\d+,\d+)' - device_replacement: '$1' - brand_replacement: 'Apple' - model_replacement: '$1$2' - # @note: iPad needs to be before iPhone - - regex: '(iPad)(?:;| Simulator;)' - device_replacement: '$1' - brand_replacement: 'Apple' - model_replacement: '$1' - - regex: '(iPod)(?:;| touch;| Simulator;)' - device_replacement: '$1' - brand_replacement: 'Apple' - model_replacement: '$1' - - regex: '(iPhone)(?:;| Simulator;)' - device_replacement: '$1' - brand_replacement: 'Apple' - model_replacement: '$1' - - regex: '(Watch)(\d+,\d+)' - device_replacement: 'Apple $1' - brand_replacement: 'Apple' - model_replacement: '$1$2' - - regex: '(Apple Watch)(?:;| Simulator;)' - device_replacement: '$1' - brand_replacement: 'Apple' - model_replacement: '$1' - - regex: '(HomePod)(?:;| Simulator;)' - device_replacement: '$1' - brand_replacement: 'Apple' - model_replacement: '$1' - - regex: 'iPhone' - device_replacement: 'iPhone' - brand_replacement: 'Apple' - model_replacement: 'iPhone' - # @note: desktop applications show device info - - regex: 'CFNetwork/.* Darwin/\d.*\(((?:Mac|iMac|PowerMac|PowerBook)[^\d]*)(\d+)(?:,|%2C)(\d+)' - device_replacement: '$1$2,$3' - brand_replacement: 'Apple' - model_replacement: '$1$2,$3' - # @note: newer desktop applications don't show device info - # This is here so as to not have them recorded as iOS-Device - - regex: 'CFNetwork/.* Darwin/\d+\.\d+\.\d+ \(x86_64\)' - device_replacement: 'Mac' - brand_replacement: 'Apple' - model_replacement: 'Mac' - # @note: iOS applications do not show device info - - regex: 'CFNetwork/.* Darwin/\d' - device_replacement: 'iOS-Device' - brand_replacement: 'Apple' - model_replacement: 'iOS-Device' - - ########################## - # Outlook on iOS >= 2.62.0 - ########################## - - regex: 'Outlook-(iOS)/\d+\.\d+\.prod\.iphone' - brand_replacement: 'Apple' - device_replacement: 'iPhone' - model_replacement: 'iPhone' - - ########## - # Acer - ########## - - regex: 'acer_([A-Za-z0-9]+)_' - device_replacement: 'Acer $1' - brand_replacement: 'Acer' - model_replacement: '$1' - - ########## - # Alcatel - ########## - - regex: '(?:ALCATEL|Alcatel)-([A-Za-z0-9\-]+)' - device_replacement: 'Alcatel $1' - brand_replacement: 'Alcatel' - model_replacement: '$1' - - ########## - # Amoi - ########## - - regex: '(?:Amoi|AMOI)\-([A-Za-z0-9]+)' - device_replacement: 'Amoi $1' - brand_replacement: 'Amoi' - model_replacement: '$1' - - ########## - # Asus - ########## - - regex: '(?:; |\/|^)((?:Transformer (?:Pad|Prime) |Transformer |PadFone[ _]?)[A-Za-z0-9]*)' - device_replacement: 'Asus $1' - brand_replacement: 'Asus' - model_replacement: '$1' - - regex: '(?:asus.*?ASUS|Asus|ASUS|asus)[\- ;]*((?:Transformer (?:Pad|Prime) |Transformer |Padfone |Nexus[ _]|)[A-Za-z0-9]+)' - device_replacement: 'Asus $1' - brand_replacement: 'Asus' - model_replacement: '$1' - - regex: '(?:ASUS)_([A-Za-z0-9\-]+)' - device_replacement: 'Asus $1' - brand_replacement: 'Asus' - model_replacement: '$1' - - - ########## - # Bird - ########## - - regex: '\bBIRD[ \-\.]([A-Za-z0-9]+)' - device_replacement: 'Bird $1' - brand_replacement: 'Bird' - model_replacement: '$1' - - ########## - # Dell - ########## - - regex: '\bDell ([A-Za-z0-9]+)' - device_replacement: 'Dell $1' - brand_replacement: 'Dell' - model_replacement: '$1' - - ########## - # DoCoMo - ########## - - regex: 'DoCoMo/2\.0 ([A-Za-z0-9]+)' - device_replacement: 'DoCoMo $1' - brand_replacement: 'DoCoMo' - model_replacement: '$1' - - regex: '([A-Za-z0-9]+)_W;FOMA' - device_replacement: 'DoCoMo $1' - brand_replacement: 'DoCoMo' - model_replacement: '$1' - - regex: '([A-Za-z0-9]+);FOMA' - device_replacement: 'DoCoMo $1' - brand_replacement: 'DoCoMo' - model_replacement: '$1' - - ########## - # htc - ########## - - regex: '\b(?:HTC/|HTC/[a-z0-9]+/|)HTC[ _\-;]? *(.*?)(?:-?Mozilla|fingerPrint|[;/\(\)]|$)' - device_replacement: 'HTC $1' - brand_replacement: 'HTC' - model_replacement: '$1' - - ########## - # Huawei - ########## - - regex: 'Huawei([A-Za-z0-9]+)' - device_replacement: 'Huawei $1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - regex: 'HUAWEI-([A-Za-z0-9]+)' - device_replacement: 'Huawei $1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - regex: 'HUAWEI ([A-Za-z0-9\-]+)' - device_replacement: 'Huawei $1' - brand_replacement: 'Huawei' - model_replacement: '$1' - - regex: 'vodafone([A-Za-z0-9]+)' - device_replacement: 'Huawei Vodafone $1' - brand_replacement: 'Huawei' - model_replacement: 'Vodafone $1' - - ########## - # i-mate - ########## - - regex: 'i\-mate ([A-Za-z0-9]+)' - device_replacement: 'i-mate $1' - brand_replacement: 'i-mate' - model_replacement: '$1' - - ########## - # kyocera - ########## - - regex: 'Kyocera\-([A-Za-z0-9]+)' - device_replacement: 'Kyocera $1' - brand_replacement: 'Kyocera' - model_replacement: '$1' - - regex: 'KWC\-([A-Za-z0-9]+)' - device_replacement: 'Kyocera $1' - brand_replacement: 'Kyocera' - model_replacement: '$1' - - ########## - # lenovo - ########## - - regex: 'Lenovo[_\-]([A-Za-z0-9]+)' - device_replacement: 'Lenovo $1' - brand_replacement: 'Lenovo' - model_replacement: '$1' - - ########## - # HbbTV (European and Australian standard) - # written before the LG regexes, as LG is making HbbTV too - ########## - - regex: '(HbbTV)/[0-9]+\.[0-9]+\.[0-9]+ \( ?;(LG)E ?;([^;]{0,30})' - device_replacement: '$1' - brand_replacement: '$2' - model_replacement: '$3' - - regex: '(HbbTV)/1\.1\.1.*CE-HTML/1\.\d;(Vendor/|)(THOM[^;]*?)[;\s].{0,30}(LF[^;]+);?' - device_replacement: '$1' - brand_replacement: 'Thomson' - model_replacement: '$4' - - regex: '(HbbTV)(?:/1\.1\.1|) ?(?: \(;;;;;\)|); *CE-HTML(?:/1\.\d|); *([^ ]+) ([^;]+);' - device_replacement: '$1' - brand_replacement: '$2' - model_replacement: '$3' - - regex: '(HbbTV)/1\.1\.1 \(;;;;;\) Maple_2011' - device_replacement: '$1' - brand_replacement: 'Samsung' - - regex: '(HbbTV)/[0-9]+\.[0-9]+\.[0-9]+ \([^;]{0,30}; ?(?:CUS:([^;]*)|([^;]+)) ?; ?([^;]{0,30})' - device_replacement: '$1' - brand_replacement: '$2$3' - model_replacement: '$4' - - regex: '(HbbTV)/[0-9]+\.[0-9]+\.[0-9]+' - device_replacement: '$1' - - ########## - # LGE NetCast TV - ########## - - regex: 'LGE; (?:Media\/|)([^;]*);[^;]*;[^;]*;?\); "?LG NetCast(\.TV|\.Media|)-\d+' - device_replacement: 'NetCast$2' - brand_replacement: 'LG' - model_replacement: '$1' - - ########## - # InettvBrowser - ########## - - regex: 'InettvBrowser/[0-9]+\.[0-9A-Z]+ \([^;]*;(Sony)([^;]*);[^;]*;[^\)]*\)' - device_replacement: 'Inettv' - brand_replacement: '$1' - model_replacement: '$2' - - regex: 'InettvBrowser/[0-9]+\.[0-9A-Z]+ \([^;]*;([^;]*);[^;]*;[^\)]*\)' - device_replacement: 'Inettv' - brand_replacement: 'Generic_Inettv' - model_replacement: '$1' - - regex: '(?:InettvBrowser|TSBNetTV|NETTV|HBBTV)' - device_replacement: 'Inettv' - brand_replacement: 'Generic_Inettv' - - ########## - # lg - ########## - # LG Symbian Phones - - regex: 'Series60/\d\.\d (LG)[\-]?([A-Za-z0-9 \-]+)' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - # other LG phones - - regex: '\b(?:LGE[ \-]LG\-(?:AX|)|LGE |LGE?-LG|LGE?[ \-]|LG[ /\-]|lg[\-])([A-Za-z0-9]+)\b' - device_replacement: 'LG $1' - brand_replacement: 'LG' - model_replacement: '$1' - - regex: '(?:^LG[\-]?|^LGE[\-/]?)([A-Za-z]+[0-9]+[A-Za-z]*)' - device_replacement: 'LG $1' - brand_replacement: 'LG' - model_replacement: '$1' - - regex: '^LG([0-9]+[A-Za-z]*)' - device_replacement: 'LG $1' - brand_replacement: 'LG' - model_replacement: '$1' - - ########## - # microsoft - ########## - - regex: '(KIN\.[^ ]+) (\d+)\.(\d+)' - device_replacement: 'Microsoft $1' - brand_replacement: 'Microsoft' - model_replacement: '$1' - - regex: '(?:MSIE|XBMC).*\b(Xbox)\b' - device_replacement: '$1' - brand_replacement: 'Microsoft' - model_replacement: '$1' - - regex: '; ARM; Trident/6\.0; Touch[\);]' - device_replacement: 'Microsoft Surface RT' - brand_replacement: 'Microsoft' - model_replacement: 'Surface RT' - - ########## - # motorola - ########## - - regex: 'Motorola\-([A-Za-z0-9]+)' - device_replacement: 'Motorola $1' - brand_replacement: 'Motorola' - model_replacement: '$1' - - regex: 'MOTO\-([A-Za-z0-9]+)' - device_replacement: 'Motorola $1' - brand_replacement: 'Motorola' - model_replacement: '$1' - - regex: 'MOT\-([A-z0-9][A-z0-9\-]*)' - device_replacement: 'Motorola $1' - brand_replacement: 'Motorola' - model_replacement: '$1' - - ########## - # nintendo - ########## - - regex: 'Nintendo WiiU' - device_replacement: 'Nintendo Wii U' - brand_replacement: 'Nintendo' - model_replacement: 'Wii U' - - regex: 'Nintendo (DS|3DS|DSi|Wii);' - device_replacement: 'Nintendo $1' - brand_replacement: 'Nintendo' - model_replacement: '$1' - - ########## - # pantech - ########## - - regex: '(?:Pantech|PANTECH)[ _-]?([A-Za-z0-9\-]+)' - device_replacement: 'Pantech $1' - brand_replacement: 'Pantech' - model_replacement: '$1' - - ########## - # philips - ########## - - regex: 'Philips([A-Za-z0-9]+)' - device_replacement: 'Philips $1' - brand_replacement: 'Philips' - model_replacement: '$1' - - regex: 'Philips ([A-Za-z0-9]+)' - device_replacement: 'Philips $1' - brand_replacement: 'Philips' - model_replacement: '$1' - - ########## - # Samsung - ########## - # Samsung Smart-TV - - regex: '(SMART-TV); .* Tizen ' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - # Samsung Symbian Devices - - regex: 'SymbianOS/9\.\d.* Samsung[/\-]([A-Za-z0-9 \-]+)' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - regex: '(Samsung)(SGH)(i[0-9]+)' - device_replacement: '$1 $2$3' - brand_replacement: '$1' - model_replacement: '$2-$3' - - regex: 'SAMSUNG-ANDROID-MMS/([^;/]+)' - device_replacement: '$1' - brand_replacement: 'Samsung' - model_replacement: '$1' - # Other Samsung - #- regex: 'SAMSUNG(?:; |-)([A-Za-z0-9\-]+)' - - regex: 'SAMSUNG(?:; |[ -/])([A-Za-z0-9\-]+)' - regex_flag: 'i' - device_replacement: 'Samsung $1' - brand_replacement: 'Samsung' - model_replacement: '$1' - - ########## - # Sega - ########## - - regex: '(Dreamcast)' - device_replacement: 'Sega $1' - brand_replacement: 'Sega' - model_replacement: '$1' - - ########## - # Siemens mobile - ########## - - regex: '^SIE-([A-Za-z0-9]+)' - device_replacement: 'Siemens $1' - brand_replacement: 'Siemens' - model_replacement: '$1' - - ########## - # Softbank - ########## - - regex: 'Softbank/[12]\.0/([A-Za-z0-9]+)' - device_replacement: 'Softbank $1' - brand_replacement: 'Softbank' - model_replacement: '$1' - - ########## - # SonyEricsson - ########## - - regex: 'SonyEricsson ?([A-Za-z0-9\-]+)' - device_replacement: 'Ericsson $1' - brand_replacement: 'SonyEricsson' - model_replacement: '$1' - - ########## - # Sony - ########## - - regex: 'Android [^;]+; ([^ ]+) (Sony)/' - device_replacement: '$2 $1' - brand_replacement: '$2' - model_replacement: '$1' - - regex: '(Sony)(?:BDP\/|\/|)([^ /;\)]+)[ /;\)]' - device_replacement: '$1 $2' - brand_replacement: '$1' - model_replacement: '$2' - - ######### - # Puffin Browser Device detect - # A=Android, I=iOS, P=Phone, T=Tablet - # AT=Android+Tablet - ######### - - regex: 'Puffin/[\d\.]+IT' - device_replacement: 'iPad' - brand_replacement: 'Apple' - model_replacement: 'iPad' - - regex: 'Puffin/[\d\.]+IP' - device_replacement: 'iPhone' - brand_replacement: 'Apple' - model_replacement: 'iPhone' - - regex: 'Puffin/[\d\.]+AT' - device_replacement: 'Generic Tablet' - brand_replacement: 'Generic' - model_replacement: 'Tablet' - - regex: 'Puffin/[\d\.]+AP' - device_replacement: 'Generic Smartphone' - brand_replacement: 'Generic' - model_replacement: 'Smartphone' - - ######### - # Android General Device Matching (far from perfect) - ######### - - regex: 'Android[\- ][\d]+\.[\d]+; [A-Za-z]{2}\-[A-Za-z]{0,2}; WOWMobile (.+)( Build[/ ]|\))' - brand_replacement: 'Generic_Android' - model_replacement: '$1' - - regex: 'Android[\- ][\d]+\.[\d]+\-update1; [A-Za-z]{2}\-[A-Za-z]{0,2} *; *(.+?)( Build[/ ]|\))' - brand_replacement: 'Generic_Android' - model_replacement: '$1' - - regex: 'Android[\- ][\d]+(?:\.[\d]+)(?:\.[\d]+|); *[A-Za-z]{2}[_\-][A-Za-z]{0,2}\-? *; *(.+?)( Build[/ ]|\))' - brand_replacement: 'Generic_Android' - model_replacement: '$1' - - regex: 'Android[\- ][\d]+(?:\.[\d]+)(?:\.[\d]+|); *[A-Za-z]{0,2}\- *; *(.+?)( Build[/ ]|\))' - brand_replacement: 'Generic_Android' - model_replacement: '$1' - # No build info at all - "Build" follows locale immediately - - regex: 'Android[\- ][\d]+(?:\.[\d]+)(?:\.[\d]+|); *[a-z]{0,2}[_\-]?[A-Za-z]{0,2};?( Build[/ ]|\))' - device_replacement: 'Generic Smartphone' - brand_replacement: 'Generic' - model_replacement: 'Smartphone' - - regex: 'Android[\- ][\d]+(?:\.[\d]+)(?:\.[\d]+|); *\-?[A-Za-z]{2}; *(.+?)( Build[/ ]|\))' - brand_replacement: 'Generic_Android' - model_replacement: '$1' - - regex: 'Android \d+?(?:\.\d+|)(?:\.\d+|); ([^;]+?)(?: Build|\) AppleWebKit).+? Mobile Safari' - brand_replacement: 'Generic_Android' - model_replacement: '$1' - - regex: 'Android \d+?(?:\.\d+|)(?:\.\d+|); ([^;]+?)(?: Build|\) AppleWebKit).+? Safari' - brand_replacement: 'Generic_Android_Tablet' - model_replacement: '$1' - - regex: 'Android \d+?(?:\.\d+|)(?:\.\d+|); ([^;]+?)(?: Build|\))' - brand_replacement: 'Generic_Android' - model_replacement: '$1' - - ########## - # Google TV - ########## - - regex: '(GoogleTV)' - brand_replacement: 'Generic_Inettv' - model_replacement: '$1' - - ########## - # WebTV - ########## - - regex: '(WebTV)/\d+.\d+' - brand_replacement: 'Generic_Inettv' - model_replacement: '$1' - # Roku Digital-Video-Players https://www.roku.com/ - - regex: '^(Roku)/DVP-\d+\.\d+' - brand_replacement: 'Generic_Inettv' - model_replacement: '$1' - - ########## - # Generic Tablet - ########## - - regex: '(Android 3\.\d|Opera Tablet|Tablet; .+Firefox/|Android.*(?:Tab|Pad))' - regex_flag: 'i' - device_replacement: 'Generic Tablet' - brand_replacement: 'Generic' - model_replacement: 'Tablet' - - ########## - # Generic Smart Phone - ########## - - regex: '(Symbian|\bS60(Version|V\d)|\bS60\b|\((Series 60|Windows Mobile|Palm OS|Bada); Opera Mini|Windows CE|Opera Mobi|BREW|Brew|Mobile; .+Firefox/|iPhone OS|Android|MobileSafari|Windows *Phone|\(webOS/|PalmOS)' - device_replacement: 'Generic Smartphone' - brand_replacement: 'Generic' - model_replacement: 'Smartphone' - - regex: '(hiptop|avantgo|plucker|xiino|blazer|elaine)' - regex_flag: 'i' - device_replacement: 'Generic Smartphone' - brand_replacement: 'Generic' - model_replacement: 'Smartphone' - - ########## - # Spiders (this is a hack...) - ########## - - regex: '(bot|BUbiNG|zao|borg|DBot|oegp|silk|Xenu|zeal|^NING|CCBot|crawl|htdig|lycos|slurp|teoma|voila|yahoo|Sogou|CiBra|Nutch|^Java/|^JNLP/|Daumoa|Daum|Genieo|ichiro|larbin|pompos|Scrapy|snappy|speedy|spider|msnbot|msrbot|vortex|^vortex|crawler|favicon|indexer|Riddler|scooter|scraper|scrubby|WhatWeb|WinHTTP|bingbot|BingPreview|openbot|gigabot|furlbot|polybot|seekbot|^voyager|archiver|Icarus6j|mogimogi|Netvibes|blitzbot|altavista|charlotte|findlinks|Retreiver|TLSProber|WordPress|SeznamBot|ProoXiBot|wsr\-agent|Squrl Java|EtaoSpider|PaperLiBot|SputnikBot|A6\-Indexer|netresearch|searchsight|baiduspider|YisouSpider|ICC\-Crawler|http%20client|Python-urllib|dataparksearch|converacrawler|Screaming Frog|AppEngine-Google|YahooCacheSystem|fast\-webcrawler|Sogou Pic Spider|semanticdiscovery|Innovazion Crawler|facebookexternalhit|Google.*/\+/web/snippet|Google-HTTP-Java-Client|BlogBridge|IlTrovatore-Setaccio|InternetArchive|GomezAgent|WebThumbnail|heritrix|NewsGator|PagePeeker|Reaper|ZooShot|holmes|NL-Crawler|Pingdom|StatusCake|WhatsApp|masscan|Google Web Preview|Qwantify|Yeti|OgScrper)' - regex_flag: 'i' - device_replacement: 'Spider' - brand_replacement: 'Spider' - model_replacement: 'Desktop' - - ########## - # Generic Feature Phone - # take care to do case insensitive matching - ########## - - regex: '^(1207|3gso|4thp|501i|502i|503i|504i|505i|506i|6310|6590|770s|802s|a wa|acer|acs\-|airn|alav|asus|attw|au\-m|aur |aus |abac|acoo|aiko|alco|alca|amoi|anex|anny|anyw|aptu|arch|argo|bmobile|bell|bird|bw\-n|bw\-u|beck|benq|bilb|blac|c55/|cdm\-|chtm|capi|comp|cond|dall|dbte|dc\-s|dica|ds\-d|ds12|dait|devi|dmob|doco|dopo|dorado|el(?:38|39|48|49|50|55|58|68)|el[3456]\d{2}dual|erk0|esl8|ex300|ez40|ez60|ez70|ezos|ezze|elai|emul|eric|ezwa|fake|fly\-|fly_|g\-mo|g1 u|g560|gf\-5|grun|gene|go.w|good|grad|hcit|hd\-m|hd\-p|hd\-t|hei\-|hp i|hpip|hs\-c|htc |htc\-|htca|htcg)' - regex_flag: 'i' - device_replacement: 'Generic Feature Phone' - brand_replacement: 'Generic' - model_replacement: 'Feature Phone' - - regex: '^(htcp|htcs|htct|htc_|haie|hita|huaw|hutc|i\-20|i\-go|i\-ma|i\-mobile|i230|iac|iac\-|iac/|ig01|im1k|inno|iris|jata|kddi|kgt|kgt/|kpt |kwc\-|klon|lexi|lg g|lg\-a|lg\-b|lg\-c|lg\-d|lg\-f|lg\-g|lg\-k|lg\-l|lg\-m|lg\-o|lg\-p|lg\-s|lg\-t|lg\-u|lg\-w|lg/k|lg/l|lg/u|lg50|lg54|lge\-|lge/|leno|m1\-w|m3ga|m50/|maui|mc01|mc21|mcca|medi|meri|mio8|mioa|mo01|mo02|mode|modo|mot |mot\-|mt50|mtp1|mtv |mate|maxo|merc|mits|mobi|motv|mozz|n100|n101|n102|n202|n203|n300|n302|n500|n502|n505|n700|n701|n710|nec\-|nem\-|newg|neon)' - regex_flag: 'i' - device_replacement: 'Generic Feature Phone' - brand_replacement: 'Generic' - model_replacement: 'Feature Phone' - - regex: '^(netf|noki|nzph|o2 x|o2\-x|opwv|owg1|opti|oran|ot\-s|p800|pand|pg\-1|pg\-2|pg\-3|pg\-6|pg\-8|pg\-c|pg13|phil|pn\-2|pt\-g|palm|pana|pire|pock|pose|psio|qa\-a|qc\-2|qc\-3|qc\-5|qc\-7|qc07|qc12|qc21|qc32|qc60|qci\-|qwap|qtek|r380|r600|raks|rim9|rove|s55/|sage|sams|sc01|sch\-|scp\-|sdk/|se47|sec\-|sec0|sec1|semc|sgh\-|shar|sie\-|sk\-0|sl45|slid|smb3|smt5|sp01|sph\-|spv |spv\-|sy01|samm|sany|sava|scoo|send|siem|smar|smit|soft|sony|t\-mo|t218|t250|t600|t610|t618|tcl\-|tdg\-|telm|tim\-|ts70|tsm\-|tsm3|tsm5|tx\-9|tagt)' - regex_flag: 'i' - device_replacement: 'Generic Feature Phone' - brand_replacement: 'Generic' - model_replacement: 'Feature Phone' - - regex: '^(talk|teli|topl|tosh|up.b|upg1|utst|v400|v750|veri|vk\-v|vk40|vk50|vk52|vk53|vm40|vx98|virg|vertu|vite|voda|vulc|w3c |w3c\-|wapj|wapp|wapu|wapm|wig |wapi|wapr|wapv|wapy|wapa|waps|wapt|winc|winw|wonu|x700|xda2|xdag|yas\-|your|zte\-|zeto|aste|audi|avan|blaz|brew|brvw|bumb|ccwa|cell|cldc|cmd\-|dang|eml2|fetc|hipt|http|ibro|idea|ikom|ipaq|jbro|jemu|jigs|keji|kyoc|kyok|libw|m\-cr|midp|mmef|moto|mwbp|mywa|newt|nok6|o2im|pant|pdxg|play|pluc|port|prox|rozo|sama|seri|smal|symb|treo|upsi|vx52|vx53|vx60|vx61|vx70|vx80|vx81|vx83|vx85|wap\-|webc|whit|wmlb|xda\-|xda_)' - regex_flag: 'i' - device_replacement: 'Generic Feature Phone' - brand_replacement: 'Generic' - model_replacement: 'Feature Phone' - - regex: '^(Ice)$' - device_replacement: 'Generic Feature Phone' - brand_replacement: 'Generic' - model_replacement: 'Feature Phone' - - regex: '(wap[\-\ ]browser|maui|netfront|obigo|teleca|up\.browser|midp|Opera Mini)' - regex_flag: 'i' - device_replacement: 'Generic Feature Phone' - brand_replacement: 'Generic' - model_replacement: 'Feature Phone' - - ######### - # Apple - # @ref: https://www.apple.com/mac/ - # @note: lookup Mac OS, but exclude iPad, Apple TV, a HTC phone, Kindle, LG - # @note: put this at the end, since it is hard to implement contains foo, but not contain bar1, bar 2, bar 3 in go's re2 - ######### - - regex: 'Mac OS' - device_replacement: 'Mac' - brand_replacement: 'Apple' - model_replacement: 'Mac' \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index fda78974db..06ad3945b7 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -900,7 +900,6 @@ MvcLocalization.de.Designer.cs Designer - Designer From a599ae42704a53ad4062ce1db277312b96258d59 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Mon, 10 Aug 2020 22:49:01 +0200 Subject: [PATCH 024/695] Updated CromExpressionDescriptor package to v2.15.0 --- .../SmartStore.Services.csproj | 5 +- .../SmartStore.Services/packages.config | 2 +- src/Presentation/SmartStore.Web/Web.config | 350 +++++++++--------- 3 files changed, 178 insertions(+), 179 deletions(-) diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index a7e54c6e61..ffd98f34b2 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -76,9 +76,8 @@ ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll True - - ..\..\packages\CronExpressionDescriptor.1.21.2\lib\net45\CronExpressionDescriptor.dll - True + + ..\..\packages\CronExpressionDescriptor.2.15.0\lib\netstandard2.0\CronExpressionDescriptor.dll ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 0b21ff4a14..ef25b4b8b4 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index 005758563b..9f5c1343d2 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -1,47 +1,47 @@ - + -
+
-
-
-
-
+
+
+
+
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - - - - - - - + + + + + + + - - + + - + - + - - + + - - - - + + + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + - + - - - - + + + + - - - - - - - + + + + + + + - - + + - - + + - - - + + + - - + + - - + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - + + + + + + + + + + - + - + - + - + @@ -378,81 +378,81 @@ - + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - + - + - + - + - - - - - - - - - - + + + + + + + + + + - + - - + + - + \ No newline at end of file From 23bb224ee6a774cbc2934d84ac181cc520761d40 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 11 Aug 2020 00:37:57 +0200 Subject: [PATCH 025/695] Updated MiniProfiler package to v4.2.1 --- .../Setup/MigrateDatabaseInitializer.cs | 22 +++++----- .../SmartStore.DevTools/ProfilerHttpModule.cs | 4 +- .../SmartStore.DevTools.csproj | 23 ++++++++--- src/Plugins/SmartStore.DevTools/Starter.cs | 41 ++++--------------- .../Views/DevTools/MiniProfiler.cshtml | 4 +- src/Plugins/SmartStore.DevTools/Web.config | 2 +- .../SmartStore.DevTools/packages.config | 7 +++- .../SmartStore.Web/Content/shared/_utils.scss | 2 +- .../SmartStore.Web/SmartStore.Web.csproj | 6 +++ .../SmartStore.Web/packages.config | 2 + 10 files changed, 58 insertions(+), 55 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs index 0bd1830c92..47442fd09d 100644 --- a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs +++ b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs @@ -4,6 +4,7 @@ using System.Data.Entity.Infrastructure; using System.Data.Entity.Migrations; using System.Linq; +using SmartStore.Collections; using SmartStore.Core.Data; using SmartStore.Data.Caching; using SmartStore.Data.Migrations; @@ -19,7 +20,7 @@ public class MigrateDatabaseInitializer : IDatabaseInitialize where TContext : DbContext, new() where TConfig : DbMigrationsConfiguration, new() { - #region Ctor + private static readonly SyncedCollection _initializedContextTypes = new List().AsSynchronized(); public MigrateDatabaseInitializer() { @@ -30,10 +31,6 @@ public MigrateDatabaseInitializer(string connectionString) this.ConnectionString = connectionString; } - #endregion - - #region Properties - public IEnumerable> DataSeeders { get; @@ -52,8 +49,6 @@ public string ConnectionString private set; } - #endregion - #region Interface members /// @@ -62,6 +57,11 @@ public string ConnectionString /// The context. public virtual void InitializeDatabase(TContext context) { + if (_initializedContextTypes.Contains(context.GetType())) + { + return; + } + if (!context.Database.Exists()) { throw Error.InvalidOperation("Database migration failed because the target database does not exist. Ensure the database was initialized and seeded with the 'InstallDatabaseInitializer'."); @@ -81,10 +81,10 @@ public virtual void InitializeDatabase(TContext context) } else { - // DB is up-to-date and no migration ran. - EfMappingViewCacheFactory.SetContext(context); + // DB is up-to-date and no migration ran. + EfMappingViewCacheFactory.SetContext(context); - if (config is MigrationsConfiguration coreConfig && context is SmartObjectContext ctx) + if (config is MigrationsConfiguration coreConfig && context is SmartObjectContext ctx) { // Call the main Seed method anyway (on every startup), // we could have locale resources or settings to add/update. @@ -94,6 +94,8 @@ public virtual void InitializeDatabase(TContext context) // not needed anymore this.DataSeeders = null; + + _initializedContextTypes.Add(context.GetType()); } } diff --git a/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs b/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs index ab616910d6..33cc3da676 100644 --- a/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs +++ b/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs @@ -26,7 +26,7 @@ private static void OnAcquireRequestState(object sender, EventArgs e) var app = (HttpApplication)sender; if (!MiniProfilerStarted(app) && ShouldProfile(app)) { - MiniProfiler.Start(); + MiniProfiler.StartNew(); if (app.Context != null && app.Context.Items != null) { app.Context.Items[MP_KEY] = true; @@ -39,7 +39,7 @@ private static void OnEndRequest(object sender, EventArgs e) var app = (HttpApplication)sender; if (MiniProfilerStarted(app)) { - MiniProfiler.Stop(); + MiniProfiler.Current?.Stop(); } } diff --git a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj index 940f54c632..6b784b14a8 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -104,17 +104,24 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + False + ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - - ..\..\packages\MiniProfiler.3.2.0.157\lib\net40\MiniProfiler.dll + + ..\..\packages\MiniProfiler.4.2.1\lib\net461\MiniProfiler.dll + True + + + ..\..\packages\MiniProfiler.EF6.4.2.1\lib\net461\MiniProfiler.EF6.dll True - - False - ..\..\packages\MiniProfiler.EF6.3.0.11\lib\net40\MiniProfiler.EntityFramework6.dll + + ..\..\packages\MiniProfiler.Shared.4.2.1\lib\net461\MiniProfiler.Shared.dll True @@ -124,6 +131,12 @@ + + ..\..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + False + + + diff --git a/src/Plugins/SmartStore.DevTools/Starter.cs b/src/Plugins/SmartStore.DevTools/Starter.cs index 6511b8f581..32b6edfced 100644 --- a/src/Plugins/SmartStore.DevTools/Starter.cs +++ b/src/Plugins/SmartStore.DevTools/Starter.cs @@ -6,6 +6,8 @@ using StackExchange.Profiling.Storage; using System; using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace SmartStore.DevTools { @@ -22,9 +24,12 @@ public class ProfilerStartupTask : IApplicationStart { public void Start() { - StackExchange.Profiling.MiniProfiler.Settings.MaxUnviewedProfiles = 5; - StackExchange.Profiling.MiniProfiler.Settings.Storage = new HttpRuntimeCacheStorage(TimeSpan.FromMinutes(1)); - //StackExchange.Profiling.MiniProfiler.Settings.Results_List_Authorize = (req) => true; + StackExchange.Profiling.MiniProfiler.Configure(new MiniProfilerOptions + { + MaxUnviewedProfiles = 5, + Storage = new MemoryCacheStorage(TimeSpan.FromMinutes(1)), + //ResultsAuthorize = req => true, + }); StackExchange.Profiling.EntityFramework6.MiniProfilerEF6.Initialize(); @@ -37,34 +42,4 @@ public int Order get { return int.MinValue; } } } - - internal class NullProfilerStorage : IStorage - { - public List GetUnviewedIds(string user) - { - return new List(); - } - - public IEnumerable List(int maxResults, DateTime? start = default(DateTime?), DateTime? finish = default(DateTime?), ListResultsOrder orderBy = ListResultsOrder.Descending) - { - return new List(); - } - - public MiniProfiler Load(Guid id) - { - return null; - } - - public void Save(MiniProfiler profiler) - { - } - - public void SetUnviewed(string user, Guid id) - { - } - - public void SetViewed(string user, Guid id) - { - } - } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.DevTools/Views/DevTools/MiniProfiler.cshtml b/src/Plugins/SmartStore.DevTools/Views/DevTools/MiniProfiler.cshtml index ba456f87eb..bf83d685e0 100644 --- a/src/Plugins/SmartStore.DevTools/Views/DevTools/MiniProfiler.cshtml +++ b/src/Plugins/SmartStore.DevTools/Views/DevTools/MiniProfiler.cshtml @@ -1,8 +1,10 @@ @model dynamic +@using StackExchange.Profiling + @if (base.ViewContext.IsBareBonePage()) { return; } -@StackExchange.Profiling.MiniProfiler.RenderIncludes(useExistingjQuery: true, showControls: true) \ No newline at end of file +@(StackExchange.Profiling.MiniProfiler.Current?.RenderIncludes(showControls: true)) \ No newline at end of file diff --git a/src/Plugins/SmartStore.DevTools/Web.config b/src/Plugins/SmartStore.DevTools/Web.config index 936ba70d6f..bdf8a1df13 100644 --- a/src/Plugins/SmartStore.DevTools/Web.config +++ b/src/Plugins/SmartStore.DevTools/Web.config @@ -111,7 +111,7 @@ - + diff --git a/src/Plugins/SmartStore.DevTools/packages.config b/src/Plugins/SmartStore.DevTools/packages.config index 1898961fd7..1583e8026b 100644 --- a/src/Plugins/SmartStore.DevTools/packages.config +++ b/src/Plugins/SmartStore.DevTools/packages.config @@ -9,8 +9,11 @@ + - - + + + + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Content/shared/_utils.scss b/src/Presentation/SmartStore.Web/Content/shared/_utils.scss index a53b46ffb5..a9354ac465 100644 --- a/src/Presentation/SmartStore.Web/Content/shared/_utils.scss +++ b/src/Presentation/SmartStore.Web/Content/shared/_utils.scss @@ -404,7 +404,7 @@ table th { // ------------------------------------------------------ @include media-breakpoint-down(sm) { - .profiler-results { + .mp-results { display: none !important; } } diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index 06ad3945b7..766aabe98b 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -143,6 +143,9 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + True ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -165,6 +168,9 @@ True ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll + + ..\..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll diff --git a/src/Presentation/SmartStore.Web/packages.config b/src/Presentation/SmartStore.Web/packages.config index 4c8b1b1872..212f98819d 100644 --- a/src/Presentation/SmartStore.Web/packages.config +++ b/src/Presentation/SmartStore.Web/packages.config @@ -28,6 +28,7 @@ + @@ -35,6 +36,7 @@ + \ No newline at end of file From 294b496590d29de140499cb1eaf1ad36490d06b2 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 11 Aug 2020 02:09:44 +0200 Subject: [PATCH 026/695] Updated DynamicLinq package --- .../SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs | 2 +- src/Libraries/SmartStore.Core/SmartStore.Core.csproj | 5 ++--- src/Libraries/SmartStore.Core/packages.config | 2 +- .../SmartStore.Services/Media/MediaService.Folder.cs | 2 +- src/Libraries/SmartStore.Services/Media/MediaService.cs | 2 +- .../SmartStore.Services/Media/Search/MediaSearcher.cs | 2 +- src/Libraries/SmartStore.Services/SmartStore.Services.csproj | 5 ++--- src/Libraries/SmartStore.Services/packages.config | 2 +- .../SmartStore.Web/Administration/SmartStore.Admin.csproj | 4 ++-- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs b/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs index ce8c87c8b1..135a404a50 100644 --- a/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs +++ b/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs @@ -104,7 +104,7 @@ private void DoExpand(Type type, string path) var entityParam = Expression.Parameter(type, "x"); // {x} path = String.Concat("x.", path.Trim('.')); - var expression = System.Linq.Dynamic.DynamicExpression.ParseLambda( + var expression = System.Linq.Dynamic.Core.DynamicExpressionParser.ParseLambda( new ParameterExpression[] { entityParam }, typeof(object), path.Trim('.')); diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 1bbc86c10d..57b7c776d2 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -111,9 +111,8 @@ True - - ..\..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll - True + + ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll diff --git a/src/Libraries/SmartStore.Core/packages.config b/src/Libraries/SmartStore.Core/packages.config index f8558c42cd..27fcfe462d 100644 --- a/src/Libraries/SmartStore.Core/packages.config +++ b/src/Libraries/SmartStore.Core/packages.config @@ -14,5 +14,5 @@ - + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs b/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs index df0b93f4e9..4b4325cef7 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Linq.Expressions; -using System.Linq.Dynamic; +using System.Linq.Dynamic.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Media; using System.Runtime.CompilerServices; diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs index b92f2a8a00..ce62fb0ba7 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -5,7 +5,7 @@ using System.Drawing; using System.IO; using System.Linq; -using System.Linq.Dynamic; +using System.Linq.Dynamic.Core; using System.Runtime.CompilerServices; using System.Threading.Tasks; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs index acae9d5821..c04b45786e 100644 --- a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs +++ b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Data.Entity; using System.Linq; -using System.Linq.Dynamic; +using System.Linq.Dynamic.Core; using SmartStore.Linq; using SmartStore.Core; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index ffd98f34b2..c9d5c77c23 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -136,9 +136,8 @@ - - ..\..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll - True + + ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index ef25b4b8b4..ad072f1a76 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index d1146ddf9a..69ebd0a824 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -74,11 +74,11 @@ False - ..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll True - ..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll True From b8600f1076ed79e760abd277cbacbfca698546f0 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 11 Aug 2020 02:26:51 +0200 Subject: [PATCH 027/695] Resolves #2037: Make SQL Server the default database option during installation --- .../SmartStore.Services/SmartStore.Services.csproj | 5 ++--- src/Libraries/SmartStore.Services/packages.config | 2 +- .../Localization/Installation/installation.de.xml | 4 ++-- .../Localization/Installation/installation.en.xml | 2 +- .../SmartStore.Web/Controllers/InstallController.cs | 4 ++-- .../SmartStore.Web/Views/Install/Index.cshtml | 8 ++++---- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index c9d5c77c23..3e31ccff40 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -117,9 +117,8 @@ ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\NReco.PdfGenerator.1.1.15\lib\net20\NReco.PdfGenerator.dll - True + + ..\..\packages\NReco.PdfGenerator.1.2.0\lib\net45\NReco.PdfGenerator.dll ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index ad072f1a76..207c0356f2 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -18,7 +18,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/App_Data/Localization/Installation/installation.de.xml b/src/Presentation/SmartStore.Web/App_Data/Localization/Installation/installation.de.xml index 974726bfe4..6e032bf7a4 100644 --- a/src/Presentation/SmartStore.Web/App_Data/Localization/Installation/installation.de.xml +++ b/src/Presentation/SmartStore.Web/App_Data/Localization/Installation/installation.de.xml @@ -63,7 +63,7 @@ Verbindungszeichenfolge angeben (Connection string) - (Empfohlen) + (empfohlen) Installation neu starten @@ -78,7 +78,7 @@ SQL Server Authentifizierung - Integrierte Datenbank verwenden (SQL Server Compact) + SQL Server Compact (ungeeignet im Produktivmodus) SQL Server Name diff --git a/src/Presentation/SmartStore.Web/App_Data/Localization/Installation/installation.en.xml b/src/Presentation/SmartStore.Web/App_Data/Localization/Installation/installation.en.xml index 8f3a768575..e746ce986a 100644 --- a/src/Presentation/SmartStore.Web/App_Data/Localization/Installation/installation.en.xml +++ b/src/Presentation/SmartStore.Web/App_Data/Localization/Installation/installation.en.xml @@ -75,7 +75,7 @@ Use SQL Server account - Use built-in data storage (SQL Server Compact) + SQL Server Compact (not suitable in production mode) SQL Server name diff --git a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs index fd5665b58f..6cb7447ef3 100644 --- a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs @@ -189,8 +189,8 @@ public ActionResult Index() //ConfirmPassword = "admin", InstallSampleData = false, DatabaseConnectionString = "", - DataProvider = "sqlce", // "sqlserver", - SqlAuthenticationType = "sqlauthentication", + DataProvider = "sqlserver", // "sqlce" + SqlAuthenticationType = "sqlauthentication", SqlConnectionInfo = "sqlconnectioninfo_values", SqlServerCreateDatabase = false, UseCustomCollation = false, diff --git a/src/Presentation/SmartStore.Web/Views/Install/Index.cshtml b/src/Presentation/SmartStore.Web/Views/Install/Index.cshtml index cad7fa2ca1..3b5000a164 100644 --- a/src/Presentation/SmartStore.Web/Views/Install/Index.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Install/Index.cshtml @@ -137,10 +137,10 @@
- + @Html.ValidationMessageFor(x => x.DataProvider)
From 6ee1b3d4314106f896e394e892351b529d75d3ac Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 11 Aug 2020 16:13:25 +0200 Subject: [PATCH 028/695] API: custom routing convention (in progress) --- .../Controllers/OData/CustomersController.cs | 83 +++--- .../Controllers/OData/ProductsController.cs | 273 ++++++++++-------- .../Services/CustomRoutingConvention.cs | 130 +++++++-- 3 files changed, 307 insertions(+), 179 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 1065d36d18..7d1301d6ac 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -105,52 +105,74 @@ public async Task Delete(int key) #region Navigation properties - /// - /// Handle address assignments - /// - /// Customer id - /// Address id - /// Address + [WebApiQueryable(PagingOptional = true)] + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public HttpResponseMessage GetAddresses(int key, int relatedKey = 0 /*addressId*/) + { + var addresses = GetRelatedCollection(key, x => x.Addresses); + + if (relatedKey != 0) + { + var address = addresses.FirstOrDefault(x => x.Id == relatedKey); + + return Request.CreateResponseForEntity(address, relatedKey); + } + + return Request.CreateResponseForEntity(addresses, key); + } + [WebApiAuthenticate(Permission = Permissions.Customer.EditAddress)] - public HttpResponseMessage NavigationAddresses(int key, int relatedKey) + public HttpResponseMessage PostAddresses(int key, int relatedKey /*addressId*/) { - Address address = null; var entity = GetExpandedEntity(key, x => x.Addresses); + var address = entity.Addresses.FirstOrDefault(x => x.Id == relatedKey); - if (Request.Method == HttpMethod.Delete) + if (address == null) { - if (relatedKey == 0) - { - entity.BillingAddress = null; - entity.ShippingAddress = null; - entity.Addresses.Clear(); - Service.UpdateCustomer(entity); - } - else if ((address = _addressService.Value.GetAddressById(relatedKey)) != null) + // No assignment yet. + address = _addressService.Value.GetAddressById(relatedKey); + if (address == null) { - entity.RemoveAddress(address); - Service.UpdateCustomer(entity); + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(relatedKey)); } - return Request.CreateResponse(HttpStatusCode.NoContent); + entity.Addresses.Add(address); + Service.UpdateCustomer(entity); + + return Request.CreateResponse(HttpStatusCode.Created, address); } - address = _addressService.Value.GetAddressById(relatedKey); + return Request.CreateResponse(HttpStatusCode.OK, address); + } + + [WebApiAuthenticate(Permission = Permissions.Customer.EditAddress)] + public HttpResponseMessage DeleteAddresses(int key, int relatedKey = 0 /*addressId*/) + { + var entity = GetExpandedEntity(key, x => x.Addresses); - if (Request.Method == HttpMethod.Post) + if (relatedKey == 0) + { + // Remove assignments of all addresses. + entity.BillingAddress = null; + entity.ShippingAddress = null; + entity.Addresses.Clear(); + Service.UpdateCustomer(entity); + } + else { - if (address != null && entity.Addresses.FindAddress(address) == null) + // Remove assignment of certain address. + var address = _addressService.Value.GetAddressById(relatedKey); + if (address != null) { - entity.Addresses.Add(address); + entity.RemoveAddress(address); Service.UpdateCustomer(entity); - - return Request.CreateResponse(HttpStatusCode.Created, address); } } - return Request.CreateResponseForEntity(address, relatedKey); + return Request.CreateResponse(HttpStatusCode.NoContent); } + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] public SingleResult
GetBillingAddress(int key) @@ -189,13 +211,6 @@ public IQueryable GetReturnRequests(int key) return GetRelatedCollection(key, x => x.ReturnRequests); } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public IQueryable
GetAddresses(int key) - { - return GetRelatedCollection(key, x => x.Addresses); - } - [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] public IQueryable GetCustomerRoleMappings(int key) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index a1afbbe125..c79e74c746 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -132,174 +132,211 @@ public async Task Delete(int key) return result; } - #region Navigation properties + #region Navigation properties + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] + public SingleResult GetDeliveryTime(int key) + { + return GetRelatedEntity(key, x => x.DeliveryTime); + } + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] + public SingleResult GetQuantityUnit(int key) + { + return GetRelatedEntity(key, x => x.QuantityUnit); + } + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public SingleResult GetCountryOfOrigin(int key) + { + return GetRelatedEntity(key, x => x.CountryOfOrigin); + } + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] + public SingleResult GetSampleDownload(int key) + { + return GetRelatedEntity(key, x => x.SampleDownload); + } + + + [WebApiQueryable(PagingOptional = true)] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProductCategories(int key, int relatedKey = 0 /*categoryId*/) + { + var productCategories = _categoryService.Value.GetProductCategoriesByProductId(key, true); + + if (relatedKey != 0) + { + var productCategory = productCategories.FirstOrDefault(x => x.CategoryId == relatedKey); + + return Request.CreateResponseForEntity(productCategory, relatedKey); + } + + return Request.CreateResponseForEntity(productCategories, key); + } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] - public HttpResponseMessage NavigationProductCategories(int key, int relatedKey) + public HttpResponseMessage PostProductCategories(int key, int relatedKey /*categoryId*/) { - ProductCategory productCategory = null; var productCategories = _categoryService.Value.GetProductCategoriesByProductId(key, true); + var productCategory = productCategories.FirstOrDefault(x => x.CategoryId == relatedKey); - if (Request.Method == HttpMethod.Delete) + if (productCategory == null) { - if (relatedKey == 0) - { - productCategories.Each(x => _categoryService.Value.DeleteProductCategory(x)); - } - else if ((productCategory = productCategories.FirstOrDefault(x => x.CategoryId == relatedKey)) != null) - { - _categoryService.Value.DeleteProductCategory(productCategory); - } + productCategory = ReadContent() ?? new ProductCategory(); + productCategory.ProductId = key; + productCategory.CategoryId = relatedKey; - return Request.CreateResponse(HttpStatusCode.NoContent); + _categoryService.Value.InsertProductCategory(productCategory); + + return Request.CreateResponse(HttpStatusCode.Created, productCategory); } - productCategory = productCategories.FirstOrDefault(x => x.CategoryId == relatedKey); + return Request.CreateResponse(HttpStatusCode.OK, productCategory); + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] + public HttpResponseMessage DeleteProductCategories(int key, int relatedKey = 0 /*categoryId*/) + { + var productCategories = _categoryService.Value.GetProductCategoriesByProductId(key, true); - if (Request.Method == HttpMethod.Post) + if (relatedKey == 0) { - if (productCategory == null) + productCategories.Each(x => _categoryService.Value.DeleteProductCategory(x)); + } + else + { + var productCategory = productCategories.FirstOrDefault(x => x.CategoryId == relatedKey); + if (productCategory != null) { - productCategory = ReadContent() ?? new ProductCategory(); - productCategory.ProductId = key; - productCategory.CategoryId = relatedKey; - - _categoryService.Value.InsertProductCategory(productCategory); - - return Request.CreateResponse(HttpStatusCode.Created, productCategory); + _categoryService.Value.DeleteProductCategory(productCategory); } } - return Request.CreateResponseForEntity(productCategory, relatedKey); + return Request.CreateResponse(HttpStatusCode.NoContent); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] - public HttpResponseMessage NavigationProductManufacturers(int key, int relatedKey) + + [WebApiQueryable(PagingOptional = true)] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProductManufacturers(int key, int relatedKey = 0 /*manufacturerId*/) { - ProductManufacturer productManufacturer = null; var productManufacturers = _manufacturerService.Value.GetProductManufacturersByProductId(key, true); - if (Request.Method == HttpMethod.Delete) + if (relatedKey != 0) { - if (relatedKey == 0) - { - productManufacturers.Each(x => _manufacturerService.Value.DeleteProductManufacturer(x)); - } - else if ((productManufacturer = productManufacturers.FirstOrDefault(x => x.ManufacturerId == relatedKey)) != null) - { - _manufacturerService.Value.DeleteProductManufacturer(productManufacturer); - } + var productManufacturer = productManufacturers.FirstOrDefault(x => x.ManufacturerId == relatedKey); - return Request.CreateResponse(HttpStatusCode.NoContent); + return Request.CreateResponseForEntity(productManufacturer, relatedKey); } - productManufacturer = productManufacturers.FirstOrDefault(x => x.ManufacturerId == relatedKey); + return Request.CreateResponseForEntity(productManufacturers, key); + } + + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] + public HttpResponseMessage PostProductManufacturers(int key, int relatedKey /*manufacturerId*/) + { + var productManufacturers = _manufacturerService.Value.GetProductManufacturersByProductId(key, true); + var productManufacturer = productManufacturers.FirstOrDefault(x => x.ManufacturerId == relatedKey); - if (Request.Method == HttpMethod.Post) + if (productManufacturer == null) { - if (productManufacturer == null) - { - productManufacturer = ReadContent() ?? new ProductManufacturer(); - productManufacturer.ProductId = key; - productManufacturer.ManufacturerId = relatedKey; + productManufacturer = ReadContent() ?? new ProductManufacturer(); + productManufacturer.ProductId = key; + productManufacturer.ManufacturerId = relatedKey; - _manufacturerService.Value.InsertProductManufacturer(productManufacturer); + _manufacturerService.Value.InsertProductManufacturer(productManufacturer); - return Request.CreateResponse(HttpStatusCode.Created, productManufacturer); - } + return Request.CreateResponse(HttpStatusCode.Created, productManufacturer); } - return Request.CreateResponseForEntity(productManufacturer, relatedKey); + return Request.CreateResponse(HttpStatusCode.OK, productManufacturer); } - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] - public HttpResponseMessage NavigationProductPictures(int key, int relatedKey) - { - ProductMediaFile productPicture = null; - var productPictures = Service.GetProductPicturesByProductId(key); - - if (Request.Method == HttpMethod.Delete) - { - if (relatedKey == 0) - { - productPictures.Each(x => Service.DeleteProductPicture(x)); - } - else if ((productPicture = productPictures.FirstOrDefault(x => x.MediaFileId == relatedKey)) != null) - { - Service.DeleteProductPicture(productPicture); - } - - return Request.CreateResponse(HttpStatusCode.NoContent); - } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] + public HttpResponseMessage DeleteProductManufacturers(int key, int relatedKey = 0 /*manufacturerId*/) + { + var productManufacturers = _manufacturerService.Value.GetProductManufacturersByProductId(key, true); - productPicture = productPictures.FirstOrDefault(x => x.MediaFileId == relatedKey); + if (relatedKey == 0) + { + productManufacturers.Each(x => _manufacturerService.Value.DeleteProductManufacturer(x)); + } + else + { + var productManufacturer = productManufacturers.FirstOrDefault(x => x.ManufacturerId == relatedKey); + if (productManufacturer != null) + { + _manufacturerService.Value.DeleteProductManufacturer(productManufacturer); + } + } - if (Request.Method == HttpMethod.Post) - { - if (productPicture == null) - { - productPicture = ReadContent() ?? new ProductMediaFile(); - productPicture.ProductId = key; - productPicture.MediaFileId = relatedKey; + return Request.CreateResponse(HttpStatusCode.NoContent); + } - Service.InsertProductPicture(productPicture); + + [WebApiQueryable(PagingOptional = true)] + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProductPictures(int key, int relatedKey = 0 /*mediaFileId*/) + { + var productPictures = Service.GetProductPicturesByProductId(key); - return Request.CreateResponse(HttpStatusCode.Created, productPicture); - } - } + if (relatedKey != 0) + { + var productPicture = productPictures.FirstOrDefault(x => x.MediaFileId == relatedKey); - return Request.CreateResponseForEntity(productPicture, relatedKey); - } + return Request.CreateResponseForEntity(productPicture, relatedKey); + } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] - public SingleResult GetDeliveryTime(int key) - { - return GetRelatedEntity(key, x => x.DeliveryTime); + return Request.CreateResponseForEntity(productPictures, key); } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public SingleResult GetQuantityUnit(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] + public HttpResponseMessage PostProductPictures(int key, int relatedKey /*mediaFileId*/) { - return GetRelatedEntity(key, x => x.QuantityUnit); - } + var productPictures = Service.GetProductPicturesByProductId(key); + var productPicture = productPictures.FirstOrDefault(x => x.MediaFileId == relatedKey); - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetCountryOfOrigin(int key) - { - return GetRelatedEntity(key, x => x.CountryOfOrigin); - } + if (productPicture == null) + { + productPicture = ReadContent() ?? new ProductMediaFile(); + productPicture.ProductId = key; + productPicture.MediaFileId = relatedKey; - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] - public SingleResult GetSampleDownload(int key) - { - return GetRelatedEntity(key, x => x.SampleDownload); - } + Service.InsertProductPicture(productPicture); - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductCategories(int key) - { - return GetRelatedCollection(key, x => x.ProductCategories); - } + return Request.CreateResponse(HttpStatusCode.Created, productPicture); + } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductManufacturers(int key) - { - return GetRelatedCollection(key, x => x.ProductManufacturers); + return Request.CreateResponse(HttpStatusCode.OK, productPicture); } - [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductPictures(int key) + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] + public HttpResponseMessage DeleteProductPictures(int key, int relatedKey = 0 /*mediaFileId*/) { - return GetRelatedCollection(key, x => x.ProductPictures); + var productPictures = Service.GetProductPicturesByProductId(key); + + if (relatedKey == 0) + { + productPictures.Each(x => Service.DeleteProductPicture(x)); + } + else + { + var productPicture = productPictures.FirstOrDefault(x => x.MediaFileId == relatedKey); + if (productPicture != null) + { + Service.DeleteProductPicture(productPicture); + } + } + + return Request.CreateResponse(HttpStatusCode.NoContent); } + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IQueryable GetProductSpecificationAttributes(int key) diff --git a/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs index 893d9bb112..f2eba422c0 100644 --- a/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs +++ b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs @@ -3,61 +3,126 @@ using System.Web.Http.Controllers; using System.Web.OData.Routing; using System.Web.OData.Routing.Conventions; +using SmartStore.Utilities; using SmartStore.Web.Framework.WebApi; namespace SmartStore.WebApi.Services { + /// + /// Used to serve URL paths that are ignored by OData by default. + /// + /// public class CustomRoutingConvention : EntitySetRoutingConvention { public override string SelectAction(ODataPath odataPath, HttpControllerContext context, ILookup actionMap) { var method = context.Request.Method; + var path = odataPath.PathTemplate; - if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/navigation/key")) + if (path.IsCaseInsensitiveEqual("~/entityset/key/navigation/key") || + path.IsCaseInsensitiveEqual("~/entityset/key/navigation")) { + // We ignore standard OData path cause they differ: + // ~/entityset/key/$links/navigation (OData 3 "link"), ~/entityset/key/navigation/$ref (OData 4 "reference"). + if (method == HttpMethod.Get || method == HttpMethod.Post || method == HttpMethod.Delete) { - // We ignore standard OData path cause they differ: - // ~/entityset/key/$links/navigation (OData 3 "link"), ~/entityset/key/navigation/$ref (OData 4 "reference") - - var navigationProperty = GetNavigation(odataPath, 2); + // Add keys to route data, so they will bind to action parameters. + var navigationProperty = GetNavigationName(odataPath, 2); if (navigationProperty.IsEmpty()) { throw context.Request.BadRequestException(WebApiGlobal.Error.NoNavigationFromPath); } - var methodName = string.Concat("Navigation", navigationProperty); + if (GetNormalizedKey(odataPath, 1, out var key) && key != 0) + { + context.RouteData.Values[ODataRouteConstants.Key] = key; + } + else + { + throw context.Request.BadRequestException(WebApiGlobal.Error.NoKeyFromPath); + } + + // Allow relatedKey = 0 to remove all assignments. + if (GetNormalizedKey(odataPath, 3, out var relatedKey)) + { + context.RouteData.Values[ODataRouteConstants.RelatedKey] = relatedKey; + } + else if (method == HttpMethod.Post) + { + // relatedKey is mandatory. + throw context.Request.BadRequestException(WebApiGlobal.Error.NoRelatedKeyFromPath); + } + + var methodName = Inflector.Capitalize(method.ToString()) + navigationProperty; + if (actionMap.Contains(methodName)) + { + return methodName; + } - $"process custom path {methodName}".Dump(); + //$"process custom path {methodName} {actionMap.Contains(methodName)}".Dump(); } } + else if (path.IsCaseInsensitiveEqual("~/entityset/key/property")) + { + if (method == HttpMethod.Get) + { + if (GetNormalizedKey(odataPath, 1, out var key) && key != 0) + { + context.RouteData.Values[ODataRouteConstants.Key] = key; + } + else + { + throw context.Request.BadRequestException(WebApiGlobal.Error.NoKeyFromPath); + } - // Not a match. + var propertyName = GetPropertyName(odataPath, 2); + + if (propertyName.IsEmpty()) + { + throw context.Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(string.Empty)); + } + + //GetProperty + var methodName = Inflector.Capitalize(method.ToString()) + propertyName; + if (actionMap.Contains(methodName)) + { + return methodName; + } + } + } + + // Not a match. We do not support requested path. return null; } #region Utilities - // public static bool GetNormalizedKey(this ODataPath odataPath, int segmentIndex, out int key) - //{ - // if (odataPath.Segments.Count > segmentIndex) - // { - // string rawKey = (odataPath.Segments[segmentIndex] as KeyValuePathSegment).Value; - // if (rawKey.HasValue()) - // { - // if (rawKey.StartsWith("'")) - // rawKey = rawKey.Substring(1, rawKey.Length - 2); - - // if (int.TryParse(rawKey, out key)) - // return true; - // } - // } - // key = 0; - // return false; - //} - - private static string GetNavigation(ODataPath odataPath, int segmentIndex) + private static bool GetNormalizedKey(ODataPath odataPath, int segmentIndex, out int key) + { + if (odataPath.Segments.Count > segmentIndex) + { + var rawKey = (odataPath.Segments[segmentIndex] as KeyValuePathSegment).Value; + if (rawKey.HasValue()) + { + if (rawKey.StartsWith("'")) + { + rawKey = rawKey.Substring(1, rawKey.Length - 2); + } + + if (int.TryParse(rawKey, out key)) + { + return true; + } + } + } + + key = 0; + return false; + } + + private static string GetNavigationName(ODataPath odataPath, int segmentIndex) { if (odataPath.Segments.Count > segmentIndex) { @@ -68,6 +133,17 @@ private static string GetNavigation(ODataPath odataPath, int segmentIndex) return null; } + private static string GetPropertyName(ODataPath odataPath, int segmentIndex) + { + if (odataPath.Segments.Count > segmentIndex) + { + var propertyName = (odataPath.Segments[segmentIndex] as PropertyAccessPathSegment).PropertyName; + return propertyName; + } + + return null; + } + #endregion } } \ No newline at end of file From bccaa31bcb19fe514881c8bf59ae10360b2122c9 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 11 Aug 2020 21:54:13 +0200 Subject: [PATCH 029/695] API: custom routing convention (final) --- .../Controllers/OData/AddressesController.cs | 7 + .../OData/BlogCommentsController.cs | 7 + .../Controllers/OData/BlogPostsController.cs | 7 + .../Controllers/OData/CategoriesController.cs | 7 + .../Controllers/OData/CountriesController.cs | 7 + .../Controllers/OData/CurrenciesController.cs | 7 + .../OData/CustomerRoleMappingsController.cs | 7 + .../OData/CustomerRolesController.cs | 7 + .../Controllers/OData/CustomersController.cs | 6 + .../OData/DeliveryTimesController.cs | 7 + .../Controllers/OData/DiscountsController.cs | 7 + .../Controllers/OData/DownloadsController.cs | 7 + .../OData/GenericAttributesController.cs | 6 + .../Controllers/OData/LanguagesController.cs | 7 + .../OData/LocalizedPropertiesController.cs | 6 + .../OData/ManufacturersController.cs | 9 +- .../OData/MeasureDimensionsController.cs | 9 +- .../OData/MeasureWeightsController.cs | 9 +- .../NewsLetterSubscriptionsController.cs | 14 +- .../Controllers/OData/OrderItemsController.cs | 7 + .../Controllers/OData/OrderNotesController.cs | 11 +- .../Controllers/OData/OrdersController.cs | 6 + .../OData/PaymentMethodsController.cs | 7 + .../ProductAttributeOptionsController.cs | 7 + .../ProductAttributeOptionsSetsController.cs | 7 + .../OData/ProductAttributesController.cs | 7 + .../OData/ProductBundleItemsController.cs | 7 + .../OData/ProductCategoriesController.cs | 7 + .../OData/ProductManufacturersController.cs | 7 + .../OData/ProductPicturesController.cs | 7 + ...roductSpecificationAttributesController.cs | 7 + ...tVariantAttributeCombinationsController.cs | 7 + ...ProductVariantAttributeValuesController.cs | 7 + .../ProductVariantAttributesController.cs | 7 + .../Controllers/OData/ProductsController.cs | 6 + .../OData/QuantityUnitsController.cs | 7 + .../OData/RelatedProductsController.cs | 7 + .../OData/ReturnRequestsController.cs | 7 + .../Controllers/OData/SettingsController.cs | 7 + .../OData/ShipmentItemsController.cs | 7 + .../Controllers/OData/ShipmentsController.cs | 7 + .../OData/ShippingMethodsController.cs | 7 + ...SpecificationAttributeOptionsController.cs | 7 + .../SpecificationAttributesController.cs | 7 + .../OData/StateProvincesController.cs | 7 + .../OData/StoreMappingsController.cs | 6 + .../Controllers/OData/StoresController.cs | 7 + .../OData/SyncMappingsController.cs | 6 + .../OData/TaxCategoriesController.cs | 7 + .../Controllers/OData/TierPricesController.cs | 7 + .../Controllers/OData/UrlRecordsController.cs | 6 + src/Plugins/SmartStore.WebApi/Description.txt | 2 +- .../Services/CustomRoutingConvention.cs | 95 +- .../SmartStore.WebApi.csproj | 3 - src/Plugins/SmartStore.WebApi/changelog.md | 104 -- .../WebApi/WebApiEntityController.cs | 955 +----------------- 56 files changed, 448 insertions(+), 1077 deletions(-) delete mode 100644 src/Plugins/SmartStore.WebApi/changelog.md diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs index 1eef895022..abc1ce01e0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -44,6 +45,12 @@ public SingleResult
Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Customer.Create)] public IHttpActionResult Post(Address entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs index 7fbdcc6651..691280cc65 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -51,6 +52,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Create)] public IHttpActionResult Post(BlogComment entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs index 2f5c151f3e..1dd55e6d51 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -47,6 +48,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Create)] public IHttpActionResult Post(BlogPost entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs index da335af975..a7821927c0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -47,6 +48,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Create)] public IHttpActionResult Post(Category entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs index 0c0599a620..49bd885456 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Create)] public IHttpActionResult Post(Country entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index 6abbd30456..a78a6c9ec5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Create)] public IHttpActionResult Post(Currency entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs index 9c21dc55cf..1d89824fa0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Customer.EditRole)] public IHttpActionResult Post(CustomerRoleMapping entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs index bd7a3d1091..bace05aee0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Net; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -28,6 +29,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Customer.Role.Create)] public IHttpActionResult Post(CustomerRole entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 7d1301d6ac..93cddb03c3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -50,6 +50,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Customer.Create)] public IHttpActionResult Post(Customer entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs index 649ce3194f..a9bd1a19b9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Create)] public IHttpActionResult Post(DeliveryTime entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs index 1dd70f414f..df4efe9c77 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -28,6 +29,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Create)] public IHttpActionResult Post(Discount entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs index ea82ca2836..856f5a462f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Media.Download.Create)] public IHttpActionResult Post(Download entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs index 7aedad51ae..9a073846b7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -25,6 +26,11 @@ public SingleResult Get(int key) return GetSingleResult(key); } + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + public IHttpActionResult Post(GenericAttribute entity) { var result = Insert(entity, () => Service.InsertAttribute(entity)); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs index 2d1f4afaf6..ec58bc0c56 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Create)] public IHttpActionResult Post(Language entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index e24b3ab85f..dc8f046299 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -25,6 +26,11 @@ public SingleResult Get(int key) return GetSingleResult(key); } + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + public IHttpActionResult Post(LocalizedProperty entity) { var result = Insert(entity, () => Service.InsertLocalizedProperty(entity)); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs index 67d7a85b59..c89c03e7a9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -34,7 +35,7 @@ from x in this.Repository.Table } [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] public IQueryable Get() { return GetEntitySet(); @@ -47,6 +48,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Create)] public IHttpActionResult Post(Manufacturer entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs index 10e83615f7..5e1ff6dc6f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -14,7 +15,7 @@ namespace SmartStore.WebApi.Controllers.OData public class MeasureDimensionsController : WebApiEntityController { [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] public IQueryable Get() { return GetEntitySet(); @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] public IHttpActionResult Post(MeasureDimension entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs index 7170408664..9d5c27d0d3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -14,7 +15,7 @@ namespace SmartStore.WebApi.Controllers.OData public class MeasureWeightsController : WebApiEntityController { [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] public IQueryable Get() { return GetEntitySet(); @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] public IHttpActionResult Post(MeasureWeight entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs index e950390cce..7ca5fb06f5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -14,18 +15,25 @@ namespace SmartStore.WebApi.Controllers.OData public class NewsLetterSubscriptionsController : WebApiEntityController { [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public IQueryable Get() + [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Read)] + public IQueryable Get() { return GetEntitySet(); } [WebApiQueryable] - public SingleResult Get(int key) + [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Read)] + public SingleResult Get(int key) { return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + // There is no insert permission because a subscription is always created by customer. [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Update)] public IHttpActionResult Post(NewsLetterSubscription entity) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index f73fc2a2ca..80487b446e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Net; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -41,6 +42,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] public IHttpActionResult Post(OrderItem entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index c539d054a7..aa7bf8296a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Net; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -23,11 +24,17 @@ public IQueryable Get() [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult GetOrderNote(int key) + public SingleResult Get(int key) { return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Order.Update)] public IHttpActionResult Post(OrderNote entity) { @@ -36,7 +43,7 @@ public IHttpActionResult Post(OrderNote entity) var order = Service.GetOrderById(entity.OrderId); if (order == null || order.Deleted) { - throw ExceptionEntityNotFound(entity.OrderId); + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(entity.OrderId)); } Service.AddOrderNote(order, entity.Note, entity.DisplayToCustomer); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index 8abc376d50..32c0f3dca7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -57,6 +57,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Order.Create)] public IHttpActionResult Post(Order entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index 53c6c18136..d4a4f73082 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Net; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -28,6 +29,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + // Update permission sufficient here. [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Update)] public IHttpActionResult Post(PaymentMethod entity) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs index a820cf0e27..7a91ca362c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] public IHttpActionResult Post(ProductAttributeOption entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs index c5dbdc8e7b..55c54bb588 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.EditSet)] public IHttpActionResult Post(ProductAttributeOptionsSet entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs index fc828f1e23..60295fcb38 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Create)] public IHttpActionResult Post(ProductAttribute entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs index b70f6ce115..58631b8fb0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditBundle)] public IHttpActionResult Post(ProductBundleItem entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs index 2dad9fb4ac..8a691b80ef 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] public IHttpActionResult Post(ProductCategory entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs index d56460f60e..60a4ef3c0f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] public IHttpActionResult Post(ProductManufacturer entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs index 3203b4f6fe..07597a77c7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -28,6 +29,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] public IHttpActionResult Post(ProductMediaFile entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs index ce1d3f528b..39eb2c9548 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditAttribute)] public IHttpActionResult Post(ProductSpecificationAttribute entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs index 545df638d8..ce2709fb5b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -28,6 +29,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] public IHttpActionResult Post(ProductVariantAttributeCombination entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs index 5b42d5be4c..c103c54d51 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] public IHttpActionResult Post(ProductVariantAttributeValue entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs index 449d3274e8..b404129266 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] public IHttpActionResult Post(ProductVariantAttribute entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index c79e74c746..de5f207710 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -77,6 +77,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Create)] public IHttpActionResult Post(Product entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs index bc73ed1586..03a19c0a7c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Create)] public IHttpActionResult Post(QuantityUnit entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs index adeee5d791..7785aed816 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPromotion)] public IHttpActionResult Post(RelatedProduct entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs index 91f5467cfc..56a34ae9c5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Net; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,6 +30,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Customer.Create)] public IHttpActionResult Post(ReturnRequest entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs index 9e19004f8a..1136d56b84 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Create)] public IHttpActionResult Post(Setting entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs index 0be2285599..a5da584fef 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] public IHttpActionResult Post(ShipmentItem entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs index 12b02ef6dd..7faead5cdb 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] public IHttpActionResult Post(Shipment entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs index bb9928fb93..b172febdec 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Create)] public IHttpActionResult Post(ShippingMethod entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs index 8c54098f66..01b82d5a21 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.EditOption)] public IHttpActionResult Post(SpecificationAttributeOption entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs index 2994d7c258..b8c4a4c6b6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Create)] public IHttpActionResult Post(SpecificationAttribute entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs index b450dba788..7da8f87f11 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Create)] public IHttpActionResult Post(StateProvince entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs index 82c20ecb18..c61016b7af 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -25,6 +26,11 @@ public SingleResult Get(int key) return GetSingleResult(key); } + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + public IHttpActionResult Post(StoreMapping entity) { var result = Insert(entity, () => Service.InsertStoreMapping(entity)); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs index 715dccbd3c..64570cabad 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Create)] public IHttpActionResult Post(Store entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs index 5fbd37ba7a..969f45ba9f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -25,6 +26,11 @@ public SingleResult Get(int key) return GetSingleResult(key); } + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + public IHttpActionResult Post(SyncMapping entity) { var result = Insert(entity, () => Service.InsertSyncMapping(entity)); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs index dfc94d598c..5add9b60c4 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Create)] public IHttpActionResult Post(TaxCategory entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs index 543dc6a7e3..9bc0ab575f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -27,6 +28,12 @@ public SingleResult Get(int key) return GetSingleResult(key); } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditTierPrice)] public IHttpActionResult Post(TierPrice entity) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs index bbc1aca985..4889655ac5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Net; +using System.Net.Http; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Seo; @@ -25,6 +26,11 @@ public SingleResult Get(int key) return GetSingleResult(key); } + public HttpResponseMessage GetProperty(int key, string propertyName) + { + return GetPropertyValue(key, propertyName); + } + public IHttpActionResult Post(UrlRecord entity) { throw new HttpResponseException(HttpStatusCode.Forbidden); diff --git a/src/Plugins/SmartStore.WebApi/Description.txt b/src/Plugins/SmartStore.WebApi/Description.txt index ef2e93639e..6c569e9191 100644 --- a/src/Plugins/SmartStore.WebApi/Description.txt +++ b/src/Plugins/SmartStore.WebApi/Description.txt @@ -1,6 +1,6 @@ FriendlyName: Smartstore Web API SystemName: Smartstore.WebApi -Group: Api +Group: API Version: 4.0.1 MinAppVersion: 4.0.1 Author: SmartStore AG diff --git a/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs index f2eba422c0..5675411cb9 100644 --- a/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs +++ b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs @@ -11,30 +11,42 @@ namespace SmartStore.WebApi.Services /// /// Used to serve URL paths that are ignored by OData by default. /// + /// /// public class CustomRoutingConvention : EntitySetRoutingConvention { + private static readonly string[] _navigationPaths = new string[] + { + "~/entityset/key/navigation/key", + "~/entityset/key/navigation" + }; + + private static readonly string[] _propertyPaths = new string[] + { + "~/entityset/key/property", + "~/entityset/key/cast/property", + "~/singleton/property", + "~/singleton/cast/property" + }; + public override string SelectAction(ODataPath odataPath, HttpControllerContext context, ILookup actionMap) { - var method = context.Request.Method; - var path = odataPath.PathTemplate; + var path = odataPath?.PathTemplate; + var method = context?.Request?.Method; - if (path.IsCaseInsensitiveEqual("~/entityset/key/navigation/key") || - path.IsCaseInsensitiveEqual("~/entityset/key/navigation")) + if (path == null || method == null) { - // We ignore standard OData path cause they differ: + return null; + } + + if (_navigationPaths.Contains(path)) + { + // Standard OData path differ: // ~/entityset/key/$links/navigation (OData 3 "link"), ~/entityset/key/navigation/$ref (OData 4 "reference"). if (method == HttpMethod.Get || method == HttpMethod.Post || method == HttpMethod.Delete) { // Add keys to route data, so they will bind to action parameters. - var navigationProperty = GetNavigationName(odataPath, 2); - - if (navigationProperty.IsEmpty()) - { - throw context.Request.BadRequestException(WebApiGlobal.Error.NoNavigationFromPath); - } - if (GetNormalizedKey(odataPath, 1, out var key) && key != 0) { context.RouteData.Values[ODataRouteConstants.Key] = key; @@ -44,6 +56,12 @@ public override string SelectAction(ODataPath odataPath, HttpControllerContext c throw context.Request.BadRequestException(WebApiGlobal.Error.NoKeyFromPath); } + var navPropertyName = (odataPath.Segments[2] as NavigationPathSegment)?.NavigationPropertyName; + if (navPropertyName.IsEmpty()) + { + throw context.Request.BadRequestException(WebApiGlobal.Error.NoNavigationFromPath); + } + // Allow relatedKey = 0 to remove all assignments. if (GetNormalizedKey(odataPath, 3, out var relatedKey)) { @@ -55,37 +73,40 @@ public override string SelectAction(ODataPath odataPath, HttpControllerContext c throw context.Request.BadRequestException(WebApiGlobal.Error.NoRelatedKeyFromPath); } - var methodName = Inflector.Capitalize(method.ToString()) + navigationProperty; + var methodName = Inflector.Capitalize(method.ToString()) + navPropertyName; if (actionMap.Contains(methodName)) { return methodName; } - - //$"process custom path {methodName} {actionMap.Contains(methodName)}".Dump(); } } - else if (path.IsCaseInsensitiveEqual("~/entityset/key/property")) + else if (_propertyPaths.Contains(path)) { if (method == HttpMethod.Get) { - if (GetNormalizedKey(odataPath, 1, out var key) && key != 0) + if (path.StartsWith("~/entityset/key")) { - context.RouteData.Values[ODataRouteConstants.Key] = key; + if (GetNormalizedKey(odataPath, 1, out var key) && key != 0) + { + context.RouteData.Values[ODataRouteConstants.Key] = key; + } + else + { + throw context.Request.BadRequestException(WebApiGlobal.Error.NoKeyFromPath); + } } - else + + var propertyName = (odataPath.Segments.Last() as PropertyAccessPathSegment)?.PropertyName; + if (propertyName.HasValue()) { - throw context.Request.BadRequestException(WebApiGlobal.Error.NoKeyFromPath); + context.RouteData.Values["propertyName"] = propertyName; } - - var propertyName = GetPropertyName(odataPath, 2); - - if (propertyName.IsEmpty()) + else { throw context.Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(string.Empty)); } - //GetProperty - var methodName = Inflector.Capitalize(method.ToString()) + propertyName; + var methodName = Inflector.Capitalize(method.ToString()) + "Property"; if (actionMap.Contains(methodName)) { return methodName; @@ -122,28 +143,6 @@ private static bool GetNormalizedKey(ODataPath odataPath, int segmentIndex, out return false; } - private static string GetNavigationName(ODataPath odataPath, int segmentIndex) - { - if (odataPath.Segments.Count > segmentIndex) - { - var navigationProperty = (odataPath.Segments[segmentIndex] as NavigationPathSegment).NavigationPropertyName; - return navigationProperty; - } - - return null; - } - - private static string GetPropertyName(ODataPath odataPath, int segmentIndex) - { - if (odataPath.Segments.Count > segmentIndex) - { - var propertyName = (odataPath.Segments[segmentIndex] as PropertyAccessPathSegment).PropertyName; - return propertyName; - } - - return null; - } - #endregion } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index f2fe3a6b8f..3944793f73 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -340,9 +340,6 @@ - - PreserveNewest - Designer diff --git a/src/Plugins/SmartStore.WebApi/changelog.md b/src/Plugins/SmartStore.WebApi/changelog.md deleted file mode 100644 index e6231f2392..0000000000 --- a/src/Plugins/SmartStore.WebApi/changelog.md +++ /dev/null @@ -1,104 +0,0 @@ -#Release Notes - -##Web Api 4.0.0.0 -###New Features -* #1809 Added a parameter to start an import after uploading import files. -* #1801 Added endpoints for ProductPicture, ProductCategory, ProductManufacturer to allow to update DisplayOrder. -* Added endpoints for CustomerRoleMapping. - -##Web Api 3.1.5.1 -###New Features -* Added endpoints for ProductSpecificationAttribute. - -##Web Api 3.0.3.1 -###New Features -* Added endpoint to get order in PDF format. -* Added endpoint to complete an order. -* Added endpoints for MeasureWeight and MeasureDimension. -###Bugfixes -* Fixed instance must not be null exception. - -##Web Api 3.0.0.1 -###New Features -* Added endpoints for blog post and blog comment. - -##Web Api 2.6.0.5 -###New Features -* #1072 Add support for TaxCategory. -* #1074 Extend product image upload to allow updating of images. -* #1064 Deleting all product categories/manufacturers per product in one go. -* #1063 Adding product category/manufacturer ignores any other property like DisplayOrder. -* Added endpoint "Infos" for order and order item entity for additional information like aggregated data. -* Added endpoints for new entity ProductAttributeOption. -###Improvements -* #1073 Settings for maximum pagesize ($top) and maximum expansion depth ($expand). - -##Web Api 2.6.0.4 -###Improvements -* Filter options for user grid on configuration page - -##Web Api 2.6.0.3 -###Bugfixes -* Products.ManageAttributes with Synchronize set to true should only delete an attribute if it has no values and if its control type supports configuring values - -##Web Api 2.6.0.2 -###New Features -* Integration of Swagger documentation - -##Web Api 2.6.0.1 -###New Features -* #1002 Add support for addresses and customer roles navigation property of customer entity - -##Web Api 2.5.0.1 -###New Features -* Option to allow authentification without MD5 content hash - -##Web Api 2.2.0.5 -###New Features -* Bridge to import framework: uploading import files to import profile directory - -##Web Api 2.2.0.4 -###New Features -* Added OData endpoint for shipment items -* Added OData action to add a shipment to an order and to set it as shipped -###Improvements -* OData actions should return SingleResult (instead of entity instance) to let expand option be recognized - -##Web Api 2.2.0.3 -###New Features -* Added OData endpoint for payment method -* #727 Option to deactivate TimestampOlderThanLastRequest validation -* #731 Allow deletion and inserting of product category and manufacturer assignments -###Improvements -* Using header timestamp as last user request date rather than API server date - -##Web Api 2.2.0.2 -###Improvements -* WebApiAuthenticate attribute can be applied on methods too -* Product image upload requires manage catalog permission - -##Web Api 2.2.0.1 -###New Features -* #652 Support for file upload and multipart mime - -##Web Api 1.32 -###New Features -* #618 Add endpoint for quantity units - -##Web Api 1.31 -###Bugfixes -* WebApiController requires more permission checks - -##Web Api 1.23 -###New Features -* #431 Add support for localized properties - -##Web Api 1.22 -###New Features -* #393 Implement OData actions for simpler working with product attributes -> added ProductsController.ManageAttributes and ProductsController.CreateAttributeCombinations - -##Web Api 1.21 -###Improvements -* #384 Inserting sluged recources like products require an URL record -###Bugfixes -* PUT implementation was incomplete \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 3f164e0760..f18661dbe8 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -10,10 +10,6 @@ using System.Web.Http; using System.Web.OData; using System.Web.OData.Formatter; -//using System.Web.Http.OData; -//using System.Web.Http.OData.Extensions; -//using System.Web.Http.OData.Formatter; -//using System.Web.Http.OData.Routing; using Autofac; using SmartStore.ComponentModel; using SmartStore.Core; @@ -42,24 +38,9 @@ public abstract class WebApiEntityController : ODataControlle ///
public virtual ICommonServices Services { get; set; } - protected internal HttpResponseException ExceptionEntityNotFound(TKey key) - { - var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - - return new HttpResponseException(response); - } - - protected internal HttpResponseException ExceptionNotExpanded(Expression> path) - { - // NotFound cause of nullable properties. - var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.PropertyNotExpanded.FormatInvariant(path.ToString())); - - return new HttpResponseException(response); - } - protected internal virtual IQueryable GetEntitySet() { - return this.Repository.Table; + return Repository.Table; } protected internal virtual IQueryable GetExpandedEntitySet(Expression> path) @@ -83,12 +64,15 @@ protected internal virtual IQueryable GetExpandedEntitySet(string prope protected internal virtual TEntity GetEntityByKeyNotNull(int key) { if (!ModelState.IsValid) + { throw this.InvalidModelStateException(); + } - var entity = this.Repository.GetById(key); - + var entity = Repository.GetById(key); if (entity == null) - throw ExceptionEntityNotFound(key); + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } return entity; } @@ -103,7 +87,6 @@ protected internal virtual SingleResult GetSingleResult(int key) var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); return GetSingleResult(entity); - //return SingleResult.Create(GetEntitySet().Where(x => x.Id == key)); } protected internal virtual SingleResult GetSingleResult(TEntity entity) @@ -114,14 +97,17 @@ protected internal virtual SingleResult GetSingleResult(TEntity entity) protected internal virtual TEntity GetExpandedEntity(int key, Expression> path) { if (!ModelState.IsValid) + { throw this.InvalidModelStateException(); + } var query = GetExpandedEntitySet(path); - var entity = query.FirstOrDefault(x => x.Id == key); if (entity == null) - throw ExceptionEntityNotFound(key); + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } return entity; } @@ -129,14 +115,17 @@ protected internal virtual TEntity GetExpandedEntity(int key, Express protected internal virtual TEntity GetExpandedEntity(int key, string properties) { if (!ModelState.IsValid) + { throw this.InvalidModelStateException(); + } var query = GetExpandedEntitySet(properties); - var entity = query.FirstOrDefault(x => x.Id == key); if (entity == null) - throw ExceptionEntityNotFound(key); + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } return entity; } @@ -151,9 +140,10 @@ protected internal virtual TEntity GetExpandedEntity(int key, SingleResult x.Id == key); - if (entity == null) - throw ExceptionEntityNotFound(key); + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } return entity; } @@ -166,7 +156,9 @@ protected internal virtual TProperty GetExpandedProperty(int key, Exp var property = expression.Invoke(entity); if (property == null) - throw ExceptionNotExpanded(path); + { + throw Request.NotFoundException(WebApiGlobal.Error.PropertyNotExpanded.FormatInvariant(path.ToString())); + } return property; } @@ -209,6 +201,25 @@ protected internal virtual SingleResult GetRelatedEntity( return SingleResult.Create(query); } + protected internal virtual HttpResponseMessage GetPropertyValue(int key, string propertyName) + { + var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); + if (entity == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } + + var prop = FastProperty.GetProperty(entity.GetType(), propertyName); + if (prop == null) + { + throw Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); + } + + var propertyValue = prop.GetValue(entity); + + return Request.CreateResponse(HttpStatusCode.OK, prop.Property.PropertyType, propertyValue); + } + protected internal virtual IHttpActionResult Insert(TEntity entity, Action insert) { if (!ModelState.IsValid) @@ -382,886 +393,4 @@ protected internal virtual T ReadContent() return Request.Content.ReadAsAsync(formatters).Result; } } - - #region Old WebApiEntityController - - //public abstract class WebApiEntityController : EntitySetController - // where TEntity : BaseEntity, new() - //{ - - // protected internal HttpResponseException ExceptionEntityNotFound(TKey key) - // { - // var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, - // WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - - // return new HttpResponseException(response); - // } - - // protected internal HttpResponseException ExceptionNotExpanded(Expression> path) - // { - // // NotFound cause of nullable properties - // var response = Request.CreateErrorResponse(HttpStatusCode.NotFound, - // WebApiGlobal.Error.PropertyNotExpanded.FormatInvariant(path.ToString())); - - // return new HttpResponseException(response); - // } - - // public override HttpResponseMessage HandleUnmappedRequest(ODataPath odataPath) - // { - // if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/property") || - // odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/cast/property") || - // odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/unresolved")) - // { - // if (Request.Method == HttpMethod.Get || Request.Method == HttpMethod.Post) - // { - // return UnmappedGetProperty(odataPath); - // } - // } - // else if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/navigation/key")) - // { - // if (Request.Method == HttpMethod.Get || Request.Method == HttpMethod.Post || Request.Method == HttpMethod.Delete) - // { - // // we ignore standard odata path cause they differ: - // // ~/entityset/key/$links/navigation (odata 3 "link"), ~/entityset/key/navigation/$ref (odata 4 "reference") - - // return UnmappedGetNavigation(odataPath); - // } - // } - // else if (odataPath.PathTemplate.IsCaseInsensitiveEqual("~/entityset/key/navigation")) - // { - // if (Request.Method == HttpMethod.Delete) - // { - // return UnmappedGetNavigation(odataPath); - // } - // } - - // return base.HandleUnmappedRequest(odataPath); - // } - - // protected virtual internal HttpResponseMessage UnmappedGetProperty(ODataPath odataPath) - // { - // int key; - - // if (!odataPath.GetNormalizedKey(1, out key)) - // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoKeyFromPath); - - // var entity = GetEntityByKey(key); - - // if (entity == null) - // return Request.CreateErrorResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - - // FastProperty prop = null; - // string propertyName = null; - // var lastSegment = odataPath.Segments.Last(); - // var propertySegment = (lastSegment as PropertyAccessPathSegment); - - // if (propertySegment == null) - // propertyName = lastSegment.ToString(); - // else - // propertyName = propertySegment.PropertyName; - - // if (propertyName.HasValue()) - // prop = FastProperty.GetProperty(entity.GetType(), propertyName); - - // if (prop == null) - // return UnmappedGetProperty(entity, propertyName ?? ""); - - // var propertyValue = prop.GetValue(entity); - - // return Request.CreateResponse(HttpStatusCode.OK, prop.Property.PropertyType, propertyValue); - // } - - // protected virtual internal HttpResponseMessage UnmappedGetProperty(TEntity entity, string propertyName) - // { - // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName)); - // } - - // protected virtual internal HttpResponseMessage UnmappedGetNavigation(ODataPath odataPath) - // { - // int key, relatedKey; - - // if (!odataPath.GetNormalizedKey(1, out key)) - // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoKeyFromPath); - - // var navigationProperty = odataPath.GetNavigation(2); - - // if (navigationProperty.IsEmpty()) - // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoNavigationFromPath); - - // if (!odataPath.GetNormalizedKey(3, out relatedKey) && Request.Method != HttpMethod.Delete) - // return Request.CreateErrorResponse(HttpStatusCode.BadRequest, WebApiGlobal.Error.NoRelatedKeyFromPath); - - // var methodName = string.Concat("Navigation", navigationProperty); - // var methodInfo = GetType().GetMethod(methodName); - - // if (methodInfo != null) - // { - // HttpResponseMessage response = null; - - // this.ProcessEntity(() => - // { - // response = (HttpResponseMessage)methodInfo.Invoke(this, new object[] { key, relatedKey }); - // }); - - // return response; - // } - // return base.HandleUnmappedRequest(odataPath); - // } - - // /// - // /// Auto injected by Autofac - // /// - // public virtual IRepository Repository - // { - // get; - // set; - // } - - // /// - // /// Auto injected by Autofac - // /// - // public virtual TService Service - // { - // get; - // set; - // } - - // /// - // /// Auto injected by Autofac - // /// - // public virtual ICommonServices Services - // { - // get; - // set; - // } - - // public override IQueryable Get() - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // return this.GetEntitySet(); - // } - - // protected internal virtual IQueryable GetEntitySet() - // { - // return this.Repository.Table; - // } - - // protected internal virtual IQueryable GetExpandedEntitySet(Expression> path) - // { - // var query = GetEntitySet().Expand(path); - // return query; - // } - - // protected internal virtual IQueryable GetExpandedEntitySet(string properties) - // { - // var query = GetEntitySet(); - - // foreach (var property in properties.SplitSafe(",")) - // { - // query = query.Expand(property.Trim()); - // } - - // return query; - // } - - // protected override int GetKey(TEntity entity) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // return entity.Id; - // } - - // protected override TEntity GetEntityByKey(int key) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // return this.Repository.GetById(key); - // } - - // protected internal virtual TEntity GetEntityByKeyNotNull(int key) - // { - // var entity = GetEntityByKey(key); - - // if (entity == null) - // throw ExceptionEntityNotFound(key); - - // return entity; - // } - - // protected internal virtual SingleResult GetSingleResult(int key) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // return SingleResult.Create(GetEntitySet().Where(x => x.Id == key)); - // } - - // protected internal virtual TEntity GetExpandedEntity(int key, Expression> path) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // var query = GetExpandedEntitySet(path); - - // var entity = query.FirstOrDefault(x => x.Id == key); - - // if (entity == null) - // throw ExceptionEntityNotFound(key); - - // return entity; - // } - // protected internal virtual TEntity GetExpandedEntity(int key, string properties) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // var query = GetExpandedEntitySet(properties); - - // var entity = query.FirstOrDefault(x => x.Id == key); - - // if (entity == null) - // throw ExceptionEntityNotFound(key); - - // return entity; - // } - - // protected internal virtual TEntity GetExpandedEntity(int key, SingleResult result, string path) - // { - // var query = result.Queryable; - - // foreach (var property in path.SplitSafe(",")) - // { - // query = query.Expand(property.Trim()); - // } - - // var entity = query.FirstOrDefault(x => x.Id == key); - - // if (entity == null) - // throw ExceptionEntityNotFound(key); - - // return entity; - // } - - // protected internal virtual TProperty GetExpandedProperty(int key, Expression> path) - // { - // var entity = GetExpandedEntity(key, path); - - // var expression = path.CompileFast(PropertyCachingStrategy.EagerCached); - // var property = expression.Invoke(entity); - - // if (property == null) - // throw ExceptionNotExpanded(path); - - // return property; - // } - - // protected internal virtual IQueryable GetRelatedCollection( - // int key, - // Expression>> navigationProperty) - // { - // Guard.NotNull(navigationProperty, nameof(navigationProperty)); - - // var query = GetEntitySet().Where(x => x.Id.Equals(key)); - // return query.SelectMany(navigationProperty); - // } - - // protected internal virtual IQueryable GetRelatedCollection( - // int key, - // string navigationProperty) - // { - // Guard.NotEmpty(navigationProperty, nameof(navigationProperty)); - - // var ctx = (DbContext)Repository.Context; - // var product = GetEntityByKey(key); - // var entry = ctx.Entry(product); - // var query = entry.Collection(navigationProperty).Query(); - - // return query.Cast(); - // } - - // protected internal virtual SingleResult GetRelatedEntity( - // int key, - // Expression> navigationProperty) - // { - // Guard.NotNull(navigationProperty, nameof(navigationProperty)); - - // var query = GetEntitySet().Where(x => x.Id.Equals(key)).Select(navigationProperty); - // return SingleResult.Create(query); - // } - - // protected internal virtual SingleResult GetRelatedEntity( - // int key, - // string navigationProperty) - // { - // Guard.NotEmpty(navigationProperty, nameof(navigationProperty)); - - // var ctx = (DbContext)Repository.Context; - // var product = GetEntityByKey(key); - // var entry = ctx.Entry(product); - // var query = entry.Reference(navigationProperty).Query().Cast(); - - // return SingleResult.Create(query); - // } - - // public override HttpResponseMessage Post(TEntity entity) - // { - // var response = Request.CreateResponse(HttpStatusCode.OK, CreateEntity(entity)); - - // try - // { - // var entityUrl = Url.CreateODataLink( - // new EntitySetPathSegment(entity.GetType().Name.EnsureEndsWith("s")), - // new KeyValuePathSegment(entity.Id.ToString()) - // ); - - // response.Headers.Location = new Uri(entityUrl); - // } - // catch { } - - // return response; - // } - - // protected override TEntity CreateEntity(TEntity entity) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // if (entity == null) - // throw this.ExceptionBadRequest(WebApiGlobal.Error.NoDataToInsert); - - // Insert(FulfillPropertiesOn(entity)); - - // return entity; - // } - - // protected internal virtual void Insert(TEntity entity) - // { - // Repository.Insert(entity); - // } - - // public override HttpResponseMessage Put(int key, TEntity update) - // { - // return Request.CreateResponse(HttpStatusCode.OK, UpdateEntity(key, update)); - // } - - // protected override TEntity UpdateEntity(int key, TEntity update) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // var originalEntity = GetEntityByKeyNotNull(key); - - // var context = ((IObjectContextAdapter)this.Repository.Context).ObjectContext; - // var container = context.MetadataWorkspace.GetEntityContainer(context.DefaultContainerName, DataSpace.CSpace); - - // string entityName = typeof(TEntity).Name; - // string entitySetName = container.BaseEntitySets.First(x => x.ElementType.Name == entityName).Name; - - // update.Id = key; - // var entity = context.ApplyCurrentValues(entitySetName, update); - - // Update(FulfillPropertiesOn(entity)); - - // return entity; - // } - - // protected internal virtual void Update(TEntity entity) - // { - // Repository.Update(entity); - // } - - // public override HttpResponseMessage Patch(int key, Delta patch) - // { - // return Request.CreateResponse(HttpStatusCode.OK, PatchEntity(key, patch)); - // } - - // protected override TEntity PatchEntity(int key, Delta patch) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // var entity = GetEntityByKeyNotNull(key); - - // if (patch != null) - // patch.Patch(entity); - - // Update(FulfillPropertiesOn(entity)); - - // return entity; - // } - - // public override void Delete(int key) - // { - // if (!ModelState.IsValid) - // throw this.ExceptionInvalidModelState(); - - // var entity = GetEntityByKeyNotNull(key); - - // Delete(entity); - // } - - // protected internal virtual void Delete(TEntity entity) - // { - // Repository.Delete(entity); - // } - - // protected internal virtual object FulfillPropertyOn(TEntity entity, string propertyName, string queryValue) - // { - // var container = Services.Container; - - // if (propertyName.IsCaseInsensitiveEqual("Country")) - // { - // return container.Resolve().GetCountryByTwoOrThreeLetterIsoCode(queryValue); - // } - // else if (propertyName.IsCaseInsensitiveEqual("StateProvince")) - // { - // return container.Resolve().GetStateProvinceByAbbreviation(queryValue); - // } - // else if (propertyName.IsCaseInsensitiveEqual("Language")) - // { - // return container.Resolve().GetLanguageByCulture(queryValue); - // } - // else if (propertyName.IsCaseInsensitiveEqual("Currency")) - // { - // return container.Resolve().GetCurrencyByCode(queryValue); - // } - - // return null; - // } - - // protected internal virtual TEntity FulfillPropertiesOn(TEntity entity) - // { - // try - // { - // if (entity == null) - // return entity; - - // var queries = Request.RequestUri.ParseQueryString(); - - // if (queries == null || queries.Count <= 0) - // return entity; - - // foreach (string key in queries.AllKeys.Where(x => x.StartsWith(WebApiGlobal.QueryOption.Fulfill))) - // { - // string propertyName = key.Substring(WebApiGlobal.QueryOption.Fulfill.Length); - // string queryValue = queries.Get(key); - - // if (propertyName.HasValue() && queryValue.HasValue()) - // { - // var prop = FastProperty.GetProperty(entity.GetType(), propertyName); - // if (prop != null) - // { - // var propertyValue = prop.GetValue(entity); - // if (propertyValue == null) - // { - // object value = FulfillPropertyOn(entity, propertyName, queryValue); - - // // there's no requirement to set a property value of null - // if (value != null) - // { - // prop.SetValue(entity, value); - // } - // } - // } - // } - // } - // } - // catch (Exception ex) - // { - // throw this.ExceptionUnprocessableEntity(ex.Message); - // } - - // return entity; - // } - - // protected internal virtual T ReadContent() - // { - // var formatters = ODataMediaTypeFormatters.Create() - // .Select(formatter => formatter.GetPerRequestFormatterInstance(typeof(T), Request, Request.Content.Headers.ContentType)); - - // return Request.Content.ReadAsAsync(formatters).Result; - // } - //} - - #endregion - - #region Old OData3 EntitySetController - - //[CLSCompliant(false)] - //[ODataNullValue] - //public abstract class EntitySetController : ODataController - //where TEntity : class - //{ - // /// Gets the OData path of the current request. - // public ODataPath ODataPath - // { - // get - // { - // return EntitySetControllerHelpers.GetODataPath(this); - // } - // } - - // /// Gets the OData query options of the current request. - // public ODataQueryOptions QueryOptions - // { - // get - // { - // return EntitySetControllerHelpers.CreateQueryOptions(this); - // } - // } - - // protected EntitySetController() - // { - // } - - // /// This method should be overridden to create a new entity in the entity set. - // /// The created entity. - // /// The entity to add to the entity set. - // protected internal virtual TEntity CreateEntity(TEntity entity) - // { - // throw EntitySetControllerHelpers.CreateEntityNotImplementedResponse(base.get_Request()); - // } - - // /// This method should be overridden to handle POST and PUT requests that attempt to create a link between two entities. - // /// The key of the entity with the navigation property. - // /// The name of the navigation property. - // /// The URI of the entity to link. - // [AcceptVerbs(new string[] { "POST", "PUT" })] - // public virtual void CreateLink([FromODataUri] TKey key, string navigationProperty, [FromBody] Uri link) - // { - // throw EntitySetControllerHelpers.CreateLinkNotImplementedResponse(base.get_Request(), navigationProperty); - // } - - // /// This method should be overriden to handle DELETE requests for deleting existing entities from the entity set. - // /// The entity key of the entity to delete. - // public virtual void Delete([FromODataUri] TKey key) - // { - // throw EntitySetControllerHelpers.DeleteEntityNotImplementedResponse(base.get_Request()); - // } - - // /// This method should be overridden to handle DELETE requests that attempt to break a relationship between two entities. - // /// The key of the entity with the navigation property. - // /// The name of the navigation property. - // /// The URI of the entity to remove from the navigation property. - // public virtual void DeleteLink([FromODataUri] TKey key, string navigationProperty, [FromBody] Uri link) - // { - // throw EntitySetControllerHelpers.DeleteLinkNotImplementedResponse(base.get_Request(), navigationProperty); - // } - - // /// This method should be overridden to handle DELETE requests that attempt to break a relationship between two entities. - // /// The key of the entity with the navigation property. - // /// The key of the related entity. - // /// The name of the navigation property. - // public virtual void DeleteLink([FromODataUri] TKey key, string relatedKey, string navigationProperty) - // { - // throw EntitySetControllerHelpers.DeleteLinkNotImplementedResponse(base.get_Request(), navigationProperty); - // } - - // /// This method should be overridden to handle GET requests that attempt to retrieve entities from the entity set. - // /// The matching entities from the entity set. - // public virtual IQueryable Get() - // { - // throw EntitySetControllerHelpers.GetNotImplementedResponse(base.get_Request()); - // } - - // /// Handles GET requests that attempt to retrieve an individual entity by key from the entity set. - // /// The response message to send back to the client. - // /// The entity key of the entity to retrieve. - // public virtual HttpResponseMessage Get([FromODataUri] TKey key) - // { - // TEntity entityByKey = this.GetEntityByKey(key); - // return EntitySetControllerHelpers.GetByKeyResponse(base.get_Request(), entityByKey); - // } - - // /// This method should be overridden to retrieve an entity by key from the entity set. - // /// The retrieved entity, or null if an entity with the specified entity key cannot be found in the entity set. - // /// The entity key of the entity to retrieve. - // protected internal virtual TEntity GetEntityByKey(TKey key) - // { - // throw EntitySetControllerHelpers.GetEntityByKeyNotImplementedResponse(base.get_Request()); - // } - - // /// This method should be overridden to get the entity key of the specified entity. - // /// The entity key value - // /// The entity. - // protected internal virtual TKey GetKey(TEntity entity) - // { - // throw EntitySetControllerHelpers.GetKeyNotImplementedResponse(base.get_Request()); - // } - - // /// This method should be overridden to handle all unmapped OData requests. - // /// The response message to send back to the client. - // /// The OData path of the request. - // [AcceptVerbs(new string[] { "GET", "POST", "PUT", "PATCH", "MERGE", "DELETE" })] - // public virtual HttpResponseMessage HandleUnmappedRequest(ODataPath odataPath) - // { - // throw EntitySetControllerHelpers.UnmappedRequestResponse(base.get_Request(), odataPath); - // } - - // /// Handles PATCH and MERGE requests to partially update a single entity in the entity set. - // /// The response message to send back to the client. - // /// The entity key of the entity to update. - // /// The patch representing the partial update. - // [AcceptVerbs(new string[] { "PATCH", "MERGE" })] - // public virtual HttpResponseMessage Patch([FromODataUri] TKey key, Delta patch) - // { - // TEntity tEntity = this.PatchEntity(key, patch); - // return EntitySetControllerHelpers.PatchResponse(base.get_Request(), tEntity); - // } - - // /// This method should be overridden to apply a partial update to an existing entity in the entity set. - // /// The updated entity. - // /// The entity key of the entity to update. - // /// The patch representing the partial update. - // protected internal virtual TEntity PatchEntity(TKey key, Delta patch) - // { - // throw EntitySetControllerHelpers.PatchEntityNotImplementedResponse(base.get_Request()); - // } - - // /// Handles POST requests that create new entities in the entity set. - // /// The response message to send back to the client. - // /// The entity to insert into the entity set. - // public virtual HttpResponseMessage Post([FromBody] TEntity entity) - // { - // TEntity tEntity = this.CreateEntity(entity); - // return EntitySetControllerHelpers.PostResponse(this, tEntity, this.GetKey(entity)); - // } - - // /// Handles PUT requests that attempt to replace a single entity in the entity set. - // /// The response message to send back to the client. - // /// The entity key of the entity to replace. - // /// The updated entity. - // public virtual HttpResponseMessage Put([FromODataUri] TKey key, [FromBody] TEntity update) - // { - // TEntity tEntity = this.UpdateEntity(key, update); - // return EntitySetControllerHelpers.PutResponse(base.get_Request(), tEntity); - // } - - // /// This method should be overridden to update an existing entity in the entity set. - // /// The updated entity. - // /// The entity key of the entity to update. - // /// The updated entity. - // protected internal virtual TEntity UpdateEntity(TKey key, TEntity update) - // { - // throw EntitySetControllerHelpers.UpdateEntityNotImplementedResponse(base.get_Request()); - // } - //} - - - //internal static class EntitySetControllerHelpers - //{ - // private const string PreferHeaderName = "Prefer"; - - // private const string PreferenceAppliedHeaderName = "Preference-Applied"; - - // private const string ReturnContentHeaderValue = "return-content"; - - // private const string ReturnNoContentHeaderValue = "return-no-content"; - - // public static HttpResponseException CreateEntityNotImplementedResponse(HttpRequestMessage request) - // { - // ODataError oDataError = new ODataError(); - // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedCreate); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; - // object[] objArray = new object[] { "POST" }; - // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static HttpResponseException CreateLinkNotImplementedResponse(HttpRequestMessage request, string navigationProperty) - // { - // ODataError oDataError = new ODataError(); - // string entitySetControllerUnsupportedCreateLink = SRResources.EntitySetControllerUnsupportedCreateLink; - // object[] objArray = new object[] { navigationProperty }; - // oDataError.set_Message(Error.Format(entitySetControllerUnsupportedCreateLink, objArray)); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // oDataError.set_ErrorCode(SRResources.EntitySetControllerUnsupportedCreateLinkErrorCode); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static ODataQueryOptions CreateQueryOptions(ApiController controller) - // { - // ODataQueryContext oDataQueryContext = new ODataQueryContext(controller.get_Request().ODataProperties().Model, typeof(TEntity)); - // return new ODataQueryOptions(oDataQueryContext, controller.get_Request()); - // } - - // public static HttpResponseException DeleteEntityNotImplementedResponse(HttpRequestMessage request) - // { - // ODataError oDataError = new ODataError(); - // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedDelete); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; - // object[] objArray = new object[] { "DELETE" }; - // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static HttpResponseException DeleteLinkNotImplementedResponse(HttpRequestMessage request, string navigationProperty) - // { - // ODataError oDataError = new ODataError(); - // string entitySetControllerUnsupportedDeleteLink = SRResources.EntitySetControllerUnsupportedDeleteLink; - // object[] objArray = new object[] { navigationProperty }; - // oDataError.set_Message(Error.Format(entitySetControllerUnsupportedDeleteLink, objArray)); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // oDataError.set_ErrorCode(SRResources.EntitySetControllerUnsupportedDeleteLinkErrorCode); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static HttpResponseMessage GetByKeyResponse(HttpRequestMessage request, TEntity entity) - // { - // if (entity == null) - // { - // return HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotFound); - // } - // return HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.OK, entity); - // } - - // public static HttpResponseException GetEntityByKeyNotImplementedResponse(HttpRequestMessage request) - // { - // ODataError oDataError = new ODataError(); - // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedGetByKey); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // oDataError.set_ErrorCode(SRResources.EntitySetControllerUnsupportedGetByKeyErrorCode); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static HttpResponseException GetKeyNotImplementedResponse(HttpRequestMessage request) - // { - // ODataError oDataError = new ODataError(); - // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedGetKey); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; - // object[] objArray = new object[] { "POST" }; - // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static HttpResponseException GetNotImplementedResponse(HttpRequestMessage request) - // { - // ODataError oDataError = new ODataError(); - // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedGet); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; - // object[] objArray = new object[] { "GET" }; - // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static ODataPath GetODataPath(ApiController controller) - // { - // return controller.get_Request().ODataProperties().Path; - // } - - // public static HttpResponseException PatchEntityNotImplementedResponse(HttpRequestMessage request) - // { - // ODataError oDataError = new ODataError(); - // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedPatch); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; - // object[] objArray = new object[] { "PATCH" }; - // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static HttpResponseMessage PatchResponse(HttpRequestMessage request, TEntity patchedEntity) - // { - // if (!EntitySetControllerHelpers.RequestPrefersReturnContent(request)) - // { - // return HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NoContent); - // } - // HttpResponseMessage httpResponseMessage = HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.OK, patchedEntity); - // httpResponseMessage.Headers.Add("Preference-Applied", "return-content"); - // return httpResponseMessage; - // } - - // public static HttpResponseMessage PostResponse(ApiController controller, TEntity createdEntity, TKey entityKey) - // { - // HttpResponseMessage httpResponseMessage = null; - // HttpRequestMessage request = controller.get_Request(); - // if (!EntitySetControllerHelpers.RequestPrefersReturnNoContent(request)) - // { - // httpResponseMessage = HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.Created, createdEntity); - // } - // else - // { - // httpResponseMessage = HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NoContent); - // httpResponseMessage.Headers.Add("Preference-Applied", "return-no-content"); - // } - // ODataPath path = request.ODataProperties().Path; - // if (path == null) - // { - // throw Error.InvalidOperation(SRResources.LocationHeaderMissingODataPath, new object[0]); - // } - // EntitySetPathSegment entitySetPathSegment = path.Segments.FirstOrDefault() as EntitySetPathSegment; - // if (entitySetPathSegment == null) - // { - // throw Error.InvalidOperation(SRResources.LocationHeaderDoesNotStartWithEntitySet, new object[0]); - // } - // UrlHelper url = controller.get_Url() ?? new UrlHelper(request); - // HttpResponseHeaders headers = httpResponseMessage.Headers; - // ODataPathSegment[] keyValuePathSegment = new ODataPathSegment[] { entitySetPathSegment, new KeyValuePathSegment(ODataUriUtils.ConvertToUriLiteral(entityKey, 2)) }; - // headers.Location = new Uri(url.CreateODataLink(keyValuePathSegment)); - // return httpResponseMessage; - // } - - // public static HttpResponseMessage PutResponse(HttpRequestMessage request, TEntity updatedEntity) - // { - // if (!EntitySetControllerHelpers.RequestPrefersReturnContent(request)) - // { - // return HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NoContent); - // } - // HttpResponseMessage httpResponseMessage = HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.OK, updatedEntity); - // httpResponseMessage.Headers.Add("Preference-Applied", "return-content"); - // return httpResponseMessage; - // } - - // internal static bool RequestPrefersReturnContent(HttpRequestMessage request) - // { - // IEnumerable strs = null; - // if (!request.Headers.TryGetValues("Prefer", out strs)) - // { - // return false; - // } - // return strs.Contains("return-content"); - // } - - // internal static bool RequestPrefersReturnNoContent(HttpRequestMessage request) - // { - // IEnumerable strs = null; - // if (!request.Headers.TryGetValues("Prefer", out strs)) - // { - // return false; - // } - // return strs.Contains("return-no-content"); - // } - - // public static HttpResponseException UnmappedRequestResponse(HttpRequestMessage request, ODataPath odataPath) - // { - // ODataError oDataError = new ODataError(); - // string entitySetControllerUnmappedRequest = SRResources.EntitySetControllerUnmappedRequest; - // object[] pathTemplate = new object[] { odataPath.PathTemplate }; - // oDataError.set_Message(Error.Format(entitySetControllerUnmappedRequest, pathTemplate)); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // oDataError.set_ErrorCode(SRResources.EntitySetControllerUnmappedRequestErrorCode); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - - // public static HttpResponseException UpdateEntityNotImplementedResponse(HttpRequestMessage request) - // { - // ODataError oDataError = new ODataError(); - // oDataError.set_Message(SRResources.EntitySetControllerUnsupportedUpdate); - // oDataError.set_MessageLanguage(SRResources.EntitySetControllerErrorMessageLanguage); - // string entitySetControllerUnsupportedMethodErrorCode = SRResources.EntitySetControllerUnsupportedMethodErrorCode; - // object[] objArray = new object[] { "PUT" }; - // oDataError.set_ErrorCode(Error.Format(entitySetControllerUnsupportedMethodErrorCode, objArray)); - // return new HttpResponseException(HttpRequestMessageExtensions.CreateResponse(request, HttpStatusCode.NotImplemented, oDataError)); - // } - //} - - #endregion } From 9b50d20dddc0dc02359e535cf28e9b88619233f8 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 12 Aug 2020 02:15:09 +0200 Subject: [PATCH 030/695] (perf) Migration: MoveCustomerFields() ~10x faster now --- .../Extensions/DateTimeExtensions.cs | 8 + .../201807051830375_MoveCustomerFields.cs | 25 +-- ...1908050758298_MoveFurtherCustomerFields.cs | 20 ++- .../SmartStore.Data/Utilities/DataMigrator.cs | 152 +++++++++++++----- 4 files changed, 139 insertions(+), 66 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs index 847572155a..47dfe31a32 100644 --- a/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs @@ -201,6 +201,14 @@ public static string ToNativeString(this DateTime value, string format, IFormatP provider = provider ?? CultureInfo.CurrentCulture; return value.ToString(format, provider).ReplaceNativeDigits(provider); } + + /// + /// Converts a DateTime to ISO 8601 string + /// + public static string ToIso8601String(this DateTime value) + { + return value.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"); + } } } diff --git a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs index bf0b6b0b43..4bc48f7cc5 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs @@ -1,7 +1,8 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using System.Collections.Generic; + using System.Data.Entity.Migrations; using System.Linq; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; @@ -54,35 +55,35 @@ public void Seed(SmartObjectContext context) var candidates = new[] { "Title", "FirstName", "LastName", "Company", "CustomerNumber", "DateOfBirth" }; var numUpdatedCustomers = DataMigrator.MoveCustomerFields(context, UpdateCustomer, candidates); - } + } - private static void UpdateCustomer(Customer customer, GenericAttribute attr) + private static void UpdateCustomer(IDictionary columns, string key, string value) { - switch (attr.Key) + switch (key) { case "Title": - customer.Title = attr.Value?.Truncate(100); + columns[key] = value?.Truncate(50); break; case "FirstName": - customer.FirstName = attr.Value?.Truncate(225); + columns[key] = value?.Truncate(199); break; case "LastName": - customer.LastName = attr.Value?.Truncate(225); + columns[key] = value?.Truncate(199); break; case "Company": - customer.Company = attr.Value?.Truncate(255); + columns[key] = value?.Truncate(255); break; case "CustomerNumber": - customer.CustomerNumber = attr.Value?.Truncate(100); + columns[key] = value?.Truncate(100); break; case "DateOfBirth": - customer.BirthDate = attr.Value?.Convert(); + columns["BirthDate"] = value?.Convert(); break; } // Update FullName - var parts = new[] { customer.Title, customer.FirstName, customer.LastName }; - customer.FullName = string.Join(" ", parts.Where(x => x.HasValue())).NullEmpty(); + var parts = new string[] { (string)columns.Get("Title"), (string)columns.Get("FirstName"), (string)columns.Get("LastName") }; + columns["FullName"] = string.Join(" ", parts.Where(x => x.HasValue())).NullEmpty(); } public void MigrateLocaleResources(LocaleResourcesBuilder builder) diff --git a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs index 193a185e41..f7080a68b1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs @@ -5,6 +5,7 @@ namespace SmartStore.Data.Migrations using SmartStore.Data.Setup; using SmartStore.Data.Utilities; using System; + using System.Collections.Generic; using System.Data.Entity.Migrations; public partial class MoveFurtherCustomerFields : DbMigration, IDataSeeder @@ -51,31 +52,28 @@ public void Seed(SmartObjectContext context) var numUpdatedCustomers = DataMigrator.MoveCustomerFields(context, UpdateCustomer, candidates); } - private static void UpdateCustomer(Customer customer, GenericAttribute attr) + private static void UpdateCustomer(IDictionary columns, string key, string value) { - switch (attr.Key) + switch (key) { case "Gender": - customer.Gender = attr.Value?.Truncate(100); + columns[key] = value?.Truncate(100); break; case "VatNumberStatusId": - customer.VatNumberStatusId = attr.Value.Convert(); + columns[key] = value.Convert(); break; case "TimeZoneId": - customer.TimeZoneId = attr.Value?.Truncate(255); + columns[key] = value?.Truncate(255); break; case "TaxDisplayTypeId": - customer.TaxDisplayTypeId = attr.Value.Convert(); + columns[key] = value.Convert(); break; case "LastForumVisit": - customer.LastForumVisit = attr.Value.Convert(); + columns[key] = value.Convert(); break; case "LastUserAgent": - customer.LastUserAgent = attr.Value.Convert(); - break; case "LastUserDeviceType": - // TODO: split - customer.LastUserDeviceType = attr.Value.Convert(); + columns[key] = value; break; } } diff --git a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs index 765cff8f52..a1ecbbf47c 100644 --- a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs +++ b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs @@ -1,14 +1,17 @@ using System; using System.Collections.Generic; using System.Data.Entity; +using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; +using System.Runtime.Remoting.Contexts; using System.Security.Policy; using System.Text; using System.Text.RegularExpressions; using System.Xml.Linq; using System.Xml.Serialization; +using Microsoft.SqlServer.Management.Sdk.Sfc; using Newtonsoft.Json; using SmartStore.Collections; using SmartStore.Core; @@ -32,6 +35,7 @@ using SmartStore.Rules; using SmartStore.Rules.Domain; using SmartStore.Utilities; +using SmartStore.Utilities.ObjectPools; using EfState = System.Data.Entity.EntityState; namespace SmartStore.Data.Utilities @@ -349,88 +353,150 @@ public static int ImportAddressFormats(IDbContext context) #region MoveCustomerFields (V3.2) + class CustomerStub + { + public int Id { get; set; } + public IEnumerable Attributes { get; set; } + } + + class AttributeStub + { + public int Id { get; set; } + public string Key { get; set; } + public string Value { get; set; } + } + /// /// Moves several customer fields saved as generic attributes to customer entity (Title, FirstName, LastName, BirthDate, Company, CustomerNumber) /// /// Database context (must be ) /// The total count of fixed and updated customer entities - public static int MoveCustomerFields(IDbContext context, Action updater, params string[] candidates) + public static int MoveCustomerFields( + IDbContext context, + Action, string, string> updater, + params string[] candidates) { Guard.NotNull(updater, nameof(updater)); - + if (!(context is SmartObjectContext ctx)) throw new ArgumentException("Passed context must be an instance of type '{0}'.".FormatInvariant(typeof(SmartObjectContext)), nameof(context)); if (candidates.Length == 0) return 0; - // We delete attrs only if the WHOLE migration succeeded - var attrIdsToDelete = new List(1000); - var gaTable = context.Set(); + const int pageSize = 1000; + var gaTable = context.Set().AsNoTracking(); //var candidates = new[] { "Title", "FirstName", "LastName", "Company", "CustomerNumber", "DateOfBirth" }; - var query = gaTable - .AsNoTracking() - .Where(x => x.KeyGroup == "Customer" && candidates.Contains(x.Key)) + var query = ( + from a in gaTable + where a.KeyGroup == "Customer" && candidates.Contains(a.Key) + group a by a.EntityId into grps + where grps.Any() + select new CustomerStub + { + Id = grps.Key, + Attributes = grps.Select(a2 => new AttributeStub { Id = a2.Id, Key = a2.Key, Value = a2.Value }) + }) .OrderBy(x => x.Id); + int numAffectedRows = 0; int numUpdated = 0; using (var scope = new DbContextScope(ctx: context, validateOnSave: false, hooksEnabled: false, autoCommit: false)) { - for (var pageIndex = 0; pageIndex < 9999999; ++pageIndex) + for (var pageIndex = 0; pageIndex < 9999999; pageIndex++) { - var attrs = new PagedList(query, pageIndex, 250); - - var customerIds = attrs.Select(a => a.EntityId).Distinct().ToArray(); - var customers = context.Set() - .Where(x => customerIds.Contains(x.Id)) - .ToDictionary(x => x.Id); + var data = query + .Skip(pageIndex * pageSize) + .Take(pageSize) + .ToList(); - // Move attrs one by one to customer - foreach (var attr in attrs) + foreach (var chunk in data.Slice(100)) { - var customer = customers.Get(attr.EntityId); - if (customer == null) - continue; - - updater(customer, attr); - - attrIdsToDelete.Add(attr.Id); + numAffectedRows += GenerateAndExecuteSql(chunk); } - // Save batch - numUpdated += scope.Commit(); + numUpdated += data.Count; - // Breathe - context.DetachAll(); - - if (!attrs.HasNextPage) + if (data.Count == 0) break; } + } + + return numUpdated; + + int GenerateAndExecuteSql(IEnumerable customers) + { + var sb = PooledStringBuilder.Rent(); - // Everything worked out, now delete all orpahned attributes - if (attrIdsToDelete.Count > 0) + foreach (var c in customers) { - try + var attrs = c.Attributes.ToArray(); + + if (attrs.Length == 0) + continue; + + var columns = new Dictionary(); + + /// Generate UPDATE Customer statement + foreach (var attr in attrs) { - // Don't rollback migration when this fails - var stubs = attrIdsToDelete.Select(x => new GenericAttribute { Id = x }).ToList(); - foreach (var chunk in stubs.Slice(500)) + updater(columns, attr.Key, attr.Value); + } + + if (columns.Count == 0) + continue; + + sb.Append("UPDATE [Customer] SET"); + + int i = 0; + foreach (var kvp in columns) + { + sb.Append(" "); + if (i > 0) sb.Append(", "); + + sb.Append($"[{kvp.Key}] = "); + + if (kvp.Value is int n) + { + sb.Append($"{n.ToString(CultureInfo.InvariantCulture)}"); + } + else if (kvp.Value is DateTime d) { - chunk.Each(x => gaTable.Attach(x)); - gaTable.RemoveRange(chunk); - scope.Commit(); + sb.Append($"'{d.ToIso8601String()}'"); } + else if (kvp.Value == null) + { + sb.Append("NULL"); + } + else + { + sb.Append($"N'{kvp.Value}'"); + } + + i++; } - catch (Exception ex) + + sb.Append(" WHERE Id = {0}".FormatInvariant(c.Id)); + sb.Append("\n"); + + // Generate all GenericAttribute DELETE statements + for (i = 0; i < attrs.Length; i++) { - var msg = ex.Message; + var a = attrs[i]; + sb.AppendLine($"DELETE FROM [GenericAttribute] WHERE [Id] = {a.Id}"); } } - } - return numUpdated; + var sql = sb.ToStringAndReturn(); + if (sql.HasValue()) + { + return ctx.Execute(sql); + } + + return 0; + } } public static int DeleteGuestCustomerGenericAttributes(IDbContext context, TimeSpan olderThan) From bd35d49cbee44787d98a862e642a64711235dd5e Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 12 Aug 2020 03:42:51 +0200 Subject: [PATCH 031/695] Updated Autofac packages to latest version --- .../DependencyManagement/ContainerManager.cs | 1 + .../DefaultLifetimeScopeAccessor.cs | 4 +- .../Infrastructure/SmartStoreEngine.cs | 42 +++++++------------ .../SmartStore.Core/Logging/LoggingModule.cs | 3 +- .../SmartStore.Core/Logging/TraceLogger.cs | 32 +++++++------- .../SmartStore.Core/SmartStore.Core.csproj | 18 +++++--- src/Libraries/SmartStore.Core/app.config | 2 +- src/Libraries/SmartStore.Core/packages.config | 7 +++- .../SmartStore.Data/SmartStore.Data.csproj | 14 ++++++- src/Libraries/SmartStore.Data/app.config | 2 +- src/Libraries/SmartStore.Data/packages.config | 5 ++- .../SmartStore.Services.csproj | 18 +++++--- src/Libraries/SmartStore.Services/app.config | 2 +- .../SmartStore.Services/packages.config | 7 +++- .../SmartStore.AmazonPay.csproj | 21 ++++++++-- .../SmartStore.AmazonPay/packages.config | 7 +++- src/Plugins/SmartStore.AmazonPay/web.config | 2 +- src/Plugins/SmartStore.Clickatell/web.config | 2 +- .../SmartStore.DevTools.csproj | 21 ++++++++-- src/Plugins/SmartStore.DevTools/Web.config | 2 +- .../SmartStore.DevTools/packages.config | 7 +++- .../SmartStore.FacebookAuth.csproj | 21 ++++++++-- .../SmartStore.FacebookAuth/packages.config | 7 +++- .../SmartStore.FacebookAuth/web.config | 2 +- .../SmartStore.GoogleAnalytics/web.config | 2 +- .../SmartStore.GoogleMerchantCenter.csproj | 21 ++++++++-- .../packages.config | 7 +++- .../web.config | 2 +- .../SmartStore.OfflinePayment.csproj | 17 +++++++- .../SmartStore.OfflinePayment/packages.config | 5 ++- .../SmartStore.OfflinePayment/web.config | 2 +- .../SmartStore.PayPal.csproj | 21 ++++++++-- src/Plugins/SmartStore.PayPal/packages.config | 7 +++- src/Plugins/SmartStore.PayPal/web.config | 2 +- .../SmartStore.Shipping.csproj | 21 ++++++++-- .../SmartStore.Shipping/packages.config | 7 +++- src/Plugins/SmartStore.Shipping/web.config | 2 +- .../SmartStore.ShippingByWeight.csproj | 21 ++++++++-- .../packages.config | 7 +++- .../SmartStore.ShippingByWeight/web.config | 2 +- .../SmartStore.Tax/SmartStore.Tax.csproj | 17 +++++++- src/Plugins/SmartStore.Tax/packages.config | 5 ++- src/Plugins/SmartStore.Tax/web.config | 2 +- .../SmartStore.WebApi.csproj | 25 ++++++++--- src/Plugins/SmartStore.WebApi/packages.config | 9 ++-- src/Plugins/SmartStore.WebApi/web.config | 2 +- .../DependencyRegistrar.cs | 14 ++++--- .../SmartStore.Web.Framework.csproj | 22 ++++++---- .../SmartStore.Web.Framework/app.config | 2 +- .../SmartStore.Web.Framework/packages.config | 9 ++-- .../Administration/SmartStore.Admin.csproj | 18 +++++--- .../SmartStore.Web/Administration/Web.config | 2 +- .../Administration/packages.config | 7 +++- .../SmartStore.Web/SmartStore.Web.csproj | 18 +++++--- src/Presentation/SmartStore.Web/Web.config | 2 +- .../SmartStore.Web/packages.config | 7 +++- src/Tests/SmartStore.Core.Tests/App.config | 2 +- .../SmartStore.Core.Tests.csproj | 13 +++++- .../SmartStore.Core.Tests/packages.config | 5 ++- src/Tests/SmartStore.Data.Tests/App.config | 2 +- .../SmartStore.Services.Tests/App.config | 2 +- src/Tests/SmartStore.Tests/App.config | 2 +- .../SmartStore.Tests/SmartStore.Tests.csproj | 14 ++++++- src/Tests/SmartStore.Tests/packages.config | 5 ++- src/Tests/SmartStore.Web.MVC.Tests/App.config | 2 +- src/Tools/SmartStore.Packager/App.config | 2 +- 66 files changed, 425 insertions(+), 180 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs index a839f412c1..fb00780d8e 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs @@ -157,6 +157,7 @@ public bool TryResolve(Type serviceType, ILifetimeScope scope, out object instan [DebuggerStepThrough] public bool TryResolve(ILifetimeScope scope, out T instance) + where T : class { instance = default(T); diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs index 1c7fed864c..8f8156e815 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs @@ -21,8 +21,8 @@ public DefaultLifetimeScopeAccessor(ILifetimeScope rootContainer) //rootContainer.ChildLifetimeScopeBeginning += OnScopeBeginning; - this._rootContainer = rootContainer; - this._state = new ContextState("CustomLifetimeScopeProvider.WorkScope"); + _rootContainer = rootContainer; + _state = new ContextState("CustomLifetimeScopeProvider.WorkScope"); } public ILifetimeScope ApplicationContainer diff --git a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs index 48979a36b0..7028b2ab70 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using System.Web.Mvc; using Autofac; +using Autofac.Core; using Autofac.Integration.Mvc; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure.DependencyManagement; @@ -72,41 +73,22 @@ protected virtual object CreateDependencyResolver(IContainer container) protected virtual ContainerManager RegisterDependencies() { - var builder = new ContainerBuilder(); - var container = builder.Build(); var typeFinder = CreateTypeFinder(); - _containerManager = new ContainerManager(container); - // core dependencies - builder = new ContainerBuilder(); + var builder = new ContainerBuilder(); builder.RegisterInstance(this).As(); builder.RegisterInstance(typeFinder).As(); // Autofac - var lifetimeScopeAccessor = new DefaultLifetimeScopeAccessor(container); - var lifetimeScopeProvider = new DefaultLifetimeScopeProvider(lifetimeScopeAccessor); - builder.RegisterInstance(lifetimeScopeAccessor).As(); - builder.RegisterInstance(lifetimeScopeProvider).As(); - - var dependencyResolver = new AutofacDependencyResolver(container, lifetimeScopeProvider); - builder.RegisterInstance(dependencyResolver); - DependencyResolver.SetResolver(dependencyResolver); + builder.Register(x => new DefaultLifetimeScopeAccessor(x.Resolve())).As().SingleInstance(); + builder.Register(x => new DefaultLifetimeScopeProvider(x.Resolve())).As().SingleInstance(); + builder.Register(x => new AutofacDependencyResolver(x.Resolve(), x.Resolve())).As().SingleInstance(); // Logging dependencies should be available very early builder.RegisterModule(new LoggingModule()); -#pragma warning disable 612, 618 - builder.Update(container); -#pragma warning restore 612, 618 - - // Propagate logger - var logger = container.Resolve().GetLogger("SmartStore.Bootstrapper"); - this.Logger = logger; - ((AppDomainTypeFinder)typeFinder).Logger = logger; - // Register dependencies provided by other assemblies - builder = new ContainerBuilder(); var registrarTypes = typeFinder.FindClassesOfType(); var registrarInstances = new List(); foreach (var type in registrarTypes) @@ -119,13 +101,19 @@ protected virtual ContainerManager RegisterDependencies() foreach (var registrar in registrarInstances) { var type = registrar.GetType(); - logger.DebugFormat("Executing dependency registrar '{0}'", type.FullName); + Debug.WriteLine("Executing dependency registrar '{0}'.".FormatInvariant(type.FullName)); registrar.Register(builder, typeFinder, PluginManager.IsActivePluginAssembly(type.Assembly)); } -#pragma warning disable 612, 618 - builder.Update(container); -#pragma warning restore 612, 618 + var container = builder.Build(); + _containerManager = new ContainerManager(container); + + // MVC dependency resolver + DependencyResolver.SetResolver(container.Resolve()); + + // Logger + this.Logger = container.Resolve().GetLogger("SmartStore.Bootstrapper"); + ((AppDomainTypeFinder)typeFinder).Logger = this.Logger; return _containerManager; } diff --git a/src/Libraries/SmartStore.Core/Logging/LoggingModule.cs b/src/Libraries/SmartStore.Core/Logging/LoggingModule.cs index 31f73d2807..8f69742577 100644 --- a/src/Libraries/SmartStore.Core/Logging/LoggingModule.cs +++ b/src/Libraries/SmartStore.Core/Logging/LoggingModule.cs @@ -6,6 +6,7 @@ using Autofac; using Autofac.Core; using Autofac.Core.Activators.Reflection; +using Autofac.Core.Registration; using SmartStore.ComponentModel; using SmartStore.Core.Data; @@ -31,7 +32,7 @@ protected override void Load(ContainerBuilder builder) } } - protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration) + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) { bool hasCtorLogger = false; bool hasPropertyLogger = false; diff --git a/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs b/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs index 71c5916162..ede0263089 100644 --- a/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs +++ b/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs @@ -121,22 +121,22 @@ private TraceEventType LogLevelToEventType(LogLevel level) } } - private LogLevel EventTypeToLogLevel(TraceEventType eventType) - { - switch (eventType) - { - case TraceEventType.Verbose: - return LogLevel.Debug; - case TraceEventType.Error: - return LogLevel.Error; - case TraceEventType.Critical: - return LogLevel.Fatal; - case TraceEventType.Warning: - return LogLevel.Warning; - default: - return LogLevel.Information; - } - } + //private LogLevel EventTypeToLogLevel(TraceEventType eventType) + //{ + // switch (eventType) + // { + // case TraceEventType.Verbose: + // return LogLevel.Debug; + // case TraceEventType.Error: + // return LogLevel.Error; + // case TraceEventType.Critical: + // return LogLevel.Fatal; + // case TraceEventType.Warning: + // return LogLevel.Warning; + // default: + // return LogLevel.Information; + // } + //} public void Flush() { diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 57b7c776d2..72b716c29e 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -65,12 +65,11 @@ ..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll - True + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -87,6 +86,9 @@ ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll True + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + True ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -116,8 +118,14 @@ + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll diff --git a/src/Libraries/SmartStore.Core/app.config b/src/Libraries/SmartStore.Core/app.config index 1e2654dc0e..aa1f38f1f9 100644 --- a/src/Libraries/SmartStore.Core/app.config +++ b/src/Libraries/SmartStore.Core/app.config @@ -8,7 +8,7 @@ - + diff --git a/src/Libraries/SmartStore.Core/packages.config b/src/Libraries/SmartStore.Core/packages.config index 27fcfe462d..0c8d7ea5ba 100644 --- a/src/Libraries/SmartStore.Core/packages.config +++ b/src/Libraries/SmartStore.Core/packages.config @@ -1,18 +1,21 @@  - - + + + + + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index 6d014f01c7..3d8952ee05 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -67,8 +67,8 @@ latest - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -82,6 +82,9 @@ ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll True + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + True ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.ConnectionInfo.dll @@ -98,12 +101,19 @@ ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + True ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + diff --git a/src/Libraries/SmartStore.Data/app.config b/src/Libraries/SmartStore.Data/app.config index a89e0781b5..76beb2a152 100644 --- a/src/Libraries/SmartStore.Data/app.config +++ b/src/Libraries/SmartStore.Data/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/Libraries/SmartStore.Data/packages.config b/src/Libraries/SmartStore.Data/packages.config index a913d74148..d2fafe90f4 100644 --- a/src/Libraries/SmartStore.Data/packages.config +++ b/src/Libraries/SmartStore.Data/packages.config @@ -1,9 +1,12 @@  - + + + + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 3e31ccff40..c87d31e0c2 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -69,12 +69,11 @@ ..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll - True + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll ..\..\packages\CronExpressionDescriptor.2.15.0\lib\netstandard2.0\CronExpressionDescriptor.dll @@ -102,6 +101,9 @@ ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + True @@ -139,8 +141,14 @@ ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll diff --git a/src/Libraries/SmartStore.Services/app.config b/src/Libraries/SmartStore.Services/app.config index 10ff5d2982..f0beaa056a 100644 --- a/src/Libraries/SmartStore.Services/app.config +++ b/src/Libraries/SmartStore.Services/app.config @@ -26,7 +26,7 @@ - + diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 207c0356f2..6d7f4e50d8 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -1,8 +1,8 @@  - - + + @@ -13,6 +13,7 @@ + @@ -22,5 +23,7 @@ + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj index 7365b57355..2054dd0bf7 100644 --- a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj +++ b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj @@ -81,18 +81,22 @@ ..\..\packages\AmazonPay.3.5.0\lib\net20\AmazonPay.dll True - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll False ..\..\packages\Common.Logging.2.0.0\lib\2.0\Common.Logging.dll True + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -106,9 +110,18 @@ False + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.AmazonPay/packages.config b/src/Plugins/SmartStore.AmazonPay/packages.config index d6e63a10cf..dfea9931d7 100644 --- a/src/Plugins/SmartStore.AmazonPay/packages.config +++ b/src/Plugins/SmartStore.AmazonPay/packages.config @@ -1,14 +1,17 @@  - - + + + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.AmazonPay/web.config b/src/Plugins/SmartStore.AmazonPay/web.config index 803ea9b9aa..f340aff88f 100644 --- a/src/Plugins/SmartStore.AmazonPay/web.config +++ b/src/Plugins/SmartStore.AmazonPay/web.config @@ -78,7 +78,7 @@ - + diff --git a/src/Plugins/SmartStore.Clickatell/web.config b/src/Plugins/SmartStore.Clickatell/web.config index 552e56025b..e15d8a0902 100644 --- a/src/Plugins/SmartStore.Clickatell/web.config +++ b/src/Plugins/SmartStore.Clickatell/web.config @@ -75,7 +75,7 @@ - + diff --git a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj index 6b784b14a8..153a7575e3 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -76,12 +76,12 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll False @@ -100,6 +100,10 @@ ..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -129,6 +133,7 @@ False + @@ -136,6 +141,14 @@ False + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.DevTools/Web.config b/src/Plugins/SmartStore.DevTools/Web.config index bdf8a1df13..9bfec8954e 100644 --- a/src/Plugins/SmartStore.DevTools/Web.config +++ b/src/Plugins/SmartStore.DevTools/Web.config @@ -79,7 +79,7 @@ - + diff --git a/src/Plugins/SmartStore.DevTools/packages.config b/src/Plugins/SmartStore.DevTools/packages.config index 1583e8026b..218e690d73 100644 --- a/src/Plugins/SmartStore.DevTools/packages.config +++ b/src/Plugins/SmartStore.DevTools/packages.config @@ -1,13 +1,14 @@  - - + + + @@ -16,4 +17,6 @@ + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj index 8045732912..bc92ae73f0 100644 --- a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj +++ b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj @@ -85,12 +85,12 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll False @@ -123,6 +123,10 @@ ..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.3.4.13329\lib\net45-full\DotNetOpenAuth.OpenId.RelyingParty.dll True + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -136,6 +140,7 @@ False + @@ -148,6 +153,14 @@ False + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.FacebookAuth/packages.config b/src/Plugins/SmartStore.FacebookAuth/packages.config index c30173272e..1ec5c2fa2b 100644 --- a/src/Plugins/SmartStore.FacebookAuth/packages.config +++ b/src/Plugins/SmartStore.FacebookAuth/packages.config @@ -1,7 +1,7 @@  - - + + @@ -12,9 +12,12 @@ + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.FacebookAuth/web.config b/src/Plugins/SmartStore.FacebookAuth/web.config index d3ef8d4db1..69adedf4ac 100644 --- a/src/Plugins/SmartStore.FacebookAuth/web.config +++ b/src/Plugins/SmartStore.FacebookAuth/web.config @@ -79,7 +79,7 @@ - + diff --git a/src/Plugins/SmartStore.GoogleAnalytics/web.config b/src/Plugins/SmartStore.GoogleAnalytics/web.config index 21fe12fec3..a1041ef9b0 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/web.config +++ b/src/Plugins/SmartStore.GoogleAnalytics/web.config @@ -74,7 +74,7 @@ - + diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj index 06368ab51d..4bc8d5c1f7 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj @@ -85,12 +85,12 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll False @@ -105,6 +105,10 @@ ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -118,8 +122,17 @@ False + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config b/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config index 6f0d685c52..ba0f4f340a 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config @@ -1,13 +1,16 @@  - - + + + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config index 552e56025b..e15d8a0902 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config @@ -75,7 +75,7 @@ - + diff --git a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj index 5b6689d041..cd1359771c 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -85,14 +85,18 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -106,8 +110,17 @@ False + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.OfflinePayment/packages.config b/src/Plugins/SmartStore.OfflinePayment/packages.config index 940a1c2036..9fb815616a 100644 --- a/src/Plugins/SmartStore.OfflinePayment/packages.config +++ b/src/Plugins/SmartStore.OfflinePayment/packages.config @@ -1,11 +1,14 @@  - + + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.OfflinePayment/web.config b/src/Plugins/SmartStore.OfflinePayment/web.config index 552e56025b..e15d8a0902 100644 --- a/src/Plugins/SmartStore.OfflinePayment/web.config +++ b/src/Plugins/SmartStore.OfflinePayment/web.config @@ -75,7 +75,7 @@ - + diff --git a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj index 5e49a320b9..8ed2210936 100644 --- a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj +++ b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj @@ -59,18 +59,22 @@ false - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll False ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -84,9 +88,18 @@ False + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.PayPal/packages.config b/src/Plugins/SmartStore.PayPal/packages.config index 5294b5ff78..40af810d02 100644 --- a/src/Plugins/SmartStore.PayPal/packages.config +++ b/src/Plugins/SmartStore.PayPal/packages.config @@ -1,13 +1,16 @@  - - + + + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.PayPal/web.config b/src/Plugins/SmartStore.PayPal/web.config index d5de44336a..5e67769af4 100644 --- a/src/Plugins/SmartStore.PayPal/web.config +++ b/src/Plugins/SmartStore.PayPal/web.config @@ -91,7 +91,7 @@ - + diff --git a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj index a4f65fe396..1ac5ed4f85 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -85,12 +85,12 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll False @@ -101,6 +101,10 @@ ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -110,8 +114,17 @@ False + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.Shipping/packages.config b/src/Plugins/SmartStore.Shipping/packages.config index 775e294d7d..3f60621a73 100644 --- a/src/Plugins/SmartStore.Shipping/packages.config +++ b/src/Plugins/SmartStore.Shipping/packages.config @@ -1,11 +1,14 @@  - - + + + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Shipping/web.config b/src/Plugins/SmartStore.Shipping/web.config index 21fe12fec3..a1041ef9b0 100644 --- a/src/Plugins/SmartStore.Shipping/web.config +++ b/src/Plugins/SmartStore.Shipping/web.config @@ -74,7 +74,7 @@ - + diff --git a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj index ca1310024f..7e250cd045 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj +++ b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj @@ -85,12 +85,12 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll False @@ -101,6 +101,10 @@ ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -110,8 +114,17 @@ False + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.ShippingByWeight/packages.config b/src/Plugins/SmartStore.ShippingByWeight/packages.config index 775e294d7d..3f60621a73 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/packages.config +++ b/src/Plugins/SmartStore.ShippingByWeight/packages.config @@ -1,11 +1,14 @@  - - + + + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.ShippingByWeight/web.config b/src/Plugins/SmartStore.ShippingByWeight/web.config index 21fe12fec3..a1041ef9b0 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/web.config +++ b/src/Plugins/SmartStore.ShippingByWeight/web.config @@ -74,7 +74,7 @@ - + diff --git a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj index 36f3d57b73..8e700adbe5 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -85,8 +85,8 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False @@ -97,6 +97,10 @@ ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -110,8 +114,17 @@ False + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.Tax/packages.config b/src/Plugins/SmartStore.Tax/packages.config index 36d0a9ec66..67dcff123b 100644 --- a/src/Plugins/SmartStore.Tax/packages.config +++ b/src/Plugins/SmartStore.Tax/packages.config @@ -1,11 +1,14 @@  - + + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Tax/web.config b/src/Plugins/SmartStore.Tax/web.config index 552e56025b..e15d8a0902 100644 --- a/src/Plugins/SmartStore.Tax/web.config +++ b/src/Plugins/SmartStore.Tax/web.config @@ -75,7 +75,7 @@ - + diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 56670be120..a724433ca6 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -83,16 +83,16 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll False - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll False - - ..\..\packages\Autofac.WebApi2.4.2.0\lib\net45\Autofac.Integration.WebApi.dll + + ..\..\packages\Autofac.WebApi2.5.0.0\lib\net461\Autofac.Integration.WebApi.dll False @@ -103,6 +103,10 @@ ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False @@ -128,6 +132,7 @@ True + @@ -138,6 +143,10 @@ False + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + @@ -145,6 +154,10 @@ ..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll False + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + diff --git a/src/Plugins/SmartStore.WebApi/packages.config b/src/Plugins/SmartStore.WebApi/packages.config index 70f1cfe266..554f1b2b1b 100644 --- a/src/Plugins/SmartStore.WebApi/packages.config +++ b/src/Plugins/SmartStore.WebApi/packages.config @@ -1,8 +1,8 @@  - - - + + + @@ -13,11 +13,14 @@ + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/web.config b/src/Plugins/SmartStore.WebApi/web.config index 9eb24d4874..40c8794565 100644 --- a/src/Plugins/SmartStore.WebApi/web.config +++ b/src/Plugins/SmartStore.WebApi/web.config @@ -39,7 +39,7 @@ - + diff --git a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs index f228466df9..2d65ce1470 100644 --- a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs +++ b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs @@ -7,6 +7,7 @@ using Autofac; using Autofac.Builder; using Autofac.Core; +using Autofac.Core.Registration; using Autofac.Integration.Mvc; using Autofac.Integration.WebApi; using SmartStore.ComponentModel; @@ -278,7 +279,7 @@ protected override void Load(ContainerBuilder builder) builder.RegisterType().As().InstancePerRequest(); } - protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration) + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) { // Look for first settable property of type "ICommonServices" and inject var servicesProperty = FindCommonServicesProperty(registration.Activator.LimitType); @@ -448,7 +449,7 @@ Type findHookedType(Type t) .InstancePerRequest(); } - protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration) + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) { var querySettingsProperty = FindQuerySettingsProperty(registration.Activator.LimitType); @@ -503,7 +504,7 @@ protected override void Load(ContainerBuilder builder) builder.RegisterType().InstancePerRequest(); } - protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration) + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) { var userProperty = FindUserProperty(registration.Activator.LimitType); @@ -752,7 +753,7 @@ protected override void Load(ContainerBuilder builder) builder.RegisterType().As(); } - protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration) + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) { if (!DataSettings.DatabaseIsInstalled()) return; @@ -1330,7 +1331,8 @@ static IComponentRegistration CreateMetaRegistration(Service providedService, if (!workValues.Values.TryGetValue(w, out T value)) { - value = (T)workValues.ComponentContext.ResolveComponent(valueRegistration, p); + var request = new ResolveRequest(providedService, valueRegistration, p); + value = (T)workValues.ComponentContext.ResolveComponent(request); workValues.Values[w] = value; } @@ -1341,7 +1343,7 @@ static IComponentRegistration CreateMetaRegistration(Service providedService, }); }) .As(providedService) - .Targeting(valueRegistration) + .Targeting(valueRegistration, false) .SingleInstance(); return rb.CreateRegistration(); diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 4358766610..99aaa7dadf 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -71,15 +71,14 @@ False ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll - True + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - ..\..\packages\Autofac.WebApi2.4.2.0\lib\net45\Autofac.Integration.WebApi.dll + + ..\..\packages\Autofac.WebApi2.5.0.0\lib\net461\Autofac.Integration.WebApi.dll ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll @@ -116,6 +115,9 @@ ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll @@ -146,6 +148,9 @@ ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -154,6 +159,9 @@ ..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + diff --git a/src/Presentation/SmartStore.Web.Framework/app.config b/src/Presentation/SmartStore.Web.Framework/app.config index 3cf6309ecc..6268c5997d 100644 --- a/src/Presentation/SmartStore.Web.Framework/app.config +++ b/src/Presentation/SmartStore.Web.Framework/app.config @@ -8,7 +8,7 @@ - + diff --git a/src/Presentation/SmartStore.Web.Framework/packages.config b/src/Presentation/SmartStore.Web.Framework/packages.config index 8ad306cfc9..60230ca41b 100644 --- a/src/Presentation/SmartStore.Web.Framework/packages.config +++ b/src/Presentation/SmartStore.Web.Framework/packages.config @@ -2,9 +2,9 @@ - - - + + + @@ -25,6 +25,7 @@ + @@ -35,7 +36,9 @@ + + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index 69ebd0a824..2eefc4a9dc 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -66,12 +66,11 @@ ..\..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll False - - ..\..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - ..\..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll - False + + ..\..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -84,6 +83,9 @@ ..\..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -115,11 +117,17 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + diff --git a/src/Presentation/SmartStore.Web/Administration/Web.config b/src/Presentation/SmartStore.Web/Administration/Web.config index 19498da48d..7bfcddf208 100644 --- a/src/Presentation/SmartStore.Web/Administration/Web.config +++ b/src/Presentation/SmartStore.Web/Administration/Web.config @@ -55,7 +55,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/Administration/packages.config b/src/Presentation/SmartStore.Web/Administration/packages.config index 7c34e63d21..185c22d86f 100644 --- a/src/Presentation/SmartStore.Web/Administration/packages.config +++ b/src/Presentation/SmartStore.Web/Administration/packages.config @@ -1,8 +1,8 @@  - - + + @@ -12,10 +12,13 @@ + + + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index 766aabe98b..cffabce250 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -79,12 +79,11 @@ False ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - ..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll - True + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll @@ -140,6 +139,9 @@ ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -172,6 +174,9 @@ ..\..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -180,6 +185,9 @@ + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index 9f5c1343d2..cb83d5a972 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -266,7 +266,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/packages.config b/src/Presentation/SmartStore.Web/packages.config index 212f98819d..4bc6a49167 100644 --- a/src/Presentation/SmartStore.Web/packages.config +++ b/src/Presentation/SmartStore.Web/packages.config @@ -2,8 +2,8 @@ - - + + @@ -27,6 +27,7 @@ + @@ -37,6 +38,8 @@ + + \ No newline at end of file diff --git a/src/Tests/SmartStore.Core.Tests/App.config b/src/Tests/SmartStore.Core.Tests/App.config index d8c6b8d753..a1bf925b24 100644 --- a/src/Tests/SmartStore.Core.Tests/App.config +++ b/src/Tests/SmartStore.Core.Tests/App.config @@ -16,7 +16,7 @@ - + diff --git a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj index 65432f54b0..614e73c738 100644 --- a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj +++ b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj @@ -62,8 +62,8 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -71,6 +71,9 @@ ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -87,6 +90,12 @@ + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + diff --git a/src/Tests/SmartStore.Core.Tests/packages.config b/src/Tests/SmartStore.Core.Tests/packages.config index 464049c76b..c5c54e3b6d 100644 --- a/src/Tests/SmartStore.Core.Tests/packages.config +++ b/src/Tests/SmartStore.Core.Tests/packages.config @@ -1,8 +1,11 @@  - + + + + \ No newline at end of file diff --git a/src/Tests/SmartStore.Data.Tests/App.config b/src/Tests/SmartStore.Data.Tests/App.config index 1378872e0d..e0aaca7600 100644 --- a/src/Tests/SmartStore.Data.Tests/App.config +++ b/src/Tests/SmartStore.Data.Tests/App.config @@ -24,7 +24,7 @@ - + diff --git a/src/Tests/SmartStore.Services.Tests/App.config b/src/Tests/SmartStore.Services.Tests/App.config index 42628e2c61..c39dc1a0f3 100644 --- a/src/Tests/SmartStore.Services.Tests/App.config +++ b/src/Tests/SmartStore.Services.Tests/App.config @@ -34,7 +34,7 @@ - + diff --git a/src/Tests/SmartStore.Tests/App.config b/src/Tests/SmartStore.Tests/App.config index a9530d0756..e1c69410e5 100644 --- a/src/Tests/SmartStore.Tests/App.config +++ b/src/Tests/SmartStore.Tests/App.config @@ -11,7 +11,7 @@ - + diff --git a/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj b/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj index 656767cf8c..bc6caffde1 100644 --- a/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj +++ b/src/Tests/SmartStore.Tests/SmartStore.Tests.csproj @@ -62,8 +62,8 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Autofac.4.9.0\lib\net45\Autofac.dll + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -71,6 +71,9 @@ ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + False ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll @@ -79,8 +82,15 @@ ..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + diff --git a/src/Tests/SmartStore.Tests/packages.config b/src/Tests/SmartStore.Tests/packages.config index e08776c4ed..7aacc4eda3 100644 --- a/src/Tests/SmartStore.Tests/packages.config +++ b/src/Tests/SmartStore.Tests/packages.config @@ -1,7 +1,10 @@  - + + + + \ No newline at end of file diff --git a/src/Tests/SmartStore.Web.MVC.Tests/App.config b/src/Tests/SmartStore.Web.MVC.Tests/App.config index 6ebf5eff27..21fa8e95a1 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/App.config +++ b/src/Tests/SmartStore.Web.MVC.Tests/App.config @@ -23,7 +23,7 @@ - + diff --git a/src/Tools/SmartStore.Packager/App.config b/src/Tools/SmartStore.Packager/App.config index 5ce5d12972..7a1de6a456 100644 --- a/src/Tools/SmartStore.Packager/App.config +++ b/src/Tools/SmartStore.Packager/App.config @@ -22,7 +22,7 @@ - + From 230a10b03cfee4788c2d514def4ed990dee9437b Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 12 Aug 2020 10:33:13 +0200 Subject: [PATCH 032/695] Installation: fixes "Invalid object name dbo.Customer_CustomerRole_Mapping" (cherry picked from commit a18bf4d7613729f38b782be6db684567e5a1ce41) --- .../Migrations/202003052100521_CustomerRoleMappings.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs index b0c4bf9640..b9fd772490 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs @@ -42,10 +42,10 @@ public override void Up() .Index(t => t.CustomerRole_Id) .Index(t => t.RuleSetEntity_Id); - if (HostingEnvironment.IsHosted) + if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer) { // Copy customer role mappings. - Sql("Insert Into [dbo].[CustomerRoleMapping] (CustomerId, CustomerRoleId, IsSystemMapping) Select Customer_Id As Customer_Id, CustomerRole_Id As CustomerRole_Id, 0 As IsSystemMapping From [dbo].[Customer_CustomerRole_Mapping]"); + Sql("IF (EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Customer_CustomerRole_Mapping')) BEGIN Insert Into [dbo].[CustomerRoleMapping] (CustomerId, CustomerRoleId, IsSystemMapping) Select Customer_Id As Customer_Id, CustomerRole_Id As CustomerRole_Id, 0 As IsSystemMapping From [dbo].[Customer_CustomerRole_Mapping] END"); } } From 32d15520c7454698bc5e4ebc62596749c9243599 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 12 Aug 2020 14:24:10 +0200 Subject: [PATCH 033/695] API: if paging is required and there is no $top sent by client then force the page size specified by merchant (in that case do not produce an error any more) --- .../Controllers/Api/PaymentsController.cs | 2 +- .../Controllers/Api/UploadsController.cs | 4 +- .../Controllers/OData/CustomersController.cs | 2 +- .../Controllers/OData/MediaController.cs | 2 +- .../Controllers/OData/ProductsController.cs | 12 ++--- .../WebApi/OData/WebApiQueryableAttribute.cs | 49 ++++++------------- 6 files changed, 26 insertions(+), 45 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs index 08cd9c73d6..d108efa64e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs @@ -19,7 +19,7 @@ public PaymentsController(Lazy providerManager) _providerManager = providerManager; } - [WebApiQueryable(PagingOptional = true)] + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] public IQueryable GetMethods() { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs index a6a6e3fd42..d5bbb1a10c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs @@ -89,7 +89,7 @@ private StringContent CloneHeaderContent(string path, MultipartFileData origin) #endregion [HttpPost, WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] - [WebApiQueryable(PagingOptional = true)] + [WebApiQueryable] public async Task> ProductImages() { if (!Request.Content.IsMimeMultipartContent()) @@ -218,7 +218,7 @@ public async Task> ProductImages() } [HttpPost, WebApiAuthenticate(Permission = Permissions.Configuration.Import.Execute)] - [WebApiQueryable(PagingOptional = true)] + [WebApiQueryable] public async Task> ImportFiles() { if (!Request.Content.IsMimeMultipartContent()) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 93cddb03c3..fb2d49941a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -111,7 +111,7 @@ public async Task Delete(int key) #region Navigation properties - [WebApiQueryable(PagingOptional = true)] + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] public HttpResponseMessage GetAddresses(int key, int relatedKey = 0 /*addressId*/) { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index ad8d87063f..70085b407b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -171,7 +171,7 @@ public MediaFileInfo GetFileByPath(ODataActionParameters parameters) /// POST /Media/GetFilesByIds {"Ids":[1,2,3]} [HttpPost, WebApiAuthenticate] - [WebApiQueryable(PagingOptional = true)] + [WebApiQueryable] public IQueryable GetFilesByIds(ODataActionParameters parameters) { IList files = null; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index de5f207710..086417d141 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -169,7 +169,7 @@ public SingleResult GetSampleDownload(int key) } - [WebApiQueryable(PagingOptional = true)] + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public HttpResponseMessage GetProductCategories(int key, int relatedKey = 0 /*categoryId*/) { @@ -227,7 +227,7 @@ public HttpResponseMessage DeleteProductCategories(int key, int relatedKey = 0 / } - [WebApiQueryable(PagingOptional = true)] + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public HttpResponseMessage GetProductManufacturers(int key, int relatedKey = 0 /*manufacturerId*/) { @@ -285,7 +285,7 @@ public HttpResponseMessage DeleteProductManufacturers(int key, int relatedKey = } - [WebApiQueryable(PagingOptional = true)] + [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public HttpResponseMessage GetProductPictures(int key, int relatedKey = 0 /*mediaFileId*/) { @@ -423,7 +423,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) manageAttributes.CollectionParameter("Attributes"); } - [HttpPost, WebApiQueryable(PagingOptional = true)] + [HttpPost, WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IQueryable Search([ModelBinder(typeof(WebApiCatalogSearchQueryModelBinder))] CatalogSearchQuery query) { @@ -492,7 +492,7 @@ public IQueryable Search([ModelBinder(typeof(WebApiCatalogSearchQueryMo return CalculatePrice(key, true); } - [HttpPost, WebApiQueryable(PagingOptional = true)] + [HttpPost, WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] public IQueryable CreateAttributeCombinations(int key) { @@ -506,7 +506,7 @@ public IQueryable CreateAttributeCombination return entity.ProductVariantAttributeCombinations.AsQueryable(); } - [HttpPost, WebApiQueryable(PagingOptional = true)] + [HttpPost, WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] public IQueryable ManageAttributes(int key, ODataActionParameters parameters) { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs index 424f52df82..16322f986c 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs @@ -1,5 +1,4 @@ using System; -using System.Net; using System.Net.Http; using System.Web.Http; using System.Web.Http.Filters; @@ -8,25 +7,16 @@ namespace SmartStore.Web.Framework.WebApi.OData { - /// - /// The [EnableQuery] attribute enables clients to modify the query, by using query options such as $filter, $sort, and $page. - /// - /// - public class WebApiQueryableAttribute : EnableQueryAttribute + /// + /// The [EnableQuery] attribute enables clients to modify the query, by using query options such as $filter, $sort, and $page. + /// + /// + public class WebApiQueryableAttribute : EnableQueryAttribute { - public bool PagingOptional { get; set; } - - protected virtual bool MissingClientPaging(HttpActionExecutedContext actionExecutedContext) + protected virtual void SetDefaultQueryOptions(HttpActionExecutedContext actionExecutedContext) { - if (PagingOptional) - { - return false; - } - try { - var content = actionExecutedContext.Response.Content as ObjectContent; - if (MaxTop == 0) { var controllingData = WebApiCachingControllingData.Data(); @@ -35,38 +25,29 @@ protected virtual bool MissingClientPaging(HttpActionExecutedContext actionExecu MaxExpansionDepth = controllingData.MaxExpansionDepth; } - if (content != null) + var content = actionExecutedContext?.Response?.Content as ObjectContent; + if (content?.Value is HttpError || content?.Value is SingleResult) { - if (content.Value is HttpError) - return false; - - if (content.Value is SingleResult) - return false; // 'true' would result in a 500 'internal server error' + // Paging not required. + return; } - var query = actionExecutedContext.Request.RequestUri.Query; - var missingClientPaging = query.IsEmpty() || !query.Contains("$top="); - - if (missingClientPaging) + var hasClientPaging = actionExecutedContext?.Request?.RequestUri?.Query?.Contains("$top=") ?? false; + if (!hasClientPaging) { - actionExecutedContext.Response = actionExecutedContext.Request.CreateErrorResponse(HttpStatusCode.BadRequest, - $"Missing client paging. Please specify odata $top query option. Maximum value is {MaxTop}."); - - return true; + // If paging is required and there is no $top sent by client then force the page size specified by merchant. + PageSize = MaxTop; } } catch (Exception ex) { ex.Dump(); } - - return false; } public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext) { - if (MissingClientPaging(actionExecutedContext)) - return; + SetDefaultQueryOptions(actionExecutedContext); base.OnActionExecuted(actionExecutedContext); } From 3e0948e03611633c36b6f66ef7532ba15f7b43f5 Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Wed, 12 Aug 2020 21:46:44 +0200 Subject: [PATCH 034/695] fu > minor adjustments --- .../Views/Shared/Components/FileUploader.cshtml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml index 6159bdb862..6b752a57d4 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml @@ -65,7 +65,7 @@ { // TODO: find a better way!!! var mediaService = EngineContext.Current.Resolve(); - var files = Model.UploadedFiles; + var files = Model.UploadedFiles ?? new List();
@@ -73,14 +73,12 @@ { var previewUrl = mediaService.GetUrl(file.MediaFileId, 250); var isMainPic = file.MediaFileId == Model.MainFileId; - var entityMediaId = 0; - - if (Model.EntityType.Equals("Product")) - { - var entityMediaFile = file as ProductMediaFile; - entityMediaId = entityMediaFile.Id; - } + var entityMediaId = file.MediaFileId; + //if (Model.EntityType.Equals("Product")) + //{ + //entityMediaId = file.MediaFileId; +
Date: Wed, 12 Aug 2020 21:47:26 +0200 Subject: [PATCH 035/695] pb > gallery block: moved GalleryMediaFuile to pb gallery block --- .../SmartStore.Core/Domain/Catalog/ProductMediaFile.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs index bbf8b12cf1..e43e481e90 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs @@ -20,14 +20,6 @@ public interface IMediaFile MediaFile MediaFile { get; set; } } - public class GalleryMediaFile : IMediaFile - { - public int MediaFileId { get; set; } - public string Title { get; set; } - public int DisplayOrder { get; set; } - public MediaFile MediaFile { get; set; } - } - /// /// Represents a product media file mapping /// From 63ebb871706bf7344f50bcd565681ff605a9c6ff Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 12 Aug 2020 21:57:39 +0200 Subject: [PATCH 036/695] Resolves #2053: Handle output cache invalidation for media files --- .../Caching/OutputCache/DisplayControl.cs | 5 +++++ .../SmartStore.Core/Domain/Media/MediaFile.cs | 19 +++++++++++++++++++ .../Controllers/BlogController.cs | 2 ++ .../Controllers/CatalogHelper.MapProduct.cs | 2 ++ .../Controllers/CatalogHelper.cs | 10 ++++++++-- .../Controllers/NewsController.cs | 2 ++ .../Views/Shared/MediaTemplates/Audio.cshtml | 8 +++++--- .../Views/Shared/MediaTemplates/Bin.cshtml | 13 ++++++------- .../Shared/MediaTemplates/Document.cshtml | 13 ++++++------- .../Views/Shared/MediaTemplates/Text.cshtml | 13 ++++++------- .../Views/Shared/MediaTemplates/Video.cshtml | 8 +++++--- .../Shared/MediaTemplates/_Thumbnail.cshtml | 12 ++++++++---- 12 files changed, 74 insertions(+), 33 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/DisplayControl.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache/DisplayControl.cs index 28a05372d5..35875da687 100644 --- a/src/Libraries/SmartStore.Core/Caching/OutputCache/DisplayControl.cs +++ b/src/Libraries/SmartStore.Core/Caching/OutputCache/DisplayControl.cs @@ -8,6 +8,7 @@ using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Domain.Localization; +using SmartStore.Core.Domain.Media; using SmartStore.Core.Domain.News; using SmartStore.Core.Domain.Topics; using SmartStore.Utilities; @@ -36,6 +37,7 @@ public partial class DisplayControl : IDisplayControl [typeof(NewsItem)] = (x, c) => new[] { "n" + x.Id }, [typeof(NewsComment)] = (x, c) => new[] { "n" + ((NewsComment)x).NewsItemId }, [typeof(Topic)] = (x, c) => new[] { "t" + x.Id }, + [typeof(MediaFile)] = (x, c) => new[] { "mf" + x.Id }, [typeof(SpecificationAttributeOption)] = (x, c) => ((SpecificationAttributeOption)x).ProductSpecificationAttributes.Select(y => "p" + y.ProductId), [typeof(ProductTag)] = (x, c) => ((ProductTag)x).Products.Select(y => "p" + y.Id), [typeof(Product)] = HandleProduct, @@ -153,6 +155,9 @@ private static IEnumerable HandleLocalizedProperty(BaseEntity entity, IC case nameof(Topic): prefix = "t"; break; + case nameof(MediaFile): + prefix = "mf"; + break; case nameof(SpecificationAttribute): targetEntity = dbContext.Set().Find(lp.EntityId); break; diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs index 592ad6d5d5..051fc8efff 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs @@ -10,6 +10,25 @@ namespace SmartStore.Core.Domain.Media [DataContract] public partial class MediaFile : BaseEntity, ITransient, IHasMedia, IAuditable, ISoftDeletable, ILocalizedEntity { + #region static + + private static readonly HashSet _outputAffectingProductProps = new HashSet + { + nameof(MediaFile.FolderId), + nameof(MediaFile.Name), + nameof(MediaFile.Alt), + nameof(MediaFile.Title), + nameof(MediaFile.Hidden), + nameof(MediaFile.Deleted) + }; + + public static IReadOnlyCollection GetOutputAffectingPropertyNames() + { + return _outputAffectingProductProps; + } + + #endregion + private ICollection _productMediaFiles; private ICollection _tags; private ICollection _tracks; diff --git a/src/Presentation/SmartStore.Web/Controllers/BlogController.cs b/src/Presentation/SmartStore.Web/Controllers/BlogController.cs index 01bbf3bc49..4bb3982f98 100644 --- a/src/Presentation/SmartStore.Web/Controllers/BlogController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/BlogController.cs @@ -117,6 +117,8 @@ protected PictureModel PrepareBlogPostPictureModel(BlogPost blogPost, int? fileI AlternateText = file?.File?.GetLocalized(x => x.Alt)?.Value.NullEmpty() ?? blogPost.Title, File = file }; + + _services.DisplayControl.Announce(file?.File); return pictureModel; } diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs index 47ebd0a52e..fb6ed03e63 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs @@ -465,6 +465,8 @@ private void MapProductSummaryItem(Product product, MapProductSummaryItemContext AlternateText = file?.File?.GetLocalized(x => x.Alt)?.Value.NullEmpty() ?? string.Format(ctx.Resources["Media.Product.ImageAlternateTextFormat"], item.Name), File = file }; + + _services.DisplayControl.Announce(file?.File); } // Manufacturers diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index e4ff90d732..91d171adc5 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs @@ -217,7 +217,9 @@ public IList MapCategorySummaryModel(IEnumerable File = file }; - return model; + _services.DisplayControl.Announce(file?.File); + + return model; }) .ToList(); } @@ -590,6 +592,8 @@ private PictureModel CreatePictureModel(ProductDetailsPictureModel model, MediaF File = _mediaService.ConvertMediaFile(file) }; + _services.DisplayControl.Announce(file); + return result; } @@ -1508,7 +1512,9 @@ public PictureModel PrepareManufacturerPictureModel( File = file }; - return model; + _services.DisplayControl.Announce(file?.File); + + return model; } public ManufacturerNavigationModel PrepareManufacturerNavigationModel(int manufacturerItemsToDisplay) diff --git a/src/Presentation/SmartStore.Web/Controllers/NewsController.cs b/src/Presentation/SmartStore.Web/Controllers/NewsController.cs index e4cf21638c..907097b4b6 100644 --- a/src/Presentation/SmartStore.Web/Controllers/NewsController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/NewsController.cs @@ -387,6 +387,8 @@ protected PictureModel PrepareNewsItemPictureModel(NewsItem newsItem, int? fileI File = file }; + _services.DisplayControl.Announce(file?.File); + return pictureModel; } diff --git a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Audio.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Audio.cshtml index 8c53272ba5..335dd0eeb9 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Audio.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Audio.cshtml @@ -1,5 +1,7 @@ -@using SmartStore.Web.Framework.Modelling; -@model MediaTemplateModel +@model MediaTemplateModel + +@using SmartStore.Web.Framework.Modelling; + @if (Model.RenderViewer) {
@@ -8,5 +10,5 @@ } else { - @Html.Partial("MediaTemplates/_Thumbnail") + @Html.Partial("MediaTemplates/_Thumbnail", Model) } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Bin.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Bin.cshtml index 43b9316bde..e2ce0c6ebb 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Bin.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Bin.cshtml @@ -1,9 +1,8 @@ -@using SmartStore.Web.Framework.Modelling; -@model MediaTemplateModel -@if (Model.RenderViewer) +@model MediaTemplateModel + +@using SmartStore.Web.Framework.Modelling; + +@if (!Model.RenderViewer) { -} -else -{ - @Html.Partial("MediaTemplates/_Thumbnail") + @Html.Partial("MediaTemplates/_Thumbnail", Model) } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Document.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Document.cshtml index 43b9316bde..e2ce0c6ebb 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Document.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Document.cshtml @@ -1,9 +1,8 @@ -@using SmartStore.Web.Framework.Modelling; -@model MediaTemplateModel -@if (Model.RenderViewer) +@model MediaTemplateModel + +@using SmartStore.Web.Framework.Modelling; + +@if (!Model.RenderViewer) { -} -else -{ - @Html.Partial("MediaTemplates/_Thumbnail") + @Html.Partial("MediaTemplates/_Thumbnail", Model) } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Text.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Text.cshtml index 43b9316bde..e2ce0c6ebb 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Text.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Text.cshtml @@ -1,9 +1,8 @@ -@using SmartStore.Web.Framework.Modelling; -@model MediaTemplateModel -@if (Model.RenderViewer) +@model MediaTemplateModel + +@using SmartStore.Web.Framework.Modelling; + +@if (!Model.RenderViewer) { -} -else -{ - @Html.Partial("MediaTemplates/_Thumbnail") + @Html.Partial("MediaTemplates/_Thumbnail", Model) } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Video.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Video.cshtml index 50af54c289..2bfa55d44a 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Video.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/Video.cshtml @@ -1,5 +1,7 @@ -@using SmartStore.Web.Framework.Modelling; -@model MediaTemplateModel +@model MediaTemplateModel + +@using SmartStore.Web.Framework.Modelling; + @if (Model.RenderViewer) {
@@ -8,5 +10,5 @@ } else { - @Html.Partial("MediaTemplates/_Thumbnail") + @Html.Partial("MediaTemplates/_Thumbnail", Model) } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/_Thumbnail.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/_Thumbnail.cshtml index b299415941..50494c6947 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/_Thumbnail.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/MediaTemplates/_Thumbnail.cshtml @@ -1,17 +1,21 @@ -@using SmartStore.Web.Framework.Modelling; -@model MediaTemplateModel +@model MediaTemplateModel + +@using SmartStore.Web.Framework.Modelling; + @{ dynamic iconHint = GetIconHint(Model.File.MediaType); } +
@* Title must be on the Picture attribute, otherwise it's covered by the CSS play-video symbol. *@ - @Model.Alt
+ @functions { private object GetIconHint(string mediaType) { From 359fd22678f8ba4a59373d4564489d577bd92f2d Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 12 Aug 2020 22:04:37 +0200 Subject: [PATCH 037/695] API: IMediaService endpoints (in progress) --- .../Media/MediaFileInfo.cs | 7 +- .../Controllers/OData/MediaController.cs | 192 ++++++++++++------ .../Models/OData/Media/MediaItemInfo.cs | 30 +++ .../SmartStore.WebApi.csproj | 1 + .../WebApiConfigurationProvider.cs | 4 +- 5 files changed, 160 insertions(+), 74 deletions(-) create mode 100644 src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaItemInfo.cs diff --git a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs index 5ce0f0657e..bff031e5bb 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs @@ -35,12 +35,7 @@ public MediaFileInfo(MediaFile file, IMediaStorageProvider storageProvider, IMed public MediaFile File { get; } [JsonProperty("id")] - public int Id - { - get { return File.Id; } - set { } - } - //public int Id => File.Id; + public int Id => File.Id; [JsonProperty("folderId")] public int? FolderId => File.FolderId; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 70085b407b..902e396705 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -1,81 +1,139 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; +using System.Web.OData.Query; +using SmartStore.ComponentModel; +using SmartStore.Core.Domain.Media; using SmartStore.Services.Media; using SmartStore.Web.Framework.WebApi; +using SmartStore.Web.Framework.WebApi.Caching; using SmartStore.Web.Framework.WebApi.Configuration; using SmartStore.Web.Framework.WebApi.OData; using SmartStore.Web.Framework.WebApi.Security; +using SmartStore.WebApi.Models.OData; namespace SmartStore.WebApi.Controllers.OData { - // TODO: readonly properties of MediaFileInfo cannot be serialized! - public class MediaController : ODataController + /// + /// Is intended to make methods of the IMediaService accessible. Direct access to the MediaFile entity is not intended. + /// + public class MediaController : WebApiEntityController { - private readonly IMediaService _mediaService; + // GET /Media(123) + [WebApiQueryable] + [WebApiAuthenticate] + public SingleResult Get(int key) + { + var file = Service.GetFileById(key); + if (file == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } - public MediaController(IMediaService mediaService) + return SingleResult.Create(new[] { Convert(file) }.AsQueryable()); + } + + // GET /Media + [WebApiQueryable] + [WebApiAuthenticate] + public IQueryable Get(/*ODataQueryOptions queryOptions*/) { - _mediaService = mediaService; + throw new HttpResponseException(HttpStatusCode.NotImplemented); + + // TODO or not TODO :) + //var maxTop = WebApiCachingControllingData.Data().MaxTop; + //var top = Math.Min(this.GetQueryStringValue("$top", maxTop), maxTop); + + //var query = queryOptions.ApplyTo(GetEntitySet(), new ODataQuerySettings { PageSize = top }) as IQueryable; + //var files = query.ToList(); + //var result = files.Select(x => Convert(Service.ConvertMediaFile(x))); + + //return result.AsQueryable(); } - // GET /Media(123) + // GET /Media(123)/ThumbUrl [WebApiAuthenticate] - public MediaFileInfo Get(int key) + public HttpResponseMessage GetProperty(int key, string propertyName) { - MediaFileInfo file = null; + var file = Service.GetFileById(key); + if (file == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } - this.ProcessEntity(() => + var item = Convert(file); + + var prop = FastProperty.GetProperty(item.GetType(), propertyName); + if (prop == null) { - file = _mediaService.GetFileById(key); - if (file == null) - { - throw Request.NotFoundException($"Cannot find file by ID {key}."); - } - }); + throw Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); + } - return file; + var propertyValue = prop.GetValue(item); + + return Request.CreateResponse(HttpStatusCode.OK, prop.Property.PropertyType, propertyValue); } - #region Actions + public IHttpActionResult Post(MediaFile entity) + { + throw new HttpResponseException(HttpStatusCode.Forbidden); + } + + public IHttpActionResult Put(int key, MediaFile entity) + { + throw new HttpResponseException(HttpStatusCode.Forbidden); + } + + public IHttpActionResult Patch(int key, Delta model) + { + throw new HttpResponseException(HttpStatusCode.Forbidden); + } + + public IHttpActionResult Delete(int key) + { + throw new HttpResponseException(HttpStatusCode.Forbidden); + } + + #region Actions and functions public static void Init(WebApiConfigurationBroadcaster configData) { - var entityConfig = configData.ModelBuilder.EntityType(); + var entityConfig = configData.ModelBuilder.EntityType(); entityConfig.Collection - .Action("FileExists") - .ReturnsFromEntitySet("Media") + .Function("FileExists") + .Returns() .Parameter("Path"); entityConfig.Collection .Action("CheckUniqueFileName") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("Media") .Parameter("Path"); entityConfig.Collection .Action("GetFileByPath") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("Media") .Parameter("Path"); //var getFileByName = entityConfig.Collection // .Action("GetFileByName") - // .ReturnsFromEntitySet("Media"); + // .ReturnsFromEntitySet("Media"); //getFileByName.Parameter("FileName"); //getFileByName.Parameter("FolderId"); entityConfig.Collection .Action("GetFilesByIds") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("Media") .CollectionParameter("Ids"); var countFiles = entityConfig.Collection .Action("CountFiles") - .ReturnsFromEntitySet("Media"); + .ReturnsFromEntitySet("Media"); countFiles.Parameter("FolderId"); countFiles.Parameter("DeepSearch"); countFiles.Parameter("Hidden"); @@ -87,19 +145,11 @@ public static void Init(WebApiConfigurationBroadcaster configData) countFiles.CollectionParameter("Extensions"); } - /// POST /Media/FileExists {"Path":"content/my-file.jpg"} - [HttpPost, WebApiAuthenticate] - public bool FileExists(ODataActionParameters parameters) + /// GET /Media/FileExists(Path='content/my-file.jpg') + [HttpGet, WebApiAuthenticate] + public bool FileExists([FromODataUri] string path) { - var fileExists = false; - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - - fileExists = _mediaService.FileExists(path); - }); - + var fileExists = Service.FileExists(path); return fileExists; } @@ -113,7 +163,7 @@ public HttpResponseMessage CheckUniqueFileName(ODataActionParameters parameters) { var path = parameters.GetValueSafe("Path"); - if (!_mediaService.CheckUniqueFileName(path, out newPath)) + if (!Service.CheckUniqueFileName(path, out newPath)) { // Just to make sure the result is unmistakable ;-) newPath = null; @@ -138,7 +188,7 @@ public MediaFileInfo GetFileByPath(ODataActionParameters parameters) { var path = parameters.GetValueSafe("Path"); - file = _mediaService.GetFileByPath(path); + file = Service.GetFileByPath(path); if (file == null) { throw Request.NotFoundException($"The file with the path '{path ?? string.Empty}' does not exist."); @@ -181,7 +231,7 @@ public IQueryable GetFilesByIds(ODataActionParameters parameters) var ids = parameters.GetValueSafe>("Ids"); if (ids?.Any() ?? false) { - files = _mediaService.GetFilesByIds(ids.ToArray()); + files = Service.GetFilesByIds(ids.ToArray()); } }); @@ -209,38 +259,48 @@ await this.ProcessEntityAsync(async () => Extensions = parameters.GetValueSafe>("Extensions")?.ToArray() }; - count = await _mediaService.CountFilesAsync(query); + count = await Service.CountFilesAsync(query); }); return count; } #endregion + + #region Utilities + + private MediaItemInfo Convert(MediaFileInfo file) + { + var item = MiniMapper.Map(file); + return item; + } + + #endregion } - // public class PicturesController : WebApiEntityController - //{ - // protected override IQueryable GetEntitySet() - // { - // var query = - // from x in Repository.Table - // where !x.Deleted && !x.Hidden - // select x; - - // return query; - // } - - // [WebApiQueryable] - // public SingleResult GetPicture(int key) - // { - // return GetSingleResult(key); - // } - - // [WebApiQueryable] - // public IQueryable GetProductPictures(int key) - // { - // return GetRelatedCollection(key, x => x.ProductMediaFiles); - // } - //} + // public class PicturesController : WebApiEntityController + //{ + // protected override IQueryable GetEntitySet() + // { + // var query = + // from x in Repository.Table + // where !x.Deleted && !x.Hidden + // select x; + + // return query; + // } + + // [WebApiQueryable] + // public SingleResult GetPicture(int key) + // { + // return GetSingleResult(key); + // } + + // [WebApiQueryable] + // public IQueryable GetProductPictures(int key) + // { + // return GetRelatedCollection(key, x => x.ProductMediaFiles); + // } + //} } diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaItemInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaItemInfo.cs new file mode 100644 index 0000000000..f8bf9c2436 --- /dev/null +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaItemInfo.cs @@ -0,0 +1,30 @@ +using System.Runtime.Serialization; +using SmartStore.Core.Domain.Media; + +namespace SmartStore.WebApi.Models.OData +{ + /// + /// Information about a media file returned by the API. + /// + [DataContract] + public partial class MediaItemInfo + { + [DataMember] + public int Id { get; set; } + + [DataMember] + public string Directory { get; set; } + + [DataMember] + public string Path { get; set; } + + [DataMember] + public string Url { get; set; } + + [DataMember] + public string ThumbUrl { get; set; } + + [DataMember] + public MediaFile File { get; set; } + } +} \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 3944793f73..dd50975ed1 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -273,6 +273,7 @@ + diff --git a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs index 4a1bed9ab8..1513a824d6 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs @@ -18,9 +18,9 @@ using SmartStore.Core.Domain.Stores; using SmartStore.Core.Domain.Tax; using SmartStore.Core.Plugins; -using SmartStore.Services.Media; using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.Configuration; +using SmartStore.WebApi.Models.OData; using SmartStore.WebApi.Services; using SmartStore.WebApi.Services.Swagger; using Swashbuckle.Application; @@ -53,7 +53,7 @@ public void Configure(WebApiConfigurationBroadcaster configData) m.EntitySet("Manufacturers"); m.EntitySet("MeasureDimensions"); m.EntitySet("MeasureWeights"); - m.EntitySet("Media"); + m.EntitySet("Media"); m.EntitySet("MediaTags"); m.EntitySet("MediaTracks"); m.EntitySet("NewsLetterSubscriptions"); From ff0eacb58d7479001747743e5fb6326e90c734dd Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 13 Aug 2020 01:57:21 +0200 Subject: [PATCH 038/695] Theming: nicer modal anim --- .../SmartStore.Web/Content/shared/_modal.scss | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Content/shared/_modal.scss b/src/Presentation/SmartStore.Web/Content/shared/_modal.scss index b144fe7617..dadd8fc2b4 100644 --- a/src/Presentation/SmartStore.Web/Content/shared/_modal.scss +++ b/src/Presentation/SmartStore.Web/Content/shared/_modal.scss @@ -2,10 +2,15 @@ /// /// +/* $modal-transition-duration: 0.4s; //$modal-transition-timing: cubic-bezier(0.25, 0.46, 0.45, 0.94); // easeOutQuad $modal-transition-timing: cubic-bezier(0.165, 0.84, 0.44, 1); // easeOutQuart //$modal-transition-timing: cubic-bezier(0.19, 1, 0.22, 1); // easeOutExpo +*/ + +$modal-transition-duration: 0.25s; +$modal-transition-timing: ease-out; // FLEX MODAL @@ -29,12 +34,12 @@ $modal-transition-timing: cubic-bezier(0.165, 0.84, 0.44, 1); // easeOutQuart transition-property: opacity, transform; transition-duration: $modal-transition-duration; transition-timing-function: $modal-transition-timing; - transform: scale(1.1, 1.1); + transform: translate(0, 30px) scale(0.95, 0.95); will-change: transform, opacity; } &.show .modal-dialog { - transform: scale(1, 1); + transform: translate(0, 0) scale(1, 1); opacity: 1; } } From f947bf39670fd7abe4eb3dcbbe96c061027f118d Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 13 Aug 2020 11:41:11 +0200 Subject: [PATCH 039/695] Currencies with duplicate ISO code should be displayed in the currency list --- .../Administration/Controllers/CurrencyController.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs index 8cdedb42c2..d1cadb01a6 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs @@ -175,10 +175,10 @@ public ActionResult Index() public ActionResult List(bool liveRates = false) { var language = _services.WorkContext.WorkingLanguage; - var allCurrencies = _currencyService.GetAllCurrencies(true) - .ToDictionarySafe(x => x.CurrencyCode.EmptyNull().ToUpper(), x => x); + var allCurrencies = _currencyService.GetAllCurrencies(true); + var allCurrenciesByIsoCode = allCurrencies.ToDictionarySafe(x => x.CurrencyCode.EmptyNull().ToUpper(), x => x); - var models = allCurrencies.Select(x => CreateCurrencyListModel(x.Value)).ToList(); + var models = allCurrencies.Select(x => CreateCurrencyListModel(x)).ToList(); if (liveRates) { @@ -193,7 +193,7 @@ public ActionResult List(bool liveRates = false) var rates = _currencyService.GetCurrencyLiveRates(primaryExchangeCurrency.CurrencyCode); // get localized name of currencies - var currencyNames = allCurrencies.ToDictionarySafe( + var currencyNames = allCurrenciesByIsoCode.ToDictionarySafe( x => x.Key, x => x.Value.GetLocalized(y => y.Name, language, true, false).Value ); @@ -214,7 +214,7 @@ public ActionResult List(bool liveRates = false) // provide rate with currency name and whether it is available in store rates.Each(x => { - x.IsStoreCurrency = allCurrencies.ContainsKey(x.CurrencyCode); + x.IsStoreCurrency = allCurrenciesByIsoCode.ContainsKey(x.CurrencyCode); if (x.Name.IsEmpty() && currencyNames.ContainsKey(x.CurrencyCode)) x.Name = currencyNames[x.CurrencyCode]; From 77a21793c0fd45fa4546d81eb87ae349e3a32251 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 13 Aug 2020 16:37:00 +0200 Subject: [PATCH 040/695] API: IMediaService endpoints (in progress) --- .../Media/Search/MediaSearchQuery.cs | 26 ++- .../SmartStore.Services.csproj | 1 + .../Controllers/OData/MediaController.cs | 173 +++++++----------- .../Extensions/MiscExtensions.cs | 6 +- .../Models/OData/Media/CheckUniqueFileName.cs | 14 ++ .../SmartStore.WebApi.csproj | 1 + .../Extensions/ApiControllerExtensions.cs | 3 + 7 files changed, 108 insertions(+), 116 deletions(-) create mode 100644 src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileName.cs diff --git a/src/Libraries/SmartStore.Services/Media/Search/MediaSearchQuery.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearchQuery.cs index 124ccd8523..3fceaf4ddd 100644 --- a/src/Libraries/SmartStore.Services/Media/Search/MediaSearchQuery.cs +++ b/src/Libraries/SmartStore.Services/Media/Search/MediaSearchQuery.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Runtime.Serialization; using Newtonsoft.Json; using SmartStore.Core.Domain.Media; @@ -16,58 +12,76 @@ public enum ImageDimension Large = 3, VeryLarge = 4 } - + + [DataContract] public partial class MediaFilesFilter { + [DataMember] [JsonProperty("mediaTypes")] public string[] MediaTypes { get; set; } + [DataMember] [JsonProperty("mimeTypes")] public string[] MimeTypes { get; set; } + [DataMember] [JsonProperty("extensions")] public string[] Extensions { get; set; } + [DataMember] [JsonProperty("dimensions")] public ImageDimension[] Dimensions { get; set; } + [DataMember] [JsonProperty("tags")] public int[] Tags { get; set; } + [DataMember] [JsonProperty("hidden")] public bool? Hidden { get; set; } + [DataMember] [JsonProperty("deleted")] public bool? Deleted { get; set; } + [DataMember] [JsonProperty("term")] public string Term { get; set; } + [DataMember] [JsonProperty("exact")] public bool ExactMatch { get; set; } + [DataMember] [JsonProperty("includeAlt")] public bool IncludeAltForTerm { get; set; } } + [DataContract] public partial class MediaSearchQuery : MediaFilesFilter { + [DataMember] [JsonProperty("folderId")] public int? FolderId { get; set; } + [DataMember] [JsonProperty("deep")] public bool DeepSearch { get; set; } + [DataMember] [JsonProperty("page")] public int PageIndex { get; set; } + [DataMember] [JsonProperty("pageSize")] public int PageSize { get; set; } = int.MaxValue; + [DataMember] [JsonProperty("sortBy")] public string SortBy { get; set; } = nameof(MediaFile.Id); + [DataMember] [JsonProperty("sortDesc")] public bool SortDesc { get; set; } } diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 82e77a9138..74f9a23db0 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -142,6 +142,7 @@ True + diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 902e396705..65990afd7c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -1,17 +1,14 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; -using System.Web.OData.Query; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Media; using SmartStore.Services.Media; using SmartStore.Web.Framework.WebApi; -using SmartStore.Web.Framework.WebApi.Caching; using SmartStore.Web.Framework.WebApi.Configuration; using SmartStore.Web.Framework.WebApi.OData; using SmartStore.Web.Framework.WebApi.Security; @@ -22,6 +19,10 @@ namespace SmartStore.WebApi.Controllers.OData /// /// Is intended to make methods of the IMediaService accessible. Direct access to the MediaFile entity is not intended. /// + /// + /// Functions like GET /Media/FileExists(Path='content/my-file.jpg') would never work (404). + /// That's why some endpoints are implemented as Actions (POST). + /// public class MediaController : WebApiEntityController { // GET /Media(123) @@ -105,16 +106,6 @@ public static void Init(WebApiConfigurationBroadcaster configData) { var entityConfig = configData.ModelBuilder.EntityType(); - entityConfig.Collection - .Function("FileExists") - .Returns() - .Parameter("Path"); - - entityConfig.Collection - .Action("CheckUniqueFileName") - .ReturnsFromEntitySet("Media") - .Parameter("Path"); - entityConfig.Collection .Action("GetFileByPath") .ReturnsFromEntitySet("Media") @@ -127,75 +118,40 @@ public static void Init(WebApiConfigurationBroadcaster configData) //getFileByName.Parameter("FolderId"); entityConfig.Collection - .Action("GetFilesByIds") + .Function("GetFilesByIds") .ReturnsFromEntitySet("Media") .CollectionParameter("Ids"); - var countFiles = entityConfig.Collection - .Action("CountFiles") - .ReturnsFromEntitySet("Media"); - countFiles.Parameter("FolderId"); - countFiles.Parameter("DeepSearch"); - countFiles.Parameter("Hidden"); - countFiles.Parameter("Deleted"); - countFiles.Parameter("Term"); - countFiles.Parameter("ExactMatch"); - countFiles.CollectionParameter("MediaTypes"); - countFiles.CollectionParameter("MimeTypes"); - countFiles.CollectionParameter("Extensions"); - } - - /// GET /Media/FileExists(Path='content/my-file.jpg') - [HttpGet, WebApiAuthenticate] - public bool FileExists([FromODataUri] string path) - { - var fileExists = Service.FileExists(path); - return fileExists; - } - - /// POST /Media/CheckUniqueFileName {"Path":"content/my-file.jpg"} - [HttpPost, WebApiAuthenticate] - public HttpResponseMessage CheckUniqueFileName(ODataActionParameters parameters) - { - string newPath = null; - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - - if (!Service.CheckUniqueFileName(path, out newPath)) - { - // Just to make sure the result is unmistakable ;-) - newPath = null; - } - }); + entityConfig.Collection + .Action("FileExists") + .Returns() + .Parameter("Path"); - if (newPath == null) - { - return Request.CreateResponse(HttpStatusCode.NoContent); - } + entityConfig.Collection + .Action("CheckUniqueFileName") + .Returns() + .Parameter("Path"); - return Request.CreateResponse(HttpStatusCode.OK, newPath); + entityConfig.Collection + .Action("CountFiles") + .Returns() + .Parameter("Query"); } /// POST /Media/GetFileByPath {"Path":"content/my-file.jpg"} - [HttpPost, WebApiAuthenticate] - public MediaFileInfo GetFileByPath(ODataActionParameters parameters) + [HttpPost] + [WebApiAuthenticate] + public MediaItemInfo GetFileByPath(ODataActionParameters parameters) { - MediaFileInfo file = null; + var path = parameters.GetValueSafe("Path"); + var file = Service.GetFileByPath(path); - this.ProcessEntity(() => + if (file == null) { - var path = parameters.GetValueSafe("Path"); - - file = Service.GetFileByPath(path); - if (file == null) - { - throw Request.NotFoundException($"The file with the path '{path ?? string.Empty}' does not exist."); - } - }); + throw Request.NotFoundException($"The file with the path '{path ?? string.Empty}' does not exist."); + } - return file; + return Convert(file); } // POST /Media/GetFileByName {"FolderId":2, "FileName":"my-file.jpg"} @@ -219,49 +175,52 @@ public MediaFileInfo GetFileByPath(ODataActionParameters parameters) // return file; //} - /// POST /Media/GetFilesByIds {"Ids":[1,2,3]} - [HttpPost, WebApiAuthenticate] - [WebApiQueryable] - public IQueryable GetFilesByIds(ODataActionParameters parameters) + /// GET /Media/GetFilesByIds(Ids=[1,2,3]) + [HttpGet, WebApiQueryable] + [WebApiAuthenticate] + public IQueryable GetFilesByIds([FromODataUri] int[] ids) { - IList files = null; - - this.ProcessEntity(() => + if (ids?.Any() ?? false) { - var ids = parameters.GetValueSafe>("Ids"); - if (ids?.Any() ?? false) - { - files = Service.GetFilesByIds(ids.ToArray()); - } - }); - - return (files ?? new List()).AsQueryable(); + var files = Service.GetFilesByIds(ids.ToArray()); + + return files.Select(x => Convert(x)).AsQueryable(); + } + + return new List().AsQueryable(); } - /// POST /Media/CountFiles {"FolderId":7, "Term":"xyz", "Extensions":["jpg"], ...} - [HttpPost, WebApiAuthenticate] - public async Task CountFiles(ODataActionParameters parameters) + /// POST /Media/FileExists {"Path":"content/my-file.jpg"} + [HttpPost] + [WebApiAuthenticate] + public bool FileExists(ODataActionParameters parameters) { - var count = 0; + var path = parameters.GetValueSafe("Path"); + var fileExists = Service.FileExists(path); + return fileExists; + } - await this.ProcessEntityAsync(async () => - { - var query = new MediaSearchQuery - { - FolderId = parameters.GetValueSafe("FolderId"), - DeepSearch = parameters.GetValueSafe("DeepSearch") ?? false, - Hidden = parameters.GetValueSafe("Hidden") ?? false, - Deleted = parameters.GetValueSafe("Deleted") ?? false, - Term = parameters.GetValueSafe("Term"), - ExactMatch = parameters.GetValueSafe("ExactMatch") ?? false, - MediaTypes = parameters.GetValueSafe>("MediaTypes")?.ToArray(), - MimeTypes = parameters.GetValueSafe>("MimeTypes")?.ToArray(), - Extensions = parameters.GetValueSafe>("Extensions")?.ToArray() - }; - - count = await Service.CountFilesAsync(query); - }); + /// POST /Media/CheckUniqueFileName {"Path":"content/my-file.jpg"} + [HttpPost] + [WebApiAuthenticate] + public CheckUniqueFileName CheckUniqueFileName(ODataActionParameters parameters) + { + var result = new CheckUniqueFileName(); + var path = parameters.GetValueSafe("Path"); + + result.Result = Service.CheckUniqueFileName(path, out string newPath); + result.NewPath = newPath; + + return result; + } + /// POST /Media/CountFiles {"Query":{"FolderId":7,"Extensions":["jpg"], ...}} + [HttpPost] + [WebApiAuthenticate] + public async Task CountFiles(ODataActionParameters parameters) + { + var query = parameters.GetValueSafe("Query"); + var count = await Service.CountFilesAsync(query ?? new MediaSearchQuery()); return count; } diff --git a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs index d4ef779249..926e9bed83 100644 --- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs @@ -54,14 +54,14 @@ public static string ToUnquoted(this string value) return value; } - public static T GetValueSafe(this ODataActionParameters parameters, string key) + public static T GetValueSafe(this ODataActionParameters parameters, string key, T defaultValue = default) { if (parameters != null && key.HasValue() && parameters.TryGetValue(key, out var value)) { - return value.Convert(); + return value.Convert(defaultValue); } - return default; + return defaultValue; } public static void DeleteLocalFiles(this MultipartFormDataStreamProvider provider) diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileName.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileName.cs new file mode 100644 index 0000000000..9225d61697 --- /dev/null +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileName.cs @@ -0,0 +1,14 @@ +using System.Runtime.Serialization; + +namespace SmartStore.WebApi.Models.OData +{ + [DataContract] + public partial class CheckUniqueFileName + { + [DataMember] + public bool Result { get; set; } + + [DataMember] + public string NewPath { get; set; } + } +} \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index dd50975ed1..5159b3193f 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -273,6 +273,7 @@ + diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs index a48d6ed651..a5a55ad3f6 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs @@ -64,6 +64,9 @@ public static async Task ProcessEntityAsync(this ApiController apiController, Fu /// /// Gets a query string value from API request URL. /// + /// + /// Query string values are not part of the EDM and therefore do not appear in any auto generated documentation etc. + /// /// Value type. /// API controller. /// Name of the query string value. From 8ca1cab5470b4fc97aa957dbf3d1011ac93451e1 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 13 Aug 2020 21:37:55 +0200 Subject: [PATCH 041/695] API: IMediaService endpoints (in progress) --- .../Controllers/OData/MediaController.cs | 53 +++++++++++++++++-- ...leName.cs => CheckUniqueFileNameResult.cs} | 2 +- .../OData/Media/CountFilesGroupedResult.cs | 41 ++++++++++++++ .../SmartStore.WebApi.csproj | 3 +- 4 files changed, 93 insertions(+), 6 deletions(-) rename src/Plugins/SmartStore.WebApi/Models/OData/Media/{CheckUniqueFileName.cs => CheckUniqueFileNameResult.cs} (82%) create mode 100644 src/Plugins/SmartStore.WebApi/Models/OData/Media/CountFilesGroupedResult.cs diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 65990afd7c..bb617e30bb 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Net; using System.Net.Http; @@ -129,13 +130,28 @@ public static void Init(WebApiConfigurationBroadcaster configData) entityConfig.Collection .Action("CheckUniqueFileName") - .Returns() + .Returns() .Parameter("Path"); entityConfig.Collection .Action("CountFiles") .Returns() .Parameter("Query"); + + entityConfig.Collection + .Action("CountFilesGrouped") + .Returns() + .Parameter("Filter"); + + // Crap: + //var cfgr = configData.ModelBuilder.ComplexType(); + //cfgr.Property(x => x.Total); + //cfgr.Property(x => x.Trash); + //cfgr.Property(x => x.Unassigned); + //cfgr.Property(x => x.Transient); + //cfgr.Property(x => x.Orphan); + //cfgr.ComplexProperty(x => x.Filter); + //cfgr.HasDynamicProperties(x => x.Folders); } /// POST /Media/GetFileByPath {"Path":"content/my-file.jpg"} @@ -203,9 +219,9 @@ public bool FileExists(ODataActionParameters parameters) /// POST /Media/CheckUniqueFileName {"Path":"content/my-file.jpg"} [HttpPost] [WebApiAuthenticate] - public CheckUniqueFileName CheckUniqueFileName(ODataActionParameters parameters) + public CheckUniqueFileNameResult CheckUniqueFileName(ODataActionParameters parameters) { - var result = new CheckUniqueFileName(); + var result = new CheckUniqueFileNameResult(); var path = parameters.GetValueSafe("Path"); result.Result = Service.CheckUniqueFileName(path, out string newPath); @@ -224,13 +240,42 @@ public async Task CountFiles(ODataActionParameters parameters) return count; } + /// POST /Media/CountFilesGrouped {"Filter":{"Term":"my image","Extensions":["jpg"], ...}} + [HttpPost] + [WebApiAuthenticate] + public CountFilesGroupedResult CountFilesGrouped(ODataActionParameters parameters) + { + var query = parameters.GetValueSafe("Filter"); + var res = Service.CountFilesGrouped(query ?? new MediaFilesFilter()); + + var result = new CountFilesGroupedResult + { + Total = res.Total, + Trash = res.Trash, + Unassigned = res.Unassigned, + Transient = res.Unassigned, + Orphan = res.Orphan, + Filter = res.Filter + }; + + result.Folders = res.Folders + .Select(x => new CountFilesGroupedResult.FolderCount + { + FolderId = x.Key, + Count = x.Value + }) + .ToList(); + + return result; + } + #endregion #region Utilities private MediaItemInfo Convert(MediaFileInfo file) { - var item = MiniMapper.Map(file); + var item = MiniMapper.Map(file, CultureInfo.InvariantCulture); return item; } diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileName.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileNameResult.cs similarity index 82% rename from src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileName.cs rename to src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileNameResult.cs index 9225d61697..70aeecc34d 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileName.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileNameResult.cs @@ -3,7 +3,7 @@ namespace SmartStore.WebApi.Models.OData { [DataContract] - public partial class CheckUniqueFileName + public partial class CheckUniqueFileNameResult { [DataMember] public bool Result { get; set; } diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/CountFilesGroupedResult.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CountFilesGroupedResult.cs new file mode 100644 index 0000000000..6c1513940c --- /dev/null +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CountFilesGroupedResult.cs @@ -0,0 +1,41 @@ +using System.Collections.Generic; +using System.Runtime.Serialization; +using SmartStore.Services.Media; + +namespace SmartStore.WebApi.Models.OData +{ + [DataContract] + public partial class CountFilesGroupedResult + { + [DataMember] + public MediaFilesFilter Filter { get; set; } + + [DataMember] + public int Total { get; set; } + + [DataMember] + public int Trash { get; set; } + + [DataMember] + public int Unassigned { get; set; } + + [DataMember] + public int Transient { get; set; } + + [DataMember] + public int Orphan { get; set; } + + [DataMember] + public ICollection Folders { get; set; } + + [DataContract] + public class FolderCount + { + [DataMember] + public int FolderId { get; set; } + + [DataMember] + public int Count { get; set; } + } + } +} \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 5159b3193f..6082742ad5 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -273,7 +273,8 @@ - + + From 55ec4576a37f2c8959ceb3ad926316c38b85ecc2 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 14 Aug 2020 16:42:49 +0200 Subject: [PATCH 042/695] API: IMediaService endpoints (in progress) --- .../Controllers/OData/MediaController.cs | 316 ++++++++++++++---- .../OData/Media/CheckUniqueFileNameResult.cs | 2 +- .../OData/Media/CountFilesGroupedResult.cs | 2 +- .../{MediaItemInfo.cs => FileItemInfo.cs} | 6 +- .../Models/OData/Media/FolderItemInfo.cs | 23 ++ .../SmartStore.WebApi.csproj | 3 +- .../WebApiConfigurationProvider.cs | 4 +- .../Extensions/ApiControllerExtensions.cs | 3 +- 8 files changed, 289 insertions(+), 70 deletions(-) rename src/Plugins/SmartStore.WebApi/Models/OData/Media/{MediaItemInfo.cs => FileItemInfo.cs} (79%) create mode 100644 src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderItemInfo.cs diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index bb617e30bb..7deccb978b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Net; @@ -8,12 +9,13 @@ using System.Web.OData; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Media; +using SmartStore.Core.Security; using SmartStore.Services.Media; using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.Configuration; using SmartStore.Web.Framework.WebApi.OData; using SmartStore.Web.Framework.WebApi.Security; -using SmartStore.WebApi.Models.OData; +using SmartStore.WebApi.Models.OData.Media; namespace SmartStore.WebApi.Controllers.OData { @@ -26,12 +28,14 @@ namespace SmartStore.WebApi.Controllers.OData /// public class MediaController : WebApiEntityController { + public static MediaLoadFlags _defaultLoadFlags = MediaLoadFlags.AsNoTracking | MediaLoadFlags.WithTags | MediaLoadFlags.WithTracks | MediaLoadFlags.WithFolder; + // GET /Media(123) [WebApiQueryable] [WebApiAuthenticate] - public SingleResult Get(int key) + public SingleResult Get(int key) { - var file = Service.GetFileById(key); + var file = Service.GetFileById(key, _defaultLoadFlags); if (file == null) { throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); @@ -43,7 +47,7 @@ public SingleResult Get(int key) // GET /Media [WebApiQueryable] [WebApiAuthenticate] - public IQueryable Get(/*ODataQueryOptions queryOptions*/) + public IQueryable Get(/*ODataQueryOptions queryOptions*/) { throw new HttpResponseException(HttpStatusCode.NotImplemented); @@ -62,23 +66,35 @@ public IQueryable Get(/*ODataQueryOptions queryOptions [WebApiAuthenticate] public HttpResponseMessage GetProperty(int key, string propertyName) { - var file = Service.GetFileById(key); - if (file == null) + Type propertyType = null; + object propertyValue = null; + + this.ProcessEntity(() => { - throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - } + var file = Service.GetFileById(key); + if (file == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } - var item = Convert(file); + var item = Convert(file); - var prop = FastProperty.GetProperty(item.GetType(), propertyName); - if (prop == null) + var prop = FastProperty.GetProperty(item.GetType(), propertyName); + if (prop == null) + { + throw Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); + } + + propertyType = prop.Property.PropertyType; + propertyValue = prop.GetValue(item); + }); + + if (propertyType == null) { - throw Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); + return Request.CreateResponse(HttpStatusCode.NoContent); } - var propertyValue = prop.GetValue(item); - - return Request.CreateResponse(HttpStatusCode.OK, prop.Property.PropertyType, propertyValue); + return Request.CreateResponse(HttpStatusCode.OK, propertyType, propertyValue); } public IHttpActionResult Post(MediaFile entity) @@ -96,31 +112,50 @@ public IHttpActionResult Patch(int key, Delta model) throw new HttpResponseException(HttpStatusCode.Forbidden); } + [WebApiAuthenticate(Permission = Permissions.Media.Delete)] public IHttpActionResult Delete(int key) { - throw new HttpResponseException(HttpStatusCode.Forbidden); + this.ProcessEntity(() => + { + var file = Service.GetFileById(key); + if (file == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } + + // Get options from query string. + // FromODataUri (404) and FromBody ("Can't bind multiple parameters") are not possible here. + var permanent = this.GetQueryStringValue("permanent", false); + var force = this.GetQueryStringValue("force", false); + + Service.DeleteFile(file.File, permanent, force); + }); + + return StatusCode(HttpStatusCode.NoContent); } #region Actions and functions public static void Init(WebApiConfigurationBroadcaster configData) { - var entityConfig = configData.ModelBuilder.EntityType(); + var entityConfig = configData.ModelBuilder.EntityType(); + + #region Files entityConfig.Collection .Action("GetFileByPath") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("Media") .Parameter("Path"); //var getFileByName = entityConfig.Collection // .Action("GetFileByName") - // .ReturnsFromEntitySet("Media"); + // .ReturnsFromEntitySet("Media"); //getFileByName.Parameter("FileName"); //getFileByName.Parameter("FolderId"); entityConfig.Collection .Function("GetFilesByIds") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("Media") .CollectionParameter("Ids"); entityConfig.Collection @@ -143,7 +178,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) .Returns() .Parameter("Filter"); - // Crap: + // Doesn't work: //var cfgr = configData.ModelBuilder.ComplexType(); //cfgr.Property(x => x.Total); //cfgr.Property(x => x.Trash); @@ -152,22 +187,61 @@ public static void Init(WebApiConfigurationBroadcaster configData) //cfgr.Property(x => x.Orphan); //cfgr.ComplexProperty(x => x.Filter); //cfgr.HasDynamicProperties(x => x.Folders); + + var moveFile = entityConfig + .Action("MoveFile") + .ReturnsFromEntitySet("Media"); + + moveFile.Parameter("DestinationFileName"); + var dph1 = moveFile.Parameter("DuplicateFileHandling"); + dph1.OptionalParameter = true; + + var copyFile = entityConfig + .Action("CopyFile") + .ReturnsFromEntitySet("Media"); + + copyFile.Parameter("DestinationFileName"); + var dph2 = copyFile.Parameter("DuplicateFileHandling"); + dph2.OptionalParameter = true; + + #endregion + + #region Folders + + entityConfig.Collection + .Action("FolderExists") + .Returns() + .Parameter("Path"); + + entityConfig.Collection + .Action("CreateFolder") + .Returns() + .Parameter("Path"); + + #endregion } /// POST /Media/GetFileByPath {"Path":"content/my-file.jpg"} [HttpPost] [WebApiAuthenticate] - public MediaItemInfo GetFileByPath(ODataActionParameters parameters) + public FileItemInfo GetFileByPath(ODataActionParameters parameters) { - var path = parameters.GetValueSafe("Path"); - var file = Service.GetFileByPath(path); + FileItemInfo file = null; - if (file == null) + this.ProcessEntity(() => { - throw Request.NotFoundException($"The file with the path '{path ?? string.Empty}' does not exist."); - } + var path = parameters.GetValueSafe("Path"); + var mediaFile = Service.GetFileByPath(path, _defaultLoadFlags); + + if (mediaFile == null) + { + throw Request.NotFoundException($"The file with the path '{path ?? string.Empty}' does not exist."); + } - return Convert(file); + file = Convert(mediaFile); + }); + + return file; } // POST /Media/GetFileByName {"FolderId":2, "FileName":"my-file.jpg"} @@ -194,16 +268,21 @@ public MediaItemInfo GetFileByPath(ODataActionParameters parameters) /// GET /Media/GetFilesByIds(Ids=[1,2,3]) [HttpGet, WebApiQueryable] [WebApiAuthenticate] - public IQueryable GetFilesByIds([FromODataUri] int[] ids) + public IQueryable GetFilesByIds([FromODataUri] int[] ids) { - if (ids?.Any() ?? false) - { - var files = Service.GetFilesByIds(ids.ToArray()); + IQueryable files = null; - return files.Select(x => Convert(x)).AsQueryable(); - } + this.ProcessEntity(() => + { + if (ids?.Any() ?? false) + { + var mediaFiles = Service.GetFilesByIds(ids.ToArray(), _defaultLoadFlags); + + files = mediaFiles.Select(x => Convert(x)).AsQueryable(); + } + }); - return new List().AsQueryable(); + return files ?? new List().AsQueryable(); } /// POST /Media/FileExists {"Path":"content/my-file.jpg"} @@ -211,8 +290,14 @@ public IQueryable GetFilesByIds([FromODataUri] int[] ids) [WebApiAuthenticate] public bool FileExists(ODataActionParameters parameters) { - var path = parameters.GetValueSafe("Path"); - var fileExists = Service.FileExists(path); + var fileExists = false; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + fileExists = Service.FileExists(path); + }); + return fileExists; } @@ -222,10 +307,14 @@ public bool FileExists(ODataActionParameters parameters) public CheckUniqueFileNameResult CheckUniqueFileName(ODataActionParameters parameters) { var result = new CheckUniqueFileNameResult(); - var path = parameters.GetValueSafe("Path"); - result.Result = Service.CheckUniqueFileName(path, out string newPath); - result.NewPath = newPath; + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + + result.Result = Service.CheckUniqueFileName(path, out string newPath); + result.NewPath = newPath; + }); return result; } @@ -235,8 +324,14 @@ public CheckUniqueFileNameResult CheckUniqueFileName(ODataActionParameters param [WebApiAuthenticate] public async Task CountFiles(ODataActionParameters parameters) { - var query = parameters.GetValueSafe("Query"); - var count = await Service.CountFilesAsync(query ?? new MediaSearchQuery()); + var count = 0; + + await this.ProcessEntityAsync(async () => + { + var query = parameters.GetValueSafe("Query"); + count = await Service.CountFilesAsync(query ?? new MediaSearchQuery()); + }); + return count; } @@ -245,37 +340,134 @@ public async Task CountFiles(ODataActionParameters parameters) [WebApiAuthenticate] public CountFilesGroupedResult CountFilesGrouped(ODataActionParameters parameters) { - var query = parameters.GetValueSafe("Filter"); - var res = Service.CountFilesGrouped(query ?? new MediaFilesFilter()); + CountFilesGroupedResult result = null; - var result = new CountFilesGroupedResult + this.ProcessEntity(() => { - Total = res.Total, - Trash = res.Trash, - Unassigned = res.Unassigned, - Transient = res.Unassigned, - Orphan = res.Orphan, - Filter = res.Filter - }; - - result.Folders = res.Folders - .Select(x => new CountFilesGroupedResult.FolderCount + var query = parameters.GetValueSafe("Filter"); + var res = Service.CountFilesGrouped(query ?? new MediaFilesFilter()); + + result = new CountFilesGroupedResult { - FolderId = x.Key, - Count = x.Value - }) - .ToList(); + Total = res.Total, + Trash = res.Trash, + Unassigned = res.Unassigned, + Transient = res.Unassigned, + Orphan = res.Orphan, + Filter = res.Filter + }; + + result.Folders = res.Folders + .Select(x => new CountFilesGroupedResult.FolderCount + { + FolderId = x.Key, + Count = x.Value + }) + .ToList(); + }); return result; } + /// POST /Media(123)/MoveFile {"DestinationFileName":"content/updated-file-name.jpg"} + [HttpPost] + [WebApiAuthenticate(Permission = Permissions.Media.Update)] + public FileItemInfo MoveFile(int key, ODataActionParameters parameters) + { + FileItemInfo movedFile = null; + + this.ProcessEntity(() => + { + var file = Service.GetFileById(key); + if (file == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } + + var destinationFileName = parameters.GetValueSafe("DestinationFileName"); + var duplicateFileHandling = parameters.GetValueSafe("DuplicateFileHandling", DuplicateFileHandling.ThrowError); + + var result = Service.MoveFile(file.File, destinationFileName, duplicateFileHandling); + movedFile = Convert(result); + }); + + return movedFile; + } + + /// POST /Media(123)/CopyFile {"DestinationFileName":"content/new-file.jpg"} + [HttpPost] + [WebApiAuthenticate(Permission = Permissions.Media.Update)] + public FileItemInfo CopyFile(int key, ODataActionParameters parameters) + { + FileItemInfo fileCopy = null; + + this.ProcessEntity(() => + { + var file = Service.GetFileById(key); + if (file == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } + + var destinationFileName = parameters.GetValueSafe("DestinationFileName"); + var duplicateFileHandling = parameters.GetValueSafe("DuplicateFileHandling", DuplicateFileHandling.ThrowError); + + var result = Service.CopyFile(file, destinationFileName, duplicateFileHandling); + fileCopy = Convert(result.DestinationFile); + }); + + return fileCopy; + } + + + /// POST /Media/FolderExists {"Path":"my-folder"} + [HttpPost] + [WebApiAuthenticate] + public bool FolderExists(ODataActionParameters parameters) + { + var folderExists = false; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + folderExists = Service.FolderExists(path); + }); + + return folderExists; + } + + /// POST /Media/CreateFolder {"Path":"content/my-folder"} + [HttpPost] + [WebApiAuthenticate] + public HttpResponseMessage CreateFolder(ODataActionParameters parameters) + { + FolderItemInfo newFolder = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + + var result = Service.CreateFolder(path); + newFolder = Convert(result); + }); + + return Request.CreateResponse(HttpStatusCode.Created, newFolder); + } + + #endregion #region Utilities - private MediaItemInfo Convert(MediaFileInfo file) + private FileItemInfo Convert(MediaFileInfo file) + { + var item = MiniMapper.Map(file, CultureInfo.InvariantCulture); + return item; + } + + private FolderItemInfo Convert(MediaFolderInfo folder) { - var item = MiniMapper.Map(file, CultureInfo.InvariantCulture); + var item = MiniMapper.Map(folder, CultureInfo.InvariantCulture); return item; } diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileNameResult.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileNameResult.cs index 70aeecc34d..18e07f1c5d 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileNameResult.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CheckUniqueFileNameResult.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace SmartStore.WebApi.Models.OData +namespace SmartStore.WebApi.Models.OData.Media { [DataContract] public partial class CheckUniqueFileNameResult diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/CountFilesGroupedResult.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CountFilesGroupedResult.cs index 6c1513940c..32ff884a91 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/CountFilesGroupedResult.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/CountFilesGroupedResult.cs @@ -2,7 +2,7 @@ using System.Runtime.Serialization; using SmartStore.Services.Media; -namespace SmartStore.WebApi.Models.OData +namespace SmartStore.WebApi.Models.OData.Media { [DataContract] public partial class CountFilesGroupedResult diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaItemInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs similarity index 79% rename from src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaItemInfo.cs rename to src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs index f8bf9c2436..36b44220b2 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaItemInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs @@ -1,13 +1,13 @@ using System.Runtime.Serialization; using SmartStore.Core.Domain.Media; -namespace SmartStore.WebApi.Models.OData +namespace SmartStore.WebApi.Models.OData.Media { /// - /// Information about a media file returned by the API. + /// File information returned by the API. /// [DataContract] - public partial class MediaItemInfo + public partial class FileItemInfo { [DataMember] public int Id { get; set; } diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderItemInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderItemInfo.cs new file mode 100644 index 0000000000..f4cc186806 --- /dev/null +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderItemInfo.cs @@ -0,0 +1,23 @@ +using System.Runtime.Serialization; + +namespace SmartStore.WebApi.Models.OData.Media +{ + /// + /// Folder information returned by the API. + /// + [DataContract] + public partial class FolderItemInfo + { + [DataMember] + public int Id { get; set; } + + [DataMember] + public int FilesCount { get; set; } + + [DataMember] + public string Path { get; set; } + + [DataMember] + public string Name { get; set; } + } +} \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 6082742ad5..aed3840b04 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -275,7 +275,8 @@ - + + diff --git a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs index 1513a824d6..2ac5d019cc 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs @@ -21,6 +21,7 @@ using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.Configuration; using SmartStore.WebApi.Models.OData; +using SmartStore.WebApi.Models.OData.Media; using SmartStore.WebApi.Services; using SmartStore.WebApi.Services.Swagger; using Swashbuckle.Application; @@ -53,7 +54,8 @@ public void Configure(WebApiConfigurationBroadcaster configData) m.EntitySet("Manufacturers"); m.EntitySet("MeasureDimensions"); m.EntitySet("MeasureWeights"); - m.EntitySet("Media"); + m.EntitySet("Media"); + m.EntitySet("MediaFolders"); m.EntitySet("MediaTags"); m.EntitySet("MediaTracks"); m.EntitySet("NewsLetterSubscriptions"); diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs index a5a55ad3f6..c83fd118cd 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs @@ -16,7 +16,8 @@ public static HttpResponseException InvalidModelStateException(this ApiControlle } /// - /// Further entity processing typically used by OData actions. + /// Further entity processing typically used by OData actions. + /// It is mainly used where a 422 status code is more suitable than a 500. /// /// Action for entity processing. public static void ProcessEntity(this ApiController apiController, Action process) From 295bfcc9e952cc4396c6643f7afd0c571a5722dc Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Fri, 14 Aug 2020 22:42:59 +0200 Subject: [PATCH 043/695] Removed System.ValueTuple from config dependencies --- src/Libraries/SmartStore.Core/app.config | 4 ---- src/Libraries/SmartStore.Data/app.config | 4 ---- src/Libraries/SmartStore.Services/app.config | 4 ---- src/Plugins/SmartStore.AmazonPay/web.config | 4 ---- src/Plugins/SmartStore.Clickatell/web.config | 4 ---- src/Plugins/SmartStore.DevTools/Web.config | 4 ---- src/Plugins/SmartStore.FacebookAuth/web.config | 4 ---- src/Plugins/SmartStore.GoogleAnalytics/web.config | 4 ---- src/Plugins/SmartStore.GoogleMerchantCenter/web.config | 4 ---- src/Plugins/SmartStore.OfflinePayment/web.config | 4 ---- src/Plugins/SmartStore.PayPal/web.config | 4 ---- src/Plugins/SmartStore.Shipping/web.config | 4 ---- src/Plugins/SmartStore.ShippingByWeight/web.config | 4 ---- src/Plugins/SmartStore.Tax/web.config | 4 ---- src/Plugins/SmartStore.WebApi/web.config | 4 ---- src/Presentation/SmartStore.Web.Framework/app.config | 4 ---- src/Presentation/SmartStore.Web/Administration/Web.config | 4 ---- src/Presentation/SmartStore.Web/Web.config | 4 ---- src/Tests/SmartStore.Core.Tests/App.config | 4 ---- src/Tests/SmartStore.Data.Tests/App.config | 4 ---- src/Tests/SmartStore.Services.Tests/App.config | 4 ---- src/Tests/SmartStore.Tests/App.config | 4 ---- src/Tests/SmartStore.Web.MVC.Tests/App.config | 4 ---- src/Tools/SmartStore.Packager/App.config | 4 ---- 24 files changed, 96 deletions(-) diff --git a/src/Libraries/SmartStore.Core/app.config b/src/Libraries/SmartStore.Core/app.config index aa1f38f1f9..9657a5deb1 100644 --- a/src/Libraries/SmartStore.Core/app.config +++ b/src/Libraries/SmartStore.Core/app.config @@ -10,10 +10,6 @@ - - - - diff --git a/src/Libraries/SmartStore.Data/app.config b/src/Libraries/SmartStore.Data/app.config index 76beb2a152..68a1994474 100644 --- a/src/Libraries/SmartStore.Data/app.config +++ b/src/Libraries/SmartStore.Data/app.config @@ -10,10 +10,6 @@ - - - - diff --git a/src/Libraries/SmartStore.Services/app.config b/src/Libraries/SmartStore.Services/app.config index f0beaa056a..252642d5ed 100644 --- a/src/Libraries/SmartStore.Services/app.config +++ b/src/Libraries/SmartStore.Services/app.config @@ -28,10 +28,6 @@ - - - - diff --git a/src/Plugins/SmartStore.AmazonPay/web.config b/src/Plugins/SmartStore.AmazonPay/web.config index f340aff88f..a6a989fbf9 100644 --- a/src/Plugins/SmartStore.AmazonPay/web.config +++ b/src/Plugins/SmartStore.AmazonPay/web.config @@ -128,10 +128,6 @@ - - - - diff --git a/src/Plugins/SmartStore.Clickatell/web.config b/src/Plugins/SmartStore.Clickatell/web.config index e15d8a0902..680acd42a7 100644 --- a/src/Plugins/SmartStore.Clickatell/web.config +++ b/src/Plugins/SmartStore.Clickatell/web.config @@ -113,10 +113,6 @@ - - - - diff --git a/src/Plugins/SmartStore.DevTools/Web.config b/src/Plugins/SmartStore.DevTools/Web.config index 9bfec8954e..8e4b28cf47 100644 --- a/src/Plugins/SmartStore.DevTools/Web.config +++ b/src/Plugins/SmartStore.DevTools/Web.config @@ -121,10 +121,6 @@ - - - - diff --git a/src/Plugins/SmartStore.FacebookAuth/web.config b/src/Plugins/SmartStore.FacebookAuth/web.config index 69adedf4ac..8707925158 100644 --- a/src/Plugins/SmartStore.FacebookAuth/web.config +++ b/src/Plugins/SmartStore.FacebookAuth/web.config @@ -121,10 +121,6 @@ - - - - diff --git a/src/Plugins/SmartStore.GoogleAnalytics/web.config b/src/Plugins/SmartStore.GoogleAnalytics/web.config index a1041ef9b0..4553edefdf 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/web.config +++ b/src/Plugins/SmartStore.GoogleAnalytics/web.config @@ -112,10 +112,6 @@ - - - - diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config index e15d8a0902..680acd42a7 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config @@ -113,10 +113,6 @@ - - - - diff --git a/src/Plugins/SmartStore.OfflinePayment/web.config b/src/Plugins/SmartStore.OfflinePayment/web.config index e15d8a0902..680acd42a7 100644 --- a/src/Plugins/SmartStore.OfflinePayment/web.config +++ b/src/Plugins/SmartStore.OfflinePayment/web.config @@ -113,10 +113,6 @@ - - - - diff --git a/src/Plugins/SmartStore.PayPal/web.config b/src/Plugins/SmartStore.PayPal/web.config index 5e67769af4..4d2ad21466 100644 --- a/src/Plugins/SmartStore.PayPal/web.config +++ b/src/Plugins/SmartStore.PayPal/web.config @@ -141,10 +141,6 @@ - - - - diff --git a/src/Plugins/SmartStore.Shipping/web.config b/src/Plugins/SmartStore.Shipping/web.config index a1041ef9b0..4553edefdf 100644 --- a/src/Plugins/SmartStore.Shipping/web.config +++ b/src/Plugins/SmartStore.Shipping/web.config @@ -112,10 +112,6 @@ - - - - diff --git a/src/Plugins/SmartStore.ShippingByWeight/web.config b/src/Plugins/SmartStore.ShippingByWeight/web.config index a1041ef9b0..4553edefdf 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/web.config +++ b/src/Plugins/SmartStore.ShippingByWeight/web.config @@ -112,10 +112,6 @@ - - - - diff --git a/src/Plugins/SmartStore.Tax/web.config b/src/Plugins/SmartStore.Tax/web.config index e15d8a0902..680acd42a7 100644 --- a/src/Plugins/SmartStore.Tax/web.config +++ b/src/Plugins/SmartStore.Tax/web.config @@ -113,10 +113,6 @@ - - - - diff --git a/src/Plugins/SmartStore.WebApi/web.config b/src/Plugins/SmartStore.WebApi/web.config index 40c8794565..4da7697a52 100644 --- a/src/Plugins/SmartStore.WebApi/web.config +++ b/src/Plugins/SmartStore.WebApi/web.config @@ -77,10 +77,6 @@ - - - - diff --git a/src/Presentation/SmartStore.Web.Framework/app.config b/src/Presentation/SmartStore.Web.Framework/app.config index 6268c5997d..c6e7e5837b 100644 --- a/src/Presentation/SmartStore.Web.Framework/app.config +++ b/src/Presentation/SmartStore.Web.Framework/app.config @@ -58,10 +58,6 @@ - - - - diff --git a/src/Presentation/SmartStore.Web/Administration/Web.config b/src/Presentation/SmartStore.Web/Administration/Web.config index 7bfcddf208..dc2d6af869 100644 --- a/src/Presentation/SmartStore.Web/Administration/Web.config +++ b/src/Presentation/SmartStore.Web/Administration/Web.config @@ -109,10 +109,6 @@ - - - - diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index cb83d5a972..11ba51c4bd 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -348,10 +348,6 @@ - - - - diff --git a/src/Tests/SmartStore.Core.Tests/App.config b/src/Tests/SmartStore.Core.Tests/App.config index a1bf925b24..0b185292d0 100644 --- a/src/Tests/SmartStore.Core.Tests/App.config +++ b/src/Tests/SmartStore.Core.Tests/App.config @@ -22,10 +22,6 @@ - - - - diff --git a/src/Tests/SmartStore.Data.Tests/App.config b/src/Tests/SmartStore.Data.Tests/App.config index e0aaca7600..8134880ec5 100644 --- a/src/Tests/SmartStore.Data.Tests/App.config +++ b/src/Tests/SmartStore.Data.Tests/App.config @@ -26,10 +26,6 @@ - - - - diff --git a/src/Tests/SmartStore.Services.Tests/App.config b/src/Tests/SmartStore.Services.Tests/App.config index c39dc1a0f3..660f40f4ef 100644 --- a/src/Tests/SmartStore.Services.Tests/App.config +++ b/src/Tests/SmartStore.Services.Tests/App.config @@ -36,10 +36,6 @@ - - - - diff --git a/src/Tests/SmartStore.Tests/App.config b/src/Tests/SmartStore.Tests/App.config index e1c69410e5..aee5982c7e 100644 --- a/src/Tests/SmartStore.Tests/App.config +++ b/src/Tests/SmartStore.Tests/App.config @@ -13,10 +13,6 @@ - - - - diff --git a/src/Tests/SmartStore.Web.MVC.Tests/App.config b/src/Tests/SmartStore.Web.MVC.Tests/App.config index 21fa8e95a1..461ef28a18 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/App.config +++ b/src/Tests/SmartStore.Web.MVC.Tests/App.config @@ -81,10 +81,6 @@ - - - - diff --git a/src/Tools/SmartStore.Packager/App.config b/src/Tools/SmartStore.Packager/App.config index 7a1de6a456..13fbad55c2 100644 --- a/src/Tools/SmartStore.Packager/App.config +++ b/src/Tools/SmartStore.Packager/App.config @@ -28,10 +28,6 @@ - - - - From bc74031ce7adb5176781d2a9abacb95458a420c8 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 14 Aug 2020 22:08:39 +0200 Subject: [PATCH 044/695] Theming: nicer switch control --- .../Content/shared/_switch.scss | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Content/shared/_switch.scss b/src/Presentation/SmartStore.Web/Content/shared/_switch.scss index 6effadaeb9..2465b799de 100644 --- a/src/Presentation/SmartStore.Web/Content/shared/_switch.scss +++ b/src/Presentation/SmartStore.Web/Content/shared/_switch.scss @@ -8,8 +8,8 @@ .switch { $h: $font-size-base * $line-height-base; $h-sm: $font-size-sm * $line-height-sm; - $w: $h * 2.15; - $w-sm: $h-sm * 2.15; + $w: $h * 2; + $w-sm: $h-sm * 2; position: relative; display: inline-block; vertical-align: bottom; @@ -21,9 +21,14 @@ --switcher-w: #{$w}; --switcher-h: #{$h}; --switch-size: calc(var(--switcher-h) - 4px); + --switch-bg-rgb: #{red($orange)}, #{green($orange)}, #{blue($orange)}; width: var(--switcher-w); height: var(--switcher-h); + &.switch-blue { + --switch-bg-rgb: #{red($blue)}, #{green($blue)}, #{blue($blue)}; + } + .switcher-sm > & { --switcher-w: #{$w-sm}; --switcher-h: #{$h-sm}; @@ -39,72 +44,49 @@ background-color: $gray-200; border: 1px solid rgba(#000, 0.15); cursor: pointer; - transition: background-color 0.4s cubic-bezier(.54,1.85,.5,1); + transition: background-color 0.2s cubic-bezier(.54,1.85,.5,1), box-shadow 0.2s ease-in-out, border-color 0.2s ease-in-out; &:before { // The circle (off) position: absolute; - left: 1px; - top: 1px; + left: 2px; + top: 2px; content: ' '; - width: var(--switch-size); - height: var(--switch-size); + width: calc(var(--switch-size) - 2px); + height: calc(var(--switch-size) - 2px); border-radius: 50%; background-color: #fff; box-shadow: 0 0 3px rgba(#000, 0.2); - transition: left 0.4s cubic-bezier(.54,1.85,.5,1); - } - - &:after { - // The label (off) - position: absolute; - display: inline-block; - left: var(--switch-size); - top: 1px; - right: 1px; - bottom: 1px; - line-height: calc(var(--switcher-h) - 0.4em); - vertical-align: middle; - text-align: center; - text-transform: lowercase; - content: attr(data-off); - color: $gray-500; + transition: left 0.2s cubic-bezier(.54,1.85,.5,1); } } > input[type=checkbox] { position: absolute; - z-index: 0; + z-index: -1; opacity: 0; margin: 0; } > input[type=checkbox]:checked ~ .switch-toggle { - background-color: $orange; + background-color: rgba(var(--switch-bg-rgb), 1); + border-color: rgba(var(--switch-bg-rgb), 1); &:before { // The circle (on) - left: 26px; left: calc(var(--switcher-w) - var(--switch-size) - 2px); } - - &:after { - // The label (on) - content: attr(data-on); - color: rgba(#fff, 0.75); - left: 1px; - right: var(--switch-size); - } } - &.switch-blue > input[type=checkbox]:checked ~ .switch-toggle { - background-color: $blue; + > input[type=checkbox]:focus ~ .switch-toggle { + box-shadow: 0 0 0 0.2rem rgba(var(--switch-bg-rgb), .25); } > input[type=checkbox]:disabled ~ .switch-toggle, - input[type=checkbox][readonly] ~ .switch-toggle { + > input[type=checkbox][readonly] ~ .switch-toggle { opacity: $btn-disabled-opacity; cursor: default; border-color: transparent; + box-shadow: none !important; } } \ No newline at end of file From 44e6e922e71b2cf552c23445ca0d0d991f03348c Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 14 Aug 2020 22:51:00 +0200 Subject: [PATCH 045/695] (mm) Resolves #2017 > Media Manager: lazy load thumbnail with a slight delay after first intersection --- .../SmartStore.Web/Scripts/smartstore.system.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.system.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.system.js index 41569bb774..30530fdbf5 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.system.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.system.js @@ -129,7 +129,21 @@ window.webkitCancelAnimationFrame || window.mozCancelAnimationFrame || window.msCancelAnimationFrame || - window.oCancelAnimationFrame + window.oCancelAnimationFrame, + + requestIdleCallback: window.requestIdleCallback || function (cb) { + var start = Date.now(); + return setTimeout(function () { + cb({ + didTimeout: false, + timeRemaining: function () { + return Math.max(0, 50 - (Date.now() - start)); + }, + }); + }, 1); + }, + + cancelIdleCallback: window.cancelIdleCallback || function (id) { clearTimeout(id); } }); // provide main app namespace From 9b70f3933ae09a91e07b40d576e84cd73a836e93 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 17 Aug 2020 12:23:44 +0200 Subject: [PATCH 046/695] API: IMediaService endpoints (in progress) --- .../Controllers/OData/MediaController.cs | 159 +++++++++++++----- .../OData/PaymentMethodsController.cs | 5 +- .../Controllers/OData/UrlRecordsController.cs | 17 +- .../Extensions/MiscExtensions.cs | 15 ++ .../Extensions/ApiControllerExtensions.cs | 4 +- 5 files changed, 148 insertions(+), 52 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 7deccb978b..336972bc9f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -97,41 +97,27 @@ public HttpResponseMessage GetProperty(int key, string propertyName) return Request.CreateResponse(HttpStatusCode.OK, propertyType, propertyValue); } - public IHttpActionResult Post(MediaFile entity) + public IHttpActionResult Post() { - throw new HttpResponseException(HttpStatusCode.Forbidden); + return StatusCode(HttpStatusCode.Forbidden); } - public IHttpActionResult Put(int key, MediaFile entity) + public IHttpActionResult Put() { - throw new HttpResponseException(HttpStatusCode.Forbidden); + return StatusCode(HttpStatusCode.Forbidden); } - public IHttpActionResult Patch(int key, Delta model) + public IHttpActionResult Patch() { - throw new HttpResponseException(HttpStatusCode.Forbidden); + return StatusCode(HttpStatusCode.Forbidden); } - [WebApiAuthenticate(Permission = Permissions.Media.Delete)] - public IHttpActionResult Delete(int key) + public IHttpActionResult Delete() { - this.ProcessEntity(() => - { - var file = Service.GetFileById(key); - if (file == null) - { - throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - } - - // Get options from query string. - // FromODataUri (404) and FromBody ("Can't bind multiple parameters") are not possible here. - var permanent = this.GetQueryStringValue("permanent", false); - var force = this.GetQueryStringValue("force", false); - - Service.DeleteFile(file.File, permanent, force); - }); + // We do not allow direct entity deletion. + // There is an action method "DeleteFile" instead to trigger the corresponding service method. - return StatusCode(HttpStatusCode.NoContent); + return StatusCode(HttpStatusCode.Forbidden); } #region Actions and functions @@ -147,11 +133,11 @@ public static void Init(WebApiConfigurationBroadcaster configData) .ReturnsFromEntitySet("Media") .Parameter("Path"); - //var getFileByName = entityConfig.Collection + //entityConfig.Collection // .Action("GetFileByName") - // .ReturnsFromEntitySet("Media"); - //getFileByName.Parameter("FileName"); - //getFileByName.Parameter("FolderId"); + // .ReturnsFromEntitySet("Media") + // .AddParameter("FileName") + // .AddParameter("FolderId"); entityConfig.Collection .Function("GetFilesByIds") @@ -188,21 +174,22 @@ public static void Init(WebApiConfigurationBroadcaster configData) //cfgr.ComplexProperty(x => x.Filter); //cfgr.HasDynamicProperties(x => x.Folders); - var moveFile = entityConfig + entityConfig .Action("MoveFile") - .ReturnsFromEntitySet("Media"); - - moveFile.Parameter("DestinationFileName"); - var dph1 = moveFile.Parameter("DuplicateFileHandling"); - dph1.OptionalParameter = true; + .ReturnsFromEntitySet("Media") + .AddParameter("DestinationFileName") + .AddParameter("DuplicateFileHandling", true); - var copyFile = entityConfig + entityConfig .Action("CopyFile") - .ReturnsFromEntitySet("Media"); + .ReturnsFromEntitySet("Media") + .AddParameter("DestinationFileName") + .AddParameter("DuplicateFileHandling", true); - copyFile.Parameter("DestinationFileName"); - var dph2 = copyFile.Parameter("DuplicateFileHandling"); - dph2.OptionalParameter = true; + entityConfig + .Action("DeleteFile") + .AddParameter("Permanent") + .AddParameter("Force", true); #endregion @@ -218,6 +205,24 @@ public static void Init(WebApiConfigurationBroadcaster configData) .Returns() .Parameter("Path"); + entityConfig.Collection + .Action("MoveFolder") + .Returns() + .AddParameter("Path") + .AddParameter("DestinationPath"); + + entityConfig.Collection + .Action("CopyFolder") + .Returns() + .AddParameter("Path") + .AddParameter("DestinationPath") + .AddParameter("DuplicateEntryHandling", true); + + entityConfig.Collection + .Action("DeleteFolder") + .AddParameter("Path") + .AddParameter("FileHandling", true); + #endregion } @@ -419,6 +424,28 @@ public FileItemInfo CopyFile(int key, ODataActionParameters parameters) return fileCopy; } + /// POST /Media(123)/DeleteFile {"Permanent":false} + [HttpPost] + [WebApiAuthenticate(Permission = Permissions.Media.Delete)] + public IHttpActionResult DeleteFile(int key, ODataActionParameters parameters) + { + this.ProcessEntity(() => + { + var file = Service.GetFileById(key); + if (file == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } + + var permanent = parameters.GetValueSafe("Permanent"); + var force = parameters.GetValueSafe("Force", false); + + Service.DeleteFile(file.File, permanent, force); + }); + + return StatusCode(HttpStatusCode.NoContent); + } + /// POST /Media/FolderExists {"Path":"my-folder"} [HttpPost] @@ -454,6 +481,60 @@ public HttpResponseMessage CreateFolder(ODataActionParameters parameters) return Request.CreateResponse(HttpStatusCode.Created, newFolder); } + /// POST /Media/MoveFolder {"Path":"content/my-folder", "DestinationPath":"content/my-renamed-folder"} + [HttpPost] + [WebApiAuthenticate(Permission = Permissions.Media.Update)] + public FolderItemInfo MoveFolder(ODataActionParameters parameters) + { + FolderItemInfo movedFolder = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + var destinationPath = parameters.GetValueSafe("DestinationPath"); + + var result = Service.MoveFolder(path, destinationPath); + movedFolder = Convert(result); + }); + + return movedFolder; + } + + /// POST /Media/CopyFolder {"Path":"content/my-folder", "DestinationPath":"content/my-new-folder"} + [HttpPost] + [WebApiAuthenticate(Permission = Permissions.Media.Update)] + public FolderItemInfo CopyFolder(ODataActionParameters parameters) + { + FolderItemInfo copiedFolder = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + var destinationPath = parameters.GetValueSafe("DestinationPath"); + var duplicateEntryHandling = parameters.GetValueSafe("DuplicateEntryHandling", DuplicateEntryHandling.Skip); + + var result = Service.CopyFolder(path, destinationPath, duplicateEntryHandling); + copiedFolder = Convert(result.Folder); + }); + + return copiedFolder; + } + + /// POST /Media/DeleteFolder {"Path":"content/my-folder"} + [HttpPost] + [WebApiAuthenticate(Permission = Permissions.Media.Delete)] + public IHttpActionResult DeleteFolder(ODataActionParameters parameters) + { + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + var fileHandling = parameters.GetValueSafe("FileHandling", FileHandling.SoftDelete); + + Service.DeleteFolder(path, fileHandling); + }); + + return StatusCode(HttpStatusCode.NoContent); + } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index d4a4f73082..9aeabfef18 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -57,10 +57,9 @@ public async Task Patch(int key, Delta model) return result; } - [WebApiAuthenticate] - public IHttpActionResult Delete(int key) + public IHttpActionResult Delete() { - throw new HttpResponseException(HttpStatusCode.Forbidden); + return StatusCode(HttpStatusCode.Forbidden); } } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs index 4889655ac5..88a2b90ccd 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs @@ -2,7 +2,6 @@ using System.Net; using System.Net.Http; using System.Web.Http; -using System.Web.OData; using SmartStore.Core.Domain.Seo; using SmartStore.Services.Seo; using SmartStore.Web.Framework.WebApi; @@ -31,24 +30,24 @@ public HttpResponseMessage GetProperty(int key, string propertyName) return GetPropertyValue(key, propertyName); } - public IHttpActionResult Post(UrlRecord entity) + public IHttpActionResult Post() { - throw new HttpResponseException(HttpStatusCode.Forbidden); + return StatusCode(HttpStatusCode.Forbidden); } - public IHttpActionResult Put(int key, UrlRecord entity) + public IHttpActionResult Put() { - throw new HttpResponseException(HttpStatusCode.Forbidden); + return StatusCode(HttpStatusCode.Forbidden); } - public IHttpActionResult Patch(int key, Delta model) + public IHttpActionResult Patch() { - throw new HttpResponseException(HttpStatusCode.Forbidden); + return StatusCode(HttpStatusCode.Forbidden); } - public IHttpActionResult Delete(int key) + public IHttpActionResult Delete() { - throw new HttpResponseException(HttpStatusCode.Forbidden); + return StatusCode(HttpStatusCode.Forbidden); } } } diff --git a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs index 926e9bed83..d681fee0b7 100644 --- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs @@ -2,6 +2,7 @@ using System.Text; using System.Web.Mvc; using System.Web.OData; +using System.Web.OData.Builder; using SmartStore.Core.Infrastructure; using SmartStore.Services.Localization; using SmartStore.Utilities; @@ -75,5 +76,19 @@ public static void DeleteLocalFiles(this MultipartFormDataStreamProvider provide } catch { } } + + /// + /// Helper to improve readability. + /// + public static ActionConfiguration AddParameter( + this ActionConfiguration config, + string name, + bool optional = false) + { + var parameter = config.Parameter(name); + parameter.OptionalParameter = optional; + + return config; + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs index c83fd118cd..b77bdae3a2 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs @@ -17,7 +17,7 @@ public static HttpResponseException InvalidModelStateException(this ApiControlle /// /// Further entity processing typically used by OData actions. - /// It is mainly used where a 422 status code is more suitable than a 500. + /// Is mainly used to capture errors of the service project and in that case generate a 422 status code instead of a 500. /// /// Action for entity processing. public static void ProcessEntity(this ApiController apiController, Action process) @@ -33,10 +33,12 @@ public static void ProcessEntity(this ApiController apiController, Action proces } catch (HttpResponseException hrEx) { + // Do not catch exceptions thrown within process action. throw hrEx; } catch (Exception ex) { + // Capture exception because a 422 is more suitable. throw apiController.Request.UnprocessableEntityException(ex.Message); } } From 7a13d4b9c46a38fe49e954d1a9028a618af9ecf8 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 17 Aug 2020 16:36:30 +0200 Subject: [PATCH 047/695] API: IHttpActionResult refactoring (in progress) --- .../Controllers/OData/AddressesController.cs | 3 +- .../OData/BlogCommentsController.cs | 3 +- .../Controllers/OData/BlogPostsController.cs | 3 +- .../Controllers/OData/CategoriesController.cs | 3 +- .../Controllers/OData/CountriesController.cs | 3 +- .../Controllers/OData/CurrenciesController.cs | 3 +- .../OData/CustomerRoleMappingsController.cs | 3 +- .../OData/CustomerRolesController.cs | 3 +- .../Controllers/OData/CustomersController.cs | 19 ++++--- .../OData/DeliveryTimesController.cs | 3 +- .../Controllers/OData/DiscountsController.cs | 3 +- .../Controllers/OData/DownloadsController.cs | 3 +- .../OData/GenericAttributesController.cs | 3 +- .../Controllers/OData/LanguagesController.cs | 3 +- .../OData/LocalizedPropertiesController.cs | 3 +- .../OData/ManufacturersController.cs | 3 +- .../OData/MeasureDimensionsController.cs | 3 +- .../OData/MeasureWeightsController.cs | 3 +- .../Controllers/OData/MediaController.cs | 29 ++++++----- .../NewsLetterSubscriptionsController.cs | 3 +- .../Controllers/OData/OrderItemsController.cs | 16 +++--- .../Controllers/OData/OrderNotesController.cs | 11 ++-- .../Controllers/OData/OrdersController.cs | 21 ++++---- .../OData/PaymentMethodsController.cs | 3 +- .../ProductAttributeOptionsController.cs | 3 +- .../ProductAttributeOptionsSetsController.cs | 3 +- .../OData/ProductAttributesController.cs | 3 +- .../OData/ProductBundleItemsController.cs | 3 +- .../OData/ProductCategoriesController.cs | 2 +- .../OData/ProductManufacturersController.cs | 3 +- .../OData/ProductPicturesController.cs | 2 +- ...roductSpecificationAttributesController.cs | 2 +- ...tVariantAttributeCombinationsController.cs | 2 +- ...ProductVariantAttributeValuesController.cs | 2 +- .../ProductVariantAttributesController.cs | 2 +- .../Controllers/OData/ProductsController.cs | 51 +++++++++---------- .../OData/QuantityUnitsController.cs | 2 +- .../OData/RelatedProductsController.cs | 2 +- .../OData/ReturnRequestsController.cs | 16 +++--- .../Controllers/OData/SettingsController.cs | 3 +- .../OData/ShipmentItemsController.cs | 3 +- .../Controllers/OData/ShipmentsController.cs | 3 +- .../OData/ShippingMethodsController.cs | 3 +- ...SpecificationAttributeOptionsController.cs | 3 +- .../SpecificationAttributesController.cs | 3 +- .../OData/StateProvincesController.cs | 3 +- .../OData/StoreMappingsController.cs | 3 +- .../Controllers/OData/StoresController.cs | 3 +- .../OData/SyncMappingsController.cs | 3 +- .../OData/TaxCategoriesController.cs | 3 +- .../Controllers/OData/TierPricesController.cs | 3 +- .../Controllers/OData/UrlRecordsController.cs | 3 +- .../Services/WebApiPdfHelper.cs | 23 ++++----- .../HttpRequestMessageExtensions.cs | 13 +---- .../WebApi/WebApiEntityController.cs | 26 ++++++++-- 55 files changed, 158 insertions(+), 194 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs index abc1ce01e0..16c71e16f3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -46,7 +45,7 @@ public SingleResult
Get(int key) } [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs index 691280cc65..c03ba9d217 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -53,7 +52,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs index 1dd55e6d51..e1173408cd 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -49,7 +48,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs index a7821927c0..fc8d36d5be 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -49,7 +48,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs index 49bd885456..7999b12970 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index a78a6c9ec5..c5d58116c2 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs index 1d89824fa0..77412247ff 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs index bace05aee0..0db2ccea75 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs @@ -1,6 +1,5 @@ using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -30,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index fb2d49941a..62409319c8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -51,7 +50,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } @@ -113,7 +112,7 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public HttpResponseMessage GetAddresses(int key, int relatedKey = 0 /*addressId*/) + public IHttpActionResult GetAddresses(int key, int relatedKey = 0 /*addressId*/) { var addresses = GetRelatedCollection(key, x => x.Addresses); @@ -121,14 +120,14 @@ public HttpResponseMessage GetAddresses(int key, int relatedKey = 0 /*addressId* { var address = addresses.FirstOrDefault(x => x.Id == relatedKey); - return Request.CreateResponseForEntity(address, relatedKey); + return Response(address); } - return Request.CreateResponseForEntity(addresses, key); + return Response(addresses); } [WebApiAuthenticate(Permission = Permissions.Customer.EditAddress)] - public HttpResponseMessage PostAddresses(int key, int relatedKey /*addressId*/) + public IHttpActionResult PostAddresses(int key, int relatedKey /*addressId*/) { var entity = GetExpandedEntity(key, x => x.Addresses); var address = entity.Addresses.FirstOrDefault(x => x.Id == relatedKey); @@ -145,14 +144,14 @@ public HttpResponseMessage PostAddresses(int key, int relatedKey /*addressId*/) entity.Addresses.Add(address); Service.UpdateCustomer(entity); - return Request.CreateResponse(HttpStatusCode.Created, address); + return Response(HttpStatusCode.Created, address); } - return Request.CreateResponse(HttpStatusCode.OK, address); + return Ok(address); } [WebApiAuthenticate(Permission = Permissions.Customer.EditAddress)] - public HttpResponseMessage DeleteAddresses(int key, int relatedKey = 0 /*addressId*/) + public IHttpActionResult DeleteAddresses(int key, int relatedKey = 0 /*addressId*/) { var entity = GetExpandedEntity(key, x => x.Addresses); @@ -175,7 +174,7 @@ public HttpResponseMessage DeleteAddresses(int key, int relatedKey = 0 /*address } } - return Request.CreateResponse(HttpStatusCode.NoContent); + return StatusCode(HttpStatusCode.NoContent); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs index a9bd1a19b9..f8112b64e1 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs index df4efe9c77..9c3f6cca40 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -30,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs index 856f5a462f..9606478fff 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs index 9a073846b7..fe6a8b360b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -26,7 +25,7 @@ public SingleResult Get(int key) return GetSingleResult(key); } - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs index ec58bc0c56..490929b96e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index dc8f046299..1ac2d14600 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -26,7 +25,7 @@ public SingleResult Get(int key) return GetSingleResult(key); } - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs index c89c03e7a9..429571eaed 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -49,7 +48,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs index 5e1ff6dc6f..c17ba0d475 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs index 9d5c27d0d3..fc3f1cb770 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 336972bc9f..32a6cef635 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -33,23 +33,23 @@ public class MediaController : WebApiEntityController // GET /Media(123) [WebApiQueryable] [WebApiAuthenticate] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { var file = Service.GetFileById(key, _defaultLoadFlags); if (file == null) { - throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + return NotFound(); } - return SingleResult.Create(new[] { Convert(file) }.AsQueryable()); + return Ok(Convert(file)); } // GET /Media [WebApiQueryable] [WebApiAuthenticate] - public IQueryable Get(/*ODataQueryOptions queryOptions*/) + public IHttpActionResult Get(/*ODataQueryOptions queryOptions*/) { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); // TODO or not TODO :) //var maxTop = WebApiCachingControllingData.Data().MaxTop; @@ -64,7 +64,7 @@ public IQueryable Get(/*ODataQueryOptions queryOptions* // GET /Media(123)/ThumbUrl [WebApiAuthenticate] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { Type propertyType = null; object propertyValue = null; @@ -91,10 +91,11 @@ public HttpResponseMessage GetProperty(int key, string propertyName) if (propertyType == null) { - return Request.CreateResponse(HttpStatusCode.NoContent); + return StatusCode(HttpStatusCode.NoContent); } - return Request.CreateResponse(HttpStatusCode.OK, propertyType, propertyValue); + var response = Request.CreateResponse(HttpStatusCode.OK, propertyType, propertyValue); + return ResponseMessage(response); } public IHttpActionResult Post() @@ -466,7 +467,7 @@ public bool FolderExists(ODataActionParameters parameters) /// POST /Media/CreateFolder {"Path":"content/my-folder"} [HttpPost] [WebApiAuthenticate] - public HttpResponseMessage CreateFolder(ODataActionParameters parameters) + public IHttpActionResult CreateFolder(ODataActionParameters parameters) { FolderItemInfo newFolder = null; @@ -478,13 +479,13 @@ public HttpResponseMessage CreateFolder(ODataActionParameters parameters) newFolder = Convert(result); }); - return Request.CreateResponse(HttpStatusCode.Created, newFolder); + return Response(HttpStatusCode.Created, newFolder); } /// POST /Media/MoveFolder {"Path":"content/my-folder", "DestinationPath":"content/my-renamed-folder"} [HttpPost] [WebApiAuthenticate(Permission = Permissions.Media.Update)] - public FolderItemInfo MoveFolder(ODataActionParameters parameters) + public IHttpActionResult MoveFolder(ODataActionParameters parameters) { FolderItemInfo movedFolder = null; @@ -497,13 +498,13 @@ public FolderItemInfo MoveFolder(ODataActionParameters parameters) movedFolder = Convert(result); }); - return movedFolder; + return Ok(movedFolder); } /// POST /Media/CopyFolder {"Path":"content/my-folder", "DestinationPath":"content/my-new-folder"} [HttpPost] [WebApiAuthenticate(Permission = Permissions.Media.Update)] - public FolderItemInfo CopyFolder(ODataActionParameters parameters) + public IHttpActionResult CopyFolder(ODataActionParameters parameters) { FolderItemInfo copiedFolder = null; @@ -517,7 +518,7 @@ public FolderItemInfo CopyFolder(ODataActionParameters parameters) copiedFolder = Convert(result.Folder); }); - return copiedFolder; + return Ok(copiedFolder); } /// POST /Media/DeleteFolder {"Path":"content/my-folder"} diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs index 7ca5fb06f5..928714003b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index 80487b446e..886983b473 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -1,9 +1,7 @@ using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; -using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; @@ -43,27 +41,27 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] - public IHttpActionResult Post(OrderItem entity) + public IHttpActionResult Post() { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] - public IHttpActionResult Put(int key, OrderItem entity) + public IHttpActionResult Put() { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] - public IHttpActionResult Patch(int key, Delta model) + public IHttpActionResult Patch() { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.EditItem)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index aa7bf8296a..d1d4622a4c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -1,6 +1,5 @@ using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -30,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } @@ -58,15 +57,15 @@ public IHttpActionResult Post(OrderNote entity) } [WebApiAuthenticate(Permission = Permissions.Order.Update)] - public IHttpActionResult Put(int key, OrderNote entity) + public IHttpActionResult Put() { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.Update)] - public IHttpActionResult Patch(int key, Delta model) + public IHttpActionResult Patch() { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.Update)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index 32c0f3dca7..783565ea76 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -58,7 +58,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } @@ -198,20 +198,21 @@ public OrderInfo Infos(int key) [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public HttpResponseMessage Pdf(int key) + public IHttpActionResult Pdf(int key) { - byte[] pdfData = new byte[0]; - var result = GetSingleResult(key); - var order = GetExpandedEntity(key, result, "OrderItems, OrderItems.Product"); + HttpResponseMessage response = null; this.ProcessEntity(() => { - pdfData = _apiPdfHelper.Value.OrderToPdf(order); - }); + var result = GetSingleResult(key); + var order = GetExpandedEntity(key, result, "OrderItems, OrderItems.Product"); + var pdfData = _apiPdfHelper.Value.OrderToPdf(order); - var fileName = Services.Localization.GetResource("Order.PdfInvoiceFileName").FormatInvariant(order.Id); - var response = _apiPdfHelper.Value.CreateResponse(Request, pdfData, fileName); - return response; + var fileName = Services.Localization.GetResource("Order.PdfInvoiceFileName").FormatInvariant(order.Id); + response = _apiPdfHelper.Value.CreateResponse(Request, pdfData, fileName); + }); + + return ResponseMessage(response); } [HttpPost] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index 9aeabfef18..d63d4ca8cc 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -1,6 +1,5 @@ using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -30,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs index 7a91ca362c..d788f8101a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs index 55c54bb588..5d6608f62d 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs index 60295fcb38..f419ed79dd 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs index 58631b8fb0..da9e110077 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs index 8a691b80ef..7082d3605a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs @@ -29,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs index 60a4ef3c0f..b03fd1b404 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs index 07597a77c7..d303edb6cf 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs @@ -30,7 +30,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs index 39eb2c9548..31770ab910 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs @@ -29,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs index ce2709fb5b..316aae1e7d 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs @@ -30,7 +30,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs index c103c54d51..2148125f16 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs @@ -29,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs index b404129266..f244e031c3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs @@ -29,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 086417d141..754db80f4e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.ModelBinding; @@ -78,7 +77,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } @@ -171,7 +170,7 @@ public SingleResult GetSampleDownload(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProductCategories(int key, int relatedKey = 0 /*categoryId*/) + public IHttpActionResult GetProductCategories(int key, int relatedKey = 0 /*categoryId*/) { var productCategories = _categoryService.Value.GetProductCategoriesByProductId(key, true); @@ -179,14 +178,14 @@ public HttpResponseMessage GetProductCategories(int key, int relatedKey = 0 /*ca { var productCategory = productCategories.FirstOrDefault(x => x.CategoryId == relatedKey); - return Request.CreateResponseForEntity(productCategory, relatedKey); + return Response(productCategory); } - return Request.CreateResponseForEntity(productCategories, key); + return Response(productCategories); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] - public HttpResponseMessage PostProductCategories(int key, int relatedKey /*categoryId*/) + public IHttpActionResult PostProductCategories(int key, int relatedKey /*categoryId*/) { var productCategories = _categoryService.Value.GetProductCategoriesByProductId(key, true); var productCategory = productCategories.FirstOrDefault(x => x.CategoryId == relatedKey); @@ -199,14 +198,14 @@ public HttpResponseMessage PostProductCategories(int key, int relatedKey /*categ _categoryService.Value.InsertProductCategory(productCategory); - return Request.CreateResponse(HttpStatusCode.Created, productCategory); + return Response(HttpStatusCode.Created, productCategory); } - return Request.CreateResponse(HttpStatusCode.OK, productCategory); + return Ok(productCategory); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] - public HttpResponseMessage DeleteProductCategories(int key, int relatedKey = 0 /*categoryId*/) + public IHttpActionResult DeleteProductCategories(int key, int relatedKey = 0 /*categoryId*/) { var productCategories = _categoryService.Value.GetProductCategoriesByProductId(key, true); @@ -223,13 +222,13 @@ public HttpResponseMessage DeleteProductCategories(int key, int relatedKey = 0 / } } - return Request.CreateResponse(HttpStatusCode.NoContent); + return StatusCode(HttpStatusCode.NoContent); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProductManufacturers(int key, int relatedKey = 0 /*manufacturerId*/) + public IHttpActionResult GetProductManufacturers(int key, int relatedKey = 0 /*manufacturerId*/) { var productManufacturers = _manufacturerService.Value.GetProductManufacturersByProductId(key, true); @@ -237,14 +236,14 @@ public HttpResponseMessage GetProductManufacturers(int key, int relatedKey = 0 / { var productManufacturer = productManufacturers.FirstOrDefault(x => x.ManufacturerId == relatedKey); - return Request.CreateResponseForEntity(productManufacturer, relatedKey); + return Response(productManufacturer); } - return Request.CreateResponseForEntity(productManufacturers, key); + return Response(productManufacturers); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] - public HttpResponseMessage PostProductManufacturers(int key, int relatedKey /*manufacturerId*/) + public IHttpActionResult PostProductManufacturers(int key, int relatedKey /*manufacturerId*/) { var productManufacturers = _manufacturerService.Value.GetProductManufacturersByProductId(key, true); var productManufacturer = productManufacturers.FirstOrDefault(x => x.ManufacturerId == relatedKey); @@ -257,14 +256,14 @@ public HttpResponseMessage PostProductManufacturers(int key, int relatedKey /*ma _manufacturerService.Value.InsertProductManufacturer(productManufacturer); - return Request.CreateResponse(HttpStatusCode.Created, productManufacturer); + return Response(HttpStatusCode.Created, productManufacturer); } - return Request.CreateResponse(HttpStatusCode.OK, productManufacturer); + return Ok(productManufacturer); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] - public HttpResponseMessage DeleteProductManufacturers(int key, int relatedKey = 0 /*manufacturerId*/) + public IHttpActionResult DeleteProductManufacturers(int key, int relatedKey = 0 /*manufacturerId*/) { var productManufacturers = _manufacturerService.Value.GetProductManufacturersByProductId(key, true); @@ -281,13 +280,13 @@ public HttpResponseMessage DeleteProductManufacturers(int key, int relatedKey = } } - return Request.CreateResponse(HttpStatusCode.NoContent); + return StatusCode(HttpStatusCode.NoContent); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProductPictures(int key, int relatedKey = 0 /*mediaFileId*/) + public IHttpActionResult GetProductPictures(int key, int relatedKey = 0 /*mediaFileId*/) { var productPictures = Service.GetProductPicturesByProductId(key); @@ -295,14 +294,14 @@ public HttpResponseMessage GetProductPictures(int key, int relatedKey = 0 /*medi { var productPicture = productPictures.FirstOrDefault(x => x.MediaFileId == relatedKey); - return Request.CreateResponseForEntity(productPicture, relatedKey); + return Response(productPicture); } - return Request.CreateResponseForEntity(productPictures, key); + return Response(productPictures); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] - public HttpResponseMessage PostProductPictures(int key, int relatedKey /*mediaFileId*/) + public IHttpActionResult PostProductPictures(int key, int relatedKey /*mediaFileId*/) { var productPictures = Service.GetProductPicturesByProductId(key); var productPicture = productPictures.FirstOrDefault(x => x.MediaFileId == relatedKey); @@ -315,14 +314,14 @@ public HttpResponseMessage PostProductPictures(int key, int relatedKey /*mediaFi Service.InsertProductPicture(productPicture); - return Request.CreateResponse(HttpStatusCode.Created, productPicture); + return Response(HttpStatusCode.Created, productPicture); } - return Request.CreateResponse(HttpStatusCode.OK, productPicture); + return Ok(productPicture); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] - public HttpResponseMessage DeleteProductPictures(int key, int relatedKey = 0 /*mediaFileId*/) + public IHttpActionResult DeleteProductPictures(int key, int relatedKey = 0 /*mediaFileId*/) { var productPictures = Service.GetProductPicturesByProductId(key); @@ -339,7 +338,7 @@ public HttpResponseMessage DeleteProductPictures(int key, int relatedKey = 0 /*m } } - return Request.CreateResponse(HttpStatusCode.NoContent); + return StatusCode(HttpStatusCode.NoContent); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs index 03a19c0a7c..59492e7be0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs @@ -29,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs index 7785aed816..d8ef5ea122 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs @@ -29,7 +29,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs index 56a34ae9c5..1d4952e033 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs @@ -1,9 +1,7 @@ using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; -using System.Web.OData; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; @@ -31,27 +29,27 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } [WebApiAuthenticate(Permission = Permissions.Customer.Create)] - public IHttpActionResult Post(ReturnRequest entity) + public IHttpActionResult Post() { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Customer.Update)] - public IHttpActionResult Put(int key, ReturnRequest entity) + public IHttpActionResult Put() { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Customer.Update)] - public IHttpActionResult Patch(int key, Delta model) + public IHttpActionResult Patch() { - throw new HttpResponseException(HttpStatusCode.NotImplemented); + return StatusCode(HttpStatusCode.NotImplemented); } [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Delete)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs index 1136d56b84..2ec972f8a6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs index a5da584fef..b03d489044 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs index 7faead5cdb..fb026bf595 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs index b172febdec..420ee08f72 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs index 01b82d5a21..46006338c8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs index b8c4a4c6b6..05d93ee00d 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs index 7da8f87f11..ab549637bb 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs index c61016b7af..008d943315 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -26,7 +25,7 @@ public SingleResult Get(int key) return GetSingleResult(key); } - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs index 64570cabad..33d549474a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs index 969f45ba9f..ad6421e8d6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -26,7 +25,7 @@ public SingleResult Get(int key) return GetSingleResult(key); } - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs index 5add9b60c4..1628e69309 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs index 9bc0ab575f..c70310cf24 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -29,7 +28,7 @@ public SingleResult Get(int key) } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs index 88a2b90ccd..b161e526f7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs @@ -1,6 +1,5 @@ using System.Linq; using System.Net; -using System.Net.Http; using System.Web.Http; using SmartStore.Core.Domain.Seo; using SmartStore.Services.Seo; @@ -25,7 +24,7 @@ public SingleResult Get(int key) return GetSingleResult(key); } - public HttpResponseMessage GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty(int key, string propertyName) { return GetPropertyValue(key, propertyName); } diff --git a/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs b/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs index a82c074505..b05089b6e0 100644 --- a/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs +++ b/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs @@ -3,7 +3,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; -using System.Text.RegularExpressions; using System.Web; using System.Web.Mvc; using System.Web.Routing; @@ -52,17 +51,17 @@ private ControllerContext CreateControllerContext() return controllerContext; } - private string Render(ControllerContext controllerContext, RazorView view, object model) - { - //http://forums.asp.net/t/1888849.aspx?Render+PartialView+without+ControllerContext - //https://weblog.west-wind.com/posts/2012/May/30/Rendering-ASPNET-MVC-Views-to-String - - using (var writer = new StringWriter()) - { - view.Render(new ViewContext(controllerContext, view, new ViewDataDictionary(model), new TempDataDictionary(), writer), writer); - return writer.ToString(); - } - } + //private string Render(ControllerContext controllerContext, RazorView view, object model) + //{ + // //http://forums.asp.net/t/1888849.aspx?Render+PartialView+without+ControllerContext + // //https://weblog.west-wind.com/posts/2012/May/30/Rendering-ASPNET-MVC-Views-to-String + + // using (var writer = new StringWriter()) + // { + // view.Render(new ViewContext(controllerContext, view, new ViewDataDictionary(model), new TempDataDictionary(), writer), writer); + // return writer.ToString(); + // } + //} public byte[] OrderToPdf(Order order) { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs index 9467caa675..a3bf233a2d 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs @@ -18,22 +18,12 @@ private static MethodInfo InitCreateResponse() return (expr.Body as MethodCallExpression).Method.GetGenericMethodDefinition(); } - /// https://gist.github.com/raghuramn/5084608 + /// public static HttpResponseMessage CreateResponse(this HttpRequestMessage request, HttpStatusCode status, Type type, object value) { return _createResponse.MakeGenericMethod(type).Invoke(null, new[] { request, status, value }) as HttpResponseMessage; } - public static HttpResponseMessage CreateResponseForEntity(this HttpRequestMessage request, object entity, int key) - { - if (entity == null) - { - return request.CreateResponse(HttpStatusCode.NotFound, WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - } - - return request.CreateResponse(HttpStatusCode.OK, entity.GetType(), entity); - } - public static HttpResponseException BadRequestException(this HttpRequestMessage request, string message) { return new HttpResponseException(request.CreateErrorResponse(HttpStatusCode.BadRequest, message)); @@ -53,6 +43,5 @@ public static HttpResponseException InternalServerErrorException(this HttpReques { return new HttpResponseException(request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex)); } - } } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index f18661dbe8..bb298a4db8 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -8,6 +8,7 @@ using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; +using System.Web.Http.Results; using System.Web.OData; using System.Web.OData.Formatter; using Autofac; @@ -201,23 +202,40 @@ protected internal virtual SingleResult GetRelatedEntity( return SingleResult.Create(query); } - protected internal virtual HttpResponseMessage GetPropertyValue(int key, string propertyName) + protected internal virtual IHttpActionResult GetPropertyValue(int key, string propertyName) { var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); if (entity == null) { - throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + return NotFound(); } var prop = FastProperty.GetProperty(entity.GetType(), propertyName); if (prop == null) { - throw Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); + return BadRequest(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); } var propertyValue = prop.GetValue(entity); - return Request.CreateResponse(HttpStatusCode.OK, prop.Property.PropertyType, propertyValue); + var response = Request.CreateResponse(HttpStatusCode.OK, prop.Property.PropertyType, propertyValue); + return ResponseMessage(response); + } + + protected internal virtual IHttpActionResult Response(HttpStatusCode status, T value) + { + var response = Request.CreateResponse(status, value); + return ResponseMessage(response); + } + + protected internal virtual IHttpActionResult Response(T entity) + { + if (entity == null) + { + return NotFound(); + } + + return Ok(entity); } protected internal virtual IHttpActionResult Insert(TEntity entity, Action insert) From 8340675678d9c801f83c47e5e01d8b540651ec33 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 17 Aug 2020 18:05:52 +0200 Subject: [PATCH 048/695] API: fixes missing entity id in location header when inserting order notes --- .../Controllers/OData/OrderNotesController.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index d1d4622a4c..6d37eef5f6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -1,8 +1,8 @@ -using System.Linq; +using System; +using System.Linq; using System.Net; using System.Threading.Tasks; using System.Web.Http; -using System.Web.OData; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; using SmartStore.Services.Orders; @@ -44,8 +44,15 @@ public IHttpActionResult Post(OrderNote entity) { throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(entity.OrderId)); } + if (entity.Note.IsEmpty()) + { + throw Request.BadRequestException("Missing or empty order note text."); + } + + entity.CreatedOnUtc = DateTime.UtcNow; - Service.AddOrderNote(order, entity.Note, entity.DisplayToCustomer); + order.OrderNotes.Add(entity); + Service.UpdateOrder(order); if (entity.DisplayToCustomer && this.GetQueryStringValue("customernotification", true)) { From fa69aa36f761bf3b9e9a347021fd56b113d36a05 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 18 Aug 2020 01:01:18 +0200 Subject: [PATCH 049/695] API: fixes missing location header for some endpoints --- .../Controllers/OData/CustomersController.cs | 2 +- .../Controllers/OData/MediaController.cs | 2 +- .../Controllers/OData/ProductsController.cs | 10 +++++----- .../WebApi/WebApiEntityController.cs | 7 ------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 62409319c8..b3ee72cfa8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -144,7 +144,7 @@ public IHttpActionResult PostAddresses(int key, int relatedKey /*addressId*/) entity.Addresses.Add(address); Service.UpdateCustomer(entity); - return Response(HttpStatusCode.Created, address); + return Created(address); } return Ok(address); diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 32a6cef635..cd79fe40a7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -479,7 +479,7 @@ public IHttpActionResult CreateFolder(ODataActionParameters parameters) newFolder = Convert(result); }); - return Response(HttpStatusCode.Created, newFolder); + return Created(newFolder); } /// POST /Media/MoveFolder {"Path":"content/my-folder", "DestinationPath":"content/my-renamed-folder"} diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 754db80f4e..e98c29fc03 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -71,7 +71,7 @@ public IQueryable Get() [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public SingleResult Get(int key) { return GetSingleResult(key); } @@ -170,7 +170,7 @@ public SingleResult GetSampleDownload(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IHttpActionResult GetProductCategories(int key, int relatedKey = 0 /*categoryId*/) + public IHttpActionResult GetProductCategories(int key, int relatedKey = 0 /*categoryId*/) { var productCategories = _categoryService.Value.GetProductCategoriesByProductId(key, true); @@ -198,7 +198,7 @@ public IHttpActionResult PostProductCategories(int key, int relatedKey /*categor _categoryService.Value.InsertProductCategory(productCategory); - return Response(HttpStatusCode.Created, productCategory); + return Created(productCategory); } return Ok(productCategory); @@ -256,7 +256,7 @@ public IHttpActionResult PostProductManufacturers(int key, int relatedKey /*manu _manufacturerService.Value.InsertProductManufacturer(productManufacturer); - return Response(HttpStatusCode.Created, productManufacturer); + return Created(productManufacturer); } return Ok(productManufacturer); @@ -314,7 +314,7 @@ public IHttpActionResult PostProductPictures(int key, int relatedKey /*mediaFile Service.InsertProductPicture(productPicture); - return Response(HttpStatusCode.Created, productPicture); + return Created(productPicture); } return Ok(productPicture); diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index bb298a4db8..1b9d8fcbd9 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -8,7 +8,6 @@ using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; -using System.Web.Http.Results; using System.Web.OData; using System.Web.OData.Formatter; using Autofac; @@ -222,12 +221,6 @@ protected internal virtual IHttpActionResult GetPropertyValue(int key, string pr return ResponseMessage(response); } - protected internal virtual IHttpActionResult Response(HttpStatusCode status, T value) - { - var response = Request.CreateResponse(status, value); - return ResponseMessage(response); - } - protected internal virtual IHttpActionResult Response(T entity) { if (entity == null) From 23f5dbd31d3e0c9fe7bc40430a0a5975fd7d22be Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 18 Aug 2020 03:05:07 +0200 Subject: [PATCH 050/695] Minor fix --- .../SmartStore.Core/Domain/Catalog/ProductMediaFile.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs index e43e481e90..d40236f0a5 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs @@ -1,4 +1,5 @@ using System.Runtime.Serialization; +using Newtonsoft.Json; using SmartStore.Core.Domain.Media; namespace SmartStore.Core.Domain.Catalog @@ -17,6 +18,7 @@ public interface IMediaFile /// /// Gets the media file /// + [JsonIgnore] MediaFile MediaFile { get; set; } } From 98d0b856bdac185483aac75a41859344adf7c8e8 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 18 Aug 2020 12:44:31 +0200 Subject: [PATCH 051/695] API: IHttpActionResult refactoring (in progress) --- .../Controllers/OData/AddressesController.cs | 8 ++++---- .../OData/BlogCommentsController.cs | 8 ++++---- .../Controllers/OData/BlogPostsController.cs | 8 ++++---- .../Controllers/OData/CategoriesController.cs | 8 ++++---- .../Controllers/OData/CountriesController.cs | 8 ++++---- .../Controllers/OData/CurrenciesController.cs | 11 +++++----- .../OData/CustomerRoleMappingsController.cs | 11 +++++----- .../OData/CustomerRolesController.cs | 11 +++++----- .../Controllers/OData/CustomersController.cs | 12 +++++------ .../OData/DeliveryTimesController.cs | 11 +++++----- .../Controllers/OData/DiscountsController.cs | 10 +++++----- .../Controllers/OData/DownloadsController.cs | 11 +++++----- .../OData/GenericAttributesController.cs | 11 +++++----- .../Controllers/OData/LanguagesController.cs | 11 +++++----- .../OData/LocalizedPropertiesController.cs | 11 +++++----- .../OData/ManufacturersController.cs | 10 +++++----- .../OData/MeasureDimensionsController.cs | 11 +++++----- .../OData/MeasureWeightsController.cs | 11 +++++----- .../NewsLetterSubscriptionsController.cs | 11 +++++----- .../Controllers/OData/OrderItemsController.cs | 8 ++++---- .../Controllers/OData/OrderNotesController.cs | 9 ++++----- .../Controllers/OData/OrdersController.cs | 8 ++++---- .../OData/PaymentMethodsController.cs | 11 +++++----- .../ProductAttributeOptionsController.cs | 11 +++++----- .../ProductAttributeOptionsSetsController.cs | 8 ++++---- .../OData/ProductAttributesController.cs | 8 ++++---- .../OData/ProductBundleItemsController.cs | 11 +++++----- .../OData/ProductCategoriesController.cs | 12 +++++------ .../OData/ProductManufacturersController.cs | 11 +++++----- .../OData/ProductPicturesController.cs | 14 ++++++------- ...roductSpecificationAttributesController.cs | 12 +++++------ ...tVariantAttributeCombinationsController.cs | 12 +++++------ ...ProductVariantAttributeValuesController.cs | 12 +++++------ .../ProductVariantAttributesController.cs | 9 ++++----- .../Controllers/OData/ProductsController.cs | 20 +++++++++---------- .../OData/QuantityUnitsController.cs | 12 +++++------ .../OData/RelatedProductsController.cs | 12 +++++------ .../OData/ReturnRequestsController.cs | 11 +++++----- .../Controllers/OData/SettingsController.cs | 11 +++++----- .../OData/ShipmentItemsController.cs | 11 +++++----- .../Controllers/OData/ShipmentsController.cs | 11 +++++----- .../OData/ShippingMethodsController.cs | 11 +++++----- ...SpecificationAttributeOptionsController.cs | 8 ++++---- .../SpecificationAttributesController.cs | 8 ++++---- .../OData/StateProvincesController.cs | 11 +++++----- .../OData/StoreMappingsController.cs | 11 +++++----- .../Controllers/OData/StoresController.cs | 11 +++++----- .../OData/SyncMappingsController.cs | 11 +++++----- .../OData/TaxCategoriesController.cs | 11 +++++----- .../Controllers/OData/TierPricesController.cs | 11 +++++----- .../Controllers/OData/UrlRecordsController.cs | 11 +++++----- .../WebApi/WebApiEntityController.cs | 14 ++++++++++++- .../WebApi/WebApiStartupTask.cs | 20 ++++++++++++------- .../SmartStore.WebApi.Client/MainForm.cs | 2 +- .../WebApi/WebApiConsumer.cs | 4 ++-- 55 files changed, 278 insertions(+), 303 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs index 16c71e16f3..7a746bc975 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs @@ -32,16 +32,16 @@ public AddressesController( [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public IQueryable
Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult
Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Customer.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs index c03ba9d217..4d985362c9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs @@ -39,16 +39,16 @@ protected override IQueryable GetEntitySet() [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs index e1173408cd..c915677c5a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs @@ -35,16 +35,16 @@ orderby x.CreatedOnUtc descending [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs index fc8d36d5be..479e1bf3a0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs @@ -35,16 +35,16 @@ from x in this.Repository.Table [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs index 7999b12970..88b4096317 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs @@ -15,16 +15,16 @@ public class CountriesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index c5d58116c2..58b735a8fe 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Directory; @@ -15,16 +14,16 @@ public class CurrenciesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs index 77412247ff..8322d465b7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Customers; @@ -15,16 +14,16 @@ public class CustomerRoleMappingsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs index 0db2ccea75..be355defca 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Net; +using System.Net; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -16,16 +15,16 @@ public class CustomerRolesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index b3ee72cfa8..6330a804d3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -37,16 +37,16 @@ from x in this.Repository.Table [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Customer.Read)] @@ -120,10 +120,10 @@ public IHttpActionResult GetAddresses(int key, int relatedKey = 0 /*addressId*/) { var address = addresses.FirstOrDefault(x => x.Id == relatedKey); - return Response(address); + return Ok(address); } - return Response(addresses); + return Ok(addresses); } [WebApiAuthenticate(Permission = Permissions.Customer.EditAddress)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs index f8112b64e1..66f4d5c205 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Directory; @@ -15,16 +14,16 @@ public class DeliveryTimesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs index 9c3f6cca40..0dd9f41f99 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs @@ -16,16 +16,16 @@ public class DiscountsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); - } + return Ok(GetEntitySet()); + } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs index 9606478fff..a1627d3bff 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Media; @@ -15,16 +14,16 @@ public class DownloadsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs index fe6a8b360b..73ff02a280 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Common; @@ -14,15 +13,15 @@ namespace SmartStore.WebApi.Controllers.OData public class GenericAttributesController : WebApiEntityController { [WebApiQueryable] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs index 490929b96e..c751ea2c95 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Localization; @@ -15,16 +14,16 @@ public class LanguagesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index 1ac2d14600..74191fbe8a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Localization; @@ -14,15 +13,15 @@ namespace SmartStore.WebApi.Controllers.OData public class LocalizedPropertiesController : WebApiEntityController { [WebApiQueryable] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs index 429571eaed..cd37c345e1 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs @@ -26,7 +26,7 @@ public ManufacturersController(Lazy urlRecordService) protected override IQueryable GetEntitySet() { var query = - from x in this.Repository.Table + from x in Repository.Table where !x.Deleted select x; @@ -35,16 +35,16 @@ from x in this.Repository.Table [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs index c17ba0d475..4b81748d5c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Directory; @@ -15,16 +14,16 @@ public class MeasureDimensionsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs index fc3f1cb770..141ebc54fb 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Directory; @@ -15,16 +14,16 @@ public class MeasureWeightsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs index 928714003b..c10b7553bf 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Messages; @@ -15,16 +14,16 @@ public class NewsLetterSubscriptionsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index 886983b473..be90a29d4d 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -28,16 +28,16 @@ from x in Repository.Table [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index 6d37eef5f6..f48236c269 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.Net; using System.Threading.Tasks; using System.Web.Http; @@ -16,16 +15,16 @@ public class OrderNotesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index 783565ea76..ed8c34ca8b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -45,16 +45,16 @@ from x in Repository.Table [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index d63d4ca8cc..79e5b87713 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Net; +using System.Net; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -16,16 +15,16 @@ public class PaymentMethodsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs index d788f8101a..2d8c839449 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -15,16 +14,16 @@ public class ProductAttributeOptionsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs index 5d6608f62d..16858d8ef4 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs @@ -15,16 +15,16 @@ public class ProductAttributeOptionsSetsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs index f419ed79dd..b443fa3138 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs @@ -15,16 +15,16 @@ public class ProductAttributesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs index da9e110077..a8464db545 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -15,16 +14,16 @@ public class ProductBundleItemsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs index 7082d3605a..9d9e9a3d80 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -16,16 +14,16 @@ public class ProductCategoriesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs index b03fd1b404..a9b29021b4 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -15,16 +14,16 @@ public class ProductManufacturersController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs index d303edb6cf..8cec6bb7f5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -13,20 +11,20 @@ namespace SmartStore.WebApi.Controllers.OData { - public class ProductPicturesController : WebApiEntityController + public class ProductPicturesController : WebApiEntityController { [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs index 31770ab910..64824d65e6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -16,16 +14,16 @@ public class ProductSpecificationAttributesController : WebApiEntityController

Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs index 316aae1e7d..6b8182e1d2 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -17,16 +15,16 @@ public class ProductVariantAttributeCombinationsController : WebApiEntityControl { [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs index 2148125f16..e15019fce9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -16,16 +14,16 @@ public class ProductVariantAttributeValuesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs index f244e031c3..8dc7348744 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -16,16 +15,16 @@ public class ProductVariantAttributesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index e98c29fc03..57c58346d8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -64,16 +64,16 @@ from x in Repository.Table [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] @@ -178,10 +178,10 @@ public IHttpActionResult GetProductCategories(int key, int relatedKey = 0 /*cate { var productCategory = productCategories.FirstOrDefault(x => x.CategoryId == relatedKey); - return Response(productCategory); + return Ok(productCategory); } - return Response(productCategories); + return Ok(productCategories); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditCategory)] @@ -236,10 +236,10 @@ public IHttpActionResult GetProductManufacturers(int key, int relatedKey = 0 /*m { var productManufacturer = productManufacturers.FirstOrDefault(x => x.ManufacturerId == relatedKey); - return Response(productManufacturer); + return Ok(productManufacturer); } - return Response(productManufacturers); + return Ok(productManufacturers); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditManufacturer)] @@ -294,10 +294,10 @@ public IHttpActionResult GetProductPictures(int key, int relatedKey = 0 /*mediaF { var productPicture = productPictures.FirstOrDefault(x => x.MediaFileId == relatedKey); - return Response(productPicture); + return Ok(productPicture); } - return Response(productPictures); + return Ok(productPictures); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditPicture)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs index 59492e7be0..aab2d6d06a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Directory; @@ -16,16 +14,16 @@ public class QuantityUnitsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs index d8ef5ea122..3b5d61c637 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -16,16 +14,16 @@ public class RelatedProductsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs index 1d4952e033..ee24ce2a60 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Net; +using System.Net; using System.Threading.Tasks; using System.Web.Http; using SmartStore.Core.Domain.Customers; @@ -16,16 +15,16 @@ public class ReturnRequestsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs index 2ec972f8a6..5831ce1118 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Configuration; @@ -15,16 +14,16 @@ public class SettingsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs index b03d489044..0f8bbaa5fb 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Shipping; @@ -15,16 +14,16 @@ public class ShipmentItemsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs index fb026bf595..af99894339 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Shipping; @@ -15,16 +14,16 @@ public class ShipmentsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs index 420ee08f72..b7536df6ae 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Shipping; @@ -15,16 +14,16 @@ public class ShippingMethodsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs index 46006338c8..c8afcb7899 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs @@ -15,16 +15,16 @@ public class SpecificationAttributeOptionsController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs index 05d93ee00d..32dd211d43 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs @@ -15,16 +15,16 @@ public class SpecificationAttributesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs index ab549637bb..c059e884ee 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Directory; @@ -15,16 +14,16 @@ public class StateProvincesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs index 008d943315..d674bda27b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Stores; @@ -14,15 +13,15 @@ namespace SmartStore.WebApi.Controllers.OData public class StoreMappingsController : WebApiEntityController { [WebApiQueryable] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs index 33d549474a..7779a4fc25 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Stores; @@ -15,16 +14,16 @@ public class StoresController : WebApiEntityController { [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs index ad6421e8d6..3c71dff7d4 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.DataExchange; @@ -14,15 +13,15 @@ namespace SmartStore.WebApi.Controllers.OData public class SyncMappingsController : WebApiEntityController { [WebApiQueryable] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs index 1628e69309..fa81274d82 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Tax; @@ -15,16 +14,16 @@ public class TaxCategoriesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs index c70310cf24..e89d51c481 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -15,16 +14,16 @@ public class TierPricesController : WebApiEntityController Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs index b161e526f7..bf363d27cd 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Net; +using System.Net; using System.Web.Http; using SmartStore.Core.Domain.Seo; using SmartStore.Services.Seo; @@ -13,15 +12,15 @@ namespace SmartStore.WebApi.Controllers.OData public class UrlRecordsController : WebApiEntityController { [WebApiQueryable] - public IQueryable Get() + public IHttpActionResult Get() { - return GetEntitySet(); + return Ok(GetEntitySet()); } [WebApiQueryable] - public SingleResult Get(int key) + public IHttpActionResult Get(int key) { - return GetSingleResult(key); + return Ok(key); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 1b9d8fcbd9..22f93c01ee 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -221,8 +221,20 @@ protected internal virtual IHttpActionResult GetPropertyValue(int key, string pr return ResponseMessage(response); } - protected internal virtual IHttpActionResult Response(T entity) + protected internal new IHttpActionResult Ok(T content) { + if (content == null) + { + return NotFound(); + } + + return base.Ok(content); + } + + protected internal virtual IHttpActionResult Ok(int key) + { + var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); + if (entity == null) { return NotFound(); diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 184c532976..9fc53fcd6f 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -28,18 +28,24 @@ public void Start() }; config.DependencyResolver = new AutofacWebApiDependencyResolver(); + //config.MapHttpAttributeRoutes(); - // Causes error messages during XML serialization: + // Causes errors during XML serialization: //var oDataFormatters = ODataMediaTypeFormatters.Create(); //config.Formatters.InsertRange(0, oDataFormatters); - config.Formatters.JsonFormatter.SerializerSettings.Formatting = Formatting.Indented; - config.Formatters.JsonFormatter.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; - config.Formatters.JsonFormatter.SerializerSettings.ContractResolver = new WebApiContractResolver(config.Formatters.JsonFormatter); - config.Formatters.JsonFormatter.MediaTypeMappings.Add(new QueryStringMapping("format", "json", "application/json")); - config.Formatters.XmlFormatter.MediaTypeMappings.Add(new QueryStringMapping("format", "xml", "application/xml")); + var json = config.Formatters.JsonFormatter; + json.SerializerSettings.Formatting = Formatting.Indented; + json.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; + json.SerializerSettings.ContractResolver = new WebApiContractResolver(config.Formatters.JsonFormatter); + json.AddQueryStringMapping("$format", "json", "application/json"); - config.AddODataQueryFilter(new WebApiQueryableAttribute()); + var xml = config.Formatters.XmlFormatter; + xml.UseXmlSerializer = true; + xml.Indent = true; + xml.AddQueryStringMapping("$format", "xml", "application/xml"); + + config.AddODataQueryFilter(new WebApiQueryableAttribute()); var corsAttribute = new EnableCorsAttribute("*", "*", "*", WebApiGlobal.Header.CorsExposed); config.EnableCors(corsAttribute); diff --git a/src/Tools/SmartStore.WebApi.Client/MainForm.cs b/src/Tools/SmartStore.WebApi.Client/MainForm.cs index 72d341f8b1..87f3e824ca 100644 --- a/src/Tools/SmartStore.WebApi.Client/MainForm.cs +++ b/src/Tools/SmartStore.WebApi.Client/MainForm.cs @@ -74,7 +74,7 @@ private void CallTheApi() SecretKey = txtSecretKey.Text, Url = txtUrl.Text + (radioOdata.Checked ? "odata/" : "api/") + txtVersion.Text + cboPath.Text, HttpMethod = cboMethod.Text, - HttpAcceptType = (radioJson.Checked ? ApiConsumer.JsonAcceptType : ApiConsumer.XmlAcceptType) + HttpAcceptType = radioJson.Checked ? ApiConsumer.JsonAcceptType : ApiConsumer.XmlAcceptType }; if (cboQuery.Text.HasValue()) diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs index 3ce18ef41d..6b695ba44f 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs @@ -12,8 +12,8 @@ namespace SmartStore.WebApi.Client { public class ApiConsumer : HmacAuthentication { - public static string XmlAcceptType { get { return "application/atom+xml,application/atomsvc+xml,application/xml"; } } - public static string JsonAcceptType { get { return "application/json, text/javascript, */*"; } } + public static string XmlAcceptType => "application/atom+xml,application/xml"; + public static string JsonAcceptType => "application/json"; private void SetTimeout(HttpWebRequest webRequest) { From ed9f6c40bdb60efd7acf298f8ede8ebd1fd0ebfd Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 18 Aug 2020 16:27:11 +0200 Subject: [PATCH 052/695] API: IHttpActionResult refactoring (in progress) --- .../Controllers/OData/AddressesController.cs | 13 ++-- .../OData/BlogCommentsController.cs | 4 +- .../Controllers/OData/BlogPostsController.cs | 11 ++- .../Controllers/OData/CategoriesController.cs | 7 +- .../Controllers/OData/CountriesController.cs | 7 +- .../OData/CustomerRoleMappingsController.cs | 8 +- .../Controllers/OData/CustomersController.cs | 32 +++----- .../Controllers/OData/DiscountsController.cs | 16 ++-- .../OData/LocalizedPropertiesController.cs | 4 +- .../OData/ManufacturersController.cs | 5 +- .../Controllers/OData/OrderItemsController.cs | 13 ++-- .../Controllers/OData/OrderNotesController.cs | 4 +- .../Controllers/OData/OrdersController.cs | 74 ++++++++----------- .../ProductAttributeOptionsController.cs | 4 +- .../ProductAttributeOptionsSetsController.cs | 11 ++- .../OData/ProductAttributesController.cs | 7 +- .../OData/ProductBundleItemsController.cs | 8 +- .../OData/ProductCategoriesController.cs | 8 +- .../OData/ProductManufacturersController.cs | 8 +- .../OData/ProductPicturesController.cs | 9 +-- ...roductSpecificationAttributesController.cs | 4 +- ...tVariantAttributeCombinationsController.cs | 12 ++- ...ProductVariantAttributeValuesController.cs | 4 +- .../ProductVariantAttributesController.cs | 11 ++- .../Controllers/OData/ProductsController.cs | 51 ++++++------- .../OData/ReturnRequestsController.cs | 5 +- .../OData/ShipmentItemsController.cs | 12 +++ .../Controllers/OData/ShipmentsController.cs | 11 +++ ...SpecificationAttributeOptionsController.cs | 11 ++- .../SpecificationAttributesController.cs | 7 +- .../OData/StateProvincesController.cs | 4 +- .../WebApi/WebApiEntityController.cs | 7 +- 32 files changed, 191 insertions(+), 201 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs index 7a746bc975..3dbec93642 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs @@ -5,7 +5,6 @@ using System.Web.OData; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; -using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Events; using SmartStore.Core.Security; @@ -103,17 +102,17 @@ public async Task Delete(int key) #region Navigation properties [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult GetCountry(int key) + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IHttpActionResult GetCountry(int key) { - return GetRelatedEntity(key, x => x.Country); + return Ok(GetRelatedEntity(key, x => x.Country)); } [WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult GetStateProvince(int key) + [WebApiAuthenticate(Permission = Permissions.Customer.Read)] + public IHttpActionResult GetStateProvince(int key) { - return GetRelatedEntity(key, x => x.StateProvince); + return Ok(GetRelatedEntity(key, x => x.StateProvince)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs index 4d985362c9..f4c316b569 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs @@ -113,9 +113,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public SingleResult GetBlogPost(int key) + public IHttpActionResult GetBlogPost(int key) { - return GetRelatedEntity(key, x => x.BlogPost); + return Ok(GetRelatedEntity(key, x => x.BlogPost)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs index c915677c5a..db021d2b7b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs @@ -4,7 +4,6 @@ using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Blogs; -using SmartStore.Core.Domain.Localization; using SmartStore.Core.Security; using SmartStore.Services.Blogs; using SmartStore.Services.Seo; @@ -26,7 +25,7 @@ public BlogPostsController(Lazy urlRecordService) protected override IQueryable GetEntitySet() { var query = - from x in this.Repository.Table + from x in Repository.Table orderby x.CreatedOnUtc descending select x; @@ -116,16 +115,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public SingleResult GetLanguage(int key) + public IHttpActionResult GetLanguage(int key) { - return GetRelatedEntity(key, x => x.Language); + return Ok(GetRelatedEntity(key, x => x.Language)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] - public IQueryable GetBlogComments(int key) + public IHttpActionResult GetBlogComments(int key) { - return GetRelatedCollection(key, x => x.BlogComments); + return Ok(GetRelatedCollection(key, x => x.BlogComments)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs index 479e1bf3a0..c9e05e1abf 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs @@ -4,7 +4,6 @@ using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; -using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Security; using SmartStore.Services.Catalog; using SmartStore.Services.Seo; @@ -26,7 +25,7 @@ public CategoriesController(Lazy urlRecordService) protected override IQueryable GetEntitySet() { var query = - from x in this.Repository.Table + from x in Repository.Table where !x.Deleted select x; @@ -116,9 +115,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] - public IQueryable GetAppliedDiscounts(int key) + public IHttpActionResult GetAppliedDiscounts(int key) { - return GetRelatedCollection(key, x => x.AppliedDiscounts); + return Ok(GetRelatedCollection(key, x => x.AppliedDiscounts)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs index 88b4096317..7d74723304 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Directory; @@ -65,9 +64,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] - public IQueryable GetStateProvinces(int key) + public IHttpActionResult GetStateProvinces(int key) { - return GetRelatedCollection(key, x => x.StateProvinces); + return Ok(GetRelatedCollection(key, x => x.StateProvinces)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs index 8322d465b7..d67711e4ef 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs @@ -64,16 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult GetCustomer(int key) + public IHttpActionResult GetCustomer(int key) { - return GetRelatedEntity(key, x => x.Customer); + return Ok(GetRelatedEntity(key, x => x.Customer)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] - public SingleResult GetCustomerRole(int key) + public IHttpActionResult GetCustomerRole(int key) { - return GetRelatedEntity(key, x => x.CustomerRole); + return Ok(GetRelatedEntity(key, x => x.CustomerRole)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 6330a804d3..d06df10a98 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -4,9 +4,7 @@ using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; -using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; -using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; using SmartStore.Services.Common; using SmartStore.Services.Customers; @@ -180,47 +178,37 @@ public IHttpActionResult DeleteAddresses(int key, int relatedKey = 0 /*addressId [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult

GetBillingAddress(int key) + public IHttpActionResult GetBillingAddress(int key) { - return GetRelatedEntity(key, x => x.BillingAddress); + return Ok(GetRelatedEntity(key, x => x.BillingAddress)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult
GetShippingAddress(int key) + public IHttpActionResult GetShippingAddress(int key) { - return GetRelatedEntity(key, x => x.ShippingAddress); + return Ok(GetRelatedEntity(key, x => x.ShippingAddress)); } - //public Language GetLanguage(int key) - //{ - // return GetExpandedProperty(key, x => x.Language); - //} - - //public Currency GetCurrency(int key) - //{ - // return GetExpandedProperty(key, x => x.Currency); - //} - [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public IQueryable GetOrders(int key) + public IHttpActionResult GetOrders(int key) { - return GetRelatedCollection(key, x => x.Orders); + return Ok(GetRelatedCollection(key, x => x.Orders)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] - public IQueryable GetReturnRequests(int key) + public IHttpActionResult GetReturnRequests(int key) { - return GetRelatedCollection(key, x => x.ReturnRequests); + return Ok(GetRelatedCollection(key, x => x.ReturnRequests)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] - public IQueryable GetCustomerRoleMappings(int key) + public IHttpActionResult GetCustomerRoleMappings(int key) { - return GetRelatedCollection(key, x => x.CustomerRoleMappings); + return Ok(GetRelatedCollection(key, x => x.CustomerRoleMappings)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs index 0dd9f41f99..2c3a15dc96 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs @@ -1,8 +1,6 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; -using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Security; using SmartStore.Services.Discounts; @@ -66,23 +64,23 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] - public IQueryable GetAppliedToCategories(int key) + public IHttpActionResult GetAppliedToCategories(int key) { - return GetRelatedCollection(key, x => x.AppliedToCategories); + return Ok(GetRelatedCollection(key, x => x.AppliedToCategories)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] - public IQueryable GetAppliedToManufacturers(int key) + public IHttpActionResult GetAppliedToManufacturers(int key) { - return GetRelatedCollection(key, x => x.AppliedToManufacturers); + return Ok(GetRelatedCollection(key, x => x.AppliedToManufacturers)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetAppliedToProducts(int key) + public IHttpActionResult GetAppliedToProducts(int key) { - return GetRelatedCollection(key, x => x.AppliedToProducts); + return Ok(GetRelatedCollection(key, x => x.AppliedToProducts)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index 74191fbe8a..1995360dc3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -56,9 +56,9 @@ public async Task Delete(int key) #region Navigation properties [WebApiQueryable] - public SingleResult GetLanguage(int key) + public IHttpActionResult GetLanguage(int key) { - return GetRelatedEntity(key, x => x.Language); + return Ok(GetRelatedEntity(key, x => x.Language)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs index cd37c345e1..2f60526fe2 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs @@ -4,7 +4,6 @@ using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; -using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Security; using SmartStore.Services.Catalog; using SmartStore.Services.Seo; @@ -112,9 +111,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] - public IQueryable GetAppliedDiscounts(int key) + public IHttpActionResult GetAppliedDiscounts(int key) { - return GetRelatedCollection(key, x => x.AppliedDiscounts); + return Ok(GetRelatedCollection(key, x => x.AppliedDiscounts)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index be90a29d4d..7cffcc6c15 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -2,7 +2,6 @@ using System.Net; using System.Threading.Tasks; using System.Web.Http; -using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; using SmartStore.Services.Orders; @@ -75,16 +74,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult GetOrder(int key) + public IHttpActionResult GetOrder(int key) { - return GetRelatedEntity(key, x => x.Order); + return Ok(GetRelatedEntity(key, x => x.Order)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProduct(int key) + public IHttpActionResult GetProduct(int key) { - return GetRelatedEntity(key, x => x.Product); + return Ok(GetRelatedEntity(key, x => x.Product)); } #endregion @@ -100,7 +99,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public OrderItemInfo Infos(int key) + public IHttpActionResult Infos(int key) { var result = new OrderItemInfo(); var entity = GetEntityByKeyNotNull(key); @@ -115,7 +114,7 @@ public OrderItemInfo Infos(int key) result.NotDeliveredItemsCount = entity.GetNotDeliveredItemsCount(); }); - return result; + return Ok(result); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index f48236c269..de1a9c67a6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -85,9 +85,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult GetOrder(int key) + public IHttpActionResult GetOrder(int key) { - return GetRelatedEntity(key, x => x.Order); + return Ok(GetRelatedEntity(key, x => x.Order)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index ed8c34ca8b..d9ec9e4b65 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -4,11 +4,8 @@ using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; -using SmartStore.Core.Domain.Common; -using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Payments; -using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; using SmartStore.Services.Orders; using SmartStore.Web.Framework.WebApi; @@ -95,45 +92,44 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult GetCustomer(int key) + public IHttpActionResult GetCustomer(int key) { - return GetRelatedEntity(key, x => x.Customer); + return Ok(GetRelatedEntity(key, x => x.Customer)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult
GetBillingAddress(int key) + public IHttpActionResult GetBillingAddress(int key) { - return GetRelatedEntity(key, x => x.BillingAddress); + return Ok(GetRelatedEntity(key, x => x.BillingAddress)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public SingleResult
GetShippingAddress(int key) + public IHttpActionResult GetShippingAddress(int key) { - return GetRelatedEntity(key, x => x.ShippingAddress); + return Ok(GetRelatedEntity(key, x => x.ShippingAddress)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public IQueryable GetOrderNotes(int key) + public IHttpActionResult GetOrderNotes(int key) { - //var entity = GetEntityByKeyNotNull(key); // if ProxyCreationEnabled = true - return GetRelatedCollection(key, x => x.OrderNotes); + return Ok(GetRelatedCollection(key, x => x.OrderNotes)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public IQueryable GetShipments(int key) + public IHttpActionResult GetShipments(int key) { - return GetRelatedCollection(key, x => x.Shipments); + return Ok(GetRelatedCollection(key, x => x.Shipments)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public IQueryable GetOrderItems(int key) + public IHttpActionResult GetOrderItems(int key) { - return GetRelatedCollection(key, x => x.OrderItems); + return Ok(GetRelatedCollection(key, x => x.OrderItems)); } #endregion @@ -181,7 +177,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Read)] - public OrderInfo Infos(int key) + public IHttpActionResult Infos(int key) { var result = new OrderInfo(); var entity = GetEntityByKeyNotNull(key); @@ -193,7 +189,7 @@ public OrderInfo Infos(int key) result.CanAddItemsToShipment = entity.CanAddItemsToShipment(); }); - return result; + return Ok(result); } [HttpPost] @@ -217,10 +213,9 @@ public IHttpActionResult Pdf(int key) [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Update)] - public SingleResult PaymentPending(int key) + public IHttpActionResult PaymentPending(int key) { - var result = GetSingleResult(key); - var order = GetExpandedEntity(key, result, null); + var order = GetEntityByKeyNotNull(key); this.ProcessEntity(() => { @@ -228,15 +223,14 @@ public SingleResult PaymentPending(int key) Service.UpdateOrder(order); }); - return result; + return Ok(order); } [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Update)] - public SingleResult PaymentPaid(int key, ODataActionParameters parameters) + public IHttpActionResult PaymentPaid(int key, ODataActionParameters parameters) { - var result = GetSingleResult(key); - var order = GetExpandedEntity(key, result, null); + var order = GetEntityByKeyNotNull(key); this.ProcessEntity(() => { @@ -251,15 +245,14 @@ public SingleResult PaymentPaid(int key, ODataActionParameters parameters _orderProcessingService.Value.MarkOrderAsPaid(order); }); - return result; + return Ok(order); } [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Update)] - public SingleResult PaymentRefund(int key, ODataActionParameters parameters) + public IHttpActionResult PaymentRefund(int key, ODataActionParameters parameters) { - var result = GetSingleResult(key); - var order = GetExpandedEntity(key, result, null); + var order = GetEntityByKeyNotNull(key); this.ProcessEntity(() => { @@ -277,30 +270,28 @@ public SingleResult PaymentRefund(int key, ODataActionParameters paramete } }); - return result; + return Ok(order); } [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Update)] - public SingleResult Cancel(int key) + public IHttpActionResult Cancel(int key) { - var result = GetSingleResult(key); - var order = GetExpandedEntity(key, result, "OrderItems, OrderItems.Product"); + var order = GetEntityByKeyNotNull(key); this.ProcessEntity(() => { _orderProcessingService.Value.CancelOrder(order, true); }); - return result; + return Ok(order); } [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] - public SingleResult AddShipment(int key, ODataActionParameters parameters) + public IHttpActionResult AddShipment(int key, ODataActionParameters parameters) { - var result = GetSingleResult(key); - var order = GetExpandedEntity(key, result, "OrderItems, OrderItems.Product, Shipments, Shipments.ShipmentItems"); + var order = GetEntityByKeyNotNull(key); this.ProcessEntity(() => { @@ -320,22 +311,21 @@ public SingleResult AddShipment(int key, ODataActionParameters parameters } }); - return result; + return Ok(order); } [HttpPost] [WebApiAuthenticate(Permission = Permissions.Order.Update)] - public SingleResult CompleteOrder(int key) + public IHttpActionResult CompleteOrder(int key) { - var result = GetSingleResult(key); - var order = GetExpandedEntity(key, result, "OrderItems, OrderItems.Product, Shipments, Shipments.ShipmentItems"); + var order = GetEntityByKeyNotNull(key); this.ProcessEntity(() => { _orderProcessingService.Value.CompleteOrder(order); }); - return result; + return Ok(order); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs index 2d8c839449..c3f9225ed2 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs @@ -64,9 +64,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public SingleResult GetProductAttributeOptionsSet(int key) + public IHttpActionResult GetProductAttributeOptionsSet(int key) { - return GetRelatedEntity(key, x => x.ProductAttributeOptionsSet); + return Ok(GetRelatedEntity(key, x => x.ProductAttributeOptionsSet)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs index 16858d8ef4..67628e360f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -65,16 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public SingleResult GetProductAttribute(int key) + public IHttpActionResult GetProductAttribute(int key) { - return GetRelatedEntity(key, x => x.ProductAttribute); + return Ok(GetRelatedEntity(key, x => x.ProductAttribute)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public IQueryable GetProductAttributeOptions(int key) + public IHttpActionResult GetProductAttributeOptions(int key) { - return GetRelatedCollection(key, x => x.ProductAttributeOptions); + return Ok(GetRelatedCollection(key, x => x.ProductAttributeOptions)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs index b443fa3138..1ea647c14f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -65,9 +64,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] - public IQueryable GetProductAttributeOptionsSets(int key) + public IHttpActionResult GetProductAttributeOptionsSets(int key) { - return GetRelatedCollection(key, x => x.ProductAttributeOptionsSets); + return Ok(GetRelatedCollection(key, x => x.ProductAttributeOptionsSets)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs index a8464db545..548d4bee90 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs @@ -64,16 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProduct(int key) + public IHttpActionResult GetProduct(int key) { - return GetRelatedEntity(key, x => x.Product); + return Ok(GetRelatedEntity(key, x => x.Product)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetBundleProduct(int key) + public IHttpActionResult GetBundleProduct(int key) { - return GetRelatedEntity(key, x => x.BundleProduct); + return Ok(GetRelatedEntity(key, x => x.BundleProduct)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs index 9d9e9a3d80..dcf737bd8f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs @@ -64,16 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] - public SingleResult GetCategory(int key) + public IHttpActionResult GetCategory(int key) { - return GetRelatedEntity(key, x => x.Category); + return Ok(GetRelatedEntity(key, x => x.Category)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProduct(int key) + public IHttpActionResult GetProduct(int key) { - return GetRelatedEntity(key, x => x.Product); + return Ok(GetRelatedEntity(key, x => x.Product)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs index a9b29021b4..fd50b57809 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs @@ -64,16 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] - public SingleResult GetManufacturer(int key) + public IHttpActionResult GetManufacturer(int key) { - return GetRelatedEntity(key, x => x.Manufacturer); + return Ok(GetRelatedEntity(key, x => x.Manufacturer)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProduct(int key) + public IHttpActionResult GetProduct(int key) { - return GetRelatedEntity(key, x => x.Product); + return Ok(GetRelatedEntity(key, x => x.Product)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs index 8cec6bb7f5..5884968d11 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs @@ -2,7 +2,6 @@ using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; -using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; using SmartStore.Services.Catalog; using SmartStore.Web.Framework.WebApi; @@ -65,16 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetPicture(int key) + public IHttpActionResult GetPicture(int key) { - return GetRelatedEntity(key, x => x.MediaFile); + return Ok(GetRelatedEntity(key, x => x.MediaFile)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProduct(int key) + public IHttpActionResult GetProduct(int key) { - return GetRelatedEntity(key, x => x.Product); + return Ok(GetRelatedEntity(key, x => x.Product)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs index 64824d65e6..878c567c6a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs @@ -64,9 +64,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetSpecificationAttributeOption(int key) + public IHttpActionResult GetSpecificationAttributeOption(int key) { - return GetRelatedEntity(key, x => x.SpecificationAttributeOption); + return Ok(GetRelatedEntity(key, x => x.SpecificationAttributeOption)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs index 6b8182e1d2..1b3396cd98 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs @@ -2,7 +2,6 @@ using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; -using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Catalog; using SmartStore.Web.Framework.WebApi; @@ -65,9 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] - public SingleResult GetDeliveryTime(int key) + public IHttpActionResult GetDeliveryTime(int key) { - return GetRelatedEntity(key, x => x.DeliveryTime); + return Ok(GetRelatedEntity(key, x => x.DeliveryTime)); + } + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] + public IHttpActionResult GetQuantityUnit(int key) + { + return Ok(GetRelatedEntity(key, x => x.QuantityUnit)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs index e15019fce9..dd62875c82 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs @@ -64,9 +64,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProductVariantAttribute(int key) + public IHttpActionResult GetProductVariantAttribute(int key) { - return GetRelatedEntity(key, x => x.ProductVariantAttribute); + return Ok(GetRelatedEntity(key, x => x.ProductVariantAttribute)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs index 8dc7348744..8a2ea2dd1d 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -65,16 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetProductAttribute(int key) + public IHttpActionResult GetProductAttribute(int key) { - return GetRelatedEntity(key, x => x.ProductAttribute); + return Ok(GetRelatedEntity(key, x => x.ProductAttribute)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductVariantAttributeValues(int key) + public IHttpActionResult GetProductVariantAttributeValues(int key) { - return GetRelatedCollection(key, x => x.ProductVariantAttributeValues); + return Ok(GetRelatedCollection(key, x => x.ProductVariantAttributeValues)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 57c58346d8..145f0f8dff 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -7,9 +7,6 @@ using System.Web.Http.ModelBinding; using System.Web.OData; using SmartStore.Core.Domain.Catalog; -using SmartStore.Core.Domain.Directory; -using SmartStore.Core.Domain.Discounts; -using SmartStore.Core.Domain.Media; using SmartStore.Core.Search; using SmartStore.Core.Security; using SmartStore.Services.Catalog; @@ -141,30 +138,30 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] - public SingleResult GetDeliveryTime(int key) + public IHttpActionResult GetDeliveryTime(int key) { - return GetRelatedEntity(key, x => x.DeliveryTime); + return Ok(GetRelatedEntity(key, x => x.DeliveryTime)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] - public SingleResult GetQuantityUnit(int key) + public IHttpActionResult GetQuantityUnit(int key) { - return GetRelatedEntity(key, x => x.QuantityUnit); + return Ok(GetRelatedEntity(key, x => x.QuantityUnit)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public SingleResult GetCountryOfOrigin(int key) + public IHttpActionResult GetCountryOfOrigin(int key) { - return GetRelatedEntity(key, x => x.CountryOfOrigin); + return Ok(GetRelatedEntity(key, x => x.CountryOfOrigin)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] - public SingleResult GetSampleDownload(int key) + public IHttpActionResult GetSampleDownload(int key) { - return GetRelatedEntity(key, x => x.SampleDownload); + return Ok(GetRelatedEntity(key, x => x.SampleDownload)); } @@ -344,51 +341,51 @@ public IHttpActionResult DeleteProductPictures(int key, int relatedKey = 0 /*med [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductSpecificationAttributes(int key) + public IHttpActionResult GetProductSpecificationAttributes(int key) { - return GetRelatedCollection(key, x => x.ProductSpecificationAttributes); + return Ok(GetRelatedCollection(key, x => x.ProductSpecificationAttributes)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductTags(int key) + public IHttpActionResult GetProductTags(int key) { - return GetRelatedCollection(key, x => x.ProductTags); + return Ok(GetRelatedCollection(key, x => x.ProductTags)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetTierPrices(int key) + public IHttpActionResult GetTierPrices(int key) { - return GetRelatedCollection(key, x => x.TierPrices); + return Ok(GetRelatedCollection(key, x => x.TierPrices)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetAppliedDiscounts(int key) + public IHttpActionResult GetAppliedDiscounts(int key) { - return GetRelatedCollection(key, x => x.AppliedDiscounts); + return Ok(GetRelatedCollection(key, x => x.AppliedDiscounts)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductVariantAttributes(int key) + public IHttpActionResult GetProductVariantAttributes(int key) { - return GetRelatedCollection(key, x => x.ProductVariantAttributes); + return Ok(GetRelatedCollection(key, x => x.ProductVariantAttributes)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductVariantAttributeCombinations(int key) + public IHttpActionResult GetProductVariantAttributeCombinations(int key) { - return GetRelatedCollection(key, x => x.ProductVariantAttributeCombinations); + return Ok(GetRelatedCollection(key, x => x.ProductVariantAttributeCombinations)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductBundleItems(int key) + public IHttpActionResult GetProductBundleItems(int key) { - return GetRelatedCollection(key, x => x.ProductBundleItems); + return Ok(GetRelatedCollection(key, x => x.ProductBundleItems)); } #endregion @@ -424,7 +421,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) [HttpPost, WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable Search([ModelBinder(typeof(WebApiCatalogSearchQueryModelBinder))] CatalogSearchQuery query) + public IHttpActionResult Search([ModelBinder(typeof(WebApiCatalogSearchQueryModelBinder))] CatalogSearchQuery query) { CatalogSearchResult result = null; @@ -438,7 +435,7 @@ public IQueryable Search([ModelBinder(typeof(WebApiCatalogSearchQueryMo result = _catalogSearchService.Value.Search(query); }); - return result.Hits.AsQueryable(); + return Ok(result.Hits.AsQueryable()); } private decimal? CalculatePrice(int key, bool lowestPrice) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs index ee24ce2a60..8c29885622 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs @@ -1,7 +1,6 @@ using System.Net; using System.Threading.Tasks; using System.Web.Http; -using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; using SmartStore.Services.Orders; @@ -62,9 +61,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] - public SingleResult GetCustomer(int key) + public IHttpActionResult GetCustomer(int key) { - return GetRelatedEntity(key, x => x.Customer); + return Ok(GetRelatedEntity(key, x => x.Customer)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs index 0f8bbaa5fb..a4c3a845f5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs @@ -59,5 +59,17 @@ public async Task Delete(int key) var result = await DeleteAsync(key, entity => Service.DeleteShipmentItem(entity)); return result; } + + #region Navigation properties + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public IHttpActionResult GetShipment(int key) + { + return Ok(GetRelatedEntity(key, x => x.Shipment)); + } + + #endregion + } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs index af99894339..63c45a1a58 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs @@ -59,5 +59,16 @@ public async Task Delete(int key) var result = await DeleteAsync(key, entity => Service.DeleteShipment(entity)); return result; } + + #region Navigation properties + + [WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Order.Read)] + public IHttpActionResult GetShipmentItems(int key) + { + return Ok(GetRelatedCollection(key, x => x.ShipmentItems)); + } + + #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs index c8afcb7899..5589359d3c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -65,16 +64,16 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] - public SingleResult GetSpecificationAttribute(int key) + public IHttpActionResult GetSpecificationAttribute(int key) { - return GetRelatedEntity(key, x => x.SpecificationAttribute); + return Ok(GetRelatedEntity(key, x => x.SpecificationAttribute)); } [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public IQueryable GetProductSpecificationAttributes(int key) + public IHttpActionResult GetProductSpecificationAttributes(int key) { - return GetRelatedCollection(key, x => x.ProductSpecificationAttributes); + return Ok(GetRelatedCollection(key, x => x.ProductSpecificationAttributes)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs index 32dd211d43..6659f141da 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -65,9 +64,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] - public IQueryable GetSpecificationAttributeOptions(int key) + public IHttpActionResult GetSpecificationAttributeOptions(int key) { - return GetRelatedCollection(key, x => x.SpecificationAttributeOptions); + return Ok(GetRelatedCollection(key, x => x.SpecificationAttributeOptions)); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs index c059e884ee..b286231498 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs @@ -64,9 +64,9 @@ public async Task Delete(int key) [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] - public SingleResult GetCountry(int key) + public IHttpActionResult GetCountry(int key) { - return GetRelatedEntity(key, x => x.Country); + return Ok(GetRelatedEntity(key, x => x.Country)); } #endregion diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 22f93c01ee..2dc59acab0 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -68,7 +68,7 @@ protected internal virtual TEntity GetEntityByKeyNotNull(int key) throw this.InvalidModelStateException(); } - var entity = Repository.GetById(key); + var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); if (entity == null) { throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); @@ -180,11 +180,12 @@ protected internal virtual IQueryable GetRelatedCollection Date: Tue, 18 Aug 2020 20:51:45 +0200 Subject: [PATCH 053/695] shopping cart > renamed order processing 'order total validation' methods and variables --- .../Orders/IOrderProcessingService.cs | 6 +- .../Orders/OrderProcessingService.cs | 86 +++++++++---------- .../Controllers/CheckoutController.cs | 24 +++--- .../Controllers/ShoppingCartController.cs | 52 +++++------ .../Models/ShoppingCart/ShoppingCartModel.cs | 2 +- .../ShoppingCart/Partials/OrderSummary.cshtml | 2 +- .../Partials/_RefreshCartScript.cshtml | 2 +- 7 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs index c458fc5e11..a0e545e499 100644 --- a/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs @@ -288,7 +288,7 @@ IList GetOrderPlacementWarnings( /// /// Shopping cart /// true - OK; false - minimum order amount is not reached - (bool isValid, decimal minOrderAmount) ValidateMinOrderAmount(IList cart, int[] customerRoleIds); + (bool valid, decimal orderTotalMinimum) IsAboveMinimumOrderTotal(IList cart, int[] customerRoleIds); /// /// Valdiate maximum order amount. @@ -297,7 +297,7 @@ IList GetOrderPlacementWarnings( /// /// Shopping cart, customer role ids /// true - OK; false - maximum order amount is exceeded - (bool isValid, decimal maxOrderAmount) ValidateMaxOrderAmount(IList cart, int[] customerRoleIds); + (bool valid, decimal orderTotalMaximum) IsBelowOrderTotalMaximum(IList cart, int[] customerRoleIds); /// /// Valdiate minimum and maximum order amount. @@ -306,7 +306,7 @@ IList GetOrderPlacementWarnings( /// /// Shopping cart, customer role ids /// true - OK; false - minimum amount is not reached or maximum amount is exceeded - bool ValidateOrderAmount(IList cart, int[] customerRoleIds); + bool IsInOrderTotalsRange(IList cart, int[] customerRoleIds); /// /// Adds a shipment to an order. diff --git a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs index 0e90c84612..dc0f9411b0 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs @@ -523,34 +523,34 @@ public virtual IList GetOrderPlacementWarnings( } } - // Min amount validation + // Order total minimum validation var customerRoleIds = customer.GetRoleIds(); - var minOrderAmountValidation = ValidateMinOrderAmount(cart, customerRoleIds); - if (!minOrderAmountValidation.isValid) + var (isAboveMinOrderTotal, orderTotalMinimum) = IsAboveMinimumOrderTotal(cart, customerRoleIds); + if (!isAboveMinOrderTotal) { - var minOrderAmount = _currencyService.ConvertFromPrimaryStoreCurrency( - minOrderAmountValidation.minOrderAmount, + orderTotalMinimum = _currencyService.ConvertFromPrimaryStoreCurrency( + orderTotalMinimum, _workContext.WorkingCurrency); var msg = _orderSettings.ApplyToSubtotal - ? T("Checkout.MinOrderSubtotalAmount", _priceFormatter.FormatPrice(minOrderAmount, true, false)) - : T("Checkout.MinOrderTotalAmount", _priceFormatter.FormatPrice(minOrderAmount, true, false)); + ? T("Checkout.MinOrderSubtotalAmount", _priceFormatter.FormatPrice(orderTotalMinimum, true, false)) + : T("Checkout.MinOrderTotalAmount", _priceFormatter.FormatPrice(orderTotalMinimum, true, false)); warnings.Add(msg); return warnings; } - // Max amount validation - var maxOrderAmountValidation = ValidateMaxOrderAmount(cart, customerRoleIds); - if (minOrderAmountValidation.isValid && !maxOrderAmountValidation.isValid) + // Order total maximum validation + var (isBelowMaxOrderTotal, orderTotalMaximum) = IsBelowOrderTotalMaximum(cart, customerRoleIds); + if (isAboveMinOrderTotal && !isBelowMaxOrderTotal) { - var maxOrderAmount = _currencyService.ConvertFromPrimaryStoreCurrency( - maxOrderAmountValidation.maxOrderAmount, + orderTotalMaximum = _currencyService.ConvertFromPrimaryStoreCurrency( + orderTotalMaximum, _workContext.WorkingCurrency); var msg = _orderSettings.ApplyToSubtotal - ? T("Checkout.MaxOrderSubtotalAmount", _priceFormatter.FormatPrice(maxOrderAmount, true, false)) - : T("Checkout.MaxOrderTotalAmount", _priceFormatter.FormatPrice(maxOrderAmount, true, false)); + ? T("Checkout.MaxOrderSubtotalAmount", _priceFormatter.FormatPrice(orderTotalMaximum, true, false)) + : T("Checkout.MaxOrderTotalAmount", _priceFormatter.FormatPrice(orderTotalMaximum, true, false)); warnings.Add(msg); return warnings; @@ -2646,7 +2646,7 @@ public virtual bool IsReturnRequestAllowed(Order order) return numberOfDaysReturnRequestAvailableValid; } - public virtual (bool isValid, decimal minOrderAmount) ValidateMinOrderAmount(IList cart, int[] customerRoleIds) + public virtual (bool valid, decimal orderTotalMinimum) IsAboveMinimumOrderTotal(IList cart, int[] customerRoleIds) { var query = _customerService.GetAllCustomerRoles().SourceQuery; var customerRole = query @@ -2654,44 +2654,44 @@ public virtual (bool isValid, decimal minOrderAmount) ValidateMinOrderAmount(ILi .OrderByDescending(x => x.MinOrderAmount) .FirstOrDefault(); - var minOrderAmount = customerRole == null + var minimumOrderTotal = customerRole == null ? _orderSettings.MinOrderAmount : customerRole.MinOrderAmount; - return ValidateMinOrderAmount(cart, minOrderAmount); + return IsAboveOrderAmountMinimum(cart, minimumOrderTotal); } /// - /// Valdiate minimum order amount. + /// Valdiate order total minimum. /// - /// Shopping cart, minimum order amount - /// true - OK; false - minimum order amount is not reached - private (bool isValid, decimal minOrderAmount) ValidateMinOrderAmount(IList cart, decimal minOrderAmount) + /// Shopping cart, minimum order total + /// true - OK; false - minimum order total is not reached + private (bool valid, decimal orderTotalMinimum) IsAboveOrderAmountMinimum(IList cart, decimal minimumOrderTotal) { if (cart == null) throw new ArgumentNullException("cart"); - if (cart.Count > 0 && minOrderAmount > decimal.Zero) + if (cart.Count > 0 && minimumOrderTotal > decimal.Zero) { if (_orderSettings.ApplyToSubtotal) { _orderTotalCalculationService.GetShoppingCartSubTotal( cart, out _, out _, out var cartSubtotal, out _); - if (cartSubtotal < minOrderAmount) - return (false, minOrderAmount); + if (cartSubtotal < minimumOrderTotal) + return (false, minimumOrderTotal); } else { decimal? cartTotal = _orderTotalCalculationService.GetShoppingCartTotal(cart); - if (cartTotal.HasValue && cartTotal.Value < minOrderAmount) - return (false, minOrderAmount); + if (cartTotal.HasValue && cartTotal.Value < minimumOrderTotal) + return (false, minimumOrderTotal); } } - return (true, minOrderAmount); + return (true, minimumOrderTotal); } - public virtual (bool isValid, decimal maxOrderAmount) ValidateMaxOrderAmount(IList cart, int[] customerRoleIds) + public virtual (bool valid, decimal orderTotalMaximum) IsBelowOrderTotalMaximum(IList cart, int[] customerRoleIds) { var query = _customerService.GetAllCustomerRoles().SourceQuery; var customerRole = query @@ -2699,47 +2699,47 @@ public virtual (bool isValid, decimal maxOrderAmount) ValidateMaxOrderAmount(ILi .OrderBy(x => x.MaxOrderAmount) .FirstOrDefault(); - var maxOrderAmount = customerRole == null + var maximumOrderTotal = customerRole == null ? _orderSettings.MaxOrderAmount : customerRole.MaxOrderAmount; - return ValidateMaxOrderAmount(cart, maxOrderAmount); + return IsBelowOrderTotalMaximum(cart, maximumOrderTotal); } /// - /// Valdiate maximum order amount. + /// Valdiate order total maximum. /// - /// Shopping cart, maximum order amount - /// true - OK; false - maximum order amount is exceeded - private (bool isValid, decimal maxOrderAmount) ValidateMaxOrderAmount(IList cart, decimal maxOrderAmount) + /// Shopping cart, maximum order total + /// true - OK; false - maximum order total is exceeded + private (bool valid, decimal orderTotalMaximum) IsBelowOrderTotalMaximum(IList cart, decimal maximumOrderTotal) { if (cart == null) throw new ArgumentNullException("cart"); - if (cart.Count > 0 && maxOrderAmount > decimal.Zero) + if (cart.Count > 0 && maximumOrderTotal > decimal.Zero) { if (_orderSettings.ApplyToSubtotal) { _orderTotalCalculationService.GetShoppingCartSubTotal( cart, out _, out _, out var cartSubtotal, out _); - if (cartSubtotal > maxOrderAmount) - return (false, maxOrderAmount); + if (cartSubtotal > maximumOrderTotal) + return (false, maximumOrderTotal); } else { decimal? cartTotal = _orderTotalCalculationService.GetShoppingCartTotal(cart); - if (cartTotal.HasValue && cartTotal.Value > maxOrderAmount) - return (false, maxOrderAmount); + if (cartTotal.HasValue && cartTotal.Value > maximumOrderTotal) + return (false, maximumOrderTotal); } } - return (true, maxOrderAmount); + return (true, maximumOrderTotal); } - public virtual bool ValidateOrderAmount(IList cart, int[] customerRoleIds) + public virtual bool IsInOrderTotalsRange(IList cart, int[] customerRoleIds) { - return ValidateMinOrderAmount(cart, customerRoleIds).isValid - && ValidateMaxOrderAmount(cart, customerRoleIds).isValid; + return IsAboveMinimumOrderTotal(cart, customerRoleIds).valid + && IsBelowOrderTotalMaximum(cart, customerRoleIds).valid; } public virtual Shipment AddShipment( diff --git a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs index f2aaaaab59..937c8ad1d1 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs @@ -353,33 +353,33 @@ protected CheckoutConfirmModel PrepareConfirmOrderModel(IList x.IsRequired).Count() == 0 && orderAmountIsValid; + var isInOrderTotalsRange = _orderProcessingService.IsInOrderTotalsRange(cart, _workContext.CurrentCustomer.GetRoleIds()); + model.DisplayCheckoutButton = checkoutAttributes.Where(x => x.IsRequired).Count() == 0 && isInOrderTotalsRange; // Products. sort descending (recently added products) cart = cart.ToList(); // TBD: (mc) Why? @@ -1658,7 +1658,7 @@ public ActionResult DeleteCartItem(int cartItemId, bool? wishlistItem) if (!_permissionService.Authorize(isWishlistItem ? Permissions.Cart.AccessWishlist : Permissions.Cart.AccessShoppingCart)) { - return Json(new { success = false, showCheckoutButtons = true }); + return Json(new { success = false, displayCheckoutButtons = true }); } // Get shopping cart item. @@ -1667,7 +1667,7 @@ public ActionResult DeleteCartItem(int cartItemId, bool? wishlistItem) if (item == null) { - return Json(new { success = false, showCheckoutButtons = true, message = _localizationService.GetResource("ShoppingCart.DeleteCartItem.Failed") }); + return Json(new { success = false, displayCheckoutButtons = true, message = _localizationService.GetResource("ShoppingCart.DeleteCartItem.Failed") }); } // Remove the cart item. @@ -1679,7 +1679,7 @@ public ActionResult DeleteCartItem(int cartItemId, bool? wishlistItem) var cartHtml = String.Empty; var totalsHtml = String.Empty; var cartItemCount = 0; - var showCheckoutButtons = true; + var displayCheckoutButtons = true; if (cartType == ShoppingCartType.Wishlist) { @@ -1695,7 +1695,7 @@ public ActionResult DeleteCartItem(int cartItemId, bool? wishlistItem) cartHtml = this.RenderPartialViewToString("CartItems", model); totalsHtml = this.InvokeAction("OrderTotals", routeValues: new RouteValueDictionary(new { isEditable = true })).ToString(); cartItemCount = cart.Count; - showCheckoutButtons = model.IsValidOrderAmount; + displayCheckoutButtons = model.IsInOrderTotalsRange; } // Updated cart. @@ -1706,7 +1706,7 @@ public ActionResult DeleteCartItem(int cartItemId, bool? wishlistItem) message = _localizationService.GetResource("ShoppingCart.DeleteCartItem.Success"), cartHtml = cartHtml, totalsHtml = totalsHtml, - showCheckoutButtons = showCheckoutButtons + displayCheckoutButtons = displayCheckoutButtons }); } @@ -2095,30 +2095,30 @@ public ActionResult OrderTotals(bool isEditable) model.ShowConfirmOrderLegalHint = _shoppingCartSettings.ShowConfirmOrderLegalHint; var customerRoleIds = customer.GetRoleIds(); - var minOrderAmountValidation = _orderProcessingService.ValidateMinOrderAmount(cart, customerRoleIds); - if (!minOrderAmountValidation.isValid) + var (isAboveMinimumOrderTotal, orderTotalMinimum) = _orderProcessingService.IsAboveMinimumOrderTotal(cart, customerRoleIds); + if (!isAboveMinimumOrderTotal) { - var minOrderAmount = _currencyService.ConvertFromPrimaryStoreCurrency( - minOrderAmountValidation.minOrderAmount, + orderTotalMinimum = _currencyService.ConvertFromPrimaryStoreCurrency( + orderTotalMinimum, currency); var resource = _orderSettings.ApplyToSubtotal ? "Checkout.MinOrderSubtotalAmount" : "Checkout.MinOrderTotalAmount"; model.OrderAmountWarning = string.Format( _localizationService.GetResource(resource), - _priceFormatter.FormatPrice(minOrderAmount, true, false)); + _priceFormatter.FormatPrice(orderTotalMinimum, true, false)); } - var maxOrderAmountValidation = _orderProcessingService.ValidateMaxOrderAmount(cart, customerRoleIds); - if (minOrderAmountValidation.isValid && !maxOrderAmountValidation.isValid) + var (isBelowOrderTotalMaximum, orderTotalMaximum) = _orderProcessingService.IsBelowOrderTotalMaximum(cart, customerRoleIds); + if (isAboveMinimumOrderTotal && !isBelowOrderTotalMaximum) { - var maxOrderAmount = _currencyService.ConvertFromPrimaryStoreCurrency( - maxOrderAmountValidation.maxOrderAmount, + orderTotalMaximum = _currencyService.ConvertFromPrimaryStoreCurrency( + orderTotalMaximum, currency); var resource = _orderSettings.ApplyToSubtotal ? "Checkout.MaxOrderSubtotalAmount" : "Checkout.MaxOrderTotalAmount"; model.OrderAmountWarning = string.Format( _localizationService.GetResource(resource), - _priceFormatter.FormatPrice(maxOrderAmount, true, false)); + _priceFormatter.FormatPrice(orderTotalMaximum, true, false)); } // Cart total @@ -2203,7 +2203,7 @@ public ActionResult RemoveDiscountCoupon() success = true, totalsHtml, discountHtml, - showCheckoutButtons = model.IsValidOrderAmount + displayCheckoutButtons = model.IsInOrderTotalsRange }); } @@ -2229,7 +2229,7 @@ public ActionResult RemoveGiftCardCode(int giftCardId) { success = true, totalsHtml, - showCheckoutButtons = model.IsValidOrderAmount + displayCheckoutButtons = model.IsInOrderTotalsRange }); } @@ -2309,7 +2309,7 @@ public ActionResult UpdateCartItem(int sciItemId, int newQuantity, bool isCartPa var cartHtml = string.Empty; var totalsHtml = string.Empty; - var showCheckoutButtons = true; + var displayCheckoutButtons = true; if (isCartPage) { @@ -2327,7 +2327,7 @@ public ActionResult UpdateCartItem(int sciItemId, int newQuantity, bool isCartPa PrepareShoppingCartModel(model, cart); cartHtml = this.RenderPartialViewToString("CartItems", model); totalsHtml = this.InvokeAction("OrderTotals", routeValues: new RouteValueDictionary(new { isEditable = true })).ToString(); - showCheckoutButtons = model.IsValidOrderAmount; + displayCheckoutButtons = model.IsInOrderTotalsRange; } } @@ -2338,7 +2338,7 @@ public ActionResult UpdateCartItem(int sciItemId, int newQuantity, bool isCartPa message = warnings, cartHtml, totalsHtml, - showCheckoutButtons + displayCheckoutButtons }); } @@ -2484,7 +2484,7 @@ public ActionResult MoveItemBetweenCartAndWishlistAjax(int cartItemId, ShoppingC }); } - var showCheckoutButtons = true; + var displayCheckoutButtons = true; var customer = _workContext.CurrentCustomer; var storeId = _storeContext.CurrentStore.Id; var cart = customer.GetCartItems(cartType, storeId); @@ -2540,7 +2540,7 @@ public ActionResult MoveItemBetweenCartAndWishlistAjax(int cartItemId, ShoppingC totalsHtml = this.InvokeAction("OrderTotals", routeValues: new RouteValueDictionary(new { isEditable = true })).ToString(); message = T("Products.ProductHasBeenAddedToTheWishlist"); cartItemCount = cart.Count; - showCheckoutButtons = model.IsValidOrderAmount; + displayCheckoutButtons = model.IsInOrderTotalsRange; } } @@ -2552,7 +2552,7 @@ public ActionResult MoveItemBetweenCartAndWishlistAjax(int cartItemId, ShoppingC cartHtml, totalsHtml, cartItemCount, - showCheckoutButtons + displayCheckoutButtons }); } } diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs index a78c516c7e..44bdea536b 100644 --- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs +++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs @@ -39,7 +39,7 @@ public ShoppingCartModel() public IList CheckoutAttributes { get; set; } public IList Warnings { get; set; } - public bool IsValidOrderAmount { get; set; } + public bool IsInOrderTotalsRange { get; set; } public bool TermsOfServiceEnabled { get; set; } public EstimateShippingModel EstimateShipping { get; set; } public DiscountBoxModel DiscountBox { get; set; } diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/Partials/OrderSummary.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/Partials/OrderSummary.cshtml index 2413eee28a..3c451c5a0d 100644 --- a/src/Presentation/SmartStore.Web/Views/ShoppingCart/Partials/OrderSummary.cshtml +++ b/src/Presentation/SmartStore.Web/Views/ShoppingCart/Partials/OrderSummary.cshtml @@ -106,7 +106,7 @@
-
+
-
- - +
+ + + @T("ShoppingCart.Mini.ViewCart") + +
+ -
+
@T("Checkout.Button") From d1098582d0389b17799519d797f207d083815f7e Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 18 Aug 2020 21:14:56 +0200 Subject: [PATCH 055/695] API: IHttpActionResult refactoring (final) --- .../Controllers/OData/AddressesController.cs | 2 +- .../OData/BlogCommentsController.cs | 2 +- .../Controllers/OData/BlogPostsController.cs | 2 +- .../Controllers/OData/CategoriesController.cs | 2 +- .../Controllers/OData/CountriesController.cs | 2 +- .../Controllers/OData/CurrenciesController.cs | 2 +- .../OData/CustomerRoleMappingsController.cs | 2 +- .../OData/CustomerRolesController.cs | 2 +- .../Controllers/OData/CustomersController.cs | 2 +- .../OData/DeliveryTimesController.cs | 2 +- .../Controllers/OData/DiscountsController.cs | 2 +- .../Controllers/OData/DownloadsController.cs | 2 +- .../OData/GenericAttributesController.cs | 2 +- .../Controllers/OData/LanguagesController.cs | 2 +- .../OData/LocalizedPropertiesController.cs | 2 +- .../OData/ManufacturersController.cs | 2 +- .../OData/MeasureDimensionsController.cs | 2 +- .../OData/MeasureWeightsController.cs | 2 +- .../Controllers/OData/MediaController.cs | 36 ++++---- .../NewsLetterSubscriptionsController.cs | 4 +- .../Controllers/OData/OrderItemsController.cs | 4 +- .../Controllers/OData/OrderNotesController.cs | 2 +- .../Controllers/OData/OrdersController.cs | 21 ++--- .../OData/PaymentMethodsController.cs | 2 +- .../ProductAttributeOptionsController.cs | 2 +- .../ProductAttributeOptionsSetsController.cs | 2 +- .../OData/ProductAttributesController.cs | 2 +- .../OData/ProductBundleItemsController.cs | 2 +- .../OData/ProductCategoriesController.cs | 2 +- .../OData/ProductManufacturersController.cs | 2 +- .../OData/ProductPicturesController.cs | 2 +- ...roductSpecificationAttributesController.cs | 2 +- ...tVariantAttributeCombinationsController.cs | 2 +- ...ProductVariantAttributeValuesController.cs | 2 +- .../ProductVariantAttributesController.cs | 2 +- .../Controllers/OData/ProductsController.cs | 22 +++-- .../OData/QuantityUnitsController.cs | 2 +- .../OData/RelatedProductsController.cs | 2 +- .../OData/ReturnRequestsController.cs | 2 +- .../Controllers/OData/SettingsController.cs | 2 +- .../OData/ShipmentItemsController.cs | 2 +- .../Controllers/OData/ShipmentsController.cs | 2 +- .../OData/ShippingMethodsController.cs | 2 +- ...SpecificationAttributeOptionsController.cs | 2 +- .../SpecificationAttributesController.cs | 2 +- .../OData/StateProvincesController.cs | 2 +- .../OData/StoreMappingsController.cs | 2 +- .../Controllers/OData/StoresController.cs | 2 +- .../OData/SyncMappingsController.cs | 2 +- .../OData/TaxCategoriesController.cs | 2 +- .../Controllers/OData/TierPricesController.cs | 2 +- .../Controllers/OData/UrlRecordsController.cs | 2 +- .../WebApi/WebApiEntityController.cs | 91 ++++--------------- 53 files changed, 109 insertions(+), 163 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs index 3dbec93642..570c9017e6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs @@ -40,7 +40,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Customer.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Customer.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs index f4c316b569..cc01e73261 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs @@ -48,7 +48,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs index db021d2b7b..a0128a6ccb 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs @@ -43,7 +43,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Cms.Blog.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs index c9e05e1abf..c76db12643 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs @@ -43,7 +43,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Category.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs index 7d74723304..ff7fb5673c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index 58b735a8fe..8d8021c3ce 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Currency.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs index d67711e4ef..e7116cfa82 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs index be355defca..783a56ad85 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs @@ -24,7 +24,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Customer.Role.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index d06df10a98..4ffff99a83 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -44,7 +44,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Customer.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Customer.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs index 66f4d5c205..d5056de533 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.DeliveryTime.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs index 2c3a15dc96..0d7dab016e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Promotion.Discount.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs index a1627d3bff..0b02c0e214 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Media.Download.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs index 73ff02a280..50ce8831a9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs @@ -21,7 +21,7 @@ public IHttpActionResult Get() [WebApiQueryable] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs index c751ea2c95..d454d8404f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Language.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index 1995360dc3..ac39646363 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -21,7 +21,7 @@ public IHttpActionResult Get() [WebApiQueryable] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs index 2f60526fe2..2def81a246 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs @@ -43,7 +43,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Manufacturer.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs index 4b81748d5c..60792292af 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs index 141ebc54fb..143afafde6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index cd79fe40a7..dd34fce747 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -230,7 +230,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) /// POST /Media/GetFileByPath {"Path":"content/my-file.jpg"} [HttpPost] [WebApiAuthenticate] - public FileItemInfo GetFileByPath(ODataActionParameters parameters) + public IHttpActionResult GetFileByPath(ODataActionParameters parameters) { FileItemInfo file = null; @@ -247,7 +247,7 @@ public FileItemInfo GetFileByPath(ODataActionParameters parameters) file = Convert(mediaFile); }); - return file; + return Ok(file); } // POST /Media/GetFileByName {"FolderId":2, "FileName":"my-file.jpg"} @@ -274,7 +274,7 @@ public FileItemInfo GetFileByPath(ODataActionParameters parameters) /// GET /Media/GetFilesByIds(Ids=[1,2,3]) [HttpGet, WebApiQueryable] [WebApiAuthenticate] - public IQueryable GetFilesByIds([FromODataUri] int[] ids) + public IHttpActionResult GetFilesByIds([FromODataUri] int[] ids) { IQueryable files = null; @@ -288,13 +288,13 @@ public IQueryable GetFilesByIds([FromODataUri] int[] ids) } }); - return files ?? new List().AsQueryable(); + return Ok(files ?? new List().AsQueryable()); } /// POST /Media/FileExists {"Path":"content/my-file.jpg"} [HttpPost] [WebApiAuthenticate] - public bool FileExists(ODataActionParameters parameters) + public IHttpActionResult FileExists(ODataActionParameters parameters) { var fileExists = false; @@ -304,13 +304,13 @@ public bool FileExists(ODataActionParameters parameters) fileExists = Service.FileExists(path); }); - return fileExists; + return Ok(fileExists); } /// POST /Media/CheckUniqueFileName {"Path":"content/my-file.jpg"} [HttpPost] [WebApiAuthenticate] - public CheckUniqueFileNameResult CheckUniqueFileName(ODataActionParameters parameters) + public IHttpActionResult CheckUniqueFileName(ODataActionParameters parameters) { var result = new CheckUniqueFileNameResult(); @@ -322,13 +322,13 @@ public CheckUniqueFileNameResult CheckUniqueFileName(ODataActionParameters param result.NewPath = newPath; }); - return result; + return Ok(result); } /// POST /Media/CountFiles {"Query":{"FolderId":7,"Extensions":["jpg"], ...}} [HttpPost] [WebApiAuthenticate] - public async Task CountFiles(ODataActionParameters parameters) + public async Task CountFiles(ODataActionParameters parameters) { var count = 0; @@ -338,13 +338,13 @@ await this.ProcessEntityAsync(async () => count = await Service.CountFilesAsync(query ?? new MediaSearchQuery()); }); - return count; + return Ok(count); } /// POST /Media/CountFilesGrouped {"Filter":{"Term":"my image","Extensions":["jpg"], ...}} [HttpPost] [WebApiAuthenticate] - public CountFilesGroupedResult CountFilesGrouped(ODataActionParameters parameters) + public IHttpActionResult CountFilesGrouped(ODataActionParameters parameters) { CountFilesGroupedResult result = null; @@ -372,13 +372,13 @@ public CountFilesGroupedResult CountFilesGrouped(ODataActionParameters parameter .ToList(); }); - return result; + return Ok(result); } /// POST /Media(123)/MoveFile {"DestinationFileName":"content/updated-file-name.jpg"} [HttpPost] [WebApiAuthenticate(Permission = Permissions.Media.Update)] - public FileItemInfo MoveFile(int key, ODataActionParameters parameters) + public IHttpActionResult MoveFile(int key, ODataActionParameters parameters) { FileItemInfo movedFile = null; @@ -397,13 +397,13 @@ public FileItemInfo MoveFile(int key, ODataActionParameters parameters) movedFile = Convert(result); }); - return movedFile; + return Ok(movedFile); } /// POST /Media(123)/CopyFile {"DestinationFileName":"content/new-file.jpg"} [HttpPost] [WebApiAuthenticate(Permission = Permissions.Media.Update)] - public FileItemInfo CopyFile(int key, ODataActionParameters parameters) + public IHttpActionResult CopyFile(int key, ODataActionParameters parameters) { FileItemInfo fileCopy = null; @@ -422,7 +422,7 @@ public FileItemInfo CopyFile(int key, ODataActionParameters parameters) fileCopy = Convert(result.DestinationFile); }); - return fileCopy; + return Ok(fileCopy); } /// POST /Media(123)/DeleteFile {"Permanent":false} @@ -451,7 +451,7 @@ public IHttpActionResult DeleteFile(int key, ODataActionParameters parameters) /// POST /Media/FolderExists {"Path":"my-folder"} [HttpPost] [WebApiAuthenticate] - public bool FolderExists(ODataActionParameters parameters) + public IHttpActionResult FolderExists(ODataActionParameters parameters) { var folderExists = false; @@ -461,7 +461,7 @@ public bool FolderExists(ODataActionParameters parameters) folderExists = Service.FolderExists(path); }); - return folderExists; + return Ok(folderExists); } /// POST /Media/CreateFolder {"Path":"content/my-folder"} diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs index c10b7553bf..fb6e877c4e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs @@ -23,8 +23,8 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Read)] public IHttpActionResult Get(int key) { - return Ok(key); - } + return Ok(GetByKey(key)); + } [WebApiAuthenticate(Permission = Permissions.Promotion.Newsletter.Read)] public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index 7cffcc6c15..e01711ffa9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -36,7 +36,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Order.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] @@ -102,7 +102,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) public IHttpActionResult Infos(int key) { var result = new OrderItemInfo(); - var entity = GetEntityByKeyNotNull(key); + var entity = GetByKeyNotNull(key); this.ProcessEntity(() => { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index de1a9c67a6..0c0fd79dda 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -24,7 +24,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Order.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index d9ec9e4b65..ec693946ca 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -17,7 +17,7 @@ namespace SmartStore.WebApi.Controllers.OData { - public class OrdersController : WebApiEntityController + public class OrdersController : WebApiEntityController { private readonly Lazy _orderProcessingService; private readonly Lazy _apiPdfHelper; @@ -51,7 +51,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Order.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] @@ -180,7 +180,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) public IHttpActionResult Infos(int key) { var result = new OrderInfo(); - var entity = GetEntityByKeyNotNull(key); + var entity = GetByKeyNotNull(key); this.ProcessEntity(() => { @@ -200,8 +200,7 @@ public IHttpActionResult Pdf(int key) this.ProcessEntity(() => { - var result = GetSingleResult(key); - var order = GetExpandedEntity(key, result, "OrderItems, OrderItems.Product"); + var order = GetByKeyNotNull(key); var pdfData = _apiPdfHelper.Value.OrderToPdf(order); var fileName = Services.Localization.GetResource("Order.PdfInvoiceFileName").FormatInvariant(order.Id); @@ -215,7 +214,7 @@ public IHttpActionResult Pdf(int key) [WebApiAuthenticate(Permission = Permissions.Order.Update)] public IHttpActionResult PaymentPending(int key) { - var order = GetEntityByKeyNotNull(key); + var order = GetByKeyNotNull(key); this.ProcessEntity(() => { @@ -230,7 +229,7 @@ public IHttpActionResult PaymentPending(int key) [WebApiAuthenticate(Permission = Permissions.Order.Update)] public IHttpActionResult PaymentPaid(int key, ODataActionParameters parameters) { - var order = GetEntityByKeyNotNull(key); + var order = GetByKeyNotNull(key); this.ProcessEntity(() => { @@ -252,7 +251,7 @@ public IHttpActionResult PaymentPaid(int key, ODataActionParameters parameters) [WebApiAuthenticate(Permission = Permissions.Order.Update)] public IHttpActionResult PaymentRefund(int key, ODataActionParameters parameters) { - var order = GetEntityByKeyNotNull(key); + var order = GetByKeyNotNull(key); this.ProcessEntity(() => { @@ -277,7 +276,7 @@ public IHttpActionResult PaymentRefund(int key, ODataActionParameters parameters [WebApiAuthenticate(Permission = Permissions.Order.Update)] public IHttpActionResult Cancel(int key) { - var order = GetEntityByKeyNotNull(key); + var order = GetByKeyNotNull(key); this.ProcessEntity(() => { @@ -291,7 +290,7 @@ public IHttpActionResult Cancel(int key) [WebApiAuthenticate(Permission = Permissions.Order.EditShipment)] public IHttpActionResult AddShipment(int key, ODataActionParameters parameters) { - var order = GetEntityByKeyNotNull(key); + var order = GetByKeyNotNull(key); this.ProcessEntity(() => { @@ -318,7 +317,7 @@ public IHttpActionResult AddShipment(int key, ODataActionParameters parameters) [WebApiAuthenticate(Permission = Permissions.Order.Update)] public IHttpActionResult CompleteOrder(int key) { - var order = GetEntityByKeyNotNull(key); + var order = GetByKeyNotNull(key); this.ProcessEntity(() => { diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index 79e5b87713..2dad7aeee7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -24,7 +24,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.PaymentMethod.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs index c3f9225ed2..1629455196 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs index 67628e360f..6736f61ae8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs index 1ea647c14f..937de926b6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Variant.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs index 548d4bee90..78d9e0b7be 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs index dcf737bd8f..6b33c90820 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs index fd50b57809..01e6c972cf 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs index 5884968d11..3e5e8d6ec2 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs index 878c567c6a..568aa9dc1f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs index 1b3396cd98..dad75716cc 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs index dd62875c82..64093ad631 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs index 8a2ea2dd1d..995a96a386 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 145f0f8dff..6c4557654c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -70,7 +70,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] @@ -476,35 +476,37 @@ public IHttpActionResult Search([ModelBinder(typeof(WebApiCatalogSearchQueryMode [HttpPost] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public decimal? FinalPrice(int key) + public IHttpActionResult FinalPrice(int key) { - return CalculatePrice(key, false); + var price = CalculatePrice(key, false); + return Ok(price); } [HttpPost] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] - public decimal? LowestPrice(int key) + public IHttpActionResult LowestPrice(int key) { - return CalculatePrice(key, true); + var price = CalculatePrice(key, true); + return Ok(price); } [HttpPost, WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - public IQueryable CreateAttributeCombinations(int key) + public IHttpActionResult CreateAttributeCombinations(int key) { - var entity = GetEntityByKeyNotNull(key); + var entity = GetByKeyNotNull(key); this.ProcessEntity(() => { _productAttributeService.Value.CreateAllProductVariantAttributeCombinations(entity); }); - return entity.ProductVariantAttributeCombinations.AsQueryable(); + return Ok(entity.ProductVariantAttributeCombinations.AsQueryable()); } [HttpPost, WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.EditVariant)] - public IQueryable ManageAttributes(int key, ODataActionParameters parameters) + public IHttpActionResult ManageAttributes(int key, ODataActionParameters parameters) { var entity = GetExpandedEntity(key, x => x.ProductVariantAttributes.Select(y => y.ProductAttribute)); var result = new List(); @@ -623,7 +625,7 @@ public IQueryable ManageAttributes(int key, ODataAction } }); - return entity.ProductVariantAttributes.AsQueryable(); + return Ok(entity.ProductVariantAttributes.AsQueryable()); } #endregion diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs index aab2d6d06a..3e99ebda86 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Measure.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs index 3b5d61c637..c16fa23845 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs index 8c29885622..5fd194a18b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Order.ReturnRequest.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs index 5831ce1118..8fe39216bd 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Setting.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs index a4c3a845f5..708769eebe 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Order.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs index 63c45a1a58..52285eba6a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Order.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Order.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs index b7536df6ae..e12678111d 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Shipping.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs index 5589359d3c..2243a83d89 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs index 6659f141da..60f5691e8c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Attribute.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs index b286231498..fcdc0c49fa 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Country.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs index d674bda27b..3da660eca8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs @@ -21,7 +21,7 @@ public IHttpActionResult Get() [WebApiQueryable] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs index 7779a4fc25..874e891853 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Store.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs index 3c71dff7d4..f0b49fbbe0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs @@ -21,7 +21,7 @@ public IHttpActionResult Get() [WebApiQueryable] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs index fa81274d82..412cf61ac9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Configuration.Tax.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs index e89d51c481..ce9fa46169 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs @@ -23,7 +23,7 @@ public IHttpActionResult Get() [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs index bf363d27cd..a11a2efa39 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs @@ -20,7 +20,7 @@ public IHttpActionResult Get() [WebApiQueryable] public IHttpActionResult Get(int key) { - return Ok(key); + return Ok(GetByKey(key)); } public IHttpActionResult GetProperty(int key, string propertyName) diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 2dc59acab0..03c65b2d48 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Data.Entity; using System.Data.Entity.Infrastructure; using System.Linq; using System.Linq.Expressions; @@ -61,37 +60,30 @@ protected internal virtual IQueryable GetExpandedEntitySet(string prope return query; } - protected internal virtual TEntity GetEntityByKeyNotNull(int key) + protected internal virtual TEntity GetByKey(int key) { - if (!ModelState.IsValid) + if (key == 0) { - throw this.InvalidModelStateException(); - } - - var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); - if (entity == null) - { - throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + return null; } - return entity; + return GetEntitySet().FirstOrDefault(x => x.Id == key); } - protected internal virtual SingleResult GetSingleResult(int key) + protected internal virtual TEntity GetByKeyNotNull(int key) { if (!ModelState.IsValid) { throw this.InvalidModelStateException(); } - var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); - - return GetSingleResult(entity); - } + var entity = GetByKey(key); + if (entity == null) + { + throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + } - protected internal virtual SingleResult GetSingleResult(TEntity entity) - { - return SingleResult.Create(new[] { entity }.AsQueryable()); + return entity; } protected internal virtual TEntity GetExpandedEntity(int key, Expression> path) @@ -130,24 +122,6 @@ protected internal virtual TEntity GetExpandedEntity(int key, string properties) return entity; } - protected internal virtual TEntity GetExpandedEntity(int key, SingleResult result, string path) - { - var query = result.Queryable; - - foreach (var property in path.SplitSafe(",")) - { - query = query.Expand(property.Trim()); - } - - var entity = query.FirstOrDefault(x => x.Id == key); - if (entity == null) - { - throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - } - - return entity; - } - protected internal virtual TProperty GetExpandedProperty(int key, Expression> path) { var entity = GetExpandedEntity(key, path); @@ -170,41 +144,24 @@ protected internal virtual IQueryable GetRelatedCollection x.Id.Equals(key)); - return query.SelectMany(navigationProperty); - } - - protected internal virtual IQueryable GetRelatedCollection( - int key, - string navigationProperty) - { - Guard.NotEmpty(navigationProperty, nameof(navigationProperty)); - if (!ModelState.IsValid) - { - throw this.InvalidModelStateException(); - } - - var ctx = (DbContext)Repository.Context; - var product = Repository.GetById(key); - var entry = ctx.Entry(product); - var query = entry.Collection(navigationProperty).Query(); - - return query.Cast(); + return query.SelectMany(navigationProperty); } - protected internal virtual SingleResult GetRelatedEntity( + protected internal virtual TElement GetRelatedEntity( int key, Expression> navigationProperty) { Guard.NotNull(navigationProperty, nameof(navigationProperty)); var query = GetEntitySet().Where(x => x.Id.Equals(key)).Select(navigationProperty); - return SingleResult.Create(query); + + return query.FirstOrDefault(); } protected internal virtual IHttpActionResult GetPropertyValue(int key, string propertyName) { - var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); + var entity = GetByKey(key); if (entity == null) { return NotFound(); @@ -222,9 +179,9 @@ protected internal virtual IHttpActionResult GetPropertyValue(int key, string pr return ResponseMessage(response); } - protected internal new IHttpActionResult Ok(T content) + protected internal virtual new IHttpActionResult Ok(T content) { - if (content == null) + if (content == null && !typeof(T).IsNullable(out _)) { return NotFound(); } @@ -232,18 +189,6 @@ protected internal virtual IHttpActionResult GetPropertyValue(int key, string pr return base.Ok(content); } - protected internal virtual IHttpActionResult Ok(int key) - { - var entity = GetEntitySet().FirstOrDefault(x => x.Id == key); - - if (entity == null) - { - return NotFound(); - } - - return Ok(entity); - } - protected internal virtual IHttpActionResult Insert(TEntity entity, Action insert) { if (!ModelState.IsValid) From 799df93155c91fb8f9f982d2017d24bc37ddafb6 Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Tue, 18 Aug 2020 22:42:05 +0200 Subject: [PATCH 056/695] order amount restriction > customer groups: renamed field and made it nullable. Refactoring --- .../Domain/Customers/CustomerRole.cs | 4 +- .../Domain/Orders/OrderSettings.cs | 11 +- ..._RenamedCustomerRoleOrderTotal.Designer.cs | 29 ++++ ...181949580_RenamedCustomerRoleOrderTotal.cs | 24 ++++ ...1949580_RenamedCustomerRoleOrderTotal.resx | 126 ++++++++++++++++++ .../Migrations/MigrationsConfiguration.cs | 30 +++-- .../SmartStore.Data/SmartStore.Data.csproj | 7 + .../Orders/IOrderProcessingService.cs | 2 +- .../Orders/OrderProcessingService.cs | 30 ++--- .../Models/Customers/CustomerRoleModel.cs | 4 +- .../Models/Settings/OrderSettingsModel.cs | 10 +- .../Views/CustomerRole/_CreateOrUpdate.cshtml | 12 +- .../Administration/Views/Setting/Order.cshtml | 21 ++- .../Controllers/CheckoutController.cs | 2 +- .../Controllers/ShoppingCartController.cs | 2 +- 15 files changed, 265 insertions(+), 49 deletions(-) create mode 100644 src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs create mode 100644 src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs create mode 100644 src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.resx diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs index 8ff52b55f1..005092aa71 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs @@ -66,13 +66,13 @@ public partial class CustomerRole : BaseEntity, IRulesContainer /// Gets or sets a minimum order amount /// [DataMember] - public decimal MinOrderAmount { get; set; } + public decimal? OrderTotalMinimum { get; set; } /// /// Gets or sets a maximum order amount /// [DataMember] - public decimal MaxOrderAmount { get; set; } + public decimal? OrderTotalMaximum { get; set; } /// /// Gets or sets the permission role mappings. diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs b/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs index e7f9ebb640..4d60104e14 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs @@ -27,18 +27,23 @@ public OrderSettings() /// /// Gets or sets a minimum order total amount /// - public decimal MinOrderAmount { get; set; } + public decimal? OrderTotalMinimum { get; set; } /// /// Gets or sets a maximum order total amount /// - public decimal MaxOrderAmount { get; set; } + public decimal? OrderTotalMaximum { get; set; } /// - /// Gets or sets a value indicating whether min/max order amount is relating to order amount subtotal + /// Gets or sets a value indicating whether min/max order total is relating to order amount subtotal /// public bool ApplyToSubtotal { get; set; } + /// + /// Gets or sets a value indicating how further customer group restriction are applied + /// + public bool OrderValueRestrictionType { get; set; } + /// /// Gets or sets a value indicating whether anonymous checkout allowed /// diff --git a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs new file mode 100644 index 0000000000..ec697d5c0b --- /dev/null +++ b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs @@ -0,0 +1,29 @@ +// +namespace SmartStore.Data.Migrations +{ + using System.CodeDom.Compiler; + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + [GeneratedCode("EntityFramework.Migrations", "6.4.4")] + public sealed partial class RenamedCustomerRoleOrderTotal : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(RenamedCustomerRoleOrderTotal)); + + string IMigrationMetadata.Id + { + get { return "202008181949580_RenamedCustomerRoleOrderTotal"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs new file mode 100644 index 0000000000..fd3031a53c --- /dev/null +++ b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs @@ -0,0 +1,24 @@ +namespace SmartStore.Data.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class RenamedCustomerRoleOrderTotal : DbMigration + { + public override void Up() + { + AddColumn("dbo.CustomerRole", "OrderTotalMinimum", c => c.Decimal(nullable: true, precision: 18, scale: 2)); + AddColumn("dbo.CustomerRole", "OrderTotalMaximum", c => c.Decimal(nullable: true, precision: 18, scale: 2)); + DropColumn("dbo.CustomerRole", "MinOrderAmount"); + DropColumn("dbo.CustomerRole", "MaxOrderAmount"); + } + + public override void Down() + { + AddColumn("dbo.CustomerRole", "MinOrderAmount", c => c.Decimal(nullable: true, precision: 18, scale: 2)); + AddColumn("dbo.CustomerRole", "MaxOrderAmount", c => c.Decimal(nullable: true, precision: 18, scale: 2)); + DropColumn("dbo.CustomerRole", "OrderTotalMaximum"); + DropColumn("dbo.CustomerRole", "OrderTotalMinimum"); + } + } +} diff --git a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.resx b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.resx new file mode 100644 index 0000000000..10b085d3d3 --- /dev/null +++ b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index f29edac29d..831b82b208 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -144,21 +144,21 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Der Höchstbestellwert der Gesamtsumme ist {0}."); builder.AddOrUpdate("Admin.Configuration.Settings.Order.MinOrderAmount", - "Min order amount", + "Minimum order total", "Mindestbestellwert", - "Enter minimum order amount.", + "Sets the minimum order total.", "Legt den Mindestbestellwert fest."); builder.AddOrUpdate("Admin.Configuration.Settings.Order.MaxOrderAmount", - "Max order amount", + "Maximum order total", "Höchstbestellwert", - "Enter maximum order amount.", + "Sets the maximum order total.", "Legt den Höchstbestellwert fest."); builder.AddOrUpdate("Admin.Configuration.Settings.Order.ApplyToSubtotal", - "Order amount related to subtotal", + "Order value related to subtotal", "Bestellwert bezogen auf Zwischensumme", - "Determines whether the min/max order amount refers to the order subtotal, otherwise it refers to the total amount.", + "Determines whether the min/max order value refers to the order subtotal, otherwise it refers to the total amount.", "Bestimmt, ob sich der Mindest-/Höchstbetrag auf die Auftragszwischensumme bezieht, andernfalls bezieht er sich auf den Gesamtbetrag."); builder.Delete("Admin.Configuration.Settings.Order.MaxOrderSubtotalAmount"); @@ -171,15 +171,15 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.Delete("Admin.Configuration.Settings.Order.MinOrderTotalAmount.Hint"); builder.AddOrUpdate("Admin.Customers.CustomerRoles.Fields.MinOrderAmount", - "Min order amount", + "Minimum order total", "Mindestbestellwert", - "Enter minimum order amount for user in this customer group.", + "Enter minimum order total for user in this customer group.", "Legt den Mindestbestellwert für Nutzer in der Kundengruppe fest."); builder.AddOrUpdate("Admin.Customers.CustomerRoles.Fields.MaxOrderAmount", - "Max order amount", + "Maximum order total", "Höchstbestellwert", - "Enter maximum order amount for user in this customer group.", + "Enter maximum order total for user in this customer group.", "Legt den Höchstbestellwert für Nutzer in der Kundengruppe fest."); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.CustomerFormFields.Description", @@ -197,6 +197,16 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Standards nur auf der Startseite verwenden", "Determines whether the default meta informations are used only on the home page, rather than as defaults for every page.", "Legt fest, ob die Standard-Meta-Informationen nur auf der Startseite anstatt als Standardeinstellung für jede Seite verwendet werden."); + + builder.AddOrUpdate("Admin.Configuration.Settings.Order.OrderValueRestrictionType", + "Order value restriction type", + "Bestellwertbeschränkungsart", + "", + ""); + + builder.AddOrUpdate("Admin.Configuration.Settings.Order.OrderTotal.Error", + "The maximum order value must be higher than the minimum order value", + "Der Maximale Bestellwert muss über dem Mindestbestellwert liegen."); } } } diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index 3d8952ee05..cda1e3cb24 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -501,6 +501,10 @@ 202007301117363_AddCustomerRoleOrderAmount.cs + + + 202008181949580_RenamedCustomerRoleOrderTotal.cs + @@ -902,6 +906,9 @@ 202007301117363_AddCustomerRoleOrderAmount.cs + + 202008181949580_RenamedCustomerRoleOrderTotal.cs + diff --git a/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs index a0e545e499..9c825dc868 100644 --- a/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs @@ -288,7 +288,7 @@ IList GetOrderPlacementWarnings( /// /// Shopping cart /// true - OK; false - minimum order amount is not reached - (bool valid, decimal orderTotalMinimum) IsAboveMinimumOrderTotal(IList cart, int[] customerRoleIds); + (bool valid, decimal orderTotalMinimum) IsAboveOrderTotalMinimum(IList cart, int[] customerRoleIds); /// /// Valdiate maximum order amount. diff --git a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs index dc0f9411b0..9f59031a0d 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs @@ -525,8 +525,8 @@ public virtual IList GetOrderPlacementWarnings( // Order total minimum validation var customerRoleIds = customer.GetRoleIds(); - var (isAboveMinOrderTotal, orderTotalMinimum) = IsAboveMinimumOrderTotal(cart, customerRoleIds); - if (!isAboveMinOrderTotal) + var (isAboveOrderTotalMinimum, orderTotalMinimum) = IsAboveOrderTotalMinimum(cart, customerRoleIds); + if (!isAboveOrderTotalMinimum) { orderTotalMinimum = _currencyService.ConvertFromPrimaryStoreCurrency( orderTotalMinimum, @@ -541,8 +541,8 @@ public virtual IList GetOrderPlacementWarnings( } // Order total maximum validation - var (isBelowMaxOrderTotal, orderTotalMaximum) = IsBelowOrderTotalMaximum(cart, customerRoleIds); - if (isAboveMinOrderTotal && !isBelowMaxOrderTotal) + var (isBelowOrderTotalMaximum, orderTotalMaximum) = IsBelowOrderTotalMaximum(cart, customerRoleIds); + if (isAboveOrderTotalMinimum && !isBelowOrderTotalMaximum) { orderTotalMaximum = _currencyService.ConvertFromPrimaryStoreCurrency( orderTotalMaximum, @@ -2646,18 +2646,18 @@ public virtual bool IsReturnRequestAllowed(Order order) return numberOfDaysReturnRequestAvailableValid; } - public virtual (bool valid, decimal orderTotalMinimum) IsAboveMinimumOrderTotal(IList cart, int[] customerRoleIds) + public virtual (bool valid, decimal orderTotalMinimum) IsAboveOrderTotalMinimum(IList cart, int[] customerRoleIds) { var query = _customerService.GetAllCustomerRoles().SourceQuery; var customerRole = query - .Where(x => x.MinOrderAmount > decimal.Zero && customerRoleIds.Contains(x.Id)) - .OrderByDescending(x => x.MinOrderAmount) + .Where(x => x.OrderTotalMinimum > decimal.Zero && customerRoleIds.Contains(x.Id)) + .OrderByDescending(x => x.OrderTotalMinimum) .FirstOrDefault(); var minimumOrderTotal = customerRole == null - ? _orderSettings.MinOrderAmount : customerRole.MinOrderAmount; + ? _orderSettings.OrderTotalMinimum : customerRole.OrderTotalMinimum; - return IsAboveOrderAmountMinimum(cart, minimumOrderTotal); + return IsAboveOrderTotalMinimum(cart, minimumOrderTotal ?? decimal.Zero); } /// @@ -2665,7 +2665,7 @@ public virtual (bool valid, decimal orderTotalMinimum) IsAboveMinimumOrderTotal( /// /// Shopping cart, minimum order total /// true - OK; false - minimum order total is not reached - private (bool valid, decimal orderTotalMinimum) IsAboveOrderAmountMinimum(IList cart, decimal minimumOrderTotal) + private (bool valid, decimal orderTotalMinimum) IsAboveOrderTotalMinimum(IList cart, decimal minimumOrderTotal) { if (cart == null) throw new ArgumentNullException("cart"); @@ -2695,14 +2695,14 @@ public virtual (bool valid, decimal orderTotalMaximum) IsBelowOrderTotalMaximum( { var query = _customerService.GetAllCustomerRoles().SourceQuery; var customerRole = query - .Where(x => x.MaxOrderAmount > decimal.Zero && customerRoleIds.Contains(x.Id)) - .OrderBy(x => x.MaxOrderAmount) + .Where(x => x.OrderTotalMaximum > decimal.Zero && customerRoleIds.Contains(x.Id)) + .OrderBy(x => x.OrderTotalMaximum) .FirstOrDefault(); var maximumOrderTotal = customerRole == null - ? _orderSettings.MaxOrderAmount : customerRole.MaxOrderAmount; + ? _orderSettings.OrderTotalMaximum : customerRole.OrderTotalMaximum; - return IsBelowOrderTotalMaximum(cart, maximumOrderTotal); + return IsBelowOrderTotalMaximum(cart, maximumOrderTotal ?? decimal.Zero); } /// @@ -2738,7 +2738,7 @@ public virtual (bool valid, decimal orderTotalMaximum) IsBelowOrderTotalMaximum( public virtual bool IsInOrderTotalsRange(IList cart, int[] customerRoleIds) { - return IsAboveMinimumOrderTotal(cart, customerRoleIds).valid + return IsAboveOrderTotalMinimum(cart, customerRoleIds).valid && IsBelowOrderTotalMaximum(cart, customerRoleIds).valid; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs index f3b7a7e792..3f0f1a36d2 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs @@ -44,10 +44,10 @@ public CustomerRoleModel() public string SystemName { get; set; } [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.MinOrderAmount")] - public decimal MinOrderAmount { get; set; } + public decimal? OrderTotalMinimum { get; set; } [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.MaxOrderAmount")] - public decimal MaxOrderAmount { get; set; } + public decimal? OrderTotalMaximum { get; set; } public string PrimaryStoreCurrencyCode { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs index d369edbdab..bd8af73e5c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs @@ -25,14 +25,17 @@ public OrderSettingsModel() public bool IsReOrderAllowed { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.Order.MinOrderAmount")] - public decimal MinOrderAmount { get; set; } + public decimal? OrderTotalMinimum { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.Order.MaxOrderAmount")] - public decimal MaxOrderAmount { get; set; } + public decimal? OrderTotalMaximum { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.Order.ApplyToSubtotal")] public bool ApplyToSubtotal { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Settings.Order.OrderValueRestrictionType")] + public bool OrderValueRestrictionType { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Settings.Order.AnonymousCheckoutAllowed")] public bool AnonymousCheckoutAllowed { get; set; } @@ -101,6 +104,9 @@ public OrderSettingsValidator(Localizer T) RuleFor(x => x.OrderListPageSize) .GreaterThan(0); + + //RuleFor(x => x.OrderTotalMaximum).LessThan(x => x.OrderTotalMaximum) + // .WithMessage(T("Admin.Configuration.Settings.Order.OrderTotal.Error")); } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Views/CustomerRole/_CreateOrUpdate.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/CustomerRole/_CreateOrUpdate.cshtml index 4ff0b6c905..d34244431f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/CustomerRole/_CreateOrUpdate.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/CustomerRole/_CreateOrUpdate.cshtml @@ -55,20 +55,20 @@ - @Html.SmartLabelFor(model => model.MinOrderAmount) + @Html.SmartLabelFor(model => model.OrderTotalMinimum) - @Html.SettingEditorFor(model => model.MinOrderAmount, null, new { postfix = Model.PrimaryStoreCurrencyCode }) - @Html.ValidationMessageFor(model => model.MinOrderAmount) + @Html.SettingEditorFor(model => model.OrderTotalMinimum, null, new { postfix = Model.PrimaryStoreCurrencyCode }) + @Html.ValidationMessageFor(model => model.OrderTotalMinimum) - @Html.SmartLabelFor(model => model.MaxOrderAmount) + @Html.SmartLabelFor(model => model.OrderTotalMaximum) - @Html.SettingEditorFor(model => model.MaxOrderAmount, null, new { postfix = Model.PrimaryStoreCurrencyCode }) - @Html.ValidationMessageFor(model => model.MaxOrderAmount) + @Html.SettingEditorFor(model => model.OrderTotalMaximum, null, new { postfix = Model.PrimaryStoreCurrencyCode }) + @Html.ValidationMessageFor(model => model.OrderTotalMaximum) diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Order.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Order.cshtml index 7933456e1e..184856feb4 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Order.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Order.cshtml @@ -48,20 +48,20 @@ - @Html.SmartLabelFor(model => model.MinOrderAmount) + @Html.SmartLabelFor(model => model.OrderTotalMinimum) - @Html.SettingEditorFor(model => model.MinOrderAmount, null, new { postfix = Model.PrimaryStoreCurrencyCode }) - @Html.ValidationMessageFor(model => model.MinOrderAmount) + @Html.SettingEditorFor(model => model.OrderTotalMinimum, null, new { postfix = Model.PrimaryStoreCurrencyCode }) + @Html.ValidationMessageFor(model => model.OrderTotalMinimum) - @Html.SmartLabelFor(model => model.MaxOrderAmount) + @Html.SmartLabelFor(model => model.OrderTotalMaximum) - @Html.SettingEditorFor(model => model.MaxOrderAmount, null, new { postfix = Model.PrimaryStoreCurrencyCode }) - @Html.ValidationMessageFor(model => model.MaxOrderAmount) + @Html.SettingEditorFor(model => model.OrderTotalMaximum, null, new { postfix = Model.PrimaryStoreCurrencyCode }) + @Html.ValidationMessageFor(model => model.OrderTotalMaximum) @@ -73,6 +73,15 @@ @Html.ValidationMessageFor(model => model.ApplyToSubtotal) + + + @Html.SmartLabelFor(model => model.OrderValueRestrictionType) + + + @Html.SettingEditorFor(model => model.OrderValueRestrictionType) + @Html.ValidationMessageFor(model => model.OrderValueRestrictionType) + + @Html.SmartLabelFor(model => model.AnonymousCheckoutAllowed) diff --git a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs index 937c8ad1d1..f53c91c20d 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs @@ -355,7 +355,7 @@ protected CheckoutConfirmModel PrepareConfirmOrderModel(IList Date: Wed, 19 Aug 2020 11:31:41 +0200 Subject: [PATCH 057/695] Message template attachments were not attached to the email --- changelog.md | 3 ++- .../SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 5f0a5875ab..a2ad0ff35d 100644 --- a/changelog.md +++ b/changelog.md @@ -20,7 +20,8 @@ * **Media Manager** * The file date should be displayed in local time and not in UTC. * **Page Builder** - * Reveal effect on story block conflicted with nested block reveal effects + * Reveal effect on story block conflicted with nested block reveal effects. +* Message template attachments were not attached to the email. ## Smartstore 4.0.1 diff --git a/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml index 91f9be5dda..cf6e4921a8 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml @@ -112,7 +112,7 @@
@Html.MediaThumbnail(currentFile, 250)
- @Html.HiddenFor(x => x, new { @class = "hidden", Value = currentFile != null ? Model : 0 }) + @Html.HiddenFor(x => x, new { @class = "hidden", Value = currentFile != null ? Model : (int?)null }) }
From be58f752909df6359f43d219cbd6f943524a9114 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 19 Aug 2020 12:48:17 +0200 Subject: [PATCH 058/695] Updated change log --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index a2ad0ff35d..01d7c5b245 100644 --- a/changelog.md +++ b/changelog.md @@ -22,6 +22,7 @@ * **Page Builder** * Reveal effect on story block conflicted with nested block reveal effects. * Message template attachments were not attached to the email. +* EasyCredit: fixed "Could not convert setting 'EasyCreditSettings.LastPurchaseLimitUpdatedOn' to type 'DateTime'". ## Smartstore 4.0.1 From 3abe1027406c6f1b3cce741464d368ce538a4993 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 19 Aug 2020 14:47:13 +0200 Subject: [PATCH 059/695] Fixes merging error --- .../SmartStore.Web.Framework.csproj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 181e0735e5..28b531ddc4 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -115,10 +115,11 @@ ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll - + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll From 8a4bc18a1848babd44cec78905906588957fd140 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 19 Aug 2020 16:50:11 +0200 Subject: [PATCH 060/695] API: minor change --- .../SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 9fc53fcd6f..2025286db2 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -35,7 +35,6 @@ public void Start() //config.Formatters.InsertRange(0, oDataFormatters); var json = config.Formatters.JsonFormatter; - json.SerializerSettings.Formatting = Formatting.Indented; json.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; json.SerializerSettings.ContractResolver = new WebApiContractResolver(config.Formatters.JsonFormatter); json.AddQueryStringMapping("$format", "json", "application/json"); @@ -45,7 +44,7 @@ public void Start() xml.Indent = true; xml.AddQueryStringMapping("$format", "xml", "application/xml"); - config.AddODataQueryFilter(new WebApiQueryableAttribute()); + config.AddODataQueryFilter(new WebApiQueryableAttribute()); var corsAttribute = new EnableCorsAttribute("*", "*", "*", WebApiGlobal.Header.CorsExposed); config.EnableCors(corsAttribute); From 20aa5af3934a4ede33416c25e9847f2259fea9c0 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 19 Aug 2020 16:59:43 +0200 Subject: [PATCH 061/695] API: removes an unused method --- .../SmartStore.Web.Framework/WebApi/WebApiCore.cs | 2 -- .../WebApi/WebApiEntityController.cs | 15 --------------- 2 files changed, 17 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs index d5b3d7911a..d6f41da77d 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs @@ -43,12 +43,10 @@ public static string CorsExposed public static class Error { public static string PropertyNotFound { get { return "Entity does not own property '{0}'."; } } - public static string PropertyNotExpanded { get { return "Property path '{0}' cannot be expanded."; } } public static string NoKeyFromPath { get { return "Cannot retrieve valid entity key from OData path."; } } public static string NoRelatedKeyFromPath { get { return "Cannot retrieve valid related entity key from OData path."; } } public static string NoNavigationFromPath { get { return "Cannot retrieve the navigation property from OData path."; } } public static string EntityNotFound { get { return "Entity with key '{0}' could not be found."; } } - public static string NoDataToInsert { get { return "No data to be inserted."; } } } public static class QueryOption diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs index 03c65b2d48..ccc79d81d0 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiEntityController.cs @@ -122,21 +122,6 @@ protected internal virtual TEntity GetExpandedEntity(int key, string properties) return entity; } - protected internal virtual TProperty GetExpandedProperty(int key, Expression> path) - { - var entity = GetExpandedEntity(key, path); - - var expression = path.CompileFast(PropertyCachingStrategy.EagerCached); - var property = expression.Invoke(entity); - - if (property == null) - { - throw Request.NotFoundException(WebApiGlobal.Error.PropertyNotExpanded.FormatInvariant(path.ToString())); - } - - return property; - } - protected internal virtual IQueryable GetRelatedCollection( int key, Expression>> navigationProperty) From 34cbe66528d56aa51fcac37508b7812b075b70be Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 19 Aug 2020 19:21:59 +0200 Subject: [PATCH 062/695] Removed obsolete code --- src/Libraries/SmartStore.Core/SmartStore.Core.csproj | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 72b716c29e..413adaffe1 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -497,16 +497,13 @@ - - - @@ -798,9 +795,7 @@ - - - + From bfded9aae35446fd6066b54f739ee2daa9e87935 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 19 Aug 2020 20:05:27 +0200 Subject: [PATCH 063/695] Correction of commit "Message template attachments were not attached to the email" --- .../SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml index cf6e4921a8..67eba15904 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Media.cshtml @@ -99,8 +99,8 @@ @{ var random = CommonHelper.GenerateRandomInteger(); var mediaService = this.CommonServices.MediaService; - var mediaSettings = this.CommonServices.Resolve(); var currentFile = Model != null ? mediaService.GetFileById((int)Model) : null; + var defaultValue = Model != null ? 0 : (int?)null; }
@@ -112,7 +112,7 @@
@Html.MediaThumbnail(currentFile, 250)
- @Html.HiddenFor(x => x, new { @class = "hidden", Value = currentFile != null ? Model : (int?)null }) + @Html.HiddenFor(x => x, new { @class = "hidden", Value = currentFile != null ? Model : defaultValue }) }
From 1bc0a5f21a8433bfbf50c14185551595fe4941d0 Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Wed, 19 Aug 2020 21:45:31 +0200 Subject: [PATCH 064/695] Customer role/Order settings > min/max restriction: adjusted resources and names. Added validation. --- .../Migrations/MigrationsConfiguration.cs | 70 +++++++++---------- .../Models/Customers/CustomerRoleModel.cs | 9 ++- .../Models/Settings/OrderSettingsModel.cs | 12 ++-- 3 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 831b82b208..9efea3f03e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -143,44 +143,50 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "The maximum order value for the total is {0}.", "Der Höchstbestellwert der Gesamtsumme ist {0}."); - builder.AddOrUpdate("Admin.Configuration.Settings.Order.MinOrderAmount", + builder.AddOrUpdate("Admin.Customers.CustomerRoles.Fields.MinOrderTotal", "Minimum order total", "Mindestbestellwert", - "Sets the minimum order total.", - "Legt den Mindestbestellwert fest."); + "Defines the minimum order total for customers in this group.", + "Legt den Mindestbestellwert für Kunden in dieser Gruppe fest."); - builder.AddOrUpdate("Admin.Configuration.Settings.Order.MaxOrderAmount", + builder.AddOrUpdate("Admin.Customers.CustomerRoles.Fields.MaxOrderTotal", "Maximum order total", "Höchstbestellwert", - "Sets the maximum order total.", - "Legt den Höchstbestellwert fest."); + "Defines the maximum order total for customers in this group.", + "Legt den Höchstbestellwert für Kunden in dieser Gruppe fest."); - builder.AddOrUpdate("Admin.Configuration.Settings.Order.ApplyToSubtotal", - "Order value related to subtotal", - "Bestellwert bezogen auf Zwischensumme", - "Determines whether the min/max order value refers to the order subtotal, otherwise it refers to the total amount.", - "Bestimmt, ob sich der Mindest-/Höchstbetrag auf die Auftragszwischensumme bezieht, andernfalls bezieht er sich auf den Gesamtbetrag."); - - builder.Delete("Admin.Configuration.Settings.Order.MaxOrderSubtotalAmount"); - builder.Delete("Admin.Configuration.Settings.Order.MaxOrderSubtotalAmount.Hint"); - builder.Delete("Admin.Configuration.Settings.Order.MaxOrderTotalAmount"); - builder.Delete("Admin.Configuration.Settings.Order.MaxOrderTotalAmount.Hint"); - builder.Delete("Admin.Configuration.Settings.Order.MinOrderSubtotalAmount"); - builder.Delete("Admin.Configuration.Settings.Order.MinOrderSubtotalAmount.Hint"); - builder.Delete("Admin.Configuration.Settings.Order.MinOrderTotalAmount"); - builder.Delete("Admin.Configuration.Settings.Order.MinOrderTotalAmount.Hint"); - - builder.AddOrUpdate("Admin.Customers.CustomerRoles.Fields.MinOrderAmount", + builder.AddOrUpdate("Admin.Configuration.Settings.Order.MinOrderTotal", "Minimum order total", "Mindestbestellwert", - "Enter minimum order total for user in this customer group.", - "Legt den Mindestbestellwert für Nutzer in der Kundengruppe fest."); + "Defines the default minimum order total for the shop. Overridden by customer group restrictions.", + "Legt den standardmäßigen Mindestbestellwert für den Shop fest. Wird von Kundengruppenbeschränkungen überschrieben."); - builder.AddOrUpdate("Admin.Customers.CustomerRoles.Fields.MaxOrderAmount", + builder.AddOrUpdate("Admin.Configuration.Settings.Order.MaxOrderTotal", "Maximum order total", "Höchstbestellwert", - "Enter maximum order total for user in this customer group.", - "Legt den Höchstbestellwert für Nutzer in der Kundengruppe fest."); + "Defines the default maximum order total for the shop. Overridden by customer group restrictions.", + "Legt den standardmäßigen Höchstbestellwert für den Shop fest. Wird von Kundengruppenbeschränkungen überschrieben."); + + builder.AddOrUpdate("Admin.Configuration.Settings.Order.ApplyToSubtotal", + "Order total restriction in relation to subtotal", + "Beschränkung bezogen auf Zwischensumme", + "Determines whether the min/max order value refers to the order subtotal, otherwise it refers to the total amount.", + "Bestimmt, ob sich der Mindest-/Höchstbetrag auf die Auftragszwischensumme bezieht, andernfalls bezieht er sich auf den Gesamtbetrag."); + + builder.Delete("Admin.Configuration.Settings.Order.MaxOrderSubtotalAmount", + "Admin.Configuration.Settings.Order.MaxOrderSubtotalAmount.Hint", + "Admin.Configuration.Settings.Order.MaxOrderTotalAmount", + "Admin.Configuration.Settings.Order.MaxOrderTotalAmount.Hint", + "Admin.Configuration.Settings.Order.MinOrderSubtotalAmount", + "Admin.Configuration.Settings.Order.MinOrderSubtotalAmount.Hint", + "Admin.Configuration.Settings.Order.MinOrderTotalAmount", + "Admin.Configuration.Settings.Order.MinOrderTotalAmount.Hint"); + + builder.AddOrUpdate("Admin.Configuration.Settings.Order.OrderTotalRestrictionType", + "Restrictions in customer groups are cumulative", + "Beschränkungen in Kundengruppen sind kumulativ", + "Determines whether multiple order total restrictions are cumulated by customer group assignments.", + "Bestimmt, ob mehrfache Bestellwertbeschränkungen durch Kundengruppenzuordnungen kumuliert werden."); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.CustomerFormFields.Description", "Manage form fields that are displayed during registration.
" + @@ -197,16 +203,6 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Standards nur auf der Startseite verwenden", "Determines whether the default meta informations are used only on the home page, rather than as defaults for every page.", "Legt fest, ob die Standard-Meta-Informationen nur auf der Startseite anstatt als Standardeinstellung für jede Seite verwendet werden."); - - builder.AddOrUpdate("Admin.Configuration.Settings.Order.OrderValueRestrictionType", - "Order value restriction type", - "Bestellwertbeschränkungsart", - "", - ""); - - builder.AddOrUpdate("Admin.Configuration.Settings.Order.OrderTotal.Error", - "The maximum order value must be higher than the minimum order value", - "Der Maximale Bestellwert muss über dem Mindestbestellwert liegen."); } } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs index 3f0f1a36d2..5a4eb973dd 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs @@ -5,6 +5,7 @@ using FluentValidation.Attributes; using SmartStore.Collections; using SmartStore.Core.Domain.Security; +using SmartStore.Core.Localization; using SmartStore.Rules; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -43,10 +44,10 @@ public CustomerRoleModel() [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.SystemName")] public string SystemName { get; set; } - [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.MinOrderAmount")] + [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.MinOrderTotal")] public decimal? OrderTotalMinimum { get; set; } - [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.MaxOrderAmount")] + [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.MaxOrderTotal")] public decimal? OrderTotalMaximum { get; set; } public string PrimaryStoreCurrencyCode { get; set; } @@ -67,9 +68,11 @@ public CustomerRoleModel() public partial class CustomerRoleValidator : AbstractValidator { - public CustomerRoleValidator() + public CustomerRoleValidator(Localizer T) { RuleFor(x => x.Name).NotNull(); + + RuleFor(x => x.OrderTotalMaximum).GreaterThan(x => x.OrderTotalMinimum ?? 0); } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs index bd8af73e5c..2e00c286fa 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs @@ -24,17 +24,17 @@ public OrderSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Order.IsReOrderAllowed")] public bool IsReOrderAllowed { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Order.MinOrderAmount")] + [SmartResourceDisplayName("Admin.Configuration.Settings.Order.MinOrderTotal")] public decimal? OrderTotalMinimum { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Order.MaxOrderAmount")] + [SmartResourceDisplayName("Admin.Configuration.Settings.Order.MaxOrderTotal")] public decimal? OrderTotalMaximum { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.Order.ApplyToSubtotal")] public bool ApplyToSubtotal { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Order.OrderValueRestrictionType")] - public bool OrderValueRestrictionType { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Settings.Order.OrderTotalRestrictionType")] + public bool OrderTotalRestrictionType { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.Order.AnonymousCheckoutAllowed")] public bool AnonymousCheckoutAllowed { get; set; } @@ -105,8 +105,8 @@ public OrderSettingsValidator(Localizer T) RuleFor(x => x.OrderListPageSize) .GreaterThan(0); - //RuleFor(x => x.OrderTotalMaximum).LessThan(x => x.OrderTotalMaximum) - // .WithMessage(T("Admin.Configuration.Settings.Order.OrderTotal.Error")); + RuleFor(x => x.OrderTotalMaximum) + .GreaterThan(x => x.OrderTotalMinimum ?? 0); } } } \ No newline at end of file From b95e4165c3aaeb9e13efa9a70a13387276d043c4 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 20 Aug 2020 03:01:15 +0200 Subject: [PATCH 065/695] Typo --- src/Libraries/SmartStore.Core/IWebHelper.cs | 3 --- .../SmartStore.Core/Infrastructure/ComparableObject.cs | 7 +++++-- .../SmartStore.Core/Infrastructure/DisposableObject.cs | 3 --- .../SmartStore.Core/Infrastructure/ICloneable.cs | 2 -- .../SmartStore.Core/Infrastructure/ITypeFinder.cs | 1 - .../Infrastructure/ObjectSignatureAttribute.cs | 9 --------- .../SmartStore.Core/Infrastructure/RegularExpressions.cs | 2 -- src/Libraries/SmartStore.Core/SmartStore.Core.csproj | 3 --- .../SmartStore.Core/Utilities/ActionDisposable.cs | 4 ---- src/Libraries/SmartStore.Core/Utilities/Inflector.cs | 3 +-- src/Libraries/SmartStore.Core/Utilities/Prettifier.cs | 3 --- src/Libraries/SmartStore.Core/Utilities/Range.cs | 2 -- .../SmartStore.Core/Utilities/StringTokenizer.cs | 2 -- 13 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 src/Libraries/SmartStore.Core/Infrastructure/ObjectSignatureAttribute.cs diff --git a/src/Libraries/SmartStore.Core/IWebHelper.cs b/src/Libraries/SmartStore.Core/IWebHelper.cs index 2d089bd64d..b32c43be24 100644 --- a/src/Libraries/SmartStore.Core/IWebHelper.cs +++ b/src/Libraries/SmartStore.Core/IWebHelper.cs @@ -2,9 +2,6 @@ namespace SmartStore.Core { - /// - /// Represents a common helper - /// public partial interface IWebHelper { /// diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs b/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs index 153405382b..c236a5b0f2 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs @@ -10,6 +10,11 @@ namespace SmartStore { + [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)] + public sealed class ObjectSignatureAttribute : Attribute + { + } + /// /// Provides a standard base class for facilitating sophisticated comparison of objects. /// @@ -168,7 +173,6 @@ protected void RegisterSignatureProperty(string propertyName) } - /// /// Generic version of . /// @@ -198,5 +202,4 @@ public virtual bool Equals(T other) return base.Equals(other); } } - } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DisposableObject.cs b/src/Libraries/SmartStore.Core/Infrastructure/DisposableObject.cs index e3b01f2e42..c470370f23 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DisposableObject.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DisposableObject.cs @@ -5,7 +5,6 @@ namespace SmartStore { - public abstract class DisposableObject : IDisposable { private bool _isDisposed; @@ -104,7 +103,5 @@ protected static void DisposeMember(object member) { Dispose(false); } - } - } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ICloneable.cs b/src/Libraries/SmartStore.Core/Infrastructure/ICloneable.cs index 6b82c27d85..5c23d126c2 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ICloneable.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ICloneable.cs @@ -2,7 +2,6 @@ namespace SmartStore { - /// /// Generic variant of . /// @@ -15,5 +14,4 @@ public interface ICloneable : ICloneable /// The cloned instance new T Clone(); } - } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ITypeFinder.cs b/src/Libraries/SmartStore.Core/Infrastructure/ITypeFinder.cs index a198846e58..b43be647d3 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ITypeFinder.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ITypeFinder.cs @@ -57,6 +57,5 @@ public static IEnumerable FindClassesOfType(this ITypeFinder finder, IE { return finder.FindClassesOfType(typeof(T), assemblies, onlyConcreteClasses); } - } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ObjectSignatureAttribute.cs b/src/Libraries/SmartStore.Core/Infrastructure/ObjectSignatureAttribute.cs deleted file mode 100644 index 42b53f80c4..0000000000 --- a/src/Libraries/SmartStore.Core/Infrastructure/ObjectSignatureAttribute.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace SmartStore -{ - [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)] - public sealed class ObjectSignatureAttribute : Attribute - { - } -} diff --git a/src/Libraries/SmartStore.Core/Infrastructure/RegularExpressions.cs b/src/Libraries/SmartStore.Core/Infrastructure/RegularExpressions.cs index fafd0508bd..f97c203129 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/RegularExpressions.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/RegularExpressions.cs @@ -6,7 +6,6 @@ namespace SmartStore { public static class RegularExpressions { - internal static readonly string ValidRealPattern = "^([-]|[.]|[-.]|[0-9])[0-9]*[.]*[0-9]+$"; internal static readonly string ValidIntegerPattern = "^([-]|[0-9])[0-9]*$"; @@ -35,5 +34,4 @@ public static class RegularExpressions public static readonly Regex IsIban = new Regex(@"[a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16}", RegexOptions.Singleline | RegexOptions.Compiled); public static readonly Regex IsBic = new Regex(@"([a-zA-Z]{4}[a-zA-Z]{2}[a-zA-Z0-9]{2}([a-zA-Z0-9]{3})?)", RegexOptions.Singleline | RegexOptions.Compiled); } - } diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 413adaffe1..a91bf691a6 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -792,9 +792,6 @@ - - - diff --git a/src/Libraries/SmartStore.Core/Utilities/ActionDisposable.cs b/src/Libraries/SmartStore.Core/Utilities/ActionDisposable.cs index dd99242538..8512b7fdcf 100644 --- a/src/Libraries/SmartStore.Core/Utilities/ActionDisposable.cs +++ b/src/Libraries/SmartStore.Core/Utilities/ActionDisposable.cs @@ -2,7 +2,6 @@ namespace SmartStore.Utilities { - /// /// Allows action to be executed when it is disposed /// @@ -23,8 +22,5 @@ public void Dispose() { _action(); } - } - - } diff --git a/src/Libraries/SmartStore.Core/Utilities/Inflector.cs b/src/Libraries/SmartStore.Core/Utilities/Inflector.cs index a9f1c73e39..0bff363b4a 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Inflector.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Inflector.cs @@ -4,7 +4,6 @@ namespace SmartStore.Utilities { - /// /// Implementation of the Inflector in Ruby that transforms words from singular to plural, /// class names to table names, modularized class names to ones without, and class names to foreign keys @@ -303,7 +302,7 @@ public static string Dasherize(string underscoredWord) { return underscoredWord.Replace('_', '-'); } + #endregion } - } diff --git a/src/Libraries/SmartStore.Core/Utilities/Prettifier.cs b/src/Libraries/SmartStore.Core/Utilities/Prettifier.cs index d0d4cc2307..d9486c3f29 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Prettifier.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Prettifier.cs @@ -60,9 +60,6 @@ public static string PrettifyXML(string xml) var result = sb.ToString(); return result; } - } - } - } diff --git a/src/Libraries/SmartStore.Core/Utilities/Range.cs b/src/Libraries/SmartStore.Core/Utilities/Range.cs index 42780fbe9a..7b10f3e6c3 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Range.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Range.cs @@ -4,7 +4,6 @@ namespace SmartStore.Utilities { - /// /// Helper class with shortcut methods for managing enumerables. /// Useful for inlining object generation in tests @@ -135,5 +134,4 @@ public static int[] Array(int count) return array; } } - } diff --git a/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs b/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs index 4e863c3e87..5a4b428145 100644 --- a/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs +++ b/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs @@ -6,7 +6,6 @@ namespace SmartStore.Utilities { - public class StringTokenizer : IEnumerable { private const string _defaultDelim = " \t\n\r\f"; @@ -91,5 +90,4 @@ IEnumerator IEnumerable.GetEnumerator() #endregion } - } From 4c8d488dd5cd33960c0fb04f56dab1e01910c27b Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 20 Aug 2020 11:46:08 +0200 Subject: [PATCH 066/695] Minor change --- .../SmartStore.Licensing.dll | Bin 260608 -> 260608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/SmartStore.Licensing/SmartStore.Licensing.dll b/lib/SmartStore.Licensing/SmartStore.Licensing.dll index 17bf4e2ad95b3880226181edd8cdd706e1c309d8..cc03daccc9911177bf1097152315fa3d91554988 100644 GIT binary patch literal 260608 zcmce<34B!5**|`BXXf6SJ2OdcCQL#CWDtVaSz<^OgSZ3~_gZl!pa>`^QMlp+7h+;S zQLBLaQmR%(ZQW{H>)N{3`l_uh;$8ulYIm1fyV~Oa`#k5|J9ln!NBish{`oMu=RD_p z&+?q@InUX?GUqZSq$o-lzt2Bcl!x%8f8G4I@}D6%SGPP;t^6SN!uW@(4tZhxktZ)H zW==cZKI!xYOEV`dShmdW%Pd@!Ieo>l%#vl9eZP7{W~qJRqPAqxm?(ojY^I_dQWa9B z?7P?TPHb;0ZR6urnxcG+ltl$KTa6TEV9roVyM~z*PhVv|+(D;*A*FkbqSW&L z(pOrA7iCj2tQ#9@2@lQEaGPqRaT=*q}q^conlA;(QI3?Ata}j|jW)T_C3{B+7ri5v#wHhD$JThmE zrY!uoDsRFwyqaprCRdAGL-rv48rsYTWOM>N)Zmwac?y1q;I|&Xh4`I?-@$O(4ZpWw z{u_StV2a@>DpH~p;f5%R7x4;p{q?$n~B=% zQX2&oK2)1ZOZZgR1$ZDieS}J8?c@ZQTM9Zjq}p+c9^s1e%N+$e`WDqj9yC$Fx#^${ z5iN>DNm>E4(}?y=$=_(uP=2c2NQoy_<+NfBL9bM^il=^qJEDHG0cmvV4D4pn0FLSm zIojw=e02tGfs(xTHB>+(TbY82OJ<9_f>7NO&!*bPDi;#tgX&ZbfF?Y=iSGpbvM}$3 z?`6_F2j3O=-6icw`6YiphFNP#PopyILRk=pOPr)sbR`9~RBiIaUv~NgC;;4A(rXo5 zH(CCrT2X?@@-K0>h!D3qN2xSvGVAYxolih(oow_v& zo(rLLZ+4Int*N-x2?w^=EpSUj)4knY2*cV1^i;ICD?V{EYNLBFQu;P?63n~7T$*4-HJ2jh~4h>QEKhk%C&K90q<5;1`9N{-xR@%2oKH z`d2K+s;rell*YJqXlzw+J*{oNUT@G^tP}8U)LOdeJ6daLr*D(ilA&)iv+;U;472Te zeJru*dUgGhL^_$vsIf~atk&i9SC5T7{_@!D%?mcKB5SN+b}|<2+>&jx(ulU8rn3#` z6I7O6P}9ufKFGA8jkfp2H?HTSx;+!7TvdG{nvX{9{e&eM+w>@c<9gYNKw=b9jB9AA zX0Wx5qd*^L?++-A3p2D@DcU8fLY^ z(|~O&yMUuYe)kf5R@1#!20l>6no@`Q ziCoC~XgC=V#iVCGzA&%!W<~en*qYWYLouU1WVZb6h_kq0h_yFr4Vl5t+t-nqi8pGE znTM9|egs=Y0oHw6`U*Fr}HAzHB~yz%Sy@$0!f*eq{cjp>oGtm34U1kXbEQ zAQDXZeNp6>5>I>~t~^rW3i-Qn7%MX~i3=jX1WIY4CGij%I<;ob|L{D{j>k-Gc5+0< z%uak^{#AW|%0Z0|P&s(&WJp1u$N&7b&e!nDYrm(aLyQ{M=H9hNgSyFwp++wn2DMXP zQ|8KyVo{D(Lz%-L9#v1glT7Ma0Edg!%scv~mnCWOqMlIZk;ewlaJ|ijr+L8cxYut! zb%{M{sAs_fPkzJ7A}7D)&B~WpU)R8?^R?Q{pMPpCrV}qc9w}Qq7L8EARuEYjGqd1wy z2GERjnf#e_+}QwkNB)F=ljH@KKgp4#fZ_5d%>>rcKtp*AwZ|2V68tZ;VkxLRmmoBC4)dK zUY6uPB5K5nDl8^yk_>(m86_*`l75(TL zM4Mp)(h3@8NrJ`(&<;{bT*MrHU;MQXLWRjHhYDIq5)UR~s@+u3j1;tIvp5}oF`r|k z4Z(}r6XRzJGxRi?Jsy9`bpzEcjR>dKkw-_Yi!F_vg-~A|G8tEOo04Wx1Ta$s7DWIv zMPN|`-mIg|N0psq8bug}NTbF9b=HYgY9gpVl8Oes2(|aHG7C(ie`;p8-u^e5i^~zw zz;WP~nkme?;Sx!xXTm$b-|dW+r0{YpQ!Y^sxODzw=iLO{PC>Byv2kW^S3yGppGKmGoQO)p7e1v z6Q*BvQbrQaW5NNuKWa+CFPX6X>;q4ggzqxpzJd1-mxTS8F!|Txc9DbuCMc!~*&@9BS}B_&wY&Xmm`eD|kL_P)-P7xp~t6$!%h4~hT$(2Y+?!qZIH z$NF@+B%m9DkE4q(JGr@v3Fj>QhLhi;m{9lG?`;YBDHG0o>`xC!!U85tQGV)_?&q?dP?FmC!e=SjkPCRjC>JnLY7&XiS0^fyW`yD;I?eP7!k314Nx zqG$5&OTuMLc)R(5u}&Zm)e-RxtG+c&dO;foq35$5ztSYKgMki&=!s9<<7Du9rmXtb zW$&hi7mRA~vdfv>FUvq67J=~6>7S$};XWqlPo7oNQY$danDV{r_PbJgL1#%3ANSD@ zB;he8-2TC56D8qcCN#hE#J-ZSm
T{}s_&P+J{=@*?MUdMztzqN9T^nv~XvFvlq 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

QYx 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 Date: Thu, 20 Aug 2020 13:16:50 +0200 Subject: [PATCH 067/695] Use the tenant temp folder when creating PDFs --- src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs b/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs index 72181616b6..5c43feae89 100644 --- a/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs +++ b/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs @@ -73,7 +73,8 @@ internal HtmlToPdfConverter CreateWkConverter(PdfConvertSettings settings) PageHeight = settings.PageHeight, PageWidth = settings.PageWidth, Size = (PageSize)(int)settings.Size, - PdfToolPath = FileSystemHelper.TempDir("wkhtmltopdf") + PdfToolPath = FileSystemHelper.TempDir("wkhtmltopdf"), + TempFilesPath = FileSystemHelper.TempDirTenant() }; if (settings.Margins != null) From 531f8a8a5f49dee3cefc14942c4f44be0628d0dd Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Thu, 20 Aug 2020 14:59:29 +0200 Subject: [PATCH 068/695] (cookie manager) Admin area for user defined cookie information --- .../Domain/Customers/PrivacySettings.cs | 8 +- .../Plugins/ICookiePublisher.cs | 15 +- .../Migrations/MigrationsConfiguration.cs | 58 ++ .../Controllers/SettingController.cs | 220 ++++++- .../Settings/CustomerUserSettingsModel.cs | 65 +- .../Administration/SmartStore.Admin.csproj | 9 + .../Setting/CookieInfoCreatePopup.cshtml | 22 + .../Views/Setting/CookieInfoEditPopup.cshtml | 22 + .../Views/Setting/CustomerUser.cshtml | 577 ++++++++++-------- .../Setting/_CreateOrUpdateCookieInfo.cshtml | 71 +++ 10 files changed, 808 insertions(+), 259 deletions(-) create mode 100644 src/Presentation/SmartStore.Web/Administration/Views/Setting/CookieInfoCreatePopup.cshtml create mode 100644 src/Presentation/SmartStore.Web/Administration/Views/Setting/CookieInfoEditPopup.cshtml create mode 100644 src/Presentation/SmartStore.Web/Administration/Views/Setting/_CreateOrUpdateCookieInfo.cshtml diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs index f88ec44f6a..9577d1f533 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs @@ -1,10 +1,9 @@ using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Localization; -using SmartStore.Core.Domain.Orders; namespace SmartStore.Core.Domain.Customers { - public class PrivacySettings : BaseEntity, ISettings, ILocalizedEntity + public class PrivacySettings : BaseEntity, ISettings, ILocalizedEntity { public PrivacySettings() { @@ -38,5 +37,10 @@ public PrivacySettings() /// Gets or sets a value indicating whether the full name field is required on product requests ///

public bool FullNameOnProductRequestRequired { get; set; } + + /// + /// Gets or sets cookie infos (JSON serialized) + /// + public string CookieInfos { get; set; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Plugins/ICookiePublisher.cs b/src/Libraries/SmartStore.Core/Plugins/ICookiePublisher.cs index aea384dafd..39eb636d9e 100644 --- a/src/Libraries/SmartStore.Core/Plugins/ICookiePublisher.cs +++ b/src/Libraries/SmartStore.Core/Plugins/ICookiePublisher.cs @@ -1,4 +1,6 @@ -using System; +using SmartStore.Core.Domain.Localization; +using System; +using System.Runtime.Serialization; using System.Web.Routing; namespace SmartStore.Core.Plugins @@ -17,21 +19,30 @@ public interface ICookiePublisher /// /// Plugin cookie infos. /// - public class CookieInfo + public class CookieInfo : BaseEntity, ILocalizedEntity { /// /// Name of the plugin. /// + [DataMember] public string Name { get; set; } /// /// Description of the cookie (e.g. purpose of using the cookie). /// + [DataMember] public string Description { get; set; } + /// + /// SelectedStoreIds + /// + [DataMember] + public int[] SelectedStoreIds { get; set; } + /// /// Type of the cookie. /// + [DataMember] public CookieType CookieType { get; set; } } diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 9efea3f03e..93431e8b3b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -203,6 +203,64 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Standards nur auf der Startseite verwenden", "Determines whether the default meta informations are used only on the home page, rather than as defaults for every page.", "Legt fest, ob die Standard-Meta-Informationen nur auf der Startseite anstatt als Standardeinstellung für jede Seite verwendet werden."); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AddCookieInfo.Title", + "Add new cookie information", + "Neue Cookie-Informationen zufügen"); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.EditCookieInfo.Title", + "Add new cookie information", + "Neue Cookie-Informationen zufügen"); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.Name", + "Name", + "Name", + "Specifies the display name of the cookie information.", + "Bestimmt den Anzeigenamen der Cookie-Information."); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.Description", + "Description", + "Beschreibung", + "Specifies the description of the cookie information.", + "Bestimmt die Beschreibung der Cookie-Information."); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.CookieType", + "Cookie type", + "Art des Cookies", + "Specifies the usage type of the cookie (Required, Analytics, ThirdParty).", + "Bestimmt die Verwendungsart des Cookies (Required, Analytics, ThirdParty)."); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.IsPluginInfo", + "System cookie", + "System-Cookie"); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.CookieInfoNotFound", + "Cookie information wasn't found.", + "Cookie-Information wurde nicht gefunden."); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AdminInstruction", + @"
Cookie Information
+

+ If you have included third-party scripts in your shop that use cookies and are not integrated into Smartstore via a plugin, + you can provide your own information about these cookies for the Cookie Manager in the following table. +

+

+ The added information is displayed in the Cookie Manager of the front end, corresponding to the type. + Cookie information provided to the Cookie Manager by active plug-ins is displayed in this table, + but cannot be edited. The texts of this information can be edited using the language resources + Admin > Configuration > Regional Settings > Languages. +

", + @"
Cookie-Informationen
+

+ Wenn Sie Scripte von Drittanbietern in Ihren Shop eingebunden haben, die Cookies nutzen und die nicht über ein Plugin in Smartstore integriert sind, + können Sie in folgender Tabelle eigene Informationen über diese Cookies für den Cookie-Manager bereitstellen. +

+

+ Die zugefügten Informtionen werden, dem Typ entsprechend, im Cookie-Manager des Frontends angezeigt. + Cookie-Informationen, die dem Cookie-Manager von aktiven Plugins zur Verfügung gestellt werden, werden in dieser Tabelle angezeigt, + können aber nicht bearbeitet werden. Die Texte dieser Informationen können über die Sprachresourcen bearbeitet werden + Admin > Konfiguration > Regionale Einstellungen > Sprachen. +

"); } } } diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs index 96641b1ef9..41b7bd7d1d 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.Mvc; +using Newtonsoft.Json; using SmartStore.Admin.Models.Common; using SmartStore.Admin.Models.Settings; using SmartStore.ComponentModel; @@ -41,6 +42,7 @@ using SmartStore.Services.Search.Extensions; using SmartStore.Services.Search.Modelling; using SmartStore.Services.Security; +using SmartStore.Services.Stores; using SmartStore.Services.Tax; using SmartStore.Utilities; using SmartStore.Web.Framework; @@ -82,8 +84,9 @@ public partial class SettingController : AdminControllerBase private readonly Lazy _catalogSearchQueryAliasMapper; private readonly Lazy _forumSearchQueryAliasMapper; private readonly Lazy _menuService; - - private StoreDependingSettingHelper _storeDependingSettings; + private readonly ICookieManager _cookieManager; + + private StoreDependingSettingHelper _storeDependingSettings; #endregion @@ -111,7 +114,8 @@ public SettingController( Lazy mediaTracker, Lazy catalogSearchQueryAliasMapper, Lazy forumSearchQueryAliasMapper, - Lazy menuService) + Lazy menuService, + ICookieManager cookieManager) { _countryService = countryService; _stateProvinceService = stateProvinceService; @@ -135,7 +139,8 @@ public SettingController( _catalogSearchQueryAliasMapper = catalogSearchQueryAliasMapper; _forumSearchQueryAliasMapper = forumSearchQueryAliasMapper; _menuService = menuService; - } + _cookieManager = cookieManager; + } #endregion @@ -998,7 +1003,212 @@ public ActionResult CustomerUser(CustomerUserSettingsModel model, FormCollection } - [Permission(Permissions.Configuration.Setting.Read)] + #region CookieInfos + + [HttpPost, GridAction(EnableCustomBinding = true)] + public ActionResult CookieInfoList(GridCommand command) + { + var data = _cookieManager.GetAllCookieInfos(); + var systemCookies = string.Join(",", data.Select(x => x.Name).ToArray()); + var privacySettings = Services.Settings.LoadSetting(); + + if (privacySettings.CookieInfos.HasValue()) + { + data.AddRange(JsonConvert.DeserializeObject>(privacySettings.CookieInfos) + .OrderBy(x => x.CookieType) + .ThenBy(x => x.Name)); + } + + var model = new GridModel + { + Data = data + .Select(x => { + return new CookieInfoModel + { + CookieType = x.CookieType, + Name = x.Name, + Description = x.Description, + IsPluginInfo = systemCookies.Contains(x.Name), + CookieTypeName = x.CookieType.ToString() + }; + }) + .ToList(), + Total = data.Count + }; + + return new JsonResult + { + Data = model + }; + } + + [GridAction(EnableCustomBinding = true)] + public ActionResult CookieInfoDelete(string name, GridCommand command) + { + // First deserialize setting. + var privacySettings = Services.Settings.LoadSetting(); + + var ciList = JsonConvert.DeserializeObject>(privacySettings.CookieInfos); + ciList.Remove(x => x.Name.IsCaseInsensitiveEqual(name)); + + // Now serialize again. + privacySettings.CookieInfos = JsonConvert.SerializeObject(ciList, Formatting.None); + + // Save setting. + Services.Settings.SaveSetting(privacySettings, x => x.CookieInfos, 0, true); + + return CookieInfoList(command); + } + + public ActionResult CookieInfoCreatePopup() + { + var model = new CookieInfoModel(); + + AddLocales(_languageService, model.Locales); + + return View(model); + } + + [HttpPost] + [AdminAuthorize] + public ActionResult CookieInfoCreatePopup(string btnId, string formId, CookieInfoModel model) + { + if (!ModelState.IsValid) + return View(model); + + // Deserialize + var privacySettings = Services.Settings.LoadSetting(); + var ciList = JsonConvert.DeserializeObject>(privacySettings.CookieInfos); + + if (ciList == null) + ciList = new List(); + + var cookieInfo = ciList + .Select(x => x) + .Where(x => x.Name.IsCaseInsensitiveEqual(model.Name)) + .FirstOrDefault(); + + if (cookieInfo != null) + { + // Remove item if it's already there. + ciList.Remove(x => x.Name.IsCaseInsensitiveEqual(cookieInfo.Name)); + } + + cookieInfo = new CookieInfo + { + // TODO: Use MiniMapper + CookieType = model.CookieType, + Name = model.Name, + Description = model.Description, + SelectedStoreIds = model.SelectedStoreIds + }; + + ciList.Add(cookieInfo); + + // Serialize + privacySettings.CookieInfos = JsonConvert.SerializeObject(ciList, Formatting.None); + + // Now save again. + Services.Settings.SaveSetting(privacySettings, x => x.CookieInfos, 0, true); + + foreach (var localized in model.Locales) + { + _localizedEntityService.SaveLocalizedValue(cookieInfo, x => x.Name, localized.Name, localized.LanguageId); + _localizedEntityService.SaveLocalizedValue(cookieInfo, x => x.Description, localized.Description, localized.LanguageId); + } + + ViewBag.RefreshPage = true; + ViewBag.btnId = btnId; + ViewBag.formId = formId; + + return View(model); + } + + [AdminAuthorize] + public ActionResult CookieInfoEditPopup(string name) + { + var privacySettings = Services.Settings.LoadSetting(); + var ciList = JsonConvert.DeserializeObject>(privacySettings.CookieInfos); + var cookieInfo = ciList + .Select(x => x) + .Where(x => x.Name.IsCaseInsensitiveEqual(name)) + .FirstOrDefault(); + + if (cookieInfo == null) + { + NotifyError(T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.CookieInfoNotFound")); + return View(new CookieInfoModel()); + } + + var model = new CookieInfoModel + { + CookieType = cookieInfo.CookieType, + Name = cookieInfo.Name, + Description = cookieInfo.Description, + SelectedStoreIds = cookieInfo.SelectedStoreIds + }; + + AddLocales(_languageService, model.Locales, (locale, languageId) => + { + locale.Name = cookieInfo.GetLocalized(x => x.Name, languageId, false, false); + locale.Description = cookieInfo.GetLocalized(x => x.Description, languageId, false, false); + }); + + return View(model); + } + + [HttpPost] + [AdminAuthorize] + public ActionResult CookieInfoEditPopup(string btnId, string formId, CookieInfoModel model) + { + var privacySettings = Services.Settings.LoadSetting(); + var ciList = JsonConvert.DeserializeObject>(privacySettings.CookieInfos); + var cookieInfo = ciList + .Select(x => x) + .Where(x => x.Name.IsCaseInsensitiveEqual(model.Name)) + .FirstOrDefault(); + + if (cookieInfo == null) + { + NotifyError(T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.CookieInfoNotFound")); + ViewBag.RefreshPage = true; + ViewBag.btnId = btnId; + ViewBag.formId = formId; + return View(new CookieInfoModel()); + } + + if (ModelState.IsValid) + { + cookieInfo.Name = model.Name; + cookieInfo.Description = model.Description; + cookieInfo.CookieType = model.CookieType; + cookieInfo.SelectedStoreIds = model.SelectedStoreIds; + + ciList.Remove(x => x.Name.IsCaseInsensitiveEqual(cookieInfo.Name)); + ciList.Add(cookieInfo); + + privacySettings.CookieInfos = JsonConvert.SerializeObject(ciList, Formatting.None); + + Services.Settings.SaveSetting(privacySettings, x => x.CookieInfos, 0, true); + + foreach (var localized in model.Locales) + { + _localizedEntityService.SaveLocalizedValue(cookieInfo, x => x.Name, localized.Name, localized.LanguageId); + _localizedEntityService.SaveLocalizedValue(cookieInfo, x => x.Description, localized.Description, localized.LanguageId); + } + + ViewBag.RefreshPage = true; + ViewBag.btnId = btnId; + ViewBag.formId = formId; + } + + return View(model); + } + + #endregion + + + [Permission(Permissions.Configuration.Setting.Read)] public ActionResult GeneralCommon() { // Set page timeout to 5 minutes. diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs index 47e9d9e4e0..ad552d0cef 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs @@ -4,6 +4,7 @@ using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Customers; +using SmartStore.Core.Plugins; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Localization; using SmartStore.Web.Framework.Modelling; @@ -258,7 +259,8 @@ public partial class PrivacySettingsModel public PrivacySettingsModel() { EnableCookieConsent = true; - } + CookieInfos = new List(); + } [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.EnableCookieConsent")] public bool EnableCookieConsent { get; set; } @@ -274,10 +276,12 @@ public PrivacySettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.FullNameOnProductRequestRequired")] public bool FullNameOnProductRequestRequired { get; set; } - } - - #endregion - } + + public List CookieInfos { get; set; } + } + + #endregion + } public class CustomerUserSettingsLocalizedModel : ILocalizedModelLocal { @@ -287,6 +291,57 @@ public class CustomerUserSettingsLocalizedModel : ILocalizedModelLocal public string Salutations { get; set; } } + public partial class CookieInfoModel : ILocalizedModel + { + public CookieInfoModel () + { + Locales = new List(); + } + + [Required] + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.Name")] + public string Name { get; set; } + + [Required] + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.Description")] + public string Description { get; set; } + + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.CookieType")] + public CookieType CookieType { get; set; } + + /// + /// Used for display in grid + /// + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.CookieType")] + public string CookieTypeName { get; set; } + + /// + /// Used to mark which cookie info can be deleted from setting. + /// + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.IsPluginInfo")] + public bool IsPluginInfo { get; set; } + + [UIHint("Stores")] + [AdditionalMetadata("multiple", true)] + [SmartResourceDisplayName("Admin.Common.Store.LimitedTo")] + public int[] SelectedStoreIds { get; set; } + + [SmartResourceDisplayName("Admin.Common.Store.LimitedTo")] + public bool LimitedToStores { get; set; } + + public IList Locales { get; set; } + } + + public class CookieInfoLocalizedModel : ILocalizedModelLocal + { + public int LanguageId { get; set; } + + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.Name")] + public string Name { get; set; } + + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.Description")] + public string Description { get; set; } + } public partial class CustomerUserSettingsValidator : AbstractValidator { diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index 2eefc4a9dc..4c33fe7fb3 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -657,6 +657,15 @@ + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/CookieInfoCreatePopup.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CookieInfoCreatePopup.cshtml new file mode 100644 index 0000000000..e92f27aa80 --- /dev/null +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CookieInfoCreatePopup.cshtml @@ -0,0 +1,22 @@ +@model CookieInfoModel +@using SmartStore.Admin.Models.Settings; +@{ + ViewBag.Title = T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AddCookieInfo.Title").Text; + Layout = "_AdminPopupLayout"; +} +@using (Html.BeginForm()) +{ +
+
+ @T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AddCookieInfo.Title") +
+
+ +
+
+ + Html.RenderPartial("_CreateOrUpdateCookieInfo", Model); +} \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/CookieInfoEditPopup.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CookieInfoEditPopup.cshtml new file mode 100644 index 0000000000..d6c066a941 --- /dev/null +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CookieInfoEditPopup.cshtml @@ -0,0 +1,22 @@ +@model CookieInfoModel +@using SmartStore.Admin.Models.Settings; +@{ + ViewBag.Title = T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.EditCookieInfo.Title").Text; + Layout = "_AdminPopupLayout"; +} +@using (Html.BeginForm()) +{ +
+
+ @T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.EditCookieInfo.Title") +
+
+ +
+
+ + Html.RenderPartial("_CreateOrUpdateCookieInfo", Model); +} \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml index f153d5f3a3..49e64dc861 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml @@ -15,26 +15,26 @@
+ + @T("Admin.Common.Save") +
Html.RenderAction("StoreScopeConfiguration", "Setting"); @Html.ValidationSummary(false) - + @Html.SmartStore().TabStrip().Name("customersettings-edit").Style(TabsStyle.Material).Position(TabsPosition.Top).Items(x => { - x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.CustomerSettings").Text).Content(TabCustomerSettings()).Selected(true); - x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.CustomerFormFields").Text).Content(TabCustomerFormFields().ToHtmlString()); - x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.AddressFormFields").Text).Content(TabAddressFormFields().ToHtmlString()); - x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.DateTimeSettings").Text).Content(TabDateTimeSettings()); - x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.ExternalAuthenticationSettings").Text).Content(TabExternalAuthenticationSettings()); - x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.Privacy").Text).Content(TabPrivacy()); - EngineContext.Current.Resolve().Publish(new TabStripCreated(x, "customersettings-edit", this.Html, this.Model)); - }) + x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.CustomerSettings").Text).Content(TabCustomerSettings()).Selected(true); + x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.CustomerFormFields").Text).Content(TabCustomerFormFields().ToHtmlString()); + x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.AddressFormFields").Text).Content(TabAddressFormFields().ToHtmlString()); + x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.DateTimeSettings").Text).Content(TabDateTimeSettings()); + x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.ExternalAuthenticationSettings").Text).Content(TabExternalAuthenticationSettings()); + x.Add().Text(T("Admin.Configuration.Settings.CustomerUser.Privacy").Text).Content(TabPrivacy()); + EngineContext.Current.Resolve().Publish(new TabStripCreated(x, "customersettings-edit", this.Html, this.Model)); + }) } @helper TabCustomerSettings() @@ -56,74 +56,74 @@ @Html.SmartLabelFor(model => model.CustomerSettings.CustomerLoginType) - @Html.DropDownListForEnum(model => model.CustomerSettings.CustomerLoginType) + @Html.DropDownListForEnum(model => model.CustomerSettings.CustomerLoginType) @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerLoginType) - - - - @Html.SmartLabelFor(model => model.CustomerSettings.AllowUsersToChangeUsernames) - - - @Html.SettingEditorFor(model => model.CustomerSettings.AllowUsersToChangeUsernames) - @Html.ValidationMessageFor(model => model.CustomerSettings.AllowUsersToChangeUsernames) - - - - - @Html.SmartLabelFor(model => model.CustomerSettings.CheckUsernameAvailabilityEnabled) - - - @Html.SettingEditorFor(model => model.CustomerSettings.CheckUsernameAvailabilityEnabled) - @Html.ValidationMessageFor(model => model.CustomerSettings.CheckUsernameAvailabilityEnabled) - - - - - - @Html.SmartLabelFor(model => model.CustomerSettings.CustomerNameFormat) - - - @Html.EnumSettingEditorFor(model => model.CustomerSettings.CustomerNameFormat) - @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerNameFormat) - - - - - @Html.SmartLabelFor(model => model.CustomerSettings.CustomerNameFormatMaxLength) - - - @Html.SettingEditorFor(model => model.CustomerSettings.CustomerNameFormatMaxLength) - @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerNameFormatMaxLength) - - + + + + @Html.SmartLabelFor(model => model.CustomerSettings.AllowUsersToChangeUsernames) + + + @Html.SettingEditorFor(model => model.CustomerSettings.AllowUsersToChangeUsernames) + @Html.ValidationMessageFor(model => model.CustomerSettings.AllowUsersToChangeUsernames) + + + + + @Html.SmartLabelFor(model => model.CustomerSettings.CheckUsernameAvailabilityEnabled) + + + @Html.SettingEditorFor(model => model.CustomerSettings.CheckUsernameAvailabilityEnabled) + @Html.ValidationMessageFor(model => model.CustomerSettings.CheckUsernameAvailabilityEnabled) + + + + + + @Html.SmartLabelFor(model => model.CustomerSettings.CustomerNameFormat) + + + @Html.EnumSettingEditorFor(model => model.CustomerSettings.CustomerNameFormat) + @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerNameFormat) + + + + + @Html.SmartLabelFor(model => model.CustomerSettings.CustomerNameFormatMaxLength) + + + @Html.SettingEditorFor(model => model.CustomerSettings.CustomerNameFormatMaxLength) + @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerNameFormatMaxLength) + + - - - @Html.SmartLabelFor(model => model.CustomerSettings.CustomerNumberMethod) - - - @Html.EnumSettingEditorFor(model => model.CustomerSettings.CustomerNumberMethod) - @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerNumberMethod) - - - - - @Html.SmartLabelFor(model => model.CustomerSettings.CustomerNumberVisibility) - - - @Html.EnumSettingEditorFor(model => model.CustomerSettings.CustomerNumberVisibility) - @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerNumberVisibility) - - + + + @Html.SmartLabelFor(model => model.CustomerSettings.CustomerNumberMethod) + + + @Html.EnumSettingEditorFor(model => model.CustomerSettings.CustomerNumberMethod) + @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerNumberMethod) + + + + + @Html.SmartLabelFor(model => model.CustomerSettings.CustomerNumberVisibility) + + + @Html.EnumSettingEditorFor(model => model.CustomerSettings.CustomerNumberVisibility) + @Html.ValidationMessageFor(model => model.CustomerSettings.CustomerNumberVisibility) + + @Html.SmartLabelFor(model => model.CustomerSettings.UserRegistrationType) - @Html.EnumSettingEditorFor(model => model.CustomerSettings.UserRegistrationType) + @Html.EnumSettingEditorFor(model => model.CustomerSettings.UserRegistrationType) @Html.ValidationMessageFor(model => model.CustomerSettings.UserRegistrationType) @@ -132,8 +132,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.RegisterCustomerRoleId) - @Html.SettingEditorFor(model => model.CustomerSettings.RegisterCustomerRoleId, - Html.EditorFor(model => model.CustomerSettings.RegisterCustomerRoleId, null, new { htmlAttributes = new { data_placeholder = T("Common.Unspecified").Text } })) + @Html.SettingEditorFor(model => model.CustomerSettings.RegisterCustomerRoleId, + Html.EditorFor(model => model.CustomerSettings.RegisterCustomerRoleId, null, new { htmlAttributes = new { data_placeholder = T("Common.Unspecified").Text } })) @Html.ValidationMessageFor(model => model.CustomerSettings.RegisterCustomerRoleId) @@ -143,8 +143,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.AllowCustomersToUploadAvatars) - @Html.SettingEditorFor(model => model.CustomerSettings.AllowCustomersToUploadAvatars, - Html.CheckBoxFor(model => model.CustomerSettings.AllowCustomersToUploadAvatars)) + @Html.SettingEditorFor(model => model.CustomerSettings.AllowCustomersToUploadAvatars, + Html.CheckBoxFor(model => model.CustomerSettings.AllowCustomersToUploadAvatars)) @Html.ValidationMessageFor(model => model.CustomerSettings.AllowCustomersToUploadAvatars) @@ -279,11 +279,11 @@ @helper TabCustomerFormFields() { -
- @T("Admin.Configuration.Settings.CustomerUser.CustomerFormFields.Description") - -
- +
+ @T("Admin.Configuration.Settings.CustomerUser.CustomerFormFields.Description") + +
+ - - - - - - - - + + + + + + + + @@ -354,8 +354,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.StreetAddressEnabled) @@ -373,8 +373,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.StreetAddress2Enabled) @@ -392,8 +392,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.ZipPostalCodeEnabled) @@ -411,8 +411,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.CityEnabled) @@ -430,8 +430,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.CountryEnabled) @@ -449,8 +449,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.PhoneEnabled) @@ -468,8 +468,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.FaxEnabled) @@ -496,11 +496,11 @@ @helper TabAddressFormFields() { -
- @T("Admin.Configuration.Settings.CustomerUser.AddressFormFields.Description") - -
- +
+ @T("Admin.Configuration.Settings.CustomerUser.AddressFormFields.Description") + +
+
@@ -303,24 +303,24 @@ @Html.ValidationMessageFor(model => model.CustomerSettings.TitleEnabled)
- @Html.SmartLabelFor(model => model.CustomerSettings.FirstNameRequired) - - @Html.SettingEditorFor(model => model.CustomerSettings.FirstNameRequired) - @Html.ValidationMessageFor(model => model.CustomerSettings.FirstNameRequired) -
- @Html.SmartLabelFor(model => model.CustomerSettings.LastNameRequired) - - @Html.SettingEditorFor(model => model.CustomerSettings.LastNameRequired) - @Html.ValidationMessageFor(model => model.CustomerSettings.LastNameRequired) -
+ @Html.SmartLabelFor(model => model.CustomerSettings.FirstNameRequired) + + @Html.SettingEditorFor(model => model.CustomerSettings.FirstNameRequired) + @Html.ValidationMessageFor(model => model.CustomerSettings.FirstNameRequired) +
+ @Html.SmartLabelFor(model => model.CustomerSettings.LastNameRequired) + + @Html.SettingEditorFor(model => model.CustomerSettings.LastNameRequired) + @Html.ValidationMessageFor(model => model.CustomerSettings.LastNameRequired) +
@Html.SmartLabelFor(model => model.CustomerSettings.DateOfBirthEnabled) @@ -335,8 +335,8 @@ @Html.SmartLabelFor(model => model.CustomerSettings.CompanyEnabled) - @Html.SettingEditorFor(model => model.CustomerSettings.CompanyEnabled, - Html.CheckBoxFor(model => model.CustomerSettings.CompanyEnabled, new { data_toggler_for = "#pnlCompanyRequired" })) + @Html.SettingEditorFor(model => model.CustomerSettings.CompanyEnabled, + Html.CheckBoxFor(model => model.CustomerSettings.CompanyEnabled, new { data_toggler_for = "#pnlCompanyRequired" })) @Html.ValidationMessageFor(model => model.CustomerSettings.CompanyEnabled)
- @Html.SettingEditorFor(model => model.CustomerSettings.StreetAddressEnabled, - Html.CheckBoxFor(model => model.CustomerSettings.StreetAddressEnabled, new { data_toggler_for = "#pnlStreetAddressRequired" })) + @Html.SettingEditorFor(model => model.CustomerSettings.StreetAddressEnabled, + Html.CheckBoxFor(model => model.CustomerSettings.StreetAddressEnabled, new { data_toggler_for = "#pnlStreetAddressRequired" })) @Html.ValidationMessageFor(model => model.CustomerSettings.StreetAddressEnabled)
- @Html.SettingEditorFor(model => model.CustomerSettings.StreetAddress2Enabled, - Html.CheckBoxFor(model => model.CustomerSettings.StreetAddress2Enabled, new { data_toggler_for = "#pnlStreetAddress2Required" })) + @Html.SettingEditorFor(model => model.CustomerSettings.StreetAddress2Enabled, + Html.CheckBoxFor(model => model.CustomerSettings.StreetAddress2Enabled, new { data_toggler_for = "#pnlStreetAddress2Required" })) @Html.ValidationMessageFor(model => model.CustomerSettings.StreetAddress2Enabled)
- @Html.SettingEditorFor(model => model.CustomerSettings.ZipPostalCodeEnabled, - Html.CheckBoxFor(model => model.CustomerSettings.ZipPostalCodeEnabled, new { data_toggler_for = "#pnlZipPostalCodeRequired" })) + @Html.SettingEditorFor(model => model.CustomerSettings.ZipPostalCodeEnabled, + Html.CheckBoxFor(model => model.CustomerSettings.ZipPostalCodeEnabled, new { data_toggler_for = "#pnlZipPostalCodeRequired" })) @Html.ValidationMessageFor(model => model.CustomerSettings.ZipPostalCodeEnabled)
- @Html.SettingEditorFor(model => model.CustomerSettings.CityEnabled, - Html.CheckBoxFor(model => model.CustomerSettings.CityEnabled, new { data_toggler_for = "#pnlCityRequired" })) + @Html.SettingEditorFor(model => model.CustomerSettings.CityEnabled, + Html.CheckBoxFor(model => model.CustomerSettings.CityEnabled, new { data_toggler_for = "#pnlCityRequired" })) @Html.ValidationMessageFor(model => model.CustomerSettings.CityEnabled)
- @Html.SettingEditorFor(model => model.CustomerSettings.CountryEnabled, - Html.CheckBoxFor(model => model.CustomerSettings.CountryEnabled, new { data_toggler_for = "#pnlStateProvincEnabled" })) + @Html.SettingEditorFor(model => model.CustomerSettings.CountryEnabled, + Html.CheckBoxFor(model => model.CustomerSettings.CountryEnabled, new { data_toggler_for = "#pnlStateProvincEnabled" })) @Html.ValidationMessageFor(model => model.CustomerSettings.CountryEnabled)
- @Html.SettingEditorFor(model => model.CustomerSettings.PhoneEnabled, - Html.CheckBoxFor(model => model.CustomerSettings.PhoneEnabled, new { data_toggler_for = "#pnlPhoneRequired" })) + @Html.SettingEditorFor(model => model.CustomerSettings.PhoneEnabled, + Html.CheckBoxFor(model => model.CustomerSettings.PhoneEnabled, new { data_toggler_for = "#pnlPhoneRequired" })) @Html.ValidationMessageFor(model => model.CustomerSettings.PhoneEnabled)
- @Html.SettingEditorFor(model => model.CustomerSettings.FaxEnabled, - Html.CheckBoxFor(model => model.CustomerSettings.FaxEnabled, new { data_toggler_for = "#pnlFaxRequired" })) + @Html.SettingEditorFor(model => model.CustomerSettings.FaxEnabled, + Html.CheckBoxFor(model => model.CustomerSettings.FaxEnabled, new { data_toggler_for = "#pnlFaxRequired" })) @Html.ValidationMessageFor(model => model.CustomerSettings.FaxEnabled)
@@ -516,43 +516,43 @@ @Html.SmartLabelFor(model => model.AddressSettings.SalutationEnabled) - @Html.SettingEditorFor(model => model.AddressSettings.SalutationEnabled, - Html.CheckBoxFor(model => model.AddressSettings.SalutationEnabled, new { data_toggler_for = "#pnlAddressSettingsSalutations" })) + @Html.SettingEditorFor(model => model.AddressSettings.SalutationEnabled, + Html.CheckBoxFor(model => model.AddressSettings.SalutationEnabled, new { data_toggler_for = "#pnlAddressSettingsSalutations" })) @Html.ValidationMessageFor(model => model.AddressSettings.SalutationEnabled)
-
- @(Html.LocalizedEditor("setting-customer-localized", - @ - - - + +
- @Html.SmartLabelFor(model => model.Locales[item].Salutations) - - @*IMPORTANT: Do not delete, this hidden element contains the id to assign localized values to the corresponding language *@ - @Html.HiddenFor(model => model.Locales[item].LanguageId) +
+ @(Html.LocalizedEditor("setting-customer-localized", + @ + + + - -
+ @Html.SmartLabelFor(model => model.Locales[item].Salutations) + + @*IMPORTANT: Do not delete, this hidden element contains the id to assign localized values to the corresponding language *@ + @Html.HiddenFor(model => model.Locales[item].LanguageId) - @Html.TextBoxFor(model => Model.Locales[item].Salutations) - @Html.ValidationMessageFor(model => model.Locales[item].Salutations) -
- , - @ - - - - -
- @Html.SmartLabelFor(model => model.AddressSettings.Salutations) - - @Html.TextBoxFor(model => model.AddressSettings.Salutations) - @Html.ValidationMessageFor(model => model.AddressSettings.Salutations) -
- )) -
+ @Html.TextBoxFor(model => Model.Locales[item].Salutations) + @Html.ValidationMessageFor(model => model.Locales[item].Salutations) +
+, + @ + + + + +
+ @Html.SmartLabelFor(model => model.AddressSettings.Salutations) + + @Html.TextBoxFor(model => model.AddressSettings.Salutations) + @Html.ValidationMessageFor(model => model.AddressSettings.Salutations) +
+ )) +
@@ -569,8 +569,8 @@ @Html.SmartLabelFor(model => model.AddressSettings.CompanyEnabled) @@ -588,8 +588,8 @@ @Html.SmartLabelFor(model => model.AddressSettings.StreetAddressEnabled) @@ -607,8 +607,8 @@ @Html.SmartLabelFor(model => model.AddressSettings.StreetAddress2Enabled) @@ -626,8 +626,8 @@ @Html.SmartLabelFor(model => model.AddressSettings.ZipPostalCodeEnabled) @@ -645,8 +645,8 @@ @Html.SmartLabelFor(model => model.AddressSettings.CityEnabled) @@ -664,47 +664,47 @@ @Html.SmartLabelFor(model => model.AddressSettings.CountryEnabled) - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -722,8 +722,8 @@ @Html.SmartLabelFor(model => model.AddressSettings.FaxEnabled) @@ -756,8 +756,8 @@ @Html.SmartLabelFor(model => model.DateTimeSettings.DefaultStoreTimeZoneId) @@ -781,52 +781,139 @@ @helper TabPrivacy() { -
- @Html.SettingEditorFor(model => model.AddressSettings.CompanyEnabled, - Html.CheckBoxFor(model => model.AddressSettings.CompanyEnabled, new { data_toggler_for = "#pnlAddressCompanyRequired" })) + @Html.SettingEditorFor(model => model.AddressSettings.CompanyEnabled, + Html.CheckBoxFor(model => model.AddressSettings.CompanyEnabled, new { data_toggler_for = "#pnlAddressCompanyRequired" })) @Html.ValidationMessageFor(model => model.AddressSettings.CompanyEnabled)
- @Html.SettingEditorFor(model => model.AddressSettings.StreetAddressEnabled, - Html.CheckBoxFor(model => model.AddressSettings.StreetAddressEnabled, new { data_toggler_for = "#pnlAddressStreetAddressRequired" })) + @Html.SettingEditorFor(model => model.AddressSettings.StreetAddressEnabled, + Html.CheckBoxFor(model => model.AddressSettings.StreetAddressEnabled, new { data_toggler_for = "#pnlAddressStreetAddressRequired" })) @Html.ValidationMessageFor(model => model.AddressSettings.StreetAddressEnabled)
- @Html.SettingEditorFor(model => model.AddressSettings.StreetAddress2Enabled, - Html.CheckBoxFor(model => model.AddressSettings.StreetAddress2Enabled, new { data_toggler_for = "#pnlAddressStreetAddress2Required" })) + @Html.SettingEditorFor(model => model.AddressSettings.StreetAddress2Enabled, + Html.CheckBoxFor(model => model.AddressSettings.StreetAddress2Enabled, new { data_toggler_for = "#pnlAddressStreetAddress2Required" })) @Html.ValidationMessageFor(model => model.AddressSettings.StreetAddress2Enabled)
- @Html.SettingEditorFor(model => model.AddressSettings.ZipPostalCodeEnabled, - Html.CheckBoxFor(model => model.AddressSettings.ZipPostalCodeEnabled, new { data_toggler_for = "#pnlAddressZipPostalCodeRequired" })) + @Html.SettingEditorFor(model => model.AddressSettings.ZipPostalCodeEnabled, + Html.CheckBoxFor(model => model.AddressSettings.ZipPostalCodeEnabled, new { data_toggler_for = "#pnlAddressZipPostalCodeRequired" })) @Html.ValidationMessageFor(model => model.AddressSettings.ZipPostalCodeEnabled)
- @Html.SettingEditorFor(model => model.AddressSettings.CityEnabled, - Html.CheckBoxFor(model => model.AddressSettings.CityEnabled, new { data_toggler_for = "#pnlAddressCityRequired" })) + @Html.SettingEditorFor(model => model.AddressSettings.CityEnabled, + Html.CheckBoxFor(model => model.AddressSettings.CityEnabled, new { data_toggler_for = "#pnlAddressCityRequired" })) @Html.ValidationMessageFor(model => model.AddressSettings.CityEnabled)
- @Html.SettingEditorFor(model => model.AddressSettings.CountryEnabled, - Html.CheckBoxFor(model => model.AddressSettings.CountryEnabled, new { data_toggler_for = "#pnlAddressStateProvinceEnabled" })) + @Html.SettingEditorFor(model => model.AddressSettings.CountryEnabled, + Html.CheckBoxFor(model => model.AddressSettings.CountryEnabled, new { data_toggler_for = "#pnlAddressStateProvinceEnabled" })) @Html.ValidationMessageFor(model => model.AddressSettings.CountryEnabled)
- @Html.SmartLabelFor(model => model.AddressSettings.CountryRequired) - - @Html.SettingEditorFor(model => model.AddressSettings.CountryRequired) - @Html.ValidationMessageFor(model => model.AddressSettings.CountryRequired) -
- @Html.SmartLabelFor(model => model.AddressSettings.StateProvinceEnabled) - - @Html.SettingEditorFor(model => model.AddressSettings.StateProvinceEnabled) - @Html.ValidationMessageFor(model => model.AddressSettings.StateProvinceEnabled) -
- @Html.SmartLabelFor(model => model.AddressSettings.StateProvinceRequired) - - @Html.SettingEditorFor(model => model.AddressSettings.StateProvinceRequired) - @Html.ValidationMessageFor(model => model.AddressSettings.StateProvinceRequired) -
+ @Html.SmartLabelFor(model => model.AddressSettings.CountryRequired) + + @Html.SettingEditorFor(model => model.AddressSettings.CountryRequired) + @Html.ValidationMessageFor(model => model.AddressSettings.CountryRequired) +
+ @Html.SmartLabelFor(model => model.AddressSettings.StateProvinceEnabled) + + @Html.SettingEditorFor(model => model.AddressSettings.StateProvinceEnabled) + @Html.ValidationMessageFor(model => model.AddressSettings.StateProvinceEnabled) +
+ @Html.SmartLabelFor(model => model.AddressSettings.StateProvinceRequired) + + @Html.SettingEditorFor(model => model.AddressSettings.StateProvinceRequired) + @Html.ValidationMessageFor(model => model.AddressSettings.StateProvinceRequired) +
@Html.SmartLabelFor(model => model.AddressSettings.PhoneEnabled) - @Html.SettingEditorFor(model => model.AddressSettings.PhoneEnabled, - Html.CheckBoxFor(model => model.AddressSettings.PhoneEnabled, new { data_toggler_for = "#pnlAddressPhoneRequired" })) + @Html.SettingEditorFor(model => model.AddressSettings.PhoneEnabled, + Html.CheckBoxFor(model => model.AddressSettings.PhoneEnabled, new { data_toggler_for = "#pnlAddressPhoneRequired" })) @Html.ValidationMessageFor(model => model.AddressSettings.PhoneEnabled)
- @Html.SettingEditorFor(model => model.AddressSettings.FaxEnabled, - Html.CheckBoxFor(model => model.AddressSettings.FaxEnabled, new { data_toggler_for = "#pnlAddressFaxRequired" })) + @Html.SettingEditorFor(model => model.AddressSettings.FaxEnabled, + Html.CheckBoxFor(model => model.AddressSettings.FaxEnabled, new { data_toggler_for = "#pnlAddressFaxRequired" })) @Html.ValidationMessageFor(model => model.AddressSettings.FaxEnabled)
- @Html.SettingEditorFor(model => model.DateTimeSettings.DefaultStoreTimeZoneId, - Html.DropDownListFor(model => model.DateTimeSettings.DefaultStoreTimeZoneId, Model.DateTimeSettings.AvailableTimeZones)) + @Html.SettingEditorFor(model => model.DateTimeSettings.DefaultStoreTimeZoneId, + Html.DropDownListFor(model => model.DateTimeSettings.DefaultStoreTimeZoneId, Model.DateTimeSettings.AvailableTimeZones)) @Html.ValidationMessageFor(model => model.DateTimeSettings.DefaultStoreTimeZoneId)
- - - - - - - - - - - - - - - - - - - - -
- @Html.SmartLabelFor(model => model.PrivacySettings.EnableCookieConsent) - - @Html.SettingEditorFor(model => model.PrivacySettings.EnableCookieConsent, - Html.CheckBoxFor(model => model.PrivacySettings.EnableCookieConsent)) - @Html.ValidationMessageFor(model => model.PrivacySettings.EnableCookieConsent) -
- @Html.SmartLabelFor(model => model.PrivacySettings.StoreLastIpAddress) - - @Html.SettingEditorFor(model => model.PrivacySettings.StoreLastIpAddress) - @Html.ValidationMessageFor(model => model.PrivacySettings.StoreLastIpAddress) -
- @Html.SmartLabelFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) - - @Html.SettingEditorFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) - @Html.ValidationMessageFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) -
- @Html.SmartLabelFor(model => model.PrivacySettings.FullNameOnContactUsRequired) - - @Html.SettingEditorFor(model => model.PrivacySettings.FullNameOnContactUsRequired) - @Html.ValidationMessageFor(model => model.PrivacySettings.FullNameOnContactUsRequired) -
- @Html.SmartLabelFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) - - @Html.SettingEditorFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) - @Html.ValidationMessageFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) -
-} \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + +
+ @Html.SmartLabelFor(model => model.PrivacySettings.EnableCookieConsent) + + @Html.SettingEditorFor(model => model.PrivacySettings.EnableCookieConsent, + Html.CheckBoxFor(model => model.PrivacySettings.EnableCookieConsent)) + @Html.ValidationMessageFor(model => model.PrivacySettings.EnableCookieConsent) +
+ @Html.SmartLabelFor(model => model.PrivacySettings.StoreLastIpAddress) + + @Html.SettingEditorFor(model => model.PrivacySettings.StoreLastIpAddress) + @Html.ValidationMessageFor(model => model.PrivacySettings.StoreLastIpAddress) +
+ @Html.SmartLabelFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) + + @Html.SettingEditorFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) + @Html.ValidationMessageFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) +
+ @Html.SmartLabelFor(model => model.PrivacySettings.FullNameOnContactUsRequired) + + @Html.SettingEditorFor(model => model.PrivacySettings.FullNameOnContactUsRequired) + @Html.ValidationMessageFor(model => model.PrivacySettings.FullNameOnContactUsRequired) +
+ @Html.SmartLabelFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) + + @Html.SettingEditorFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) + @Html.ValidationMessageFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) +
+ +
+ + @T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AdminInstruction") +
+ + +} + +@helper CookieInfoGridCommands(Grid grid) +{ + +} + + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/_CreateOrUpdateCookieInfo.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/_CreateOrUpdateCookieInfo.cshtml new file mode 100644 index 0000000000..405710b7ef --- /dev/null +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/_CreateOrUpdateCookieInfo.cshtml @@ -0,0 +1,71 @@ +@model CookieInfoModel +@using SmartStore.Web.Framework; +@using SmartStore.Admin.Models.Settings; + +@Html.ValidationSummary(false) + + + + + + + + + + +
+ @Html.SmartLabelFor(model => model.SelectedStoreIds) + + @Html.EditorFor(model => model.SelectedStoreIds) + @Html.ValidationMessageFor(model => model.SelectedStoreIds) +
+ @Html.SmartLabelFor(model => model.CookieType) + + @Html.DropDownListForEnum(model => model.CookieType) + @Html.ValidationMessageFor(model => model.CookieType) +
+ +@(Html.LocalizedEditor("ci-localized", + @ + + + + + + + + +
+ @Html.SmartLabelFor(model => model.Locales[item].Name) + + @Html.EditorFor(model => model.Locales[item].Name) + @Html.ValidationMessageFor(model => model.Locales[item].Name) + @Html.HiddenFor(model => model.Locales[item].LanguageId) +
+ @Html.SmartLabelFor(model => model.Locales[item].Description) + + @Html.EditorFor(model => model.Locales[item].Description) + @Html.ValidationMessageFor(model => model.Locales[item].Description) +
+ , + @ + + + + + + + + +
+ @Html.SmartLabelFor(model => model.Name) + + @Html.EditorFor(model => model.Name) + @Html.ValidationMessageFor(model => model.Name) +
+ @Html.SmartLabelFor(model => model.Description) + + @Html.EditorFor(model => model.Description) + @Html.ValidationMessageFor(model => model.Description) +
+)) \ No newline at end of file From 2da4e1e58ce8aae8108b08ca664c4424b1edbdc0 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Thu, 20 Aug 2020 15:01:34 +0200 Subject: [PATCH 069/695] (cookie manager) Added some classes to frontend dialog --- .../Common/Partials/CookieManager.cshtml | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml b/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml index 21d9ce3e87..1dc44ce726 100644 --- a/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml @@ -39,36 +39,36 @@ @Html.HiddenFor(x => x.AcceptAll)
/// List of CookieInfos. - List GetAllCookieInfos(); + List GetAllCookieInfos(bool addSettingCookies = false); /// /// Gets a value which specifies whether it is allowed to set a cookie of a certain type. diff --git a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs index 77fd078551..febc8c8850 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs @@ -835,7 +835,7 @@ private bool DisplayForCountry() private void PrepareCookieManagerModel(CookieManagerModel model) { // Get cookie infos from plugins. - model.CookiesInfos = _cookieManager.GetAllCookieInfos(); + model.CookiesInfos = _cookieManager.GetAllCookieInfos(true); var cookie = _cookieManager.GetCookieData(this.ControllerContext); diff --git a/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml b/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml index f59b6bedfa..bf360ee059 100644 --- a/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml @@ -87,7 +87,7 @@
- +
@foreach (var info in requiredCookieInfos) { @@ -138,7 +138,7 @@
-
+
@foreach (var info in analyticsCookieInfos) { @@ -189,7 +189,7 @@
-
+
@foreach (var info in thirdPartyCookieInfos) { From 86c14678b18dbe5799c61d7448c9ce349ba40260 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sun, 23 Aug 2020 06:47:12 +0200 Subject: [PATCH 088/695] Better image processor encapsulation (wip) --- .../SmartStore.Core/IO/LocalFileSystem.cs | 2 +- .../SmartStore.Services/Media/Events.cs | 12 +- .../Media/Imaging/BitDepth.cs | 44 +++ .../Media/Imaging/DefaultImageProcessor.cs | 326 ----------------- .../Media/Imaging/IImage.cs | 48 +++ .../Media/Imaging/IImageCache.cs | 11 +- .../Media/Imaging/IImageFormat.cs | 39 ++ .../Media/Imaging/IImageInfo.cs | 31 ++ .../Media/Imaging/IImageProcessor.cs | 7 + .../Media/Imaging/IImageTransformer.cs | 36 ++ .../Media/Imaging/ImageCache.cs | 31 +- .../Media/Imaging/Impl/IPImage.cs | 77 ++++ .../Media/Imaging/Impl/IPImageFormat.cs | 55 +++ .../Media/Imaging/Impl/IPImageProcessor.cs | 335 ++++++++++++++++++ .../Media/Imaging/Impl/IPImageTransformer.cs | 50 +++ .../Media/Imaging/ProcessImageResult.cs | 23 +- .../Media/Imaging/ResizeOptions.cs | 181 ++++++++++ .../SmartStore.Services/Media/MediaModule.cs | 2 +- .../SmartStore.Services.csproj | 11 +- 19 files changed, 961 insertions(+), 360 deletions(-) create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/BitDepth.cs delete mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/IImageFormat.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/IImageInfo.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/ResizeOptions.cs diff --git a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs index eb50af6fa8..dbb3581c55 100644 --- a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs +++ b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs @@ -631,7 +631,7 @@ public Stream OpenRead() public Stream OpenWrite() { - return new FileStream(_localPath, FileMode.Open, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true); + return new FileStream(_localPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true); } public Stream CreateFile() diff --git a/src/Libraries/SmartStore.Services/Media/Events.cs b/src/Libraries/SmartStore.Services/Media/Events.cs index b292015375..80b3156476 100644 --- a/src/Libraries/SmartStore.Services/Media/Events.cs +++ b/src/Libraries/SmartStore.Services/Media/Events.cs @@ -71,30 +71,28 @@ public ImageQueryCreatedEvent(ProcessImageQuery query, HttpContextBase httpConte /// public class ImageProcessingEvent { - public ImageProcessingEvent(ProcessImageQuery query, ImageFactory processor) + public ImageProcessingEvent(ProcessImageQuery query, IImage image) { Query = query; - Processor = processor; + Image = image; } public ProcessImageQuery Query { get; private set; } - public ImageFactory Processor { get; private set; } + public IImage Image { get; private set; } } /// - /// Published after processing finishes and the result is saved to a stream (ProcessImageResult.Result) + /// Published after processing finishes. /// public class ImageProcessedEvent { - public ImageProcessedEvent(ProcessImageQuery query, ImageFactory processor, ProcessImageResult result) + public ImageProcessedEvent(ProcessImageQuery query, ProcessImageResult result) { Query = query; - Processor = processor; Result = result; } public ProcessImageQuery Query { get; private set; } - public ImageFactory Processor { get; private set; } public ProcessImageResult Result { get; private set; } } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/BitDepth.cs b/src/Libraries/SmartStore.Services/Media/Imaging/BitDepth.cs new file mode 100644 index 0000000000..0733b74b89 --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/BitDepth.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SmartStore.Services.Media +{ + /// + /// Provides enumeration for the available bit depths. + /// + public enum BitDepth + { + /// + /// 1 bit per pixel + /// + Bit1 = 1, + + /// + /// 4 bits per pixel + /// + Bit4 = 4, + + /// + /// 8 bits per pixel + /// + Bit8 = 8, + + /// + /// 16 bits per pixel + /// + Bit16 = 16, + + /// + /// 24 bits per pixel + /// + Bit24 = 24, + + /// + /// 32 bits per pixel + /// + Bit32 = 32 + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs deleted file mode 100644 index e1e8e5e118..0000000000 --- a/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs +++ /dev/null @@ -1,326 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Drawing; -using ImageProcessor; -using ImageProcessor.Imaging; -using ImageProcessor.Imaging.Formats; -using SmartStore.Core.Logging; -using ImageProcessor.Configuration; -using SmartStore.Core.Events; -using SmartStore.Utilities; -using SmartStore.Core.IO; - -namespace SmartStore.Services.Media -{ - public partial class DefaultImageProcessor : IImageProcessor - { - private static long _totalProcessingTime; - - private readonly IEventPublisher _eventPublisher; - - public DefaultImageProcessor(IEventPublisher eventPublisher) - { - _eventPublisher = eventPublisher; - } - - public ILogger Logger { get; set; } = NullLogger.Instance; - - public bool IsSupportedImage(string extension) - { - if (extension.IsEmpty()) - { - return false; - } - - if (extension[0] == '.' && extension.Length > 1) - { - extension = extension.Substring(1); - } - - return ImageProcessorBootstrapper.Instance.SupportedImageFormats - .SelectMany(x => x.FileExtensions) - .Any(x => x.Equals(extension, StringComparison.OrdinalIgnoreCase)); - } - - public ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) - { - Guard.NotNull(query, nameof(query)); - - ValidateQuery(query); - - var watch = new Stopwatch(); - byte[] inBuffer = null; - - try - { - watch.Start(); - - using (var processor = new ImageFactory(preserveExifData: false, fixGamma: false)) - { - var source = query.Source; - - // Load source - if (source is byte[] b) - { - inBuffer = b; - } - else if (source is Stream s) - { - inBuffer = s.ToByteArray(); - } - else if (source is Image img) - { - processor.Load(img); - } - else if (source is string str) - { - var path = NormalizePath(str); - using (var fs = File.OpenRead(path)) - { - inBuffer = fs.ToByteArray(); - } - } - else if (source is IFile file) - { - using (var fs = file.OpenRead()) - { - inBuffer = fs.ToByteArray(); - } - } - else - { - throw new ProcessImageException("Invalid source type '{0}' in query.".FormatInvariant(query.Source.GetType().FullName), query); - } - - if (inBuffer != null) - { - processor.Load(inBuffer); - } - - // Pre-process event - _eventPublisher.Publish(new ImageProcessingEvent(query, processor)); - - var result = new ProcessImageResult - { - Query = query, - SourceWidth = processor.Image.Width, - SourceHeight = processor.Image.Height, - SourceMimeType = processor.CurrentImageFormat.MimeType, - DisposeOutputStream = disposeOutput - }; - - // Core processing - ProcessImageCore(query, processor, out var fxApplied); - - // Create & prepare result - var outStream = new MemoryStream(); - processor.Save(outStream); - - var fmt = processor.CurrentImageFormat; - result.FileExtension = fmt.DefaultExtension == "jpeg" ? "jpg" : fmt.DefaultExtension; - result.MimeType = fmt.MimeType; - - result.HasAppliedVisualEffects = fxApplied; - result.Width = processor.Image.Width; - result.Height = processor.Image.Height; - - if (inBuffer != null) - { - // Check whether it is more beneficial to return the source instead of the result. - // Prefer result only if its size is smaller than the source size. - // Result size may be larger if a high-compressed image has been uploaded. - // During image processing the source compression algorithm gets lost and the image may be larger in size - // after encoding with default encoders. - var compare = - // only when image was not altered visually... - !fxApplied - // ...size has not changed - && result.Width == result.SourceWidth - && result.Height == result.SourceHeight - // ...and format has not changed - && result.MimeType == result.SourceMimeType; - - if (compare && inBuffer.LongLength <= outStream.Length) - { - // Source is smaller. Throw away result and get back to source. - outStream.Dispose(); - result.OutputStream = new MemoryStream(inBuffer, 0, inBuffer.Length, true, true); - } - } - - // Set output stream - if (result.OutputStream == null) - { - result.OutputStream = outStream; - } - - // Post-process event - _eventPublisher.Publish(new ImageProcessedEvent(query, processor, result)); - - result.OutputStream.Position = 0; - - result.ProcessTimeMs = watch.ElapsedMilliseconds; - - return result; - } - } - catch (Exception ex) - { - throw new ProcessImageException(query, ex); - } - finally - { - if (query.DisposeSource && query.Source is IDisposable source) - { - source.Dispose(); - } - - watch.Stop(); - _totalProcessingTime += watch.ElapsedMilliseconds; - } - } - - /// - /// Processes the loaded image. Inheritors should NOT save the image, this is done by the main method. - /// - /// Query - /// Processor instance - /// - /// Should be true if any effect has been applied that potentially changes the image visually (like background color, contrast, sharpness etc.). - /// Resize and compression quality does NOT count as FX. - /// - protected virtual void ProcessImageCore(ProcessImageQuery query, ImageFactory processor, out bool fxApplied) - { - fxApplied = false; - - // Resize - var size = query.MaxWidth != null || query.MaxHeight != null - ? new Size(query.MaxWidth ?? 0, query.MaxHeight ?? 0) - : Size.Empty; - - if (!size.IsEmpty) - { - processor.Resize(new ResizeLayer( - size, - resizeMode: ConvertScaleMode(query.ScaleMode), - anchorPosition: ConvertAnchorPosition(query.AnchorPosition), - upscale: false)); - } - - if (query.BackgroundColor.HasValue()) - { - processor.BackgroundColor(ColorTranslator.FromHtml(query.BackgroundColor)); - fxApplied = true; - } - - // Format - if (query.Format != null) - { - var format = query.Format as ISupportedImageFormat; - - if (format == null && query.Format is string) - { - var requestedFormat = ((string)query.Format).ToLowerInvariant(); - switch (requestedFormat) - { - case "jpg": - case "jpeg": - format = new JpegFormat(); - break; - case "png": - format = new PngFormat(); - break; - case "gif": - format = new GifFormat(); - break; - } - } - - if (format != null) - { - processor.Format(format); - } - } - - // Set Quality - if (query.Quality.HasValue) - { - processor.Quality(query.Quality.Value); - } - } - - private string NormalizePath(string path) - { - if (path.IsWebUrl()) - { - throw new NotSupportedException($"Remote images cannot be processed: Path: {path}"); - } - - if (!PathHelper.IsAbsolutePhysicalPath(path)) - { - path = CommonHelper.MapPath(path); - } - - return path; - } - - private void ValidateQuery(ProcessImageQuery query) - { - if (query.Source == null) - { - throw new ArgumentException("During image processing 'ProcessImageQuery.Source' must not be null.", nameof(query)); - } - } - - public long TotalProcessingTimeMs - { - get { return _totalProcessingTime; } - } - - private ResizeMode ConvertScaleMode(string mode) - { - switch (mode.EmptyNull().ToLower()) - { - case "boxpad": - return ResizeMode.BoxPad; - case "crop": - return ResizeMode.Crop; - case "min": - return ResizeMode.Min; - case "pad": - return ResizeMode.Pad; - case "stretch": - return ResizeMode.Stretch; - default: - return ResizeMode.Max; - } - } - - private AnchorPosition ConvertAnchorPosition(string anchor) - { - switch (anchor.EmptyNull().ToLower()) - { - case "top": - return AnchorPosition.Top; - case "bottom": - return AnchorPosition.Bottom; - case "left": - return AnchorPosition.Left; - case "right": - return AnchorPosition.Right; - case "top-left": - return AnchorPosition.TopLeft; - case "top-right": - return AnchorPosition.TopRight; - case "bottom-left": - return AnchorPosition.BottomLeft; - case "bottom-right": - return AnchorPosition.BottomRight; - default: - return AnchorPosition.Center; - } - } - } -} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs new file mode 100644 index 0000000000..3df584062a --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SmartStore.Services.Media +{ + public interface IImage : IImageInfo, IDisposable + { + /// + /// Gets the original width and height of the source image before any transform has been applied. + /// + Size SourceSize { get; } + + /// + /// Gets or sets the color depth in number of bits per pixel (1, 4, 8, 16, 24, 32) + /// + new BitDepth BitDepth { get; set; } + + /// + /// Gets or sets the format of the image. + /// + new IImageFormat Format { get; set; } + + /// + /// Transforms the image. + /// + /// + IImage Transform(Action transformer); + + /// + /// Saves the current image to the specified output stream. + /// + /// The stream to save the image to. + /// The current . + IImage Save(Stream stream); + + /// + /// Saves the current image to the specified file path. + /// + /// The path to save the image to. + /// The current . + IImage Save(string path); + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs index 04afe9a111..3fdf2fa93c 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs @@ -13,14 +13,21 @@ public interface IImageCache /// /// Adds an image to the cache. /// - /// An instance of the object, which is returned by the Get() method. + /// An instance of the object which is returned by the Get() method. + /// The image object. + void Put(CachedImage cachedImage, IImage image); + + /// + /// Adds an image to the cache. + /// + /// An instance of the object which is returned by the Get() method. /// The file input stream. void Put(CachedImage cachedImage, Stream stream); /// /// Asynchronously adds an image to the cache. /// - /// An instance of the object, which is returned by the Get() method. + /// An instance of the object which is returned by the Get() method. /// The file input stream. Task PutAsync(CachedImage cachedImage, Stream stream); diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageFormat.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageFormat.cs new file mode 100644 index 0000000000..081818158d --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageFormat.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SmartStore.Services.Media +{ + /// + /// Defines the contract for an image format. + /// + public interface IImageFormat // TODO: >> IEquatable & Equals & GetHashCode() + { + /// + /// Gets the name that describes this image format. + /// + string Name { get; } + + /// + /// Gets the default file extension. + /// + string DefaultExtension { get; } + + /// + /// Gets the default mimetype that the image format uses + /// + string DefaultMimeType { get; } + + /// + /// Gets the file extensions this image format commonly uses. + /// + IEnumerable FileExtensions { get; } + + /// + /// Gets all the mimetypes that have been used by this image format. + /// + IEnumerable MimeTypes { get; } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageInfo.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageInfo.cs new file mode 100644 index 0000000000..8e020bd0ff --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageInfo.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SmartStore.Services.Media +{ + /// + /// Encapsulates properties that describe basic image information including dimensions, pixel type information + /// and additional metadata. + /// + public interface IImageInfo + { + /// + /// Gets width and height. + /// + Size Size { get; } + + /// + /// Gets the color depth in number of bits per pixel (1, 4, 8, 16, 24, 32) + /// + BitDepth BitDepth { get; } + + /// + /// Gets the format of the image. + /// + IImageFormat Format { get; } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs index a60f67c75b..08cfe15037 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs @@ -1,4 +1,5 @@ using System; +using System.IO; namespace SmartStore.Services.Media { @@ -14,6 +15,12 @@ public interface IImageProcessor /// A value indicating whether processing is possible bool IsSupportedImage(string extension); + IImageFormat GetImageFormat(string extension); + + IImage LoadImage(string path); + + IImage LoadImage(Stream stream); + /// /// Processes an image /// diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs new file mode 100644 index 0000000000..7df59285d9 --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SmartStore.Services.Media +{ + public interface IImageTransformer + { + /// + /// Resizes the current image to the given dimensions. + /// + /// + /// The containing the width and height to set the image to. + /// + /// + IImageTransformer Resize(Size size); + + /// + /// Resizes the current image according to the given options. + /// + /// The options. + /// + IImageTransformer Resize(ResizeOptions options); + + /// + /// Changes the background color of the current image. + /// + /// + /// The to paint the image background with. + /// + IImageTransformer BackgroundColor(Color color); + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs index 143ba216ed..d73f0e20eb 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using System.Runtime.CompilerServices; using System.Threading.Tasks; using SmartStore.Core.Domain.Media; using SmartStore.Core.Logging; @@ -31,14 +32,25 @@ public ImageCache( public ILogger Logger { get; set; } = NullLogger.Instance; + public void Put(CachedImage cachedImage, IImage image) + { + var path = BuildPath(cachedImage.Path); + using var stream = _fileSystem.GetFile(path).OpenWrite(); + + if (PreparePut(cachedImage, stream)) + { + image.Save(stream); + PostPut(cachedImage, path); + } + } + public void Put(CachedImage cachedImage, Stream stream) { if (PreparePut(cachedImage, stream)) { var path = BuildPath(cachedImage.Path); _fileSystem.SaveStream(path, stream); - cachedImage.Exists = true; - cachedImage.File = _fileSystem.GetFile(path); + PostPut(cachedImage, path); } } @@ -48,11 +60,17 @@ public async Task PutAsync(CachedImage cachedImage, Stream stream) { var path = BuildPath(cachedImage.Path); await _fileSystem.SaveStreamAsync(path, stream); - cachedImage.Exists = true; - cachedImage.File = _fileSystem.GetFile(path); + PostPut(cachedImage, path); } } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private void PostPut(CachedImage cachedImage, string path) + { + cachedImage.Exists = true; + cachedImage.File = _fileSystem.GetFile(path); + } + private bool PreparePut(CachedImage cachedImage, Stream stream) { Guard.NotNull(cachedImage, nameof(cachedImage)); @@ -62,11 +80,6 @@ private bool PreparePut(CachedImage cachedImage, Stream stream) return false; } - if (cachedImage.Exists) - { - _fileSystem.DeleteFile(BuildPath(cachedImage.Path)); - } - // create folder if needed string imageDir = System.IO.Path.GetDirectoryName(cachedImage.Path); if (imageDir.HasValue()) diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs new file mode 100644 index 0000000000..7ccb4f7b0a --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ImageProcessor; + +namespace SmartStore.Services.Media.Impl +{ + internal class IPImage : DisposableObject, IImage + { + private readonly ImageFactory _image; + + public IPImage(ImageFactory image) + { + _image = image; + SourceSize = new Size(image.Image.Width, image.Image.Height); + } + + #region IImageInfo + + /// + public Size Size => _image.Image.Size; + + /// + public BitDepth BitDepth + { + get => (BitDepth)Convert.ToInt32(_image.CurrentBitDepth); + set => _image.BitDepth(Convert.ToInt64(value)); + } + + /// + public IImageFormat Format + { + get => new IPImageFormat(_image.CurrentImageFormat); + set + { + Guard.NotNull(value, nameof(value)); + _image.Format(((IPImageFormat)value).WrappedFormat); + } + } + + #endregion + + /// + public Size SourceSize { get; } + + /// + public IImage Transform(Action transformer) + { + transformer(new IPImageTransformer(_image)); + return this; + } + + /// + public IImage Save(Stream stream) + { + _image.Save(stream); + return this; + } + + /// + public IImage Save(string path) + { + _image.Save(path); + return this; + } + + protected override void OnDispose(bool disposing) + { + if (disposing) + _image.Dispose(); + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs new file mode 100644 index 0000000000..9b2f9cd12a --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs @@ -0,0 +1,55 @@ +using ImageProcessor.Imaging.Formats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SmartStore.Services.Media.Impl +{ + internal class IPImageFormat : IImageFormat + { + private readonly ISupportedImageFormat _format; + + public IPImageFormat(ISupportedImageFormat format) + { + Guard.NotNull(format, nameof(format)); + _format = format; + } + + public ISupportedImageFormat WrappedFormat + { + get => _format; + } + + public string Name => _format.MimeType; + + public string DefaultExtension => _format.DefaultExtension == "jpeg" ? "jpg" : _format.DefaultExtension; + + public string DefaultMimeType => _format.MimeType; + + public IEnumerable FileExtensions => _format.FileExtensions; + + public IEnumerable MimeTypes => new[] { _format.MimeType }; + + //public override bool Equals(object obj) + //{ + // if (!(obj is IImageFormat format)) + // { + // return false; + // } + + // return this.DefaultMimeType.Equals(format.DefaultMimeType); + //} + + //public override int GetHashCode() + //{ + // unchecked + // { + // int hashCode = this.DefaultMimeType.GetHashCode(); + // hashCode = (hashCode * 397) ^ this.IsIndexed.GetHashCode(); + // return (hashCode * 397) ^ this.Quality; + // } + //} + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs new file mode 100644 index 0000000000..e8ea330c9f --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs @@ -0,0 +1,335 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Drawing; +using ImageProcessor; +using ImageProcessor.Imaging; +using ImageProcessor.Imaging.Formats; +using SmartStore.Core.Logging; +using ImageProcessor.Configuration; +using SmartStore.Core.Events; +using SmartStore.Utilities; +using SmartStore.Core.IO; +using System.Collections.Concurrent; +using System.Collections.Generic; + +namespace SmartStore.Services.Media.Impl +{ + public partial class IPImageProcessor : IImageProcessor + { + private static long _totalProcessingTime; + private static readonly IEnumerable _supportedFormats = ImageProcessorBootstrapper.Instance.SupportedImageFormats; + + private readonly IEventPublisher _eventPublisher; + + public IPImageProcessor(IEventPublisher eventPublisher) + { + _eventPublisher = eventPublisher; + } + + public ILogger Logger { get; set; } = NullLogger.Instance; + + public virtual bool IsSupportedImage(string extension) + { + return GetInternalImageFormat(extension) != null; + } + + public virtual IImageFormat GetImageFormat(string extension) + { + var internalFormat = GetInternalImageFormat(extension); + if (internalFormat != null) + { + return new IPImageFormat(internalFormat); + } + + return null; + } + + private ISupportedImageFormat GetInternalImageFormat(string extension) + { + if (extension.IsEmpty()) + { + return null; + } + + if (extension[0] == '.' && extension.Length > 1) + { + extension = extension.Substring(1); + } + + return _supportedFormats + .FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase)); + } + + public virtual IImage LoadImage(string path) + { + var internalImage = new ImageFactory(preserveExifData: false, fixGamma: false) + .Load(NormalizePath(path)); + + return new IPImage(internalImage); + } + + public virtual IImage LoadImage(Stream stream) + { + var internalImage = new ImageFactory(preserveExifData: false, fixGamma: false) + .Load(stream); + + return new IPImage(internalImage); + } + + public virtual ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) + { + Guard.NotNull(query, nameof(query)); + + ValidateQuery(query); + + var watch = new Stopwatch(); + byte[] inBuffer = null; + long len = 0; + IImage image = null; + + try + { + watch.Start(); + + var source = query.Source; + + // Load source + if (source is byte[] b) + { + inBuffer = b; + len = b.LongLength; + } + else if (source is Stream s) + { + image = LoadImage(s); + len = s.Length; + } + else if (source is string str) + { + str = NormalizePath(str); + image = LoadImage(str); + len = (new FileInfo(str)).Length; + } + else if (source is IFile file) + { + using (var fs = file.OpenRead()) + { + image = LoadImage(fs); + len = file.Size; + } + } + else + { + throw new ProcessImageException("Invalid source type '{0}' in query.".FormatInvariant(query.Source.GetType().FullName), query); + } + + var sourceFormat = image.Format; + + // Pre-process event + _eventPublisher.Publish(new ImageProcessingEvent(query, image)); + + var result = new ProcessImageResult + { + Query = query, + SourceFormat = image.Format, + Image = image, + DisposeImage = disposeOutput + }; + + // Core processing + ProcessImageCore(query, image, out var fxApplied); + + result.HasAppliedVisualEffects = fxApplied; + + // TODO: convert this shit, but how?!!! + //if (inBuffer != null) + //{ + // // Check whether it is more beneficial to return the source instead of the result. + // // Prefer result only if its size is smaller than the source size. + // // Result size may be larger if a high-compressed image has been uploaded. + // // During image processing the source compression algorithm gets lost and the image may be larger in size + // // after encoding with default encoders. + // var compare = + // // only when image was not altered visually... + // !fxApplied + // // ...size has not changed + // && image.Size == image.SourceSize + // // ...and format has not changed + // && image.Format.Name == result.SourceFormat.Name; + + // if (compare && len <= outStream.Length) + // { + // // Source is smaller. Throw away result and get back to source. + // outStream.Dispose(); + // result.OutputStream = new MemoryStream(inBuffer, 0, inBuffer.Length, true, true); + // } + //} + + //// Set output stream + //if (result.OutputStream == null) + //{ + // result.OutputStream = outStream; + //} + + // Post-process event + _eventPublisher.Publish(new ImageProcessedEvent(query, result)); + + result.ProcessTimeMs = watch.ElapsedMilliseconds; + + return result; + } + catch (Exception ex) + { + throw new ProcessImageException(query, ex); + } + finally + { + if (query.DisposeSource && query.Source is IDisposable source) + { + source.Dispose(); + } + + watch.Stop(); + _totalProcessingTime += watch.ElapsedMilliseconds; + } + } + + /// + /// Processes the loaded image. Inheritors should NOT save the image, this is done by the caller. + /// + /// Query + /// Image instance + /// + /// Should be true if any effect has been applied that potentially changes the image visually (like background color, contrast, sharpness etc.). + /// Resize and compression quality does NOT count as FX. + /// + protected virtual void ProcessImageCore(ProcessImageQuery query, IImage image, out bool fxApplied) + { + bool fxAppliedInternal = false; + + // Resize + var size = query.MaxWidth != null || query.MaxHeight != null + ? new Size(query.MaxWidth ?? 0, query.MaxHeight ?? 0) + : Size.Empty; + + image.Transform(transformer => + { + if (!size.IsEmpty) + { + transformer.Resize(new ResizeOptions + { + Size = size, + ResizeMode = ConvertScaleMode(query.ScaleMode), + AnchorPosition = ConvertAnchorPosition(query.AnchorPosition) + }); ; + } + + if (query.BackgroundColor.HasValue()) + { + transformer.BackgroundColor(ColorTranslator.FromHtml(query.BackgroundColor)); + fxAppliedInternal = true; + } + }); + + + // Format + if (query.Format != null) + { + var format = query.Format as IImageFormat; + + if (format == null && query.Format is string) + { + var requestedFormat = ((string)query.Format).ToLowerInvariant(); + format = GetImageFormat(requestedFormat); + } + + if (format != null) + { + image.Format = format; + } + } + + //// Set Quality (TODO) + //if (query.Quality.HasValue) + //{ + // processor.Quality(query.Quality.Value); + //} + + fxApplied = fxAppliedInternal; + } + + private string NormalizePath(string path) + { + if (path.IsWebUrl()) + { + throw new NotSupportedException($"Remote images cannot be processed: Path: {path}"); + } + + if (!PathHelper.IsAbsolutePhysicalPath(path)) + { + path = CommonHelper.MapPath(path); + } + + return path; + } + + private void ValidateQuery(ProcessImageQuery query) + { + if (query.Source == null) + { + throw new ArgumentException("During image processing 'ProcessImageQuery.Source' must not be null.", nameof(query)); + } + } + + public long TotalProcessingTimeMs + { + get { return _totalProcessingTime; } + } + + private ResizeMode ConvertScaleMode(string mode) + { + switch (mode.EmptyNull().ToLower()) + { + case "boxpad": + return ResizeMode.BoxPad; + case "crop": + return ResizeMode.Crop; + case "min": + return ResizeMode.Min; + case "pad": + return ResizeMode.Pad; + case "stretch": + return ResizeMode.Stretch; + default: + return ResizeMode.Max; + } + } + + private AnchorPosition ConvertAnchorPosition(string anchor) + { + switch (anchor.EmptyNull().ToLower()) + { + case "top": + return AnchorPosition.Top; + case "bottom": + return AnchorPosition.Bottom; + case "left": + return AnchorPosition.Left; + case "right": + return AnchorPosition.Right; + case "top-left": + return AnchorPosition.TopLeft; + case "top-right": + return AnchorPosition.TopRight; + case "bottom-left": + return AnchorPosition.BottomLeft; + case "bottom-right": + return AnchorPosition.BottomRight; + default: + return AnchorPosition.Center; + } + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs new file mode 100644 index 0000000000..125bf98a6e --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ImageProcessor; +using ImageProcessor.Imaging; + +namespace SmartStore.Services.Media.Impl +{ + internal class IPImageTransformer : IImageTransformer + { + private readonly ImageFactory _image; + + public IPImageTransformer(ImageFactory image) + { + _image = image; + } + + public IImageTransformer Resize(Size size) + { + return Resize(new ResizeOptions { Size = size }); + } + + public IImageTransformer Resize(ResizeOptions options) + { + Guard.NotNull(options, nameof(options)); + + var layer = new ResizeLayer( + size: options.Size, + resizeMode: (ImageProcessor.Imaging.ResizeMode)options.ResizeMode, + anchorPosition: (ImageProcessor.Imaging.AnchorPosition)options.AnchorPosition, + upscale: options.Upscale, + centerCoordinates: options.CenterCoordinates, + maxSize: null, + restrictedSizes: null, + anchorPoint: options.AnchorPoint); + + _image.Resize(layer); + return this; + } + + public IImageTransformer BackgroundColor(Color color) + { + _image.BackgroundColor(color); + return this; + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs index c46df1ff86..596d33ae93 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs @@ -7,17 +7,14 @@ public class ProcessImageResult : DisposableObject { public ProcessImageQuery Query { get; set; } - public MemoryStream OutputStream { get; set; } - internal bool DisposeOutputStream { get; set; } + public IImageFormat SourceFormat { get; set; } + public IImage Image { get; set; } + internal bool DisposeImage { get; set; } - public int? SourceWidth { get; set; } - public int? SourceHeight { get; set; } - public string SourceMimeType { get; set; } - - public string FileExtension { get; set; } - public string MimeType { get; set; } - public int Width { get; set; } - public int Height { get; set; } + //public string FileExtension { get; set; } + //public string MimeType { get; set; } + //public int Width { get; set; } + //public int Height { get; set; } /// /// Is true if any effect has been applied that changed the image visually (like background color, contrast, sharpness etc.). @@ -29,10 +26,10 @@ public class ProcessImageResult : DisposableObject protected override void OnDispose(bool disposing) { - if (disposing && DisposeOutputStream && OutputStream != null) + if (disposing && DisposeImage && Image != null) { - OutputStream.Dispose(); - OutputStream = null; + Image.Dispose(); + Image = null; } } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ResizeOptions.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ResizeOptions.cs new file mode 100644 index 0000000000..5d2ea6e7ea --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ResizeOptions.cs @@ -0,0 +1,181 @@ +using System; +using System.Drawing; +using System.Linq; + +namespace SmartStore.Services.Media +{ + /// + /// Enumerated resize modes to apply to resized images. + /// + public enum ResizeMode + { + /// + /// Pads the resized image to fit the bounds of its container. + /// If only one dimension is passed, will maintain the original aspect ratio. + /// + Pad, + + /// + /// Stretches the resized image to fit the bounds of its container. + /// + Stretch, + + /// + /// Crops the resized image to fit the bounds of its container. + /// + Crop, + + /// + /// Constrains the resized image to fit the bounds of its container maintaining + /// the original aspect ratio. + /// + Max, + + /// + /// Resizes the image until the shortest side reaches the set given dimension. + /// Sets to false only allowing downscaling. + /// + Min, + + /// + /// Pads the image to fit the bound of the container without resizing the + /// original source. Sets to true. + /// When downscaling, performs the same functionality as + /// + BoxPad + } + + /// + /// Enumerated anchor positions to apply to resized images. + /// + public enum AnchorPosition + { + /// + /// Anchors the position of the image to the center of it's bounding container. + /// + Center, + + /// + /// Anchors the position of the image to the top of it's bounding container. + /// + Top, + + /// + /// Anchors the position of the image to the bottom of it's bounding container. + /// + Bottom, + + /// + /// Anchors the position of the image to the left of it's bounding container. + /// + Left, + + /// + /// Anchors the position of the image to the right of it's bounding container. + /// + Right, + + /// + /// Anchors the position of the image to the top left side of it's bounding container. + /// + TopLeft, + + /// + /// Anchors the position of the image to the top right side of it's bounding container. + /// + TopRight, + + /// + /// Anchors the position of the image to the bottom right side of it's bounding container. + /// + BottomRight, + + /// + /// Anchors the position of the image to the bottom left side of it's bounding container. + /// + BottomLeft + } + + public class ResizeOptions + { + /// + /// Gets or sets the size. + /// + public Size Size { get; set; } + + /// + /// Gets or sets the resize mode. + /// + public ResizeMode ResizeMode { get; set; } = ResizeMode.Pad; + + /// + /// Gets or sets the anchor position. + /// + public AnchorPosition AnchorPosition { get; set; } = AnchorPosition.Center; + + /// + /// Gets or sets a value indicating whether to allow up-scaling of images. + /// For this is always true. + /// + public bool Upscale { get; set; } + + /// + /// Gets or sets the center coordinates. + /// + public float[] CenterCoordinates { get; set; } + + /// + /// Gets or sets the anchor point. + /// + public Point? AnchorPoint { get; set; } + + /// + /// Returns a value that indicates whether the specified object is an + /// object that is equivalent to + /// this object. + /// + /// + /// The object to test. + /// + /// + /// True if the given object is an object that is equivalent to + /// this object; otherwise, false. + /// + public override bool Equals(object obj) + { + if (!(obj is ResizeOptions options)) + { + return false; + } + + return this.Size == options.Size + && this.ResizeMode == options.ResizeMode + && this.AnchorPosition == options.AnchorPosition + && this.Upscale == options.Upscale + && ((this.CenterCoordinates != null + && options.CenterCoordinates != null + && this.CenterCoordinates.SequenceEqual(options.CenterCoordinates)) + || (this.CenterCoordinates == options.CenterCoordinates)) + && this.AnchorPoint == options.AnchorPoint; + } + + /// + /// Returns the hash code for this instance. + /// + /// + /// A 32-bit signed integer that is the hash code for this instance. + /// + public override int GetHashCode() + { + unchecked + { + int hashCode = this.Size.GetHashCode(); + hashCode = (hashCode * 397) ^ (int)this.ResizeMode; + hashCode = (hashCode * 397) ^ (int)this.AnchorPosition; + hashCode = (hashCode * 397) ^ this.Upscale.GetHashCode(); + hashCode = (hashCode * 397) ^ (this.CenterCoordinates?.GetHashCode() ?? 0); + return (hashCode * 397) ^ this.AnchorPoint.GetHashCode(); + } + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/MediaModule.cs b/src/Libraries/SmartStore.Services/Media/MediaModule.cs index 0cc2ae706a..c60a8d266e 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaModule.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaModule.cs @@ -36,7 +36,7 @@ protected override void Load(ContainerBuilder builder) builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); // Register factory for currently active media storage provider diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 5887e2f35b..f0a8f50f89 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -352,6 +352,15 @@ + + + + + + + + + @@ -529,7 +538,7 @@ - + From 639b0d3a6bbeb85a2ac06f7f1082eaf3ec8f46ba Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 25 Aug 2020 04:26:41 +0200 Subject: [PATCH 089/695] (perf) (dev) Better image processor encapsulation & namespace refactoring. Also: faster processing and less mem usage due to removal of all MemoryStream stuff. --- .../SmartStore.Core/IO/LocalFileSystem.cs | 12 +- .../Properties/AssemblyInfo.cs | 1 + .../Export/DynamicEntityHelper.cs | 1 + .../SmartStore.Services/Media/Events.cs | 15 +- .../Extensions/IMediaServiceExtensions.cs | 1 + .../Media/Handlers/ImageHandler.cs | 13 +- .../Media/Handlers/ImageHandlerBase.cs | 6 +- .../Media/Handlers/MediaHandlerContext.cs | 3 +- .../Media/IMediaService.cs | 1 + .../Media/IMediaUrlGenerator.cs | 1 + .../Media/Imaging/BitDepth.cs | 2 +- .../Media/Imaging/CachedImage.cs | 13 +- .../Media/Imaging/IImage.cs | 23 +- .../Media/Imaging/IImageCache.cs | 2 +- .../Media/Imaging/IImageFormat.cs | 5 +- .../Media/Imaging/IImageInfo.cs | 2 +- .../Media/Imaging/IImageProcessor.cs | 6 +- .../Media/Imaging/IImageTransformer.cs | 2 +- .../Media/Imaging/ImageCache.cs | 5 +- .../Media/Imaging/ImageProcessorBase.cs | 243 +++++++++++ .../Media/Imaging/ImageSharpImageProcessor.cs | 406 ++++++++++++++++++ .../Media/Imaging/ImageWrapper.cs | 83 ++++ .../Media/Imaging/Impl/IPImage.cs | 9 +- .../Media/Imaging/Impl/IPImageFormat.cs | 4 +- .../Media/Imaging/Impl/IPImageProcessor.cs | 293 +------------ .../Media/Imaging/Impl/IPImageTransformer.cs | 2 +- .../Media/Imaging/ProcessImageException.cs | 2 +- .../Media/Imaging/ProcessImageQuery.cs | 54 ++- .../Media/Imaging/ProcessImageResult.cs | 2 +- .../Media/Imaging/ResizeOptions.cs | 2 +- .../Media/Imaging/UnsupportedImageFormat.cs | 37 ++ .../Media/MediaFileInfo.cs | 1 + .../SmartStore.Services/Media/MediaModule.cs | 2 + .../SmartStore.Services/Media/MediaService.cs | 84 ++-- .../Media/MediaUrlGenerator.cs | 1 + .../Media/Migration/MediaMigrator.cs | 7 +- .../Storage/DatabaseMediaStorageProvider.cs | 43 +- .../Storage/FileSystemMediaStorageProvider.cs | 27 +- .../Media/Storage/IMediaStorageProvider.cs | 8 +- .../Media/Storage/MediaStorageItem.cs | 147 +++++++ .../SmartStore.Services.csproj | 11 +- .../SmartStore.Services/packages.config | 3 +- .../Extensions/UrlHelperExtensions.cs | 1 + .../Modelling/Results/CachedFileResult.cs | 3 - .../Modelling/Results/FileResponder.cs | 10 +- .../Modelling/Results/IFileResponse.cs | 2 +- .../Controllers/CommonController.cs | 2 +- .../Controllers/MediaController.cs | 47 +- .../Installation/InstallDataSeeder.cs | 2 +- .../Events/TestConsumers.cs | 5 +- .../TestDatabaseMediaStorageProvider.cs | 6 +- 51 files changed, 1204 insertions(+), 459 deletions(-) create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/ImageProcessorBase.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/ImageSharpImageProcessor.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/ImageWrapper.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/UnsupportedImageFormat.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Storage/MediaStorageItem.cs diff --git a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs index dbb3581c55..823cf4a2b0 100644 --- a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs +++ b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs @@ -610,6 +610,10 @@ public Size Dimensions } return _dimensions.Value; + } + internal set + { + _dimensions = value; } } @@ -631,7 +635,13 @@ public Stream OpenRead() public Stream OpenWrite() { - return new FileStream(_localPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true); + var fi = GetFileInfo(); + if (!fi.Directory.Exists) + { + System.IO.Directory.CreateDirectory(fi.Directory.FullName); + } + + return new FileStream(_localPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true); } public Stream CreateFile() diff --git a/src/Libraries/SmartStore.Core/Properties/AssemblyInfo.cs b/src/Libraries/SmartStore.Core/Properties/AssemblyInfo.cs index ddde4c0b4a..24146e3f54 100644 --- a/src/Libraries/SmartStore.Core/Properties/AssemblyInfo.cs +++ b/src/Libraries/SmartStore.Core/Properties/AssemblyInfo.cs @@ -2,6 +2,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTitle("SmartStore.Core")] +[assembly: InternalsVisibleTo("SmartStore.Services")] [assembly: InternalsVisibleTo("SmartStore.Core.Tests")] [assembly: InternalsVisibleTo("SmartStore.Services.Tests")] [assembly: InternalsVisibleTo("SmartStore.Web.Mvc.Tests")] diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs index 8d698f54cf..107503be09 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs @@ -32,6 +32,7 @@ using SmartStore.Services.DataExchange.Export.Internal; using SmartStore.Services.Localization; using SmartStore.Services.Media; +using SmartStore.Services.Media.Imaging; using SmartStore.Services.Seo; using SmartStore.Utilities; diff --git a/src/Libraries/SmartStore.Services/Media/Events.cs b/src/Libraries/SmartStore.Services/Media/Events.cs index 80b3156476..2de2d48734 100644 --- a/src/Libraries/SmartStore.Services/Media/Events.cs +++ b/src/Libraries/SmartStore.Services/Media/Events.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.IO; using System.Web; -using ImageProcessor; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Media { @@ -15,16 +15,16 @@ namespace SmartStore.Services.Media /// /// A subscriber should NOT resize the image. But if you do - and you shouldn't :-) - , don't forget to set . /// - public class ImageUploadValidatedEvent + public class ImageUploadedEvent { - public ImageUploadValidatedEvent(ProcessImageQuery query, Size size) + public ImageUploadedEvent(ProcessImageQuery query, Size size) { Query = query; Size = size; } /// - /// Contains the source (as byte[]), max size, format and default image quality instructions. + /// Contains the source (as byte[], STream or path string), max size, format and default image quality instructions. /// public ProcessImageQuery Query { get; private set; } @@ -37,12 +37,7 @@ public ImageUploadValidatedEvent(ProcessImageQuery query, Size size) /// The processing result. If null, the original data /// from Query.Source will be put to storage. /// - public Stream ResultStream { get; set; } - - /// - /// Size of the result image. - /// - public Size ResultSize { get; set; } + public IImage ResultImage { get; set; } } /// diff --git a/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs b/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs index 3fe57b1ae0..bc3c0716fa 100644 --- a/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs +++ b/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using SmartStore.Core.Domain.Media; using SmartStore.Core.IO; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Media { diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs index 899e244149..4cee95ff9c 100644 --- a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs +++ b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using SmartStore.Core.Logging; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Media { @@ -37,17 +38,19 @@ protected override Task ProcessImageAsync(MediaHandlerContext context, CachedIma { Logger.DebugFormat($"Processed image '{cachedImage.FileName}' in {result.ProcessTimeMs} ms.", null); - if (!cachedImage.Extension.IsCaseInsensitiveEqual(result.FileExtension)) + var ext = result.Image.Format.DefaultExtension; + + if (!cachedImage.Extension.IsCaseInsensitiveEqual(ext)) { // jpg <> jpeg - cachedImage.Path = Path.ChangeExtension(cachedImage.Path, result.FileExtension); - cachedImage.Extension = result.FileExtension; + cachedImage.Path = Path.ChangeExtension(cachedImage.Path, ext); + cachedImage.Extension = ext; } - context.ResultStream = result.OutputStream; + context.ResultImage = result.Image; } - return Task.FromResult(0); + return Task.CompletedTask; } } } diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandlerBase.cs b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandlerBase.cs index ad8f0b1be8..bf04b744f8 100644 --- a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandlerBase.cs +++ b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandlerBase.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using SmartStore.Core.Localization; using SmartStore.Core.Logging; +using SmartStore.Services.Media.Imaging; using SmartStore.Utilities.Threading; namespace SmartStore.Services.Media @@ -109,10 +110,9 @@ public async Task ExecuteAsync(MediaHandlerContext context) } } - if (context.ResultStream != null && context.ResultStream.Length > 0) + if (context.ResultImage != null) { - await ImageCache.PutAsync(cachedImage, context.ResultStream); - context.ResultStream.Position = 0; + ImageCache.Put(cachedImage, context.ResultImage); context.ResultFile = cachedImage.File; } diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs index 27d8f04615..c9c94250fe 100644 --- a/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs +++ b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs @@ -9,6 +9,7 @@ using SmartStore.Core.Domain.Customers; using SmartStore.Core.IO; using SmartStore.Core.Security; +using SmartStore.Services.Media.Imaging; using SmartStore.Utilities; namespace SmartStore.Services.Media @@ -43,7 +44,7 @@ public IFile SourceFile public bool Executed { get; set; } public Exception Exception { get; set; } public IFile ResultFile { get; set; } - public Stream ResultStream { get; set; } + public IImage ResultImage { get; set; } private IFile GetSourceFile() { diff --git a/src/Libraries/SmartStore.Services/Media/IMediaService.cs b/src/Libraries/SmartStore.Services/Media/IMediaService.cs index 6aafabfdcc..045a1d2526 100644 --- a/src/Libraries/SmartStore.Services/Media/IMediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/IMediaService.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Newtonsoft.Json; using SmartStore.Core.Domain.Media; +using SmartStore.Services.Media.Imaging; using SmartStore.Services.Media.Storage; namespace SmartStore.Services.Media diff --git a/src/Libraries/SmartStore.Services/Media/IMediaUrlGenerator.cs b/src/Libraries/SmartStore.Services/Media/IMediaUrlGenerator.cs index fb8b50b4bc..1566c6b1fe 100644 --- a/src/Libraries/SmartStore.Services/Media/IMediaUrlGenerator.cs +++ b/src/Libraries/SmartStore.Services/Media/IMediaUrlGenerator.cs @@ -1,5 +1,6 @@ using SmartStore.Core.Domain.Media; using SmartStore.Core.Domain.Stores; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Media { diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/BitDepth.cs b/src/Libraries/SmartStore.Services/Media/Imaging/BitDepth.cs index 0733b74b89..8ee167be7b 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/BitDepth.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/BitDepth.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { /// /// Provides enumeration for the available bit depths. diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/CachedImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/CachedImage.cs index e23d763d16..4d4681113f 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/CachedImage.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/CachedImage.cs @@ -1,7 +1,8 @@ using System; +using System.Drawing; using SmartStore.Core.IO; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { /// /// Contains information about a cached image @@ -14,6 +15,7 @@ public class CachedImage { private bool? _exists; private string _mimeType; + private Size? _size; public CachedImage(IFile file) { @@ -69,6 +71,15 @@ public string MimeType get => _mimeType ?? (_mimeType = MimeTypes.MapNameToMimeType(FileName)); } + /// + /// The image width and height. + /// + public Size Size + { + get => _size ?? (_size = File.Dimensions).Value; + internal set => _size = value; + } + /// /// The path relative to the cache root folder /// diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs index 3df584062a..75d3f3e02b 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs @@ -6,8 +6,23 @@ using System.Text; using System.Threading.Tasks; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { + /// + /// Represents a processable image. + /// + public interface IProcessableImage : IImage + { + /// + /// Transforms the image. + /// + /// + IImage Transform(Action transformer); + } + + /// + /// Represents an image. + /// public interface IImage : IImageInfo, IDisposable { /// @@ -25,12 +40,6 @@ public interface IImage : IImageInfo, IDisposable /// new IImageFormat Format { get; set; } - /// - /// Transforms the image. - /// - /// - IImage Transform(Action transformer); - /// /// Saves the current image to the specified output stream. /// diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs index 3fdf2fa93c..f2e675fa70 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using SmartStore.Core.Domain.Media; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { /// /// Image cache interface diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageFormat.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageFormat.cs index 081818158d..25e8516973 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageFormat.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageFormat.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { /// /// Defines the contract for an image format. diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageInfo.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageInfo.cs index 8e020bd0ff..9ab9cedad4 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageInfo.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageInfo.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { /// /// Encapsulates properties that describe basic image information including dimensions, pixel type information diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs index 08cfe15037..ad392d3049 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { /// /// A service interface responsible for resizing/processing images. @@ -17,9 +17,9 @@ public interface IImageProcessor IImageFormat GetImageFormat(string extension); - IImage LoadImage(string path); + IProcessableImage LoadImage(string path); - IImage LoadImage(Stream stream); + IProcessableImage LoadImage(Stream stream); /// /// Processes an image diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs index 7df59285d9..aaee41ea22 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { public interface IImageTransformer { diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs index d73f0e20eb..dcf6ef77a6 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs @@ -6,7 +6,7 @@ using SmartStore.Core.Domain.Media; using SmartStore.Core.Logging; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { public class ImageCache : IImageCache { @@ -20,8 +20,6 @@ public class ImageCache : IImageCache public ImageCache( MediaSettings mediaSettings, IMediaFileSystem fileSystem, - IImageProcessor imageProcessor, - IFolderService folderService, MediaHelper mediaHelper) { _mediaSettings = mediaSettings; @@ -40,6 +38,7 @@ public void Put(CachedImage cachedImage, IImage image) if (PreparePut(cachedImage, stream)) { image.Save(stream); + image.Dispose(); PostPut(cachedImage, path); } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ImageProcessorBase.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ImageProcessorBase.cs new file mode 100644 index 0000000000..84d1c9d477 --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ImageProcessorBase.cs @@ -0,0 +1,243 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Drawing; +using SmartStore.Core.Logging; +using SmartStore.Core.Events; +using SmartStore.Utilities; +using SmartStore.Core.IO; + +namespace SmartStore.Services.Media.Imaging +{ + public abstract class ImageProcessorBase : IImageProcessor + { + private static long _totalProcessingTime; + + private readonly IEventPublisher _eventPublisher; + + public ImageProcessorBase(IEventPublisher eventPublisher) + { + _eventPublisher = eventPublisher; + } + + public ILogger Logger { get; set; } = NullLogger.Instance; + + public abstract bool IsSupportedImage(string extension); + + public abstract IImageFormat GetImageFormat(string extension); + + public abstract IProcessableImage LoadImage(string path); + + public abstract IProcessableImage LoadImage(Stream stream); + + public virtual ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) + { + Guard.NotNull(query, nameof(query)); + + ValidateQuery(query); + + var watch = new Stopwatch(); + long len; + IProcessableImage image = null; + + try + { + watch.Start(); + + var source = query.Source; + + // Load source + if (source is byte[] b) + { + using var memStream = new MemoryStream(b); + image = LoadImage(memStream); + len = b.LongLength; + } + else if (source is Stream s) + { + image = LoadImage(s); + len = s.Length; + } + else if (source is string str) + { + str = NormalizePath(str); + image = LoadImage(str); + len = (new FileInfo(str)).Length; + } + else if (source is IFile file) + { + using (var fs = file.OpenRead()) + { + image = LoadImage(fs); + len = file.Size; + } + } + else + { + throw new ProcessImageException("Invalid source type '{0}' in query.".FormatInvariant(query.Source.GetType().FullName), query); + } + + var sourceFormat = image.Format; + + // Pre-process event + _eventPublisher.Publish(new ImageProcessingEvent(query, image)); + + var result = new ProcessImageResult + { + Query = query, + SourceFormat = image.Format, + Image = image, + DisposeImage = disposeOutput + }; + + // Core processing + ProcessImageCore(query, image, out var fxApplied); + + result.HasAppliedVisualEffects = fxApplied; + + // TODO: convert this shit, but how?!!! + //if (inBuffer != null) + //{ + // // Check whether it is more beneficial to return the source instead of the result. + // // Prefer result only if its size is smaller than the source size. + // // Result size may be larger if a high-compressed image has been uploaded. + // // During image processing the source compression algorithm gets lost and the image may be larger in size + // // after encoding with default encoders. + // var compare = + // // only when image was not altered visually... + // !fxApplied + // // ...size has not changed + // && image.Size == image.SourceSize + // // ...and format has not changed + // && image.Format.Name == result.SourceFormat.Name; + + // if (compare && len <= outStream.Length) + // { + // // Source is smaller. Throw away result and get back to source. + // outStream.Dispose(); + // result.OutputStream = new MemoryStream(inBuffer, 0, inBuffer.Length, true, true); + // } + //} + + //// Set output stream + //if (result.OutputStream == null) + //{ + // result.OutputStream = outStream; + //} + + // Post-process event + _eventPublisher.Publish(new ImageProcessedEvent(query, result)); + + result.ProcessTimeMs = watch.ElapsedMilliseconds; + + return result; + } + catch (Exception ex) + { + throw new ProcessImageException(query, ex); + } + finally + { + if (query.DisposeSource && query.Source is IDisposable source) + { + source.Dispose(); + } + + watch.Stop(); + _totalProcessingTime += watch.ElapsedMilliseconds; + } + } + + /// + /// Processes the loaded image. Inheritors should NOT save the image, this is done by the caller. + /// + /// Query + /// Image instance + /// + /// Should be true if any effect has been applied that potentially changes the image visually (like background color, contrast, sharpness etc.). + /// Resize and compression quality does NOT count as FX. + /// + protected virtual void ProcessImageCore(ProcessImageQuery query, IProcessableImage image, out bool fxApplied) + { + bool fxAppliedInternal = false; + + // Resize + var size = query.MaxWidth != null || query.MaxHeight != null + ? new Size(query.MaxWidth ?? 0, query.MaxHeight ?? 0) + : Size.Empty; + + image.Transform(transformer => + { + if (!size.IsEmpty) + { + transformer.Resize(new ResizeOptions + { + Size = size, + ResizeMode = ProcessImageQuery.ConvertScaleMode(query.ScaleMode), + AnchorPosition = ProcessImageQuery.ConvertAnchorPosition(query.AnchorPosition) + }); ; + } + + if (query.BackgroundColor.HasValue()) + { + transformer.BackgroundColor(ColorTranslator.FromHtml(query.BackgroundColor)); + fxAppliedInternal = true; + } + }); + + + // Format + if (query.Format != null) + { + var format = query.Format as IImageFormat; + + if (format == null && query.Format is string) + { + var requestedFormat = ((string)query.Format).ToLowerInvariant(); + format = GetImageFormat(requestedFormat); + } + + if (format != null) + { + image.Format = format; + } + } + + //// Set Quality (TODO) + //if (query.Quality.HasValue) + //{ + // processor.Quality(query.Quality.Value); + //} + + fxApplied = fxAppliedInternal; + } + + protected virtual string NormalizePath(string path) + { + if (path.IsWebUrl()) + { + throw new NotSupportedException($"Remote images cannot be processed: Path: {path}"); + } + + if (!PathHelper.IsAbsolutePhysicalPath(path)) + { + path = CommonHelper.MapPath(path); + } + + return path; + } + + private void ValidateQuery(ProcessImageQuery query) + { + if (query.Source == null) + { + throw new ArgumentException("During image processing 'ProcessImageQuery.Source' must not be null.", nameof(query)); + } + } + + public long TotalProcessingTimeMs + { + get { return _totalProcessingTime; } + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ImageSharpImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ImageSharpImageProcessor.cs new file mode 100644 index 0000000000..67363b4ea3 --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ImageSharpImageProcessor.cs @@ -0,0 +1,406 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Linq; +//using System.Drawing; +//using ImageProcessor; +//using ImageProcessor.Imaging; +//using ImageProcessor.Imaging.Formats; +using SmartStore.Core.Logging; +//using ImageProcessor.Configuration; +using SixLabors.ImageSharp; +using SmartStore.Core.Events; +using SmartStore.Utilities; +using SmartStore.Core.IO; +using SixLabors.ImageSharp.Formats; +using ImageSharpConfig = SixLabors.ImageSharp.Configuration; +using System.Collections.Concurrent; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Formats.Jpeg; + +namespace SmartStore.Services.Media +{ + public partial class ImageSharpImageProcessor : IImageProcessor + { + class SourceImage + { + public Image Image { get; set; } + public IImageFormat Format { get; set; } + public Stream Stream { get; set; } + public long Length { get; set; } + public int Width { get; set; } + public int Height { get; set; } + } + + private static readonly ConcurrentDictionary _supportedFormats = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); + private static long _totalProcessingTime; + + private readonly IEventPublisher _eventPublisher; + + static ImageSharpImageProcessor() + { + ImageSharpConfig.Default.MemoryAllocator = new SixLabors.ImageSharp.Memory.SimpleGcMemoryAllocator(); + + } + + public ImageSharpImageProcessor(IEventPublisher eventPublisher) + { + _eventPublisher = eventPublisher; + } + + public ILogger Logger { get; set; } = NullLogger.Instance; + + public bool IsSupportedImage(string extension) + { + if (extension.IsEmpty()) + { + return false; + } + + if (extension[0] == '.' && extension.Length > 1) + { + extension = extension.Substring(1); + } + + return _supportedFormats.GetOrAdd(extension, k => + { + return ImageSharpConfig.Default.ImageFormats + .SelectMany(x => x.FileExtensions) + .Any(x => x.Equals(extension, StringComparison.OrdinalIgnoreCase)); + }); + + //return ImageProcessorBootstrapper.Instance.SupportedImageFormats + // .SelectMany(x => x.FileExtensions) + // .Any(x => x.Equals(extension, StringComparison.OrdinalIgnoreCase)); + } + + public ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) + { + Guard.NotNull(query, nameof(query)); + + ValidateQuery(query); + + var watch = new Stopwatch(); + SourceImage source = null; + + try + { + watch.Start(); + + // Load source + source = LoadImage(query); + + // Pre-process event + _eventPublisher.Publish(new ImageProcessingEvent(query, source.Image)); + + var result = new ProcessImageResult + { + Query = query, + SourceWidth = source.Image.Width, + SourceHeight = source.Image.Height, + SourceMimeType = source.Format.DefaultMimeType, + DisposeOutputStream = disposeOutput + }; + + // Core processing + ProcessImageCore(query, source.Image, out var fxApplied); + + // Create & prepare result + //var outStream = new MemoryStream(); + //source.Image.Save(outStream, source.Format); // TODO: outFormat + var dest = SaveImage(source, query); + + var fmt = dest.Format; + result.FileExtension = fmt.FileExtensions.First(); + result.MimeType = fmt.DefaultMimeType; + + result.HasAppliedVisualEffects = fxApplied; + result.Width = source.Image.Width; + result.Height = source.Image.Height; + + if (source.Length > 0) + { + // Check whether it is more beneficial to return the source instead of the result. + // Prefer result only if its size is smaller than the source size. + // Result size may be larger if a high-compressed image has been uploaded. + // During image processing the source compression algorithm gets lost and the image may be larger in size + // after encoding with default encoders. + var compare = + // only when image was not altered visually... + !fxApplied + // ...size has not changed + && result.Width == result.SourceWidth + && result.Height == result.SourceHeight + // ...and format has not changed + && result.MimeType == result.SourceMimeType; + + if (compare && source.Length <= dest.OutStream.Length) + { + // Source is smaller. Throw away result and get back to source. + dest.OutStream.Dispose(); + dest.OutStream = null; + source.Stream.Position = 0; + result.OutputStream = source.Stream; + } + } + + // Set output stream + if (result.OutputStream == null) + { + result.OutputStream = dest.OutStream; + } + + // Post-process event + _eventPublisher.Publish(new ImageProcessedEvent(query, source.Image, result)); + + result.OutputStream.Position = 0; + + result.ProcessTimeMs = watch.ElapsedMilliseconds; + + return result; + } + catch (Exception ex) + { + throw new ProcessImageException(query, ex); + } + finally + { + if (source?.Image != null) + { + source?.Image.Dispose(); + } + + if (source?.Stream != null && query.DisposeSource) + { + source?.Stream.Dispose(); + } + + watch.Stop(); + _totalProcessingTime += watch.ElapsedMilliseconds; + } + } + + private SourceImage LoadImage(ProcessImageQuery query) + { + var source = query.Source; + + Image image; + IImageFormat format; + Stream stream; + long len; + + // Load source + if (source is byte[] b) + { + stream = new MemoryStream(b); + len = b.LongLength; + } + else if (source is Stream s) + { + stream = s; + len = s.Length; + } + else if (source is string str) + { + var fi = new FileInfo(NormalizePath(str)); + stream = fi.OpenRead(); + len = fi.Length; + } + else if (source is IFile file) + { + len = file.Size; + stream = file.OpenRead(); + } + else + { + throw new ProcessImageException("Invalid source type '{0}' in query.".FormatInvariant(query.Source.GetType().FullName), query); + } + + image = Image.Load(stream, out format); + + return new SourceImage + { + Image = image, + Format = format, + Stream = stream, + Length = len, + Width = image.Width, + Height = image.Height + }; + } + + private (MemoryStream OutStream, IImageFormat Format, IImageEncoder Encoder) SaveImage(SourceImage source, ProcessImageQuery query) + { + // Format + IImageFormat format = null; + if (query.Format != null) + { + format = query.Format as IImageFormat; + + if (format == null && query.Format is string) + { + var requestedFormat = ((string)query.Format).ToLowerInvariant(); + format = ImageSharpConfig.Default.ImageFormatsManager.FindFormatByFileExtension(requestedFormat); + } + } + + format ??= source.Format; + + // Encoder + var encoder = ImageSharpConfig.Default.ImageFormatsManager.FindEncoder(format); + + // Set Quality + if (query.Quality.HasValue && encoder is JpegEncoder) + { + // Create new encoder instance to avoid altering a shared static encoder instance. + encoder = new JpegEncoder { Quality = query.Quality }; + } + + var outStream = new MemoryStream(); + source.Image.Save(outStream, encoder); + + return (outStream, format, encoder); + } + + /// + /// Processes the loaded image. Inheritors should NOT save the image, this is done by the main method. + /// + /// Query + /// Processor instance + /// + /// Should be true if any effect has been applied that potentially changes the image visually (like background color, contrast, sharpness etc.). + /// Resize and compression quality does NOT count as FX. + /// + protected virtual void ProcessImageCore(ProcessImageQuery query, Image image, out bool fxApplied) + { + bool fxAppliedPrivate = false; + + // Resize + var size = query.MaxWidth != null || query.MaxHeight != null + ? new Size(query.MaxWidth ?? 0, query.MaxHeight ?? 0) + : Size.Empty; + + image.Mutate(x => + { + if (!size.IsEmpty && (image.Width > size.Width || image.Height > size.Height)) + { + //image.Resize(new ResizeLayer( + // size, + // resizeMode: ConvertScaleMode(query.ScaleMode), + // anchorPosition: ConvertAnchorPosition(query.AnchorPosition), + // upscale: false)); + + x.Resize(new ResizeOptions + { + Size = size, + Mode = ConvertScaleMode(query.ScaleMode), + Position = ConvertAnchorPosition(query.AnchorPosition) + }); + } + + if (query.BackgroundColor.HasValue()) + { + x.BackgroundColor(Color.ParseHex(query.BackgroundColor)); + fxAppliedPrivate = true; + } + }); + + //// Format + //if (query.Format != null) + //{ + // var format = query.Format as IImageFormat; + + // if (format == null && query.Format is string) + // { + // var requestedFormat = ((string)query.Format).ToLowerInvariant(); + // format = ImageSharpConfig.Default.ImageFormatsManager.FindFormatByFileExtension(requestedFormat); + // } + + // if (format != null) + // { + // image.Format(format); + // } + //} + + //// Set Quality + //if (query.Quality.HasValue) + //{ + // image.Quality(query.Quality.Value); + //} + + fxApplied = fxAppliedPrivate; + } + + private string NormalizePath(string path) + { + if (path.IsWebUrl()) + { + throw new NotSupportedException($"Remote images cannot be processed: Path: {path}"); + } + + if (!PathHelper.IsAbsolutePhysicalPath(path)) + { + path = CommonHelper.MapPath(path); + } + + return path; + } + + private void ValidateQuery(ProcessImageQuery query) + { + if (query.Source == null) + { + throw new ArgumentException("During image processing 'ProcessImageQuery.Source' must not be null.", nameof(query)); + } + } + + public long TotalProcessingTimeMs + { + get { return _totalProcessingTime; } + } + + private ResizeMode ConvertScaleMode(string mode) + { + switch (mode.EmptyNull().ToLower()) + { + case "boxpad": + return ResizeMode.BoxPad; + case "crop": + return ResizeMode.Crop; + case "min": + return ResizeMode.Min; + case "pad": + return ResizeMode.Pad; + case "stretch": + return ResizeMode.Stretch; + default: + return ResizeMode.Max; + } + } + + private AnchorPositionMode ConvertAnchorPosition(string anchor) + { + switch (anchor.EmptyNull().ToLower()) + { + case "top": + return AnchorPositionMode.Top; + case "bottom": + return AnchorPositionMode.Bottom; + case "left": + return AnchorPositionMode.Left; + case "right": + return AnchorPositionMode.Right; + case "top-left": + return AnchorPositionMode.TopLeft; + case "top-right": + return AnchorPositionMode.TopRight; + case "bottom-left": + return AnchorPositionMode.BottomLeft; + case "bottom-right": + return AnchorPositionMode.BottomRight; + default: + return AnchorPositionMode.Center; + } + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ImageWrapper.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ImageWrapper.cs new file mode 100644 index 0000000000..180c4fd45a --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ImageWrapper.cs @@ -0,0 +1,83 @@ +using System; +using System.Drawing; +using System.IO; + +namespace SmartStore.Services.Media.Imaging +{ + public class ImageWrapper : DisposableObject, IImage + { + private readonly bool _disposeStream; + + public ImageWrapper(Stream stream, Size size, IImageFormat format, BitDepth bitDepth = BitDepth.Bit24, bool disposeStream = true) + { + Guard.NotNull(stream, nameof(stream)); + Guard.NotNull(format, nameof(format)); + + InStream = stream; + Format = format; + Size = size; + SourceSize = size; + BitDepth = bitDepth; + _disposeStream = disposeStream; + } + + #region IImageInfo + + /// + public Size Size { get; } + + /// + public BitDepth BitDepth { get; set; } = BitDepth.Bit24; + + /// + public IImageFormat Format { get; set; } + + #endregion + + public Stream InStream { get; } + + /// + public Size SourceSize { get; set; } + + /// + public IImage Save(string path) + { + Guard.NotEmpty(path, nameof(path)); + + var di = new DirectoryInfo(Path.GetDirectoryName(path)); + if (!di.Exists) + { + di.Create(); + } + + using var stream = File.OpenWrite(path); + return Save(stream); + } + + /// + public IImage Save(Stream stream) + { + Guard.NotNull(stream, nameof(stream)); + + if (stream.CanSeek) + { + stream.SetLength(0); + } + + InStream.CopyTo(stream); + + if (stream.CanSeek) + { + stream.Position = 0; + } + + return this; + } + + protected override void OnDispose(bool disposing) + { + if (disposing && _disposeStream) + InStream.Dispose(); + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs index 7ccb4f7b0a..23cacd4ff5 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; using ImageProcessor; -namespace SmartStore.Services.Media.Impl +namespace SmartStore.Services.Media.Imaging.Impl { - internal class IPImage : DisposableObject, IImage + public class IPImage : DisposableObject, IProcessableImage { private readonly ImageFactory _image; @@ -44,6 +44,11 @@ public IImageFormat Format #endregion + public ImageFactory ImageFactory + { + get => _image; + } + /// public Size SourceSize { get; } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs index 9b2f9cd12a..a83ffb689b 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace SmartStore.Services.Media.Impl +namespace SmartStore.Services.Media.Imaging.Impl { internal class IPImageFormat : IImageFormat { @@ -22,7 +22,7 @@ public ISupportedImageFormat WrappedFormat get => _format; } - public string Name => _format.MimeType; + public string Name => _format.DefaultExtension; public string DefaultExtension => _format.DefaultExtension == "jpeg" ? "jpg" : _format.DefaultExtension; diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs index e8ea330c9f..87c9fd51ac 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs @@ -1,41 +1,32 @@ using System; -using System.Diagnostics; using System.IO; using System.Linq; -using System.Drawing; using ImageProcessor; -using ImageProcessor.Imaging; -using ImageProcessor.Imaging.Formats; -using SmartStore.Core.Logging; using ImageProcessor.Configuration; +using ImageProcessor.Imaging.Formats; +using ImageProcessor.Plugins.WebP.Imaging.Formats; using SmartStore.Core.Events; -using SmartStore.Utilities; -using SmartStore.Core.IO; -using System.Collections.Concurrent; -using System.Collections.Generic; -namespace SmartStore.Services.Media.Impl +namespace SmartStore.Services.Media.Imaging.Impl { - public partial class IPImageProcessor : IImageProcessor + public partial class IPImageProcessor : ImageProcessorBase { - private static long _totalProcessingTime; - private static readonly IEnumerable _supportedFormats = ImageProcessorBootstrapper.Instance.SupportedImageFormats; - - private readonly IEventPublisher _eventPublisher; + static IPImageProcessor() + { + ImageProcessorBootstrapper.Instance.AddImageFormats(new WebPFormat { Quality = 100 }); + } public IPImageProcessor(IEventPublisher eventPublisher) + : base(eventPublisher) { - _eventPublisher = eventPublisher; } - public ILogger Logger { get; set; } = NullLogger.Instance; - - public virtual bool IsSupportedImage(string extension) + public override bool IsSupportedImage(string extension) { - return GetInternalImageFormat(extension) != null; + return GetInternalImageFormat(extension) != null; } - public virtual IImageFormat GetImageFormat(string extension) + public override IImageFormat GetImageFormat(string extension) { var internalFormat = GetInternalImageFormat(extension); if (internalFormat != null) @@ -58,11 +49,11 @@ private ISupportedImageFormat GetInternalImageFormat(string extension) extension = extension.Substring(1); } - return _supportedFormats + return ImageProcessorBootstrapper.Instance.SupportedImageFormats .FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase)); } - public virtual IImage LoadImage(string path) + public override IProcessableImage LoadImage(string path) { var internalImage = new ImageFactory(preserveExifData: false, fixGamma: false) .Load(NormalizePath(path)); @@ -70,266 +61,12 @@ public virtual IImage LoadImage(string path) return new IPImage(internalImage); } - public virtual IImage LoadImage(Stream stream) + public override IProcessableImage LoadImage(Stream stream) { var internalImage = new ImageFactory(preserveExifData: false, fixGamma: false) .Load(stream); return new IPImage(internalImage); } - - public virtual ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) - { - Guard.NotNull(query, nameof(query)); - - ValidateQuery(query); - - var watch = new Stopwatch(); - byte[] inBuffer = null; - long len = 0; - IImage image = null; - - try - { - watch.Start(); - - var source = query.Source; - - // Load source - if (source is byte[] b) - { - inBuffer = b; - len = b.LongLength; - } - else if (source is Stream s) - { - image = LoadImage(s); - len = s.Length; - } - else if (source is string str) - { - str = NormalizePath(str); - image = LoadImage(str); - len = (new FileInfo(str)).Length; - } - else if (source is IFile file) - { - using (var fs = file.OpenRead()) - { - image = LoadImage(fs); - len = file.Size; - } - } - else - { - throw new ProcessImageException("Invalid source type '{0}' in query.".FormatInvariant(query.Source.GetType().FullName), query); - } - - var sourceFormat = image.Format; - - // Pre-process event - _eventPublisher.Publish(new ImageProcessingEvent(query, image)); - - var result = new ProcessImageResult - { - Query = query, - SourceFormat = image.Format, - Image = image, - DisposeImage = disposeOutput - }; - - // Core processing - ProcessImageCore(query, image, out var fxApplied); - - result.HasAppliedVisualEffects = fxApplied; - - // TODO: convert this shit, but how?!!! - //if (inBuffer != null) - //{ - // // Check whether it is more beneficial to return the source instead of the result. - // // Prefer result only if its size is smaller than the source size. - // // Result size may be larger if a high-compressed image has been uploaded. - // // During image processing the source compression algorithm gets lost and the image may be larger in size - // // after encoding with default encoders. - // var compare = - // // only when image was not altered visually... - // !fxApplied - // // ...size has not changed - // && image.Size == image.SourceSize - // // ...and format has not changed - // && image.Format.Name == result.SourceFormat.Name; - - // if (compare && len <= outStream.Length) - // { - // // Source is smaller. Throw away result and get back to source. - // outStream.Dispose(); - // result.OutputStream = new MemoryStream(inBuffer, 0, inBuffer.Length, true, true); - // } - //} - - //// Set output stream - //if (result.OutputStream == null) - //{ - // result.OutputStream = outStream; - //} - - // Post-process event - _eventPublisher.Publish(new ImageProcessedEvent(query, result)); - - result.ProcessTimeMs = watch.ElapsedMilliseconds; - - return result; - } - catch (Exception ex) - { - throw new ProcessImageException(query, ex); - } - finally - { - if (query.DisposeSource && query.Source is IDisposable source) - { - source.Dispose(); - } - - watch.Stop(); - _totalProcessingTime += watch.ElapsedMilliseconds; - } - } - - /// - /// Processes the loaded image. Inheritors should NOT save the image, this is done by the caller. - /// - /// Query - /// Image instance - /// - /// Should be true if any effect has been applied that potentially changes the image visually (like background color, contrast, sharpness etc.). - /// Resize and compression quality does NOT count as FX. - /// - protected virtual void ProcessImageCore(ProcessImageQuery query, IImage image, out bool fxApplied) - { - bool fxAppliedInternal = false; - - // Resize - var size = query.MaxWidth != null || query.MaxHeight != null - ? new Size(query.MaxWidth ?? 0, query.MaxHeight ?? 0) - : Size.Empty; - - image.Transform(transformer => - { - if (!size.IsEmpty) - { - transformer.Resize(new ResizeOptions - { - Size = size, - ResizeMode = ConvertScaleMode(query.ScaleMode), - AnchorPosition = ConvertAnchorPosition(query.AnchorPosition) - }); ; - } - - if (query.BackgroundColor.HasValue()) - { - transformer.BackgroundColor(ColorTranslator.FromHtml(query.BackgroundColor)); - fxAppliedInternal = true; - } - }); - - - // Format - if (query.Format != null) - { - var format = query.Format as IImageFormat; - - if (format == null && query.Format is string) - { - var requestedFormat = ((string)query.Format).ToLowerInvariant(); - format = GetImageFormat(requestedFormat); - } - - if (format != null) - { - image.Format = format; - } - } - - //// Set Quality (TODO) - //if (query.Quality.HasValue) - //{ - // processor.Quality(query.Quality.Value); - //} - - fxApplied = fxAppliedInternal; - } - - private string NormalizePath(string path) - { - if (path.IsWebUrl()) - { - throw new NotSupportedException($"Remote images cannot be processed: Path: {path}"); - } - - if (!PathHelper.IsAbsolutePhysicalPath(path)) - { - path = CommonHelper.MapPath(path); - } - - return path; - } - - private void ValidateQuery(ProcessImageQuery query) - { - if (query.Source == null) - { - throw new ArgumentException("During image processing 'ProcessImageQuery.Source' must not be null.", nameof(query)); - } - } - - public long TotalProcessingTimeMs - { - get { return _totalProcessingTime; } - } - - private ResizeMode ConvertScaleMode(string mode) - { - switch (mode.EmptyNull().ToLower()) - { - case "boxpad": - return ResizeMode.BoxPad; - case "crop": - return ResizeMode.Crop; - case "min": - return ResizeMode.Min; - case "pad": - return ResizeMode.Pad; - case "stretch": - return ResizeMode.Stretch; - default: - return ResizeMode.Max; - } - } - - private AnchorPosition ConvertAnchorPosition(string anchor) - { - switch (anchor.EmptyNull().ToLower()) - { - case "top": - return AnchorPosition.Top; - case "bottom": - return AnchorPosition.Bottom; - case "left": - return AnchorPosition.Left; - case "right": - return AnchorPosition.Right; - case "top-left": - return AnchorPosition.TopLeft; - case "top-right": - return AnchorPosition.TopRight; - case "bottom-left": - return AnchorPosition.BottomLeft; - case "bottom-right": - return AnchorPosition.BottomRight; - default: - return AnchorPosition.Center; - } - } } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs index 125bf98a6e..b7889069f0 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs @@ -7,7 +7,7 @@ using ImageProcessor; using ImageProcessor.Imaging; -namespace SmartStore.Services.Media.Impl +namespace SmartStore.Services.Media.Imaging.Impl { internal class IPImageTransformer : IImageTransformer { diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageException.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageException.cs index 9a0cc3f09c..023cac8db7 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageException.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageException.cs @@ -1,6 +1,6 @@ using System; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { public sealed class ProcessImageException : Exception { diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs index cba9253b04..550517044e 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs @@ -8,7 +8,7 @@ using System.Drawing; using ImageProcessor.Imaging.Formats; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { public class ProcessImageQuery : QueryString { @@ -189,9 +189,9 @@ public bool NeedsProcessing(bool ignoreQualityFlag = false) return false; } - if (base.Count == 1 && Quality == 100) + if (base.Count == 1 && Quality >= 90) { - // If "q" is the only flag and its value is 100, we don't need to process + // If "q" is the only flag and its value is >= 90, we don't need to process return false; } @@ -231,5 +231,53 @@ public string GetResultExtension() return null; } + + #region Static Helpers + + public static ResizeMode ConvertScaleMode(string mode) + { + switch (mode.EmptyNull().ToLower()) + { + case "boxpad": + return ResizeMode.BoxPad; + case "crop": + return ResizeMode.Crop; + case "min": + return ResizeMode.Min; + case "pad": + return ResizeMode.Pad; + case "stretch": + return ResizeMode.Stretch; + default: + return ResizeMode.Max; + } + } + + public static AnchorPosition ConvertAnchorPosition(string anchor) + { + switch (anchor.EmptyNull().ToLower()) + { + case "top": + return SmartStore.Services.Media.Imaging.AnchorPosition.Top; + case "bottom": + return SmartStore.Services.Media.Imaging.AnchorPosition.Bottom; + case "left": + return SmartStore.Services.Media.Imaging.AnchorPosition.Left; + case "right": + return SmartStore.Services.Media.Imaging.AnchorPosition.Right; + case "top-left": + return SmartStore.Services.Media.Imaging.AnchorPosition.TopLeft; + case "top-right": + return SmartStore.Services.Media.Imaging.AnchorPosition.TopRight; + case "bottom-left": + return SmartStore.Services.Media.Imaging.AnchorPosition.BottomLeft; + case "bottom-right": + return SmartStore.Services.Media.Imaging.AnchorPosition.BottomRight; + default: + return SmartStore.Services.Media.Imaging.AnchorPosition.Center; + } + } + + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs index 596d33ae93..0491cbef7d 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { public class ProcessImageResult : DisposableObject { diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ResizeOptions.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ResizeOptions.cs index 5d2ea6e7ea..421dc6239b 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ResizeOptions.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ResizeOptions.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Linq; -namespace SmartStore.Services.Media +namespace SmartStore.Services.Media.Imaging { /// /// Enumerated resize modes to apply to resized images. diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/UnsupportedImageFormat.cs b/src/Libraries/SmartStore.Services/Media/Imaging/UnsupportedImageFormat.cs new file mode 100644 index 0000000000..24574a78f1 --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/UnsupportedImageFormat.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; + +namespace SmartStore.Services.Media.Imaging +{ + public class UnsupportedImageFormat : IImageFormat + { + public UnsupportedImageFormat(string mimeType, string extension) + { + Guard.NotEmpty(mimeType, nameof(mimeType)); + Guard.NotEmpty(extension, nameof(extension)); + + if (extension[0] == '.' && extension.Length > 1) + { + extension = extension.Substring(1); + } + + Name = extension; + DefaultMimeType = mimeType; + DefaultExtension = extension; + } + + public string Name { get; } + public string DefaultExtension { get; } + public string DefaultMimeType { get; } + + public IEnumerable FileExtensions + { + get => new string[] { DefaultExtension }; + } + + public IEnumerable MimeTypes + { + get => new string[] { DefaultMimeType }; + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs index bff031e5bb..8569e1e55a 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json; using SmartStore.Core.Domain.Media; using SmartStore.Core.IO; +using SmartStore.Services.Media.Imaging; using SmartStore.Services.Media.Storage; namespace SmartStore.Services.Media diff --git a/src/Libraries/SmartStore.Services/Media/MediaModule.cs b/src/Libraries/SmartStore.Services/Media/MediaModule.cs index c60a8d266e..cdec9c3198 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaModule.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaModule.cs @@ -4,6 +4,8 @@ using SmartStore.Core.Infrastructure; using SmartStore.Core.Plugins; using SmartStore.Services.Configuration; +using SmartStore.Services.Media.Imaging; +using SmartStore.Services.Media.Imaging.Impl; using SmartStore.Services.Media.Migration; using SmartStore.Services.Media.Storage; diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs index ce62fb0ba7..a25220c0a9 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -15,6 +15,7 @@ using SmartStore.Core.Localization; using SmartStore.Core.Logging; using SmartStore.Services.Localization; +using SmartStore.Services.Media.Imaging; using SmartStore.Services.Media.Storage; namespace SmartStore.Services.Media @@ -354,7 +355,8 @@ public MediaFileInfo SaveFile(string path, Stream stream, bool isTransient = tru var pathData = CreatePathData(path); var file = _fileRepo.Table.FirstOrDefault(x => x.Name == pathData.FileName && x.FolderId == pathData.Folder.Id); - stream = ProcessFile(ref file, pathData, stream, isTransient, dupeFileHandling); + var isNewFile = file == null; + var storageItem = ProcessFile(ref file, pathData, stream, isTransient, dupeFileHandling); using (var scope = new DbContextScope(_fileRepo.Context, autoCommit: false)) { @@ -364,8 +366,22 @@ public MediaFileInfo SaveFile(string path, Stream stream, bool isTransient = tru scope.Commit(); } - _storageProvider.Save(file, stream); - scope.Commit(); + try + { + _storageProvider.Save(file, storageItem); + scope.Commit(); + } + catch (Exception ex) + { + if (isNewFile) + { + // New file's metadata should be removed on storage save failure immediately + DeleteFile(file, true, true); + scope.Commit(); + } + + Logger.Error(ex); + } } return ConvertMediaFile(file, pathData.Folder); @@ -377,7 +393,7 @@ public async Task SaveFileAsync(string path, Stream stream, bool var file = await _fileRepo.Table.FirstOrDefaultAsync(x => x.Name == pathData.FileName && x.FolderId == pathData.Folder.Id); var isNewFile = file == null; - stream = ProcessFile(ref file, pathData, stream, isTransient, dupeFileHandling); + var storageItem = ProcessFile(ref file, pathData, stream, isTransient, dupeFileHandling); using (var scope = new DbContextScope(_fileRepo.Context, autoCommit: false)) { @@ -389,7 +405,7 @@ public async Task SaveFileAsync(string path, Stream stream, bool try { - await _storageProvider.SaveAsync(file, stream); + await _storageProvider.SaveAsync(file, storageItem); await scope.CommitAsync(); } catch (Exception ex) @@ -397,12 +413,7 @@ public async Task SaveFileAsync(string path, Stream stream, bool if (isNewFile) { // New file's metadata should be removed on storage save failure immediately - if (file.MediaStorage != null) - { - file.MediaStorage.Data = null; - file.MediaStorage = null; - } - _fileRepo.Delete(file); + DeleteFile(file, true, true); await scope.CommitAsync(); } @@ -475,7 +486,7 @@ protected MediaPathData CreatePathData(string path) return pathData; } - protected Stream ProcessFile( + protected MediaStorageItem ProcessFile( ref MediaFile file, MediaPathData pathData, Stream inStream, @@ -537,38 +548,39 @@ protected Stream ProcessFile( } // Process image - if (inStream != null && inStream.Length > 0 && file.MediaType == MediaType.Image && ProcessImage(file, inStream, out var outStream, out var size)) + if (inStream != null && inStream.Length > 0 && file.MediaType == MediaType.Image && ProcessImage(file, inStream, out var outImage)) { - inStream = outStream; - file.Size = (int)outStream.Length; - file.Width = size.Width; - file.Height = size.Height; - file.PixelSize = size.Width * size.Height; + //file.Size = (int)outStream.Length; + file.Width = outImage.Size.Width; + file.Height = outImage.Size.Height; + file.PixelSize = outImage.Size.Width * outImage.Size.Height; + + return MediaStorageItem.FromImage(outImage); } else { file.RefreshMetadata(inStream); - } - return inStream; + return MediaStorageItem.FromStream(inStream); + } } - protected bool ProcessImage(MediaFile file, Stream inStream, out Stream outStream, out Size size) + protected bool ProcessImage(MediaFile file, Stream inStream, out IImage outImage) { - outStream = null; - size = Size.Empty; + outImage = null; var originalSize = Size.Empty; + var format = _imageProcessor.GetImageFormat(file.Extension) ?? new UnsupportedImageFormat(file.MimeType, file.Extension); + try { originalSize = ImageHeader.GetDimensions(inStream, file.MimeType); } catch { } - if (!_imageProcessor.IsSupportedImage(file.Extension)) + if (format is UnsupportedImageFormat) { - outStream = inStream; - size = originalSize; + outImage = new ImageWrapper(inStream, originalSize, format); return true; } @@ -585,20 +597,9 @@ protected bool ProcessImage(MediaFile file, Stream inStream, out Stream outStrea if (originalSize.IsEmpty || (originalSize.Height <= maxSize && originalSize.Width <= maxSize)) { // Give subscribers the chance to (pre)-process - var evt = new ImageUploadValidatedEvent(query, originalSize); + var evt = new ImageUploadedEvent(query, originalSize); _eventPublisher.Publish(evt); - - if (evt.ResultStream != null) - { - outStream = evt.ResultStream; - // Maybe subscriber forgot to set this, so check - size = evt.ResultSize.IsEmpty ? originalSize : evt.ResultSize; - } - else - { - outStream = inStream; - size = originalSize; - } + outImage = evt.ResultImage ?? new ImageWrapper(inStream, originalSize, format); return true; } @@ -607,8 +608,7 @@ protected bool ProcessImage(MediaFile file, Stream inStream, out Stream outStrea using (var result = _imageProcessor.ProcessImage(query, false)) { - size = new Size(result.Width, result.Height); - outStream = result.OutputStream; + outImage = result.Image; return true; } } @@ -730,7 +730,7 @@ private MediaFile InternalCopyFile( private void InternalCopyFileData(MediaFile file, MediaFile copy) { - _storageProvider.Save(copy, _storageProvider.OpenRead(file)); + _storageProvider.Save(copy, MediaStorageItem.FromStream(_storageProvider.OpenRead(file))); _imageCache.Delete(copy); using (var scope = new DbContextScope(_fileRepo.Context, autoCommit: false)) diff --git a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs index 271fa8e076..921bbf740d 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs @@ -4,6 +4,7 @@ using SmartStore.Core; using SmartStore.Core.Domain.Media; using SmartStore.Services.Configuration; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Media { diff --git a/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs b/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs index 1731278e4c..45b87b1d01 100644 --- a/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs +++ b/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs @@ -2,9 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.IO; -using System.Text; -using System.Threading.Tasks; -using System.Data.Entity; using SmartStore.Core.Data; using SmartStore.Core.Domain.Media; using SmartStore.Core.Plugins; @@ -17,8 +14,8 @@ using SmartStore.Core.Domain.Messages; using System.Diagnostics; using System.Globalization; -using NReco.PdfGenerator; using SmartStore.Core; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Media.Migration { @@ -512,7 +509,7 @@ void ProcessFolder(IFolder folder, int mediaFolderId) } else { - _mediaStorageProvider.Save(newFile.MediaFile, newFile.UploadedFile.OpenRead()); + _mediaStorageProvider.Save(newFile.MediaFile, MediaStorageItem.FromFile(newFile.UploadedFile)); } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs index daa7ac7c0e..0e922f9104 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs @@ -138,88 +138,93 @@ public async Task LoadAsync(MediaFile mediaFile) } } - public void Save(MediaFile mediaFile, Stream stream) + public void Save(MediaFile mediaFile, MediaStorageItem item) { Guard.NotNull(mediaFile, nameof(mediaFile)); - if (stream == null) + if (item == null) { mediaFile.ApplyBlob(null); } else { - SaveInternal(mediaFile, stream); + SaveInternal(mediaFile, item); } _mediaFileRepo.Update(mediaFile); } - private void SaveInternal(MediaFile mediaFile, Stream stream) + private void SaveInternal(MediaFile mediaFile, MediaStorageItem item) { - using (stream) + using (item) { if (_isSqlServer) { - SaveFast(mediaFile, stream); + SaveFast(mediaFile, item); } else { - var buffer = stream.ToByteArray(); + var buffer = item.SourceStream.ToByteArray(); mediaFile.ApplyBlob(buffer); + mediaFile.Size = buffer.Length; } } _mediaFileRepo.Update(mediaFile); } - public async Task SaveAsync(MediaFile mediaFile, Stream stream) + public async Task SaveAsync(MediaFile mediaFile, MediaStorageItem item) { Guard.NotNull(mediaFile, nameof(mediaFile)); - if (stream == null) + if (item == null) { mediaFile.ApplyBlob(null); } else { - await SaveInternalAsync(mediaFile, stream); + await SaveInternalAsync(mediaFile, item); } _mediaFileRepo.Update(mediaFile); } - private async Task SaveInternalAsync(MediaFile mediaFile, Stream stream) + private async Task SaveInternalAsync(MediaFile mediaFile, MediaStorageItem item) { - using (stream) + using (item) { if (_isSqlServer) { - SaveFast(mediaFile, stream); + SaveFast(mediaFile, item); } else { - var buffer = await stream.ToByteArrayAsync(); + var buffer = await item.SourceStream.ToByteArrayAsync(); mediaFile.ApplyBlob(buffer); + mediaFile.Size = buffer.Length; } } _mediaFileRepo.Update(mediaFile); } - private int SaveFast(MediaFile mediaFile, Stream stream) + private int SaveFast(MediaFile mediaFile, MediaStorageItem item) { + var sourceStream = item.SourceStream; + mediaFile.Size = (int)sourceStream.Length; + if (mediaFile.MediaStorageId == null) { // Insert new blob var sql = "INSERT INTO [MediaStorage] (Data) Values(@p0)"; - mediaFile.MediaStorageId = ((DbContext)_dbContext).InsertInto(sql, stream); + mediaFile.MediaStorageId = ((DbContext)_dbContext).InsertInto(sql, sourceStream); return mediaFile.MediaStorageId.Value; } else { // Update existing blob var sql = "UPDATE [MediaStorage] SET [Data] = @p0 WHERE Id = @p1"; - _dbContext.ExecuteSqlCommand(sql, false, null, stream, mediaFile.MediaStorageId.Value); + _dbContext.ExecuteSqlCommand(sql, false, null, sourceStream, mediaFile.MediaStorageId.Value); return mediaFile.MediaStorageId.Value; } } @@ -277,7 +282,7 @@ public void Receive(MediaMoverContext context, MediaFile mediaFile, Stream strea if (stream != null && stream.Length > 0) { // Requires AutoDetectChanges set to true or remove explicit entity detaching - Save(mediaFile, stream); + Save(mediaFile, MediaStorageItem.FromStream(stream)); } } @@ -290,7 +295,7 @@ public async Task ReceiveAsync(MediaMoverContext context, MediaFile mediaFile, S if (stream != null && stream.Length > 0) { // Requires AutoDetectChanges set to true or remove explicit entity detaching - await SaveAsync(mediaFile, stream); + await SaveAsync(mediaFile, MediaStorageItem.FromStream(stream)); } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/FileSystemMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/FileSystemMediaStorageProvider.cs index ca04a9f1f8..96ad3e42f8 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/FileSystemMediaStorageProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/FileSystemMediaStorageProvider.cs @@ -8,6 +8,7 @@ using SmartStore.Core.Domain.Media; using SmartStore.Core.IO; using SmartStore.Core.Plugins; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Media.Storage { @@ -106,7 +107,7 @@ public async Task LoadAsync(MediaFile mediaFile) return (await _fileSystem.ReadAllBytesAsync(filePath)) ?? new byte[0]; } - public void Save(MediaFile mediaFile, Stream stream) + public void Save(MediaFile mediaFile, MediaStorageItem item) { Guard.NotNull(mediaFile, nameof(mediaFile)); @@ -114,19 +115,20 @@ public void Save(MediaFile mediaFile, Stream stream) var filePath = GetPath(mediaFile); - if (stream != null) + if (item != null) { // Create folder if it does not exist yet var dir = Path.GetDirectoryName(filePath); if (!_fileSystem.FolderExists(dir)) - { + { _fileSystem.CreateFolder(dir); } - using (stream) - { - _fileSystem.SaveStream(filePath, stream); - } + using (item) + { + using var outStream = _fileSystem.GetFile(filePath).OpenWrite(); + item.SaveTo(outStream, mediaFile); + } } else if (_fileSystem.FileExists(filePath)) { @@ -135,7 +137,7 @@ public void Save(MediaFile mediaFile, Stream stream) } } - public async Task SaveAsync(MediaFile mediaFile, Stream stream) + public async Task SaveAsync(MediaFile mediaFile, MediaStorageItem item) { Guard.NotNull(mediaFile, nameof(mediaFile)); @@ -143,7 +145,7 @@ public async Task SaveAsync(MediaFile mediaFile, Stream stream) var filePath = GetPath(mediaFile); - if (stream != null) + if (item != null) { // Create folder if it does not exist yet var dir = Path.GetDirectoryName(filePath); @@ -152,9 +154,10 @@ public async Task SaveAsync(MediaFile mediaFile, Stream stream) _fileSystem.CreateFolder(dir); } - using (stream) - { - await _fileSystem.SaveStreamAsync(filePath, stream); + using (item) + { + using var outStream = _fileSystem.GetFile(filePath).OpenWrite(); + await item.SaveToAsync(outStream, mediaFile); } } else if (_fileSystem.FileExists(filePath)) diff --git a/src/Libraries/SmartStore.Services/Media/Storage/IMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/IMediaStorageProvider.cs index a5d143a262..72424f2a1b 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/IMediaStorageProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/IMediaStorageProvider.cs @@ -48,15 +48,15 @@ public interface IMediaStorageProvider : IProvider /// Saves media item data /// /// Media file item - /// File stream - void Save(MediaFile mediaFile, Stream stream); + /// The source item + void Save(MediaFile mediaFile, MediaStorageItem item); /// /// Asynchronously saves media item data /// /// Media file item - /// File stream - Task SaveAsync(MediaFile mediaFile, Stream stream); + /// The source item + Task SaveAsync(MediaFile mediaFile, MediaStorageItem item); /// /// Remove media storage item(s) diff --git a/src/Libraries/SmartStore.Services/Media/Storage/MediaStorageItem.cs b/src/Libraries/SmartStore.Services/Media/Storage/MediaStorageItem.cs new file mode 100644 index 0000000000..d748b4beb9 --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaStorageItem.cs @@ -0,0 +1,147 @@ +using System; +using System.IO; +using System.Threading.Tasks; +using SmartStore.Core.Domain.Media; +using SmartStore.Core.IO; +using SmartStore.Services.Media.Imaging; + +namespace SmartStore.Services.Media.Storage +{ + public abstract class MediaStorageItem : IDisposable + { + private Stream _sourceStream; + + public Stream SourceStream + { + get + { + if (_sourceStream == null) + { + _sourceStream = GetSourceStream(); + } + + if (_sourceStream.CanSeek) + { + _sourceStream.Position = 0; + } + + return _sourceStream; + } + } + + protected abstract Stream GetSourceStream(); + public abstract void SaveTo(Stream stream, MediaFile mediaFile); + public abstract Task SaveToAsync(Stream stream, MediaFile mediaFile); + + public virtual void Dispose() + { + if (_sourceStream != null) + { + _sourceStream.Dispose(); + _sourceStream = null; + } + } + + #region Factories + + public static MediaStorageItem FromImage(IImage image) + { + return new ImageStorageItem(image); + } + + public static MediaStorageItem FromStream(Stream stream) + { + return new StreamStorageItem(stream); + } + + public static MediaStorageItem FromFile(IFile file) + { + return new StreamStorageItem(file.OpenRead()); + } + + #endregion + + #region Impls + + public class ImageStorageItem : MediaStorageItem + { + private readonly IImage _image; + + public ImageStorageItem(IImage image) + { + _image = image; + } + + protected override Stream GetSourceStream() + { + var memStream = new MemoryStream(); + _image.Save(memStream); + return memStream; + } + + public override void SaveTo(Stream stream, MediaFile mediaFile) + { + _image.Save(stream); + mediaFile.Size = (int)stream.Length; + } + + public override Task SaveToAsync(Stream stream, MediaFile mediaFile) + { + _image.Save(stream); + mediaFile.Size = (int)stream.Length; + return Task.CompletedTask; + } + } + + public class StreamStorageItem : MediaStorageItem + { + private readonly Stream _stream; + + public StreamStorageItem(Stream stream) + { + _stream = stream; + } + + protected override Stream GetSourceStream() + { + return _stream; + } + + public override void SaveTo(Stream stream, MediaFile mediaFile) + { + if (stream.CanSeek) + { + stream.SetLength(0); + } + + SourceStream.CopyTo(stream); + + if (stream.CanSeek) + { + stream.Position = 0; + } + + mediaFile.Size = (int)stream.Length; + } + + public override async Task SaveToAsync(Stream stream, MediaFile mediaFile) + { + if (stream.CanSeek) + { + stream.SetLength(0); + } + + await SourceStream.CopyToAsync(stream); + + if (stream.CanSeek) + { + stream.Position = 0; + } + + mediaFile.Size = (int)stream.Length; + } + } + + #endregion + } +} diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index f0a8f50f89..52e0b5ece3 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -89,8 +89,11 @@ ..\..\packages\EPPlus.4.5.3.1\lib\net40\EPPlus.dll - - ..\..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll + + ..\..\packages\ImageProcessor.2.8.0\lib\net452\ImageProcessor.dll + + + ..\..\packages\ImageProcessor.Plugins.WebP.1.3.0\lib\net452\ImageProcessor.Plugins.WebP.dll ..\..\packages\LumenWorksCsvReader.4.0.0\lib\net461\LumenWorks.Framework.IO.dll @@ -357,10 +360,13 @@ + + + @@ -379,6 +385,7 @@ + diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 6d7f4e50d8..79508508e8 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -6,7 +6,8 @@ - + + diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs index f42ad0b854..89cfd0c2cd 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs @@ -2,6 +2,7 @@ using SmartStore.Core.Infrastructure; using SmartStore.Services.Cms; using SmartStore.Services.Media; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Web.Framework { diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs index 3055ea8726..e536be675e 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs @@ -46,7 +46,6 @@ public CachedFileResult(IFile file, string contentType = null) Transmitter = new FileStreamTransmitter(file.OpenRead); ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(file.Name); FileLength = file.Size; - Dimensions = file.Dimensions; LastModifiedUtc = file.LastUpdated; } @@ -127,8 +126,6 @@ private static FileInfo GetFileInfo(string path) public long? FileLength { get; set; } - public Size? Dimensions { get; set; } - public DateTime LastModifiedUtc { get; set; } public TimeSpan MaxAge { get; set; } = TimeSpan.FromDays(7); diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs index 6ecda387d3..777ae66757 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs @@ -62,11 +62,11 @@ public override bool TrySendHeaders(HttpContextBase context) response.StatusCode = (int)HttpStatusCode.OK; response.AddHeader("Content-Length", (FileResponse.FileLength ?? 0).ToString(CultureInfo.InvariantCulture)); - if (FileResponse.Dimensions != null) - { - response.AddHeader("X-Width", FileResponse.Dimensions.Value.Width.ToString(CultureInfo.InvariantCulture)); - response.AddHeader("X-Height", FileResponse.Dimensions.Value.Height.ToString(CultureInfo.InvariantCulture)); - } + //if (FileResponse.Dimensions != null) + //{ + // response.AddHeader("X-Width", FileResponse.Dimensions.Value.Width.ToString(CultureInfo.InvariantCulture)); + // response.AddHeader("X-Height", FileResponse.Dimensions.Value.Height.ToString(CultureInfo.InvariantCulture)); + //} response.End(); diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/IFileResponse.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/IFileResponse.cs index 3bc0b9c483..4da1582489 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/IFileResponse.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/IFileResponse.cs @@ -7,7 +7,7 @@ public interface IFileResponse { string ContentType { get; } long? FileLength { get; } - Size? Dimensions { get; } + //Func LazyDimensions { get; } DateTime LastModifiedUtc { get; } TimeSpan MaxAge { get; } string ETag { get; } diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs index 7ed32b3525..5416c48694 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs @@ -38,7 +38,7 @@ using SmartStore.Services.Directory; using SmartStore.Services.Helpers; using SmartStore.Services.Localization; -using SmartStore.Services.Media; +using SmartStore.Services.Media.Imaging; using SmartStore.Services.Payments; using SmartStore.Services.Shipping; using SmartStore.Services.Tasks; diff --git a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs index 1de4ffb209..d26eecf9c4 100644 --- a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs @@ -1,32 +1,31 @@ using System; -using System.IO; +using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.Linq; using System.Net; -using System.Text; using System.Threading.Tasks; -using System.Web; using System.Web.Mvc; -using System.Linq; +using System.Web.Routing; using System.Web.SessionState; +using SmartStore.Core; using SmartStore.Core.Domain.Media; using SmartStore.Core.Domain.Seo; using SmartStore.Core.Events; +using SmartStore.Core.Infrastructure; using SmartStore.Core.Logging; +using SmartStore.Core.Security; using SmartStore.Services.Media; +using SmartStore.Services.Media.Imaging; using SmartStore.Services.Seo; using SmartStore.Utilities; +using SmartStore.Web.Framework.Localization; using SmartStore.Web.Framework.Modelling; using SmartStore.Web.Framework.Seo; -using SmartStore.Web.Framework.Localization; -using System.Web.Routing; -using SmartStore.Core.Security; -using System.Collections.Generic; -using SmartStore.Core.IO; -using SmartStore.Core; -using System.Globalization; namespace SmartStore.Web.Controllers { - [SessionState(SessionStateBehavior.Disabled)] + [SessionState(SessionStateBehavior.Disabled)] [OverrideAuthentication] [OverrideAuthorization] [OverrideResultFilters] @@ -225,22 +224,20 @@ public async Task File(int id /* mediaFileId */, string path) } } - var responseFile = handlerContext.ResultFile ?? handlerContext.SourceFile; - if (responseFile == null || !responseFile.Exists) - { - return NotFound(pathData.MimeType); - } + try + { + var responseFile = handlerContext.ResultFile ?? handlerContext.SourceFile; + if (responseFile == null || !responseFile.Exists) + { + return NotFound(pathData.MimeType); + } - if (handlerContext.ResultStream != null) - { - // A result stream instance is given when the file has just been processed by a media handler during this request. - // In this case there is no need to open the stream from storage again. - return new CachedFileResult(MimeTypes.MapNameToMimeType(responseFile.Name), responseFile.LastUpdated, () => handlerContext.ResultStream, handlerContext.ResultStream.Length); - } - else - { return new CachedFileResult(responseFile, pathData.MimeType); } + finally + { + Debug.WriteLine("ImageProcessor TOTAL: {0} ms.".FormatCurrent(EngineContext.Current.Resolve().TotalProcessingTimeMs)); + } } private ActionResult NotFound(string mime) diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallDataSeeder.cs b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallDataSeeder.cs index 21bf8780ff..96e7aa8953 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallDataSeeder.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallDataSeeder.cs @@ -389,7 +389,7 @@ private void MoveMedia() { if (mediaFile.MediaStorage?.Data?.LongLength > 0) { - fileSystemStorageProvider.Save(mediaFile, mediaFile.MediaStorage.Data.ToStream()); + fileSystemStorageProvider.Save(mediaFile, MediaStorageItem.FromStream(mediaFile.MediaStorage.Data.ToStream())); mediaFile.MediaStorageId = null; mediaFile.MediaStorage = null; } diff --git a/src/Tests/SmartStore.Services.Tests/Events/TestConsumers.cs b/src/Tests/SmartStore.Services.Tests/Events/TestConsumers.cs index f9f57d9a36..154ac09cd7 100644 --- a/src/Tests/SmartStore.Services.Tests/Events/TestConsumers.cs +++ b/src/Tests/SmartStore.Services.Tests/Events/TestConsumers.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; using SmartStore.Core.Caching; using SmartStore.Core.Domain.Orders; @@ -9,7 +6,7 @@ using SmartStore.Services.Catalog; using SmartStore.Services.Customers; using SmartStore.Services.DataExchange.Export.Events; -using SmartStore.Services.Media; +using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Tests.Events { diff --git a/src/Tests/SmartStore.Services.Tests/Media/Storage/TestDatabaseMediaStorageProvider.cs b/src/Tests/SmartStore.Services.Tests/Media/Storage/TestDatabaseMediaStorageProvider.cs index 8da0de3001..74cfce4a3d 100644 --- a/src/Tests/SmartStore.Services.Tests/Media/Storage/TestDatabaseMediaStorageProvider.cs +++ b/src/Tests/SmartStore.Services.Tests/Media/Storage/TestDatabaseMediaStorageProvider.cs @@ -29,13 +29,13 @@ public Task LoadAsync(MediaFile media) return Task.FromResult(Load(media)); } - public void Save(MediaFile media, Stream stream) + public void Save(MediaFile media, MediaStorageItem item) { } - public Task SaveAsync(MediaFile media, Stream stream) + public Task SaveAsync(MediaFile media, MediaStorageItem item) { - return Task.FromResult(0); + return Task.CompletedTask; } public void Remove(params MediaFile[] medias) From 3ce9707df60aa3f242789d085dbc454c9ecc9d16 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 25 Aug 2020 10:51:37 +0200 Subject: [PATCH 090/695] API: IMediaService endpoints (in progress) --- .../Controllers/OData/MediaController.cs | 107 ++++++++++++++---- .../Models/OData/Media/FolderNodeInfo.cs | 26 ++++- .../Models/OData/Media/MediaCountResult.cs | 2 +- 3 files changed, 109 insertions(+), 26 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs index 1f48d06add..3f1f60e983 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.IO; using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; -using Microsoft.OData.Core.UriParser.Semantic; using SmartStore.Collections; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Media; @@ -190,16 +188,6 @@ public static void Init(WebApiConfigurationBroadcaster configData) .Returns() .Parameter("Filter"); - // Doesn't work: - //var cfgr = configData.ModelBuilder.ComplexType(); - //cfgr.Property(x => x.Total); - //cfgr.Property(x => x.Trash); - //cfgr.Property(x => x.Unassigned); - //cfgr.Property(x => x.Transient); - //cfgr.Property(x => x.Orphan); - //cfgr.ComplexProperty(x => x.Filter); - //cfgr.HasDynamicProperties(x => x.Folders); - entityConfig .Action("MoveFile") .ReturnsFromEntitySet("Media") @@ -255,6 +243,20 @@ public static void Init(WebApiConfigurationBroadcaster configData) .Returns() .Parameter("Path"); + entityConfig.Collection + .Function("GetRootNode") + .ReturnsCollection(); + + entityConfig.Collection + .Function("GetNodeById") + .ReturnsCollection() + .Parameter("Id"); + + entityConfig.Collection + .Action("GetNodeByPath") + .ReturnsCollection() + .Parameter("Path"); + #endregion } @@ -533,6 +535,56 @@ public IHttpActionResult CheckUniqueFolderName(ODataActionParameters parameters) return Ok(result); } + /// GET /Media/GetRootNode + [HttpGet] + [WebApiAuthenticate] + public IHttpActionResult GetRootNode() + { + List result = null; + + this.ProcessEntity(() => + { + var root = _folderService.Value.GetRootNode(); + result = Convert(root); + }); + + return Ok(result); + } + + /// GET /Media/GetNodeById(Id=123) + [HttpGet] + [WebApiAuthenticate] + public IHttpActionResult GetNodeById(int id) + { + List result = null; + + this.ProcessEntity(() => + { + var node = _folderService.Value.GetNodeById(id); + result = Convert(node); + }); + + return Ok(result); + } + + /// POST /Media/GetNodeByPath {"Path":"content/my-folder"} + [HttpPost] + [WebApiAuthenticate] + public IHttpActionResult GetNodeByPath(ODataActionParameters parameters) + { + List result = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + + var node = _folderService.Value.GetNodeByPath(path); + result = Convert(node); + }); + + return Ok(result); + } + /// POST /Media/CreateFolder {"Path":"content/my-folder"} [HttpPost, WebApiQueryable] [WebApiAuthenticate] @@ -656,21 +708,23 @@ private FolderItemInfo Convert(MediaFolderInfo folder) return null; } - private FolderNodeInfo Convert(TreeNode folderNode) + private List Convert(TreeNode folderNode) { - if (folderNode != null) + if (folderNode == null) { - var result = ConvertNode(folderNode); - return result; + return null; } - return null; + var result = new List(); - FolderNodeInfo ConvertNode(TreeNode node) + ConvertNode(folderNode); + return result; + + void ConvertNode(TreeNode node) { var val = node.Value; - var item = new FolderNodeInfo + var parent = new FolderNodeInfo { Id = val.Id, ParentId = val.ParentId, @@ -679,15 +733,22 @@ FolderNodeInfo ConvertNode(TreeNode node) IsAlbum = val.IsAlbum, Path = val.Path, Slug = val.Slug, - Children = new List(), + HasChildren = node.HasChildren, + Children = new List() }; + result.Add(parent); foreach (var child in node.Children) { - item.Children.Add(ConvertNode(child)); - } + parent.Children.Add(new FolderNodeInfo.FolderChildNodeInfo + { + Id = child.Value.Id, + Name = child.Value.Name, + Path = child.Value.Path + }); - return item; + ConvertNode(child); + } } } diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs index bae90d664e..b20593d5ef 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs @@ -7,7 +7,7 @@ namespace SmartStore.WebApi.Models.OData.Media /// Information about a folder node returned by the API. /// [DataContract] - public class FolderNodeInfo + public partial class FolderNodeInfo { [DataMember] public int Id { get; set; } @@ -30,6 +30,7 @@ public class FolderNodeInfo /// /// Whether the folder is a root album node. /// + [DataMember] public bool IsAlbum { get; set; } [DataMember] @@ -39,6 +40,27 @@ public class FolderNodeInfo public string Slug { get; set; } [DataMember] - public ICollection Children { get; set; } + public bool HasChildren { get; set; } + + // Not supported yet: "The complex type 'FolderNodeInfo' has a reference to itself through the property 'Children'. A recursive loop of complex types is not allowed." + // See https://github.com/OData/WebApi/issues/1248 + //[DataMember] + //public ICollection Children { get; set; } + + [DataMember] + public ICollection Children { get; set; } + + [DataContract] + public partial class FolderChildNodeInfo + { + [DataMember] + public int Id { get; set; } + + [DataMember] + public string Name { get; set; } + + [DataMember] + public string Path { get; set; } + } } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaCountResult.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaCountResult.cs index 3820369110..3682c62b9a 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaCountResult.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaCountResult.cs @@ -25,7 +25,7 @@ public partial class MediaCountResult public ICollection Folders { get; set; } [DataContract] - public class FolderCount + public partial class FolderCount { [DataMember] public int FolderId { get; set; } From 9a5cf14ef10be314841a8fb30494d21a99cc9c22 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 25 Aug 2020 16:39:26 +0200 Subject: [PATCH 091/695] API: IMediaService endpoints (in progress) --- ...aController.cs => MediaFilesController.cs} | 346 +-------------- .../OData/MediaFoldersController.cs | 405 ++++++++++++++++++ .../Models/OData/Media/FileItemInfo.cs | 1 + .../Models/OData/Media/FolderItemInfo.cs | 23 - .../Models/OData/Media/FolderNodeInfo.cs | 22 +- .../SmartStore.WebApi.csproj | 4 +- .../WebApiConfigurationProvider.cs | 10 +- 7 files changed, 447 insertions(+), 364 deletions(-) rename src/Plugins/SmartStore.WebApi/Controllers/OData/{MediaController.cs => MediaFilesController.cs} (55%) create mode 100644 src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs delete mode 100644 src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderItemInfo.cs diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs similarity index 55% rename from src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs rename to src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs index 3f1f60e983..d414363b55 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; -using SmartStore.Collections; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; @@ -21,25 +20,15 @@ namespace SmartStore.WebApi.Controllers.OData { - /// - /// Is intended to make methods of the IMediaService accessible. Direct access to the MediaFile entity is not intended. - /// /// - /// Functions like GET /Media/FileExists(Path='content/my-file.jpg') would never work (404). - /// That's why some endpoints are implemented as Actions (POST). + /// Some endpoints are accessible via POST where you would expect GET. + /// That's because a function like GET /MediaFiles/FileExists(Path='content/my-file.jpg') would never work (HTTP status 404). /// - public class MediaController : WebApiEntityController + public class MediaFilesController : WebApiEntityController { public static MediaLoadFlags _defaultLoadFlags = MediaLoadFlags.AsNoTracking | MediaLoadFlags.WithTags | MediaLoadFlags.WithTracks | MediaLoadFlags.WithFolder; - private readonly Lazy _folderService; - - public MediaController(Lazy folderService) - { - _folderService = folderService; - } - - // GET /Media + // GET /MediaFiles [WebApiQueryable] [WebApiAuthenticate] public IHttpActionResult Get() @@ -69,7 +58,7 @@ public IHttpActionResult Get() return Ok(result); }*/ - // GET /Media(123) + // GET /MediaFiles(123) [WebApiQueryable] [WebApiAuthenticate] public IHttpActionResult Get(int key) @@ -79,7 +68,7 @@ public IHttpActionResult Get(int key) return Ok(Convert(file)); } - // GET /Media(123)/ThumbUrl + // GET /MediaFiles(123)/ThumbUrl [WebApiAuthenticate] public IHttpActionResult GetProperty(int key, string propertyName) { @@ -145,27 +134,25 @@ public static void Init(WebApiConfigurationBroadcaster configData) { var entityConfig = configData.ModelBuilder.EntityType(); - #region Files - entityConfig.Collection .Action("GetFileByPath") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("MediaFiles") .Parameter("Path"); //entityConfig.Collection // .Action("GetFileByName") - // .ReturnsFromEntitySet("Media") + // .ReturnsFromEntitySet("MediaFiles") // .AddParameter("FileName") // .AddParameter("FolderId"); entityConfig.Collection .Function("GetFilesByIds") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("MediaFiles") .CollectionParameter("Ids"); entityConfig.Collection .Action("SearchFiles") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("MediaFiles") .Parameter("Query"); entityConfig.Collection @@ -190,7 +177,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) entityConfig .Action("MoveFile") - .ReturnsFromEntitySet("Media") + .ReturnsFromEntitySet("MediaFiles") .AddParameter("DestinationFileName") .AddParameter("DuplicateFileHandling", true); @@ -204,63 +191,9 @@ public static void Init(WebApiConfigurationBroadcaster configData) .Action("DeleteFile") .AddParameter("Permanent") .AddParameter("Force", true); - - #endregion - - #region Folders - - entityConfig.Collection - .Action("FolderExists") - .Returns() - .Parameter("Path"); - - entityConfig.Collection - .Action("CreateFolder") - .Returns() - .Parameter("Path"); - - entityConfig.Collection - .Action("MoveFolder") - .Returns() - .AddParameter("Path") - .AddParameter("DestinationPath"); - - entityConfig.Collection - .Action("CopyFolder") - .Returns() - .AddParameter("Path") - .AddParameter("DestinationPath") - .AddParameter("DuplicateEntryHandling", true); - - entityConfig.Collection - .Action("DeleteFolder") - .Returns() - .AddParameter("Path") - .AddParameter("FileHandling", true); - - entityConfig.Collection - .Action("CheckUniqueFolderName") - .Returns() - .Parameter("Path"); - - entityConfig.Collection - .Function("GetRootNode") - .ReturnsCollection(); - - entityConfig.Collection - .Function("GetNodeById") - .ReturnsCollection() - .Parameter("Id"); - - entityConfig.Collection - .Action("GetNodeByPath") - .ReturnsCollection() - .Parameter("Path"); - - #endregion } - /// POST /Media/GetFileByPath {"Path":"content/my-file.jpg"} + /// POST /MediaFiles/GetFileByPath {"Path":"content/my-file.jpg"} [HttpPost, WebApiQueryable] [WebApiAuthenticate] public IHttpActionResult GetFileByPath(ODataActionParameters parameters) @@ -298,7 +231,7 @@ public IHttpActionResult GetFileByPath(ODataActionParameters parameters) // return file; //} - /// GET /Media/GetFilesByIds(Ids=[1,2,3]) + /// GET /MediaFiles/GetFilesByIds(Ids=[1,2,3]) [HttpGet, WebApiQueryable] [WebApiAuthenticate] public IHttpActionResult GetFilesByIds([FromODataUri] int[] ids) @@ -318,7 +251,7 @@ public IHttpActionResult GetFilesByIds([FromODataUri] int[] ids) return Ok(files ?? new List().AsQueryable()); } - /// POST /Media/SearchFiles {"Query":{"FolderId":7,"Extensions":["jpg"], ...}} + /// POST /MediaFiles/SearchFiles {"Query":{"FolderId":7,"Extensions":["jpg"], ...}} [HttpPost, WebApiQueryable] [WebApiAuthenticate] public async Task SearchFiles(ODataActionParameters parameters) @@ -338,7 +271,7 @@ await this.ProcessEntityAsync(async () => return Ok(result.Select(x => Convert(x)).AsQueryable()); } - /// POST /Media/FileExists {"Path":"content/my-file.jpg"} + /// POST /MediaFiles/FileExists {"Path":"content/my-file.jpg"} [HttpPost] [WebApiAuthenticate] public IHttpActionResult FileExists(ODataActionParameters parameters) @@ -354,7 +287,7 @@ public IHttpActionResult FileExists(ODataActionParameters parameters) return Ok(fileExists); } - /// POST /Media/CheckUniqueFileName {"Path":"content/my-file.jpg"} + /// POST /MediaFiles/CheckUniqueFileName {"Path":"content/my-file.jpg"} [HttpPost] [WebApiAuthenticate] public IHttpActionResult CheckUniqueFileName(ODataActionParameters parameters) @@ -372,7 +305,7 @@ public IHttpActionResult CheckUniqueFileName(ODataActionParameters parameters) return Ok(result); } - /// POST /Media/CountFiles {"Query":{"FolderId":7,"Extensions":["jpg"], ...}} + /// POST /MediaFiles/CountFiles {"Query":{"FolderId":7,"Extensions":["jpg"], ...}} [HttpPost] [WebApiAuthenticate] public async Task CountFiles(ODataActionParameters parameters) @@ -388,7 +321,7 @@ await this.ProcessEntityAsync(async () => return Ok(count); } - /// POST /Media/CountFilesGrouped {"Filter":{"Term":"my image","Extensions":["jpg"], ...}} + /// POST /MediaFiles/CountFilesGrouped {"Filter":{"Term":"my image","Extensions":["jpg"], ...}} [HttpPost] [WebApiAuthenticate] public IHttpActionResult CountFilesGrouped(ODataActionParameters parameters) @@ -421,7 +354,7 @@ public IHttpActionResult CountFilesGrouped(ODataActionParameters parameters) return Ok(result); } - /// POST /Media(123)/MoveFile {"DestinationFileName":"content/updated-file-name.jpg"} + /// POST /MediaFiles(123)/MoveFile {"DestinationFileName":"content/updated-file-name.jpg"} [HttpPost, WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Media.Update)] public IHttpActionResult MoveFile(int key, ODataActionParameters parameters) @@ -446,7 +379,7 @@ public IHttpActionResult MoveFile(int key, ODataActionParameters parameters) return Ok(movedFile); } - /// POST /Media(123)/CopyFile {"DestinationFileName":"content/new-file.jpg"} + /// POST /MediaFiles(123)/CopyFile {"DestinationFileName":"content/new-file.jpg"} [HttpPost, WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Media.Update)] public IHttpActionResult CopyFile(int key, ODataActionParameters parameters) @@ -478,7 +411,7 @@ public IHttpActionResult CopyFile(int key, ODataActionParameters parameters) return Ok(opResult); } - /// POST /Media(123)/DeleteFile {"Permanent":false} + /// POST /MediaFiles(123)/DeleteFile {"Permanent":false} [HttpPost] [WebApiAuthenticate(Permission = Permissions.Media.Delete)] public IHttpActionResult DeleteFile(int key, ODataActionParameters parameters) @@ -500,188 +433,6 @@ public IHttpActionResult DeleteFile(int key, ODataActionParameters parameters) return StatusCode(HttpStatusCode.NoContent); } - - /// POST /Media/FolderExists {"Path":"my-folder"} - [HttpPost] - [WebApiAuthenticate] - public IHttpActionResult FolderExists(ODataActionParameters parameters) - { - var folderExists = false; - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - folderExists = Service.FolderExists(path); - }); - - return Ok(folderExists); - } - - /// POST /Media/CheckUniqueFolderName {"Path":"content/my-folder"} - [HttpPost] - [WebApiAuthenticate] - public IHttpActionResult CheckUniqueFolderName(ODataActionParameters parameters) - { - var result = new CheckUniquenessResult(); - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - - result.Result = _folderService.Value.CheckUniqueFolderName(path, out string newPath); - result.NewPath = newPath; - }); - - return Ok(result); - } - - /// GET /Media/GetRootNode - [HttpGet] - [WebApiAuthenticate] - public IHttpActionResult GetRootNode() - { - List result = null; - - this.ProcessEntity(() => - { - var root = _folderService.Value.GetRootNode(); - result = Convert(root); - }); - - return Ok(result); - } - - /// GET /Media/GetNodeById(Id=123) - [HttpGet] - [WebApiAuthenticate] - public IHttpActionResult GetNodeById(int id) - { - List result = null; - - this.ProcessEntity(() => - { - var node = _folderService.Value.GetNodeById(id); - result = Convert(node); - }); - - return Ok(result); - } - - /// POST /Media/GetNodeByPath {"Path":"content/my-folder"} - [HttpPost] - [WebApiAuthenticate] - public IHttpActionResult GetNodeByPath(ODataActionParameters parameters) - { - List result = null; - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - - var node = _folderService.Value.GetNodeByPath(path); - result = Convert(node); - }); - - return Ok(result); - } - - /// POST /Media/CreateFolder {"Path":"content/my-folder"} - [HttpPost, WebApiQueryable] - [WebApiAuthenticate] - public IHttpActionResult CreateFolder(ODataActionParameters parameters) - { - FolderItemInfo newFolder = null; - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - - var result = Service.CreateFolder(path); - newFolder = Convert(result); - }); - - return Created(newFolder); - } - - /// POST /Media/MoveFolder {"Path":"content/my-folder", "DestinationPath":"content/my-renamed-folder"} - [HttpPost, WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Media.Update)] - public IHttpActionResult MoveFolder(ODataActionParameters parameters) - { - FolderItemInfo movedFolder = null; - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - var destinationPath = parameters.GetValueSafe("DestinationPath"); - - var result = Service.MoveFolder(path, destinationPath); - movedFolder = Convert(result); - }); - - return Ok(movedFolder); - } - - /// POST /Media/CopyFolder {"Path":"content/my-folder", "DestinationPath":"content/my-new-folder"} - [HttpPost, WebApiQueryable] - [WebApiAuthenticate(Permission = Permissions.Media.Update)] - public IHttpActionResult CopyFolder(ODataActionParameters parameters) - { - MediaFolderOperationResult opResult = null; - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - var destinationPath = parameters.GetValueSafe("DestinationPath"); - var duplicateEntryHandling = parameters.GetValueSafe("DuplicateEntryHandling", DuplicateEntryHandling.Skip); - - var result = Service.CopyFolder(path, destinationPath, duplicateEntryHandling); - - opResult = new MediaFolderOperationResult - { - FolderId = result.Folder.Id, - //Folder = Convert(result.Folder) - }; - - opResult.DuplicateFiles = result.DuplicateFiles - .Select(x => new MediaFolderOperationResult.DuplicateFileInfo - { - SourceFileId = x.SourceFile.Id, - DestinationFileId = x.DestinationFile.Id, - //SourceFile = Convert(x.SourceFile), - //DestinationFile = Convert(x.DestinationFile), - UniquePath = x.UniquePath - }) - .ToList(); - }); - - return Ok(opResult); - } - - /// POST /Media/DeleteFolder {"Path":"content/my-folder"} - [HttpPost] - [WebApiAuthenticate(Permission = Permissions.Media.Delete)] - public IHttpActionResult DeleteFolder(ODataActionParameters parameters) - { - MediaFolderDeleteResult opResult = null; - - this.ProcessEntity(() => - { - var path = parameters.GetValueSafe("Path"); - var fileHandling = parameters.GetValueSafe("FileHandling", FileHandling.SoftDelete); - - var result = Service.DeleteFolder(path, fileHandling); - - opResult = new MediaFolderDeleteResult - { - DeletedFileNames = result.DeletedFileNames, - DeletedFolderIds = result.DeletedFolderIds - }; - }); - - return Ok(opResult); - } - #endregion #region Utilities @@ -697,61 +448,6 @@ private FileItemInfo Convert(MediaFileInfo file) return null; } - private FolderItemInfo Convert(MediaFolderInfo folder) - { - if (folder != null) - { - var item = MiniMapper.Map(folder, CultureInfo.InvariantCulture); - return item; - } - - return null; - } - - private List Convert(TreeNode folderNode) - { - if (folderNode == null) - { - return null; - } - - var result = new List(); - - ConvertNode(folderNode); - return result; - - void ConvertNode(TreeNode node) - { - var val = node.Value; - - var parent = new FolderNodeInfo - { - Id = val.Id, - ParentId = val.ParentId, - AlbumName = val.AlbumName, - Name = val.Name, - IsAlbum = val.IsAlbum, - Path = val.Path, - Slug = val.Slug, - HasChildren = node.HasChildren, - Children = new List() - }; - result.Add(parent); - - foreach (var child in node.Children) - { - parent.Children.Add(new FolderNodeInfo.FolderChildNodeInfo - { - Id = child.Value.Id, - Name = child.Value.Name, - Path = child.Value.Path - }); - - ConvertNode(child); - } - } - } - #endregion } } diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs new file mode 100644 index 0000000000..0226b38ae3 --- /dev/null +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs @@ -0,0 +1,405 @@ +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Web.Http; +using System.Web.OData; +using SmartStore.Collections; +using SmartStore.Core.Domain.Media; +using SmartStore.Core.Security; +using SmartStore.Services.Media; +using SmartStore.Web.Framework.WebApi; +using SmartStore.Web.Framework.WebApi.Configuration; +using SmartStore.Web.Framework.WebApi.OData; +using SmartStore.Web.Framework.WebApi.Security; +using SmartStore.WebApi.Models.OData.Media; + +namespace SmartStore.WebApi.Controllers.OData +{ + /// + /// Entity is MediaAlbum and not MediaFolder. Otherwise strange, unexpected serialization. + /// + public class MediaFoldersController : WebApiEntityController + { + private readonly IMediaService _mediaService; + + public MediaFoldersController(IMediaService mediaService) + { + _mediaService = mediaService; + } + + // GET /MediaFolders + [WebApiQueryable] + [WebApiAuthenticate] + public IHttpActionResult Get() + { + return Ok(GetEntitySet()); + } + + // GET /MediaFolders(123) + [WebApiQueryable] + [WebApiAuthenticate] + public IHttpActionResult Get(int key) + { + //var node = Service.GetNodeById(key); + + //return Ok(Convert(node)); + return null; + } + + // GET /MediaFolders(123)/Path + [WebApiAuthenticate] + public IHttpActionResult GetProperty(int key, string propertyName) + { + //Type propertyType = null; + //object propertyValue = null; + + //this.ProcessEntity(() => + //{ + // var file = Service.GetFileById(key); + // if (file == null) + // { + // throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); + // } + + // var item = Convert(file); + + // var prop = FastProperty.GetProperty(item.GetType(), propertyName); + // if (prop == null) + // { + // throw Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); + // } + + // propertyType = prop.Property.PropertyType; + // propertyValue = prop.GetValue(item); + //}); + + //if (propertyType == null) + //{ + // return StatusCode(HttpStatusCode.NoContent); + //} + + //var response = Request.CreateResponse(HttpStatusCode.OK, propertyType, propertyValue); + //return ResponseMessage(response); + return null; + } + + public IHttpActionResult Post() + { + return StatusCode(HttpStatusCode.Forbidden); + } + + public IHttpActionResult Put() + { + return StatusCode(HttpStatusCode.Forbidden); + } + + public IHttpActionResult Patch() + { + return StatusCode(HttpStatusCode.Forbidden); + } + + public IHttpActionResult Delete() + { + // Insufficient endpoint. Parameters required but ODataActionParameters not possible here. + // Query string parameters less good because not part of the EDM. + // So use action method "DeleteFile" instead to trigger the corresponding service method. + + return StatusCode(HttpStatusCode.Forbidden); + } + + #region Actions and functions + + public static void Init(WebApiConfigurationBroadcaster configData) + { + var entityConfig = configData.ModelBuilder.EntityType(); + + configData.ModelBuilder.ComplexType(); + + entityConfig.Collection + .Action("FolderExists") + .Returns() + .Parameter("Path"); + + entityConfig.Collection + .Action("CreateFolder") + .ReturnsFromEntitySet("MediaFolders") + .Parameter("Path"); + + entityConfig.Collection + .Action("MoveFolder") + .ReturnsFromEntitySet("MediaFolders") + .AddParameter("Path") + .AddParameter("DestinationPath"); + + entityConfig.Collection + .Action("CopyFolder") + .Returns() + .AddParameter("Path") + .AddParameter("DestinationPath") + .AddParameter("DuplicateEntryHandling", true); + + entityConfig.Collection + .Action("DeleteFolder") + .Returns() + .AddParameter("Path") + .AddParameter("FileHandling", true); + + entityConfig.Collection + .Action("CheckUniqueFolderName") + .Returns() + .Parameter("Path"); + + entityConfig.Collection + .Function("GetRootNode") + .ReturnsCollectionFromEntitySet("MediaFolders"); + + entityConfig.Collection + .Function("GetNodeById") + .ReturnsCollectionFromEntitySet("MediaFolders") + .Parameter("Id"); + + entityConfig.Collection + .Action("GetNodeByPath") + .ReturnsCollectionFromEntitySet("MediaFolders") + .Parameter("Path"); + } + + /// POST /MediaFolders/FolderExists {"Path":"my-folder"} + [HttpPost] + [WebApiAuthenticate] + public IHttpActionResult FolderExists(ODataActionParameters parameters) + { + var folderExists = false; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + folderExists = _mediaService.FolderExists(path); + }); + + return Ok(folderExists); + } + + /// POST /MediaFolders/CheckUniqueFolderName {"Path":"content/my-folder"} + [HttpPost] + [WebApiAuthenticate] + public IHttpActionResult CheckUniqueFolderName(ODataActionParameters parameters) + { + var result = new CheckUniquenessResult(); + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + + result.Result = Service.CheckUniqueFolderName(path, out string newPath); + result.NewPath = newPath; + }); + + return Ok(result); + } + + /// GET /MediaFolders/GetRootNode + [HttpGet] + [WebApiAuthenticate] + public IHttpActionResult GetRootNode() + { + List result = null; + + this.ProcessEntity(() => + { + var root = Service.GetRootNode(); + result = Convert(root); + }); + + return Ok(result); + } + + /// GET /MediaFolders/GetNodeById(Id=123) + [HttpGet] + [WebApiAuthenticate] + public IHttpActionResult GetNodeById(int id) + { + List result = null; + + this.ProcessEntity(() => + { + var node = Service.GetNodeById(id); + result = Convert(node); + }); + + return Ok(result); + } + + /// POST /MediaFolders/GetNodeByPath {"Path":"content/my-folder"} + [HttpPost] + [WebApiAuthenticate] + public IHttpActionResult GetNodeByPath(ODataActionParameters parameters) + { + List result = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + + var node = Service.GetNodeByPath(path); + result = Convert(node); + }); + + return Ok(result); + } + + /// POST /MediaFolders/CreateFolder {"Path":"content/my-folder"} + [HttpPost, WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Media.Update)] + public IHttpActionResult CreateFolder(ODataActionParameters parameters) + { + FolderNodeInfo newFolder = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + + var result = _mediaService.CreateFolder(path); + newFolder = Convert(result.Node, false).FirstOrDefault(); + }); + + return Created(newFolder); + } + + /// POST /MediaFolders/MoveFolder {"Path":"content/my-folder", "DestinationPath":"content/my-renamed-folder"} + [HttpPost, WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Media.Update)] + public IHttpActionResult MoveFolder(ODataActionParameters parameters) + { + FolderNodeInfo movedFolder = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + var destinationPath = parameters.GetValueSafe("DestinationPath"); + + var result = _mediaService.MoveFolder(path, destinationPath); + movedFolder = Convert(result.Node, false).FirstOrDefault(); + }); + + return Ok(movedFolder); + } + + /// POST /MediaFolders/CopyFolder {"Path":"content/my-folder", "DestinationPath":"content/my-new-folder"} + [HttpPost, WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Media.Update)] + public IHttpActionResult CopyFolder(ODataActionParameters parameters) + { + MediaFolderOperationResult opResult = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + var destinationPath = parameters.GetValueSafe("DestinationPath"); + var duplicateEntryHandling = parameters.GetValueSafe("DuplicateEntryHandling", DuplicateEntryHandling.Skip); + + var result = _mediaService.CopyFolder(path, destinationPath, duplicateEntryHandling); + + opResult = new MediaFolderOperationResult + { + FolderId = result.Folder.Id, + //Folder = Convert(result.Folder) + }; + + opResult.DuplicateFiles = result.DuplicateFiles + .Select(x => new MediaFolderOperationResult.DuplicateFileInfo + { + SourceFileId = x.SourceFile.Id, + DestinationFileId = x.DestinationFile.Id, + //SourceFile = Convert(x.SourceFile), + //DestinationFile = Convert(x.DestinationFile), + UniquePath = x.UniquePath + }) + .ToList(); + }); + + return Ok(opResult); + } + + /// POST /MediaFolders/DeleteFolder {"Path":"content/my-folder"} + [HttpPost] + [WebApiAuthenticate(Permission = Permissions.Media.Delete)] + public IHttpActionResult DeleteFolder(ODataActionParameters parameters) + { + MediaFolderDeleteResult opResult = null; + + this.ProcessEntity(() => + { + var path = parameters.GetValueSafe("Path"); + var fileHandling = parameters.GetValueSafe("FileHandling", FileHandling.SoftDelete); + + var result = _mediaService.DeleteFolder(path, fileHandling); + + opResult = new MediaFolderDeleteResult + { + DeletedFileNames = result.DeletedFileNames, + DeletedFolderIds = result.DeletedFolderIds + }; + }); + + return Ok(opResult); + } + + #endregion + + #region Utilities + + private List Convert(TreeNode folderNode, bool addChildren = true) + { + if (folderNode == null) + { + return null; + } + + var result = new List(); + + ConvertNode(folderNode); + return result; + + void ConvertNode(TreeNode node) + { + var val = node.Value; + + var parent = new FolderNodeInfo + { + Id = val.Id, + ParentId = val.ParentId, + AlbumName = val.AlbumName, + Name = val.Name, + IsAlbum = val.IsAlbum, + Path = val.Path, + Slug = val.Slug, + HasChildren = node.HasChildren, + Children = new List() + }; + + if (node.HasChildren) + { + foreach (var child in node.Children) + { + parent.Children.Add(new FolderChildNodeInfo + { + Id = child.Value.Id, + Name = child.Value.Name, + Path = child.Value.Path + }); + } + } + + result.Add(parent); + + if (addChildren && node.HasChildren) + { + node.Children.Each(child => ConvertNode(child)); + } + } + } + + #endregion + } +} diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs index c7c39ffee7..ec20787ad0 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs @@ -9,6 +9,7 @@ namespace SmartStore.WebApi.Models.OData.Media /// /// /// Should not be inherited from MediaFile because then navigation properties cannot be expanded using $expand (e.g. $expand=File($expand=Tracks)). + /// Should not use [Contained] because throws "The Path property in ODataMessageWriterSettings.ODataUri must be set when writing contained elements". /// [DataContract] public partial class FileItemInfo diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderItemInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderItemInfo.cs deleted file mode 100644 index f4cc186806..0000000000 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderItemInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Runtime.Serialization; - -namespace SmartStore.WebApi.Models.OData.Media -{ - /// - /// Folder information returned by the API. - /// - [DataContract] - public partial class FolderItemInfo - { - [DataMember] - public int Id { get; set; } - - [DataMember] - public int FilesCount { get; set; } - - [DataMember] - public string Path { get; set; } - - [DataMember] - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs index b20593d5ef..339030f878 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Runtime.Serialization; +using System.Web.OData.Builder; namespace SmartStore.WebApi.Models.OData.Media { @@ -45,22 +46,23 @@ public partial class FolderNodeInfo // Not supported yet: "The complex type 'FolderNodeInfo' has a reference to itself through the property 'Children'. A recursive loop of complex types is not allowed." // See https://github.com/OData/WebApi/issues/1248 //[DataMember] + //[AutoExpand] //public ICollection Children { get; set; } [DataMember] public ICollection Children { get; set; } + } - [DataContract] - public partial class FolderChildNodeInfo - { - [DataMember] - public int Id { get; set; } + [DataContract] + public partial class FolderChildNodeInfo + { + [DataMember] + public int Id { get; set; } - [DataMember] - public string Name { get; set; } + [DataMember] + public string Name { get; set; } - [DataMember] - public string Path { get; set; } - } + [DataMember] + public string Path { get; set; } } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index d9b36fb94f..c7acca052e 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -246,6 +246,7 @@ + @@ -253,7 +254,7 @@ - + @@ -290,7 +291,6 @@ - diff --git a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs index 3502b3b1b8..75e89b2156 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiConfigurationProvider.cs @@ -53,11 +53,12 @@ public void Configure(WebApiConfigurationBroadcaster configData) m.EntitySet("Manufacturers"); m.EntitySet("MeasureDimensions"); m.EntitySet("MeasureWeights"); - m.EntitySet("Media"); - m.EntitySet("MediaFiles"); - m.EntitySet("MediaFolders"); + + m.EntitySet("MediaFiles"); + m.EntitySet("MediaFolders"); m.EntitySet("MediaTags"); m.EntitySet("MediaTracks"); + m.EntitySet("NewsLetterSubscriptions"); m.EntitySet("OrderNotes"); m.EntitySet("Orders"); @@ -97,7 +98,8 @@ public void Configure(WebApiConfigurationBroadcaster configData) Controllers.OData.OrdersController.Init(configData); Controllers.OData.OrderItemsController.Init(configData); Controllers.OData.ProductsController.Init(configData); - Controllers.OData.MediaController.Init(configData); + Controllers.OData.MediaFilesController.Init(configData); + Controllers.OData.MediaFoldersController.Init(configData); // Custom routing convention. configData.RoutingConventions.Insert(0, new CustomRoutingConvention()); From 19f031b522b659577d5718b262732d7bb00fbc79 Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Tue, 25 Aug 2020 22:04:38 +0200 Subject: [PATCH 092/695] (fu) > dropzone wrapper: handles pb media block - (file) add, sort and remove w/o ajax --- .../Scripts/smartstore.dropzoneWrapper.js | 96 ++++++++++++++++--- 1 file changed, 85 insertions(+), 11 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js index 60dedf12a7..0fb7f99cc8 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js @@ -495,15 +495,55 @@ } }); } else { + const hidden = document.getElementById("media-file-ids"); - if (hidden) { + if (hidden && clearAssignableFiles) { hidden.value = (hidden.value + assignableFileIds); + + const items = previewContainer.find('.dz-image-preview'); + const hiddenValues = hidden.value.split(',').map(Number); + + $.each(items, function (index, item) { + if (index < items.length - assignableFiles.length) return; + + const fileName = $(item).find(".fu-file-info-name").text(); + var file = assignableFiles.find(x => x.media.id === hiddenValues[index]); + if (!file) { + file = assignableFiles.find(x => x.name.toLowerCase() === fileName.toLowerCase()); + } + + if (file) { + // Set properties for newly added file preview. + var elPreview = file.previewElement ? $(file.previewElement) : $(previewTemplate.html()); + + elPreview + .attr("data-media-id", hiddenValues[index]) + .attr("data-media-name", fileName) + .removeClass("d-none dz-processing"); + + elPreview.find(".fu-file-info-name").html(fileName); + + elPreview + .find('img') + .attr('src', file.dataURL || file.media.thumbUrl); + + previewContainer.append(elPreview); + dzResetProgressBar(elPreview.find(".progress-bar")); + } + else { + console.log("Error while adding preview element.", fileName.toLowerCase()); + } + }); + + assignableFileIds = ""; + assignableFiles.length = 0; } } } // Calls server function after sorting, to save current sort order. function sortMediaFiles() { + if ($el.data('sort-url') && $el.data('entity-id')) { var items = previewContainer.find('.dz-image-preview'); @@ -538,6 +578,19 @@ } }); } + else { + const hidden = document.getElementById("media-file-ids"); + if (hidden) { + const items = previewContainer.find('.dz-image-preview'); + + let newOrder = []; + $.each(items, function (i, val) { + newOrder.push($(val).data('entity-media-id')); + }); + + hidden.value = newOrder; + } + } } // Sets file icon for files in preview containers (in multifile & status window). @@ -587,22 +640,43 @@ var entityMediaFileId = previewThumb.data("entity-media-id"); var mediaFileId = previewThumb.data("media-id"); - $.ajax({ - async: false, - cache: false, - type: 'POST', - url: $el.data('remove-url'), - data: { id: entityMediaFileId }, - success: function () { + if ($el.data('remove-url')) { + + $.ajax({ + async: false, + cache: false, + type: 'POST', + url: $el.data('remove-url'), + data: { id: entityMediaFileId }, + success: function () { + previewThumb.remove(); + + // File must be removed from dropzone if it was added in current queue. + var file = el.files.find(file => file.media.id === mediaFileId); + if (file) + el.removeFile(file); + } + }); + } else { + const hidden = document.getElementById("media-file-ids"); + if (hidden) { previewThumb.remove(); // File must be removed from dropzone if it was added in current queue. - var file = el.files.find(file => file.media.id === mediaFileId); + const file = el.files.find(file => file.media.id === mediaFileId); if (file) el.removeFile(file); - } - }); + const items = previewContainer.find('.dz-image-preview'); + + let newOrder = []; + $.each(items, function (i, val) { + newOrder.push($(val).data('entity-media-id')); + }); + + hidden.value = newOrder; + } + } return false; }); From c5d1bb8c272d1d911849f9b4bc7ba937b9f05aad Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 25 Aug 2020 22:30:05 +0200 Subject: [PATCH 093/695] API: IMediaService endpoints (in progress) --- .../Controllers/OData/MediaFilesController.cs | 36 +------- .../OData/MediaFoldersController.cs | 83 ++++--------------- .../Models/OData/Media/FolderNodeInfo.cs | 21 +++-- .../OData/Media/MediaFolderOperationResult.cs | 4 +- 4 files changed, 32 insertions(+), 112 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs index d414363b55..491e0b7a9f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs @@ -3,7 +3,6 @@ using System.Globalization; using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -68,40 +67,11 @@ public IHttpActionResult Get(int key) return Ok(Convert(file)); } - // GET /MediaFiles(123)/ThumbUrl [WebApiAuthenticate] - public IHttpActionResult GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty() { - Type propertyType = null; - object propertyValue = null; - - this.ProcessEntity(() => - { - var file = Service.GetFileById(key); - if (file == null) - { - throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - } - - var item = Convert(file); - - var prop = FastProperty.GetProperty(item.GetType(), propertyName); - if (prop == null) - { - throw Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); - } - - propertyType = prop.Property.PropertyType; - propertyValue = prop.GetValue(item); - }); - - if (propertyType == null) - { - return StatusCode(HttpStatusCode.NoContent); - } - - var response = Request.CreateResponse(HttpStatusCode.OK, propertyType, propertyValue); - return ResponseMessage(response); + // Because of the return object, the method makes little sense here. + return StatusCode(HttpStatusCode.NotImplemented); } public IHttpActionResult Post() diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs index 0226b38ae3..c29b6a5b41 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs @@ -15,10 +15,7 @@ namespace SmartStore.WebApi.Controllers.OData { - /// - /// Entity is MediaAlbum and not MediaFolder. Otherwise strange, unexpected serialization. - /// - public class MediaFoldersController : WebApiEntityController + public class MediaFoldersController : WebApiEntityController { private readonly IMediaService _mediaService; @@ -40,47 +37,22 @@ public IHttpActionResult Get() [WebApiAuthenticate] public IHttpActionResult Get(int key) { - //var node = Service.GetNodeById(key); + FolderNodeInfo result = null; - //return Ok(Convert(node)); - return null; + this.ProcessEntity(() => + { + var node = Service.GetNodeById(key); + result = Convert(node, false)?.FirstOrDefault(); + }); + + return Ok(result); } - // GET /MediaFolders(123)/Path [WebApiAuthenticate] - public IHttpActionResult GetProperty(int key, string propertyName) + public IHttpActionResult GetProperty() { - //Type propertyType = null; - //object propertyValue = null; - - //this.ProcessEntity(() => - //{ - // var file = Service.GetFileById(key); - // if (file == null) - // { - // throw Request.NotFoundException(WebApiGlobal.Error.EntityNotFound.FormatInvariant(key)); - // } - - // var item = Convert(file); - - // var prop = FastProperty.GetProperty(item.GetType(), propertyName); - // if (prop == null) - // { - // throw Request.BadRequestException(WebApiGlobal.Error.PropertyNotFound.FormatInvariant(propertyName.EmptyNull())); - // } - - // propertyType = prop.Property.PropertyType; - // propertyValue = prop.GetValue(item); - //}); - - //if (propertyType == null) - //{ - // return StatusCode(HttpStatusCode.NoContent); - //} - - //var response = Request.CreateResponse(HttpStatusCode.OK, propertyType, propertyValue); - //return ResponseMessage(response); - return null; + // Because of the return object, the method makes little sense here. + return StatusCode(HttpStatusCode.NotImplemented); } public IHttpActionResult Post() @@ -113,7 +85,7 @@ public static void Init(WebApiConfigurationBroadcaster configData) { var entityConfig = configData.ModelBuilder.EntityType(); - configData.ModelBuilder.ComplexType(); + configData.ModelBuilder.ComplexType(); entityConfig.Collection .Action("FolderExists") @@ -153,11 +125,6 @@ public static void Init(WebApiConfigurationBroadcaster configData) .Function("GetRootNode") .ReturnsCollectionFromEntitySet("MediaFolders"); - entityConfig.Collection - .Function("GetNodeById") - .ReturnsCollectionFromEntitySet("MediaFolders") - .Parameter("Id"); - entityConfig.Collection .Action("GetNodeByPath") .ReturnsCollectionFromEntitySet("MediaFolders") @@ -214,22 +181,6 @@ public IHttpActionResult GetRootNode() return Ok(result); } - /// GET /MediaFolders/GetNodeById(Id=123) - [HttpGet] - [WebApiAuthenticate] - public IHttpActionResult GetNodeById(int id) - { - List result = null; - - this.ProcessEntity(() => - { - var node = Service.GetNodeById(id); - result = Convert(node); - }); - - return Ok(result); - } - /// POST /MediaFolders/GetNodeByPath {"Path":"content/my-folder"} [HttpPost] [WebApiAuthenticate] @@ -260,7 +211,7 @@ public IHttpActionResult CreateFolder(ODataActionParameters parameters) var path = parameters.GetValueSafe("Path"); var result = _mediaService.CreateFolder(path); - newFolder = Convert(result.Node, false).FirstOrDefault(); + newFolder = Convert(result.Node, false)?.FirstOrDefault(); }); return Created(newFolder); @@ -279,7 +230,7 @@ public IHttpActionResult MoveFolder(ODataActionParameters parameters) var destinationPath = parameters.GetValueSafe("DestinationPath"); var result = _mediaService.MoveFolder(path, destinationPath); - movedFolder = Convert(result.Node, false).FirstOrDefault(); + movedFolder = Convert(result.Node, false)?.FirstOrDefault(); }); return Ok(movedFolder); @@ -375,14 +326,14 @@ void ConvertNode(TreeNode node) Path = val.Path, Slug = val.Slug, HasChildren = node.HasChildren, - Children = new List() + Children = new List() }; if (node.HasChildren) { foreach (var child in node.Children) { - parent.Children.Add(new FolderChildNodeInfo + parent.Children.Add(new FolderNodeInfo.FolderChildNodeInfo { Id = child.Value.Id, Name = child.Value.Name, diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs index 339030f878..c42935cbbf 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FolderNodeInfo.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Runtime.Serialization; -using System.Web.OData.Builder; namespace SmartStore.WebApi.Models.OData.Media { @@ -51,18 +50,18 @@ public partial class FolderNodeInfo [DataMember] public ICollection Children { get; set; } - } - [DataContract] - public partial class FolderChildNodeInfo - { - [DataMember] - public int Id { get; set; } + [DataContract] + public partial class FolderChildNodeInfo + { + [DataMember] + public int Id { get; set; } - [DataMember] - public string Name { get; set; } + [DataMember] + public string Name { get; set; } - [DataMember] - public string Path { get; set; } + [DataMember] + public string Path { get; set; } + } } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaFolderOperationResult.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaFolderOperationResult.cs index 378ab16c6a..d4bacb0462 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaFolderOperationResult.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/MediaFolderOperationResult.cs @@ -12,13 +12,13 @@ public partial class MediaFolderOperationResult // TODO: add properties later. Complex Type with navigation property requires OData ASP.NET Web API V6. // See https://docs.microsoft.com/en-us/odata/webapi/complextypewithnavigationproperty //[DataMember] - //public FolderItemInfo Folder { get; set; } + //public FolderNodeInfo Folder { get; set; } [DataMember] public ICollection DuplicateFiles { get; set; } [DataContract] - public class DuplicateFileInfo + public partial class DuplicateFileInfo { [DataMember] public int SourceFileId { get; set; } From 4db8ef5767fd6537324f5a5b34fac2386e953fa0 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 25 Aug 2020 23:35:55 +0200 Subject: [PATCH 094/695] Fixes #2065: TinyImage does not show notifications anymore --- .../SmartStore.Web/Scripts/smartstore.common.js | 4 ++-- .../Scripts/smartstore.dropzoneWrapper.js | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.common.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.common.js index 199277bccd..bb7a8969e7 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.common.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.common.js @@ -467,13 +467,13 @@ // Handle ajax notifications $(document) - .ajaxSuccess(function (ev, xhr) { + .ajaxSuccess(function (e, xhr) { var msg = xhr.getResponseHeader('X-Message'); if (msg) { displayNotification(decode(msg), xhr.getResponseHeader('X-Message-Type')); } }) - .ajaxError(function (ev, xhr) { + .ajaxError(function (e, xhr) { var msg = xhr.getResponseHeader('X-Message'); if (msg) { displayNotification(decode(msg), xhr.getResponseHeader('X-Message-Type')); diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js index 0fb7f99cc8..5910d4874e 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js @@ -250,6 +250,15 @@ el.on("successmultiple", function (files, response, progress) { logEvent("successmultiple", files, response, progress); + // Handle notifications + var xhr = progress.currentTarget; + if (xhr && xhr.getResponseHeader) { + var msg = xhr.getResponseHeader('X-Message'); + if (msg) { + showNotification(msg, xhr.getResponseHeader('X-Message-Type')); + } + } + if (opts.maxFiles === 1) return; @@ -1093,5 +1102,9 @@ } } + var showNotification = _.throttle(function (msg, type) { + displayNotification(decodeURIComponent(escape(msg)), type); + }, 750, { leading: true, trailing: true }); + })(jQuery); From c5d88ada49f39f1d97648e35d0a841125895449b Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 26 Aug 2020 01:18:51 +0200 Subject: [PATCH 095/695] Brought imaging effects and filters to IImageTransformer interface --- .../Media/Handlers/ImageHandler.cs | 2 +- ...cessorBase.cs => DefaultImageProcessor.cs} | 90 +++------ .../Media/Imaging/IImage.cs | 10 - .../Media/Imaging/IImageFactory.cs | 45 +++++ .../Media/Imaging/IImageProcessor.cs | 16 +- .../Media/Imaging/IImageTransformer.cs | 171 +++++++++++++++++- .../Media/Imaging/Impl/IPImageFactory.cs | 60 ++++++ .../Media/Imaging/Impl/IPImageProcessor.cs | 72 -------- .../Media/Imaging/Impl/IPImageTransformer.cs | 153 ++++++++++++++++ .../SmartStore.Services/Media/MediaModule.cs | 7 +- .../Media/MediaPathData.cs | 2 +- .../SmartStore.Services/Media/MediaService.cs | 3 +- .../SmartStore.Services.csproj | 5 +- .../web.config | 8 - .../Administration/SmartStore.Admin.csproj | 12 +- .../Controllers/MediaController.cs | 6 + 16 files changed, 471 insertions(+), 191 deletions(-) rename src/Libraries/SmartStore.Services/Media/Imaging/{ImageProcessorBase.cs => DefaultImageProcessor.cs} (64%) create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/IImageFactory.cs create mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFactory.cs delete mode 100644 src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs index 4cee95ff9c..384e449d56 100644 --- a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs +++ b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs @@ -21,7 +21,7 @@ public ImageHandler(IImageProcessor imageProcessor, IImageCache imageCache, Medi protected override bool IsProcessable(MediaHandlerContext context) { - return context.ImageQuery.NeedsProcessing(true) && _imageProcessor.IsSupportedImage(context.PathData.Extension); + return context.ImageQuery.NeedsProcessing(true) && _imageProcessor.Factory.IsSupportedImage(context.PathData.Extension); } protected override Task ProcessImageAsync(MediaHandlerContext context, CachedImage cachedImage, Stream inputStream) diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ImageProcessorBase.cs b/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs similarity index 64% rename from src/Libraries/SmartStore.Services/Media/Imaging/ImageProcessorBase.cs rename to src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs index 84d1c9d477..076d30d278 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ImageProcessorBase.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs @@ -9,28 +9,23 @@ namespace SmartStore.Services.Media.Imaging { - public abstract class ImageProcessorBase : IImageProcessor + public class DefaultImageProcessor : IImageProcessor { private static long _totalProcessingTime; private readonly IEventPublisher _eventPublisher; - public ImageProcessorBase(IEventPublisher eventPublisher) + public DefaultImageProcessor(IImageFactory imageFactory, IEventPublisher eventPublisher) { + Factory = imageFactory; _eventPublisher = eventPublisher; } public ILogger Logger { get; set; } = NullLogger.Instance; - public abstract bool IsSupportedImage(string extension); + public IImageFactory Factory { get; } - public abstract IImageFormat GetImageFormat(string extension); - - public abstract IProcessableImage LoadImage(string path); - - public abstract IProcessableImage LoadImage(Stream stream); - - public virtual ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) + public ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) { Guard.NotNull(query, nameof(query)); @@ -50,25 +45,25 @@ public virtual ProcessImageResult ProcessImage(ProcessImageQuery query, bool dis if (source is byte[] b) { using var memStream = new MemoryStream(b); - image = LoadImage(memStream); + image = Factory.LoadImage(memStream); len = b.LongLength; } else if (source is Stream s) { - image = LoadImage(s); + image = Factory.LoadImage(s); len = s.Length; } else if (source is string str) { str = NormalizePath(str); - image = LoadImage(str); + image = Factory.LoadImage(str); len = (new FileInfo(str)).Length; } else if (source is IFile file) { using (var fs = file.OpenRead()) { - image = LoadImage(fs); + image = Factory.LoadImage(fs); len = file.Size; } } @@ -95,36 +90,6 @@ public virtual ProcessImageResult ProcessImage(ProcessImageQuery query, bool dis result.HasAppliedVisualEffects = fxApplied; - // TODO: convert this shit, but how?!!! - //if (inBuffer != null) - //{ - // // Check whether it is more beneficial to return the source instead of the result. - // // Prefer result only if its size is smaller than the source size. - // // Result size may be larger if a high-compressed image has been uploaded. - // // During image processing the source compression algorithm gets lost and the image may be larger in size - // // after encoding with default encoders. - // var compare = - // // only when image was not altered visually... - // !fxApplied - // // ...size has not changed - // && image.Size == image.SourceSize - // // ...and format has not changed - // && image.Format.Name == result.SourceFormat.Name; - - // if (compare && len <= outStream.Length) - // { - // // Source is smaller. Throw away result and get back to source. - // outStream.Dispose(); - // result.OutputStream = new MemoryStream(inBuffer, 0, inBuffer.Length, true, true); - // } - //} - - //// Set output stream - //if (result.OutputStream == null) - //{ - // result.OutputStream = outStream; - //} - // Post-process event _eventPublisher.Publish(new ImageProcessedEvent(query, result)); @@ -183,33 +148,32 @@ protected virtual void ProcessImageCore(ProcessImageQuery query, IProcessableIma transformer.BackgroundColor(ColorTranslator.FromHtml(query.BackgroundColor)); fxAppliedInternal = true; } - }); + // Format + if (query.Format != null) + { + var format = query.Format as IImageFormat; - // Format - if (query.Format != null) - { - var format = query.Format as IImageFormat; + if (format == null && query.Format is string) + { + var requestedFormat = ((string)query.Format).ToLowerInvariant(); + format = Factory.GetImageFormat(requestedFormat); + } - if (format == null && query.Format is string) - { - var requestedFormat = ((string)query.Format).ToLowerInvariant(); - format = GetImageFormat(requestedFormat); + if (format != null) + { + transformer.Format(format); + } } - if (format != null) + // QUality + if (query.Quality.HasValue) { - image.Format = format; + transformer.Quality(query.Quality.Value); } - } - - //// Set Quality (TODO) - //if (query.Quality.HasValue) - //{ - // processor.Quality(query.Quality.Value); - //} + }); - fxApplied = fxAppliedInternal; + fxApplied = fxAppliedInternal; } protected virtual string NormalizePath(string path) diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs index 75d3f3e02b..b2b064ff9d 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs @@ -30,16 +30,6 @@ public interface IImage : IImageInfo, IDisposable /// Size SourceSize { get; } - /// - /// Gets or sets the color depth in number of bits per pixel (1, 4, 8, 16, 24, 32) - /// - new BitDepth BitDepth { get; set; } - - /// - /// Gets or sets the format of the image. - /// - new IImageFormat Format { get; set; } - /// /// Saves the current image to the specified output stream. /// diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageFactory.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageFactory.cs new file mode 100644 index 0000000000..7ebc1f1df0 --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageFactory.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SmartStore.Services.Media.Imaging +{ + /// + /// A provider interface for imaging libraries. + /// + public interface IImageFactory + { + /// + /// Determines whether the given file name is processable by the image provider + /// + /// The file extension to check. + /// A value indicating whether processing is possible + bool IsSupportedImage(string extension); + + /// + /// Resolves the image format instance for a given file extension. + /// + /// The (dot-less) file extension. + /// An object that adapts the library specific format implementation. + IImageFormat GetImageFormat(string extension); + + /// + /// Loads an image by path. + /// + /// The full physical path to the image file. + /// Whether to preserve exif metadata. Defaults to false. + /// An object that adapts the library specific imaging implementation. + IProcessableImage LoadImage(string path, bool preserveExif = false); + + /// + /// Loads an image by stream. + /// + /// The stream that contains image data. + /// Whether to preserve exif metadata. Defaults to false. + /// An object that adapts the library specific imaging implementation. + IProcessableImage LoadImage(Stream stream, bool preserveExif = false); + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs index ad392d3049..041f87d7ce 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs @@ -4,23 +4,15 @@ namespace SmartStore.Services.Media.Imaging { /// - /// A service interface responsible for resizing/processing images. + /// A service interface responsible for processing images. /// public interface IImageProcessor { /// - /// Determines whether the given file name is processable by the image resizer + /// The image factory adapter used to load and process images. /// - /// The file extension to check. - /// A value indicating whether processing is possible - bool IsSupportedImage(string extension); - - IImageFormat GetImageFormat(string extension); - - IProcessableImage LoadImage(string path); - - IProcessableImage LoadImage(Stream stream); - + IImageFactory Factory { get; } + /// /// Processes an image /// diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs index aaee41ea22..f17b721270 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs @@ -10,13 +10,134 @@ namespace SmartStore.Services.Media.Imaging public interface IImageTransformer { /// - /// Resizes the current image to the given dimensions. + /// Changes the opacity of the current image. /// - /// - /// The containing the width and height to set the image to. + /// The percentage by which to alter the images opacity. Any integer between 0 and 100. + IImageTransformer Alpha(int percentage); + + /// + /// Changes the background color of the current image. + /// + /// + /// The to paint the image background with. /// - /// - IImageTransformer Resize(Size size); + IImageTransformer BackgroundColor(Color color); + + /// + /// Alters the bit depth of the current image. + /// + /// The new bit depth. + IImageTransformer BitDepth(BitDepth bitDepth); + + /// + /// Changes the brightness of the current image. + /// + /// The percentage by which to alter the images brightness. Any integer between -100 and 100. + IImageTransformer Brightness(int percentage); + + /// + /// Changes the contrast of the current image. + /// + /// The percentage by which to alter the images contrast. Any integer between -100 and 100. + IImageTransformer Contrast(int percentage); + + /// + /// Crops the current image to the given location and size. + /// + /// The rectangle containing the coordinates to crop the image to. + IImageTransformer Crop(Rectangle rect); + + /// + /// Crops an image to the area of greatest entropy. + /// + /// The threshold in bytes to control the entropy. + IImageTransformer EntropyCrop(byte threshold = 128); + + /// + /// Flips the current image either horizontally or vertically. + /// + /// Whether to flip the image vertically. + /// Whether to flip the image both vertically and horizontally. + IImageTransformer Flip(bool flipVertically = false, bool flipBoth = false); + + /// + /// Sets the output format of the current image to the matching ImageFormat. + /// + /// The new format to set the image to. + IImageTransformer Format(IImageFormat format); + + /// + /// Adjust the gamma (intensity of the light) component of the given image. + /// + /// The value to adjust the gamma by (typically between .2 and 5). + IImageTransformer Gamma(float value); + + /// + /// Uses a Gaussian kernel to blur the current image. + /// + /// The size to set the Gaussian kernel to. + /// The sigma and threshold values applied to the kernel are 1.4 and 0 respectively. + IImageTransformer GaussianBlur(int size); + + /// + /// Uses a Gaussian kernel to sharpen the current image. + /// + /// The size to set the Gaussian kernel to. + /// The sigma and threshold values applied to the kernel are 1.4 and 0 respectively. + IImageTransformer GaussianSharpen(int size); + + /// + /// Alters the hue of the current image changing the overall color. + /// + /// The angle by which to alter the images hue. Any integer between 0 and 360. + /// Whether to rotate the hue of the current image altering each color. + IImageTransformer Hue(int degrees, bool rotate = false); + + /// + /// Applies an image mask to the current image. + /// + /// The mask image. + /// Size of the mask. + /// Opacity of the mask. + /// + /// Position of the mask. + /// Point is used to place the image mask if it has not the same dimensions as the original image. + /// Pass null to center the mask. + /// + IImageTransformer Mask(IImage image, Size size, int opacity, Point? position); + + /// + /// Adds an image overlay to the current image. + /// + /// The overlay image. + /// Size of the layer. + /// Opacity of the layer. + /// + /// Position of the layer. + /// Point is used to place the image overlay if it has not the same dimensions as the original image. + /// Pass null to center the overlay. + /// + IImageTransformer Overlay(IImage image, Size size, int opacity, Point? position); + + /// + /// Alters the output quality of the current image. + /// + /// A value between 1 and 100 to set the quality to. + /// This method will only effect the output quality of jpeg and webp images. + IImageTransformer Quality(int percentage); + + /// + /// Rotates the current image by the given angle. + /// + /// The angle at which to rotate the image in degrees. + /// If true, rotates the image without expanding the canvas to fit the image. + /// + /// Whether to keep the original image dimensions. . + /// Only applicable if is true. + /// If set to true, the image is zoomed to fit the bounding area. + /// If set to false, the area is cropped to fit the rotated image. + /// + IImageTransformer Rotate(float degrees, bool bounded = false, bool keepSize = false); /// /// Resizes the current image according to the given options. @@ -26,11 +147,43 @@ public interface IImageTransformer IImageTransformer Resize(ResizeOptions options); /// - /// Changes the background color of the current image. + /// Adds rounded corners to the current image. /// - /// - /// The to paint the image background with. + /// The radius at which the corner will be rounded. + IImageTransformer RoundedCorners(int radius); + + /// + /// Changes the saturation of the current image. + /// + /// The percentage by which to alter the images saturation. Any integer between -100 and 100. + IImageTransformer Saturation(int percentage); + + /// + /// Tints the current image with the given color. + /// + /// The color to tint the image with. + IImageTransformer Tint(Color color); + + /// + /// Adds a vignette image effect to the current image. + /// + /// The color of the vignette. Defaults to black. + /// + IImageTransformer Vignette(Color? color = null); + } + + public static class IImageTransformerExtensions + { + /// + /// Resizes the current image to the given dimensions. + /// + /// + /// The containing the width and height to set the image to. /// - IImageTransformer BackgroundColor(Color color); + /// + public static IImageTransformer Resize(this IImageTransformer transformer, Size size) + { + return transformer.Resize(new ResizeOptions { Size = size }); + } } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFactory.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFactory.cs new file mode 100644 index 0000000000..f8a4c23c30 --- /dev/null +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFactory.cs @@ -0,0 +1,60 @@ +using System; +using System.IO; +using System.Linq; +using ImageProcessor; +using ImageProcessor.Configuration; +using ImageProcessor.Imaging.Formats; +using ImageProcessor.Plugins.WebP.Imaging.Formats; + +namespace SmartStore.Services.Media.Imaging.Impl +{ + public class IPImageFactory : IImageFactory + { + static IPImageFactory() + { + ImageProcessorBootstrapper.Instance.AddImageFormats(new WebPFormat { Quality = 100 }); + } + + public bool IsSupportedImage(string extension) + { + return GetInternalImageFormat(extension) != null; + } + + public IImageFormat GetImageFormat(string extension) + { + var internalFormat = GetInternalImageFormat(extension); + if (internalFormat != null) + { + return new IPImageFormat(internalFormat); + } + + return null; + } + + private ISupportedImageFormat GetInternalImageFormat(string extension) + { + if (extension.IsEmpty()) + { + return null; + } + + if (extension[0] == '.' && extension.Length > 1) + { + extension = extension.Substring(1); + } + + return ImageProcessorBootstrapper.Instance.SupportedImageFormats + .FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase)); + } + + public IProcessableImage LoadImage(string path, bool preserveExif = false) + { + return new IPImage(new ImageFactory(preserveExif, fixGamma: false).Load(path)); + } + + public IProcessableImage LoadImage(Stream stream, bool preserveExif = false) + { + return new IPImage(new ImageFactory(preserveExif, fixGamma: false).Load(stream)); + } + } +} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs deleted file mode 100644 index 87c9fd51ac..0000000000 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageProcessor.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using ImageProcessor; -using ImageProcessor.Configuration; -using ImageProcessor.Imaging.Formats; -using ImageProcessor.Plugins.WebP.Imaging.Formats; -using SmartStore.Core.Events; - -namespace SmartStore.Services.Media.Imaging.Impl -{ - public partial class IPImageProcessor : ImageProcessorBase - { - static IPImageProcessor() - { - ImageProcessorBootstrapper.Instance.AddImageFormats(new WebPFormat { Quality = 100 }); - } - - public IPImageProcessor(IEventPublisher eventPublisher) - : base(eventPublisher) - { - } - - public override bool IsSupportedImage(string extension) - { - return GetInternalImageFormat(extension) != null; - } - - public override IImageFormat GetImageFormat(string extension) - { - var internalFormat = GetInternalImageFormat(extension); - if (internalFormat != null) - { - return new IPImageFormat(internalFormat); - } - - return null; - } - - private ISupportedImageFormat GetInternalImageFormat(string extension) - { - if (extension.IsEmpty()) - { - return null; - } - - if (extension[0] == '.' && extension.Length > 1) - { - extension = extension.Substring(1); - } - - return ImageProcessorBootstrapper.Instance.SupportedImageFormats - .FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase)); - } - - public override IProcessableImage LoadImage(string path) - { - var internalImage = new ImageFactory(preserveExifData: false, fixGamma: false) - .Load(NormalizePath(path)); - - return new IPImage(internalImage); - } - - public override IProcessableImage LoadImage(Stream stream) - { - var internalImage = new ImageFactory(preserveExifData: false, fixGamma: false) - .Load(stream); - - return new IPImage(internalImage); - } - } -} diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs index b7889069f0..03df89e9f6 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs @@ -46,5 +46,158 @@ public IImageTransformer BackgroundColor(Color color) _image.BackgroundColor(color); return this; } + + public IImageTransformer Alpha(int percentage) + { + _image.Alpha(percentage); + return this; + } + + public IImageTransformer Brightness(int percentage) + { + _image.Brightness(percentage); + return this; + } + + public IImageTransformer Contrast(int percentage) + { + _image.Contrast(percentage); + return this; + } + + public IImageTransformer Crop(Rectangle rect) + { + _image.Crop(rect); + return this; + } + + public IImageTransformer EntropyCrop(byte threshold = 128) + { + _image.EntropyCrop(threshold); + return this; + } + + public IImageTransformer Flip(bool flipVertically = false, bool flipBoth = false) + { + _image.Flip(flipVertically, flipBoth); + return this; + } + + public IImageTransformer Format(IImageFormat format) + { + if (format is IPImageFormat ipFormat) + { + _image.Format(ipFormat.WrappedFormat); + return this; + } + + throw new ArgumentException("Passed image type must be '{0}'.".FormatCurrent(typeof(IPImageFormat)), nameof(format)); + } + + public IImageTransformer Gamma(float value) + { + _image.Gamma(value); + return this; + } + + public IImageTransformer GaussianBlur(int size) + { + _image.GaussianBlur(size); + return this; + } + + public IImageTransformer GaussianSharpen(int size) + { + _image.GaussianSharpen(size); + return this; + } + + public IImageTransformer Hue(int degrees, bool rotate = false) + { + _image.Hue(degrees, rotate); + return this; + } + + public IImageTransformer Quality(int percentage) + { + _image.Quality(percentage); + return this; + } + + public IImageTransformer BitDepth(BitDepth bitDepth) + { + _image.BitDepth((long)bitDepth); + return this; + } + + public IImageTransformer Overlay(IImage image, Size size, int opacity, Point? position) + { + if (image is IPImage ipImage) + { + _image.Overlay(new ImageLayer + { + Image = ipImage.ImageFactory.Image, + Size = size, + Opacity = opacity, + Position = position + }); + + return this; + } + + throw new ArgumentException("Passed image type must be '{0}'.".FormatCurrent(typeof(IPImage)), nameof(image)); + } + + public IImageTransformer Mask(IImage image, Size size, int opacity, Point? position) + { + if (image is IPImage ipImage) + { + _image.Mask(new ImageLayer + { + Image = ipImage.ImageFactory.Image, + Size = size, + Opacity = opacity, + Position = position + }); + + return this; + } + + throw new ArgumentException("Passed image type must be '{0}'.".FormatCurrent(typeof(IPImage)), nameof(image)); + } + + public IImageTransformer Rotate(float degrees, bool bounded = false, bool keepSize = false) + { + if (bounded) + _image.Rotate(degrees); + else + _image.RotateBounded(degrees, keepSize); + + return this; + } + + public IImageTransformer RoundedCorners(int radius) + { + _image.RoundedCorners(radius); + return this; + } + + public IImageTransformer Saturation(int percentage) + { + _image.Saturation(percentage); + return this; + } + + public IImageTransformer Tint(Color color) + { + _image.Tint(color); + return this; + } + + public IImageTransformer Vignette(Color? color = null) + { + _image.Vignette(color); + return this; + } } } diff --git a/src/Libraries/SmartStore.Services/Media/MediaModule.cs b/src/Libraries/SmartStore.Services/Media/MediaModule.cs index cdec9c3198..80b3f5a9e1 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaModule.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaModule.cs @@ -35,10 +35,13 @@ protected override void Load(ContainerBuilder builder) builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + + // ImageProcessor adapter factory + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); // Register factory for currently active media storage provider diff --git a/src/Libraries/SmartStore.Services/Media/MediaPathData.cs b/src/Libraries/SmartStore.Services/Media/MediaPathData.cs index 132e84fc8d..858dcbdea6 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaPathData.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaPathData.cs @@ -81,7 +81,7 @@ public string Extension } set { - _ext = value; + _ext = value?.TrimStart('.'); } } diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs index a25220c0a9..f2120d9277 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -550,7 +550,6 @@ protected MediaStorageItem ProcessFile( // Process image if (inStream != null && inStream.Length > 0 && file.MediaType == MediaType.Image && ProcessImage(file, inStream, out var outImage)) { - //file.Size = (int)outStream.Length; file.Width = outImage.Size.Width; file.Height = outImage.Size.Height; file.PixelSize = outImage.Size.Width * outImage.Size.Height; @@ -570,7 +569,7 @@ protected bool ProcessImage(MediaFile file, Stream inStream, out IImage outImage outImage = null; var originalSize = Size.Empty; - var format = _imageProcessor.GetImageFormat(file.Extension) ?? new UnsupportedImageFormat(file.MimeType, file.Extension); + var format = _imageProcessor.Factory.GetImageFormat(file.Extension) ?? new UnsupportedImageFormat(file.MimeType, file.Extension); try { diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 52e0b5ece3..3b7d6587fe 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -357,12 +357,14 @@ + - + + @@ -545,7 +547,6 @@ - diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config index 680acd42a7..612bf5c6d6 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config @@ -6,14 +6,6 @@ - diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index 4c33fe7fb3..9baca49bd4 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -657,15 +657,9 @@ - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + diff --git a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs index d26eecf9c4..4f4d61aeeb 100644 --- a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs @@ -13,6 +13,7 @@ using SmartStore.Core.Domain.Seo; using SmartStore.Core.Events; using SmartStore.Core.Infrastructure; +using SmartStore.Core.IO; using SmartStore.Core.Logging; using SmartStore.Core.Security; using SmartStore.Services.Media; @@ -232,6 +233,11 @@ public async Task File(int id /* mediaFileId */, string path) return NotFound(pathData.MimeType); } + if (string.Equals(responseFile.Extension, "." + pathData.Extension, StringComparison.CurrentCultureIgnoreCase)) + { + pathData.MimeType = MimeTypes.MapNameToMimeType(responseFile.Extension); + } + return new CachedFileResult(responseFile, pathData.MimeType); } finally From 8702c6140f4fc91956ef35dba12d24492fb3f768 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 26 Aug 2020 02:02:42 +0200 Subject: [PATCH 096/695] For security reasons complex types transported via in 'ModelBase.CustomProperties' must be decorated with 'CustomModelPartAttribute' now. --- .../Models/BackendExtensionModel.cs | 2 +- .../Models/FeedGoogleMerchantCenterModel.cs | 1 + .../SmartStore.Web.Framework/Modelling/ModelBase.cs | 10 +++++++--- .../Modelling/SmartModelBinder.cs | 8 ++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/Plugins/SmartStore.DevTools/Models/BackendExtensionModel.cs b/src/Plugins/SmartStore.DevTools/Models/BackendExtensionModel.cs index 7de7bbe5e1..949444fe06 100644 --- a/src/Plugins/SmartStore.DevTools/Models/BackendExtensionModel.cs +++ b/src/Plugins/SmartStore.DevTools/Models/BackendExtensionModel.cs @@ -2,10 +2,10 @@ namespace SmartStore.DevTools.Models { + [CustomModelPart] public class BackendExtensionModel : ModelBase { public string Welcome { get; set; } - public int ProductId { get; set; } } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/FeedGoogleMerchantCenterModel.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/FeedGoogleMerchantCenterModel.cs index 973d44f295..530d8bea2d 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/FeedGoogleMerchantCenterModel.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/FeedGoogleMerchantCenterModel.cs @@ -19,6 +19,7 @@ public class FeedGoogleMerchantCenterModel public string SearchIsTouched { get; set; } } + [CustomModelPart] public class GoogleProductModel : ModelBase { public int TotalCount { get; set; } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs index 68dfb6bdfb..2d81d39f80 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs @@ -6,7 +6,12 @@ namespace SmartStore.Web.Framework.Modelling { - [Serializable] + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public sealed class CustomModelPartAttribute : Attribute + { + } + + [Serializable] public sealed class CustomPropertiesDictionary : Dictionary { } @@ -41,9 +46,8 @@ public TProperty Get(string key) Guard.NotEmpty(key, nameof(key)); IDictionary dict; - object value; - if (TryGetCustomThreadProperties(false, out dict) && dict.TryGetValue(key, out value)) + if (TryGetCustomThreadProperties(false, out dict) && dict.TryGetValue(key, out var value)) { return (TProperty)value; } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs index fef277e4da..95e98bdc8b 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using System.Security; using System.Web.Mvc; using SmartStore.Core.Html; using SmartStore.Web.Framework.Security; @@ -82,6 +83,13 @@ private CustomPropertiesDictionary BindCustomPropertiesDictioary(ControllerConte // Is Complex type var modelName = key.Substring(0, key.Length - subPropertyName.Length - 1); var valueType = GetValueType(keys, modelName, bindingContext.ValueProvider); + if (!valueType.HasAttribute(false)) + { + throw new SecurityException("For security reasons complex types in '{0}' must be decorated with the '{1}' attribute.".FormatInvariant( + typeof(CustomPropertiesDictionary).AssemblyQualifiedNameWithoutVersion(), + typeof(CustomModelPartAttribute).AssemblyQualifiedNameWithoutVersion())); + } + valueBinder = this.Binders.GetBinder(valueType); var complexBindingContext = new ModelBindingContext { From d00580dec353ffd3d114bfe53c8357a4e1459fac Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 26 Aug 2020 13:44:16 +0200 Subject: [PATCH 097/695] API: updated the API client for testing file uploads --- src/Tools/SmartStore.WebApi.Client/App.config | 3 + .../MainForm.Designer.cs | 172 +++++------------- .../SmartStore.WebApi.Client/MainForm.cs | 148 ++++++++------- .../Models/ApiFileParameter.cs | 31 ++++ .../Models/FileUploadModel.cs | 50 +++++ .../Properties/Settings.Designer.cs | 12 ++ .../Properties/Settings.settings | 3 + .../SmartStore.WebApi.Client.csproj | 2 + .../WebApi/WebApiConsumer.cs | 142 ++++++++++----- 9 files changed, 326 insertions(+), 237 deletions(-) create mode 100644 src/Tools/SmartStore.WebApi.Client/Models/ApiFileParameter.cs create mode 100644 src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs diff --git a/src/Tools/SmartStore.WebApi.Client/App.config b/src/Tools/SmartStore.WebApi.Client/App.config index a5e6ece070..cbdc2ac7cf 100644 --- a/src/Tools/SmartStore.WebApi.Client/App.config +++ b/src/Tools/SmartStore.WebApi.Client/App.config @@ -37,6 +37,9 @@ + + + diff --git a/src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs b/src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs index fabc33a851..c21a92f691 100644 --- a/src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs +++ b/src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs @@ -59,23 +59,16 @@ private void InitializeComponent() this.lblRequest = new System.Windows.Forms.TextBox(); this.lblResponse = new System.Windows.Forms.TextBox(); this.lblFile = new System.Windows.Forms.Label(); - this.txtFile = new System.Windows.Forms.TextBox(); - this.txtVersion = new System.Windows.Forms.TextBox(); - this.txtUrl = new System.Windows.Forms.TextBox(); this.btnFileOpen = new System.Windows.Forms.Button(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.txtIdentfier1 = new System.Windows.Forms.TextBox(); - this.lblIdentifier1 = new System.Windows.Forms.Label(); - this.txtIdentfier2 = new System.Windows.Forms.TextBox(); - this.lblIdentfier2 = new System.Windows.Forms.Label(); - this.txtPictureId = new System.Windows.Forms.TextBox(); - this.lblPictureId = new System.Windows.Forms.Label(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); - this.txtMoreData = new System.Windows.Forms.TextBox(); - this.lblMoreData = new System.Windows.Forms.Label(); this.btnDeleteHeaders = new System.Windows.Forms.Button(); this.cboHeaders = new System.Windows.Forms.ComboBox(); this.label10 = new System.Windows.Forms.Label(); + this.cboFileUpload = new System.Windows.Forms.ComboBox(); + this.txtVersion = new System.Windows.Forms.TextBox(); + this.txtUrl = new System.Windows.Forms.TextBox(); + this.btnDeleteFileUpload = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.SuspendLayout(); @@ -395,45 +388,20 @@ private void InitializeComponent() // lblFile // this.lblFile.AutoSize = true; - this.lblFile.Location = new System.Drawing.Point(23, 125); + this.lblFile.Location = new System.Drawing.Point(22, 125); this.lblFile.Name = "lblFile"; this.lblFile.Size = new System.Drawing.Size(58, 13); this.lblFile.TabIndex = 34; this.lblFile.Text = "File upload"; // - // txtFile - // - this.txtFile.Location = new System.Drawing.Point(84, 122); - this.txtFile.Name = "txtFile"; - this.txtFile.Size = new System.Drawing.Size(282, 21); - this.txtFile.TabIndex = 33; - // - // txtVersion - // - this.txtVersion.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::SmartStore.WebApi.Client.Properties.Settings.Default, "ApiVersion", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.txtVersion.Location = new System.Drawing.Point(370, 36); - this.txtVersion.Name = "txtVersion"; - this.txtVersion.Size = new System.Drawing.Size(89, 21); - this.txtVersion.TabIndex = 4; - this.txtVersion.Text = global::SmartStore.WebApi.Client.Properties.Settings.Default.ApiVersion; - // - // txtUrl - // - this.txtUrl.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::SmartStore.WebApi.Client.Properties.Settings.Default, "ApiUrl", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.txtUrl.Location = new System.Drawing.Point(84, 62); - this.txtUrl.Name = "txtUrl"; - this.txtUrl.Size = new System.Drawing.Size(225, 21); - this.txtUrl.TabIndex = 2; - this.txtUrl.Text = global::SmartStore.WebApi.Client.Properties.Settings.Default.ApiUrl; - // // btnFileOpen // this.btnFileOpen.AutoSize = true; - this.btnFileOpen.Location = new System.Drawing.Point(367, 120); + this.btnFileOpen.Location = new System.Drawing.Point(1075, 120); this.btnFileOpen.Name = "btnFileOpen"; - this.btnFileOpen.Size = new System.Drawing.Size(43, 24); + this.btnFileOpen.Size = new System.Drawing.Size(69, 24); this.btnFileOpen.TabIndex = 35; - this.btnFileOpen.Text = "Open"; + this.btnFileOpen.Text = "Open file"; this.btnFileOpen.UseVisualStyleBackColor = true; this.btnFileOpen.Click += new System.EventHandler(this.btnFileOpen_Click); // @@ -441,70 +409,6 @@ private void InitializeComponent() // this.openFileDialog1.FileName = "openFileDialog1"; // - // txtIdentfier1 - // - this.txtIdentfier1.Location = new System.Drawing.Point(450, 122); - this.txtIdentfier1.Name = "txtIdentfier1"; - this.txtIdentfier1.Size = new System.Drawing.Size(51, 21); - this.txtIdentfier1.TabIndex = 36; - // - // lblIdentifier1 - // - this.lblIdentifier1.AutoSize = true; - this.lblIdentifier1.Location = new System.Drawing.Point(428, 125); - this.lblIdentifier1.Name = "lblIdentifier1"; - this.lblIdentifier1.Size = new System.Drawing.Size(18, 13); - this.lblIdentifier1.TabIndex = 37; - this.lblIdentifier1.Text = "ID"; - // - // txtIdentfier2 - // - this.txtIdentfier2.Location = new System.Drawing.Point(590, 123); - this.txtIdentfier2.Name = "txtIdentfier2"; - this.txtIdentfier2.Size = new System.Drawing.Size(128, 21); - this.txtIdentfier2.TabIndex = 38; - // - // lblIdentfier2 - // - this.lblIdentfier2.AutoSize = true; - this.lblIdentfier2.Location = new System.Drawing.Point(507, 126); - this.lblIdentfier2.Name = "lblIdentfier2"; - this.lblIdentfier2.Size = new System.Drawing.Size(82, 13); - this.lblIdentfier2.TabIndex = 39; - this.lblIdentfier2.Text = "SKU, Name etc."; - // - // txtPictureId - // - this.txtPictureId.Location = new System.Drawing.Point(780, 123); - this.txtPictureId.Name = "txtPictureId"; - this.txtPictureId.Size = new System.Drawing.Size(61, 21); - this.txtPictureId.TabIndex = 40; - // - // lblPictureId - // - this.lblPictureId.AutoSize = true; - this.lblPictureId.Location = new System.Drawing.Point(726, 126); - this.lblPictureId.Name = "lblPictureId"; - this.lblPictureId.Size = new System.Drawing.Size(50, 13); - this.lblPictureId.TabIndex = 41; - this.lblPictureId.Text = "PictureId"; - // - // txtMoreData - // - this.txtMoreData.Location = new System.Drawing.Point(910, 123); - this.txtMoreData.Name = "txtMoreData"; - this.txtMoreData.Size = new System.Drawing.Size(234, 21); - this.txtMoreData.TabIndex = 42; - // - // lblMoreData - // - this.lblMoreData.AutoSize = true; - this.lblMoreData.Location = new System.Drawing.Point(852, 126); - this.lblMoreData.Name = "lblMoreData"; - this.lblMoreData.Size = new System.Drawing.Size(56, 13); - this.lblMoreData.TabIndex = 43; - this.lblMoreData.Text = "More data"; - // // btnDeleteHeaders // this.btnDeleteHeaders.AutoSize = true; @@ -534,24 +438,55 @@ private void InitializeComponent() this.label10.TabIndex = 46; this.label10.Text = "Headers"; // + // cboFileUpload + // + this.cboFileUpload.FormattingEnabled = true; + this.cboFileUpload.Location = new System.Drawing.Point(84, 122); + this.cboFileUpload.Name = "cboFileUpload"; + this.cboFileUpload.Size = new System.Drawing.Size(965, 21); + this.cboFileUpload.TabIndex = 48; + // + // txtVersion + // + this.txtVersion.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::SmartStore.WebApi.Client.Properties.Settings.Default, "ApiVersion", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.txtVersion.Location = new System.Drawing.Point(370, 36); + this.txtVersion.Name = "txtVersion"; + this.txtVersion.Size = new System.Drawing.Size(89, 21); + this.txtVersion.TabIndex = 4; + this.txtVersion.Text = global::SmartStore.WebApi.Client.Properties.Settings.Default.ApiVersion; + // + // txtUrl + // + this.txtUrl.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::SmartStore.WebApi.Client.Properties.Settings.Default, "ApiUrl", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.txtUrl.Location = new System.Drawing.Point(84, 62); + this.txtUrl.Name = "txtUrl"; + this.txtUrl.Size = new System.Drawing.Size(225, 21); + this.txtUrl.TabIndex = 2; + this.txtUrl.Text = global::SmartStore.WebApi.Client.Properties.Settings.Default.ApiUrl; + // + // btnDeleteFileUpload + // + this.btnDeleteFileUpload.AutoSize = true; + this.btnDeleteFileUpload.Font = new System.Drawing.Font("Arial", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnDeleteFileUpload.Location = new System.Drawing.Point(1051, 121); + this.btnDeleteFileUpload.Name = "btnDeleteFileUpload"; + this.btnDeleteFileUpload.Size = new System.Drawing.Size(20, 22); + this.btnDeleteFileUpload.TabIndex = 49; + this.btnDeleteFileUpload.Text = "x"; + this.btnDeleteFileUpload.UseVisualStyleBackColor = true; + this.btnDeleteFileUpload.Click += new System.EventHandler(this.btnDeleteFileUpload_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1154, 811); + this.Controls.Add(this.btnDeleteFileUpload); + this.Controls.Add(this.cboFileUpload); this.Controls.Add(this.btnDeleteHeaders); this.Controls.Add(this.cboHeaders); this.Controls.Add(this.label10); - this.Controls.Add(this.txtMoreData); - this.Controls.Add(this.lblMoreData); - this.Controls.Add(this.txtPictureId); - this.Controls.Add(this.lblPictureId); - this.Controls.Add(this.txtIdentfier2); - this.Controls.Add(this.lblIdentfier2); - this.Controls.Add(this.txtIdentfier1); - this.Controls.Add(this.lblIdentifier1); this.Controls.Add(this.btnFileOpen); - this.Controls.Add(this.txtFile); this.Controls.Add(this.lblFile); this.Controls.Add(this.lblResponse); this.Controls.Add(this.lblRequest); @@ -632,22 +567,15 @@ private void InitializeComponent() private System.Windows.Forms.Label label9; private System.Windows.Forms.TextBox lblRequest; private System.Windows.Forms.TextBox lblResponse; - private System.Windows.Forms.TextBox txtFile; private System.Windows.Forms.Label lblFile; private System.Windows.Forms.Button btnFileOpen; private System.Windows.Forms.OpenFileDialog openFileDialog1; - private System.Windows.Forms.TextBox txtIdentfier1; - private System.Windows.Forms.Label lblIdentifier1; - private System.Windows.Forms.TextBox txtIdentfier2; - private System.Windows.Forms.Label lblIdentfier2; - private System.Windows.Forms.TextBox txtPictureId; - private System.Windows.Forms.Label lblPictureId; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; - private System.Windows.Forms.TextBox txtMoreData; - private System.Windows.Forms.Label lblMoreData; private System.Windows.Forms.Button btnDeleteHeaders; private System.Windows.Forms.ComboBox cboHeaders; private System.Windows.Forms.Label label10; + private System.Windows.Forms.ComboBox cboFileUpload; + private System.Windows.Forms.Button btnDeleteFileUpload; } } diff --git a/src/Tools/SmartStore.WebApi.Client/MainForm.cs b/src/Tools/SmartStore.WebApi.Client/MainForm.cs index 22ef137c74..72a545722d 100644 --- a/src/Tools/SmartStore.WebApi.Client/MainForm.cs +++ b/src/Tools/SmartStore.WebApi.Client/MainForm.cs @@ -1,8 +1,12 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.IO; +using System.Linq; using System.Text; using System.Windows.Forms; +using Newtonsoft.Json; +using SmartStore.WebApi.Client.Models; using SmartStore.WebApi.Client.Properties; namespace SmartStore.WebApi.Client @@ -31,6 +35,7 @@ public MainForm() cboQuery.Items.FromString(s.ApiQuery); cboContent.Items.FromString(s.ApiContent); cboHeaders.Items.FromString(s.ApiHeaders); + cboFileUpload.Items.FromString(s.FileUpload); if (cboPath.Items.Count <= 0) { @@ -42,6 +47,19 @@ public MainForm() cboHeaders.Items.Add("{\"Prefer\":\"return=representation\"}"); } + if (cboFileUpload.Items.Count <= 0) + { + var model = new FileUploadModel + { + Files = new List + { + new FileUploadModel.FileModel { Path = @"C:\my-upload-picture.jpg" } + } + }; + var serializedModel = JsonConvert.SerializeObject(model); + cboFileUpload.Items.Add(serializedModel); + } + cboMethod_changeCommitted(null, null); radioApi_CheckedChanged(null, null); @@ -64,6 +82,7 @@ public MainForm() s.ApiQuery = cboQuery.Items.IntoString(); s.ApiContent = cboContent.Items.IntoString(); s.ApiHeaders = cboHeaders.Items.IntoString(); + s.FileUpload = cboFileUpload.Items.IntoString(); s.Save(); }; @@ -72,10 +91,14 @@ public MainForm() private void CallTheApi() { if (txtUrl.Text.HasValue() && !txtUrl.Text.EndsWith("/")) - txtUrl.Text = txtUrl.Text + "/"; + { + txtUrl.Text += "/"; + } if (cboPath.Text.HasValue() && !cboPath.Text.StartsWith("/")) + { cboPath.Text = "/" + cboPath.Text; + } var context = new WebApiRequestContext { @@ -108,56 +131,19 @@ private void CallTheApi() lblRequest.Text = "Request: " + context.HttpMethod + " " + context.Url; lblRequest.Refresh(); - if (radioApi.Checked && txtFile.Text.HasValue()) + // Create multipart form data. + if (cboFileUpload.Text.HasValue()) { - if (string.Compare(context.HttpMethod, "POST", StringComparison.OrdinalIgnoreCase) != 0) - { - "Please select POST method for image upload.".Box(MessageBoxButtons.OK, MessageBoxIcon.Exclamation); - return; - } - - var id1 = txtIdentfier1.Text.ToInt(); - var id2 = txtIdentfier2.Text; - var pictureId = txtPictureId.Text.ToInt(); - var moreData = txtMoreData.Text.EmptyNull().Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); - var keyForId1 = "Id"; - var keyForId2 = ""; - - multiPartData = new Dictionary(); - - if (cboPath.Text.StartsWith("/Uploads/ProductImages")) + try { - // only one identifier required: product id, sku or gtin - keyForId2 = "Sku"; + var fileUploadModel = JsonConvert.DeserializeObject(cboFileUpload.Text, typeof(FileUploadModel)) as FileUploadModel; + multiPartData = apiConsumer.CreateMultipartData(fileUploadModel); } - else if (cboPath.Text.StartsWith("/Uploads/ImportFiles")) + catch { - // only one identifier required: import profile id or profile name - keyForId2 = "Name"; + cboFileUpload.RemoveCurrent(); + cboFileUpload.Text = string.Empty; } - - if (id1 != 0) - { - multiPartData.Add(keyForId1, id1); - } - - if (id2.HasValue()) - { - multiPartData.Add(keyForId2, id2); - } - - // To delete existing import files... deleteExisting:true - // To start import... startImport:true - foreach (var str in moreData) - { - var data = str.Split(new string[] { ":" }, StringSplitOptions.RemoveEmptyEntries); - if (data.Length == 2) - { - multiPartData.Add(data[0], data[1]); - } - } - - apiConsumer.AddApiFileParameter(multiPartData, txtFile.Text, pictureId); } var webRequest = apiConsumer.StartRequest(context, cboContent.Text, multiPartData, out requestContent); @@ -166,7 +152,6 @@ private void CallTheApi() var result = apiConsumer.ProcessResponse(webRequest, response, folderBrowserDialog1); lblResponse.Text = "Response: " + response.Status; - sb.Append(response.Headers); if (result && response.Content.HasValue()) @@ -174,13 +159,10 @@ private void CallTheApi() if (radioJson.Checked && radioOdata.Checked) { var customers = response.TryParseCustomers(); - if (customers != null) { sb.AppendLine("Parsed {0} customer(s):".FormatInvariant(customers.Count)); - customers.ForEach(x => sb.AppendLine(x.ToString())); - sb.Append("\r\n"); } } @@ -193,6 +175,7 @@ private void CallTheApi() cboQuery.InsertRolled(cboQuery.Text, 64); cboContent.InsertRolled(cboContent.Text, 64); cboHeaders.InsertRolled(cboHeaders.Text, 64); + cboFileUpload.InsertRolled(cboFileUpload.Text, 64); } private void SavePathItems(bool odata) @@ -252,6 +235,11 @@ private void btnDeleteHeaders_Click(object sender, EventArgs e) cboHeaders.RemoveCurrent(); } + private void btnDeleteFileUpload_Click(object sender, EventArgs e) + { + cboFileUpload.RemoveCurrent(); + } + private void clear_Click(object sender, EventArgs e) { txtRequest.Clear(); @@ -277,27 +265,57 @@ private void api_Click(object sender, EventArgs e) private void radioApi_CheckedChanged(object sender, EventArgs e) { - var show = radioApi.Checked; - - lblFile.Visible = show; - txtFile.Visible = show; - btnFileOpen.Visible = show; - lblIdentifier1.Visible = show; - txtIdentfier1.Visible = show; - lblIdentfier2.Visible = show; - txtIdentfier2.Visible = show; - lblPictureId.Visible = show; - txtPictureId.Visible = show; - lblMoreData.Visible = show; - txtMoreData.Visible = show; + //var show = radioApi.Checked; } private void btnFileOpen_Click(object sender, EventArgs e) { var result = openFileDialog1.ShowDialog(); - if (result == DialogResult.OK) + if (result == DialogResult.OK && openFileDialog1.FileNames.Any()) { - txtFile.Text = string.Join(";", openFileDialog1.FileNames); + FileUploadModel model = null; + + // Deserialize current model. + if (cboFileUpload.Text.HasValue()) + { + try + { + model = JsonConvert.DeserializeObject(cboFileUpload.Text, typeof(FileUploadModel)) as FileUploadModel; + } + catch + { + cboFileUpload.RemoveCurrent(); + cboFileUpload.Text = string.Empty; + } + } + + if (model == null) + { + model = new FileUploadModel(); + } + + // Remove files that no longer exist. + for (var i = model.Files.Count - 1; i >= 0; --i) + { + if (!File.Exists(model.Files[i].Path)) + { + model.Files.RemoveAt(i); + } + } + + // Add new selected files. + foreach (var fileName in openFileDialog1.FileNames) + { + if (!model.Files.Any(x => x.Path != null && x.Path == fileName)) + { + model.Files.Add(new FileUploadModel.FileModel + { + Path = fileName + }); + } + } + + cboFileUpload.Text = JsonConvert.SerializeObject(model); } } } diff --git a/src/Tools/SmartStore.WebApi.Client/Models/ApiFileParameter.cs b/src/Tools/SmartStore.WebApi.Client/Models/ApiFileParameter.cs new file mode 100644 index 0000000000..62330145e6 --- /dev/null +++ b/src/Tools/SmartStore.WebApi.Client/Models/ApiFileParameter.cs @@ -0,0 +1,31 @@ +using System.Collections.Specialized; + +namespace SmartStore.WebApi.Client.Models +{ + public class ApiFileParameter + { + public ApiFileParameter(byte[] data) + : this(data, null) + { + } + + public ApiFileParameter(byte[] data, string filename) + : this(data, filename, null) + { + } + + public ApiFileParameter(byte[] data, string filename, string contenttype) + { + Data = data; + FileName = filename; + ContentType = contenttype; + Parameters = new NameValueCollection(); + } + + public byte[] Data { get; set; } + public string FileName { get; set; } + public string ContentType { get; set; } + + public NameValueCollection Parameters { get; set; } + } +} diff --git a/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs b/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs new file mode 100644 index 0000000000..b9687d2aa0 --- /dev/null +++ b/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; + +namespace SmartStore.WebApi.Client.Models +{ + /// + /// Represents file upload data to be used for multipart form data. + /// + [Serializable] + public class FileUploadModel + { + public FileUploadModel() + { + Files = new List(); + CustomProperties = new Dictionary(); + } + + /// + /// Entity identifier to which the files belong. + /// + public int Id { get; set; } + + /// + /// Paths of files to upload. + /// + public List Files { get; set; } + + /// + /// Any custom properties to be added to multipart form data. Examples: + /// Identify product by SKU: Sku = "my SKU" + /// Delete existing import files: deleteExisting = true + /// Start import: startImport = true + /// + public Dictionary CustomProperties { get; set; } + + [Serializable] + public class FileModel + { + /// + /// File identifier for updating files. + /// + public int Id { get; set; } + + /// + /// Absolute path. + /// + public string Path { get; set; } + } + } +} diff --git a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs index c5726367ac..a740166ce4 100644 --- a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs +++ b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs @@ -130,5 +130,17 @@ public string ApiHeaders { this["ApiHeaders"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string FileUpload { + get { + return ((string)(this["FileUpload"])); + } + set { + this["FileUpload"] = value; + } + } } } diff --git a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings index 07f315c125..f26a998da7 100644 --- a/src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings +++ b/src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings @@ -29,5 +29,8 @@ + + + \ No newline at end of file diff --git a/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj b/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj index 4e20cc2a42..6e1ea3d8bd 100644 --- a/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj +++ b/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.csproj @@ -77,6 +77,8 @@ + + diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs index 662ef9aa31..ff72c89093 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Collections.Specialized; using System.IO; using System.Linq; using System.Net; @@ -8,10 +7,11 @@ using System.Web; using System.Windows.Forms; using Newtonsoft.Json.Linq; +using SmartStore.WebApi.Client.Models; namespace SmartStore.WebApi.Client { - public class ApiConsumer : HmacAuthentication + public class ApiConsumer : HmacAuthentication { public static string XmlAcceptType => "application/atom+xml,application/xml"; public static string JsonAcceptType => "application/json"; @@ -90,7 +90,9 @@ private byte[] GetMultipartFormData(Dictionary postParameters, s private void GetResponse(HttpWebResponse webResponse, WebApiConsumerResponse response, FolderBrowserDialog folderBrowserDialog) { if (webResponse == null) + { return; + } response.Status = string.Format("{0} {1}", (int)webResponse.StatusCode, webResponse.StatusDescription); response.Headers = webResponse.Headers.ToString(); @@ -132,43 +134,109 @@ private void GetResponse(HttpWebResponse webResponse, WebApiConsumerResponse res public static bool BodySupported(string method) { if (!string.IsNullOrWhiteSpace(method) && string.Compare(method, "GET", true) != 0 && string.Compare(method, "DELETE", true) != 0) + { return true; + } return false; } - public void AddApiFileParameter(Dictionary multipartData, string filePath, int pictureId) + public Dictionary CreateMultipartData(FileUploadModel model) { + if (!(model?.Files?.Any() ?? false)) + { + return null; + } + + var result = new Dictionary(); + var isValid = false; var count = 0; - var paths = (filePath.Contains(";") ? filePath.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries).ToList() : new List { filePath }); - foreach (var path in paths) + // Identify entity by its identifier. + if (model.Id != 0) { - using (var fstream = new FileStream(path, FileMode.Open, FileAccess.Read)) - { - byte[] data = new byte[fstream.Length]; - fstream.Read(data, 0, data.Length); + result.Add("Id", model.Id); + } - var name = Path.GetFileName(path); - var id = string.Format("my-file-{0}", ++count); - var apiFile = new ApiFileParameter(data, name, MimeMapping.GetMimeMapping(name)); + // Custom properties like SKU etc. + foreach (var kvp in model.CustomProperties) + { + if (kvp.Key.HasValue() && kvp.Value != null) + { + result.Add(kvp.Key, kvp.Value); + } + } - if (pictureId != 0) + // File data. + foreach (var file in model.Files) + { + if (File.Exists(file.Path)) + { + using (var fstream = new FileStream(file.Path, FileMode.Open, FileAccess.Read)) { - apiFile.Parameters.Add("PictureId", pictureId.ToString()); - } + byte[] data = new byte[fstream.Length]; + fstream.Read(data, 0, data.Length); - // test pass through of custom parameters - apiFile.Parameters.Add("CustomValue1", string.Format("{0:N}", Guid.NewGuid())); - apiFile.Parameters.Add("CustomValue2", string.Format("say hello to {0}", id)); + var name = Path.GetFileName(file.Path); + var id = string.Format("my-file-{0}", ++count); + var apiFile = new ApiFileParameter(data, name, MimeMapping.GetMimeMapping(name)); - multipartData.Add(id, apiFile); + if (file.Id != 0) + { + apiFile.Parameters.Add("PictureId", file.Id.ToString()); + } + + // Test pass through of custom parameters but the API ignores them anyway. + //apiFile.Parameters.Add("CustomValue1", string.Format("{0:N}", Guid.NewGuid())); + //apiFile.Parameters.Add("CustomValue2", string.Format("say hello to {0}", id)); - fstream.Close(); + result.Add(id, apiFile); + isValid = true; + fstream.Close(); + } } } + + if (!isValid) + { + return null; + } + + return result; } + //public void AddApiFileParameter(Dictionary multipartData, string filePath, int pictureId) + //{ + // var count = 0; + // var paths = filePath.Contains(";") ? filePath.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries).ToList() : new List { filePath }; + + // foreach (var path in paths) + // { + // using (var fstream = new FileStream(path, FileMode.Open, FileAccess.Read)) + // { + // byte[] data = new byte[fstream.Length]; + // fstream.Read(data, 0, data.Length); + + // var name = Path.GetFileName(path); + // var id = string.Format("my-file-{0}", ++count); + // var apiFile = new ApiFileParameter(data, name, MimeMapping.GetMimeMapping(name)); + + // if (pictureId != 0) + // { + // apiFile.Parameters.Add("PictureId", pictureId.ToString()); + // } + + // // Test pass through of custom parameters + // apiFile.Parameters.Add("CustomValue1", string.Format("{0:N}", Guid.NewGuid())); + // apiFile.Parameters.Add("CustomValue2", string.Format("say hello to {0}", id)); + + // multipartData.Add(id, apiFile); + + // fstream.Close(); + // } + // } + //} + public HttpWebRequest StartRequest(WebApiRequestContext context, string content, Dictionary multipartData, out StringBuilder requestContent) { requestContent = new StringBuilder(); @@ -278,16 +346,16 @@ public bool ProcessResponse(HttpWebRequest webRequest, WebApiConsumerResponse re webResponse = webRequest.GetResponse() as HttpWebResponse; GetResponse(webResponse, response, folderBrowserDialog); } - catch (WebException wexc) + catch (WebException wex) { result = false; - webResponse = wexc.Response as HttpWebResponse; + webResponse = wex.Response as HttpWebResponse; GetResponse(webResponse, response, folderBrowserDialog); } - catch (Exception exc) + catch (Exception ex) { result = false; - response.Content = string.Format("{0}\r\n{1}", exc.Message, exc.StackTrace); + response.Content = string.Format("{0}\r\n{1}", ex.Message, ex.StackTrace); } finally { @@ -300,30 +368,4 @@ public bool ProcessResponse(HttpWebRequest webRequest, WebApiConsumerResponse re return result; } } - - - public class ApiFileParameter - { - public ApiFileParameter(byte[] data) - : this(data, null) - { - } - public ApiFileParameter(byte[] data, string filename) - : this(data, filename, null) - { - } - public ApiFileParameter(byte[] data, string filename, string contenttype) - { - Data = data; - FileName = filename; - ContentType = contenttype; - Parameters = new NameValueCollection(); - } - - public byte[] Data { get; set; } - public string FileName { get; set; } - public string ContentType { get; set; } - - public NameValueCollection Parameters { get; set; } - } } From 488eb1f8eae3e382eeecf05ad65e144e0a09037e Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Wed, 26 Aug 2020 22:39:11 +0200 Subject: [PATCH 098/695] (cm) > some fix michael applied --- src/Libraries/SmartStore.Services/Customers/CookieManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs index f27b0b3a0d..1c15132474 100644 --- a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs +++ b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs @@ -80,7 +80,7 @@ public virtual List GetAllCookieInfos(bool addSettingCookies = false } // Add user defined cookies from privacy settings. - if (addSettingCookies) + if (addSettingCookies && _privacySettings.CookieInfos.HasValue()) { var ciList = JsonConvert.DeserializeObject>(_privacySettings.CookieInfos); From e6a96f219fa5f44f994998a66086a4c60619ed2c Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Wed, 26 Aug 2020 22:40:56 +0200 Subject: [PATCH 099/695] renamed > masonry grid --- .../SmartStore.Web/Scripts/smartstore.jquery.utils.js | 4 ++-- .../SmartStore.Web/Themes/Flex/Content/_misc.scss | 4 ++-- src/Presentation/SmartStore.Web/Views/Blog/List.cshtml | 2 +- .../SmartStore.Web/Views/Blog/Partials/BlogSummary.cshtml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.jquery.utils.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.jquery.utils.js index 98b22b6f53..6a82f47257 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.jquery.utils.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.jquery.utils.js @@ -293,7 +293,7 @@ }, // Element must be decorated with visibilty:hidden - masonaryGrid: function (itemSelector, callback) { + masonryGrid: function (itemSelector, callback) { return this.each(function () { @@ -307,7 +307,7 @@ return false; } - self.addClass("masonary-grid"); + self.addClass("masonry-grid"); // first call so aos can be initialized correctly resizeAllGridItems(); diff --git a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss index 5683632c60..a028006315 100644 --- a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss +++ b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss @@ -207,8 +207,8 @@ .pd-section-top:hover .btn-admin-edit { display: inline-block; } -// masonary grid -.masonary-grid { +// masonry grid +.masonry-grid { display: grid; grid-gap: $list-group-item-padding-x; grid-template-columns: repeat(auto-fill, minmax(330px,1fr)); diff --git a/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml b/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml index 7187389dbc..9e02875552 100644 --- a/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml @@ -90,6 +90,6 @@ \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Blog/Partials/BlogSummary.cshtml b/src/Presentation/SmartStore.Web/Views/Blog/Partials/BlogSummary.cshtml index 80aede1c29..8925dd3d0d 100644 --- a/src/Presentation/SmartStore.Web/Views/Blog/Partials/BlogSummary.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Blog/Partials/BlogSummary.cshtml @@ -20,6 +20,6 @@ \ No newline at end of file From 1ed5cf9d9e94433a5df362f539bbc904528aba28 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 26 Aug 2020 23:12:06 +0200 Subject: [PATCH 100/695] Removed Microsoft.Net.Compilers package --- SmartStoreNET.Tasks.Targets | 2 +- .../SmartStore.Services/Media/Imaging/IImageTransformer.cs | 4 ---- .../SmartStore.AmazonPay/SmartStore.AmazonPay.csproj | 6 ------ src/Plugins/SmartStore.AmazonPay/packages.config | 1 - src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj | 6 ------ src/Plugins/SmartStore.PayPal/packages.config | 1 - src/Presentation/SmartStore.Web/SmartStore.Web.csproj | 2 -- src/Presentation/SmartStore.Web/packages.config | 1 - 8 files changed, 1 insertion(+), 22 deletions(-) diff --git a/SmartStoreNET.Tasks.Targets b/SmartStoreNET.Tasks.Targets index 941c3d4189..9b9ef73803 100644 --- a/SmartStoreNET.Tasks.Targets +++ b/SmartStoreNET.Tasks.Targets @@ -103,7 +103,7 @@ - + diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs index f17b721270..7fc73cc6d5 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageTransformer.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace SmartStore.Services.Media.Imaging { diff --git a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj index 2054dd0bf7..b253eaa0aa 100644 --- a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj +++ b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj @@ -305,12 +305,6 @@ - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - diff --git a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj index b253eaa0aa..aa30c693c3 100644 --- a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj +++ b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj @@ -97,8 +97,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.AmazonPay/packages.config b/src/Plugins/SmartStore.AmazonPay/packages.config index aaeadf40c2..36f4b6da90 100644 --- a/src/Plugins/SmartStore.AmazonPay/packages.config +++ b/src/Plugins/SmartStore.AmazonPay/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/Plugins/SmartStore.AmazonPay/web.config b/src/Plugins/SmartStore.AmazonPay/web.config index a6a989fbf9..a67360ca42 100644 --- a/src/Plugins/SmartStore.AmazonPay/web.config +++ b/src/Plugins/SmartStore.AmazonPay/web.config @@ -164,7 +164,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj index 01628968ed..6913511e9e 100644 --- a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj +++ b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj @@ -85,8 +85,8 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.Clickatell/packages.config b/src/Plugins/SmartStore.Clickatell/packages.config index dfe5e2740a..362bbd54e5 100644 --- a/src/Plugins/SmartStore.Clickatell/packages.config +++ b/src/Plugins/SmartStore.Clickatell/packages.config @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Clickatell/web.config b/src/Plugins/SmartStore.Clickatell/web.config index 680acd42a7..c358eb4210 100644 --- a/src/Plugins/SmartStore.Clickatell/web.config +++ b/src/Plugins/SmartStore.Clickatell/web.config @@ -149,7 +149,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj index 153a7575e3..190529f713 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -105,7 +105,7 @@ False - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.DevTools/Web.config b/src/Plugins/SmartStore.DevTools/Web.config index 8e4b28cf47..d4ffe1d137 100644 --- a/src/Plugins/SmartStore.DevTools/Web.config +++ b/src/Plugins/SmartStore.DevTools/Web.config @@ -157,7 +157,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.DevTools/packages.config b/src/Plugins/SmartStore.DevTools/packages.config index 218e690d73..998dcf1fa2 100644 --- a/src/Plugins/SmartStore.DevTools/packages.config +++ b/src/Plugins/SmartStore.DevTools/packages.config @@ -9,7 +9,7 @@ - + diff --git a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj index bc92ae73f0..448e1d634b 100644 --- a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj +++ b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj @@ -127,8 +127,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.FacebookAuth/packages.config b/src/Plugins/SmartStore.FacebookAuth/packages.config index 1ec5c2fa2b..21c1f8b47a 100644 --- a/src/Plugins/SmartStore.FacebookAuth/packages.config +++ b/src/Plugins/SmartStore.FacebookAuth/packages.config @@ -14,7 +14,7 @@ - + diff --git a/src/Plugins/SmartStore.FacebookAuth/web.config b/src/Plugins/SmartStore.FacebookAuth/web.config index 8707925158..0ed041f3f2 100644 --- a/src/Plugins/SmartStore.FacebookAuth/web.config +++ b/src/Plugins/SmartStore.FacebookAuth/web.config @@ -157,7 +157,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj index bc12815ad2..a0a1733bec 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj +++ b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj @@ -85,8 +85,8 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.GoogleAnalytics/packages.config b/src/Plugins/SmartStore.GoogleAnalytics/packages.config index d1411e05a4..bba317dcf9 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/packages.config +++ b/src/Plugins/SmartStore.GoogleAnalytics/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.GoogleAnalytics/web.config b/src/Plugins/SmartStore.GoogleAnalytics/web.config index 4553edefdf..ad8c315e74 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/web.config +++ b/src/Plugins/SmartStore.GoogleAnalytics/web.config @@ -148,7 +148,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj index 4bc8d5c1f7..8514c5e9eb 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj @@ -109,8 +109,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config b/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config index ba0f4f340a..3f0f2b5e17 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config index 612bf5c6d6..02d6ce1797 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/web.config +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/web.config @@ -141,7 +141,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj index cd1359771c..752242a26f 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -97,8 +97,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.OfflinePayment/packages.config b/src/Plugins/SmartStore.OfflinePayment/packages.config index 9fb815616a..d772d4d4ca 100644 --- a/src/Plugins/SmartStore.OfflinePayment/packages.config +++ b/src/Plugins/SmartStore.OfflinePayment/packages.config @@ -6,7 +6,7 @@ - + diff --git a/src/Plugins/SmartStore.OfflinePayment/web.config b/src/Plugins/SmartStore.OfflinePayment/web.config index 680acd42a7..c358eb4210 100644 --- a/src/Plugins/SmartStore.OfflinePayment/web.config +++ b/src/Plugins/SmartStore.OfflinePayment/web.config @@ -149,7 +149,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj index 400da35244..77e2a326c7 100644 --- a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj +++ b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj @@ -75,8 +75,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.PayPal/packages.config b/src/Plugins/SmartStore.PayPal/packages.config index 624e6ba760..30f8bdedcb 100644 --- a/src/Plugins/SmartStore.PayPal/packages.config +++ b/src/Plugins/SmartStore.PayPal/packages.config @@ -7,7 +7,7 @@ - + diff --git a/src/Plugins/SmartStore.PayPal/web.config b/src/Plugins/SmartStore.PayPal/web.config index 4d2ad21466..53359f962e 100644 --- a/src/Plugins/SmartStore.PayPal/web.config +++ b/src/Plugins/SmartStore.PayPal/web.config @@ -177,7 +177,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj index 1ac5ed4f85..cb03b8a070 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -105,8 +105,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.Shipping/packages.config b/src/Plugins/SmartStore.Shipping/packages.config index 3f60621a73..4925ad3780 100644 --- a/src/Plugins/SmartStore.Shipping/packages.config +++ b/src/Plugins/SmartStore.Shipping/packages.config @@ -7,7 +7,7 @@ - + diff --git a/src/Plugins/SmartStore.Shipping/web.config b/src/Plugins/SmartStore.Shipping/web.config index 4553edefdf..ad8c315e74 100644 --- a/src/Plugins/SmartStore.Shipping/web.config +++ b/src/Plugins/SmartStore.Shipping/web.config @@ -148,7 +148,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj index 7e250cd045..6a33f327f7 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj +++ b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj @@ -105,8 +105,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.ShippingByWeight/packages.config b/src/Plugins/SmartStore.ShippingByWeight/packages.config index 3f60621a73..4925ad3780 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/packages.config +++ b/src/Plugins/SmartStore.ShippingByWeight/packages.config @@ -7,7 +7,7 @@ - + diff --git a/src/Plugins/SmartStore.ShippingByWeight/web.config b/src/Plugins/SmartStore.ShippingByWeight/web.config index 4553edefdf..ad8c315e74 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/web.config +++ b/src/Plugins/SmartStore.ShippingByWeight/web.config @@ -148,7 +148,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj index 8e700adbe5..2c92dd3e14 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -101,8 +101,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.Tax/packages.config b/src/Plugins/SmartStore.Tax/packages.config index 67dcff123b..cc3488e5d3 100644 --- a/src/Plugins/SmartStore.Tax/packages.config +++ b/src/Plugins/SmartStore.Tax/packages.config @@ -6,7 +6,7 @@ - + diff --git a/src/Plugins/SmartStore.Tax/web.config b/src/Plugins/SmartStore.Tax/web.config index 680acd42a7..c358eb4210 100644 --- a/src/Plugins/SmartStore.Tax/web.config +++ b/src/Plugins/SmartStore.Tax/web.config @@ -149,7 +149,7 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index c7acca052e..aa138bcb9a 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -107,8 +107,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll False - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Plugins/SmartStore.WebApi/packages.config b/src/Plugins/SmartStore.WebApi/packages.config index f112790950..6c3a76e7b1 100644 --- a/src/Plugins/SmartStore.WebApi/packages.config +++ b/src/Plugins/SmartStore.WebApi/packages.config @@ -14,7 +14,7 @@ - + diff --git a/src/Plugins/SmartStore.WebApi/web.config b/src/Plugins/SmartStore.WebApi/web.config index 4da7697a52..2aebbf6199 100644 --- a/src/Plugins/SmartStore.WebApi/web.config +++ b/src/Plugins/SmartStore.WebApi/web.config @@ -121,7 +121,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index 9baca49bd4..cd6899cfdb 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -86,9 +86,9 @@ ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - + False - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll False diff --git a/src/Presentation/SmartStore.Web/Administration/Web.config b/src/Presentation/SmartStore.Web/Administration/Web.config index dc2d6af869..b634d0613d 100644 --- a/src/Presentation/SmartStore.Web/Administration/Web.config +++ b/src/Presentation/SmartStore.Web/Administration/Web.config @@ -141,7 +141,7 @@ - + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/packages.config b/src/Presentation/SmartStore.Web/Administration/packages.config index 185c22d86f..a33883a142 100644 --- a/src/Presentation/SmartStore.Web/Administration/packages.config +++ b/src/Presentation/SmartStore.Web/Administration/packages.config @@ -13,7 +13,7 @@ - + diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index 99933b61b0..330befad3a 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -1,5 +1,6 @@  + @@ -141,8 +142,8 @@ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll @@ -2082,7 +2083,7 @@ $(ProjectDir)bin\roslyn\ - + @@ -2095,7 +2096,7 @@ - + @@ -2103,7 +2104,7 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index 11ba51c4bd..a32342b917 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -448,7 +448,7 @@ - + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/packages.config b/src/Presentation/SmartStore.Web/packages.config index f399eb5c8b..2137c83469 100644 --- a/src/Presentation/SmartStore.Web/packages.config +++ b/src/Presentation/SmartStore.Web/packages.config @@ -28,7 +28,7 @@ - + diff --git a/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj b/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj index 46ac88b8ca..72413d3900 100644 --- a/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj +++ b/src/Tests/SmartStore.Services.Tests/SmartStore.Services.Tests.csproj @@ -1,7 +1,6 @@  - Debug AnyCPU From 8d8bc4972f34f6aed4f809ccda819a7f0e356bb9 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 27 Aug 2020 04:30:27 +0200 Subject: [PATCH 103/695] Stack-like behaviour for BeginContextAwareLifetimeScope() --- .../DefaultLifetimeScopeAccessor.cs | 37 +++++++++++++++---- .../Media/Imaging/Impl/IPImage.cs | 4 -- .../Media/Imaging/Impl/IPImageFormat.cs | 24 ------------ .../Media/Imaging/ProcessImageQuery.cs | 1 - .../Media/Imaging/ProcessImageResult.cs | 5 --- 5 files changed, 29 insertions(+), 42 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs index 8f8156e815..19d9c05d8d 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs @@ -2,16 +2,28 @@ using System.Diagnostics; using System.Web; using Autofac; -using Autofac.Core.Lifetime; -using SmartStore.Core.Data; -using SmartStore.Core.Logging; using SmartStore.Utilities; namespace SmartStore.Core.Infrastructure.DependencyManagement { public class DefaultLifetimeScopeAccessor : ILifetimeScopeAccessor { - private ContextState _state; + class ContextAwareScope : IDisposable + { + private readonly Action _disposer; + + public ContextAwareScope(Action disposer) + { + _disposer = disposer; + } + + public void Dispose() + { + _disposer?.Invoke(); + } + } + + private ContextState _state; private readonly ILifetimeScope _rootContainer; internal static readonly object ScopeTag = "AutofacWebRequest"; @@ -32,11 +44,20 @@ public ILifetimeScope ApplicationContainer public IDisposable BeginContextAwareScope() { - var disposer = HttpContext.Current != null - ? ActionDisposable.Empty - : new ActionDisposable(() => this.EndLifetimeScope()); + if (HttpContext.Current != null) + { + return ActionDisposable.Empty; + } + else + { + Action disposer = null; + if (_state.GetState() == null) + { + disposer = this.EndLifetimeScope; + } - return disposer; + return new ContextAwareScope(disposer); + } } public void EndLifetimeScope() diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs index 23cacd4ff5..4eef7f194d 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using ImageProcessor; namespace SmartStore.Services.Media.Imaging.Impl diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs index a83ffb689b..49bee15de5 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs @@ -1,9 +1,5 @@ using ImageProcessor.Imaging.Formats; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace SmartStore.Services.Media.Imaging.Impl { @@ -31,25 +27,5 @@ public ISupportedImageFormat WrappedFormat public IEnumerable FileExtensions => _format.FileExtensions; public IEnumerable MimeTypes => new[] { _format.MimeType }; - - //public override bool Equals(object obj) - //{ - // if (!(obj is IImageFormat format)) - // { - // return false; - // } - - // return this.DefaultMimeType.Equals(format.DefaultMimeType); - //} - - //public override int GetHashCode() - //{ - // unchecked - // { - // int hashCode = this.DefaultMimeType.GetHashCode(); - // hashCode = (hashCode * 397) ^ this.IsIndexed.GetHashCode(); - // return (hashCode * 397) ^ this.Quality; - // } - //} } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs index 550517044e..feadbc62b4 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Collections.Specialized; -using System.Text; using SmartStore.Collections; using System.Drawing; using ImageProcessor.Imaging.Formats; diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs index 0491cbef7d..02f7a54a5d 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs @@ -11,11 +11,6 @@ public class ProcessImageResult : DisposableObject public IImage Image { get; set; } internal bool DisposeImage { get; set; } - //public string FileExtension { get; set; } - //public string MimeType { get; set; } - //public int Width { get; set; } - //public int Height { get; set; } - /// /// Is true if any effect has been applied that changed the image visually (like background color, contrast, sharpness etc.). /// Resize and compression quality does NOT count as FX. From 9177d5a5de9789b78454062dd4268af60e7a9a50 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Thu, 27 Aug 2020 12:53:15 +0200 Subject: [PATCH 104/695] Added option for SameSite mode --- .../Domain/Customers/PrivacySettings.cs | 6 ++ .../Domain/Customers/SameSiteType.cs | 28 +++++++++ .../SmartStore.Core/SmartStore.Core.csproj | 1 + .../Migrations/MigrationsConfiguration.cs | 39 ++++++++++++ .../FormsAuthenticationService.cs | 15 +++-- .../Catalog/CompareProductsService.cs | 13 +++- .../Catalog/RecentlyViewedProductsService.cs | 9 ++- .../Customers/CookieManager.cs | 3 +- .../Extensions/HttpExtensions.cs | 11 +++- .../Security/SameSiteSupport.cs | 63 +++++++++++++++++++ .../SmartStore.Web.Framework.csproj | 1 + .../SmartUrlRoutingModule.cs | 25 ++++++++ .../WebWorkContext.cs | 12 ++-- .../Settings/CustomerUserSettingsModel.cs | 5 ++ .../Views/Setting/CustomerUser.cshtml | 19 ++++++ .../InstallationLocalizationService.cs | 3 +- 16 files changed, 237 insertions(+), 16 deletions(-) create mode 100644 src/Libraries/SmartStore.Core/Domain/Customers/SameSiteType.cs create mode 100644 src/Presentation/SmartStore.Web.Framework/Security/SameSiteSupport.cs diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs index 48eeaaf01f..6622b5cba2 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs @@ -1,5 +1,6 @@ using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Localization; +using System.Web; namespace SmartStore.Core.Domain.Customers { @@ -24,6 +25,11 @@ public PrivacySettings() /// public bool ModalCookieConsent { get; set; } + /// + /// Defines the global SameSiteMode for cookies. + /// + public SameSiteType SameSiteMode { get; set; } + /// /// Gets or sets a value indicating whether to store last IP address for each customer /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/SameSiteType.cs b/src/Libraries/SmartStore.Core/Domain/Customers/SameSiteType.cs new file mode 100644 index 0000000000..de98665704 --- /dev/null +++ b/src/Libraries/SmartStore.Core/Domain/Customers/SameSiteType.cs @@ -0,0 +1,28 @@ +namespace SmartStore.Core.Domain.Customers +{ + /// + /// Represents the SameSiteMode for Cookies + /// + public enum SameSiteType + { + /// + /// No SameSite header should be included on requests. + /// + Unspecified = -1, + + /// + /// No mode specified. This setting must be used if the shop runs also in an iframe (SSL must be configured correctly for this). + /// + None = 0, + + /// + /// Cookies are sent with requests on the same website and with cross-site navigation at the highest level. + /// + Lax = 1, + + /// + /// If the value is "Strict" or invalid, cookies will only be sent to requests on the same website. + /// + Strict = 2 + } +} diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index a91bf691a6..76be3e8816 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -227,6 +227,7 @@ + diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 7986327fec..5c06cb5ae1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -230,6 +230,45 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Specifies the usage type of the cookie (Required, Analytics, ThirdParty).", "Bestimmt die Verwendungsart des Cookies (Required, Analytics, ThirdParty)."); + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.SameSiteMode", + "'SameSite' mode", + "'SameSite' Modus"); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.SameSiteMode.AdminInstruction", + @"
SameSite Mode
+

+ The SameSite setting for cookies specifies the level of security for cookies when they are requested by other sites (e.g. in a cross-site request or in an iframe). + The recommended setting is Lax, as cookies are sent with most secure actions. +
+ If the store should also run in an iframe, it is necessary to select the setting None. Additionally SSL must be set up in the store. +

+
    +
  • Unspecified: No SameSite header is transmitted to requests.
    • +
  • None: No mode specified. This setting must be used if the store should also run in an iframe (SSL must be set up).
    • +
  • Lax: Recommended setting. Cookies are sent at the highest level for requests on the same website and for cross-site requests.
    • +
  • Strict: Cookies are only sent to requests from the same website.
    • +
", + @"
SameSite Modus
+

+ Die SameSite-Einstellung für Cookies bestimmt, das Sicherheitslevel für Cookies, wenn diese von anderen Seiten (z.B. in einem Cross-Site-Request oder in einem Iframe) aufgerufen werden. + Die empfohlene Einstellung ist Lax, da hier Cookies bei den meisten gesicherten Aktionen mitgesendet werden. +
+ Soll der Shop auch in einem Iframe laufen, ist es notwendig die Einstellung None zu wählen. Zusätzlich muss SSL im Shop eingerichtet sein. +

+
    +
  • Unspecified: Es wird kein SameSite-Header an Requests übermittelt.
    • +
  • None: Kein Modus angegeben. Diese Einstellung muss verwendet werden, wenn der Shop auch in einem Iframe laufen soll (SSL muss eingerichtet sein).
    • +
  • Lax: Empfohlene Einstellung. Cookies werden bei Anfragen auf derselben Website und bei Cross-Site-Requests auf höchster Ebene gesendet.
    • +
  • Strict: Cookies werden nur an Anfragen derselben Website gesendet.
    • +
"); + + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.ModalCookieConsent", + "Modal Cookie Manager", + "Cookie-Manager modal anzeigen", + "Specifies whether the Cookie Manager is displayed in a modal dialog in the frontend.", + "Bestimmt, ob der Cookie-Manager im Frontend in einem modalen Dialog angezeigt wird."); + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.IsPluginInfo", "System cookie", "System-Cookie"); diff --git a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs index ca39006dfe..97e81a5d52 100644 --- a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs +++ b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs @@ -12,15 +12,21 @@ public partial class FormsAuthenticationService : IAuthenticationService private readonly HttpContextBase _httpContext; private readonly ICustomerService _customerService; private readonly CustomerSettings _customerSettings; + private readonly PrivacySettings _privacySettings; private readonly TimeSpan _expirationTimeSpan; private Customer _cachedCustomer; - public FormsAuthenticationService(HttpContextBase httpContext, ICustomerService customerService, CustomerSettings customerSettings) + public FormsAuthenticationService( + HttpContextBase httpContext, + ICustomerService customerService, + CustomerSettings customerSettings, + PrivacySettings privacySettings) { _httpContext = httpContext; _customerService = customerService; _customerSettings = customerSettings; + _privacySettings = privacySettings; _expirationTimeSpan = FormsAuthentication.Timeout; } @@ -45,8 +51,9 @@ public virtual void SignIn(Customer customer, bool createPersistentCookie) { HttpOnly = true, Secure = FormsAuthentication.RequireSSL, - Path = FormsAuthentication.FormsCookiePath - }; + Path = FormsAuthentication.FormsCookiePath, + SameSite = FormsAuthentication.RequireSSL ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax + }; if (ticket.IsPersistent) { @@ -101,7 +108,7 @@ public virtual Customer GetAuthenticatedCustomerFromTicket(FormsAuthenticationTi var usernameOrEmail = ticket.UserData; - if (string.IsNullOrWhiteSpace(usernameOrEmail)) + if (!usernameOrEmail.HasValue()) return null; Customer customer = null; diff --git a/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs b/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs index c467218a6d..cbb1658d07 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Web; using SmartStore.Core.Domain.Catalog; +using SmartStore.Core.Domain.Customers; using SmartStore.Services.Search; namespace SmartStore.Services.Catalog @@ -17,15 +18,18 @@ public partial class CompareProductsService : ICompareProductsService private readonly HttpContextBase _httpContext; private readonly IProductService _productService; private readonly ICatalogSearchService _catalogSearchService; + private readonly PrivacySettings _privacySettings; - public CompareProductsService( - HttpContextBase httpContext, + public CompareProductsService( + HttpContextBase httpContext, IProductService productService, - ICatalogSearchService catalogSearchService) + ICatalogSearchService catalogSearchService, + PrivacySettings privacySettings) { _httpContext = httpContext; _productService = productService; _catalogSearchService = catalogSearchService; + _privacySettings = privacySettings; } #region Utilities @@ -68,6 +72,7 @@ public virtual void ClearCompareProducts() compareCookie.Expires = DateTime.Now.AddYears(-1); compareCookie.HttpOnly = true; compareCookie.Secure = _httpContext.Request.IsHttps(); + compareCookie.SameSite = _httpContext.Request.IsHttps() ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax; _httpContext.Response.Cookies.Set(compareCookie); } @@ -127,6 +132,7 @@ public virtual void RemoveProductFromCompareList(int productId) compareCookie.Expires = DateTime.Now.AddDays(10.0); compareCookie.HttpOnly = true; compareCookie.Secure = _httpContext.Request.IsHttps(); + compareCookie.SameSite = _httpContext.Request.IsHttps() ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax; _httpContext.Response.Cookies.Set(compareCookie); } @@ -163,6 +169,7 @@ public virtual void AddProductToCompareList(int productId) compareCookie.Expires = DateTime.Now.AddDays(10.0); compareCookie.HttpOnly = true; compareCookie.Secure = _httpContext.Request.IsHttps(); + compareCookie.SameSite = _httpContext.Request.IsHttps() ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax; _httpContext.Response.Cookies.Set(compareCookie); } diff --git a/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs b/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs index 23064626c7..5b2bf053ea 100644 --- a/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Web; using SmartStore.Core.Domain.Catalog; +using SmartStore.Core.Domain.Customers; using SmartStore.Services.Security; namespace SmartStore.Services.Catalog @@ -19,11 +20,12 @@ public partial class RecentlyViewedProductsService : IRecentlyViewedProductsServ private readonly IProductService _productService; private readonly IAclService _aclService; private readonly CatalogSettings _catalogSettings; + private readonly PrivacySettings _privacySettings; #endregion #region Ctor - + /// /// Ctor /// @@ -35,13 +37,15 @@ public RecentlyViewedProductsService( HttpContextBase httpContext, IProductService productService, IAclService aclService, - CatalogSettings catalogSettings) + CatalogSettings catalogSettings, + PrivacySettings privacySettings) { _services = services; _httpContext = httpContext; _productService = productService; _aclService = aclService; _catalogSettings = catalogSettings; + _privacySettings = privacySettings; } #endregion @@ -133,6 +137,7 @@ public virtual void AddProductToRecentlyViewedList(int productId) recentlyViewedCookie.Expires = DateTime.Now.AddDays(10.0); recentlyViewedCookie.HttpOnly = true; recentlyViewedCookie.Secure = _services.WebHelper.IsCurrentConnectionSecured(); + recentlyViewedCookie.SameSite = _services.WebHelper.IsCurrentConnectionSecured() ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax; _httpContext.Response.Cookies.Set(recentlyViewedCookie); } diff --git a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs index 1c15132474..03a91084e3 100644 --- a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs +++ b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs @@ -137,7 +137,8 @@ public virtual void SetConsentCookie(HttpResponseBase response, bool allowAnalyt // Store JSON serialized object which contains current allowed types (Analytics & ThirdParty) in cookie. Value = JsonConvert.SerializeObject(cookieData), Expires = DateTime.UtcNow + expiry, - Secure = _services.WebHelper.IsCurrentConnectionSecured() + Secure = _services.WebHelper.IsCurrentConnectionSecured(), + SameSite = _services.WebHelper.IsCurrentConnectionSecured() ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax }; response.Cookies.Set(consentCookie); diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs index a93566ec3b..870e5ce269 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs @@ -4,6 +4,8 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; +using SmartStore.Core.Domain.Customers; +using SmartStore.Core.Infrastructure; using SmartStore.Services.Orders; using SmartStore.Utilities; @@ -193,11 +195,13 @@ internal static void SetUserThemeChoiceInCookie(this HttpContextBase context, st return; } + var settings = EngineContext.Current.Resolve(); var cookie = context.Request.Cookies.Get("sm.UserThemeChoice") ?? new HttpCookie("sm.UserThemeChoice"); cookie.Value = value; cookie.Expires = DateTime.UtcNow.AddYears(1); cookie.HttpOnly = true; cookie.Secure = context.Request.IsHttps(); + cookie.SameSite = context.Request.IsHttps() ? (SameSiteMode)settings.SameSiteMode : SameSiteMode.Lax; context.Request.Cookies.Set(cookie); } @@ -209,7 +213,12 @@ internal static HttpCookie GetPreviewModeCookie(this HttpContextBase context, bo if (cookie == null && createIfMissing && httpRequest != null) { - cookie = new HttpCookie("sm.PreviewModeOverrides") { HttpOnly = true }; + var settings = EngineContext.Current.Resolve(); + cookie = new HttpCookie("sm.PreviewModeOverrides") { + HttpOnly = true, + Secure = context.Request.IsHttps(), + SameSite = context.Request.IsHttps() ? (SameSiteMode)settings.SameSiteMode : SameSiteMode.Lax + }; httpRequest.Cookies.Set(cookie); } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/SameSiteSupport.cs b/src/Presentation/SmartStore.Web.Framework/Security/SameSiteSupport.cs new file mode 100644 index 0000000000..238ee429e4 --- /dev/null +++ b/src/Presentation/SmartStore.Web.Framework/Security/SameSiteSupport.cs @@ -0,0 +1,63 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace SameSite +{ + public static class BrowserDetection + { + // Same as https://devblogs.microsoft.com/aspnet/upcoming-samesite-cookie-changes-in-asp-net-and-asp-net-core/ + public static bool DisallowsSameSiteNone(string userAgent) + { + if (string.IsNullOrEmpty(userAgent)) + { + return true; + } + + // Note that these detections are a starting point. See https://www.chromium.org/updates/same-site/incompatible-clients for more detections. + + // Cover all iOS based browsers here. This includes: + // - Safari on iOS 12 for iPhone, iPod Touch, iPad + // - WkWebview on iOS 12 for iPhone, iPod Touch, iPad + // - Chrome on iOS 12 for iPhone, iPod Touch, iPad + // All of which are broken by SameSite=None, because they use the iOS networking stack + if (userAgent.Contains("CPU iPhone OS 12") || userAgent.Contains("iPad; CPU OS 12")) + { + return true; + } + + // Cover Mac OS X based browsers that use the Mac OS networking stack. This includes: + // - Safari on Mac OS X. + // This does not include: + // - Chrome on Mac OS X + // Because they do not use the Mac OS networking stack. + if (userAgent.Contains("Macintosh; Intel Mac OS X 10_14") && + userAgent.Contains("Version/") && userAgent.Contains("Safari")) + { + return true; + } + + // Cover Chrome 50-69, because some versions are broken by SameSite=None, + // and none in this range require it. + // Note: this covers some pre-Chromium Edge versions, + // but pre-Chromium Edge does not require SameSite=None. + if (userAgent.Contains("Chrome/5") || userAgent.Contains("Chrome/6")) + { + return true; + } + + // Unreal Engine runs Chromium 59, but does not advertise as Chrome until 4.23. Treat versions of Unreal + // that don't specify their Chrome version as lacking support for SameSite=None. + if (userAgent.Contains("UnrealEngine") && !userAgent.Contains("Chrome")) + { + return true; + } + + return false; + } + + public static bool AllowsSameSiteNone(string userAgent) + { + return !DisallowsSameSiteNone(userAgent); + } + } +} \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index d1e31c9aa7..2842d0074d 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -247,6 +247,7 @@ + diff --git a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs index cc1d0ae197..d639b0205f 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs +++ b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs @@ -83,6 +83,8 @@ public void Init(HttpApplication application) { application.Context.Items[_contextKey] = _contextKey; + application.BeginRequest += (s, e) => FilterSameSiteNoneForIncompatibleUserAgents(application); + if (CommonHelper.IsDevEnvironment && HttpContext.Current.IsDebuggingEnabled) { // Handle plugin static file in DevMode @@ -217,6 +219,29 @@ public virtual void PostResolveRequestCache(HttpContextBase context) } } + public virtual void FilterSameSiteNoneForIncompatibleUserAgents(HttpApplication application) + { + if (application != null) + { + var userAgent = application.Context.Request.UserAgent; + if (SameSite.BrowserDetection.DisallowsSameSiteNone(userAgent)) + { + application.Response.AddOnSendingHeaders(context => + { + var cookies = context.Response.Cookies; + for (var i = 0; i < cookies.Count; i++) + { + var cookie = cookies[i]; + if (cookie.SameSite == SameSiteMode.None) + { + cookie.SameSite = (SameSiteMode)(-1); // Unspecified + } + } + }); + } + } + } + private bool IsExtensionPath(HttpRequestBase request) { var path = request.AppRelativeCurrentExecutionFilePath.ToLower(); diff --git a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs index 704cdc3376..0af2c05e9a 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs @@ -29,6 +29,7 @@ public partial class WebWorkContext : IWorkContext private readonly ICurrencyService _currencyService; private readonly IGenericAttributeService _attrService; private readonly TaxSettings _taxSettings; + private readonly PrivacySettings _privacySettings; private readonly LocalizationSettings _localizationSettings; private readonly ICacheManager _cacheManager; private readonly Lazy _taxService; @@ -54,6 +55,7 @@ public WebWorkContext( ICurrencyService currencyService, IGenericAttributeService attrService, TaxSettings taxSettings, + PrivacySettings privacySettings, LocalizationSettings localizationSettings, Lazy taxService, IUserAgent userAgent, @@ -70,7 +72,8 @@ public WebWorkContext( _attrService = attrService; _currencyService = currencyService; _taxSettings = taxSettings; - _taxService = taxService; + _privacySettings = privacySettings; + _taxService = taxService; _localizationSettings = localizationSettings; _userAgent = userAgent; _webHelper = webHelper; @@ -196,11 +199,12 @@ protected virtual Customer GetGuestCustomer() // Set visitor cookie if ( _httpContext?.Response != null) { - visitorCookie = new HttpCookie(VisitorCookieName) + visitorCookie = new HttpCookie(VisitorCookieName) { HttpOnly = true, - Secure = _httpContext.Request.IsHttps() - }; + Secure = _httpContext.Request.IsHttps(), + SameSite = _httpContext.Request.IsHttps() ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax + }; visitorCookie.Value = customer.CustomerGuid.ToString(); if (customer.CustomerGuid == Guid.Empty) diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs index 9b847f85ad..2269cb73a2 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Web; using System.Web.Mvc; using FluentValidation; using FluentValidation.Attributes; @@ -261,6 +262,7 @@ public PrivacySettingsModel() EnableCookieConsent = true; ModalCookieConsent = true; CookieInfos = new List(); + SameSiteMode = SameSiteType.Lax; } [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.EnableCookieConsent")] @@ -269,6 +271,9 @@ public PrivacySettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.ModalCookieConsent")] public bool ModalCookieConsent { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.SameSiteMode")] + public SameSiteType SameSiteMode { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.Privacy.StoreLastIpAddress")] public bool StoreLastIpAddress { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml index 876e23f124..d566b03ab9 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml @@ -802,6 +802,25 @@ @Html.ValidationMessageFor(model => model.PrivacySettings.ModalCookieConsent) + + + + + + + + } + + + + + + + + + + + + + + + + + + + + + + + +
+ @Html.SmartLabelFor(model => model.PrivacySettings.SameSiteMode) + + @Html.DropDownListForEnum(model => model.PrivacySettings.SameSiteMode) + @Html.ValidationMessageFor(model => model.PrivacySettings.SameSiteMode) +
+ +
+ + @T("Admin.Configuration.Settings.CustomerUser.Privacy.SameSiteMode.AdminInstruction") +
+
@Html.SmartLabelFor(model => model.PrivacySettings.StoreLastIpAddress) diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs index cf1aa1967e..b3ef24f937 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs @@ -96,11 +96,12 @@ private bool MatchLanguageByCurrentCulture(InstallationLanguage language) public virtual void SaveCurrentLanguage(string languageCode) { var httpContext = EngineContext.Current.Resolve(); - + var cookie = new HttpCookie(LanguageCookieName); cookie.HttpOnly = true; cookie.Value = languageCode; cookie.Expires = DateTime.Now.AddHours(24); + cookie.SameSite = SameSiteMode.Lax; httpContext.Response.Cookies.Remove(LanguageCookieName); httpContext.Response.Cookies.Add(cookie); From 3d61ead043138a6c0517116e66b6304a481e4de4 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 27 Aug 2020 13:10:41 +0200 Subject: [PATCH 105/695] Export: SEO file name should be exported without file extension --- .../DataExchange/Export/ExportXmlHelper.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs index 7165d88a1d..8fb29ce583 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs @@ -344,8 +344,11 @@ public void WritePicture(dynamic picture, string node) _writer.WriteStartElement(node); } + var seoName = (string)picture.Name; + seoName = Path.GetFileNameWithoutExtension(seoName.EmptyNull()); + _writer.Write("Id", entity.Id.ToString()); - _writer.Write("SeoFilename", (string)picture.Name); + _writer.Write("SeoFilename", seoName); _writer.Write("MimeType", (string)picture.MimeType); _writer.Write("ThumbImageUrl", (string)picture._ThumbImageUrl); _writer.Write("ImageUrl", (string)picture._ImageUrl); From 2f02efa13ba6c422ecfbdf72120b3adf2ec6d554 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Thu, 27 Aug 2020 14:43:45 +0200 Subject: [PATCH 106/695] Applied SameSite setting to AntiForgeryToken cookie --- .../SmartUrlRoutingModule.cs | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs index d639b0205f..7000646b84 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs +++ b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs @@ -15,6 +15,7 @@ using SmartStore.Core.Events; using SmartStore.Core.Data; using SmartStore.Collections; +using SmartStore.Core.Domain.Customers; namespace SmartStore.Web.Framework { @@ -194,6 +195,22 @@ public virtual void PreSendRequestHeaders(HttpContextBase context) context.Response.Cache.SetNoStore(); context.Response.Cache.SetLastModifiedFromFileDependencies(); } + + if (SameSite.BrowserDetection.AllowsSameSiteNone(context.Request.UserAgent)) + { + // Set SameSite attribute for antiforgery token. + var privacySettings = EngineContext.Current.Resolve(); + var antiForgeryCookie = context.Request.Cookies["__requestverificationtoken"]; + + if (antiForgeryCookie != null) + { + antiForgeryCookie.HttpOnly = true; + antiForgeryCookie.Secure = context.Request.IsHttps(); + antiForgeryCookie.SameSite = context.Request.IsHttps() ? (SameSiteMode)privacySettings.SameSiteMode : SameSiteMode.Lax; + + context.Response.Cookies.Set(antiForgeryCookie); + } + } } public virtual void PostResolveRequestCache(HttpContextBase context) @@ -223,8 +240,7 @@ public virtual void FilterSameSiteNoneForIncompatibleUserAgents(HttpApplication { if (application != null) { - var userAgent = application.Context.Request.UserAgent; - if (SameSite.BrowserDetection.DisallowsSameSiteNone(userAgent)) + if (SameSite.BrowserDetection.DisallowsSameSiteNone(application.Context.Request.UserAgent)) { application.Response.AddOnSendingHeaders(context => { From 27faa953b60473c4c849f25d83e04b5c643168d2 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Thu, 27 Aug 2020 15:45:47 +0200 Subject: [PATCH 107/695] CookieInfos should only be returned as long as the corresponding widget is active --- .../SmartStore.Services/Customers/CookieManager.cs | 4 +++- src/Plugins/SmartStore.AmazonPay/Plugin.cs | 14 +++++++++++++- .../GoogleAnalyticPlugin.cs | 13 ++++++++++++- .../SmartStore.GoogleAnalytics.csproj | 1 + 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs index 03a91084e3..485b1a5654 100644 --- a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs +++ b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs @@ -76,7 +76,9 @@ public virtual List GetAllCookieInfos(bool addSettingCookies = false foreach(var plugin in plugins) { var typedInstance = plugin as ICookiePublisher; - cookieInfos.Add(typedInstance.GetCookieInfo()); + var cookieInfo = typedInstance.GetCookieInfo(); + if (cookieInfo != null) + cookieInfos.Add(cookieInfo); } // Add user defined cookies from privacy settings. diff --git a/src/Plugins/SmartStore.AmazonPay/Plugin.cs b/src/Plugins/SmartStore.AmazonPay/Plugin.cs index ff643fed61..ff5eef6e8b 100644 --- a/src/Plugins/SmartStore.AmazonPay/Plugin.cs +++ b/src/Plugins/SmartStore.AmazonPay/Plugin.cs @@ -3,11 +3,13 @@ using System.Web.Routing; using SmartStore.AmazonPay.Controllers; using SmartStore.AmazonPay.Services; +using SmartStore.Core.Domain.Cms; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Logging; using SmartStore.Core.Plugins; using SmartStore.Services; using SmartStore.Services.Authentication.External; +using SmartStore.Services.Cms; using SmartStore.Services.Customers; using SmartStore.Services.Orders; using SmartStore.Services.Payments; @@ -24,17 +26,23 @@ public class AmazonPayPlugin : PaymentPluginBase, IExternalAuthenticationMethod, private readonly ICommonServices _services; private readonly IOrderTotalCalculationService _orderTotalCalculationService; private readonly IScheduleTaskService _scheduleTaskService; + private readonly IWidgetService _widgetService; + private readonly WidgetSettings _widgetSettings; public AmazonPayPlugin( IAmazonPayService apiService, ICommonServices services, IOrderTotalCalculationService orderTotalCalculationService, - IScheduleTaskService scheduleTaskService) + IScheduleTaskService scheduleTaskService, + IWidgetService widgetService, + WidgetSettings widgetSettings) { _apiService = apiService; _services = services; _orderTotalCalculationService = orderTotalCalculationService; _scheduleTaskService = scheduleTaskService; + _widgetService = widgetService; + _widgetSettings = widgetSettings; Logger = NullLogger.Instance; } @@ -52,6 +60,10 @@ public static string SystemName /// CookieInfo containing plugin name, cookie purpose description & cookie type public CookieInfo GetCookieInfo() { + var widget = _widgetService.LoadWidgetBySystemName("Widgets.AmazonPay"); + if (!widget.IsWidgetActive(_widgetSettings)) + return null; + var cookieInfo = new CookieInfo { Name = _services.Localization.GetResource("Plugins.FriendlyName.Widgets.AmazonPay"), diff --git a/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs b/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs index 8d8d66817a..28822d099a 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs +++ b/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Web.Routing; +using SmartStore.Core.Domain.Cms; using SmartStore.Core.Plugins; using SmartStore.Services.Cms; using SmartStore.Services.Configuration; @@ -60,14 +61,20 @@ public class GoogleAnalyticPlugin : BasePlugin, IWidget, IConfigurable, ICookieP private readonly ISettingService _settingService; private readonly GoogleAnalyticsSettings _googleAnalyticsSettings; private readonly ILocalizationService _localizationService; + private readonly IWidgetService _widgetService; + private readonly WidgetSettings _widgetSettings; public GoogleAnalyticPlugin(ISettingService settingService, GoogleAnalyticsSettings googleAnalyticsSettings, - ILocalizationService localizationService) + ILocalizationService localizationService, + IWidgetService widgetService, + WidgetSettings widgetSettings) { _settingService = settingService; _googleAnalyticsSettings = googleAnalyticsSettings; _localizationService = localizationService; + _widgetService = widgetService; + _widgetSettings = widgetSettings; } /// @@ -125,6 +132,10 @@ public void GetDisplayWidgetRoute(string widgetZone, object model, int storeId, /// CookieInfo containing plugin name, cookie purpose description & cookie type public CookieInfo GetCookieInfo() { + var widget = _widgetService.LoadWidgetBySystemName("SmartStore.GoogleAnalytics"); + if (!widget.IsWidgetActive(_widgetSettings)) + return null; + var cookieInfo = new CookieInfo { Name = _localizationService.GetResource("Plugins.FriendlyName.SmartStore.GoogleAnalytics"), diff --git a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj index a0a1733bec..94e221cc9f 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj +++ b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj @@ -94,6 +94,7 @@ False + From 0429cc759a70c5c5a7c3019dd9c532d3dd916bd4 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 27 Aug 2020 19:08:34 +0200 Subject: [PATCH 108/695] Minor code refactoring --- .../DefaultLifetimeScopeAccessor.cs | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs index 19d9c05d8d..43e163cbfc 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs @@ -44,20 +44,14 @@ public ILifetimeScope ApplicationContainer public IDisposable BeginContextAwareScope() { - if (HttpContext.Current != null) - { - return ActionDisposable.Empty; - } - else - { - Action disposer = null; - if (_state.GetState() == null) - { - disposer = this.EndLifetimeScope; - } - - return new ContextAwareScope(disposer); - } + // Stack-like behaviour for Non-HttpContext thread: + // Only the first call returns a disposer, all nested calls to this method are void. + return HttpContext.Current != null + ? (IDisposable)ActionDisposable.Empty + : new ContextAwareScope( + _state.GetState() == null + ? this.EndLifetimeScope + : (Action)null); } public void EndLifetimeScope() From f36dc2b9e3a7165a72cf11c54f425dd49e03acd8 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 27 Aug 2020 19:25:47 +0200 Subject: [PATCH 109/695] Renamed namespace and class name for SameSIteSupport class --- .../{SameSiteSupport.cs => SameSiteBrowserDetector.cs} | 4 ++-- .../SmartStore.Web.Framework/SmartStore.Web.Framework.csproj | 2 +- .../SmartStore.Web.Framework/SmartUrlRoutingModule.cs | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) rename src/Presentation/SmartStore.Web.Framework/Security/{SameSiteSupport.cs => SameSiteBrowserDetector.cs} (96%) diff --git a/src/Presentation/SmartStore.Web.Framework/Security/SameSiteSupport.cs b/src/Presentation/SmartStore.Web.Framework/Security/SameSiteBrowserDetector.cs similarity index 96% rename from src/Presentation/SmartStore.Web.Framework/Security/SameSiteSupport.cs rename to src/Presentation/SmartStore.Web.Framework/Security/SameSiteBrowserDetector.cs index 238ee429e4..c3308758b6 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/SameSiteSupport.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/SameSiteBrowserDetector.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace SameSite +namespace SmartStore.Web.Framework.Security { - public static class BrowserDetection + public static class SameSiteBrowserDetector { // Same as https://devblogs.microsoft.com/aspnet/upcoming-samesite-cookie-changes-in-asp-net-and-asp-net-core/ public static bool DisallowsSameSiteNone(string userAgent) diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 2842d0074d..8b904bae9a 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -247,7 +247,7 @@ - + diff --git a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs index 7000646b84..e0e236b761 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs +++ b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs @@ -16,6 +16,7 @@ using SmartStore.Core.Data; using SmartStore.Collections; using SmartStore.Core.Domain.Customers; +using SmartStore.Web.Framework.Security; namespace SmartStore.Web.Framework { @@ -196,7 +197,7 @@ public virtual void PreSendRequestHeaders(HttpContextBase context) context.Response.Cache.SetLastModifiedFromFileDependencies(); } - if (SameSite.BrowserDetection.AllowsSameSiteNone(context.Request.UserAgent)) + if (SameSiteBrowserDetector.AllowsSameSiteNone(context.Request.UserAgent)) { // Set SameSite attribute for antiforgery token. var privacySettings = EngineContext.Current.Resolve(); @@ -240,7 +241,7 @@ public virtual void FilterSameSiteNoneForIncompatibleUserAgents(HttpApplication { if (application != null) { - if (SameSite.BrowserDetection.DisallowsSameSiteNone(application.Context.Request.UserAgent)) + if (SameSiteBrowserDetector.DisallowsSameSiteNone(application.Context.Request.UserAgent)) { application.Response.AddOnSendingHeaders(context => { From 69785ba0d95da7ad965ff9c18d00787f28012041 Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Thu, 27 Aug 2020 22:30:54 +0200 Subject: [PATCH 110/695] (fu) > Dropzone Wrapper: Removed gallery block media handling functionality from methods and file --- .../Scripts/smartstore.dropzoneWrapper.js | 90 ++----------------- 1 file changed, 7 insertions(+), 83 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js index 5910d4874e..40bf9fd7e1 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js @@ -503,51 +503,7 @@ sortMediaFiles(); } }); - } else { - - const hidden = document.getElementById("media-file-ids"); - if (hidden && clearAssignableFiles) { - hidden.value = (hidden.value + assignableFileIds); - - const items = previewContainer.find('.dz-image-preview'); - const hiddenValues = hidden.value.split(',').map(Number); - - $.each(items, function (index, item) { - if (index < items.length - assignableFiles.length) return; - - const fileName = $(item).find(".fu-file-info-name").text(); - var file = assignableFiles.find(x => x.media.id === hiddenValues[index]); - if (!file) { - file = assignableFiles.find(x => x.name.toLowerCase() === fileName.toLowerCase()); - } - - if (file) { - // Set properties for newly added file preview. - var elPreview = file.previewElement ? $(file.previewElement) : $(previewTemplate.html()); - - elPreview - .attr("data-media-id", hiddenValues[index]) - .attr("data-media-name", fileName) - .removeClass("d-none dz-processing"); - - elPreview.find(".fu-file-info-name").html(fileName); - - elPreview - .find('img') - .attr('src', file.dataURL || file.media.thumbUrl); - - previewContainer.append(elPreview); - dzResetProgressBar(elPreview.find(".progress-bar")); - } - else { - console.log("Error while adding preview element.", fileName.toLowerCase()); - } - }); - - assignableFileIds = ""; - assignableFiles.length = 0; - } - } + } } // Calls server function after sorting, to save current sort order. @@ -587,19 +543,6 @@ } }); } - else { - const hidden = document.getElementById("media-file-ids"); - if (hidden) { - const items = previewContainer.find('.dz-image-preview'); - - let newOrder = []; - $.each(items, function (i, val) { - newOrder.push($(val).data('entity-media-id')); - }); - - hidden.value = newOrder; - } - } } // Sets file icon for files in preview containers (in multifile & status window). @@ -645,11 +588,11 @@ // Deletes a media file assignment of an entity (multifile upload). fuContainer.on("click", ".delete-entity-picture", function (e) { - var previewThumb = $(this).closest('.dz-image-preview'); - var entityMediaFileId = previewThumb.data("entity-media-id"); - var mediaFileId = previewThumb.data("media-id"); if ($el.data('remove-url')) { + var previewThumb = $(this).closest('.dz-image-preview'); + var entityMediaFileId = previewThumb.data("entity-id"); + var mediaFileId = previewThumb.data("media-id"); $.ajax({ async: false, @@ -662,31 +605,12 @@ // File must be removed from dropzone if it was added in current queue. var file = el.files.find(file => file.media.id === mediaFileId); - if (file) + if (file) { el.removeFile(file); + } } }); - } else { - const hidden = document.getElementById("media-file-ids"); - if (hidden) { - previewThumb.remove(); - - // File must be removed from dropzone if it was added in current queue. - const file = el.files.find(file => file.media.id === mediaFileId); - if (file) - el.removeFile(file); - - const items = previewContainer.find('.dz-image-preview'); - - let newOrder = []; - $.each(items, function (i, val) { - newOrder.push($(val).data('entity-media-id')); - }); - - hidden.value = newOrder; - } - } - return false; + } }); // Remove uploaded file (singlefile upload). From 929fedbf80a360baf7ad95d73e0fff9fb25da6c0 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 27 Aug 2020 21:45:18 +0200 Subject: [PATCH 111/695] Coding style --- .../Domain/Customers/PrivacySettings.cs | 17 +- .../Extensions/HttpExtensions.cs | 27 ++- src/Libraries/SmartStore.Core/WebHelper.cs | 2 +- .../Security/SameSiteBrowserDetector.cs | 3 + .../SmartUrlRoutingModule.cs | 216 ++++++++++-------- 5 files changed, 147 insertions(+), 118 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs index 6622b5cba2..3e754da5ba 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs @@ -6,29 +6,20 @@ namespace SmartStore.Core.Domain.Customers { public class PrivacySettings : BaseEntity, ISettings, ILocalizedEntity { - public PrivacySettings() - { - EnableCookieConsent = true; - ModalCookieConsent = true; - StoreLastIpAddress = false; - DisplayGdprConsentOnForms = true; - FullNameOnContactUsRequired = false; - } - /// /// Specifies whether cookie hint and consent will be displayed to customers in the frontent /// - public bool EnableCookieConsent { get; set; } + public bool EnableCookieConsent { get; set; } = true; /// /// Specifies whether the cookie dialog will be display in a modal dialog /// - public bool ModalCookieConsent { get; set; } + public bool ModalCookieConsent { get; set; } = true; /// /// Defines the global SameSiteMode for cookies. /// - public SameSiteType SameSiteMode { get; set; } + public SameSiteType SameSiteMode { get; set; } = SameSiteType.Lax; /// /// Gets or sets a value indicating whether to store last IP address for each customer @@ -38,7 +29,7 @@ public PrivacySettings() /// /// Gets or sets a value indicating whether to display a checkbox to the customer where he can agree to privacy terms /// - public bool DisplayGdprConsentOnForms { get; set; } + public bool DisplayGdprConsentOnForms { get; set; } = true; /// /// Gets or sets a value indicating whether the full name field is required on contact us requests diff --git a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs index 074eb87d5c..aea8f1f1ad 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs @@ -147,8 +147,6 @@ public static bool IsAppLocalUrl(this HttpRequestBase request, string url) /// Gets a value which indicates whether the HTTP connection uses secure sockets (HTTPS protocol). /// Works with Cloud's load balancers. /// - /// - /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsHttps(this HttpRequest request) { @@ -159,8 +157,6 @@ public static bool IsHttps(this HttpRequest request) /// Gets a value which indicates whether the HTTP connection uses secure sockets (HTTPS protocol). /// Works with Cloud's load balancers. /// - /// - /// public static bool IsHttps(this HttpRequestBase request) { if (request.IsSecureConnection) @@ -180,6 +176,29 @@ public static bool IsHttps(this HttpRequestBase request) return false; } + /// + /// Gets a value which indicates whether the current request requests a static resource, like .txt, .pdf, .js, .css etc. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool IsStaticResourceRequested(this HttpContext context) + { + return IsStaticResourceRequested(new HttpContextWrapper(context)); + } + + /// + /// Gets a value which indicates whether the current request requests a static resource, like .txt, .pdf, .js, .css etc. + /// + public static bool IsStaticResourceRequested(this HttpContextBase context) + { + if (context?.Request == null) + return false; + + return context.GetItem( + "IsStaticResourceRequested", + () => WebHelper.IsStaticResourceRequested(context.Request), + true); + } + [SuppressMessage("ReSharper", "PossibleNullReferenceException")] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void SetFormsAuthenticationCookie(this HttpWebRequest webRequest, HttpRequestBase httpRequest) diff --git a/src/Libraries/SmartStore.Core/WebHelper.cs b/src/Libraries/SmartStore.Core/WebHelper.cs index 6c989747bd..b0f849407c 100644 --- a/src/Libraries/SmartStore.Core/WebHelper.cs +++ b/src/Libraries/SmartStore.Core/WebHelper.cs @@ -25,7 +25,7 @@ public partial class WebHelper : IWebHelper private static object s_lock = new object(); private static bool? s_optimizedCompilationsEnabled; private static AspNetHostingPermissionLevel? s_trustLevel; - private static readonly Regex s_staticExts = new Regex(@"(.*?)\.(css|js|png|jpg|jpeg|gif|webp|liquid|bmp|html|htm|xml|pdf|doc|xls|rar|zip|7z|ico|eot|svg|ttf|woff|woff2|otf)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex s_staticExts = new Regex(@"(.*?)\.(css|js|png|jpg|jpeg|gif|webp|liquid|bmp|html|htm|xml|txt|pdf|doc|xls|rar|zip|7z|ico|eot|svg|ttf|woff|woff2|otf|json)", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex s_htmlPathPattern = new Regex(@"(?<=(?:href|src)=(?:""|'))(?!https?://)(?[^(?:""|')]+)", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Multiline); private static readonly Regex s_cssPathPattern = new Regex(@"url\('(?.+)'\)", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Multiline); private static ConcurrentDictionary s_safeLocalHostNames = new ConcurrentDictionary(); diff --git a/src/Presentation/SmartStore.Web.Framework/Security/SameSiteBrowserDetector.cs b/src/Presentation/SmartStore.Web.Framework/Security/SameSiteBrowserDetector.cs index c3308758b6..ad0d832ead 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/SameSiteBrowserDetector.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/SameSiteBrowserDetector.cs @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Runtime.CompilerServices; + namespace SmartStore.Web.Framework.Security { public static class SameSiteBrowserDetector @@ -55,6 +57,7 @@ public static bool DisallowsSameSiteNone(string userAgent) return false; } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool AllowsSameSiteNone(string userAgent) { return !DisallowsSameSiteNone(userAgent); diff --git a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs index e0e236b761..0c2e922ea0 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs +++ b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs @@ -81,110 +81,60 @@ public void Init(HttpApplication application) if (!DataSettings.DatabaseIsInstalled()) return; - if (application.Context.Items[_contextKey] == null) - { - application.Context.Items[_contextKey] = _contextKey; + if (application.Context.Items[_contextKey] == null) + { + application.Context.Items[_contextKey] = _contextKey; application.BeginRequest += (s, e) => FilterSameSiteNoneForIncompatibleUserAgents(application); - if (CommonHelper.IsDevEnvironment && HttpContext.Current.IsDebuggingEnabled) - { - // Handle plugin static file in DevMode - application.PostAuthorizeRequest += (s, e) => PostAuthorizeRequest(new HttpContextWrapper(((HttpApplication)s).Context)); - application.PreSendRequestHeaders += (s, e) => PreSendRequestHeaders(new HttpContextWrapper(((HttpApplication)s).Context)); - } - - application.PostResolveRequestCache += (s, e) => PostResolveRequestCache(new HttpContextWrapper(((HttpApplication)s).Context)); - - // Publish event to give plugins the chance to register custom event handlers for the request lifecycle. - foreach (var action in _actions) - { - action(application); + if (CommonHelper.IsDevEnvironment && HttpContext.Current.IsDebuggingEnabled) + { + // Handle plugin static file in DevMode + application.PostAuthorizeRequest += (s, e) => RewritePluginStaticFilePaths((HttpApplication)s); + application.PreSendRequestHeaders += (s, e) => HandlePluginStaticFileCaching((HttpApplication)s); } - // Set app to fully initialized state on very first request - EngineContext.Current.IsFullyInitialized = true; - } - } - - /// - /// Registers an action that is called on application init. Call this to register HTTP request lifecycle callbacks / event handlers. - /// - /// Action - public static void RegisterAction(Action action) - { - Guard.NotNull(action, nameof(action)); - - _actions.Add(action); - } - - /// - /// Registers a path pattern which should be handled by the - /// - /// The app relative path to handle (regular expression, e.g. /sitemap.xml or /mini-profiler-resources/(.*)) - /// The http method constraint (regular expression, e.g. GET|POST) - /// - /// For performance reasons Smartstore is configured to serve static files (files with extensions other than those mapped to managed handlers) - /// through the native StaticFileModule. This method lets you define exceptions to this default rule: every path registered as routable gets - /// handled by the and therefore enables dynamic processing of (physically non-existent) static files. - /// - public static void RegisterRoutablePath(string path, string verb = ".*") - { - Guard.NotEmpty(path, nameof(path)); + application.PreSendRequestHeaders += (s, e) => HandleSameSiteForAntiForgeryCookie((HttpApplication)s); + application.PostResolveRequestCache += (s, e) => TryResolveRoutablePath((HttpApplication)s); - if (path.IsWebUrl()) - { - throw new ArgumentException("Only relative paths are allowed.", "path"); - } + // Publish event to give plugins the chance to register custom event handlers for the request lifecycle. + foreach (var action in _actions) + { + action(application); + } - var rgPath = new Regex(path, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); - var rgVerb = new Regex(verb, RegexOptions.CultureInvariant | RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.IgnoreCase); + // Set app to fully initialized state on very first request + EngineContext.Current.IsFullyInitialized = true; + } + } - _routes.Add(new RoutablePath { PathPattern = rgPath, HttpMethodPattern = rgVerb }); - } + #region Handlers - public static bool HasMatchingPathHandler(string path, string method = "GET") - { - Guard.NotEmpty(path, nameof(path)); - Guard.NotEmpty(method, nameof(method)); - - if (_routes.Count > 0) - { - foreach (var route in _routes) - { - if (route.PathPattern.IsMatch(path) && route.HttpMethodPattern.IsMatch(method)) - { - return true; - } - } - } - - return false; - } - - public virtual void PostAuthorizeRequest(HttpContextBase context) + private static void RewritePluginStaticFilePaths(HttpApplication app) { + var context = app.Context; var request = context?.Request; if (request == null) return; - if (IsExtensionPath(request) && WebHelper.IsStaticResourceRequested(request)) + if (IsExtensionPath(request) && context.IsStaticResourceRequested()) { // We're in debug mode and in dev environment var file = HostingEnvironment.VirtualPathProvider.GetFile(request.AppRelativeCurrentExecutionFilePath) as DebugVirtualFile; if (file != null) { - context.Items["DebugFile"] = file; - context.Response.TransmitFile(file.PhysicalPath); - context.Response.Flush(); // TBD: optional? - context.Response.SuppressContent = true; // TBD: optional? - context.ApplicationInstance.CompleteRequest(); - } + context.Items["DebugFile"] = file; + context.Response.TransmitFile(file.PhysicalPath); + context.Response.Flush(); // TBD: optional? + context.Response.SuppressContent = true; // TBD: optional? + context.ApplicationInstance.CompleteRequest(); + } } } - public virtual void PreSendRequestHeaders(HttpContextBase context) + private static void HandlePluginStaticFileCaching(HttpApplication app) { + var context = app.Context; if (context?.Response == null) return; @@ -196,6 +146,16 @@ public virtual void PreSendRequestHeaders(HttpContextBase context) context.Response.Cache.SetNoStore(); context.Response.Cache.SetLastModifiedFromFileDependencies(); } + } + + private static void HandleSameSiteForAntiForgeryCookie(HttpApplication app) + { + var context = app.Context; + if (context?.Request == null || context?.Response == null) + return; + + if (context.IsStaticResourceRequested()) + return; if (SameSiteBrowserDetector.AllowsSameSiteNone(context.Request.UserAgent)) { @@ -207,15 +167,16 @@ public virtual void PreSendRequestHeaders(HttpContextBase context) { antiForgeryCookie.HttpOnly = true; antiForgeryCookie.Secure = context.Request.IsHttps(); - antiForgeryCookie.SameSite = context.Request.IsHttps() ? (SameSiteMode)privacySettings.SameSiteMode : SameSiteMode.Lax; + antiForgeryCookie.SameSite = antiForgeryCookie.Secure ? (SameSiteMode)privacySettings.SameSiteMode : SameSiteMode.Lax; context.Response.Cookies.Set(antiForgeryCookie); } } } - public virtual void PostResolveRequestCache(HttpContextBase context) + private static void TryResolveRoutablePath(HttpApplication app) { + var context = app.Context; var request = context?.Request; if (request == null) return; @@ -230,36 +191,91 @@ public virtual void PostResolveRequestCache(HttpContextBase context) if (route.PathPattern.IsMatch(path) && route.HttpMethodPattern.IsMatch(method)) { var module = new UrlRoutingModule(); - module.PostResolveRequestCache(context); + module.PostResolveRequestCache(new HttpContextWrapper(context)); return; } } - } + } } - public virtual void FilterSameSiteNoneForIncompatibleUserAgents(HttpApplication application) + private static void FilterSameSiteNoneForIncompatibleUserAgents(HttpApplication app) { - if (application != null) + var context = app?.Context; + if (context == null || context.IsStaticResourceRequested() || SameSiteBrowserDetector.AllowsSameSiteNone(context.Request?.UserAgent)) + return; + + app.Response.AddOnSendingHeaders(ctx => { - if (SameSiteBrowserDetector.DisallowsSameSiteNone(application.Context.Request.UserAgent)) + var cookies = ctx.Response.Cookies; + for (var i = 0; i < cookies.Count; i++) { - application.Response.AddOnSendingHeaders(context => + var cookie = cookies[i]; + if (cookie.SameSite == SameSiteMode.None) { - var cookies = context.Response.Cookies; - for (var i = 0; i < cookies.Count; i++) - { - var cookie = cookies[i]; - if (cookie.SameSite == SameSiteMode.None) - { - cookie.SameSite = (SameSiteMode)(-1); // Unspecified - } - } - }); + cookie.SameSite = (SameSiteMode)(-1); // Unspecified + } } + }); + } + + #endregion + + /// + /// Registers an action that is called on application init. Call this to register HTTP request lifecycle callbacks / event handlers. + /// + /// Action + public static void RegisterAction(Action action) + { + Guard.NotNull(action, nameof(action)); + + _actions.Add(action); + } + + /// + /// Registers a path pattern which should be handled by the + /// + /// The app relative path to handle (regular expression, e.g. /sitemap.xml or /mini-profiler-resources/(.*)) + /// The http method constraint (regular expression, e.g. GET|POST) + /// + /// For performance reasons Smartstore is configured to serve static files (files with extensions other than those mapped to managed handlers) + /// through the native StaticFileModule. This method lets you define exceptions to this default rule: every path registered as routable gets + /// handled by the and therefore enables dynamic processing of (physically non-existent) static files. + /// + public static void RegisterRoutablePath(string path, string verb = ".*") + { + Guard.NotEmpty(path, nameof(path)); + + if (path.IsWebUrl()) + { + throw new ArgumentException("Only relative paths are allowed.", "path"); } + + var rgPath = new Regex(path, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); + var rgVerb = new Regex(verb, RegexOptions.CultureInvariant | RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.IgnoreCase); + + _routes.Add(new RoutablePath { PathPattern = rgPath, HttpMethodPattern = rgVerb }); + } + + public static bool HasMatchingPathHandler(string path, string method = "GET") + { + Guard.NotEmpty(path, nameof(path)); + Guard.NotEmpty(method, nameof(method)); + + if (_routes.Count > 0) + { + foreach (var route in _routes) + { + if (route.PathPattern.IsMatch(path) && route.HttpMethodPattern.IsMatch(method)) + { + return true; + } + } + } + + return false; } - private bool IsExtensionPath(HttpRequestBase request) + private static bool IsExtensionPath(HttpRequest request) { var path = request.AppRelativeCurrentExecutionFilePath.ToLower(); var result = path.StartsWith("~/plugins/") || path.StartsWith("~/themes/"); From 89ec77d51e88b6771ec297ea55a2fe32f7e65355 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 27 Aug 2020 22:28:32 +0200 Subject: [PATCH 112/695] Removed obsolete code --- .../Controllers/ProductController.cs | 38 ------------------- .../Models/Catalog/ProductModel.cs | 2 - 2 files changed, 40 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs index 4aa06c2103..c46765e308 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs @@ -757,33 +757,6 @@ private void PrepareProductPictureModel(ProductModel model) var productPictures = _productService.GetProductPicturesByProductId(model.Id); - // OBSOLETE - model.ProductPictureModels = productPictures - .Select(x => - { - var pictureModel = new ProductModel.ProductPictureModel - { - Id = x.Id, - ProductId = x.ProductId, - PictureId = x.MediaFileId, - DisplayOrder = x.DisplayOrder, - ProductMediaFile = x - }; - - try - { - pictureModel.PictureUrl = _mediaService.GetUrl(x.MediaFileId, 0); - } - catch (Exception ex) - { - // The user must always have the possibility to delete faulty images. - Logger.Error(ex); - } - - return pictureModel; - }) - .ToList(); - model.ProductMediaFiles = productPictures .Select(x => { @@ -796,17 +769,6 @@ private void PrepareProductPictureModel(ProductModel model) MediaFile = x.MediaFile }; - // TODO - //try - //{ - // media.PictureUrl = _mediaService.GetUrl(x.MediaFileId, 0); - //} - //catch (Exception ex) - //{ - // // The user must always have the possibility to delete faulty images. - // Logger.Error(ex); - //} - return media; }) .ToList(); diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs index e8801faa28..069e0f5a38 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs @@ -23,7 +23,6 @@ public class ProductModel : TabbableModel, ILocalizedModel(); - ProductPictureModels = new List(); CopyProductModel = new CopyProductModel(); AvailableProductTemplates = new List(); AvailableTaxCategories = new List(); @@ -387,7 +386,6 @@ public ProductModel() [SmartResourceDisplayName("Admin.Catalog.Products.Fields.HasPreviewPicture")] public bool HasPreviewPicture { get; set; } public ProductPictureModel AddPictureModel { get; set; } - public IList ProductPictureModels { get; set; } public IList ProductMediaFiles { get; set; } From 5b043c9e57761b79c0c5dad96474f9685e5ce132 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 27 Aug 2020 22:29:09 +0200 Subject: [PATCH 113/695] Added 'ImagePostProcessingEnabled' property to IMediaService --- src/Libraries/SmartStore.Services/Media/IMediaService.cs | 7 +++++++ .../SmartStore.Services/Media/Imaging/ProcessImageQuery.cs | 2 +- src/Libraries/SmartStore.Services/Media/MediaService.cs | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Libraries/SmartStore.Services/Media/IMediaService.cs b/src/Libraries/SmartStore.Services/Media/IMediaService.cs index 045a1d2526..8954e6c053 100644 --- a/src/Libraries/SmartStore.Services/Media/IMediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/IMediaService.cs @@ -111,6 +111,13 @@ public partial interface IMediaService /// IMediaStorageProvider StorageProvider { get; } + /// + /// Gets or sets a value indicating whether image post-processing is enabled. + /// It is recommended to turn this off during long-running processes - like product imports - + /// as post-processing can heavily decrease processing time. + /// + public bool ImagePostProcessingEnabled { get; set; } + /// /// Determines the number of files that match the filter criteria in . /// diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs index feadbc62b4..3ca9333981 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs @@ -96,7 +96,7 @@ private static NameValueCollection SanitizeCollection(NameValueCollection query) /// can reduce the resulting file size drastically, but also /// can slow down processing time. /// - public bool ExecutePostProcessor { get; set; } + public bool ExecutePostProcessor { get; set; } = true; public int? MaxWidth { diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs index f2120d9277..e00ffd3540 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -77,6 +77,8 @@ public IMediaStorageProvider StorageProvider get => _storageProvider; } + public bool ImagePostProcessingEnabled { get; set; } + #region Query public int CountFiles(MediaSearchQuery query) @@ -590,6 +592,7 @@ protected bool ProcessImage(MediaFile file, Stream inStream, out IImage outImage Quality = _mediaSettings.DefaultImageQuality, Format = file.Extension, DisposeSource = true, + ExecutePostProcessor = ImagePostProcessingEnabled, IsValidationMode = true }; From 1c78365448af78b139d52157ed8a4e6475751e69 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 28 Aug 2020 02:56:46 +0200 Subject: [PATCH 114/695] (perf) faster page rendering: reorganized heavy queries --- .../FormsAuthenticationService.cs | 23 +++++++++++++++---- .../Customers/CustomerService.cs | 9 +++++--- .../Controllers/CatalogHelper.cs | 20 ++++++++++------ 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs index 97e81a5d52..91ec3fb8c3 100644 --- a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs +++ b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Linq; using System.Web; using System.Web.Security; using SmartStore.Core; @@ -111,22 +113,33 @@ public virtual Customer GetAuthenticatedCustomerFromTicket(FormsAuthenticationTi if (!usernameOrEmail.HasValue()) return null; - Customer customer = null; + List> customerResolvers = new List>(2); if (_customerSettings.CustomerLoginType == CustomerLoginType.Email) { - customer = _customerService.GetCustomerByEmail(usernameOrEmail); + customerResolvers.Add(_customerService.GetCustomerByEmail); } else if (_customerSettings.CustomerLoginType == CustomerLoginType.Username) { - customer = _customerService.GetCustomerByUsername(usernameOrEmail); + customerResolvers.Add(_customerService.GetCustomerByUsername); } else { - customer = _customerService.GetCustomerByEmail(usernameOrEmail) ?? _customerService.GetCustomerByUsername(usernameOrEmail); + customerResolvers.Add(_customerService.GetCustomerByUsername); + var mayBeEmail = usernameOrEmail.IndexOf('@') > -1; + if (mayBeEmail) + { + customerResolvers.Insert(0, _customerService.GetCustomerByEmail); + } + else + { + customerResolvers.Add(_customerService.GetCustomerByEmail); + } } - return customer; + return customerResolvers + .Select(x => x.Invoke(usernameOrEmail)) + .FirstOrDefault(); } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerService.cs b/src/Libraries/SmartStore.Services/Customers/CustomerService.cs index 3b6b72b7a4..f5f08c80d2 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerService.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerService.cs @@ -307,9 +307,12 @@ public virtual Customer GetCustomerById(int customerId) private IQueryable IncludeShoppingCart(IQueryable query) { - return query - .Expand(x => x.ShoppingCartItems.Select(y => y.BundleItem)) - .Expand(x => x.ShoppingCartItems.Select(y => y.Product.AppliedDiscounts.Select(z => z.RuleSets))); + return query; + + /// The generated SQL is way too heavy (!). Discard later (??) + //return query + // .Expand(x => x.ShoppingCartItems.Select(y => y.BundleItem)) + // .Expand(x => x.ShoppingCartItems.Select(y => y.Product.AppliedDiscounts.Select(z => z.RuleSets))); } public virtual IList GetCustomersByIds(int[] customerIds) diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index 91d171adc5..f6a45fb037 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs @@ -1451,12 +1451,18 @@ public List PrepareManufacturersOverviewModel( cachedModels = new Dictionary(); } - var fileIds = manufacturers - .Select(x => x.Manufacturer.MediaFileId ?? 0) - .Where(x => x != 0) - .Distinct() - .ToArray(); - var files = _mediaService.GetFilesByIds(fileIds).ToDictionarySafe(x => x.Id); + IDictionary mediaFileLookup = null; + if (withPicture) + { + mediaFileLookup = manufacturers + .Select(x => x.Manufacturer.MediaFile) + .Where(x => x != null) + .Distinct() + .Select(x => _mediaService.ConvertMediaFile(x)) + .ToDictionarySafe(x => x.Id); + } + + //var files = _mediaService.GetFilesByIds(fileIds).ToDictionarySafe(x => x.Id); foreach (var pm in manufacturers) { @@ -1474,7 +1480,7 @@ public List PrepareManufacturersOverviewModel( if (withPicture) { - item.Picture = PrepareManufacturerPictureModel(manufacturer, item.Name, files); + item.Picture = PrepareManufacturerPictureModel(manufacturer, item.Name, mediaFileLookup); } cachedModels.Add(item.Id, item); From e5c6c806e4c03e42958284e3c95ea5bd6aa7cf6f Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 28 Aug 2020 10:52:25 +0200 Subject: [PATCH 115/695] Fixes runtime error of a not found System.Runtime.InteropServices.RuntimeInformation 4.0.2.0 --- src/Presentation/SmartStore.Web/Web.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index a32342b917..cf6bc0c9f2 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -362,7 +362,7 @@ - + From 2a0343f4f027206abbca53c05d8ed595ad3171d2 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 28 Aug 2020 16:18:15 +0200 Subject: [PATCH 116/695] API: IMediaService endpoints (in progress) --- .../Controllers/OData/MediaFilesController.cs | 73 ++++++++++++++++ .../Models/OData/Media/FileItemInfo.cs | 1 + .../SmartStore.WebApi.Client/MainForm.cs | 19 ++-- .../Models/FileUploadModel.cs | 25 +++++- .../WebApi/WebApiConsumer.cs | 86 ++++++++++++------- 5 files changed, 166 insertions(+), 38 deletions(-) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs index 491e0b7a9f..d407275740 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.IO; using System.Linq; using System.Net; +using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using System.Web.OData; @@ -10,6 +12,7 @@ using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; using SmartStore.Services.Media; +using SmartStore.Utilities; using SmartStore.Web.Framework.WebApi; using SmartStore.Web.Framework.WebApi.Caching; using SmartStore.Web.Framework.WebApi.Configuration; @@ -161,6 +164,10 @@ public static void Init(WebApiConfigurationBroadcaster configData) .Action("DeleteFile") .AddParameter("Permanent") .AddParameter("Force", true); + + entityConfig.Collection + .Action("SaveFile") + .ReturnsFromEntitySet("MediaFiles"); } /// POST /MediaFiles/GetFileByPath {"Path":"content/my-file.jpg"} @@ -403,6 +410,72 @@ public IHttpActionResult DeleteFile(int key, ODataActionParameters parameters) return StatusCode(HttpStatusCode.NoContent); } + /// POST /MediaFiles/SaveFile + [HttpPost, WebApiQueryable] + [WebApiAuthenticate(Permission = Permissions.Media.Upload)] + public async Task SaveFile() + { + if (!Request.Content.IsMimeMultipartContent()) + { + return StatusCode(HttpStatusCode.UnsupportedMediaType); + } + + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + var provider = new MultipartFormDataStreamProvider(FileSystemHelper.TempDirTenant()); + + try + { + await Request.Content.ReadAsMultipartAsync(provider); + } + catch (Exception ex) + { + provider.DeleteLocalFiles(); + return InternalServerError(ex); + } + + var fileData = provider.FileData?.FirstOrDefault(); + if (fileData == null) + { + return BadRequest("Missing multipart file data."); + } + + if (provider.FileData?.Count > 1) + { + provider.DeleteLocalFiles(); + return BadRequest("Send one file per request, not multiple."); + } + + FileItemInfo savedFile = null; + + await this.ProcessEntityAsync(async () => + { + var cd = fileData.Headers?.ContentDisposition; + if (!(cd?.Parameters?.Any() ?? false)) + { + throw Request.BadRequestException("Missing file parameters in content-disposition header."); + } + + var path = cd.Parameters.FirstOrDefault(x => x.Name == "Path")?.Value.ToUnquoted(); + var isTransient = cd.Parameters.FirstOrDefault(x => x.Name == "IsTransient")?.Value?.ToUnquoted()?.ToBool(true) ?? true; + + var rawDuplicateFileHandling = cd.Parameters.FirstOrDefault(x => x.Name == "DuplicateFileHandling")?.Value?.ToUnquoted(); + Enum.TryParse(rawDuplicateFileHandling.EmptyNull(), out var duplicateFileHandling); + + using (var stream = File.OpenRead(fileData.LocalFileName)) + { + var result = await Service.SaveFileAsync(path, stream, isTransient, duplicateFileHandling); + savedFile = Convert(result); + } + }); + + provider.DeleteLocalFiles(); + return Ok(savedFile); + } + #endregion #region Utilities diff --git a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs index ec20787ad0..19c90d3c64 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs @@ -29,6 +29,7 @@ public partial class FileItemInfo [DataMember] public string ThumbUrl { get; set; } + /// AutoExpand only works with . [DataMember] [AutoExpand] public MediaFile File { get; set; } diff --git a/src/Tools/SmartStore.WebApi.Client/MainForm.cs b/src/Tools/SmartStore.WebApi.Client/MainForm.cs index 72a545722d..28c62bc80a 100644 --- a/src/Tools/SmartStore.WebApi.Client/MainForm.cs +++ b/src/Tools/SmartStore.WebApi.Client/MainForm.cs @@ -53,7 +53,7 @@ public MainForm() { Files = new List { - new FileUploadModel.FileModel { Path = @"C:\my-upload-picture.jpg" } + new FileUploadModel.FileModel { LocalPath = @"C:\my-upload-picture.jpg" } } }; var serializedModel = JsonConvert.SerializeObject(model); @@ -211,8 +211,15 @@ private void callApi_Click(object sender, EventArgs e) private void cboMethod_changeCommitted(object sender, EventArgs e) { - bool enable = ApiConsumer.BodySupported(cboMethod.Text); - cboContent.Enabled = enable; + var isBodySupported = ApiConsumer.BodySupported(cboMethod.Text); + var isMultipartSupported = ApiConsumer.MultipartSupported(cboMethod.Text); + + cboContent.Enabled = isBodySupported; + btnDeleteContent.Enabled = isBodySupported; + + cboFileUpload.Enabled = isMultipartSupported; + btnDeleteFileUpload.Enabled = isMultipartSupported; + btnFileOpen.Enabled = isMultipartSupported; } private void btnDeletePath_Click(object sender, EventArgs e) @@ -297,7 +304,7 @@ private void btnFileOpen_Click(object sender, EventArgs e) // Remove files that no longer exist. for (var i = model.Files.Count - 1; i >= 0; --i) { - if (!File.Exists(model.Files[i].Path)) + if (!File.Exists(model.Files[i].LocalPath)) { model.Files.RemoveAt(i); } @@ -306,11 +313,11 @@ private void btnFileOpen_Click(object sender, EventArgs e) // Add new selected files. foreach (var fileName in openFileDialog1.FileNames) { - if (!model.Files.Any(x => x.Path != null && x.Path == fileName)) + if (!model.Files.Any(x => x.LocalPath != null && x.LocalPath == fileName)) { model.Files.Add(new FileUploadModel.FileModel { - Path = fileName + LocalPath = fileName }); } } diff --git a/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs b/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs index b9687d2aa0..1bf46a8049 100644 --- a/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs +++ b/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs @@ -42,9 +42,32 @@ public class FileModel public int Id { get; set; } /// - /// Absolute path. + /// Absolute local path of file to be uploaded. + /// + public string LocalPath { get; set; } + + /// + /// Media service path in shop. /// public string Path { get; set; } + + /// + /// Whether the file in shop is marked as transient. + /// + public bool IsTransient { get; set; } = true; + + /// + /// Duplicate file handling. + /// + public DuplicateFileHandling DuplicateFileHandling { get; set; } = DuplicateFileHandling.ThrowError; } } + + + public enum DuplicateFileHandling + { + ThrowError, + Overwrite, + Rename + } } diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs index ff72c89093..17f0567913 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs @@ -19,7 +19,8 @@ public class ApiConsumer : HmacAuthentication private void SetTimeout(HttpWebRequest webRequest) { #if DEBUG - webRequest.Timeout = 1000 * 60 * 5; // just for debugging + // Just for debugging. + webRequest.Timeout = 1000 * 60 * 5; #endif } @@ -141,6 +142,12 @@ public static bool BodySupported(string method) return false; } + public static bool MultipartSupported(string method) + { + // At the moment all API methods with multipart support are POST methods. + return string.Compare(method, "POST", true) == 0; + } + public Dictionary CreateMultipartData(FileUploadModel model) { if (!(model?.Files?.Any() ?? false)) @@ -170,21 +177,34 @@ public Dictionary CreateMultipartData(FileUploadModel model) // File data. foreach (var file in model.Files) { - if (File.Exists(file.Path)) + if (File.Exists(file.LocalPath)) { - using (var fstream = new FileStream(file.Path, FileMode.Open, FileAccess.Read)) + using (var fstream = new FileStream(file.LocalPath, FileMode.Open, FileAccess.Read)) { byte[] data = new byte[fstream.Length]; fstream.Read(data, 0, data.Length); - var name = Path.GetFileName(file.Path); + var name = Path.GetFileName(file.LocalPath); var id = string.Format("my-file-{0}", ++count); var apiFile = new ApiFileParameter(data, name, MimeMapping.GetMimeMapping(name)); + // Add file parameters. Omit default values (let the server apply them). if (file.Id != 0) { apiFile.Parameters.Add("PictureId", file.Id.ToString()); } + if (file.Path.HasValue()) + { + apiFile.Parameters.Add("Path", file.Path); + } + if (!file.IsTransient) + { + apiFile.Parameters.Add("IsTransient", file.IsTransient.ToString()); + } + if (file.DuplicateFileHandling != DuplicateFileHandling.ThrowError) + { + apiFile.Parameters.Add("DuplicateFileHandling", ((int)file.DuplicateFileHandling).ToString()); + } // Test pass through of custom parameters but the API ignores them anyway. //apiFile.Parameters.Add("CustomValue1", string.Format("{0:N}", Guid.NewGuid())); @@ -246,13 +266,12 @@ public HttpWebRequest StartRequest(WebApiRequestContext context, string content, return null; } - // Client system time must not be too far away from api server time! check response header. - // ISO-8601 utc timestamp with milliseconds (e.g. 2013-09-23T09:24:43.5395441Z) + // Client system time must not be too far away from APPI server time! Check response header. + // ISO-8601 utc timestamp with milliseconds (e.g. 2013-09-23T09:24:43.5395441Z). string timestamp = DateTime.UtcNow.ToString("o"); byte[] data = null; - string contentMd5Hash = ""; - var bodySupported = BodySupported(context.HttpMethod); + var contentMd5Hash = string.Empty; var request = (HttpWebRequest)WebRequest.Create(context.Url); SetTimeout(request); @@ -284,39 +303,42 @@ public HttpWebRequest StartRequest(WebApiRequestContext context, string content, } } - if (multipartData != null && multipartData.Count > 0) + if (BodySupported(context.HttpMethod)) { - var formDataBoundary = string.Format("----------{0:N}", Guid.NewGuid()); + if (MultipartSupported(context.HttpMethod) && (multipartData?.Any() ?? false)) + { + var formDataBoundary = string.Format("----------{0:N}", Guid.NewGuid()); - data = GetMultipartFormData(multipartData, formDataBoundary, requestContent); - contentMd5Hash = CreateContentMd5Hash(data); + data = GetMultipartFormData(multipartData, formDataBoundary, requestContent); + contentMd5Hash = CreateContentMd5Hash(data); - request.ContentLength = data.Length; - request.ContentType = "multipart/form-data; boundary=" + formDataBoundary; - } - else if (!string.IsNullOrWhiteSpace(content) && bodySupported) - { - requestContent.Append(content); - data = Encoding.UTF8.GetBytes(content); - contentMd5Hash = CreateContentMd5Hash(data); - - request.ContentLength = data.Length; - request.ContentType = "application/json; charset=utf-8"; - } - else if (bodySupported) - { - request.ContentLength = 0; + request.ContentLength = data.Length; + request.ContentType = "multipart/form-data; boundary=" + formDataBoundary; + } + else if (!string.IsNullOrWhiteSpace(content)) + { + requestContent.Append(content); + data = Encoding.UTF8.GetBytes(content); + contentMd5Hash = CreateContentMd5Hash(data); + + request.ContentLength = data.Length; + request.ContentType = "application/json; charset=utf-8"; + } + else + { + request.ContentLength = 0; + } } if (!string.IsNullOrEmpty(contentMd5Hash)) { - // optional... provider returns HmacResult.ContentMd5NotMatching if there's no match + // Optional. Provider returns HmacResult.ContentMd5NotMatching if there's no match. request.Headers.Add(HttpRequestHeader.ContentMd5, contentMd5Hash); } - string messageRepresentation = CreateMessageRepresentation(context, contentMd5Hash, timestamp, true); + var messageRepresentation = CreateMessageRepresentation(context, contentMd5Hash, timestamp, true); //Debug.WriteLine(messageRepresentation); - string signature = CreateSignature(context.SecretKey, messageRepresentation); + var signature = CreateSignature(context.SecretKey, messageRepresentation); request.Headers.Add(HttpRequestHeader.Authorization, CreateAuthorizationHeader(signature)); @@ -336,9 +358,11 @@ public HttpWebRequest StartRequest(WebApiRequestContext context, string content, public bool ProcessResponse(HttpWebRequest webRequest, WebApiConsumerResponse response, FolderBrowserDialog folderBrowserDialog) { if (webRequest == null) + { return false; + } - bool result = true; + var result = true; HttpWebResponse webResponse = null; try From 0586a025938f183310619dfb4ae500f5a83e76b7 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 28 Aug 2020 11:28:42 +0200 Subject: [PATCH 117/695] Minor restructuring of privacy setting layout in admin area --- .../Migrations/MigrationsConfiguration.cs | 36 +++-- .../Views/Setting/CustomerUser.cshtml | 142 ++++++++++-------- 2 files changed, 101 insertions(+), 77 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 5c06cb5ae1..f47767b468 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -206,11 +206,11 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AddCookieInfo.Title", "Add new cookie information", - "Neue Cookie-Informationen zufügen"); + "Neue Cookie-Informationen hinzufügen"); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.EditCookieInfo.Title", - "Add new cookie information", - "Neue Cookie-Informationen zufügen"); + "Edit new cookie information", + "Cookie-Informationen bearbeiten"); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.Name", "Name", @@ -240,24 +240,24 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) The SameSite setting for cookies specifies the level of security for cookies when they are requested by other sites (e.g. in a cross-site request or in an iframe). The recommended setting is Lax, as cookies are sent with most secure actions.
- If the store should also run in an iframe, it is necessary to select the setting None. Additionally SSL must be set up in the store. + If the store should also be embedded in an iframe, it is necessary to select the setting None. Additionally SSL must be set up in the store.

  • Unspecified: No SameSite header is transmitted to requests.
    • -
  • None: No mode specified. This setting must be used if the store should also run in an iframe (SSL must be set up).
    • +
  • None: No mode specified. This setting must be used if the store should also be embedded in an iframe (SSL must be set up).
  • Lax: Recommended setting. Cookies are sent at the highest level for requests on the same website and for cross-site requests.
  • Strict: Cookies are only sent to requests from the same website.
", @"
SameSite Modus

- Die SameSite-Einstellung für Cookies bestimmt, das Sicherheitslevel für Cookies, wenn diese von anderen Seiten (z.B. in einem Cross-Site-Request oder in einem Iframe) aufgerufen werden. + Die SameSite-Einstellung für Cookies bestimmt, das Sicherheitslevel für Cookies, wenn diese von anderen Seiten (z.B. in einem Cross-Site-Request oder in einem IFrame) aufgerufen werden. Die empfohlene Einstellung ist Lax, da hier Cookies bei den meisten gesicherten Aktionen mitgesendet werden.
- Soll der Shop auch in einem Iframe laufen, ist es notwendig die Einstellung None zu wählen. Zusätzlich muss SSL im Shop eingerichtet sein. + Soll der Shop auch in ein IFrame eingebettet werden, ist es notwendig die Einstellung None zu wählen. Zusätzlich muss SSL im Shop eingerichtet sein.

  • Unspecified: Es wird kein SameSite-Header an Requests übermittelt.
    • -
  • None: Kein Modus angegeben. Diese Einstellung muss verwendet werden, wenn der Shop auch in einem Iframe laufen soll (SSL muss eingerichtet sein).
    • +
  • None: Kein Modus angegeben. Diese Einstellung muss verwendet werden, wenn der Shop auch in ein IFrame eingebettet werden soll (SSL muss eingerichtet sein).
  • Lax: Empfohlene Einstellung. Cookies werden bei Anfragen auf derselben Website und bei Cross-Site-Requests auf höchster Ebene gesendet.
  • Strict: Cookies werden nur an Anfragen derselben Website gesendet.
"); @@ -266,8 +266,14 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.ModalCookieConsent", "Modal Cookie Manager", "Cookie-Manager modal anzeigen", - "Specifies whether the Cookie Manager is displayed in a modal dialog in the frontend.", - "Bestimmt, ob der Cookie-Manager im Frontend in einem modalen Dialog angezeigt wird."); + "Specifies whether the Cookie Manager is displayed in a modal dialog in the frontend. The modal mode requires a customer interaction with the dialog before the customer can navigate in the store.", + "Bestimmt, ob der Cookie-Manager im Frontend in einem modalen Dialog angezeigt wird. Der modale Modus macht eine Kundeninteraktion mit dem Dialog erfoderlich, bevor der Kunde im Shop navigieren kann."); + + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.EnableCookieConsent", + "Enable Cookie Manager", + "Cookie-Manager aktivieren", + "Specifies whether the Cookie Manager will be displayed in the frontend.", + "Legt fest, ob ein Dialog für die Zustimmung zur Nutzung von Cookies im Frontend angezeigt wird."); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.CookieInfo.IsPluginInfo", "System cookie", @@ -277,13 +283,16 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Cookie information wasn't found.", "Cookie-Information wurde nicht gefunden."); + builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.RegisterCookieInfo.Title", + "Register your own cookie information", + "Eigene Cookie-Informationen registrieren"); + builder.AddOrUpdate("CookieManager.Dialog.Hide", "Hide", "Ausblenden"); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AdminInstruction", - @"
Cookie Information
-

+ @"

If you have included third-party scripts in your shop that use cookies and are not integrated into Smartstore via a plugin, you can provide your own information about these cookies for the Cookie Manager in the following table.

@@ -293,8 +302,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) but cannot be edited. The texts of this information can be edited using the language resources Admin > Configuration > Regional Settings > Languages.

", - @"
Cookie-Informationen
-

+ @"

Wenn Sie Scripte von Drittanbietern in Ihren Shop eingebunden haben, die Cookies nutzen und die nicht über ein Plugin in Smartstore integriert sind, können Sie in folgender Tabelle eigene Informationen über diese Cookies für den Cookie-Manager bereitstellen.

diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml index d566b03ab9..0c37b190db 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml @@ -525,32 +525,32 @@
@(Html.LocalizedEditor("setting-customer-localized", - @ - - - + +
- @Html.SmartLabelFor(model => model.Locales[item].Salutations) - - @*IMPORTANT: Do not delete, this hidden element contains the id to assign localized values to the corresponding language *@ - @Html.HiddenFor(model => model.Locales[item].LanguageId) + @ + + + - -
+ @Html.SmartLabelFor(model => model.Locales[item].Salutations) + + @*IMPORTANT: Do not delete, this hidden element contains the id to assign localized values to the corresponding language *@ + @Html.HiddenFor(model => model.Locales[item].LanguageId) - @Html.TextBoxFor(model => Model.Locales[item].Salutations) - @Html.ValidationMessageFor(model => model.Locales[item].Salutations) -
-, - @ - - - - -
- @Html.SmartLabelFor(model => model.AddressSettings.Salutations) - - @Html.TextBoxFor(model => model.AddressSettings.Salutations) - @Html.ValidationMessageFor(model => model.AddressSettings.Salutations) -
+ @Html.TextBoxFor(model => Model.Locales[item].Salutations) + @Html.ValidationMessageFor(model => model.Locales[item].Salutations) +
+ , + @ + + + + +
+ @Html.SmartLabelFor(model => model.AddressSettings.Salutations) + + @Html.TextBoxFor(model => model.AddressSettings.Salutations) + @Html.ValidationMessageFor(model => model.AddressSettings.Salutations) +
))
@@ -784,86 +784,102 @@ - + - + + + - + - + + +
- @Html.SmartLabelFor(model => model.PrivacySettings.EnableCookieConsent) + @Html.SmartLabelFor(model => model.PrivacySettings.StoreLastIpAddress) - @Html.SettingEditorFor(model => model.PrivacySettings.EnableCookieConsent, - Html.CheckBoxFor(model => model.PrivacySettings.EnableCookieConsent, new { data_toggler_for = "#pnlModalCookieConsent" })) - @Html.ValidationMessageFor(model => model.PrivacySettings.EnableCookieConsent) + @Html.SettingEditorFor(model => model.PrivacySettings.StoreLastIpAddress) + @Html.ValidationMessageFor(model => model.PrivacySettings.StoreLastIpAddress)
- @Html.SmartLabelFor(model => model.PrivacySettings.ModalCookieConsent) + @Html.SmartLabelFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) - @Html.SettingEditorFor(model => model.PrivacySettings.ModalCookieConsent, - Html.CheckBoxFor(model => model.PrivacySettings.ModalCookieConsent)) - @Html.ValidationMessageFor(model => model.PrivacySettings.ModalCookieConsent) + @Html.SettingEditorFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) + @Html.ValidationMessageFor(model => model.PrivacySettings.DisplayGdprConsentOnForms)
- @Html.SmartLabelFor(model => model.PrivacySettings.SameSiteMode) + @Html.SmartLabelFor(model => model.PrivacySettings.FullNameOnContactUsRequired) - @Html.DropDownListForEnum(model => model.PrivacySettings.SameSiteMode) - @Html.ValidationMessageFor(model => model.PrivacySettings.SameSiteMode) + @Html.SettingEditorFor(model => model.PrivacySettings.FullNameOnContactUsRequired) + @Html.ValidationMessageFor(model => model.PrivacySettings.FullNameOnContactUsRequired)
+ @Html.SmartLabelFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) -
- - @T("Admin.Configuration.Settings.CustomerUser.Privacy.SameSiteMode.AdminInstruction") -
+ 		+ @Html.SettingEditorFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) + @Html.ValidationMessageFor(model => model.PrivacySettings.FullNameOnProductRequestRequired)
+
+
+ Cookies +
+
+
- @Html.SmartLabelFor(model => model.PrivacySettings.StoreLastIpAddress) + @Html.SmartLabelFor(model => model.PrivacySettings.EnableCookieConsent) - @Html.SettingEditorFor(model => model.PrivacySettings.StoreLastIpAddress) - @Html.ValidationMessageFor(model => model.PrivacySettings.StoreLastIpAddress) + @Html.SettingEditorFor(model => model.PrivacySettings.EnableCookieConsent, + Html.CheckBoxFor(model => model.PrivacySettings.EnableCookieConsent, new { data_toggler_for = "#pnlModalCookieConsent" })) + @Html.ValidationMessageFor(model => model.PrivacySettings.EnableCookieConsent)
- @Html.SmartLabelFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) + @Html.SmartLabelFor(model => model.PrivacySettings.ModalCookieConsent) - @Html.SettingEditorFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) - @Html.ValidationMessageFor(model => model.PrivacySettings.DisplayGdprConsentOnForms) + @Html.SettingEditorFor(model => model.PrivacySettings.ModalCookieConsent, + Html.CheckBoxFor(model => model.PrivacySettings.ModalCookieConsent)) + @Html.ValidationMessageFor(model => model.PrivacySettings.ModalCookieConsent)
- @Html.SmartLabelFor(model => model.PrivacySettings.FullNameOnContactUsRequired) + @Html.SmartLabelFor(model => model.PrivacySettings.SameSiteMode) - @Html.SettingEditorFor(model => model.PrivacySettings.FullNameOnContactUsRequired) - @Html.ValidationMessageFor(model => model.PrivacySettings.FullNameOnContactUsRequired) + @Html.DropDownListForEnum(model => model.PrivacySettings.SameSiteMode) + @Html.ValidationMessageFor(model => model.PrivacySettings.SameSiteMode)
- @Html.SmartLabelFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) - @Html.SettingEditorFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) - @Html.ValidationMessageFor(model => model.PrivacySettings.FullNameOnProductRequestRequired) + +
+ + @T("Admin.Configuration.Settings.CustomerUser.Privacy.SameSiteMode.AdminInstruction") +
+
+
+ @T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.RegisterCookieInfo.Title") +
+
+ @T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AdminInstruction") +
+
+
-
- - @T("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AdminInstruction") -
-
+
+
+ Logo & Icons +
+
+
+ @Html.SmartLabelFor(model => model.LogoMediaFileId) + + @Html.EditorFor(model => model.LogoMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.LogoMediaFileId) +
+ @Html.SmartLabelFor(model => model.AppleTouchIconMediaFileId) + + @Html.EditorFor(model => model.AppleTouchIconMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.AppleTouchIconMediaFileId) +
+ @Html.SmartLabelFor(model => model.MsTileImageMediaFileId) + + @Html.EditorFor(model => model.MsTileImageMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.MsTileImageMediaFileId) +
+ @Html.SmartLabelFor(model => model.PngIconMediaFileId) + + @Html.EditorFor(model => model.PngIconMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.PngIconMediaFileId) +
+ @Html.SmartLabelFor(model => model.MsTileColor) + + @Html.EditorFor(model => model.MsTileColor) + @Html.ValidationMessageFor(model => model.MsTileColor) +
diff --git a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs index febc8c8850..73b49b8cee 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs @@ -1,7 +1,10 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Text; using System.Web.Mvc; +using System.Xml; using SmartStore.Core; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Domain.Catalog; @@ -528,9 +531,10 @@ public ActionResult ChangeTheme(string themeName, string returnUrl = null) [OutputCache(Duration=3600, VaryByCustom="Theme_Store")] public ActionResult Favicon() { + var store = Services.StoreContext.CurrentStore; var icons = new string[] { - "favicon-{0}.ico".FormatInvariant(Services.StoreContext.CurrentStore.Id), + "favicon-{0}.ico".FormatInvariant(store.Id), "favicon.ico" }; @@ -553,7 +557,11 @@ public ActionResult Favicon() var model = new FaviconModel() { Uploaded = true, - FaviconUrl = virtualPath + FaviconUrl = virtualPath, + AppleTouchIconId = store.AppleTouchIconMediaFileId, + MsTileColor = store.MsTileColor, + MsTileIconId = store.MsTileImageMediaFileId, + PngIconId = store.PngIconMediaFileId }; return PartialView(model); @@ -650,13 +658,67 @@ public ActionResult RobotsTextFile() sb.Append(newLine); } - Response.ContentType = "text/plain"; - Response.Write(sb.ToStringAndReturn()); + return Content(sb.ToStringAndReturn(), "text/plain"); + } + + public ActionResult BrowserConfigXmlFile() + { + var store = Services.StoreContext.CurrentStore; + + if (store.MsTileImageMediaFileId == 0 || !store.MsTileColor.HasValue()) + return null; + + XmlWriterSettings settings = new XmlWriterSettings(); + settings.Indent = true; + var sb = PooledStringBuilder.Rent(); + + using (XmlWriter writer = XmlWriter.Create(sb, settings)) + { + writer.WriteStartDocument(); + writer.WriteStartElement("browserconfig"); + writer.WriteStartElement("msapplication"); + writer.WriteStartElement("tile"); + + if (store.MsTileImageMediaFileId != 0) + { + writer.WriteStartElement("square70x70logo"); + writer.WriteAttributeString("src", "{0}".FormatWith(_mediaService.Value.GetUrl(store.MsTileImageMediaFileId, 70, host: string.Empty))); + writer.WriteString(""); + writer.WriteEndElement(); + + writer.WriteStartElement("square150x150logo"); + writer.WriteAttributeString("src", "{0}".FormatWith(_mediaService.Value.GetUrl(store.MsTileImageMediaFileId, 150, host: string.Empty))); + writer.WriteString(""); + writer.WriteEndElement(); + + writer.WriteStartElement("square310x310logo"); + writer.WriteAttributeString("src", "{0}".FormatWith(_mediaService.Value.GetUrl(store.MsTileImageMediaFileId, 310, host: string.Empty))); + writer.WriteString(""); + writer.WriteEndElement(); + + // New setting ? :-/ + writer.WriteStartElement("wide310x150logo"); + writer.WriteAttributeString("src", "{0}".FormatWith(_mediaService.Value.GetUrl(store.MsTileImageMediaFileId, 150, host: string.Empty))); + writer.WriteString(""); + writer.WriteEndElement(); + } + + if (store.MsTileColor.HasValue()) + { + writer.WriteElementString("TileColor", store.MsTileColor); + } + + writer.WriteEndElement(); // tile + writer.WriteEndElement(); // msapplication + writer.WriteEndElement(); // browserconfig + writer.WriteEndDocument(); + writer.Flush(); + } - return null; + return Content(sb.ToStringAndReturn(), "text/xml"); } - private IEnumerable GetLowerCaseVariants(IEnumerable disallows) + private IEnumerable GetLowerCaseVariants(IEnumerable disallows) { var other = new List(); foreach (var item in disallows) diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/1_StoreRoutes.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/1_StoreRoutes.cs index 2f2ec5a795..1cdcc7b402 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Routes/1_StoreRoutes.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Routes/1_StoreRoutes.cs @@ -359,6 +359,11 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) new { controller = "Common", action = "RobotsTextFile" }, new[] { "SmartStore.Web.Controllers" }); + routes.MapRoute("browserconfig.xml", + "browserconfig.xml", + new { controller = "Common", action = "BrowserConfigXmlFile" }, + new[] { "SmartStore.Web.Controllers" }); + routes.MapLocalizedRoute("Settings", "settings", new { controller = "Common", action = "Settings" }, diff --git a/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs b/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs index 10e4f6e8a4..570eef1e3c 100644 --- a/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs @@ -6,5 +6,9 @@ public partial class FaviconModel : ModelBase { public bool Uploaded { get; set; } public string FaviconUrl { get; set; } + public int AppleTouchIconId { get; set; } + public int PngIconId { get; set; } + public int MsTileIconId { get; set; } + public string MsTileColor { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml b/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml index 3f598237b8..bd5d47245d 100644 --- a/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml @@ -1,8 +1,44 @@ - @model FaviconModel +@model FaviconModel @using SmartStore.Web.Models.Common; @if (Model.Uploaded) { +} + +@if (Model.PngIconId != 0) +{ + @*16x16 (browser tabs), 32x32 (Taskbar), 96x96 (Desktop), 196x196 (Android Chrome)*@ + + + + + + +} + +@if (Model.AppleTouchIconId != 0) +{ + + + + + + + + + + +} + +@if (Model.MsTileIconId != 0) +{ + + if (Model.MsTileColor.HasValue()) + { + + } + + } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index cf6bc0c9f2..4c47c3bd63 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -166,6 +166,10 @@ + + + + From eafbf569e41644ef3bb923d6e9eed3a5838d2024 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 3 Sep 2020 21:19:40 +0200 Subject: [PATCH 148/695] Resolves #2040 Shipment templates show all products of the order instead of only those of the shipment --- changelog.md | 1 + .../MessageModelProvider.OrderParts.cs | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/changelog.md b/changelog.md index 7b36da7f01..5e89d1cf30 100644 --- a/changelog.md +++ b/changelog.md @@ -30,6 +30,7 @@ * The offset option skipped one record too much. * The XML export of CountryOfOrigin caused an error. * Message template attachments were not attached to the email. +* Shipment templates showed all products of the order instead of only those of the shipment. * EasyCredit: fixed "Could not convert setting 'EasyCreditSettings.LastPurchaseLimitUpdatedOn' to type 'DateTime'". diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs index f2a306fa7c..7ce9a9634f 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs @@ -385,12 +385,21 @@ protected virtual object CreateModelPart(Shipment part, MessageContext messageCo Guard.NotNull(messageContext, nameof(messageContext)); Guard.NotNull(part, nameof(part)); - var orderService = _services.Resolve(); - var orderItems = orderService.GetOrderItemsByOrderIds(new int[] { part.OrderId })[part.OrderId]; - var itemParts = orderItems - .Where(x => x.Product != null) - .Select(x => CreateModelPart(x, messageContext)) - .ToList(); + var itemParts = new List(); + var orderService = _services.Resolve(); + var orderItems = orderService.GetOrderItemsByOrderIds(new int[] { part.OrderId })[part.OrderId]; + var orderItemsDic = orderItems.ToDictionarySafe(x => x.Id); + + foreach (var shipmentItem in part.ShipmentItems) + { + if (orderItemsDic.TryGetValue(shipmentItem.OrderItemId, out var orderItem) && orderItem.Product != null) + { + var itemPart = CreateModelPart(orderItem, messageContext) as Dictionary; + itemPart["Qty"] = shipmentItem.Quantity; + + itemParts.Add(itemPart); + } + } var trackingUrl = part.TrackingUrl; From 7b0f05e704ee4a71351633ee231a638ad04aabd7 Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Thu, 3 Sep 2020 21:58:05 +0200 Subject: [PATCH 149/695] Manual revert of my commit from 3 Aug 2020 "Resolves #213: Allow special title and meta tags for home page" (7f3dee7) --- .../SmartStore.Core/Domain/Seo/SeoSettings.cs | 1 - .../Migrations/MigrationsConfiguration.cs | 6 ---- .../UI/PageAssetsBuilder.cs | 36 +++++++------------ .../Settings/GeneralCommonSettingsModel.cs | 3 -- .../Views/Setting/GeneralCommon.cshtml | 11 +----- 5 files changed, 13 insertions(+), 44 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs index edc2c4716f..4be4ab65a9 100644 --- a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs @@ -59,7 +59,6 @@ public SeoSettings() public string DefaultTitle { get; set; } = "Shop"; public string DefaultMetaKeywords { get; set; } = string.Empty; public string DefaultMetaDescription { get; set; } = string.Empty; - public bool UseDefaultsOnHomepageOnly { get; set; } public string MetaRobotsContent { get; set; } public bool ConvertNonWesternChars { get; set; } diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 53c94f6897..a7977bd510 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -198,12 +198,6 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "dass folgende Felder aktiviert und vom Kunden ausgefüllt sind:" + "
  • Vorname
  • Nachname
  • E-Mail
  • und alle Felder die im Tab \"Adressen\" als erforderlich ausgewählt sind
"); - builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.UseDefaultsOnHomepageOnly", - "Use defaults on Homepage only", - "Standards nur auf der Startseite verwenden", - "Determines whether the default meta informations are used only on the home page, rather than as defaults for every page.", - "Legt fest, ob die Standard-Meta-Informationen nur auf der Startseite anstatt als Standardeinstellung für jede Seite verwendet werden."); - builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.Cookies.AddCookieInfo.Title", "Add new cookie information", "Neue Cookie-Informationen hinzufügen"); diff --git a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs index 01f65ad0a6..cdf515d2ed 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs @@ -132,15 +132,10 @@ public void AddTitleParts(IEnumerable parts, bool append = false) public virtual string GenerateTitle(bool addDefaultTitle) { - var result = !_seoSettings.UseDefaultsOnHomepageOnly - ? _seoSettings.DefaultTitle - : _httpContext.Request.Path == "/" - ? _seoSettings.DefaultTitle - : ""; - if (_titleParts == null) - return result; - + return string.Empty; + + var result = string.Empty; var specificTitle = string.Join(_seoSettings.PageTitleSeparator, _titleParts.AsEnumerable().Reverse().ToArray()); if (specificTitle.HasValue()) { @@ -151,17 +146,13 @@ public virtual string GenerateTitle(bool addDefaultTitle) { case PageTitleSeoAdjustment.PagenameAfterStorename: { - result = result.HasValue() - ? string.Join(_seoSettings.PageTitleSeparator, result, specificTitle) - : specificTitle; + result = string.Join(_seoSettings.PageTitleSeparator, _seoSettings.DefaultTitle, specificTitle); } break; case PageTitleSeoAdjustment.StorenameAfterPagename: default: { - result = result.HasValue() - ? string.Join(_seoSettings.PageTitleSeparator, specificTitle, result) - : specificTitle; + result = string.Join(_seoSettings.PageTitleSeparator, specificTitle, _seoSettings.DefaultTitle); } break; } @@ -172,6 +163,11 @@ public virtual string GenerateTitle(bool addDefaultTitle) result = specificTitle; } } + else + { + // Store name only + result = _seoSettings.DefaultTitle; + } return result; } @@ -184,11 +180,7 @@ public void AddMetaDescriptionParts(IEnumerable parts, bool append = fal public virtual string GenerateMetaDescription() { - var result = !_seoSettings.UseDefaultsOnHomepageOnly - ? _seoSettings.DefaultMetaDescription - : _httpContext.Request.Path == "/" - ? _seoSettings.DefaultMetaDescription - : ""; + var result = _seoSettings.DefaultMetaDescription; if (_metaDescriptionParts == null) return result; @@ -210,11 +202,7 @@ public void AddMetaKeywordParts(IEnumerable parts, bool append = false) public virtual string GenerateMetaKeywords() { - var result = !_seoSettings.UseDefaultsOnHomepageOnly - ? _seoSettings.DefaultMetaKeywords - : _httpContext.Request.Path == "/" - ? _seoSettings.DefaultMetaKeywords - : ""; + var result = _seoSettings.DefaultMetaKeywords; if (_metaKeywordParts == null) return result; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs index 6fc073343b..06fafd2648 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs @@ -75,9 +75,6 @@ public partial class SeoSettingsModel [AllowHtml] public string DefaultMetaDescription { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.UseDefaultsOnHomepageOnly")] - public bool UseDefaultsOnHomepageOnly { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.MetaRobotsContent")] public string MetaRobotsContent { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/GeneralCommon.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/GeneralCommon.cshtml index 73ffe20d00..78dc0008ff 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/GeneralCommon.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/GeneralCommon.cshtml @@ -129,16 +129,7 @@ @Html.SettingEditorFor(model => model.SeoSettings.DefaultMetaDescription) @Html.ValidationMessageFor(model => model.SeoSettings.DefaultMetaDescription) - - - - @Html.SmartLabelFor(model => model.SeoSettings.UseDefaultsOnHomepageOnly) - - - @Html.SettingEditorFor(model => model.SeoSettings.UseDefaultsOnHomepageOnly, Html.CheckBoxFor(model => model.SeoSettings.UseDefaultsOnHomepageOnly)) - @Html.ValidationMessageFor(model => model.SeoSettings.UseDefaultsOnHomepageOnly) - - + @Html.SmartLabelFor(model => model.SeoSettings.MetaRobotsContent) From 2328f4c329e10ccdf24ffc5c5493fecff5447a69 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 4 Sep 2020 04:15:32 +0200 Subject: [PATCH 150/695] DbSaveHook: support for hooks that are bound to context types --- .../SmartStore.Core/Data/Hooks/DbSaveHook.cs | 4 +- .../Data/Hooks/DefaultDbHookHandler.cs | 83 +++++++----------- .../Data/Hooks/HookMetadata.cs | 10 ++- .../Data/Hooks/HookedEntity.cs | 37 +++++--- .../SmartStore.Core/Data/Hooks/IDbHook.cs | 9 -- .../SmartStore.Core/Data/Hooks/IDbLoadHook.cs | 13 --- .../SmartStore.Core/Data/Hooks/IDbSaveHook.cs | 13 ++- .../Extensions/TypeExtensions.cs | 6 +- .../Properties/AssemblyInfo.cs | 1 + .../SmartStore.Core/SmartStore.Core.csproj | 2 - .../ObjectContextBase.SaveChanges.cs | 15 +--- .../SmartObjectContextSaveHook.cs | 10 +++ .../SmartStore.Data/SmartStore.Data.csproj | 1 + .../Catalog/CategoryTreeChangeHandler.cs | 3 +- .../Cms/LinkResolverInvalidator.cs | 3 + .../Hooks/AclEntityHook.cs | 3 +- .../Hooks/AuditableHook.cs | 3 +- .../Hooks/LocalizedEntityHook.cs | 3 +- .../Hooks/SettingSaveHook.cs | 3 +- .../Hooks/SlugSupportedHook.cs | 3 +- .../Hooks/SoftDeletableHook.cs | 2 +- .../Hooks/StoreMappingEntityHook.cs | 3 +- .../Media/Tracking/MediaTrackerHook.cs | 2 +- .../Payments/CapturePaymentHook.cs | 37 ++++---- .../SmartStore.Services/ServiceCacheBuster.cs | 2 +- .../DependencyRegistrar.cs | 87 +++++++++++++------ .../Controllers/InstallController.cs | 2 +- .../Cache/ModelCacheEventConsumer.cs | 3 +- .../Data/Hooks/DefaultDbHookHandlerTests.cs | 8 +- .../Data/Hooks/FakeHooks.cs | 10 +-- .../Data/Hooks/HookedEntityMock.cs | 2 + 31 files changed, 212 insertions(+), 171 deletions(-) delete mode 100644 src/Libraries/SmartStore.Core/Data/Hooks/IDbHook.cs delete mode 100644 src/Libraries/SmartStore.Core/Data/Hooks/IDbLoadHook.cs create mode 100644 src/Libraries/SmartStore.Data/SmartObjectContextSaveHook.cs diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/DbSaveHook.cs b/src/Libraries/SmartStore.Core/Data/Hooks/DbSaveHook.cs index 09b74716ac..a2ca148f98 100644 --- a/src/Libraries/SmartStore.Core/Data/Hooks/DbSaveHook.cs +++ b/src/Libraries/SmartStore.Core/Data/Hooks/DbSaveHook.cs @@ -2,7 +2,9 @@ namespace SmartStore.Core.Data.Hooks { - public abstract class DbSaveHook : IDbSaveHook where TEntity : class + public abstract class DbSaveHook : IDbSaveHook + where TContext : IDbContext + where TEntity : class { public virtual void OnBeforeSave(IHookedEntity entry) { diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/DefaultDbHookHandler.cs b/src/Libraries/SmartStore.Core/Data/Hooks/DefaultDbHookHandler.cs index 57fbbe6f48..3e5d2ce8f4 100644 --- a/src/Libraries/SmartStore.Core/Data/Hooks/DefaultDbHookHandler.cs +++ b/src/Libraries/SmartStore.Core/Data/Hooks/DefaultDbHookHandler.cs @@ -9,9 +9,9 @@ namespace SmartStore.Core.Data.Hooks { public class DefaultDbHookHandler : IDbHookHandler { - private readonly IList> _saveHooks; + private readonly IEnumerable> _saveHooks; - private readonly Multimap _hooksRequestCache = new Multimap(); + private readonly Multimap _hooksRequestCache = new Multimap(); // Prevents repetitive hooking of the same entity/state/[pre|post] combination within a single request private readonly HashSet _hookedEntities = new HashSet(); @@ -19,15 +19,15 @@ public class DefaultDbHookHandler : IDbHookHandler private static HashSet _importantSaveHookTypes; private readonly static object _lock = new object(); - // Contains all IDbHook/EntityType/State/Stage combinations in which + // Contains all IDbSaveHook/EntityType/State/Stage combinations in which // the implementor threw either NotImplementedException or NotSupportedException. // This boosts performance because these VOID combinations are not processed again // and frees us mostly from the obligation always to detect changes. private readonly static HashSet _voidHooks = new HashSet(); - public DefaultDbHookHandler(IEnumerable> hooks) + public DefaultDbHookHandler(IEnumerable> hooks) { - _saveHooks = hooks.Where(x => x.Metadata.IsLoadHook == false).ToList(); + _saveHooks = hooks; } public ILogger Logger @@ -87,7 +87,7 @@ public IEnumerable TriggerPreSaveHooks(IEnumerable e } catch (Exception ex) when (ex is NotImplementedException || ex is NotSupportedException) { - RegisterVoidHook(hook, e.EntityType, e.InitialState, HookStage.PreSave); + RegisterVoidHook(hook, e, HookStage.PreSave); } catch (Exception ex) { @@ -127,7 +127,7 @@ public IEnumerable TriggerPostSaveHooks(IEnumerable continue; } - var hooks = GetSaveHookInstancesFor(e, HookStage.PostSave, importantHooksOnly).ToList(); + var hooks = GetSaveHookInstancesFor(e, HookStage.PostSave, importantHooksOnly); foreach (var hook in hooks) { @@ -140,7 +140,7 @@ public IEnumerable TriggerPostSaveHooks(IEnumerable } catch (Exception ex) when (ex is NotImplementedException || ex is NotSupportedException) { - RegisterVoidHook(hook, e.EntityType, e.InitialState, HookStage.PostSave); + RegisterVoidHook(hook, e, HookStage.PostSave); } catch (Exception ex) { @@ -154,35 +154,17 @@ public IEnumerable TriggerPostSaveHooks(IEnumerable return processedHooks; } - [MethodImpl(MethodImplOptions.AggressiveInlining)] private IEnumerable GetSaveHookInstancesFor(IHookedEntity entry, HookStage stage, bool importantOnly) { - return GetHookInstancesFor( - entry.EntityType, - entry.InitialState, - stage, - importantOnly, - _saveHooks, - _importantSaveHookTypes); - } - - private IEnumerable GetHookInstancesFor( - Type entityType, - EntityState entityState, - HookStage stage, - bool importantOnly, - IList> hookList, - HashSet importantHookTypes) where THook : IDbHook - { - IEnumerable hooks; - - if (entityType == null) + if (entry.EntityType == null) { - return Enumerable.Empty(); + return Enumerable.Empty(); } + IEnumerable hooks; + // For request cache lookup - var requestKey = new RequestHookKey(entityType, entityState, stage, importantOnly); + var requestKey = new RequestHookKey(entry, stage, importantOnly); if (_hooksRequestCache.ContainsKey(requestKey)) { @@ -190,20 +172,22 @@ private IEnumerable GetHookInstancesFor( } else { - hooks = hookList + hooks = _saveHooks + // Reduce by data context types + .Where(x => x.Metadata.DbContextType.IsAssignableFrom(entry.ContextType)) // Reduce by entity types which can be processed by this hook - .Where(x => x.Metadata.HookedType.IsAssignableFrom(entityType)) + .Where(x => x.Metadata.HookedType.IsAssignableFrom(entry.EntityType)) // When importantOnly, only include hook types with [ImportantAttribute] - .Where(x => !importantOnly || importantHookTypes.Contains(x.Metadata.ImplType)) + .Where(x => !importantOnly || _importantSaveHookTypes.Contains(x.Metadata.ImplType)) // Exclude void hooks (hooks known to be useless for the current EntityType/State/Stage combination) - .Where(x => !_voidHooks.Contains(new HookKey(x.Metadata.ImplType, entityType, entityState, stage))) + .Where(x => !_voidHooks.Contains(new HookKey(x.Metadata.ImplType, entry, stage))) .Select(x => x.Value) .ToArray(); _hooksRequestCache.AddRange(requestKey, hooks); } - return hooks.Cast(); + return hooks; } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -214,7 +198,7 @@ private bool HandledAlready(IHookedEntity entry, HookStage stage) if (entity == null || entity.IsTransientRecord()) return false; - var key = new HookedEntityKey(entry.EntityType, entity.Id, entry.InitialState, stage); + var key = new HookedEntityKey(entry, stage, entity.Id); if (_hookedEntities.Contains(key)) { return true; @@ -225,48 +209,47 @@ private bool HandledAlready(IHookedEntity entry, HookStage stage) } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void RegisterVoidHook(IDbHook hook, Type entityType, EntityState entityState, HookStage stage) + private void RegisterVoidHook(IDbSaveHook hook, IHookedEntity entry, HookStage stage) { var hookType = hook.GetType(); // Unregister from request cache (if cached) - _hooksRequestCache.Remove(new RequestHookKey(entityType, entityState, stage, false), hook); - _hooksRequestCache.Remove(new RequestHookKey(entityType, entityState, stage, true), hook); + _hooksRequestCache.Remove(new RequestHookKey(entry, stage, false), hook); + _hooksRequestCache.Remove(new RequestHookKey(entry, stage, true), hook); lock (_lock) { // Add to static void hooks set - _voidHooks.Add(new HookKey(hookType, entityType, entityState, stage)); + _voidHooks.Add(new HookKey(hookType, entry, stage)); } } enum HookStage { - Load, PreSave, PostSave } - class HookedEntityKey : Tuple + class HookedEntityKey : Tuple { - public HookedEntityKey(Type entityType, int entityId, EntityState initialState, HookStage stage) - : base(entityType, entityId, initialState, stage) + public HookedEntityKey(IHookedEntity entry, HookStage stage, int entityId) + : base(entry.ContextType, entry.EntityType, entityId, entry.InitialState, stage) { } } - class RequestHookKey : Tuple + class RequestHookKey : Tuple { - public RequestHookKey(Type entityType, EntityState entityState, HookStage stage, bool importantOnly) - : base(entityType, entityState, stage, importantOnly) + public RequestHookKey(IHookedEntity entry, HookStage stage, bool importantOnly) + : base(entry.ContextType, entry.EntityType, entry.InitialState, stage, importantOnly) { } } class HookKey : Tuple { - public HookKey(Type hookType, Type entityType, EntityState entityState, HookStage stage) - : base(hookType, entityType, entityState, stage) + public HookKey(Type hookType, IHookedEntity entry, HookStage stage) + : base(hookType, entry.EntityType, entry.InitialState, stage) { } } diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/HookMetadata.cs b/src/Libraries/SmartStore.Core/Data/Hooks/HookMetadata.cs index f1f81574a2..da6e3d902d 100644 --- a/src/Libraries/SmartStore.Core/Data/Hooks/HookMetadata.cs +++ b/src/Libraries/SmartStore.Core/Data/Hooks/HookMetadata.cs @@ -14,20 +14,26 @@ public class HookMetadata /// public Type ImplType { get; set; } - public bool IsLoadHook { get; set; } + /// + /// The impl type of to which the hook belongs to. + /// + public Type DbContextType { get; set; } /// /// Whether the hook should run in any case, even if hooking has been turned off. /// public bool Important { get; set; } - public static HookMetadata Create(Type hookedType, bool important = false) where THook : IDbHook + public static HookMetadata Create(Type hookedType, bool important = false) + where THook : IDbSaveHook + where TContext : IDbContext { Guard.NotNull(hookedType, nameof(hookedType)); return new HookMetadata { ImplType = typeof(THook), + DbContextType = typeof(TContext), HookedType = hookedType, Important = important }; diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs index 2175d189d9..5cfcd7e2ed 100644 --- a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs +++ b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs @@ -6,13 +6,24 @@ namespace SmartStore.Core.Data.Hooks { public interface IHookedEntity { + /// + /// Gets the impl type of the data context that triggered the hook. + /// + Type ContextType { get; } + /// /// Gets the hooked entity entry /// DbEntityEntry Entry { get; } + /// + /// Gets the hooked entity instance + /// BaseEntity Entity { get; } + /// + /// Gets the unproxied type of the hooked entity instance. + /// Type EntityType { get; } /// @@ -50,29 +61,36 @@ public class HookedEntity : IHookedEntity { private Type _entityType; - public HookedEntity(DbEntityEntry entry) + public HookedEntity(IDbContext context, DbEntityEntry entry) + : this(context.GetType(), entry) + { + } + + internal HookedEntity(Type contextType, DbEntityEntry entry) { + ContextType = contextType; Entry = entry; InitialState = (EntityState)entry.State; } + public Type ContextType + { + get; + } + public DbEntityEntry Entry { get; - private set; } public BaseEntity Entity { - get { return Entry.Entity as BaseEntity; } + get => Entry.Entity as BaseEntity; } public Type EntityType { - get - { - return _entityType ?? (_entityType = this.Entity?.GetUnproxiedType()); - } + get => _entityType ?? (_entityType = this.Entity?.GetUnproxiedType()); } public EntityState InitialState @@ -95,10 +113,7 @@ public EntityState State public bool HasStateChanged { - get - { - return InitialState != State; - } + get => InitialState != State; } public bool IsPropertyModified(string propertyName) diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/IDbHook.cs b/src/Libraries/SmartStore.Core/Data/Hooks/IDbHook.cs deleted file mode 100644 index 14194258c8..0000000000 --- a/src/Libraries/SmartStore.Core/Data/Hooks/IDbHook.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace SmartStore.Core.Data.Hooks -{ - /// - /// Marker interface for the hooking framework - /// - public interface IDbHook - { - } -} diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/IDbLoadHook.cs b/src/Libraries/SmartStore.Core/Data/Hooks/IDbLoadHook.cs deleted file mode 100644 index 669ffc9dec..0000000000 --- a/src/Libraries/SmartStore.Core/Data/Hooks/IDbLoadHook.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace SmartStore.Core.Data.Hooks -{ - /// - /// A hook that is executed right after an entity has been loaded from database and materialized. - /// - [Obsolete("Not called anymore for performance reasons.")] - public interface IDbLoadHook : IDbHook - { - void OnLoaded(BaseEntity entity); - } -} diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/IDbSaveHook.cs b/src/Libraries/SmartStore.Core/Data/Hooks/IDbSaveHook.cs index 3a1161aa39..ebaa27519a 100644 --- a/src/Libraries/SmartStore.Core/Data/Hooks/IDbSaveHook.cs +++ b/src/Libraries/SmartStore.Core/Data/Hooks/IDbSaveHook.cs @@ -9,7 +9,7 @@ namespace SmartStore.Core.Data.Hooks /// that it never should process the hook again for the current /// EntityType/State/Stage combination. /// - public interface IDbSaveHook : IDbHook + public interface IDbSaveHook { void OnBeforeSave(IHookedEntity entry); @@ -25,4 +25,15 @@ public interface IDbSaveHook : IDbHook /// void OnAfterSaveCompleted(); } + + /// + /// + /// Restricts the hook to the specified data context implementation type. + /// To restrict to the core data context, implement the parameterless instead. + /// Abstract base types can also be specified in order to bypass restrictions. + /// + public interface IDbSaveHook : IDbSaveHook + where TContext : IDbContext + { + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/TypeExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/TypeExtensions.cs index 07e188fbff..234477a8af 100644 --- a/src/Libraries/SmartStore.Core/Extensions/TypeExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/TypeExtensions.cs @@ -237,9 +237,10 @@ public static bool HasDefaultConstructor(this Type type) [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsSubClass(this Type type, Type check) { - return IsSubClass(type, check, out Type _); + return IsSubClass(type, check, out _); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsSubClass(this Type type, Type check, out Type implementingType) { if (type == null) @@ -279,7 +280,8 @@ private static bool IsSubClassInternal(Type initialType, Type currentType, Type { if (IsSubClassInternal(initialType, currentType.GetGenericTypeDefinition(), check, out implementingType)) { - implementingType = currentType; + // INFO: this seems to be wrong! Don't we need the implementing base type (?!?) + implementingType = currentType; return true; } } diff --git a/src/Libraries/SmartStore.Core/Properties/AssemblyInfo.cs b/src/Libraries/SmartStore.Core/Properties/AssemblyInfo.cs index 24146e3f54..7f42ecee30 100644 --- a/src/Libraries/SmartStore.Core/Properties/AssemblyInfo.cs +++ b/src/Libraries/SmartStore.Core/Properties/AssemblyInfo.cs @@ -3,6 +3,7 @@ [assembly: AssemblyTitle("SmartStore.Core")] [assembly: InternalsVisibleTo("SmartStore.Services")] +[assembly: InternalsVisibleTo("SmartStore.Data")] [assembly: InternalsVisibleTo("SmartStore.Core.Tests")] [assembly: InternalsVisibleTo("SmartStore.Services.Tests")] [assembly: InternalsVisibleTo("SmartStore.Web.Mvc.Tests")] diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 76be3e8816..28880ddd54 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -208,8 +208,6 @@ - - diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs index 63d32c8111..d0877396da 100644 --- a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs +++ b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs @@ -144,17 +144,6 @@ internal bool IsInSaveOperation get { return _currentSaveOperation != null; } } - private bool IsHookableEntry(IHookedEntity entry) - { - var entity = entry.Entity; - if (entity == null) - { - return false; - } - - return IsHookableEntityType(entry.EntityType); - } - private static bool IsHookableEntityType(Type entityType) { var isHookable = _hookableEntities.GetOrAdd(entityType, t => @@ -280,8 +269,10 @@ private IEnumerable PreExecute(out IEnumerable chang if (enableHooks) { + var contextType = _ctx.GetType(); + changedHookEntries = _changedEntries - .Select(x => new HookedEntity(x)) + .Select(x => new HookedEntity(contextType, x)) .Where(x => IsHookableEntityType(x.EntityType)) .ToArray(); diff --git a/src/Libraries/SmartStore.Data/SmartObjectContextSaveHook.cs b/src/Libraries/SmartStore.Data/SmartObjectContextSaveHook.cs new file mode 100644 index 0000000000..dd36228341 --- /dev/null +++ b/src/Libraries/SmartStore.Data/SmartObjectContextSaveHook.cs @@ -0,0 +1,10 @@ +using System; +using SmartStore.Data; + +namespace SmartStore.Core.Data.Hooks +{ + public abstract class DbSaveHook : DbSaveHook + where TEntity : class + { + } +} \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index 4d7ccd8c58..c9a6531718 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -567,6 +567,7 @@ + diff --git a/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs b/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs index 7bd3a3ab3d..3a7081da8e 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs @@ -12,6 +12,7 @@ using SmartStore.Core.Domain.Stores; using SmartStore.Core.Events; using SmartStore.Core.Search; +using SmartStore.Data; namespace SmartStore.Services.Catalog { @@ -35,7 +36,7 @@ public CategoryTreeChangedEvent(CategoryTreeChangeReason reason) public CategoryTreeChangeReason Reason { get; private set; } } - public class CategoryTreeChangeHook : IDbSaveHook, IConsumer + public class CategoryTreeChangeHook : IDbSaveHook, IConsumer { private readonly ICommonServices _services; private readonly ICategoryService _categoryService; diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolverInvalidator.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolverInvalidator.cs index 2eab564051..826bd143c9 100644 --- a/src/Libraries/SmartStore.Services/Cms/LinkResolverInvalidator.cs +++ b/src/Libraries/SmartStore.Services/Cms/LinkResolverInvalidator.cs @@ -46,6 +46,9 @@ public override void OnBeforeSave(IHookedEntity entry) var e = entry.Entity; var evict = e is Topic || e is Product || e is Category || e is Manufacturer || e is StoreMapping || e is UrlRecord; + if (!evict) + throw new NotSupportedException(); // Perf + if (evict && entry.InitialState == EntityState.Modified) { var modProps = entry.Entry.GetModifiedProperties(_services.DbContext); diff --git a/src/Libraries/SmartStore.Services/Hooks/AclEntityHook.cs b/src/Libraries/SmartStore.Services/Hooks/AclEntityHook.cs index b1518ba862..9f760b8536 100644 --- a/src/Libraries/SmartStore.Services/Hooks/AclEntityHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/AclEntityHook.cs @@ -3,11 +3,12 @@ using SmartStore.Core.Data; using SmartStore.Core.Data.Hooks; using SmartStore.Core.Domain.Security; +using SmartStore.Data; using SmartStore.Services.Security; namespace SmartStore.Services.Common { - public class AclEntityHook : DbSaveHook + public class AclEntityHook : DbSaveHook { private readonly Lazy _aclService; private readonly HashSet _toDelete = new HashSet(); diff --git a/src/Libraries/SmartStore.Services/Hooks/AuditableHook.cs b/src/Libraries/SmartStore.Services/Hooks/AuditableHook.cs index cb22b6a757..cee9a54f4f 100644 --- a/src/Libraries/SmartStore.Services/Hooks/AuditableHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/AuditableHook.cs @@ -1,11 +1,12 @@ using System; using SmartStore.Core; using SmartStore.Core.Data.Hooks; +using SmartStore.Data; namespace SmartStore.Services.Hooks { [Important] - public class AuditableHook : DbSaveHook + public class AuditableHook : DbSaveHook { protected override void OnInserting(IAuditable entity, IHookedEntity entry) { diff --git a/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityHook.cs b/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityHook.cs index c0f0942078..d63262c6d8 100644 --- a/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityHook.cs @@ -3,11 +3,12 @@ using SmartStore.Core.Data; using SmartStore.Core.Data.Hooks; using SmartStore.Core.Domain.Localization; +using SmartStore.Data; using SmartStore.Services.Localization; namespace SmartStore.Services.Hooks { - public class LocalizedEntityHook : DbSaveHook + public class LocalizedEntityHook : DbSaveHook { private readonly Lazy _localizedEntityService; private readonly HashSet _toDelete = new HashSet(); diff --git a/src/Libraries/SmartStore.Services/Hooks/SettingSaveHook.cs b/src/Libraries/SmartStore.Services/Hooks/SettingSaveHook.cs index 4e1e9fea79..9d1e7fcb8c 100644 --- a/src/Libraries/SmartStore.Services/Hooks/SettingSaveHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/SettingSaveHook.cs @@ -10,8 +10,7 @@ public class SettingSaveHook : DbSaveHook private readonly ICustomerActivityService _customerActivityService; private readonly ILocalizationService _localizationService; - public SettingSaveHook(ICustomerActivityService customerActivityService, - ILocalizationService localizationService) + public SettingSaveHook(ICustomerActivityService customerActivityService, ILocalizationService localizationService) { _customerActivityService = customerActivityService; _localizationService = localizationService; diff --git a/src/Libraries/SmartStore.Services/Hooks/SlugSupportedHook.cs b/src/Libraries/SmartStore.Services/Hooks/SlugSupportedHook.cs index e744e41f2d..430bd301d0 100644 --- a/src/Libraries/SmartStore.Services/Hooks/SlugSupportedHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/SlugSupportedHook.cs @@ -3,11 +3,12 @@ using SmartStore.Core.Data; using SmartStore.Core.Data.Hooks; using SmartStore.Core.Domain.Seo; +using SmartStore.Data; using SmartStore.Services.Seo; namespace SmartStore.Services.Common { - public class SlugSupportedHook : DbSaveHook + public class SlugSupportedHook : DbSaveHook { private readonly Lazy _urlRecordService; private readonly HashSet _toDelete = new HashSet(); diff --git a/src/Libraries/SmartStore.Services/Hooks/SoftDeletableHook.cs b/src/Libraries/SmartStore.Services/Hooks/SoftDeletableHook.cs index 74eddf6724..42c9195047 100644 --- a/src/Libraries/SmartStore.Services/Hooks/SoftDeletableHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/SoftDeletableHook.cs @@ -17,7 +17,7 @@ namespace SmartStore.Services.Hooks { - public class SoftDeletablePreUpdateHook : DbSaveHook + public class SoftDeletablePreUpdateHook : DbSaveHook { private readonly IComponentContext _ctx; diff --git a/src/Libraries/SmartStore.Services/Hooks/StoreMappingEntityHook.cs b/src/Libraries/SmartStore.Services/Hooks/StoreMappingEntityHook.cs index 422ba4c281..f23c9b9f87 100644 --- a/src/Libraries/SmartStore.Services/Hooks/StoreMappingEntityHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/StoreMappingEntityHook.cs @@ -4,11 +4,12 @@ using SmartStore.Core.Data; using SmartStore.Core.Data.Hooks; using SmartStore.Core.Domain.Stores; +using SmartStore.Data; using SmartStore.Services.Stores; namespace SmartStore.Services.Common { - public class StoreMappingEntityHook : DbSaveHook + public class StoreMappingEntityHook : DbSaveHook { private readonly Lazy _storeMappingService; private readonly HashSet _toDelete = new HashSet(); diff --git a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTrackerHook.cs b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTrackerHook.cs index 2f355b3887..c6be2e0662 100644 --- a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTrackerHook.cs +++ b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTrackerHook.cs @@ -10,7 +10,7 @@ namespace SmartStore.Services.Media { [Important] - public sealed class MediaTrackerHook : DbSaveHook + public sealed class MediaTrackerHook : DbSaveHook { // Track items for the current (SaveChanges) unit. private readonly HashSet _actionsUnit = new HashSet(); diff --git a/src/Libraries/SmartStore.Services/Payments/CapturePaymentHook.cs b/src/Libraries/SmartStore.Services/Payments/CapturePaymentHook.cs index 1b30b02387..22ab547627 100644 --- a/src/Libraries/SmartStore.Services/Payments/CapturePaymentHook.cs +++ b/src/Libraries/SmartStore.Services/Payments/CapturePaymentHook.cs @@ -40,32 +40,29 @@ private bool IsStatusPropertyModifiedTo(IHookedEntity entry, string propertyName protected override void OnUpdating(Order entity, IHookedEntity entry) { - if (entry.State == Core.Data.EntityState.Modified) - { - var isShipped = IsStatusPropertyModifiedTo(entry, nameof(entity.ShippingStatusId), (int)ShippingStatus.Shipped); - var isDelivered = IsStatusPropertyModifiedTo(entry, nameof(entity.ShippingStatusId), (int)ShippingStatus.Delivered); + var isShipped = IsStatusPropertyModifiedTo(entry, nameof(entity.ShippingStatusId), (int)ShippingStatus.Shipped); + var isDelivered = IsStatusPropertyModifiedTo(entry, nameof(entity.ShippingStatusId), (int)ShippingStatus.Delivered); - if (isShipped || isDelivered) + if (isShipped || isDelivered) + { + var settings = _services.Value.Settings.LoadSetting(entity.StoreId); + if (settings.CapturePaymentReason.HasValue) { - var settings = _services.Value.Settings.LoadSetting(entity.StoreId); - if (settings.CapturePaymentReason.HasValue) + if (isShipped && settings.CapturePaymentReason.Value == CapturePaymentReason.OrderShipped) + { + _toCapture.Add(entity); + } + else if (isDelivered && settings.CapturePaymentReason.Value == CapturePaymentReason.OrderDelivered) { - if (isShipped && settings.CapturePaymentReason.Value == CapturePaymentReason.OrderShipped) - { - _toCapture.Add(entity); - } - else if (isDelivered && settings.CapturePaymentReason.Value == CapturePaymentReason.OrderDelivered) - { - _toCapture.Add(entity); - } + _toCapture.Add(entity); } } - - //if (IsStatusPropertyModifiedTo(entry, nameof(entity.OrderStatusId), (int)OrderStatus.Complete)) - //{ - // That's too late. The payment is already marked as paid and the capture process would never be executed. - //} } + + //if (IsStatusPropertyModifiedTo(entry, nameof(entity.OrderStatusId), (int)OrderStatus.Complete)) + //{ + // That's too late. The payment is already marked as paid and the capture process would never be executed. + //} } public override void OnAfterSave(IHookedEntity entry) diff --git a/src/Libraries/SmartStore.Services/ServiceCacheBuster.cs b/src/Libraries/SmartStore.Services/ServiceCacheBuster.cs index feaca72088..165f9c78ca 100644 --- a/src/Libraries/SmartStore.Services/ServiceCacheBuster.cs +++ b/src/Libraries/SmartStore.Services/ServiceCacheBuster.cs @@ -21,7 +21,7 @@ public ServiceCacheBuster(ICacheManager cacheManager) protected override void OnInserted(BaseEntity entity, IHookedEntity entry) { if (entry.EntityType != typeof(Store) && entry.EntityType != typeof(Language)) - throw new NotImplementedException(); + throw new NotSupportedException(); _cacheManager.Remove(STORE_LANGUAGE_MAP_KEY); } diff --git a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs index 7f95371ce1..9675905c1d 100644 --- a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs +++ b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs @@ -357,7 +357,57 @@ public DbModule(ITypeFinder typeFinder) { _typeFinder = typeFinder; } - + + private static (Type ContextType, Type EntityType) DiscoverHookTypes(Type type) + { + var x = type.BaseType; + while (x != null && x != typeof(object)) + { + if (x.IsGenericType) + { + var gtd = x.GetGenericTypeDefinition(); + if (gtd == typeof(DbSaveHook<>)) + { + return (typeof(SmartObjectContext), x.GetGenericArguments()[0]); + } + if (gtd == typeof(DbSaveHook<,>)) + { + var args = x.GetGenericArguments(); + return (args[0], args[1]); + } + } + + x = x.BaseType; + } + + foreach (var intface in type.GetInterfaces()) + { + if (intface.IsGenericType) + { + var gtd = intface.GetGenericTypeDefinition(); + if (gtd == typeof(IDbSaveHook<>)) + { + return (intface.GetGenericArguments()[0], typeof(BaseEntity)); + } + } + } + + return (typeof(SmartObjectContext), typeof(BaseEntity)); + + //if (type.IsSubClass(typeof(DbSaveHook<,>), out Type baseType)) + //{ + // var args = baseType.GetGenericArguments(); + // return (args[0], args[1]); + //} + //else if (type.IsSubClass(typeof(IDbSaveHook<>), out baseType)) + //{ + // var args = baseType.GetGenericArguments(); + // return (args[0], typeof(BaseEntity)); + //} + + //return (typeof(SmartObjectContext), typeof(BaseEntity)); + } + protected override void Load(ContainerBuilder builder) { builder.Register(c => DataSettings.Current).As().InstancePerDependency(); @@ -372,37 +422,22 @@ protected override void Load(ContainerBuilder builder) if (DataSettings.DatabaseIsInstalled()) { - // register DB Hooks (only when app was installed properly) - - Type findHookedType(Type t) - { - var x = t; - while (x != null) - { - if (x.IsGenericType) - { - return x.GetGenericArguments()[0]; - } - x = x.BaseType; - } - - return typeof(BaseEntity); - } + // Register DB Hooks (only when app was installed properly) - var hooks = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); - foreach (var hook in hooks) + var hookTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); + foreach (var hookType in hookTypes) { - var hookedType = findHookedType(hook); + var types = DiscoverHookTypes(hookType); - var registration = builder.RegisterType(hook) - .As() + var registration = builder.RegisterType(hookType) + .As() .InstancePerRequest() .WithMetadata(m => { - m.For(em => em.HookedType, hookedType); - m.For(em => em.ImplType, hook); - m.For(em => em.IsLoadHook, false); - m.For(em => em.Important, hook.HasAttribute(false)); + m.For(em => em.HookedType, types.EntityType); + m.For(em => em.ImplType, hookType); + m.For(em => em.DbContextType, types.ContextType ?? typeof(SmartObjectContext)); + m.For(em => em.Important, hookType.HasAttribute(false)); }); } diff --git a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs index 6cb7447ef3..86116f87d2 100644 --- a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs @@ -521,7 +521,7 @@ protected virtual InstallationResult InstallCore(ILifetimeScope scope, InstallMo // AuditableHook must run during install dbContext.DbHookHandler = new DefaultDbHookHandler(new[] { - new Lazy(() => new AuditableHook(), HookMetadata.Create(typeof(IAuditable), true), false) + new Lazy(() => new AuditableHook(), HookMetadata.Create(typeof(IAuditable), true), false) }); // IMPORTANT: Migration would run way too early otherwise diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Cache/ModelCacheEventConsumer.cs b/src/Presentation/SmartStore.Web/Infrastructure/Cache/ModelCacheEventConsumer.cs index dff42588a2..39b904b8bf 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Cache/ModelCacheEventConsumer.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Cache/ModelCacheEventConsumer.cs @@ -12,11 +12,12 @@ using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Polls; using SmartStore.Core.Domain.Topics; +using SmartStore.Data; using SmartStore.Utilities; namespace SmartStore.Web.Infrastructure.Cache { - public partial class ModelCacheEventConsumer : IDbSaveHook + public partial class ModelCacheEventConsumer : IDbSaveHook { /// /// Key for ManufacturerNavigationModel caching diff --git a/src/Tests/SmartStore.Core.Tests/Data/Hooks/DefaultDbHookHandlerTests.cs b/src/Tests/SmartStore.Core.Tests/Data/Hooks/DefaultDbHookHandlerTests.cs index e2de1576d1..f6a02ed371 100644 --- a/src/Tests/SmartStore.Core.Tests/Data/Hooks/DefaultDbHookHandlerTests.cs +++ b/src/Tests/SmartStore.Core.Tests/Data/Hooks/DefaultDbHookHandlerTests.cs @@ -22,7 +22,7 @@ namespace SmartStore.Core.Tests.Data.Hooks [TestFixture] public class DefaultDbHookHandlerTests { - private Lazy[] _hooks; + private Lazy[] _hooks; private IDbHookHandler _handler; [SetUp] @@ -46,7 +46,7 @@ private ICollection GetExpectedSaveHooks(IEnumerable entrie { var hset = new HashSet(); - foreach (var hook in _hooks.Where(x => x.Metadata.IsLoadHook == false)) + foreach (var hook in _hooks) { foreach (var e in entries) { @@ -144,9 +144,9 @@ public void Can_handle_importance() return new HookedEntityMock(new T(), state); } - private static Lazy CreateHook() where THook : IDbHook, new() where TEntity : class + private static Lazy CreateHook() where THook : IDbSaveHook, new() where TEntity : class { - var hook = new Lazy(() => new THook(), new HookMetadata + var hook = new Lazy(() => new THook(), new HookMetadata { HookedType = typeof(TEntity), ImplType = typeof(THook), diff --git a/src/Tests/SmartStore.Core.Tests/Data/Hooks/FakeHooks.cs b/src/Tests/SmartStore.Core.Tests/Data/Hooks/FakeHooks.cs index 4caabd31f5..483cba176c 100644 --- a/src/Tests/SmartStore.Core.Tests/Data/Hooks/FakeHooks.cs +++ b/src/Tests/SmartStore.Core.Tests/Data/Hooks/FakeHooks.cs @@ -11,7 +11,7 @@ namespace SmartStore.Core.Tests.Data.Hooks { - internal class Hook_Entity_Inserted_Deleted_Update : DbSaveHook + internal class Hook_Entity_Inserted_Deleted_Update : DbSaveHook { protected override void OnInserted(BaseEntity entity, IHookedEntity entry) {} protected override void OnDeleted(BaseEntity entity, IHookedEntity entry) {} @@ -19,19 +19,19 @@ protected override void OnUpdating(BaseEntity entity, IHookedEntity entry) { } protected override void OnUpdated(BaseEntity entity, IHookedEntity entry) { } } - internal class Hook_Acl_Deleted : DbSaveHook + internal class Hook_Acl_Deleted : DbSaveHook { protected override void OnDeleted(IAclSupported entity, IHookedEntity entry) { } } [Important] - internal class Hook_Auditable_Inserting_Updating_Important : DbSaveHook + internal class Hook_Auditable_Inserting_Updating_Important : DbSaveHook { protected override void OnInserting(IAuditable entity, IHookedEntity entry) { } protected override void OnUpdating(IAuditable entity, IHookedEntity entry) { } } - internal class Hook_SoftDeletable_Updating_ChangingState : DbSaveHook + internal class Hook_SoftDeletable_Updating_ChangingState : DbSaveHook { protected override void OnUpdating(ISoftDeletable entity, IHookedEntity entry) { @@ -39,7 +39,7 @@ protected override void OnUpdating(ISoftDeletable entity, IHookedEntity entry) } } - internal class Hook_LocalizedEntity_Deleted : DbSaveHook + internal class Hook_LocalizedEntity_Deleted : DbSaveHook { protected override void OnDeleted(ILocalizedEntity entity, IHookedEntity entry) { } } diff --git a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs index 386aa82332..b082fd4e92 100644 --- a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs +++ b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs @@ -21,6 +21,8 @@ public HookedEntityMock(BaseEntity entity, EntityState state) InitialState = state; } + public Type ContextType => typeof(IDbContext); + public DbEntityEntry Entry { // Is unmockable From 9746fb8bd0b58d44af7fc98048f5600b711f1dbc Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 4 Sep 2020 10:52:42 +0200 Subject: [PATCH 151/695] Fixes missing "orderId" parameter for method AddShipment(Int32) if no products are selected --- .../Administration/Controllers/OrderController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs index dfe559d4ed..57e4ae3582 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs @@ -2369,7 +2369,7 @@ public ActionResult AddShipment(ShipmentModel model, FormCollection form, bool c { NotifyError(T("Admin.Orders.Shipments.NoProductsSelected")); - return RedirectToAction("AddShipment", new { order.Id }); + return RedirectToAction("AddShipment", new { orderId = order.Id }); } } From 086451aa0f408e62da19308e9f8745fe6d9accce Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 4 Sep 2020 14:16:37 +0200 Subject: [PATCH 152/695] Updated change log --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 5e89d1cf30..33bd4e6e86 100644 --- a/changelog.md +++ b/changelog.md @@ -19,6 +19,7 @@ * #1981 Added grouping for cart rules. * #1407 Added menu to set order and payment status for orders checked in backend grid. * #1778 Back button closes offcanvas menu/cart. +* #2069 MegaSearch: product order is applied to all categories in which a product appears. ### Bugfixes * **Media Manager** From c95bd6dc8e9e74013b32f13916af4965c4586e95 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 4 Sep 2020 15:36:58 +0200 Subject: [PATCH 153/695] Ammendment for shop icon configuration --- .../SmartStore.Core/Domain/Stores/Store.cs | 5 + .../Migrations/202009031412478_ShopIcons.resx | 126 ------------------ ... => 202009041122208_ShopIcons.Designer.cs} | 2 +- ...pIcons.cs => 202009041122208_ShopIcons.cs} | 26 ++-- .../Migrations/202009041122208_ShopIcons.resx | 126 ++++++++++++++++++ .../SmartStore.Data/SmartStore.Data.csproj | 10 +- .../Models/Stores/StoreModel.cs | 9 +- .../Views/Store/_CreateOrUpdate.cshtml | 36 ++--- .../Controllers/CommonController.cs | 26 +--- .../Models/Common/ShopLogoModel.cs | 3 +- .../SmartStore.Web/SmartStore.Web.csproj | 1 - .../Views/Common/Partials/Favicon.cshtml | 5 +- .../SmartStore.Web/favicon.readme.txt | 19 --- 13 files changed, 183 insertions(+), 211 deletions(-) delete mode 100644 src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.resx rename src/Libraries/SmartStore.Data/Migrations/{202009031412478_ShopIcons.Designer.cs => 202009041122208_ShopIcons.Designer.cs} (93%) rename src/Libraries/SmartStore.Data/Migrations/{202009031412478_ShopIcons.cs => 202009041122208_ShopIcons.cs} (51%) create mode 100644 src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.resx delete mode 100644 src/Presentation/SmartStore.Web/favicon.readme.txt diff --git a/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs b/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs index 72764d601d..2181655f2c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs +++ b/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs @@ -52,6 +52,11 @@ public partial class Store : BaseEntity [DataMember] public int LogoMediaFileId { get; set; } + /// + /// Gets or sets the png icon media file id + /// + [DataMember] + public int FavIconMediaFileId { get; set; } /// /// Gets or sets the png icon media file id diff --git a/src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.resx b/src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.resx deleted file mode 100644 index bdd87684df..0000000000 --- a/src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - - - dbo - - \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs similarity index 93% rename from src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.Designer.cs rename to src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs index 9b80d3fbf1..9a78bf96fb 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs @@ -13,7 +13,7 @@ public sealed partial class ShopIcons : IMigrationMetadata string IMigrationMetadata.Id { - get { return "202009031412478_ShopIcons"; } + get { return "202009041122208_ShopIcons"; } } string IMigrationMetadata.Source diff --git a/src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.cs b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs similarity index 51% rename from src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.cs rename to src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs index 224b83bf80..b33ca9876d 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009031412478_ShopIcons.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs @@ -9,6 +9,7 @@ public partial class ShopIcons : DbMigration, ILocaleResourcesProvider, IDataSee { public override void Up() { + AddColumn("dbo.Store", "FavIconMediaFileId", c => c.Int(nullable: false)); AddColumn("dbo.Store", "PngIconMediaFileId", c => c.Int(nullable: false)); AddColumn("dbo.Store", "AppleTouchIconMediaFileId", c => c.Int(nullable: false)); AddColumn("dbo.Store", "MsTileImageMediaFileId", c => c.Int(nullable: false)); @@ -21,6 +22,7 @@ public override void Down() DropColumn("dbo.Store", "MsTileImageMediaFileId"); DropColumn("dbo.Store", "AppleTouchIconMediaFileId"); DropColumn("dbo.Store", "PngIconMediaFileId"); + DropColumn("dbo.Store", "FavIconMediaFileId"); } public bool RollbackOnFailure => true; @@ -38,29 +40,35 @@ public void Seed(SmartObjectContext context) public void MigrateLocaleResources(LocaleResourcesBuilder builder) { + builder.AddOrUpdate("Admin.Configuration.Stores.Fields.FavIconMediaFileId", + "Favicon", + "Favicon", + "Defines the favicon for the store. This icon should contain graphics in the dimensions 16×16, 32×32 and 48×48.", + "Legt das Favicon für den Shop fest. Dieses Icon sollte Grafiken in den Abmessungen 16×16, 32×32 und 48×48 beinhalten."); + builder.AddOrUpdate("Admin.Configuration.Stores.Fields.PngIconMediaFileId", "PNG icon", "PNG-Icon", - "Defines the icon for the store. This icon is used as favicon and when shortcuts to your store are created.", - "Legt das Icon für den Shop fest. Dieses Icon wird als Favicon verwendet und wenn Shortcuts zu Ihrem Shop erstellt werden."); + "Defines the PNG icon for the store. This icon is recognized as favicon by up-to-date devices and used when shortcuts to your store are created. Optimal dimensions for this icon are 196x196.", + "Legt das PNG-Icon für den Shop fest. Dieses Icon wird von aktuellen Geräten als Favicon erkannt und verwendet, wenn Shortcuts zu Ihrem Shop erstellt werden. Optimale Abmessungen für das Icon sind 196x196."); builder.AddOrUpdate("Admin.Configuration.Stores.Fields.AppleTouchIconMediaFileId", "Apple Touch icon", "Apple Touch Icon", - "TODO", - "TODO"); + "Defines the icon used by Apple devices as shortcut icon. Optimal dimensions for this icon are 180x180.", + "Legt das Icon fest, das von Apple-Geräten als Shortcut-Icon verwendet wird. Optimale Abmessungen für das Icon sind 180x180."); builder.AddOrUpdate("Admin.Configuration.Stores.Fields.MsTileImageMediaFileId", - "Microsoft tile icon", + "Microsoft tile picture", "Microsoft Kachelgrafik", - "TODO", - "TODO"); + "Defines the icon that is used by Microsoft devices as a tile picture when shortcuts to your store are created. Optimal dimensions for the picture are 310x310.", + "Legt das Icon fest, das von Microsoft-Geräten als Kachelgrafik verwendet wird, wenn Shortcuts zu Ihrem Shop erstellt werden. Optimale Abmessungen für das Bild sind 310x310."); builder.AddOrUpdate("Admin.Configuration.Stores.Fields.MsTileColor", "Microsoft tile color", "Microsoft Kachelfarbe", - "TODO", - "TODO"); + "Defines the color used by Microsoft devices as tile color when shortcuts to your store are created.", + "Legt die Farbe fest, die von Microsoft-Geräten als Kachelfarbe verwendet wird, wenn Shortcuts zu Ihrem Shop erstellt werden."); } } } diff --git a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.resx b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.resx new file mode 100644 index 0000000000..eab00470d5 --- /dev/null +++ b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index c9a6531718..92c0dedfa4 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -509,9 +509,9 @@ 202009021705132_Merge9.cs - - - 202009031412478_ShopIcons.cs + + + 202009041122208_ShopIcons.cs @@ -921,8 +921,8 @@ 202009021705132_Merge9.cs - - 202009031412478_ShopIcons.cs + + 202009041122208_ShopIcons.cs diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs index 73c538cbe5..f7e7973677 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs @@ -39,17 +39,20 @@ public partial class StoreModel : EntityModelBase [UIHint("Media"), AdditionalMetadata("album", "content")] public int LogoMediaFileId { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.FavIconMediaFileId")] + [UIHint("Media"), AdditionalMetadata("album", "content"), AdditionalMetadata("typeFilter", ".ico")] + public int FavIconMediaFileId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.PngIconMediaFileId")] - [UIHint("Media"), AdditionalMetadata("album", "content")] + [UIHint("Media"), AdditionalMetadata("album", "content"), AdditionalMetadata("typeFilter", ".png")] public int PngIconMediaFileId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.AppleTouchIconMediaFileId")] - [UIHint("Media"), AdditionalMetadata("album", "content")] + [UIHint("Media"), AdditionalMetadata("album", "content"), AdditionalMetadata("typeFilter", "image")] public int AppleTouchIconMediaFileId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.MsTileImageMediaFileId")] - [UIHint("Media"), AdditionalMetadata("album", "content")] + [UIHint("Media"), AdditionalMetadata("album", "content"), AdditionalMetadata("typeFilter", "image")] public int MsTileImageMediaFileId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.MsTileColor")] diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Store/_CreateOrUpdate.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Store/_CreateOrUpdate.cshtml index 7c6489e407..97aa1f16cd 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Store/_CreateOrUpdate.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Store/_CreateOrUpdate.cshtml @@ -4,15 +4,6 @@ @Html.HiddenFor(model => model.Id) - - - - + + + + diff --git a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs index 73b49b8cee..be7e37751f 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs @@ -532,32 +532,10 @@ public ActionResult ChangeTheme(string themeName, string returnUrl = null) public ActionResult Favicon() { var store = Services.StoreContext.CurrentStore; - var icons = new string[] - { - "favicon-{0}.ico".FormatInvariant(store.Id), - "favicon.ico" - }; - - string virtualPath = null; - - foreach (var icon in icons) - { - virtualPath = Url.ThemeAwareContent(icon); - if (virtualPath.HasValue()) - { - break; - } - } - - if (virtualPath.IsEmpty()) - { - return Content(""); - } - + var model = new FaviconModel() { - Uploaded = true, - FaviconUrl = virtualPath, + FavIconId = store.FavIconMediaFileId, AppleTouchIconId = store.AppleTouchIconMediaFileId, MsTileColor = store.MsTileColor, MsTileIconId = store.MsTileImageMediaFileId, diff --git a/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs b/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs index 570eef1e3c..e0a0a9ea4a 100644 --- a/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs @@ -4,8 +4,7 @@ namespace SmartStore.Web.Models.Common { public partial class FaviconModel : ModelBase { - public bool Uploaded { get; set; } - public string FaviconUrl { get; set; } + public int FavIconId { get; set; } public int AppleTouchIconId { get; set; } public int PngIconId { get; set; } public int MsTileIconId { get; set; } diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index 10dd6ce078..8c1e9a714d 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -1095,7 +1095,6 @@ - diff --git a/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml b/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml index bd5d47245d..63ffd19b53 100644 --- a/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml @@ -2,15 +2,14 @@ @using SmartStore.Web.Models.Common; -@if (Model.Uploaded) +@if (Model.FavIconId != 0) { - + } @if (Model.PngIconId != 0) { @*16x16 (browser tabs), 32x32 (Taskbar), 96x96 (Desktop), 196x196 (Android Chrome)*@ - diff --git a/src/Presentation/SmartStore.Web/favicon.readme.txt b/src/Presentation/SmartStore.Web/favicon.readme.txt deleted file mode 100644 index 07bdd1a3dc..0000000000 --- a/src/Presentation/SmartStore.Web/favicon.readme.txt +++ /dev/null @@ -1,19 +0,0 @@ - -How to specify a favicon for your store -======================================================================= - -Smartstore tries to find an existing icon file by looking up -pathes in the following order: - -1. [Root]/Themes/[CurrentTheme]/favicon-[StoreId].ico -2. [Root]/favicon-[StoreId].ico -3. [Root]/Themes/[CurrentTheme]/favicon.ico -4. [Root]/favicon.ico - -The [StoreId] is displayed in 'Admin > Configuration > Stores > {Edit}'. - -For the sake of performance, once found, the resulting icon path is cached -for the duration of one hour with any [CurrentTheme] and [StoreId] combination. -So when your new icon is not showing up in the browser, restart the application -or just be patient ;-) - From f5f791713067641bc512a85a4484b02ce2c12731 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 4 Sep 2020 16:00:51 +0200 Subject: [PATCH 154/695] Resolves #2067 (fu) > ProductPictureDelete: wants to delete picture by id, but gets media id as parameter --- .../Scripts/smartstore.dropzoneWrapper.js | 9 ++++----- .../Views/Shared/Components/FileUploader.cshtml | 10 ++++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js index 1bfe0c6cc9..4d3ccf8923 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.dropzoneWrapper.js @@ -591,17 +591,16 @@ // Deletes a media file assignment of an entity (multifile upload). fuContainer.on("click", ".delete-entity-picture", function (e) { - - if ($el.data('remove-url')) { + var removeUrl = $el.data('remove-url'); + if (removeUrl) { var previewThumb = $(this).closest('.dz-image-preview'); - var entityMediaFileId = previewThumb.data("entity-id"); + var entityMediaFileId = previewThumb.data("entity-media-id"); var mediaFileId = previewThumb.data("media-id"); $.ajax({ - async: false, cache: false, type: 'POST', - url: $el.data('remove-url'), + url: removeUrl, data: { id: entityMediaFileId }, success: function () { previewThumb.remove(); diff --git a/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml index cd9651fbbe..883142c25c 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml @@ -73,11 +73,13 @@ { var previewUrl = mediaService.GetUrl(file.MediaFileId, 250); var isMainPic = file.MediaFileId == Model.MainFileId; - var entityMediaId = file.MediaFileId; + var entityMediaId = 0; - //if (Model.EntityType.Equals("Product")) - //{ - //entityMediaId = file.MediaFileId; + if (Model.EntityType.Equals("Product")) + { + var entityMediaFile = file as ProductMediaFile; + entityMediaId = entityMediaFile.Id; + }
Date: Fri, 4 Sep 2020 16:29:03 +0200 Subject: [PATCH 155/695] Resolves #2071 Downloads / ESD: saving a product after uploading a sample download renders "REPLACE" label in file uploader instead of file name. --- .../Views/Shared/EditorTemplates/Download.cshtml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/Download.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/Download.cshtml index 37eb6009d6..407e2cd52f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/Download.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/Download.cshtml @@ -3,6 +3,7 @@ @using SmartStore.Web.Framework.UI; @using SmartStore.Utilities; @using SmartStore.Core.Domain.Media; +@using SmartStore.Core.Domain.Catalog; @functions { bool? _minimalMode = null; @@ -90,6 +91,7 @@ var clientId = "download-editor-" + random; var mediaService = this.CommonServices.MediaService; var mediaSettings = this.CommonServices.Resolve(); + var catalogSettings = this.CommonServices.Resolve(); var downloadService = EngineContext.Current.Resolve(); var download = downloadService.GetDownloadById(Model.GetValueOrDefault()); var fileName = string.Empty; @@ -156,10 +158,12 @@ .DeleteUrl(Url.Action("DeleteDownload", "Download", new { minimalMode = MinimalMode, fieldName = FieldName, downloadId = Model, area = "Admin" })) .Multifile(false) .Path(Path) - .UploadText(hasFile ? T("Common.Replace").Text : T("Common.Fileuploader.Upload").Text) + .TypeFilter(string.Join("|", catalogSettings.FileUploadAllowedExtensions.Select(x => x.Trim()).ToList())) + .UploadText(hasFile ? fileName : T("Common.Fileuploader.Upload").Text) .HasTemplatePreview(true) - .ShowRemoveButton(false) - .ShowRemoveButtonAfterUpload(false) + .ShowBrowseMedia(true) + .ShowRemoveButton(hasFile) + .ShowRemoveButtonAfterUpload(true) .OnMediaSelectedHandlerName("onMediaSelected_" + random) )
@@ -204,7 +208,7 @@ entityId: @EntityId, entityName: "@EntityName" }, - success: function (response) { + success: function (response) { if (!response.success) displayNotification("Error when trying to create a download for the selected file.", "error"); } From 2409e5bd66e7034f2dcc682a209883405eba718e Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 4 Sep 2020 16:44:07 +0200 Subject: [PATCH 156/695] Resolves #2073 Don't delete download versions without any user confirmation --- .../Views/Product/_CreateOrUpdate.Downloads.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Downloads.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Downloads.cshtml index 04e6764060..e41986b57c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Downloads.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Downloads.cshtml @@ -140,7 +140,7 @@ + onclick='return confirm(@T("Admin.Common.AskToProceed").JsText);' class="btn btn-outline-secondary btn-to-danger btn-sm btn-icon" title="@T("Common.Download.Delete")"> From 56d2a7cebc9757fd06be0cea6ad03d8f90545750 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 4 Sep 2020 17:43:08 +0200 Subject: [PATCH 157/695] Resolves #2038 Revise Cookie Manager UI (make it more compact) --- .../Themes/Flex/Content/_cookie-manager.scss | 24 +++++-- .../Common/Partials/CookieManager.cshtml | 64 ++++++++++--------- 2 files changed, 52 insertions(+), 36 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_cookie-manager.scss b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_cookie-manager.scss index 168eca8726..db377a8fa9 100644 --- a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_cookie-manager.scss +++ b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_cookie-manager.scss @@ -23,16 +23,14 @@ .cm-consent-title { margin-bottom: 0; - &:after { - @include fontawesome("\f106"); + .collapse-chevron { position: absolute; right: 1rem; - top: 50%; - transform: translateY(-50%); + transition: transform 0.35s, -webkit-transform 0.35s; } - &.collapsed:after { - content: "\f107"; + &.collapsed .collapse-chevron { + transform: rotate(180deg); } } } @@ -44,9 +42,23 @@ .cm-info-table { margin-bottom: 0; + + > tbody > tr { + > td { + padding: 0.5rem; + } + + > th { + padding: 0.5rem; + padding-right: 0; + width: 35% + } + } } @include media-breakpoint-down(sm) { + font-size: 0.825rem; + .cm-footer { padding: 0; } diff --git a/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml b/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml index 4840c1e31b..442eaed98f 100644 --- a/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Common/Partials/CookieManager.cshtml @@ -67,6 +67,7 @@ @@ -100,6 +101,7 @@ @@ -122,39 +124,41 @@ } - -
-
-
- + @if (thirdPartyCookieInfos.Count > 0) + { +
+
+
+ +
+
- -
- -
- @Html.SmartLabelFor(model => model.LogoMediaFileId) - - @Html.EditorFor(model => model.LogoMediaFileId, "#store-logo-picture", new { transientUpload = true }) - @Html.ValidationMessageFor(model => model.LogoMediaFileId) -
@Html.SmartLabelFor(model => model.Name) @@ -146,29 +137,38 @@
- @Html.SmartLabelFor(model => model.AppleTouchIconMediaFileId) + @Html.SmartLabelFor(model => model.FavIconMediaFileId) - @Html.EditorFor(model => model.AppleTouchIconMediaFileId, new { transientUpload = true }) - @Html.ValidationMessageFor(model => model.AppleTouchIconMediaFileId) + @Html.EditorFor(model => model.FavIconMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.FavIconMediaFileId)
- @Html.SmartLabelFor(model => model.MsTileImageMediaFileId) + @Html.SmartLabelFor(model => model.PngIconMediaFileId) - @Html.EditorFor(model => model.MsTileImageMediaFileId, new { transientUpload = true }) - @Html.ValidationMessageFor(model => model.MsTileImageMediaFileId) + @Html.EditorFor(model => model.PngIconMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.PngIconMediaFileId)
- @Html.SmartLabelFor(model => model.PngIconMediaFileId) + @Html.SmartLabelFor(model => model.AppleTouchIconMediaFileId) - @Html.EditorFor(model => model.PngIconMediaFileId, new { transientUpload = true }) - @Html.ValidationMessageFor(model => model.PngIconMediaFileId) + @Html.EditorFor(model => model.AppleTouchIconMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.AppleTouchIconMediaFileId) +
+ @Html.SmartLabelFor(model => model.MsTileImageMediaFileId) + + @Html.EditorFor(model => model.MsTileImageMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.MsTileImageMediaFileId)
- @foreach (var info in thirdPartyCookieInfos) - { - - - - - } -
@info.Name@info.Description
- } + - + } } } From 817812b9586721fc01c6614166339cc6a54fd3df Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 4 Sep 2020 21:32:38 +0200 Subject: [PATCH 158/695] Some (perf) refactoring to recent FavIcon stuff commit --- .../Migrations/MigrationsConfiguration.cs | 25 +- .../Media/Album/SystemAlbumProvider.cs | 4 + .../Extensions/IMediaServiceExtensions.cs | 2 + .../SmartStore.Services/Media/MediaService.cs | 1 + .../Media/MediaTypes/MediaType.cs | 2 +- .../Extensions/UrlHelperExtensions.cs | 19 +- .../Controllers/CommonController.cs | 591 +++++++++--------- .../Models/Common/ShopLogoModel.cs | 11 +- .../Views/Common/Partials/Favicon.cshtml | 40 +- 9 files changed, 341 insertions(+), 354 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index a7977bd510..1553c0cd47 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -5,14 +5,11 @@ using System.Data.Entity.Migrations; using Setup; using SmartStore.Core.Data; - using SmartStore.Core.Domain.Catalog; - using SmartStore.Core.Domain.Common; - using SmartStore.Core.Domain.Configuration; - using SmartStore.Core.Domain.Media; - using SmartStore.Core.Domain.Tasks; using SmartStore.Utilities; + using SmartStore.Core.Domain.Media; + using SmartStore.Core.Domain.Configuration; - public sealed class MigrationsConfiguration : DbMigrationsConfiguration + public sealed class MigrationsConfiguration : DbMigrationsConfiguration { public MigrationsConfiguration() { @@ -49,8 +46,22 @@ protected override void Seed(SmartObjectContext context) public void MigrateSettings(SmartObjectContext context) { + // Add .ico extension to MediaSettings.ImageTypes + var name = TypeHelper.NameOf(y => y.ImageTypes, true); + var setting = context.Set().FirstOrDefault(x => x.Name == name); + if (setting != null) + { + var arr = setting.Value.EmptyNull() + .Replace(Environment.NewLine, " ") + .ToLower() + .Split(new char[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries); - } + if (!arr.Contains("ico")) + { + setting.Value += " ico"; + } + } + } public void MigrateLocaleResources(LocaleResourcesBuilder builder) { diff --git a/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs b/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs index 271f3e9636..4ba8a1dad8 100644 --- a/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs @@ -139,6 +139,10 @@ public void ConfigureTracks(string albumName, TrackedMediaPropertyTable table) table.Register(x => x.MediaFileId); table.Register(x => x.PreviewMediaFileId); table.Register(x => x.LogoMediaFileId); + table.Register(x => x.FavIconMediaFileId); + table.Register(x => x.PngIconMediaFileId); + table.Register(x => x.AppleTouchIconMediaFileId); + table.Register(x => x.MsTileImageMediaFileId); } else if (albumName == Downloads) { diff --git a/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs b/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs index bc3c0716fa..2ba35ccb5c 100644 --- a/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs +++ b/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs @@ -47,6 +47,7 @@ public static string GetUrl(this IMediaService service, MediaFile file, int thum return service.GetUrl(file != null ? service.ConvertMediaFile(file) : null, query, host, doFallback); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string GetUrl(this IMediaService service, MediaFileInfo file, int thumbnailSize, string host = null, bool doFallback = true) { ProcessImageQuery query = thumbnailSize > 0 @@ -56,6 +57,7 @@ public static string GetUrl(this IMediaService service, MediaFileInfo file, int return service.GetUrl(file, query, host, doFallback); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string GetFallbackUrl(this IMediaService service, int thumbnailSize = 0) { ProcessImageQuery query = thumbnailSize > 0 diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs index 592d4ba605..7ddf472def 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -14,6 +14,7 @@ using SmartStore.Core.IO; using SmartStore.Core.Localization; using SmartStore.Core.Logging; +using SmartStore.Data.Caching; using SmartStore.Services.Localization; using SmartStore.Services.Media.Imaging; using SmartStore.Services.Media.Storage; diff --git a/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaType.cs b/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaType.cs index 7f9bcc0d3b..9e6c903938 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaType.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaType.cs @@ -8,7 +8,7 @@ public class MediaType : IEquatable { private readonly static IDictionary _defaultExtensionsMap = new Dictionary { - ["image"] = new[] { "png", "jpg", "jpeg", "gif", "webp", "bmp", "svg" }, + ["image"] = new[] { "png", "jpg", "jpeg", "gif", "webp", "bmp", "svg", "ico" }, ["video"] = new[] { "mp4", "m4v", "mkv", "wmv", "avi", "asf", "mpg", "mpeg", "webm", "flv", "ogv", "mov", "3gp" }, ["audio"] = new[] { "mp3", "wav", "wma", "aac", "flac", "oga", "wav", "m4a", "ogg" }, ["document"] = new[] { "pdf", "doc", "docx", "ppt", "pptx", "pps", "ppsx", "docm", "odt", "ods", "dot", "dotx", "dotm", "psd", "xls", "xlsx", "rtf" }, diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs index 89cfd0c2cd..5a15d51207 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs @@ -1,4 +1,5 @@ -using System.Web.Mvc; +using System.Runtime.CompilerServices; +using System.Web.Mvc; using SmartStore.Core.Infrastructure; using SmartStore.Services.Cms; using SmartStore.Services.Media; @@ -129,28 +130,28 @@ public static string EntityLabel(this UrlHelper urlHelper, string expression) #region Media + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string Media(this UrlHelper urlHelper, int? fileId, int thumbnailSize = 0, string host = null, bool doFallback = true) { - var mediaService = EngineContext.Current.Resolve(); - return mediaService.GetUrl(fileId, thumbnailSize, host, doFallback); + return EngineContext.Current.Resolve().GetUrl(fileId, thumbnailSize, host, doFallback); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string Media(this UrlHelper urlHelper, MediaFileInfo file, int thumbnailSize = 0, string host = null, bool doFallback = true) { - var mediaService = EngineContext.Current.Resolve(); - return mediaService.GetUrl(file, thumbnailSize, host, doFallback); + return EngineContext.Current.Resolve().GetUrl(file, thumbnailSize, host, doFallback); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string Media(this UrlHelper urlHelper, int? fileId, ProcessImageQuery query, string host = null, bool doFallback = true) { - var mediaService = EngineContext.Current.Resolve(); - return mediaService.GetUrl(fileId, query, host, doFallback); + return EngineContext.Current.Resolve().GetUrl(fileId, query, host, doFallback); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string Media(this UrlHelper urlHelper, MediaFileInfo file, ProcessImageQuery query, string host = null, bool doFallback = true) { - var mediaService = EngineContext.Current.Resolve(); - return mediaService.GetUrl(file, query, host, doFallback); + return EngineContext.Current.Resolve().GetUrl(file, query, host, doFallback); } #endregion diff --git a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs index be7e37751f..b659fd0e57 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs @@ -5,6 +5,7 @@ using System.Text; using System.Web.Mvc; using System.Xml; +using System.Xml.Linq; using SmartStore.Core; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Domain.Catalog; @@ -44,16 +45,16 @@ namespace SmartStore.Web.Controllers { public partial class CommonController : PublicControllerBase { - private readonly static string[] s_hints = new string[] { "Shopsystem", "Onlineshop Software", "Shopsoftware", "E-Commerce Solution" }; + private readonly static string[] s_hints = new string[] { "Shopsystem", "Onlineshop Software", "Shopsoftware", "E-Commerce Solution" }; - private readonly Lazy _languageService; + private readonly Lazy _languageService; private readonly Lazy _currencyService; private readonly IThemeContext _themeContext; private readonly Lazy _themeRegistry; private readonly Lazy _forumService; private readonly Lazy _genericAttributeService; - private readonly Lazy _urlRecordService; - private readonly IPageAssetsBuilder _pageAssetsBuilder; + private readonly Lazy _urlRecordService; + private readonly IPageAssetsBuilder _pageAssetsBuilder; private readonly Lazy _mediaService; private readonly ICookieManager _cookieManager; private readonly IGeoCountryLookup _geoCountryLookup; @@ -61,39 +62,39 @@ public partial class CommonController : PublicControllerBase private readonly ICountryService _countryService; private readonly CustomerSettings _customerSettings; - private readonly PrivacySettings _privacySettings; - private readonly TaxSettings _taxSettings; + private readonly PrivacySettings _privacySettings; + private readonly TaxSettings _taxSettings; private readonly CatalogSettings _catalogSettings; private readonly ShoppingCartSettings _shoppingCartSettings; private readonly ThemeSettings _themeSettings; private readonly CommonSettings _commonSettings; - private readonly NewsSettings _newsSettings; + private readonly NewsSettings _newsSettings; private readonly BlogSettings _blogSettings; private readonly ForumSettings _forumSettings; private readonly LocalizationSettings _localizationSettings; - private readonly Lazy _socialSettings; + private readonly Lazy _socialSettings; public CommonController( - Lazy languageService, + Lazy languageService, Lazy currencyService, - IThemeContext themeContext, - Lazy themeRegistry, - Lazy forumService, - Lazy genericAttributeService, - Lazy urlRecordService, - IPageAssetsBuilder pageAssetsBuilder, + IThemeContext themeContext, + Lazy themeRegistry, + Lazy forumService, + Lazy genericAttributeService, + Lazy urlRecordService, + IPageAssetsBuilder pageAssetsBuilder, Lazy mediaService, CustomerSettings customerSettings, - PrivacySettings privacySettings, - TaxSettings taxSettings, - CatalogSettings catalogSettings, + PrivacySettings privacySettings, + TaxSettings taxSettings, + CatalogSettings catalogSettings, ShoppingCartSettings shoppingCartSettings, - CommonSettings commonSettings, - NewsSettings newsSettings, - BlogSettings blogSettings, - ForumSettings forumSettings, - LocalizationSettings localizationSettings, - Lazy socialSettings, + CommonSettings commonSettings, + NewsSettings newsSettings, + BlogSettings blogSettings, + ForumSettings forumSettings, + LocalizationSettings localizationSettings, + Lazy socialSettings, ThemeSettings themeSettings, ICookieManager cookieManager, IGeoCountryLookup geoCountryLookup, @@ -106,20 +107,20 @@ public CommonController( _themeRegistry = themeRegistry; _forumService = forumService; _genericAttributeService = genericAttributeService; - _urlRecordService = urlRecordService; - _pageAssetsBuilder = pageAssetsBuilder; + _urlRecordService = urlRecordService; + _pageAssetsBuilder = pageAssetsBuilder; _mediaService = mediaService; - _customerSettings = customerSettings; - _privacySettings = privacySettings; - _taxSettings = taxSettings; + _customerSettings = customerSettings; + _privacySettings = privacySettings; + _taxSettings = taxSettings; _catalogSettings = catalogSettings; _shoppingCartSettings = shoppingCartSettings; _commonSettings = commonSettings; - _newsSettings = newsSettings; + _newsSettings = newsSettings; _blogSettings = blogSettings; _forumSettings = forumSettings; _localizationSettings = localizationSettings; - _socialSettings = socialSettings; + _socialSettings = socialSettings; _themeSettings = themeSettings; _cookieManager = cookieManager; _geoCountryLookup = geoCountryLookup; @@ -132,10 +133,10 @@ public CommonController( [NonAction] protected LanguageSelectorModel PrepareLanguageSelectorModel() { - var availableLanguages = Services.Cache.Get(string.Format(ModelCacheEventConsumer.AVAILABLE_LANGUAGES_MODEL_KEY, Services.StoreContext.CurrentStore.Id), () => + var availableLanguages = Services.Cache.Get(string.Format(ModelCacheEventConsumer.AVAILABLE_LANGUAGES_MODEL_KEY, Services.StoreContext.CurrentStore.Id), () => { var result = _languageService.Value - .GetAllLanguages(storeId: Services.StoreContext.CurrentStore.Id) + .GetAllLanguages(storeId: Services.StoreContext.CurrentStore.Id) .Select(x => new LanguageModel { Id = x.Id, @@ -149,7 +150,7 @@ protected LanguageSelectorModel PrepareLanguageSelectorModel() return result; }); - var workingLanguage = Services.WorkContext.WorkingLanguage; + var workingLanguage = Services.WorkContext.WorkingLanguage; var model = new LanguageSelectorModel { @@ -158,14 +159,14 @@ protected LanguageSelectorModel PrepareLanguageSelectorModel() UseImages = _localizationSettings.UseImagesForLanguageSelection }; - string defaultSeoCode = _languageService.Value.GetDefaultLanguageSeoCode(); + string defaultSeoCode = _languageService.Value.GetDefaultLanguageSeoCode(); foreach (var lang in model.AvailableLanguages) { //var helper = new LocalizedUrlHelper(HttpContext.Request, true); - var helper = CreateUrlHelperForLanguageSelector(lang, workingLanguage.Id); + var helper = CreateUrlHelperForLanguageSelector(lang, workingLanguage.Id); - if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled) + if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled) { if (lang.SeoCode == defaultSeoCode && (int)(_localizationSettings.DefaultLanguageRedirectBehaviour) > 0) { @@ -183,52 +184,52 @@ protected LanguageSelectorModel PrepareLanguageSelectorModel() return model; } - private LocalizedUrlHelper CreateUrlHelperForLanguageSelector(LanguageModel model, int currentLanguageId) - { - if (currentLanguageId != model.Id) - { - var routeValues = this.Request.RequestContext.RouteData.Values; - var controller = routeValues["controller"].ToString(); - - if (!routeValues.TryGetValue(controller + "id", out var val)) - { - controller = routeValues["action"].ToString(); - routeValues.TryGetValue(controller + "id", out val); - } - - int entityId = 0; - if (val != null) - { - entityId = val.Convert(); - } - - if (entityId > 0) - { - var activeSlug = _urlRecordService.Value.GetActiveSlug(entityId, controller, model.Id); - if (activeSlug.IsEmpty()) - { - // Fallback to default value. - activeSlug = _urlRecordService.Value.GetActiveSlug(entityId, controller, 0); - } - - if (activeSlug.HasValue()) - { - var helper = new LocalizedUrlHelper(Request.ApplicationPath, activeSlug, false); - return helper; - } - } - } - - return new LocalizedUrlHelper(HttpContext.Request, true); - } + private LocalizedUrlHelper CreateUrlHelperForLanguageSelector(LanguageModel model, int currentLanguageId) + { + if (currentLanguageId != model.Id) + { + var routeValues = this.Request.RequestContext.RouteData.Values; + var controller = routeValues["controller"].ToString(); + + if (!routeValues.TryGetValue(controller + "id", out var val)) + { + controller = routeValues["action"].ToString(); + routeValues.TryGetValue(controller + "id", out val); + } + + int entityId = 0; + if (val != null) + { + entityId = val.Convert(); + } + + if (entityId > 0) + { + var activeSlug = _urlRecordService.Value.GetActiveSlug(entityId, controller, model.Id); + if (activeSlug.IsEmpty()) + { + // Fallback to default value. + activeSlug = _urlRecordService.Value.GetActiveSlug(entityId, controller, 0); + } + + if (activeSlug.HasValue()) + { + var helper = new LocalizedUrlHelper(Request.ApplicationPath, activeSlug, false); + return helper; + } + } + } + + return new LocalizedUrlHelper(HttpContext.Request, true); + } [NonAction] protected CurrencySelectorModel PrepareCurrencySelectorModel() { - var availableCurrencies = Services.Cache.Get(string.Format(ModelCacheEventConsumer.AVAILABLE_CURRENCIES_MODEL_KEY, Services.WorkContext.WorkingLanguage.Id, Services.StoreContext.CurrentStore.Id), () => + var availableCurrencies = Services.Cache.Get(string.Format(ModelCacheEventConsumer.AVAILABLE_CURRENCIES_MODEL_KEY, Services.WorkContext.WorkingLanguage.Id, Services.StoreContext.CurrentStore.Id), () => { var result = _currencyService.Value - .GetAllCurrencies(storeId: Services.StoreContext.CurrentStore.Id) + .GetAllCurrencies(storeId: Services.StoreContext.CurrentStore.Id) .Select(x => new CurrencyModel { Id = x.Id, @@ -242,7 +243,7 @@ protected CurrencySelectorModel PrepareCurrencySelectorModel() var model = new CurrencySelectorModel() { - CurrentCurrencyId = Services.WorkContext.WorkingCurrency.Id, + CurrentCurrencyId = Services.WorkContext.WorkingCurrency.Id, AvailableCurrencies = availableCurrencies }; return model; @@ -254,32 +255,32 @@ protected TaxTypeSelectorModel PrepareTaxTypeSelectorModel() var model = new TaxTypeSelectorModel() { Enabled = _taxSettings.AllowCustomersToSelectTaxDisplayType, - CurrentTaxType = Services.WorkContext.TaxDisplayType + CurrentTaxType = Services.WorkContext.TaxDisplayType }; return model; } #endregion - #region Methods + #region Methods [ChildActionOnly] public ActionResult LanguageSelector() { var model = PrepareLanguageSelectorModel(); - - if (model.AvailableLanguages.Count < 2) - return Content(""); - - // register all available languages as - if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled) - { - var host = Services.WebHelper.GetStoreLocation(); - foreach (var lang in model.AvailableLanguages) - { - _pageAssetsBuilder.AddLinkPart("alternate", host.EnsureEndsWith("/") + model.ReturnUrls[lang.SeoCode].TrimStart('/'), hreflang: lang.SeoCode); - } - } + + if (model.AvailableLanguages.Count < 2) + return Content(""); + + // register all available languages as + if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled) + { + var host = Services.WebHelper.GetStoreLocation(); + foreach (var lang in model.AvailableLanguages) + { + _pageAssetsBuilder.AddLinkPart("alternate", host.EnsureEndsWith("/") + model.ReturnUrls[lang.SeoCode].TrimStart('/'), hreflang: lang.SeoCode); + } + } return PartialView(model); } @@ -293,8 +294,8 @@ public ActionResult Logo() var model = new ShopHeaderModel { LogoUploaded = logo != null, - LogoTitle = store.Name - }; + LogoTitle = store.Name + }; if (logo != null) { @@ -308,7 +309,7 @@ public ActionResult Logo() public ActionResult SetLanguage(int langid, string returnUrl = "") { - var language = _languageService.Value.GetLanguageById(langid); + var language = _languageService.Value.GetLanguageById(langid); if (language != null && language.Published) { Services.WorkContext.WorkingLanguage = language; @@ -341,11 +342,11 @@ public ActionResult CurrencySelector() public ActionResult CurrencySelected(int customerCurrency, string returnUrl = "") { - var currency = _currencyService.Value.GetCurrencyById(customerCurrency); + var currency = _currencyService.Value.GetCurrencyById(customerCurrency); if (currency != null) - { + { Services.WorkContext.WorkingCurrency = currency; - } + } return RedirectToReferrer(returnUrl); } @@ -380,36 +381,36 @@ public ActionResult JavaScriptDisabledWarning() [ChildActionOnly] public ActionResult ShopBar() { - var customer = Services.WorkContext.CurrentCustomer; - var isAdmin = customer.IsAdmin(); - var isRegistered = isAdmin || customer.IsRegistered(); - + var customer = Services.WorkContext.CurrentCustomer; + var isAdmin = customer.IsAdmin(); + var isRegistered = isAdmin || customer.IsRegistered(); + var model = new ShopBarModel { IsAuthenticated = isRegistered, CustomerEmailUsername = isRegistered ? (_customerSettings.CustomerLoginType != CustomerLoginType.Email ? customer.Username : customer.Email) : "", - IsCustomerImpersonated = Services.WorkContext.OriginalCustomerIfImpersonated != null, - DisplayAdminLink = Services.Permissions.Authorize(Permissions.System.AccessBackend), - ShoppingCartEnabled = Services.Permissions.Authorize(Permissions.Cart.AccessShoppingCart) && _shoppingCartSettings.MiniShoppingCartEnabled, - WishlistEnabled = Services.Permissions.Authorize(Permissions.Cart.AccessWishlist), + IsCustomerImpersonated = Services.WorkContext.OriginalCustomerIfImpersonated != null, + DisplayAdminLink = Services.Permissions.Authorize(Permissions.System.AccessBackend), + ShoppingCartEnabled = Services.Permissions.Authorize(Permissions.Cart.AccessShoppingCart) && _shoppingCartSettings.MiniShoppingCartEnabled, + WishlistEnabled = Services.Permissions.Authorize(Permissions.Cart.AccessWishlist), CompareProductsEnabled = _catalogSettings.CompareProductsEnabled, - PublicStoreNavigationAllowed = Services.Permissions.Authorize(Permissions.System.AccessShop) - }; + PublicStoreNavigationAllowed = Services.Permissions.Authorize(Permissions.System.AccessShop) + }; - return PartialView(model); + return PartialView(model); } - [ChildActionOnly] - [GdprConsent] - public ActionResult Footer() + [ChildActionOnly] + [GdprConsent] + public ActionResult Footer() { - var store = Services.StoreContext.CurrentStore; - var taxDisplayType = Services.WorkContext.GetTaxDisplayTypeFor(Services.WorkContext.CurrentCustomer, store.Id); + var store = Services.StoreContext.CurrentStore; + var taxDisplayType = Services.WorkContext.GetTaxDisplayTypeFor(Services.WorkContext.CurrentCustomer, store.Id); - var taxInfo = T(taxDisplayType == TaxDisplayType.IncludingTax ? "Tax.InclVAT" : "Tax.ExclVAT"); + var taxInfo = T(taxDisplayType == TaxDisplayType.IncludingTax ? "Tax.InclVAT" : "Tax.ExclVAT"); - var availableStoreThemes = !_themeSettings.AllowCustomerToSelectTheme - ? new List() + var availableStoreThemes = !_themeSettings.AllowCustomerToSelectTheme + ? new List() : _themeRegistry.Value.GetThemeManifests() .Select(x => { @@ -423,39 +424,39 @@ public ActionResult Footer() var model = new FooterModel { - StoreName = store.Name, + StoreName = store.Name, ShowLegalInfo = _taxSettings.ShowLegalHintsInFooter, - ShowThemeSelector = availableStoreThemes.Count > 1, + ShowThemeSelector = availableStoreThemes.Count > 1, HideNewsletterBlock = _customerSettings.HideNewsletterBlock }; - var shippingInfoUrl = Url.Topic("shippinginfo").ToString(); - if (shippingInfoUrl.HasValue()) - { - model.LegalInfo = T("Tax.LegalInfoFooter", taxInfo, shippingInfoUrl); - } - else - { - model.LegalInfo = T("Tax.LegalInfoFooter2", taxInfo); - } - - var hint = Services.Settings.GetSettingByKey("Rnd_SmCopyrightHint", string.Empty, store.Id); - if (hint.IsEmpty()) - { - hint = s_hints[CommonHelper.GenerateRandomInteger(0, s_hints.Length - 1)]; + var shippingInfoUrl = Url.Topic("shippinginfo").ToString(); + if (shippingInfoUrl.HasValue()) + { + model.LegalInfo = T("Tax.LegalInfoFooter", taxInfo, shippingInfoUrl); + } + else + { + model.LegalInfo = T("Tax.LegalInfoFooter2", taxInfo); + } + + var hint = Services.Settings.GetSettingByKey("Rnd_SmCopyrightHint", string.Empty, store.Id); + if (hint.IsEmpty()) + { + hint = s_hints[CommonHelper.GenerateRandomInteger(0, s_hints.Length - 1)]; Services.Settings.SetSetting("Rnd_SmCopyrightHint", hint, store.Id); - } + } model.ShowSocialLinks = _socialSettings.Value.ShowSocialLinksInFooter; model.FacebookLink = _socialSettings.Value.FacebookLink; model.TwitterLink = _socialSettings.Value.TwitterLink; model.PinterestLink = _socialSettings.Value.PinterestLink; model.YoutubeLink = _socialSettings.Value.YoutubeLink; - model.InstagramLink = _socialSettings.Value.InstagramLink; - - model.SmartStoreHint = "{0} by SmartStore AG © {1}" - .FormatCurrent(hint, DateTime.Now.Year); + model.InstagramLink = _socialSettings.Value.InstagramLink; + + model.SmartStoreHint = "{0} by SmartStore AG © {1}" + .FormatCurrent(hint, DateTime.Now.Year); return PartialView(model); } @@ -463,22 +464,22 @@ public ActionResult Footer() [ChildActionOnly] public ActionResult TopBar() { - var customer = Services.WorkContext.CurrentCustomer; + var customer = Services.WorkContext.CurrentCustomer; var model = new MenuBarModel { RecentlyAddedProductsEnabled = _catalogSettings.RecentlyAddedProductsEnabled, - NewsEnabled = _newsSettings.Enabled, + NewsEnabled = _newsSettings.Enabled, BlogEnabled = _blogSettings.Enabled, ForumEnabled = _forumSettings.ForumsEnabled, CustomerEmailUsername = customer.IsRegistered() ? (_customerSettings.CustomerLoginType != CustomerLoginType.Email ? customer.Username : customer.Email) : "", - IsCustomerImpersonated = Services.WorkContext.OriginalCustomerIfImpersonated != null, + IsCustomerImpersonated = Services.WorkContext.OriginalCustomerIfImpersonated != null, IsAuthenticated = customer.IsRegistered(), - DisplayAdminLink = Services.Permissions.Authorize(Permissions.System.AccessBackend), - HasContactUsPage = Url.Topic("ContactUs").ToString().HasValue(), + DisplayAdminLink = Services.Permissions.Authorize(Permissions.System.AccessBackend), + HasContactUsPage = Url.Topic("ContactUs").ToString().HasValue(), DisplayLoginLink = _customerSettings.UserRegistrationType != UserRegistrationType.Disabled }; - + return PartialView(model); } @@ -495,8 +496,8 @@ public ActionResult StoreThemeSelector() Name = currentTheme.ThemeName, Title = currentTheme.ThemeTitle }; - model.AvailableStoreThemes = _themeRegistry.Value - .GetThemeManifests() + model.AvailableStoreThemes = _themeRegistry.Value + .GetThemeManifests() .Select(x => { return new StoreThemeModel @@ -510,36 +511,36 @@ public ActionResult StoreThemeSelector() return PartialView(model); } - public ActionResult ChangeTheme(string themeName, string returnUrl = null) + public ActionResult ChangeTheme(string themeName, string returnUrl = null) { - if (!_themeSettings.AllowCustomerToSelectTheme || (themeName.HasValue() && !_themeRegistry.Value.ThemeManifestExists(themeName))) - { - return HttpNotFound(); - } + if (!_themeSettings.AllowCustomerToSelectTheme || (themeName.HasValue() && !_themeRegistry.Value.ThemeManifestExists(themeName))) + { + return HttpNotFound(); + } - _themeContext.WorkingThemeName = themeName; + _themeContext.WorkingThemeName = themeName; - if (HttpContext.Request.IsAjaxRequest()) - { - return Json(new { Success = true }); - } + if (HttpContext.Request.IsAjaxRequest()) + { + return Json(new { Success = true }); + } - return RedirectToReferrer(returnUrl); + return RedirectToReferrer(returnUrl); } [ChildActionOnly] - [OutputCache(Duration=3600, VaryByCustom="Theme_Store")] public ActionResult Favicon() { var store = Services.StoreContext.CurrentStore; - - var model = new FaviconModel() - { - FavIconId = store.FavIconMediaFileId, - AppleTouchIconId = store.AppleTouchIconMediaFileId, - MsTileColor = store.MsTileColor, - MsTileIconId = store.MsTileImageMediaFileId, - PngIconId = store.PngIconMediaFileId + var mediaService = _mediaService.Value; + + var model = new FaviconModel + { + FavIcon = mediaService.GetFileById(store.FavIconMediaFileId, MediaLoadFlags.AsNoTracking), + PngIcon = mediaService.GetFileById(store.PngIconMediaFileId, MediaLoadFlags.AsNoTracking), + AppleTouchIcon = mediaService.GetFileById(store.AppleTouchIconMediaFileId, MediaLoadFlags.AsNoTracking), + MsTileIcon = mediaService.GetFileById(store.MsTileImageMediaFileId, MediaLoadFlags.AsNoTracking), + MsTileColor = store.MsTileColor }; return PartialView(model); @@ -547,10 +548,12 @@ public ActionResult Favicon() public ActionResult RobotsTextFile() { + #region DisallowPaths + var disallowPaths = new List() { "/bin/", - "/Exchange/", + "/Exchange/", "/Country/GetStatesByCountryId", "/Install$", "/Product/SetReviewHelpfulness", @@ -578,7 +581,7 @@ public ActionResult RobotsTextFile() "/Customer/CheckUsernameAvailability", "/Customer/DownloadableProducts", "/Customer/ForumSubscriptions", - "/Customer/DeleteForumSubscriptions", + "/Customer/DeleteForumSubscriptions", "/Customer/Info", "/Customer/Orders", "/Customer/ReturnRequests", @@ -596,27 +599,28 @@ public ActionResult RobotsTextFile() "/Product/EmailAFriend", //"/Search", "/Config$", - "/Settings$", - "/Login$", - "/Login?*", - "/Register$", - "/Register?*" - }; + "/Settings$", + "/Login$", + "/Login?*", + "/Register$", + "/Register?*" + }; + #endregion const string newLine = "\r\n"; //Environment.NewLine var sb = PooledStringBuilder.Rent(); sb.Append("User-agent: *"); sb.Append(newLine); - sb.AppendFormat("Sitemap: {0}", Url.RouteUrl("XmlSitemap", (object)null, Services.StoreContext.CurrentStore.ForceSslForAllPages ? "https" : "http")); - sb.AppendLine(); + sb.AppendFormat("Sitemap: {0}", Url.RouteUrl("XmlSitemap", (object)null, Services.StoreContext.CurrentStore.ForceSslForAllPages ? "https" : "http")); + sb.AppendLine(); - var disallows = disallowPaths.Concat(localizableDisallowPaths); + var disallows = disallowPaths.Concat(localizableDisallowPaths); if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled) { // URLs are localizable. Append SEO code - foreach (var language in _languageService.Value.GetAllLanguages(storeId: Services.StoreContext.CurrentStore.Id)) + foreach (var language in _languageService.Value.GetAllLanguages(storeId: Services.StoreContext.CurrentStore.Id)) { disallows = disallows.Concat(localizableDisallowPaths.Select(x => "/{0}{1}".FormatInvariant(language.UniqueSeoCode, x))); } @@ -627,8 +631,8 @@ public ActionResult RobotsTextFile() // append extra disallows disallows = disallows.Concat(seoSettings.ExtraRobotsDisallows.Select(x => x.Trim())); - // Append all lowercase variants (at least Google is case sensitive) - disallows = disallows.Concat(GetLowerCaseVariants(disallows)); + // Append all lowercase variants (at least Google is case sensitive) + disallows = disallows.Union(disallows.Select(x => x.ToLower())); foreach (var disallow in disallows) { @@ -643,74 +647,37 @@ public ActionResult BrowserConfigXmlFile() { var store = Services.StoreContext.CurrentStore; - if (store.MsTileImageMediaFileId == 0 || !store.MsTileColor.HasValue()) - return null; - - XmlWriterSettings settings = new XmlWriterSettings(); - settings.Indent = true; - var sb = PooledStringBuilder.Rent(); - - using (XmlWriter writer = XmlWriter.Create(sb, settings)) - { - writer.WriteStartDocument(); - writer.WriteStartElement("browserconfig"); - writer.WriteStartElement("msapplication"); - writer.WriteStartElement("tile"); - - if (store.MsTileImageMediaFileId != 0) - { - writer.WriteStartElement("square70x70logo"); - writer.WriteAttributeString("src", "{0}".FormatWith(_mediaService.Value.GetUrl(store.MsTileImageMediaFileId, 70, host: string.Empty))); - writer.WriteString(""); - writer.WriteEndElement(); - - writer.WriteStartElement("square150x150logo"); - writer.WriteAttributeString("src", "{0}".FormatWith(_mediaService.Value.GetUrl(store.MsTileImageMediaFileId, 150, host: string.Empty))); - writer.WriteString(""); - writer.WriteEndElement(); - - writer.WriteStartElement("square310x310logo"); - writer.WriteAttributeString("src", "{0}".FormatWith(_mediaService.Value.GetUrl(store.MsTileImageMediaFileId, 310, host: string.Empty))); - writer.WriteString(""); - writer.WriteEndElement(); - - // New setting ? :-/ - writer.WriteStartElement("wide310x150logo"); - writer.WriteAttributeString("src", "{0}".FormatWith(_mediaService.Value.GetUrl(store.MsTileImageMediaFileId, 150, host: string.Empty))); - writer.WriteString(""); - writer.WriteEndElement(); - } - - if (store.MsTileColor.HasValue()) - { - writer.WriteElementString("TileColor", store.MsTileColor); - } + if (store.MsTileImageMediaFileId == 0 || store.MsTileColor.IsEmpty()) + return new EmptyResult(); - writer.WriteEndElement(); // tile - writer.WriteEndElement(); // msapplication - writer.WriteEndElement(); // browserconfig - writer.WriteEndDocument(); - writer.Flush(); - } + var mediaService = _mediaService.Value; + var msTileImage = mediaService.GetFileById(store.MsTileImageMediaFileId, MediaLoadFlags.AsNoTracking); + if (msTileImage == null) + return new EmptyResult(); - return Content(sb.ToStringAndReturn(), "text/xml"); + XElement root = new XElement + ( + "browserconfig", + new XElement + ( + "msapplication", + new XElement + ( + "tile", + new XElement("square70x70logo", new XAttribute("src", mediaService.GetUrl(msTileImage, 70, host: string.Empty))), + new XElement("square150x150logo", new XAttribute("src", mediaService.GetUrl(msTileImage, 150, host: string.Empty))), + new XElement("square310x310logo", new XAttribute("src", mediaService.GetUrl(msTileImage, 310, host: string.Empty))), + new XElement("wide310x150logo", new XAttribute("src", mediaService.GetUrl(msTileImage, 150, host: string.Empty))), + new XElement("TileColor", store.MsTileColor) + ) + ) + ); + + var doc = new XDocument(root); + var xml = doc.ToString(SaveOptions.DisableFormatting); + return Content(xml, "text/xml"); } - private IEnumerable GetLowerCaseVariants(IEnumerable disallows) - { - var other = new List(); - foreach (var item in disallows) - { - var lower = item.ToLower(); - if (lower != item) - { - other.Add(lower); - } - } - - return other; - } - public ActionResult GenericUrl() { // Seems that no entity was found @@ -720,7 +687,7 @@ public ActionResult GenericUrl() [ChildActionOnly] public ActionResult AccountDropdown() { - var customer = Services.WorkContext.CurrentCustomer; + var customer = Services.WorkContext.CurrentCustomer; var unreadMessageCount = GetUnreadPrivateMessages(); var unreadMessage = string.Empty; @@ -741,8 +708,8 @@ public ActionResult AccountDropdown() var model = new AccountDropdownModel { IsAuthenticated = customer.IsRegistered(), - DisplayAdminLink = Services.Permissions.Authorize(Permissions.System.AccessBackend), - ShoppingCartEnabled = Services.Permissions.Authorize(Permissions.Cart.AccessShoppingCart), + DisplayAdminLink = Services.Permissions.Authorize(Permissions.System.AccessBackend), + ShoppingCartEnabled = Services.Permissions.Authorize(Permissions.Cart.AccessShoppingCart), //ShoppingCartItems = customer.CountProductsInCart(ShoppingCartType.ShoppingCart, Services.StoreContext.CurrentStore.Id), WishlistEnabled = Services.Permissions.Authorize(Permissions.Cart.AccessWishlist), //WishlistItems = customer.CountProductsInCart(ShoppingCartType.Wishlist, _serServicesvices.StoreContext.CurrentStore.Id), @@ -772,55 +739,55 @@ protected int GetUnreadPrivateMessages() } [OverrideActionFilters, OverrideAuthorization] - public ActionResult PdfReceiptHeader(PdfHeaderFooterVariables vars, int storeId = 0, bool isPartial = false) - { - var model = PreparePdfReceiptHeaderFooterModel(storeId); - model.Variables = vars; + public ActionResult PdfReceiptHeader(PdfHeaderFooterVariables vars, int storeId = 0, bool isPartial = false) + { + var model = PreparePdfReceiptHeaderFooterModel(storeId); + model.Variables = vars; - ViewBag.IsPartial = isPartial; + ViewBag.IsPartial = isPartial; - if (isPartial) - return PartialView(model); - return View(model); - } + if (isPartial) + return PartialView(model); + return View(model); + } [OverrideActionFilters, OverrideAuthorization] - public ActionResult PdfReceiptFooter(PdfHeaderFooterVariables vars, int storeId = 0, bool isPartial = false) - { - var model = PreparePdfReceiptHeaderFooterModel(storeId); - model.Variables = vars; - - ViewBag.IsPartial = isPartial; - - if (isPartial) - return PartialView(model); - return View(model); - } - - protected PdfReceiptHeaderFooterModel PreparePdfReceiptHeaderFooterModel(int storeId) - { - return Services.Cache.Get("PdfReceiptHeaderFooterModel-{0}".FormatInvariant(storeId), () => - { - var model = new PdfReceiptHeaderFooterModel { StoreId = storeId }; - var store = Services.StoreService.GetStoreById(model.StoreId) ?? Services.StoreContext.CurrentStore; - - var companyInfoSettings = Services.Settings.LoadSetting(store.Id); - var bankSettings = Services.Settings.LoadSetting(store.Id); - var contactSettings = Services.Settings.LoadSetting(store.Id); - var pdfSettings = Services.Settings.LoadSetting(store.Id); - - model.StoreName = store.Name; - model.StoreUrl = store.Url; + public ActionResult PdfReceiptFooter(PdfHeaderFooterVariables vars, int storeId = 0, bool isPartial = false) + { + var model = PreparePdfReceiptHeaderFooterModel(storeId); + model.Variables = vars; + + ViewBag.IsPartial = isPartial; + + if (isPartial) + return PartialView(model); + return View(model); + } + + protected PdfReceiptHeaderFooterModel PreparePdfReceiptHeaderFooterModel(int storeId) + { + return Services.Cache.Get("PdfReceiptHeaderFooterModel-{0}".FormatInvariant(storeId), () => + { + var model = new PdfReceiptHeaderFooterModel { StoreId = storeId }; + var store = Services.StoreService.GetStoreById(model.StoreId) ?? Services.StoreContext.CurrentStore; + + var companyInfoSettings = Services.Settings.LoadSetting(store.Id); + var bankSettings = Services.Settings.LoadSetting(store.Id); + var contactSettings = Services.Settings.LoadSetting(store.Id); + var pdfSettings = Services.Settings.LoadSetting(store.Id); + + model.StoreName = store.Name; + model.StoreUrl = store.Url; model.LogoId = pdfSettings.LogoPictureId != 0 ? pdfSettings.LogoPictureId : store.LogoMediaFileId; - model.MerchantCompanyInfo = companyInfoSettings; - model.MerchantBankAccount = bankSettings; - model.MerchantContactData = contactSettings; - model.MerchantFormattedAddress = Services.Resolve().FormatAddress(companyInfoSettings, true); + model.MerchantCompanyInfo = companyInfoSettings; + model.MerchantBankAccount = bankSettings; + model.MerchantContactData = contactSettings; + model.MerchantFormattedAddress = Services.Resolve().FormatAddress(companyInfoSettings, true); - return model; - }, TimeSpan.FromMinutes(1) /* 1 min. (just for the duration of pdf processing) */); - } + return model; + }, TimeSpan.FromMinutes(1) /* 1 min. (just for the duration of pdf processing) */); + } #region CookieManager @@ -878,7 +845,7 @@ private void PrepareCookieManagerModel(CookieManagerModel model) model.CookiesInfos = _cookieManager.GetAllCookieInfos(true); var cookie = _cookieManager.GetCookieData(this.ControllerContext); - + model.AnalyticsConsent = cookie != null ? cookie.AllowAnalytics : false; model.ThirdPartyConsent = cookie != null ? cookie.AllowThirdParty : false; @@ -907,27 +874,27 @@ public ActionResult SetCookieManagerConsent(CookieManagerModel model) #endregion [ChildActionOnly] - public ActionResult GdprConsent(bool isSmall) - { - if (!_privacySettings.DisplayGdprConsentOnForms) - { - return new EmptyResult(); - } - - var customer = Services.WorkContext.CurrentCustomer; - var hasConsentedToGdpr = customer.GetAttribute(SystemCustomerAttributeNames.HasConsentedToGdpr); - - if (hasConsentedToGdpr) - { - return new EmptyResult(); - } - - var model = new GdprConsentModel(); - model.GdprConsent = false; - model.SmallDisplay = isSmall; - - return PartialView(model); - } + public ActionResult GdprConsent(bool isSmall) + { + if (!_privacySettings.DisplayGdprConsentOnForms) + { + return new EmptyResult(); + } + + var customer = Services.WorkContext.CurrentCustomer; + var hasConsentedToGdpr = customer.GetAttribute(SystemCustomerAttributeNames.HasConsentedToGdpr); + + if (hasConsentedToGdpr) + { + return new EmptyResult(); + } + + var model = new GdprConsentModel(); + model.GdprConsent = false; + model.SmallDisplay = isSmall; + + return PartialView(model); + } #endregion } diff --git a/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs b/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs index e0a0a9ea4a..dbb041853d 100644 --- a/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Common/ShopLogoModel.cs @@ -1,13 +1,14 @@ -using SmartStore.Web.Framework.Modelling; +using SmartStore.Services.Media; +using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Models.Common { public partial class FaviconModel : ModelBase { - public int FavIconId { get; set; } - public int AppleTouchIconId { get; set; } - public int PngIconId { get; set; } - public int MsTileIconId { get; set; } + public MediaFileInfo FavIcon { get; set; } + public MediaFileInfo AppleTouchIcon { get; set; } + public MediaFileInfo PngIcon { get; set; } + public MediaFileInfo MsTileIcon { get; set; } public string MsTileColor { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml b/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml index 63ffd19b53..09f2268bc5 100644 --- a/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Common/Partials/Favicon.cshtml @@ -2,42 +2,42 @@ @using SmartStore.Web.Models.Common; -@if (Model.FavIconId != 0) +@if (Model.FavIcon != null) { - + } -@if (Model.PngIconId != 0) +@if (Model.PngIcon != null) { @*16x16 (browser tabs), 32x32 (Taskbar), 96x96 (Desktop), 196x196 (Android Chrome)*@ - - - - + + + + } -@if (Model.AppleTouchIconId != 0) +@if (Model.AppleTouchIcon != null) { - - - - - - - - - + + + + + + + + + } -@if (Model.MsTileIconId != 0) +@if (Model.MsTileIcon != null) { if (Model.MsTileColor.HasValue()) { } - - + + } \ No newline at end of file From dbe4ff90d71682d968e5a858dfd450f9a10ef828 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 5 Sep 2020 04:16:20 +0200 Subject: [PATCH 159/695] Better localization support for properties of ISettings --- .../Domain/Common/AddressSettings.cs | 6 +- .../Domain/Customers/PrivacySettings.cs | 2 +- .../Domain/Orders/OrderSettings.cs | 2 +- .../Domain/Orders/ShoppingCartSettings.cs | 2 +- .../Localization/ILocalizedEntityService.cs | 32 ++++- .../Localization/LocalizationExtensions.cs | 130 ++++++++++++++++-- .../Localization/LocalizedEntityHelper.cs | 13 +- .../Localization/LocalizedEntityService.cs | 129 ++++++++++------- .../Controllers/ReturnRequestController.cs | 4 +- .../Controllers/SettingController.cs | 16 +-- .../Controllers/CheckoutController.cs | 2 +- .../Controllers/ReturnRequestController.cs | 4 +- .../Extensions/MappingExtensions.cs | 2 +- 13 files changed, 252 insertions(+), 92 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Common/AddressSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/AddressSettings.cs index 6d39656c46..9970106a28 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/AddressSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/AddressSettings.cs @@ -3,13 +3,10 @@ namespace SmartStore.Core.Domain.Common { - public class AddressSettings : BaseEntity, ISettings, ILocalizedEntity + public class AddressSettings : ISettings { public AddressSettings() { - ValidateEmailAddress = false; - SalutationEnabled = false; - TitleEnabled = false; CompanyEnabled = true; StreetAddressEnabled = true; StreetAddressRequired = true; @@ -21,7 +18,6 @@ public AddressSettings() CountryEnabled = true; CountryRequired = true; StateProvinceEnabled = true; - StateProvinceRequired = false; PhoneEnabled = true; PhoneRequired = true; FaxEnabled = true; diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs index 3e754da5ba..24aa06a677 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs @@ -4,7 +4,7 @@ namespace SmartStore.Core.Domain.Customers { - public class PrivacySettings : BaseEntity, ISettings, ILocalizedEntity + public class PrivacySettings : ISettings { /// /// Specifies whether cookie hint and consent will be displayed to customers in the frontent diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs b/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs index 4d60104e14..b210ac07bf 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs @@ -3,7 +3,7 @@ namespace SmartStore.Core.Domain.Orders { - public class OrderSettings : BaseEntity, ISettings, ILocalizedEntity + public class OrderSettings : ISettings { public OrderSettings() { diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs b/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs index e569f371b7..853862dfd2 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs @@ -3,7 +3,7 @@ namespace SmartStore.Core.Domain.Orders { - public class ShoppingCartSettings : BaseEntity, ISettings, ILocalizedEntity + public class ShoppingCartSettings : ISettings { public ShoppingCartSettings() { diff --git a/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs b/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs index 979ef91ca5..13e75001e2 100644 --- a/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs +++ b/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq.Expressions; using SmartStore.Core; +using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Localization; namespace SmartStore.Services.Localization @@ -93,18 +94,43 @@ public partial interface ILocalizedEntityService : IScopedService /// Type /// Entity /// Key selector - /// Locale value + /// Locale value /// Language ID void SaveLocalizedValue( T entity, Expression> keySelector, - string localeValue, + string value, int languageId) where T : BaseEntity, ILocalizedEntity; + + /// + /// Save localized value + /// + /// Type + /// Property type + /// Entity + /// Key selector + /// Locale value + /// Language ID void SaveLocalizedValue( T entity, Expression> keySelector, - TPropType localeValue, + TPropType value, int languageId) where T : BaseEntity, ILocalizedEntity; + + /// + /// Save localized setting value + /// + /// Setting impl type + /// Property type + /// Settings instance + /// Key selector + /// Locale value + /// Language ID + void SaveLocalizedSetting( + TSetting settings, + Expression> keySelector, + TPropType value, + int languageId) where TSetting : class, ISettings; } } diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizationExtensions.cs b/src/Libraries/SmartStore.Services/Localization/LocalizationExtensions.cs index 42dac5164d..706fad2245 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizationExtensions.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizationExtensions.cs @@ -3,6 +3,7 @@ using System.Xml; using SmartStore.ComponentModel; using SmartStore.Core; +using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.DataExchange; using SmartStore.Core.Domain.Localization; @@ -14,6 +15,8 @@ namespace SmartStore.Services.Localization { public static class LocalizationExtensions { + #region GetLocalized BaseEntity + /// /// Get localized property of an entity /// @@ -28,6 +31,7 @@ public static LocalizedValue GetLocalized(this T entity, Expression().GetLocalizedValue( entity, + entity.Id, entity.GetEntityName(), invoker.Property.Name, (Func)invoker, @@ -57,6 +61,7 @@ public static LocalizedValue GetLocalized(this T entity, var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( entity, + entity.Id, entity.GetEntityName(), invoker.Property.Name, invoker, @@ -88,6 +93,7 @@ public static LocalizedValue GetLocalized(this T entity, { return EngineContext.Current.Resolve().GetLocalizedValue( entity, + entity.Id, entity.GetEntityName(), localeKey, x => fallback, @@ -119,6 +125,7 @@ public static LocalizedValue GetLocalized(this T entity, var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( entity, + entity.Id, entity.GetEntityName(), invoker.Property.Name, invoker, @@ -151,6 +158,7 @@ public static LocalizedValue GetLocalized(this T entity, var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( entity, + entity.Id, entity.GetEntityName(), invoker.Property.Name, (Func)invoker, @@ -183,6 +191,7 @@ public static LocalizedValue GetLocalized(this T entity, var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( entity, + entity.Id, entity.GetEntityName(), invoker.Property.Name, (Func)invoker, @@ -192,17 +201,22 @@ public static LocalizedValue GetLocalized(this T entity, detectEmptyHtml); } - /// - /// Get localized property of an instance - /// - /// Node - /// Key selector - /// Localized property - public static LocalizedValue GetLocalized(this ICategoryNode node, Expression> keySelector) + #endregion + + #region GetLocalized ICategoryNode + + /// + /// Get localized property of an instance + /// + /// Node + /// Key selector + /// Localized property + public static LocalizedValue GetLocalized(this ICategoryNode node, Expression> keySelector) { var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( node, + node.Id, "Category", invoker.Property.Name, (Func)invoker, @@ -221,7 +235,8 @@ public static LocalizedValue GetLocalized(this ICategoryNode node, Expre var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( node, - "Category", + node.Id, + nameof(Category), invoker.Property.Name, (Func)invoker, languageId); @@ -239,12 +254,103 @@ public static LocalizedValue GetLocalized(this ICategoryNode node, Expre var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( node, - "Category", + node.Id, + nameof(Category), invoker.Property.Name, (Func)invoker, language); } + #endregion + + #region GetLocalized ISettings + + /// + /// Get localized property of an implementation + /// + /// The settings instance + /// Key selector + /// Localized property + public static LocalizedValue GetLocalizedSetting(this TSetting settings, + Expression> keySelector, + bool returnDefaultValue = true, + bool ensureTwoPublishedLanguages = true, + bool detectEmptyHtml = false) + where TSetting : class, ISettings + { + var invoker = keySelector.CompileFast(); + return EngineContext.Current.Resolve().GetLocalizedValue( + settings, + 0, + typeof(TSetting).Name, + invoker.Property.Name, + (Func)invoker, + EngineContext.Current.Resolve().WorkingLanguage, + returnDefaultValue, + ensureTwoPublishedLanguages, + detectEmptyHtml); + } + + /// + /// Get localized property of an implementation + /// + /// The settings instance + /// Key selector + /// Language identifier + /// Localized property + public static LocalizedValue GetLocalizedSetting(this TSetting settings, + Expression> keySelector, + int languageId, + bool returnDefaultValue = true, + bool ensureTwoPublishedLanguages = true, + bool detectEmptyHtml = false) + where TSetting : class, ISettings + { + var invoker = keySelector.CompileFast(); + return EngineContext.Current.Resolve().GetLocalizedValue( + settings, + 0, + typeof(TSetting).Name, + invoker.Property.Name, + (Func)invoker, + languageId, + returnDefaultValue, + ensureTwoPublishedLanguages, + detectEmptyHtml); + } + + /// + /// Get localized property of an implementation + /// + /// The settings instance + /// Key selector + /// Language + /// Localized property + public static LocalizedValue GetLocalizedSetting(this TSetting settings, + Expression> keySelector, + Language language, + bool returnDefaultValue = true, + bool ensureTwoPublishedLanguages = true, + bool detectEmptyHtml = false) + where TSetting : class, ISettings + { + var invoker = keySelector.CompileFast(); + return EngineContext.Current.Resolve().GetLocalizedValue( + settings, + 0, + typeof(TSetting).Name, + invoker.Property.Name, + (Func)invoker, + language, + returnDefaultValue, + ensureTwoPublishedLanguages, + detectEmptyHtml); + } + + #endregion + + #region GetLocalizedEnum + /// /// Get localized value of enum /// @@ -301,6 +407,10 @@ public static string GetLocalizedEnum(this T enumValue, ILocalizationService return result; } + #endregion + + #region Plugin Localization + /// /// Delete a locale resource /// @@ -576,5 +686,7 @@ public static void ImportResourcesFromXml(this ILocalizationService service, service.ImportResourcesFromXml(language, xmlDoc, rootKey, sourceIsPlugin, mode, updateTouchedResources); } + + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityHelper.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityHelper.cs index 188581c335..9c6b90aa54 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityHelper.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityHelper.cs @@ -33,7 +33,8 @@ public LocalizedEntityHelper( _defaultLanguage = _languageService.GetLanguageById(_languageService.GetDefaultLanguageId()); } - public LocalizedValue GetLocalizedValue(T entity, + public LocalizedValue GetLocalizedValue(T obj, + int id, string localeKeyGroup, string localeKey, Func fallback, @@ -41,10 +42,10 @@ public LocalizedValue GetLocalizedValue(T entity, bool returnDefaultValue = true, bool ensureTwoPublishedLanguages = true, bool detectEmptyHtml = false) - where T : ILocalizedEntity + where T : class { - if (entity == null) - throw new ArgumentNullException(nameof(entity)); + if (obj == null) + throw new ArgumentNullException(nameof(obj)); TProp result = default; var str = string.Empty; @@ -79,7 +80,7 @@ public LocalizedValue GetLocalizedValue(T entity, // Localized value if (loadLocalizedValue) { - str = _localizedEntityService.GetLocalizedValue(requestLanguage.Id, entity.Id, localeKeyGroup, localeKey); + str = _localizedEntityService.GetLocalizedValue(requestLanguage.Id, id, localeKeyGroup, localeKey); if (detectEmptyHtml && HtmlUtils.IsEmptyHtml(str)) { @@ -97,7 +98,7 @@ public LocalizedValue GetLocalizedValue(T entity, if (returnDefaultValue && str.IsEmpty()) { currentLanguage = _defaultLanguage; - result = fallback(entity); + result = fallback(obj); } if (currentLanguage == null) diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs index bdd52f1977..87e35e2839 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs @@ -3,9 +3,11 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; +using System.Runtime.CompilerServices; using System.Threading; using SmartStore.Core; using SmartStore.Core.Caching; +using SmartStore.Core.Configuration; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Localization; @@ -312,75 +314,98 @@ public virtual LocalizedProperty GetLocalizedPropertyById(int localizedPropertyI return localizedProperty; } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public virtual void SaveLocalizedValue( T entity, Expression> keySelector, - string localeValue, + string value, int languageId) where T : BaseEntity, ILocalizedEntity { - SaveLocalizedValue(entity, keySelector, localeValue, languageId); - } + SaveLocalizedValue(entity, entity.Id, entity.GetEntityName(), keySelector, value, languageId); + } - public virtual void SaveLocalizedValue( + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public virtual void SaveLocalizedValue( T entity, Expression> keySelector, - TPropType localeValue, + TPropType value, int languageId) where T : BaseEntity, ILocalizedEntity { - Guard.NotNull(entity, nameof(entity)); + SaveLocalizedValue(entity, entity.Id, entity.GetEntityName(), keySelector, value, languageId); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public virtual void SaveLocalizedSetting( + TSetting settings, + Expression> keySelector, + TPropType value, + int languageId) where TSetting : class, ISettings + { + SaveLocalizedValue(settings, 0, typeof(TSetting).Name, keySelector, value, languageId); + } + + protected virtual void SaveLocalizedValue( + T obj, + int id, + string keyGroup, + Expression> keySelector, + TPropType value, + int languageId) where T : class + { + Guard.NotNull(obj, nameof(obj)); + Guard.NotEmpty(keyGroup, nameof(keyGroup)); Guard.NotZero(languageId, nameof(languageId)); - var member = keySelector.Body as MemberExpression; - if (member == null) - { - throw new ArgumentException($"Expression '{keySelector}' refers to a method, not a property."); - } - - var propInfo = member.Member as PropertyInfo; - if (propInfo == null) - { - throw new ArgumentException($"Expression '{keySelector}' refers to a field, not a property."); - } - - var keyGroup = entity.GetEntityName(); - var key = propInfo.Name; - var valueStr = localeValue.Convert(); - var prop = GetLocalizedProperty(languageId, entity.Id, keyGroup, key); - - if (prop != null) - { - if (valueStr.IsEmpty()) - { - // Delete - DeleteLocalizedProperty(prop); - } - else - { - // Update + var member = keySelector.Body as MemberExpression; + if (member == null) + { + throw new ArgumentException($"Expression '{keySelector}' refers to a method, not a property."); + } + + var propInfo = member.Member as PropertyInfo; + if (propInfo == null) + { + throw new ArgumentException($"Expression '{keySelector}' refers to a field, not a property."); + } + + var key = propInfo.Name; + var valueStr = value.Convert(); + var prop = GetLocalizedProperty(languageId, id, keyGroup, key); + + if (prop != null) + { + if (valueStr.IsEmpty()) + { + // Delete + DeleteLocalizedProperty(prop); + } + else + { + // Update if (prop.LocaleValue != valueStr) { prop.LocaleValue = valueStr; UpdateLocalizedProperty(prop); } - } - } - else - { - if (valueStr.HasValue()) - { - // insert - prop = new LocalizedProperty - { - EntityId = entity.Id, - LanguageId = languageId, - LocaleKey = key, - LocaleKeyGroup = keyGroup, - LocaleValue = valueStr - }; - InsertLocalizedProperty(prop); - } - } - } + } + } + else + { + if (valueStr.HasValue()) + { + // insert + prop = new LocalizedProperty + { + EntityId = id, + LanguageId = languageId, + LocaleKey = key, + LocaleKeyGroup = keyGroup, + LocaleValue = valueStr + }; + InsertLocalizedProperty(prop); + } + } + } private string BuildCacheSegmentKey(string segment, int languageId) { diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ReturnRequestController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ReturnRequestController.cs index d571868dc5..0b23b68f01 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ReturnRequestController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ReturnRequestController.cs @@ -296,8 +296,8 @@ private bool PrepareReturnRequestModel( if (!forList) { // That's what we also offer in frontend. - string returnRequestReasons = _orderSettings.GetLocalized(x => x.ReturnRequestReasons, orderItem.Order.CustomerLanguageId, true, false); - string returnRequestActions = _orderSettings.GetLocalized(x => x.ReturnRequestActions, orderItem.Order.CustomerLanguageId, true, false); + string returnRequestReasons = _orderSettings.GetLocalizedSetting(x => x.ReturnRequestReasons, orderItem.Order.CustomerLanguageId, true, false); + string returnRequestActions = _orderSettings.GetLocalizedSetting(x => x.ReturnRequestActions, orderItem.Order.CustomerLanguageId, true, false); string unspec = T("Common.Unspecified"); model.AvailableReasonForReturn.Add(new SelectListItem { Text = unspec, Value = "" }); diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs index 41b7bd7d1d..efa79eea8a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs @@ -658,8 +658,8 @@ public ActionResult Order() AddLocales(_languageService, model.Locales, (locale, languageId) => { - locale.ReturnRequestActions = orderSettings.GetLocalized(x => x.ReturnRequestActions, languageId, false, false); - locale.ReturnRequestReasons = orderSettings.GetLocalized(x => x.ReturnRequestReasons, languageId, false, false); + locale.ReturnRequestActions = orderSettings.GetLocalizedSetting(x => x.ReturnRequestActions, languageId, false, false); + locale.ReturnRequestReasons = orderSettings.GetLocalizedSetting(x => x.ReturnRequestReasons, languageId, false, false); }); model.OrderIdent = _maintenanceService.GetTableIdent(); @@ -696,8 +696,8 @@ public ActionResult Order(OrderSettingsModel model, FormCollection form) foreach (var localized in model.Locales) { - _localizedEntityService.SaveLocalizedValue(orderSettings, x => x.ReturnRequestActions, localized.ReturnRequestActions, localized.LanguageId); - _localizedEntityService.SaveLocalizedValue(orderSettings, x => x.ReturnRequestReasons, localized.ReturnRequestReasons, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(orderSettings, x => x.ReturnRequestActions, localized.ReturnRequestActions, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(orderSettings, x => x.ReturnRequestReasons, localized.ReturnRequestReasons, localized.LanguageId); } if (model.GiftCards_Activated_OrderStatusId.HasValue) @@ -751,7 +751,7 @@ public ActionResult ShoppingCart() AddLocales(_languageService, model.Locales, (locale, languageId) => { - locale.ThirdPartyEmailHandOverLabel = shoppingCartSettings.GetLocalized(x => x.ThirdPartyEmailHandOverLabel, languageId, false, false); + locale.ThirdPartyEmailHandOverLabel = shoppingCartSettings.GetLocalizedSetting(x => x.ThirdPartyEmailHandOverLabel, languageId, false, false); }); return View(model); @@ -786,7 +786,7 @@ public ActionResult ShoppingCart(ShoppingCartSettingsModel model, FormCollection foreach (var localized in model.Locales) { - _localizedEntityService.SaveLocalizedValue(shoppingCartSettings, x => x.ThirdPartyEmailHandOverLabel, localized.ThirdPartyEmailHandOverLabel, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(shoppingCartSettings, x => x.ThirdPartyEmailHandOverLabel, localized.ThirdPartyEmailHandOverLabel, localized.LanguageId); } return NotifyAndRedirect("ShoppingCart"); @@ -936,7 +936,7 @@ public ActionResult CustomerUser() AddLocales(_languageService, model.Locales, (locale, languageId) => { - locale.Salutations = addressSettings.GetLocalized(x => x.Salutations, languageId, false, false); + locale.Salutations = addressSettings.GetLocalizedSetting(x => x.Salutations, languageId, false, false); }); return View(model); @@ -996,7 +996,7 @@ public ActionResult CustomerUser(CustomerUserSettingsModel model, FormCollection foreach (var localized in model.Locales) { - _localizedEntityService.SaveLocalizedValue(addressSettings, x => x.Salutations, localized.Salutations, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(addressSettings, x => x.Salutations, localized.Salutations, localized.LanguageId); } return NotifyAndRedirect("CustomerUser"); diff --git a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs index f53c91c20d..3f91f4bf61 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs @@ -390,7 +390,7 @@ protected CheckoutConfirmModel PrepareConfirmOrderModel(IList x.ThirdPartyEmailHandOverLabel, _workContext.WorkingLanguage, true, false); + model.ThirdPartyEmailHandOverLabel = _shoppingCartSettings.GetLocalizedSetting(x => x.ThirdPartyEmailHandOverLabel, _workContext.WorkingLanguage, true, false); if (model.ThirdPartyEmailHandOverLabel.IsEmpty()) model.ThirdPartyEmailHandOverLabel = T("Admin.Configuration.Settings.ShoppingCart.ThirdPartyEmailHandOverLabel.Default"); diff --git a/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs b/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs index e1d02d745b..4ab8fffbb7 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs @@ -62,8 +62,8 @@ protected SubmitReturnRequestModel PrepareReturnRequestModel(SubmitReturnRequest model.OrderId = order.Id; var language = Services.WorkContext.WorkingLanguage; - string returnRequestReasons = _orderSettings.GetLocalized(x => x.ReturnRequestReasons, order.CustomerLanguageId, true, false); - string returnRequestActions = _orderSettings.GetLocalized(x => x.ReturnRequestActions, order.CustomerLanguageId, true, false); + string returnRequestReasons = _orderSettings.GetLocalizedSetting(x => x.ReturnRequestReasons, order.CustomerLanguageId, true, false); + string returnRequestActions = _orderSettings.GetLocalizedSetting(x => x.ReturnRequestActions, order.CustomerLanguageId, true, false); // Return reasons. foreach (var rrr in returnRequestReasons.SplitSafe(",")) diff --git a/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs b/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs index a2354af761..bb37d8c886 100644 --- a/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs +++ b/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs @@ -226,7 +226,7 @@ public static void PrepareModel(this AddressModel model, if (localizationService != null) { - string salutations = addressSettings.GetLocalized(x => x.Salutations); + string salutations = addressSettings.GetLocalizedSetting(x => x.Salutations); foreach (var sal in salutations.SplitSafe(",")) { model.AvailableSalutations.Add(new SelectListItem { Value = sal, Text = sal }); From 8a212a6d8c66a14b4c469922e5561e3e6c22a06d Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 7 Sep 2020 14:35:57 +0200 Subject: [PATCH 160/695] Resolves #2076 Attributes are not pre-selected for all associated products of a grouped product --- changelog.md | 1 + .../Controllers/CatalogHelper.cs | 47 ++++++++++++------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/changelog.md b/changelog.md index 33bd4e6e86..e827b811c7 100644 --- a/changelog.md +++ b/changelog.md @@ -33,6 +33,7 @@ * Message template attachments were not attached to the email. * Shipment templates showed all products of the order instead of only those of the shipment. * EasyCredit: fixed "Could not convert setting 'EasyCreditSettings.LastPurchaseLimitUpdatedOn' to type 'DateTime'". +* #2076 Attributes were not pre-selected for all associated products of a grouped product. ## Smartstore 4.0.1 diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index f6a45fb037..c860dc5c19 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs @@ -759,7 +759,7 @@ public ProductDetailsModel PrepareProductDetailModel( var bundleItemId = productBundleItem == null ? 0 : productBundleItem.Item.Id; var hasSelectedAttributesValues = false; - var hasSelectedAttributes = query.Variants.Count > 0; + var hasSelectedAttributes = query.Variants.Any(); List selectedAttributeValues = null; var variantAttributes = isBundle ? new List() : _productAttributeService.GetProductVariantAttributesByProductId(product.Id); @@ -874,13 +874,9 @@ public ProductDetailsModel PrepareProductDetailModel( }; if (linkedProduct != null && linkedProduct.Visibility != ProductVisibility.Hidden) + { pvaValueModel.SeName = linkedProduct.GetSeName(); - - // Explicitly selected always discards pre-selected by merchant. - if (hasSelectedAttributes || query.VariantCombinationId != 0) - { - pvaValueModel.IsPreSelected = false; - } + } // Display price if allowed. if (displayPrices && !isBundlePricing) @@ -997,7 +993,16 @@ public ProductDetailsModel PrepareProductDetailModel( } else { - attributeXml = query.CreateSelectedAttributesXml(product.Id, bundleItemId, variantAttributes, _productAttributeParser, _localizationService, _downloadService, _catalogSettings, _httpRequest, warnings); + attributeXml = query.CreateSelectedAttributesXml( + product.Id, + bundleItemId, + variantAttributes, + _productAttributeParser, + _localizationService, + _downloadService, + _catalogSettings, + _httpRequest, + warnings); } selectedAttributeValues = _productAttributeParser.ParseProductVariantAttributeValues(attributeXml).ToList(); @@ -1025,18 +1030,26 @@ public ProductDetailsModel PrepareProductDetailModel( product.MergeWithCombination(model.SelectedCombination); - // Mark explicitly selected as pre-selected. + // Explicitly selected values always discards values pre-selected by merchant. + var selectedValueIds = selectedAttributeValues.Select(x => x.Id).ToArray(); + foreach (var attribute in model.ProductVariantAttributes) { - foreach (var value in attribute.Values) - { - if (selectedAttributeValues.FirstOrDefault(v => v.Id == value.Id) != null) - value.IsPreSelected = true; + var updatePreSelection = selectedValueIds.Any() && selectedValueIds.Intersect(attribute.Values.Select(x => x.Id)).Any(); - if (!_catalogSettings.ShowVariantCombinationPriceAdjustment) - value.PriceAdjustment = ""; - } - } + foreach (var value in attribute.Values) + { + if (updatePreSelection) + { + value.IsPreSelected = selectedValueIds.Contains(value.Id); + } + + if (!_catalogSettings.ShowVariantCombinationPriceAdjustment) + { + value.PriceAdjustment = string.Empty; + } + } + } } } From 9ce738f8e8dad21d32fd8689da0174a51bdc9103 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 7 Sep 2020 17:02:39 +0200 Subject: [PATCH 161/695] Minor improvement at sorting of facets --- .../Search/Facets/FacetExtensions.cs | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Search/Facets/FacetExtensions.cs b/src/Libraries/SmartStore.Core/Search/Facets/FacetExtensions.cs index 3951bb1a7e..4d706d00bc 100644 --- a/src/Libraries/SmartStore.Core/Search/Facets/FacetExtensions.cs +++ b/src/Libraries/SmartStore.Core/Search/Facets/FacetExtensions.cs @@ -33,27 +33,38 @@ public static IOrderedEnumerable OrderBy(this IEnumerable source, { case FacetSorting.ValueAsc: if (selectedFirst) - return source.OrderByDescending(x => x.Value.IsSelected).ThenBy(x => x.Value.Value); + return source + .OrderByDescending(x => x.Value.IsSelected) + .ThenBy(x => x.Value.Value); else return source.OrderBy(x => x.Value.Value); case FacetSorting.LabelAsc: if (selectedFirst) - return source.OrderByDescending(x => x.Value.IsSelected).ThenBy(x => x.Value.Label); + return source + .OrderByDescending(x => x.Value.IsSelected) + .ThenBy(x => x.Value.Label); else return source.OrderBy(x => x.Value.Label); case FacetSorting.DisplayOrder: if (selectedFirst) - return source.OrderByDescending(x => x.Value.IsSelected).ThenBy(x => x.Value.DisplayOrder); + return source + .OrderByDescending(x => x.Value.IsSelected) + .ThenBy(x => x.Value.DisplayOrder); else return source.OrderBy(x => x.Value.DisplayOrder); default: if (selectedFirst) - return source.OrderByDescending(x => x.Value.IsSelected).ThenByDescending(x => x.HitCount); + return source + .OrderByDescending(x => x.Value.IsSelected) + .ThenByDescending(x => x.HitCount) + .ThenBy(x => x.Value.Label); else - return source.OrderByDescending(x => x.HitCount); + return source + .OrderByDescending(x => x.HitCount) + .ThenBy(x => x.Value.Label); } } From 82bd989b7d542d65395e22c1748a932824e71880 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 8 Sep 2020 01:49:20 +0200 Subject: [PATCH 162/695] Isolated Seo model properties in ISeoModel interface and added SeoModel editor template for backend --- .../Extensions/HtmlExtensions.cs | 2 +- .../Localization/ILocalizedModel.cs | 9 +-- .../SmartStore.Web.Framework/Seo/ISeoModel.cs | 23 ++++++ .../SmartStore.Web.Framework.csproj | 1 + .../Administration/SmartStore.Admin.csproj | 1 + .../Views/Category/_CreateOrUpdate.cshtml | 1 + .../Shared/EditorTemplates/SeoModel.cshtml | 70 +++++++++++++++++++ 7 files changed, 100 insertions(+), 7 deletions(-) create mode 100644 src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs create mode 100644 src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/SeoModel.cshtml diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs index e10d675511..19fbede0dc 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs @@ -62,7 +62,7 @@ public static MvcHtmlString Hint(this HtmlHelper helper, string value) return MvcHtmlString.Create(a.ToString()); } - public static HelperResult LocalizedEditor(this HtmlHelper helper, string name, Func localizedTemplate, Func standardTemplate) + public static HelperResult LocalizedEditor(this HtmlHelper helper, string name, Func localizedTemplate, Func standardTemplate) where T : ILocalizedModel where TLocalizedModelLocal : ILocalizedModelLocal { diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs b/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs index d91f9f2ad8..b4a818c976 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs @@ -1,12 +1,9 @@ using System.Collections.Generic; +using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Framework.Localization { - public interface ILocalizedModel - { - } - - public interface ILocalizedModel : ILocalizedModel where T : ILocalizedModelLocal + public interface ILocalizedModel where T : ILocalizedModelLocal { IList Locales { get; set; } } @@ -15,4 +12,4 @@ public interface ILocalizedModelLocal { int LanguageId { get; set; } } -} +} \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs new file mode 100644 index 0000000000..91fb2a717d --- /dev/null +++ b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs @@ -0,0 +1,23 @@ +using System; +using SmartStore.Web.Framework.Localization; + +namespace SmartStore.Web.Framework.Seo +{ + public interface ISeoModel : ILocalizedModel + { + // TODO: (mh) Annotate these props with "SmartResourceDisplayNameAttribute" here, not on impl model level + string MetaTitle { get; } + string MetaDescription { get; } + string MetaKeywords { get; } + } + + public class SeoModelLocal : ILocalizedModelLocal + { + public int LanguageId { get; set; } + + // TODO: (mh) Annotate these props with "SmartResourceDisplayNameAttribute" here, not on impl model level + public string MetaTitle { get; set; } + public string MetaDescription { get; set; } + public string MetaKeywords { get; set; } + } +} diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 8b904bae9a..c080dfdf8a 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -250,6 +250,7 @@ + diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index db697c1ee8..9eab1c3acb 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -661,6 +661,7 @@ + diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Category/_CreateOrUpdate.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Category/_CreateOrUpdate.cshtml index 21c70905cc..2b3a4a76ac 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Category/_CreateOrUpdate.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Category/_CreateOrUpdate.cshtml @@ -1,4 +1,5 @@ @model CategoryModel + @Html.ValidationSummary(false) @Html.HiddenFor(model => model.Id) diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/SeoModel.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/SeoModel.cshtml new file mode 100644 index 0000000000..512830a690 --- /dev/null +++ b/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/SeoModel.cshtml @@ -0,0 +1,70 @@ +@model ISeoModel + +@using SmartStore.Web.Framework.Seo; + +@{ + @(Html.LocalizedEditor("seo-model-localized", + @ + + + + + + + + + + + + +
+ @Html.SmartLabelFor(model => model.Locales[item].MetaTitle) + + @*IMPORTANT: Do not delete, this hidden element contains the id to assign localized values to the corresponding language *@ + @Html.HiddenFor(model => model.Locales[item].LanguageId) + + @Html.EditorFor(model => Model.Locales[item].MetaTitle) + @Html.ValidationMessageFor(model => model.Locales[item].MetaTitle) +
+ @Html.SmartLabelFor(model => model.Locales[item].MetaDescription) + + @Html.EditorFor(model => Model.Locales[item].MetaDescription) + @Html.ValidationMessageFor(model => model.Locales[item].MetaDescription) +
+ @Html.SmartLabelFor(model => model.Locales[item].MetaKeywords) + + @Html.EditorFor(model => model.Locales[item].MetaKeywords) + @Html.ValidationMessageFor(model => model.Locales[item].MetaKeywords) +
+ , + @ + + + + + + + + + + + + +
+ @Html.SmartLabelFor(model => model.MetaTitle) + + @Html.EditorFor(model => model.MetaTitle) + @Html.ValidationMessageFor(model => model.MetaTitle) +
+ @Html.SmartLabelFor(model => model.MetaDescription) + + @Html.EditorFor(model => model.MetaDescription) + @Html.ValidationMessageFor(model => model.MetaDescription) +
+ @Html.SmartLabelFor(model => model.MetaKeywords) + + @Html.EditorFor(x => x.MetaKeywords) + @Html.ValidationMessageFor(model => model.MetaKeywords) +
+ )) +} From 4e18128e1eecdf0d72b13f49d1c01f39b8cea2c1 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 8 Sep 2020 04:28:23 +0200 Subject: [PATCH 163/695] Output cache invalidation observers: some entities like BlogPost, NewsItem etc. did not purge rendered lists when a visibility affecting property was changed (e.g. NewsItem.Published: false > true) --- .../SmartStore.Core/Domain/Blogs/BlogPost.cs | 20 ++++++++++++++++++- .../SmartStore.Core/Domain/News/NewsItem.cs | 18 +++++++++++++++++ .../Administration/Views/Language/Edit.cshtml | 7 ++++--- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs index 09d2269787..f336a9483d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs +++ b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs @@ -14,7 +14,25 @@ namespace SmartStore.Core.Domain.Blogs [DataContract] public partial class BlogPost : BaseEntity, ISlugSupported, IStoreMappingSupported { - private ICollection _blogComments; + #region static + + private static readonly List _visibilityAffectingProps = new List + { + nameof(BlogPost.IsPublished), + nameof(BlogPost.StartDateUtc), + nameof(BlogPost.EndDateUtc), + nameof(BlogPost.LimitedToStores), + nameof(BlogPost.LanguageId) + }; + + public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() + { + return _visibilityAffectingProps; + } + + #endregion + + private ICollection _blogComments; /// /// Gets or sets a value indicating whether the blog post comments are allowed diff --git a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs index 5763f56c8a..2f5bfe18f4 100644 --- a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs +++ b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs @@ -13,6 +13,24 @@ namespace SmartStore.Core.Domain.News /// public partial class NewsItem : BaseEntity, ISlugSupported, IStoreMappingSupported { + #region static + + private static readonly List _visibilityAffectingProps = new List + { + nameof(NewsItem.Published), + nameof(NewsItem.StartDateUtc), + nameof(NewsItem.EndDateUtc), + nameof(NewsItem.LimitedToStores), + nameof(NewsItem.LanguageId) + }; + + public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() + { + return _visibilityAffectingProps; + } + + #endregion + private ICollection _newsComments; /// diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Language/Edit.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Language/Edit.cshtml index 98fbea9085..e8122be266 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Language/Edit.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Language/Edit.cshtml @@ -39,9 +39,10 @@ @*Import resources dialog*@ @{Html.SmartStore().Window() - .Name("importxml-window") - .Title(T("Admin.Configuration.Languages.Import")) - .Content(@ + .Name("importxml-window") + .Title(T("Admin.Configuration.Languages.Import")) + .BodyHtmlAttributes(new { @class = "pt-0" }) + .Content(@ From 2d90cc34dbb517c354f291eb953edf60e5e1a8a6 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 8 Sep 2020 11:45:11 +0200 Subject: [PATCH 164/695] Resolves #2022 reCAPTCHA API should not be called if the reCAPTCHA widget was not rendered at all --- .../Captcha/ValidateCaptchaAttribute.cs | 77 ++++++++++++++++--- 1 file changed, 67 insertions(+), 10 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs index 9570cecc14..b3998389cd 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs @@ -16,22 +16,20 @@ namespace SmartStore.Web.Framework.Security { public class ValidateCaptchaAttribute : ActionFilterAttribute { - public ValidateCaptchaAttribute() - { - Logger = NullLogger.Instance; - } - - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } = NullLogger.Instance; public Lazy CaptchaSettings { get; set; } public Lazy LocalizationService { get; set; } public override void OnActionExecuting(ActionExecutingContext filterContext) { var valid = false; + var verify = true; - try + try { - if (CaptchaSettings.Value.CanDisplayCaptcha) + verify = CaptchaSettings.Value.CanDisplayCaptcha && VerifyRecaptcha(filterContext); + + if (verify) { var verifyUrl = CommonHelper.GetAppSetting("g:RecaptchaVerifyUrl"); var recaptchaResponse = filterContext.HttpContext.Request.Form["g-recaptcha-response"]; @@ -78,15 +76,74 @@ public override void OnActionExecuting(ActionExecutingContext filterContext) Logger.ErrorsAll(ex); } - // This will push the result value into a parameter in our action method. + // Push the result values as parameters in our action method. filterContext.ActionParameters["captchaValid"] = valid; - filterContext.ActionParameters["captchaError"] = !valid && CaptchaSettings.Value.CanDisplayCaptcha + filterContext.ActionParameters["captchaError"] = !valid && verify ? LocalizationService.Value.GetResource(CaptchaSettings.Value.UseInvisibleReCaptcha ? "Common.WrongInvisibleCaptcha" : "Common.WrongCaptcha") : null; base.OnActionExecuting(filterContext); } + + private bool VerifyRecaptcha(ActionExecutingContext context) + { + // Poor method to avoid unnecessary requests to the Google API. + var controller = context?.ActionDescriptor?.ControllerDescriptor?.ControllerName.EmptyNull(); + var action = context?.ActionDescriptor?.ActionName.EmptyNull(); + + if (controller == "Blog" && action == "BlogCommentAdd") + { + return CaptchaSettings.Value.ShowOnBlogCommentPage; + } + else if (controller == "Boards") + { + switch (action) + { + case "TopicCreate": + case "TopicEdit": + case "PostCreate": + case "PostEdit": + return CaptchaSettings.Value.ShowOnForumPage; + } + } + else if (controller == "Customer") + { + switch (action) + { + case "Login": + return CaptchaSettings.Value.ShowOnLoginPage; + case "Register": + return CaptchaSettings.Value.ShowOnRegistrationPage; + } + } + else if (controller == "Home" && action == "ContactUsSend") + { + return CaptchaSettings.Value.ShowOnContactUsPage; + } + else if (controller == "News" && action == "NewsCommentAdd") + { + return CaptchaSettings.Value.ShowOnNewsCommentPage; + } + else if (controller == "Product") + { + switch (action) + { + case "ReviewsAdd": + return CaptchaSettings.Value.ShowOnProductReviewPage; + case "AskQuestionSend": + return CaptchaSettings.Value.ShowOnAskQuestionPage; + case "EmailAFriendSend": + return CaptchaSettings.Value.ShowOnEmailProductToFriendPage; + } + } + else if (controller == "ShoppingCart" && action == "EmailWishlistSend") + { + return CaptchaSettings.Value.ShowOnEmailWishlistToFriendPage; + } + + return true; + } } From d5229298c8a1334dd4148ade25745f957f5816cc Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 8 Sep 2020 13:50:51 +0200 Subject: [PATCH 165/695] When editing a product, the stock quantity is only updated if it has not changed since the page was loaded. Resolves #2052. --- changelog.md | 1 + .../Migrations/MigrationsConfiguration.cs | 12 +++-- .../Controllers/ProductController.cs | 54 +++++++++++++------ .../Models/Catalog/ProductModel.cs | 1 + .../Product/_CreateOrUpdate.Inventory.cshtml | 2 + 5 files changed, 50 insertions(+), 20 deletions(-) diff --git a/changelog.md b/changelog.md index e827b811c7..d746321c7a 100644 --- a/changelog.md +++ b/changelog.md @@ -20,6 +20,7 @@ * #1407 Added menu to set order and payment status for orders checked in backend grid. * #1778 Back button closes offcanvas menu/cart. * #2069 MegaSearch: product order is applied to all categories in which a product appears. +* #2052 When editing a product, the stock quantity is only updated if it has not changed since the page was loaded. ### Bugfixes * **Media Manager** diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 1553c0cd47..c3f67650db 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -318,6 +318,10 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb Admin > Konfiguration > Regionale Einstellungen > Sprachen.

"); + builder.AddOrUpdate("Admin.Catalog.Products.StockQuantityNotChanged", + "The stock quantity has not been updated because the value has changed since the page was loaded (e.g. due to a placed order). Current value is {0}.", + "Der Lagerbestand wurde nicht aktualisiert, weil sich der Wert seit Laden der Seite geändert hat (z.B. durch einen Auftragseingang). Aktueller Wert ist {0}."); + builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.Style", "Gallery style", "Galerie-Stil"); @@ -325,14 +329,14 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.Fullscreen", "View fullscreen", "Vollbild anzeigen", - "Determines whether the medium is clickable to display it in its original size.", - "Bestimmt, ob das Medium anklickbar ist, um es in seiner Originalgröße anzuzeigen:"); + "Specifies whether the medium is clickable to display it in its original size.", + "Legt fest, ob das Medium anklickbar ist, um es in seiner Originalgröße anzuzeigen."); builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.Zoomer", "Magnify on mouse hover", "Vergrößern beim Maus-Hover", - "Displays an enlarged detailed view of the media at the cursor position", - "Zeigt eine vergrößerte Detailansicht des Mediums an der Zeigerposition"); + "Displays an enlarged detailed view of the media at the cursor position.", + "Zeigt eine vergrößerte Detailansicht des Mediums an der Zeigerposition."); builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.Padding", "Paddings", diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs index 832dca037a..2662eb96d8 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs @@ -315,11 +315,30 @@ protected void UpdateProductInventory(Product product, ProductModel model) { var p = product; var m = model; + var updateStockQuantity = true; + var stockQuantityInDatabase = product.StockQuantity; - var prevStockQuantity = product.StockQuantity; + if (p.ManageInventoryMethod == ManageInventoryMethod.ManageStock && p.Id != 0) + { + if (m.OriginalStockQuantity != stockQuantityInDatabase) + { + // The stock has changed since the edit page was loaded, e.g. because an order has been placed. + updateStockQuantity = false; + + if (m.StockQuantity != m.OriginalStockQuantity) + { + // The merchant has changed the stock quantity manually. + NotifyWarning(T("Admin.Catalog.Products.StockQuantityNotChanged", stockQuantityInDatabase.ToString("N0"))); + } + } + } + + if (updateStockQuantity) + { + p.StockQuantity = m.StockQuantity; + } p.ManageInventoryMethodId = m.ManageInventoryMethodId; - p.StockQuantity = m.StockQuantity; p.DisplayStockAvailability = m.DisplayStockAvailability; p.DisplayStockQuantity = m.DisplayStockQuantity; p.MinStockQuantity = m.MinStockQuantity; @@ -332,22 +351,24 @@ protected void UpdateProductInventory(Product product, ProductModel model) p.QuantityStep = m.QuantityStep; p.HideQuantityControl = m.HideQuantityControl; - // back in stock notifications - if (p.ManageInventoryMethod == ManageInventoryMethod.ManageStock && - p.BackorderMode == BackorderMode.NoBackorders && - p.AllowBackInStockSubscriptions && - p.StockQuantity > 0 && - prevStockQuantity <= 0 && - p.Published && - !p.Deleted && - !p.IsSystemProduct) + if (p.ManageInventoryMethod == ManageInventoryMethod.ManageStock && updateStockQuantity) { - _backInStockSubscriptionService.SendNotificationsToSubscribers(p); - } + // Back in stock notifications. + if (p.BackorderMode == BackorderMode.NoBackorders && + p.AllowBackInStockSubscriptions && + p.StockQuantity > 0 && + stockQuantityInDatabase <= 0 && + p.Published && + !p.Deleted && + !p.IsSystemProduct) + { + _backInStockSubscriptionService.SendNotificationsToSubscribers(p); + } - if (p.StockQuantity != prevStockQuantity && p.ManageInventoryMethod == ManageInventoryMethod.ManageStock) - { - _productService.AdjustInventory(p, true, 0, string.Empty); + if (p.StockQuantity != stockQuantityInDatabase) + { + _productService.AdjustInventory(p, true, 0, string.Empty); + } } } @@ -523,6 +544,7 @@ protected void PrepareProductModel(ProductModel model, Product product, bool set model.UpdatedOn = _dateTimeHelper.ConvertToUserTime(product.UpdatedOnUtc, DateTimeKind.Utc); model.SelectedStoreIds = _storeMappingService.GetStoresIdsWithAccess(product); model.SelectedCustomerRoleIds = _aclService.GetCustomerRoleIdsWithAccessTo(product); + model.OriginalStockQuantity = product.StockQuantity; if (product.LimitedToStores) { diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs index 069e0f5a38..b202a96cb7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs @@ -236,6 +236,7 @@ public ProductModel() [SmartResourceDisplayName("Admin.Catalog.Products.Fields.StockQuantity")] public int StockQuantity { get; set; } + public int OriginalStockQuantity { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.DisplayStockAvailability")] public bool DisplayStockAvailability { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Inventory.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Inventory.cshtml index f564238252..c41bba46d0 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Inventory.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Inventory.cshtml @@ -78,6 +78,8 @@ }); +@Html.HiddenFor(model => model.OriginalStockQuantity) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
From 07a9cd45cd24a2bbd42f69696b833a942bb955b0 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 8 Sep 2020 14:10:39 +0200 Subject: [PATCH 166/695] String resources of plugins should be provided in the appropriate XML file --- .../Migrations/MigrationsConfiguration.cs | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index c3f67650db..637455049c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -321,30 +321,6 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb builder.AddOrUpdate("Admin.Catalog.Products.StockQuantityNotChanged", "The stock quantity has not been updated because the value has changed since the page was loaded (e.g. due to a placed order). Current value is {0}.", "Der Lagerbestand wurde nicht aktualisiert, weil sich der Wert seit Laden der Seite geändert hat (z.B. durch einen Auftragseingang). Aktueller Wert ist {0}."); - - builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.Style", - "Gallery style", - "Galerie-Stil"); - - builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.Fullscreen", - "View fullscreen", - "Vollbild anzeigen", - "Specifies whether the medium is clickable to display it in its original size.", - "Legt fest, ob das Medium anklickbar ist, um es in seiner Originalgröße anzuzeigen."); - - builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.Zoomer", - "Magnify on mouse hover", - "Vergrößern beim Maus-Hover", - "Displays an enlarged detailed view of the media at the cursor position.", - "Zeigt eine vergrößerte Detailansicht des Mediums an der Zeigerposition."); - - builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.Padding", - "Paddings", - "Abstände"); - - builder.AddOrUpdate("Plugins.SmartStore.PageBuilder.Gallery.HidePreviewPanel", - "Toggle preview panel", - "Vorschaubilderanzeige umschalten"); } } } From 377a3723fbf290180ad9222b2fda1d7a3e9b5d74 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Tue, 8 Sep 2020 15:28:48 +0200 Subject: [PATCH 167/695] Removed obsolete relict --- .../Administration/SmartStore.Admin.csproj | 3 --- .../Views/Setting/EditorTemplates/Store.cshtml | 12 ------------ 2 files changed, 15 deletions(-) delete mode 100644 src/Presentation/SmartStore.Web/Administration/Views/Setting/EditorTemplates/Store.cshtml diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index 9eab1c3acb..44fa8b4be9 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -1264,9 +1264,6 @@ - - - diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/EditorTemplates/Store.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/EditorTemplates/Store.cshtml deleted file mode 100644 index 3612b4f72a..0000000000 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/EditorTemplates/Store.cshtml +++ /dev/null @@ -1,12 +0,0 @@ -@* codehint: sm-edit (see also AllSettings.cshtml grid_onStoreEdit) *@ - - - From 8c27c9fe20b485a31f7f7d1e189a23423c2674de Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Tue, 8 Sep 2020 15:32:25 +0200 Subject: [PATCH 168/695] Added new SEO interface for meta infos to Blog, News & Forum settings --- .../Domain/Blogs/BlogSettings.cs | 36 +- .../Domain/Common/CommonSettings.cs | 34 +- .../Domain/Forums/ForumSettings.cs | 87 ++-- .../Domain/News/NewsSettings.cs | 45 +- .../Migrations/MigrationsConfiguration.cs | 16 + .../SmartStore.Web.Framework/Seo/ISeoModel.cs | 12 +- .../Controllers/SettingController.cs | 61 ++- .../Models/Settings/BlogSettingsModel.cs | 16 +- .../Models/Settings/ForumSettingsModel.cs | 17 +- .../Models/Settings/NewsSettingsModel.cs | 17 +- .../Administration/Views/Setting/Blog.cshtml | 158 +++--- .../Administration/Views/Setting/Forum.cshtml | 482 +++++++++--------- .../Administration/Views/Setting/News.cshtml | 180 ++++--- .../Controllers/BlogController.cs | 28 +- .../Controllers/BoardsController.cs | 7 + .../Controllers/NewsController.cs | 9 +- .../Models/Blogs/BlogPostListModel.cs | 3 + .../Models/Boards/BoardsIndexModel.cs | 6 +- .../Models/News/NewsItemListModel.cs | 3 + .../SmartStore.Web/Views/Blog/List.cshtml | 21 +- .../SmartStore.Web/Views/Boards/Index.cshtml | 4 +- .../SmartStore.Web/Views/News/List.cshtml | 6 +- 22 files changed, 717 insertions(+), 531 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogSettings.cs b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogSettings.cs index e0c7492934..63b5929320 100644 --- a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogSettings.cs @@ -5,29 +5,20 @@ namespace SmartStore.Core.Domain.Blogs { public class BlogSettings : ISettings { - public BlogSettings() - { - Enabled = true; - PostsPageSize = 10; - AllowNotRegisteredUsersToLeaveComments = true; - NumberOfTags = 15; - MaxAgeInDays = 180; - } - - /// + /// /// Gets or sets a value indicating whether blog is enabled /// - public bool Enabled { get; set; } + public bool Enabled { get; set; } = true; /// /// Gets or sets the page size for posts /// - public int PostsPageSize { get; set; } + public int PostsPageSize { get; set; } = 10; /// /// Gets or sets a value indicating whether not registered user can leave comments /// - public bool AllowNotRegisteredUsersToLeaveComments { get; set; } + public bool AllowNotRegisteredUsersToLeaveComments { get; set; } = true; /// /// Gets or sets a value indicating whether to notify about new blog comments @@ -37,16 +28,31 @@ public BlogSettings() /// /// Gets or sets a number of blog tags that appear in the tag cloud /// - public int NumberOfTags { get; set; } + public int NumberOfTags { get; set; } = 15; /// /// The maximum age of blog items (in days) for RSS feed /// - public int MaxAgeInDays { get; set; } + public int MaxAgeInDays { get; set; } = 180; /// /// Enable the blog RSS feed link in customers browser address bar /// public bool ShowHeaderRssUrl { get; set; } + + /// + /// Gets or sets the meta title for blog index page + /// + public string MetaTitle { get; set; } + + /// + /// Gets or sets the meta description for blog index page + /// + public string MetaDescription { get; set; } + + /// + /// Gets or sets the meta keywords for blog index page + /// + public string MetaKeywords { get; set; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs index 5f17e3c92e..cd62f68045 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs @@ -4,21 +4,9 @@ namespace SmartStore.Core.Domain.Common { public class CommonSettings : ISettings { - public CommonSettings() - { - UseStoredProceduresIfSupported = true; - AutoUpdateEnabled = true; - EntityPickerPageSize = 48; - MaxScheduleHistoryAgeInDays = 30; - MaxLogAgeInDays = 7; - MaxNumberOfScheduleHistoryEntries = 100; - MaxQueuedMessagesAgeInDays = 14; - MaxGuestsRegistrationAgeInMinutes = 1440; // 1 day (60 * 24). - } - public bool UseSystemEmailForContactUsForm { get; set; } - public bool UseStoredProceduresIfSupported { get; set; } + public bool UseStoredProceduresIfSupported { get; set; } = true; public bool HideAdvertisementsOnAdminArea { get; set; } @@ -27,36 +15,36 @@ public CommonSettings() /// public bool DisplayJavaScriptDisabledWarning { get; set; } - public bool AutoUpdateEnabled { get; set; } + public bool AutoUpdateEnabled { get; set; } = true; - /// - /// Gets or sets the page size for the entity picker - /// - public int EntityPickerPageSize { get; set; } + /// + /// Gets or sets the page size for the entity picker + /// + public int EntityPickerPageSize { get; set; } = 48; /// /// Gets or sets the maximum age of schedule history entries (in days). /// - public int MaxScheduleHistoryAgeInDays { get; set; } + public int MaxScheduleHistoryAgeInDays { get; set; } = 30; /// /// Gets or sets the maximum age of log entries (in days). /// - public int MaxLogAgeInDays { get; set; } + public int MaxLogAgeInDays { get; set; } = 7; /// /// Gets or sets the maximum number of schedule history entries per task. /// - public int MaxNumberOfScheduleHistoryEntries { get; set; } + public int MaxNumberOfScheduleHistoryEntries { get; set; } = 100; /// /// Gets or sets the maximum age of sent queued messages (in days). /// - public int MaxQueuedMessagesAgeInDays { get; set; } + public int MaxQueuedMessagesAgeInDays { get; set; } = 14; /// /// Gets or sets the maximum registration age (in minutes) for automatic deletion of guests customers. /// - public int MaxGuestsRegistrationAgeInMinutes { get; set; } + public int MaxGuestsRegistrationAgeInMinutes { get; set; } = 1440; // 1 day (60 * 24). } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumSettings.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumSettings.cs index 86a2b5e423..4d03094351 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumSettings.cs @@ -4,41 +4,15 @@ namespace SmartStore.Core.Domain.Forums { public class ForumSettings : ISettings { - public ForumSettings() - { - ForumsEnabled = true; - RelativeDateTimeFormattingEnabled = true; - TopicSubjectMaxLength = 450; - PostMaxLength = 4000; - StrippedTopicMaxLength = 45; - TopicsPageSize = 20; - PostsPageSize = 20; - ForumFeedCount = 20; - SearchResultsPageSize = 20; - LatestCustomerPostsPageSize = 20; - AllowSorting = true; - ShowCustomersPostCount = true; - ForumEditor = EditorType.BBCodeEditor; - SignaturesEnabled = true; - PrivateMessagesPageSize = 20; - ForumSubscriptionsPageSize = 20; - PMSubjectMaxLength = 450; - PMTextMaxLength = 4000; - HomePageActiveDiscussionsTopicCount = 5; - ActiveDiscussionsPageTopicCount = 50; - ActiveDiscussionsFeedCount = 25; - AllowCustomersToVoteOnPosts = true; - } - - /// + /// /// Gets or sets a value indicating whether forums are enabled /// - public bool ForumsEnabled { get; set; } + public bool ForumsEnabled { get; set; } = true; /// /// Gets or sets a value indicating whether relative date and time formatting is enabled (e.g. 2 hours ago, a month ago) /// - public bool RelativeDateTimeFormattingEnabled { get; set; } + public bool RelativeDateTimeFormattingEnabled { get; set; } = true; /// /// Gets or sets a value indicating whether customers are allowed to edit posts that they created @@ -68,7 +42,7 @@ public ForumSettings() /// /// Gets or sets a value indicating whether customer can vote on posts /// - public bool AllowCustomersToVoteOnPosts { get; set; } + public bool AllowCustomersToVoteOnPosts { get; set; } = true; /// /// Gets or sets a value indicating whether guests are allowed to vote on posts @@ -78,57 +52,57 @@ public ForumSettings() /// /// Gets or sets maximum length of topic subject /// - public int TopicSubjectMaxLength { get; set; } + public int TopicSubjectMaxLength { get; set; } = 450; /// /// Gets or sets the maximum length for stripped forum topic names /// - public int StrippedTopicMaxLength { get; set; } + public int StrippedTopicMaxLength { get; set; } = 45; /// /// Gets or sets maximum length of post /// - public int PostMaxLength { get; set; } + public int PostMaxLength { get; set; } = 4000; /// /// Gets or sets the page size for topics in forums /// - public int TopicsPageSize { get; set; } + public int TopicsPageSize { get; set; } = 20; /// /// Gets or sets the page size for posts in topics /// - public int PostsPageSize { get; set; } + public int PostsPageSize { get; set; } = 20; /// /// Gets or sets the page size for search result /// - public int SearchResultsPageSize { get; set; } + public int SearchResultsPageSize { get; set; } = 20; /// /// Gets or sets a value indicating whether sorting is enabled. /// - public bool AllowSorting { get; set; } + public bool AllowSorting { get; set; } = true; /// /// Gets or sets the page size for latest customer posts /// - public int LatestCustomerPostsPageSize { get; set; } + public int LatestCustomerPostsPageSize { get; set; } = 20; /// /// Gets or sets a value indicating whether to show customers forum post count /// - public bool ShowCustomersPostCount { get; set; } + public bool ShowCustomersPostCount { get; set; } = true; /// /// Gets or sets a forum editor type /// - public EditorType ForumEditor { get; set; } + public EditorType ForumEditor { get; set; } = EditorType.BBCodeEditor; /// /// Gets or sets a value indicating whether customers are allowed to specify a signature /// - public bool SignaturesEnabled { get; set; } + public bool SignaturesEnabled { get; set; } = true; /// /// Gets or sets a value indicating whether private messages are allowed @@ -143,12 +117,12 @@ public ForumSettings() /// /// Gets or sets the page size for private messages /// - public int PrivateMessagesPageSize { get; set; } + public int PrivateMessagesPageSize { get; set; } = 20; /// /// Gets or sets the page size for (My Account) Forum Subscriptions /// - public int ForumSubscriptionsPageSize { get; set; } + public int ForumSubscriptionsPageSize { get; set; } = 20; /// /// Gets or sets a value indicating whether a customer should be notified about new private messages @@ -158,27 +132,27 @@ public ForumSettings() /// /// Gets or sets maximum length of pm subject /// - public int PMSubjectMaxLength { get; set; } + public int PMSubjectMaxLength { get; set; } = 450; /// /// Gets or sets maximum length of pm message /// - public int PMTextMaxLength { get; set; } + public int PMTextMaxLength { get; set; } = 4000; /// /// Gets or sets the number of items to display for Active Discussions on forums home page /// - public int HomePageActiveDiscussionsTopicCount { get; set; } + public int HomePageActiveDiscussionsTopicCount { get; set; } = 5; /// /// Gets or sets the number of items to display for Active Discussions page /// - public int ActiveDiscussionsPageTopicCount { get; set; } + public int ActiveDiscussionsPageTopicCount { get; set; } = 50; /// /// Gets or sets the number of items to display for Active Discussions RSS Feed /// - public int ActiveDiscussionsFeedCount { get; set; } + public int ActiveDiscussionsFeedCount { get; set; } = 25; /// /// Gets or sets the whether the Active Discussions RSS Feed is enabled @@ -193,6 +167,21 @@ public ForumSettings() /// /// Gets or sets the number of items to display for Forum RSS Feed /// - public int ForumFeedCount { get; set; } + public int ForumFeedCount { get; set; } = 20; + + /// + /// Gets or sets the meta title for forum index page + /// + public string MetaTitle { get; set; } + + /// + /// Gets or sets the meta description for forum index page + /// + public string MetaDescription { get; set; } + + /// + /// Gets or sets the meta keywords for forum index page + /// + public string MetaKeywords { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/News/NewsSettings.cs b/src/Libraries/SmartStore.Core/Domain/News/NewsSettings.cs index ffceb3edab..624350caf0 100644 --- a/src/Libraries/SmartStore.Core/Domain/News/NewsSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/News/NewsSettings.cs @@ -4,25 +4,15 @@ namespace SmartStore.Core.Domain.News { public class NewsSettings : ISettings { - public NewsSettings() - { - Enabled = true; - AllowNotRegisteredUsersToLeaveComments = true; - ShowNewsOnMainPage = true; - MainPageNewsCount = 3; - NewsArchivePageSize = 10; - MaxAgeInDays = 180; - } - - /// + /// /// Gets or sets a value indicating whether news are enabled /// - public bool Enabled { get; set; } + public bool Enabled { get; set; } = true; /// /// Gets or sets a value indicating whether not registered user can leave comments /// - public bool AllowNotRegisteredUsersToLeaveComments { get; set; } + public bool AllowNotRegisteredUsersToLeaveComments { get; set; } = true; /// /// Gets or sets a value indicating whether to notify about new news comments @@ -32,26 +22,41 @@ public NewsSettings() /// /// Gets or sets a value indicating whether to show news on the main page /// - public bool ShowNewsOnMainPage { get; set; } + public bool ShowNewsOnMainPage { get; set; } = true; /// /// Gets or sets a value indicating news count displayed on the main page /// - public int MainPageNewsCount { get; set; } + public int MainPageNewsCount { get; set; } = 3; /// /// Gets or sets the page size for news archive /// - public int NewsArchivePageSize { get; set; } + public int NewsArchivePageSize { get; set; } = 10; - /// - /// The maximum age of news (in days) for RSS feed - /// - public int MaxAgeInDays { get; set; } + /// + /// The maximum age of news (in days) for RSS feed + /// + public int MaxAgeInDays { get; set; } = 180; /// /// Enable the news RSS feed link in customers browser address bar /// public bool ShowHeaderRssUrl { get; set; } + + /// + /// Gets or sets the meta title for news index page + /// + public string MetaTitle { get; set; } + + /// + /// Gets or sets the meta description for news index page + /// + public string MetaDescription { get; set; } + + /// + /// Gets or sets the meta keywords for news index page + /// + public string MetaKeywords { get; set; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 637455049c..22eef31071 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -321,6 +321,22 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb builder.AddOrUpdate("Admin.Catalog.Products.StockQuantityNotChanged", "The stock quantity has not been updated because the value has changed since the page was loaded (e.g. due to a placed order). Current value is {0}.", "Der Lagerbestand wurde nicht aktualisiert, weil sich der Wert seit Laden der Seite geändert hat (z.B. durch einen Auftragseingang). Aktueller Wert ist {0}."); + + builder.AddOrUpdate("Admin.Configuration.SeoTab.Title", + "SEO settings", + "SEO-Einstellungen"); + + builder.AddOrUpdate("Admin.Configuration.Seo.MetaTitle", + "Meta title", + "Meta Titel"); + + builder.AddOrUpdate("Admin.Configuration.Seo.MetaDescription", + "Meta description", + "Meta Beschreibung"); + + builder.AddOrUpdate("Admin.Configuration.Seo.MetaKeywords", + "Meta keywords", + "Meta Keywords"); } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs index 91fb2a717d..478bf5948f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs @@ -5,9 +5,13 @@ namespace SmartStore.Web.Framework.Seo { public interface ISeoModel : ILocalizedModel { - // TODO: (mh) Annotate these props with "SmartResourceDisplayNameAttribute" here, not on impl model level + [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] string MetaTitle { get; } + + [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] string MetaDescription { get; } + + [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] string MetaKeywords { get; } } @@ -15,9 +19,13 @@ public class SeoModelLocal : ILocalizedModelLocal { public int LanguageId { get; set; } - // TODO: (mh) Annotate these props with "SmartResourceDisplayNameAttribute" here, not on impl model level + [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] public string MetaTitle { get; set; } + + [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] public string MetaDescription { get; set; } + + [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] public string MetaKeywords { get; set; } } } diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs index efa79eea8a..31bcf72dfe 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs @@ -249,16 +249,30 @@ public ActionResult Blog(BlogSettings blogSettings) { var model = blogSettings.ToModel(); - return View(model); + AddLocales(_languageService, model.Locales, (locale, languageId) => + { + locale.MetaTitle = blogSettings.GetLocalizedSetting(x => x.MetaTitle, languageId, false, false); + locale.MetaDescription = blogSettings.GetLocalizedSetting(x => x.MetaDescription, languageId, false, false); + locale.MetaKeywords = blogSettings.GetLocalizedSetting(x => x.MetaKeywords, languageId, false, false); + }); + + return View(model); } [Permission(Permissions.Configuration.Setting.Update)] [HttpPost, SaveSetting] public ActionResult Blog(BlogSettings blogSettings, BlogSettingsModel model) { - blogSettings = model.ToEntity(blogSettings); + _ = model.ToEntity(blogSettings); + + foreach (var localized in model.Locales) + { + _localizedEntityService.SaveLocalizedSetting(blogSettings, x => x.MetaTitle, localized.MetaTitle, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(blogSettings, x => x.MetaDescription, localized.MetaDescription, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(blogSettings, x => x.MetaKeywords, localized.MetaKeywords, localized.LanguageId); + } - return NotifyAndRedirect("Blog"); + return NotifyAndRedirect("Blog"); } [Permission(Permissions.Configuration.Setting.Read)] @@ -266,7 +280,14 @@ public ActionResult Blog(BlogSettings blogSettings, BlogSettingsModel model) public ActionResult Forum(ForumSettings forumSettings) { var model = forumSettings.ToModel(); - + + AddLocales(_languageService, model.Locales, (locale, languageId) => + { + locale.MetaTitle = forumSettings.GetLocalizedSetting(x => x.MetaTitle, languageId, false, false); + locale.MetaDescription = forumSettings.GetLocalizedSetting(x => x.MetaDescription, languageId, false, false); + locale.MetaKeywords = forumSettings.GetLocalizedSetting(x => x.MetaKeywords, languageId, false, false); + }); + return View(model); } @@ -274,9 +295,16 @@ public ActionResult Forum(ForumSettings forumSettings) [HttpPost, SaveSetting] public ActionResult Forum(ForumSettings forumSettings, ForumSettingsModel model) { - forumSettings = model.ToEntity(forumSettings); + _ = model.ToEntity(forumSettings); - return NotifyAndRedirect("Forum"); + foreach (var localized in model.Locales) + { + _localizedEntityService.SaveLocalizedSetting(forumSettings, x => x.MetaTitle, localized.MetaTitle, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(forumSettings, x => x.MetaDescription, localized.MetaDescription, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(forumSettings, x => x.MetaKeywords, localized.MetaKeywords, localized.LanguageId); + } + + return NotifyAndRedirect("Forum"); } @@ -285,6 +313,14 @@ public ActionResult Forum(ForumSettings forumSettings, ForumSettingsModel model) public ActionResult News(NewsSettings newsSettings) { var model = newsSettings.ToModel(); + + AddLocales(_languageService, model.Locales, (locale, languageId) => + { + locale.MetaTitle = newsSettings.GetLocalizedSetting(x => x.MetaTitle, languageId, false, false); + locale.MetaDescription = newsSettings.GetLocalizedSetting(x => x.MetaDescription, languageId, false, false); + locale.MetaKeywords = newsSettings.GetLocalizedSetting(x => x.MetaKeywords, languageId, false, false); + }); + return View(model); } @@ -292,11 +328,17 @@ public ActionResult News(NewsSettings newsSettings) [HttpPost, SaveSetting] public ActionResult News(NewsSettings newsSettings, NewsSettingsModel model) { - newsSettings = model.ToEntity(newsSettings); + _ = model.ToEntity(newsSettings); - return NotifyAndRedirect("News"); - } + foreach (var localized in model.Locales) + { + _localizedEntityService.SaveLocalizedSetting(newsSettings, x => x.MetaTitle, localized.MetaTitle, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(newsSettings, x => x.MetaDescription, localized.MetaDescription, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(newsSettings, x => x.MetaKeywords, localized.MetaKeywords, localized.LanguageId); + } + return NotifyAndRedirect("News"); + } [Permission(Permissions.Configuration.Setting.Read)] public ActionResult Shipping() @@ -409,7 +451,6 @@ public ActionResult Shipping(ShippingSettingsModel model, FormCollection form) return NotifyAndRedirect("Shipping"); } - [Permission(Permissions.Configuration.Setting.Read)] public ActionResult Tax() { diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/BlogSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/BlogSettingsModel.cs index 5c7a95c12a..2b1b3a30d1 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/BlogSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/BlogSettingsModel.cs @@ -1,10 +1,16 @@ using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; +using SmartStore.Web.Framework.Seo; +using System.Collections.Generic; namespace SmartStore.Admin.Models.Settings { - public class BlogSettingsModel : ModelBase + public class BlogSettingsModel : ModelBase, ISeoModel { + public BlogSettingsModel() { + Locales = new List(); + } + [SmartResourceDisplayName("Admin.Configuration.Settings.Blog.Enabled")] public bool Enabled { get; set; } @@ -25,5 +31,13 @@ public class BlogSettingsModel : ModelBase [SmartResourceDisplayName("Admin.Configuration.Settings.Blog.ShowHeaderRSSUrl")] public bool ShowHeaderRssUrl { get; set; } + + public string MetaTitle { get; set; } + + public string MetaDescription { get; set; } + + public string MetaKeywords { get; set; } + + public IList Locales { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSettingsModel.cs index cb1a9ec8ab..f741e3a0c6 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSettingsModel.cs @@ -1,10 +1,17 @@ using SmartStore.Core.Domain.Forums; using SmartStore.Web.Framework; +using SmartStore.Web.Framework.Seo; +using System.Collections.Generic; namespace SmartStore.Admin.Models.Settings { - public class ForumSettingsModel + public class ForumSettingsModel : ISeoModel { + public ForumSettingsModel() + { + Locales = new List(); + } + [SmartResourceDisplayName("Admin.Configuration.Settings.Forums.ForumsEnabled")] public bool ForumsEnabled { get; set; } @@ -73,5 +80,13 @@ public class ForumSettingsModel [SmartResourceDisplayName("Admin.Configuration.Settings.Forums.ForumFeedCount")] public int ForumFeedCount { get; set; } + + public string MetaTitle { get; set; } + + public string MetaDescription { get; set; } + + public string MetaKeywords { get; set; } + + public IList Locales { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/NewsSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/NewsSettingsModel.cs index f7a00fd03e..989576f89a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/NewsSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/NewsSettingsModel.cs @@ -1,9 +1,16 @@ using SmartStore.Web.Framework; +using SmartStore.Web.Framework.Seo; +using System.Collections.Generic; namespace SmartStore.Admin.Models.Settings { - public class NewsSettingsModel + public class NewsSettingsModel : ISeoModel { + public NewsSettingsModel() + { + Locales = new List(); + } + [SmartResourceDisplayName("Admin.Configuration.Settings.News.Enabled")] public bool Enabled { get; set; } @@ -27,5 +34,13 @@ public class NewsSettingsModel [SmartResourceDisplayName("Admin.Configuration.Settings.News.ShowHeaderRSSUrl")] public bool ShowHeaderRssUrl { get; set; } + + public string MetaTitle { get; set; } + + public string MetaDescription { get; set; } + + public string MetaKeywords { get; set; } + + public IList Locales { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Blog.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Blog.cshtml index 7709950cdc..71440993f1 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Blog.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Blog.cshtml @@ -15,82 +15,98 @@
+ + @T("Admin.Common.Save") +
Html.RenderAction("StoreScopeConfiguration", "Setting"); - @Html.ValidationSummary(false) + @Html.ValidationSummary(false) -
-
-
- @Html.SmartLabelFor(model => model.Enabled) -
-
- @Html.SettingEditorFor(model => model.Enabled, Html.CheckBoxFor(model => model.Enabled, new { data_toggler_for = "#pnlBlogEnabled" })) - @Html.ValidationMessageFor(model => model.Enabled) -
-
-
+ @Html.SmartStore().TabStrip().Name("blogsettings-edit").Style(TabsStyle.Material).Position(TabsPosition.Top).Items(x => + { + x.Add().Text(T("Admin.Configuration.Settings.Blog").Text).Content(TabBlogSettings()).Selected(true); + x.Add().Text(T("Admin.Configuration.SeoTab.Title").Text).Content(TabSeoSettings().ToHtmlString()); - - - - - - - - - - - - - - - - - - - - - - - - - -
- @Html.SmartLabelFor(model => model.PostsPageSize) - - @Html.SettingEditorFor(model => model.PostsPageSize) - @Html.ValidationMessageFor(model => model.PostsPageSize) -
- @Html.SmartLabelFor(model => model.AllowNotRegisteredUsersToLeaveComments) - - @Html.SettingEditorFor(model => model.AllowNotRegisteredUsersToLeaveComments) - @Html.ValidationMessageFor(model => model.AllowNotRegisteredUsersToLeaveComments) -
- @Html.SmartLabelFor(model => model.NotifyAboutNewBlogComments) - - @Html.SettingEditorFor(model => model.NotifyAboutNewBlogComments) - @Html.ValidationMessageFor(model => model.NotifyAboutNewBlogComments) -
- @Html.SmartLabelFor(model => model.NumberOfTags) - - @Html.SettingEditorFor(model => model.NumberOfTags) - @Html.ValidationMessageFor(model => model.NumberOfTags) -
- @Html.SmartLabelFor(model => model.MaxAgeInDays) - - @Html.SettingEditorFor(model => model.MaxAgeInDays) - @Html.ValidationMessageFor(model => model.MaxAgeInDays) -
- @Html.SmartLabelFor(model => model.ShowHeaderRssUrl) - - @Html.SettingEditorFor(model => model.ShowHeaderRssUrl) - @Html.ValidationMessageFor(model => model.ShowHeaderRssUrl) -
+ EngineContext.Current.Resolve().Publish(new TabStripCreated(x, "blogsettings-edit", this.Html, this.Model)); + }) + + @helper TabBlogSettings() + { +
+
+
+ @Html.SmartLabelFor(model => model.Enabled) +
+
+ @Html.SettingEditorFor(model => model.Enabled, Html.CheckBoxFor(model => model.Enabled, new { data_toggler_for = "#pnlBlogEnabled" })) + @Html.ValidationMessageFor(model => model.Enabled) +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ @Html.SmartLabelFor(model => model.PostsPageSize) + + @Html.SettingEditorFor(model => model.PostsPageSize) + @Html.ValidationMessageFor(model => model.PostsPageSize) +
+ @Html.SmartLabelFor(model => model.AllowNotRegisteredUsersToLeaveComments) + + @Html.SettingEditorFor(model => model.AllowNotRegisteredUsersToLeaveComments) + @Html.ValidationMessageFor(model => model.AllowNotRegisteredUsersToLeaveComments) +
+ @Html.SmartLabelFor(model => model.NotifyAboutNewBlogComments) + + @Html.SettingEditorFor(model => model.NotifyAboutNewBlogComments) + @Html.ValidationMessageFor(model => model.NotifyAboutNewBlogComments) +
+ @Html.SmartLabelFor(model => model.NumberOfTags) + + @Html.SettingEditorFor(model => model.NumberOfTags) + @Html.ValidationMessageFor(model => model.NumberOfTags) +
+ @Html.SmartLabelFor(model => model.MaxAgeInDays) + + @Html.SettingEditorFor(model => model.MaxAgeInDays) + @Html.ValidationMessageFor(model => model.MaxAgeInDays) +
+ @Html.SmartLabelFor(model => model.ShowHeaderRssUrl) + + @Html.SettingEditorFor(model => model.ShowHeaderRssUrl) + @Html.ValidationMessageFor(model => model.ShowHeaderRssUrl) +
+ } + + @helper TabSeoSettings() + { + @Html.EditorFor(model => model, "SeoModel") + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Forum.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Forum.cshtml index 0e03856ecd..13063c1bdd 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Forum.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Forum.cshtml @@ -14,9 +14,9 @@
+ + @T("Admin.Common.Save") +
@@ -24,235 +24,251 @@ @Html.ValidationSummary(false) -
-
-
- @Html.SmartLabelFor(model => model.ForumsEnabled) -
-
- @Html.SettingEditorFor(model => model.ForumsEnabled, Html.CheckBoxFor(model => model.ForumsEnabled, new { data_toggler_for = "#pnlForumsEnabled" })) - @Html.ValidationMessageFor(model => model.ForumsEnabled) -
-
-
+ @Html.SmartStore().TabStrip().Name("forumsettings-edit").Style(TabsStyle.Material).Position(TabsPosition.Top).Items(x => + { + x.Add().Text(T("Admin.Configuration.Settings.Forums").Text).Content(TabForumSettings()).Selected(true); + x.Add().Text(T("Admin.Configuration.SeoTab.Title").Text).Content(TabSeoSettings().ToHtmlString()); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- @Html.SmartLabelFor(model => model.SignaturesEnabled) - - @Html.SettingEditorFor(model => model.SignaturesEnabled) - @Html.ValidationMessageFor(model => model.SignaturesEnabled) -
- @Html.SmartLabelFor(model => model.RelativeDateTimeFormattingEnabled) - - @Html.SettingEditorFor(model => model.RelativeDateTimeFormattingEnabled) - @Html.ValidationMessageFor(model => model.RelativeDateTimeFormattingEnabled) -
- @Html.SmartLabelFor(model => model.ShowCustomersPostCount) - - @Html.SettingEditorFor(model => model.ShowCustomersPostCount) - @Html.ValidationMessageFor(model => model.ShowCustomersPostCount) -
- @Html.SmartLabelFor(model => model.AllowGuestsToCreatePosts) - - @Html.SettingEditorFor(model => model.AllowGuestsToCreatePosts) - @Html.ValidationMessageFor(model => model.AllowGuestsToCreatePosts) -
- @Html.SmartLabelFor(model => model.AllowGuestsToCreateTopics) - - @Html.SettingEditorFor(model => model.AllowGuestsToCreateTopics) - @Html.ValidationMessageFor(model => model.AllowGuestsToCreateTopics) -
- @Html.SmartLabelFor(model => model.AllowCustomersToEditPosts) - - @Html.SettingEditorFor(model => model.AllowCustomersToEditPosts) - @Html.ValidationMessageFor(model => model.AllowCustomersToEditPosts) -
- @Html.SmartLabelFor(model => model.AllowCustomersToDeletePosts) - - @Html.SettingEditorFor(model => model.AllowCustomersToDeletePosts) - @Html.ValidationMessageFor(model => model.AllowCustomersToDeletePosts) -
- @Html.SmartLabelFor(model => model.AllowCustomersToManageSubscriptions) - - @Html.SettingEditorFor(model => model.AllowCustomersToManageSubscriptions) - @Html.ValidationMessageFor(model => model.AllowCustomersToManageSubscriptions) -
- @Html.SmartLabelFor(model => model.AllowCustomersToVoteOnPosts) - - @Html.SettingEditorFor(model => model.AllowCustomersToVoteOnPosts, Html.CheckBoxFor(x => x.AllowCustomersToVoteOnPosts, new { data_toggler_for = "#pnlForumsEnabled .post-voting" })) - @Html.ValidationMessageFor(model => model.AllowCustomersToVoteOnPosts) -
- @Html.SmartLabelFor(model => model.AllowGuestsToVoteOnPosts) - - @Html.SettingEditorFor(model => model.AllowGuestsToVoteOnPosts) - @Html.ValidationMessageFor(model => model.AllowGuestsToVoteOnPosts) -
- @Html.SmartLabelFor(model => model.ForumEditor) - - @Html.EnumSettingEditorFor(model => model.ForumEditor) - @Html.ValidationMessageFor(model => model.ForumEditor) -
-
-
- @Html.SmartLabelFor(model => model.AllowSorting) - - @Html.SettingEditorFor(model => model.AllowSorting) - @Html.ValidationMessageFor(model => model.AllowSorting) -
- @Html.SmartLabelFor(model => model.TopicsPageSize) - - @Html.SettingEditorFor(model => model.TopicsPageSize) - @Html.ValidationMessageFor(model => model.TopicsPageSize) -
- @Html.SmartLabelFor(model => model.PostsPageSize) - - @Html.SettingEditorFor(model => model.PostsPageSize) - @Html.ValidationMessageFor(model => model.PostsPageSize) -
- @Html.SmartLabelFor(model => model.SearchResultsPageSize) - - @Html.SettingEditorFor(model => model.SearchResultsPageSize) - @Html.ValidationMessageFor(model => model.SearchResultsPageSize) -
-
-
- @Html.SmartLabelFor(model => model.AllowPrivateMessages) - - @Html.SettingEditorFor(model => model.AllowPrivateMessages, Html.CheckBoxFor(model => model.AllowPrivateMessages, new { data_toggler_for = "#pnlPrivateMessages" })) - @Html.ValidationMessageFor(model => model.AllowPrivateMessages) -
- @Html.SmartLabelFor(model => model.ShowAlertForPM) - - @Html.SettingEditorFor(model => model.ShowAlertForPM) - @Html.ValidationMessageFor(model => model.ShowAlertForPM) -
- @Html.SmartLabelFor(model => model.NotifyAboutPrivateMessages) - - @Html.SettingEditorFor(model => model.NotifyAboutPrivateMessages) - @Html.ValidationMessageFor(model => model.NotifyAboutPrivateMessages) -
-
-
- @Html.SmartLabelFor(model => model.ForumFeedsEnabled) - - @Html.SettingEditorFor(model => model.ForumFeedsEnabled, Html.CheckBoxFor(model => model.ForumFeedsEnabled, new { data_toggler_for = "#pnlForumFeeds" })) - @Html.ValidationMessageFor(model => model.ForumFeedsEnabled) -
- @Html.SmartLabelFor(model => model.ForumFeedCount) - - @Html.SettingEditorFor(model => model.ForumFeedCount) - @Html.ValidationMessageFor(model => model.ForumFeedCount) -
- @Html.SmartLabelFor(model => model.ActiveDiscussionsFeedEnabled) - - @Html.SettingEditorFor(model => model.ActiveDiscussionsFeedEnabled) - @Html.ValidationMessageFor(model => model.ActiveDiscussionsFeedEnabled) -
- @Html.SmartLabelFor(model => model.ActiveDiscussionsFeedCount) - - @Html.SettingEditorFor(model => model.ActiveDiscussionsFeedCount) - @Html.ValidationMessageFor(model => model.ActiveDiscussionsFeedCount) -
+ EngineContext.Current.Resolve().Publish(new TabStripCreated(x, "forumsettings-edit", this.Html, this.Model)); + }) + + @helper TabForumSettings() + { +
+
+
+ @Html.SmartLabelFor(model => model.ForumsEnabled) +
+
+ @Html.SettingEditorFor(model => model.ForumsEnabled, Html.CheckBoxFor(model => model.ForumsEnabled, new { data_toggler_for = "#pnlForumsEnabled" })) + @Html.ValidationMessageFor(model => model.ForumsEnabled) +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ @Html.SmartLabelFor(model => model.SignaturesEnabled) + + @Html.SettingEditorFor(model => model.SignaturesEnabled) + @Html.ValidationMessageFor(model => model.SignaturesEnabled) +
+ @Html.SmartLabelFor(model => model.RelativeDateTimeFormattingEnabled) + + @Html.SettingEditorFor(model => model.RelativeDateTimeFormattingEnabled) + @Html.ValidationMessageFor(model => model.RelativeDateTimeFormattingEnabled) +
+ @Html.SmartLabelFor(model => model.ShowCustomersPostCount) + + @Html.SettingEditorFor(model => model.ShowCustomersPostCount) + @Html.ValidationMessageFor(model => model.ShowCustomersPostCount) +
+ @Html.SmartLabelFor(model => model.AllowGuestsToCreatePosts) + + @Html.SettingEditorFor(model => model.AllowGuestsToCreatePosts) + @Html.ValidationMessageFor(model => model.AllowGuestsToCreatePosts) +
+ @Html.SmartLabelFor(model => model.AllowGuestsToCreateTopics) + + @Html.SettingEditorFor(model => model.AllowGuestsToCreateTopics) + @Html.ValidationMessageFor(model => model.AllowGuestsToCreateTopics) +
+ @Html.SmartLabelFor(model => model.AllowCustomersToEditPosts) + + @Html.SettingEditorFor(model => model.AllowCustomersToEditPosts) + @Html.ValidationMessageFor(model => model.AllowCustomersToEditPosts) +
+ @Html.SmartLabelFor(model => model.AllowCustomersToDeletePosts) + + @Html.SettingEditorFor(model => model.AllowCustomersToDeletePosts) + @Html.ValidationMessageFor(model => model.AllowCustomersToDeletePosts) +
+ @Html.SmartLabelFor(model => model.AllowCustomersToManageSubscriptions) + + @Html.SettingEditorFor(model => model.AllowCustomersToManageSubscriptions) + @Html.ValidationMessageFor(model => model.AllowCustomersToManageSubscriptions) +
+ @Html.SmartLabelFor(model => model.AllowCustomersToVoteOnPosts) + + @Html.SettingEditorFor(model => model.AllowCustomersToVoteOnPosts, Html.CheckBoxFor(x => x.AllowCustomersToVoteOnPosts, new { data_toggler_for = "#pnlForumsEnabled .post-voting" })) + @Html.ValidationMessageFor(model => model.AllowCustomersToVoteOnPosts) +
+ @Html.SmartLabelFor(model => model.AllowGuestsToVoteOnPosts) + + @Html.SettingEditorFor(model => model.AllowGuestsToVoteOnPosts) + @Html.ValidationMessageFor(model => model.AllowGuestsToVoteOnPosts) +
+ @Html.SmartLabelFor(model => model.ForumEditor) + + @Html.EnumSettingEditorFor(model => model.ForumEditor) + @Html.ValidationMessageFor(model => model.ForumEditor) +
+
+
+ @Html.SmartLabelFor(model => model.AllowSorting) + + @Html.SettingEditorFor(model => model.AllowSorting) + @Html.ValidationMessageFor(model => model.AllowSorting) +
+ @Html.SmartLabelFor(model => model.TopicsPageSize) + + @Html.SettingEditorFor(model => model.TopicsPageSize) + @Html.ValidationMessageFor(model => model.TopicsPageSize) +
+ @Html.SmartLabelFor(model => model.PostsPageSize) + + @Html.SettingEditorFor(model => model.PostsPageSize) + @Html.ValidationMessageFor(model => model.PostsPageSize) +
+ @Html.SmartLabelFor(model => model.SearchResultsPageSize) + + @Html.SettingEditorFor(model => model.SearchResultsPageSize) + @Html.ValidationMessageFor(model => model.SearchResultsPageSize) +
+
+
+ @Html.SmartLabelFor(model => model.AllowPrivateMessages) + + @Html.SettingEditorFor(model => model.AllowPrivateMessages, Html.CheckBoxFor(model => model.AllowPrivateMessages, new { data_toggler_for = "#pnlPrivateMessages" })) + @Html.ValidationMessageFor(model => model.AllowPrivateMessages) +
+ @Html.SmartLabelFor(model => model.ShowAlertForPM) + + @Html.SettingEditorFor(model => model.ShowAlertForPM) + @Html.ValidationMessageFor(model => model.ShowAlertForPM) +
+ @Html.SmartLabelFor(model => model.NotifyAboutPrivateMessages) + + @Html.SettingEditorFor(model => model.NotifyAboutPrivateMessages) + @Html.ValidationMessageFor(model => model.NotifyAboutPrivateMessages) +
+
+
+ @Html.SmartLabelFor(model => model.ForumFeedsEnabled) + + @Html.SettingEditorFor(model => model.ForumFeedsEnabled, Html.CheckBoxFor(model => model.ForumFeedsEnabled, new { data_toggler_for = "#pnlForumFeeds" })) + @Html.ValidationMessageFor(model => model.ForumFeedsEnabled) +
+ @Html.SmartLabelFor(model => model.ForumFeedCount) + + @Html.SettingEditorFor(model => model.ForumFeedCount) + @Html.ValidationMessageFor(model => model.ForumFeedCount) +
+ @Html.SmartLabelFor(model => model.ActiveDiscussionsFeedEnabled) + + @Html.SettingEditorFor(model => model.ActiveDiscussionsFeedEnabled) + @Html.ValidationMessageFor(model => model.ActiveDiscussionsFeedEnabled) +
+ @Html.SmartLabelFor(model => model.ActiveDiscussionsFeedCount) + + @Html.SettingEditorFor(model => model.ActiveDiscussionsFeedCount) + @Html.ValidationMessageFor(model => model.ActiveDiscussionsFeedCount) +
+ } + + @helper TabSeoSettings() + { + @Html.EditorFor(model => model, "SeoModel") + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/News.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/News.cshtml index 07bca2edef..b287003227 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/News.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/News.cshtml @@ -1,103 +1,119 @@ @model NewsSettingsModel @{ - ViewBag.Title = T("Admin.Configuration.Settings.News").Text; + ViewBag.Title = T("Admin.Configuration.Settings.News").Text; Layout = "_SettingLayout"; } @using (Html.BeginForm()) { -
-
- - @T("Admin.Configuration.Settings.News") -
-
- -
-
+ + - Html.RenderAction("StoreScopeConfiguration", "Setting"); + Html.RenderAction("StoreScopeConfiguration", "Setting"); - @Html.ValidationSummary(false) + @Html.ValidationSummary(false) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @Html.SmartStore().TabStrip().Name("newssettings-edit").Style(TabsStyle.Material).Position(TabsPosition.Top).Items(x => + { + x.Add().Text(T("Admin.Configuration.Settings.News").Text).Content(TabNewsSettings()).Selected(true); + x.Add().Text(T("Admin.Configuration.SeoTab.Title").Text).Content(TabSeoSettings().ToHtmlString()); + + EngineContext.Current.Resolve().Publish(new TabStripCreated(x, "newssettings-edit", this.Html, this.Model)); + }) + + @helper TabNewsSettings() + { +
- @Html.SmartLabelFor(model => model.Enabled) - - @Html.SettingEditorFor(model => model.Enabled, Html.CheckBoxFor(model => model.Enabled, new { data_toggler_for = "#pnlNewsEnabled" })) - @Html.ValidationMessageFor(model => model.Enabled) -
- @Html.SmartLabelFor(model => model.AllowNotRegisteredUsersToLeaveComments) - - @Html.SettingEditorFor(model => model.AllowNotRegisteredUsersToLeaveComments) - @Html.ValidationMessageFor(model => model.AllowNotRegisteredUsersToLeaveComments) -
- @Html.SmartLabelFor(model => model.NotifyAboutNewNewsComments) - - @Html.SettingEditorFor(model => model.NotifyAboutNewNewsComments) - @Html.ValidationMessageFor(model => model.NotifyAboutNewNewsComments) -
- @Html.SmartLabelFor(model => model.ShowNewsOnMainPage) - - @Html.SettingEditorFor(model => model.ShowNewsOnMainPage) - @Html.ValidationMessageFor(model => model.ShowNewsOnMainPage) -
- @Html.SmartLabelFor(model => model.MainPageNewsCount) - - @Html.SettingEditorFor(model => model.MainPageNewsCount) - @Html.ValidationMessageFor(model => model.MainPageNewsCount) -
- @Html.SmartLabelFor(model => model.NewsArchivePageSize) - - @Html.SettingEditorFor(model => model.NewsArchivePageSize) - @Html.ValidationMessageFor(model => model.NewsArchivePageSize) -
- @Html.SmartLabelFor(model => model.MaxAgeInDays) - - @Html.SettingEditorFor(model => model.MaxAgeInDays, null, new { postfix = T("Time.Days").Text }) - @Html.ValidationMessageFor(model => model.MaxAgeInDays) -
- -
- @Html.SmartLabelFor(model => model.ShowHeaderRssUrl) + @Html.SmartLabelFor(model => model.Enabled) - @Html.SettingEditorFor(model => model.ShowHeaderRssUrl) - @Html.ValidationMessageFor(model => model.ShowHeaderRssUrl) + @Html.SettingEditorFor(model => model.Enabled, Html.CheckBoxFor(model => model.Enabled, new { data_toggler_for = "#pnlNewsEnabled" })) + @Html.ValidationMessageFor(model => model.Enabled)
+
+ @Html.SmartLabelFor(model => model.AllowNotRegisteredUsersToLeaveComments) + + @Html.SettingEditorFor(model => model.AllowNotRegisteredUsersToLeaveComments) + @Html.ValidationMessageFor(model => model.AllowNotRegisteredUsersToLeaveComments) +
+ @Html.SmartLabelFor(model => model.NotifyAboutNewNewsComments) + + @Html.SettingEditorFor(model => model.NotifyAboutNewNewsComments) + @Html.ValidationMessageFor(model => model.NotifyAboutNewNewsComments) +
+ @Html.SmartLabelFor(model => model.ShowNewsOnMainPage) + + @Html.SettingEditorFor(model => model.ShowNewsOnMainPage) + @Html.ValidationMessageFor(model => model.ShowNewsOnMainPage) +
+ @Html.SmartLabelFor(model => model.MainPageNewsCount) + + @Html.SettingEditorFor(model => model.MainPageNewsCount) + @Html.ValidationMessageFor(model => model.MainPageNewsCount) +
+ @Html.SmartLabelFor(model => model.NewsArchivePageSize) + + @Html.SettingEditorFor(model => model.NewsArchivePageSize) + @Html.ValidationMessageFor(model => model.NewsArchivePageSize) +
+ @Html.SmartLabelFor(model => model.MaxAgeInDays) + + @Html.SettingEditorFor(model => model.MaxAgeInDays, null, new { postfix = T("Time.Days").Text }) + @Html.ValidationMessageFor(model => model.MaxAgeInDays) +
+ @Html.SmartLabelFor(model => model.ShowHeaderRssUrl) + + @Html.SettingEditorFor(model => model.ShowHeaderRssUrl) + @Html.ValidationMessageFor(model => model.ShowHeaderRssUrl) +
+ } + + @helper TabSeoSettings() + { + @Html.EditorFor(model => model, "SeoModel") + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Controllers/BlogController.cs b/src/Presentation/SmartStore.Web/Controllers/BlogController.cs index 4bb3982f98..031ccc1862 100644 --- a/src/Presentation/SmartStore.Web/Controllers/BlogController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/BlogController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.ServiceModel.Syndication; using System.Web.Mvc; @@ -230,6 +231,28 @@ protected BlogPostListModel PrepareBlogPostListModel(BlogPagingFilteringModel co model.PagingFilteringContext.LoadPagedList(blogPosts); + // Prepare SEO model + var parsedMonth = model.PagingFilteringContext.GetParsedMonth(); + var tag = model.PagingFilteringContext.Tag; + + if (parsedMonth == null && tag == null) + { + model.MetaTitle = _blogSettings.GetLocalizedSetting(x => x.MetaTitle); + model.MetaDescription = _blogSettings.GetLocalizedSetting(x => x.MetaDescription); + model.MetaKeywords = _blogSettings.GetLocalizedSetting(x => x.MetaKeywords); + } + else { + model.MetaTitle = parsedMonth != null ? + T("PageTitle.Blog.Month").Text.FormatWith(parsedMonth.Value.ToNativeString("MMMM", CultureInfo.InvariantCulture) + " " + parsedMonth.Value.Year) : + T("PageTitle.Blog.Tag").Text.FormatWith(tag); + + model.MetaDescription = parsedMonth != null ? + T("Metadesc.Blog.Month").Text.FormatWith(parsedMonth.Value.ToNativeString("MMMM", CultureInfo.InvariantCulture) + " " + parsedMonth.Value.Year) : + T("Metadesc.Blog.Tag").Text.FormatWith(tag); + + model.MetaKeywords = parsedMonth != null ? parsedMonth.Value.ToNativeString("MMMM", CultureInfo.InvariantCulture) + " " + parsedMonth.Value.Year : tag; + } + model.BlogPosts = blogPosts .Select(x => { @@ -264,11 +287,11 @@ protected BlogPostListModel PrepareBlogPostListModel(int? maxPostAmount, int? ma IPagedList blogPosts; if (!postsWithTag.IsEmpty()) { - blogPosts = _blogService.GetAllBlogPostsByTag(storeId, workingLanguageId, postsWithTag, 0, maxPostAmount ?? 100, false, maxAge); + blogPosts = _blogService.GetAllBlogPostsByTag(storeId, workingLanguageId, postsWithTag, 0, maxPostAmount ?? 100, _services.WorkContext.CurrentCustomer.IsAdmin(), maxAge); } else { - blogPosts = _blogService.GetAllBlogPosts(storeId, workingLanguageId, null, null, 0, maxPostAmount ?? 100, false, maxAge); + blogPosts = _blogService.GetAllBlogPosts(storeId, workingLanguageId, null, null, 0, maxPostAmount ?? 100, _services.WorkContext.CurrentCustomer.IsAdmin(), maxAge); } model.BlogPosts = blogPosts @@ -293,6 +316,7 @@ public ActionResult List(BlogPagingFilteringModel command) return HttpNotFound(); var model = PrepareBlogPostListModel(command); + return View("List", model); } diff --git a/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs b/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs index 9f8c4b64c5..179129a24b 100644 --- a/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs @@ -334,6 +334,13 @@ public ActionResult Index() model.ForumGroups.Add(groupModel); } + model.MetaTitle = _forumSettings.GetLocalizedSetting(x => x.MetaTitle); + model.MetaDescription = _forumSettings.GetLocalizedSetting(x => x.MetaDescription); + model.MetaKeywords = _forumSettings.GetLocalizedSetting(x => x.MetaKeywords); + + if (!model.MetaTitle.HasValue()) + model.MetaTitle = T("Forum.PageTitle.Default").Text; + return View(model); } diff --git a/src/Presentation/SmartStore.Web/Controllers/NewsController.cs b/src/Presentation/SmartStore.Web/Controllers/NewsController.cs index 907097b4b6..b25b211c85 100644 --- a/src/Presentation/SmartStore.Web/Controllers/NewsController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/NewsController.cs @@ -220,7 +220,14 @@ public ActionResult List(NewsPagingFilteringModel command) }) .ToList(); - Services.DisplayControl.AnnounceRange(newsItems); + model.MetaTitle = _newsSettings.GetLocalizedSetting(x => x.MetaTitle); + model.MetaDescription = _newsSettings.GetLocalizedSetting(x => x.MetaDescription); + model.MetaKeywords = _newsSettings.GetLocalizedSetting(x => x.MetaKeywords); + + if (!model.MetaTitle.HasValue()) + model.MetaTitle = T("PageTitle.NewsArchive").Text; + + Services.DisplayControl.AnnounceRange(newsItems); return View(model); } diff --git a/src/Presentation/SmartStore.Web/Models/Blogs/BlogPostListModel.cs b/src/Presentation/SmartStore.Web/Models/Blogs/BlogPostListModel.cs index 36b1e4e4c9..2ee5b92e50 100644 --- a/src/Presentation/SmartStore.Web/Models/Blogs/BlogPostListModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Blogs/BlogPostListModel.cs @@ -18,5 +18,8 @@ public BlogPostListModel() public bool DisableCommentCount { get; set; } public BlogPagingFilteringModel PagingFilteringContext { get; set; } public IList BlogPosts { get; set; } + public string MetaTitle { get; set; } + public string MetaDescription { get; set; } + public string MetaKeywords { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Models/Boards/BoardsIndexModel.cs b/src/Presentation/SmartStore.Web/Models/Boards/BoardsIndexModel.cs index f4fd08ceae..5e1e37792e 100644 --- a/src/Presentation/SmartStore.Web/Models/Boards/BoardsIndexModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Boards/BoardsIndexModel.cs @@ -7,11 +7,15 @@ public partial class BoardsIndexModel { public BoardsIndexModel() { - this.ForumGroups = new List(); + ForumGroups = new List(); } public DateTime CurrentTime { get; set; } public IList ForumGroups { get; set; } + + public string MetaTitle { get; set; } + public string MetaDescription { get; set; } + public string MetaKeywords { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Models/News/NewsItemListModel.cs b/src/Presentation/SmartStore.Web/Models/News/NewsItemListModel.cs index ff5ba23165..3e8ec1a5f7 100644 --- a/src/Presentation/SmartStore.Web/Models/News/NewsItemListModel.cs +++ b/src/Presentation/SmartStore.Web/Models/News/NewsItemListModel.cs @@ -14,5 +14,8 @@ public NewsItemListModel() public int WorkingLanguageId { get; set; } public NewsPagingFilteringModel PagingFilteringContext { get; set; } public IList NewsItems { get; set; } + public string MetaTitle { get; set; } + public string MetaDescription { get; set; } + public string MetaKeywords { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml b/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml index 9e02875552..655709d604 100644 --- a/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml @@ -1,24 +1,13 @@ @model BlogPostListModel @using SmartStore.Web.Models.Blogs; @using SmartStore.Web.Framework.UI; -@using System.Globalization; @{ Layout = "_Layout"; - var parsedMonth = Model.PagingFilteringContext.GetParsedMonth(); - - Html.AddTitleParts( - parsedMonth != null ? - T("PageTitle.Blog.Month").Text.FormatWith(parsedMonth.Value.ToNativeString("MMMM", CultureInfo.InvariantCulture) + " " + parsedMonth.Value.Year) : - T("PageTitle.Blog.Tag").Text.FormatWith(Model.PagingFilteringContext.Tag) - ); - Html.AddMetaDescriptionParts( - parsedMonth != null ? - T("Metadesc.Blog.Month").Text.FormatWith(parsedMonth.Value.ToNativeString("MMMM", CultureInfo.InvariantCulture) + " " + parsedMonth.Value.Year) : - T("Metadesc.Blog.Tag").Text.FormatWith(Model.PagingFilteringContext.Tag) - ); - + Html.AddTitleParts(Model.MetaTitle); + Html.AddMetaDescriptionParts(Model.MetaDescription); + Html.AddMetaKeywordParts(Model.MetaKeywords); Html.AppendScriptParts(true, "~/Content/vendors/imagesloaded/imagesloaded.pkgd.min.js"); } @@ -79,8 +68,8 @@ {
+ href="@Url.RouteUrl("BlogPost", new { SeName = item.SeName })" + title="@string.Format(@T("Blog.CommentsLink").Text, item.Comments.NumberOfComments)"> @item.Comments.NumberOfComments diff --git a/src/Presentation/SmartStore.Web/Views/Boards/Index.cshtml b/src/Presentation/SmartStore.Web/Views/Boards/Index.cshtml index 465d4414f3..ae43cd1f03 100644 --- a/src/Presentation/SmartStore.Web/Views/Boards/Index.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Boards/Index.cshtml @@ -3,7 +3,9 @@ @{ Layout = "_Layout"; - Html.AddTitleParts(T("Forum.PageTitle.Default").Text); + Html.AddTitleParts(Model.MetaTitle); + Html.AddMetaDescriptionParts(Model.MetaDescription); + Html.AddMetaKeywordParts(Model.MetaKeywords); }
diff --git a/src/Presentation/SmartStore.Web/Views/News/List.cshtml b/src/Presentation/SmartStore.Web/Views/News/List.cshtml index 5f88495b83..bca7b69e9e 100644 --- a/src/Presentation/SmartStore.Web/Views/News/List.cshtml +++ b/src/Presentation/SmartStore.Web/Views/News/List.cshtml @@ -3,7 +3,9 @@ @using SmartStore.Web.Framework.UI; @{ Layout = "_Layout"; - Html.AddTitleParts(T("PageTitle.NewsArchive").Text); + Html.AddTitleParts(Model.MetaTitle); + Html.AddMetaDescriptionParts(Model.MetaDescription); + Html.AddMetaKeywordParts(Model.MetaKeywords); }
@@ -14,7 +16,7 @@
- + * @T("News.RSS") From 89aeee31ef749ffd160890d46825ca1b6a58f429 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 8 Sep 2020 20:48:15 +0200 Subject: [PATCH 169/695] Resolves #1971 Rule builder: find uniqueness key for cart rules that can be used for locking --- .../SmartStore.Core/Rules/IRuleProvider.cs | 1 + .../SmartStore.Core/Rules/RuleExpression.cs | 15 +++++++++++++++ .../SmartStore.Core/Rules/RuleExpressionGroup.cs | 15 +++++++++++---- .../Cart/Rules/CartRuleContext.cs | 5 +---- .../Cart/Rules/CartRuleProvider.cs | 3 ++- .../Cart/Rules/Impl/CartSubtotalRule.cs | 11 ++++++----- .../Cart/Rules/Impl/CartTotalRule.cs | 7 ++++--- 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Rules/IRuleProvider.cs b/src/Libraries/SmartStore.Core/Rules/IRuleProvider.cs index 8dcfbfd0c7..fd0039c0a6 100644 --- a/src/Libraries/SmartStore.Core/Rules/IRuleProvider.cs +++ b/src/Libraries/SmartStore.Core/Rules/IRuleProvider.cs @@ -45,6 +45,7 @@ protected virtual void ConvertRule(RuleEntity entity, RuleExpression expression) } expression.Id = entity.Id; + expression.RuleSetId = entity.RuleSetId; expression.Descriptor = descriptor; expression.Operator = entity.Operator; expression.RawValue = entity.Value; diff --git a/src/Libraries/SmartStore.Core/Rules/RuleExpression.cs b/src/Libraries/SmartStore.Core/Rules/RuleExpression.cs index 6a60f0a3fa..a6bcaf32f2 100644 --- a/src/Libraries/SmartStore.Core/Rules/RuleExpression.cs +++ b/src/Libraries/SmartStore.Core/Rules/RuleExpression.cs @@ -1,10 +1,12 @@ using System.Collections.Generic; +using SmartStore.Utilities; namespace SmartStore.Rules { public interface IRuleExpression { int Id { get; } + int RuleSetId { get; } RuleDescriptor Descriptor { get; } RuleOperator Operator { get; } object Value { get; } @@ -20,10 +22,23 @@ public RuleExpression() } public int Id { get; set; } + public int RuleSetId { get; set; } public RuleDescriptor Descriptor { get; set; } public RuleOperator Operator { get; set; } public object Value { get; set; } public string RawValue { get; set; } public IDictionary Metadata { get; set; } + + public override int GetHashCode() + { + var combiner = HashCodeCombiner + .Start() + .Add(RuleSetId) + .Add(Id) + .Add(Operator) + .Add(RawValue); + + return combiner.CombinedHash; + } } } diff --git a/src/Libraries/SmartStore.Core/Rules/RuleExpressionGroup.cs b/src/Libraries/SmartStore.Core/Rules/RuleExpressionGroup.cs index 9ec260c8cb..5026beba23 100644 --- a/src/Libraries/SmartStore.Core/Rules/RuleExpressionGroup.cs +++ b/src/Libraries/SmartStore.Core/Rules/RuleExpressionGroup.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SmartStore.Utilities; namespace SmartStore.Rules { @@ -41,5 +39,14 @@ public virtual void AddExpressions(params IRuleExpression[] expressions) Guard.NotNull(expressions, nameof(expressions)); _expressions.AddRange(expressions); } + + public override int GetHashCode() + { + var combiner = HashCodeCombiner + .Start() + .Add(Expressions.Select(x => x.GetHashCode())); + + return combiner.CombinedHash; + } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs index a3940fdbaa..0975a51f89 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Stores; @@ -14,5 +10,6 @@ public class CartRuleContext public Customer Customer { get; set; } public Store Store { get; set; } public IWorkContext WorkContext { get; set; } + public Func GetRuleHashCode { get; set; } } } diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs index 5d691df810..d38ce1e447 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs @@ -135,7 +135,8 @@ public bool RuleMatches(RuleExpression[] expressions, LogicalRuleOperator logica { Customer = _services.WorkContext.CurrentCustomer, Store = _services.StoreContext.CurrentStore, - WorkContext = _services.WorkContext + WorkContext = _services.WorkContext, + GetRuleHashCode = () => group.GetHashCode() }; var processor = GetProcessor(group); diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartSubtotalRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartSubtotalRule.cs index 119168bb8e..3a6e142148 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartSubtotalRule.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartSubtotalRule.cs @@ -1,5 +1,4 @@ -using System.Threading; -using SmartStore.Core.Domain.Orders; +using SmartStore.Core.Domain.Orders; using SmartStore.Rules; using SmartStore.Services.Orders; using SmartStore.Utilities.Threading; @@ -19,10 +18,12 @@ public CartSubtotalRule(IShoppingCartService shoppingCartService, IOrderTotalCal public bool Match(CartRuleContext context, RuleExpression expression) { - var lockKey = $"rule:cart:cartsubtotalrule:{Thread.CurrentThread.ManagedThreadId}-{expression.Id}"; + var hashCode = context.GetRuleHashCode(); + var lockKey = "rule:cart:cartsubtotalrule:" + hashCode.ToString(); + if (KeyedLock.IsLockHeld(lockKey)) { - //$"locked: {lockKey}".Dump(); + //$"locked expression {expression.Id}: {lockKey}".Dump(); return false; } @@ -38,7 +39,7 @@ public bool Match(CartRuleContext context, RuleExpression expression) cartSubtotal = money.RoundedAmount; var result = expression.Operator.Match(cartSubtotal, expression.Value); - //$"unlocked {result}: {lockKey}".Dump(); + //$"unlocked expression {expression.Id}: {lockKey}".Dump(); return result; } } diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartTotalRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartTotalRule.cs index d5f7e67d21..13de712cf5 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartTotalRule.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartTotalRule.cs @@ -1,5 +1,4 @@ -using System.Threading; -using SmartStore.Core.Domain.Orders; +using SmartStore.Core.Domain.Orders; using SmartStore.Rules; using SmartStore.Services.Orders; using SmartStore.Utilities.Threading; @@ -21,7 +20,9 @@ public CartTotalRule( public bool Match(CartRuleContext context, RuleExpression expression) { - var lockKey = $"rule:cart:carttotalrule:{Thread.CurrentThread.ManagedThreadId}-{expression.Id}"; + var hashCode = context.GetRuleHashCode(); + var lockKey = "rule:cart:carttotalrule:" + hashCode.ToString(); + if (KeyedLock.IsLockHeld(lockKey)) { return false; From 4c7e67a4e25b87a3dc65544e3ab1425a215afd40 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 8 Sep 2020 22:31:37 +0200 Subject: [PATCH 170/695] Fixed some bad coding decisions ;-) --- .../Cart/Rules/CartRuleContext.cs | 14 +++++++++++++- .../Cart/Rules/CartRuleProvider.cs | 5 ++--- .../Cart/Rules/Impl/CartSubtotalRule.cs | 4 ++-- .../Cart/Rules/Impl/CartTotalRule.cs | 4 ++-- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs index 0975a51f89..dfb249f4fd 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs @@ -7,9 +7,21 @@ namespace SmartStore.Services.Cart.Rules { public class CartRuleContext { + private readonly Func _sessionKeyBuilder; + private object _sessionKey; + + internal CartRuleContext(Func sessionKeyBuilder) + { + _sessionKeyBuilder = sessionKeyBuilder; + } + public Customer Customer { get; set; } public Store Store { get; set; } public IWorkContext WorkContext { get; set; } - public Func GetRuleHashCode { get; set; } + + public object SessionKey + { + get => _sessionKey ?? (_sessionKey = _sessionKeyBuilder?.Invoke() ?? 0); + } } } diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs index d38ce1e447..ea9d8ad22b 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs @@ -131,12 +131,11 @@ public bool RuleMatches(RuleExpression[] expressions, LogicalRuleOperator logica group.AddExpressions(expressions); } - var context = new CartRuleContext + var context = new CartRuleContext(() => group.GetHashCode()) { Customer = _services.WorkContext.CurrentCustomer, Store = _services.StoreContext.CurrentStore, - WorkContext = _services.WorkContext, - GetRuleHashCode = () => group.GetHashCode() + WorkContext = _services.WorkContext }; var processor = GetProcessor(group); diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartSubtotalRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartSubtotalRule.cs index 3a6e142148..96c0c8a728 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartSubtotalRule.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartSubtotalRule.cs @@ -18,8 +18,8 @@ public CartSubtotalRule(IShoppingCartService shoppingCartService, IOrderTotalCal public bool Match(CartRuleContext context, RuleExpression expression) { - var hashCode = context.GetRuleHashCode(); - var lockKey = "rule:cart:cartsubtotalrule:" + hashCode.ToString(); + var sessionKey = context.SessionKey; + var lockKey = "rule:cart:cartsubtotalrule:" + sessionKey.ToString(); if (KeyedLock.IsLockHeld(lockKey)) { diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartTotalRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartTotalRule.cs index 13de712cf5..163535831b 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartTotalRule.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/CartTotalRule.cs @@ -20,8 +20,8 @@ public CartTotalRule( public bool Match(CartRuleContext context, RuleExpression expression) { - var hashCode = context.GetRuleHashCode(); - var lockKey = "rule:cart:carttotalrule:" + hashCode.ToString(); + var sessionKey = context.SessionKey; + var lockKey = "rule:cart:carttotalrule:" + sessionKey.ToString(); if (KeyedLock.IsLockHeld(lockKey)) { From 281f8e9f1a996f11d8cedf9f57642d587b38f6fe Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 8 Sep 2020 23:24:14 +0200 Subject: [PATCH 171/695] (ui) Fixed "switcher" vertical positioning issues --- .../Extensions/HtmlExtensions.cs | 4 ++-- .../Administration/Content/_admin.scss | 13 ------------- .../Content/shared/_switch.scss | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs index 19fbede0dc..f908bd62e2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs @@ -747,9 +747,9 @@ public static MvcHtmlString SettingEditorFor( return editor; // CONTROL var sb = PooledStringBuilder.Rent("
"); - sb.Append("
"); + sb.Append("
"); sb.Append(helper.SettingOverrideCheckboxInternal(expression, data, parentSelector)); // CHECK - sb.Append("
"); + sb.Append("
"); sb.Append("
"); sb.Append(editor.ToHtmlString()); // CONTROL sb.Append("
"); diff --git a/src/Presentation/SmartStore.Web/Administration/Content/_admin.scss b/src/Presentation/SmartStore.Web/Administration/Content/_admin.scss index 0b6bd7581e..b5eee773fb 100644 --- a/src/Presentation/SmartStore.Web/Administration/Content/_admin.scss +++ b/src/Presentation/SmartStore.Web/Administration/Content/_admin.scss @@ -713,19 +713,6 @@ legend { margin-bottom: 0; } - .adminData { - > .switch, - .multi-store-setting-control > .switch { - padding-top: calc(#{$input-padding-y} + #{$input-border-width}); - padding-bottom: calc(#{$input-padding-y} + #{$input-border-width}); - } - - > .switch { - margin-bottom: 0; - line-height: $input-line-height; - } - } - > tbody > tr > td:only-child:not(.adminData):not(.adminTitle), > tr > td:only-child:not(.adminData):not(.adminTitle) { flex-grow: 1; diff --git a/src/Presentation/SmartStore.Web/Content/shared/_switch.scss b/src/Presentation/SmartStore.Web/Content/shared/_switch.scss index 2465b799de..e0abf97b40 100644 --- a/src/Presentation/SmartStore.Web/Content/shared/_switch.scss +++ b/src/Presentation/SmartStore.Web/Content/shared/_switch.scss @@ -5,23 +5,30 @@ /* On/Off switch button -------------------------------------------------------------- */ +.switch { + @extend .col-form-label; +} + +.switcher-sm > .switch { + @extend .col-form-label-sm; +} + .switch { $h: $font-size-base * $line-height-base; $h-sm: $font-size-sm * $line-height-sm; $w: $h * 2; $w-sm: $h-sm * 2; + --switcher-w: #{$w}; + --switcher-h: #{$h}; + --switch-size: calc(var(--switcher-h) - 4px); + --switch-bg-rgb: #{red($orange)}, #{green($orange)}, #{blue($orange)}; position: relative; display: inline-block; vertical-align: bottom; margin: 0; - padding: 0; user-select: none; box-sizing: content-box; - font-size: 0.725em; - --switcher-w: #{$w}; - --switcher-h: #{$h}; - --switch-size: calc(var(--switcher-h) - 4px); - --switch-bg-rgb: #{red($orange)}, #{green($orange)}, #{blue($orange)}; + font-size: 0.725em !important; width: var(--switcher-w); height: var(--switcher-h); From 78869533cd58c1ed6dca0f8aa5a8074e18b7ae8b Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 9 Sep 2020 01:42:35 +0200 Subject: [PATCH 172/695] (pb) Fixes #2080: ugly overlay borders if radius > 0 --- src/Presentation/SmartStore.Web/Content/shared/_bg.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Content/shared/_bg.scss b/src/Presentation/SmartStore.Web/Content/shared/_bg.scss index 99f24af0a4..8ebf674746 100644 --- a/src/Presentation/SmartStore.Web/Content/shared/_bg.scss +++ b/src/Presentation/SmartStore.Web/Content/shared/_bg.scss @@ -15,7 +15,6 @@ top: 0; right: 0; bottom: 0; - border-radius: var(--border-radius, 0); transition: opacity $box-transition-duration $box-transition-timing; } From 6402ab5f6577e679e8c786216d4b7e0f999dba8f Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 9 Sep 2020 01:56:23 +0200 Subject: [PATCH 173/695] Fixes #1991: GetLocalizedValue with detectEmptyHtml may incorrectly load the default value --- src/Libraries/SmartStore.Core/Html/HtmlUtils.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs b/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs index e2f6038f60..247a3d3a15 100644 --- a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs +++ b/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs @@ -169,9 +169,17 @@ public static bool IsEmptyHtml(string html) { case "html": case "head": - case "body": case "br": continue; + case "body": + if (el.ChildElementCount > 0) + { + continue; + } + else + { + return el.Text().Trim().IsEmpty(); + } case "p": case "div": case "span": From d6d5ae47d1fcac2daceadf9af529f136abf98746 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 9 Sep 2020 04:03:07 +0200 Subject: [PATCH 174/695] Fixes #2077: better media file name normalization for writing media commands --- .../Catalog/Importer/CategoryImporter.cs | 2 +- .../Catalog/Importer/ProductImporter.cs | 2 +- .../Customers/Importer/CustomerImporter.cs | 2 +- .../Media/DownloadService.cs | 2 +- .../SmartStore.Services/Media/MediaHelper.cs | 22 +++++++++++++++++-- .../Media/MediaPathData.cs | 12 ++++++---- .../Media/MediaService.Folder.cs | 2 +- .../SmartStore.Services/Media/MediaService.cs | 14 ++++++------ .../Media/MediaServiceFileSystemAdapter.cs | 2 +- .../Media/Migration/MediaMigrator.cs | 4 ++-- .../Controllers/MediaController.cs | 2 +- 11 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs b/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs index 068821a45f..885cabfd8b 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs @@ -209,7 +209,7 @@ protected virtual int ProcessPictures( if (!_mediaService.FindEqualFile(stream, currentFiles.Select(x => x.File), true, out var _)) { - var path = _mediaService.CombinePaths(SystemAlbumProvider.Catalog, image.FileName.ToValidFileName()); + var path = _mediaService.CombinePaths(SystemAlbumProvider.Catalog, image.FileName); var newFile = _mediaService.SaveFile(path, stream, false, DuplicateFileHandling.Rename); if ((newFile?.Id ?? 0) != 0) { diff --git a/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs b/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs index bfb4987377..d034b9e15d 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs @@ -915,7 +915,7 @@ protected virtual void ProcessProductPictures(ImportExecuteContext context, IEnu if (!_mediaService.FindEqualFile(stream, currentFiles.Select(x => x.MediaFile), true, out var _)) { - var path = _mediaService.CombinePaths(SystemAlbumProvider.Catalog, image.FileName.ToValidFileName()); + var path = _mediaService.CombinePaths(SystemAlbumProvider.Catalog, image.FileName); var newFile = _mediaService.SaveFile(path, stream, false, DuplicateFileHandling.Rename); if ((newFile?.Id ?? 0) != 0) { diff --git a/src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs b/src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs index 4fb953ca0d..a6396727ed 100644 --- a/src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs +++ b/src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs @@ -629,7 +629,7 @@ protected virtual int ProcessAvatars( if (!_mediaService.FindEqualFile(stream, currentFiles.Select(x => x.File), true, out var _)) { // Don't manage avatar files. Just overwrite existing file. - var path = _mediaService.CombinePaths(SystemAlbumProvider.Customers, image.FileName.ToValidFileName()); + var path = _mediaService.CombinePaths(SystemAlbumProvider.Customers, image.FileName); var newFile = _mediaService.SaveFile(path, stream, false, DuplicateFileHandling.Overwrite); if ((newFile?.Id ?? 0) != 0) diff --git a/src/Libraries/SmartStore.Services/Media/DownloadService.cs b/src/Libraries/SmartStore.Services/Media/DownloadService.cs index 5f3605ff09..082643ba6f 100644 --- a/src/Libraries/SmartStore.Services/Media/DownloadService.cs +++ b/src/Libraries/SmartStore.Services/Media/DownloadService.cs @@ -142,7 +142,7 @@ public virtual MediaFileInfo InsertDownload(Download download, Stream stream, st { Guard.NotNull(download, nameof(download)); - var path = _mediaService.CombinePaths(SystemAlbumProvider.Downloads, fileName.ToValidFileName()); + var path = _mediaService.CombinePaths(SystemAlbumProvider.Downloads, fileName); var file = _mediaService.SaveFile(path, stream, dupeFileHandling: DuplicateFileHandling.Rename); file.File.Hidden = true; download.MediaFile = file.File; diff --git a/src/Libraries/SmartStore.Services/Media/MediaHelper.cs b/src/Libraries/SmartStore.Services/Media/MediaHelper.cs index de43c9ac21..e066771337 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaHelper.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaHelper.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Linq.Expressions; using SmartStore.ComponentModel; using SmartStore.Core; @@ -12,6 +13,23 @@ namespace SmartStore.Services.Media { public partial class MediaHelper { + #region Static + + private readonly static char[] _invalidFileNameChars = Path.GetInvalidFileNameChars().Concat(new[] { '&' }).ToArray(); + private readonly static char[] _invalidFolderNameChars = Path.GetInvalidPathChars().Concat(new[] { '&', '/', '\\' }).ToArray(); + + public static string NormalizeFileName(string fileName) + { + return string.Join("-", fileName.ToSafe().Split(_invalidFileNameChars)); + } + + public static string NormalizeFolderName(string folderName) + { + return string.Join("-", folderName.ToSafe().Split(_invalidFolderNameChars)); + } + + #endregion + private readonly IFolderService _folderService; public MediaHelper(IFolderService folderService) @@ -19,7 +37,7 @@ public MediaHelper(IFolderService folderService) _folderService = folderService; } - public bool TokenizePath(string path, out MediaPathData data) + public bool TokenizePath(string path, bool normalizeFileName, out MediaPathData data) { data = null; @@ -34,7 +52,7 @@ public bool TokenizePath(string path, out MediaPathData data) var node = _folderService.GetNodeByPath(dir); if (node != null) { - data = new MediaPathData(node, path.Substring(dir.Length + 1)); + data = new MediaPathData(node, path.Substring(dir.Length + 1), normalizeFileName); return true; } } diff --git a/src/Libraries/SmartStore.Services/Media/MediaPathData.cs b/src/Libraries/SmartStore.Services/Media/MediaPathData.cs index 858dcbdea6..23c3d91b95 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaPathData.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaPathData.cs @@ -12,20 +12,24 @@ public class MediaPathData private string _ext; private string _mime; - public MediaPathData(TreeNode node, string fileName) + public MediaPathData(TreeNode node, string fileName, bool normalizeFileName = false) { Guard.NotNull(node, nameof(node)); Guard.NotEmpty(fileName, nameof(fileName)); Node = node; - _name = fileName; + _name = normalizeFileName + ? MediaHelper.NormalizeFileName(fileName) + : fileName; } - public MediaPathData(string path) + public MediaPathData(string path, bool normalizeFileName = false) { Guard.NotEmpty(path, nameof(path)); - _name = Path.GetFileName(path); + _name = normalizeFileName + ? MediaHelper.NormalizeFileName(Path.GetFileName(path)) + : Path.GetFileName(path); } public MediaPathData(MediaPathData pathData) diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs b/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs index 4b4325cef7..a821418cb9 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs @@ -47,7 +47,7 @@ public MediaFolderInfo CreateFolder(string path) { for (int i = 0; i < folderNames.Length; i++) { - var folderName = folderNames[i].ToValidPath(); + var folderName = MediaHelper.NormalizeFolderName(folderNames[i]); path += (i > 0 ? sep : string.Empty) + folderName; if (!flag) diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs index 7ddf472def..adebd38b13 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -185,7 +185,7 @@ public bool FileExists(string path) { Guard.NotEmpty(path, nameof(path)); - if (_helper.TokenizePath(path, out var tokens)) + if (_helper.TokenizePath(path, false, out var tokens)) { return _fileRepo.Table.Any(x => x.FolderId == tokens.Folder.Id && x.Name == tokens.FileName); } @@ -197,7 +197,7 @@ public MediaFileInfo GetFileByPath(string path, MediaLoadFlags flags = MediaLoad { Guard.NotEmpty(path, nameof(path)); - if (_helper.TokenizePath(path, out var tokens)) + if (_helper.TokenizePath(path, false, out var tokens)) { var table = _searcher.ApplyLoadFlags(_fileRepo.Table, flags); @@ -265,7 +265,7 @@ public bool CheckUniqueFileName(string path, out string newPath) newPath = null; - if (!_helper.TokenizePath(path, out var pathData)) + if (!_helper.TokenizePath(path, false, out var pathData)) { return false; } @@ -476,7 +476,7 @@ protected MediaPathData CreatePathData(string path) { Guard.NotEmpty(path, nameof(path)); - if (!_helper.TokenizePath(path, out var pathData)) + if (!_helper.TokenizePath(path, true, out var pathData)) { throw new ArgumentException(T("Admin.Media.Exception.InvalidPathExample", path), nameof(path)); } @@ -536,7 +536,7 @@ protected MediaStorageItem ProcessFile( file.IsTransient = false; } - var name = pathData.FileName.ToValidFileName(); + var name = pathData.FileName; if (name != pathData.FileName) { pathData.FileName = name; @@ -786,7 +786,7 @@ public MediaFileInfo MoveFile(MediaFile file, string destinationFileName, Duplic if (nameChanged) { - var title = destPathData.FileTitle.ToValidFileName(); + var title = destPathData.FileTitle; var ext = destPathData.Extension.ToLower(); file.Name = title + "." + ext; @@ -984,7 +984,7 @@ private static void MapMediaFile(MediaFile from, MediaFile to) private MediaPathData CreateDestinationPathData(MediaFile file, string destinationFileName) { - if (!_helper.TokenizePath(destinationFileName, out var pathData)) + if (!_helper.TokenizePath(destinationFileName, true, out var pathData)) { // Passed path is NOT a path, but a file name diff --git a/src/Libraries/SmartStore.Services/Media/MediaServiceFileSystemAdapter.cs b/src/Libraries/SmartStore.Services/Media/MediaServiceFileSystemAdapter.cs index f414498d38..acfc0c892e 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaServiceFileSystemAdapter.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaServiceFileSystemAdapter.cs @@ -229,7 +229,7 @@ public IFolder GetFolder(string path) public IFolder GetFolderForFile(string path) { - if (!_mediaHelper.TokenizePath(path, out var pathData)) + if (!_mediaHelper.TokenizePath(path, false, out var pathData)) { throw _exceptionFactory.FolderNotFound(Fix(Path.GetDirectoryName(path))); } diff --git a/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs b/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs index 45b87b1d01..1e9368ea1a 100644 --- a/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs +++ b/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs @@ -357,7 +357,7 @@ public void MigrateMediaFiles(SmartObjectContext ctx) } else { - name = fixedName = file.Name.Truncate(292).ToValidFileName(); + name = fixedName = MediaHelper.NormalizeFileName(file.Name.Truncate(292)); if (name == prevName) { // Make file name unique @@ -426,7 +426,7 @@ public void MigrateMediaFiles_Old(SmartObjectContext ctx) } else { - name = file.Name.Truncate(292).ToValidFileName(); + name = MediaHelper.NormalizeFileName(file.Name.Truncate(292)); } file.Name = name + "." + file.Extension; diff --git a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs index 4f4d61aeeb..4e000a6f1e 100644 --- a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs @@ -165,7 +165,7 @@ public async Task File(int id /* mediaFileId */, string path) // This is most likely a request for a default placeholder image pathData = new MediaPathData(path); } - else if (!_mediaHelper.TokenizePath(path, out pathData)) + else if (!_mediaHelper.TokenizePath(path, false, out pathData)) { // Missing or malformed Uri: get file metadata from DB by id, but only when current user has media manage rights if (!_permissionService.Authorize(Permissions.Media.Update)) From 3c978d64a9ad6b25b38610d2599ec5dc3bbc3706 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Tue, 8 Sep 2020 19:57:08 +0200 Subject: [PATCH 175/695] MInor adaptions --- .../Migrations/MigrationsConfiguration.cs | 6 +----- .../Views/Store/_CreateOrUpdate.cshtml | 20 +++++++++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 22eef31071..0cc880f907 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -300,8 +300,6 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) @"

If you have included third-party scripts in your shop that use cookies and are not integrated into Smartstore via a plugin, you can provide your own information about these cookies for the Cookie Manager in the following table. -

-

The added information is displayed in the Cookie Manager of the front end, corresponding to the type. Cookie information provided to the Cookie Manager by active plug-ins is displayed in this table, but cannot be edited. The texts of this information can be edited using the language resources @@ -310,9 +308,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) @"

Wenn Sie Scripte von Drittanbietern in Ihren Shop eingebunden haben, die Cookies nutzen und die nicht über ein Plugin in Smartstore integriert sind, können Sie in folgender Tabelle eigene Informationen über diese Cookies für den Cookie-Manager bereitstellen. -

-

- Die zugefügten Informtionen werden, dem Typ entsprechend, im Cookie-Manager des Frontends angezeigt. + Die zugefügten Informationen werden, dem Typ entsprechend, im Cookie-Manager des Frontends angezeigt. Cookie-Informationen, die dem Cookie-Manager von aktiven Plugins zur Verfügung gestellt werden, werden in dieser Tabelle angezeigt, können aber nicht bearbeitet werden. Die Texte dieser Informationen können über die Sprachresourcen bearbeitet werden Admin > Konfiguration > Regionale Einstellungen > Sprachen. diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Store/_CreateOrUpdate.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Store/_CreateOrUpdate.cshtml index 97aa1f16cd..a1dfeedd6e 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Store/_CreateOrUpdate.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Store/_CreateOrUpdate.cshtml @@ -4,6 +4,15 @@ @Html.HiddenFor(model => model.Id) + + + + - - - -
+ @Html.SmartLabelFor(model => model.LogoMediaFileId) + + @Html.EditorFor(model => model.LogoMediaFileId, new { transientUpload = true }) + @Html.ValidationMessageFor(model => model.LogoMediaFileId) +
@Html.SmartLabelFor(model => model.Name) @@ -121,20 +130,11 @@
- Logo & Icons + Icons
- @Html.SmartLabelFor(model => model.LogoMediaFileId) - - @Html.EditorFor(model => model.LogoMediaFileId, new { transientUpload = true }) - @Html.ValidationMessageFor(model => model.LogoMediaFileId) -
@Html.SmartLabelFor(model => model.FavIconMediaFileId) From 1610756a73776018915e6b025df3d120d483c160 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Tue, 8 Sep 2020 20:28:27 +0200 Subject: [PATCH 176/695] Allow HTML for SEO meta infos --- src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs index 478bf5948f..cce8426ee4 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs @@ -1,4 +1,5 @@ using System; +using System.Web.Mvc; using SmartStore.Web.Framework.Localization; namespace SmartStore.Web.Framework.Seo @@ -6,12 +7,15 @@ namespace SmartStore.Web.Framework.Seo public interface ISeoModel : ILocalizedModel { [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] + [AllowHtml] string MetaTitle { get; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] + [AllowHtml] string MetaDescription { get; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] + [AllowHtml] string MetaKeywords { get; } } @@ -20,12 +24,15 @@ public class SeoModelLocal : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] + [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] + [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] + [AllowHtml] public string MetaKeywords { get; set; } } } From 291a0d4911a0a2f03cf1e83e2ba59ccd13c8957b Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Wed, 9 Sep 2020 15:39:49 +0200 Subject: [PATCH 177/695] Resolves #213 Allow special title and meta tags for home page --- .../SmartStore.Core/Domain/Seo/SeoSettings.cs | 8 ++ .../Migrations/MigrationsConfiguration.cs | 22 +++++ .../SmartStore.Web.Framework/Seo/SeoModel.cs | 17 ++++ .../SmartStore.Web.Framework.csproj | 1 + .../UI/PageAssetsBuilder.cs | 11 +-- .../Controllers/SettingController.cs | 44 ++++++++++ .../Settings/GeneralCommonSettingsModel.cs | 27 ++++--- .../Views/Setting/GeneralCommon.cshtml | 80 ++++++++----------- .../Shared/EditorTemplates/SeoModel.cshtml | 68 +++++++++++++--- .../Controllers/HomeController.cs | 12 ++- .../Views/Home/ContactUs.cshtml | 2 +- .../SmartStore.Web/Views/Home/Index.cshtml | 4 + .../Views/Shared/Layouts/_Document.cshtml | 2 +- 13 files changed, 224 insertions(+), 74 deletions(-) create mode 100644 src/Presentation/SmartStore.Web.Framework/Seo/SeoModel.cs diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs index 4be4ab65a9..2bddd96472 100644 --- a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs @@ -56,9 +56,15 @@ public SeoSettings() public string PageTitleSeparator { get; set; } = ". "; public PageTitleSeoAdjustment PageTitleSeoAdjustment { get; set; } = PageTitleSeoAdjustment.PagenameAfterStorename; + public string DefaultTitle { get; set; } = "Shop"; public string DefaultMetaKeywords { get; set; } = string.Empty; public string DefaultMetaDescription { get; set; } = string.Empty; + + public string HomepageMetaTitle { get; set; } + public string HomepageMetaDescription { get; set; } + public string HomepageMetaKeywords { get; set; } + public string MetaRobotsContent { get; set; } public bool ConvertNonWesternChars { get; set; } @@ -94,5 +100,7 @@ public SeoSettings() public bool XmlSitemapIncludesForum { get; set; } = true; #endregion + + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 0cc880f907..e650822360 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -333,6 +333,28 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb builder.AddOrUpdate("Admin.Configuration.Seo.MetaKeywords", "Meta keywords", "Meta Keywords"); + + builder.AddOrUpdate("Admin.System.MetaInfos", + "Meta tags", + "Meta-Elemente"); + + builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.HomepageTitle", + "Meta title (Homepage)", + "Meta Titel (Startseite)", + "Defines the meta title for the homepage.", + "Legt den Meta Titel für die Startseite fest."); + + builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.HomepageMetaDescription", + "Meta description (Homepage)", + "Meta Beschreibung (Startseite)", + "Defines the meta description for the homepage.", + "Legt die Meta Beschreibung für die Startseite fest."); + + builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.HomepageMetaKeywords", + "Meta keywords (Homepage)", + "Meta Keywords (Startseite)", + "Defines the meta keywords for the homepage.", + "Legt die Meta Keywords für die Startseite fest."); } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/SeoModel.cs b/src/Presentation/SmartStore.Web.Framework/Seo/SeoModel.cs new file mode 100644 index 0000000000..ca096d5334 --- /dev/null +++ b/src/Presentation/SmartStore.Web.Framework/Seo/SeoModel.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace SmartStore.Web.Framework.Seo +{ + public partial class SeoModel : ISeoModel + { + public SeoModel() + { + Locales = new List(); + } + + public string MetaTitle { get; set; } + public string MetaDescription { get; set; } + public string MetaKeywords { get; set; } + public IList Locales { get; set; } + } +} diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index c080dfdf8a..bcf9404eb3 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -250,6 +250,7 @@ + diff --git a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs index cdf515d2ed..c75971c323 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs @@ -12,6 +12,7 @@ using SmartStore.Core; using SmartStore.Core.Domain.Seo; using SmartStore.Core.Domain.Themes; +using SmartStore.Services.Localization; using SmartStore.Utilities.ObjectPools; namespace SmartStore.Web.Framework.UI @@ -146,13 +147,13 @@ public virtual string GenerateTitle(bool addDefaultTitle) { case PageTitleSeoAdjustment.PagenameAfterStorename: { - result = string.Join(_seoSettings.PageTitleSeparator, _seoSettings.DefaultTitle, specificTitle); + result = string.Join(_seoSettings.PageTitleSeparator, _seoSettings.GetLocalizedSetting(x => x.DefaultTitle).Value, specificTitle); } break; case PageTitleSeoAdjustment.StorenameAfterPagename: default: { - result = string.Join(_seoSettings.PageTitleSeparator, specificTitle, _seoSettings.DefaultTitle); + result = string.Join(_seoSettings.PageTitleSeparator, specificTitle, _seoSettings.GetLocalizedSetting(x => x.DefaultTitle).Value); } break; } @@ -166,7 +167,7 @@ public virtual string GenerateTitle(bool addDefaultTitle) else { // Store name only - result = _seoSettings.DefaultTitle; + result = _seoSettings.GetLocalizedSetting(x => x.DefaultTitle).Value; } return result; @@ -180,7 +181,7 @@ public void AddMetaDescriptionParts(IEnumerable parts, bool append = fal public virtual string GenerateMetaDescription() { - var result = _seoSettings.DefaultMetaDescription; + var result = _seoSettings.GetLocalizedSetting(x => x.DefaultMetaDescription).Value; if (_metaDescriptionParts == null) return result; @@ -202,7 +203,7 @@ public void AddMetaKeywordParts(IEnumerable parts, bool append = false) public virtual string GenerateMetaKeywords() { - var result = _seoSettings.DefaultMetaKeywords; + var result = _seoSettings.GetLocalizedSetting(x => x.DefaultMetaKeywords).Value; if (_metaKeywordParts == null) return result; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs index 31bcf72dfe..de26c27cee 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs @@ -1271,6 +1271,28 @@ public ActionResult GeneralCommon() // Fix Disallows joined with comma in MiniMapper (we need NewLine). model.SeoSettings.ExtraRobotsDisallows = string.Join(Environment.NewLine, seoSettings.ExtraRobotsDisallows); + model.SeoSettings.DefaultSeoModel.MetaTitle = seoSettings.DefaultTitle; + model.SeoSettings.DefaultSeoModel.MetaDescription = seoSettings.DefaultMetaDescription; + model.SeoSettings.DefaultSeoModel.MetaKeywords = seoSettings.DefaultMetaKeywords; + + AddLocales(_languageService, model.SeoSettings.DefaultSeoModel.Locales, (locale, languageId) => + { + locale.MetaTitle = seoSettings.GetLocalizedSetting(x => x.DefaultTitle, languageId, false, false); + locale.MetaDescription = seoSettings.GetLocalizedSetting(x => x.DefaultMetaDescription, languageId, false, false); + locale.MetaKeywords = seoSettings.GetLocalizedSetting(x => x.DefaultMetaKeywords, languageId, false, false); + }); + + model.SeoSettings.HomepageSeoModel.MetaTitle = seoSettings.HomepageMetaTitle; + model.SeoSettings.HomepageSeoModel.MetaDescription = seoSettings.HomepageMetaDescription; + model.SeoSettings.HomepageSeoModel.MetaKeywords = seoSettings.HomepageMetaKeywords; + + AddLocales(_languageService, model.SeoSettings.HomepageSeoModel.Locales, (locale, languageId) => + { + locale.MetaTitle = seoSettings.GetLocalizedSetting(x => x.HomepageMetaTitle, languageId, false, false); + locale.MetaDescription = seoSettings.GetLocalizedSetting(x => x.HomepageMetaDescription, languageId, false, false); + locale.MetaKeywords = seoSettings.GetLocalizedSetting(x => x.HomepageMetaKeywords, languageId, false, false); + }); + StoreDependingSettings.GetOverrideKeys(seoSettings, model.SeoSettings, storeScope, Services.Settings, false); // Security. @@ -1375,6 +1397,28 @@ public ActionResult GeneralCommon(GeneralCommonSettingsModel model, FormCollecti var resetUserSeoCharacterTable = (seoSettings.SeoNameCharConversion != model.SeoSettings.SeoNameCharConversion); MiniMapper.Map(model.SeoSettings, seoSettings); + seoSettings.DefaultTitle = model.SeoSettings.DefaultSeoModel.MetaTitle; + seoSettings.DefaultMetaDescription = model.SeoSettings.DefaultSeoModel.MetaDescription; + seoSettings.DefaultMetaKeywords = model.SeoSettings.DefaultSeoModel.MetaKeywords; + + foreach (var localized in model.SeoSettings.DefaultSeoModel.Locales) + { + _localizedEntityService.SaveLocalizedSetting(seoSettings, x => x.DefaultTitle, localized.MetaTitle, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(seoSettings, x => x.DefaultMetaKeywords, localized.MetaDescription, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(seoSettings, x => x.DefaultMetaDescription, localized.MetaKeywords, localized.LanguageId); + } + + seoSettings.HomepageMetaTitle = model.SeoSettings.HomepageSeoModel.MetaTitle; + seoSettings.HomepageMetaDescription = model.SeoSettings.HomepageSeoModel.MetaDescription; + seoSettings.HomepageMetaKeywords = model.SeoSettings.HomepageSeoModel.MetaKeywords; + + foreach (var localized in model.SeoSettings.HomepageSeoModel.Locales) + { + _localizedEntityService.SaveLocalizedSetting(seoSettings, x => x.HomepageMetaTitle, localized.MetaTitle, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(seoSettings, x => x.HomepageMetaDescription, localized.MetaDescription, localized.LanguageId); + _localizedEntityService.SaveLocalizedSetting(seoSettings, x => x.HomepageMetaKeywords, localized.MetaKeywords, localized.LanguageId); + } + // Security. var securitySettings = Services.Settings.LoadSetting(storeScope); MiniMapper.Map(model.SecuritySettings, securitySettings); diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs index 06fafd2648..5bc34523e8 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs @@ -5,6 +5,7 @@ using SmartStore.Core.Localization; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; +using SmartStore.Web.Framework.Seo; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Web.Mvc; @@ -56,6 +57,12 @@ public StoreInformationSettingsModel() public partial class SeoSettingsModel { + public SeoSettingsModel () + { + DefaultSeoModel = new SeoModel(); + HomepageSeoModel = new SeoModel(); + } + [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PageTitleSeparator")] [AllowHtml] public string PageTitleSeparator { get; set; } @@ -63,17 +70,15 @@ public partial class SeoSettingsModel [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PageTitleSeoAdjustment")] public PageTitleSeoAdjustment PageTitleSeoAdjustment { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.DefaultTitle")] - [AllowHtml] - public string DefaultTitle { get; set; } + [AdditionalMetadata("MetaTitleResKey", "Admin.Configuration.Settings.GeneralCommon.DefaultTitle")] + [AdditionalMetadata("MetaDescriptionResKey", "Admin.Configuration.Settings.GeneralCommon.DefaultMetaDescription")] + [AdditionalMetadata("MetaKeywordsResKey", "Admin.Configuration.Settings.GeneralCommon.DefaultMetaKeywords")] + public SeoModel DefaultSeoModel { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.DefaultMetaKeywords")] - [AllowHtml] - public string DefaultMetaKeywords { get; set; } - - [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.DefaultMetaDescription")] - [AllowHtml] - public string DefaultMetaDescription { get; set; } + [AdditionalMetadata("MetaTitleResKey", "Admin.Configuration.Settings.GeneralCommon.HomepageTitle")] + [AdditionalMetadata("MetaDescriptionResKey", "Admin.Configuration.Settings.GeneralCommon.HomepageMetaDescription")] + [AdditionalMetadata("MetaKeywordsResKey", "Admin.Configuration.Settings.GeneralCommon.HomepageMetaKeywords")] + public SeoModel HomepageSeoModel { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.MetaRobotsContent")] public string MetaRobotsContent { get; set; } @@ -124,7 +129,7 @@ public partial class SeoSettingsModel public bool XmlSitemapIncludesTopics { get; set; } } - public partial class SecuritySettingsModel + public partial class SecuritySettingsModel { [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.EncryptionKey")] [AllowHtml] diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/GeneralCommon.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/GeneralCommon.cshtml index 78dc0008ff..e5a1bc5cff 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/GeneralCommon.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/GeneralCommon.cshtml @@ -85,51 +85,6 @@ @helper TabSEOSettings() { - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- @Html.SmartLabelFor(model => model.SeoSettings.PageTitleSeparator) - - @Html.SettingEditorFor(model => model.SeoSettings.PageTitleSeparator) - @Html.ValidationMessageFor(model => model.SeoSettings.PageTitleSeparator) -
- @Html.SmartLabelFor(model => model.SeoSettings.PageTitleSeoAdjustment) - - @Html.EnumSettingEditorFor(model => model.SeoSettings.PageTitleSeoAdjustment) - @Html.ValidationMessageFor(model => model.SeoSettings.PageTitleSeoAdjustment) -
- @Html.SmartLabelFor(model => model.SeoSettings.DefaultTitle) - - @Html.SettingEditorFor(model => model.SeoSettings.DefaultTitle) - @Html.ValidationMessageFor(model => model.SeoSettings.DefaultTitle) -
- @Html.SmartLabelFor(model => model.SeoSettings.DefaultMetaKeywords) - - @Html.SettingEditorFor(model => model.SeoSettings.DefaultMetaKeywords) - @Html.ValidationMessageFor(model => model.SeoSettings.DefaultMetaKeywords) -
- @Html.SmartLabelFor(model => model.SeoSettings.DefaultMetaDescription) - - @Html.SettingEditorFor(model => model.SeoSettings.DefaultMetaDescription) - @Html.ValidationMessageFor(model => model.SeoSettings.DefaultMetaDescription) -
@Html.SmartLabelFor(model => model.SeoSettings.MetaRobotsContent) @@ -175,6 +130,41 @@ @Html.TextAreaFor(model => model.SeoSettings.ExtraRobotsDisallows, new { style = "height:250px" }) @Html.ValidationMessageFor(model => model.SeoSettings.ExtraRobotsDisallows)
+
+
@T("Admin.System.MetaInfos")
+
+
+ @Html.SmartLabelFor(model => model.SeoSettings.PageTitleSeparator) + + @Html.SettingEditorFor(model => model.SeoSettings.PageTitleSeparator) + @Html.ValidationMessageFor(model => model.SeoSettings.PageTitleSeparator) +
+ @Html.SmartLabelFor(model => model.SeoSettings.PageTitleSeoAdjustment) + + @Html.EnumSettingEditorFor(model => model.SeoSettings.PageTitleSeoAdjustment) + @Html.ValidationMessageFor(model => model.SeoSettings.PageTitleSeoAdjustment) +
+ @Html.EditorFor(model => model.SeoSettings.DefaultSeoModel, "SeoModel") +
+ @Html.EditorFor(model => model.SeoSettings.HomepageSeoModel, "SeoModel") +
diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/SeoModel.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/SeoModel.cshtml index 512830a690..9e511e6586 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/SeoModel.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/SeoModel.cshtml @@ -2,12 +2,27 @@ @using SmartStore.Web.Framework.Seo; +@{ + var random = CommonHelper.GenerateRandomDigitCode(5); + + var metaTitleResKey = GetMetadata("MetaTitleResKey"); + var metaDescriptionResKey = GetMetadata("MetaDescriptionResKey"); + var metaKeywordsResKey = GetMetadata("MetaKeywordsResKey"); +} + @{ - @(Html.LocalizedEditor("seo-model-localized", + @(Html.LocalizedEditor("seo-model-localized" + random, @ - + + + + + - - - - - - - - + + + + - - - - + + + + "); - var tokens = x.Split(new char[] { ':' }, 2); - - if (tokens.Length > 1) - { - builder.AppendFormat("", tokens[0]); - builder.AppendFormat("", tokens[1]); - } - else - { - builder.Append(""); - builder.AppendFormat("",tokens[0]); - } - - builder.Append(""); - }); + lines.Where(x => x.HasValue()).Each(x => + { + builder.Append(""); + var tokens = x.Split(new char[] { ':' }, 2); + + if (tokens.Length > 1) + { + builder.AppendFormat("", tokens[0]); + builder.AppendFormat("", tokens[1]); + } + else + { + builder.Append(""); + builder.AppendFormat("", tokens[0]); + } + + builder.Append(""); + }); builder.Append("
- @Html.SmartLabelFor(model => model.Locales[item].MetaTitle) + @if (metaTitleResKey.HasValue()) + { + @Html.SmartLabelFor(model => model.Locales[item].MetaTitle, metaTitleResKey) + } + else + { + @Html.SmartLabelFor(model => model.Locales[item].MetaTitle) + } @*IMPORTANT: Do not delete, this hidden element contains the id to assign localized values to the corresponding language *@ @@ -19,16 +34,30 @@
- @Html.SmartLabelFor(model => model.Locales[item].MetaDescription) + @if (metaTitleResKey.HasValue()) + { + @Html.SmartLabelFor(model => model.Locales[item].MetaDescription, metaDescriptionResKey) + } + else + { + @Html.SmartLabelFor(model => model.Locales[item].MetaDescription) + } @Html.EditorFor(model => Model.Locales[item].MetaDescription) @Html.ValidationMessageFor(model => model.Locales[item].MetaDescription)
- @Html.SmartLabelFor(model => model.Locales[item].MetaKeywords) + @if (metaTitleResKey.HasValue()) + { + @Html.SmartLabelFor(model => model.Locales[item].MetaKeywords, metaKeywordsResKey) + } + else + { + @Html.SmartLabelFor(model => model.Locales[item].MetaKeywords) + } @Html.EditorFor(model => model.Locales[item].MetaKeywords) @@ -40,7 +69,14 @@ @ - + + + + + + + + +
- @Html.SmartLabelFor(model => model.MetaTitle) + @if (metaTitleResKey.HasValue()) + { + @Html.SmartLabelFor(model => model.MetaTitle, metaTitleResKey) + } + else + { + @Html.SmartLabelFor(model => model.MetaTitle) + } @Html.EditorFor(model => model.MetaTitle) @@ -49,16 +85,30 @@
- @Html.SmartLabelFor(model => model.MetaDescription) + @if (metaTitleResKey.HasValue()) + { + @Html.SmartLabelFor(model => model.MetaDescription, metaDescriptionResKey) + } + else + { + @Html.SmartLabelFor(model => model.MetaDescription) + } @Html.EditorFor(model => model.MetaDescription) @Html.ValidationMessageFor(model => model.MetaDescription)
- @Html.SmartLabelFor(model => model.MetaKeywords) + @if (metaTitleResKey.HasValue()) + { + @Html.SmartLabelFor(model => model.MetaKeywords, metaKeywordsResKey) + } + else + { + @Html.SmartLabelFor(model => model.MetaKeywords) + } @Html.EditorFor(x => x.MetaKeywords) diff --git a/src/Presentation/SmartStore.Web/Controllers/HomeController.cs b/src/Presentation/SmartStore.Web/Controllers/HomeController.cs index 18a8b57a55..c0d6885fb8 100644 --- a/src/Presentation/SmartStore.Web/Controllers/HomeController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/HomeController.cs @@ -2,6 +2,7 @@ using System.Web.Mvc; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; +using SmartStore.Core.Domain.Seo; using SmartStore.Core.Email; using SmartStore.Services.Customers; using SmartStore.Services.Localization; @@ -21,23 +22,30 @@ public partial class HomeController : PublicControllerBase private readonly Lazy _captchaSettings; private readonly Lazy _commonSettings; private readonly Lazy _privacySettings; + private readonly Lazy _seoSettings; public HomeController( Lazy topicService, Lazy captchaSettings, Lazy commonSettings, - Lazy privacySettings) + Lazy privacySettings, + Lazy seoSettings) { _topicService = topicService; _captchaSettings = captchaSettings; _commonSettings = commonSettings; _privacySettings = privacySettings; + _seoSettings = seoSettings; } [RewriteUrl(SslRequirement.No)] public ActionResult Index() { - return View(); + ViewBag.MetaTitle = _seoSettings.Value.GetLocalizedSetting(x => x.HomepageMetaTitle); + ViewBag.MetaDescription = _seoSettings.Value.GetLocalizedSetting(x => x.HomepageMetaDescription); + ViewBag.MetaKeywords = _seoSettings.Value.GetLocalizedSetting(x => x.HomepageMetaKeywords); + + return View(); } public ActionResult StoreClosed() diff --git a/src/Presentation/SmartStore.Web/Views/Home/ContactUs.cshtml b/src/Presentation/SmartStore.Web/Views/Home/ContactUs.cshtml index c48eada596..77e647f76c 100644 --- a/src/Presentation/SmartStore.Web/Views/Home/ContactUs.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Home/ContactUs.cshtml @@ -3,7 +3,7 @@ @{ Layout = "_Layout"; - Html.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : T("PageTitle.ContactUs").Text); + Html.AddTitleParts(Model.MetaTitle.HasValue() ? Model.MetaTitle : T("PageTitle.ContactUs").Text); Html.AddMetaDescriptionParts(Model.MetaDescription); Html.AddMetaKeywordParts(Model.MetaKeywords); } diff --git a/src/Presentation/SmartStore.Web/Views/Home/Index.cshtml b/src/Presentation/SmartStore.Web/Views/Home/Index.cshtml index aa71267f32..cef7b57cc5 100644 --- a/src/Presentation/SmartStore.Web/Views/Home/Index.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Home/Index.cshtml @@ -1,6 +1,10 @@ @{ Layout = "_Layout"; Html.AddBodyCssClass("home"); + + Html.AddTitleParts((string)ViewBag.MetaTitle); + Html.AddMetaDescriptionParts((string)ViewBag.MetaDescription); + Html.AddMetaKeywordParts((string)ViewBag.MetaKeywords); }
diff --git a/src/Presentation/SmartStore.Web/Views/Shared/Layouts/_Document.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/Layouts/_Document.cshtml index b4d001a012..442c6526a4 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/Layouts/_Document.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/Layouts/_Document.cshtml @@ -29,7 +29,7 @@ Html.RenderAction("RssHeaderLink", "News", new { area = "" }); Html.RenderAction("RssHeaderLink", "Blog", new { area = "" }); } - @*Favicon - upload favicon.ico or favicon-[StoreId].ico file either to the root web or your theme directory*@ + @{ Html.RenderAction("Favicon", "Common", new { area = "" }); } @Html.SmartCssFiles(this.Url, ResourceLocation.Head) From 82c4804479816f4bc44438051fec5f8e656bc47f Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 9 Sep 2020 16:29:51 +0200 Subject: [PATCH 178/695] Resolves merge conflict --- .../Domain/Catalog/CatalogSettings.cs | 7 + .../Domain/Directory/DeliveryTime.cs | 37 ++++- ...0817220_DeliveryTimeMinMaxDays.Designer.cs | 29 ++++ .../202009090817220_DeliveryTimeMinMaxDays.cs | 20 +++ ...02009090817220_DeliveryTimeMinMaxDays.resx | 126 ++++++++++++++++++ .../Migrations/MigrationsConfiguration.cs | 27 ++++ .../SmartStore.Data/SmartStore.Data.csproj | 7 + .../DataExchange/Export/ExportXmlHelper.cs | 2 + .../Directory/DeliveryTimeService.cs | 99 +++++++++++++- .../Directory/IDeliveryTimeService.cs | 15 +++ .../Controllers/DeliveryTimeController.cs | 3 +- .../Models/Directory/DeliveryTimeModel.cs | 35 ++++- .../Models/Settings/CatalogSettingsModel.cs | 4 + .../Views/DeliveryTime/List.cshtml | 43 +++--- .../Views/DeliveryTime/_CreateOrUpdate.cshtml | 18 +++ .../Views/Setting/Catalog.cshtml | 9 ++ 16 files changed, 448 insertions(+), 33 deletions(-) create mode 100644 src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs create mode 100644 src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs create mode 100644 src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.resx diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs index 02376872ce..e39f5fbe2e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using SmartStore.Core.Configuration; +using SmartStore.Core.Domain.Directory; namespace SmartStore.Core.Domain.Catalog { @@ -82,6 +83,7 @@ public CatalogSettings() AllowDifferingEmailAddressForEmailAFriend = false; AllowAnonymousUsersToEmailAFriend = false; AllowAnonymousUsersToReviewProduct = false; + DeliveryTimesPresentation = DeliveryTimesPresentation.DateOnly; } /// @@ -119,6 +121,11 @@ public CatalogSettings() /// public bool ShowDeliveryTimesInProductDetail { get; set; } + /// + /// Specifies how to display delivery times. + /// + public DeliveryTimesPresentation DeliveryTimesPresentation { get; set; } + /// /// Gets or sets a value indicating whether to display the base price of a product /// diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs index 8dcd1da749..f29e553649 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs @@ -1,6 +1,5 @@ -using System; -using SmartStore.Core.Domain.Localization; using System.Runtime.Serialization; +using SmartStore.Core.Domain.Localization; namespace SmartStore.Core.Domain.Directory { @@ -39,5 +38,39 @@ public partial class DeliveryTime : BaseEntity, ILocalizedEntity /// [DataMember] public bool? IsDefault { get; set; } + + /// + /// Specifies the earliest time of delivery in days. + /// + [DataMember] + public int? MinDays { get; set; } + + /// + /// Specifies the latest time of delivery in days. + /// + [DataMember] + public int? MaxDays { get; set; } + } + + + /// + /// Represents how to present delivery times. + /// + public enum DeliveryTimesPresentation + { + /// + /// Display date only if possible. + /// + DateOnly = 0, + + /// + /// Display label only. + /// + LabelOnly = 5, + + /// + /// Display label and date. + /// + LabelAndDate = 10 } } diff --git a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs new file mode 100644 index 0000000000..6a218b39fb --- /dev/null +++ b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs @@ -0,0 +1,29 @@ +// +namespace SmartStore.Data.Migrations +{ + using System.CodeDom.Compiler; + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + [GeneratedCode("EntityFramework.Migrations", "6.4.4")] + public sealed partial class DeliveryTimeMinMaxDays : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(DeliveryTimeMinMaxDays)); + + string IMigrationMetadata.Id + { + get { return "202009090817220_DeliveryTimeMinMaxDays"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs new file mode 100644 index 0000000000..6e3b790ccc --- /dev/null +++ b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs @@ -0,0 +1,20 @@ +namespace SmartStore.Data.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class DeliveryTimeMinMaxDays : DbMigration + { + public override void Up() + { + AddColumn("dbo.DeliveryTime", "MinDays", c => c.Int()); + AddColumn("dbo.DeliveryTime", "MaxDays", c => c.Int()); + } + + public override void Down() + { + DropColumn("dbo.DeliveryTime", "MaxDays"); + DropColumn("dbo.DeliveryTime", "MinDays"); + } + } +} diff --git a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.resx b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.resx new file mode 100644 index 0000000000..5021045a95 --- /dev/null +++ b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index e650822360..8f496c1467 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -355,6 +355,33 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb "Meta Keywords (Startseite)", "Defines the meta keywords for the homepage.", "Legt die Meta Keywords für die Startseite fest."); + + builder.AddOrUpdate("Admin.Configuration.DeliveryTimes.Fields.MinDays", + "Earliest time (in days)", + "Frühester Zeitpunkt (in Tagen)", + "Specifies the earliest time of delivery in days.", + "Legt den frühesten Zeitpunkt der Lieferung in Tagen fest."); + + builder.AddOrUpdate("Admin.Configuration.DeliveryTimes.Fields.MaxDays", + "Latest time (in days)", + "Spätester Zeitpunkt (in Tagen)", + "Specifies the latest time of delivery in days.", + "Legt den spätesten Zeitpunkt der Lieferung in Tagen fest."); + + builder.AddOrUpdate("DeliveryTimes.Date.EarliestOn", "Earliest on {0}.", "Frühestens am {0}."); + builder.AddOrUpdate("DeliveryTimes.Date.LatestOn", "At the latest on {0}.", "Spätestens am {0}."); + builder.AddOrUpdate("DeliveryTimes.Date.Between", "Between {0} and {1}.", "Zwischen {0} und {1}."); + builder.AddOrUpdate("DeliveryTimes.Date.DeliveredOn", "Will be delivered on {0}.", "Wird am {0} geliefert."); + + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.DateOnly", "Date only (if possible)", "Nur Datum (sofern möglich)"); + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.LabelOnly", "Label only", "Nur Label"); + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.LabelAndDate", "Label and date", "Label und Datum"); + + builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.DeliveryTimesPresentation", + "Presentation of delivery times", + "Darstellung der Lieferzeiten", + "Specifies how to present delivery times.", + "Legt die Art der Darstellung von Lieferzeiten fest."); } } } diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index 92c0dedfa4..59936e9336 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -513,6 +513,10 @@ 202009041122208_ShopIcons.cs + + + 202009090817220_DeliveryTimeMinMaxDays.cs + @@ -924,6 +928,9 @@ 202009041122208_ShopIcons.cs + + 202009090817220_DeliveryTimeMinMaxDays.cs + diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs index 8fb29ce583..2ca13aef97 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs @@ -295,6 +295,8 @@ public void WriteDeliveryTime(dynamic deliveryTime, string node) _writer.Write("ColorHexValue", entity.ColorHexValue); _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); _writer.Write("IsDefault", entity.IsDefault.ToString()); + _writer.Write("MinDays", entity.MinDays.HasValue ? entity.MinDays.Value.ToString() : ""); + _writer.Write("MaxDays", entity.MaxDays.HasValue ? entity.MaxDays.Value.ToString() : ""); WriteLocalized(deliveryTime); diff --git a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs index c9f813d50c..fad1d725de 100644 --- a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs +++ b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs @@ -1,12 +1,17 @@ +using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; +using SmartStore.Core.Domain.Localization; using SmartStore.Core.Localization; using SmartStore.Data.Caching; using SmartStore.Data.Utilities; using SmartStore.Services.Catalog; +using SmartStore.Services.Helpers; +using SmartStore.Services.Localization; namespace SmartStore.Services.Directory { @@ -15,17 +20,20 @@ public partial class DeliveryTimeService : IDeliveryTimeService private readonly IRepository _deliveryTimeRepository; private readonly IRepository _productRepository; private readonly IRepository _attributeCombinationRepository; - private readonly CatalogSettings _catalogSettings; + private readonly IDateTimeHelper _dateTimeHelper; + private readonly CatalogSettings _catalogSettings; public DeliveryTimeService( IRepository deliveryTimeRepository, IRepository productRepository, IRepository attributeCombinationRepository, - CatalogSettings catalogSettings) + IDateTimeHelper dateTimeHelper, + CatalogSettings catalogSettings) { _deliveryTimeRepository = deliveryTimeRepository; _productRepository = productRepository; _attributeCombinationRepository = attributeCombinationRepository; + _dateTimeHelper = dateTimeHelper; _catalogSettings = catalogSettings; } @@ -153,5 +161,92 @@ public virtual DeliveryTime GetDefaultDeliveryTime() { return _deliveryTimeRepository.Table.Where(x => x.IsDefault == true).FirstOrDefault(); } + + public virtual string FormatDeliveryTime( + DeliveryTime deliveryTime, + Language language, + string dateFormat = "M", + string delimiter = " ") + { + Guard.NotNull(language, nameof(language)); + Guard.NotEmpty(dateFormat, nameof(dateFormat)); + Guard.NotNull(delimiter, nameof(delimiter)); + + if (deliveryTime == null) + { + return null; + } + + string result = null; + CultureInfo ci; + + try + { + ci = new CultureInfo(language.LanguageCulture); + } + catch + { + ci = CultureInfo.CurrentCulture; + } + + + switch (_catalogSettings.DeliveryTimesPresentation) + { + case DeliveryTimesPresentation.LabelAndDate: + result = deliveryTime.GetLocalized(x => x.Name, language).Value.Grow(GetFormattedDate(), delimiter); + break; + case DeliveryTimesPresentation.LabelOnly: + result = deliveryTime.GetLocalized(x => x.Name, language); + break; + case DeliveryTimesPresentation.DateOnly: + default: + result = GetFormattedDate(); + break; + } + + // Fallback. + if (string.IsNullOrEmpty(result)) + { + result = deliveryTime.GetLocalized(x => x.Name, language); + } + + return result; + + string GetFormattedDate() + { + var minDays = deliveryTime.MinDays ?? 0; + var maxDays = deliveryTime.MaxDays ?? 0; + + var dtMin = minDays > 0 + ? _dateTimeHelper.ConvertToUserTime(DateTime.UtcNow.AddDays(minDays)) + : (DateTime?)null; + + var dtMax = maxDays > 0 + ? _dateTimeHelper.ConvertToUserTime(DateTime.UtcNow.AddDays(maxDays)) + : (DateTime?)null; + + if (dtMin.HasValue && dtMax.HasValue) + { + if (minDays == maxDays) + { + return T("DeliveryTimes.Date.DeliveredOn", dtMin.Value.ToString(dateFormat, ci)); + } + else if (minDays < maxDays) + { + return T("DeliveryTimes.Date.Between", dtMin.Value.ToString(dateFormat), dtMax.Value.ToString(dateFormat)); + } + } + else if (dtMin.HasValue) + { + return T("DeliveryTimes.Date.EarliestOn", dtMin.Value.ToString(dateFormat, ci)); + } + else if (dtMax.HasValue) + { + return T("DeliveryTimes.Date.LatestOn", dtMax.Value.ToString(dateFormat, ci)); + } + + return null; + } + } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs b/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs index 36663e2e6c..b0cad343e4 100644 --- a/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs +++ b/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; +using SmartStore.Core.Domain.Localization; namespace SmartStore.Services.Directory { @@ -65,5 +66,19 @@ public partial interface IDeliveryTimeService /// The product /// Delivery time DeliveryTime GetDefaultDeliveryTime(); + + /// + /// Creates the formatted representation of a delivery time. + /// + /// Delivery time. + /// Language. + /// Date format. + /// Delimiter if the delivery time representation is a concatenation of label and date. + /// Formatted representation of a delivery time. + string FormatDeliveryTime( + DeliveryTime deliveryTime, + Language language, + string dateFormat = "M", + string delimiter = " "); } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs index a903daed88..11bb90e814 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs @@ -29,8 +29,7 @@ public DeliveryTimeController( _languageService = languageService; } - [NonAction] - public void UpdateLocales(DeliveryTime deliveryTime, DeliveryTimeModel model) + private void UpdateLocales(DeliveryTime deliveryTime, DeliveryTimeModel model) { foreach (var localized in model.Locales) { diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs index db263836c2..1b5ffc0cf7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs @@ -1,13 +1,13 @@ -using FluentValidation; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Web.Mvc; +using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Localization; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Localization; using SmartStore.Web.Framework.Modelling; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Web.Mvc; namespace SmartStore.Admin.Models.Directory { @@ -36,7 +36,13 @@ public DeliveryTimeModel() [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.IsDefault")] public bool IsDefault { get; set; } - + + [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.MinDays")] + public int? MinDays { get; set; } + + [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.MaxDays")] + public int? MaxDays { get; set; } + public IList Locales { get; set; } } @@ -55,13 +61,15 @@ public DeliveryTimeValidator(Localizer T) { RuleFor(x => x.Name).NotEmpty().Length(1, 50); RuleFor(x => x.ColorHexValue).NotEmpty().Length(1, 50); + RuleFor(x => x.DisplayLocale) .Must(x => { try { - if (String.IsNullOrEmpty(x)) + if (string.IsNullOrEmpty(x)) return true; + var culture = new CultureInfo(x); return culture != null; } @@ -71,6 +79,19 @@ public DeliveryTimeValidator(Localizer T) } }) .WithMessage(T("Admin.Configuration.DeliveryTimes.Fields.DisplayLocale.Validation")); + + RuleFor(x => x.MinDays) + .GreaterThan(0) + .When(x => x.MinDays.HasValue); + + RuleFor(x => x.MaxDays) + .GreaterThan(0) + .When(x => x.MaxDays.HasValue); + + When(x => x.MinDays.HasValue && x.MaxDays.HasValue, () => + { + RuleFor(x => x.MaxDays).GreaterThanOrEqualTo(x => x.MinDays); + }); } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs index 99c07baa27..8d16ead4d2 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs @@ -1,6 +1,7 @@ using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Catalog; +using SmartStore.Core.Domain.Directory; using SmartStore.Web.Framework; using System.Collections.Generic; using System.Web.Mvc; @@ -117,6 +118,9 @@ public CatalogSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.ShowProductCondition")] public bool ShowProductCondition { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.DeliveryTimesPresentation")] + public DeliveryTimesPresentation DeliveryTimesPresentation { get; set; } + #endregion #region Product lists diff --git a/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/List.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/List.cshtml index 2450230bda..3103d5fa81 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/List.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/List.cshtml @@ -10,37 +10,40 @@
@(Html.Telerik().Grid() - .Name("delivery-time-grid") + .Name("delivery-time-grid") .DataKeys(x => { x.Add(y => y.Id); }) - .Columns(columns => - { - columns.Bound(x => x.Name); - columns.Bound(x => x.ColorHexValue) - .ClientTemplate(" <#= ColorHexValue #>") - .Width(200); - columns.Bound(x => x.DisplayOrder) - .Centered() - .Width(200); - columns.Bound(x => x.IsDefault) - .ClientTemplate(Html.SymbolForBool("IsDefault")) - .Centered() - .Width(200); + .Columns(columns => + { + columns.Bound(x => x.Name) + .ClientTemplate("<#= Name #>"); + columns.Bound(x => x.ColorHexValue) + .ClientTemplate(" <#= ColorHexValue #>"); + columns.Bound(x => x.DisplayOrder) + .Centered(); + columns.Bound(x => x.IsDefault) + .ClientTemplate(Html.SymbolForBool("IsDefault")) + .Centered(); + columns.Bound(x => x.MinDays) + .Centered(); + columns.Bound(x => x.MaxDays) + .Centered(); columns.Command(commands => { commands.Custom("edit-delivery-time").Text(T("Common.Edit")); commands.Delete().Localize(T); - }).Width(180) + }) + .Width(200) .HtmlAttributes(new { align = "right", @class = "omega" }); - }) + }) .ToolBar(commands => commands.Template(DeliveryTimeGridCommands)) - .DataBinding(dataBinding => dataBinding.Ajax() + .DataBinding(dataBinding => dataBinding.Ajax() .Select("List", "DeliveryTime") .Delete("DeleteDeliveryTime", "DeliveryTime")) - .PreserveGridState() - .EnableCustomBinding(true) + .PreserveGridState() + .EnableCustomBinding(true) )
@@ -60,7 +63,7 @@ return false; }); - $('#delivery-time-grid').on('click', '.t-grid-edit-delivery-time', function (e) { + $('#delivery-time-grid').on('click', '.t-grid-edit-delivery-time, .edit-delivery-time', function (e) { e.preventDefault(); var tr = $(this).closest('tr'); var id = $('#delivery-time-grid').data('tGrid').dataItem(tr).Id; diff --git a/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/_CreateOrUpdate.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/_CreateOrUpdate.cshtml index 2d8ad7b5ca..84ed822e6b 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/_CreateOrUpdate.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/_CreateOrUpdate.cshtml @@ -62,4 +62,22 @@ @Html.ValidationMessageFor(model => model.DisplayOrder)
+ @Html.SmartLabelFor(model => model.MinDays) + + @Html.EditorFor(model => model.MinDays, new { postfix = T("Time.Days").Text }) + @Html.ValidationMessageFor(model => model.MinDays) +
+ @Html.SmartLabelFor(model => model.MaxDays) + + @Html.EditorFor(model => model.MaxDays, new { postfix = T("Time.Days").Text }) + @Html.ValidationMessageFor(model => model.MaxDays) +
diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Catalog.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Catalog.cshtml index e977cd802f..49660c1f6b 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Catalog.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Catalog.cshtml @@ -163,6 +163,15 @@ @Html.ValidationMessageFor(model => model.DeliveryTimeIdForEmptyStock)
+ @Html.SmartLabelFor(model => model.DeliveryTimesPresentation) + + @Html.EnumSettingEditorFor(model => model.DeliveryTimesPresentation) + @Html.ValidationMessageFor(model => model.DeliveryTimesPresentation) +
@Html.SmartLabelFor(model => model.HideProductDefaultPictures) From af15443393682cff0ec57980d330e39a287e8aba Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 9 Sep 2020 21:54:01 +0200 Subject: [PATCH 179/695] Add MinDays and MaxDays to delivery time (in progress) --- .../Domain/Directory/DeliveryTime.cs | 11 ++- .../Domain/Shipping/ShippingSettings.cs | 9 ++ .../Migrations/MigrationsConfiguration.cs | 19 ++-- .../Directory/DeliveryTimeService.cs | 88 +++++++------------ .../Directory/IDeliveryTimeService.cs | 12 +-- .../Controllers/DeliveryTimeController.cs | 10 ++- .../Models/Directory/DeliveryTimeModel.cs | 4 +- .../Views/DeliveryTime/List.cshtml | 4 +- 8 files changed, 74 insertions(+), 83 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs index f29e553649..c23ba5201f 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs @@ -58,19 +58,24 @@ public partial class DeliveryTime : BaseEntity, ILocalizedEntity /// public enum DeliveryTimesPresentation { + /// + /// Do not display. + /// + None = 0, + /// /// Display date only if possible. /// - DateOnly = 0, + DateOnly = 5, /// /// Display label only. /// - LabelOnly = 5, + LabelOnly = 10, /// /// Display label and date. /// - LabelAndDate = 10 + LabelAndDate = 15 } } diff --git a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs index 1dc2bfbf54..69363b23cf 100644 --- a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs @@ -62,5 +62,14 @@ public ShippingSettings() /// Gets or sets a value indicating whether to charge only the highest shipping surcharge of products /// public bool ChargeOnlyHighestProductShippingSurcharge { get; set; } + + #region Delivery Time + + /// + /// Specifies the format string for delivery time dates. + /// + public string DeliveryTimesDateFormat { get; set; } + + #endregion } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 8f496c1467..67329a263a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -357,22 +357,23 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb "Legt die Meta Keywords für die Startseite fest."); builder.AddOrUpdate("Admin.Configuration.DeliveryTimes.Fields.MinDays", - "Earliest time (in days)", - "Frühester Zeitpunkt (in Tagen)", - "Specifies the earliest time of delivery in days.", + "Delivery not before (in days)", + "Lieferung frühestens (in Tagen)", + "Specifies the minimum number of days for the delivery.", "Legt den frühesten Zeitpunkt der Lieferung in Tagen fest."); builder.AddOrUpdate("Admin.Configuration.DeliveryTimes.Fields.MaxDays", - "Latest time (in days)", - "Spätester Zeitpunkt (in Tagen)", - "Specifies the latest time of delivery in days.", + "Delivery not later than (in days)", + "Lieferung spätestens (in Tagen)", + "Specifies the maximum number of days for the delivery.", "Legt den spätesten Zeitpunkt der Lieferung in Tagen fest."); - builder.AddOrUpdate("DeliveryTimes.Date.EarliestOn", "Earliest on {0}.", "Frühestens am {0}."); - builder.AddOrUpdate("DeliveryTimes.Date.LatestOn", "At the latest on {0}.", "Spätestens am {0}."); + builder.AddOrUpdate("DeliveryTimes.Date.NotBefore", "Not before {0}.", "Frühestens am {0}."); + builder.AddOrUpdate("DeliveryTimes.Date.NotLaterThan", "Not later than {0}.", "Spätestens am {0}."); builder.AddOrUpdate("DeliveryTimes.Date.Between", "Between {0} and {1}.", "Zwischen {0} und {1}."); - builder.AddOrUpdate("DeliveryTimes.Date.DeliveredOn", "Will be delivered on {0}.", "Wird am {0} geliefert."); + builder.AddOrUpdate("DeliveryTimes.Date.DeliveredOn", "On {0}.", "Am {0}."); + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.None", "None", "Keine"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.DateOnly", "Date only (if possible)", "Nur Datum (sofern möglich)"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.LabelOnly", "Label only", "Nur Label"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.LabelAndDate", "Label and date", "Label und Datum"); diff --git a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs index fad1d725de..6a710bf9e5 100644 --- a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs +++ b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs @@ -6,6 +6,7 @@ using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Localization; +using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Localization; using SmartStore.Data.Caching; using SmartStore.Data.Utilities; @@ -22,19 +23,22 @@ public partial class DeliveryTimeService : IDeliveryTimeService private readonly IRepository _attributeCombinationRepository; private readonly IDateTimeHelper _dateTimeHelper; private readonly CatalogSettings _catalogSettings; + private readonly ShippingSettings _shippingSettings; public DeliveryTimeService( IRepository deliveryTimeRepository, IRepository productRepository, IRepository attributeCombinationRepository, IDateTimeHelper dateTimeHelper, - CatalogSettings catalogSettings) + CatalogSettings catalogSettings, + ShippingSettings shippingSettings) { _deliveryTimeRepository = deliveryTimeRepository; _productRepository = productRepository; _attributeCombinationRepository = attributeCombinationRepository; _dateTimeHelper = dateTimeHelper; _catalogSettings = catalogSettings; + _shippingSettings = shippingSettings; } public Localizer T { get; set; } = NullLocalizer.Instance; @@ -162,22 +166,16 @@ public virtual DeliveryTime GetDefaultDeliveryTime() return _deliveryTimeRepository.Table.Where(x => x.IsDefault == true).FirstOrDefault(); } - public virtual string FormatDeliveryTime( - DeliveryTime deliveryTime, - Language language, - string dateFormat = "M", - string delimiter = " ") + public virtual string GetFormattedDate(DeliveryTime deliveryTime, Language language) { Guard.NotNull(language, nameof(language)); - Guard.NotEmpty(dateFormat, nameof(dateFormat)); - Guard.NotNull(delimiter, nameof(delimiter)); if (deliveryTime == null) { return null; } - string result = null; + var dateFormat = _shippingSettings.DeliveryTimesDateFormat.NullEmpty() ?? "M"; CultureInfo ci; try @@ -189,64 +187,40 @@ public virtual string FormatDeliveryTime( ci = CultureInfo.CurrentCulture; } + var minDays = deliveryTime.MinDays ?? 0; + var maxDays = deliveryTime.MaxDays ?? 0; - switch (_catalogSettings.DeliveryTimesPresentation) - { - case DeliveryTimesPresentation.LabelAndDate: - result = deliveryTime.GetLocalized(x => x.Name, language).Value.Grow(GetFormattedDate(), delimiter); - break; - case DeliveryTimesPresentation.LabelOnly: - result = deliveryTime.GetLocalized(x => x.Name, language); - break; - case DeliveryTimesPresentation.DateOnly: - default: - result = GetFormattedDate(); - break; - } + // TODO: more settings, more calculation required. - // Fallback. - if (string.IsNullOrEmpty(result)) - { - result = deliveryTime.GetLocalized(x => x.Name, language); - } + var dtMin = minDays > 0 + ? _dateTimeHelper.ConvertToUserTime(DateTime.UtcNow.AddDays(minDays)) + : (DateTime?)null; - return result; + var dtMax = maxDays > 0 + ? _dateTimeHelper.ConvertToUserTime(DateTime.UtcNow.AddDays(maxDays)) + : (DateTime?)null; - string GetFormattedDate() + if (dtMin.HasValue && dtMax.HasValue) { - var minDays = deliveryTime.MinDays ?? 0; - var maxDays = deliveryTime.MaxDays ?? 0; - - var dtMin = minDays > 0 - ? _dateTimeHelper.ConvertToUserTime(DateTime.UtcNow.AddDays(minDays)) - : (DateTime?)null; - - var dtMax = maxDays > 0 - ? _dateTimeHelper.ConvertToUserTime(DateTime.UtcNow.AddDays(maxDays)) - : (DateTime?)null; - - if (dtMin.HasValue && dtMax.HasValue) - { - if (minDays == maxDays) - { - return T("DeliveryTimes.Date.DeliveredOn", dtMin.Value.ToString(dateFormat, ci)); - } - else if (minDays < maxDays) - { - return T("DeliveryTimes.Date.Between", dtMin.Value.ToString(dateFormat), dtMax.Value.ToString(dateFormat)); - } - } - else if (dtMin.HasValue) + if (minDays == maxDays) { - return T("DeliveryTimes.Date.EarliestOn", dtMin.Value.ToString(dateFormat, ci)); + return T("DeliveryTimes.Date.DeliveredOn", dtMin.Value.ToString(dateFormat, ci)); } - else if (dtMax.HasValue) + else if (minDays < maxDays) { - return T("DeliveryTimes.Date.LatestOn", dtMax.Value.ToString(dateFormat, ci)); + return T("DeliveryTimes.Date.Between", dtMin.Value.ToString(dateFormat, ci), dtMax.Value.ToString(dateFormat, ci)); } - - return null; } + else if (dtMin.HasValue) + { + return T("DeliveryTimes.Date.NotBefore", dtMin.Value.ToString(dateFormat, ci)); + } + else if (dtMax.HasValue) + { + return T("DeliveryTimes.Date.NotLaterThan", dtMax.Value.ToString(dateFormat, ci)); + } + + return null; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs b/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs index b0cad343e4..aec476b865 100644 --- a/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs +++ b/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs @@ -68,17 +68,11 @@ public partial interface IDeliveryTimeService DeliveryTime GetDefaultDeliveryTime(); /// - /// Creates the formatted representation of a delivery time. + /// Gets the formatted date of a delivery time. /// /// Delivery time. /// Language. - /// Date format. - /// Delimiter if the delivery time representation is a concatenation of label and date. - /// Formatted representation of a delivery time. - string FormatDeliveryTime( - DeliveryTime deliveryTime, - Language language, - string dateFormat = "M", - string delimiter = " "); + /// Formatted date. + string GetFormattedDate(DeliveryTime deliveryTime, Language language); } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs index 11bb90e814..4cc6acd304 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs @@ -52,12 +52,18 @@ public ActionResult List() [HttpPost, GridAction(EnableCustomBinding = true)] [Permission(Permissions.Configuration.DeliveryTime.Read)] - public ActionResult List(GridCommand command) + public ActionResult List(GridCommand _) { var gridModel = new GridModel(); var deliveryTimeModels = _deliveryTimeService.GetAllDeliveryTimes() - .Select(x => x.ToModel()) + .Select(x => + { + var model = x.ToModel(); + model.FormattedDate = _deliveryTimeService.GetFormattedDate(x, Services.WorkContext.WorkingLanguage); + + return model; + }) .ToList(); gridModel.Data = deliveryTimeModels; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs index 1b5ffc0cf7..cb9a8a1be8 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Globalization; using System.Web.Mvc; using FluentValidation; @@ -22,6 +21,7 @@ public DeliveryTimeModel() [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.Name")] [AllowHtml] public string Name { get; set; } + public string FormattedDate { get; set; } [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.DisplayLocale")] [AllowHtml] diff --git a/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/List.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/List.cshtml index 3103d5fa81..6b1b639676 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/List.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/DeliveryTime/List.cshtml @@ -18,7 +18,9 @@ .Columns(columns => { columns.Bound(x => x.Name) - .ClientTemplate("<#= Name #>"); + .ClientTemplate( + "" + + "<# if(FormattedDate){ #>
<#= FormattedDate #>
<# } #>"); columns.Bound(x => x.ColorHexValue) .ClientTemplate(" <#= ColorHexValue #>"); columns.Bound(x => x.DisplayOrder) From 0b1e36c512b6a75a74547c078c363a569d04a2a9 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 10 Sep 2020 16:11:56 +0200 Subject: [PATCH 180/695] Add MinDays and MaxDays to delivery time (in progress) --- .../Domain/Catalog/CatalogSettings.cs | 16 +++--- .../Domain/Directory/DeliveryTime.cs | 8 +-- .../Domain/Shipping/ShippingSettings.cs | 8 ++- .../202009090817220_DeliveryTimeMinMaxDays.cs | 51 ++++++++++++++++++- .../Migrations/MigrationsConfiguration.cs | 20 ++++++-- .../Directory/DeliveryTimeService.cs | 51 ++++++++++++++----- .../Models/Settings/CatalogSettingsModel.cs | 11 ++-- .../Views/Setting/Catalog.cshtml | 45 +++++++--------- .../Controllers/CatalogHelper.MapProduct.cs | 6 +-- .../Controllers/CatalogHelper.cs | 2 +- 10 files changed, 145 insertions(+), 73 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs index e39f5fbe2e..ba7e8524e4 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs @@ -83,7 +83,8 @@ public CatalogSettings() AllowDifferingEmailAddressForEmailAFriend = false; AllowAnonymousUsersToEmailAFriend = false; AllowAnonymousUsersToReviewProduct = false; - DeliveryTimesPresentation = DeliveryTimesPresentation.DateOnly; + DeliveryTimesInLists = DeliveryTimesPresentation.DateOnly; + DeliveryTimesInProductDetail = DeliveryTimesPresentation.DateOnly; } /// @@ -112,19 +113,14 @@ public CatalogSettings() public bool ShowDimensions { get; set; } /// - /// Gets or sets a value indicating whether to display the delivery time of a product + /// Specifies the presentation of delivery times in product lists. /// - public bool ShowDeliveryTimesInProductLists { get; set; } + public DeliveryTimesPresentation DeliveryTimesInLists { get; set; } /// - /// Gets or sets a value indicating whether to display the delivery time of a product + /// Specifies the presentation of delivery times in product detail pages. /// - public bool ShowDeliveryTimesInProductDetail { get; set; } - - /// - /// Specifies how to display delivery times. - /// - public DeliveryTimesPresentation DeliveryTimesPresentation { get; set; } + public DeliveryTimesPresentation DeliveryTimesInProductDetail { get; set; } /// /// Gets or sets a value indicating whether to display the base price of a product diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs index c23ba5201f..8b2da2bf9f 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs @@ -64,14 +64,14 @@ public enum DeliveryTimesPresentation None = 0, /// - /// Display date only if possible. + /// Display label only. /// - DateOnly = 5, + LabelOnly = 5, /// - /// Display label only. + /// Display date only (if possible). /// - LabelOnly = 10, + DateOnly = 10, /// /// Display label and date. diff --git a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs index 69363b23cf..0601e45e27 100644 --- a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs @@ -7,9 +7,10 @@ public class ShippingSettings : ISettings { public ShippingSettings() { - ActiveShippingRateComputationMethodSystemNames = new List() { "Shipping.FixedRate" }; + ActiveShippingRateComputationMethodSystemNames = new List { "Shipping.FixedRate" }; EstimateShippingEnabled = true; ReturnValidOptionsIfThereAreAny = true; + TodayDeliveryHour = 14; } /// @@ -70,6 +71,11 @@ public ShippingSettings() /// public string DeliveryTimesDateFormat { get; set; } + /// + /// Specifies the hour (value between 1 and 24) up to which the delivery will be shipped today. + /// + public int? TodayDeliveryHour { get; set; } + #endregion } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs index 6e3b790ccc..821319f96a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs @@ -2,8 +2,14 @@ { using System; using System.Data.Entity.Migrations; - - public partial class DeliveryTimeMinMaxDays : DbMigration + using System.Linq; + using SmartStore.Core.Data; + using SmartStore.Core.Domain.Catalog; + using SmartStore.Core.Domain.Configuration; + using SmartStore.Core.Domain.Directory; + using SmartStore.Data.Setup; + + public partial class DeliveryTimeMinMaxDays : DbMigration, IDataSeeder { public override void Up() { @@ -16,5 +22,46 @@ public override void Down() DropColumn("dbo.DeliveryTime", "MaxDays"); DropColumn("dbo.DeliveryTime", "MinDays"); } + + public bool RollbackOnFailure => false; + + public void Seed(SmartObjectContext context) + { + if (!DataSettings.DatabaseIsInstalled()) + { + return; + } + + // Migrate old to new delivery times catalog settings. + var settings = context.Set(); + var prefix = nameof(CatalogSettings) + "."; + var showInLists = settings.FirstOrDefault(x => x.Name == "CatalogSettings.ShowDeliveryTimesInProductLists"); + var showInDetail = settings.FirstOrDefault(x => x.Name == "CatalogSettings.ShowDeliveryTimesInProductDetail"); + + context.MigrateSettings(x => + { + if (showInLists != null && showInLists.Value.IsCaseInsensitiveEqual("False")) + { + x.Add(prefix + nameof(CatalogSettings.DeliveryTimesInLists), DeliveryTimesPresentation.None.ToString()); + } + if (showInDetail != null && showInDetail.Value.IsCaseInsensitiveEqual("False")) + { + x.Add(prefix + nameof(CatalogSettings.DeliveryTimesInProductDetail), DeliveryTimesPresentation.None.ToString()); + } + }); + + context.SaveChanges(); + + if (showInLists != null) + { + settings.Remove(showInLists); + } + if (showInDetail != null) + { + settings.Remove(showInDetail); + } + + context.SaveChanges(); + } } } diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 67329a263a..f10002bbcb 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -378,11 +378,23 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.LabelOnly", "Label only", "Nur Label"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Directory.DeliveryTimesPresentation.LabelAndDate", "Label and date", "Label und Datum"); - builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.DeliveryTimesPresentation", + builder.Delete( + "Admin.Configuration.Settings.Catalog.ShowDeliveryTimesInProductLists", + "Admin.Configuration.Settings.Catalog.ShowDeliveryTimesInProductLists.Hint", + "Admin.Configuration.Settings.Catalog.ShowDeliveryTimesInProductDetail", + "Admin.Configuration.Settings.Catalog.ShowDeliveryTimesInProductDetail.Hint"); + + builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.DeliveryTimesInProductDetail", + "Presentation of delivery times", + "Darstellung von Lieferzeiten", + "Specifies the way delivery times are displayed on product detail pages.", + "Legt die Darstellungsart von Lieferzeiten auf Produktdetailseiten fest."); + + builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.DeliveryTimesInLists", "Presentation of delivery times", - "Darstellung der Lieferzeiten", - "Specifies how to present delivery times.", - "Legt die Art der Darstellung von Lieferzeiten fest."); + "Darstellung von Lieferzeiten", + "Specifies the way delivery times are displayed in product lists. Due to lack of space, the grid view does not show a date for the delivery time.", + "Legt die Darstellungsart von Lieferzeiten in Produktlisten fest. Aus Platzgründen wird in der Tabellenansicht kein Datum zur Lieferzeit angezeigt."); } } } diff --git a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs index 6a710bf9e5..45ae52820c 100644 --- a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs +++ b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs @@ -174,9 +174,20 @@ public virtual string GetFormattedDate(DeliveryTime deliveryTime, Language langu { return null; } + if (!deliveryTime.MinDays.HasValue && !deliveryTime.MaxDays.HasValue) + { + return null; + } - var dateFormat = _shippingSettings.DeliveryTimesDateFormat.NullEmpty() ?? "M"; CultureInfo ci; + var minDays = deliveryTime.MinDays ?? 0; + var maxDays = deliveryTime.MaxDays ?? 0; + var daysToAdd = 0; + var dateFormat = _shippingSettings.DeliveryTimesDateFormat.NullEmpty() ?? "M"; + + // TODO: at the moment the server's local time is used as shop time but the server can be anywhere. + // What we actually need is the actual time\timezone of the physical location of the business because only the merchant knows this. + var shopDate = DateTime.Now; try { @@ -187,37 +198,49 @@ public virtual string GetFormattedDate(DeliveryTime deliveryTime, Language langu ci = CultureInfo.CurrentCulture; } - var minDays = deliveryTime.MinDays ?? 0; - var maxDays = deliveryTime.MaxDays ?? 0; + // shopDate.Hour: 0-23. TodayDeliveryHour: 1-24 + if (_shippingSettings.TodayDeliveryHour.HasValue && shopDate.Hour < _shippingSettings.TodayDeliveryHour) + { + daysToAdd -= 1; + } // TODO: more settings, more calculation required. - var dtMin = minDays > 0 - ? _dateTimeHelper.ConvertToUserTime(DateTime.UtcNow.AddDays(minDays)) + if (minDays > 0) + { + minDays = Math.Max(minDays + daysToAdd, 0); + } + if (maxDays > 0) + { + maxDays = Math.Max(maxDays + daysToAdd, 0); + } + + var minDate = minDays > 0 + ? _dateTimeHelper.ConvertToUserTime(shopDate.AddDays(minDays)) : (DateTime?)null; - var dtMax = maxDays > 0 - ? _dateTimeHelper.ConvertToUserTime(DateTime.UtcNow.AddDays(maxDays)) + var maxDate = maxDays > 0 + ? _dateTimeHelper.ConvertToUserTime(shopDate.AddDays(maxDays)) : (DateTime?)null; - if (dtMin.HasValue && dtMax.HasValue) + if (minDate.HasValue && maxDate.HasValue) { if (minDays == maxDays) { - return T("DeliveryTimes.Date.DeliveredOn", dtMin.Value.ToString(dateFormat, ci)); + return T("DeliveryTimes.Date.DeliveredOn", minDate.Value.ToString(dateFormat, ci)); } else if (minDays < maxDays) { - return T("DeliveryTimes.Date.Between", dtMin.Value.ToString(dateFormat, ci), dtMax.Value.ToString(dateFormat, ci)); + return T("DeliveryTimes.Date.Between", minDate.Value.ToString(dateFormat, ci), maxDate.Value.ToString(dateFormat, ci)); } } - else if (dtMin.HasValue) + else if (minDate.HasValue) { - return T("DeliveryTimes.Date.NotBefore", dtMin.Value.ToString(dateFormat, ci)); + return T("DeliveryTimes.Date.NotBefore", minDate.Value.ToString(dateFormat, ci)); } - else if (dtMax.HasValue) + else if (maxDate.HasValue) { - return T("DeliveryTimes.Date.NotLaterThan", dtMax.Value.ToString(dateFormat, ci)); + return T("DeliveryTimes.Date.NotLaterThan", maxDate.Value.ToString(dateFormat, ci)); } return null; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs index 8d16ead4d2..7a44029051 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs @@ -118,9 +118,6 @@ public CatalogSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.ShowProductCondition")] public bool ShowProductCondition { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.DeliveryTimesPresentation")] - public DeliveryTimesPresentation DeliveryTimesPresentation { get; set; } - #endregion #region Product lists @@ -202,8 +199,8 @@ public CatalogSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.ShowProductOptionsInLists")] public bool ShowProductOptionsInLists { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.ShowDeliveryTimesInProductLists")] - public bool ShowDeliveryTimesInProductLists { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.DeliveryTimesInLists")] + public DeliveryTimesPresentation DeliveryTimesInLists { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.ShowBasePriceInProductLists")] public bool ShowBasePriceInProductLists { get; set; } @@ -294,8 +291,8 @@ public CatalogSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.ShowManufacturerPicturesInProductDetail")] public bool ShowManufacturerPicturesInProductDetail { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.ShowDeliveryTimesInProductDetail")] - public bool ShowDeliveryTimesInProductDetail { get; set; } + [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.DeliveryTimesInProductDetail")] + public DeliveryTimesPresentation DeliveryTimesInProductDetail { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.Catalog.DeliveryTimeIdForEmptyStock")] public int? DeliveryTimeIdForEmptyStock { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Catalog.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Catalog.cshtml index 49660c1f6b..84ebf9083e 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Catalog.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Catalog.cshtml @@ -163,15 +163,6 @@ @Html.ValidationMessageFor(model => model.DeliveryTimeIdForEmptyStock)
- @Html.SmartLabelFor(model => model.DeliveryTimesPresentation) - - @Html.EnumSettingEditorFor(model => model.DeliveryTimesPresentation) - @Html.ValidationMessageFor(model => model.DeliveryTimesPresentation) -
@Html.SmartLabelFor(model => model.HideProductDefaultPictures) @@ -483,15 +474,15 @@ @Html.ValidationMessageFor(model => model.ShowShortDescriptionInGridStyleLists)
- @Html.SmartLabelFor(model => model.ShowDeliveryTimesInProductLists) - - @Html.SettingEditorFor(model => model.ShowDeliveryTimesInProductLists) - @Html.ValidationMessageFor(model => model.ShowDeliveryTimesInProductLists) -
+ @Html.SmartLabelFor(model => model.DeliveryTimesInLists) + + @Html.EnumSettingEditorFor(model => model.DeliveryTimesInLists) + @Html.ValidationMessageFor(model => model.DeliveryTimesInLists) +
@Html.SmartLabelFor(model => model.ShowManufacturerInGridStyleLists) @@ -796,15 +787,15 @@ @Html.ValidationMessageFor(model => model.ShowManufacturerPicturesInProductDetail)
- @Html.SmartLabelFor(model => model.ShowDeliveryTimesInProductDetail) - - @Html.SettingEditorFor(model => model.ShowDeliveryTimesInProductDetail) - @Html.ValidationMessageFor(model => model.ShowDeliveryTimesInProductDetail) -
+ @Html.SmartLabelFor(model => model.DeliveryTimesInProductDetail) + + @Html.EnumSettingEditorFor(model => model.DeliveryTimesInProductDetail) + @Html.ValidationMessageFor(model => model.DeliveryTimesInProductDetail) +
@Html.SmartLabelFor(model => model.EnableDynamicPriceUpdate) diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs index fb6ed03e63..3528b768ba 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs @@ -110,7 +110,7 @@ public ProductSummaryMappingSettings GetBestFitProductSummaryMappingSettings(Pro settings.MapColorAttributes = _catalogSettings.ShowColorSquaresInLists; settings.MapAttributes = _catalogSettings.ShowProductOptionsInLists; settings.MapReviews = _catalogSettings.ShowProductReviewsInProductLists; - settings.MapDeliveryTimes = _catalogSettings.ShowDeliveryTimesInProductLists; + settings.MapDeliveryTimes = _catalogSettings.DeliveryTimesInLists != DeliveryTimesPresentation.None; } else if (viewMode == ProductSummaryViewMode.List) { @@ -121,7 +121,7 @@ public ProductSummaryMappingSettings GetBestFitProductSummaryMappingSettings(Pro settings.MapAttributes = _catalogSettings.ShowProductOptionsInLists; //settings.MapSpecificationAttributes = true; // TODO: (mc) What about SpecAttrs in List-Mode (?) Option? settings.MapReviews = _catalogSettings.ShowProductReviewsInProductLists; - settings.MapDeliveryTimes = _catalogSettings.ShowDeliveryTimesInProductLists; + settings.MapDeliveryTimes = _catalogSettings.DeliveryTimesInLists != DeliveryTimesPresentation.None; settings.MapDimensions = _catalogSettings.ShowDimensions; } else if (viewMode == ProductSummaryViewMode.Compare) @@ -133,7 +133,7 @@ public ProductSummaryMappingSettings GetBestFitProductSummaryMappingSettings(Pro settings.MapAttributes = true; settings.MapSpecificationAttributes = true; settings.MapReviews = _catalogSettings.ShowProductReviewsInProductLists; - settings.MapDeliveryTimes = _catalogSettings.ShowDeliveryTimesInProductLists; + settings.MapDeliveryTimes = _catalogSettings.DeliveryTimesInLists != DeliveryTimesPresentation.None; settings.MapDimensions = _catalogSettings.ShowDimensions; } diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index c860dc5c19..f4bb2bdb14 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs @@ -1186,7 +1186,7 @@ public ProductDetailsModel PrepareProductDetailModel( } } - model.DisplayDeliveryTime = _catalogSettings.ShowDeliveryTimesInProductDetail; + model.DisplayDeliveryTime = _catalogSettings.DeliveryTimesInProductDetail != DeliveryTimesPresentation.None; model.IsShipEnabled = product.IsShipEnabled; model.DisplayDeliveryTimeAccordingToStock = product.DisplayDeliveryTimeAccordingToStock(_catalogSettings); From f87f3133995cb99ec72aa20af81eac88ada8fae2 Mon Sep 17 00:00:00 2001 From: Marcel Schmidt Date: Thu, 10 Sep 2020 21:37:14 +0200 Subject: [PATCH 181/695] (fu) Caused null reference exception if no entity type was specified in media editor --- .../SmartStore.Web/Views/Shared/Components/FileUploader.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml index 883142c25c..28c24ba94b 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/Components/FileUploader.cshtml @@ -75,7 +75,7 @@ var isMainPic = file.MediaFileId == Model.MainFileId; var entityMediaId = 0; - if (Model.EntityType.Equals("Product")) + if (Model.EntityType.HasValue() && Model.EntityType == "Product") { var entityMediaFile = file as ProductMediaFile; entityMediaId = entityMediaFile.Id; From b4706d41dc9196e6fcf9ce18bddba1638e49da3d Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 10 Sep 2020 22:38:10 +0200 Subject: [PATCH 182/695] Add MinDays and MaxDays to delivery time (in progress) --- .../Domain/Shipping/ShippingSettings.cs | 6 + .../Migrations/MigrationsConfiguration.cs | 2 + .../Directory/DeliveryTimeService.cs | 122 ++++++++++++++---- 3 files changed, 103 insertions(+), 27 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs index 0601e45e27..23e5a00969 100644 --- a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs @@ -11,6 +11,7 @@ public ShippingSettings() EstimateShippingEnabled = true; ReturnValidOptionsIfThereAreAny = true; TodayDeliveryHour = 14; + DeliveryOnWorkweekDaysOnly = true; } /// @@ -76,6 +77,11 @@ public ShippingSettings() /// public int? TodayDeliveryHour { get; set; } + /// + /// Specifies whether delivery takes place only on workweek days. + /// + public bool DeliveryOnWorkweekDaysOnly { get; set; } + #endregion } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index f10002bbcb..605b7c0ceb 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -395,6 +395,8 @@ können aber nicht bearbeitet werden. Die Texte dieser Informationen können üb "Darstellung von Lieferzeiten", "Specifies the way delivery times are displayed in product lists. Due to lack of space, the grid view does not show a date for the delivery time.", "Legt die Darstellungsart von Lieferzeiten in Produktlisten fest. Aus Platzgründen wird in der Tabellenansicht kein Datum zur Lieferzeit angezeigt."); + + builder.AddOrUpdate("Time.Tomorrow", "Tomorrow", "Morgen"); } } } diff --git a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs index 45ae52820c..24a62a37a3 100644 --- a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs +++ b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs @@ -12,7 +12,6 @@ using SmartStore.Data.Utilities; using SmartStore.Services.Catalog; using SmartStore.Services.Helpers; -using SmartStore.Services.Localization; namespace SmartStore.Services.Directory { @@ -180,14 +179,12 @@ public virtual string GetFormattedDate(DeliveryTime deliveryTime, Language langu } CultureInfo ci; - var minDays = deliveryTime.MinDays ?? 0; - var maxDays = deliveryTime.MaxDays ?? 0; var daysToAdd = 0; var dateFormat = _shippingSettings.DeliveryTimesDateFormat.NullEmpty() ?? "M"; // TODO: at the moment the server's local time is used as shop time but the server can be anywhere. // What we actually need is the actual time\timezone of the physical location of the business because only the merchant knows this. - var shopDate = DateTime.Now; + var now = DateTime.Now; try { @@ -198,52 +195,123 @@ public virtual string GetFormattedDate(DeliveryTime deliveryTime, Language langu ci = CultureInfo.CurrentCulture; } - // shopDate.Hour: 0-23. TodayDeliveryHour: 1-24 - if (_shippingSettings.TodayDeliveryHour.HasValue && shopDate.Hour < _shippingSettings.TodayDeliveryHour) + // shopDate.Hour: 0-23. TodayDeliveryHour: 1-24. + if (_shippingSettings.TodayDeliveryHour.HasValue && now.Hour < _shippingSettings.TodayDeliveryHour) { daysToAdd -= 1; } - // TODO: more settings, more calculation required. - - if (minDays > 0) - { - minDays = Math.Max(minDays + daysToAdd, 0); - } - if (maxDays > 0) - { - maxDays = Math.Max(maxDays + daysToAdd, 0); - } - - var minDate = minDays > 0 - ? _dateTimeHelper.ConvertToUserTime(shopDate.AddDays(minDays)) + // Normalization. "Today" is not supported\allowed. + var minDate = deliveryTime.MinDays.HasValue + ? AddDays(now, Math.Max(deliveryTime.MinDays.Value + daysToAdd, 1)) : (DateTime?)null; - var maxDate = maxDays > 0 - ? _dateTimeHelper.ConvertToUserTime(shopDate.AddDays(maxDays)) + var maxDate = deliveryTime.MaxDays.HasValue + ? AddDays(now, Math.Max(deliveryTime.MaxDays.Value + daysToAdd, 1)) : (DateTime?)null; if (minDate.HasValue && maxDate.HasValue) { - if (minDays == maxDays) + if (minDate == maxDate) { - return T("DeliveryTimes.Date.DeliveredOn", minDate.Value.ToString(dateFormat, ci)); + if (IsTomorrow(minDate.Value)) + return T("Time.Tomorrow"); + else + return T("DeliveryTimes.Date.DeliveredOn", Format(minDate.Value)); } - else if (minDays < maxDays) + else if (minDate < maxDate) { - return T("DeliveryTimes.Date.Between", minDate.Value.ToString(dateFormat, ci), maxDate.Value.ToString(dateFormat, ci)); + return T("DeliveryTimes.Date.Between", + IsTomorrow(minDate.Value) ? T("Time.Tomorrow").Text : Format(minDate.Value), + Format(maxDate.Value)); } } else if (minDate.HasValue) { - return T("DeliveryTimes.Date.NotBefore", minDate.Value.ToString(dateFormat, ci)); + if (IsTomorrow(minDate.Value)) + return T("Time.Tomorrow"); + else + return T("DeliveryTimes.Date.NotBefore", Format(minDate.Value)); } else if (maxDate.HasValue) { - return T("DeliveryTimes.Date.NotLaterThan", maxDate.Value.ToString(dateFormat, ci)); + if (IsTomorrow(maxDate.Value)) + return T("Time.Tomorrow"); + else + return T("DeliveryTimes.Date.NotLaterThan", Format(maxDate.Value)); } return null; + + bool IsTomorrow(DateTime date) + { + return (date - now).TotalDays == 1; + } + + string Format(DateTime date) + { + return _dateTimeHelper.ConvertToUserTime(date).ToString(dateFormat, ci); + } + } + + #region Utilities + + /// + /// + private DateTime AddDays(DateTime date, int days) + { + Guard.NotNegative(days, nameof(days)); + + if (days == 0) + { + return date; + } + + if (!_shippingSettings.DeliveryOnWorkweekDaysOnly) + { + return date.AddDays(days); + } + + // Add days for non workweek days. + if (date.DayOfWeek == DayOfWeek.Saturday) + { + date = date.AddDays(2); + days -= 1; + } + else if (date.DayOfWeek == DayOfWeek.Sunday) + { + date = date.AddDays(1); + days -= 1; + } + + date = date.AddDays(days / 5 * 7); + int extraDays = days % 5; + + if ((int)date.DayOfWeek + extraDays > 5) + { + extraDays += 2; + } + + return date.AddDays(extraDays); } + + //private DateTime AddWorkweekDays(DateTime date, int days, DayOfWeek[] nonWorkweekDays) + //{ + // var sign = Math.Sign(days); + // var unsignedDays = Math.Abs(days); + + // for (var i = 0; i < unsignedDays; ++i) + // { + // do + // { + // date = date.AddDays(sign); + // } + // while (nonWorkweekDays.Contains(date.DayOfWeek)); + // } + + // return date; + //} + + #endregion } } \ No newline at end of file From e71a50f5a026ae82af9a31ff78e094cc4e2734b9 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Wed, 9 Sep 2020 22:50:18 +0200 Subject: [PATCH 183/695] Minor code cleanup --- .../Affiliates/AffiliateService.cs | 31 +------------------ .../Catalog/CategoryTreeChangeHandler.cs | 4 +-- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Affiliates/AffiliateService.cs b/src/Libraries/SmartStore.Services/Affiliates/AffiliateService.cs index 68475199cf..2ab394c1f4 100644 --- a/src/Libraries/SmartStore.Services/Affiliates/AffiliateService.cs +++ b/src/Libraries/SmartStore.Services/Affiliates/AffiliateService.cs @@ -7,41 +7,15 @@ namespace SmartStore.Services.Affiliates { - /// - /// Affiliate service - /// public partial class AffiliateService : IAffiliateService { - #region Fields - private readonly IRepository _affiliateRepository; - private readonly IEventPublisher _eventPublisher; - - #endregion - - #region Ctor - /// - /// Ctor - /// - /// Affiliate repository - /// Event published - public AffiliateService(IRepository affiliateRepository, - IEventPublisher eventPublisher) + public AffiliateService(IRepository affiliateRepository) { _affiliateRepository = affiliateRepository; - _eventPublisher = eventPublisher; } - #endregion - - #region Methods - - /// - /// Gets an affiliate by affiliate identifier - /// - /// Affiliate identifier - /// Affiliate public virtual Affiliate GetAffiliateById(int affiliateId) { if (affiliateId == 0) @@ -102,8 +76,5 @@ public virtual void UpdateAffiliate(Affiliate affiliate) _affiliateRepository.Update(affiliate); } - - #endregion - } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs b/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs index 3a7081da8e..b39f394a40 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs @@ -39,7 +39,6 @@ public CategoryTreeChangedEvent(CategoryTreeChangeReason reason) public class CategoryTreeChangeHook : IDbSaveHook, IConsumer { private readonly ICommonServices _services; - private readonly ICategoryService _categoryService; private readonly bool[] _handledReasons = new bool[(int)CategoryTreeChangeReason.Hierarchy + 1]; private bool _invalidated; @@ -63,10 +62,9 @@ public class CategoryTreeChangeHook : IDbSaveHook, IConsumer typeof(AclRecord) }; - public CategoryTreeChangeHook(ICommonServices services, ICategoryService categoryService) + public CategoryTreeChangeHook(ICommonServices services) { _services = services; - _categoryService = categoryService; } public void OnBeforeSave(IHookedEntity entry) From fcaadeccf3af40b7898beaa0450fda61da8071d5 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 11 Sep 2020 04:00:33 +0200 Subject: [PATCH 184/695] Adding local video support to products (wip) --- .../SmartStore.Core/Utilities/CommonHelper.cs | 2 +- .../Media/MediaFileInfo.cs | 113 +++++++++--- .../SmartStore.Services/Media/MediaService.cs | 2 + .../Extensions/HtmlExtensions.cs | 101 ++++++----- .../Modelling/MediaTemplateModel.cs | 11 +- .../Models/Catalog/ProductModel.cs | 2 +- .../SmartStore.Web/Content/shared/_media.scss | 4 +- .../Controllers/CatalogHelper.cs | 167 ++++++++---------- .../Controllers/ProductController.cs | 11 +- .../Models/Catalog/ProductDetailsModel.cs | 41 +---- .../Models/Media/MediaGalleryModel.cs | 23 +++ .../Models/Media/PictureModel.cs | 3 +- .../Scripts/smartstore.gallery.js | 45 +++-- .../SmartStore.Web/SmartStore.Web.csproj | 5 +- .../Themes/Flex/Content/_gallery.scss | 16 +- .../Product/Partials/Product.Media.cshtml | 27 +++ .../Product/Partials/Product.Picture.cshtml | 141 --------------- .../Views/Product/Product.cshtml | 6 +- .../Views/Shared/EditorTemplates/Media.cshtml | 1 + .../Views/Shared/MediaTemplates/Audio.cshtml | 4 +- .../Views/Shared/MediaTemplates/Image.cshtml | 8 +- .../Views/Shared/MediaTemplates/Video.cshtml | 4 +- .../Shared/MediaTemplates/_Thumbnail.cshtml | 10 +- .../Views/Shared/Partials/MediaGallery.cshtml | 110 ++++++++++++ .../Views/Shared/Partials/PhotoSwipe.cshtml | 39 ++++ src/Presentation/SmartStore.Web/Web.config | 1 - 26 files changed, 507 insertions(+), 390 deletions(-) create mode 100644 src/Presentation/SmartStore.Web/Models/Media/MediaGalleryModel.cs create mode 100644 src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Media.cshtml delete mode 100644 src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Picture.cshtml create mode 100644 src/Presentation/SmartStore.Web/Views/Shared/Partials/MediaGallery.cshtml create mode 100644 src/Presentation/SmartStore.Web/Views/Shared/Partials/PhotoSwipe.cshtml diff --git a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs index 5f413627b1..f2b87c8b64 100644 --- a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs @@ -261,7 +261,7 @@ public static ExpandoObject ToExpando(object value) public static IDictionary ObjectToDictionary(object obj) { if (obj == null) - throw new ArgumentNullException(nameof(obj)); + return new Dictionary(); return FastProperty.ObjectToDictionary( obj, diff --git a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs index 8569e1e55a..204f5c12e0 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs @@ -1,6 +1,9 @@ using System; +using System.Collections.Generic; using System.Drawing; +using System.Globalization; using System.IO; +using System.Runtime.CompilerServices; using System.Threading.Tasks; using Newtonsoft.Json; using SmartStore.Core.Domain.Media; @@ -10,10 +13,10 @@ namespace SmartStore.Services.Media { - public partial class MediaFileInfo : IFile + public partial class MediaFileInfo : IFile, ICloneable { - private string _url; - private string _thumbUrl; + private string _alt; + private string _title; private readonly IMediaStorageProvider _storageProvider; private readonly IMediaUrlGenerator _urlGenerator; @@ -32,6 +35,29 @@ public MediaFileInfo(MediaFile file, IMediaStorageProvider storageProvider, IMed _urlGenerator = urlGenerator; } + #region Clone + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + object ICloneable.Clone() + { + return Clone(); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public MediaFileInfo Clone() + { + var clone = new MediaFileInfo(File, _storageProvider, _urlGenerator, Directory) + { + ThumbSize = this.ThumbSize, + _alt = this._alt, + _title = this._title + }; + + return clone; + } + + #endregion + [JsonIgnore] public MediaFile File { get; } @@ -59,8 +85,69 @@ public MediaFileInfo(MediaFile file, IMediaStorageProvider storageProvider, IMed [JsonProperty("createdOn")] public DateTime CreatedOn => File.CreatedOnUtc; + [JsonProperty("alt")] + public string Alt + { + get => _alt ?? File.Alt; + set => _alt = value; + } + + [JsonProperty("titleAttr")] + public string TitleAttribute + { + get => _title ?? File.Title; + set => _title = value; + } + public static explicit operator MediaFile(MediaFileInfo fileInfo) => fileInfo.File; + #region Url + + private readonly IDictionary<(int size, string host), string> _cachedUrls = new Dictionary<(int, string), string>(); + + [JsonProperty("url")] + internal string Url + { + // For serialization in MediaManager + get => GetUrl(0, string.Empty); + } + + [JsonProperty("thumbUrl")] + internal string ThumbUrl + { + // For serialization in MediaManager + get => GetUrl(ThumbSize, string.Empty); + } + + [JsonIgnore] + internal int ThumbSize + { + // For serialization of "ThumbUrl" in MediaManager + get; set; + } = 256; + + public string GetUrl(int maxSize = 0, string host = null) + { + var cacheKey = (maxSize, host); + if (!_cachedUrls.TryGetValue(cacheKey, out var url)) + { + url = _urlGenerator.GenerateUrl(this, null, host, false); + + if (maxSize > 0) + { + // (perf) Instead of calling GenerateUrl() with a processing query we simply + // append the query part to the string. + url += "?size=" + maxSize.ToString(CultureInfo.InvariantCulture); + } + + _cachedUrls[cacheKey] = url; + } + + return url; + } + + #endregion + #region IFile [JsonProperty("path")] @@ -72,9 +159,6 @@ public MediaFileInfo(MediaFile file, IMediaStorageProvider storageProvider, IMed [JsonProperty("name")] public string Name => File.Name; - [JsonProperty("alt")] - public string Alt => File.Alt; - [JsonProperty("title")] public string Title => System.IO.Path.GetFileNameWithoutExtension(File.Name); @@ -90,23 +174,6 @@ public MediaFileInfo(MediaFile file, IMediaStorageProvider storageProvider, IMed [JsonProperty("dimensions")] public Size Dimensions { get; } - [JsonProperty("url")] - public string Url - { - get { return _url ?? (_url = _urlGenerator.GenerateUrl(this, null, string.Empty)); } - set { _url = value; } - } - - [JsonProperty("thumbUrl")] - public string ThumbUrl - { - get { return _thumbUrl ?? (_thumbUrl = _urlGenerator.GenerateUrl(this, new ProcessImageQuery { MaxSize = ThumbSize }, string.Empty)); } - set { _thumbUrl = value; } - } - - [JsonIgnore] - public int ThumbSize { get; set; } = 256; - [JsonIgnore] public bool Exists => File?.Id > 0; diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs index adebd38b13..2d5201c84e 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -892,11 +892,13 @@ public string GetUrl(MediaFileInfo file, ProcessImageQuery imageQuery, string ho #region Utils + [MethodImpl(MethodImplOptions.AggressiveInlining)] public MediaFileInfo ConvertMediaFile(MediaFile file) { return ConvertMediaFile(file, _folderService.FindNode(file)?.Value); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] protected MediaFileInfo ConvertMediaFile(MediaFile file, MediaFolderNode folder) { var mediaFile = new MediaFileInfo(file, _storageProvider, _urlGenerator, folder?.Path) diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs index f908bd62e2..daf0460f86 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs @@ -15,6 +15,7 @@ using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Infrastructure; +using SmartStore.Core.Localization; using SmartStore.Services.Localization; using SmartStore.Services.Media; using SmartStore.Utilities; @@ -930,61 +931,77 @@ public static MvcHtmlString IconForFileExtension(this HtmlHelper helper, string return MvcHtmlString.Create(result); } - #region Media + #region Media - public static MvcHtmlString MediaThumbnail( - this HtmlHelper helper, - MediaFileInfo file, - int size, - string extraCssClasses = null) - { - return MediaInternal(helper, file, false, size, extraCssClasses); - } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static MvcHtmlString MediaViewer(this HtmlHelper helper, MediaFileInfo file, object htmlAttributes = null) + { + return MediaInternal(helper, file, true, 0, CommonHelper.ObjectToDictionary(htmlAttributes)); + } - public static MvcHtmlString MediaViewer( - this HtmlHelper helper, - MediaFileInfo file, - string extraCssClasses = null) + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static MvcHtmlString MediaViewer(this HtmlHelper helper, MediaFileInfo file, IDictionary htmlAttributes) + { + return MediaInternal(helper, file, true, 0, htmlAttributes); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static MvcHtmlString MediaThumbnail(this HtmlHelper helper, MediaFileInfo file, int size, object htmlAttributes = null) { - return MediaInternal(helper, file, true, 0, extraCssClasses); + return MediaInternal(helper, file, false, size, CommonHelper.ObjectToDictionary(htmlAttributes)); } - private static MvcHtmlString MediaInternal( - this HtmlHelper helper, - MediaFileInfo file, - bool renderViewer, - int size, - string extraCssClasses) - { - if (file?.File == null) - { - return MvcHtmlString.Empty; - } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static MvcHtmlString MediaThumbnail(this HtmlHelper helper, MediaFileInfo file, int size, IDictionary htmlAttributes) + { + return MediaInternal(helper, file, false, size, htmlAttributes); + } - // Validate size parameter. - if (file.MediaType != "image" && !renderViewer) - { - Guard.IsPositive(size, nameof(size), $"The size must be greater than 0 to get a thumbnail for type '{file.MediaType.NaIfEmpty()}'."); - } + private static MvcHtmlString MediaInternal( + HtmlHelper helper, + MediaFileInfo file, + bool renderViewer, + int size, + IDictionary htmlAttributes) + { + if (file?.File == null) + { + return MvcHtmlString.Empty; + } - if (size > 0) - { - file.ThumbSize = size; - } + // Validate size parameter. + if (file.MediaType != "image" && !renderViewer) + { + Guard.IsPositive(size, nameof(size), $"The size must be greater than 0 to get a thumbnail for type '{file.MediaType.NaIfEmpty()}'."); + } var f = file?.File; var model = new MediaTemplateModel(file, renderViewer) - { - ExtraCssClasses = extraCssClasses, - Title = f?.GetLocalized(x => x.Title), - Alt = f?.GetLocalized(x => x.Alt) + { + ThumbSize = size, + HtmlAttributes = htmlAttributes }; - return helper.Partial("MediaTemplates/" + file.MediaType, model); - } + if (htmlAttributes.TryGetValue("alt", out var alt)) + { + htmlAttributes.Remove("alt"); + } - #endregion - } + if (htmlAttributes.TryGetValue("title", out var title)) + { + htmlAttributes.Remove("title"); + } + + //alt != null ? (string)alt : f?.GetLocalized(x => x.Alt).Value + + model.Alt = (string)(alt ?? f?.GetLocalized(x => x.Alt).Value); + model.Title = (string)(title ?? f?.GetLocalized(x => x.Title).Value); + + return helper.Partial("MediaTemplates/" + file.MediaType, model); + } + + #endregion + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/MediaTemplateModel.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/MediaTemplateModel.cs index a825a52a35..843210f093 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/MediaTemplateModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/MediaTemplateModel.cs @@ -1,4 +1,6 @@ -using SmartStore.Services.Localization; +using System.Collections.Generic; +using System.Web.Routing; +using SmartStore.Services.Localization; using SmartStore.Services.Media; namespace SmartStore.Web.Framework.Modelling @@ -17,9 +19,10 @@ public MediaTemplateModel(MediaFileInfo file, bool renderViewer) public MediaFileInfo File { get; private set; } public bool RenderViewer { get; private set; } - public string ExtraCssClasses { get; set; } + public int ThumbSize { get; set; } = 256; + public IDictionary HtmlAttributes { get; set; } - public LocalizedValue Title { get; set; } - public LocalizedValue Alt { get; set; } + public string Title { get; set; } + public string Alt { get; set; } } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs index b202a96cb7..6bd9ec07ac 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs @@ -462,7 +462,7 @@ public class ProductPictureModel : EntityModelBase { public int ProductId { get; set; } - [UIHint("Media"), AdditionalMetadata("album", "catalog")] + [UIHint("Media"), AdditionalMetadata("album", "catalog"), AdditionalMetadata("typeFilter", "image,video")] [SmartResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.Picture")] public int PictureId { get; set; } diff --git a/src/Presentation/SmartStore.Web/Content/shared/_media.scss b/src/Presentation/SmartStore.Web/Content/shared/_media.scss index 8e1511434a..9bd50dacee 100644 --- a/src/Presentation/SmartStore.Web/Content/shared/_media.scss +++ b/src/Presentation/SmartStore.Web/Content/shared/_media.scss @@ -32,7 +32,7 @@ display: inline-block; } - &[data-type=video]:before { + &.show[data-type=video]:before { position: absolute; display: block; content: ''; @@ -44,7 +44,7 @@ z-index: 1; } - &[data-type=video]:after { + &.show[data-type=video]:after { @include fontawesome("\f04b", 1rem, solid); // fas fa-play position: absolute; left: 50%; diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index f4bb2bdb14..e2bc80191c 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs @@ -506,16 +506,16 @@ public ProductDetailsModel PrepareProductDetailsPageModel( combination = model.SelectedCombination; } - var files = _productService.GetProductPicturesByProductId(product.Id) - .Select(x => x.MediaFile) - .ToList(); + var files = _productService.GetProductPicturesByProductId(product.Id) + .Select(x => _mediaService.ConvertMediaFile(x.MediaFile)) + .ToList(); if (product.HasPreviewPicture && files.Count > 1) { files.RemoveAt(0); } - PrepareProductDetailsPictureModel(model.DetailsPictureModel, files, model.Name, combinationPictureIds, isAssociatedProduct, productBundleItem, combination); + model.MediaGalleryModel = PrepareProductDetailsMediaGalleryModel(files, model.Name, combinationPictureIds, isAssociatedProduct, productBundleItem, combination); return model; } @@ -576,28 +576,18 @@ public void PrepareProductReviewsModel(ProductReviewsModel model, Product produc model.DisplayCaptcha = _captchaSettings.CanDisplayCaptcha && _captchaSettings.ShowOnProductReviewPage; } - private PictureModel CreatePictureModel(ProductDetailsPictureModel model, MediaFile file, int pictureSize) + private MediaFileInfo PrepareMediaFileInfo(MediaFileInfo file, MediaGalleryModel model) { - var result = new PictureModel - { - PictureId = file?.Id ?? 0, - Size = pictureSize, - ThumbImageUrl = _mediaService.GetUrl(file, _mediaSettings.ProductThumbPictureSizeOnProductDetailsPage), - ImageUrl = _mediaService.GetUrl(file, pictureSize, null, !_catalogSettings.HideProductDefaultPictures), - FullSizeImageUrl = _mediaService.GetUrl(file, 0, null, false), - FullSizeImageWidth = file?.Width, - FullSizeImageHeight = file?.Height, - AlternateText = file?.GetLocalized(x => x.Alt)?.Value.NullEmpty() ?? model.AlternateText, - Title = file?.GetLocalized(x => x.Title)?.Value.NullEmpty() ?? model.Name, - File = _mediaService.ConvertMediaFile(file) - }; + file.Alt = file.File.GetLocalized(x => x.Alt)?.Value.NullEmpty() ?? model.DefaultAlt; + file.TitleAttribute = file.File.GetLocalized(x => x.Title)?.Value.NullEmpty() ?? model.ModelName; - _services.DisplayControl.Announce(file); + _services.DisplayControl.Announce(file.File); - return result; + // Return for chaining + return file; } - public IList CreateTierPriceModel (Product product, decimal adjustment = decimal.Zero) + public IList CreateTierPriceModel (Product product, decimal adjustment = decimal.Zero) { var model = product.TierPrices .OrderBy(x => x.Quantity) @@ -633,105 +623,92 @@ private PictureModel CreatePictureModel(ProductDetailsPictureModel model, MediaF return model; } - public void PrepareProductDetailsPictureModel( - ProductDetailsPictureModel model, - IList files, - string name, + public MediaGalleryModel PrepareProductDetailsMediaGalleryModel( + IList files, + string productName, IList allCombinationImageIds, - bool isAssociatedProduct, - ProductBundleItemData bundleItem = null, + bool isAssociatedProduct, + ProductBundleItemData bundleItem = null, ProductVariantAttributeCombination combination = null) { - model.Name = name; - model.DefaultPictureZoomEnabled = _mediaSettings.DefaultPictureZoomEnabled; - model.PictureZoomType = _mediaSettings.PictureZoomType; + var model = new MediaGalleryModel + { + ModelName = productName, + DefaultAlt = T("Media.Product.ImageAlternateTextFormat", productName), + BoxEnabled = true, // TODO: make a setting for this in the future + ImageZoomEnabled = _mediaSettings.DefaultPictureZoomEnabled, + ImageZoomType = _mediaSettings.PictureZoomType, + ThumbSize = _mediaSettings.ProductThumbPictureSizeOnProductDetailsPage, + ImageSize = _mediaSettings.ProductDetailsPictureSize + }; - MediaFile defaultFile = null; + MediaFileInfo defaultFile = null; var combiAssignedImages = combination?.GetAssignedMediaIds(); - int defaultPictureSize; - - if (isAssociatedProduct) - defaultPictureSize = _mediaSettings.AssociatedProductPictureSize; - else if (bundleItem != null) - defaultPictureSize = _mediaSettings.BundledProductPictureSize; - else - defaultPictureSize = _mediaSettings.ProductDetailsPictureSize; - using (var scope = new DbContextScope(_services.DbContext, autoCommit: false)) + if (files.Count > 0) { - if (files.Count > 0) + if (files.Count <= _catalogSettings.DisplayAllImagesNumber) { - if (files.Count <= _catalogSettings.DisplayAllImagesNumber) + // Show all images. + foreach (var file in files) { - // Show all images. - foreach (var file in files) - { - model.PictureModels.Add(CreatePictureModel(model, file, _mediaSettings.ProductDetailsPictureSize)); + model.Files.Add(PrepareMediaFileInfo(file, model)); - if (defaultFile == null && combiAssignedImages != null && combiAssignedImages.Contains(file.Id)) - { - model.GalleryStartIndex = model.PictureModels.Count - 1; - defaultFile = file; - } + if (defaultFile == null && combiAssignedImages != null && combiAssignedImages.Contains(file.Id)) + { + model.GalleryStartIndex = model.Files.Count - 1; + defaultFile = file; } } - else + } + else + { + // Images not belonging to any combination... + allCombinationImageIds = allCombinationImageIds ?? new List(); + foreach (var file in files.Where(p => !allCombinationImageIds.Contains(p.Id))) { - // Images not belonging to any combination... - allCombinationImageIds = allCombinationImageIds ?? new List(); - foreach (var file in files.Where(p => !allCombinationImageIds.Contains(p.Id))) - { - model.PictureModels.Add(CreatePictureModel(model, file, _mediaSettings.ProductDetailsPictureSize)); - } + model.Files.Add(PrepareMediaFileInfo(file, model)); + } - // Plus images belonging to selected combination. - if (combiAssignedImages != null) + // Plus images belonging to selected combination. + if (combiAssignedImages != null) + { + foreach (var file in files.Where(p => combiAssignedImages.Contains(p.Id))) { - foreach (var file in files.Where(p => combiAssignedImages.Contains(p.Id))) - { - model.PictureModels.Add(CreatePictureModel(model, file, _mediaSettings.ProductDetailsPictureSize)); + model.Files.Add(PrepareMediaFileInfo(file, model)); - if (defaultFile == null) - { - model.GalleryStartIndex = model.PictureModels.Count - 1; - defaultFile = file; - } + if (defaultFile == null) + { + model.GalleryStartIndex = model.Files.Count - 1; + defaultFile = file; } } } - - if (defaultFile == null) - { - model.GalleryStartIndex = 0; - defaultFile = files.First(); - } } - scope.Commit(); + if (defaultFile == null) + { + model.GalleryStartIndex = 0; + defaultFile = files.First(); + } } - model.AlternateText = defaultFile?.GetLocalized(x => x.Alt)?.Value.NullEmpty() ?? T("Media.Product.ImageAlternateTextFormat", model.Name); - - if (defaultFile == null) - { - model.DefaultPictureModel = new PictureModel + if (defaultFile == null && !_catalogSettings.HideProductDefaultPictures) + { + var fallbackImageSize = _mediaSettings.ProductDetailsPictureSize; + if (isAssociatedProduct) { - Title = T("Media.Product.ImageLinkTitleFormat", model.Name), - AlternateText = model.AlternateText - }; - - if (!_catalogSettings.HideProductDefaultPictures) + fallbackImageSize = _mediaSettings.AssociatedProductPictureSize; + } + else if (bundleItem != null) { - model.DefaultPictureModel.Size = defaultPictureSize; - model.DefaultPictureModel.ThumbImageUrl = _mediaService.GetFallbackUrl(_mediaSettings.ProductThumbPictureSizeOnProductDetailsPage); - model.DefaultPictureModel.ImageUrl = _mediaService.GetFallbackUrl(defaultPictureSize); - model.DefaultPictureModel.FullSizeImageUrl = _mediaService.GetFallbackUrl(); - } - } - else - { - model.DefaultPictureModel = CreatePictureModel(model, defaultFile, defaultPictureSize); - } + fallbackImageSize = _mediaSettings.BundledProductPictureSize; + } + + model.FallbackUrl = _mediaService.GetFallbackUrl(fallbackImageSize); + } + + return model; } public ProductDetailsModel PrepareProductDetailModel( diff --git a/src/Presentation/SmartStore.Web/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Controllers/ProductController.cs index 0eb0445e6b..a6b61d05e2 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ProductController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ProductController.cs @@ -31,6 +31,7 @@ using SmartStore.Web.Framework.UI; using SmartStore.Web.Infrastructure.Cache; using SmartStore.Web.Models.Catalog; +using SmartStore.Web.Models.Media; namespace SmartStore.Web.Controllers { @@ -456,7 +457,6 @@ public ActionResult UpdateProductDetails(int productId, string itemType, int bun string galleryHtml = null; string dynamicThumbUrl = null; var isAssociated = itemType.IsCaseInsensitiveEqual("associateditem"); - var pictureModel = new ProductDetailsPictureModel(); var m = new ProductDetailsModel(); var product = _productService.GetProductById(productId); var bItem = _productService.GetBundleItemById(bundleItemId); @@ -519,7 +519,7 @@ public ActionResult UpdateProductDetails(int productId, string itemType, int bun { // Update image gallery. var files = _productService.GetProductPicturesByProductId(productId) - .Select(x => x.MediaFile) + .Select(x => _mediaService.ConvertMediaFile(x.MediaFile)) .ToList(); if (product.HasPreviewPicture && files.Count > 1) @@ -543,8 +543,7 @@ public ActionResult UpdateProductDetails(int productId, string itemType, int bun { var allCombinationPictureIds = _productAttributeService.GetAllProductVariantAttributeCombinationPictureIds(product.Id); - _helper.PrepareProductDetailsPictureModel( - pictureModel, + var mediaModel = _helper.PrepareProductDetailsMediaGalleryModel( files, product.GetLocalized(x => x.Name), allCombinationPictureIds, @@ -552,8 +551,8 @@ public ActionResult UpdateProductDetails(int productId, string itemType, int bun bundleItem, m.SelectedCombination); - galleryStartIndex = pictureModel.GalleryStartIndex; - galleryHtml = this.RenderPartialViewToString("Product.Picture", pictureModel); + galleryStartIndex = mediaModel.GalleryStartIndex; + galleryHtml = this.RenderPartialViewToString("Product.Media", mediaModel); } m.PriceDisplayStyle = _catalogSettings.PriceDisplayStyle; diff --git a/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs b/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs index ddd3a6089a..6fb0f527ec 100644 --- a/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs @@ -4,6 +4,7 @@ using SmartStore.Core.Domain.Catalog; using SmartStore.Services.Catalog.Modelling; using SmartStore.Services.Localization; +using SmartStore.Services.Media; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; using SmartStore.Web.Framework.Security; @@ -14,9 +15,7 @@ namespace SmartStore.Web.Models.Catalog { public partial class ProductDetailsModel : EntityModelBase { - private ProductDetailsPictureModel _detailsPictureModel; - - public ProductDetailsModel() + public ProductDetailsModel() { Manufacturers = new List(); GiftCard = new GiftCardModel(); @@ -30,20 +29,9 @@ public ProductDetailsModel() IsAvailable = true; } - public ProductDetailsPictureModel DetailsPictureModel - { - get - { - if (_detailsPictureModel == null) - { - _detailsPictureModel = new ProductDetailsPictureModel(); - } - - return _detailsPictureModel; - } - } + public MediaGalleryModel MediaGalleryModel { get; set; } - public LocalizedValue Name { get; set; } + public LocalizedValue Name { get; set; } public LocalizedValue ShortDescription { get; set; } public LocalizedValue FullDescription { get; set; } public string ProductTemplateViewPath { get; set; } @@ -75,10 +63,7 @@ public ProductDetailsPictureModel DetailsPictureModel public GiftCardModel GiftCard { get; set; } public string GiftCardFieldPrefix { - get - { - return GiftCardQueryItem.CreateKey(Id, BundleItem.Id, null); - } + get => GiftCardQueryItem.CreateKey(Id, BundleItem.Id, null); } public string StockAvailability { get; set; } @@ -290,20 +275,4 @@ public partial class ProductBundleItemModel : EntityModelBase #endregion } - - public partial class ProductDetailsPictureModel : ModelBase - { - public ProductDetailsPictureModel() - { - PictureModels = new List(); - } - - public string Name { get; set; } - public string AlternateText { get; set; } - public bool DefaultPictureZoomEnabled { get; set; } - public string PictureZoomType { get; set; } - public PictureModel DefaultPictureModel { get; set; } - public IList PictureModels { get; set; } - public int GalleryStartIndex { get; set; } - } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Models/Media/MediaGalleryModel.cs b/src/Presentation/SmartStore.Web/Models/Media/MediaGalleryModel.cs new file mode 100644 index 0000000000..ef6db0a4e1 --- /dev/null +++ b/src/Presentation/SmartStore.Web/Models/Media/MediaGalleryModel.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using SmartStore.Services.Media; +using SmartStore.Web.Framework.Modelling; + +namespace SmartStore.Web.Models.Media +{ + public partial class MediaGalleryModel : ModelBase + { + public IList Files { get; set; } = new List(); + public int GalleryStartIndex { get; set; } + public int ThumbSize { get; set; } = 72; + public int ImageSize { get; set; } = 600; + public string FallbackUrl { get; set; } + + public string ModelName { get; set; } + public string DefaultAlt { get; set; } + + public bool BoxEnabled { get; set; } + public bool ImageZoomEnabled { get; set; } + public string ImageZoomType { get; set; } + } +} \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Models/Media/PictureModel.cs b/src/Presentation/SmartStore.Web/Models/Media/PictureModel.cs index 88ed591957..a0e2a0837c 100644 --- a/src/Presentation/SmartStore.Web/Models/Media/PictureModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Media/PictureModel.cs @@ -1,4 +1,5 @@ -using SmartStore.Services.Media; +using System; +using SmartStore.Services.Media; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Models.Media diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.gallery.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.gallery.js index 29bbf5d0a7..56a8357224 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.gallery.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.gallery.js @@ -187,11 +187,14 @@ self.navItemsCount = items.length; - items.each(function (i, el) { + items.each(function (i) { var $el = $(this); $el.attr('data-gal-index', i); }); + // Lazy load thumbnails for video files. + SmartStore.media.lazyLoadThumbnails(list); + if (items.length > self.options.thumbsToShow) { if (!isInitialized) { self.navPrevArrow = $('').prependTo(nav); @@ -406,12 +409,14 @@ }, initBox: function () { - var self = this; + var pswpEl = document.getElementById('pswp'); + if (!pswpEl) + return; - this.pswp = $('#pswp'); + this.pswp = $(pswpEl); - var pswpEl = this.pswp[0]; var pswpContainer = $('.pswp__container', pswpEl); + var self = this; function setTransition(e) { // Photoswipe has no support for transitions on Mouse/Keyboard-Nav out of the box. @@ -481,17 +486,29 @@ links.each(function (i, el) { var a = $(el); - var width = a.data("width"); - var height = a.data("height"); - if (width && height) { - items.push({ - src: a.attr('href'), - msrc: a.data('medium-image'), - w: width, - h: height, - el: $this - }); + if (a.data('type') === 'image') { + var width = a.data("width"); + var height = a.data("height"); + if (width && height) { + items.push({ + src: a.attr('href'), + msrc: a.data('medium-image'), + w: width, + h: height, + el: $this + }); + } } + else { + var html = [ + '
', + '
', + '
', + '
' + ].join(); + items.push({ html: html, el: $this, width: '800px' }); + } }); if (items.length > 0) { diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index 8c1e9a714d..ae5e008de8 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -357,6 +357,7 @@ + @@ -1773,7 +1774,6 @@ - @@ -1884,6 +1884,9 @@ + + + Web.config diff --git a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_gallery.scss b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_gallery.scss index a8db5397aa..243b23ba8b 100644 --- a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_gallery.scss +++ b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_gallery.scss @@ -47,6 +47,13 @@ max-height: 100%; } +.gal.slick-initialized, +.gal-nav.gal-initialized { + opacity: 1; + .gal-item-content { display: flex; } + img.gal-item-content { display: inline-block; } +} + .gal .gal-item-viewport.no-picture { .gal-item-content { margin: 0 auto; } &:before { @@ -69,11 +76,6 @@ max-height: 560px; opacity: 0; text-align: center; - - &.gal-initialized { - opacity: 1; - .gal-item-content { display: block; } - } } .gal-nav .gal-list { @@ -88,6 +90,10 @@ .gal-nav .gal-item { padding: 4px 1px; + + .file-icon { + font-size: 2rem; + } } .gal-nav .gal-item-viewport { border: 1px solid rgba(0,0,0, 0.12); diff --git a/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Media.cshtml b/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Media.cshtml new file mode 100644 index 0000000000..fc265780e5 --- /dev/null +++ b/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Media.cshtml @@ -0,0 +1,27 @@ +@model MediaGalleryModel + +@using SmartStore.Web.Models.Catalog; +@using SmartStore.Web.Models.Media; + +@{ + // FB OpenGraph og:image & Twitter meta + var oImg = Model.Files?[Model.GalleryStartIndex]; + var url = oImg?.GetUrl(); + if (oImg != null && url.HasValue()) + { + url = WebHelper.GetAbsoluteUrl(url, this.Request, true); + Html.AddCustomHeadParts("".FormatInvariant(url)); + Html.AddCustomHeadParts("".FormatInvariant(url)); + if (oImg.Dimensions.Width > 0 && oImg.Dimensions.Height > 0) + { + Html.AddCustomHeadParts("".FormatInvariant(oImg.Dimensions.Width)); + Html.AddCustomHeadParts("".FormatInvariant(oImg.Dimensions.Height)); + } + } +} + + \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Picture.cshtml b/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Picture.cshtml deleted file mode 100644 index 39c16d9407..0000000000 --- a/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Picture.cshtml +++ /dev/null @@ -1,141 +0,0 @@ -@model ProductDetailsPictureModel - -@using SmartStore.Web.Models.Catalog; - -@{ - Html.AddScriptParts("~/bundles/smart-gallery"); - var defaultPicture = Model.DefaultPictureModel; - - // FB OpenGraph og:image & Twitter meta - var oImg = Model.PictureModels?.FirstOrDefault(); - if (oImg != null && oImg.FullSizeImageUrl.HasValue()) - { - var url = WebHelper.GetAbsoluteUrl(oImg.FullSizeImageUrl, this.Request, true); - Html.AddCustomHeadParts("".FormatInvariant(url)); - Html.AddCustomHeadParts("".FormatInvariant(url)); - if (oImg.FullSizeImageWidth > 0 && oImg.FullSizeImageHeight > 0) - { - Html.AddCustomHeadParts("".FormatInvariant(oImg.FullSizeImageWidth.Value)); - Html.AddCustomHeadParts("".FormatInvariant(oImg.FullSizeImageHeight.Value)); - } - } -} - - - -@using (Html.BeginZoneContent("aftercontent", key: "pswp")) -{ - - -} \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Views/Product/Product.cshtml b/src/Presentation/SmartStore.Web/Views/Product/Product.cshtml index a83f07cff8..e554cf969b 100644 --- a/src/Presentation/SmartStore.Web/Views/Product/Product.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Product/Product.cshtml @@ -62,7 +62,7 @@ @{ Html.RenderWidget("productdetails_pictures_top"); } @{ Html.RenderWidget("productdetails_pictures_bottom"); } @@ -175,8 +175,8 @@ "; - DefaultProductRatingValue = 5; - NotifyStoreOwnerAboutNewProductReviews = true; - EmailAFriendEnabled = true; - AskQuestionEnabled = true; - RecentlyViewedProductsNumber = 8; - RecentlyViewedProductsEnabled = true; - RecentlyAddedProductsNumber = 100; - RecentlyAddedProductsEnabled = true; - CompareProductsEnabled = true; - SubCategoryDisplayType = SubCategoryDisplayType.AboveProductList; - NumberOfBestsellersOnHomepage = 12; + AllowProductViewModeChanging = true; + DefaultViewMode = "grid"; + CategoryBreadcrumbEnabled = true; + ShowShareButton = true; + PageShareCode = "
"; + DefaultProductRatingValue = 5; + NotifyStoreOwnerAboutNewProductReviews = true; + EmailAFriendEnabled = true; + AskQuestionEnabled = true; + RecentlyViewedProductsNumber = 8; + RecentlyViewedProductsEnabled = true; + RecentlyAddedProductsNumber = 100; + RecentlyAddedProductsEnabled = true; + CompareProductsEnabled = true; + SubCategoryDisplayType = SubCategoryDisplayType.AboveProductList; + NumberOfBestsellersOnHomepage = 12; ShowPopularProductTagsOnHomepage = false; ShowManufacturersOnHomepage = true; ShowManufacturerPictures = true; @@ -51,38 +51,38 @@ public CatalogSettings() ManufacturerItemsToDisplayInOffcanvasMenu = 20; ShowManufacturerInProductDetail = true; ShowManufacturerPicturesInProductDetail = true; - ProductsAlsoPurchasedEnabled = true; - ProductsAlsoPurchasedNumber = 12; - NumberOfProductTags = 15; - DefaultProductListPageSize = 24; - UseSmallProductBoxOnHomePage = true; - DisplayTierPricesWithDiscounts = true; - DefaultPageSizeOptions = "12,24,36,48,72,120"; - AllowCustomersToSelectPageSize = true; - MaximumBackInStockSubscriptions = 200; - FileUploadMaximumSizeBytes = 1024 * 200; //200KB - DisplayAllImagesNumber = 6; - ShowShortDescriptionInGridStyleLists = true; - ShowManufacturerInGridStyleLists = true; - ShowManufacturerLogoInLists = false; - ShowProductOptionsInLists = true; - ShowColorSquaresInLists = true; - ShowDiscountSign = true; - ShowVariantCombinationPriceAdjustment = true; + ProductsAlsoPurchasedEnabled = true; + ProductsAlsoPurchasedNumber = 12; + NumberOfProductTags = 15; + DefaultProductListPageSize = 24; + UseSmallProductBoxOnHomePage = true; + DisplayTierPricesWithDiscounts = true; + DefaultPageSizeOptions = "12,24,36,48,72,120"; + AllowCustomersToSelectPageSize = true; + MaximumBackInStockSubscriptions = 200; + FileUploadMaximumSizeBytes = 1024 * 200; //200KB + DisplayAllImagesNumber = 6; + ShowShortDescriptionInGridStyleLists = true; + ShowManufacturerInGridStyleLists = true; + ShowManufacturerLogoInLists = false; + ShowProductOptionsInLists = true; + ShowColorSquaresInLists = true; + ShowDiscountSign = true; + ShowVariantCombinationPriceAdjustment = true; ShowLinkedAttributeValueImage = true; - EnableDynamicPriceUpdate = true; + EnableDynamicPriceUpdate = true; ShowProductReviewsInProductDetail = true; EnableHtmlTextCollapser = true; - HtmlTextCollapsedHeight = 260; - MostRecentlyUsedCategoriesMaxSize = 6; - MostRecentlyUsedManufacturersMaxSize = 4; - IncludeShortDescriptionInCompareProducts = true; - GridStyleListColumnSpan = GridColumnSpan.Max4Cols; - ShowProductsFromSubcategories = true; + HtmlTextCollapsedHeight = 260; + MostRecentlyUsedCategoriesMaxSize = 6; + MostRecentlyUsedManufacturersMaxSize = 4; + IncludeShortDescriptionInCompareProducts = true; + GridStyleListColumnSpan = GridColumnSpan.Max4Cols; + ShowProductsFromSubcategories = true; ApplyTierPricePercentageToAttributePriceAdjustments = false; AllowDifferingEmailAddressForEmailAFriend = false; - AllowAnonymousUsersToEmailAFriend = false; - AllowAnonymousUsersToReviewProduct = false; + AllowAnonymousUsersToEmailAFriend = false; + AllowAnonymousUsersToReviewProduct = false; DeliveryTimesInLists = DeliveryTimesPresentation.DateOnly; DeliveryTimesInProductDetail = DeliveryTimesPresentation.DateOnly; } @@ -142,10 +142,10 @@ public CatalogSettings() /// public bool ShowLinkedAttributeValueQuantity { get; set; } - /// - /// Gets or sets a value indicating whether to display the image of linked product at attribute values - /// - public bool ShowLinkedAttributeValueImage { get; set; } + /// + /// Gets or sets a value indicating whether to display the image of linked product at attribute values + /// + public bool ShowLinkedAttributeValueImage { get; set; } /// /// Gets or sets a value indicating how many menu items will be displayed @@ -191,26 +191,26 @@ public CatalogSettings() /// Gets or sets a value indicating whether category breadcrumb is enabled /// public bool CategoryBreadcrumbEnabled { get; set; } - - /// - /// Gets or sets a value indicating whether and where to display a list of subcategories - /// - public SubCategoryDisplayType SubCategoryDisplayType { get; set; } - /// - /// An option indicating whether sub pages should display the subcategories - /// - public bool ShowSubCategoriesInSubPages { get; set; } + /// + /// Gets or sets a value indicating whether and where to display a list of subcategories + /// + public SubCategoryDisplayType SubCategoryDisplayType { get; set; } - /// - /// An option indicating whether sub pages should display the category/manufacturer description - /// - public bool ShowDescriptionInSubPages { get; set; } + /// + /// An option indicating whether sub pages should display the subcategories + /// + public bool ShowSubCategoriesInSubPages { get; set; } - /// - /// Gets or sets a value indicating whether a 'Share button' is enabled - /// - public bool ShowShareButton { get; set; } + /// + /// An option indicating whether sub pages should display the category/manufacturer description + /// + public bool ShowDescriptionInSubPages { get; set; } + + /// + /// Gets or sets a value indicating whether a 'Share button' is enabled + /// + public bool ShowShareButton { get; set; } /// /// Gets or sets a share code (e.g. AddThis button code) @@ -256,7 +256,7 @@ public CatalogSettings() /// Gets or sets a value indicating whether 'ask product question' feature is enabled /// public bool AskQuestionEnabled { get; set; } - + /// /// Gets or sets a value indicating whether customers are allowed to enter a differing email address /// @@ -311,7 +311,7 @@ public CatalogSettings() /// Gets or sets a value indicating whether to show manufacturers in offcanvas menu /// public bool ShowManufacturersInOffCanvas { get; set; } - + /// /// Gets or sets the value indicating how many manufacturers on home page /// @@ -321,7 +321,7 @@ public CatalogSettings() /// Gets or sets the value indicating how many manufacturers in offcanvas menu /// public int ManufacturerItemsToDisplayInOffcanvasMenu { get; set; } - + /// /// Gets or sets a value indicating whether to show manufacturer pictures or names on home page /// @@ -337,25 +337,25 @@ public CatalogSettings() /// public bool ShowManufacturerPicturesInProductDetail { get; set; } - /// - /// Gets or sets a value indicating whether to hide manufacturer default pictures - /// - public bool HideManufacturerDefaultPictures { get; set; } + /// + /// Gets or sets a value indicating whether to hide manufacturer default pictures + /// + public bool HideManufacturerDefaultPictures { get; set; } /// /// Gets or sets a value indicating whether to hide manufacturer default pictures /// public bool SortManufacturersAlphabetically { get; set; } - + /// /// Gets or sets a value indicating whether to hide category default pictures /// public bool HideCategoryDefaultPictures { get; set; } - /// - /// Gets or sets a value indicating whether to hide product default pictures - /// - public bool HideProductDefaultPictures { get; set; } + /// + /// Gets or sets a value indicating whether to hide product default pictures + /// + public bool HideProductDefaultPictures { get; set; } /// /// Gets or sets a value whether to display the product condition. @@ -377,10 +377,10 @@ public CatalogSettings() /// public bool EnableDynamicPriceUpdate { get; set; } - /// - /// Gets or sets a value indicating whether base price should be rendered for bundle items - /// - public bool BundleItemShowBasePrice { get; set; } + /// + /// Gets or sets a value indicating whether base price should be rendered for bundle items + /// + public bool BundleItemShowBasePrice { get; set; } /// /// Gets or sets a number of product tags that appear in the tag cloud @@ -396,23 +396,23 @@ public CatalogSettings() /// Gets or sets a value indicating whether customers can select page size in product listings /// public bool AllowCustomersToSelectPageSize { get; set; } - - public int DisplayAllImagesNumber { get; set; } - public bool ShowManufacturerInGridStyleLists { get; set; } + public int DisplayAllImagesNumber { get; set; } - /// - /// Whether to show brand logo instead of textual name in product lists - /// - public bool ShowManufacturerLogoInLists { get; set; } + public bool ShowManufacturerInGridStyleLists { get; set; } + + /// + /// Whether to show brand logo instead of textual name in product lists + /// + public bool ShowManufacturerLogoInLists { get; set; } - public bool ShowShortDescriptionInGridStyleLists { get; set; } + public bool ShowShortDescriptionInGridStyleLists { get; set; } - public bool ShowProductOptionsInLists { get; set; } + public bool ShowProductOptionsInLists { get; set; } - public bool ShowColorSquaresInLists { get; set; } + public bool ShowColorSquaresInLists { get; set; } - public bool HideBuyButtonInLists { get; set; } + public bool HideBuyButtonInLists { get; set; } public int? LabelAsNewForMaxDays { get; set; } @@ -464,16 +464,16 @@ public CatalogSettings() /// public bool IncludeFeaturedProductsInNormalLists { get; set; } - /// - /// An option indicating whether products on category and manufacturer pages should include featured products in sub pages as well - /// - public bool IncludeFeaturedProductsInSubPages { get; set; } + /// + /// An option indicating whether products on category and manufacturer pages should include featured products in sub pages as well + /// + public bool IncludeFeaturedProductsInSubPages { get; set; } + + /// + /// Gets or sets a value indicating whether tier prices should be displayed with applied discounts (if available) + /// + public bool DisplayTierPricesWithDiscounts { get; set; } - /// - /// Gets or sets a value indicating whether tier prices should be displayed with applied discounts (if available) - /// - public bool DisplayTierPricesWithDiscounts { get; set; } - /// /// Gets or sets a value indicating whether to ignore discounts (side-wide) /// @@ -503,36 +503,36 @@ public CatalogSettings() /// Gets or sets a list of allowed file extensions for customer uploaded files /// public List FileUploadAllowedExtensions { get; set; } - - /// - /// Gets or sets a value indicating if html long text should be collapsed - /// - public bool EnableHtmlTextCollapser { get; set; } - /// - /// Gets or sets the height of collapsed text - /// - public int HtmlTextCollapsedHeight { get; set; } + /// + /// Gets or sets a value indicating if html long text should be collapsed + /// + public bool EnableHtmlTextCollapser { get; set; } - /// - /// Gets or sets an identifier for a delivery time dislayed when stock is empty - /// - public int? DeliveryTimeIdForEmptyStock { get; set; } + /// + /// Gets or sets the height of collapsed text + /// + public int HtmlTextCollapsedHeight { get; set; } - /// - /// Gets or sets how many items to display maximally in the most recently used category list - /// - public int MostRecentlyUsedCategoriesMaxSize { get; set; } + /// + /// Gets or sets an identifier for a delivery time dislayed when stock is empty + /// + public int? DeliveryTimeIdForEmptyStock { get; set; } - /// - /// Gets or sets how many items to display maximally in the most recently used manufacturer list - /// - public int MostRecentlyUsedManufacturersMaxSize { get; set; } + /// + /// Gets or sets how many items to display maximally in the most recently used category list + /// + public int MostRecentlyUsedCategoriesMaxSize { get; set; } - /// - /// Gets or sets how many columns per row should be displayed at most in grid style lists on largest screen resolution. - /// - public GridColumnSpan GridStyleListColumnSpan { get; set; } + /// + /// Gets or sets how many items to display maximally in the most recently used manufacturer list + /// + public int MostRecentlyUsedManufacturersMaxSize { get; set; } + + /// + /// Gets or sets how many columns per row should be displayed at most in grid style lists on largest screen resolution. + /// + public GridColumnSpan GridStyleListColumnSpan { get; set; } /// /// Gets or sets a value indicating whether percental values of tierprices should be applied to price adjustments of attributes diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs index 144821545d..f0364da897 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs @@ -14,8 +14,8 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a category /// [DataContract] - [DebuggerDisplay("{Id}: {Name} (Parent: {ParentCategoryId})")] - public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDeletable, IPagingOptions, IRulesContainer + [DebuggerDisplay("{Id}: {Name} (Parent: {ParentCategoryId})")] + public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDeletable, IPagingOptions, IRulesContainer { private ICollection _ruleSets; private ICollection _appliedDiscounts; @@ -26,11 +26,11 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele [DataMember] public string Name { get; set; } - /// - /// Gets or sets the full name (category page title) - /// - [DataMember] - public string FullName { get; set; } + /// + /// Gets or sets the full name (category page title) + /// + [DataMember] + public string FullName { get; set; } /// /// Gets or sets the description @@ -38,11 +38,11 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele [DataMember] public string Description { get; set; } - /// - /// Gets or sets a description displayed at the bottom of the category page - /// - [DataMember] - public string BottomDescription { get; set; } + /// + /// Gets or sets a description displayed at the bottom of the category page + /// + [DataMember] + public string BottomDescription { get; set; } /// /// Gets or sets the external link expression. If set, any category menu item will navigate to the specified link. @@ -67,7 +67,7 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele /// (an optional key for advanced customization) /// [DataMember] - public string Alias { get; set; } + public string Alias { get; set; } /// /// Gets or sets a value of used category template identifier @@ -105,42 +105,42 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele [DataMember] public int? MediaFileId { get; set; } - /// - /// Gets or sets the media file - /// - [DataMember] - public virtual MediaFile MediaFile { get; set; } + /// + /// Gets or sets the media file + /// + [DataMember] + public virtual MediaFile MediaFile { get; set; } /// /// Gets or sets the page size /// [DataMember] - public int? PageSize { get; set; } + public int? PageSize { get; set; } /// /// Gets or sets a value indicating whether customers can select the page size /// [DataMember] - public bool? AllowCustomersToSelectPageSize { get; set; } + public bool? AllowCustomersToSelectPageSize { get; set; } /// /// Gets or sets the available customer selectable page size options /// [DataMember] - public string PageSizeOptions { get; set; } + public string PageSizeOptions { get; set; } - /// - /// Gets or sets the available price ranges - /// - [Obsolete("Price ranges are calculated automatically since version 3")] - [StringLength(400)] - public string PriceRanges { get; set; } + /// + /// Gets or sets the available price ranges + /// + [Obsolete("Price ranges are calculated automatically since version 3")] + [StringLength(400)] + public string PriceRanges { get; set; } - /// - /// Gets or sets a value indicating whether to show the category on home page - /// - [DataMember] - public bool ShowOnHomePage { get; set; } + /// + /// Gets or sets a value indicating whether to show the category on home page + /// + [DataMember] + public bool ShowOnHomePage { get; set; } /// /// Gets or sets a value indicating whether this category has discounts applied @@ -150,19 +150,19 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele /// /// [DataMember] - public bool HasDiscountsApplied { get; set; } + public bool HasDiscountsApplied { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL /// [DataMember] - public bool SubjectToAcl { get; set; } + public bool SubjectToAcl { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is published @@ -205,18 +205,18 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele /// public virtual ICollection RuleSets { - get { return _ruleSets ?? (_ruleSets = new HashSet()); } - protected set { _ruleSets = value; } + get => _ruleSets ?? (_ruleSets = new HashSet()); + protected set => _ruleSets = value; } /// /// Gets or sets the collection of applied discounts /// [DataMember] - public virtual ICollection AppliedDiscounts + public virtual ICollection AppliedDiscounts { - get { return _appliedDiscounts ?? (_appliedDiscounts = new HashSet()); } - protected set { _appliedDiscounts = value; } + get => _appliedDiscounts ?? (_appliedDiscounts = new HashSet()); + protected set => _appliedDiscounts = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/CategoryNode.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/CategoryNode.cs index e0c2ec17c8..19965ea78f 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/CategoryNode.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/CategoryNode.cs @@ -6,35 +6,35 @@ namespace SmartStore.Core.Domain.Catalog { - public interface ICategoryNode : ILocalizedEntity, ISlugSupported, IAclSupported, IStoreMappingSupported - { - int ParentCategoryId { get; } - string Name { get; } + public interface ICategoryNode : ILocalizedEntity, ISlugSupported, IAclSupported, IStoreMappingSupported + { + int ParentCategoryId { get; } + string Name { get; } string ExternalLink { get; } string Alias { get; } - int? MediaFileId { get; } - bool Published { get; } - int DisplayOrder { get; } - DateTime UpdatedOnUtc { get; } - string BadgeText { get; } - int BadgeStyle { get; } - } + int? MediaFileId { get; } + bool Published { get; } + int DisplayOrder { get; } + DateTime UpdatedOnUtc { get; } + string BadgeText { get; } + int BadgeStyle { get; } + } - [Serializable] - public class CategoryNode : ICategoryNode - { - public int Id { get; set; } - public int ParentCategoryId { get; set; } - public string Name { get; set; } + [Serializable] + public class CategoryNode : ICategoryNode + { + public int Id { get; set; } + public int ParentCategoryId { get; set; } + public string Name { get; set; } public string ExternalLink { get; set; } public string Alias { get; set; } - public int? MediaFileId { get; set; } - public bool Published { get; set; } - public int DisplayOrder { get; set; } - public DateTime UpdatedOnUtc { get; set; } - public string BadgeText { get; set; } - public int BadgeStyle { get; set; } - public bool SubjectToAcl { get; set; } - public bool LimitedToStores { get; set; } - } + public int? MediaFileId { get; set; } + public bool Published { get; set; } + public int DisplayOrder { get; set; } + public DateTime UpdatedOnUtc { get; set; } + public string BadgeText { get; set; } + public int BadgeStyle { get; set; } + public bool SubjectToAcl { get; set; } + public bool LimitedToStores { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/IPagingOptions.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/IPagingOptions.cs index 3a4ce6b720..fb231147c8 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/IPagingOptions.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/IPagingOptions.cs @@ -1,11 +1,9 @@ -using System; - -namespace SmartStore.Core.Domain.Catalog +namespace SmartStore.Core.Domain.Catalog { - public interface IPagingOptions - { - int? PageSize { get; } - bool? AllowCustomersToSelectPageSize { get; } - string PageSizeOptions { get; } - } + public interface IPagingOptions + { + int? PageSize { get; } + bool? AllowCustomersToSelectPageSize { get; } + string PageSizeOptions { get; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs index bdfc5bd503..68ec18111c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs @@ -12,25 +12,25 @@ namespace SmartStore.Core.Domain.Catalog { - /// - /// Represents a manufacturer - /// - [DataContract] - public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILocalizedEntity, ISlugSupported, IAclSupported, IStoreMappingSupported, IPagingOptions - { - private ICollection _appliedDiscounts; - - /// - /// Gets or sets the name - /// - [DataMember] - public string Name { get; set; } + /// + /// Represents a manufacturer + /// + [DataContract] + public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILocalizedEntity, ISlugSupported, IAclSupported, IStoreMappingSupported, IPagingOptions + { + private ICollection _appliedDiscounts; + + /// + /// Gets or sets the name + /// + [DataMember] + public string Name { get; set; } /// /// Gets or sets the description /// [DataMember] - public string Description { get; set; } + public string Description { get; set; } /// /// Gets or sets a description displayed at the bottom of the manufacturer page. @@ -42,68 +42,68 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc /// Gets or sets a value of used manufacturer template identifier /// [DataMember] - public int ManufacturerTemplateId { get; set; } + public int ManufacturerTemplateId { get; set; } /// /// Gets or sets the meta keywords /// [DataMember] - public string MetaKeywords { get; set; } + public string MetaKeywords { get; set; } /// /// Gets or sets the meta description /// [DataMember] - public string MetaDescription { get; set; } + public string MetaDescription { get; set; } /// /// Gets or sets the meta title /// [DataMember] - public string MetaTitle { get; set; } + public string MetaTitle { get; set; } /// /// Gets or sets the parent media file identifier /// [DataMember] - public int? MediaFileId { get; set; } + public int? MediaFileId { get; set; } - /// - /// Gets or sets the media file - /// - [DataMember] - public virtual MediaFile MediaFile { get; set; } + /// + /// Gets or sets the media file + /// + [DataMember] + public virtual MediaFile MediaFile { get; set; } /// /// Gets or sets the page size /// [DataMember] - public int? PageSize { get; set; } + public int? PageSize { get; set; } /// /// Gets or sets a value indicating whether customers can select the page size /// [DataMember] - public bool? AllowCustomersToSelectPageSize { get; set; } + public bool? AllowCustomersToSelectPageSize { get; set; } /// /// Gets or sets the available customer selectable page size options /// [DataMember] - public string PageSizeOptions { get; set; } + public string PageSizeOptions { get; set; } /// /// Gets or sets the available price ranges /// [Obsolete("Price ranges are calculated automatically since version 3")] - [StringLength(400)] - public string PriceRanges { get; set; } + [StringLength(400)] + public string PriceRanges { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL. @@ -116,7 +116,7 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc /// Gets or sets a value indicating whether the entity is published /// [DataMember] - public bool Published { get; set; } + public bool Published { get; set; } /// /// Gets or sets a value indicating whether the entity has been deleted @@ -128,38 +128,38 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } /// /// Gets or sets the date and time of instance creation /// [DataMember] - public DateTime CreatedOnUtc { get; set; } + public DateTime CreatedOnUtc { get; set; } /// /// Gets or sets the date and time of instance update /// [DataMember] - public DateTime UpdatedOnUtc { get; set; } - - /// - /// Gets or sets a value indicating whether this manufacturer has discounts applied - /// The same as if we run Manufacturer.AppliedDiscounts.Count > 0 - /// We use this property for performance optimization: - /// if this property is set to false, then we do not need to load Applied Discounts navigation property - /// - /// - [DataMember] - public bool HasDiscountsApplied { get; set; } + public DateTime UpdatedOnUtc { get; set; } - /// - /// Gets or sets the collection of applied discounts - /// - [DataMember] - public virtual ICollection AppliedDiscounts - { - get { return _appliedDiscounts ?? (_appliedDiscounts = new HashSet()); } - protected set { _appliedDiscounts = value; } - } - } + /// + /// Gets or sets a value indicating whether this manufacturer has discounts applied + /// The same as if we run Manufacturer.AppliedDiscounts.Count > 0 + /// We use this property for performance optimization: + /// if this property is set to false, then we do not need to load Applied Discounts navigation property + /// + /// + [DataMember] + public bool HasDiscountsApplied { get; set; } + + /// + /// Gets or sets the collection of applied discounts + /// + [DataMember] + public virtual ICollection AppliedDiscounts + { + get => _appliedDiscounts ?? (_appliedDiscounts = new HashSet()); + protected set => _appliedDiscounts = value; + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/PriceDisplayStyle.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/PriceDisplayStyle.cs index adee8aa61f..1275690ff9 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/PriceDisplayStyle.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/PriceDisplayStyle.cs @@ -7,7 +7,7 @@ namespace SmartStore.Core.Domain.Catalog /// [Flags] public enum PriceDisplayStyle - { + { /// /// Display prices without badges /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/PriceDisplayType.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/PriceDisplayType.cs index aeb4c24250..778aba0b13 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/PriceDisplayType.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/PriceDisplayType.cs @@ -1,29 +1,29 @@  namespace SmartStore.Core.Domain.Catalog { - /// - /// Represents types of product prices to display - /// - public enum PriceDisplayType - { - /// - /// The lowest possible price of a product (default) - /// - LowestPrice = 0, + /// + /// Represents types of product prices to display + /// + public enum PriceDisplayType + { + /// + /// The lowest possible price of a product (default) + /// + LowestPrice = 0, - /// - /// The product price initially displayed on the product detail page - /// - PreSelectedPrice = 10, + /// + /// The product price initially displayed on the product detail page + /// + PreSelectedPrice = 10, - /// - /// The product price without associated data like discounts, tier prices, attributes or attribute combinations - /// - PriceWithoutDiscountsAndAttributes = 20, + /// + /// The product price without associated data like discounts, tier prices, attributes or attribute combinations + /// + PriceWithoutDiscountsAndAttributes = 20, - /// - /// Do not display a product price - /// - Hide = 30 - } + /// + /// Do not display a product price + /// + Hide = 30 + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs index 17d9ea1054..5306390b8b 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Diagnostics; -using System.Linq.Expressions; using System.Runtime.Serialization; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Discounts; @@ -18,71 +17,71 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a product /// [DataContract] - public partial class Product : BaseEntity, IAuditable, ISoftDeletable, ILocalizedEntity, ISlugSupported, IAclSupported, IStoreMappingSupported, IMergedData - { - #region static - - private static readonly HashSet _visibilityAffectingProductProps = new HashSet - { - nameof(Product.AvailableEndDateTimeUtc), - nameof(Product.AvailableStartDateTimeUtc), - nameof(Product.Deleted), - nameof(Product.LowStockActivityId), - nameof(Product.LimitedToStores), - nameof(Product.ManageInventoryMethodId), - nameof(Product.MinStockQuantity), - nameof(Product.Published), - nameof(Product.SubjectToAcl), - nameof(Product.Visibility) - }; - - public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() - { - return _visibilityAffectingProductProps; - } - - #endregion - - private ICollection _productCategories; + public partial class Product : BaseEntity, IAuditable, ISoftDeletable, ILocalizedEntity, ISlugSupported, IAclSupported, IStoreMappingSupported, IMergedData + { + #region static + + private static readonly HashSet _visibilityAffectingProductProps = new HashSet + { + nameof(Product.AvailableEndDateTimeUtc), + nameof(Product.AvailableStartDateTimeUtc), + nameof(Product.Deleted), + nameof(Product.LowStockActivityId), + nameof(Product.LimitedToStores), + nameof(Product.ManageInventoryMethodId), + nameof(Product.MinStockQuantity), + nameof(Product.Published), + nameof(Product.SubjectToAcl), + nameof(Product.Visibility) + }; + + public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() + { + return _visibilityAffectingProductProps; + } + + #endregion + + private ICollection _productCategories; private ICollection _productManufacturers; private ICollection _productPictures; private ICollection _productReviews; private ICollection _productSpecificationAttributes; private ICollection _productTags; - private ICollection _productVariantAttributes; - private ICollection _productVariantAttributeCombinations; - private ICollection _tierPrices; - private ICollection _appliedDiscounts; - private ICollection _productBundleItems; - + private ICollection _productVariantAttributes; + private ICollection _productVariantAttributeCombinations; + private ICollection _tierPrices; + private ICollection _appliedDiscounts; + private ICollection _productBundleItems; + private int _stockQuantity; private int _backorderModeId; - private string _sku; - private string _gtin; - private string _manufacturerPartNumber; - private decimal _price; - private int? _deliveryTimeId; + private string _sku; + private string _gtin; + private string _manufacturerPartNumber; + private decimal _price; + private int? _deliveryTimeId; private int? _quantityUnitId; - private decimal _length; - private decimal _width; - private decimal _height; - private decimal? _basePriceAmount; - private int? _basePriceBaseAmount; + private decimal _length; + private decimal _width; + private decimal _height; + private decimal? _basePriceAmount; + private int? _basePriceBaseAmount; - public bool MergedDataIgnore { get; set; } - public Dictionary MergedDataValues { get; set; } + public bool MergedDataIgnore { get; set; } + public Dictionary MergedDataValues { get; set; } - /// - /// Gets or sets the product type identifier - /// - [DataMember] - public int ProductTypeId { get; set; } + /// + /// Gets or sets the product type identifier + /// + [DataMember] + public int ProductTypeId { get; set; } - /// - /// Gets or sets the parent product identifier. It's used to identify associated products (only with "grouped" products) - /// - [DataMember] - public int ParentGroupedProductId { get; set; } + /// + /// Gets or sets the parent product identifier. It's used to identify associated products (only with "grouped" products) + /// + [DataMember] + public int ParentGroupedProductId { get; set; } [Obsolete("Use property Visibility instead.")] public bool VisibleIndividually { get; set; } @@ -122,383 +121,353 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// Gets or sets the admin comment /// [DataMember] - public string AdminComment { get; set; } + public string AdminComment { get; set; } /// /// Gets or sets a value of used product template identifier /// [DataMember] - public int ProductTemplateId { get; set; } + public int ProductTemplateId { get; set; } /// /// Gets or sets a value indicating whether to show the product on home page /// [DataMember] - public bool ShowOnHomePage { get; set; } + public bool ShowOnHomePage { get; set; } - /// - /// Gets or sets the display order for homepage products - /// - [DataMember] - public int HomePageDisplayOrder { get; set; } + /// + /// Gets or sets the display order for homepage products + /// + [DataMember] + public int HomePageDisplayOrder { get; set; } /// /// Gets or sets the meta keywords /// [DataMember] - public string MetaKeywords { get; set; } + public string MetaKeywords { get; set; } /// /// Gets or sets the meta description /// [DataMember] - public string MetaDescription { get; set; } + public string MetaDescription { get; set; } /// /// Gets or sets the meta title /// [DataMember] - public string MetaTitle { get; set; } + public string MetaTitle { get; set; } /// /// Gets or sets a value indicating whether the product allows customer reviews /// [DataMember] - public bool AllowCustomerReviews { get; set; } + public bool AllowCustomerReviews { get; set; } /// /// Gets or sets the rating sum (approved reviews) /// [DataMember] - public int ApprovedRatingSum { get; set; } + public int ApprovedRatingSum { get; set; } /// /// Gets or sets the rating sum (not approved reviews) /// [DataMember] - public int NotApprovedRatingSum { get; set; } + public int NotApprovedRatingSum { get; set; } /// /// Gets or sets the total rating votes (approved reviews) /// [DataMember] - public int ApprovedTotalReviews { get; set; } + public int ApprovedTotalReviews { get; set; } /// /// Gets or sets the total rating votes (not approved reviews) /// [DataMember] - public int NotApprovedTotalReviews { get; set; } + public int NotApprovedTotalReviews { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL /// [DataMember] - public bool SubjectToAcl { get; set; } + public bool SubjectToAcl { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } - /// - /// Gets or sets the SKU - /// - [DataMember] - public string Sku - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(Sku), _sku); - } - set - { - _sku = value; - } - } - - /// - /// Gets or sets the manufacturer part number - /// - [DataMember] - [Index] - public string ManufacturerPartNumber - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(ManufacturerPartNumber), _manufacturerPartNumber); - } - set - { - _manufacturerPartNumber = value; - } - } - - /// - /// Gets or sets the Global Trade Item Number (GTIN). These identifiers include UPC (in North America), EAN (in Europe), JAN (in Japan), and ISBN (for books). - /// - [DataMember] - [Index] - public string Gtin - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(Gtin), _gtin); - } - set - { - _gtin = value; - } - } - - /// - /// Gets or sets a value indicating whether the product is gift card - /// - [DataMember] - public bool IsGiftCard { get; set; } + /// + /// Gets or sets the SKU + /// + [DataMember] + public string Sku + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(Sku), _sku); + set => _sku = value; + } - /// - /// Gets or sets the gift card type identifier - /// - [DataMember] - public int GiftCardTypeId { get; set; } + /// + /// Gets or sets the manufacturer part number + /// + [DataMember] + [Index] + public string ManufacturerPartNumber + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(ManufacturerPartNumber), _manufacturerPartNumber); + set => _manufacturerPartNumber = value; + } - /// - /// Gets or sets a value indicating whether the product requires that other products are added to the cart (Product X requires Product Y) - /// - [DataMember] - public bool RequireOtherProducts { get; set; } + /// + /// Gets or sets the Global Trade Item Number (GTIN). These identifiers include UPC (in North America), EAN (in Europe), JAN (in Japan), and ISBN (for books). + /// + [DataMember] + [Index] + public string Gtin + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(Gtin), _gtin); + set => _gtin = value; + } - /// - /// Gets or sets a required product identifiers (comma separated) - /// - [DataMember] - public string RequiredProductIds { get; set; } + /// + /// Gets or sets a value indicating whether the product is gift card + /// + [DataMember] + public bool IsGiftCard { get; set; } - /// - /// Gets or sets a value indicating whether required products are automatically added to the cart - /// - [DataMember] - public bool AutomaticallyAddRequiredProducts { get; set; } + /// + /// Gets or sets the gift card type identifier + /// + [DataMember] + public int GiftCardTypeId { get; set; } - /// - /// Gets or sets a value indicating whether the product is a download - /// - [DataMember] - public bool IsDownload { get; set; } + /// + /// Gets or sets a value indicating whether the product requires that other products are added to the cart (Product X requires Product Y) + /// + [DataMember] + public bool RequireOtherProducts { get; set; } - /// - /// Gets or sets the download identifier - /// - [Obsolete("Since version 3.2 more than one download can be assigned to a product. See property Download.EntityId and Download.EntityName.")] + /// + /// Gets or sets a required product identifiers (comma separated) + /// + [DataMember] + public string RequiredProductIds { get; set; } + + /// + /// Gets or sets a value indicating whether required products are automatically added to the cart + /// + [DataMember] + public bool AutomaticallyAddRequiredProducts { get; set; } + + /// + /// Gets or sets a value indicating whether the product is a download + /// + [DataMember] + public bool IsDownload { get; set; } + + /// + /// Gets or sets the download identifier + /// + [Obsolete("Since version 3.2 more than one download can be assigned to a product. See property Download.EntityId and Download.EntityName.")] public int DownloadId { get; set; } - /// - /// Gets or sets a value indicating whether this downloadable product can be downloaded unlimited number of times - /// - [DataMember] - public bool UnlimitedDownloads { get; set; } + /// + /// Gets or sets a value indicating whether this downloadable product can be downloaded unlimited number of times + /// + [DataMember] + public bool UnlimitedDownloads { get; set; } - /// - /// Gets or sets the maximum number of downloads - /// - [DataMember] - public int MaxNumberOfDownloads { get; set; } + /// + /// Gets or sets the maximum number of downloads + /// + [DataMember] + public int MaxNumberOfDownloads { get; set; } - /// - /// Gets or sets the number of days during customers keeps access to the file. - /// - [DataMember] - public int? DownloadExpirationDays { get; set; } + /// + /// Gets or sets the number of days during customers keeps access to the file. + /// + [DataMember] + public int? DownloadExpirationDays { get; set; } - /// - /// Gets or sets the download activation type - /// - [DataMember] - public int DownloadActivationTypeId { get; set; } + /// + /// Gets or sets the download activation type + /// + [DataMember] + public int DownloadActivationTypeId { get; set; } - /// - /// Gets or sets a value indicating whether the product has a sample download file - /// - [DataMember] - public bool HasSampleDownload { get; set; } + /// + /// Gets or sets a value indicating whether the product has a sample download file + /// + [DataMember] + public bool HasSampleDownload { get; set; } - /// - /// Gets or sets the sample download identifier - /// - [DataMember] - public int? SampleDownloadId { get; set; } + /// + /// Gets or sets the sample download identifier + /// + [DataMember] + public int? SampleDownloadId { get; set; } - /// - /// Gets or sets the sample download - /// - [DataMember] - public Download SampleDownload { get; set; } + /// + /// Gets or sets the sample download + /// + [DataMember] + public Download SampleDownload { get; set; } - /// - /// Gets or sets a value indicating whether the product has user agreement - /// - [DataMember] - public bool HasUserAgreement { get; set; } + /// + /// Gets or sets a value indicating whether the product has user agreement + /// + [DataMember] + public bool HasUserAgreement { get; set; } - /// - /// Gets or sets the text of license agreement - /// - [DataMember] - public string UserAgreementText { get; set; } + /// + /// Gets or sets the text of license agreement + /// + [DataMember] + public string UserAgreementText { get; set; } - /// - /// Gets or sets a value indicating whether the product is recurring - /// - [DataMember] - public bool IsRecurring { get; set; } + /// + /// Gets or sets a value indicating whether the product is recurring + /// + [DataMember] + public bool IsRecurring { get; set; } - /// - /// Gets or sets the cycle length - /// - [DataMember] - public int RecurringCycleLength { get; set; } + /// + /// Gets or sets the cycle length + /// + [DataMember] + public int RecurringCycleLength { get; set; } - /// - /// Gets or sets the cycle period - /// - [DataMember] - public int RecurringCyclePeriodId { get; set; } + /// + /// Gets or sets the cycle period + /// + [DataMember] + public int RecurringCyclePeriodId { get; set; } - /// - /// Gets or sets the total cycles - /// - [DataMember] - public int RecurringTotalCycles { get; set; } + /// + /// Gets or sets the total cycles + /// + [DataMember] + public int RecurringTotalCycles { get; set; } - /// - /// Gets or sets a value indicating whether the entity is ship enabled - /// - [DataMember] - public bool IsShipEnabled { get; set; } + /// + /// Gets or sets a value indicating whether the entity is ship enabled + /// + [DataMember] + public bool IsShipEnabled { get; set; } - /// - /// Gets or sets a value indicating whether the entity is free shipping - /// - [DataMember] - public bool IsFreeShipping { get; set; } + /// + /// Gets or sets a value indicating whether the entity is free shipping + /// + [DataMember] + public bool IsFreeShipping { get; set; } - /// - /// Gets or sets the additional shipping charge - /// - [DataMember] - public decimal AdditionalShippingCharge { get; set; } + /// + /// Gets or sets the additional shipping charge + /// + [DataMember] + public decimal AdditionalShippingCharge { get; set; } - /// - /// Gets or sets a value indicating whether the product is marked as tax exempt - /// - [DataMember] - public bool IsTaxExempt { get; set; } + /// + /// Gets or sets a value indicating whether the product is marked as tax exempt + /// + [DataMember] + public bool IsTaxExempt { get; set; } - /// - /// Gets or sets a value indicating whether the product is an electronic service - /// bound to EU VAT regulations for digital goods. - /// - [DataMember] - public bool IsEsd { get; set; } + /// + /// Gets or sets a value indicating whether the product is an electronic service + /// bound to EU VAT regulations for digital goods. + /// + [DataMember] + public bool IsEsd { get; set; } - /// - /// Gets or sets the tax category identifier - /// - [DataMember] - public int TaxCategoryId { get; set; } + /// + /// Gets or sets the tax category identifier + /// + [DataMember] + public int TaxCategoryId { get; set; } - /// - /// Gets or sets a value indicating how to manage inventory - /// - [DataMember] - public int ManageInventoryMethodId { get; set; } + /// + /// Gets or sets a value indicating how to manage inventory + /// + [DataMember] + public int ManageInventoryMethodId { get; set; } - /// - /// Gets or sets the stock quantity - /// - [DataMember] - public int StockQuantity - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(StockQuantity), _stockQuantity); - } - set - { - _stockQuantity = value; - } - } - - /// - /// Gets or sets a value indicating whether to display stock availability - /// - [DataMember] - public bool DisplayStockAvailability { get; set; } + /// + /// Gets or sets the stock quantity + /// + [DataMember] + public int StockQuantity + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(StockQuantity), _stockQuantity); + set => _stockQuantity = value; + } - /// - /// Gets or sets a value indicating whether to display stock quantity - /// - [DataMember] - public bool DisplayStockQuantity { get; set; } + /// + /// Gets or sets a value indicating whether to display stock availability + /// + [DataMember] + public bool DisplayStockAvailability { get; set; } - /// - /// Gets or sets the minimum stock quantity - /// - [DataMember] - public int MinStockQuantity { get; set; } + /// + /// Gets or sets a value indicating whether to display stock quantity + /// + [DataMember] + public bool DisplayStockQuantity { get; set; } - /// - /// Gets or sets the low stock activity identifier - /// - [DataMember] - public int LowStockActivityId { get; set; } + /// + /// Gets or sets the minimum stock quantity + /// + [DataMember] + public int MinStockQuantity { get; set; } - /// - /// Gets or sets the quantity when admin should be notified - /// - [DataMember] - public int NotifyAdminForQuantityBelow { get; set; } + /// + /// Gets or sets the low stock activity identifier + /// + [DataMember] + public int LowStockActivityId { get; set; } - /// - /// Gets or sets a value backorder mode identifier - /// - [DataMember] - public int BackorderModeId + /// + /// Gets or sets the quantity when admin should be notified + /// + [DataMember] + public int NotifyAdminForQuantityBelow { get; set; } + + /// + /// Gets or sets a value backorder mode identifier + /// + [DataMember] + public int BackorderModeId { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(BackorderModeId), _backorderModeId); - } - set - { - _backorderModeId = value; - } + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(BackorderModeId), _backorderModeId); + set => _backorderModeId = value; } - /// - /// Gets or sets a value indicating whether to back in stock subscriptions are allowed - /// - [DataMember] - public bool AllowBackInStockSubscriptions { get; set; } + /// + /// Gets or sets a value indicating whether to back in stock subscriptions are allowed + /// + [DataMember] + public bool AllowBackInStockSubscriptions { get; set; } - /// - /// Gets or sets the order minimum quantity - /// - [DataMember] - public int OrderMinimumQuantity { get; set; } + /// + /// Gets or sets the order minimum quantity + /// + [DataMember] + public int OrderMinimumQuantity { get; set; } - /// - /// Gets or sets the order maximum quantity - /// - [DataMember] - public int OrderMaximumQuantity { get; set; } + /// + /// Gets or sets the order maximum quantity + /// + [DataMember] + public int OrderMaximumQuantity { get; set; } /// /// Gets or sets the quantity step @@ -522,259 +491,229 @@ public int BackorderModeId /// Gets or sets the comma seperated list of allowed quantities. null or empty if any quantity is allowed /// [DataMember] - public string AllowedQuantities { get; set; } + public string AllowedQuantities { get; set; } - /// - /// Gets or sets a value indicating whether to disable buy (Add to cart) button - /// - [DataMember] - public bool DisableBuyButton { get; set; } + /// + /// Gets or sets a value indicating whether to disable buy (Add to cart) button + /// + [DataMember] + public bool DisableBuyButton { get; set; } - /// - /// Gets or sets a value indicating whether to disable "Add to wishlist" button - /// - [DataMember] - public bool DisableWishlistButton { get; set; } + /// + /// Gets or sets a value indicating whether to disable "Add to wishlist" button + /// + [DataMember] + public bool DisableWishlistButton { get; set; } - /// - /// Gets or sets a value indicating whether this item is available for Pre-Order - /// - [DataMember] - public bool AvailableForPreOrder { get; set; } + /// + /// Gets or sets a value indicating whether this item is available for Pre-Order + /// + [DataMember] + public bool AvailableForPreOrder { get; set; } - /// - /// Gets or sets a value indicating whether to show "Call for Pricing" or "Call for quote" instead of price - /// - [DataMember] - public bool CallForPrice { get; set; } + /// + /// Gets or sets a value indicating whether to show "Call for Pricing" or "Call for quote" instead of price + /// + [DataMember] + public bool CallForPrice { get; set; } - /// - /// Gets or sets the price - /// - [DataMember] - public decimal Price - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(Price), _price); - } - set - { - _price = value; - } - } - - /// - /// Gets or sets the old price - /// - [DataMember] - public decimal OldPrice { get; set; } + /// + /// Gets or sets the price + /// + [DataMember] + public decimal Price + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(Price), _price); + set => _price = value; + } - /// - /// Gets or sets the product cost - /// - [DataMember] - public decimal ProductCost { get; set; } + /// + /// Gets or sets the old price + /// + [DataMember] + public decimal OldPrice { get; set; } - /// - /// Gets or sets the product special price - /// - [DataMember] - public decimal? SpecialPrice { get; set; } + /// + /// Gets or sets the product cost + /// + [DataMember] + public decimal ProductCost { get; set; } - /// - /// Gets or sets the start date and time of the special price - /// - [DataMember] - public DateTime? SpecialPriceStartDateTimeUtc { get; set; } + /// + /// Gets or sets the product special price + /// + [DataMember] + public decimal? SpecialPrice { get; set; } - /// - /// Gets or sets the end date and time of the special price - /// - [DataMember] - public DateTime? SpecialPriceEndDateTimeUtc { get; set; } + /// + /// Gets or sets the start date and time of the special price + /// + [DataMember] + public DateTime? SpecialPriceStartDateTimeUtc { get; set; } - /// - /// Gets or sets a value indicating whether a customer enters price - /// - [DataMember] - public bool CustomerEntersPrice { get; set; } + /// + /// Gets or sets the end date and time of the special price + /// + [DataMember] + public DateTime? SpecialPriceEndDateTimeUtc { get; set; } - /// - /// Gets or sets the minimum price entered by a customer - /// - [DataMember] - public decimal MinimumCustomerEnteredPrice { get; set; } + /// + /// Gets or sets a value indicating whether a customer enters price + /// + [DataMember] + public bool CustomerEntersPrice { get; set; } - /// - /// Gets or sets the maximum price entered by a customer - /// - [DataMember] - public decimal MaximumCustomerEnteredPrice { get; set; } - - /// - /// Gets or sets a value indicating whether this product has tier prices configured - /// The same as if we run this.TierPrices.Count > 0 - /// We use this property for performance optimization: - /// if this property is set to false, then we do not need to load tier prices navigation property - /// - /// - [DataMember] - public bool HasTierPrices { get; set; } + /// + /// Gets or sets the minimum price entered by a customer + /// + [DataMember] + public decimal MinimumCustomerEnteredPrice { get; set; } - /// - /// Gets or sets a value for the lowest attribute combination price override - /// - [DataMember] - public decimal? LowestAttributeCombinationPrice { get; set; } - - /// - /// Gets or sets a value indicating whether this product has discounts applied - /// The same as if we run this.AppliedDiscounts.Count > 0 - /// We use this property for performance optimization: - /// if this property is set to false, then we do not need to load Applied Discounts navifation property - /// - /// - [DataMember] - public bool HasDiscountsApplied { get; set; } + /// + /// Gets or sets the maximum price entered by a customer + /// + [DataMember] + public decimal MaximumCustomerEnteredPrice { get; set; } - /// - /// Gets or sets the weight - /// - [DataMember] - public decimal Weight { get; set; } + /// + /// Gets or sets a value indicating whether this product has tier prices configured + /// The same as if we run this.TierPrices.Count > 0 + /// We use this property for performance optimization: + /// if this property is set to false, then we do not need to load tier prices navigation property + /// + /// + [DataMember] + public bool HasTierPrices { get; set; } - /// - /// Gets or sets the length - /// - [DataMember] - public decimal Length - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(Length), _length); - } - set - { - _length = value; - } - } - - /// - /// Gets or sets the width - /// - [DataMember] - public decimal Width - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(Width), _width); - } - set - { - _width = value; - } - } - - /// - /// Gets or sets the height - /// - [DataMember] - public decimal Height - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(Height), _height); - } - set - { - _height = value; - } - } - - /// - /// Gets or sets the available start date and time - /// - [DataMember] - public DateTime? AvailableStartDateTimeUtc { get; set; } + /// + /// Gets or sets a value for the lowest attribute combination price override + /// + [DataMember] + public decimal? LowestAttributeCombinationPrice { get; set; } - /// - /// Gets or sets the available end date and time - /// - [DataMember] - public DateTime? AvailableEndDateTimeUtc { get; set; } + /// + /// Gets or sets a value indicating whether this product has discounts applied + /// The same as if we run this.AppliedDiscounts.Count > 0 + /// We use this property for performance optimization: + /// if this property is set to false, then we do not need to load Applied Discounts navifation property + /// + /// + [DataMember] + public bool HasDiscountsApplied { get; set; } - /// - /// Gets or sets a display order. This value is used when sorting associated products (used with "grouped" products) - /// - [DataMember] - public int DisplayOrder { get; set; } + /// + /// Gets or sets the weight + /// + [DataMember] + public decimal Weight { get; set; } + + /// + /// Gets or sets the length + /// + [DataMember] + public decimal Length + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(Length), _length); + set => _length = value; + } + + /// + /// Gets or sets the width + /// + [DataMember] + public decimal Width + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(Width), _width); + set => _width = value; + } + + /// + /// Gets or sets the height + /// + [DataMember] + public decimal Height + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(Height), _height); + set => _height = value; + } + + /// + /// Gets or sets the available start date and time + /// + [DataMember] + public DateTime? AvailableStartDateTimeUtc { get; set; } + + /// + /// Gets or sets the available end date and time + /// + [DataMember] + public DateTime? AvailableEndDateTimeUtc { get; set; } + + /// + /// Gets or sets a display order. This value is used when sorting associated products (used with "grouped" products) + /// + [DataMember] + public int DisplayOrder { get; set; } /// /// Gets or sets a value indicating whether the entity is published /// [DataMember] [Index("IX_Product_Published_Deleted_IsSystemProduct", 1)] - public bool Published { get; set; } + public bool Published { get; set; } /// /// Gets or sets a value indicating whether the entity has been deleted /// [Index] [Index("IX_Product_Published_Deleted_IsSystemProduct", 2)] - public bool Deleted { get; set; } + public bool Deleted { get; set; } - /// - /// Gets or sets a value indicating whether the entity is a system product. - /// - [DataMember] + /// + /// Gets or sets a value indicating whether the entity is a system product. + /// + [DataMember] [Index] [Index("IX_Product_SystemName_IsSystemProduct", 2)] [Index("IX_Product_Published_Deleted_IsSystemProduct", 3)] - public bool IsSystemProduct { get; set; } + public bool IsSystemProduct { get; set; } - /// - /// Gets or sets the product system name. - /// - [DataMember] - [Index("IX_Product_SystemName_IsSystemProduct", 1)] - public string SystemName { get; set; } + /// + /// Gets or sets the product system name. + /// + [DataMember] + [Index("IX_Product_SystemName_IsSystemProduct", 1)] + public string SystemName { get; set; } - /// - /// Gets or sets the date and time of product creation - /// - [DataMember] - public DateTime CreatedOnUtc { get; set; } + /// + /// Gets or sets the date and time of product creation + /// + [DataMember] + public DateTime CreatedOnUtc { get; set; } /// /// Gets or sets the date and time of product update /// [DataMember] - public DateTime UpdatedOnUtc { get; set; } + public DateTime UpdatedOnUtc { get; set; } - /// - /// Gets or sets the delivery time identifier - /// - [DataMember] - public int? DeliveryTimeId - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(DeliveryTimeId), _deliveryTimeId); - } - set - { - _deliveryTimeId = value; - } - } + /// + /// Gets or sets the delivery time identifier + /// + [DataMember] + public int? DeliveryTimeId + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(DeliveryTimeId), _deliveryTimeId); + set => _deliveryTimeId = value; + } - [DataMember] - public virtual DeliveryTime DeliveryTime { get; set; } + [DataMember] + public virtual DeliveryTime DeliveryTime { get; set; } /// /// Gets or sets the quantity unit identifier @@ -783,123 +722,99 @@ public int? DeliveryTimeId public int? QuantityUnitId { [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(QuantityUnitId), _quantityUnitId); - } - set - { - _quantityUnitId = value; - } + get => this.GetMergedDataValue(nameof(QuantityUnitId), _quantityUnitId); + set => _quantityUnitId = value; } [DataMember] public virtual QuantityUnit QuantityUnit { get; set; } - /// - /// Gets or sets the customs tariff number - /// - [DataMember] - public string CustomsTariffNumber { get; set; } + /// + /// Gets or sets the customs tariff number + /// + [DataMember] + public string CustomsTariffNumber { get; set; } - /// - /// Gets or sets the country of origin identifier - /// - [DataMember] - public int? CountryOfOriginId { get; set; } + /// + /// Gets or sets the country of origin identifier + /// + [DataMember] + public int? CountryOfOriginId { get; set; } - /// - /// Gets or sets the country of origin - /// - [DataMember] - public virtual Country CountryOfOrigin { get; set; } + /// + /// Gets or sets the country of origin + /// + [DataMember] + public virtual Country CountryOfOrigin { get; set; } - /// - /// Gets or sets if base price quotation (PAnGV) is enabled - /// - [DataMember] - public bool BasePriceEnabled { get; set; } + /// + /// Gets or sets if base price quotation (PAnGV) is enabled + /// + [DataMember] + public bool BasePriceEnabled { get; set; } - /// - /// Measure unit for the base price (e.g. "kg", "g", "qm" etc.) - /// - [DataMember] - public string BasePriceMeasureUnit { get; set; } + /// + /// Measure unit for the base price (e.g. "kg", "g", "qm" etc.) + /// + [DataMember] + public string BasePriceMeasureUnit { get; set; } - /// - /// Amount of product per packing unit in the given measure unit + /// + /// Amount of product per packing unit in the given measure unit /// (e.g. 250 ml shower gel: "0.25" if MeasureUnit = "liter" and BaseAmount = 1) - /// - [DataMember] - public decimal? BasePriceAmount - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(BasePriceAmount), _basePriceAmount); - } - set - { - _basePriceAmount = value; - } - } - - /// - /// Reference value for the given measure unit - /// (e.g. "1" liter. Formula: [BaseAmount] [MeasureUnit] = [SellingPrice] / [Amount]) - /// - [DataMember] - public int? BasePriceBaseAmount - { - [DebuggerStepThrough] - get - { - return this.GetMergedDataValue(nameof(BasePriceBaseAmount), _basePriceBaseAmount); - } - set - { - _basePriceBaseAmount = value; - } - } + /// + [DataMember] + public decimal? BasePriceAmount + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(BasePriceAmount), _basePriceAmount); + set => _basePriceAmount = value; + } - [DataMember] - public bool BasePriceHasValue - { - get - { - return BasePriceEnabled && BasePriceAmount.GetValueOrDefault() > 0 && BasePriceBaseAmount.GetValueOrDefault() > 0 && BasePriceMeasureUnit.HasValue(); - } - } - - /// - /// Optional title text of a product bundle - /// - [DataMember] - public string BundleTitleText { get; set; } + /// + /// Reference value for the given measure unit + /// (e.g. "1" liter. Formula: [BaseAmount] [MeasureUnit] = [SellingPrice] / [Amount]) + /// + [DataMember] + public int? BasePriceBaseAmount + { + [DebuggerStepThrough] + get => this.GetMergedDataValue(nameof(BasePriceBaseAmount), _basePriceBaseAmount); + set => _basePriceBaseAmount = value; + } - /// - /// Per item shipping of bundle items - /// - [DataMember] - public bool BundlePerItemShipping { get; set; } + [DataMember] + public bool BasePriceHasValue => BasePriceEnabled && BasePriceAmount.GetValueOrDefault() > 0 && BasePriceBaseAmount.GetValueOrDefault() > 0 && BasePriceMeasureUnit.HasValue(); - /// - /// Per item pricing of bundle items - /// - [DataMember] - public bool BundlePerItemPricing { get; set; } + /// + /// Optional title text of a product bundle + /// + [DataMember] + public string BundleTitleText { get; set; } - /// - /// Per item shopping cart handling of bundle items - /// - [DataMember] - public bool BundlePerItemShoppingCart { get; set; } + /// + /// Per item shipping of bundle items + /// + [DataMember] + public bool BundlePerItemShipping { get; set; } - /// - /// Gets or sets the main picture id - /// - [DataMember] - public int? MainPictureId { get; set; } + /// + /// Per item pricing of bundle items + /// + [DataMember] + public bool BundlePerItemPricing { get; set; } + + /// + /// Per item shopping cart handling of bundle items + /// + [DataMember] + public bool BundlePerItemShoppingCart { get; set; } + + /// + /// Gets or sets the main picture id + /// + [DataMember] + public int? MainPictureId { get; set; } /// /// Gets or sets a value that indictaes whether the product has a preview picture @@ -911,160 +826,118 @@ public bool BasePriceHasValue /// Gets or sets the product type /// [DataMember] - public ProductType ProductType - { - get - { - return (ProductType)this.ProductTypeId; - } - set - { - this.ProductTypeId = (int)value; - } - } - - public string ProductTypeLabelHint - { - get - { - switch (ProductType) - { - case ProductType.SimpleProduct: - return "secondary d-none"; - case ProductType.GroupedProduct: - return "success"; - case ProductType.BundledProduct: - return "info"; - default: - return ""; - } - } - } - - /// - /// Gets or sets the backorder mode - /// - [DataMember] - public BackorderMode BackorderMode - { - get - { - return (BackorderMode)this.BackorderModeId; - } - set - { - this.BackorderModeId = (int)value; - } - } - - /// - /// Gets or sets the download activation type - /// - [DataMember] - public DownloadActivationType DownloadActivationType - { - get - { - return (DownloadActivationType)this.DownloadActivationTypeId; - } - set - { - this.DownloadActivationTypeId = (int)value; - } - } - - /// - /// Gets or sets the gift card type - /// - [DataMember] - public GiftCardType GiftCardType - { - get - { - return (GiftCardType)this.GiftCardTypeId; - } - set - { - this.GiftCardTypeId = (int)value; - } - } - - /// - /// Gets or sets the low stock activity - /// - [DataMember] - public LowStockActivity LowStockActivity - { - get - { - return (LowStockActivity)this.LowStockActivityId; - } - set - { - this.LowStockActivityId = (int)value; - } - } - - /// - /// Gets or sets the value indicating how to manage inventory - /// - [DataMember] - public ManageInventoryMethod ManageInventoryMethod - { - get - { - return (ManageInventoryMethod)this.ManageInventoryMethodId; - } - set - { - this.ManageInventoryMethodId = (int)value; - } - } - - /// - /// Gets or sets the cycle period for recurring products - /// - [DataMember] - public RecurringProductCyclePeriod RecurringCyclePeriod - { - get - { - return (RecurringProductCyclePeriod)this.RecurringCyclePeriodId; - } - set - { - this.RecurringCyclePeriodId = (int)value; - } - } - - /// + public ProductType ProductType + { + get => (ProductType)this.ProductTypeId; + set => this.ProductTypeId = (int)value; + } + + public string ProductTypeLabelHint + { + get + { + switch (ProductType) + { + case ProductType.SimpleProduct: + return "secondary d-none"; + case ProductType.GroupedProduct: + return "success"; + case ProductType.BundledProduct: + return "info"; + default: + return ""; + } + } + } + + /// + /// Gets or sets the backorder mode + /// + [DataMember] + public BackorderMode BackorderMode + { + get => (BackorderMode)this.BackorderModeId; + set => this.BackorderModeId = (int)value; + } + + /// + /// Gets or sets the download activation type + /// + [DataMember] + public DownloadActivationType DownloadActivationType + { + get => (DownloadActivationType)this.DownloadActivationTypeId; + set => this.DownloadActivationTypeId = (int)value; + } + + /// + /// Gets or sets the gift card type + /// + [DataMember] + public GiftCardType GiftCardType + { + get => (GiftCardType)this.GiftCardTypeId; + set => this.GiftCardTypeId = (int)value; + } + + /// + /// Gets or sets the low stock activity + /// + [DataMember] + public LowStockActivity LowStockActivity + { + get => (LowStockActivity)this.LowStockActivityId; + set => this.LowStockActivityId = (int)value; + } + + /// + /// Gets or sets the value indicating how to manage inventory + /// + [DataMember] + public ManageInventoryMethod ManageInventoryMethod + { + get => (ManageInventoryMethod)this.ManageInventoryMethodId; + set => this.ManageInventoryMethodId = (int)value; + } + + /// + /// Gets or sets the cycle period for recurring products + /// + [DataMember] + public RecurringProductCyclePeriod RecurringCyclePeriod + { + get => (RecurringProductCyclePeriod)this.RecurringCyclePeriodId; + set => this.RecurringCyclePeriodId = (int)value; + } + + /// /// Gets or sets the collection of ProductCategory /// [DataMember] public virtual ICollection ProductCategories { - get { return _productCategories ?? (_productCategories = new HashSet()); } - protected set { _productCategories = value; } + get => _productCategories ?? (_productCategories = new HashSet()); + protected set => _productCategories = value; } /// /// Gets or sets the collection of ProductManufacturer /// [DataMember] - public virtual ICollection ProductManufacturers + public virtual ICollection ProductManufacturers { - get { return _productManufacturers ?? (_productManufacturers = new HashSet()); } - protected set { _productManufacturers = value; } + get => _productManufacturers ?? (_productManufacturers = new HashSet()); + protected set => _productManufacturers = value; } /// /// Gets or sets the collection of ProductPicture /// [DataMember] - public virtual ICollection ProductPictures + public virtual ICollection ProductPictures { - get { return _productPictures ?? (_productPictures = new List()); } - protected set { _productPictures = value; } + get => _productPictures ?? (_productPictures = new List()); + protected set => _productPictures = value; } /// @@ -1072,78 +945,78 @@ public virtual ICollection ProductPictures /// public virtual ICollection ProductReviews { - get { return _productReviews ?? (_productReviews = new HashSet()); } - protected set { _productReviews = value; } + get => _productReviews ?? (_productReviews = new HashSet()); + protected set => _productReviews = value; } /// /// Gets or sets the product specification attribute /// [DataMember] - public virtual ICollection ProductSpecificationAttributes + public virtual ICollection ProductSpecificationAttributes { - get { return _productSpecificationAttributes ?? (_productSpecificationAttributes = new HashSet()); } - protected set { _productSpecificationAttributes = value; } + get => _productSpecificationAttributes ?? (_productSpecificationAttributes = new HashSet()); + protected set => _productSpecificationAttributes = value; } /// /// Gets or sets the product tags /// [DataMember] - public virtual ICollection ProductTags + public virtual ICollection ProductTags { - get { return _productTags ?? (_productTags = new HashSet()); } - protected set { _productTags = value; } + get => _productTags ?? (_productTags = new HashSet()); + protected set => _productTags = value; } - /// - /// Gets or sets the product attributes - /// - [DataMember] - public virtual ICollection ProductVariantAttributes - { - get { return _productVariantAttributes ?? (_productVariantAttributes = new HashSet()); } - protected set { _productVariantAttributes = value; } - } - - /// - /// Gets or sets the product attribute combinations - /// - [DataMember] - public virtual ICollection ProductVariantAttributeCombinations - { - get { return _productVariantAttributeCombinations ?? (_productVariantAttributeCombinations = new List()); } - protected set { _productVariantAttributeCombinations = value; } - } - - /// - /// Gets or sets the tier prices - /// - [DataMember] - public virtual ICollection TierPrices - { - get { return _tierPrices ?? (_tierPrices = new HashSet()); } - protected set { _tierPrices = value; } - } - - /// - /// Gets or sets the collection of applied discounts - /// - [DataMember] - public virtual ICollection AppliedDiscounts - { - get { return _appliedDiscounts ?? (_appliedDiscounts = new HashSet()); } - protected set { _appliedDiscounts = value; } - } - - /// - /// Gets or sets the collection of product bundle items - /// - [DataMember] - public virtual ICollection ProductBundleItems - { - get { return _productBundleItems ?? (_productBundleItems = new HashSet()); } - protected set { _productBundleItems = value; } - } + /// + /// Gets or sets the product attributes + /// + [DataMember] + public virtual ICollection ProductVariantAttributes + { + get => _productVariantAttributes ?? (_productVariantAttributes = new HashSet()); + protected set => _productVariantAttributes = value; + } + + /// + /// Gets or sets the product attribute combinations + /// + [DataMember] + public virtual ICollection ProductVariantAttributeCombinations + { + get => _productVariantAttributeCombinations ?? (_productVariantAttributeCombinations = new List()); + protected set => _productVariantAttributeCombinations = value; + } + + /// + /// Gets or sets the tier prices + /// + [DataMember] + public virtual ICollection TierPrices + { + get => _tierPrices ?? (_tierPrices = new HashSet()); + protected set => _tierPrices = value; + } + + /// + /// Gets or sets the collection of applied discounts + /// + [DataMember] + public virtual ICollection AppliedDiscounts + { + get => _appliedDiscounts ?? (_appliedDiscounts = new HashSet()); + protected set => _appliedDiscounts = value; + } + + /// + /// Gets or sets the collection of product bundle items + /// + [DataMember] + public virtual ICollection ProductBundleItems + { + get => _productBundleItems ?? (_productBundleItems = new HashSet()); + protected set => _productBundleItems = value; + } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs index 0b34ac64b3..9043816b92 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs @@ -7,51 +7,51 @@ namespace SmartStore.Core.Domain.Catalog { - /// - /// Represents a product attribute - /// - [DataContract] - public partial class ProductAttribute : BaseEntity, ILocalizedEntity, ISearchAlias - { - private ICollection _productAttributeOptionsSets; + /// + /// Represents a product attribute + /// + [DataContract] + public partial class ProductAttribute : BaseEntity, ILocalizedEntity, ISearchAlias + { + private ICollection _productAttributeOptionsSets; /// /// Gets or sets the product attribute alias /// [DataMember] public string Alias { get; set; } - + /// /// Gets or sets the name /// - [DataMember] - public string Name { get; set; } + [DataMember] + public string Name { get; set; } /// /// Gets or sets the description /// [DataMember] - public string Description { get; set; } + public string Description { get; set; } - /// - /// Gets or sets whether the attribute can be filtered - /// - [DataMember] - [Index] - public bool AllowFiltering { get; set; } + /// + /// Gets or sets whether the attribute can be filtered + /// + [DataMember] + [Index] + public bool AllowFiltering { get; set; } - /// - /// Gets or sets the display order - /// - [DataMember] + /// + /// Gets or sets the display order + /// + [DataMember] [Index] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } /// /// Gets or sets the facet template hint. Only effective in accordance with MegaSearchPlus plugin. /// [DataMember] - public FacetTemplateHint FacetTemplateHint { get; set; } + public FacetTemplateHint FacetTemplateHint { get; set; } /// /// Specifies whether option names should be included in the search index. Only effective in accordance with MegaSearchPlus plugin. @@ -59,20 +59,20 @@ public partial class ProductAttribute : BaseEntity, ILocalizedEntity, ISearchAli [DataMember] public bool IndexOptionNames { get; set; } - /// - /// Gets or sets export mappings. - /// - [DataMember] - public string ExportMappings { get; set; } + /// + /// Gets or sets export mappings. + /// + [DataMember] + public string ExportMappings { get; set; } - /// - /// Gets or sets the prooduct attribute option sets - /// - [DataMember] - public virtual ICollection ProductAttributeOptionsSets - { - get { return _productAttributeOptionsSets ?? (_productAttributeOptionsSets = new HashSet()); } - protected set { _productAttributeOptionsSets = value; } - } - } + /// + /// Gets or sets the prooduct attribute option sets + /// + [DataMember] + public virtual ICollection ProductAttributeOptionsSets + { + get => _productAttributeOptionsSets ?? (_productAttributeOptionsSets = new HashSet()); + protected set => _productAttributeOptionsSets = value; + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttributeOption.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttributeOption.cs index 08e7481248..0bbe59e24d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttributeOption.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttributeOption.cs @@ -1,132 +1,125 @@ using System; using System.Runtime.Serialization; using SmartStore.Core.Domain.Localization; -using SmartStore.Core.Domain.Media; using SmartStore.Core.Search; namespace SmartStore.Core.Domain.Catalog { - /// - /// Represents a product attribute option - /// - [DataContract] - public partial class ProductAttributeOption : BaseEntity, ILocalizedEntity, ISearchAlias, ICloneable - { - /// - /// Gets or sets the product attribute options set identifier - /// - [DataMember] - public int ProductAttributeOptionsSetId { get; set; } - - /// - /// Gets or sets the option alias - /// - [DataMember] - public string Alias { get; set; } - - /// - /// Gets or sets the option name - /// - [DataMember] - public string Name { get; set; } - - /// - /// Gets or sets the media file id - /// - [DataMember] - public int MediaFileId { get; set; } - - /// - /// Gets or sets the color RGB value (used with "Boxes" attribute type) - /// - [DataMember] - public string Color { get; set; } - - /// - /// Gets or sets the price adjustment - /// - [DataMember] - public decimal PriceAdjustment { get; set; } - - /// - /// Gets or sets the weight adjustment - /// - [DataMember] - public decimal WeightAdjustment { get; set; } - - /// - /// Gets or sets a value indicating whether the option is pre-selected - /// - [DataMember] - public bool IsPreSelected { get; set; } - - /// - /// Gets or sets the display order - /// - [DataMember] - public int DisplayOrder { get; set; } - - /// - /// Gets or sets the type Id - /// - [DataMember] - public int ValueTypeId { get; set; } - - /// - /// Gets or sets the linked product Id - /// - [DataMember] - public int LinkedProductId { get; set; } - - /// - /// Gets or sets the quantity for the linked product - /// - [DataMember] - public int Quantity { get; set; } - - /// - /// Gets the product attribute options set - /// - [DataMember] - public virtual ProductAttributeOptionsSet ProductAttributeOptionsSet { get; set; } - - /// - /// Gets or sets the product attribute value type - /// - [DataMember] - public ProductVariantAttributeValueType ValueType - { - get - { - return (ProductVariantAttributeValueType)this.ValueTypeId; - } - set - { - this.ValueTypeId = (int)value; - } - } - - public ProductVariantAttributeValue Clone() - { - var value = new ProductVariantAttributeValue(); - value.Alias = Alias; - value.Name = Name; - value.MediaFileId = MediaFileId; - value.Color = Color; - value.PriceAdjustment = PriceAdjustment; - value.WeightAdjustment = WeightAdjustment; - value.IsPreSelected = IsPreSelected; - value.DisplayOrder = DisplayOrder; - value.ValueTypeId = ValueTypeId; - value.LinkedProductId = LinkedProductId; - value.Quantity = Quantity; - - return value; - } - - object ICloneable.Clone() - { - return this.Clone(); - } - } + /// + /// Represents a product attribute option + /// + [DataContract] + public partial class ProductAttributeOption : BaseEntity, ILocalizedEntity, ISearchAlias, ICloneable + { + /// + /// Gets or sets the product attribute options set identifier + /// + [DataMember] + public int ProductAttributeOptionsSetId { get; set; } + + /// + /// Gets or sets the option alias + /// + [DataMember] + public string Alias { get; set; } + + /// + /// Gets or sets the option name + /// + [DataMember] + public string Name { get; set; } + + /// + /// Gets or sets the media file id + /// + [DataMember] + public int MediaFileId { get; set; } + + /// + /// Gets or sets the color RGB value (used with "Boxes" attribute type) + /// + [DataMember] + public string Color { get; set; } + + /// + /// Gets or sets the price adjustment + /// + [DataMember] + public decimal PriceAdjustment { get; set; } + + /// + /// Gets or sets the weight adjustment + /// + [DataMember] + public decimal WeightAdjustment { get; set; } + + /// + /// Gets or sets a value indicating whether the option is pre-selected + /// + [DataMember] + public bool IsPreSelected { get; set; } + + /// + /// Gets or sets the display order + /// + [DataMember] + public int DisplayOrder { get; set; } + + /// + /// Gets or sets the type Id + /// + [DataMember] + public int ValueTypeId { get; set; } + + /// + /// Gets or sets the linked product Id + /// + [DataMember] + public int LinkedProductId { get; set; } + + /// + /// Gets or sets the quantity for the linked product + /// + [DataMember] + public int Quantity { get; set; } + + /// + /// Gets the product attribute options set + /// + [DataMember] + public virtual ProductAttributeOptionsSet ProductAttributeOptionsSet { get; set; } + + /// + /// Gets or sets the product attribute value type + /// + [DataMember] + public ProductVariantAttributeValueType ValueType + { + get => (ProductVariantAttributeValueType)this.ValueTypeId; + set => this.ValueTypeId = (int)value; + } + + public ProductVariantAttributeValue Clone() + { + var value = new ProductVariantAttributeValue(); + value.Alias = Alias; + value.Name = Name; + value.MediaFileId = MediaFileId; + value.Color = Color; + value.PriceAdjustment = PriceAdjustment; + value.WeightAdjustment = WeightAdjustment; + value.IsPreSelected = IsPreSelected; + value.DisplayOrder = DisplayOrder; + value.ValueTypeId = ValueTypeId; + value.LinkedProductId = LinkedProductId; + value.Quantity = Quantity; + + return value; + } + + object ICloneable.Clone() + { + return this.Clone(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttributeOptionsSet.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttributeOptionsSet.cs index c6819334d2..4dcbac9d0d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttributeOptionsSet.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttributeOptionsSet.cs @@ -3,37 +3,37 @@ namespace SmartStore.Core.Domain.Catalog { - [DataContract] - public partial class ProductAttributeOptionsSet : BaseEntity - { - private ICollection _productAttributeOptions; + [DataContract] + public partial class ProductAttributeOptionsSet : BaseEntity + { + private ICollection _productAttributeOptions; - /// - /// Gets or sets the name - /// - [DataMember] - public string Name { get; set; } + /// + /// Gets or sets the name + /// + [DataMember] + public string Name { get; set; } - /// - /// Gets or sets the product attribute identifier - /// - [DataMember] - public int ProductAttributeId { get; set; } + /// + /// Gets or sets the product attribute identifier + /// + [DataMember] + public int ProductAttributeId { get; set; } - /// - /// Gets the product attribute - /// - [DataMember] - public virtual ProductAttribute ProductAttribute { get; set; } + /// + /// Gets the product attribute + /// + [DataMember] + public virtual ProductAttribute ProductAttribute { get; set; } - /// - /// Gets or sets the prooduct attribute options - /// - [DataMember] - public virtual ICollection ProductAttributeOptions - { - get { return _productAttributeOptions ?? (_productAttributeOptions = new HashSet()); } - protected set { _productAttributeOptions = value; } - } - } + /// + /// Gets or sets the prooduct attribute options + /// + [DataMember] + public virtual ICollection ProductAttributeOptions + { + get => _productAttributeOptions ?? (_productAttributeOptions = new HashSet()); + protected set => _productAttributeOptions = value; + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleData.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleData.cs index 60373a2d15..ea7b41f44c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleData.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleData.cs @@ -1,29 +1,29 @@ namespace SmartStore.Core.Domain.Catalog { public partial class ProductBundleItemData - { - public ProductBundleItemData(ProductBundleItem item) - { - Item = item; // Can be null. - } + { + public ProductBundleItemData(ProductBundleItem item) + { + Item = item; // Can be null. + } - public ProductBundleItem Item { get; private set; } - public decimal AdditionalCharge { get; set; } - } + public ProductBundleItem Item { get; private set; } + public decimal AdditionalCharge { get; set; } + } - public partial class ProductBundleItemOrderData - { - public int BundleItemId { get; set; } - public int ProductId { get; set; } - public string Sku { get; set; } - public string ProductName { get; set; } - public string ProductSeName { get; set; } - public bool VisibleIndividually { get; set; } - public int Quantity { get; set; } - public decimal PriceWithDiscount { get; set; } - public int DisplayOrder { get; set; } - public string AttributesXml { get; set; } - public string AttributesInfo { get; set; } - public bool PerItemShoppingCart { get; set; } - } + public partial class ProductBundleItemOrderData + { + public int BundleItemId { get; set; } + public int ProductId { get; set; } + public string Sku { get; set; } + public string ProductName { get; set; } + public string ProductSeName { get; set; } + public bool VisibleIndividually { get; set; } + public int Quantity { get; set; } + public decimal PriceWithDiscount { get; set; } + public int DisplayOrder { get; set; } + public string AttributesXml { get; set; } + public string AttributesInfo { get; set; } + public bool PerItemShoppingCart { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleItem.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleItem.cs index 38865d9b70..923e1681e7 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleItem.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleItem.cs @@ -5,141 +5,141 @@ namespace SmartStore.Core.Domain.Catalog { - [DataContract] - public partial class ProductBundleItem : BaseEntity, IAuditable, ILocalizedEntity, ICloneable - { - private ICollection _attributeFilters; - - /// - /// Gets or sets the product identifier - /// - [DataMember] - public int ProductId { get; set; } - - /// - /// Gets or sets the product identifier of the bundle product - /// - [DataMember] - public int BundleProductId { get; set; } - - /// - /// Gets or sets the quantity - /// - [DataMember] - public int Quantity { get; set; } - - /// - /// Gets or sets the discount value - /// - [DataMember] - public decimal? Discount { get; set; } - - /// - /// Gets or sets whether the discount is in percent - /// - [DataMember] - public bool DiscountPercentage { get; set; } - - /// - /// Gets or sets the name value - /// - [DataMember] - public string Name { get; set; } - - /// - /// Gets or sets the name value - /// - [DataMember] - public string ShortDescription { get; set; } - - /// - /// Gets or sets a value indicating whether to filter attributes - /// - [DataMember] - public bool FilterAttributes { get; set; } - - /// - /// Gets or sets a value indicating whether to hide the thumbnail - /// - [DataMember] - public bool HideThumbnail { get; set; } - - /// - /// Gets or sets a value indicating whether the item is visible - /// - [DataMember] - public bool Visible { get; set; } - - /// - /// Gets or sets a value indicating whether the entity is published - /// - [DataMember] - public bool Published { get; set; } - - /// - /// Gets or sets a display order - /// - [DataMember] - public int DisplayOrder { get; set; } - - /// - /// Gets or sets the date and time of product bundle item creation - /// - [DataMember] - public DateTime CreatedOnUtc { get; set; } - - /// - /// Gets or sets the date and time of product bundle item update - /// - [DataMember] - public DateTime UpdatedOnUtc { get; set; } - - /// - /// Gets the product - /// - [DataMember] - public virtual Product Product { get; set; } - - /// - /// Gets the bundle product - /// - [DataMember] - public virtual Product BundleProduct { get; set; } - - /// - /// Gets or sets the collection of attribute filters - /// - public virtual ICollection AttributeFilters - { - get { return _attributeFilters ?? (_attributeFilters = new HashSet()); } - protected set { _attributeFilters = value; } - } - - public ProductBundleItem Clone() - { - var bundleItem = new ProductBundleItem - { - ProductId = this.ProductId, - BundleProductId = this.BundleProductId, - Quantity = this.Quantity, - Discount = this.Discount, - DiscountPercentage = this.DiscountPercentage, - Name = this.Name, - ShortDescription = this.ShortDescription, - FilterAttributes = this.FilterAttributes, - HideThumbnail = this.HideThumbnail, - Visible = this.Visible, - Published = this.Published, - DisplayOrder = this.DisplayOrder, - CreatedOnUtc = this.CreatedOnUtc, - UpdatedOnUtc = this.UpdatedOnUtc - }; - return bundleItem; - } - - object ICloneable.Clone() - { - return this.Clone(); - } - } + [DataContract] + public partial class ProductBundleItem : BaseEntity, IAuditable, ILocalizedEntity, ICloneable + { + private ICollection _attributeFilters; + + /// + /// Gets or sets the product identifier + /// + [DataMember] + public int ProductId { get; set; } + + /// + /// Gets or sets the product identifier of the bundle product + /// + [DataMember] + public int BundleProductId { get; set; } + + /// + /// Gets or sets the quantity + /// + [DataMember] + public int Quantity { get; set; } + + /// + /// Gets or sets the discount value + /// + [DataMember] + public decimal? Discount { get; set; } + + /// + /// Gets or sets whether the discount is in percent + /// + [DataMember] + public bool DiscountPercentage { get; set; } + + /// + /// Gets or sets the name value + /// + [DataMember] + public string Name { get; set; } + + /// + /// Gets or sets the name value + /// + [DataMember] + public string ShortDescription { get; set; } + + /// + /// Gets or sets a value indicating whether to filter attributes + /// + [DataMember] + public bool FilterAttributes { get; set; } + + /// + /// Gets or sets a value indicating whether to hide the thumbnail + /// + [DataMember] + public bool HideThumbnail { get; set; } + + /// + /// Gets or sets a value indicating whether the item is visible + /// + [DataMember] + public bool Visible { get; set; } + + /// + /// Gets or sets a value indicating whether the entity is published + /// + [DataMember] + public bool Published { get; set; } + + /// + /// Gets or sets a display order + /// + [DataMember] + public int DisplayOrder { get; set; } + + /// + /// Gets or sets the date and time of product bundle item creation + /// + [DataMember] + public DateTime CreatedOnUtc { get; set; } + + /// + /// Gets or sets the date and time of product bundle item update + /// + [DataMember] + public DateTime UpdatedOnUtc { get; set; } + + /// + /// Gets the product + /// + [DataMember] + public virtual Product Product { get; set; } + + /// + /// Gets the bundle product + /// + [DataMember] + public virtual Product BundleProduct { get; set; } + + /// + /// Gets or sets the collection of attribute filters + /// + public virtual ICollection AttributeFilters + { + get => _attributeFilters ?? (_attributeFilters = new HashSet()); + protected set => _attributeFilters = value; + } + + public ProductBundleItem Clone() + { + var bundleItem = new ProductBundleItem + { + ProductId = this.ProductId, + BundleProductId = this.BundleProductId, + Quantity = this.Quantity, + Discount = this.Discount, + DiscountPercentage = this.DiscountPercentage, + Name = this.Name, + ShortDescription = this.ShortDescription, + FilterAttributes = this.FilterAttributes, + HideThumbnail = this.HideThumbnail, + Visible = this.Visible, + Published = this.Published, + DisplayOrder = this.DisplayOrder, + CreatedOnUtc = this.CreatedOnUtc, + UpdatedOnUtc = this.UpdatedOnUtc + }; + return bundleItem; + } + + object ICloneable.Clone() + { + return this.Clone(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleItemAttributeFilter.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleItemAttributeFilter.cs index e7ecba5eb3..0a6db35734 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleItemAttributeFilter.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleItemAttributeFilter.cs @@ -2,48 +2,48 @@ namespace SmartStore.Core.Domain.Catalog { - public partial class ProductBundleItemAttributeFilter : BaseEntity, ICloneable - { - /// - /// Gets or sets the product bundle item identifier - /// - public int BundleItemId { get; set; } + public partial class ProductBundleItemAttributeFilter : BaseEntity, ICloneable + { + /// + /// Gets or sets the product bundle item identifier + /// + public int BundleItemId { get; set; } - /// - /// Gets or sets the product attribute identifier - /// - public int AttributeId { get; set; } + /// + /// Gets or sets the product attribute identifier + /// + public int AttributeId { get; set; } - /// - /// Gets or sets the product attribute value identifier - /// - public int AttributeValueId { get; set; } + /// + /// Gets or sets the product attribute value identifier + /// + public int AttributeValueId { get; set; } - /// - /// Gets or sets whether the filtered value is preselected - /// - public bool IsPreSelected { get; set; } + /// + /// Gets or sets whether the filtered value is preselected + /// + public bool IsPreSelected { get; set; } - /// - /// Gets the product bundle item - /// - public virtual ProductBundleItem BundleItem { get; set; } + /// + /// Gets the product bundle item + /// + public virtual ProductBundleItem BundleItem { get; set; } - public ProductBundleItemAttributeFilter Clone() - { - var filter = new ProductBundleItemAttributeFilter() - { - BundleItemId = this.BundleItemId, - AttributeId = this.AttributeId, - AttributeValueId = this.AttributeValueId, - IsPreSelected = this.IsPreSelected - }; - return filter; - } + public ProductBundleItemAttributeFilter Clone() + { + var filter = new ProductBundleItemAttributeFilter() + { + BundleItemId = this.BundleItemId, + AttributeId = this.AttributeId, + AttributeValueId = this.AttributeValueId, + IsPreSelected = this.IsPreSelected + }; + return filter; + } - object ICloneable.Clone() - { - return this.Clone(); - } - } + object ICloneable.Clone() + { + return this.Clone(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs index 73d59fe51e..1d027e15b4 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs @@ -13,19 +13,19 @@ public partial class ProductCategory : BaseEntity /// Gets or sets the product identifier /// [DataMember] - public int ProductId { get; set; } + public int ProductId { get; set; } /// /// Gets or sets the category identifier /// [DataMember] - public int CategoryId { get; set; } + public int CategoryId { get; set; } /// /// Gets or sets a value indicating whether the product is featured /// [DataMember] - [Index] + [Index] public bool IsFeaturedProduct { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs index 73edaec790..88babcda90 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs @@ -3,36 +3,36 @@ namespace SmartStore.Core.Domain.Catalog { - /// - /// Represents a product manufacturer mapping - /// - [DataContract] - public partial class ProductManufacturer : BaseEntity + /// + /// Represents a product manufacturer mapping + /// + [DataContract] + public partial class ProductManufacturer : BaseEntity { /// /// Gets or sets the product identifier /// [DataMember] - public int ProductId { get; set; } + public int ProductId { get; set; } /// /// Gets or sets the manufacturer identifier /// [DataMember] - public int ManufacturerId { get; set; } + public int ManufacturerId { get; set; } /// /// Gets or sets a value indicating whether the product is featured /// [DataMember] - [Index] - public bool IsFeaturedProduct { get; set; } + [Index] + public bool IsFeaturedProduct { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } /// /// Gets or sets the manufacturer diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs index d40236f0a5..ad7175b88e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs @@ -26,26 +26,26 @@ public interface IMediaFile /// Represents a product media file mapping /// [DataContract] - public partial class ProductMediaFile : BaseEntity, IMediaFile + public partial class ProductMediaFile : BaseEntity, IMediaFile { /// /// Gets or sets the product identifier /// [DataMember] - public int ProductId { get; set; } + public int ProductId { get; set; } /// /// Gets or sets the picture identifier /// [DataMember] - public int MediaFileId { get; set; } + public int MediaFileId { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } - + public int DisplayOrder { get; set; } + /// /// Gets the media file diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductReview.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductReview.cs index eb52702201..7d45b1e756 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductReview.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductReview.cs @@ -50,8 +50,8 @@ public partial class ProductReview : CustomerContent /// public virtual ICollection ProductReviewHelpfulnessEntries { - get { return _productReviewHelpfulnessEntries ?? (_productReviewHelpfulnessEntries = new HashSet()); } - protected set { _productReviewHelpfulnessEntries = value; } + get => _productReviewHelpfulnessEntries ?? (_productReviewHelpfulnessEntries = new HashSet()); + protected set => _productReviewHelpfulnessEntries = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSortingEnum.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSortingEnum.cs index 1440fd556f..4d4de9397e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSortingEnum.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSortingEnum.cs @@ -10,10 +10,10 @@ public enum ProductSortingEnum /// Initial = 0, - /// - /// Relevance - /// - Relevance = 1, + /// + /// Relevance + /// + Relevance = 1, /// /// Name: A to Z diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSpecificationAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSpecificationAttribute.cs index eb8595b3af..b168833a78 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSpecificationAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSpecificationAttribute.cs @@ -6,38 +6,38 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a product specification attribute /// [DataContract] - public partial class ProductSpecificationAttribute : BaseEntity + public partial class ProductSpecificationAttribute : BaseEntity { /// /// Gets or sets the product identifier /// [DataMember] - public int ProductId { get; set; } + public int ProductId { get; set; } /// /// Gets or sets the specification attribute identifier /// [DataMember] - public int SpecificationAttributeOptionId { get; set; } + public int SpecificationAttributeOptionId { get; set; } - /// - /// Gets or sets whether the attribute can be filtered. Only effective in accordance with MegaSearchPlus plugin. - /// - [DataMember] - public bool? AllowFiltering { get; set; } + /// + /// Gets or sets whether the attribute can be filtered. Only effective in accordance with MegaSearchPlus plugin. + /// + [DataMember] + public bool? AllowFiltering { get; set; } /// /// Gets or sets whether the attribute will be shown on the product page. /// [DataMember] - public bool? ShowOnProductPage { get; set; } + public bool? ShowOnProductPage { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } - + public int DisplayOrder { get; set; } + /// /// Gets or sets the product /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs index c2563fcfd2..ace86b58ef 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs @@ -9,15 +9,15 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a product tag. /// [DataContract] - public partial class ProductTag : BaseEntity, ILocalizedEntity + public partial class ProductTag : BaseEntity, ILocalizedEntity { - private ICollection _products; + private ICollection _products; /// /// Gets or sets the name. /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets a value indicating whether the entity is published. @@ -30,9 +30,9 @@ public partial class ProductTag : BaseEntity, ILocalizedEntity /// Gets or sets the products. /// public virtual ICollection Products - { - get { return _products ?? (_products = new HashSet()); } - protected set { _products = value; } - } + { + get => _products ?? (_products = new HashSet()); + protected set => _products = value; + } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductType.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductType.cs index bf71926304..267c7a8b54 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductType.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductType.cs @@ -1,24 +1,24 @@  namespace SmartStore.Core.Domain.Catalog { - /// - /// Represents a product type - /// - public enum ProductType - { - /// - /// Simple product - /// - SimpleProduct = 5, + /// + /// Represents a product type + /// + public enum ProductType + { + /// + /// Simple product + /// + SimpleProduct = 5, - /// - /// Grouped product - /// - GroupedProduct = 10, + /// + /// Grouped product + /// + GroupedProduct = 10, - /// - /// Bundled product - /// - BundledProduct = 15 - } + /// + /// Bundled product + /// + BundledProduct = 15 + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs index 96a9e5367b..4756e4d513 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs @@ -9,98 +9,92 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a product variant attribute mapping /// [DataContract] - public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity - { + public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity + { private ICollection _productVariantAttributeValues; /// /// Gets or sets the product identifier /// [DataMember] - [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 1)] - public int ProductId { get; set; } + [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 1)] + public int ProductId { get; set; } /// /// Gets or sets the product attribute identifier /// [DataMember] - public int ProductAttributeId { get; set; } + public int ProductAttributeId { get; set; } /// /// Gets or sets a value a text prompt /// [DataMember] - public string TextPrompt { get; set; } + public string TextPrompt { get; set; } /// /// Gets or sets a value indicating whether the entity is required /// [DataMember] - public bool IsRequired { get; set; } + public bool IsRequired { get; set; } /// /// Gets or sets the attribute control type identifier /// [DataMember] - [Index] - public int AttributeControlTypeId { get; set; } + [Index] + public int AttributeControlTypeId { get; set; } /// /// Gets or sets the display order /// [DataMember] - [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 2)] - public int DisplayOrder { get; set; } + [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 2)] + public int DisplayOrder { get; set; } /// /// Gets the attribute control type /// [DataMember] - public AttributeControlType AttributeControlType + public AttributeControlType AttributeControlType { - get - { - return (AttributeControlType)this.AttributeControlTypeId; - } - set + get => (AttributeControlType)this.AttributeControlTypeId; + set => this.AttributeControlTypeId = (int)value; + } + + public bool IsListTypeAttribute() + { + switch (AttributeControlType) { - this.AttributeControlTypeId = (int)value; + case AttributeControlType.Checkboxes: + case AttributeControlType.Boxes: + case AttributeControlType.DropdownList: + case AttributeControlType.RadioList: + return true; + default: + return false; } } - public bool IsListTypeAttribute() - { - switch (AttributeControlType) - { - case AttributeControlType.Checkboxes: - case AttributeControlType.Boxes: - case AttributeControlType.DropdownList: - case AttributeControlType.RadioList: - return true; - default: - return false; - } - } - /// /// Gets the product attribute /// [DataMember] - public virtual ProductAttribute ProductAttribute { get; set; } + public virtual ProductAttribute ProductAttribute { get; set; } /// /// Gets the product /// public virtual Product Product { get; set; } - + /// /// Gets the product variant attribute values /// - [DataMember] - public virtual ICollection ProductVariantAttributeValues + [DataMember] + public virtual ICollection ProductVariantAttributeValues { - get { return _productVariantAttributeValues ?? (_productVariantAttributeValues = new HashSet()); } - protected set { _productVariantAttributeValues = value; } + get => _productVariantAttributeValues ?? (_productVariantAttributeValues = new HashSet()); + protected set => _productVariantAttributeValues = value; } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs index e34724a820..415f79ed7f 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs @@ -5,35 +5,35 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a product variant attribute combination /// [DataContract] - public partial class ProductVariantAttributeCombination : BaseEntity + public partial class ProductVariantAttributeCombination : BaseEntity { /// /// Gets or sets the product identifier /// [DataMember] - public int ProductId { get; set; } + public int ProductId { get; set; } /// /// Gets or sets the attributes /// [DataMember] - public string AttributesXml { get; set; } + public string AttributesXml { get; set; } /// /// Gets or sets the stock quantity /// [DataMember] - public int StockQuantity { get; set; } + public int StockQuantity { get; set; } /// /// Gets or sets a value indicating whether to allow orders when out of stock /// [DataMember] - public bool AllowOutOfStockOrders { get; set; } - + public bool AllowOutOfStockOrders { get; set; } + /// /// Gets the product /// - public virtual Product Product { get; set; } + public virtual Product Product { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs index dc9a6b0a77..7804a7f972 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs @@ -1,7 +1,6 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; using SmartStore.Core.Domain.Localization; -using SmartStore.Core.Domain.Media; using SmartStore.Core.Search; namespace SmartStore.Core.Domain.Catalog @@ -10,27 +9,27 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a product variant attribute value /// [DataContract] - public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity, ISearchAlias - { + public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity, ISearchAlias + { /// /// Gets or sets the product variant attribute mapping identifier /// [DataMember] - [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 1)] - public int ProductVariantAttributeId { get; set; } + [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 1)] + public int ProductVariantAttributeId { get; set; } /// /// Gets or sets the product variant attribute alias /// [DataMember] - public string Alias { get; set; } + public string Alias { get; set; } /// /// Gets or sets the product variant attribute name /// [DataMember] - [Index] - public string Name { get; set; } + [Index] + public string Name { get; set; } /// /// Gets or sets the media file id @@ -38,75 +37,69 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity [DataMember] public int MediaFileId { get; set; } - /// - /// Gets or sets the color RGB value (used with "Boxes" attribute type) - /// - [DataMember] - public string Color { get; set; } + /// + /// Gets or sets the color RGB value (used with "Boxes" attribute type) + /// + [DataMember] + public string Color { get; set; } /// /// Gets or sets the price adjustment /// [DataMember] - public decimal PriceAdjustment { get; set; } + public decimal PriceAdjustment { get; set; } /// /// Gets or sets the weight adjustment /// [DataMember] - public decimal WeightAdjustment { get; set; } + public decimal WeightAdjustment { get; set; } /// /// Gets or sets a value indicating whether the value is pre-selected /// [DataMember] - public bool IsPreSelected { get; set; } + public bool IsPreSelected { get; set; } /// /// Gets or sets the display order /// [DataMember] - [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 2)] - public int DisplayOrder { get; set; } + [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 2)] + public int DisplayOrder { get; set; } - /// - /// Gets or sets the type Id - /// - [DataMember] - [Index] - public int ValueTypeId { get; set; } + /// + /// Gets or sets the type Id + /// + [DataMember] + [Index] + public int ValueTypeId { get; set; } - /// - /// Gets or sets the linked product Id - /// - [DataMember] - public int LinkedProductId { get; set; } + /// + /// Gets or sets the linked product Id + /// + [DataMember] + public int LinkedProductId { get; set; } - /// - /// Gets or sets the quantity for the linked product - /// - [DataMember] - public int Quantity { get; set; } + /// + /// Gets or sets the quantity for the linked product + /// + [DataMember] + public int Quantity { get; set; } /// /// Gets the product variant attribute /// [DataMember] - public virtual ProductVariantAttribute ProductVariantAttribute { get; set; } + public virtual ProductVariantAttribute ProductVariantAttribute { get; set; } - /// - /// Gets or sets the product attribute value type - /// - public ProductVariantAttributeValueType ValueType - { - get - { - return (ProductVariantAttributeValueType)this.ValueTypeId; - } - set - { - this.ValueTypeId = (int)value; - } - } + /// + /// Gets or sets the product attribute value type + /// + public ProductVariantAttributeValueType ValueType + { + get => (ProductVariantAttributeValueType)this.ValueTypeId; + set => this.ValueTypeId = (int)value; + } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValueType.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValueType.cs index 9fbde986e9..e6e7b67256 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValueType.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValueType.cs @@ -1,9 +1,9 @@  namespace SmartStore.Core.Domain.Catalog { - public enum ProductVariantAttributeValueType - { - Simple = 0, - ProductLinkage = 10 - } + public enum ProductVariantAttributeValueType + { + Simple = 0, + ProductLinkage = 10 + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/RelatedProduct.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/RelatedProduct.cs index a22ae92c6a..f523da1c4b 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/RelatedProduct.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/RelatedProduct.cs @@ -5,25 +5,25 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a related product /// [DataContract] - public partial class RelatedProduct : BaseEntity + public partial class RelatedProduct : BaseEntity { /// /// Gets or sets the first product identifier /// [DataMember] - public int ProductId1 { get; set; } + public int ProductId1 { get; set; } /// /// Gets or sets the second product identifier /// [DataMember] - public int ProductId2 { get; set; } + public int ProductId2 { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs index 5cd7c6b224..9b3a3c6463 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs @@ -1,8 +1,8 @@ using System; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; -using SmartStore.Core.Domain.Directory; using System.Runtime.Serialization; -using System.ComponentModel.DataAnnotations.Schema; +using SmartStore.Core.Domain.Directory; namespace SmartStore.Core.Domain.Catalog { @@ -16,42 +16,42 @@ public ProductVariantAttributeCombination() this.IsActive = true; } - [DataMember] + [DataMember] public string Sku { get; set; } - [DataMember] + [DataMember] [Index] - public string Gtin { get; set; } + public string Gtin { get; set; } - [DataMember] + [DataMember] [Index] public string ManufacturerPartNumber { get; set; } - [DataMember] - public decimal? Price { get; set; } + [DataMember] + public decimal? Price { get; set; } - [DataMember] - public decimal? Length { get; set; } + [DataMember] + public decimal? Length { get; set; } - [DataMember] - public decimal? Width { get; set; } + [DataMember] + public decimal? Width { get; set; } - [DataMember] - public decimal? Height { get; set; } + [DataMember] + public decimal? Height { get; set; } - [DataMember] - public decimal? BasePriceAmount { get; set; } + [DataMember] + public decimal? BasePriceAmount { get; set; } - [DataMember] - public int? BasePriceBaseAmount { get; set; } + [DataMember] + public int? BasePriceBaseAmount { get; set; } - [DataMember] + [DataMember] public string AssignedMediaFileIds { get; set; } - [DataMember] + [DataMember] public int? DeliveryTimeId { get; set; } - [DataMember] + [DataMember] public virtual DeliveryTime DeliveryTime { get; set; } [DataMember] @@ -60,10 +60,10 @@ public ProductVariantAttributeCombination() [DataMember] public virtual QuantityUnit QuantityUnit { get; set; } - [DataMember] + [DataMember] [Index] public bool IsActive { get; set; } - //public bool IsDefaultCombination { get; set; } + //public bool IsDefaultCombination { get; set; } public int[] GetAssignedMediaIds() { diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs index c5dd44386d..f867f81ff7 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs @@ -7,56 +7,56 @@ namespace SmartStore.Core.Domain.Catalog { - /// - /// Represents a specification attribute - /// - [DataContract] - public partial class SpecificationAttribute : BaseEntity, ILocalizedEntity, ISearchAlias - { + /// + /// Represents a specification attribute + /// + [DataContract] + public partial class SpecificationAttribute : BaseEntity, ILocalizedEntity, ISearchAlias + { private ICollection _specificationAttributeOptions; /// /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } - /// - /// Gets or sets the specification attribute alias - /// - [DataMember] - public string Alias { get; set; } + /// + /// Gets or sets the specification attribute alias + /// + [DataMember] + public string Alias { get; set; } - /// - /// Gets or sets the display order - /// - [DataMember] - public int DisplayOrder { get; set; } + /// + /// Gets or sets the display order + /// + [DataMember] + public int DisplayOrder { get; set; } - /// - /// Gets or sets whether the specification attribute will be shown on the product page. - /// - [DataMember] - public bool ShowOnProductPage { get; set; } + /// + /// Gets or sets whether the specification attribute will be shown on the product page. + /// + [DataMember] + public bool ShowOnProductPage { get; set; } - /// - /// Gets or sets whether the specification attribute can be filtered. Only effective in accordance with MegaSearchPlus plugin. - /// - [DataMember] - [Index] - public bool AllowFiltering { get; set; } + /// + /// Gets or sets whether the specification attribute can be filtered. Only effective in accordance with MegaSearchPlus plugin. + /// + [DataMember] + [Index] + public bool AllowFiltering { get; set; } - /// - /// Gets or sets the sorting of facets. Only effective in accordance with MegaSearchPlus plugin. - /// - [DataMember] - public FacetSorting FacetSorting { get; set; } + /// + /// Gets or sets the sorting of facets. Only effective in accordance with MegaSearchPlus plugin. + /// + [DataMember] + public FacetSorting FacetSorting { get; set; } - /// - /// Gets or sets the facet template hint. Only effective in accordance with MegaSearchPlus plugin. - /// - [DataMember] - public FacetTemplateHint FacetTemplateHint { get; set; } + /// + /// Gets or sets the facet template hint. Only effective in accordance with MegaSearchPlus plugin. + /// + [DataMember] + public FacetTemplateHint FacetTemplateHint { get; set; } /// /// Specifies whether option names should be included in the search index. Only effective in accordance with MegaSearchPlus plugin. @@ -68,10 +68,10 @@ public partial class SpecificationAttribute : BaseEntity, ILocalizedEntity, ISea /// Gets or sets the specification attribute options /// [DataMember] - public virtual ICollection SpecificationAttributeOptions + public virtual ICollection SpecificationAttributeOptions { - get { return _specificationAttributeOptions ?? (_specificationAttributeOptions = new HashSet()); } - protected set { _specificationAttributeOptions = value; } + get => _specificationAttributeOptions ?? (_specificationAttributeOptions = new HashSet()); + protected set => _specificationAttributeOptions = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttributeOption.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttributeOption.cs index 1e7fbbdf12..01089452b4 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttributeOption.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttributeOption.cs @@ -1,48 +1,47 @@ using System.Collections.Generic; using System.Runtime.Serialization; using SmartStore.Core.Domain.Localization; -using SmartStore.Core.Domain.Media; using SmartStore.Core.Search; namespace SmartStore.Core.Domain.Catalog { - /// - /// Represents a specification attribute option - /// - [DataContract] - public partial class SpecificationAttributeOption : BaseEntity, ILocalizedEntity, ISearchAlias - { + /// + /// Represents a specification attribute option + /// + [DataContract] + public partial class SpecificationAttributeOption : BaseEntity, ILocalizedEntity, ISearchAlias + { private ICollection _productSpecificationAttributes; /// /// Gets or sets the specification attribute identifier /// [DataMember] - public int SpecificationAttributeId { get; set; } + public int SpecificationAttributeId { get; set; } /// /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } - /// - /// Gets or sets the specification attribute option alias - /// - [DataMember] - public string Alias { get; set; } + /// + /// Gets or sets the specification attribute option alias + /// + [DataMember] + public string Alias { get; set; } - /// - /// Gets or sets the display order - /// - [DataMember] - public int DisplayOrder { get; set; } + /// + /// Gets or sets the display order + /// + [DataMember] + public int DisplayOrder { get; set; } - /// - /// Gets or sets the number value for range filtering - /// - [DataMember] - public decimal NumberValue { get; set; } + /// + /// Gets or sets the number value for range filtering + /// + [DataMember] + public decimal NumberValue { get; set; } /// /// Gets or sets the media file id. @@ -50,26 +49,26 @@ public partial class SpecificationAttributeOption : BaseEntity, ILocalizedEntity [DataMember] public int MediaFileId { get; set; } - /// - /// Gets or sets the color RGB value. - /// - [DataMember] + /// + /// Gets or sets the color RGB value. + /// + [DataMember] public string Color { get; set; } /// /// Gets or sets the specification attribute /// [DataMember] - public virtual SpecificationAttribute SpecificationAttribute { get; set; } + public virtual SpecificationAttribute SpecificationAttribute { get; set; } /// /// Gets or sets the product specification attributes /// [DataMember] - public virtual ICollection ProductSpecificationAttributes + public virtual ICollection ProductSpecificationAttributes { - get { return _productSpecificationAttributes ?? (_productSpecificationAttributes = new HashSet()); } - protected set { _productSpecificationAttributes = value; } + get => _productSpecificationAttributes ?? (_productSpecificationAttributes = new HashSet()); + protected set => _productSpecificationAttributes = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/TierPrice.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/TierPrice.cs index 7186b46490..8458fb7f3f 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/TierPrice.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/TierPrice.cs @@ -7,37 +7,37 @@ namespace SmartStore.Core.Domain.Catalog /// Represents a tier price /// [DataContract] - public partial class TierPrice : BaseEntity + public partial class TierPrice : BaseEntity { /// /// Gets or sets the product identifier /// [DataMember] - public int ProductId { get; set; } + public int ProductId { get; set; } - /// - /// Gets or sets the store identifier (0 - all stores) - /// - [DataMember] - public int StoreId { get; set; } + /// + /// Gets or sets the store identifier (0 - all stores) + /// + [DataMember] + public int StoreId { get; set; } /// /// Gets or sets the customer role identifier /// [DataMember] - public int? CustomerRoleId { get; set; } + public int? CustomerRoleId { get; set; } /// /// Gets or sets the quantity /// [DataMember] - public int Quantity { get; set; } + public int Quantity { get; set; } /// /// Gets or sets the price /// [DataMember] - public decimal Price { get; set; } + public decimal Price { get; set; } /// /// Gets or sets the product diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs index c8ebedf1c1..19dfe6e581 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs @@ -22,8 +22,8 @@ public class MenuRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupported, /// public virtual ICollection Items { - get { return _items ?? (_items = new HashSet()); } - protected set { _items = value; } + get => _items ?? (_items = new HashSet()); + protected set => _items = value; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/WidgetSettings.cs b/src/Libraries/SmartStore.Core/Domain/Cms/WidgetSettings.cs index 56aa6440a8..0284038e3e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/WidgetSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/WidgetSettings.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using SmartStore.Core.Configuration; - + namespace SmartStore.Core.Domain.Cms { public class WidgetSettings : ISettings diff --git a/src/Libraries/SmartStore.Core/Domain/Common/Address.cs b/src/Libraries/SmartStore.Core/Domain/Common/Address.cs index c4723d0e6e..ab85c7d04b 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/Address.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/Address.cs @@ -1,11 +1,11 @@ using System; -using SmartStore.Core.Domain.Directory; using System.Runtime.Serialization; +using SmartStore.Core.Domain.Directory; namespace SmartStore.Core.Domain.Common { - [DataContract] - public class Address : BaseEntity, ICloneable + [DataContract] + public class Address : BaseEntity, ICloneable { /// /// Gets or sets the first name @@ -23,91 +23,91 @@ public class Address : BaseEntity, ICloneable /// Gets or sets the first name /// [DataMember] - public string FirstName { get; set; } + public string FirstName { get; set; } /// /// Gets or sets the last name /// [DataMember] - public string LastName { get; set; } + public string LastName { get; set; } /// /// Gets or sets the email /// [DataMember] - public string Email { get; set; } + public string Email { get; set; } /// /// Gets or sets the company /// [DataMember] - public string Company { get; set; } + public string Company { get; set; } /// /// Gets or sets the country identifier /// [DataMember] - public int? CountryId { get; set; } + public int? CountryId { get; set; } /// /// Gets or sets the state/province identifier /// [DataMember] - public int? StateProvinceId { get; set; } - + public int? StateProvinceId { get; set; } + /// /// Gets or sets the city /// - [DataMember] - public string City { get; set; } + [DataMember] + public string City { get; set; } /// /// Gets or sets the address 1 /// [DataMember] - public string Address1 { get; set; } + public string Address1 { get; set; } /// /// Gets or sets the address 2 /// [DataMember] - public string Address2 { get; set; } + public string Address2 { get; set; } /// /// Gets or sets the zip/postal code /// [DataMember] - public string ZipPostalCode { get; set; } + public string ZipPostalCode { get; set; } /// /// Gets or sets the phone number /// [DataMember] - public string PhoneNumber { get; set; } + public string PhoneNumber { get; set; } /// /// Gets or sets the fax number /// [DataMember] - public string FaxNumber { get; set; } + public string FaxNumber { get; set; } /// /// Gets or sets the date and time of instance creation /// [DataMember] - public DateTime CreatedOnUtc { get; set; } - + public DateTime CreatedOnUtc { get; set; } + /// /// Gets or sets the country /// - [DataMember] - public virtual Country Country { get; set; } + [DataMember] + public virtual Country Country { get; set; } /// /// Gets or sets the state/province /// [DataMember] - public virtual StateProvince StateProvince { get; set; } + public virtual StateProvince StateProvince { get; set; } public object Clone() { @@ -134,17 +134,11 @@ public object Clone() return addr; } - public static string DefaultAddressFormat - { - get - { - return @"{{ Salutation }} {{ Title }} {{ FirstName }} {{ LastName }} + public static string DefaultAddressFormat => @"{{ Salutation }} {{ Title }} {{ FirstName }} {{ LastName }} {{ Company }} {{ Street1 }} {{ Street2 }} {{ ZipCode }} {{ City }} {{ Country | Upcase }}"; - } - } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Common/AddressSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/AddressSettings.cs index 9970106a28..32eec46007 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/AddressSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/AddressSettings.cs @@ -1,27 +1,26 @@ using SmartStore.Core.Configuration; -using SmartStore.Core.Domain.Localization; namespace SmartStore.Core.Domain.Common { public class AddressSettings : ISettings { - public AddressSettings() - { - CompanyEnabled = true; - StreetAddressEnabled = true; - StreetAddressRequired = true; - StreetAddress2Enabled = true; - ZipPostalCodeEnabled = true; - ZipPostalCodeRequired = true; - CityEnabled = true; - CityRequired = true; - CountryEnabled = true; - CountryRequired = true; - StateProvinceEnabled = true; - PhoneEnabled = true; - PhoneRequired = true; - FaxEnabled = true; - } + public AddressSettings() + { + CompanyEnabled = true; + StreetAddressEnabled = true; + StreetAddressRequired = true; + StreetAddress2Enabled = true; + ZipPostalCodeEnabled = true; + ZipPostalCodeRequired = true; + CityEnabled = true; + CityRequired = true; + CountryEnabled = true; + CountryRequired = true; + StateProvinceEnabled = true; + PhoneEnabled = true; + PhoneRequired = true; + FaxEnabled = true; + } /// /// Gets or sets a value indicating whether email address should be validated @@ -43,7 +42,7 @@ public AddressSettings() /// public bool TitleEnabled { get; set; } - /// + /// /// Gets or sets a value indicating whether 'Company' is enabled /// public bool CompanyEnabled { get; set; } @@ -93,25 +92,25 @@ public AddressSettings() /// public bool CountryEnabled { get; set; } - /// - /// Gets or sets a value indicating whether 'Country' is required - /// - public bool CountryRequired { get; set; } - - /// - /// Gets or sets a value indicating whether 'State / province' is enabled - /// - public bool StateProvinceEnabled { get; set; } - - /// - /// Gets or sets a value indicating whether 'State / province' is required - /// - public bool StateProvinceRequired { get; set; } - - /// - /// Gets or sets a value indicating whether 'Phone number' is enabled - /// - public bool PhoneEnabled { get; set; } + /// + /// Gets or sets a value indicating whether 'Country' is required + /// + public bool CountryRequired { get; set; } + + /// + /// Gets or sets a value indicating whether 'State / province' is enabled + /// + public bool StateProvinceEnabled { get; set; } + + /// + /// Gets or sets a value indicating whether 'State / province' is required + /// + public bool StateProvinceRequired { get; set; } + + /// + /// Gets or sets a value indicating whether 'Phone number' is enabled + /// + public bool PhoneEnabled { get; set; } /// /// Gets or sets a value indicating whether 'Phone number' is required /// diff --git a/src/Libraries/SmartStore.Core/Domain/Common/AdminAreaSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/AdminAreaSettings.cs index 466c1bbe79..67c4aad894 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/AdminAreaSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/AdminAreaSettings.cs @@ -5,13 +5,13 @@ namespace SmartStore.Core.Domain.Common { public class AdminAreaSettings : ISettings { - public AdminAreaSettings() - { - GridPageSize = 25; - DisplayProductPictures = true; - } - - public int GridPageSize { get; set; } + public AdminAreaSettings() + { + GridPageSize = 25; + DisplayProductPictures = true; + } + + public int GridPageSize { get; set; } public bool DisplayProductPictures { get; set; } } diff --git a/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs index cd62f68045..eb4f050317 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs @@ -4,7 +4,7 @@ namespace SmartStore.Core.Domain.Common { public class CommonSettings : ISettings { - public bool UseSystemEmailForContactUsForm { get; set; } + public bool UseSystemEmailForContactUsForm { get; set; } public bool UseStoredProceduresIfSupported { get; set; } = true; diff --git a/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs index 931d8fbb51..4a8e6d5723 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs @@ -6,36 +6,36 @@ namespace SmartStore.Core.Domain.Common /// Represents a generic attribute /// [DataContract] - public partial class GenericAttribute : BaseEntity + public partial class GenericAttribute : BaseEntity { /// /// Gets or sets the entity identifier /// [DataMember] - public int EntityId { get; set; } - + public int EntityId { get; set; } + /// /// Gets or sets the key group /// - [DataMember] - public string KeyGroup { get; set; } + [DataMember] + public string KeyGroup { get; set; } /// /// Gets or sets the key /// [DataMember, Index("IX_GenericAttribute_Key")] - public string Key { get; set; } + public string Key { get; set; } /// /// Gets or sets the value /// [DataMember] - public string Value { get; set; } + public string Value { get; set; } - /// - /// Gets or sets the store identifier - /// - [DataMember] - public int StoreId { get; set; } + /// + /// Gets or sets the store identifier + /// + [DataMember] + public int StoreId { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Common/PdfSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/PdfSettings.cs index bddfb93963..c2abe7564a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/PdfSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/PdfSettings.cs @@ -5,13 +5,13 @@ namespace SmartStore.Core.Domain.Common { public class PdfSettings : ISettings { - public PdfSettings() - { - Enabled = true; - RenderOrderNotes = true; - } - - /// + public PdfSettings() + { + Enabled = true; + RenderOrderNotes = true; + } + + /// /// Gets or sets a value indicating PDF is supported /// public bool Enabled { get; set; } @@ -31,14 +31,14 @@ public PdfSettings() /// public bool RenderOrderNotes { get; set; } - /// - /// Gets or sets a value indicating whether to attach the order PDF to 'Order Placed (customer)' email - /// - public bool AttachOrderPdfToOrderPlacedEmail { get; set; } + /// + /// Gets or sets a value indicating whether to attach the order PDF to 'Order Placed (customer)' email + /// + public bool AttachOrderPdfToOrderPlacedEmail { get; set; } - /// - /// Gets or sets a value indicating whether to attach the order PDF to 'Order Completed (customer)' email - /// - public bool AttachOrderPdfToOrderCompletedEmail { get; set; } + /// + /// Gets or sets a value indicating whether to attach the order PDF to 'Order Completed (customer)' email + /// + public bool AttachOrderPdfToOrderCompletedEmail { get; set; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Common/PerformanceSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/PerformanceSettings.cs index 8acd3065db..eea4fb50fa 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/PerformanceSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/PerformanceSettings.cs @@ -1,34 +1,33 @@ -using System; -using SmartStore.Core.Configuration; +using SmartStore.Core.Configuration; namespace SmartStore.Core.Domain.Common { - public class PerformanceSettings : ISettings - { - /// - /// The number of entries in a single cache segment - /// when greedy loading is disabled. The larger the catalog, - /// the smaller this value should be. We recommend segment - /// size 500 for catalogs smaller than 100.000 items. - /// - public int CacheSegmentSize { get; set; } = 500; + public class PerformanceSettings : ISettings + { + /// + /// The number of entries in a single cache segment + /// when greedy loading is disabled. The larger the catalog, + /// the smaller this value should be. We recommend segment + /// size 500 for catalogs smaller than 100.000 items. + /// + public int CacheSegmentSize { get; set; } = 500; - /// - /// By default only instant search prefetches translations. - /// All other product listings work against the segmented cache. - /// In very large multilingual catalogs (> 500.000) setting this to true - /// can result in higher request performance as well as less - /// resource usage. - /// - public bool AlwaysPrefetchTranslations { get; set; } + /// + /// By default only instant search prefetches translations. + /// All other product listings work against the segmented cache. + /// In very large multilingual catalogs (> 500.000) setting this to true + /// can result in higher request performance as well as less + /// resource usage. + /// + public bool AlwaysPrefetchTranslations { get; set; } - /// - /// By default only instant search prefetches url slugs. - /// All other product listings work against the segmented cache. - /// In very large catalogs (> 500.000) setting this to true - /// can result in higher request performance as well as less - /// resource usage. - /// - public bool AlwaysPrefetchUrlSlugs { get; set; } - } + /// + /// By default only instant search prefetches url slugs. + /// All other product listings work against the segmented cache. + /// In very large catalogs (> 500.000) setting this to true + /// can result in higher request performance as well as less + /// resource usage. + /// + public bool AlwaysPrefetchUrlSlugs { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Configuration/Setting.cs b/src/Libraries/SmartStore.Core/Domain/Configuration/Setting.cs index 0c981c906a..1ae9d1e412 100644 --- a/src/Libraries/SmartStore.Core/Domain/Configuration/Setting.cs +++ b/src/Libraries/SmartStore.Core/Domain/Configuration/Setting.cs @@ -6,34 +6,34 @@ namespace SmartStore.Core.Domain.Configuration /// Represents a setting /// [DataContract] - [DebuggerDisplay("{Name}: {Value}")] - public partial class Setting : BaseEntity + [DebuggerDisplay("{Name}: {Value}")] + public partial class Setting : BaseEntity { public Setting() { } - public Setting(string name, string value, int storeId = 0) - { + public Setting(string name, string value, int storeId = 0) + { this.Name = name; this.Value = value; - this.StoreId = storeId; + this.StoreId = storeId; } - + /// /// Gets or sets the name /// - [DataMember] - public string Name { get; set; } + [DataMember] + public string Name { get; set; } /// /// Gets or sets the value /// [DataMember] - public string Value { get; set; } + public string Value { get; set; } - /// - /// Gets or sets the store for which this setting is valid. 0 is set when the setting is for all stores - /// - [DataMember] - public int StoreId { get; set; } + /// + /// Gets or sets the store for which this setting is valid. 0 is set when the setting is for all stores + /// + [DataMember] + public int StoreId { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs index 65bb74e12e..45f0535f87 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs @@ -13,7 +13,7 @@ namespace SmartStore.Core.Domain.Customers /// Represents a customer /// [DataContract] - public partial class Customer : BaseEntity, ISoftDeletable + public partial class Customer : BaseEntity, ISoftDeletable { private ICollection _externalAuthenticationRecords; private ICollection _customerContent; @@ -21,15 +21,15 @@ public partial class Customer : BaseEntity, ISoftDeletable private ICollection _shoppingCartItems; private ICollection _orders; private ICollection _rewardPointsHistory; - private ICollection _walletHistory; - private ICollection _returnRequests; + private ICollection _walletHistory; + private ICollection _returnRequests; private ICollection
_addresses; private ICollection _forumTopics; private ICollection _forumPosts; - /// - /// Ctor - /// + /// + /// Ctor + /// public Customer() { this.CustomerGuid = Guid.NewGuid(); @@ -42,40 +42,40 @@ public Customer() [DataMember] public Guid CustomerGuid { get; set; } - /// - /// Gets or sets the username - /// + /// + /// Gets or sets the username + /// [DataMember] public string Username { get; set; } - /// - /// Gets or sets the email - /// + /// + /// Gets or sets the email + /// [DataMember] public string Email { get; set; } - /// - /// Gets or sets the password - /// + /// + /// Gets or sets the password + /// public string Password { get; set; } - /// - /// Gets or sets the password format - /// + /// + /// Gets or sets the password format + /// public int PasswordFormatId { get; set; } - /// - /// Gets or sets the password format - /// + /// + /// Gets or sets the password format + /// public PasswordFormat PasswordFormat { - get { return (PasswordFormat)PasswordFormatId; } - set { this.PasswordFormatId = (int)value; } + get => (PasswordFormat)PasswordFormatId; + set => this.PasswordFormatId = (int)value; } - /// - /// Gets or sets the password salt - /// + /// + /// Gets or sets the password salt + /// public string PasswordSalt { get; set; } /// @@ -94,13 +94,13 @@ public PasswordFormat PasswordFormat /// Gets or sets the affiliate identifier /// [DataMember] - public int AffiliateId { get; set; } - + public int AffiliateId { get; set; } + /// /// Gets or sets a value indicating whether the customer is active /// - [DataMember] - public bool Active { get; set; } + [DataMember] + public bool Active { get; set; } /// /// Gets or sets a value indicating whether the customer has been deleted @@ -121,58 +121,58 @@ public PasswordFormat PasswordFormat /// Gets or sets the customer system name /// [DataMember] - [Index] - public string SystemName { get; set; } + [Index] + public string SystemName { get; set; } /// /// Gets or sets the last IP address /// [DataMember, Index("IX_Customer_LastIpAddress")] - public string LastIpAddress { get; set; } + public string LastIpAddress { get; set; } /// /// Gets or sets the date and time of entity creation /// [DataMember, Index("IX_Customer_CreatedOn")] - public DateTime CreatedOnUtc { get; set; } + public DateTime CreatedOnUtc { get; set; } /// /// Gets or sets the date and time of last login /// [DataMember] - public DateTime? LastLoginDateUtc { get; set; } + public DateTime? LastLoginDateUtc { get; set; } /// /// Gets or sets the date and time of last activity /// [DataMember, Index("IX_Customer_LastActivity")] - public DateTime LastActivityDateUtc { get; set; } + public DateTime LastActivityDateUtc { get; set; } - /// - /// For future use - /// - public string Salutation { get; set; } + /// + /// For future use + /// + public string Salutation { get; set; } - [DataMember] - public string Title { get; set; } + [DataMember] + public string Title { get; set; } - [DataMember] - public string FirstName { get; set; } + [DataMember] + public string FirstName { get; set; } - [DataMember] - public string LastName { get; set; } + [DataMember] + public string LastName { get; set; } - [DataMember, Index("IX_Customer_FullName")] - public string FullName { get; set; } + [DataMember, Index("IX_Customer_FullName")] + public string FullName { get; set; } - [DataMember, Index("IX_Customer_Company")] - public string Company { get; set; } + [DataMember, Index("IX_Customer_Company")] + public string Company { get; set; } - [DataMember, Index("IX_Customer_CustomerNumber")] - public string CustomerNumber { get; set; } + [DataMember, Index("IX_Customer_CustomerNumber")] + public string CustomerNumber { get; set; } - [DataMember, Index("IX_Customer_BirthDate")] - public DateTime? BirthDate { get; set; } + [DataMember, Index("IX_Customer_BirthDate")] + public DateTime? BirthDate { get; set; } [DataMember] public string Gender { get; set; } @@ -202,8 +202,8 @@ public PasswordFormat PasswordFormat /// public virtual ICollection ExternalAuthenticationRecords { - get { return _externalAuthenticationRecords ?? (_externalAuthenticationRecords = new HashSet()); } - protected set { _externalAuthenticationRecords = value; } + get => _externalAuthenticationRecords ?? (_externalAuthenticationRecords = new HashSet()); + protected set => _externalAuthenticationRecords = value; } /// @@ -211,8 +211,8 @@ public virtual ICollection ExternalAuthenticationR /// public virtual ICollection CustomerContent { - get { return _customerContent ?? (_customerContent = new HashSet()); } - protected set { _customerContent = value; } + get => _customerContent ?? (_customerContent = new HashSet()); + protected set => _customerContent = value; } /// @@ -221,8 +221,8 @@ public virtual ICollection CustomerContent [DataMember] public virtual ICollection CustomerRoleMappings { - get { return _customerRoleMappings ?? (_customerRoleMappings = new HashSet()); } - protected set { _customerRoleMappings = value; } + get => _customerRoleMappings ?? (_customerRoleMappings = new HashSet()); + protected set => _customerRoleMappings = value; } /// @@ -230,18 +230,18 @@ public virtual ICollection CustomerRoleMappings /// public virtual ICollection ShoppingCartItems { - get { return _shoppingCartItems ?? (_shoppingCartItems = new HashSet()); } - protected set { _shoppingCartItems = value; } + get => _shoppingCartItems ?? (_shoppingCartItems = new HashSet()); + protected set => _shoppingCartItems = value; } /// /// Gets or sets orders /// [DataMember] - public virtual ICollection Orders + public virtual ICollection Orders { - get { return _orders ?? (_orders = new HashSet()); } - protected internal set { _orders = value; } + get => _orders ?? (_orders = new HashSet()); + protected internal set => _orders = value; } /// @@ -249,55 +249,49 @@ public virtual ICollection Orders /// public virtual ICollection RewardPointsHistory { - get { return _rewardPointsHistory ?? (_rewardPointsHistory = new HashSet()); } - protected set { _rewardPointsHistory = value; } + get => _rewardPointsHistory ?? (_rewardPointsHistory = new HashSet()); + protected set => _rewardPointsHistory = value; } - /// - /// Gets or sets the wallet history. - /// - public virtual ICollection WalletHistory - { - get - { - return _walletHistory ?? (_walletHistory = new HashSet()); - } - protected set - { - _walletHistory = value; - } - } + /// + /// Gets or sets the wallet history. + /// + public virtual ICollection WalletHistory + { + get => _walletHistory ?? (_walletHistory = new HashSet()); + protected set => _walletHistory = value; + } /// /// Gets or sets return request of this customer /// [DataMember] - public virtual ICollection ReturnRequests + public virtual ICollection ReturnRequests { - get { return _returnRequests ?? (_returnRequests = new HashSet()); } - protected set { _returnRequests = value; } + get => _returnRequests ?? (_returnRequests = new HashSet()); + protected set => _returnRequests = value; } - + /// /// Default billing address /// - [DataMember] - public virtual Address BillingAddress { get; set; } + [DataMember] + public virtual Address BillingAddress { get; set; } /// /// Default shipping address /// [DataMember] - public virtual Address ShippingAddress { get; set; } + public virtual Address ShippingAddress { get; set; } /// /// Gets or sets customer addresses /// [DataMember] - public virtual ICollection
Addresses + public virtual ICollection
Addresses { - get { return _addresses ?? (_addresses = new HashSet
()); } - protected set { _addresses = value; } + get => _addresses ?? (_addresses = new HashSet
()); + protected set => _addresses = value; } /// @@ -305,8 +299,8 @@ public virtual ICollection
Addresses ///
public virtual ICollection ForumTopics { - get { return _forumTopics ?? (_forumTopics = new HashSet()); } - protected set { _forumTopics = value; } + get => _forumTopics ?? (_forumTopics = new HashSet()); + protected set => _forumTopics = value; } /// @@ -314,24 +308,24 @@ public virtual ICollection ForumTopics /// public virtual ICollection ForumPosts { - get { return _forumPosts ?? (_forumPosts = new HashSet()); } - protected set { _forumPosts = value; } + get => _forumPosts ?? (_forumPosts = new HashSet()); + protected set => _forumPosts = value; } - #endregion + #endregion - #region Utils + #region Utils - /// - /// Gets a string identifier for the customer's roles by joining all role ids - /// - /// true ignores all inactive roles - /// The identifier - public string GetRolesIdent(bool onlyActiveCustomerRoles = true) - { + /// + /// Gets a string identifier for the customer's roles by joining all role ids + /// + /// true ignores all inactive roles + /// The identifier + public string GetRolesIdent(bool onlyActiveCustomerRoles = true) + { return string.Join(",", GetRoleIds(onlyActiveCustomerRoles)); - } + } /// /// Get identifiers of assigned customer roles. @@ -347,50 +341,50 @@ public int[] GetRoleIds(bool onlyActiveCustomerRoles = true) .ToArray(); } - public virtual void RemoveAddress(Address address) - { - if (this.Addresses.Contains(address)) - { - if (this.BillingAddress == address) this.BillingAddress = null; - if (this.ShippingAddress == address) this.ShippingAddress = null; - - this.Addresses.Remove(address); - } - } - - public void AddRewardPointsHistoryEntry( - int points, - string message = "", - Order usedWithOrder = null, - decimal usedAmount = 0M) - { - int newPointsBalance = this.GetRewardPointsBalance() + points; - - var rewardPointsHistory = new RewardPointsHistory() - { - Customer = this, - UsedWithOrder = usedWithOrder, - Points = points, - PointsBalance = newPointsBalance, - UsedAmount = usedAmount, - Message = message, - CreatedOnUtc = DateTime.UtcNow - }; - - this.RewardPointsHistory.Add(rewardPointsHistory); - } - - /// - /// Gets reward points balance - /// - public int GetRewardPointsBalance() - { - int result = 0; - if (this.RewardPointsHistory.Count > 0) - result = this.RewardPointsHistory.OrderByDescending(rph => rph.CreatedOnUtc).ThenByDescending(rph => rph.Id).FirstOrDefault().PointsBalance; - return result; - } - - #endregion - } + public virtual void RemoveAddress(Address address) + { + if (this.Addresses.Contains(address)) + { + if (this.BillingAddress == address) this.BillingAddress = null; + if (this.ShippingAddress == address) this.ShippingAddress = null; + + this.Addresses.Remove(address); + } + } + + public void AddRewardPointsHistoryEntry( + int points, + string message = "", + Order usedWithOrder = null, + decimal usedAmount = 0M) + { + int newPointsBalance = this.GetRewardPointsBalance() + points; + + var rewardPointsHistory = new RewardPointsHistory() + { + Customer = this, + UsedWithOrder = usedWithOrder, + Points = points, + PointsBalance = newPointsBalance, + UsedAmount = usedAmount, + Message = message, + CreatedOnUtc = DateTime.UtcNow + }; + + this.RewardPointsHistory.Add(rewardPointsHistory); + } + + /// + /// Gets reward points balance + /// + public int GetRewardPointsBalance() + { + int result = 0; + if (this.RewardPointsHistory.Count > 0) + result = this.RewardPointsHistory.OrderByDescending(rph => rph.CreatedOnUtc).ThenByDescending(rph => rph.Id).FirstOrDefault().PointsBalance; + return result; + } + + #endregion + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerContent.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerContent.cs index 1041f57d17..c3640a7a8c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerContent.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerContent.cs @@ -3,46 +3,46 @@ namespace SmartStore.Core.Domain.Customers { - /// - /// Represents a customer generated content - /// - [DataContract] - public partial class CustomerContent : BaseEntity, IAuditable - { - /// - /// Gets or sets the customer identifier - /// - [DataMember] - public int CustomerId { get; set; } + /// + /// Represents a customer generated content + /// + [DataContract] + public partial class CustomerContent : BaseEntity, IAuditable + { + /// + /// Gets or sets the customer identifier + /// + [DataMember] + public int CustomerId { get; set; } - /// - /// Gets or sets the IP address - /// - [DataMember] - public string IpAddress { get; set; } + /// + /// Gets or sets the IP address + /// + [DataMember] + public string IpAddress { get; set; } - /// - /// Gets or sets a value indicating whether the content is approved - /// - [DataMember] - public bool IsApproved { get; set; } + /// + /// Gets or sets a value indicating whether the content is approved + /// + [DataMember] + public bool IsApproved { get; set; } - /// - /// Gets or sets the date and time of instance creation - /// - [DataMember] - public DateTime CreatedOnUtc { get; set; } + /// + /// Gets or sets the date and time of instance creation + /// + [DataMember] + public DateTime CreatedOnUtc { get; set; } - /// - /// Gets or sets the date and time of instance update - /// - [DataMember] - public DateTime UpdatedOnUtc { get; set; } + /// + /// Gets or sets the date and time of instance update + /// + [DataMember] + public DateTime UpdatedOnUtc { get; set; } - /// - /// Gets or sets the customer - /// - [DataMember] - public virtual Customer Customer { get; set; } + /// + /// Gets or sets the customer + /// + [DataMember] + public virtual Customer Customer { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerNameFormat.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerNameFormat.cs index c10aa440f4..c505353e62 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerNameFormat.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerNameFormat.cs @@ -17,13 +17,13 @@ public enum CustomerNameFormat /// Show full names /// ShowFullNames = 3, - /// - /// Show first name - /// - ShowFirstName = 4, - /// - /// Show shorted name and city - /// - ShowNameAndCity = 5 + /// + /// Show first name + /// + ShowFirstName = 4, + /// + /// Show shorted name and city + /// + ShowNameAndCity = 5 } } diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs index 005092aa71..f5f8e96436 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs @@ -79,8 +79,8 @@ public partial class CustomerRole : BaseEntity, IRulesContainer ///
public virtual ICollection PermissionRoleMappings { - get { return _permissionRoleMappings ?? (_permissionRoleMappings = new HashSet()); } - protected set { _permissionRoleMappings = value; } + get => _permissionRoleMappings ?? (_permissionRoleMappings = new HashSet()); + protected set => _permissionRoleMappings = value; } /// @@ -88,8 +88,8 @@ public virtual ICollection PermissionRoleMappings /// public virtual ICollection RuleSets { - get { return _ruleSets ?? (_ruleSets = new HashSet()); } - protected set { _ruleSets = value; } + get => _ruleSets ?? (_ruleSets = new HashSet()); + protected set => _ruleSets = value; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs index 7d46c36a9c..fe16863ea4 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs @@ -2,29 +2,29 @@ namespace SmartStore.Core.Domain.Customers { - public class CustomerSettings : ISettings + public class CustomerSettings : ISettings { - public CustomerSettings() - { - CustomerLoginType = CustomerLoginType.UsernameOrEmail; + public CustomerSettings() + { + CustomerLoginType = CustomerLoginType.UsernameOrEmail; CustomerNumberMethod = CustomerNumberMethod.Disabled; CustomerNumberVisibility = CustomerNumberVisibility.None; - DefaultPasswordFormat = PasswordFormat.Hashed; - HashedPasswordFormat = "SHA1"; - PasswordMinLength = 6; - UserRegistrationType = UserRegistrationType.Standard; - AvatarMaximumSizeBytes = 512000; - CustomerNameFormat = CustomerNameFormat.ShowFirstName; - CustomerNameFormatMaxLength = 64; - GenderEnabled = true; - DateOfBirthEnabled = true; - CompanyEnabled = true; - NewsletterEnabled = true; - OnlineCustomerMinutes = 20; - StoreLastVisitedPage = true; - FirstNameRequired = false; - LastNameRequired = false; - } + DefaultPasswordFormat = PasswordFormat.Hashed; + HashedPasswordFormat = "SHA1"; + PasswordMinLength = 6; + UserRegistrationType = UserRegistrationType.Standard; + AvatarMaximumSizeBytes = 512000; + CustomerNameFormat = CustomerNameFormat.ShowFirstName; + CustomerNameFormatMaxLength = 64; + GenderEnabled = true; + DateOfBirthEnabled = true; + CompanyEnabled = true; + NewsletterEnabled = true; + OnlineCustomerMinutes = 20; + StoreLastVisitedPage = true; + FirstNameRequired = false; + LastNameRequired = false; + } /// /// Gets or sets a value indicating the customer login type @@ -115,7 +115,7 @@ public CustomerSettings() /// Gets or sets a value indicating whether 'New customer' notification message should be sent to a store owner /// public bool NotifyNewCustomerRegistration { get; set; } - + /// /// Gets or sets a value indicating whether to hide 'Downloable products' tab on 'My account' page /// @@ -136,10 +136,10 @@ public CustomerSettings() /// public CustomerNameFormat CustomerNameFormat { get; set; } - /// - /// Gets or sets a value indicating the maximum length of a formatted customer name - /// - public int CustomerNameFormatMaxLength { get; set; } + /// + /// Gets or sets a value indicating the maximum length of a formatted customer name + /// + public int CustomerNameFormatMaxLength { get; set; } /// /// Gets or sets a value indicating whether 'Newsletter' form field is enabled @@ -160,7 +160,7 @@ public CustomerSettings() /// Gets or sets a value indicating we should store last visited page URL for each customer /// public bool StoreLastVisitedPage { get; set; } - + #region Form fields /// @@ -173,27 +173,27 @@ public CustomerSettings() /// public bool TitleEnabled { get; set; } - /// - /// Gets or sets a value indicating whether 'FirstName' is required - /// - public bool FirstNameRequired { get; set; } + /// + /// Gets or sets a value indicating whether 'FirstName' is required + /// + public bool FirstNameRequired { get; set; } - /// - /// Gets or sets a value indicating whether 'LastName' is required - /// - public bool LastNameRequired { get; set; } + /// + /// Gets or sets a value indicating whether 'LastName' is required + /// + public bool LastNameRequired { get; set; } - /// - /// Gets or sets a value indicating whether 'Date of Birth' is enabled - /// - public bool DateOfBirthEnabled { get; set; } + /// + /// Gets or sets a value indicating whether 'Date of Birth' is enabled + /// + public bool DateOfBirthEnabled { get; set; } /// /// Gets or sets a value indicating whether 'Company' is enabled /// public bool CompanyEnabled { get; set; } - /// + /// /// Gets or sets a value indicating whether 'Company' is required /// public bool CompanyRequired { get; set; } @@ -202,7 +202,7 @@ public CustomerSettings() /// Gets or sets a value indicating whether 'Street address' is enabled /// public bool StreetAddressEnabled { get; set; } - + /// /// Gets or sets a value indicating whether 'Street address' is required /// @@ -270,9 +270,9 @@ public CustomerSettings() #endregion - /// - /// Identifier of a customer role that new registered customers will be assigned to - /// - public int RegisterCustomerRoleId { get; set; } - } + /// + /// Identifier of a customer role that new registered customers will be assigned to + /// + public int RegisterCustomerRoleId { get; set; } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/ExternalAuthenticationRecord.cs b/src/Libraries/SmartStore.Core/Domain/Customers/ExternalAuthenticationRecord.cs index 2a17563b33..d64523cb89 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/ExternalAuthenticationRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/ExternalAuthenticationRecord.cs @@ -39,7 +39,7 @@ public partial class ExternalAuthenticationRecord : BaseEntity /// Gets or sets the provider /// public string ProviderSystemName { get; set; } - + /// /// Gets or sets the customer /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/ExternalAuthenticationSettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/ExternalAuthenticationSettings.cs index dc1b56b566..58aef070ee 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/ExternalAuthenticationSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/ExternalAuthenticationSettings.cs @@ -9,7 +9,7 @@ public ExternalAuthenticationSettings() { ActiveAuthenticationMethodSystemNames = new List(); } - + public bool AutoRegisterEnabled { get; set; } /// /// Gets or sets an system names of active payment methods diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/PasswordFormat.cs b/src/Libraries/SmartStore.Core/Domain/Customers/PasswordFormat.cs index 4b35797ec7..32a36b8ade 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/PasswordFormat.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/PasswordFormat.cs @@ -1,6 +1,6 @@  -namespace SmartStore.Core.Domain.Customers -{ +namespace SmartStore.Core.Domain.Customers +{ public enum PasswordFormat { Clear = 0, diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs index 24aa06a677..111f52de58 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/PrivacySettings.cs @@ -1,49 +1,47 @@ using SmartStore.Core.Configuration; -using SmartStore.Core.Domain.Localization; -using System.Web; namespace SmartStore.Core.Domain.Customers { - public class PrivacySettings : ISettings - { - /// - /// Specifies whether cookie hint and consent will be displayed to customers in the frontent - /// - public bool EnableCookieConsent { get; set; } = true; - - /// - /// Specifies whether the cookie dialog will be display in a modal dialog - /// - public bool ModalCookieConsent { get; set; } = true; - - /// - /// Defines the global SameSiteMode for cookies. - /// - public SameSiteType SameSiteMode { get; set; } = SameSiteType.Lax; - - /// - /// Gets or sets a value indicating whether to store last IP address for each customer - /// - public bool StoreLastIpAddress { get; set; } - - /// - /// Gets or sets a value indicating whether to display a checkbox to the customer where he can agree to privacy terms - /// - public bool DisplayGdprConsentOnForms { get; set; } = true; - - /// - /// Gets or sets a value indicating whether the full name field is required on contact us requests - /// - public bool FullNameOnContactUsRequired { get; set; } - - /// - /// Gets or sets a value indicating whether the full name field is required on product requests - /// - public bool FullNameOnProductRequestRequired { get; set; } - - /// - /// Gets or sets cookie infos (JSON serialized) - /// - public string CookieInfos { get; set; } - } + public class PrivacySettings : ISettings + { + /// + /// Specifies whether cookie hint and consent will be displayed to customers in the frontent + /// + public bool EnableCookieConsent { get; set; } = true; + + /// + /// Specifies whether the cookie dialog will be display in a modal dialog + /// + public bool ModalCookieConsent { get; set; } = true; + + /// + /// Defines the global SameSiteMode for cookies. + /// + public SameSiteType SameSiteMode { get; set; } = SameSiteType.Lax; + + /// + /// Gets or sets a value indicating whether to store last IP address for each customer + /// + public bool StoreLastIpAddress { get; set; } + + /// + /// Gets or sets a value indicating whether to display a checkbox to the customer where he can agree to privacy terms + /// + public bool DisplayGdprConsentOnForms { get; set; } = true; + + /// + /// Gets or sets a value indicating whether the full name field is required on contact us requests + /// + public bool FullNameOnContactUsRequired { get; set; } + + /// + /// Gets or sets a value indicating whether the full name field is required on product requests + /// + public bool FullNameOnProductRequestRequired { get; set; } + + /// + /// Gets or sets cookie infos (JSON serialized) + /// + public string CookieInfos { get; set; } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/RewardPointsSettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/RewardPointsSettings.cs index f0e99e9502..543a1ffd86 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/RewardPointsSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/RewardPointsSettings.cs @@ -5,16 +5,16 @@ namespace SmartStore.Core.Domain.Customers { public class RewardPointsSettings : ISettings { - public RewardPointsSettings() - { - ExchangeRate = 1; - PointsForPurchases_Amount = 10; - PointsForPurchases_Points = 1; - PointsForPurchases_Awarded = OrderStatus.Complete; - PointsForPurchases_Canceled = OrderStatus.Cancelled; - } - - /// + public RewardPointsSettings() + { + ExchangeRate = 1; + PointsForPurchases_Amount = 10; + PointsForPurchases_Points = 1; + PointsForPurchases_Awarded = OrderStatus.Complete; + PointsForPurchases_Canceled = OrderStatus.Cancelled; + } + + /// /// Gets or sets a value indicating whether Reward Points Program is enabled /// public bool Enabled { get; set; } @@ -24,20 +24,20 @@ public RewardPointsSettings() /// public decimal ExchangeRate { get; set; } - /// - /// Gets or sets a value whether to round down reward points - /// - public bool RoundDownRewardPoints { get; set; } + /// + /// Gets or sets a value whether to round down reward points + /// + public bool RoundDownRewardPoints { get; set; } - /// - /// Gets or sets a number of points awarded for registration - /// - public int PointsForRegistration { get; set; } + /// + /// Gets or sets a number of points awarded for registration + /// + public int PointsForRegistration { get; set; } - /// - /// Gets or sets a number of points awarded for a product review - /// - public int PointsForProductReview { get; set; } + /// + /// Gets or sets a number of points awarded for a product review + /// + public int PointsForProductReview { get; set; } /// /// Gets or sets a number of points awarded for purchases (amount in primary store currency) @@ -48,7 +48,7 @@ public RewardPointsSettings() /// Gets or sets a number of points awarded for purchases /// public int PointsForPurchases_Points { get; set; } - + /// /// Points are awarded when the order status is /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerAttributeNames.cs b/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerAttributeNames.cs index 2e19a06b50..4a6b1e4c46 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerAttributeNames.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerAttributeNames.cs @@ -4,44 +4,44 @@ namespace SmartStore.Core.Domain.Customers public static partial class SystemCustomerAttributeNames { // Form fields - public static string StreetAddress { get { return "StreetAddress"; } } - public static string StreetAddress2 { get { return "StreetAddress2"; } } - public static string ZipPostalCode { get { return "ZipPostalCode"; } } - public static string City { get { return "City"; } } - public static string StateProvinceId { get { return "StateProvinceId"; } } - public static string CountryId { get { return "CountryId"; } } - public static string Phone { get { return "Phone"; } } - public static string Fax { get { return "Fax"; } } - public static string VatNumber { get { return "VatNumber"; } } + public static string StreetAddress => "StreetAddress"; + public static string StreetAddress2 => "StreetAddress2"; + public static string ZipPostalCode => "ZipPostalCode"; + public static string City => "City"; + public static string StateProvinceId => "StateProvinceId"; + public static string CountryId => "CountryId"; + public static string Phone => "Phone"; + public static string Fax => "Fax"; + public static string VatNumber => "VatNumber"; // Other attributes - public static string DiscountCouponCode { get { return "DiscountCouponCode"; } } - public static string GiftCardCouponCodes { get { return "GiftCardCouponCodes"; } } - public static string CheckoutAttributes { get { return "CheckoutAttributes"; } } - public static string AvatarPictureId { get { return "AvatarPictureId"; } } - public static string AvatarColor { get { return "AvatarColor"; } } - public static string ForumPostCount { get { return "ForumPostCount"; } } - public static string Signature { get { return "Signature"; } } - public static string PasswordRecoveryToken { get { return "PasswordRecoveryToken"; } } - public static string AccountActivationToken { get { return "AccountActivationToken"; } } - public static string LastVisitedPage { get { return "LastVisitedPage"; } } - public static string ImpersonatedCustomerId { get { return "ImpersonatedCustomerId"; } } - public static string AdminAreaStoreScopeConfiguration { get { return "AdminAreaStoreScopeConfiguration"; } } - public static string MostRecentlyUsedCategories { get { return "MostRecentlyUsedCategories"; } } - public static string MostRecentlyUsedManufacturers { get { return "MostRecentlyUsedManufacturers"; } } - public static string WalletEnabled { get { return "WalletEnabled"; } } - public static string HasConsentedToGdpr { get { return "HasConsentedToGdpr"; } } + public static string DiscountCouponCode => "DiscountCouponCode"; + public static string GiftCardCouponCodes => "GiftCardCouponCodes"; + public static string CheckoutAttributes => "CheckoutAttributes"; + public static string AvatarPictureId => "AvatarPictureId"; + public static string AvatarColor => "AvatarColor"; + public static string ForumPostCount => "ForumPostCount"; + public static string Signature => "Signature"; + public static string PasswordRecoveryToken => "PasswordRecoveryToken"; + public static string AccountActivationToken => "AccountActivationToken"; + public static string LastVisitedPage => "LastVisitedPage"; + public static string ImpersonatedCustomerId => "ImpersonatedCustomerId"; + public static string AdminAreaStoreScopeConfiguration => "AdminAreaStoreScopeConfiguration"; + public static string MostRecentlyUsedCategories => "MostRecentlyUsedCategories"; + public static string MostRecentlyUsedManufacturers => "MostRecentlyUsedManufacturers"; + public static string WalletEnabled => "WalletEnabled"; + public static string HasConsentedToGdpr => "HasConsentedToGdpr"; // Depends on store - public static string CurrencyId { get { return "CurrencyId"; } } - public static string LanguageId { get { return "LanguageId"; } } - public static string SelectedPaymentMethod { get { return "SelectedPaymentMethod"; } } - public static string SelectedShippingOption { get { return "SelectedShippingOption"; } } - public static string OfferedShippingOptions { get { return "OfferedShippingOptions"; } } - public static string LastContinueShoppingPage { get { return "LastContinueShoppingPage"; } } - public static string NotifiedAboutNewPrivateMessages { get { return "NotifiedAboutNewPrivateMessages"; } } - public static string WorkingThemeName { get { return "WorkingThemeName"; } } - public static string UseRewardPointsDuringCheckout { get { return "UseRewardPointsDuringCheckout"; } } - public static string UseCreditBalanceDuringCheckout { get { return "UseCreditBalanceDuringCheckout"; } } - } + public static string CurrencyId => "CurrencyId"; + public static string LanguageId => "LanguageId"; + public static string SelectedPaymentMethod => "SelectedPaymentMethod"; + public static string SelectedShippingOption => "SelectedShippingOption"; + public static string OfferedShippingOptions => "OfferedShippingOptions"; + public static string LastContinueShoppingPage => "LastContinueShoppingPage"; + public static string NotifiedAboutNewPrivateMessages => "NotifiedAboutNewPrivateMessages"; + public static string WorkingThemeName => "WorkingThemeName"; + public static string UseRewardPointsDuringCheckout => "UseRewardPointsDuringCheckout"; + public static string UseCreditBalanceDuringCheckout => "UseCreditBalanceDuringCheckout"; + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerNames.cs b/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerNames.cs index 48ed1b0dfd..5e52629940 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerNames.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerNames.cs @@ -3,8 +3,8 @@ namespace SmartStore.Core.Domain.Customers { public static partial class SystemCustomerNames { - public static string SearchEngine { get { return "SearchEngine"; } } - public static string BackgroundTask { get { return "BackgroundTask"; } } - public static string PdfConverter { get { return "PdfConverter"; } } + public static string SearchEngine => "SearchEngine"; + public static string BackgroundTask => "BackgroundTask"; + public static string PdfConverter => "PdfConverter"; } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerRoleNames.cs b/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerRoleNames.cs index 214fd18191..c70a4b84ab 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerRoleNames.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/SystemCustomerRoleNames.cs @@ -3,14 +3,14 @@ namespace SmartStore.Core.Domain.Customers { public static partial class SystemCustomerRoleNames { - public static string SuperAdministrators { get { return "SuperAdmins"; } } + public static string SuperAdministrators => "SuperAdmins"; - public static string Administrators { get { return "Administrators"; } } - - public static string ForumModerators { get { return "ForumModerators"; } } + public static string Administrators => "Administrators"; - public static string Registered { get { return "Registered"; } } + public static string ForumModerators => "ForumModerators"; - public static string Guests { get { return "Guests"; } } + public static string Registered => "Registered"; + + public static string Guests => "Guests"; } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs index d85437c4f7..4befa9f0d9 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs @@ -4,71 +4,71 @@ namespace SmartStore.Core.Domain.Customers { - /// - /// Represents a digital wallet history entry. - /// - public class WalletHistory : BaseEntity - { - /// - /// Gets or sets the store identifier. Should not be zero. - /// - [Index("IX_StoreId_CreatedOn", 0)] - public int StoreId { get; set; } + /// + /// Represents a digital wallet history entry. + /// + public class WalletHistory : BaseEntity + { + /// + /// Gets or sets the store identifier. Should not be zero. + /// + [Index("IX_StoreId_CreatedOn", 0)] + public int StoreId { get; set; } - /// - /// Gets or sets the customer identifier. - /// - public int CustomerId { get; set; } + /// + /// Gets or sets the customer identifier. + /// + public int CustomerId { get; set; } - /// - /// Gets or sets the order identifier. - /// - public int? OrderId { get; set; } + /// + /// Gets or sets the order identifier. + /// + public int? OrderId { get; set; } - /// - /// Gets or sets the amount of the entry. - /// - public decimal Amount { get; set; } + /// + /// Gets or sets the amount of the entry. + /// + public decimal Amount { get; set; } - /// - /// Gets or sets the amount balance when the entry was created. - /// - public decimal AmountBalance { get; set; } + /// + /// Gets or sets the amount balance when the entry was created. + /// + public decimal AmountBalance { get; set; } - /// - /// Gets or sets the amount balance per store when the entry was created. - /// - public decimal AmountBalancePerStore { get; set; } + /// + /// Gets or sets the amount balance per store when the entry was created. + /// + public decimal AmountBalancePerStore { get; set; } - /// - /// Gets or sets the date ehen the entry was created (in UTC). - /// - [Index("IX_StoreId_CreatedOn", 1)] - public DateTime CreatedOnUtc { get; set; } + /// + /// Gets or sets the date ehen the entry was created (in UTC). + /// + [Index("IX_StoreId_CreatedOn", 1)] + public DateTime CreatedOnUtc { get; set; } - /// - /// Gets or sets the reason for posting this entry. - /// - public WalletPostingReason? Reason { get; set; } + /// + /// Gets or sets the reason for posting this entry. + /// + public WalletPostingReason? Reason { get; set; } - /// - /// Gets or sets the message. - /// - public string Message { get; set; } + /// + /// Gets or sets the message. + /// + public string Message { get; set; } - /// - /// Gets or sets the admin comment. - /// - public string AdminComment { get; set; } + /// + /// Gets or sets the admin comment. + /// + public string AdminComment { get; set; } - /// - /// Gets or sets the customer. - /// - public virtual Customer Customer { get; set; } + /// + /// Gets or sets the customer. + /// + public virtual Customer Customer { get; set; } - /// - /// Gets or sets the order for which the wallet entry was used. - /// - public virtual Order Order { get; set; } - } + /// + /// Gets or sets the order for which the wallet entry was used. + /// + public virtual Order Order { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/WalletPostingReason.cs b/src/Libraries/SmartStore.Core/Domain/Customers/WalletPostingReason.cs index 06a829dba8..489bdac561 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/WalletPostingReason.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/WalletPostingReason.cs @@ -1,38 +1,38 @@ namespace SmartStore.Core.Domain.Customers { - /// - /// Represents the reason for creating a wallet history entry. - /// - public enum WalletPostingReason - { - /// - /// Any administration reason. - /// - Admin = 0, + /// + /// Represents the reason for creating a wallet history entry. + /// + public enum WalletPostingReason + { + /// + /// Any administration reason. + /// + Admin = 0, - /// - /// The Customer has purchased goods which have been paid in part or in full by wallet. - /// - Purchase, + /// + /// The Customer has purchased goods which have been paid in part or in full by wallet. + /// + Purchase, - /// - /// The customer has bought wallet credits. - /// - Refill, + /// + /// The customer has bought wallet credits. + /// + Refill, - /// - /// The admin has refunded the used credit balance. - /// - Refund, + /// + /// The admin has refunded the used credit balance. + /// + Refund, - /// - /// The admin has refunded a part of the used credit balance. - /// - PartialRefund, + /// + /// The admin has refunded a part of the used credit balance. + /// + PartialRefund, - /// - /// The admin has debited the wallet, e.g. because the purchase of credit was cancelled. - /// - Debit - } + /// + /// The admin has debited the wallet, e.g. because the purchase of credit was cancelled. + /// + Debit + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeEnums.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeEnums.cs index 7a3ab1f8ae..7872dc0072 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeEnums.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeEnums.cs @@ -1,26 +1,26 @@ namespace SmartStore.Core.Domain.DataExchange { - public delegate void ProgressValueSetter(int value, int maximum, string message); + public delegate void ProgressValueSetter(int value, int maximum, string message); - /// - /// Data exchange abortion types - /// - public enum DataExchangeAbortion - { - /// - /// No abortion. Go on with processing. - /// - None = 0, + /// + /// Data exchange abortion types + /// + public enum DataExchangeAbortion + { + /// + /// No abortion. Go on with processing. + /// + None = 0, - /// - /// Break item processing but not the rest of the execution. Typically used for demo limitations. - /// - Soft, + /// + /// Break item processing but not the rest of the execution. Typically used for demo limitations. + /// + Soft, - /// - /// Break processing immediately - /// - Hard - } + /// + /// Break processing immediately + /// + Hard + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeSettings.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeSettings.cs index 4b0bc6d497..6546707890 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeSettings.cs @@ -2,27 +2,27 @@ namespace SmartStore.Core.Domain.DataExchange { - public class DataExchangeSettings : ISettings - { - public DataExchangeSettings() - { - MaxFileNameLength = 50; - ImageDownloadTimeout = 10; - } + public class DataExchangeSettings : ISettings + { + public DataExchangeSettings() + { + MaxFileNameLength = 50; + ImageDownloadTimeout = 10; + } - /// - /// The maximum length of file names (in characters) of files created by the export framework - /// - public int MaxFileNameLength { get; set; } + /// + /// The maximum length of file names (in characters) of files created by the export framework + /// + public int MaxFileNameLength { get; set; } - /// - /// Relative path to a folder with images to be imported - /// - public string ImageImportFolder { get; set; } + /// + /// Relative path to a folder with images to be imported + /// + public string ImageImportFolder { get; set; } - /// - /// The timeout for image download per entity in minutes - /// - public int ImageDownloadTimeout { get; set; } - } + /// + /// The timeout for image download per entity in minutes + /// + public int ImageDownloadTimeout { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportDeployment.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportDeployment.cs index b9e323c670..37df2f481a 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportDeployment.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportDeployment.cs @@ -3,139 +3,127 @@ namespace SmartStore.Core.Domain { - public class ExportDeployment : BaseEntity, ICloneable - { - /// - /// The profile identifier - /// - public int ProfileId { get; set; } - - /// - /// Name of the deployment - /// - public string Name { get; set; } - - /// - /// Whether the deployment is enabled - /// - public bool Enabled { get; set; } - - /// - /// XML with information about the last deployment result - /// - public string ResultInfo { get; set; } - - /// - /// The deployment type identifier - /// - public int DeploymentTypeId { get; set; } - - /// - /// The deployment type - /// - public ExportDeploymentType DeploymentType - { - get - { - return (ExportDeploymentType)DeploymentTypeId; - } - set - { - DeploymentTypeId = (int)value; - } - } - - public string Username { get; set; } - - public string Password { get; set; } - - /// - /// Deployment URL - /// - public string Url { get; set; } - - /// - /// The type identifier of how to transmit via HTTP - /// - public int HttpTransmissionTypeId { get; set; } - - /// - /// The type of how to transmit via HTTP - /// - public ExportHttpTransmissionType HttpTransmissionType - { - get - { - return (ExportHttpTransmissionType)HttpTransmissionTypeId; - } - set - { - HttpTransmissionTypeId = (int)value; - } - } - - /// - /// The file system path - /// - public string FileSystemPath { get; set; } - - /// - /// Path of a subfolder - /// - public string SubFolder { get; set; } - - /// - /// Multiple email addresses can be separated by commas - /// - public string EmailAddresses { get; set; } - - /// - /// Subject of the email - /// - public string EmailSubject { get; set; } - - /// - /// Identifier of the email account - /// - public int EmailAccountId { get; set; } - - /// - /// Whether to use FTP active or passive mode - /// - public bool PassiveMode { get; set; } - - /// - /// Whether to use SSL - /// - public bool UseSsl { get; set; } - - public virtual ExportProfile Profile { get; set; } - - public ExportDeployment Clone() - { - var deployment = new ExportDeployment - { - Name = this.Name, - Enabled = this.Enabled, - DeploymentTypeId = this.DeploymentTypeId, - Username = this.Username, - Password = this.Password, - Url = this.Url, - HttpTransmissionTypeId = this.HttpTransmissionTypeId, - FileSystemPath = this.FileSystemPath, - SubFolder = this.SubFolder, - EmailAddresses = this.EmailAddresses, - EmailSubject = this.EmailSubject, - EmailAccountId = this.EmailAccountId, - PassiveMode = this.PassiveMode, - UseSsl = this.UseSsl - }; - return deployment; - } - - object ICloneable.Clone() - { - return this.Clone(); - } - } + public class ExportDeployment : BaseEntity, ICloneable + { + /// + /// The profile identifier + /// + public int ProfileId { get; set; } + + /// + /// Name of the deployment + /// + public string Name { get; set; } + + /// + /// Whether the deployment is enabled + /// + public bool Enabled { get; set; } + + /// + /// XML with information about the last deployment result + /// + public string ResultInfo { get; set; } + + /// + /// The deployment type identifier + /// + public int DeploymentTypeId { get; set; } + + /// + /// The deployment type + /// + public ExportDeploymentType DeploymentType + { + get => (ExportDeploymentType)DeploymentTypeId; + set => DeploymentTypeId = (int)value; + } + + public string Username { get; set; } + + public string Password { get; set; } + + /// + /// Deployment URL + /// + public string Url { get; set; } + + /// + /// The type identifier of how to transmit via HTTP + /// + public int HttpTransmissionTypeId { get; set; } + + /// + /// The type of how to transmit via HTTP + /// + public ExportHttpTransmissionType HttpTransmissionType + { + get => (ExportHttpTransmissionType)HttpTransmissionTypeId; + set => HttpTransmissionTypeId = (int)value; + } + + /// + /// The file system path + /// + public string FileSystemPath { get; set; } + + /// + /// Path of a subfolder + /// + public string SubFolder { get; set; } + + /// + /// Multiple email addresses can be separated by commas + /// + public string EmailAddresses { get; set; } + + /// + /// Subject of the email + /// + public string EmailSubject { get; set; } + + /// + /// Identifier of the email account + /// + public int EmailAccountId { get; set; } + + /// + /// Whether to use FTP active or passive mode + /// + public bool PassiveMode { get; set; } + + /// + /// Whether to use SSL + /// + public bool UseSsl { get; set; } + + public virtual ExportProfile Profile { get; set; } + + public ExportDeployment Clone() + { + var deployment = new ExportDeployment + { + Name = this.Name, + Enabled = this.Enabled, + DeploymentTypeId = this.DeploymentTypeId, + Username = this.Username, + Password = this.Password, + Url = this.Url, + HttpTransmissionTypeId = this.HttpTransmissionTypeId, + FileSystemPath = this.FileSystemPath, + SubFolder = this.SubFolder, + EmailAddresses = this.EmailAddresses, + EmailSubject = this.EmailSubject, + EmailAccountId = this.EmailAccountId, + PassiveMode = this.PassiveMode, + UseSsl = this.UseSsl + }; + return deployment; + } + + object ICloneable.Clone() + { + return this.Clone(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportEnums.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportEnums.cs index 4bd1648beb..f11b52fff5 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportEnums.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportEnums.cs @@ -2,18 +2,18 @@ namespace SmartStore.Core.Domain.DataExchange { - /// - /// Supported entity types - /// - public enum ExportEntityType - { - Product = 0, - Category, - Manufacturer, - Customer, - Order, - NewsLetterSubscription, - ShoppingCartItem + /// + /// Supported entity types + /// + public enum ExportEntityType + { + Product = 0, + Category, + Manufacturer, + Customer, + Order, + NewsLetterSubscription, + ShoppingCartItem } /// @@ -30,138 +30,138 @@ public enum RelatedEntityType /// Supported deployment types /// public enum ExportDeploymentType - { - FileSystem = 0, - Email, - Http, - Ftp, - PublicFolder - } - - /// - /// Supported HTTP transmission types - /// - public enum ExportHttpTransmissionType - { - SimplePost = 0, - MultipartFormDataPost - } - - /// - /// Controls the merging of various data as product description - /// - public enum ExportDescriptionMerging - { - None = 0, - ShortDescriptionOrNameIfEmpty, - ShortDescription, - Description, - NameAndShortDescription, - NameAndDescription, - ManufacturerAndNameAndShortDescription, - ManufacturerAndNameAndDescription - } - - /// - /// Controls the merging of various data while exporting attribute combinations as products - /// - public enum ExportAttributeValueMerging - { - None = 0, - AppendAllValuesToName - } - - /// - /// Controls data processing and projection items supported by an export provider - /// - [Flags] - public enum ExportFeatures - { - None = 0, - - /// - /// Whether to automatically create a file based public deployment when an export profile is created - /// - CreatesInitialPublicDeployment = 1, - - /// - /// Whether to offer option to include\exclude grouped products - /// - CanOmitGroupedProducts = 1 << 2, - - /// - /// Whether to offer option to export attribute combinations as products - /// - CanProjectAttributeCombinations = 1 << 3, - - /// - /// Whether to offer further options to manipulate the product description - /// - CanProjectDescription = 1 << 4, - - /// - /// Whether to offer option to enter a brand fallback - /// - OffersBrandFallback = 1 << 5, - - /// - /// Whether to offer option to set a picture size and to get the URL of the main image - /// - CanIncludeMainPicture = 1 << 6, - - /// - /// Whether to use SKU as manufacturer part number if MPN is empty - /// - UsesSkuAsMpnFallback = 1 << 7, - - /// - /// Whether to offer option to enter a shipping time fallback - /// - OffersShippingTimeFallback = 1 << 8, - - /// - /// Whether to offer option to enter a shipping costs fallback and a free shipping threshold - /// - OffersShippingCostsFallback = 1 << 9, - - /// - /// Whether to get the calculated old product price - /// - UsesOldPrice = 1 << 10, - - /// - /// Whether to get the calculated special and regular price (ignoring special offers) - /// - UsesSpecialPrice = 1 << 11, - - /// - /// Whether to not automatically send a completion email - /// - CanOmitCompletionMail = 1 << 12, - - /// - /// Whether to provide additional data of attribute combinations - /// - UsesAttributeCombination = 1 << 13, - - /// - /// Whether to export attribute combinations as products including parent product. Only effective with CanProjectAttributeCombinations. - /// - UsesAttributeCombinationParent = 1 << 14, + { + FileSystem = 0, + Email, + Http, + Ftp, + PublicFolder + } + + /// + /// Supported HTTP transmission types + /// + public enum ExportHttpTransmissionType + { + SimplePost = 0, + MultipartFormDataPost + } + + /// + /// Controls the merging of various data as product description + /// + public enum ExportDescriptionMerging + { + None = 0, + ShortDescriptionOrNameIfEmpty, + ShortDescription, + Description, + NameAndShortDescription, + NameAndDescription, + ManufacturerAndNameAndShortDescription, + ManufacturerAndNameAndDescription + } + + /// + /// Controls the merging of various data while exporting attribute combinations as products + /// + public enum ExportAttributeValueMerging + { + None = 0, + AppendAllValuesToName + } + + /// + /// Controls data processing and projection items supported by an export provider + /// + [Flags] + public enum ExportFeatures + { + None = 0, + + /// + /// Whether to automatically create a file based public deployment when an export profile is created + /// + CreatesInitialPublicDeployment = 1, + + /// + /// Whether to offer option to include\exclude grouped products + /// + CanOmitGroupedProducts = 1 << 2, + + /// + /// Whether to offer option to export attribute combinations as products + /// + CanProjectAttributeCombinations = 1 << 3, + + /// + /// Whether to offer further options to manipulate the product description + /// + CanProjectDescription = 1 << 4, + + /// + /// Whether to offer option to enter a brand fallback + /// + OffersBrandFallback = 1 << 5, + + /// + /// Whether to offer option to set a picture size and to get the URL of the main image + /// + CanIncludeMainPicture = 1 << 6, + + /// + /// Whether to use SKU as manufacturer part number if MPN is empty + /// + UsesSkuAsMpnFallback = 1 << 7, + + /// + /// Whether to offer option to enter a shipping time fallback + /// + OffersShippingTimeFallback = 1 << 8, + + /// + /// Whether to offer option to enter a shipping costs fallback and a free shipping threshold + /// + OffersShippingCostsFallback = 1 << 9, + + /// + /// Whether to get the calculated old product price + /// + UsesOldPrice = 1 << 10, + + /// + /// Whether to get the calculated special and regular price (ignoring special offers) + /// + UsesSpecialPrice = 1 << 11, + + /// + /// Whether to not automatically send a completion email + /// + CanOmitCompletionMail = 1 << 12, + + /// + /// Whether to provide additional data of attribute combinations + /// + UsesAttributeCombination = 1 << 13, + + /// + /// Whether to export attribute combinations as products including parent product. Only effective with CanProjectAttributeCombinations. + /// + UsesAttributeCombinationParent = 1 << 14, /// /// Whether to provide extra data units for related data /// UsesRelatedDataUnits = 1 << 15 - } - - /// - /// Possible order status change after order exporting - /// - public enum ExportOrderStatusChange - { - None = 0, - Processing, - Complete - } + } + + /// + /// Possible order status change after order exporting + /// + public enum ExportOrderStatusChange + { + None = 0, + Processing, + Complete + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportFilter.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportFilter.cs index 970fcae7cb..2c80250e93 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportFilter.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportFilter.cs @@ -3,9 +3,9 @@ namespace SmartStore.Core.Domain.DataExchange { - [Serializable] - public class ExportFilter - { + [Serializable] + public class ExportFilter + { public ExportFilter() { Visibility = ProductVisibility.Full; @@ -16,87 +16,87 @@ public ExportFilter() /// public int StoreId { get; set; } - /// - /// Entity created from - /// - public DateTime? CreatedFrom { get; set; } + /// + /// Entity created from + /// + public DateTime? CreatedFrom { get; set; } - /// - /// Entity created to - /// - public DateTime? CreatedTo { get; set; } + /// + /// Entity created to + /// + public DateTime? CreatedTo { get; set; } - #region Product + #region Product - /// - /// Minimum product identifier - /// - public int? IdMinimum { get; set; } + /// + /// Minimum product identifier + /// + public int? IdMinimum { get; set; } - /// - /// Maximum product identifier - /// - public int? IdMaximum { get; set; } + /// + /// Maximum product identifier + /// + public int? IdMaximum { get; set; } - /// - /// Minimum price - /// - public decimal? PriceMinimum { get; set; } + /// + /// Minimum price + /// + public decimal? PriceMinimum { get; set; } - /// - /// Maximum price - /// - public decimal? PriceMaximum { get; set; } + /// + /// Maximum price + /// + public decimal? PriceMaximum { get; set; } - /// - /// Minimum product availability - /// - public int? AvailabilityMinimum { get; set; } + /// + /// Minimum product availability + /// + public int? AvailabilityMinimum { get; set; } - /// - /// Maximum product availability - /// - public int? AvailabilityMaximum { get; set; } + /// + /// Maximum product availability + /// + public int? AvailabilityMaximum { get; set; } - /// - /// A value indicating whether to load only published or non published products - /// - public bool? IsPublished { get; set; } + /// + /// A value indicating whether to load only published or non published products + /// + public bool? IsPublished { get; set; } - /// - /// Category identifiers - /// - public int[] CategoryIds { get; set; } + /// + /// Category identifiers + /// + public int[] CategoryIds { get; set; } - /// - /// A value indicating whether to load products without any catgory mapping - /// - public bool? WithoutCategories { get; set; } + /// + /// A value indicating whether to load products without any catgory mapping + /// + public bool? WithoutCategories { get; set; } - /// - /// Manufacturer identifier - /// - public int? ManufacturerId { get; set; } + /// + /// Manufacturer identifier + /// + public int? ManufacturerId { get; set; } - /// - /// A value indicating whether to load products without any manufacturer mapping - /// - public bool? WithoutManufacturers { get; set; } + /// + /// A value indicating whether to load products without any manufacturer mapping + /// + public bool? WithoutManufacturers { get; set; } - /// - /// Identifiers of product tag - /// - public int? ProductTagId { get; set; } + /// + /// Identifiers of product tag + /// + public int? ProductTagId { get; set; } - /// - /// A value indicating whether to load products that are marked as featured (relates only to categories and manufacturers) - /// - public bool? FeaturedProducts { get; set; } + /// + /// A value indicating whether to load products that are marked as featured (relates only to categories and manufacturers) + /// + public bool? FeaturedProducts { get; set; } - /// - /// Filter by product type - /// - public ProductType? ProductType { get; set; } + /// + /// Filter by product type + /// + public ProductType? ProductType { get; set; } /// /// Filter by visibility. @@ -112,73 +112,73 @@ public ExportFilter() /// public int[] OrderStatusIds { get; set; } - /// - /// Filter by payment status - /// - public int[] PaymentStatusIds { get; set; } + /// + /// Filter by payment status + /// + public int[] PaymentStatusIds { get; set; } - /// - /// Filter by shipping status - /// - public int[] ShippingStatusIds { get; set; } + /// + /// Filter by shipping status + /// + public int[] ShippingStatusIds { get; set; } - #endregion + #endregion - #region Customer + #region Customer - /// - /// Filter by active or inactive customers - /// - public bool? IsActiveCustomer { get; set; } + /// + /// Filter by active or inactive customers + /// + public bool? IsActiveCustomer { get; set; } - /// - /// Filter by tax exempt customers - /// - public bool? IsTaxExempt { get; set; } + /// + /// Filter by tax exempt customers + /// + public bool? IsTaxExempt { get; set; } - /// - /// Identifiers of customer roles - /// - public int[] CustomerRoleIds { get; set; } + /// + /// Identifiers of customer roles + /// + public int[] CustomerRoleIds { get; set; } - /// - /// Filter by billing country identifiers - /// - public int[] BillingCountryIds { get; set; } + /// + /// Filter by billing country identifiers + /// + public int[] BillingCountryIds { get; set; } - /// - /// Filter by shipping country identifiers - /// - public int[] ShippingCountryIds { get; set; } + /// + /// Filter by shipping country identifiers + /// + public int[] ShippingCountryIds { get; set; } - /// - /// Filter by last activity date from - /// - public DateTime? LastActivityFrom { get; set; } + /// + /// Filter by last activity date from + /// + public DateTime? LastActivityFrom { get; set; } - /// - /// Filter by last activity date to - /// - public DateTime? LastActivityTo { get; set; } + /// + /// Filter by last activity date to + /// + public DateTime? LastActivityTo { get; set; } - /// - /// Filter by at least spent amount - /// - public decimal? HasSpentAtLeastAmount { get; set; } + /// + /// Filter by at least spent amount + /// + public decimal? HasSpentAtLeastAmount { get; set; } - /// - /// Filter by at least placed orders - /// - public int? HasPlacedAtLeastOrders { get; set; } + /// + /// Filter by at least placed orders + /// + public int? HasPlacedAtLeastOrders { get; set; } - #endregion + #endregion - #region Newsletter Subscription + #region Newsletter Subscription - /// - /// Filter by active or inactive subscriber - /// - public bool? IsActiveSubscriber { get; set; } + /// + /// Filter by active or inactive subscriber + /// + public bool? IsActiveSubscriber { get; set; } /// /// Filter by language @@ -194,6 +194,6 @@ public ExportFilter() /// public int? ShoppingCartTypeId { get; set; } - #endregion - } + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs index 3d75cf06ef..e14dc21145 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs @@ -5,51 +5,51 @@ namespace SmartStore.Core.Domain { public class ExportProfile : BaseEntity, ICloneable - { - private ICollection _deployments; - - public ExportProfile() - { - Enabled = true; - PerStore = true; - Cleanup = true; - EmailAccountId = 0; - } - - /// - /// The name of the profile - /// - public string Name { get; set; } - - /// - /// The root path of the export folder - /// - public string FolderName { get; set; } - - /// - /// The pattern for file names - /// - public string FileNamePattern { get; set; } - - /// - /// The system name of the profile - /// - public string SystemName { get; set; } - - /// - /// The system name of the export provider - /// - public string ProviderSystemName { get; set; } - - /// - /// Whether the profile is an unremovable system profile - /// - public bool IsSystemProfile { get; set; } - - /// - /// Whether the export profile is enabled - /// - public bool Enabled { get; set; } + { + private ICollection _deployments; + + public ExportProfile() + { + Enabled = true; + PerStore = true; + Cleanup = true; + EmailAccountId = 0; + } + + /// + /// The name of the profile + /// + public string Name { get; set; } + + /// + /// The root path of the export folder + /// + public string FolderName { get; set; } + + /// + /// The pattern for file names + /// + public string FileNamePattern { get; set; } + + /// + /// The system name of the profile + /// + public string SystemName { get; set; } + + /// + /// The system name of the export provider + /// + public string ProviderSystemName { get; set; } + + /// + /// Whether the profile is an unremovable system profile + /// + public bool IsSystemProfile { get; set; } + + /// + /// Whether the export profile is enabled + /// + public bool Enabled { get; set; } /// /// Whether the export related data @@ -61,110 +61,110 @@ public ExportProfile() /// public int SchedulingTaskId { get; set; } - /// - /// XML with filtering information - /// - public string Filtering { get; set; } - - /// - /// XML with projection information - /// - public string Projection { get; set; } - - /// - /// XML with provider specific configuration data - /// - public string ProviderConfigData { get; set; } - - /// - /// XML with information about the last export - /// - public string ResultInfo { get; set; } - - /// - /// The number of records to be skipped - /// - public int Offset { get; set; } - - /// - /// How many records to be loaded per database round-trip - /// - public int Limit { get; set; } - - /// - /// The maximum number of records of one processed batch - /// - public int BatchSize { get; set; } - - /// - /// Whether to start a separate run-through for each store - /// - public bool PerStore { get; set; } - - /// - /// Email Account identifier used to send a notification message an export completes - /// - public int EmailAccountId { get; set; } - - /// - /// Email addresses where to send the notification message - /// - public string CompletedEmailAddresses { get; set; } - - /// - /// Whether to combine and compress the export files in a ZIP archive - /// - public bool CreateZipArchive { get; set; } - - /// - /// Whether to delete unneeded files after deployment - /// - public bool Cleanup { get; set; } - - - /// - /// The scheduling task - /// - public virtual ScheduleTask ScheduleTask { get; set; } - - /// - /// Gets or sets export deployments - /// - public virtual ICollection Deployments - { - get { return _deployments ?? (_deployments = new HashSet()); } - set { _deployments = value; } - } - - public ExportProfile Clone() - { - var profile = new ExportProfile - { - Name = this.Name, - FolderName = null, - FileNamePattern = this.FileNamePattern, - ProviderSystemName = this.ProviderSystemName, - Enabled = this.Enabled, - SchedulingTaskId = 0, - Filtering = this.Filtering, - Projection = this.Projection, - ProviderConfigData = this.ProviderConfigData, - ResultInfo = null, - Offset = this.Offset, - Limit = this.Limit, - BatchSize = this.BatchSize, - PerStore = this.PerStore, - EmailAccountId = this.EmailAccountId, - CompletedEmailAddresses = this.CompletedEmailAddresses, - CreateZipArchive = this.CreateZipArchive, - Cleanup = this.Cleanup - }; - return profile; - } - - object ICloneable.Clone() - { - return this.Clone(); - } - } + /// + /// XML with filtering information + /// + public string Filtering { get; set; } + + /// + /// XML with projection information + /// + public string Projection { get; set; } + + /// + /// XML with provider specific configuration data + /// + public string ProviderConfigData { get; set; } + + /// + /// XML with information about the last export + /// + public string ResultInfo { get; set; } + + /// + /// The number of records to be skipped + /// + public int Offset { get; set; } + + /// + /// How many records to be loaded per database round-trip + /// + public int Limit { get; set; } + + /// + /// The maximum number of records of one processed batch + /// + public int BatchSize { get; set; } + + /// + /// Whether to start a separate run-through for each store + /// + public bool PerStore { get; set; } + + /// + /// Email Account identifier used to send a notification message an export completes + /// + public int EmailAccountId { get; set; } + + /// + /// Email addresses where to send the notification message + /// + public string CompletedEmailAddresses { get; set; } + + /// + /// Whether to combine and compress the export files in a ZIP archive + /// + public bool CreateZipArchive { get; set; } + + /// + /// Whether to delete unneeded files after deployment + /// + public bool Cleanup { get; set; } + + + /// + /// The scheduling task + /// + public virtual ScheduleTask ScheduleTask { get; set; } + + /// + /// Gets or sets export deployments + /// + public virtual ICollection Deployments + { + get => _deployments ?? (_deployments = new HashSet()); + set => _deployments = value; + } + + public ExportProfile Clone() + { + var profile = new ExportProfile + { + Name = this.Name, + FolderName = null, + FileNamePattern = this.FileNamePattern, + ProviderSystemName = this.ProviderSystemName, + Enabled = this.Enabled, + SchedulingTaskId = 0, + Filtering = this.Filtering, + Projection = this.Projection, + ProviderConfigData = this.ProviderConfigData, + ResultInfo = null, + Offset = this.Offset, + Limit = this.Limit, + BatchSize = this.BatchSize, + PerStore = this.PerStore, + EmailAccountId = this.EmailAccountId, + CompletedEmailAddresses = this.CompletedEmailAddresses, + CreateZipArchive = this.CreateZipArchive, + Cleanup = this.Cleanup + }; + return profile; + } + + object ICloneable.Clone() + { + return this.Clone(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProjection.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProjection.cs index f4ca7317fc..ff48168f71 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProjection.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProjection.cs @@ -4,197 +4,179 @@ namespace SmartStore.Core.Domain.DataExchange { - /// - /// Settings projected onto an export - /// - /// - /// Note possible projection controlling: a) developer controls, b) merchant controls, c) developer controls what the merchant can control - /// - [Serializable] - public class ExportProjection - { - public ExportProjection() - { - OnlyIndividuallyVisibleAssociated = true; - } - - #region All entity types - - /// - /// Store identifier - /// - public int? StoreId { get; set; } - - /// - /// The language to be applied to the export - /// - public int? LanguageId { get; set; } - - /// - /// The currency to be applied to the export - /// - public int? CurrencyId { get; set; } - - /// - /// Customer identifier - /// - public int? CustomerId { get; set; } - - #endregion - - #region Product - - /// - /// Description merging identifier - /// - public int DescriptionMergingId { get; set; } - - /// - /// Decription merging - /// - [XmlIgnore] - public ExportDescriptionMerging DescriptionMerging - { - get - { - return (ExportDescriptionMerging)DescriptionMergingId; - } - set - { - DescriptionMergingId = (int)value; - } - } - - /// - /// Convert HTML decription to plain text - /// - public bool DescriptionToPlainText { get; set; } - - /// - /// Comma separated text to append to the decription - /// - public string AppendDescriptionText { get; set; } - - /// - /// Remove critical characters from the description - /// - public bool RemoveCriticalCharacters { get; set; } - - /// - /// Comma separated list of critical characters - /// - public string CriticalCharacters { get; set; } - - /// - /// The price type for calculating the product price - /// - public PriceDisplayType? PriceType { get; set; } - - /// - /// Convert net to gross prices - /// - public bool ConvertNetToGrossPrices { get; set; } - - /// - /// Fallback for product brand - /// - public string Brand { get; set; } - - /// - /// Number of images per object to be exported - /// - public int? NumberOfMediaFiles { get; set; } - - /// - /// Picture size - /// - public int PictureSize { get; set; } - - /// - /// Fallback for shipping time - /// - public string ShippingTime { get; set; } - - /// - /// Fallback for shipping costs - /// - public decimal? ShippingCosts { get; set; } - - /// - /// Free shipping threshold - /// - public decimal? FreeShippingThreshold { get; set; } - - /// - /// Whether to export attribute combinations as products - /// - public bool AttributeCombinationAsProduct { get; set; } - - /// - /// Identifier for merging attribute values of attribute combinations - /// - public int AttributeCombinationValueMergingId { get; set; } - - /// - /// Merging attribute values of attribute combinations - /// - [XmlIgnore] - public ExportAttributeValueMerging AttributeCombinationValueMerging - { - get - { - return (ExportAttributeValueMerging)AttributeCombinationValueMergingId; - } - set - { - AttributeCombinationValueMergingId = (int)value; - } - } - - /// - /// Whether to export grouped products - /// - public bool NoGroupedProducts { get; set; } - - /// - /// Whether to export associated products that marked as "visible individually". false to load all records, true to load "visible individually" only - /// - public bool OnlyIndividuallyVisibleAssociated { get; set; } - - #endregion - - #region Order - - /// - /// Identifier of the new state for orders - /// - public int OrderStatusChangeId { get; set; } - - /// - /// New state for orders - /// - [XmlIgnore] - public ExportOrderStatusChange OrderStatusChange - { - get - { - return (ExportOrderStatusChange)OrderStatusChangeId; - } - set - { - OrderStatusChangeId = (int)value; - } - } - - #endregion - - #region Shopping Cart Item - - /// - /// Whether to export bundle products - /// - public bool NoBundleProducts { get; set; } - - #endregion - } + /// + /// Settings projected onto an export + /// + /// + /// Note possible projection controlling: a) developer controls, b) merchant controls, c) developer controls what the merchant can control + /// + [Serializable] + public class ExportProjection + { + public ExportProjection() + { + OnlyIndividuallyVisibleAssociated = true; + } + + #region All entity types + + /// + /// Store identifier + /// + public int? StoreId { get; set; } + + /// + /// The language to be applied to the export + /// + public int? LanguageId { get; set; } + + /// + /// The currency to be applied to the export + /// + public int? CurrencyId { get; set; } + + /// + /// Customer identifier + /// + public int? CustomerId { get; set; } + + #endregion + + #region Product + + /// + /// Description merging identifier + /// + public int DescriptionMergingId { get; set; } + + /// + /// Decription merging + /// + [XmlIgnore] + public ExportDescriptionMerging DescriptionMerging + { + get => (ExportDescriptionMerging)DescriptionMergingId; + set => DescriptionMergingId = (int)value; + } + + /// + /// Convert HTML decription to plain text + /// + public bool DescriptionToPlainText { get; set; } + + /// + /// Comma separated text to append to the decription + /// + public string AppendDescriptionText { get; set; } + + /// + /// Remove critical characters from the description + /// + public bool RemoveCriticalCharacters { get; set; } + + /// + /// Comma separated list of critical characters + /// + public string CriticalCharacters { get; set; } + + /// + /// The price type for calculating the product price + /// + public PriceDisplayType? PriceType { get; set; } + + /// + /// Convert net to gross prices + /// + public bool ConvertNetToGrossPrices { get; set; } + + /// + /// Fallback for product brand + /// + public string Brand { get; set; } + + /// + /// Number of images per object to be exported + /// + public int? NumberOfMediaFiles { get; set; } + + /// + /// Picture size + /// + public int PictureSize { get; set; } + + /// + /// Fallback for shipping time + /// + public string ShippingTime { get; set; } + + /// + /// Fallback for shipping costs + /// + public decimal? ShippingCosts { get; set; } + + /// + /// Free shipping threshold + /// + public decimal? FreeShippingThreshold { get; set; } + + /// + /// Whether to export attribute combinations as products + /// + public bool AttributeCombinationAsProduct { get; set; } + + /// + /// Identifier for merging attribute values of attribute combinations + /// + public int AttributeCombinationValueMergingId { get; set; } + + /// + /// Merging attribute values of attribute combinations + /// + [XmlIgnore] + public ExportAttributeValueMerging AttributeCombinationValueMerging + { + get => (ExportAttributeValueMerging)AttributeCombinationValueMergingId; + set => AttributeCombinationValueMergingId = (int)value; + } + + /// + /// Whether to export grouped products + /// + public bool NoGroupedProducts { get; set; } + + /// + /// Whether to export associated products that marked as "visible individually". false to load all records, true to load "visible individually" only + /// + public bool OnlyIndividuallyVisibleAssociated { get; set; } + + #endregion + + #region Order + + /// + /// Identifier of the new state for orders + /// + public int OrderStatusChangeId { get; set; } + + /// + /// New state for orders + /// + [XmlIgnore] + public ExportOrderStatusChange OrderStatusChange + { + get => (ExportOrderStatusChange)OrderStatusChangeId; + set => OrderStatusChangeId = (int)value; + } + + #endregion + + #region Shopping Cart Item + + /// + /// Whether to export bundle products + /// + public bool NoBundleProducts { get; set; } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportEnums.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportEnums.cs index 94bbd69246..399914eb28 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportEnums.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportEnums.cs @@ -2,27 +2,27 @@ namespace SmartStore.Core.Domain.DataExchange { - /// - /// Supported entity types - /// - public enum ImportEntityType - { - Product = 0, - Category, - Customer, - NewsLetterSubscription - } + /// + /// Supported entity types + /// + public enum ImportEntityType + { + Product = 0, + Category, + Customer, + NewsLetterSubscription + } - public enum ImportFileType - { - CSV = 0, - XLSX - } + public enum ImportFileType + { + CSV = 0, + XLSX + } - [Flags] - public enum ImportModeFlags - { - Insert = 1, - Update = 2 - } + [Flags] + public enum ImportModeFlags + { + Insert = 1, + Update = 2 + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs index 4322a88f2f..6c00160ae9 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs @@ -3,62 +3,50 @@ namespace SmartStore.Core.Domain { - public class ImportProfile : BaseEntity - { - /// - /// The name of the profile - /// - public string Name { get; set; } - - /// - /// The name of the folder (file system) - /// - public string FolderName { get; set; } - - /// - /// The identifier of the file type - /// - public int FileTypeId { get; set; } - - /// - /// The file type - /// - public ImportFileType FileType - { - get - { - return (ImportFileType)FileTypeId; - } - set - { - FileTypeId = (int)value; - } - } - - /// - /// The identifier of the entity type - /// - public int EntityTypeId { get; set; } - - /// - /// The entity type - /// - public ImportEntityType EntityType - { - get - { - return (ImportEntityType)EntityTypeId; - } - set - { - EntityTypeId = (int)value; - } - } - - /// - /// Whether the profile is enabled - /// - public bool Enabled { get; set; } + public class ImportProfile : BaseEntity + { + /// + /// The name of the profile + /// + public string Name { get; set; } + + /// + /// The name of the folder (file system) + /// + public string FolderName { get; set; } + + /// + /// The identifier of the file type + /// + public int FileTypeId { get; set; } + + /// + /// The file type + /// + public ImportFileType FileType + { + get => (ImportFileType)FileTypeId; + set => FileTypeId = (int)value; + } + + /// + /// The identifier of the entity type + /// + public int EntityTypeId { get; set; } + + /// + /// The entity type + /// + public ImportEntityType EntityType + { + get => (ImportEntityType)EntityTypeId; + set => EntityTypeId = (int)value; + } + + /// + /// Whether the profile is enabled + /// + public bool Enabled { get; set; } /// /// Whether the import related data @@ -70,49 +58,49 @@ public ImportEntityType EntityType /// public int Skip { get; set; } - /// - /// Maximum number of records to return - /// - public int Take { get; set; } - - /// - /// Whether to only update existing data - /// - public bool UpdateOnly { get; set; } - - /// - /// Name of key fields to identify existing records during import - /// - public string KeyFieldNames { get; set; } - - /// - /// File type specific configuration - /// - public string FileTypeConfiguration { get; set; } - - /// - /// XML with extra data - /// - public string ExtraData { get; set; } - - /// - /// Mapping of import columns - /// - public string ColumnMapping { get; set; } - - /// - /// XML with information about the last import - /// - public string ResultInfo { get; set; } - - /// - /// The scheduling task identifier - /// - public int SchedulingTaskId { get; set; } - - /// - /// The scheduling task - /// - public virtual ScheduleTask ScheduleTask { get; set; } - } + /// + /// Maximum number of records to return + /// + public int Take { get; set; } + + /// + /// Whether to only update existing data + /// + public bool UpdateOnly { get; set; } + + /// + /// Name of key fields to identify existing records during import + /// + public string KeyFieldNames { get; set; } + + /// + /// File type specific configuration + /// + public string FileTypeConfiguration { get; set; } + + /// + /// XML with extra data + /// + public string ExtraData { get; set; } + + /// + /// Mapping of import columns + /// + public string ColumnMapping { get; set; } + + /// + /// XML with information about the last import + /// + public string ResultInfo { get; set; } + + /// + /// The scheduling task identifier + /// + public int SchedulingTaskId { get; set; } + + /// + /// The scheduling task + /// + public virtual ScheduleTask ScheduleTask { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs index d8067400cb..09230db0a7 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs @@ -1,85 +1,81 @@ using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; using SmartStore.Core.Data.Hooks; namespace SmartStore.Core.Domain.DataExchange { - /// - /// Holds info about a synchronization operation with an external system - /// - [DataContract] - [Hookable(false)] - public partial class SyncMapping : BaseEntity - { - public SyncMapping() - { - this.SyncedOnUtc = DateTime.UtcNow; - } + /// + /// Holds info about a synchronization operation with an external system + /// + [DataContract] + [Hookable(false)] + public partial class SyncMapping : BaseEntity + { + public SyncMapping() + { + this.SyncedOnUtc = DateTime.UtcNow; + } - /// - /// Gets or sets the entity identifier in SmartStore - /// - [Index("IX_SyncMapping_ByEntity", 0, IsUnique = true)] - [DataMember] - public int EntityId { get; set; } + /// + /// Gets or sets the entity identifier in SmartStore + /// + [Index("IX_SyncMapping_ByEntity", 0, IsUnique = true)] + [DataMember] + public int EntityId { get; set; } - /// - /// Gets or sets the entity's key in the external application - /// - [Index("IX_SyncMapping_BySource", 0, IsUnique = true)] - [DataMember] - public string SourceKey { get; set; } + /// + /// Gets or sets the entity's key in the external application + /// + [Index("IX_SyncMapping_BySource", 0, IsUnique = true)] + [DataMember] + public string SourceKey { get; set; } - /// - /// Gets or sets a name representing the entity type - /// - [Index("IX_SyncMapping_ByEntity", 1, IsUnique = true)] - [Index("IX_SyncMapping_BySource", 1, IsUnique = true)] - [DataMember] - public string EntityName { get; set; } + /// + /// Gets or sets a name representing the entity type + /// + [Index("IX_SyncMapping_ByEntity", 1, IsUnique = true)] + [Index("IX_SyncMapping_BySource", 1, IsUnique = true)] + [DataMember] + public string EntityName { get; set; } - /// - /// Gets or sets a name for the external application - /// - [Index("IX_SyncMapping_ByEntity", 2, IsUnique = true)] - [Index("IX_SyncMapping_BySource", 2, IsUnique = true)] - [DataMember] - public string ContextName { get; set; } + /// + /// Gets or sets a name for the external application + /// + [Index("IX_SyncMapping_ByEntity", 2, IsUnique = true)] + [Index("IX_SyncMapping_BySource", 2, IsUnique = true)] + [DataMember] + public string ContextName { get; set; } - /// - /// Gets or sets an optional content hash reflecting the source model at the time of last sync - /// - [DataMember] - public string SourceHash { get; set; } + /// + /// Gets or sets an optional content hash reflecting the source model at the time of last sync + /// + [DataMember] + public string SourceHash { get; set; } - /// - /// Gets or sets a custom integer value - /// - [DataMember] - public int? CustomInt { get; set; } + /// + /// Gets or sets a custom integer value + /// + [DataMember] + public int? CustomInt { get; set; } - /// - /// Gets or sets a custom string value - /// - [DataMember] - public string CustomString { get; set; } + /// + /// Gets or sets a custom string value + /// + [DataMember] + public string CustomString { get; set; } - /// - /// Gets or sets a custom bool value - /// - [DataMember] - public bool? CustomBool { get; set; } + /// + /// Gets or sets a custom bool value + /// + [DataMember] + public bool? CustomBool { get; set; } - /// - /// Gets or sets the date of the last sync operation - /// - [DataMember] - public DateTime SyncedOnUtc { get; set; } + /// + /// Gets or sets the date of the last sync operation + /// + [DataMember] + public DateTime SyncedOnUtc { get; set; } - } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/Country.cs b/src/Libraries/SmartStore.Core/Domain/Directory/Country.cs index 3516ffa989..2d7bb62f3e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/Country.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/Country.cs @@ -6,11 +6,11 @@ namespace SmartStore.Core.Domain.Directory { - /// - /// Represents a country - /// - [DataContract] - public partial class Country : BaseEntity, ILocalizedEntity, IStoreMappingSupported + /// + /// Represents a country + /// + [DataContract] + public partial class Country : BaseEntity, ILocalizedEntity, IStoreMappingSupported { private ICollection _stateProvinces; @@ -18,92 +18,92 @@ public partial class Country : BaseEntity, ILocalizedEntity, IStoreMappingSuppor /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets a value indicating whether billing is allowed to this country /// [DataMember] - public bool AllowsBilling { get; set; } + public bool AllowsBilling { get; set; } /// /// Gets or sets a value indicating whether shipping is allowed to this country /// [DataMember] - public bool AllowsShipping { get; set; } + public bool AllowsShipping { get; set; } /// /// Gets or sets the two letter ISO code /// [DataMember] - public string TwoLetterIsoCode { get; set; } + public string TwoLetterIsoCode { get; set; } /// /// Gets or sets the three letter ISO code /// [DataMember] - public string ThreeLetterIsoCode { get; set; } + public string ThreeLetterIsoCode { get; set; } /// /// Gets or sets the numeric ISO code /// [DataMember] - public int NumericIsoCode { get; set; } + public int NumericIsoCode { get; set; } /// /// Gets or sets a value indicating whether customers in this country must be charged EU VAT /// [DataMember] - public bool SubjectToVat { get; set; } + public bool SubjectToVat { get; set; } /// /// Gets or sets a value indicating whether the entity is published /// [DataMember] - public bool Published { get; set; } + public bool Published { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } - /// - /// Gets or sets a value indicating whether the cookie manager should be displayed for visitors of this country. - /// - [DataMember] - public bool DisplayCookieManager { get; set; } = true; + /// + /// Gets or sets a value indicating whether the cookie manager should be displayed for visitors of this country. + /// + [DataMember] + public bool DisplayCookieManager { get; set; } = true; - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } - /// - /// Gets or sets the international mailing address format - /// - [DataMember, MaxLength] - public string AddressFormat { get; set; } + /// + /// Gets or sets the international mailing address format + /// + [DataMember, MaxLength] + public string AddressFormat { get; set; } - /// - /// Gets or sets the identfier of the default currency. - /// - [DataMember] - public int? DefaultCurrencyId { get; set; } + /// + /// Gets or sets the identfier of the default currency. + /// + [DataMember] + public int? DefaultCurrencyId { get; set; } - /// - /// Gets or sets the default currency. - /// - public virtual Currency DefaultCurrency { get; set; } + /// + /// Gets or sets the default currency. + /// + public virtual Currency DefaultCurrency { get; set; } - /// - /// Gets or sets the state/provinces - /// - public virtual ICollection StateProvinces + /// + /// Gets or sets the state/provinces + /// + public virtual ICollection StateProvinces { - get { return _stateProvinces ?? (_stateProvinces = new HashSet()); } - protected set { _stateProvinces = value; } + get => _stateProvinces ?? (_stateProvinces = new HashSet()); + protected set => _stateProvinces = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/Currency.cs b/src/Libraries/SmartStore.Core/Domain/Directory/Currency.cs index 92f0223d60..e892b06553 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/Currency.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/Currency.cs @@ -12,73 +12,73 @@ namespace SmartStore.Core.Domain.Directory /// Represents a currency /// [DataContract] - public partial class Currency : BaseEntity, IAuditable, ILocalizedEntity, IStoreMappingSupported, ICloneable + public partial class Currency : BaseEntity, IAuditable, ILocalizedEntity, IStoreMappingSupported, ICloneable { /// /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets the ISO currency code /// [DataMember] - public string CurrencyCode { get; set; } + public string CurrencyCode { get; set; } /// /// Gets or sets the rate /// [DataMember] - public decimal Rate { get; set; } + public decimal Rate { get; set; } /// /// Gets or sets the display locale /// [DataMember] - public string DisplayLocale { get; set; } + public string DisplayLocale { get; set; } /// /// Gets or sets the custom formatting /// [DataMember] - public string CustomFormatting { get; set; } + public string CustomFormatting { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is published /// [DataMember] - public bool Published { get; set; } + public bool Published { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } /// /// Gets or sets the date and time of instance creation /// [DataMember] - public DateTime CreatedOnUtc { get; set; } + public DateTime CreatedOnUtc { get; set; } /// /// Gets or sets the date and time of instance update /// [DataMember] - public DateTime UpdatedOnUtc { get; set; } + public DateTime UpdatedOnUtc { get; set; } - /// - /// Gets or sets the (comma separated) list of domain endings (e.g. country code top-level domains) to which this currency is the default one - /// - [DataMember] - public string DomainEndings { get; set; } + /// + /// Gets or sets the (comma separated) list of domain endings (e.g. country code top-level domains) to which this currency is the default one + /// + [DataMember] + public string DomainEndings { get; set; } #region Rounding @@ -128,29 +128,29 @@ object ICloneable.Clone() private NumberFormatInfo _numberFormat; - [NotMapped, JsonIgnore, IgnoreDataMember] - public NumberFormatInfo NumberFormat - { - get - { - if (_numberFormat == null && DisplayLocale.HasValue()) - { - try - { - _numberFormat = CultureInfo.CreateSpecificCulture(DisplayLocale).NumberFormat; - } - catch { } - } - - if (_numberFormat == null) - { - _numberFormat = NumberFormatInfo.CurrentInfo; - } - - return _numberFormat; - } - } - - #endregion - } + [NotMapped, JsonIgnore, IgnoreDataMember] + public NumberFormatInfo NumberFormat + { + get + { + if (_numberFormat == null && DisplayLocale.HasValue()) + { + try + { + _numberFormat = CultureInfo.CreateSpecificCulture(DisplayLocale).NumberFormat; + } + catch { } + } + + if (_numberFormat == null) + { + _numberFormat = NumberFormatInfo.CurrentInfo; + } + + return _numberFormat; + } + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs index 8b2da2bf9f..cfa6700ecc 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs @@ -7,31 +7,31 @@ namespace SmartStore.Core.Domain.Directory /// Represents a delivery time /// [DataContract] - public partial class DeliveryTime : BaseEntity, ILocalizedEntity + public partial class DeliveryTime : BaseEntity, ILocalizedEntity { /// /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets the hex value /// [DataMember] - public string ColorHexValue { get; set; } + public string ColorHexValue { get; set; } /// /// Gets or sets the display locale /// [DataMember] - public string DisplayLocale { get; set; } + public string DisplayLocale { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } /// /// Gets or sets the display order diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/ExchangeRate.cs b/src/Libraries/SmartStore.Core/Domain/Directory/ExchangeRate.cs index 5f33a5e0db..8f8c8e606a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/ExchangeRate.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/ExchangeRate.cs @@ -3,35 +3,35 @@ namespace SmartStore.Core.Domain.Directory { - /// - /// Represents an exchange rate - /// - [DebuggerDisplay("{CurrencyCode} {Rate}")] + /// + /// Represents an exchange rate + /// + [DebuggerDisplay("{CurrencyCode} {Rate}")] public partial class ExchangeRate { - /// - /// Name of the currrency - /// - public string Name { get; set; } = string.Empty; + /// + /// Name of the currrency + /// + public string Name { get; set; } = string.Empty; - /// - /// The three letter ISO code for the Exchange Rate, e.g. USD - /// - public string CurrencyCode { get; set; } = string.Empty; + /// + /// The three letter ISO code for the Exchange Rate, e.g. USD + /// + public string CurrencyCode { get; set; } = string.Empty; - /// - /// Indicates whether the currency is available in the store - /// - public bool IsStoreCurrency { get; set; } + /// + /// Indicates whether the currency is available in the store + /// + public bool IsStoreCurrency { get; set; } - /// - /// The conversion rate of this currency from the base currency - /// - public decimal Rate { get; set; } = 1.0m; + /// + /// The conversion rate of this currency from the base currency + /// + public decimal Rate { get; set; } = 1.0m; - /// - /// When was this exchange rate updated from the data source (the internet data xml feed) - /// - public DateTime UpdatedOn { get; set; } - } + /// + /// When was this exchange rate updated from the data source (the internet data xml feed) + /// + public DateTime UpdatedOn { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/MeasureDimension.cs b/src/Libraries/SmartStore.Core/Domain/Directory/MeasureDimension.cs index 2e02b62768..cf65992ff9 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/MeasureDimension.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/MeasureDimension.cs @@ -3,34 +3,34 @@ namespace SmartStore.Core.Domain.Directory { - /// - /// Represents a measure dimension - /// - [DataContract] - public partial class MeasureDimension : BaseEntity, ILocalizedEntity + /// + /// Represents a measure dimension + /// + [DataContract] + public partial class MeasureDimension : BaseEntity, ILocalizedEntity { - /// - /// Gets or sets the name - /// - [DataMember] - public string Name { get; set; } + /// + /// Gets or sets the name + /// + [DataMember] + public string Name { get; set; } - /// - /// Gets or sets the system keyword - /// - [DataMember] - public string SystemKeyword { get; set; } + /// + /// Gets or sets the system keyword + /// + [DataMember] + public string SystemKeyword { get; set; } - /// - /// Gets or sets the ratio - /// - [DataMember] - public decimal Ratio { get; set; } + /// + /// Gets or sets the ratio + /// + [DataMember] + public decimal Ratio { get; set; } - /// - /// Gets or sets the display order - /// - [DataMember] - public int DisplayOrder { get; set; } + /// + /// Gets or sets the display order + /// + [DataMember] + public int DisplayOrder { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/MeasureWeight.cs b/src/Libraries/SmartStore.Core/Domain/Directory/MeasureWeight.cs index d798c43588..ac1bfda3be 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/MeasureWeight.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/MeasureWeight.cs @@ -3,34 +3,34 @@ namespace SmartStore.Core.Domain.Directory { - /// - /// Represents a measure weight - /// - [DataContract] - public partial class MeasureWeight : BaseEntity, ILocalizedEntity + /// + /// Represents a measure weight + /// + [DataContract] + public partial class MeasureWeight : BaseEntity, ILocalizedEntity { - /// - /// Gets or sets the name - /// - [DataMember] - public string Name { get; set; } + /// + /// Gets or sets the name + /// + [DataMember] + public string Name { get; set; } - /// - /// Gets or sets the system keyword - /// - [DataMember] - public string SystemKeyword { get; set; } + /// + /// Gets or sets the system keyword + /// + [DataMember] + public string SystemKeyword { get; set; } - /// - /// Gets or sets the ratio - /// - [DataMember] - public decimal Ratio { get; set; } + /// + /// Gets or sets the ratio + /// + [DataMember] + public decimal Ratio { get; set; } - /// - /// Gets or sets the display order - /// - [DataMember] - public int DisplayOrder { get; set; } + /// + /// Gets or sets the display order + /// + [DataMember] + public int DisplayOrder { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/QuantityUnit.cs b/src/Libraries/SmartStore.Core/Domain/Directory/QuantityUnit.cs index 4e671a5384..77320a1777 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/QuantityUnit.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/QuantityUnit.cs @@ -13,7 +13,7 @@ public partial class QuantityUnit : BaseEntity, ILocalizedEntity /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets the name plural. @@ -25,24 +25,24 @@ public partial class QuantityUnit : BaseEntity, ILocalizedEntity /// Gets or sets the description /// [DataMember] - public string Description { get; set; } + public string Description { get; set; } /// /// Gets or sets the display locale /// [DataMember] - public string DisplayLocale { get; set; } + public string DisplayLocale { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } /// /// Gets or sets the default quantity unit /// [DataMember] - public bool IsDefault { get; set; } + public bool IsDefault { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/StateProvince.cs b/src/Libraries/SmartStore.Core/Domain/Directory/StateProvince.cs index f349001fa8..0151457ba6 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/StateProvince.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/StateProvince.cs @@ -1,6 +1,6 @@ -using SmartStore.Core.Domain.Localization; using System.Runtime.Serialization; +using SmartStore.Core.Domain.Localization; namespace SmartStore.Core.Domain.Directory { @@ -8,43 +8,43 @@ namespace SmartStore.Core.Domain.Directory /// Represents a state/province /// [DataContract] - public partial class StateProvince : BaseEntity, ILocalizedEntity + public partial class StateProvince : BaseEntity, ILocalizedEntity { /// /// Gets or sets the country identifier /// [DataMember] - public int CountryId { get; set; } + public int CountryId { get; set; } /// /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets the abbreviation /// [DataMember] - public string Abbreviation { get; set; } + public string Abbreviation { get; set; } /// /// Gets or sets a value indicating whether the entity is published /// [DataMember] - public bool Published { get; set; } + public bool Published { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } /// /// Gets or sets the country /// [DataMember] - public virtual Country Country { get; set; } + public virtual Country Country { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Discounts/Discount.cs b/src/Libraries/SmartStore.Core/Domain/Discounts/Discount.cs index a96a309f89..416cfdb06d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Discounts/Discount.cs +++ b/src/Libraries/SmartStore.Core/Domain/Discounts/Discount.cs @@ -11,110 +11,98 @@ namespace SmartStore.Core.Domain.Discounts /// Represents a discount /// [DataContract] - [DebuggerDisplay("{Name} - {DiscountType}")] - public partial class Discount : BaseEntity, IRulesContainer + [DebuggerDisplay("{Name} - {DiscountType}")] + public partial class Discount : BaseEntity, IRulesContainer { private ICollection _ruleSets; private ICollection _appliedToCategories; - private ICollection _appliedToManufacturers; - private ICollection _appliedToProducts; + private ICollection _appliedToManufacturers; + private ICollection _appliedToProducts; /// /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets the discount type identifier /// [DataMember] - public int DiscountTypeId { get; set; } + public int DiscountTypeId { get; set; } /// /// Gets or sets a value indicating whether to use percentage /// [DataMember] - public bool UsePercentage { get; set; } + public bool UsePercentage { get; set; } /// /// Gets or sets the discount percentage /// [DataMember] - public decimal DiscountPercentage { get; set; } + public decimal DiscountPercentage { get; set; } /// /// Gets or sets the discount amount /// [DataMember] - public decimal DiscountAmount { get; set; } + public decimal DiscountAmount { get; set; } /// /// Gets or sets the discount start date and time /// [DataMember] - public DateTime? StartDateUtc { get; set; } + public DateTime? StartDateUtc { get; set; } /// /// Gets or sets the discount end date and time /// [DataMember] - public DateTime? EndDateUtc { get; set; } + public DateTime? EndDateUtc { get; set; } /// /// Gets or sets a value indicating whether discount requires coupon code /// [DataMember] - public bool RequiresCouponCode { get; set; } + public bool RequiresCouponCode { get; set; } /// /// Gets or sets the coupon code /// [DataMember] - public string CouponCode { get; set; } + public string CouponCode { get; set; } /// /// Gets or sets the discount limitation identifier /// [DataMember] - public int DiscountLimitationId { get; set; } + public int DiscountLimitationId { get; set; } /// /// Gets or sets the discount limitation times (used when Limitation is set to "N Times Only" or "N Times Per Customer") /// [DataMember] - public int LimitationTimes { get; set; } + public int LimitationTimes { get; set; } /// /// Gets or sets the discount type /// [DataMember] - public DiscountType DiscountType + public DiscountType DiscountType { - get - { - return (DiscountType)this.DiscountTypeId; - } - set - { - this.DiscountTypeId = (int)value; - } + get => (DiscountType)this.DiscountTypeId; + set => this.DiscountTypeId = (int)value; } /// /// Gets or sets the discount limitation /// [DataMember] - public DiscountLimitationType DiscountLimitation + public DiscountLimitationType DiscountLimitation { - get - { - return (DiscountLimitationType)this.DiscountLimitationId; - } - set - { - this.DiscountLimitationId = (int)value; - } + get => (DiscountLimitationType)this.DiscountLimitationId; + set => this.DiscountLimitationId = (int)value; } /// @@ -122,8 +110,8 @@ public DiscountLimitationType DiscountLimitation /// public virtual ICollection RuleSets { - get { return _ruleSets ?? (_ruleSets = new HashSet()); } - protected set { _ruleSets = value; } + get => _ruleSets ?? (_ruleSets = new HashSet()); + protected set => _ruleSets = value; } /// @@ -132,27 +120,27 @@ public virtual ICollection RuleSets [DataMember] public virtual ICollection AppliedToCategories { - get { return _appliedToCategories ?? (_appliedToCategories = new HashSet()); } - protected set { _appliedToCategories = value; } + get => _appliedToCategories ?? (_appliedToCategories = new HashSet()); + protected set => _appliedToCategories = value; } - /// - /// Gets or sets the manufacturers - /// - [DataMember] - public virtual ICollection AppliedToManufacturers - { - get { return _appliedToManufacturers ?? (_appliedToManufacturers = new HashSet()); } - protected set { _appliedToManufacturers = value; } - } - - /// - /// Gets or sets the products - /// - public virtual ICollection AppliedToProducts - { - get { return _appliedToProducts ?? (_appliedToProducts = new HashSet()); } - protected set { _appliedToProducts = value; } - } + /// + /// Gets or sets the manufacturers + /// + [DataMember] + public virtual ICollection AppliedToManufacturers + { + get => _appliedToManufacturers ?? (_appliedToManufacturers = new HashSet()); + protected set => _appliedToManufacturers = value; + } + + /// + /// Gets or sets the products + /// + public virtual ICollection AppliedToProducts + { + get => _appliedToProducts ?? (_appliedToProducts = new HashSet()); + protected set => _appliedToProducts = value; + } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Discounts/DiscountType.cs b/src/Libraries/SmartStore.Core/Domain/Discounts/DiscountType.cs index c70468a740..d260fcabc6 100644 --- a/src/Libraries/SmartStore.Core/Domain/Discounts/DiscountType.cs +++ b/src/Libraries/SmartStore.Core/Domain/Discounts/DiscountType.cs @@ -17,14 +17,14 @@ public enum DiscountType /// Assigned to categories (all products in a category) /// AssignedToCategories = 5, - /// - /// Assigned to manufacturers (all products of a manufacturer) - /// - AssignedToManufacturers = 6, - /// - /// Assigned to shipping - /// - AssignedToShipping = 10, + /// + /// Assigned to manufacturers (all products of a manufacturer) + /// + AssignedToManufacturers = 6, + /// + /// Assigned to shipping + /// + AssignedToShipping = 10, /// /// Assigned to order subtotal /// diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs index ae83f4f8f9..3b21ddda01 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs @@ -58,8 +58,8 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported /// public virtual ICollection Forums { - get { return _forums ?? (_forums = new HashSet()); } - protected set { _forums = value; } + get => _forums ?? (_forums = new HashSet()); + protected set => _forums = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs index e65c80573d..3098a9cdc0 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs @@ -9,7 +9,7 @@ namespace SmartStore.Core.Domain.Forums /// Represents a forum post /// public partial class ForumPost : BaseEntity, IAuditable - { + { private ICollection _forumPostVotes; /// @@ -64,8 +64,8 @@ public partial class ForumPost : BaseEntity, IAuditable /// public virtual ICollection ForumPostVotes { - get { return _forumPostVotes ?? (_forumPostVotes = new HashSet()); } - protected set { _forumPostVotes = value; } + get => _forumPostVotes ?? (_forumPostVotes = new HashSet()); + protected set => _forumPostVotes = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs index 63d6134530..d7059778c1 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs @@ -8,7 +8,7 @@ namespace SmartStore.Core.Domain.Forums /// Represents a forum topic /// public partial class ForumTopic : BaseEntity, IAuditable - { + { /// /// Gets or sets the forum identifier /// @@ -87,14 +87,8 @@ public partial class ForumTopic : BaseEntity, IAuditable /// public ForumTopicType ForumTopicType { - get - { - return (ForumTopicType)this.TopicTypeId; - } - set - { - this.TopicTypeId = (int)value; - } + get => (ForumTopicType)this.TopicTypeId; + set => this.TopicTypeId = (int)value; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/PrivateMessage.cs b/src/Libraries/SmartStore.Core/Domain/Forums/PrivateMessage.cs index 0c7bfa9265..3e447d6e17 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/PrivateMessage.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/PrivateMessage.cs @@ -8,10 +8,10 @@ namespace SmartStore.Core.Domain.Forums /// public partial class PrivateMessage : BaseEntity { - /// - /// Gets or sets the store identifier - /// - public int StoreId { get; set; } + /// + /// Gets or sets the store identifier + /// + public int StoreId { get; set; } /// /// Gets or sets the customer identifier who sent the message diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/ILocalizedEntity.cs b/src/Libraries/SmartStore.Core/Domain/Localization/ILocalizedEntity.cs index 5f022ea319..49f6e41be7 100644 --- a/src/Libraries/SmartStore.Core/Domain/Localization/ILocalizedEntity.cs +++ b/src/Libraries/SmartStore.Core/Domain/Localization/ILocalizedEntity.cs @@ -6,6 +6,6 @@ namespace SmartStore.Core.Domain.Localization /// public interface ILocalizedEntity { - int Id { get; } - } + int Id { get; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/Language.cs b/src/Libraries/SmartStore.Core/Domain/Localization/Language.cs index 1d4b30386e..f80cb6bb74 100644 --- a/src/Libraries/SmartStore.Core/Domain/Localization/Language.cs +++ b/src/Libraries/SmartStore.Core/Domain/Localization/Language.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; using System.Diagnostics; using System.Globalization; +using System.Runtime.Serialization; using SmartStore.Core.Domain.Stores; namespace SmartStore.Core.Domain.Localization @@ -10,8 +10,8 @@ namespace SmartStore.Core.Domain.Localization /// Represents a language /// [DataContract] - [DebuggerDisplay("{LanguageCulture}")] - public partial class Language : BaseEntity, IStoreMappingSupported + [DebuggerDisplay("{LanguageCulture}")] + public partial class Language : BaseEntity, IStoreMappingSupported { private ICollection _localeStringResources; @@ -19,74 +19,74 @@ public partial class Language : BaseEntity, IStoreMappingSupported /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets the language culture (e.g. "en-US") /// [DataMember] - public string LanguageCulture { get; set; } + public string LanguageCulture { get; set; } /// /// Gets or sets the unique SEO code (e.g. "en") /// [DataMember] - public string UniqueSeoCode { get; set; } - + public string UniqueSeoCode { get; set; } + /// /// Gets or sets the flag image file name /// - [DataMember] - public string FlagImageFileName { get; set; } + [DataMember] + public string FlagImageFileName { get; set; } /// /// Gets or sets a value indicating whether the language supports "Right-to-left" /// [DataMember] - public bool Rtl { get; set; } + public bool Rtl { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the language is published /// [DataMember] - public bool Published { get; set; } + public bool Published { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } - + public int DisplayOrder { get; set; } + /// /// Gets or sets locale string resources /// public virtual ICollection LocaleStringResources { - get { return _localeStringResources ?? (_localeStringResources = new HashSet()); } - protected set { _localeStringResources = value; } + get => _localeStringResources ?? (_localeStringResources = new HashSet()); + protected set => _localeStringResources = value; } - public string GetTwoLetterISOLanguageName() - { - if (UniqueSeoCode.HasValue()) - { - return UniqueSeoCode; - } + public string GetTwoLetterISOLanguageName() + { + if (UniqueSeoCode.HasValue()) + { + return UniqueSeoCode; + } - try - { - var ci = new CultureInfo(LanguageCulture); - return ci.TwoLetterISOLanguageName; - } - catch { } + try + { + var ci = new CultureInfo(LanguageCulture); + return ci.TwoLetterISOLanguageName; + } + catch { } - return null; - } + return null; + } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizationSettings.cs b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizationSettings.cs index e523cb11ea..49d790dcf3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizationSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizationSettings.cs @@ -4,14 +4,14 @@ namespace SmartStore.Core.Domain.Localization { public class LocalizationSettings : ISettings { - public LocalizationSettings() - { - UseImagesForLanguageSelection = true; - DefaultLanguageRedirectBehaviour = DefaultLanguageRedirectBehaviour.StripSeoCode; - InvalidLanguageRedirectBehaviour = InvalidLanguageRedirectBehaviour.ReturnHttp404; - } - - /// + public LocalizationSettings() + { + UseImagesForLanguageSelection = true; + DefaultLanguageRedirectBehaviour = DefaultLanguageRedirectBehaviour.StripSeoCode; + InvalidLanguageRedirectBehaviour = InvalidLanguageRedirectBehaviour.ReturnHttp404; + } + + /// /// Default admin area language identifier /// public int DefaultAdminLanguageId { get; set; } diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs index 6996cf8549..521252dd36 100644 --- a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs +++ b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs @@ -13,41 +13,41 @@ public partial class LocalizedProperty : BaseEntity /// Gets or sets the entity identifier /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 1)] - public int EntityId { get; set; } + [Index("IX_LocalizedProperty_Compound", Order = 1)] + public int EntityId { get; set; } /// /// Gets or sets the language identifier /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 4)] - public int LanguageId { get; set; } + [Index("IX_LocalizedProperty_Compound", Order = 4)] + public int LanguageId { get; set; } /// /// Gets or sets the locale key group /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 3)] - [Index("IX_LocalizedProperty_LocaleKeyGroup")] - public string LocaleKeyGroup { get; set; } + [Index("IX_LocalizedProperty_Compound", Order = 3)] + [Index("IX_LocalizedProperty_LocaleKeyGroup")] + public string LocaleKeyGroup { get; set; } /// /// Gets or sets the locale key /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 2)] - public string LocaleKey { get; set; } + [Index("IX_LocalizedProperty_Compound", Order = 2)] + public string LocaleKey { get; set; } /// /// Gets or sets the locale value /// [DataMember] - public string LocaleValue { get; set; } - + public string LocaleValue { get; set; } + /// /// Gets the language /// - [DataMember] - public virtual Language Language { get; set; } + [DataMember] + public virtual Language Language { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedPropertyCollection.cs b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedPropertyCollection.cs index 9cd5549e0f..0537f9868e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedPropertyCollection.cs +++ b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedPropertyCollection.cs @@ -1,90 +1,96 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; using System.Globalization; namespace SmartStore.Core.Domain.Localization { - public class LocalizedPropertyCollection : IReadOnlyCollection - { - private readonly string _keyGroup; - private readonly IDictionary _dict; - private HashSet _requestedSet; + public class LocalizedPropertyCollection : IReadOnlyCollection + { + private readonly string _keyGroup; + private readonly IDictionary _dict; + private HashSet _requestedSet; - public LocalizedPropertyCollection(string keyGroup, int[] requestedSet, IEnumerable items) - { - Guard.NotEmpty(keyGroup, nameof(keyGroup)); - Guard.NotNull(items, nameof(items)); + public LocalizedPropertyCollection(string keyGroup, int[] requestedSet, IEnumerable items) + { + Guard.NotEmpty(keyGroup, nameof(keyGroup)); + Guard.NotNull(items, nameof(items)); - _keyGroup = keyGroup; - _dict = items.ToDictionarySafe(x => CreateKey(x.LocaleKey, x.EntityId, x.LanguageId), StringComparer.OrdinalIgnoreCase); + _keyGroup = keyGroup; + _dict = items.ToDictionarySafe(x => CreateKey(x.LocaleKey, x.EntityId, x.LanguageId), StringComparer.OrdinalIgnoreCase); - if (requestedSet != null && requestedSet.Length > 0) - { - _requestedSet = new HashSet(requestedSet); - } - } + if (requestedSet != null && requestedSet.Length > 0) + { + _requestedSet = new HashSet(requestedSet); + } + } - public void MergeWith(LocalizedPropertyCollection other) - { - Guard.NotNull(other, nameof(other)); + public void MergeWith(LocalizedPropertyCollection other) + { + Guard.NotNull(other, nameof(other)); - if (!this._keyGroup.IsCaseInsensitiveEqual(other._keyGroup)) - { - throw new InvalidOperationException("Expected keygroup '{0}', but was '{1}'".FormatInvariant(this._keyGroup, other._keyGroup)); - } + if (!this._keyGroup.IsCaseInsensitiveEqual(other._keyGroup)) + { + throw new InvalidOperationException("Expected keygroup '{0}', but was '{1}'".FormatInvariant(this._keyGroup, other._keyGroup)); + } - // Merge dictionary - other._dict.Merge(this._dict, true); + // Merge dictionary + other._dict.Merge(this._dict, true); - // Merge requested set (entity ids) - if (this._requestedSet != null) - { - if (other._requestedSet == null) - { - other._requestedSet = new HashSet(this._requestedSet); - } - else - { - other._requestedSet.AddRange(this._requestedSet); - } - } - } + // Merge requested set (entity ids) + if (this._requestedSet != null) + { + if (other._requestedSet == null) + { + other._requestedSet = new HashSet(this._requestedSet); + } + else + { + other._requestedSet.AddRange(this._requestedSet); + } + } + } - public string GetValue(int languageId, int entityId, string localeKey) - { - return Find(languageId, entityId, localeKey)?.LocaleValue; - } + public string GetValue(int languageId, int entityId, string localeKey) + { + return Find(languageId, entityId, localeKey)?.LocaleValue; + } - public LocalizedProperty Find(int languageId, int entityId, string localeKey) - { - var item = _dict.Get(CreateKey(localeKey, entityId, languageId)); + public LocalizedProperty Find(int languageId, int entityId, string localeKey) + { + var item = _dict.Get(CreateKey(localeKey, entityId, languageId)); - if (item == null && (_requestedSet == null || _requestedSet.Contains(entityId))) - { - // Although the item does not exist in the local dictionary it has been requested - // from the database, which means it does not exist in the db either. - // Avoid the upcoming roundtrip. - return new LocalizedProperty - { - LocaleKeyGroup = _keyGroup, - EntityId = entityId, - LanguageId = languageId, - LocaleKey = localeKey - }; - } + if (item == null && (_requestedSet == null || _requestedSet.Contains(entityId))) + { + // Although the item does not exist in the local dictionary it has been requested + // from the database, which means it does not exist in the db either. + // Avoid the upcoming roundtrip. + return new LocalizedProperty + { + LocaleKeyGroup = _keyGroup, + EntityId = entityId, + LanguageId = languageId, + LocaleKey = localeKey + }; + } - return item; - } + return item; + } - private string CreateKey(string localeKey, int entityId, int languageId) - { - return string.Concat(localeKey, "-", entityId.ToString(CultureInfo.InvariantCulture), "-", languageId); - } + private string CreateKey(string localeKey, int entityId, int languageId) + { + return string.Concat(localeKey, "-", entityId.ToString(CultureInfo.InvariantCulture), "-", languageId); + } - public int Count => _dict.Values.Count; - public IEnumerator GetEnumerator() => _dict.Values.GetEnumerator(); - IEnumerator IEnumerable.GetEnumerator() => _dict.Values.GetEnumerator(); - } + public int Count => _dict.Values.Count; + public IEnumerator GetEnumerator() + { + return _dict.Values.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return _dict.Values.GetEnumerator(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Logging/ActivityLogType.cs b/src/Libraries/SmartStore.Core/Domain/Logging/ActivityLogType.cs index eb59856a02..14e36bac16 100644 --- a/src/Libraries/SmartStore.Core/Domain/Logging/ActivityLogType.cs +++ b/src/Libraries/SmartStore.Core/Domain/Logging/ActivityLogType.cs @@ -1,13 +1,11 @@ -using System.Collections.Generic; - -namespace SmartStore.Core.Domain.Logging +namespace SmartStore.Core.Domain.Logging { /// /// Represents an activity log type record /// public partial class ActivityLogType : BaseEntity { - + /// /// Gets or sets the system keyword /// diff --git a/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs b/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs index f1ab2cf330..c82478c9f3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs +++ b/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs @@ -10,11 +10,11 @@ namespace SmartStore.Core.Domain.Logging /// public partial class Log : BaseEntity { - /// - /// Gets or sets the log level identifier - /// - [Index("IX_Log_Level", IsUnique = false)] - public int LogLevelId { get; set; } + /// + /// Gets or sets the log level identifier + /// + [Index("IX_Log_Level", IsUnique = false)] + public int LogLevelId { get; set; } /// /// Gets or sets the short message @@ -51,35 +51,29 @@ public partial class Log : BaseEntity /// public DateTime CreatedOnUtc { get; set; } - /// - /// Gets or sets the logger name - /// - [Index("IX_Log_Logger", IsUnique = false)] - public string Logger { get; set; } + /// + /// Gets or sets the logger name + /// + [Index("IX_Log_Logger", IsUnique = false)] + public string Logger { get; set; } - /// - /// Gets or sets the HTTP method - /// - public string HttpMethod { get; set; } + /// + /// Gets or sets the HTTP method + /// + public string HttpMethod { get; set; } - /// - /// Gets or sets the user name - /// - public string UserName { get; set; } + /// + /// Gets or sets the user name + /// + public string UserName { get; set; } - /// - /// Gets or sets the log level - /// - public LogLevel LogLevel + /// + /// Gets or sets the log level + /// + public LogLevel LogLevel { - get - { - return (LogLevel)this.LogLevelId; - } - set - { - this.LogLevelId = (int)value; - } + get => (LogLevel)this.LogLevelId; + set => this.LogLevelId = (int)value; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Media/Download.cs b/src/Libraries/SmartStore.Core/Domain/Media/Download.cs index beb66ab56e..95c3a6351e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/Download.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/Download.cs @@ -1,5 +1,3 @@ -using NuGet; -using SmartStore.Core.Domain.Catalog; using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; @@ -11,40 +9,40 @@ namespace SmartStore.Core.Domain.Media /// Represents a download /// [DataContract] - public partial class Download : BaseEntity//, ITransient - { - /// + public partial class Download : BaseEntity//, ITransient + { + /// /// Gets or sets a GUID /// - [DataMember] - [Index] - public Guid DownloadGuid { get; set; } + [DataMember] + [Index] + public Guid DownloadGuid { get; set; } /// /// Gets or sets a value indicating whether DownloadUrl property should be used /// [DataMember] - public bool UseDownloadUrl { get; set; } + public bool UseDownloadUrl { get; set; } /// /// Gets or sets a download URL /// [DataMember] - public string DownloadUrl { get; set; } + public string DownloadUrl { get; set; } - /// - /// Gets or sets a value indicating whether the entity transient/preliminary - /// - [DataMember] - [Index("IX_UpdatedOn_IsTransient", 1)] - public bool IsTransient { get; set; } + /// + /// Gets or sets a value indicating whether the entity transient/preliminary + /// + [DataMember] + [Index("IX_UpdatedOn_IsTransient", 1)] + public bool IsTransient { get; set; } - /// - /// Gets or sets the date and time of instance update - /// - [DataMember] - [Index("IX_UpdatedOn_IsTransient", 0)] - public DateTime UpdatedOnUtc { get; set; } + /// + /// Gets or sets the date and time of instance update + /// + [DataMember] + [Index("IX_UpdatedOn_IsTransient", 0)] + public DateTime UpdatedOnUtc { get; set; } /// /// Gets or sets the media file identifier @@ -57,7 +55,7 @@ public partial class Download : BaseEntity//, ITransient /// [DataMember] public virtual MediaFile MediaFile { get; set; } - + /// /// Gets or sets a value indicating the corresponding entity id /// diff --git a/src/Libraries/SmartStore.Core/Domain/Media/Enums.cs b/src/Libraries/SmartStore.Core/Domain/Media/Enums.cs index 94eb05184c..cb16901a9c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/Enums.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/Enums.cs @@ -5,12 +5,12 @@ namespace SmartStore.Core.Domain.Media /// public enum FallbackPictureType { - NoFallback = 0, + NoFallback = 0, - /// - /// Entities (products, categories, manufacturers) - /// - Entity = 1, + /// + /// Entities (products, categories, manufacturers) + /// + Entity = 1, } public enum ThumbnailScaleMode diff --git a/src/Libraries/SmartStore.Core/Domain/Media/IHasMedia.cs b/src/Libraries/SmartStore.Core/Domain/Media/IHasMedia.cs index 7cee5227c9..f0b70edaba 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/IHasMedia.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/IHasMedia.cs @@ -1,15 +1,15 @@ namespace SmartStore.Core.Domain.Media { - public interface IHasMedia - { - /// - /// Gets or sets the media storage identifier - /// - int? MediaStorageId { get; set; } + public interface IHasMedia + { + /// + /// Gets or sets the media storage identifier + /// + int? MediaStorageId { get; set; } - /// - /// Gets or sets the media storage - /// - MediaStorage MediaStorage { get; set; } - } + /// + /// Gets or sets the media storage + /// + MediaStorage MediaStorage { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaAlbum.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaAlbum.cs index 7eddbe81e2..7d95e78ceb 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaAlbum.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaAlbum.cs @@ -1,5 +1,4 @@ -using System; -using System.Runtime.Serialization; +using System.Runtime.Serialization; namespace SmartStore.Core.Domain.Media { diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs index 051fc8efff..2681666518 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs @@ -7,44 +7,44 @@ namespace SmartStore.Core.Domain.Media { - [DataContract] - public partial class MediaFile : BaseEntity, ITransient, IHasMedia, IAuditable, ISoftDeletable, ILocalizedEntity - { - #region static - - private static readonly HashSet _outputAffectingProductProps = new HashSet - { - nameof(MediaFile.FolderId), - nameof(MediaFile.Name), - nameof(MediaFile.Alt), - nameof(MediaFile.Title), - nameof(MediaFile.Hidden), - nameof(MediaFile.Deleted) - }; - - public static IReadOnlyCollection GetOutputAffectingPropertyNames() - { - return _outputAffectingProductProps; - } - - #endregion - - private ICollection _productMediaFiles; - private ICollection _tags; - private ICollection _tracks; - - /// - /// Gets or sets the associated folder identifier. - /// - [DataMember] - [Index("IX_Media_MediaType", 0)] - [Index("IX_Media_Extension", 0)] - [Index("IX_Media_PixelSize", 0)] - [Index("IX_Media_Name", 0)] - [Index("IX_Media_Size", 0)] - [Index("IX_Media_UpdatedOnUtc", 0)] - [Index("IX_Media_FolderId", 0)] - public int? FolderId { get; set; } + [DataContract] + public partial class MediaFile : BaseEntity, ITransient, IHasMedia, IAuditable, ISoftDeletable, ILocalizedEntity + { + #region static + + private static readonly HashSet _outputAffectingProductProps = new HashSet + { + nameof(MediaFile.FolderId), + nameof(MediaFile.Name), + nameof(MediaFile.Alt), + nameof(MediaFile.Title), + nameof(MediaFile.Hidden), + nameof(MediaFile.Deleted) + }; + + public static IReadOnlyCollection GetOutputAffectingPropertyNames() + { + return _outputAffectingProductProps; + } + + #endregion + + private ICollection _productMediaFiles; + private ICollection _tags; + private ICollection _tracks; + + /// + /// Gets or sets the associated folder identifier. + /// + [DataMember] + [Index("IX_Media_MediaType", 0)] + [Index("IX_Media_Extension", 0)] + [Index("IX_Media_PixelSize", 0)] + [Index("IX_Media_Name", 0)] + [Index("IX_Media_Size", 0)] + [Index("IX_Media_UpdatedOnUtc", 0)] + [Index("IX_Media_FolderId", 0)] + public int? FolderId { get; set; } /// /// Gets or sets the associated folder. @@ -52,160 +52,160 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() [DataMember] public virtual MediaFolder Folder { get; set; } - /// - /// Gets or sets the SEO friendly name of the media file including file extension - /// - [DataMember] - [Index("IX_Media_Name", 1)] - public string Name { get; set; } - - /// - /// Gets or sets the localizable image ALT text - /// - [DataMember] - public string Alt { get; set; } - - /// - /// Gets or sets the localizable media file title text - /// - [DataMember] - public string Title { get; set; } - - /// - /// Gets or sets the (dotless) file extension - /// - [DataMember] - [Index("IX_Media_MediaType", 2)] - [Index("IX_Media_Extension", 1)] - public string Extension { get; set; } - - /// - /// Gets or sets the file MIME type - /// - [DataMember] - public string MimeType { get; set; } - - /// - /// Gets or sets the file media type (image, video, audio, document etc.) - /// - [DataMember] - [Index("IX_Media_MediaType", 1)] - public string MediaType { get; set; } - - /// - /// Gets or sets the file size in bytes - /// - [DataMember] - [Index("IX_Media_Size", 1)] - public int Size { get; set; } - - /// - /// Gets or sets the total pixel size of an image (width * height) - /// - [DataMember] - [Index("IX_Media_MediaType", 3)] - [Index("IX_Media_Extension", 2)] - [Index("IX_Media_PixelSize", 1)] - public int? PixelSize { get; set; } - - /// - /// Gets or sets the file metadata as raw JSON dictionary (width, height, video length, EXIF etc.) - /// - [DataMember] - public string Metadata { get; set; } - - /// - /// Gets or sets the image width (if file is an image) - /// - [DataMember] - public int? Width { get; set; } - - /// - /// Gets or sets the image height (if file is an image) - /// - [DataMember] - public int? Height { get; set; } - - /// - /// Gets or sets the date and time of instance update - /// - [DataMember] - public DateTime CreatedOnUtc { get; set; } - - /// - /// Gets or sets the date and time of instance update - /// - [DataMember] - public DateTime UpdatedOnUtc { get; set; } - - /// - /// Gets or sets a value indicating whether the file is transient/preliminary - /// - [DataMember] - public bool IsTransient { get; set; } - - /// - /// Gets or sets a value indicating whether the file has been soft deleted - /// - [Index("IX_Media_MediaType", 4)] - [Index("IX_Media_Extension", 3)] - [Index("IX_Media_PixelSize", 2)] - [Index("IX_Media_Name", 2)] - [Index("IX_Media_Size", 2)] - [Index("IX_Media_UpdatedOnUtc", 2)] - [Index("IX_Media_FolderId", 1)] - public bool Deleted { get; set; } - - /// - /// Gets or sets a value indicating whether the file is hidden - /// - public bool Hidden { get; set; } - - /// - /// Internally used for migration stuff only. - /// 0 = needs migration 'cause existed in previous versions already, 1 = was migrated by migrator, 2 = relations has been detected - /// - public int Version { get; set; } = 2; - - /// - /// Gets or sets the media storage identifier - /// - [DataMember] - public int? MediaStorageId { get; set; } - - /// - /// Gets or sets the media storage - /// - public virtual MediaStorage MediaStorage { get; set; } - - /// - /// Gets the associated tags - /// - [DataMember] - public virtual ICollection Tags - { - get { return _tags ?? (_tags = new HashSet()); } - protected set { _tags = value; } - } - - /// - /// Gets the related entity tracks - /// - [DataMember] - public virtual ICollection Tracks - { - get { return _tracks ?? (_tracks = new HashSet()); } - protected set { _tracks = value; } - } - - /// - /// Gets or sets the product pictures - /// - [DataMember] - public virtual ICollection ProductMediaFiles + /// + /// Gets or sets the SEO friendly name of the media file including file extension + /// + [DataMember] + [Index("IX_Media_Name", 1)] + public string Name { get; set; } + + /// + /// Gets or sets the localizable image ALT text + /// + [DataMember] + public string Alt { get; set; } + + /// + /// Gets or sets the localizable media file title text + /// + [DataMember] + public string Title { get; set; } + + /// + /// Gets or sets the (dotless) file extension + /// + [DataMember] + [Index("IX_Media_MediaType", 2)] + [Index("IX_Media_Extension", 1)] + public string Extension { get; set; } + + /// + /// Gets or sets the file MIME type + /// + [DataMember] + public string MimeType { get; set; } + + /// + /// Gets or sets the file media type (image, video, audio, document etc.) + /// + [DataMember] + [Index("IX_Media_MediaType", 1)] + public string MediaType { get; set; } + + /// + /// Gets or sets the file size in bytes + /// + [DataMember] + [Index("IX_Media_Size", 1)] + public int Size { get; set; } + + /// + /// Gets or sets the total pixel size of an image (width * height) + /// + [DataMember] + [Index("IX_Media_MediaType", 3)] + [Index("IX_Media_Extension", 2)] + [Index("IX_Media_PixelSize", 1)] + public int? PixelSize { get; set; } + + /// + /// Gets or sets the file metadata as raw JSON dictionary (width, height, video length, EXIF etc.) + /// + [DataMember] + public string Metadata { get; set; } + + /// + /// Gets or sets the image width (if file is an image) + /// + [DataMember] + public int? Width { get; set; } + + /// + /// Gets or sets the image height (if file is an image) + /// + [DataMember] + public int? Height { get; set; } + + /// + /// Gets or sets the date and time of instance update + /// + [DataMember] + public DateTime CreatedOnUtc { get; set; } + + /// + /// Gets or sets the date and time of instance update + /// + [DataMember] + public DateTime UpdatedOnUtc { get; set; } + + /// + /// Gets or sets a value indicating whether the file is transient/preliminary + /// + [DataMember] + public bool IsTransient { get; set; } + + /// + /// Gets or sets a value indicating whether the file has been soft deleted + /// + [Index("IX_Media_MediaType", 4)] + [Index("IX_Media_Extension", 3)] + [Index("IX_Media_PixelSize", 2)] + [Index("IX_Media_Name", 2)] + [Index("IX_Media_Size", 2)] + [Index("IX_Media_UpdatedOnUtc", 2)] + [Index("IX_Media_FolderId", 1)] + public bool Deleted { get; set; } + + /// + /// Gets or sets a value indicating whether the file is hidden + /// + public bool Hidden { get; set; } + + /// + /// Internally used for migration stuff only. + /// 0 = needs migration 'cause existed in previous versions already, 1 = was migrated by migrator, 2 = relations has been detected + /// + public int Version { get; set; } = 2; + + /// + /// Gets or sets the media storage identifier + /// + [DataMember] + public int? MediaStorageId { get; set; } + + /// + /// Gets or sets the media storage + /// + public virtual MediaStorage MediaStorage { get; set; } + + /// + /// Gets the associated tags + /// + [DataMember] + public virtual ICollection Tags + { + get => _tags ?? (_tags = new HashSet()); + protected set => _tags = value; + } + + /// + /// Gets the related entity tracks + /// + [DataMember] + public virtual ICollection Tracks + { + get => _tracks ?? (_tracks = new HashSet()); + protected set => _tracks = value; + } + + /// + /// Gets or sets the product pictures + /// + [DataMember] + public virtual ICollection ProductMediaFiles { - get { return _productMediaFiles ?? (_productMediaFiles = new HashSet()); } - protected set { _productMediaFiles = value; } - } + get => _productMediaFiles ?? (_productMediaFiles = new HashSet()); + protected set => _productMediaFiles = value; + } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs index 7776d4211f..3598c1bb8d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; @@ -47,8 +46,8 @@ public partial class MediaFolder : BaseEntity /// public virtual ICollection Children { - get { return _children ?? (_children = new HashSet()); } - protected set { _children = value; } + get => _children ?? (_children = new HashSet()); + protected set => _children = value; } /// @@ -68,8 +67,8 @@ public virtual ICollection Children /// public virtual ICollection Files { - get { return _files ?? (_files = new HashSet()); } - protected set { _files = value; } + get => _files ?? (_files = new HashSet()); + protected set => _files = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaSettings.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaSettings.cs index 604a652036..b58fac73f9 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaSettings.cs @@ -4,54 +4,54 @@ namespace SmartStore.Core.Domain.Media { public class MediaSettings : ISettings { - public int AvatarPictureSize { get; set; } = 256; + public int AvatarPictureSize { get; set; } = 256; public int ProductThumbPictureSize { get; set; } = 256; - public int ProductDetailsPictureSize { get; set; } = 600; - public int ProductThumbPictureSizeOnProductDetailsPage { get; set; } = 72; - public int MessageProductThumbPictureSize { get; set; } = 72; - public int AssociatedProductPictureSize { get; set; } = 600; - public int BundledProductPictureSize { get; set; } = 72; - public int CategoryThumbPictureSize { get; set; } = 256; - public int ManufacturerThumbPictureSize { get; set; } = 256; - public int CartThumbPictureSize { get; set; } = 256; - public int CartThumbBundleItemPictureSize { get; set; } = 32; - public int MiniCartThumbPictureSize { get; set; } = 256; - public int VariantValueThumbPictureSize { get; set; } = 72; - public int AttributeOptionThumbPictureSize { get; set; } = 72; - - public bool DefaultPictureZoomEnabled { get; set; } = true; - public string PictureZoomType { get; set; } = "window"; - - public int MaximumImageSize { get; set; } = 2048; - - /// - /// Geta or sets a default quality used for image generation - /// - public int DefaultImageQuality { get; set; } = 90; - - /// - /// Gets or sets the height to width ratio for thumbnails in grid style lists (0.2 - 2) - /// - /// - /// A value greater than 1 indicates, that your product pictures are generally - /// in portrait format, less than 1 indicates landscape format. - /// - public float DefaultThumbnailAspectRatio { get; set; } = 1; - - /// - /// Geta or sets a vaue indicating whether single (/media/thumbs/) or multiple (/media/thumbs/0001/ and /media/thumbs/0002/) directories will used for picture thumbs - /// - public bool MultipleThumbDirectories { get; set; } = true; - - /// - /// Generates absolute media urls based upon current request uri instead of relative urls. - /// - public bool AutoGenerateAbsoluteUrls { get; set; } = true; - - /// - /// Whether orphaned files should automatically be marked as transient so that the daily cleanup task may delete them. - /// - public bool MakeFilesTransientWhenOrphaned { get; set; } = true; + public int ProductDetailsPictureSize { get; set; } = 600; + public int ProductThumbPictureSizeOnProductDetailsPage { get; set; } = 72; + public int MessageProductThumbPictureSize { get; set; } = 72; + public int AssociatedProductPictureSize { get; set; } = 600; + public int BundledProductPictureSize { get; set; } = 72; + public int CategoryThumbPictureSize { get; set; } = 256; + public int ManufacturerThumbPictureSize { get; set; } = 256; + public int CartThumbPictureSize { get; set; } = 256; + public int CartThumbBundleItemPictureSize { get; set; } = 32; + public int MiniCartThumbPictureSize { get; set; } = 256; + public int VariantValueThumbPictureSize { get; set; } = 72; + public int AttributeOptionThumbPictureSize { get; set; } = 72; + + public bool DefaultPictureZoomEnabled { get; set; } = true; + public string PictureZoomType { get; set; } = "window"; + + public int MaximumImageSize { get; set; } = 2048; + + /// + /// Geta or sets a default quality used for image generation + /// + public int DefaultImageQuality { get; set; } = 90; + + /// + /// Gets or sets the height to width ratio for thumbnails in grid style lists (0.2 - 2) + /// + /// + /// A value greater than 1 indicates, that your product pictures are generally + /// in portrait format, less than 1 indicates landscape format. + /// + public float DefaultThumbnailAspectRatio { get; set; } = 1; + + /// + /// Geta or sets a vaue indicating whether single (/media/thumbs/) or multiple (/media/thumbs/0001/ and /media/thumbs/0002/) directories will used for picture thumbs + /// + public bool MultipleThumbDirectories { get; set; } = true; + + /// + /// Generates absolute media urls based upon current request uri instead of relative urls. + /// + public bool AutoGenerateAbsoluteUrls { get; set; } = true; + + /// + /// Whether orphaned files should automatically be marked as transient so that the daily cleanup task may delete them. + /// + public bool MakeFilesTransientWhenOrphaned { get; set; } = true; /// /// Gets or sets the maximum size (in KB) of an uploaded media file. The default is 102,400 (100 MB). @@ -65,25 +65,25 @@ public class MediaSettings : ISettings /// public string ImageTypes { get; set; } - /// - /// A space separated list of video type file extensions (dotless) - /// - public string VideoTypes { get; set; } - - /// - /// A space separated list of audio type file extensions (dotless) - /// - public string AudioTypes { get; set; } - - /// - /// A space separated list of document type file extensions (dotless) - /// - public string DocumentTypes { get; set; } - - /// - /// A space separated list of text type file extensions (dotless) - /// - public string TextTypes { get; set; } + /// + /// A space separated list of video type file extensions (dotless) + /// + public string VideoTypes { get; set; } + + /// + /// A space separated list of audio type file extensions (dotless) + /// + public string AudioTypes { get; set; } + + /// + /// A space separated list of document type file extensions (dotless) + /// + public string DocumentTypes { get; set; } + + /// + /// A space separated list of text type file extensions (dotless) + /// + public string TextTypes { get; set; } /// /// A space separated list of other types file extensions (dotless) diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaStorage.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaStorage.cs index f58d750751..687b3274c8 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaStorage.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaStorage.cs @@ -1,10 +1,10 @@ namespace SmartStore.Core.Domain.Media { - public partial class MediaStorage : BaseEntity - { - /// - /// Binary data - /// - public byte[] Data { get; set; } - } + public partial class MediaStorage : BaseEntity + { + /// + /// Binary data + /// + public byte[] Data { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaTag.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaTag.cs index 16dd5ee2a1..4b264cd475 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaTag.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaTag.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +using System.Collections.Generic; using System.Runtime.Serialization; namespace SmartStore.Core.Domain.Media @@ -22,8 +19,8 @@ public partial class MediaTag : BaseEntity /// public virtual ICollection MediaFiles { - get { return _mediaFiles ?? (_mediaFiles = new HashSet()); } - protected set { _mediaFiles = value; } + get => _mediaFiles ?? (_mediaFiles = new HashSet()); + protected set => _mediaFiles = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/EmailAccount.cs b/src/Libraries/SmartStore.Core/Domain/Messages/EmailAccount.cs index d39d745ef8..2f3e818181 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/EmailAccount.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/EmailAccount.cs @@ -55,10 +55,10 @@ public string FriendlyName { get { - if (DisplayName.IsEmpty()) - return Email; + if (DisplayName.IsEmpty()) + return Email; - return "{0} ({1})".FormatInvariant(DisplayName, Email); + return "{0} ({1})".FormatInvariant(DisplayName, Email); } } @@ -72,9 +72,9 @@ object ICloneable.Clone() return this.MemberwiseClone(); } - public EmailAddress ToEmailAddress() - { - return new EmailAddress(this.Email, this.DisplayName); - } + public EmailAddress ToEmailAddress() + { + return new EmailAddress(this.Email, this.DisplayName); + } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/EmailAccountSettings.cs b/src/Libraries/SmartStore.Core/Domain/Messages/EmailAccountSettings.cs index 8a4d73f784..5c42f41643 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/EmailAccountSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/EmailAccountSettings.cs @@ -9,10 +9,10 @@ public class EmailAccountSettings : ISettings /// public int DefaultEmailAccountId { get; set; } - /// - /// Gets or sets a folder where mail messages should be saved (instead of sending them). - /// For debug and test purposes only. - /// - public string PickupDirectoryLocation { get; set; } - } + /// + /// Gets or sets a folder where mail messages should be saved (instead of sending them). + /// For debug and test purposes only. + /// + public string PickupDirectoryLocation { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/EmailAttachmentStorageLocation.cs b/src/Libraries/SmartStore.Core/Domain/Messages/EmailAttachmentStorageLocation.cs index 4bc4cbf0f4..3b86155494 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/EmailAttachmentStorageLocation.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/EmailAttachmentStorageLocation.cs @@ -2,21 +2,21 @@ namespace SmartStore.Core.Domain.Messages { - public enum EmailAttachmentStorageLocation - { - /// - /// Attachment is embedded as Blob - /// - Blob, + public enum EmailAttachmentStorageLocation + { + /// + /// Attachment is embedded as Blob + /// + Blob, - /// - /// Attachment is a reference to - /// - FileReference, - - /// - /// Attachment is located on disk (physical or virtual path) - /// - Path - } + /// + /// Attachment is a reference to + /// + FileReference, + + /// + /// Attachment is located on disk (physical or virtual path) + /// + Path + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/Events.cs b/src/Libraries/SmartStore.Core/Domain/Messages/Events.cs index a10f7193c1..8e183eeb14 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/Events.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/Events.cs @@ -4,19 +4,19 @@ namespace SmartStore.Core.Domain.Messages { public class EmailSubscribedEvent : IEquatable { - public EmailSubscribedEvent(string email) + public EmailSubscribedEvent(string email) { Email = email; } - public string Email { get; private set; } + public string Email { get; private set; } - public override bool Equals(object obj) - { - return Equals(obj as EmailSubscribedEvent); - } + public override bool Equals(object obj) + { + return Equals(obj as EmailSubscribedEvent); + } - public bool Equals(EmailSubscribedEvent other) + public bool Equals(EmailSubscribedEvent other) { if (ReferenceEquals(null, other)) return false; @@ -33,20 +33,20 @@ public override int GetHashCode() } public class EmailUnsubscribedEvent : IEquatable - { - public EmailUnsubscribedEvent(string email) + { + public EmailUnsubscribedEvent(string email) { Email = email; } - public string Email { get; private set; } + public string Email { get; private set; } - public override bool Equals(object obj) - { - return Equals(obj as EmailUnsubscribedEvent); - } + public override bool Equals(object obj) + { + return Equals(obj as EmailUnsubscribedEvent); + } - public bool Equals(EmailUnsubscribedEvent other) + public bool Equals(EmailUnsubscribedEvent other) { if (ReferenceEquals(null, other)) return false; diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs index d939cc684b..b15cfc8557 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs @@ -1,7 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.Web.Mvc; using SmartStore.Core.Domain.Localization; -using SmartStore.Core.Domain.Media; using SmartStore.Core.Domain.Stores; namespace SmartStore.Core.Domain.Messages @@ -11,35 +10,35 @@ namespace SmartStore.Core.Domain.Messages /// public partial class MessageTemplate : BaseEntity, ILocalizedEntity, IStoreMappingSupported { - /// + /// /// Gets or sets the name /// public string Name { get; set; } - [StringLength(500), Required] - public string To { get; set; } + [StringLength(500), Required] + public string To { get; set; } - [StringLength(500)] - public string ReplyTo { get; set; } + [StringLength(500)] + public string ReplyTo { get; set; } - /// - /// A comma separated list of required model types (e.g.: Product, Order, Customer, GiftCard) - /// - [StringLength(500)] - public string ModelTypes { get; set; } + /// + /// A comma separated list of required model types (e.g.: Product, Order, Customer, GiftCard) + /// + [StringLength(500)] + public string ModelTypes { get; set; } - [MaxLength] - public string LastModelTree { get; set; } + [MaxLength] + public string LastModelTree { get; set; } - /// - /// Gets or sets the BCC Email addresses - /// - public string BccEmailAddresses { get; set; } + /// + /// Gets or sets the BCC Email addresses + /// + public string BccEmailAddresses { get; set; } - /// - /// Gets or sets the subject - /// - public string Subject { get; set; } + /// + /// Gets or sets the subject + /// + public string Subject { get; set; } /// /// Gets or sets the body @@ -57,29 +56,29 @@ public partial class MessageTemplate : BaseEntity, ILocalizedEntity, IStoreMappi /// public int EmailAccountId { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + public bool LimitedToStores { get; set; } - /// - /// Gets or sets a value indicating whether emails derived from the template are only send manually - /// - public bool SendManually { get; set; } + /// + /// Gets or sets a value indicating whether emails derived from the template are only send manually + /// + public bool SendManually { get; set; } - /// - /// Gets or sets the attachment 1 file identifier - /// - public int? Attachment1FileId { get; set; } + /// + /// Gets or sets the attachment 1 file identifier + /// + public int? Attachment1FileId { get; set; } - /// - /// Gets or sets the attachment 2 file identifier - /// - public int? Attachment2FileId { get; set; } + /// + /// Gets or sets the attachment 2 file identifier + /// + public int? Attachment2FileId { get; set; } - /// - /// Gets or sets the attachment 3 file identifier - /// - public int? Attachment3FileId { get; set; } + /// + /// Gets or sets the attachment 3 file identifier + /// + public int? Attachment3FileId { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplateNames.cs b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplateNames.cs index d768f0c2dc..db219751cb 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplateNames.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplateNames.cs @@ -1,39 +1,37 @@ -using System; - -namespace SmartStore.Core.Domain.Messages +namespace SmartStore.Core.Domain.Messages { - public class MessageTemplateNames - { - public const string CustomerRegistered = "NewCustomer.Notification"; - public const string CustomerWelcome = "Customer.WelcomeMessage"; - public const string CustomerEmailValidation = "Customer.EmailValidationMessage"; - public const string CustomerPasswordRecovery = "Customer.PasswordRecovery"; - public const string OrderPlacedStoreOwner = "OrderPlaced.StoreOwnerNotification"; - public const string OrderPlacedCustomer = "OrderPlaced.CustomerNotification"; - public const string ShipmentSentCustomer = "ShipmentSent.CustomerNotification"; - public const string ShipmentDeliveredCustomer = "ShipmentDelivered.CustomerNotification"; - public const string OrderCompletedCustomer = "OrderCompleted.CustomerNotification"; - public const string OrderCancelledCustomer = "OrderCancelled.CustomerNotification"; - public const string OrderNoteAddedCustomer = "Customer.NewOrderNote"; - public const string RecurringPaymentCancelledStoreOwner = "RecurringPaymentCancelled.StoreOwnerNotification"; - public const string NewsLetterSubscriptionActivation = "NewsLetterSubscription.ActivationMessage"; - public const string NewsLetterSubscriptionDeactivation = "NewsLetterSubscription.DeactivationMessage"; - public const string ShareProduct = "Service.EmailAFriend"; - public const string ShareWishlist = "Wishlist.EmailAFriend"; - public const string ProductQuestion = "Product.AskQuestion"; - public const string NewReturnRequestStoreOwner = "NewReturnRequest.StoreOwnerNotification"; - public const string ReturnRequestStatusChangedCustomer = "ReturnRequestStatusChanged.CustomerNotification"; - public const string NewForumTopic = "Forums.NewForumTopic"; - public const string NewForumPost = "Forums.NewForumPost"; - public const string NewPrivateMessage = "Customer.NewPM"; - public const string GiftCardCustomer = "GiftCard.Notification"; - public const string ProductReviewStoreOwner = "Product.ProductReview"; - public const string QuantityBelowStoreOwner = "QuantityBelow.StoreOwnerNotification"; - public const string NewVatSubmittedStoreOwner = "NewVATSubmitted.StoreOwnerNotification"; - public const string BlogCommentStoreOwner = "Blog.BlogComment"; - public const string NewsCommentStoreOwner = "News.NewsComment"; - public const string BackInStockCustomer = "Customer.BackInStock"; - public const string SystemCampaign = "System.Campaign"; - public const string SystemContactUs = "System.ContactUs"; - } + public class MessageTemplateNames + { + public const string CustomerRegistered = "NewCustomer.Notification"; + public const string CustomerWelcome = "Customer.WelcomeMessage"; + public const string CustomerEmailValidation = "Customer.EmailValidationMessage"; + public const string CustomerPasswordRecovery = "Customer.PasswordRecovery"; + public const string OrderPlacedStoreOwner = "OrderPlaced.StoreOwnerNotification"; + public const string OrderPlacedCustomer = "OrderPlaced.CustomerNotification"; + public const string ShipmentSentCustomer = "ShipmentSent.CustomerNotification"; + public const string ShipmentDeliveredCustomer = "ShipmentDelivered.CustomerNotification"; + public const string OrderCompletedCustomer = "OrderCompleted.CustomerNotification"; + public const string OrderCancelledCustomer = "OrderCancelled.CustomerNotification"; + public const string OrderNoteAddedCustomer = "Customer.NewOrderNote"; + public const string RecurringPaymentCancelledStoreOwner = "RecurringPaymentCancelled.StoreOwnerNotification"; + public const string NewsLetterSubscriptionActivation = "NewsLetterSubscription.ActivationMessage"; + public const string NewsLetterSubscriptionDeactivation = "NewsLetterSubscription.DeactivationMessage"; + public const string ShareProduct = "Service.EmailAFriend"; + public const string ShareWishlist = "Wishlist.EmailAFriend"; + public const string ProductQuestion = "Product.AskQuestion"; + public const string NewReturnRequestStoreOwner = "NewReturnRequest.StoreOwnerNotification"; + public const string ReturnRequestStatusChangedCustomer = "ReturnRequestStatusChanged.CustomerNotification"; + public const string NewForumTopic = "Forums.NewForumTopic"; + public const string NewForumPost = "Forums.NewForumPost"; + public const string NewPrivateMessage = "Customer.NewPM"; + public const string GiftCardCustomer = "GiftCard.Notification"; + public const string ProductReviewStoreOwner = "Product.ProductReview"; + public const string QuantityBelowStoreOwner = "QuantityBelow.StoreOwnerNotification"; + public const string NewVatSubmittedStoreOwner = "NewVATSubmitted.StoreOwnerNotification"; + public const string BlogCommentStoreOwner = "Blog.BlogComment"; + public const string NewsCommentStoreOwner = "News.NewsComment"; + public const string BackInStockCustomer = "Customer.BackInStock"; + public const string SystemCampaign = "System.Campaign"; + public const string SystemContactUs = "System.ContactUs"; + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs b/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs index d54f3a1ded..282267126a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs @@ -41,7 +41,7 @@ public partial class NewsLetterSubscription : BaseEntity /// [DataMember] [Index("IX_NewsletterSubscription_Email_StoreId", 2)] - public int StoreId { get; set; } + public int StoreId { get; set; } /// /// Gets or sets the language identifier diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/QueuedEmail.cs b/src/Libraries/SmartStore.Core/Domain/Messages/QueuedEmail.cs index be65e172b7..14ba2d6067 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/QueuedEmail.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/QueuedEmail.cs @@ -8,7 +8,7 @@ namespace SmartStore.Core.Domain.Messages /// public partial class QueuedEmail : BaseEntity { - private ICollection _attachments; + private ICollection _attachments; /// /// Gets or sets the priority @@ -25,10 +25,10 @@ public partial class QueuedEmail : BaseEntity /// public string To { get; set; } - /// - /// Gets or sets the ReplyTo property - /// - public string ReplyTo { get; set; } + /// + /// Gets or sets the ReplyTo property + /// + public string ReplyTo { get; set; } /// /// Gets or sets the CC @@ -70,23 +70,23 @@ public partial class QueuedEmail : BaseEntity /// public int EmailAccountId { get; set; } - /// - /// Gets or sets a value indicating whether emails are only send manually - /// - public bool SendManually { get; set; } + /// + /// Gets or sets a value indicating whether emails are only send manually + /// + public bool SendManually { get; set; } /// /// Gets the email account /// public virtual EmailAccount EmailAccount { get; set; } - /// - /// Gets or sets the collection of attachments - /// - public virtual ICollection Attachments - { - get { return _attachments ?? (_attachments = new HashSet()); } - protected set { _attachments = value; } - } + /// + /// Gets or sets the collection of attachments + /// + public virtual ICollection Attachments + { + get => _attachments ?? (_attachments = new HashSet()); + protected set => _attachments = value; + } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/QueuedEmailAttachment.cs b/src/Libraries/SmartStore.Core/Domain/Messages/QueuedEmailAttachment.cs index 7c7ca60028..1f7a005828 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/QueuedEmailAttachment.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/QueuedEmailAttachment.cs @@ -1,64 +1,63 @@ -using System; -using SmartStore.Core.Domain.Media; +using SmartStore.Core.Domain.Media; namespace SmartStore.Core.Domain.Messages { - /// - /// Represents an e-mail attachment - /// - public partial class QueuedEmailAttachment : BaseEntity, IHasMedia - { - /// - /// Gets or sets the queued email identifier - /// - public int QueuedEmailId { get; set; } - - /// - /// Gets or sets the queued email entity instance - /// - public virtual QueuedEmail QueuedEmail { get; set; } - - /// - /// Gets or sets the storage location - /// - public EmailAttachmentStorageLocation StorageLocation { get; set; } - - /// - /// A physical or virtual path to the file (only applicable if location is Path) - /// - public string Path { get; set; } - - /// - /// The id of a record (only applicable if location is FileReference) - /// - public int? MediaFileId { get; set; } - - /// - /// Gets the file object - /// - /// - /// This property is not named Download on purpose, because we're going to rename Download to File in a future release. - /// - public virtual MediaFile MediaFile { get; set; } - - /// - /// The attachment file name (without path) - /// - public string Name { get; set; } - - /// - /// The attachment file's mime type, e.g. application/pdf - /// - public string MimeType { get; set; } - - /// - /// Gets or sets the media storage identifier (when location is BLOB) - /// - public int? MediaStorageId { get; set; } - - /// - /// Gets or sets the media storage (when location is BLOB) - /// - public virtual MediaStorage MediaStorage { get; set; } - } + /// + /// Represents an e-mail attachment + /// + public partial class QueuedEmailAttachment : BaseEntity, IHasMedia + { + /// + /// Gets or sets the queued email identifier + /// + public int QueuedEmailId { get; set; } + + /// + /// Gets or sets the queued email entity instance + /// + public virtual QueuedEmail QueuedEmail { get; set; } + + /// + /// Gets or sets the storage location + /// + public EmailAttachmentStorageLocation StorageLocation { get; set; } + + /// + /// A physical or virtual path to the file (only applicable if location is Path) + /// + public string Path { get; set; } + + /// + /// The id of a record (only applicable if location is FileReference) + /// + public int? MediaFileId { get; set; } + + /// + /// Gets the file object + /// + /// + /// This property is not named Download on purpose, because we're going to rename Download to File in a future release. + /// + public virtual MediaFile MediaFile { get; set; } + + /// + /// The attachment file name (without path) + /// + public string Name { get; set; } + + /// + /// The attachment file's mime type, e.g. application/pdf + /// + public string MimeType { get; set; } + + /// + /// Gets or sets the media storage identifier (when location is BLOB) + /// + public int? MediaStorageId { get; set; } + + /// + /// Gets or sets the media storage (when location is BLOB) + /// + public virtual MediaStorage MediaStorage { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs index 2f5bfe18f4..a30c82ce87 100644 --- a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs +++ b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Domain.Media; using SmartStore.Core.Domain.Seo; @@ -107,10 +106,10 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// public int NotApprovedCommentCount { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + public bool LimitedToStores { get; set; } /// /// Gets or sets the date and time of entity creation @@ -137,10 +136,10 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// public virtual ICollection NewsComments { - get { return _newsComments ?? (_newsComments = new HashSet()); } - protected set { _newsComments = value; } + get => _newsComments ?? (_newsComments = new HashSet()); + protected set => _newsComments = value; } - + /// /// Gets or sets the language /// diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutAttribute.cs index 56685a0f33..ca95d9b6df 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutAttribute.cs @@ -5,17 +5,17 @@ namespace SmartStore.Core.Domain.Orders { - /// - /// Represents a checkout attribute - /// - public partial class CheckoutAttribute : BaseEntity, ILocalizedEntity, IStoreMappingSupported - { + /// + /// Represents a checkout attribute + /// + public partial class CheckoutAttribute : BaseEntity, ILocalizedEntity, IStoreMappingSupported + { private ICollection _checkoutAttributeValues; - public CheckoutAttribute() - { - this.IsActive = true; - } + public CheckoutAttribute() + { + this.IsActive = true; + } /// /// Gets or sets the name @@ -57,29 +57,23 @@ public CheckoutAttribute() /// public int DisplayOrder { get; set; } - /// - /// Gets or sets whether the checkout attribute is active - /// - public bool IsActive { get; set; } + /// + /// Gets or sets whether the checkout attribute is active + /// + public bool IsActive { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + public bool LimitedToStores { get; set; } - /// - /// Gets the attribute control type - /// - public AttributeControlType AttributeControlType + /// + /// Gets the attribute control type + /// + public AttributeControlType AttributeControlType { - get - { - return (AttributeControlType)this.AttributeControlTypeId; - } - set - { - this.AttributeControlTypeId = (int)value; - } + get => (AttributeControlType)this.AttributeControlTypeId; + set => this.AttributeControlTypeId = (int)value; } public bool IsListTypeAttribute() @@ -101,8 +95,8 @@ public bool IsListTypeAttribute() /// public virtual ICollection CheckoutAttributeValues { - get { return _checkoutAttributeValues ?? (_checkoutAttributeValues = new HashSet()); } - protected set { _checkoutAttributeValues = value; } + get => _checkoutAttributeValues ?? (_checkoutAttributeValues = new HashSet()); + protected set => _checkoutAttributeValues = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutEnums.cs b/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutEnums.cs index 4ce792b336..1ba0d1c87e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutEnums.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutEnums.cs @@ -1,45 +1,45 @@ namespace SmartStore.Core.Domain.Orders { - /// - /// Setting for newsletter subscription in checkout - /// - public enum CheckoutNewsLetterSubscription - { - /// - /// No newsletter subscription checkbox - /// - None = 0, + /// + /// Setting for newsletter subscription in checkout + /// + public enum CheckoutNewsLetterSubscription + { + /// + /// No newsletter subscription checkbox + /// + None = 0, - /// - /// Deactivated newsletter subscription checkbox - /// - Deactivated, + /// + /// Deactivated newsletter subscription checkbox + /// + Deactivated, - /// - /// Activated newsletter subscription checkbox - /// - Activated - } + /// + /// Activated newsletter subscription checkbox + /// + Activated + } - /// - /// Setting to hand over customer email to third party - /// - public enum CheckoutThirdPartyEmailHandOver - { - /// - /// No third party email hand over checkbox - /// - None = 0, + /// + /// Setting to hand over customer email to third party + /// + public enum CheckoutThirdPartyEmailHandOver + { + /// + /// No third party email hand over checkbox + /// + None = 0, - /// - /// Deactivated third party email hand over checkbox - /// - Deactivated, + /// + /// Deactivated third party email hand over checkbox + /// + Deactivated, - /// - /// Activated third party email hand over checkbox - /// - Activated - } + /// + /// Activated third party email hand over checkbox + /// + Activated + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/Events.cs b/src/Libraries/SmartStore.Core/Domain/Orders/Events.cs index e7b898754c..e85fe0da04 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/Events.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/Events.cs @@ -11,10 +11,7 @@ public OrderPaidEvent(Order order) this._order = order; } - public Order Order - { - get { return _order; } - } + public Order Order => _order; } public class OrderPlacedEvent @@ -26,53 +23,38 @@ public OrderPlacedEvent(Order order) this._order = order; } - public Order Order - { - get { return _order; } - } + public Order Order => _order; } - public class OrderUpdatedEvent - { - private readonly Order _order; + public class OrderUpdatedEvent + { + private readonly Order _order; - public OrderUpdatedEvent(Order order) - { - this._order = order; - } + public OrderUpdatedEvent(Order order) + { + this._order = order; + } - public Order Order - { - get { return _order; } - } - } + public Order Order => _order; + } - public class MigrateShoppingCartEvent - { - private readonly Customer _fromCustomer; - private readonly Customer _toCustomer; - private readonly int _storeId; + public class MigrateShoppingCartEvent + { + private readonly Customer _fromCustomer; + private readonly Customer _toCustomer; + private readonly int _storeId; - public MigrateShoppingCartEvent(Customer fromCustomer, Customer toCustomer, int storeId) - { - _fromCustomer = fromCustomer; - _toCustomer = toCustomer; - _storeId = storeId; - } + public MigrateShoppingCartEvent(Customer fromCustomer, Customer toCustomer, int storeId) + { + _fromCustomer = fromCustomer; + _toCustomer = toCustomer; + _storeId = storeId; + } - public Customer FromCustomer - { - get { return _fromCustomer; } - } + public Customer FromCustomer => _fromCustomer; - public Customer ToCustomer - { - get { return _toCustomer; } - } + public Customer ToCustomer => _toCustomer; - public int StoreId - { - get { return _storeId; } - } - } + public int StoreId => _storeId; + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/GiftCard.cs b/src/Libraries/SmartStore.Core/Domain/Orders/GiftCard.cs index 3f8de5f300..5d4f7542eb 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/GiftCard.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/GiftCard.cs @@ -10,7 +10,7 @@ namespace SmartStore.Core.Domain.Orders public partial class GiftCard : BaseEntity { private ICollection _giftCardUsageHistory; - + /// /// Gets or sets the associated order item identifier /// @@ -70,31 +70,25 @@ public partial class GiftCard : BaseEntity /// Gets or sets the date and time of instance creation /// public DateTime CreatedOnUtc { get; set; } - + /// /// Gets or sets the gift card usage history /// public virtual ICollection GiftCardUsageHistory { - get { return _giftCardUsageHistory ?? (_giftCardUsageHistory = new HashSet()); } - protected set { _giftCardUsageHistory = value; } + get => _giftCardUsageHistory ?? (_giftCardUsageHistory = new HashSet()); + protected set => _giftCardUsageHistory = value; } - + /// /// Gets or sets the gift card type /// - public GiftCardType GiftCardType + public GiftCardType GiftCardType { - get - { - return (GiftCardType)this.GiftCardTypeId; - } - set - { - this.GiftCardTypeId = (int)value; - } + get => (GiftCardType)this.GiftCardTypeId; + set => this.GiftCardTypeId = (int)value; } - + /// /// Gets or sets the associated order item /// @@ -129,15 +123,15 @@ public bool IsGiftCardValid(int storeId) if (!this.IsGiftCardActivated) return false; - if (storeId != 0 && - PurchasedWithOrderItemId.HasValue && PurchasedWithOrderItem != null && - PurchasedWithOrderItem.Order != null) - { - if (PurchasedWithOrderItem.Order.StoreId != storeId) - return false; - } + if (storeId != 0 && + PurchasedWithOrderItemId.HasValue && PurchasedWithOrderItem != null && + PurchasedWithOrderItem.Order != null) + { + if (PurchasedWithOrderItem.Order.StoreId != storeId) + return false; + } - decimal remainingAmount = GetGiftCardRemainingAmount(); + decimal remainingAmount = GetGiftCardRemainingAmount(); if (remainingAmount > decimal.Zero) return true; diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/GiftCardUsageHistory.cs b/src/Libraries/SmartStore.Core/Domain/Orders/GiftCardUsageHistory.cs index da836ce1e7..c1da377335 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/GiftCardUsageHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/GiftCardUsageHistory.cs @@ -26,7 +26,7 @@ public partial class GiftCardUsageHistory : BaseEntity /// Gets or sets the date and time of instance creation /// public DateTime CreatedOnUtc { get; set; } - + /// /// Gets the gift card /// diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs b/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs index 44b1afa410..1298c88f0b 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Globalization; using System.Runtime.Serialization; -using SmartStore.Core.Domain.Affiliates; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Discounts; @@ -18,10 +17,10 @@ namespace SmartStore.Core.Domain.Orders /// Represents an order /// [DataContract] - public partial class Order : BaseEntity, IAuditable, ISoftDeletable + public partial class Order : BaseEntity, IAuditable, ISoftDeletable { - private ICollection _walletHistory; - private ICollection _discountUsageHistory; + private ICollection _walletHistory; + private ICollection _discountUsageHistory; private ICollection _giftCardUsageHistory; private ICollection _orderNotes; private ICollection _orderItems; @@ -72,7 +71,7 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat /// Gets or sets the (formatted) order number /// [DataMember] - public string OrderNumber { get; set; } + public string OrderNumber { get; set; } /// /// Gets or sets the order identifier @@ -80,29 +79,29 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat [DataMember] public Guid OrderGuid { get; set; } - /// - /// Gets or sets the store identifier - /// - [DataMember] - public int StoreId { get; set; } + /// + /// Gets or sets the store identifier + /// + [DataMember] + public int StoreId { get; set; } /// /// Gets or sets the customer identifier /// [DataMember] - public int CustomerId { get; set; } + public int CustomerId { get; set; } /// /// Gets or sets the billing address identifier /// [DataMember] - public int BillingAddressId { get; set; } + public int BillingAddressId { get; set; } /// /// Gets or sets the shipping address identifier /// [DataMember] - public int? ShippingAddressId { get; set; } + public int? ShippingAddressId { get; set; } /// /// Gets or sets an order status identifier @@ -114,13 +113,13 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat /// Gets or sets the shipping status identifier /// [DataMember] - public int ShippingStatusId { get; set; } + public int ShippingStatusId { get; set; } /// /// Gets or sets the payment status identifier /// [DataMember] - public int PaymentStatusId { get; set; } + public int PaymentStatusId { get; set; } /// /// Gets or sets the payment method system name @@ -144,7 +143,7 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat /// Gets or sets the customer tax display type identifier /// [DataMember] - public virtual int CustomerTaxDisplayTypeId { get; set; } + public virtual int CustomerTaxDisplayTypeId { get; set; } /// /// Gets or sets the VAT number (the European Union Value Added Tax) @@ -188,11 +187,11 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat [DataMember] public decimal OrderShippingExclTax { get; set; } - /// - /// Gets or sets the tax rate for order shipping - /// - [DataMember] - public decimal OrderShippingTaxRate { get; set; } + /// + /// Gets or sets the tax rate for order shipping + /// + [DataMember] + public decimal OrderShippingTaxRate { get; set; } /// /// Gets or sets the payment method additional fee (incl tax) @@ -206,11 +205,11 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat [DataMember] public decimal PaymentMethodAdditionalFeeExclTax { get; set; } - /// - /// Gets or sets the tax rate for payment method additional fee - /// - [DataMember] - public decimal PaymentMethodAdditionalFeeTaxRate { get; set; } + /// + /// Gets or sets the tax rate for payment method additional fee + /// + [DataMember] + public decimal PaymentMethodAdditionalFeeTaxRate { get; set; } /// /// Gets or sets the tax rates @@ -230,16 +229,16 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat [DataMember] public decimal OrderDiscount { get; set; } - /// - /// Gets or sets the wallet credit amount used to (partially) pay this order. - /// - [DataMember] - public decimal CreditBalance { get; set; } + /// + /// Gets or sets the wallet credit amount used to (partially) pay this order. + /// + [DataMember] + public decimal CreditBalance { get; set; } - /// - /// Gets or sets the order total rounding amount - /// - [DataMember] + /// + /// Gets or sets the order total rounding amount + /// + [DataMember] public decimal OrderTotalRounding { get; set; } /// @@ -254,12 +253,12 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat [DataMember] public decimal RefundedAmount { get; set; } - /// - /// Gets or sets the value indicating whether reward points were earned for this order - /// - [DataMember] + /// + /// Gets or sets the value indicating whether reward points were earned for this order + /// + [DataMember] public bool RewardPointsWereAdded { get; set; } - + /// /// Gets or sets the checkout attribute description /// @@ -282,7 +281,7 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat /// Gets or sets the affiliate identifier /// [DataMember] - public int AffiliateId { get; set; } + public int AffiliateId { get; set; } /// /// Gets or sets the customer IP address @@ -294,7 +293,7 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat /// Gets or sets a value indicating whether storing of credit card number is allowed /// [DataMember] - public bool AllowStoringCreditCardNumber { get; set; } + public bool AllowStoringCreditCardNumber { get; set; } /// /// Gets or sets the card type @@ -382,61 +381,61 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat /// Gets or sets the authorization transaction identifier /// [DataMember] - public string AuthorizationTransactionId { get; set; } + public string AuthorizationTransactionId { get; set; } /// /// Gets or sets the authorization transaction code /// [DataMember] - public string AuthorizationTransactionCode { get; set; } + public string AuthorizationTransactionCode { get; set; } /// /// Gets or sets the authorization transaction result /// [DataMember] - public string AuthorizationTransactionResult { get; set; } + public string AuthorizationTransactionResult { get; set; } /// /// Gets or sets the capture transaction identifier /// [DataMember] - public string CaptureTransactionId { get; set; } + public string CaptureTransactionId { get; set; } /// /// Gets or sets the capture transaction result /// [DataMember] - public string CaptureTransactionResult { get; set; } + public string CaptureTransactionResult { get; set; } /// /// Gets or sets the subscription transaction identifier /// [DataMember] - public string SubscriptionTransactionId { get; set; } + public string SubscriptionTransactionId { get; set; } /// /// Gets or sets the purchase order number /// [DataMember] - public string PurchaseOrderNumber { get; set; } + public string PurchaseOrderNumber { get; set; } /// /// Gets or sets the paid date and time /// [DataMember] - public DateTime? PaidDateUtc { get; set; } - + public DateTime? PaidDateUtc { get; set; } + /// /// Gets or sets the shipping method /// - [DataMember] - public string ShippingMethod { get; set; } + [DataMember] + public string ShippingMethod { get; set; } /// /// Gets or sets the shipping rate computation method identifier /// [DataMember] - public string ShippingRateComputationMethodSystemName { get; set; } + public string ShippingRateComputationMethodSystemName { get; set; } /// /// Gets or sets a value indicating whether the entity has been deleted @@ -448,75 +447,75 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat /// Gets or sets the date and time of order creation /// [DataMember] - public DateTime CreatedOnUtc { get; set; } + public DateTime CreatedOnUtc { get; set; } - /// - /// Gets or sets the date and time when order was updated - /// - [DataMember] - public DateTime UpdatedOnUtc { get; set; } + /// + /// Gets or sets the date and time when order was updated + /// + [DataMember] + public DateTime UpdatedOnUtc { get; set; } - /// - /// Gets or sets the amount of remaing reward points - /// - [DataMember] - public int? RewardPointsRemaining { get; set; } + /// + /// Gets or sets the amount of remaing reward points + /// + [DataMember] + public int? RewardPointsRemaining { get; set; } - /// - /// Gets or sets a value indicating whether a new payment notification arrived (IPN, webhook, callback etc.) - /// - [DataMember] - public bool HasNewPaymentNotification { get; set; } + /// + /// Gets or sets a value indicating whether a new payment notification arrived (IPN, webhook, callback etc.) + /// + [DataMember] + public bool HasNewPaymentNotification { get; set; } - /// - /// Gets or sets a value indicating whether the customer accepted to hand over email address to third party - /// - [DataMember] - public bool AcceptThirdPartyEmailHandOver { get; set; } + /// + /// Gets or sets a value indicating whether the customer accepted to hand over email address to third party + /// + [DataMember] + public bool AcceptThirdPartyEmailHandOver { get; set; } - #endregion + #endregion - #region Navigation properties + #region Navigation properties - /// - /// Gets or sets the customer - /// - [DataMember] + /// + /// Gets or sets the customer + /// + [DataMember] public virtual Customer Customer { get; set; } /// /// Gets or sets the billing address /// [DataMember] - public virtual Address BillingAddress { get; set; } + public virtual Address BillingAddress { get; set; } /// /// Gets or sets the shipping address /// [DataMember] - public virtual Address ShippingAddress { get; set; } - + public virtual Address ShippingAddress { get; set; } + /// /// Gets or sets the reward points history record /// public virtual RewardPointsHistory RedeemedRewardPointsEntry { get; set; } - /// - /// Gets or sets the wallet history. - /// - public virtual ICollection WalletHistory - { - get { return _walletHistory ?? (_walletHistory = new HashSet()); } - protected set { _walletHistory = value; } - } - - /// - /// Gets or sets discount usage history - /// - public virtual ICollection DiscountUsageHistory + /// + /// Gets or sets the wallet history. + /// + public virtual ICollection WalletHistory + { + get => _walletHistory ?? (_walletHistory = new HashSet()); + protected set => _walletHistory = value; + } + + /// + /// Gets or sets discount usage history + /// + public virtual ICollection DiscountUsageHistory { - get { return _discountUsageHistory ?? (_discountUsageHistory = new HashSet()); } - protected set { _discountUsageHistory = value; } + get => _discountUsageHistory ?? (_discountUsageHistory = new HashSet()); + protected set => _discountUsageHistory = value; } /// @@ -524,38 +523,38 @@ public virtual ICollection DiscountUsageHistory /// public virtual ICollection GiftCardUsageHistory { - get { return _giftCardUsageHistory ?? (_giftCardUsageHistory = new HashSet()); } - protected set { _giftCardUsageHistory = value; } + get => _giftCardUsageHistory ?? (_giftCardUsageHistory = new HashSet()); + protected set => _giftCardUsageHistory = value; } /// /// Gets or sets order notes /// [DataMember] - public virtual ICollection OrderNotes + public virtual ICollection OrderNotes { - get { return _orderNotes ?? (_orderNotes = new HashSet()); } - protected set { _orderNotes = value; } + get => _orderNotes ?? (_orderNotes = new HashSet()); + protected set => _orderNotes = value; } /// /// Gets or sets order items /// [DataMember] - public virtual ICollection OrderItems + public virtual ICollection OrderItems { - get { return _orderItems ?? (_orderItems = new HashSet()); } - protected internal set { _orderItems = value; } + get => _orderItems ?? (_orderItems = new HashSet()); + protected internal set => _orderItems = value; } /// /// Gets or sets shipments /// [DataMember] - public virtual ICollection Shipments + public virtual ICollection Shipments { - get { return _shipments ?? (_shipments = new HashSet()); } - protected set { _shipments = value; } + get => _shipments ?? (_shipments = new HashSet()); + protected set => _shipments = value; } #endregion @@ -566,77 +565,47 @@ public virtual ICollection Shipments /// Gets or sets the order status /// [DataMember] - public OrderStatus OrderStatus + public OrderStatus OrderStatus { - get - { - return (OrderStatus)this.OrderStatusId; - } - set - { - this.OrderStatusId = (int)value; - } + get => (OrderStatus)this.OrderStatusId; + set => this.OrderStatusId = (int)value; } /// /// Gets or sets the payment status /// [DataMember] - public PaymentStatus PaymentStatus + public PaymentStatus PaymentStatus { - get - { - return (PaymentStatus)this.PaymentStatusId; - } - set - { - this.PaymentStatusId = (int)value; - } + get => (PaymentStatus)this.PaymentStatusId; + set => this.PaymentStatusId = (int)value; } /// /// Gets or sets the shipping status /// [DataMember] - public ShippingStatus ShippingStatus + public ShippingStatus ShippingStatus { - get - { - return (ShippingStatus)this.ShippingStatusId; - } - set - { - this.ShippingStatusId = (int)value; - } + get => (ShippingStatus)this.ShippingStatusId; + set => this.ShippingStatusId = (int)value; } /// /// Gets or sets the customer tax display type /// [DataMember] - public TaxDisplayType CustomerTaxDisplayType + public TaxDisplayType CustomerTaxDisplayType { - get - { - return (TaxDisplayType)this.CustomerTaxDisplayTypeId; - } - set - { - this.CustomerTaxDisplayTypeId = (int)value; - } + get => (TaxDisplayType)this.CustomerTaxDisplayTypeId; + set => this.CustomerTaxDisplayTypeId = (int)value; } /// /// Gets the applied tax rates /// - public SortedDictionary TaxRatesDictionary - { - get - { - return ParseTaxRates(this.TaxRates); - } - } - + public SortedDictionary TaxRatesDictionary => ParseTaxRates(this.TaxRates); + #endregion } } diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/OrderItem.cs b/src/Libraries/SmartStore.Core/Domain/Orders/OrderItem.cs index 48ca396073..d81a8017f1 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/OrderItem.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/OrderItem.cs @@ -17,116 +17,116 @@ public partial class OrderItem : BaseEntity /// Gets or sets the order product variant identifier /// [DataMember] - public Guid OrderItemGuid { get; set; } + public Guid OrderItemGuid { get; set; } /// /// Gets or sets the order identifier /// [DataMember] - public int OrderId { get; set; } + public int OrderId { get; set; } /// /// Gets or sets the product identifier /// [DataMember] - public int ProductId { get; set; } + public int ProductId { get; set; } /// /// Gets or sets the quantity /// [DataMember] - public int Quantity { get; set; } + public int Quantity { get; set; } /// /// Gets or sets the unit price in primary store currency (incl tax) /// [DataMember] - public decimal UnitPriceInclTax { get; set; } + public decimal UnitPriceInclTax { get; set; } /// /// Gets or sets the unit price in primary store currency (excl tax) /// [DataMember] - public decimal UnitPriceExclTax { get; set; } + public decimal UnitPriceExclTax { get; set; } /// /// Gets or sets the price in primary store currency (incl tax) /// [DataMember] - public decimal PriceInclTax { get; set; } + public decimal PriceInclTax { get; set; } /// /// Gets or sets the price in primary store currency (excl tax) /// [DataMember] - public decimal PriceExclTax { get; set; } + public decimal PriceExclTax { get; set; } - /// - /// Gets or sets the tax rate - /// - [DataMember] - public decimal TaxRate { get; set; } + /// + /// Gets or sets the tax rate + /// + [DataMember] + public decimal TaxRate { get; set; } /// /// Gets or sets the discount amount (incl tax) /// [DataMember] - public decimal DiscountAmountInclTax { get; set; } + public decimal DiscountAmountInclTax { get; set; } /// /// Gets or sets the discount amount (excl tax) /// [DataMember] - public decimal DiscountAmountExclTax { get; set; } + public decimal DiscountAmountExclTax { get; set; } /// /// Gets or sets the attribute description /// [DataMember] - public string AttributeDescription { get; set; } + public string AttributeDescription { get; set; } /// /// Gets or sets the product variant attributes in XML format /// [DataMember] - public string AttributesXml { get; set; } - + public string AttributesXml { get; set; } + /// /// Gets or sets the download count /// - [DataMember] - public int DownloadCount { get; set; } + [DataMember] + public int DownloadCount { get; set; } /// /// Gets or sets a value indicating whether download is activated /// [DataMember] - public bool IsDownloadActivated { get; set; } + public bool IsDownloadActivated { get; set; } /// /// Gets or sets a license download identifier (in case this is a downloadable product) /// [DataMember] - public int? LicenseDownloadId { get; set; } - + public int? LicenseDownloadId { get; set; } + /// /// Gets or sets the total weight of one item /// It's nullable for compatibility with the previous version where was no such property /// - [DataMember] - public decimal? ItemWeight { get; set; } + [DataMember] + public decimal? ItemWeight { get; set; } - /// - /// Gets or sets extra bundle data - /// - [DataMember] - public string BundleData { get; set; } + /// + /// Gets or sets extra bundle data + /// + [DataMember] + public string BundleData { get; set; } - /// - /// Gets or sets the original product cost - /// - [DataMember] - public decimal ProductCost { get; set; } + /// + /// Gets or sets the original product cost + /// + [DataMember] + public decimal ProductCost { get; set; } /// /// Gets or sets the delivery time at the time of purchase. @@ -144,21 +144,21 @@ public partial class OrderItem : BaseEntity /// Gets the order /// [DataMember] - public virtual Order Order { get; set; } + public virtual Order Order { get; set; } /// /// Gets the product /// [DataMember] - public virtual Product Product { get; set; } + public virtual Product Product { get; set; } /// /// Gets or sets the associated gift card /// public virtual ICollection AssociatedGiftCards { - get { return _associatedGiftCards ?? (_associatedGiftCards = new HashSet()); } - protected set { _associatedGiftCards = value; } + get => _associatedGiftCards ?? (_associatedGiftCards = new HashSet()); + protected set => _associatedGiftCards = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/OrderNote.cs b/src/Libraries/SmartStore.Core/Domain/Orders/OrderNote.cs index f191c23b19..f406f42616 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/OrderNote.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/OrderNote.cs @@ -7,31 +7,31 @@ namespace SmartStore.Core.Domain.Orders /// Represents an order note /// [DataContract] - public partial class OrderNote : BaseEntity + public partial class OrderNote : BaseEntity { /// /// Gets or sets the order identifier /// [DataMember] - public int OrderId { get; set; } + public int OrderId { get; set; } /// /// Gets or sets the note /// [DataMember] - public string Note { get; set; } + public string Note { get; set; } /// /// Gets or sets a value indicating whether a customer can see a note /// [DataMember] - public bool DisplayToCustomer { get; set; } + public bool DisplayToCustomer { get; set; } /// /// Gets or sets the date and time of order note creation /// [DataMember] - public DateTime CreatedOnUtc { get; set; } + public DateTime CreatedOnUtc { get; set; } /// /// Gets the order diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs b/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs index b210ac07bf..d2701f84c8 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs @@ -1,25 +1,24 @@ using SmartStore.Core.Configuration; -using SmartStore.Core.Domain.Localization; namespace SmartStore.Core.Domain.Orders { - public class OrderSettings : ISettings + public class OrderSettings : ISettings { - public OrderSettings() - { - IsReOrderAllowed = true; - AnonymousCheckoutAllowed = true; - TermsOfServiceEnabled = true; - ReturnRequestsEnabled = true; - ReturnRequestActions = "Repair,Replacement,Store Credit"; - ReturnRequestReasons = "Received Wrong Product,Wrong Product Ordered,There Was A Problem With The Product"; - NumberOfDaysReturnRequestAvailable = 365; - MinimumOrderPlacementInterval = 30; - OrderListPageSize = 10; + public OrderSettings() + { + IsReOrderAllowed = true; + AnonymousCheckoutAllowed = true; + TermsOfServiceEnabled = true; + ReturnRequestsEnabled = true; + ReturnRequestActions = "Repair,Replacement,Store Credit"; + ReturnRequestReasons = "Received Wrong Product,Wrong Product Ordered,There Was A Problem With The Product"; + NumberOfDaysReturnRequestAvailable = 365; + MinimumOrderPlacementInterval = 30; + OrderListPageSize = 10; RecurringPaymentListPageSize = 10; } - - /// + + /// /// Gets or sets a value indicating whether customer can make re-order /// public bool IsReOrderAllowed { get; set; } @@ -54,11 +53,11 @@ public OrderSettings() /// public bool TermsOfServiceEnabled { get; set; } - /// - /// Gets or sets a value indicating whether "Order completed" page should be skipped - /// - public bool DisableOrderCompletedPage { get; set; } - + /// + /// Gets or sets a value indicating whether "Order completed" page should be skipped + /// + public bool DisableOrderCompletedPage { get; set; } + /// /// Gets or sets a value indicating whether "Return requests" are allowed /// @@ -94,15 +93,15 @@ public OrderSettings() /// public int MinimumOrderPlacementInterval { get; set; } - /// - /// Gets or sets a value indicating whether to display all orders of all stores to a customer - /// - public bool DisplayOrdersOfAllStores { get; set; } + /// + /// Gets or sets a value indicating whether to display all orders of all stores to a customer + /// + public bool DisplayOrdersOfAllStores { get; set; } - /// - /// Page size of the order list - /// - public int OrderListPageSize { get; set; } + /// + /// Page size of the order list + /// + public int OrderListPageSize { get; set; } /// /// Page size of the recurring payment list diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/OrganizedShoppingCartItem.cs b/src/Libraries/SmartStore.Core/Domain/Orders/OrganizedShoppingCartItem.cs index 41d38a8d0f..a052f20006 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/OrganizedShoppingCartItem.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/OrganizedShoppingCartItem.cs @@ -1,28 +1,27 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Core.Domain.Orders { - public partial class OrganizedShoppingCartItem - { - public OrganizedShoppingCartItem(ShoppingCartItem item) - { - Guard.NotNull(item, nameof(item)); + public partial class OrganizedShoppingCartItem + { + public OrganizedShoppingCartItem(ShoppingCartItem item) + { + Guard.NotNull(item, nameof(item)); - Item = item; // must not be null - ChildItems = new List(); - BundleItemData = new ProductBundleItemData(item.BundleItem); - CustomProperties = new Dictionary(); - } + Item = item; // must not be null + ChildItems = new List(); + BundleItemData = new ProductBundleItemData(item.BundleItem); + CustomProperties = new Dictionary(); + } - public ShoppingCartItem Item { get; private set; } - public IList ChildItems { get; set; } - public ProductBundleItemData BundleItemData { get; set; } + public ShoppingCartItem Item { get; private set; } + public IList ChildItems { get; set; } + public ProductBundleItemData BundleItemData { get; set; } - /// - /// Use this dictionary for any custom data required along cart processing - /// - public Dictionary CustomProperties { get; set; } - } + /// + /// Use this dictionary for any custom data required along cart processing + /// + public Dictionary CustomProperties { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPayment.cs b/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPayment.cs index 9861dc9302..02fce4bf05 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPayment.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPayment.cs @@ -50,7 +50,7 @@ public partial class RecurringPayment : BaseEntity, ISoftDeletable /// Gets or sets the date and time of payment creation /// public DateTime CreatedOnUtc { get; set; } - + /// /// Gets the next payment date /// @@ -121,31 +121,31 @@ public DateTime? NextPaymentDate //} //else //{ - if (historyCollection.Count > 0) - { - switch (this.CyclePeriod) - { - case RecurringProductCyclePeriod.Days: - result = this.StartDateUtc.AddDays((double)this.CycleLength * historyCollection.Count); - break; - case RecurringProductCyclePeriod.Weeks: - result = this.StartDateUtc.AddDays((double)(7 * this.CycleLength) * historyCollection.Count); - break; - case RecurringProductCyclePeriod.Months: - result = this.StartDateUtc.AddMonths(this.CycleLength * historyCollection.Count); - break; - case RecurringProductCyclePeriod.Years: - result = this.StartDateUtc.AddYears(this.CycleLength * historyCollection.Count); - break; - default: - throw new SmartException("Not supported cycle period"); - } - } - else + if (historyCollection.Count > 0) + { + switch (this.CyclePeriod) { - if (this.TotalCycles > 0) - result = this.StartDateUtc; + case RecurringProductCyclePeriod.Days: + result = this.StartDateUtc.AddDays((double)this.CycleLength * historyCollection.Count); + break; + case RecurringProductCyclePeriod.Weeks: + result = this.StartDateUtc.AddDays((double)(7 * this.CycleLength) * historyCollection.Count); + break; + case RecurringProductCyclePeriod.Months: + result = this.StartDateUtc.AddMonths(this.CycleLength * historyCollection.Count); + break; + case RecurringProductCyclePeriod.Years: + result = this.StartDateUtc.AddYears(this.CycleLength * historyCollection.Count); + break; + default: + throw new SmartException("Not supported cycle period"); } + } + else + { + if (this.TotalCycles > 0) + result = this.StartDateUtc; + } //} return result; @@ -174,16 +174,10 @@ public int CyclesRemaining /// public RecurringProductCyclePeriod CyclePeriod { - get - { - return (RecurringProductCyclePeriod)this.CyclePeriodId; - } - set - { - this.CyclePeriodId = (int)value; - } + get => (RecurringProductCyclePeriod)this.CyclePeriodId; + set => this.CyclePeriodId = (int)value; } - + @@ -192,9 +186,9 @@ public RecurringProductCyclePeriod CyclePeriod /// public virtual ICollection RecurringPaymentHistory { - get { return _recurringPaymentHistory ?? (_recurringPaymentHistory = new List()); } - protected set { _recurringPaymentHistory = value; } - } + get => _recurringPaymentHistory ?? (_recurringPaymentHistory = new List()); + protected set => _recurringPaymentHistory = value; + } /// /// Gets the initial order diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPaymentHistory.cs b/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPaymentHistory.cs index 457bb9806d..4755d07c6a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPaymentHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPaymentHistory.cs @@ -16,12 +16,12 @@ public partial class RecurringPaymentHistory : BaseEntity /// Gets or sets the recurring payment identifier /// public int OrderId { get; set; } - + /// /// Gets or sets the date and time of entity creation /// public DateTime CreatedOnUtc { get; set; } - + /// /// Gets the recurring payment /// diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/ReturnRequest.cs b/src/Libraries/SmartStore.Core/Domain/Orders/ReturnRequest.cs index 888c2ac83e..c876feff76 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/ReturnRequest.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/ReturnRequest.cs @@ -4,116 +4,110 @@ namespace SmartStore.Core.Domain.Orders { - /// - /// Represents a return request - /// - [DataContract] - public partial class ReturnRequest : BaseEntity, IAuditable - { - /// - /// Gets or sets the store identifier - /// - [DataMember] - public int StoreId { get; set; } + /// + /// Represents a return request + /// + [DataContract] + public partial class ReturnRequest : BaseEntity, IAuditable + { + /// + /// Gets or sets the store identifier + /// + [DataMember] + public int StoreId { get; set; } /// /// Gets or sets the order item identifier /// [DataMember] - public int OrderItemId { get; set; } + public int OrderItemId { get; set; } /// /// Gets or sets the customer identifier /// [DataMember] - public int CustomerId { get; set; } + public int CustomerId { get; set; } /// /// Gets or sets the quantity /// [DataMember] - public int Quantity { get; set; } + public int Quantity { get; set; } /// /// Gets or sets the reason to return /// [DataMember] - public string ReasonForReturn { get; set; } + public string ReasonForReturn { get; set; } /// /// Gets or sets the requested action /// [DataMember] - public string RequestedAction { get; set; } + public string RequestedAction { get; set; } - /// - /// Gets or sets the date and time when requested action was last updated - /// - [DataMember] - public DateTime? RequestedActionUpdatedOnUtc { get; set; } + /// + /// Gets or sets the date and time when requested action was last updated + /// + [DataMember] + public DateTime? RequestedActionUpdatedOnUtc { get; set; } /// /// Gets or sets the customer comments /// [DataMember] - public string CustomerComments { get; set; } + public string CustomerComments { get; set; } /// /// Gets or sets the staff notes /// [DataMember] - public string StaffNotes { get; set; } + public string StaffNotes { get; set; } - /// - /// Gets or sets the admin comment - /// - [DataMember] - public string AdminComment { get; set; } + /// + /// Gets or sets the admin comment + /// + [DataMember] + public string AdminComment { get; set; } /// /// Gets or sets the return status identifier /// [DataMember] - public int ReturnRequestStatusId { get; set; } + public int ReturnRequestStatusId { get; set; } - /// - /// Gets or sets whether to refund to wallet. - /// - [DataMember] - public bool? RefundToWallet { get; set; } + /// + /// Gets or sets whether to refund to wallet. + /// + [DataMember] + public bool? RefundToWallet { get; set; } - /// - /// Gets or sets the date and time of entity creation - /// - [DataMember] - public DateTime CreatedOnUtc { get; set; } + /// + /// Gets or sets the date and time of entity creation + /// + [DataMember] + public DateTime CreatedOnUtc { get; set; } /// /// Gets or sets the date and time of entity update /// [DataMember] - public DateTime UpdatedOnUtc { get; set; } - + public DateTime UpdatedOnUtc { get; set; } + /// /// Gets or sets the return status /// - [DataMember] - public ReturnRequestStatus ReturnRequestStatus + [DataMember] + public ReturnRequestStatus ReturnRequestStatus { - get - { - return (ReturnRequestStatus)this.ReturnRequestStatusId; - } - set - { - this.ReturnRequestStatusId = (int)value; - } + get => (ReturnRequestStatus)this.ReturnRequestStatusId; + set => this.ReturnRequestStatusId = (int)value; } /// /// Gets or sets the customer /// [DataMember] - public virtual Customer Customer { get; set; } + public virtual Customer Customer { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartItem.cs b/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartItem.cs index a7c3c91273..3ceba8c27d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartItem.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartItem.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Customers; @@ -9,21 +8,21 @@ namespace SmartStore.Core.Domain.Orders /// Represents a shopping cart item /// public partial class ShoppingCartItem : BaseEntity, IAuditable - { - /// - /// Gets or sets the store identifier - /// - public int StoreId { get; set; } + { + /// + /// Gets or sets the store identifier + /// + public int StoreId { get; set; } - /// - /// The parent shopping cart item id - /// - public int? ParentItemId { get; set; } + /// + /// The parent shopping cart item id + /// + public int? ParentItemId { get; set; } - /// - /// Gets or sets ths bundle item identifier - /// - public int? BundleItemId { get; set; } + /// + /// Gets or sets ths bundle item identifier + /// + public int? BundleItemId { get; set; } /// /// Gets or sets the shopping cart type identifier @@ -65,19 +64,13 @@ public partial class ShoppingCartItem : BaseEntity, IAuditable /// public DateTime UpdatedOnUtc { get; set; } - /// - /// Gets or sets the shopping cart type - /// - public ShoppingCartType ShoppingCartType + /// + /// Gets or sets the shopping cart type + /// + public ShoppingCartType ShoppingCartType { - get - { - return (ShoppingCartType)this.ShoppingCartTypeId; - } - set - { - this.ShoppingCartTypeId = (int)value; - } + get => (ShoppingCartType)this.ShoppingCartTypeId; + set => this.ShoppingCartTypeId = (int)value; } /// @@ -90,10 +83,10 @@ public ShoppingCartType ShoppingCartType /// public virtual Customer Customer { get; set; } - /// - /// Gets or sets the product bundle item - /// - public virtual ProductBundleItem BundleItem { get; set; } + /// + /// Gets or sets the product bundle item + /// + public virtual ProductBundleItem BundleItem { get; set; } /// /// Gets a value indicating whether the shopping cart item is free shipping @@ -102,9 +95,9 @@ public bool IsFreeShipping { get { - var product = this.Product; - if (product != null) - return product.IsFreeShipping; + var product = this.Product; + if (product != null) + return product.IsFreeShipping; return true; } } @@ -116,9 +109,9 @@ public bool IsShipEnabled { get { - var product = this.Product; - if (product != null) - return product.IsShipEnabled; + var product = this.Product; + if (product != null) + return product.IsShipEnabled; return false; } } @@ -130,9 +123,9 @@ public bool IsTaxExempt { get { - var product = this.Product; - if (product != null) - return product.IsTaxExempt; + var product = this.Product; + if (product != null) + return product.IsTaxExempt; return false; } } diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs b/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs index 853862dfd2..e6c7aa9506 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs @@ -1,35 +1,34 @@ using SmartStore.Core.Configuration; -using SmartStore.Core.Domain.Localization; namespace SmartStore.Core.Domain.Orders { public class ShoppingCartSettings : ISettings - { - public ShoppingCartSettings() - { - MaximumShoppingCartItems = 1000; - MaximumWishlistItems = 1000; - MoveItemsFromWishlistToCart = true; - ShowItemsFromWishlistToCartButton = true; - ShowProductImagesOnShoppingCart = true; - ShowProductBundleImagesOnShoppingCart = true; - ShowProductImagesOnWishList = true; - ShowProductBundleImagesOnWishList = true; - ShowDiscountBox = true; - ShowGiftCardBox = true; + { + public ShoppingCartSettings() + { + MaximumShoppingCartItems = 1000; + MaximumWishlistItems = 1000; + MoveItemsFromWishlistToCart = true; + ShowItemsFromWishlistToCartButton = true; + ShowProductImagesOnShoppingCart = true; + ShowProductBundleImagesOnShoppingCart = true; + ShowProductImagesOnWishList = true; + ShowProductBundleImagesOnWishList = true; + ShowDiscountBox = true; + ShowGiftCardBox = true; ShowCommentBox = true; - ShowEsdRevocationWaiverBox = true; - CrossSellsNumber = 8; - EmailWishlistEnabled = true; - MiniShoppingCartEnabled = true; - ShowProductImagesInMiniShoppingCart = true; + ShowEsdRevocationWaiverBox = true; + CrossSellsNumber = 8; + EmailWishlistEnabled = true; + MiniShoppingCartEnabled = true; + ShowProductImagesInMiniShoppingCart = true; ShowBasePrice = true; ShowDeliveryTimes = true; ShowShortDesc = true; - AllowAnonymousUsersToEmailWishlist = false; - } - - /// + AllowAnonymousUsersToEmailWishlist = false; + } + + /// /// Gets or sets a value indicating whether a custoemr should be redirected to the shopping cart page after adding a product to the cart/wishlist /// public bool DisplayCartAfterAddingProduct { get; set; } @@ -43,7 +42,7 @@ public ShoppingCartSettings() /// Gets or sets a value indicating maximum number of items in the shopping cart /// public int MaximumShoppingCartItems { get; set; } - + /// /// Gets or sets a value indicating maximum number of items in the wishlist /// @@ -59,30 +58,30 @@ public ShoppingCartSettings() /// public bool MoveItemsFromWishlistToCart { get; set; } - /// - /// Gets or sets a value indicating whether to show the items from wishlist to ahopping cart button. - /// - public bool ShowItemsFromWishlistToCartButton { get; set; } + /// + /// Gets or sets a value indicating whether to show the items from wishlist to ahopping cart button. + /// + public bool ShowItemsFromWishlistToCartButton { get; set; } /// /// Gets or sets a value indicating whether to show product image on shopping cart page /// public bool ShowProductImagesOnShoppingCart { get; set; } - /// - /// Gets or sets a value indicating whether to show product bundle images on shopping cart page - /// - public bool ShowProductBundleImagesOnShoppingCart { get; set; } + /// + /// Gets or sets a value indicating whether to show product bundle images on shopping cart page + /// + public bool ShowProductBundleImagesOnShoppingCart { get; set; } /// /// Gets or sets a value indicating whether to show product image on wishlist page /// public bool ShowProductImagesOnWishList { get; set; } - /// - /// Gets or sets a value indicating whether to show product image on wishlist page - /// - public bool ShowProductBundleImagesOnWishList { get; set; } + /// + /// Gets or sets a value indicating whether to show product image on wishlist page + /// + public bool ShowProductBundleImagesOnWishList { get; set; } /// /// Gets or sets a value indicating whether to show discount box on shopping cart page @@ -99,31 +98,31 @@ public ShoppingCartSettings() /// public bool ShowCommentBox { get; set; } - /// - /// Gets or sets a value indicating whether to show a revocation waiver checkbox box for ESD products - /// - public bool ShowEsdRevocationWaiverBox { get; set; } + /// + /// Gets or sets a value indicating whether to show a revocation waiver checkbox box for ESD products + /// + public bool ShowEsdRevocationWaiverBox { get; set; } + + /// + /// Gets or sets a value indicating whether to show a checkbox to subscribe to newsletters + /// + public CheckoutNewsLetterSubscription NewsLetterSubscription { get; set; } - /// - /// Gets or sets a value indicating whether to show a checkbox to subscribe to newsletters - /// - public CheckoutNewsLetterSubscription NewsLetterSubscription { get; set; } + /// + /// Gets or sets a value indicating whether to show a checkbox to let the customer accept to hand over email address to third party + /// + public CheckoutThirdPartyEmailHandOver ThirdPartyEmailHandOver { get; set; } - /// - /// Gets or sets a value indicating whether to show a checkbox to let the customer accept to hand over email address to third party - /// - public CheckoutThirdPartyEmailHandOver ThirdPartyEmailHandOver { get; set; } + /// + /// Gets or sets the label to accept to hand over the email to third party + /// + public string ThirdPartyEmailHandOverLabel { get; set; } - /// - /// Gets or sets the label to accept to hand over the email to third party - /// - public string ThirdPartyEmailHandOverLabel { get; set; } + /// + /// Gets or sets a number of "Cross-sells" on shopping cart page + /// + public int CrossSellsNumber { get; set; } - /// - /// Gets or sets a number of "Cross-sells" on shopping cart page - /// - public int CrossSellsNumber { get; set; } - /// /// Gets or sets a value indicating whether "email a wishlist" feature is enabled /// @@ -133,7 +132,7 @@ public ShoppingCartSettings() /// Gets or sets a value indicating whether to enabled "email a wishlist" for anonymous users. /// public bool AllowAnonymousUsersToEmailWishlist { get; set; } - + /// Gets or sets a value indicating whether mini-shopping cart is enabled /// public bool MiniShoppingCartEnabled { get; set; } @@ -168,9 +167,9 @@ public ShoppingCartSettings() /// public bool ShowBasePrice { get; set; } - /// - /// Gets or sets a value indicating whether to show the quantity of linked attribute value product - /// - public bool ShowLinkedAttributeValueQuantity { get; set; } + /// + /// Gets or sets a value indicating whether to show the quantity of linked attribute value product + /// + public bool ShowLinkedAttributeValueQuantity { get; set; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Payments/CapturePaymentReason.cs b/src/Libraries/SmartStore.Core/Domain/Payments/CapturePaymentReason.cs index 39d599f41d..96fa8b0323 100644 --- a/src/Libraries/SmartStore.Core/Domain/Payments/CapturePaymentReason.cs +++ b/src/Libraries/SmartStore.Core/Domain/Payments/CapturePaymentReason.cs @@ -1,18 +1,18 @@ namespace SmartStore.Core.Domain.Payments { - /// - /// The reason for automatic capturing of the payment amount. - /// - public enum CapturePaymentReason - { - /// - /// Capture payment because the order has been marked as shipped. - /// - OrderShipped = 0, + /// + /// The reason for automatic capturing of the payment amount. + /// + public enum CapturePaymentReason + { + /// + /// Capture payment because the order has been marked as shipped. + /// + OrderShipped = 0, - /// - /// Capture payment because the order has been marked as delivered. - /// - OrderDelivered - } + /// + /// Capture payment because the order has been marked as delivered. + /// + OrderDelivered + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Payments/PaymentMethod.cs b/src/Libraries/SmartStore.Core/Domain/Payments/PaymentMethod.cs index cd51eabedb..5427dcdd9c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Payments/PaymentMethod.cs +++ b/src/Libraries/SmartStore.Core/Domain/Payments/PaymentMethod.cs @@ -6,11 +6,11 @@ namespace SmartStore.Core.Domain.Payments { - /// - /// Represents a payment method - /// - [DataContract] - public partial class PaymentMethod : BaseEntity, ILocalizedEntity, IStoreMappingSupported, IRulesContainer + /// + /// Represents a payment method + /// + [DataContract] + public partial class PaymentMethod : BaseEntity, ILocalizedEntity, IStoreMappingSupported, IRulesContainer { private ICollection _ruleSets; @@ -18,13 +18,13 @@ public partial class PaymentMethod : BaseEntity, ILocalizedEntity, IStoreMapping /// Gets or sets the payment method system name /// [DataMember] - public string PaymentMethodSystemName { get; set; } + public string PaymentMethodSystemName { get; set; } - /// - /// Gets or sets the full description - /// - [DataMember] - public string FullDescription { get; set; } + /// + /// Gets or sets the full description + /// + [DataMember] + public string FullDescription { get; set; } /// /// Gets or sets a value indicating whether to round the order total. Also known as "Cash rounding". @@ -33,19 +33,19 @@ public partial class PaymentMethod : BaseEntity, ILocalizedEntity, IStoreMapping [DataMember] public bool RoundOrderTotalEnabled { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } /// /// Gets or sets assigned rule sets. /// public virtual ICollection RuleSets { - get { return _ruleSets ?? (_ruleSets = new HashSet()); } - protected set { _ruleSets = value; } + get => _ruleSets ?? (_ruleSets = new HashSet()); + protected set => _ruleSets = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Payments/PaymentSettings.cs b/src/Libraries/SmartStore.Core/Domain/Payments/PaymentSettings.cs index 7aad6a5667..5d3533c27d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Payments/PaymentSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Payments/PaymentSettings.cs @@ -8,8 +8,8 @@ public class PaymentSettings : ISettings public PaymentSettings() { ActivePaymentMethodSystemNames = new List(); - AllowRePostingPayments = true; - BypassPaymentMethodSelectionIfOnlyOne = false; + AllowRePostingPayments = true; + BypassPaymentMethodSelectionIfOnlyOne = false; } /// @@ -27,19 +27,19 @@ public PaymentSettings() /// public bool BypassPaymentMethodSelectionIfOnlyOne { get; set; } - /// - /// Gets or sets a value indicating whether we should bypass the payment method info page - /// - public bool BypassPaymentMethodInfo { get; set; } + /// + /// Gets or sets a value indicating whether we should bypass the payment method info page + /// + public bool BypassPaymentMethodInfo { get; set; } - /// - /// Gets or sets the reason for automatic payment capturing - /// - public CapturePaymentReason? CapturePaymentReason { get; set; } + /// + /// Gets or sets the reason for automatic payment capturing + /// + public CapturePaymentReason? CapturePaymentReason { get; set; } - /// - /// Gets or sets the identifier of the currency in which the wallet is kept. - /// - public int WalletCurrencyId { get; set; } - } + /// + /// Gets or sets the identifier of the currency in which the wallet is kept. + /// + public int WalletCurrencyId { get; set; } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Polls/Poll.cs b/src/Libraries/SmartStore.Core/Domain/Polls/Poll.cs index 73c2d2481f..d3d51d806a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Polls/Poll.cs +++ b/src/Libraries/SmartStore.Core/Domain/Polls/Poll.cs @@ -57,20 +57,20 @@ public partial class Poll : BaseEntity, IStoreMappingSupported /// public DateTime? EndDateUtc { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - public bool LimitedToStores { get; set; } - + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + public bool LimitedToStores { get; set; } + /// /// Gets or sets the news comments /// public virtual ICollection PollAnswers { - get { return _pollAnswers ?? (_pollAnswers = new HashSet()); } - protected set { _pollAnswers = value; } + get => _pollAnswers ?? (_pollAnswers = new HashSet()); + protected set => _pollAnswers = value; } - + /// /// Gets or sets the language /// diff --git a/src/Libraries/SmartStore.Core/Domain/Polls/PollAnswer.cs b/src/Libraries/SmartStore.Core/Domain/Polls/PollAnswer.cs index 86fb99cb53..af8dfde475 100644 --- a/src/Libraries/SmartStore.Core/Domain/Polls/PollAnswer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Polls/PollAnswer.cs @@ -28,7 +28,7 @@ public partial class PollAnswer : BaseEntity /// Gets or sets the display order /// public int DisplayOrder { get; set; } - + /// /// Gets or sets the poll /// @@ -39,8 +39,8 @@ public partial class PollAnswer : BaseEntity /// public virtual ICollection PollVotingRecords { - get { return _pollVotingRecords ?? (_pollVotingRecords = new HashSet()); } - protected set { _pollVotingRecords = value; } + get => _pollVotingRecords ?? (_pollVotingRecords = new HashSet()); + protected set => _pollVotingRecords = value; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Security/AclRecord.cs b/src/Libraries/SmartStore.Core/Domain/Security/AclRecord.cs index 7bd0cf40e3..ff8f04dede 100644 --- a/src/Libraries/SmartStore.Core/Domain/Security/AclRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Security/AclRecord.cs @@ -21,17 +21,17 @@ public partial class AclRecord : BaseEntity /// public int CustomerRoleId { get; set; } - /// - /// Gets or sets the customer role - /// - public virtual CustomerRole CustomerRole { get; set; } + /// + /// Gets or sets the customer role + /// + public virtual CustomerRole CustomerRole { get; set; } - /// - /// Gets or sets a value indicating whether the entry is idle - /// - /// - /// An entry is idle when it's related entity has been soft-deleted - /// - public bool IsIdle { get; set; } + /// + /// Gets or sets a value indicating whether the entry is idle + /// + /// + /// An entry is idle when it's related entity has been soft-deleted + /// + public bool IsIdle { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Security/DefaultPermissionRecord.cs b/src/Libraries/SmartStore.Core/Domain/Security/DefaultPermissionRecord.cs index ca9665ea9c..1cb5af8b56 100644 --- a/src/Libraries/SmartStore.Core/Domain/Security/DefaultPermissionRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Security/DefaultPermissionRecord.cs @@ -7,7 +7,7 @@ namespace SmartStore.Core.Domain.Security /// public class DefaultPermissionRecord { - public DefaultPermissionRecord() + public DefaultPermissionRecord() { PermissionRecords = new List(); } diff --git a/src/Libraries/SmartStore.Core/Domain/Security/IAclSupported.cs b/src/Libraries/SmartStore.Core/Domain/Security/IAclSupported.cs index 872f42384d..60661ea0df 100644 --- a/src/Libraries/SmartStore.Core/Domain/Security/IAclSupported.cs +++ b/src/Libraries/SmartStore.Core/Domain/Security/IAclSupported.cs @@ -5,9 +5,9 @@ namespace SmartStore.Core.Domain.Security /// public partial interface IAclSupported { - /// - /// Gets or sets a value indicating whether the entity is subject to ACL - /// - bool SubjectToAcl { get; set; } + /// + /// Gets or sets a value indicating whether the entity is subject to ACL + /// + bool SubjectToAcl { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs index 70edc60ae7..aa2f64a941 100644 --- a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs @@ -15,14 +15,14 @@ public class PermissionRecord : BaseEntity /// [Index] public string SystemName { get; set; } - + /// /// Gets or sets permission role mappings. /// public virtual ICollection PermissionRoleMappings { - get { return _permissionRoleMappings ?? (_permissionRoleMappings = new HashSet()); } - protected set { _permissionRoleMappings = value; } + get => _permissionRoleMappings ?? (_permissionRoleMappings = new HashSet()); + protected set => _permissionRoleMappings = value; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Security/SecuritySettings.cs b/src/Libraries/SmartStore.Core/Domain/Security/SecuritySettings.cs index 71999bd5ba..66f00dad16 100644 --- a/src/Libraries/SmartStore.Core/Domain/Security/SecuritySettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Security/SecuritySettings.cs @@ -6,21 +6,21 @@ namespace SmartStore.Core.Domain.Security { public class SecuritySettings : ISettings { - public SecuritySettings() - { - EncryptionKey = CommonHelper.GenerateRandomDigitCode(16); - AdminAreaAllowedIpAddresses = new List(); - } + public SecuritySettings() + { + EncryptionKey = CommonHelper.GenerateRandomDigitCode(16); + AdminAreaAllowedIpAddresses = new List(); + } - /// - /// When true, bypasses any SSL redirection on localhost - /// - public bool UseSslOnLocalhost { get; set; } + /// + /// When true, bypasses any SSL redirection on localhost + /// + public bool UseSslOnLocalhost { get; set; } - /// - /// Gets or sets an encryption key - /// - public string EncryptionKey { get; set; } + /// + /// Gets or sets an encryption key + /// + public string EncryptionKey { get; set; } /// /// Gets or sets a list of adminn area allowed IP addresses @@ -32,9 +32,9 @@ public SecuritySettings() /// public bool HideAdminMenuItemsBasedOnPermissions { get; set; } - /// - /// Gets or sets a vaule indicating whether "Honeypot" is enabled to prevent bots from posting forms. - /// - public bool EnableHoneypotProtection { get; set; } + /// + /// Gets or sets a vaule indicating whether "Honeypot" is enabled to prevent bots from posting forms. + /// + public bool EnableHoneypotProtection { get; set; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/CanonicalHostNameRule.cs b/src/Libraries/SmartStore.Core/Domain/Seo/CanonicalHostNameRule.cs index 7e64e097aa..a1449e10ed 100644 --- a/src/Libraries/SmartStore.Core/Domain/Seo/CanonicalHostNameRule.cs +++ b/src/Libraries/SmartStore.Core/Domain/Seo/CanonicalHostNameRule.cs @@ -1,13 +1,13 @@ namespace SmartStore.Core.Domain.Seo { - public enum CanonicalHostNameRule + public enum CanonicalHostNameRule { /// /// Doesn't matter (as requested) /// NoRule, - /// + /// /// The www prefix is required (www.myshop.com is default host) /// RequireWww, diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/ISlugSupported.cs b/src/Libraries/SmartStore.Core/Domain/Seo/ISlugSupported.cs index 6b52764cec..154a2c2b32 100644 --- a/src/Libraries/SmartStore.Core/Domain/Seo/ISlugSupported.cs +++ b/src/Libraries/SmartStore.Core/Domain/Seo/ISlugSupported.cs @@ -6,5 +6,5 @@ namespace SmartStore.Core.Domain.Seo /// public interface ISlugSupported { - } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs index 2bddd96472..7139060122 100644 --- a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs @@ -4,103 +4,103 @@ namespace SmartStore.Core.Domain.Seo { - public class SeoSettings : ISettings + public class SeoSettings : ISettings { - public SeoSettings() - { - ExtraRobotsDisallows = new List { "/blog/tag/", "/blog/month/", "/producttags/" }; - - ReservedUrlRecordSlugs = new List - { - "admin", - "install", - "recentlyviewedproducts", - "newproducts", - "compareproducts", - "clearcomparelist", - "setproductreviewhelpfulness", - "login", - "register", - "logout", - "cart", - "wishlist", - "emailwishlist", - "checkout", - "contactus", - "passwordrecovery", - "subscribenewsletter", - "blog", - "boards", - "inboxupdate", - "sentupdate", - "news", - "sitemap", - "sitemapseo", - "search", - "config", - "api", - "odata" - }; - - SeoNameCharConversion = string.Join(Environment.NewLine, new List - { - "ä;ae", - "ö;oe", - "ü;ue", - "Ä;Ae", - "Ö;Oe", - "Ü;Ue", - "ß;ss" - }); - } - - public string PageTitleSeparator { get; set; } = ". "; - public PageTitleSeoAdjustment PageTitleSeoAdjustment { get; set; } = PageTitleSeoAdjustment.PagenameAfterStorename; - - public string DefaultTitle { get; set; } = "Shop"; - public string DefaultMetaKeywords { get; set; } = string.Empty; + public SeoSettings() + { + ExtraRobotsDisallows = new List { "/blog/tag/", "/blog/month/", "/producttags/" }; + + ReservedUrlRecordSlugs = new List + { + "admin", + "install", + "recentlyviewedproducts", + "newproducts", + "compareproducts", + "clearcomparelist", + "setproductreviewhelpfulness", + "login", + "register", + "logout", + "cart", + "wishlist", + "emailwishlist", + "checkout", + "contactus", + "passwordrecovery", + "subscribenewsletter", + "blog", + "boards", + "inboxupdate", + "sentupdate", + "news", + "sitemap", + "sitemapseo", + "search", + "config", + "api", + "odata" + }; + + SeoNameCharConversion = string.Join(Environment.NewLine, new List + { + "ä;ae", + "ö;oe", + "ü;ue", + "Ä;Ae", + "Ö;Oe", + "Ü;Ue", + "ß;ss" + }); + } + + public string PageTitleSeparator { get; set; } = ". "; + public PageTitleSeoAdjustment PageTitleSeoAdjustment { get; set; } = PageTitleSeoAdjustment.PagenameAfterStorename; + + public string DefaultTitle { get; set; } = "Shop"; + public string DefaultMetaKeywords { get; set; } = string.Empty; public string DefaultMetaDescription { get; set; } = string.Empty; - public string HomepageMetaTitle { get; set; } - public string HomepageMetaDescription { get; set; } - public string HomepageMetaKeywords { get; set; } + public string HomepageMetaTitle { get; set; } + public string HomepageMetaDescription { get; set; } + public string HomepageMetaKeywords { get; set; } - public string MetaRobotsContent { get; set; } + public string MetaRobotsContent { get; set; } - public bool ConvertNonWesternChars { get; set; } + public bool ConvertNonWesternChars { get; set; } public bool AllowUnicodeCharsInUrls { get; set; } - public string SeoNameCharConversion { get; set; } + public string SeoNameCharConversion { get; set; } - public bool CanonicalUrlsEnabled { get; set; } + public bool CanonicalUrlsEnabled { get; set; } public CanonicalHostNameRule CanonicalHostNameRule { get; set; } = CanonicalHostNameRule.NoRule; - /// - /// Slugs (sename) reserved for some other needs - /// - public List ReservedUrlRecordSlugs { get; set; } + /// + /// Slugs (sename) reserved for some other needs + /// + public List ReservedUrlRecordSlugs { get; set; } public List ExtraRobotsDisallows { get; set; } - /// - /// A value indicating whether to load all URL records and active slugs on application startup - /// - public bool LoadAllUrlAliasesOnStartup { get; set; } = true; + /// + /// A value indicating whether to load all URL records and active slugs on application startup + /// + public bool LoadAllUrlAliasesOnStartup { get; set; } = true; - public bool RedirectLegacyTopicUrls { get; set; } + public bool RedirectLegacyTopicUrls { get; set; } - #region XML Sitemap + #region XML Sitemap - public bool XmlSitemapEnabled { get; set; } = true; - public bool XmlSitemapIncludesCategories { get; set; } = true; - public bool XmlSitemapIncludesManufacturers { get; set; } = true; - public bool XmlSitemapIncludesProducts { get; set; } = true; - public bool XmlSitemapIncludesTopics { get; set; } = true; - public bool XmlSitemapIncludesBlog { get; set; } = true; - public bool XmlSitemapIncludesNews { get; set; } = true; - public bool XmlSitemapIncludesForum { get; set; } = true; + public bool XmlSitemapEnabled { get; set; } = true; + public bool XmlSitemapIncludesCategories { get; set; } = true; + public bool XmlSitemapIncludesManufacturers { get; set; } = true; + public bool XmlSitemapIncludesProducts { get; set; } = true; + public bool XmlSitemapIncludesTopics { get; set; } = true; + public bool XmlSitemapIncludesBlog { get; set; } = true; + public bool XmlSitemapIncludesNews { get; set; } = true; + public bool XmlSitemapIncludesForum { get; set; } = true; - #endregion + #endregion - } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecord.cs b/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecord.cs index 8022e4dcfc..11640bc967 100644 --- a/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecord.cs @@ -6,36 +6,36 @@ namespace SmartStore.Core.Domain.Seo /// Represents an URL record /// [DataContract] - public partial class UrlRecord : BaseEntity + public partial class UrlRecord : BaseEntity { /// /// Gets or sets the entity identifier /// [DataMember] - public int EntityId { get; set; } + public int EntityId { get; set; } /// /// Gets or sets the entity name /// [DataMember] - public string EntityName { get; set; } + public string EntityName { get; set; } /// /// Gets or sets the slug /// [DataMember] - public string Slug { get; set; } + public string Slug { get; set; } /// /// Gets or sets the value indicating whether the record is active /// [DataMember] - public bool IsActive { get; set; } + public bool IsActive { get; set; } /// /// Gets or sets the language identifier /// [DataMember] - public int LanguageId { get; set; } + public int LanguageId { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecordCollection.cs b/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecordCollection.cs index 733e800f7a..3f765dd5d8 100644 --- a/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecordCollection.cs +++ b/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecordCollection.cs @@ -6,90 +6,97 @@ namespace SmartStore.Core.Domain.Seo { public class UrlRecordCollection : IReadOnlyCollection - { - private readonly string _entityName; - private readonly IDictionary _dict; - private HashSet _requestedSet; - - public UrlRecordCollection(string entityName, int[] requestedSet, IEnumerable items) - { - Guard.NotEmpty(entityName, nameof(entityName)); - Guard.NotNull(items, nameof(items)); - - _entityName = entityName; - _dict = items.ToDictionarySafe(x => CreateKey(x.EntityId, x.LanguageId)); - - if (requestedSet != null && requestedSet.Length > 0) - { - _requestedSet = new HashSet(requestedSet); - } - } - - public void MergeWith(UrlRecordCollection other) - { - Guard.NotNull(other, nameof(other)); - - if (!this._entityName.IsCaseInsensitiveEqual(other._entityName)) - { - throw new InvalidOperationException("Expected group '{0}', but was '{1}'".FormatInvariant(this._entityName, other._entityName)); - } - - // Merge dictionary - other._dict.Merge(this._dict, true); - - // Merge requested set (entity ids) - if (this._requestedSet != null) - { - if (other._requestedSet == null) - { - other._requestedSet = new HashSet(this._requestedSet); - } - else - { - other._requestedSet.AddRange(this._requestedSet); - } - } - } - - public string GetSlug(int languageId, int entityId, bool returnDefaultValue = true) - { - var slug = Find(languageId, entityId)?.Slug; - + { + private readonly string _entityName; + private readonly IDictionary _dict; + private HashSet _requestedSet; + + public UrlRecordCollection(string entityName, int[] requestedSet, IEnumerable items) + { + Guard.NotEmpty(entityName, nameof(entityName)); + Guard.NotNull(items, nameof(items)); + + _entityName = entityName; + _dict = items.ToDictionarySafe(x => CreateKey(x.EntityId, x.LanguageId)); + + if (requestedSet != null && requestedSet.Length > 0) + { + _requestedSet = new HashSet(requestedSet); + } + } + + public void MergeWith(UrlRecordCollection other) + { + Guard.NotNull(other, nameof(other)); + + if (!this._entityName.IsCaseInsensitiveEqual(other._entityName)) + { + throw new InvalidOperationException("Expected group '{0}', but was '{1}'".FormatInvariant(this._entityName, other._entityName)); + } + + // Merge dictionary + other._dict.Merge(this._dict, true); + + // Merge requested set (entity ids) + if (this._requestedSet != null) + { + if (other._requestedSet == null) + { + other._requestedSet = new HashSet(this._requestedSet); + } + else + { + other._requestedSet.AddRange(this._requestedSet); + } + } + } + + public string GetSlug(int languageId, int entityId, bool returnDefaultValue = true) + { + var slug = Find(languageId, entityId)?.Slug; + if (returnDefaultValue && languageId != 0 && string.IsNullOrEmpty(slug)) { slug = Find(0, entityId)?.Slug; } return slug; - } - - public UrlRecord Find(int languageId, int entityId) - { - var item = _dict.Get(CreateKey(entityId, languageId)); - - if (item == null && (_requestedSet == null || _requestedSet.Contains(entityId))) - { - // Although the item does not exist in the local dictionary it has been requested - // from the database, which means it does not exist in the db either. - // Avoid the upcoming roundtrip. - return new UrlRecord - { - EntityName = _entityName, - EntityId = entityId, - LanguageId = languageId - }; - } - - return item; - } - - private string CreateKey(int entityId, int languageId) - { - return string.Concat(entityId.ToString(CultureInfo.InvariantCulture), "-", languageId); - } - - public int Count => _dict.Values.Count; - public IEnumerator GetEnumerator() => _dict.Values.GetEnumerator(); - IEnumerator IEnumerable.GetEnumerator() => _dict.Values.GetEnumerator(); - } + } + + public UrlRecord Find(int languageId, int entityId) + { + var item = _dict.Get(CreateKey(entityId, languageId)); + + if (item == null && (_requestedSet == null || _requestedSet.Contains(entityId))) + { + // Although the item does not exist in the local dictionary it has been requested + // from the database, which means it does not exist in the db either. + // Avoid the upcoming roundtrip. + return new UrlRecord + { + EntityName = _entityName, + EntityId = entityId, + LanguageId = languageId + }; + } + + return item; + } + + private string CreateKey(int entityId, int languageId) + { + return string.Concat(entityId.ToString(CultureInfo.InvariantCulture), "-", languageId); + } + + public int Count => _dict.Values.Count; + public IEnumerator GetEnumerator() + { + return _dict.Values.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return _dict.Values.GetEnumerator(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Shipping/Shipment.cs b/src/Libraries/SmartStore.Core/Domain/Shipping/Shipment.cs index 0ae02bd495..d172210689 100644 --- a/src/Libraries/SmartStore.Core/Domain/Shipping/Shipment.cs +++ b/src/Libraries/SmartStore.Core/Domain/Shipping/Shipment.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using SmartStore.Core.Domain.Orders; -using System.Runtime.Serialization; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using SmartStore.Core.Domain.Orders; namespace SmartStore.Core.Domain.Shipping { @@ -10,7 +10,7 @@ namespace SmartStore.Core.Domain.Shipping /// Represents a shipment /// [DataContract] - public partial class Shipment : BaseEntity + public partial class Shipment : BaseEntity { private ICollection _shipmentItems; @@ -18,13 +18,13 @@ public partial class Shipment : BaseEntity /// Gets or sets the order identifier /// [DataMember] - public int OrderId { get; set; } - + public int OrderId { get; set; } + /// /// Gets or sets the tracking number of this shipment /// - [DataMember] - public string TrackingNumber { get; set; } + [DataMember] + public string TrackingNumber { get; set; } /// /// Gets or sets the tracking URL. @@ -38,31 +38,31 @@ public partial class Shipment : BaseEntity /// It's nullable for compatibility with the previous version of Smartstore where was no such property /// [DataMember] - public decimal? TotalWeight { get; set; } + public decimal? TotalWeight { get; set; } /// /// Gets or sets the shipped date and time /// [DataMember] - public DateTime? ShippedDateUtc { get; set; } + public DateTime? ShippedDateUtc { get; set; } /// /// Gets or sets the delivery date and time /// [DataMember] - public DateTime? DeliveryDateUtc { get; set; } + public DateTime? DeliveryDateUtc { get; set; } /// /// Gets or sets the entity creation date /// [DataMember] - public DateTime CreatedOnUtc { get; set; } + public DateTime CreatedOnUtc { get; set; } /// /// Gets the order /// [DataMember] - public virtual Order Order { get; set; } + public virtual Order Order { get; set; } /// /// Gets or sets the shipment items @@ -70,8 +70,8 @@ public partial class Shipment : BaseEntity [DataMember] public virtual ICollection ShipmentItems { - get { return _shipmentItems ?? (_shipmentItems = new HashSet()); } - protected set { _shipmentItems = value; } + get => _shipmentItems ?? (_shipmentItems = new HashSet()); + protected set => _shipmentItems = value; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingMethod.cs b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingMethod.cs index bba860d0b2..09cc57c627 100644 --- a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingMethod.cs +++ b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingMethod.cs @@ -6,11 +6,11 @@ namespace SmartStore.Core.Domain.Shipping { - /// - /// Represents a shipping method (used for offline shipping rate computation methods) - /// - [DataContract] - public partial class ShippingMethod : BaseEntity, ILocalizedEntity, IStoreMappingSupported, IRulesContainer + /// + /// Represents a shipping method (used for offline shipping rate computation methods) + /// + [DataContract] + public partial class ShippingMethod : BaseEntity, ILocalizedEntity, IStoreMappingSupported, IRulesContainer { private ICollection _ruleSets; @@ -18,39 +18,39 @@ public partial class ShippingMethod : BaseEntity, ILocalizedEntity, IStoreMappin /// Gets or sets the name /// [DataMember] - public string Name { get; set; } + public string Name { get; set; } /// /// Gets or sets the description /// [DataMember] - public string Description { get; set; } + public string Description { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } - /// - /// Gets or sets whether to ignore charges - /// - [DataMember] - public bool IgnoreCharges { get; set; } + /// + /// Gets or sets whether to ignore charges + /// + [DataMember] + public bool IgnoreCharges { get; set; } - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } /// /// Gets or sets assigned rule sets. /// public virtual ICollection RuleSets { - get { return _ruleSets ?? (_ruleSets = new HashSet()); } - protected set { _ruleSets = value; } + get => _ruleSets ?? (_ruleSets = new HashSet()); + protected set => _ruleSets = value; } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingOption.cs b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingOption.cs index 5edb06f415..ec5c564e45 100644 --- a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingOption.cs +++ b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingOption.cs @@ -1,11 +1,3 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - namespace SmartStore.Core.Domain.Shipping { /// @@ -13,10 +5,10 @@ namespace SmartStore.Core.Domain.Shipping /// public partial class ShippingOption { - /// - /// Shipping method identifier - /// - public int ShippingMethodId { get; set; } + /// + /// Shipping method identifier + /// + public int ShippingMethodId { get; set; } /// /// Gets or sets the system name of shipping rate computation method diff --git a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs index b473d6531d..b9d2d78f8f 100644 --- a/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Shipping/ShippingSettings.cs @@ -7,9 +7,9 @@ public class ShippingSettings : ISettings { public ShippingSettings() { - ActiveShippingRateComputationMethodSystemNames = new List { "Shipping.FixedRate" }; - EstimateShippingEnabled = true; - ReturnValidOptionsIfThereAreAny = true; + ActiveShippingRateComputationMethodSystemNames = new List { "Shipping.FixedRate" }; + EstimateShippingEnabled = true; + ReturnValidOptionsIfThereAreAny = true; TodayShipmentHour = 14; DeliveryOnWorkweekDaysOnly = true; } diff --git a/src/Libraries/SmartStore.Core/Domain/StoreInformationSettings.cs b/src/Libraries/SmartStore.Core/Domain/StoreInformationSettings.cs index b486b2acc3..ccab383818 100644 --- a/src/Libraries/SmartStore.Core/Domain/StoreInformationSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/StoreInformationSettings.cs @@ -4,12 +4,12 @@ namespace SmartStore.Core.Domain { public class StoreInformationSettings : ISettings { - public StoreInformationSettings() - { - StoreClosedAllowForAdmins = true; - } - - /// + public StoreInformationSettings() + { + StoreClosedAllowForAdmins = true; + } + + /// /// Gets or sets a value indicating whether store is closed /// public bool StoreClosed { get; set; } diff --git a/src/Libraries/SmartStore.Core/Domain/Stores/IStoreMappingSupported.cs b/src/Libraries/SmartStore.Core/Domain/Stores/IStoreMappingSupported.cs index 9303ccab4c..e3aaf3c44c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Stores/IStoreMappingSupported.cs +++ b/src/Libraries/SmartStore.Core/Domain/Stores/IStoreMappingSupported.cs @@ -1,13 +1,13 @@ namespace SmartStore.Core.Domain.Stores { - /// - /// Represents an entity which supports store mapping - /// - public partial interface IStoreMappingSupported - { - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - bool LimitedToStores { get; set; } - } + /// + /// Represents an entity which supports store mapping + /// + public partial interface IStoreMappingSupported + { + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + bool LimitedToStores { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs b/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs index 2181655f2c..fbff243180 100644 --- a/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs +++ b/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs @@ -1,191 +1,190 @@ using System.Runtime.Serialization; using SmartStore.Core.Domain.Directory; -using SmartStore.Core.Domain.Media; namespace SmartStore.Core.Domain.Stores { - /// - /// Represents a store - /// - [DataContract] - public partial class Store : BaseEntity - { - /// - /// Gets or sets the store name - /// - [DataMember] - public string Name { get; set; } - - /// - /// Gets or sets the store URL - /// - [DataMember] - public string Url { get; set; } - - /// - /// Gets or sets a value indicating whether SSL is enabled - /// - [DataMember] - public bool SslEnabled { get; set; } - - /// - /// Gets or sets the store secure URL (HTTPS) - /// - [DataMember] - public string SecureUrl { get; set; } - - /// - /// Gets or sets a value indicating whether all pages will be forced to use SSL (no matter of a specified [RequireHttpsByConfigAttribute] attribute) - /// - [DataMember] - public bool ForceSslForAllPages { get; set; } - - /// - /// Gets or sets the comma separated list of possible HTTP_HOST values - /// - [DataMember] - public string Hosts { get; set; } - - /// - /// Gets or sets the logo media file id - /// - [DataMember] - public int LogoMediaFileId { get; set; } - - /// - /// Gets or sets the png icon media file id - /// - [DataMember] - public int FavIconMediaFileId { get; set; } - - /// - /// Gets or sets the png icon media file id - /// - [DataMember] - public int PngIconMediaFileId { get; set; } - - /// - /// Gets or sets the apple touch icon media file id - /// - [DataMember] - public int AppleTouchIconMediaFileId { get; set; } - - /// - /// Gets or sets the ms tile image media file id - /// - [DataMember] - public int MsTileImageMediaFileId { get; set; } - - /// - /// Gets or sets the ms tile color - /// - [DataMember] - public string MsTileColor { get; set; } - - - - /// - /// Gets or sets the display order - /// - [DataMember] - public int DisplayOrder { get; set; } - - /// - /// Gets or sets a store specific id for the HTML body - /// - [DataMember] - public string HtmlBodyId { get; set; } - - /// - /// Gets or sets the CDN host name, if static media content should be served through a CDN. - /// - [DataMember] - public string ContentDeliveryNetwork { get; set; } - - /// - /// Gets or sets the primary store currency identifier - /// - [DataMember] - public int PrimaryStoreCurrencyId { get; set; } - - /// - /// Gets or sets the primary exchange rate currency identifier - /// - [DataMember] - public int PrimaryExchangeRateCurrencyId { get; set; } - - /// - /// Gets or sets the primary store currency - /// - [DataMember] - public virtual Currency PrimaryStoreCurrency { get; set; } - - /// - /// Gets or sets the primary exchange rate currency - /// - [DataMember] - public virtual Currency PrimaryExchangeRateCurrency { get; set; } - - - /// - /// Gets the security mode for the store - /// - public virtual HttpSecurityMode GetSecurityMode(bool? useSsl = null) - { - if (useSsl ?? SslEnabled) - { - if (SecureUrl.HasValue() && Url.HasValue() && !Url.StartsWith("https")) - { - return HttpSecurityMode.SharedSsl; - } - else - { - return HttpSecurityMode.Ssl; - } - } - - return HttpSecurityMode.Unsecured; - } - - private string _secureHost; - private string _unsecureHost; - - /// - /// Gets the store host name - /// - /// - /// If false, returns the default unsecured url. - /// If true, returns the secure url, but only if SSL is enabled for the store. - /// - /// The host name - public string GetHost(bool secure) - { - return secure - ? _secureHost ?? (_secureHost = GetHostInternal(true)) - : _unsecureHost ?? (_unsecureHost = GetHostInternal(false)); - } - - private string GetHostInternal(bool secure) - { - var host = string.Empty; - - if (secure && SslEnabled) - { - if (SecureUrl.HasValue()) - { - host = SecureUrl; - } - else - { - host = Url.Replace("http:/", "https:/"); - } - } - else - { - host = Url; - } - - return host.EnsureEndsWith("/"); - } - } + /// + /// Represents a store + /// + [DataContract] + public partial class Store : BaseEntity + { + /// + /// Gets or sets the store name + /// + [DataMember] + public string Name { get; set; } + + /// + /// Gets or sets the store URL + /// + [DataMember] + public string Url { get; set; } + + /// + /// Gets or sets a value indicating whether SSL is enabled + /// + [DataMember] + public bool SslEnabled { get; set; } + + /// + /// Gets or sets the store secure URL (HTTPS) + /// + [DataMember] + public string SecureUrl { get; set; } + + /// + /// Gets or sets a value indicating whether all pages will be forced to use SSL (no matter of a specified [RequireHttpsByConfigAttribute] attribute) + /// + [DataMember] + public bool ForceSslForAllPages { get; set; } + + /// + /// Gets or sets the comma separated list of possible HTTP_HOST values + /// + [DataMember] + public string Hosts { get; set; } + + /// + /// Gets or sets the logo media file id + /// + [DataMember] + public int LogoMediaFileId { get; set; } + + /// + /// Gets or sets the png icon media file id + /// + [DataMember] + public int FavIconMediaFileId { get; set; } + + /// + /// Gets or sets the png icon media file id + /// + [DataMember] + public int PngIconMediaFileId { get; set; } + + /// + /// Gets or sets the apple touch icon media file id + /// + [DataMember] + public int AppleTouchIconMediaFileId { get; set; } + + /// + /// Gets or sets the ms tile image media file id + /// + [DataMember] + public int MsTileImageMediaFileId { get; set; } + + /// + /// Gets or sets the ms tile color + /// + [DataMember] + public string MsTileColor { get; set; } + + + + /// + /// Gets or sets the display order + /// + [DataMember] + public int DisplayOrder { get; set; } + + /// + /// Gets or sets a store specific id for the HTML body + /// + [DataMember] + public string HtmlBodyId { get; set; } + + /// + /// Gets or sets the CDN host name, if static media content should be served through a CDN. + /// + [DataMember] + public string ContentDeliveryNetwork { get; set; } + + /// + /// Gets or sets the primary store currency identifier + /// + [DataMember] + public int PrimaryStoreCurrencyId { get; set; } + + /// + /// Gets or sets the primary exchange rate currency identifier + /// + [DataMember] + public int PrimaryExchangeRateCurrencyId { get; set; } + + /// + /// Gets or sets the primary store currency + /// + [DataMember] + public virtual Currency PrimaryStoreCurrency { get; set; } + + /// + /// Gets or sets the primary exchange rate currency + /// + [DataMember] + public virtual Currency PrimaryExchangeRateCurrency { get; set; } + + + /// + /// Gets the security mode for the store + /// + public virtual HttpSecurityMode GetSecurityMode(bool? useSsl = null) + { + if (useSsl ?? SslEnabled) + { + if (SecureUrl.HasValue() && Url.HasValue() && !Url.StartsWith("https")) + { + return HttpSecurityMode.SharedSsl; + } + else + { + return HttpSecurityMode.Ssl; + } + } + + return HttpSecurityMode.Unsecured; + } + + private string _secureHost; + private string _unsecureHost; + + /// + /// Gets the store host name + /// + /// + /// If false, returns the default unsecured url. + /// If true, returns the secure url, but only if SSL is enabled for the store. + /// + /// The host name + public string GetHost(bool secure) + { + return secure + ? _secureHost ?? (_secureHost = GetHostInternal(true)) + : _unsecureHost ?? (_unsecureHost = GetHostInternal(false)); + } + + private string GetHostInternal(bool secure) + { + var host = string.Empty; + + if (secure && SslEnabled) + { + if (SecureUrl.HasValue()) + { + host = SecureUrl; + } + else + { + host = Url.Replace("http:/", "https:/"); + } + } + else + { + host = Url; + } + + return host.EnsureEndsWith("/"); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Stores/StoreExtensions.cs b/src/Libraries/SmartStore.Core/Domain/Stores/StoreExtensions.cs index 1185f4b399..80e71808e7 100644 --- a/src/Libraries/SmartStore.Core/Domain/Stores/StoreExtensions.cs +++ b/src/Libraries/SmartStore.Core/Domain/Stores/StoreExtensions.cs @@ -1,50 +1,49 @@ using System; using System.Linq; -using System.Collections.Generic; namespace SmartStore.Core.Domain.Stores { - public static class StoreExtensions - { - /// - /// Indicates whether a store contains a specified host - /// - /// Store - /// Host - /// true - contains, false - no - public static bool ContainsHostValue(this Store store, string host) - { - Guard.NotNull(store, nameof(store)); + public static class StoreExtensions + { + /// + /// Indicates whether a store contains a specified host + /// + /// Store + /// Host + /// true - contains, false - no + public static bool ContainsHostValue(this Store store, string host) + { + Guard.NotNull(store, nameof(store)); - if (string.IsNullOrEmpty(host)) - { - return false; - } + if (string.IsNullOrEmpty(host)) + { + return false; + } - var contains = store.ParseHostValues() - .FirstOrDefault(x => x.Equals(host, StringComparison.InvariantCultureIgnoreCase)) != null; - return contains; - } + var contains = store.ParseHostValues() + .FirstOrDefault(x => x.Equals(host, StringComparison.InvariantCultureIgnoreCase)) != null; + return contains; + } - /// - /// Parse comma-separated hosts - /// - /// Store - /// Comma-separated hosts - public static string[] ParseHostValues(this Store store) - { - Guard.NotNull(store, nameof(store)); + /// + /// Parse comma-separated hosts + /// + /// Store + /// Comma-separated hosts + public static string[] ParseHostValues(this Store store) + { + Guard.NotNull(store, nameof(store)); - if (string.IsNullOrWhiteSpace(store.Hosts)) - { - return Array.Empty(); - } + if (string.IsNullOrWhiteSpace(store.Hosts)) + { + return Array.Empty(); + } - return store.Hosts - .Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries) - .Select(host => host.Trim()) - .Where(host => !string.IsNullOrWhiteSpace(host)) - .ToArray(); - } - } + return store.Hosts + .Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries) + .Select(host => host.Trim()) + .Where(host => !string.IsNullOrWhiteSpace(host)) + .ToArray(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Stores/StoreMapping.cs b/src/Libraries/SmartStore.Core/Domain/Stores/StoreMapping.cs index 6867cbf737..6f14db3afe 100644 --- a/src/Libraries/SmartStore.Core/Domain/Stores/StoreMapping.cs +++ b/src/Libraries/SmartStore.Core/Domain/Stores/StoreMapping.cs @@ -2,28 +2,28 @@ namespace SmartStore.Core.Domain.Stores { - /// - /// Represents a store mapping record - /// - [DataContract] - public partial class StoreMapping : BaseEntity - { - /// - /// Gets or sets the entity identifier - /// - [DataMember] - public virtual int EntityId { get; set; } + /// + /// Represents a store mapping record + /// + [DataContract] + public partial class StoreMapping : BaseEntity + { + /// + /// Gets or sets the entity identifier + /// + [DataMember] + public virtual int EntityId { get; set; } - /// - /// Gets or sets the entity name - /// - [DataMember] - public virtual string EntityName { get; set; } + /// + /// Gets or sets the entity name + /// + [DataMember] + public virtual string EntityName { get; set; } - /// - /// Gets or sets the store identifier - /// - [DataMember] - public virtual int StoreId { get; set; } - } + /// + /// Gets or sets the store identifier + /// + [DataMember] + public virtual int StoreId { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs index 235f54f617..bf04b013c6 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs @@ -12,10 +12,10 @@ public enum TaskPriority Normal = 0, High = 1 } - + [DebuggerDisplay("{Name} (Type: {Type})")] - [Hookable(false)] - public class ScheduleTask : BaseEntity, ICloneable + [Hookable(false)] + public class ScheduleTask : BaseEntity, ICloneable { private ICollection _scheduleTaskHistory; @@ -29,10 +29,10 @@ public class ScheduleTask : BaseEntity, ICloneable /// public string Alias { get; set; } - /// - /// Gets or sets the CRON expression used to calculate future schedules - /// - public string CronExpression { get; set; } + /// + /// Gets or sets the CRON expression used to calculate future schedules + /// + public string CronExpression { get; set; } /// /// Gets or sets the type of appropriate ITask class @@ -69,17 +69,17 @@ public class ScheduleTask : BaseEntity, ICloneable /// public bool RunPerMachine { get; set; } - /// - /// Gets a value indicating whether a task is scheduled for execution (Enabled = true and NextRunUtc <= UtcNow and is not running). - /// - public bool IsPending - { - get - { + /// + /// Gets a value indicating whether a task is scheduled for execution (Enabled = true and NextRunUtc <= UtcNow and is not running). + /// + public bool IsPending + { + get + { var result = Enabled && NextRunUtc.HasValue && NextRunUtc <= DateTime.UtcNow && (LastHistoryEntry == null || !LastHistoryEntry.IsRunning); - return result; - } - } + return result; + } + } public ScheduleTaskHistory LastHistoryEntry { get; set; } @@ -88,18 +88,12 @@ public bool IsPending /// public virtual ICollection ScheduleTaskHistory { - get - { - return _scheduleTaskHistory ?? (_scheduleTaskHistory = new HashSet()); - } - protected set - { - _scheduleTaskHistory = value; - } + get => _scheduleTaskHistory ?? (_scheduleTaskHistory = new HashSet()); + protected set => _scheduleTaskHistory = value; } public ScheduleTask Clone() - { + { var task = new ScheduleTask { Name = Name, @@ -114,11 +108,11 @@ public ScheduleTask Clone() }; return task; - } + } - object ICloneable.Clone() - { - return this.Clone(); - } - } + object ICloneable.Clone() + { + return this.Clone(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Tax/AuxiliaryServicesTaxType.cs b/src/Libraries/SmartStore.Core/Domain/Tax/AuxiliaryServicesTaxType.cs index a215f4160c..9ea9566b5f 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tax/AuxiliaryServicesTaxType.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tax/AuxiliaryServicesTaxType.cs @@ -1,29 +1,29 @@ namespace SmartStore.Core.Domain.Tax { - /// - /// Specifies how to calculate the tax of auxiliary services like shipping and payment fees - /// - public enum AuxiliaryServicesTaxType - { - /// - /// Calculate tax of auxiliary services with the tax category specified in settings - /// - SpecifiedTaxCategory = 0, + /// + /// Specifies how to calculate the tax of auxiliary services like shipping and payment fees + /// + public enum AuxiliaryServicesTaxType + { + /// + /// Calculate tax of auxiliary services with the tax category specified in settings + /// + SpecifiedTaxCategory = 0, - /// - /// Calculate tax with the tax rate that has the highest amount in the cart - /// - HighestCartAmount = 10, + /// + /// Calculate tax with the tax rate that has the highest amount in the cart + /// + HighestCartAmount = 10, - /// - /// Calculate tax by the highest tax rate in the cart - /// - HighestTaxRate = 15, + /// + /// Calculate tax by the highest tax rate in the cart + /// + HighestTaxRate = 15, - /// - /// Calculate tax pro rata in accordance with main service (proportion of line subtotal and sum of all line subtotals) - /// - /// commented out cause requires several plugins to be updated and migration of Order.OrderShippingTaxRate and Order.PaymentMethodAdditionalFeeTaxRate - ///ProRata = 20 - } + /// + /// Calculate tax pro rata in accordance with main service (proportion of line subtotal and sum of all line subtotals) + /// + /// commented out cause requires several plugins to be updated and migration of Order.OrderShippingTaxRate and Order.PaymentMethodAdditionalFeeTaxRate + ///ProRata = 20 + } } diff --git a/src/Libraries/SmartStore.Core/Domain/Tax/TaxCategory.cs b/src/Libraries/SmartStore.Core/Domain/Tax/TaxCategory.cs index 7fd0279410..ab09afe7bc 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tax/TaxCategory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tax/TaxCategory.cs @@ -2,23 +2,23 @@ namespace SmartStore.Core.Domain.Tax { - /// - /// Represents a tax category - /// - [DataContract] - public partial class TaxCategory : BaseEntity + /// + /// Represents a tax category + /// + [DataContract] + public partial class TaxCategory : BaseEntity { - /// - /// Gets or sets the name - /// - [DataMember] - public string Name { get; set; } + /// + /// Gets or sets the name + /// + [DataMember] + public string Name { get; set; } - /// - /// Gets or sets the display order - /// - [DataMember] - public int DisplayOrder { get; set; } + /// + /// Gets or sets the display order + /// + [DataMember] + public int DisplayOrder { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Tax/TaxSettings.cs b/src/Libraries/SmartStore.Core/Domain/Tax/TaxSettings.cs index 28fd36b269..13ad247d4c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tax/TaxSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tax/TaxSettings.cs @@ -4,22 +4,22 @@ namespace SmartStore.Core.Domain.Tax { public class TaxSettings : ISettings { - public TaxSettings() - { - TaxBasedOn = TaxBasedOn.BillingAddress; - TaxDisplayType = TaxDisplayType.ExcludingTax; - ActiveTaxProviderSystemName = "Tax.FixedRate"; - DisplayTaxSuffix = true; - PricesIncludeTax = true; - EuVatAllowVatExemption = true; + public TaxSettings() + { + TaxBasedOn = TaxBasedOn.BillingAddress; + TaxDisplayType = TaxDisplayType.ExcludingTax; + ActiveTaxProviderSystemName = "Tax.FixedRate"; + DisplayTaxSuffix = true; + PricesIncludeTax = true; + EuVatAllowVatExemption = true; ShippingPriceIncludesTax = true; - ShowLegalHintsInFooter = true; - ShowLegalHintsInProductDetails = true; - ShowLegalHintsInProductList = true; - AuxiliaryServicesTaxingType = AuxiliaryServicesTaxType.SpecifiedTaxCategory; - } - - /// + ShowLegalHintsInFooter = true; + ShowLegalHintsInProductDetails = true; + ShowLegalHintsInProductList = true; + AuxiliaryServicesTaxingType = AuxiliaryServicesTaxType.SpecifiedTaxCategory; + } + + /// /// Tax based on /// public TaxBasedOn TaxBasedOn { get; set; } @@ -114,15 +114,15 @@ public TaxSettings() /// public int PaymentMethodAdditionalFeeTaxClassId { get; set; } - /// - /// Taxing type for auxiliary services like shipping and payment fees - /// - public AuxiliaryServicesTaxType AuxiliaryServicesTaxingType { get; set; } + /// + /// Taxing type for auxiliary services like shipping and payment fees + /// + public AuxiliaryServicesTaxType AuxiliaryServicesTaxingType { get; set; } - /// - /// Gets or sets a value indicating whether EU VAT (Eupore Union Value Added Tax) is enabled - /// - public bool EuVatEnabled { get; set; } + /// + /// Gets or sets a value indicating whether EU VAT (Eupore Union Value Added Tax) is enabled + /// + public bool EuVatEnabled { get; set; } /// /// Gets or sets a shop country identifier diff --git a/src/Libraries/SmartStore.Core/Domain/Themes/ThemeSettings.cs b/src/Libraries/SmartStore.Core/Domain/Themes/ThemeSettings.cs index aff5ac1f4b..4b1b127369 100644 --- a/src/Libraries/SmartStore.Core/Domain/Themes/ThemeSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Themes/ThemeSettings.cs @@ -1,16 +1,15 @@ -using System; -using SmartStore.Core.Configuration; +using SmartStore.Core.Configuration; namespace SmartStore.Core.Domain.Themes { public class ThemeSettings : ISettings { - public ThemeSettings() - { - DefaultTheme = "Flex"; - AllowCustomerToSelectTheme = true; - AssetCachingEnabled = 2; - } + public ThemeSettings() + { + DefaultTheme = "Flex"; + AllowCustomerToSelectTheme = true; + AssetCachingEnabled = 2; + } /// /// Gets or sets a value indicating whether @@ -23,35 +22,35 @@ public ThemeSettings() /// public int BundleOptimizationEnabled { get; set; } - /// - /// Gets or sets a value indicating whether - /// asset caching is enabled - /// - /// - /// 0: Auto (decide based on debug mode) - /// 1: Disabled - /// 2: Enabled > default - /// - public int AssetCachingEnabled { get; set; } + /// + /// Gets or sets a value indicating whether + /// asset caching is enabled + /// + /// + /// 0: Auto (decide based on debug mode) + /// 1: Disabled + /// 2: Enabled > default + /// + public int AssetCachingEnabled { get; set; } - /// - /// Gets or sets a default store theme for desktops - /// - public string DefaultTheme { get; set; } + /// + /// Gets or sets a default store theme for desktops + /// + public string DefaultTheme { get; set; } /// /// Gets or sets a value indicating whether customers are allowed to select a theme /// public bool AllowCustomerToSelectTheme { get; set; } - /// - /// Gets or sets a value indicating whether user's theme choice should be saved in a cookie - /// - /// - /// If false, user's theme choice is associated to the account, - /// which may be undesirable when, for example, multiple users share a guest account. - /// - public bool SaveThemeChoiceInCookie { get; set; } + /// + /// Gets or sets a value indicating whether user's theme choice should be saved in a cookie + /// + /// + /// If false, user's theme choice is associated to the account, + /// which may be undesirable when, for example, multiple users share a guest account. + /// + public bool SaveThemeChoiceInCookie { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Themes/ThemeVariable.cs b/src/Libraries/SmartStore.Core/Domain/Themes/ThemeVariable.cs index 2befa5532e..14540d65d6 100644 --- a/src/Libraries/SmartStore.Core/Domain/Themes/ThemeVariable.cs +++ b/src/Libraries/SmartStore.Core/Domain/Themes/ThemeVariable.cs @@ -1,12 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; // codehint: sm-add (whole file) namespace SmartStore.Core.Domain.Themes -{ +{ public class ThemeVariable : BaseEntity { /// @@ -24,10 +21,10 @@ public class ThemeVariable : BaseEntity /// public string Value { get; set; } - /// - /// Gets or sets the store identifier - /// - public int StoreId { get; set; } + /// + /// Gets or sets the store identifier + /// + public int StoreId { get; set; } protected override bool Equals(BaseEntity other) { diff --git a/src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs b/src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs index d05d74c975..f1ef6d5796 100644 --- a/src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs +++ b/src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs @@ -9,28 +9,28 @@ namespace SmartStore.Core.Domain.Topics { - /// - /// Represents a topic - /// - [DataContract] - public partial class Topic : BaseEntity, ILocalizedEntity, ISlugSupported, IStoreMappingSupported, IAclSupported + /// + /// Represents a topic + /// + [DataContract] + public partial class Topic : BaseEntity, ILocalizedEntity, ISlugSupported, IStoreMappingSupported, IAclSupported { - public Topic() - { - IsPublished = true; - } + public Topic() + { + IsPublished = true; + } - /// - /// Gets or sets the name - /// - [DataMember] - public string SystemName { get; set; } + /// + /// Gets or sets the name + /// + [DataMember] + public string SystemName { get; set; } - /// - /// Gets or sets the value indicating whether this topic is deleteable by a user - /// - [DataMember] - public bool IsSystemTopic { get; set; } + /// + /// Gets or sets the value indicating whether this topic is deleteable by a user + /// + [DataMember] + public bool IsSystemTopic { get; set; } /// /// Gets or sets the html id @@ -48,133 +48,133 @@ public Topic() /// Gets or sets the value indicating whether this topic should be included in sitemap /// [DataMember] - public bool IncludeInSitemap { get; set; } - - /// - /// Gets or sets the value indicating whether this topic is password protected - /// - [DataMember] - public bool IsPasswordProtected { get; set; } - - /// - /// Gets or sets the password - /// - [DataMember] - public string Password { get; set; } - - /// - /// Gets or sets the title - /// - [DataMember] - public string Title { get; set; } - - /// - /// Gets or sets the short title (for links) - /// - [DataMember] - public string ShortTitle { get; set; } - - /// - /// Gets or sets the intro - /// - [DataMember] - public string Intro { get; set; } - - /// - /// Gets or sets the body - /// - [DataMember] - public string Body { get; set; } - - /// - /// Gets or sets the meta keywords - /// - [DataMember] - public string MetaKeywords { get; set; } - - /// - /// Gets or sets the meta description - /// - [DataMember] - public string MetaDescription { get; set; } - - /// - /// Gets or sets the meta title - /// - [DataMember] - public string MetaTitle { get; set; } - - /// - /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores - /// - [DataMember] - public bool LimitedToStores { get; set; } - - /// - /// Gets or sets a value indicating whether the topic should also be rendered as a generic html widget - /// - [DataMember] - public bool RenderAsWidget { get; set; } - - /// - /// Gets or sets the widget zone name - /// - [DataMember] - public string WidgetZone { get; set; } - - /// - /// Gets or sets a value indicating whether the content should be surrounded by a topic block wrapper - /// - [DataMember] - public bool? WidgetWrapContent { get; set; } - - /// - /// Gets or sets a value indicating whether the title should be displayed in the widget block - /// - [DataMember] - public bool WidgetShowTitle { get; set; } - - /// - /// Gets or sets a value indicating whether the widget block should have borders - /// - [DataMember] - public bool WidgetBordered { get; set; } - - /// - /// Gets or sets the sort order (relevant for widgets) - /// - [DataMember] - public int Priority { get; set; } - - /// - /// Gets or sets the title tag - /// - [DataMember] - public string TitleTag { get; set; } - - /// - /// Gets or sets a value indicating whether the entity is subject to ACL - /// - [DataMember] - public bool SubjectToAcl { get; set; } - - /// - /// Gets or sets a value indicating whether the topic page is published - /// - [DataMember] - public bool IsPublished { get; set; } - - /// - /// Helper function which gets the comma-separated WidgetZone property as list of strings - /// - /// - public IEnumerable GetWidgetZones() + public bool IncludeInSitemap { get; set; } + + /// + /// Gets or sets the value indicating whether this topic is password protected + /// + [DataMember] + public bool IsPasswordProtected { get; set; } + + /// + /// Gets or sets the password + /// + [DataMember] + public string Password { get; set; } + + /// + /// Gets or sets the title + /// + [DataMember] + public string Title { get; set; } + + /// + /// Gets or sets the short title (for links) + /// + [DataMember] + public string ShortTitle { get; set; } + + /// + /// Gets or sets the intro + /// + [DataMember] + public string Intro { get; set; } + + /// + /// Gets or sets the body + /// + [DataMember] + public string Body { get; set; } + + /// + /// Gets or sets the meta keywords + /// + [DataMember] + public string MetaKeywords { get; set; } + + /// + /// Gets or sets the meta description + /// + [DataMember] + public string MetaDescription { get; set; } + + /// + /// Gets or sets the meta title + /// + [DataMember] + public string MetaTitle { get; set; } + + /// + /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores + /// + [DataMember] + public bool LimitedToStores { get; set; } + + /// + /// Gets or sets a value indicating whether the topic should also be rendered as a generic html widget + /// + [DataMember] + public bool RenderAsWidget { get; set; } + + /// + /// Gets or sets the widget zone name + /// + [DataMember] + public string WidgetZone { get; set; } + + /// + /// Gets or sets a value indicating whether the content should be surrounded by a topic block wrapper + /// + [DataMember] + public bool? WidgetWrapContent { get; set; } + + /// + /// Gets or sets a value indicating whether the title should be displayed in the widget block + /// + [DataMember] + public bool WidgetShowTitle { get; set; } + + /// + /// Gets or sets a value indicating whether the widget block should have borders + /// + [DataMember] + public bool WidgetBordered { get; set; } + + /// + /// Gets or sets the sort order (relevant for widgets) + /// + [DataMember] + public int Priority { get; set; } + + /// + /// Gets or sets the title tag + /// + [DataMember] + public string TitleTag { get; set; } + + /// + /// Gets or sets a value indicating whether the entity is subject to ACL + /// + [DataMember] + public bool SubjectToAcl { get; set; } + + /// + /// Gets or sets a value indicating whether the topic page is published + /// + [DataMember] + public bool IsPublished { get; set; } + + /// + /// Helper function which gets the comma-separated WidgetZone property as list of strings + /// + /// + public IEnumerable GetWidgetZones() { if (this.WidgetZone.IsEmpty()) { return Enumerable.Empty(); } - + return this.WidgetZone.Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()); } } diff --git a/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs b/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs index 5492f4631f..018c96210f 100644 --- a/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs +++ b/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; +using System.IO; using System.Linq; -using System.Text; using System.Net.Mail; using System.Net.Mime; -using System.IO; using System.Threading.Tasks; using SmartStore.Core.Domain.Messages; @@ -12,29 +10,29 @@ namespace SmartStore.Core.Email { public class DefaultEmailSender : IEmailSender { - private readonly EmailAccountSettings _emailAccountSettings; - - public DefaultEmailSender(EmailAccountSettings emailAccountSettings) - { - _emailAccountSettings = emailAccountSettings; - } - - /// - /// Builds System.Net.Mail.Message - /// - /// SmartStore.Email.Message - /// System.Net.Mail.Message - protected virtual MailMessage BuildMailMessage(EmailMessage original) + private readonly EmailAccountSettings _emailAccountSettings; + + public DefaultEmailSender(EmailAccountSettings emailAccountSettings) + { + _emailAccountSettings = emailAccountSettings; + } + + /// + /// Builds System.Net.Mail.Message + /// + /// SmartStore.Email.Message + /// System.Net.Mail.Message + protected virtual MailMessage BuildMailMessage(EmailMessage original) { MailMessage msg = new MailMessage(); - if (String.IsNullOrEmpty(original.Subject)) - { - throw new MailSenderException("Required subject is missing!"); - } - - msg.Subject = original.Subject; - msg.IsBodyHtml = original.BodyFormat == MailBodyFormat.Html; + if (String.IsNullOrEmpty(original.Subject)) + { + throw new MailSenderException("Required subject is missing!"); + } + + msg.Subject = original.Subject; + msg.IsBodyHtml = original.BodyFormat == MailBodyFormat.Html; if (original.AltText.HasValue()) { @@ -50,65 +48,65 @@ protected virtual MailMessage BuildMailMessage(EmailMessage original) msg.From = original.From.ToMailAddress(); - msg.To.AddRange(original.To.Where(x => x.Address.HasValue()).Select(x => x.ToMailAddress())); - msg.CC.AddRange(original.Cc.Where(x => x.Address.HasValue()).Select(x => x.ToMailAddress())); - msg.Bcc.AddRange(original.Bcc.Where(x => x.Address.HasValue()).Select(x => x.ToMailAddress())); - msg.ReplyToList.AddRange(original.ReplyTo.Where(x => x.Address.HasValue()).Select(x => x.ToMailAddress())); + msg.To.AddRange(original.To.Where(x => x.Address.HasValue()).Select(x => x.ToMailAddress())); + msg.CC.AddRange(original.Cc.Where(x => x.Address.HasValue()).Select(x => x.ToMailAddress())); + msg.Bcc.AddRange(original.Bcc.Where(x => x.Address.HasValue()).Select(x => x.ToMailAddress())); + msg.ReplyToList.AddRange(original.ReplyTo.Where(x => x.Address.HasValue()).Select(x => x.ToMailAddress())); - msg.Attachments.AddRange(original.Attachments); + msg.Attachments.AddRange(original.Attachments); if (original.Headers != null) - msg.Headers.AddRange(original.Headers); - + msg.Headers.AddRange(original.Headers); + msg.Priority = original.Priority; return msg; } - #region IMailSender Members + #region IMailSender Members + + public void SendEmail(SmtpContext context, EmailMessage message) + { + Guard.NotNull(context, nameof(context)); + Guard.NotNull(message, nameof(message)); + + using (var msg = this.BuildMailMessage(message)) + { + using (var client = context.ToSmtpClient()) + { + ApplySettings(client); + client.Send(msg); + } + } + } + + public async Task SendEmailAsync(SmtpContext context, EmailMessage message) + { + Guard.NotNull(context, nameof(context)); + Guard.NotNull(message, nameof(message)); + + using (var msg = this.BuildMailMessage(message)) + { + using (var client = context.ToSmtpClient()) + { + ApplySettings(client); + await client.SendMailAsync(msg); + } + } + } - public void SendEmail(SmtpContext context, EmailMessage message) + private void ApplySettings(SmtpClient client) { - Guard.NotNull(context, nameof(context)); - Guard.NotNull(message, nameof(message)); - - using (var msg = this.BuildMailMessage(message)) - { - using (var client = context.ToSmtpClient()) - { - ApplySettings(client); - client.Send(msg); - } - } + var pickupDirLocation = _emailAccountSettings.PickupDirectoryLocation; + if (pickupDirLocation.HasValue() && client.DeliveryMethod != SmtpDeliveryMethod.SpecifiedPickupDirectory && Path.IsPathRooted(pickupDirLocation)) + { + client.DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory; + client.PickupDirectoryLocation = pickupDirLocation; + client.EnableSsl = false; + } } - public async Task SendEmailAsync(SmtpContext context, EmailMessage message) - { - Guard.NotNull(context, nameof(context)); - Guard.NotNull(message, nameof(message)); - - using (var msg = this.BuildMailMessage(message)) - { - using (var client = context.ToSmtpClient()) - { - ApplySettings(client); - await client.SendMailAsync(msg); - } - } - } - - private void ApplySettings(SmtpClient client) - { - var pickupDirLocation = _emailAccountSettings.PickupDirectoryLocation; - if (pickupDirLocation.HasValue() && client.DeliveryMethod != SmtpDeliveryMethod.SpecifiedPickupDirectory && Path.IsPathRooted(pickupDirLocation)) - { - client.DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory; - client.PickupDirectoryLocation = pickupDirLocation; - client.EnableSsl = false; - } - } - - #endregion - } + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Email/EmailAddress.cs b/src/Libraries/SmartStore.Core/Email/EmailAddress.cs index 8699174caf..b8820eb0d2 100644 --- a/src/Libraries/SmartStore.Core/Email/EmailAddress.cs +++ b/src/Libraries/SmartStore.Core/Email/EmailAddress.cs @@ -1,56 +1,52 @@ -using System; -using System.Net.Mail; +using System.Net.Mail; namespace SmartStore.Core.Email { public class EmailAddress { - private readonly MailAddress _inner; + private readonly MailAddress _inner; - public EmailAddress(string address) + public EmailAddress(string address) { - _inner = new MailAddress(address); + _inner = new MailAddress(address); } public EmailAddress(string address, string displayName) { - _inner = new MailAddress(address, displayName); - } + _inner = new MailAddress(address, displayName); + } - public EmailAddress(MailAddress address) - { - _inner = address; - } + public EmailAddress(MailAddress address) + { + _inner = address; + } - public string Address - { - get { return _inner.Address; } - } + public string Address => _inner.Address; - public string DisplayName - { - get { return _inner.DisplayName; } - } + public string DisplayName => _inner.DisplayName; - public string User - { - get { return _inner.User; } - } + public string User => _inner.User; - public string Host - { - get { return _inner.Host; } - } + public string Host => _inner.Host; - public override int GetHashCode() => _inner.GetHashCode(); + public override int GetHashCode() + { + return _inner.GetHashCode(); + } - public override string ToString() => _inner.ToString(); + public override string ToString() + { + return _inner.ToString(); + } - public MailAddress ToMailAddress() => _inner; + public MailAddress ToMailAddress() + { + return _inner; + } - public static implicit operator string(EmailAddress obj) - { - return obj.ToString(); - } - } + public static implicit operator string(EmailAddress obj) + { + return obj.ToString(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Email/EmailMessage.cs b/src/Libraries/SmartStore.Core/Email/EmailMessage.cs index cdc83e6efb..0249348cfe 100644 --- a/src/Libraries/SmartStore.Core/Email/EmailMessage.cs +++ b/src/Libraries/SmartStore.Core/Email/EmailMessage.cs @@ -1,72 +1,72 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; -using System.Net.Mail; using System.IO; -using System.Text; using System.Net; +using System.Net.Mail; +using System.Text; namespace SmartStore.Core.Email { public class EmailMessage : ICloneable { - public EmailMessage() - { - this.BodyFormat = MailBodyFormat.Html; - this.Priority = MailPriority.Normal; - - this.To = new List(); - this.Cc = new List(); - this.Bcc = new List(); - this.ReplyTo = new List(); - - this.Attachments = new List(); - - this.Headers = new NameValueCollection(); - } - - public EmailMessage(string to, string subject, string body, string from) - : this() - { - Guard.NotEmpty(to, nameof(to)); - Guard.NotEmpty(from, nameof(from)); - Guard.NotEmpty(subject, nameof(subject)); - Guard.NotEmpty(body, nameof(body)); - - this.To.Add(new EmailAddress(to)); - this.Subject = subject; - this.Body = body; - this.From = new EmailAddress(from); - } - - public EmailMessage(EmailAddress to, string subject, string body, EmailAddress from) - : this() - { - Guard.NotNull(to, nameof(to)); - Guard.NotNull(from, nameof(from)); - Guard.NotEmpty(subject, nameof(subject)); - Guard.NotEmpty(body, nameof(body)); - - this.To.Add(to); - this.Subject = subject; - this.Body = body; - this.From = from; - } - - public EmailAddress From { get; set; } + public EmailMessage() + { + this.BodyFormat = MailBodyFormat.Html; + this.Priority = MailPriority.Normal; + + this.To = new List(); + this.Cc = new List(); + this.Bcc = new List(); + this.ReplyTo = new List(); + + this.Attachments = new List(); + + this.Headers = new NameValueCollection(); + } + + public EmailMessage(string to, string subject, string body, string from) + : this() + { + Guard.NotEmpty(to, nameof(to)); + Guard.NotEmpty(from, nameof(from)); + Guard.NotEmpty(subject, nameof(subject)); + Guard.NotEmpty(body, nameof(body)); + + this.To.Add(new EmailAddress(to)); + this.Subject = subject; + this.Body = body; + this.From = new EmailAddress(from); + } + + public EmailMessage(EmailAddress to, string subject, string body, EmailAddress from) + : this() + { + Guard.NotNull(to, nameof(to)); + Guard.NotNull(from, nameof(from)); + Guard.NotEmpty(subject, nameof(subject)); + Guard.NotEmpty(body, nameof(body)); + + this.To.Add(to); + this.Subject = subject; + this.Body = body; + this.From = from; + } + + public EmailAddress From { get; set; } public string Subject { get; set; } public string Body { get; set; } public string AltText { get; set; } - public MailBodyFormat BodyFormat { get; set; } + public MailBodyFormat BodyFormat { get; set; } public MailPriority Priority { get; set; } public ICollection To { get; private set; } - public ICollection Cc { get; private set; } - public ICollection Bcc { get; private set; } - public ICollection ReplyTo { get; private set; } + public ICollection Cc { get; private set; } + public ICollection Bcc { get; private set; } + public ICollection ReplyTo { get; private set; } - public ICollection Attachments { get; private set; } + public ICollection Attachments { get; private set; } public NameValueCollection Headers { get; private set; } @@ -95,19 +95,19 @@ public EmailMessage Clone() { var clone = new EmailMessage(); - clone.Attachments.AddRange(this.Attachments); - clone.To.AddRange(this.To); - clone.Cc.AddRange(this.Cc); - clone.Bcc.AddRange(this.Bcc); - clone.ReplyTo.AddRange(this.ReplyTo); - clone.Headers.AddRange(this.Headers); + clone.Attachments.AddRange(this.Attachments); + clone.To.AddRange(this.To); + clone.Cc.AddRange(this.Cc); + clone.Bcc.AddRange(this.Bcc); + clone.ReplyTo.AddRange(this.ReplyTo); + clone.Headers.AddRange(this.Headers); - clone.AltText = this.AltText; - clone.Body = this.Body; - clone.BodyFormat = this.BodyFormat; - clone.From = this.From; - clone.Priority = this.Priority; - clone.Subject = this.Subject; + clone.AltText = this.AltText; + clone.Body = this.Body; + clone.BodyFormat = this.BodyFormat; + clone.From = this.From; + clone.Priority = this.Priority; + clone.Subject = this.Subject; return clone; } @@ -120,9 +120,9 @@ object ICloneable.Clone() #endregion } - public enum MailBodyFormat - { - Text, - Html - } + public enum MailBodyFormat + { + Text, + Html + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Email/IEmailSender.cs b/src/Libraries/SmartStore.Core/Email/IEmailSender.cs index a2740cb877..9850acfa80 100644 --- a/src/Libraries/SmartStore.Core/Email/IEmailSender.cs +++ b/src/Libraries/SmartStore.Core/Email/IEmailSender.cs @@ -1,14 +1,13 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; namespace SmartStore.Core.Email -{ +{ /// /// contract for email sender /// public interface IEmailSender { void SendEmail(SmtpContext smtpContext, EmailMessage message); - Task SendEmailAsync(SmtpContext smtpContext, EmailMessage message); + Task SendEmailAsync(SmtpContext smtpContext, EmailMessage message); } } diff --git a/src/Libraries/SmartStore.Core/Email/SmtpContext.cs b/src/Libraries/SmartStore.Core/Email/SmtpContext.cs index e1fde3c68a..ba9b71014d 100644 --- a/src/Libraries/SmartStore.Core/Email/SmtpContext.cs +++ b/src/Libraries/SmartStore.Core/Email/SmtpContext.cs @@ -1,7 +1,5 @@ using System; using System.Net; -using System.Net.Configuration; -using System.Configuration; using System.Net.Mail; using SmartStore.Core.Domain.Messages; @@ -12,81 +10,81 @@ public class SmtpContext public SmtpContext(string host, int port = 25) { - Guard.NotEmpty(host, nameof(host)); - Guard.IsPositive(port, nameof(port)); - - this.Host = host; + Guard.NotEmpty(host, nameof(host)); + Guard.IsPositive(port, nameof(port)); + + this.Host = host; this.Port = port; } - public SmtpContext(EmailAccount account) - { - Guard.NotNull(account, nameof(account)); - - this.Host = account.Host; - this.Port = account.Port; - this.EnableSsl = account.EnableSsl; - this.Password = account.Password; - this.UseDefaultCredentials = account.UseDefaultCredentials; - this.Username = account.Username; - } - - public bool UseDefaultCredentials - { - get; - set; - } - - public string Host - { - get; - set; - } - - public int Port - { - get; - set; - } - - public string Username - { - get; - set; - } - - public string Password - { - get; - set; - } - - public bool EnableSsl - { - get; - set; - } - - public SmtpClient ToSmtpClient() - { - var smtpClient = new SmtpClient(this.Host, this.Port); - - smtpClient.UseDefaultCredentials = this.UseDefaultCredentials; - smtpClient.EnableSsl = this.EnableSsl; - smtpClient.Timeout = 10000; - - if (this.UseDefaultCredentials) - { - smtpClient.Credentials = CredentialCache.DefaultNetworkCredentials; - } - else - { - if (!String.IsNullOrEmpty(this.Username)) - smtpClient.Credentials = new NetworkCredential(this.Username, this.Password); - } - - return smtpClient; - } + public SmtpContext(EmailAccount account) + { + Guard.NotNull(account, nameof(account)); + + this.Host = account.Host; + this.Port = account.Port; + this.EnableSsl = account.EnableSsl; + this.Password = account.Password; + this.UseDefaultCredentials = account.UseDefaultCredentials; + this.Username = account.Username; + } + + public bool UseDefaultCredentials + { + get; + set; + } + + public string Host + { + get; + set; + } + + public int Port + { + get; + set; + } + + public string Username + { + get; + set; + } + + public string Password + { + get; + set; + } + + public bool EnableSsl + { + get; + set; + } + + public SmtpClient ToSmtpClient() + { + var smtpClient = new SmtpClient(this.Host, this.Port); + + smtpClient.UseDefaultCredentials = this.UseDefaultCredentials; + smtpClient.EnableSsl = this.EnableSsl; + smtpClient.Timeout = 10000; + + if (this.UseDefaultCredentials) + { + smtpClient.Credentials = CredentialCache.DefaultNetworkCredentials; + } + else + { + if (!String.IsNullOrEmpty(this.Username)) + smtpClient.Credentials = new NetworkCredential(this.Username, this.Password); + } + + return smtpClient; + } } } diff --git a/src/Libraries/SmartStore.Core/Events/AmbigousConsumerException.cs b/src/Libraries/SmartStore.Core/Events/AmbigousConsumerException.cs index 18b72d94da..453ddd7406 100644 --- a/src/Libraries/SmartStore.Core/Events/AmbigousConsumerException.cs +++ b/src/Libraries/SmartStore.Core/Events/AmbigousConsumerException.cs @@ -3,11 +3,11 @@ namespace SmartStore.Core.Events { - public sealed class AmbigousConsumerException : Exception - { - public AmbigousConsumerException(MethodInfo method1, MethodInfo method2) - : base("Ambigous consumer methods detected in '{0}'. Method 1: '{1}', Method 2: '{2}'.".FormatInvariant(method1.DeclaringType.FullName, method1.ToString(), method2.ToString())) - { - } - } + public sealed class AmbigousConsumerException : Exception + { + public AmbigousConsumerException(MethodInfo method1, MethodInfo method2) + : base("Ambigous consumer methods detected in '{0}'. Method 1: '{1}', Method 2: '{2}'.".FormatInvariant(method1.DeclaringType.FullName, method1.ToString(), method2.ToString())) + { + } + } } diff --git a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppInitScheduledTasksEvent.cs b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppInitScheduledTasksEvent.cs index 348b5fac89..5058307cfb 100644 --- a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppInitScheduledTasksEvent.cs +++ b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppInitScheduledTasksEvent.cs @@ -1,16 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.Mvc; +using System.Collections.Generic; using SmartStore.Core.Domain.Tasks; namespace SmartStore.Core.Events { - /// - /// to initialize scheduled tasks in Application_Start - /// - public class AppInitScheduledTasksEvent - { - public IList ScheduledTasks { get; set; } - } + /// + /// to initialize scheduled tasks in Application_Start + /// + public class AppInitScheduledTasksEvent + { + public IList ScheduledTasks { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs index d825cc079d..6fd6e8d6fe 100644 --- a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs +++ b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs @@ -1,14 +1,12 @@ -using System; -using System.Web; -using System.Web.Mvc; +using System.Web.Mvc; namespace SmartStore.Core.Events { - /// - /// to register global filters in Application_Start - /// - public class AppRegisterGlobalFiltersEvent - { - public GlobalFilterCollection Filters { get; set; } - } + /// + /// to register global filters in Application_Start + /// + public class AppRegisterGlobalFiltersEvent + { + public GlobalFilterCollection Filters { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppStartedEvent.cs b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppStartedEvent.cs index c1f2880780..95576aea9f 100644 --- a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppStartedEvent.cs +++ b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppStartedEvent.cs @@ -1,10 +1,9 @@ -using System; -using System.Web; +using System.Web; namespace SmartStore.Core.Events { - public class AppStartedEvent - { - public HttpContextBase HttpContext { get; set; } - } + public class AppStartedEvent + { + public HttpContextBase HttpContext { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Events/ConsumeContext.cs b/src/Libraries/SmartStore.Core/Events/ConsumeContext.cs index d52607845a..dae3684721 100644 --- a/src/Libraries/SmartStore.Core/Events/ConsumeContext.cs +++ b/src/Libraries/SmartStore.Core/Events/ConsumeContext.cs @@ -1,23 +1,21 @@ -using System; - -namespace SmartStore.Core.Events +namespace SmartStore.Core.Events { - /// - /// Wrapper/Envelope for event message objects. For now, only wraps - /// the message. There may be other context data in future. - /// - /// Type of message. - public class ConsumeContext - { - public ConsumeContext(TMessage message) - { - Message = message; - } + /// + /// Wrapper/Envelope for event message objects. For now, only wraps + /// the message. There may be other context data in future. + /// + /// Type of message. + public class ConsumeContext + { + public ConsumeContext(TMessage message) + { + Message = message; + } - public TMessage Message - { - get; - private set; - } - } + public TMessage Message + { + get; + private set; + } + } } diff --git a/src/Libraries/SmartStore.Core/Events/ConsumerDescriptor.cs b/src/Libraries/SmartStore.Core/Events/ConsumerDescriptor.cs index f990c1e61c..25302b3771 100644 --- a/src/Libraries/SmartStore.Core/Events/ConsumerDescriptor.cs +++ b/src/Libraries/SmartStore.Core/Events/ConsumerDescriptor.cs @@ -1,50 +1,44 @@ using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using SmartStore.ComponentModel; using SmartStore.Core.Plugins; namespace SmartStore.Core.Events { - /// - /// Contains metadata about a consumer / event handler method. - /// - public class ConsumerDescriptor - { - public ConsumerDescriptor() - { - } + /// + /// Contains metadata about a consumer / event handler method. + /// + public class ConsumerDescriptor + { + public ConsumerDescriptor() + { + } - public ConsumerDescriptor(EventConsumerMetadata metadata) - { - ContainerType = metadata.ContainerType; - PluginDescriptor = metadata.PluginDescriptor; - } + public ConsumerDescriptor(EventConsumerMetadata metadata) + { + ContainerType = metadata.ContainerType; + PluginDescriptor = metadata.PluginDescriptor; + } - public bool WithEnvelope { get; set; } - public bool IsAsync { get; set; } - public bool FireForget { get; set; } - public PluginDescriptor PluginDescriptor { get; set; } + public bool WithEnvelope { get; set; } + public bool IsAsync { get; set; } + public bool FireForget { get; set; } + public PluginDescriptor PluginDescriptor { get; set; } - public Type MessageType { get; set; } - public Type ContainerType { get; set; } + public Type MessageType { get; set; } + public Type ContainerType { get; set; } - public MethodInfo Method { get; set; } - public ParameterInfo MessageParameter { get; set; } + public MethodInfo Method { get; set; } + public ParameterInfo MessageParameter { get; set; } - /// - /// All method parameters except - /// or empty array if is the only parameter. - /// - public ParameterInfo[] Parameters { get; set; } + /// + /// All method parameters except + /// or empty array if is the only parameter. + /// + public ParameterInfo[] Parameters { get; set; } - public override string ToString() - { - return "MessageType: {0} - Consumer: {1}.{2}".FormatCurrent(MessageType.Name, ContainerType.FullName, Method.Name); - } - } + public override string ToString() + { + return "MessageType: {0} - Consumer: {1}.{2}".FormatCurrent(MessageType.Name, ContainerType.FullName, Method.Name); + } + } } diff --git a/src/Libraries/SmartStore.Core/Events/ConsumerInvoker.cs b/src/Libraries/SmartStore.Core/Events/ConsumerInvoker.cs index 9eb50ecb00..7a2dcf0aca 100644 --- a/src/Libraries/SmartStore.Core/Events/ConsumerInvoker.cs +++ b/src/Libraries/SmartStore.Core/Events/ConsumerInvoker.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using System.Web; using Autofac; using SmartStore.ComponentModel; using SmartStore.Core.Async; @@ -11,183 +10,183 @@ namespace SmartStore.Core.Events { - public class ConsumerInvoker : IConsumerInvoker - { - private readonly IConsumerResolver _resolver; - - public ConsumerInvoker(IConsumerResolver resolver) - { - _resolver = resolver; - - Logger = NullLogger.Instance; - } - - public ILogger Logger { get; set; } - - public void Invoke(ConsumerDescriptor descriptor, IConsumer consumer, ConsumeContext envelope) where TMessage : class - { - var d = descriptor; - var p = descriptor.WithEnvelope ? (object)envelope : envelope.Message; - var fastInvoker = FastInvoker.GetInvoker(d.Method); - - if (!d.FireForget && !d.IsAsync) - { - // The all synch case - try - { - InvokeCore(); - } - catch (Exception ex) - { - HandleException(ex, d); - } - } - else if (!d.FireForget && d.IsAsync) - { - //// The awaitable Task case - //BeginInvoke((Task)InvokeCore(cancelToken: AsyncRunner.AppShutdownCancellationToken), EndInvoke, d); - - // For now we must go with the AsyncRunner, the above call to BeginInvoke (APM > TPL) does not always - // guarantee that the task is awaited and throws exceptions especially when EF is involved. - using (var runner = AsyncRunner.Create()) - { - try - { - runner.Run((Task)InvokeCore(cancelToken: AsyncRunner.AppShutdownCancellationToken)); - } - catch (Exception ex) - { - HandleException(ex, d); - } - } - } - else if (d.FireForget && !d.IsAsync) - { - // A synch method should be executed async (without awaiting) - AsyncRunner.Run((c, ct, state) => InvokeCore(c, ct), d) - .ContinueWith(t => EndInvoke(t), /*TaskContinuationOptions.OnlyOnFaulted*/ TaskContinuationOptions.None) - .ConfigureAwait(false); - } - else if (d.FireForget && d.IsAsync) - { - // An async (Task) method should be executed without awaiting - AsyncRunner.Run((c, ct) => (Task)InvokeCore(c, ct), d) - .ContinueWith(t => EndInvoke(t), TaskContinuationOptions.OnlyOnFaulted) - .ConfigureAwait(false); - } - - object InvokeCore(IComponentContext c = null, CancellationToken cancelToken = default(CancellationToken)) - { - if (d.Parameters.Length == 0) - { - // Only one method param: the message! - return fastInvoker.Invoke(consumer, p); - } - - var parameters = new object[d.Parameters.Length + 1]; - parameters[0] = p; - - int i = 0; - foreach (var obj in ResolveParameters(c, d, cancelToken).ToArray()) - { - i++; - parameters[i] = obj; - } - - return fastInvoker.Invoke(consumer, parameters); - } - } - - private void HandleException(Exception ex, ConsumerDescriptor descriptor) - { - if (ex is AggregateException ae) - { - ae.InnerExceptions.Each(x => Logger.Error(x)); - } - else - { - Logger.Error(ex); - } - - if (!descriptor.FireForget) - { - throw ex; - } - } - - protected internal virtual IEnumerable ResolveParameters( - IComponentContext container, - ConsumerDescriptor descriptor, - CancellationToken cancelToken) - { - foreach (var p in descriptor.Parameters) - { - if (p.ParameterType == typeof(CancellationToken)) - { - yield return cancelToken; - } - else - { - yield return _resolver.ResolveParameter(p, container); - } - } - } - - #region APM > TPL pattern (does not always work stable) - - /// - /// Wraps a into the Begin method of an APM pattern. - /// - /// The task to wrap. - /// The callback method passed into the Begin method of the APM pattern. - /// The state passed into the Begin method of the APM pattern. - /// The asynchronous operation, to be returned by the Begin method of the APM pattern. - protected IAsyncResult BeginInvoke(Task task, AsyncCallback callback, ConsumerDescriptor descriptor) - { - var options = TaskCreationOptions.RunContinuationsAsynchronously; - var tcs = new TaskCompletionSource(descriptor, options); - - // "_ =" to discard 'async/await' compiler warning - _ = AwaitCompletionAsync(task, callback, tcs, descriptor); - - return tcs.Task; - } - - private async Task AwaitCompletionAsync( - Task task, - AsyncCallback callback, - TaskCompletionSource tcs, - ConsumerDescriptor descriptor) - { - try - { - await task; - tcs.TrySetResult(null); - } - catch (OperationCanceledException ex) - { - tcs.TrySetCanceled(ex.CancellationToken); - } - catch (Exception ex) - { - tcs.TrySetException(ex); - } - finally - { - callback?.Invoke(tcs.Task); - } - } - - protected virtual void EndInvoke(IAsyncResult asyncResult) - { - var task = (Task)asyncResult; - - if (task.IsFaulted && task.Exception != null) - { - HandleException(task.Exception, (ConsumerDescriptor)asyncResult.AsyncState); - } - } - - #endregion - } + public class ConsumerInvoker : IConsumerInvoker + { + private readonly IConsumerResolver _resolver; + + public ConsumerInvoker(IConsumerResolver resolver) + { + _resolver = resolver; + + Logger = NullLogger.Instance; + } + + public ILogger Logger { get; set; } + + public void Invoke(ConsumerDescriptor descriptor, IConsumer consumer, ConsumeContext envelope) where TMessage : class + { + var d = descriptor; + var p = descriptor.WithEnvelope ? (object)envelope : envelope.Message; + var fastInvoker = FastInvoker.GetInvoker(d.Method); + + if (!d.FireForget && !d.IsAsync) + { + // The all synch case + try + { + InvokeCore(); + } + catch (Exception ex) + { + HandleException(ex, d); + } + } + else if (!d.FireForget && d.IsAsync) + { + //// The awaitable Task case + //BeginInvoke((Task)InvokeCore(cancelToken: AsyncRunner.AppShutdownCancellationToken), EndInvoke, d); + + // For now we must go with the AsyncRunner, the above call to BeginInvoke (APM > TPL) does not always + // guarantee that the task is awaited and throws exceptions especially when EF is involved. + using (var runner = AsyncRunner.Create()) + { + try + { + runner.Run((Task)InvokeCore(cancelToken: AsyncRunner.AppShutdownCancellationToken)); + } + catch (Exception ex) + { + HandleException(ex, d); + } + } + } + else if (d.FireForget && !d.IsAsync) + { + // A synch method should be executed async (without awaiting) + AsyncRunner.Run((c, ct, state) => InvokeCore(c, ct), d) + .ContinueWith(t => EndInvoke(t), /*TaskContinuationOptions.OnlyOnFaulted*/ TaskContinuationOptions.None) + .ConfigureAwait(false); + } + else if (d.FireForget && d.IsAsync) + { + // An async (Task) method should be executed without awaiting + AsyncRunner.Run((c, ct) => (Task)InvokeCore(c, ct), d) + .ContinueWith(t => EndInvoke(t), TaskContinuationOptions.OnlyOnFaulted) + .ConfigureAwait(false); + } + + object InvokeCore(IComponentContext c = null, CancellationToken cancelToken = default(CancellationToken)) + { + if (d.Parameters.Length == 0) + { + // Only one method param: the message! + return fastInvoker.Invoke(consumer, p); + } + + var parameters = new object[d.Parameters.Length + 1]; + parameters[0] = p; + + int i = 0; + foreach (var obj in ResolveParameters(c, d, cancelToken).ToArray()) + { + i++; + parameters[i] = obj; + } + + return fastInvoker.Invoke(consumer, parameters); + } + } + + private void HandleException(Exception ex, ConsumerDescriptor descriptor) + { + if (ex is AggregateException ae) + { + ae.InnerExceptions.Each(x => Logger.Error(x)); + } + else + { + Logger.Error(ex); + } + + if (!descriptor.FireForget) + { + throw ex; + } + } + + protected internal virtual IEnumerable ResolveParameters( + IComponentContext container, + ConsumerDescriptor descriptor, + CancellationToken cancelToken) + { + foreach (var p in descriptor.Parameters) + { + if (p.ParameterType == typeof(CancellationToken)) + { + yield return cancelToken; + } + else + { + yield return _resolver.ResolveParameter(p, container); + } + } + } + + #region APM > TPL pattern (does not always work stable) + + /// + /// Wraps a into the Begin method of an APM pattern. + /// + /// The task to wrap. + /// The callback method passed into the Begin method of the APM pattern. + /// The state passed into the Begin method of the APM pattern. + /// The asynchronous operation, to be returned by the Begin method of the APM pattern. + protected IAsyncResult BeginInvoke(Task task, AsyncCallback callback, ConsumerDescriptor descriptor) + { + var options = TaskCreationOptions.RunContinuationsAsynchronously; + var tcs = new TaskCompletionSource(descriptor, options); + + // "_ =" to discard 'async/await' compiler warning + _ = AwaitCompletionAsync(task, callback, tcs, descriptor); + + return tcs.Task; + } + + private async Task AwaitCompletionAsync( + Task task, + AsyncCallback callback, + TaskCompletionSource tcs, + ConsumerDescriptor descriptor) + { + try + { + await task; + tcs.TrySetResult(null); + } + catch (OperationCanceledException ex) + { + tcs.TrySetCanceled(ex.CancellationToken); + } + catch (Exception ex) + { + tcs.TrySetException(ex); + } + finally + { + callback?.Invoke(tcs.Task); + } + } + + protected virtual void EndInvoke(IAsyncResult asyncResult) + { + var task = (Task)asyncResult; + + if (task.IsFaulted && task.Exception != null) + { + HandleException(task.Exception, (ConsumerDescriptor)asyncResult.AsyncState); + } + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs b/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs index 0c233e9da1..d6e5927392 100644 --- a/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs +++ b/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs @@ -3,10 +3,10 @@ namespace SmartStore.Core.Events { - public class EventConsumerMetadata - { - public bool IsActive { get; set; } - public Type ContainerType { get; set; } - public PluginDescriptor PluginDescriptor { get; set; } - } + public class EventConsumerMetadata + { + public bool IsActive { get; set; } + public Type ContainerType { get; set; } + public PluginDescriptor PluginDescriptor { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Events/FireForgetAttribute.cs b/src/Libraries/SmartStore.Core/Events/FireForgetAttribute.cs index a5076473c9..f5992a9bd9 100644 --- a/src/Libraries/SmartStore.Core/Events/FireForgetAttribute.cs +++ b/src/Libraries/SmartStore.Core/Events/FireForgetAttribute.cs @@ -2,19 +2,19 @@ namespace SmartStore.Core.Events { - /// - /// Specifies whether an event consumer method should be invoked asynchronously without awaiting. - /// This can be advantegous in long running processes, because the current request thread will not 'block' - /// until method completion. - /// - /// - /// Use this with caution and only if you know what you are doing :-) - /// A class containing a fire & forget consumer should NOT take dependencies on request scoped services, because task continuation - /// happens on another thread and context gets lost. Pass required dependencies as method parameters instead, the consumer invoker - /// will spawn a new private context for the unit of work and resolve dependencies from this context. - /// - [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)] - public sealed class FireForgetAttribute : Attribute - { - } + /// + /// Specifies whether an event consumer method should be invoked asynchronously without awaiting. + /// This can be advantegous in long running processes, because the current request thread will not 'block' + /// until method completion. + /// + /// + /// Use this with caution and only if you know what you are doing :-) + /// A class containing a fire & forget consumer should NOT take dependencies on request scoped services, because task continuation + /// happens on another thread and context gets lost. Pass required dependencies as method parameters instead, the consumer invoker + /// will spawn a new private context for the unit of work and resolve dependencies from this context. + /// + [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)] + public sealed class FireForgetAttribute : Attribute + { + } } diff --git a/src/Libraries/SmartStore.Core/Events/IConsumer.cs b/src/Libraries/SmartStore.Core/Events/IConsumer.cs index da2ff66d89..f5fa00be1d 100644 --- a/src/Libraries/SmartStore.Core/Events/IConsumer.cs +++ b/src/Libraries/SmartStore.Core/Events/IConsumer.cs @@ -2,44 +2,44 @@ namespace SmartStore.Core.Events { - /// - /// Marker interface for classes that contain one or more - /// event message handlers. A handler is a public instance method following some conventions. - /// The name of the handler method must be one of: - /// - /// void Handle(TMessage msg) - /// void HandleEvent(TMessage msg) - /// void Consume(TMessage msg) - /// Task HandleAsync(TMessage msg) - /// Task HandleEventAsync(TMessage msg) - /// Task ConsumeAsync(TMessage msg) - /// - /// Alternatively, the TMessage param can be the generic type. - /// - /// The decides how to call the method based on its signature: - /// - /// void method are invoked synchronously. - /// methods are invoked asynchronously and awaited. - /// The makes the method run in the background without awaiting. - /// - /// - /// - /// You can declare additional dependency parameters in the handler method, e.g.: - /// - /// Task HandleEventAsync(SomeEvent message, IDbContext dbContext, ICacheManager cache, CancellationToken cancelToken) - /// - /// Order does not matter. The invoker will auto-resolve appropriate instances and pass them to the method. But any unregistered - /// dependency or a primitive type will result in an exception (except of which always resolves to - /// ). - /// - /// - public interface IConsumer - { - } + /// + /// Marker interface for classes that contain one or more + /// event message handlers. A handler is a public instance method following some conventions. + /// The name of the handler method must be one of: + /// + /// void Handle(TMessage msg) + /// void HandleEvent(TMessage msg) + /// void Consume(TMessage msg) + /// Task HandleAsync(TMessage msg) + /// Task HandleEventAsync(TMessage msg) + /// Task ConsumeAsync(TMessage msg) + /// + /// Alternatively, the TMessage param can be the generic type. + /// + /// The decides how to call the method based on its signature: + /// + /// void method are invoked synchronously. + /// methods are invoked asynchronously and awaited. + /// The makes the method run in the background without awaiting. + /// + /// + /// + /// You can declare additional dependency parameters in the handler method, e.g.: + /// + /// Task HandleEventAsync(SomeEvent message, IDbContext dbContext, ICacheManager cache, CancellationToken cancelToken) + /// + /// Order does not matter. The invoker will auto-resolve appropriate instances and pass them to the method. But any unregistered + /// dependency or a primitive type will result in an exception (except of which always resolves to + /// ). + /// + /// + public interface IConsumer + { + } - [Obsolete("Implement the non-generic 'IConsumer' interface instead.")] - public interface IConsumer : IConsumer - { - void HandleEvent(T message); - } + [Obsolete("Implement the non-generic 'IConsumer' interface instead.")] + public interface IConsumer : IConsumer + { + void HandleEvent(T message); + } } diff --git a/src/Libraries/SmartStore.Core/Events/IConsumerInvoker.cs b/src/Libraries/SmartStore.Core/Events/IConsumerInvoker.cs index 85036e7528..18a6fd082a 100644 --- a/src/Libraries/SmartStore.Core/Events/IConsumerInvoker.cs +++ b/src/Libraries/SmartStore.Core/Events/IConsumerInvoker.cs @@ -1,12 +1,10 @@ -using System; - -namespace SmartStore.Core.Events +namespace SmartStore.Core.Events { - /// - /// Responsible for invoking event message handler methods. - /// - public interface IConsumerInvoker - { - void Invoke(ConsumerDescriptor descriptor, IConsumer consumer, ConsumeContext envelope) where TMessage : class; - } + /// + /// Responsible for invoking event message handler methods. + /// + public interface IConsumerInvoker + { + void Invoke(ConsumerDescriptor descriptor, IConsumer consumer, ConsumeContext envelope) where TMessage : class; + } } diff --git a/src/Libraries/SmartStore.Core/Events/IConsumerRegistry.cs b/src/Libraries/SmartStore.Core/Events/IConsumerRegistry.cs index 4339d6fb4f..a23e6e97de 100644 --- a/src/Libraries/SmartStore.Core/Events/IConsumerRegistry.cs +++ b/src/Libraries/SmartStore.Core/Events/IConsumerRegistry.cs @@ -1,13 +1,12 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace SmartStore.Core.Events { - /// - /// A registry for fast lookup. - /// - public interface IConsumerRegistry - { - IEnumerable GetConsumers(object message); - } + /// + /// A registry for fast lookup. + /// + public interface IConsumerRegistry + { + IEnumerable GetConsumers(object message); + } } diff --git a/src/Libraries/SmartStore.Core/Events/IConsumerResolver.cs b/src/Libraries/SmartStore.Core/Events/IConsumerResolver.cs index 7a7be293d7..48d940e611 100644 --- a/src/Libraries/SmartStore.Core/Events/IConsumerResolver.cs +++ b/src/Libraries/SmartStore.Core/Events/IConsumerResolver.cs @@ -1,16 +1,15 @@ -using System; -using System.Reflection; +using System.Reflection; using Autofac; namespace SmartStore.Core.Events { - /// - /// Resolves the concrete class instance which contains - /// the requested consumer. - /// - public interface IConsumerResolver - { - IConsumer Resolve(ConsumerDescriptor descriptor); - object ResolveParameter(ParameterInfo p, IComponentContext c = null); - } + /// + /// Resolves the concrete class instance which contains + /// the requested consumer. + /// + public interface IConsumerResolver + { + IConsumer Resolve(ConsumerDescriptor descriptor); + object ResolveParameter(ParameterInfo p, IComponentContext c = null); + } } diff --git a/src/Libraries/SmartStore.Core/Events/IEventPublisher.cs b/src/Libraries/SmartStore.Core/Events/IEventPublisher.cs index 21f0f6ebe6..f4cbbd9724 100644 --- a/src/Libraries/SmartStore.Core/Events/IEventPublisher.cs +++ b/src/Libraries/SmartStore.Core/Events/IEventPublisher.cs @@ -1,9 +1,7 @@ -using System; - -namespace SmartStore.Core.Events +namespace SmartStore.Core.Events { - public interface IEventPublisher - { - void Publish(T message) where T : class; - } + public interface IEventPublisher + { + void Publish(T message) where T : class; + } } diff --git a/src/Libraries/SmartStore.Core/Events/NullEventPublisher.cs b/src/Libraries/SmartStore.Core/Events/NullEventPublisher.cs index 07d7ae6e11..18c6cea799 100644 --- a/src/Libraries/SmartStore.Core/Events/NullEventPublisher.cs +++ b/src/Libraries/SmartStore.Core/Events/NullEventPublisher.cs @@ -1,18 +1,15 @@  namespace SmartStore.Core.Events { - public class NullEventPublisher : IEventPublisher - { - private readonly static IEventPublisher s_instance = new NullEventPublisher(); + public class NullEventPublisher : IEventPublisher + { + private readonly static IEventPublisher s_instance = new NullEventPublisher(); - public static IEventPublisher Instance - { - get { return s_instance; } - } + public static IEventPublisher Instance => s_instance; - public void Publish(T eventMessage) where T : class - { - // Noop - } - } + public void Publish(T eventMessage) where T : class + { + // Noop + } + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/CollectionExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/CollectionExtensions.cs index 8d15fef773..bae926e8e1 100644 --- a/src/Libraries/SmartStore.Core/Extensions/CollectionExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/CollectionExtensions.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Runtime.CompilerServices; using SmartStore.Collections; @@ -12,32 +11,32 @@ public static void AddRange(this ICollection initial, IEnumerable other if (other == null) return; - if (initial is List list) - { - list.AddRange(other); - return; - } + if (initial is List list) + { + list.AddRange(other); + return; + } - foreach (var local in other) - { - initial.Add(local); - } + foreach (var local in other) + { + initial.Add(local); + } } - public static SyncedCollection AsSynchronized(this ICollection source) - { - return AsSynchronized(source, new object()); - } + public static SyncedCollection AsSynchronized(this ICollection source) + { + return AsSynchronized(source, new object()); + } - public static SyncedCollection AsSynchronized(this ICollection source, object syncRoot) - { - if (source is SyncedCollection sc) - { - return sc; - } + public static SyncedCollection AsSynchronized(this ICollection source, object syncRoot) + { + if (source is SyncedCollection sc) + { + return sc; + } - return new SyncedCollection(source, syncRoot); - } + return new SyncedCollection(source, syncRoot); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsNullOrEmpty(this ICollection source) diff --git a/src/Libraries/SmartStore.Core/Extensions/ConversionExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/ConversionExtensions.cs index 324b084e6f..4689401f35 100644 --- a/src/Libraries/SmartStore.Core/Extensions/ConversionExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/ConversionExtensions.cs @@ -10,13 +10,12 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using SmartStore.ComponentModel; using SmartStore.Utilities; using SmartStore.Utilities.ObjectPools; namespace SmartStore { - public static class ConversionExtensions + public static class ConversionExtensions { #region Object @@ -33,7 +32,7 @@ public static T Convert(this object value) [MethodImpl(MethodImplOptions.AggressiveInlining)] public static T Convert(this object value, T defaultValue) - { + { if (!CommonHelper.TryConvert(value, typeof(T), CultureInfo.InvariantCulture, out object result)) { return defaultValue; @@ -55,7 +54,7 @@ public static T Convert(this object value, CultureInfo culture) [MethodImpl(MethodImplOptions.AggressiveInlining)] public static T Convert(this object value, T defaultValue, CultureInfo culture) - { + { if (!CommonHelper.TryConvert(value, typeof(T), culture, out object result)) { return defaultValue; @@ -78,7 +77,7 @@ public static object Convert(this object value, Type to) [MethodImpl(MethodImplOptions.AggressiveInlining)] public static object Convert(this object value, Type to, CultureInfo culture) - { + { if (!CommonHelper.TryConvert(value, to, culture, out object result)) { return null; @@ -86,7 +85,7 @@ public static object Convert(this object value, Type to, CultureInfo culture) } return result; - } + } #endregion @@ -110,45 +109,45 @@ public static char ToHex(this int value) [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int ToInt(this string value, int defaultValue = 0) { - if (CommonHelper.TryConvert(value, typeof(int), CultureInfo.InvariantCulture, out object result)) - { - return (int)result; - } + if (CommonHelper.TryConvert(value, typeof(int), CultureInfo.InvariantCulture, out object result)) + { + return (int)result; + } - return defaultValue; + return defaultValue; } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static char ToChar(this string value, bool unescape = false, char defaultValue = '\0') - { - if (value.HasValue() && char.TryParse(unescape ? Regex.Unescape(value) : value, out char result)) - { - return result; - } + { + if (value.HasValue() && char.TryParse(unescape ? Regex.Unescape(value) : value, out char result)) + { + return result; + } - return defaultValue; - } + return defaultValue; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static float ToFloat(this string value, float defaultValue = 0) { - if (CommonHelper.TryConvert(value, typeof(float), CultureInfo.InvariantCulture, out object result)) - { - return (float)result; - } + if (CommonHelper.TryConvert(value, typeof(float), CultureInfo.InvariantCulture, out object result)) + { + return (float)result; + } - return defaultValue; + return defaultValue; } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool ToBool(this string value, bool defaultValue = false) { - if (CommonHelper.TryConvert(value, typeof(bool), out object result)) - { - return (bool)result; - } + if (CommonHelper.TryConvert(value, typeof(bool), out object result)) + { + return (bool)result; + } - return defaultValue; + return defaultValue; } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -183,25 +182,25 @@ public static bool ToBool(this string value, bool defaultValue = false) return defaultValue; } - /// - /// Parse ISO-8601 UTC timestamp including milliseconds. - /// - /// - /// Dublicate can be found in HmacAuthentication class. - /// - public static DateTime? ToDateTimeIso8601(this string value) - { - if (value.HasValue()) - { - if (DateTime.TryParseExact(value, "o", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out DateTime dt)) - return dt; - - if (DateTime.TryParseExact(value, "yyyy-MM-ddTHH:mm:ss.fffZ", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out dt)) - return dt; - } - - return null; - } + /// + /// Parse ISO-8601 UTC timestamp including milliseconds. + /// + /// + /// Dublicate can be found in HmacAuthentication class. + /// + public static DateTime? ToDateTimeIso8601(this string value) + { + if (value.HasValue()) + { + if (DateTime.TryParseExact(value, "o", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out DateTime dt)) + return dt; + + if (DateTime.TryParseExact(value, "yyyy-MM-ddTHH:mm:ss.fffZ", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out dt)) + return dt; + } + + return null; + } [DebuggerStepThrough] public static Version ToVersion(this string value, Version defaultVersion = null) @@ -222,19 +221,19 @@ public static Version ToVersion(this string value, Version defaultVersion = null public static byte[] ToByteArray(this Stream stream) { - if (stream == null) - throw new ArgumentNullException(nameof(stream)); - - if (stream is MemoryStream mem) - { - if (mem.TryGetBuffer(out var buffer)) - { - return buffer.Array; - } - return mem.ToArray(); - } - else - { + if (stream == null) + throw new ArgumentNullException(nameof(stream)); + + if (stream is MemoryStream mem) + { + if (mem.TryGetBuffer(out var buffer)) + { + return buffer.Array; + } + return mem.ToArray(); + } + else + { try { var len = stream.Length; @@ -252,23 +251,23 @@ public static byte[] ToByteArray(this Stream stream) return ToByteArrayCopy(stream); } } - } - - public static async Task ToByteArrayAsync(this Stream stream) - { - if (stream == null) - throw new ArgumentNullException(nameof(stream)); - - if (stream is MemoryStream mem) - { - if (mem.TryGetBuffer(out var buffer)) - { - return buffer.Array; - } - return mem.ToArray(); - } - else - { + } + + public static async Task ToByteArrayAsync(this Stream stream) + { + if (stream == null) + throw new ArgumentNullException(nameof(stream)); + + if (stream is MemoryStream mem) + { + if (mem.TryGetBuffer(out var buffer)) + { + return buffer.Array; + } + return mem.ToArray(); + } + else + { try { var len = stream.Length; @@ -286,7 +285,7 @@ public static async Task ToByteArrayAsync(this Stream stream) return await ToByteArrayCopyAsync(stream); } } - } + } private static byte[] ToByteArrayCopy(Stream stream, int capacity = 0) { @@ -308,28 +307,28 @@ private static async Task ToByteArrayCopyAsync(Stream stream, int capaci [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string AsString(this Stream stream) - { - return stream.AsString(Encoding.UTF8); - } + { + return stream.AsString(Encoding.UTF8); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Task AsStringAsync(this Stream stream) - { - return stream.AsStringAsync(Encoding.UTF8); - } + { + return stream.AsStringAsync(Encoding.UTF8); + } - public static string AsString(this Stream stream, Encoding encoding) + public static string AsString(this Stream stream, Encoding encoding) { - if (encoding == null) - throw new ArgumentNullException(nameof(encoding)); + if (encoding == null) + throw new ArgumentNullException(nameof(encoding)); - // convert stream to string - string result; + // convert stream to string + string result; - if (stream.CanSeek) - { - stream.Position = 0; - } + if (stream.CanSeek) + { + stream.Position = 0; + } using (StreamReader sr = new StreamReader(stream, encoding)) { @@ -339,37 +338,37 @@ public static string AsString(this Stream stream, Encoding encoding) return result; } - public static Task AsStringAsync(this Stream stream, Encoding encoding) - { - if (encoding == null) - throw new ArgumentNullException(nameof(encoding)); + public static Task AsStringAsync(this Stream stream, Encoding encoding) + { + if (encoding == null) + throw new ArgumentNullException(nameof(encoding)); - // convert stream to string - Task result; + // convert stream to string + Task result; - if (stream.CanSeek) - { - stream.Position = 0; - } + if (stream.CanSeek) + { + stream.Position = 0; + } - using (StreamReader sr = new StreamReader(stream, encoding)) - { - result = sr.ReadToEndAsync(); - } + using (StreamReader sr = new StreamReader(stream, encoding)) + { + result = sr.ReadToEndAsync(); + } - return result; - } + return result; + } - #endregion + #endregion - #region ByteArray + #region ByteArray - /// - /// Converts a byte array into an object. - /// - /// Object to deserialize. May be null. - /// Deserialized object, or null if input was null. - public static object ToObject(this byte[] bytes) + /// + /// Converts a byte array into an object. + /// + /// Object to deserialize. May be null. + /// Deserialized object, or null if input was null. + public static object ToObject(this byte[] bytes) { if (bytes == null) return null; @@ -385,18 +384,18 @@ public static Stream ToStream(this byte[] bytes) return new MemoryStream(bytes); } - /// - /// Computes the MD5 hash of a byte array - /// - /// The byte array to compute the hash for - /// The hash value - [DebuggerStepThrough] - public static string Hash(this byte[] value, bool toBase64 = false) + /// + /// Computes the MD5 hash of a byte array + /// + /// The byte array to compute the hash for + /// The hash value + [DebuggerStepThrough] + public static string Hash(this byte[] value, bool toBase64 = false) { - if (value == null) - throw new ArgumentNullException(nameof(value)); + if (value == null) + throw new ArgumentNullException(nameof(value)); - using (MD5 md5 = MD5.Create()) + using (MD5 md5 = MD5.Create()) { if (toBase64) @@ -420,43 +419,43 @@ public static string Hash(this byte[] value, bool toBase64 = false) } } - /// - /// Compresses the input buffer with - /// - /// Decompressed input - /// The compressed result - public static byte[] Zip(this byte[] buffer) - { - if (buffer == null) - throw new ArgumentNullException(nameof(buffer)); - - using (var compressedStream = new MemoryStream()) - using (var zipStream = new GZipStream(compressedStream, CompressionMode.Compress)) - { - zipStream.Write(buffer, 0, buffer.Length); - zipStream.Close(); - return compressedStream.ToArray(); - } - } - - /// - /// Decompresses the input buffer with decompression - /// - /// Compressed input - /// The decompressed result - public static byte[] UnZip(this byte[] buffer) - { - if (buffer == null) - throw new ArgumentNullException(nameof(buffer)); - - using (var compressedStream = new MemoryStream(buffer)) - using (var zipStream = new GZipStream(compressedStream, CompressionMode.Decompress)) - using (var resultStream = new MemoryStream()) - { - zipStream.CopyTo(resultStream); - return resultStream.ToArray(); - } - } + /// + /// Compresses the input buffer with + /// + /// Decompressed input + /// The compressed result + public static byte[] Zip(this byte[] buffer) + { + if (buffer == null) + throw new ArgumentNullException(nameof(buffer)); + + using (var compressedStream = new MemoryStream()) + using (var zipStream = new GZipStream(compressedStream, CompressionMode.Compress)) + { + zipStream.Write(buffer, 0, buffer.Length); + zipStream.Close(); + return compressedStream.ToArray(); + } + } + + /// + /// Decompresses the input buffer with decompression + /// + /// Compressed input + /// The decompressed result + public static byte[] UnZip(this byte[] buffer) + { + if (buffer == null) + throw new ArgumentNullException(nameof(buffer)); + + using (var compressedStream = new MemoryStream(buffer)) + using (var zipStream = new GZipStream(compressedStream, CompressionMode.Decompress)) + using (var resultStream = new MemoryStream()) + { + zipStream.CopyTo(resultStream); + return resultStream.ToArray(); + } + } #endregion diff --git a/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs index 47dfe31a32..517bab695a 100644 --- a/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs @@ -1,15 +1,12 @@ using System; -using System.Xml; using System.Globalization; -using TimeZone = System.TimeZoneInfo; -using System.Text.RegularExpressions; using System.Runtime.CompilerServices; namespace SmartStore { public static class DateTimeExtensions { - public static readonly DateTime BeginOfEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); + public static readonly DateTime BeginOfEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); /// /// Converts a nullable date/time value to UTC. @@ -105,7 +102,7 @@ public static DateTime GetEvenMinuteDateBefore(this DateTime? value) public static long ToJavaScriptTicks(this DateTime value) { DateTimeOffset utcDateTime = value.ToUniversalTime(); - long javaScriptTicks = (utcDateTime.Ticks - BeginOfEpoch.Ticks) / (long)10000; + long javaScriptTicks = (utcDateTime.Ticks - BeginOfEpoch.Ticks) / (long)10000; return javaScriptTicks; } @@ -136,71 +133,71 @@ public static DateTime GetLastDayOfMonth(this DateTime value) return dtTo; } - public static DateTime ToEndOfTheDay(this DateTime value) - { - if (value != null) - return new DateTime(value.Year, value.Month, value.Day, 23, 59, 59); - return value; - } + public static DateTime ToEndOfTheDay(this DateTime value) + { + if (value != null) + return new DateTime(value.Year, value.Month, value.Day, 23, 59, 59); + return value; + } - public static DateTime? ToEndOfTheDay(this DateTime? value) - { - return (value.HasValue ? value.Value.ToEndOfTheDay() : value); - } + public static DateTime? ToEndOfTheDay(this DateTime? value) + { + return (value.HasValue ? value.Value.ToEndOfTheDay() : value); + } /// /// Epoch time. Number of seconds since midnight (UTC) on 1st January 1970. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static long ToUnixTime(this DateTime value) - { - return Convert.ToInt64((value.ToUniversalTime() - BeginOfEpoch).TotalSeconds); - } + { + return Convert.ToInt64((value.ToUniversalTime() - BeginOfEpoch).TotalSeconds); + } /// /// UTC date based on number of seconds since midnight (UTC) on 1st January 1970. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static DateTime FromUnixTime(this long unixTime) - { - return BeginOfEpoch.AddSeconds(unixTime); - } + { + return BeginOfEpoch.AddSeconds(unixTime); + } /// /// Converts a DateTime to a string with native digits /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string ToNativeString(this DateTime value) - { - return value.ToNativeString(null, null); - } + { + return value.ToNativeString(null, null); + } /// /// Converts a DateTime to a string with native digits /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string ToNativeString(this DateTime value, IFormatProvider provider) - { - return value.ToNativeString(null, provider); - } + { + return value.ToNativeString(null, provider); + } /// /// Converts a DateTime to a string with native digits /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string ToNativeString(this DateTime value, string format) - { - return value.ToNativeString(format, null); - } + { + return value.ToNativeString(format, null); + } /// /// Converts a DateTime to a string with native digits /// public static string ToNativeString(this DateTime value, string format, IFormatProvider provider) - { - provider = provider ?? CultureInfo.CurrentCulture; - return value.ToString(format, provider).ReplaceNativeDigits(provider); - } + { + provider = provider ?? CultureInfo.CurrentCulture; + return value.ToString(format, provider).ReplaceNativeDigits(provider); + } /// /// Converts a DateTime to ISO 8601 string diff --git a/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs index d2b51fb506..24b46dddf9 100644 --- a/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Dynamic; -using SmartStore.Utilities; +using System.Linq; using System.Runtime.CompilerServices; -using System.Web.Routing; +using SmartStore.Utilities; namespace SmartStore { @@ -35,7 +34,7 @@ public static IDictionary Merge(this IDictionary [MethodImpl(MethodImplOptions.AggressiveInlining)] public static IDictionary Merge(this IDictionary instance, object values, bool replaceExisting = true) { - return instance.Merge(CommonHelper.ObjectToDictionary(values), replaceExisting); + return instance.Merge(CommonHelper.ObjectToDictionary(values), replaceExisting); } public static IDictionary Merge(this IDictionary instance, IDictionary from, bool replaceExisting = true) @@ -54,30 +53,30 @@ public static IDictionary Merge(this IDictionary AppendInValue(this IDictionary instance, string key, string separator, string value) { - return AddInValue(instance, key, separator, value, false); - } + return AddInValue(instance, key, separator, value, false); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static IDictionary PrependInValue(this IDictionary instance, string key, string separator, string value) { - return AddInValue(instance, key, separator, value, true); + return AddInValue(instance, key, separator, value, true); } - private static IDictionary AddInValue(IDictionary instance, string key, string separator, string value, bool prepend = false) - { - if (!instance.TryGetValue(key, out var obj)) - { - instance[key] = value; - } - else - { - var arr = obj.ToString().Trim().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable(); - var arrValue = value.Trim().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable(); + private static IDictionary AddInValue(IDictionary instance, string key, string separator, string value, bool prepend = false) + { + if (!instance.TryGetValue(key, out var obj)) + { + instance[key] = value; + } + else + { + var arr = obj.ToString().Trim().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable(); + var arrValue = value.Trim().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable(); - arr = prepend ? arrValue.Union(arr) : arr.Union(arrValue); + arr = prepend ? arrValue.Union(arr) : arr.Union(arrValue); - instance[key] = string.Join(separator, arr); - } + instance[key] = string.Join(separator, arr); + } return instance; @@ -85,20 +84,20 @@ private static IDictionary AddInValue(IDictionary(this IDictionary instance, TKey key) - { - if (instance == null) - throw new ArgumentNullException(nameof(instance)); + { + if (instance == null) + throw new ArgumentNullException(nameof(instance)); - instance.TryGetValue(key, out var val); - return val; - } + instance.TryGetValue(key, out var val); + return val; + } - public static ExpandoObject ToExpandoObject(this IDictionary source, bool castIfPossible = false) + public static ExpandoObject ToExpandoObject(this IDictionary source, bool castIfPossible = false) { - if (source == null) - throw new ArgumentNullException(nameof(source)); + if (source == null) + throw new ArgumentNullException(nameof(source)); - if (castIfPossible && source is ExpandoObject) + if (castIfPossible && source is ExpandoObject) { return source as ExpandoObject; } @@ -110,29 +109,29 @@ public static ExpandoObject ToExpandoObject(this IDictionary sou } - public static bool TryAdd(this IDictionary source, TKey key, TValue value, bool updateIfExists = false) - { - if (source == null || key == null) - { - return false; - } - - if (source.ContainsKey(key)) - { - if (updateIfExists) - { - source[key] = value; - return true; - } - } - else - { - source.Add(key, value); - return true; - } - - return false; - } + public static bool TryAdd(this IDictionary source, TKey key, TValue value, bool updateIfExists = false) + { + if (source == null || key == null) + { + return false; + } + + if (source.ContainsKey(key)) + { + if (updateIfExists) + { + source[key] = value; + return true; + } + } + else + { + source.Add(key, value); + return true; + } + + return false; + } public static bool TryRemove(this IDictionary source, TKey key, out TValue value) { diff --git a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs index 8039088462..f867372efa 100644 --- a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs @@ -2,148 +2,145 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; using System.Web; using SmartStore.Collections; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using SmartStore.Core; -using System.Runtime.CompilerServices; using SmartStore.Utilities.ObjectPools; namespace SmartStore { - public static class CollectionSlicer - { - /// - /// Slices the iteration over an enumerable by the given slice sizes. - /// - /// - /// The source sequence to slice - /// - /// Slice sizes. At least one size is required. Multiple sizes result in differently sized slices, - /// whereat the last size is used for the "rest" (if any) - /// - /// The sliced enumerable - public static IEnumerable> Slice(this IEnumerable source, params int[] sizes) - { - if (!sizes.Any(step => step != 0)) - { - throw new InvalidOperationException("Can't slice a collection with step length 0."); - } - - return new Slicer(source.GetEnumerator(), sizes).Slice(); - } - } - - internal sealed class Slicer - { - private readonly IEnumerator _iterator; - private readonly int[] _sizes; - private volatile bool _hasNext; - private volatile int _currentSize; - private volatile int _index; - - public Slicer(IEnumerator iterator, int[] sizes) - { - _iterator = iterator; - _sizes = sizes; - _index = 0; - _currentSize = 0; - _hasNext = true; - } - - public int Index - { - get { return _index; } - } - - public IEnumerable> Slice() - { - var length = _sizes.Length; - var index = 1; - var size = 0; - - for (var i = 0; _hasNext; ++i) - { - if (i < length) - { - size = _sizes[i]; - _currentSize = size - 1; - } - - while (_index < index && _hasNext) - { - _hasNext = MoveNext(); - } - - if (_hasNext) - { - yield return new List(SliceInternal()); - index += size; - } - } - } - - private IEnumerable SliceInternal() - { - if (_currentSize == -1) yield break; - yield return _iterator.Current; - - for (var count = 0; count < _currentSize && _hasNext; ++count) - { - _hasNext = MoveNext(); - - if (_hasNext) - { - yield return _iterator.Current; - } - } - } - - private bool MoveNext() - { - ++_index; - return _iterator.MoveNext(); - } - } - - [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] - public static class EnumerableExtensions - { - #region Nested classes - - private static class DefaultReadOnlyCollection - { - private static ReadOnlyCollection defaultCollection; - - [SuppressMessage("ReSharper", "ConvertIfStatementToNullCoalescingExpression")] - internal static ReadOnlyCollection Empty - { - get - { - if (defaultCollection == null) - { - defaultCollection = new ReadOnlyCollection(new T[0]); - } - return defaultCollection; - } - } - } - - #endregion - - #region IEnumerable - - /// - /// Performs an action on each item while iterating through a list. - /// This is a handy shortcut for foreach(item in list) { ... } - /// - /// The type of the items. - /// The list, which holds the objects. - /// The action delegate which is called on each item while iterating. - [DebuggerStepThrough] + public static class CollectionSlicer + { + /// + /// Slices the iteration over an enumerable by the given slice sizes. + /// + /// + /// The source sequence to slice + /// + /// Slice sizes. At least one size is required. Multiple sizes result in differently sized slices, + /// whereat the last size is used for the "rest" (if any) + /// + /// The sliced enumerable + public static IEnumerable> Slice(this IEnumerable source, params int[] sizes) + { + if (!sizes.Any(step => step != 0)) + { + throw new InvalidOperationException("Can't slice a collection with step length 0."); + } + + return new Slicer(source.GetEnumerator(), sizes).Slice(); + } + } + + internal sealed class Slicer + { + private readonly IEnumerator _iterator; + private readonly int[] _sizes; + private volatile bool _hasNext; + private volatile int _currentSize; + private volatile int _index; + + public Slicer(IEnumerator iterator, int[] sizes) + { + _iterator = iterator; + _sizes = sizes; + _index = 0; + _currentSize = 0; + _hasNext = true; + } + + public int Index => _index; + + public IEnumerable> Slice() + { + var length = _sizes.Length; + var index = 1; + var size = 0; + + for (var i = 0; _hasNext; ++i) + { + if (i < length) + { + size = _sizes[i]; + _currentSize = size - 1; + } + + while (_index < index && _hasNext) + { + _hasNext = MoveNext(); + } + + if (_hasNext) + { + yield return new List(SliceInternal()); + index += size; + } + } + } + + private IEnumerable SliceInternal() + { + if (_currentSize == -1) yield break; + yield return _iterator.Current; + + for (var count = 0; count < _currentSize && _hasNext; ++count) + { + _hasNext = MoveNext(); + + if (_hasNext) + { + yield return _iterator.Current; + } + } + } + + private bool MoveNext() + { + ++_index; + return _iterator.MoveNext(); + } + } + + [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] + public static class EnumerableExtensions + { + #region Nested classes + + private static class DefaultReadOnlyCollection + { + private static ReadOnlyCollection defaultCollection; + + [SuppressMessage("ReSharper", "ConvertIfStatementToNullCoalescingExpression")] + internal static ReadOnlyCollection Empty + { + get + { + if (defaultCollection == null) + { + defaultCollection = new ReadOnlyCollection(new T[0]); + } + return defaultCollection; + } + } + } + + #endregion + + #region IEnumerable + + /// + /// Performs an action on each item while iterating through a list. + /// This is a handy shortcut for foreach(item in list) { ... } + /// + /// The type of the items. + /// The list, which holds the objects. + /// The action delegate which is called on each item while iterating. + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Each(this IEnumerable source, Action action) { @@ -153,39 +150,39 @@ public static void Each(this IEnumerable source, Action action) } } - /// - /// Performs an action on each item while iterating through a list. - /// This is a handy shortcut for foreach(item in list) { ... } - /// - /// The type of the items. - /// The list, which holds the objects. - /// The action delegate which is called on each item while iterating. - [DebuggerStepThrough] + /// + /// Performs an action on each item while iterating through a list. + /// This is a handy shortcut for foreach(item in list) { ... } + /// + /// The type of the items. + /// The list, which holds the objects. + /// The action delegate which is called on each item while iterating. + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Each(this IEnumerable source, Action action) - { - int i = 0; - foreach (T t in source) - { - action(t, i++); - } - } + { + int i = 0; + foreach (T t in source) + { + action(t, i++); + } + } public static ReadOnlyCollection AsReadOnly(this IEnumerable source) { - if (source == null || !source.Any()) - return DefaultReadOnlyCollection.Empty; - - if (source is ReadOnlyCollection readOnly) - { - return readOnly; - } - else if (source is List list) - { - return list.AsReadOnly(); - } - - return new ReadOnlyCollection(source.ToList()); + if (source == null || !source.Any()) + return DefaultReadOnlyCollection.Empty; + + if (source is ReadOnlyCollection readOnly) + { + return readOnly; + } + else if (source is List list) + { + return list.AsReadOnly(); + } + + return new ReadOnlyCollection(source.ToList()); } /// @@ -196,11 +193,11 @@ public static ReadOnlyCollection AsReadOnly(this IEnumerable source) /// Result as dictionary [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Dictionary ToDictionarySafe( - this IEnumerable source, - Func keySelector) - { - return source.ToDictionarySafe(keySelector, new Func(src => src), null); - } + this IEnumerable source, + Func keySelector) + { + return source.ToDictionarySafe(keySelector, new Func(src => src), null); + } /// /// Converts an enumerable to a dictionary while tolerating duplicate entries (last wins) @@ -211,12 +208,12 @@ public static Dictionary ToDictionarySafe( /// Result as dictionary [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Dictionary ToDictionarySafe( - this IEnumerable source, - Func keySelector, - IEqualityComparer comparer) - { - return source.ToDictionarySafe(keySelector, new Func(src => src), comparer); - } + this IEnumerable source, + Func keySelector, + IEqualityComparer comparer) + { + return source.ToDictionarySafe(keySelector, new Func(src => src), comparer); + } /// /// Converts an enumerable to a dictionary while tolerating duplicate entries (last wins) @@ -227,85 +224,85 @@ public static Dictionary ToDictionarySafe( /// Result as dictionary [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Dictionary ToDictionarySafe( - this IEnumerable source, - Func keySelector, - Func elementSelector) - { - return source.ToDictionarySafe(keySelector, elementSelector, null); - } - - /// - /// Converts an enumerable to a dictionary while tolerating duplicate entries (last wins) - /// - /// source - /// keySelector - /// elementSelector - /// comparer - /// Result as dictionary - public static Dictionary ToDictionarySafe( - this IEnumerable source, - Func keySelector, - Func elementSelector, - IEqualityComparer comparer) - { - if (source == null) - throw new ArgumentNullException(nameof(source)); - - if (keySelector == null) - throw new ArgumentNullException(nameof(keySelector)); - - if (elementSelector == null) - throw new ArgumentNullException(nameof(elementSelector)); - - var dictionary = new Dictionary(comparer); - - foreach (var local in source) - { - dictionary[keySelector(local)] = elementSelector(local); - } - - return dictionary; - } - - /// The distinct by. - /// The source. - /// The key selector. - /// Source type - /// Key type - /// the unique list - public static IEnumerable DistinctBy(this IEnumerable source, Func keySelector) - where TKey : IEquatable - { - return source.Distinct(GenericEqualityComparer.CompareMember(keySelector)); - } - - /// - /// Orders a collection of entities by a specific ID sequence - /// - /// Entity type - /// The entity collection to sort - /// The IDs to order by - /// The sorted entity collection - public static IEnumerable OrderBySequence(this IEnumerable source, IEnumerable ids) where TEntity : BaseEntity - { - if (source == null) - throw new ArgumentNullException(nameof(source)); - - if (ids == null) - throw new ArgumentNullException(nameof(ids)); - - var sorted = from id in ids - join entity in source on id equals entity.Id - select entity; - - return sorted; - } + this IEnumerable source, + Func keySelector, + Func elementSelector) + { + return source.ToDictionarySafe(keySelector, elementSelector, null); + } + + /// + /// Converts an enumerable to a dictionary while tolerating duplicate entries (last wins) + /// + /// source + /// keySelector + /// elementSelector + /// comparer + /// Result as dictionary + public static Dictionary ToDictionarySafe( + this IEnumerable source, + Func keySelector, + Func elementSelector, + IEqualityComparer comparer) + { + if (source == null) + throw new ArgumentNullException(nameof(source)); + + if (keySelector == null) + throw new ArgumentNullException(nameof(keySelector)); + + if (elementSelector == null) + throw new ArgumentNullException(nameof(elementSelector)); + + var dictionary = new Dictionary(comparer); + + foreach (var local in source) + { + dictionary[keySelector(local)] = elementSelector(local); + } + + return dictionary; + } + + /// The distinct by. + /// The source. + /// The key selector. + /// Source type + /// Key type + /// the unique list + public static IEnumerable DistinctBy(this IEnumerable source, Func keySelector) + where TKey : IEquatable + { + return source.Distinct(GenericEqualityComparer.CompareMember(keySelector)); + } + + /// + /// Orders a collection of entities by a specific ID sequence + /// + /// Entity type + /// The entity collection to sort + /// The IDs to order by + /// The sorted entity collection + public static IEnumerable OrderBySequence(this IEnumerable source, IEnumerable ids) where TEntity : BaseEntity + { + if (source == null) + throw new ArgumentNullException(nameof(source)); + + if (ids == null) + throw new ArgumentNullException(nameof(ids)); + + var sorted = from id in ids + join entity in source on id equals entity.Id + select entity; + + return sorted; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string StrJoin(this IEnumerable source, string separator) - { - return string.Join(separator, source); - } + { + return string.Join(separator, source); + } #endregion @@ -317,44 +314,44 @@ public static Multimap ToMultimap( Func keySelector, Func valueSelector) { - return source.ToMultimap(keySelector, valueSelector, null); + return source.ToMultimap(keySelector, valueSelector, null); } - public static Multimap ToMultimap( - this IEnumerable source, - Func keySelector, - Func valueSelector, - IEqualityComparer comparer) - { - if (source == null) - throw new ArgumentNullException(nameof(source)); + public static Multimap ToMultimap( + this IEnumerable source, + Func keySelector, + Func valueSelector, + IEqualityComparer comparer) + { + if (source == null) + throw new ArgumentNullException(nameof(source)); - if (keySelector == null) - throw new ArgumentNullException(nameof(keySelector)); + if (keySelector == null) + throw new ArgumentNullException(nameof(keySelector)); - if (valueSelector == null) - throw new ArgumentNullException(nameof(valueSelector)); + if (valueSelector == null) + throw new ArgumentNullException(nameof(valueSelector)); - var map = new Multimap(comparer); + var map = new Multimap(comparer); - foreach (var item in source) - { - map.Add(keySelector(item), valueSelector(item)); - } + foreach (var item in source) + { + map.Add(keySelector(item), valueSelector(item)); + } - return map; - } + return map; + } - #endregion + #endregion - #region NameValueCollection + #region NameValueCollection - public static void AddRange(this NameValueCollection initial, NameValueCollection other) + public static void AddRange(this NameValueCollection initial, NameValueCollection other) { - if (initial == null) - throw new ArgumentNullException(nameof(initial)); + if (initial == null) + throw new ArgumentNullException(nameof(initial)); - if (other == null) + if (other == null) return; foreach (var item in other.AllKeys) @@ -363,15 +360,15 @@ public static void AddRange(this NameValueCollection initial, NameValueCollectio } } - /// - /// Builds an URL query string - /// - /// Name value collection - /// Encoding type. Can be null. - /// Whether to encode keys and values - /// The query string without leading a question mark - public static string BuildQueryString(this NameValueCollection nvc, Encoding encoding, bool encode = true) - { + /// + /// Builds an URL query string + /// + /// Name value collection + /// Encoding type. Can be null. + /// Whether to encode keys and values + /// The query string without leading a question mark + public static string BuildQueryString(this NameValueCollection nvc, Encoding encoding, bool encode = true) + { var psb = PooledStringBuilder.Rent(); var sb = (StringBuilder)psb; @@ -401,7 +398,7 @@ public static string BuildQueryString(this NameValueCollection nvc, Encoding enc } return psb.ToStringAndReturn(); - } + } #endregion @@ -433,36 +430,36 @@ public static int Remove(this IList list, Func selector) return count; } - #endregion + #endregion - #region Stack + #region Stack - public static bool TryPeek(this Stack stack, out T value) - { - value = default(T); + public static bool TryPeek(this Stack stack, out T value) + { + value = default(T); - if (stack.Count > 0) - { - value = stack.Peek(); - return true; - } + if (stack.Count > 0) + { + value = stack.Peek(); + return true; + } - return false; - } + return false; + } - public static bool TryPop(this Stack stack, out T value) - { - value = default(T); + public static bool TryPop(this Stack stack, out T value) + { + value = default(T); - if (stack.Count > 0) - { - value = stack.Pop(); - return true; - } + if (stack.Count > 0) + { + value = stack.Pop(); + return true; + } - return false; - } + return false; + } - #endregion - } + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/ExceptionExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/ExceptionExtensions.cs index 4f674a61cf..70f1e966e0 100644 --- a/src/Libraries/SmartStore.Core/Extensions/ExceptionExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/ExceptionExtensions.cs @@ -5,17 +5,17 @@ namespace SmartStore { - public static class ExceptionExtensions - { - public static bool IsFatal(this Exception ex) - { - return ex is StackOverflowException || - ex is OutOfMemoryException || - ex is AccessViolationException || - ex is AppDomainUnloadedException || - ex is ThreadAbortException || - ex is SecurityException || - ex is SEHException; - } - } + public static class ExceptionExtensions + { + public static bool IsFatal(this Exception ex) + { + return ex is StackOverflowException || + ex is OutOfMemoryException || + ex is AccessViolationException || + ex is AppDomainUnloadedException || + ex is ThreadAbortException || + ex is SecurityException || + ex is SEHException; + } + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/ExpressionExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/ExpressionExtensions.cs index ceeb53466a..4d27f78734 100644 --- a/src/Libraries/SmartStore.Core/Extensions/ExpressionExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/ExpressionExtensions.cs @@ -8,7 +8,7 @@ namespace SmartStore public static class ExpressionExtensions { public static FastPropertyInvoker CompileFast( - this Expression> expression, + this Expression> expression, PropertyCachingStrategy cachingStrategy = PropertyCachingStrategy.Cached) { if (!(expression.Body is MemberExpression member)) diff --git a/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs index acd2f75109..df752203cd 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs @@ -1,10 +1,9 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Web.UI; namespace SmartStore -{ +{ public static class HtmlTextWriterExtensions { public static void AddAttributes(this HtmlTextWriter writer, IDictionary attributes) diff --git a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs index aea8f1f1ad..a2618ee834 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs @@ -2,35 +2,34 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Net; using System.Linq; -using System.Text; +using System.Net; +using System.Runtime.CompilerServices; using System.Web; using System.Web.Caching; +using System.Web.Mvc; using System.Web.Security; -using SmartStore.Core.Infrastructure; using SmartStore.Core; -using System.Web.Mvc; using SmartStore.Core.Fakes; -using System.Runtime.CompilerServices; +using SmartStore.Core.Infrastructure; namespace SmartStore { - public static class HttpExtensions - { - const string CacheRegionName = "SmartStoreNET:"; - const string RememberPathKey = "AppRelativeCurrentExecutionFilePath.Original"; - - private static readonly List> _sslHeaders = new List> - { - new Tuple("HTTP_CLUSTER_HTTPS", "on"), + public static class HttpExtensions + { + const string CacheRegionName = "SmartStoreNET:"; + const string RememberPathKey = "AppRelativeCurrentExecutionFilePath.Original"; + + private static readonly List> _sslHeaders = new List> + { + new Tuple("HTTP_CLUSTER_HTTPS", "on"), new Tuple("HTTP_X_FORWARDED_PROTO", "https"), new Tuple("X-Forwarded-Proto", "https"), - new Tuple("x-arr-ssl", null), - new Tuple("X-Forwarded-Protocol", "https"), - new Tuple("X-Forwarded-Ssl", "on"), - new Tuple("X-Url-Scheme", "https") - }; + new Tuple("x-arr-ssl", null), + new Tuple("X-Forwarded-Protocol", "https"), + new Tuple("X-Forwarded-Ssl", "on"), + new Tuple("X-Url-Scheme", "https") + }; /// /// Tries to get the instance without throwing exceptions @@ -38,110 +37,110 @@ public static class HttpExtensions /// The instance or null. [MethodImpl(MethodImplOptions.AggressiveInlining)] public static HttpRequestBase SafeGetHttpRequest(this HttpContext httpContext) - { - if (httpContext == null) - { - return null; - } - - return SafeGetHttpRequest(new HttpContextWrapper(httpContext)); - } - - /// - /// Tries to get the instance without throwing exceptions - /// - /// The instance or null. - public static HttpRequestBase SafeGetHttpRequest(this HttpContextBase httpContext) - { - if (httpContext == null) - { - return null; - } - - if (httpContext.Handler != null || httpContext is FakeHttpContext) - { - // Having a handler means we're most likely in the MVC routing pipeline. - return httpContext.Request; - } - - try - { - return httpContext.Request; - } - catch - { - return null; - } - } - - /// - /// Returns wether the specified url is local to the host or not - /// - /// - /// - /// - public static bool IsAppLocalUrl(this HttpRequestBase request, string url) - { - if (string.IsNullOrWhiteSpace(url)) - { - return false; - } - - url = url.Trim(); - - if (url.StartsWith("~/")) - { - return true; - } - - if (url.StartsWith("//") || url.StartsWith("/\\")) - { - return false; - } - - // At this point when the url starts with "/" it is local - if (url.StartsWith("/")) - { - return true; - } - - // At this point, check for a fully qualified url - try - { - var uri = new Uri(url); - - if (!uri.Scheme.Equals(Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase) && !uri.Scheme.Equals(Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase)) - { - return false; - } - - if (uri.Authority.Equals(request.Headers["Host"], StringComparison.OrdinalIgnoreCase)) - { - return true; - } - - // Finally, check the base url from the settings - var storeContext = EngineContext.Current.Resolve(); - if (storeContext != null) - { - var baseUrl = storeContext.CurrentStore.Url; - if (baseUrl.HasValue()) - { - if (uri.Authority.Equals(new Uri(baseUrl).Authority, StringComparison.OrdinalIgnoreCase)) - { - return true; - } - } - } - - return false; - } - catch - { - // mall-formed url e.g, "abcdef" - return false; - } - } + { + if (httpContext == null) + { + return null; + } + + return SafeGetHttpRequest(new HttpContextWrapper(httpContext)); + } + + /// + /// Tries to get the instance without throwing exceptions + /// + /// The instance or null. + public static HttpRequestBase SafeGetHttpRequest(this HttpContextBase httpContext) + { + if (httpContext == null) + { + return null; + } + + if (httpContext.Handler != null || httpContext is FakeHttpContext) + { + // Having a handler means we're most likely in the MVC routing pipeline. + return httpContext.Request; + } + + try + { + return httpContext.Request; + } + catch + { + return null; + } + } + + /// + /// Returns wether the specified url is local to the host or not + /// + /// + /// + /// + public static bool IsAppLocalUrl(this HttpRequestBase request, string url) + { + if (string.IsNullOrWhiteSpace(url)) + { + return false; + } + + url = url.Trim(); + + if (url.StartsWith("~/")) + { + return true; + } + + if (url.StartsWith("//") || url.StartsWith("/\\")) + { + return false; + } + + // At this point when the url starts with "/" it is local + if (url.StartsWith("/")) + { + return true; + } + + // At this point, check for a fully qualified url + try + { + var uri = new Uri(url); + + if (!uri.Scheme.Equals(Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase) && !uri.Scheme.Equals(Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase)) + { + return false; + } + + if (uri.Authority.Equals(request.Headers["Host"], StringComparison.OrdinalIgnoreCase)) + { + return true; + } + + // Finally, check the base url from the settings + var storeContext = EngineContext.Current.Resolve(); + if (storeContext != null) + { + var baseUrl = storeContext.CurrentStore.Url; + if (baseUrl.HasValue()) + { + if (uri.Authority.Equals(new Uri(baseUrl).Authority, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + } + } + + return false; + } + catch + { + // mall-formed url e.g, "abcdef" + return false; + } + } /// /// Gets a value which indicates whether the HTTP connection uses secure sockets (HTTPS protocol). @@ -153,65 +152,65 @@ public static bool IsHttps(this HttpRequest request) return IsHttps(new HttpRequestWrapper(request)); } - /// - /// Gets a value which indicates whether the HTTP connection uses secure sockets (HTTPS protocol). - /// Works with Cloud's load balancers. - /// - public static bool IsHttps(this HttpRequestBase request) - { - if (request.IsSecureConnection) - { - return true; - } - - foreach (var tuple in _sslHeaders) - { - var serverVar = request.ServerVariables[tuple.Item1]; - if (serverVar != null) - { - return tuple.Item2 == null || tuple.Item2.Equals(serverVar, StringComparison.OrdinalIgnoreCase); - } - } - - return false; - } - - /// - /// Gets a value which indicates whether the current request requests a static resource, like .txt, .pdf, .js, .css etc. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool IsStaticResourceRequested(this HttpContext context) - { - return IsStaticResourceRequested(new HttpContextWrapper(context)); - } - - /// - /// Gets a value which indicates whether the current request requests a static resource, like .txt, .pdf, .js, .css etc. - /// - public static bool IsStaticResourceRequested(this HttpContextBase context) + /// + /// Gets a value which indicates whether the HTTP connection uses secure sockets (HTTPS protocol). + /// Works with Cloud's load balancers. + /// + public static bool IsHttps(this HttpRequestBase request) + { + if (request.IsSecureConnection) + { + return true; + } + + foreach (var tuple in _sslHeaders) + { + var serverVar = request.ServerVariables[tuple.Item1]; + if (serverVar != null) + { + return tuple.Item2 == null || tuple.Item2.Equals(serverVar, StringComparison.OrdinalIgnoreCase); + } + } + + return false; + } + + /// + /// Gets a value which indicates whether the current request requests a static resource, like .txt, .pdf, .js, .css etc. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool IsStaticResourceRequested(this HttpContext context) { - if (context?.Request == null) - return false; - - return context.GetItem( - "IsStaticResourceRequested", - () => WebHelper.IsStaticResourceRequested(context.Request), - true); - } - - [SuppressMessage("ReSharper", "PossibleNullReferenceException")] + return IsStaticResourceRequested(new HttpContextWrapper(context)); + } + + /// + /// Gets a value which indicates whether the current request requests a static resource, like .txt, .pdf, .js, .css etc. + /// + public static bool IsStaticResourceRequested(this HttpContextBase context) + { + if (context?.Request == null) + return false; + + return context.GetItem( + "IsStaticResourceRequested", + () => WebHelper.IsStaticResourceRequested(context.Request), + true); + } + + [SuppressMessage("ReSharper", "PossibleNullReferenceException")] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void SetFormsAuthenticationCookie(this HttpWebRequest webRequest, HttpRequestBase httpRequest) - { - CopyCookie(webRequest, httpRequest, FormsAuthentication.FormsCookieName); - } + { + CopyCookie(webRequest, httpRequest, FormsAuthentication.FormsCookieName); + } - [SuppressMessage("ReSharper", "PossibleNullReferenceException")] + [SuppressMessage("ReSharper", "PossibleNullReferenceException")] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void SetAnonymousIdentCookie(this HttpWebRequest webRequest, HttpRequestBase httpRequest) - { - CopyCookie(webRequest, httpRequest, "SMARTSTORE.ANONYMOUS"); - } + { + CopyCookie(webRequest, httpRequest, "SMARTSTORE.ANONYMOUS"); + } [SuppressMessage("ReSharper", "PossibleNullReferenceException")] [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -221,124 +220,124 @@ public static void SetVisitorCookie(this HttpWebRequest webRequest, HttpRequestB } private static void CopyCookie(HttpWebRequest webRequest, HttpRequestBase sourceHttpRequest, string cookieName) - { - Guard.NotNull(webRequest, nameof(webRequest)); - Guard.NotNull(sourceHttpRequest, nameof(sourceHttpRequest)); - Guard.NotEmpty(cookieName, nameof(cookieName)); + { + Guard.NotNull(webRequest, nameof(webRequest)); + Guard.NotNull(sourceHttpRequest, nameof(sourceHttpRequest)); + Guard.NotEmpty(cookieName, nameof(cookieName)); - var sourceCookie = sourceHttpRequest.Cookies[cookieName]; - if (sourceCookie == null) - return; + var sourceCookie = sourceHttpRequest.Cookies[cookieName]; + if (sourceCookie == null) + return; - var sendCookie = new Cookie(sourceCookie.Name, sourceCookie.Value, sourceCookie.Path, sourceHttpRequest.Url.Host); + var sendCookie = new Cookie(sourceCookie.Name, sourceCookie.Value, sourceCookie.Path, sourceHttpRequest.Url.Host); - if (webRequest.CookieContainer == null) - { - webRequest.CookieContainer = new CookieContainer(); - } + if (webRequest.CookieContainer == null) + { + webRequest.CookieContainer = new CookieContainer(); + } - webRequest.CookieContainer.Add(sendCookie); - } + webRequest.CookieContainer.Add(sendCookie); + } - public static string BuildScopedKey(this Cache cache, string key) - { - return key.HasValue() ? CacheRegionName + key : null; - } + public static string BuildScopedKey(this Cache cache, string key) + { + return key.HasValue() ? CacheRegionName + key : null; + } - public static T GetOrAdd(this Cache cache, string key, Func acquirer, TimeSpan? duration = null) - { - Guard.NotEmpty(key, nameof(key)); - Guard.NotNull(acquirer, nameof(acquirer)); + public static T GetOrAdd(this Cache cache, string key, Func acquirer, TimeSpan? duration = null) + { + Guard.NotEmpty(key, nameof(key)); + Guard.NotNull(acquirer, nameof(acquirer)); - object obj = cache.Get(key); + object obj = cache.Get(key); - if (obj != null) - { - return (T)obj; - } + if (obj != null) + { + return (T)obj; + } - var value = acquirer(); + var value = acquirer(); - var absoluteExpiration = Cache.NoAbsoluteExpiration; - if (duration.HasValue) - { - absoluteExpiration = DateTime.UtcNow + duration.Value; - } + var absoluteExpiration = Cache.NoAbsoluteExpiration; + if (duration.HasValue) + { + absoluteExpiration = DateTime.UtcNow + duration.Value; + } - cache.Insert(key, value, null, Cache.NoAbsoluteExpiration, Cache.NoSlidingExpiration); + cache.Insert(key, value, null, Cache.NoAbsoluteExpiration, Cache.NoSlidingExpiration); - return value; - } + return value; + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void RememberAppRelativePath(this HttpContextBase httpContext) - { - httpContext.Items[RememberPathKey] = httpContext.Request.AppRelativeCurrentExecutionFilePath; - } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void RememberAppRelativePath(this HttpContextBase httpContext) + { + httpContext.Items[RememberPathKey] = httpContext.Request.AppRelativeCurrentExecutionFilePath; + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string GetOriginalAppRelativePath(this HttpContextBase httpContext) - { - return GetItem(httpContext, RememberPathKey, forceCreation: false) ?? httpContext.Request.AppRelativeCurrentExecutionFilePath; - } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static string GetOriginalAppRelativePath(this HttpContextBase httpContext) + { + return GetItem(httpContext, RememberPathKey, forceCreation: false) ?? httpContext.Request.AppRelativeCurrentExecutionFilePath; + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static T GetItem(this HttpContext httpContext, string key, Func factory = null, bool forceCreation = true) - { - return GetItem(new HttpContextWrapper(httpContext), key, factory, forceCreation); - } - - public static T GetItem(this HttpContextBase httpContext, string key, Func factory = null, bool forceCreation = true) - { - Guard.NotEmpty(key, nameof(key)); - - var items = httpContext?.Items; - if (items == null) - { - return default(T); - } - - if (items.Contains(key)) - { - return (T)items[key]; - } - else - { - if (forceCreation) - { - var item = items[key] = (factory ?? (() => Activator.CreateInstance())).Invoke(); - return (T)item; - } - else - { - return default(T); - } - } - } - - public static void RemoveByPattern(this Cache cache, string pattern) - { - var keys = cache.AllKeys(pattern); - - foreach (var key in keys.ToArray()) - { - cache.Remove(key); - } - } - - public static string[] AllKeys(this Cache cache, string pattern) - { - pattern = pattern == "*" ? CacheRegionName : pattern; - - var keys = from entry in HttpRuntime.Cache.AsParallel().Cast() - let key = entry.Key.ToString() - where key.StartsWith(pattern, StringComparison.OrdinalIgnoreCase) - select key; - - return keys.ToArray(); - } - - public static ControllerContext GetRootControllerContext(this ControllerContext controllerContext) + { + return GetItem(new HttpContextWrapper(httpContext), key, factory, forceCreation); + } + + public static T GetItem(this HttpContextBase httpContext, string key, Func factory = null, bool forceCreation = true) + { + Guard.NotEmpty(key, nameof(key)); + + var items = httpContext?.Items; + if (items == null) + { + return default(T); + } + + if (items.Contains(key)) + { + return (T)items[key]; + } + else + { + if (forceCreation) + { + var item = items[key] = (factory ?? (() => Activator.CreateInstance())).Invoke(); + return (T)item; + } + else + { + return default(T); + } + } + } + + public static void RemoveByPattern(this Cache cache, string pattern) + { + var keys = cache.AllKeys(pattern); + + foreach (var key in keys.ToArray()) + { + cache.Remove(key); + } + } + + public static string[] AllKeys(this Cache cache, string pattern) + { + pattern = pattern == "*" ? CacheRegionName : pattern; + + var keys = from entry in HttpRuntime.Cache.AsParallel().Cast() + let key = entry.Key.ToString() + where key.StartsWith(pattern, StringComparison.OrdinalIgnoreCase) + select key; + + return keys.ToArray(); + } + + public static ControllerContext GetRootControllerContext(this ControllerContext controllerContext) { Guard.NotNull(controllerContext, nameof(controllerContext)); @@ -367,5 +366,5 @@ public static bool IsBareBonePage(this ControllerContext controllerContext) return false; } - } + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/IOExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/IOExtensions.cs index 707dd26914..c4a8f10848 100644 --- a/src/Libraries/SmartStore.Core/Extensions/IOExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/IOExtensions.cs @@ -1,66 +1,65 @@ using System; -using System.Collections.Generic; using System.IO; using System.Threading.Tasks; namespace SmartStore { - public static class IOExtensions - { - public static bool WaitForUnlock(this FileInfo file, int timeoutMs = 1000) - { - Guard.NotNull(file, nameof(file)); + public static class IOExtensions + { + public static bool WaitForUnlock(this FileInfo file, int timeoutMs = 1000) + { + Guard.NotNull(file, nameof(file)); - var wait = TimeSpan.FromMilliseconds(50); - var attempts = Math.Floor(timeoutMs / wait.TotalMilliseconds); + var wait = TimeSpan.FromMilliseconds(50); + var attempts = Math.Floor(timeoutMs / wait.TotalMilliseconds); - try - { - for (var i = 0; i < attempts; i++) - { - if (!IsFileLocked(file)) - { - return true; - } + try + { + for (var i = 0; i < attempts; i++) + { + if (!IsFileLocked(file)) + { + return true; + } - Task.Delay(wait).Wait(); - } + Task.Delay(wait).Wait(); + } - return false; - } - catch - { - return false; - } - } - - public static bool IsFileLocked(this FileInfo file) - { - if (file == null) - return false; + return false; + } + catch + { + return false; + } + } - FileStream stream = null; + public static bool IsFileLocked(this FileInfo file) + { + if (file == null) + return false; - try - { - stream = file.Open(FileMode.Open, FileAccess.ReadWrite, FileShare.None); - } - catch (IOException) - { - // The file is unavailable because it is: - // still being written to - // or being processed by another thread - // or does not exist (has already been processed) - return true; - } - finally - { - if (stream != null) - stream.Close(); - } + FileStream stream = null; - // File is not locked - return false; - } - } + try + { + stream = file.Open(FileMode.Open, FileAccess.ReadWrite, FileShare.None); + } + catch (IOException) + { + // The file is unavailable because it is: + // still being written to + // or being processed by another thread + // or does not exist (has already been processed) + return true; + } + finally + { + if (stream != null) + stream.Close(); + } + + // File is not locked + return false; + } + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/LinqExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/LinqExtensions.cs index 8c8df01019..0fb5786eaa 100644 --- a/src/Libraries/SmartStore.Core/Extensions/LinqExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/LinqExtensions.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; using System.Linq.Expressions; using System.Reflection; using System.Runtime.CompilerServices; @@ -22,34 +20,34 @@ public static FieldInfo ExtractFieldInfo(this LambdaExpression propertyAccessor) return propertyAccessor.ExtractMemberInfo() as FieldInfo; } - [SuppressMessage("ReSharper", "CanBeReplacedWithTryCastAndCheckForNull")] - public static MemberInfo ExtractMemberInfo(this LambdaExpression propertyAccessor) + [SuppressMessage("ReSharper", "CanBeReplacedWithTryCastAndCheckForNull")] + public static MemberInfo ExtractMemberInfo(this LambdaExpression propertyAccessor) { - if (propertyAccessor == null) - throw new ArgumentNullException(nameof(propertyAccessor)); + if (propertyAccessor == null) + throw new ArgumentNullException(nameof(propertyAccessor)); - MemberInfo info; + MemberInfo info; try { MemberExpression operand; // o => o.PropertyOrField LambdaExpression expression = propertyAccessor; - // If the property is not an Object, then the member access expression will be wrapped in a conversion expression - // (object)o.PropertyOrField - - if (expression.Body is UnaryExpression body) - { - // o.PropertyOrField - operand = (MemberExpression)body.Operand; - } - else - { - // o.PropertyOrField - operand = (MemberExpression)expression.Body; - } - - // Member - MemberInfo member = operand.Member; + // If the property is not an Object, then the member access expression will be wrapped in a conversion expression + // (object)o.PropertyOrField + + if (expression.Body is UnaryExpression body) + { + // o.PropertyOrField + operand = (MemberExpression)body.Operand; + } + else + { + // o.PropertyOrField + operand = (MemberExpression)expression.Body; + } + + // Member + MemberInfo member = operand.Member; info = member; } catch (Exception e) diff --git a/src/Libraries/SmartStore.Core/Extensions/MiscExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/MiscExtensions.cs index d5e3eb1685..dc7cac2c34 100644 --- a/src/Libraries/SmartStore.Core/Extensions/MiscExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/MiscExtensions.cs @@ -8,18 +8,18 @@ namespace SmartStore { public static class MiscExtensions { - public static void Dump(this Exception exception) - { - try - { - exception.StackTrace.Dump(); - exception.Message.Dump(); - } - catch { } - } - - public static string ToAllMessages(this Exception exception, bool includeStackTrace = false) - { + public static void Dump(this Exception exception) + { + try + { + exception.StackTrace.Dump(); + exception.Message.Dump(); + } + catch { } + } + + public static string ToAllMessages(this Exception exception, bool includeStackTrace = false) + { var psb = PooledStringBuilder.Rent(); var sb = (StringBuilder)psb; @@ -46,19 +46,19 @@ public static string ToAllMessages(this Exception exception, bool includeStackTr } return psb.ToStringAndReturn(); - } + } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string ToElapsedMinutes(this Stopwatch watch) + public static string ToElapsedMinutes(this Stopwatch watch) { - return "{0:0.0}".FormatWith(TimeSpan.FromMilliseconds(watch.ElapsedMilliseconds).TotalMinutes); - } + return "{0:0.0}".FormatWith(TimeSpan.FromMilliseconds(watch.ElapsedMilliseconds).TotalMinutes); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string ToElapsedSeconds(this Stopwatch watch) + public static string ToElapsedSeconds(this Stopwatch watch) { - return "{0:0.0}".FormatWith(TimeSpan.FromMilliseconds(watch.ElapsedMilliseconds).TotalSeconds); - } + return "{0:0.0}".FormatWith(TimeSpan.FromMilliseconds(watch.ElapsedMilliseconds).TotalSeconds); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsNullOrDefault(this T? value) where T : struct @@ -66,43 +66,43 @@ public static bool IsNullOrDefault(this T? value) where T : struct return default(T).Equals(value.GetValueOrDefault()); } - /// - /// Converts bytes into a hex string. - /// - public static string ToHexString(this byte[] bytes, int length = 0) - { + /// + /// Converts bytes into a hex string. + /// + public static string ToHexString(this byte[] bytes, int length = 0) + { if (bytes == null || bytes.Length <= 0) { return ""; } - var sb = new StringBuilder(); + var sb = new StringBuilder(); - foreach (byte b in bytes) - { - sb.Append(b.ToString("x2")); + foreach (byte b in bytes) + { + sb.Append(b.ToString("x2")); if (length > 0 && sb.Length >= length) { break; } - } - - return sb.ToString(); - } - - /// - /// Append grow if string builder is empty. Append delimiter and grow otherwise. - /// - /// Target string builder - /// Value to append - /// Delimiter to use - public static void Grow(this StringBuilder sb, string grow, string delimiter) - { + } + + return sb.ToString(); + } + + /// + /// Append grow if string builder is empty. Append delimiter and grow otherwise. + /// + /// Target string builder + /// Value to append + /// Delimiter to use + public static void Grow(this StringBuilder sb, string grow, string delimiter) + { Guard.NotNull(delimiter, nameof(delimiter)); - if (!string.IsNullOrWhiteSpace(grow)) - { + if (!string.IsNullOrWhiteSpace(grow)) + { if (sb.Length <= 0) { sb.Append(grow); @@ -111,13 +111,13 @@ public static void Grow(this StringBuilder sb, string grow, string delimiter) { sb.AppendFormat("{0}{1}", delimiter, grow); } - } - } + } + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string SafeGet(this string[] arr, int index) - { - return arr != null && index < arr.Length ? arr[index] : ""; - } + { + return arr != null && index < arr.Length ? arr[index] : ""; + } } } diff --git a/src/Libraries/SmartStore.Core/Extensions/NumericExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/NumericExtensions.cs index e31eed7d2c..a1449ffe05 100644 --- a/src/Libraries/SmartStore.Core/Extensions/NumericExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/NumericExtensions.cs @@ -6,18 +6,18 @@ namespace SmartStore { public static class NumericExtensions - { - #region int + { + #region int - public static int GetRange(this int id, int size, out int lower) - { + public static int GetRange(this int id, int size, out int lower) + { // max 1000 values per cache item var range = (int)Math.Ceiling((decimal)id / size) * size; - lower = range - (size - 1); + lower = range - (size - 1); - return range; - } + return range; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int? ZeroToNull(this int? value) @@ -37,16 +37,16 @@ public static int GetRange(this int id, int size, out int lower) /// Rounding decimal number /// Tax percentage public static decimal ToTaxPercentage(this decimal inclTax, decimal exclTax, int? decimals = null) - { - if (exclTax == decimal.Zero) - { - return decimal.Zero; - } + { + if (exclTax == decimal.Zero) + { + return decimal.Zero; + } - var result = ((inclTax / exclTax) - 1.0M) * 100.0M; + var result = ((inclTax / exclTax) - 1.0M) * 100.0M; - return (decimals.HasValue ? Math.Round(result, decimals.Value) : result); - } + return (decimals.HasValue ? Math.Round(result, decimals.Value) : result); + } /// /// Converts to smallest currency uint, e.g. cents @@ -55,9 +55,9 @@ public static decimal ToTaxPercentage(this decimal inclTax, decimal exclTax, int /// Smallest currency unit [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int ToSmallestCurrencyUnit(this decimal value, MidpointRounding midpoint = MidpointRounding.AwayFromZero) - { - return Convert.ToInt32(Math.Round(value * 100, 0, midpoint)); - } + { + return Convert.ToInt32(Math.Round(value * 100, 0, midpoint)); + } /// /// Round decimal to the nearest multiple of denomination @@ -68,14 +68,14 @@ public static int ToSmallestCurrencyUnit(this decimal value, MidpointRounding mi /// Rounded value [MethodImpl(MethodImplOptions.AggressiveInlining)] public static decimal RoundToNearest(this decimal value, decimal denomination, MidpointRounding midpoint = MidpointRounding.AwayFromZero) - { - if (denomination == decimal.Zero) - { - return value; - } + { + if (denomination == decimal.Zero) + { + return value; + } - return Math.Round(value / denomination, midpoint) * denomination; - } + return Math.Round(value / denomination, midpoint) * denomination; + } /// /// Round decimal up or down to the nearest multiple of denomination @@ -140,10 +140,10 @@ public static decimal RoundToNearest(this decimal value, Currency currency, out /// Rounded value public static decimal RoundIfEnabledFor(this decimal value, Currency currency) { - if (currency == null) - throw new ArgumentNullException(nameof(currency)); + if (currency == null) + throw new ArgumentNullException(nameof(currency)); - if (currency.RoundOrderItemsEnabled) + if (currency.RoundOrderItemsEnabled) { return Math.Round(value, currency.RoundNumDecimals); } @@ -159,10 +159,10 @@ public static decimal RoundIfEnabledFor(this decimal value, Currency currency) /// Rounded and formated value [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string FormatInvariant(this decimal value, int decimals = 2) - { - return Math.Round(value, decimals).ToString("0.00", CultureInfo.InvariantCulture); - } + { + return Math.Round(value, decimals).ToString("0.00", CultureInfo.InvariantCulture); + } - #endregion - } + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/ProcessExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/ProcessExtensions.cs index ae4d99a145..a14e6e5213 100644 --- a/src/Libraries/SmartStore.Core/Extensions/ProcessExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/ProcessExtensions.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; +using System.Diagnostics; using System.Threading; using System.Threading.Tasks; @@ -30,7 +26,7 @@ public static class ProcessExtensions { tcs.TrySetResult(process.ExitCode); }; - + if (process.HasExited) { return process.ExitCode; @@ -39,7 +35,7 @@ public static class ProcessExtensions using (var registration = cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken))) { return await tcs.Task.ConfigureAwait(false); - } + } } } } diff --git a/src/Libraries/SmartStore.Core/Extensions/RegexExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/RegexExtensions.cs index 02bc3d5ab5..0e29ac7926 100644 --- a/src/Libraries/SmartStore.Core/Extensions/RegexExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/RegexExtensions.cs @@ -5,41 +5,41 @@ namespace SmartStore { - public static class RegexExtensions - { - public static string ReplaceGroup(this Regex regex, string input, string groupName, string replacement) - { - return ReplaceGroupInternal(regex, input, replacement, m => m.Groups[groupName]); - } - - public static string ReplaceGroup(this Regex regex, string input, int groupNum, string replacement) - { - return ReplaceGroupInternal(regex, input, replacement, m => m.Groups[groupNum]); - } - - private static string ReplaceGroupInternal(this Regex regex, string input, string replacement, Func groupGetter) - { - return regex.Replace(input, match => - { - var group = groupGetter(match); - var sb = new StringBuilder(); - var previousCaptureEnd = 0; - - foreach (var capture in group.Captures.Cast()) - { - var currentCaptureEnd = capture.Index + capture.Length - match.Index; - var currentCaptureLength = capture.Index - match.Index - previousCaptureEnd; - - sb.Append(match.Value.Substring(previousCaptureEnd, currentCaptureLength)); - sb.Append(replacement); - - previousCaptureEnd = currentCaptureEnd; - } - - sb.Append(match.Value.Substring(previousCaptureEnd)); - - return sb.ToString(); - }); - } - } + public static class RegexExtensions + { + public static string ReplaceGroup(this Regex regex, string input, string groupName, string replacement) + { + return ReplaceGroupInternal(regex, input, replacement, m => m.Groups[groupName]); + } + + public static string ReplaceGroup(this Regex regex, string input, int groupNum, string replacement) + { + return ReplaceGroupInternal(regex, input, replacement, m => m.Groups[groupNum]); + } + + private static string ReplaceGroupInternal(this Regex regex, string input, string replacement, Func groupGetter) + { + return regex.Replace(input, match => + { + var group = groupGetter(match); + var sb = new StringBuilder(); + var previousCaptureEnd = 0; + + foreach (var capture in group.Captures.Cast()) + { + var currentCaptureEnd = capture.Index + capture.Length - match.Index; + var currentCaptureLength = capture.Index - match.Index - previousCaptureEnd; + + sb.Append(match.Value.Substring(previousCaptureEnd, currentCaptureLength)); + sb.Append(replacement); + + previousCaptureEnd = currentCaptureEnd; + } + + sb.Append(match.Value.Substring(previousCaptureEnd)); + + return sb.ToString(); + }); + } + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs index 845d7a9a79..94ad48d31e 100644 --- a/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs @@ -1,58 +1,57 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; using System.Web.Routing; // use base SmartStore Namespace to ensure the extension methods are always available namespace SmartStore { - public static class RouteExtensions - { - public static string GetAreaName(this RouteData routeData) - { - if (routeData.DataTokens.TryGetValue("area", out object area)) - { - return (area as string); - } - - return routeData.Route.GetAreaName(); - } - - public static string GetAreaName(this RouteBase route) - { - var area = route as IRouteWithArea; - if (area != null) - { - return area.Area; - } - - var route2 = route as Route; - if ((route2 != null) && (route2.DataTokens != null)) - { - return (route2.DataTokens["area"] as string); - } - - return null; - } + public static class RouteExtensions + { + public static string GetAreaName(this RouteData routeData) + { + if (routeData.DataTokens.TryGetValue("area", out object area)) + { + return (area as string); + } + + return routeData.Route.GetAreaName(); + } + + public static string GetAreaName(this RouteBase route) + { + var area = route as IRouteWithArea; + if (area != null) + { + return area.Area; + } + + var route2 = route as Route; + if ((route2 != null) && (route2.DataTokens != null)) + { + return (route2.DataTokens["area"] as string); + } + + return null; + } /// /// Generates an identifier for the given route in the form "[{area}.]{controller}.{action}" /// public static string GenerateRouteIdentifier(this RouteData routeData) - { - string area = routeData.GetAreaName(); - string controller = routeData.GetRequiredString("controller"); - string action = routeData.GetRequiredString("action"); + { + string area = routeData.GetAreaName(); + string controller = routeData.GetRequiredString("controller"); + string action = routeData.GetRequiredString("action"); - return "{0}{1}.{2}".FormatInvariant(area.HasValue() ? area + "." : "", controller, action); - } + return "{0}{1}.{2}".FormatInvariant(area.HasValue() ? area + "." : "", controller, action); + } - public static bool IsRouteEqual(this RouteData routeData, string controller, string action) - { - if (routeData == null) - return false; + public static bool IsRouteEqual(this RouteData routeData, string controller, string action) + { + if (routeData == null) + return false; - return routeData.GetRequiredString("controller").IsCaseInsensitiveEqual(controller) && routeData.GetRequiredString("action").IsCaseInsensitiveEqual(action); - } + return routeData.GetRequiredString("controller").IsCaseInsensitiveEqual(controller) && routeData.GetRequiredString("action").IsCaseInsensitiveEqual(action); + } - } + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/StreamExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/StreamExtensions.cs index ba62a83fe2..2e3a6e94ba 100644 --- a/src/Libraries/SmartStore.Core/Extensions/StreamExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/StreamExtensions.cs @@ -1,25 +1,25 @@ using System; -using System.Text; +using System.Diagnostics; using System.IO; using System.Runtime.CompilerServices; +using System.Text; using SmartStore.Core.IO; -using System.Diagnostics; namespace SmartStore { - public static class StreamExtensions - { + public static class StreamExtensions + { [MethodImpl(MethodImplOptions.AggressiveInlining)] public static StreamReader ToStreamReader(this Stream stream, bool leaveOpen) - { - return new StreamReader(stream, Encoding.UTF8, true, 0x400, leaveOpen); - } + { + return new StreamReader(stream, Encoding.UTF8, true, 0x400, leaveOpen); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static StreamReader ToStreamReader(this Stream stream, Encoding encoding, bool detectEncoding, int bufferSize, bool leaveOpen) - { - return new StreamReader(stream, encoding, detectEncoding, bufferSize, leaveOpen); - } + { + return new StreamReader(stream, encoding, detectEncoding, bufferSize, leaveOpen); + } public static Stream MakeSeekable(this Stream stream) { @@ -31,50 +31,50 @@ public static Stream MakeSeekable(this Stream stream) return new SeekableReadOnlyStream(stream, (int)stream.Length); } - public static bool ToFile(this Stream srcStream, string path) + public static bool ToFile(this Stream srcStream, string path) { - if (srcStream == null) - return false; + if (srcStream == null) + return false; - const int BuffSize = 32768; - var result = true; - Stream dstStream = null; - var buffer = new byte[BuffSize]; + const int BuffSize = 32768; + var result = true; + Stream dstStream = null; + var buffer = new byte[BuffSize]; - try + try { using (dstStream = File.Open(path, FileMode.Create)) { - int len; + int len; while ((len = srcStream.Read(buffer, 0, BuffSize)) > 0) { dstStream.Write(buffer, 0, len); } - } + } } - catch + catch { - result = false; - } - finally - { - if (dstStream != null) - { - dstStream.Close(); - dstStream.Dispose(); - } - } - - return (result && File.Exists(path)); - } - - public static bool ContentsEqual(this Stream src, Stream other, bool? forceLengthCompare = null) + result = false; + } + finally + { + if (dstStream != null) + { + dstStream.Close(); + dstStream.Dispose(); + } + } + + return (result && File.Exists(path)); + } + + public static bool ContentsEqual(this Stream src, Stream other, bool? forceLengthCompare = null) { - if (src == null) - throw new ArgumentNullException(nameof(src)); + if (src == null) + throw new ArgumentNullException(nameof(src)); - if (other == null) - throw new ArgumentNullException(nameof(other)); + if (other == null) + throw new ArgumentNullException(nameof(other)); if (src == other) { @@ -98,13 +98,13 @@ public static bool ContentsEqual(this Stream src, Stream other, bool? forceLengt const int bufferSize = 1024 * intSize; // 2048; var buffer1 = new byte[bufferSize]; var buffer2 = new byte[bufferSize]; - + while (true) { int len1 = src.Read(buffer1, 0, bufferSize); int len2 = other.Read(buffer2, 0, bufferSize); - if (len1 != len2) + if (len1 != len2) return false; if (len1 == 0) @@ -120,7 +120,7 @@ public static bool ContentsEqual(this Stream src, Stream other, bool? forceLengt } } - return true; + return true; } } } diff --git a/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs index aca89620a3..efea7d0778 100644 --- a/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs @@ -17,13 +17,13 @@ namespace SmartStore { public static class StringExtensions { - public const string CarriageReturnLineFeed = "\r\n"; + public const string CarriageReturnLineFeed = "\r\n"; public const string Empty = ""; public const char CarriageReturn = '\r'; public const char LineFeed = '\n'; public const char Tab = '\t'; - private delegate void ActionLine(TextWriter textWriter, string line); + private delegate void ActionLine(TextWriter textWriter, string line); #region Char extensions @@ -73,22 +73,22 @@ internal static void WriteCharAsUnicode(char c, TextWriter writer) writer.Write(h4); } - public static char TryRemoveDiacritic(this char c) - { - var normalized = c.ToString().Normalize(NormalizationForm.FormD); - if (normalized.Length > 1) - { - return normalized[0]; - } + public static char TryRemoveDiacritic(this char c) + { + var normalized = c.ToString().Normalize(NormalizationForm.FormD); + if (normalized.Length > 1) + { + return normalized[0]; + } - return c; - } + return c; + } - #endregion + #endregion - #region String extensions + #region String extensions - [DebuggerStepThrough] + [DebuggerStepThrough] public static T ToEnum(this string value, T defaultValue) { if (!value.HasValue()) @@ -130,39 +130,39 @@ public static string NullEmpty(this string value) return (string.IsNullOrEmpty(value)) ? null : value; } - /// - /// Formats a string to an invariant culture - /// - /// The format string. - /// The objects. - /// - [DebuggerStepThrough] + /// + /// Formats a string to an invariant culture + /// + /// The format string. + /// The objects. + /// + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string FormatInvariant(this string format, params object[] objects) { return string.Format(CultureInfo.InvariantCulture, format, objects); } - /// - /// Formats a string to the current culture. - /// - /// The format string. - /// The objects. - /// - [DebuggerStepThrough] + /// + /// Formats a string to the current culture. + /// + /// The format string. + /// The objects. + /// + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string FormatCurrent(this string format, params object[] objects) { return string.Format(CultureInfo.CurrentCulture, format, objects); } - /// - /// Formats a string to the current UI culture. - /// - /// The format string. - /// The objects. - /// - [DebuggerStepThrough] + /// + /// Formats a string to the current UI culture. + /// + /// The format string. + /// The objects. + /// + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string FormatCurrentUI(this string format, params object[] objects) { @@ -182,30 +182,30 @@ public static string FormatWith(this string format, IFormatProvider provider, pa return string.Format(provider, format, args); } - /// - /// Determines whether this instance and another specified System.String object have the same value. - /// - /// The string to check equality. - /// The comparing with string. - /// - /// true if the value of the comparing parameter is the same as this string; otherwise, false. - /// - [DebuggerStepThrough] + /// + /// Determines whether this instance and another specified System.String object have the same value. + /// + /// The string to check equality. + /// The comparing with string. + /// + /// true if the value of the comparing parameter is the same as this string; otherwise, false. + /// + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsCaseSensitiveEqual(this string value, string comparing) { return string.CompareOrdinal(value, comparing) == 0; } - /// - /// Determines whether this instance and another specified System.String object have the same value. - /// - /// The string to check equality. - /// The comparing with string. - /// - /// true if the value of the comparing parameter is the same as this string; otherwise, false. - /// - [DebuggerStepThrough] + /// + /// Determines whether this instance and another specified System.String object have the same value. + /// + /// The string to check equality. + /// The comparing with string. + /// + /// true if the value of the comparing parameter is the same as this string; otherwise, false. + /// + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsCaseInsensitiveEqual(this string value, string comparing) { @@ -219,23 +219,23 @@ public static bool IsCaseInsensitiveEqual(this string value, string comparing) [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsEmpty(this string value) { - return string.IsNullOrWhiteSpace(value); + return string.IsNullOrWhiteSpace(value); } - /// - /// Determines whether the string is all white space. Empty string will return false. - /// - /// The string to test whether it is all white space. - /// - /// true if the string is all white space; otherwise, false. - /// - [DebuggerStepThrough] + /// + /// Determines whether the string is all white space. Empty string will return false. + /// + /// The string to test whether it is all white space. + /// + /// true if the string is all white space; otherwise, false. + /// + [DebuggerStepThrough] public static bool IsWhiteSpace(this string value) { - if (value == null) - throw new ArgumentNullException(nameof(value)); + if (value == null) + throw new ArgumentNullException(nameof(value)); - if (value.Length == 0) + if (value.Length == 0) return false; for (int i = 0; i < value.Length; i++) @@ -254,73 +254,73 @@ public static bool HasValue(this string value) return !string.IsNullOrWhiteSpace(value); } - /// to get equivalent result to PHPs md5 function call Hash("my value", Encoding.ASCII, false). + /// to get equivalent result to PHPs md5 function call Hash("my value", Encoding.ASCII, false). [DebuggerStepThrough] - public static string Hash(this string value, Encoding encoding, bool toBase64 = false) + public static string Hash(this string value, Encoding encoding, bool toBase64 = false) { - if (value.IsEmpty()) - return value; + if (value.IsEmpty()) + return value; using (var md5 = MD5.Create()) { - byte[] data = encoding.GetBytes(value); + byte[] data = encoding.GetBytes(value); - if (toBase64) + if (toBase64) { - byte[] hash = md5.ComputeHash(data); - return Convert.ToBase64String(hash); - } - else + byte[] hash = md5.ComputeHash(data); + return Convert.ToBase64String(hash); + } + else { - return md5.ComputeHash(data).ToHexString().ToLower(); - } + return md5.ComputeHash(data).ToHexString().ToLower(); + } } } - /// - /// Mask by replacing characters with asterisks. - /// - /// The string - /// Number of characters to leave untouched. - /// The mask string - [DebuggerStepThrough] - public static string Mask(this string value, int length) - { - if (value.HasValue()) - return value.Substring(0, length) + new String('*', value.Length - length); + /// + /// Mask by replacing characters with asterisks. + /// + /// The string + /// Number of characters to leave untouched. + /// The mask string + [DebuggerStepThrough] + public static string Mask(this string value, int length) + { + if (value.HasValue()) + return value.Substring(0, length) + new String('*', value.Length - length); - return value; - } + return value; + } private static bool IsWebUrlInternal(string value, bool schemeIsOptional) { - if (String.IsNullOrEmpty(value)) - return false; + if (String.IsNullOrEmpty(value)) + return false; - value = value.Trim().ToLowerInvariant(); + value = value.Trim().ToLowerInvariant(); - if (schemeIsOptional && value.StartsWith("//")) - { - value = "http:" + value; - } + if (schemeIsOptional && value.StartsWith("//")) + { + value = "http:" + value; + } - return Uri.IsWellFormedUriString(value, UriKind.Absolute) && - (value.StartsWith("http://") || value.StartsWith("https://") || value.StartsWith("ftp://")); - } + return Uri.IsWellFormedUriString(value, UriKind.Absolute) && + (value.StartsWith("http://") || value.StartsWith("https://") || value.StartsWith("ftp://")); + } - [DebuggerStepThrough] - public static bool IsWebUrl(this string value) - { - return IsWebUrlInternal(value, false); - } + [DebuggerStepThrough] + public static bool IsWebUrl(this string value) + { + return IsWebUrlInternal(value, false); + } - [DebuggerStepThrough] - public static bool IsWebUrl(this string value, bool schemeIsOptional) - { - return IsWebUrlInternal(value, schemeIsOptional); - } + [DebuggerStepThrough] + public static bool IsWebUrl(this string value, bool schemeIsOptional) + { + return IsWebUrlInternal(value, schemeIsOptional); + } - [DebuggerStepThrough] + [DebuggerStepThrough] public static bool IsEmail(this string value) { return !String.IsNullOrEmpty(value) && RegularExpressions.IsEmail.IsMatch(value.Trim()); @@ -338,19 +338,19 @@ public static bool IsNumeric(this string value) RegularExpressions.IsNumeric.IsMatch(value); } - /// - /// Ensures that a string only contains numeric values - /// - /// Input string - /// Input string with only numeric values, empty string if input is null or empty - [DebuggerStepThrough] - public static string EnsureNumericOnly(this string str) - { - if (String.IsNullOrEmpty(str)) - return string.Empty; + /// + /// Ensures that a string only contains numeric values + /// + /// Input string + /// Input string with only numeric values, empty string if input is null or empty + [DebuggerStepThrough] + public static string EnsureNumericOnly(this string str) + { + if (String.IsNullOrEmpty(str)) + return string.Empty; - return new String(str.Where(c => Char.IsDigit(c)).ToArray()); - } + return new String(str.Where(c => Char.IsDigit(c)).ToArray()); + } [DebuggerStepThrough] public static bool IsAlpha(this string value) @@ -367,12 +367,12 @@ public static bool IsAlphaNumeric(this string value) [DebuggerStepThrough] public static string Truncate(this string value, int maxLength, string suffix = "") { - if (suffix == null) - throw new ArgumentNullException(nameof(suffix)); + if (suffix == null) + throw new ArgumentNullException(nameof(suffix)); Guard.IsPositive(maxLength, nameof(maxLength)); - int subStringLength = maxLength - suffix.Length; + int subStringLength = maxLength - suffix.Length; if (subStringLength <= 0) throw Error.Argument(nameof(maxLength), "Length of suffix string is greater or equal to maximumLength"); @@ -392,142 +392,142 @@ public static string Truncate(this string value, int maxLength, string suffix = } } - /// - /// Removes all redundant whitespace (empty lines, double space etc.). - /// Use ~! literal to keep whitespace wherever necessary. - /// - /// Input - /// The compacted string - public static string Compact(this string input, bool removeEmptyLines = false) - { - Guard.NotNull(input, nameof(input)); + /// + /// Removes all redundant whitespace (empty lines, double space etc.). + /// Use ~! literal to keep whitespace wherever necessary. + /// + /// Input + /// The compacted string + public static string Compact(this string input, bool removeEmptyLines = false) + { + Guard.NotNull(input, nameof(input)); var psb = PooledStringBuilder.Rent(); var sb = (StringBuilder)psb; var lines = GetLines(input.Trim(), true, removeEmptyLines).ToArray(); - foreach (var line in lines) - { - var len = line.Length; + foreach (var line in lines) + { + var len = line.Length; var psbLine = PooledStringBuilder.Rent(); var sbLine = (StringBuilder)psbLine; - var isChar = false; - var isLiteral = false; // When we detect the ~! literal - int i = 0; - var eof = false; - - for (i = 0; i < len; i++) - { - var c = line[i]; - - eof = i == len - 1; - - if (Char.IsWhiteSpace(c)) - { - // Space, Tab etc. - if (isChar) - { - // If last char not empty, append the space. - sbLine.Append(' '); - } - - isLiteral = false; - isChar = false; - } - else - { - // Char or Literal (~!) - - isLiteral = c == '~' && !eof && line[i + 1] == '!'; - isChar = true; - - if (isLiteral) - { - sbLine.Append(' '); - i++; // skip next "!" char - } - else - { - sbLine.Append(c); - } - } - } - - // Append the compacted and trimmed line - sb.AppendLine(sbLine.ToString().Trim().Trim(',')); + var isChar = false; + var isLiteral = false; // When we detect the ~! literal + int i = 0; + var eof = false; + + for (i = 0; i < len; i++) + { + var c = line[i]; + + eof = i == len - 1; + + if (Char.IsWhiteSpace(c)) + { + // Space, Tab etc. + if (isChar) + { + // If last char not empty, append the space. + sbLine.Append(' '); + } + + isLiteral = false; + isChar = false; + } + else + { + // Char or Literal (~!) + + isLiteral = c == '~' && !eof && line[i + 1] == '!'; + isChar = true; + + if (isLiteral) + { + sbLine.Append(' '); + i++; // skip next "!" char + } + else + { + sbLine.Append(c); + } + } + } + + // Append the compacted and trimmed line + sb.AppendLine(sbLine.ToString().Trim().Trim(',')); psbLine.Return(); } - return psb.ToStringAndReturn().Trim(); - } - - /// - /// Splits the input string by carriage return. - /// - /// The string to split - /// A sequence with string items per line - public static IEnumerable GetLines(this string input, bool trimLines = false, bool removeEmptyLines = false) - { - if (input.IsEmpty()) - { - yield break; - } - - using (var sr = new StringReader(input)) - { - string line; - while ((line = sr.ReadLine()) != null) - { - if (trimLines) - { - line = line.Trim(); - } - - if (removeEmptyLines && IsEmpty(line)) - { - continue; - } - - yield return line; - } - } - } - - /// - /// Ensure that a string starts with a string. - /// - /// The target string - /// The string the target string should start with - /// The resulting string - [DebuggerStepThrough] + return psb.ToStringAndReturn().Trim(); + } + + /// + /// Splits the input string by carriage return. + /// + /// The string to split + /// A sequence with string items per line + public static IEnumerable GetLines(this string input, bool trimLines = false, bool removeEmptyLines = false) + { + if (input.IsEmpty()) + { + yield break; + } + + using (var sr = new StringReader(input)) + { + string line; + while ((line = sr.ReadLine()) != null) + { + if (trimLines) + { + line = line.Trim(); + } + + if (removeEmptyLines && IsEmpty(line)) + { + continue; + } + + yield return line; + } + } + } + + /// + /// Ensure that a string starts with a string. + /// + /// The target string + /// The string the target string should start with + /// The resulting string + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string EnsureStartsWith(this string value, string startsWith) - { + { if (value == null) - throw new ArgumentNullException(nameof(value)); + throw new ArgumentNullException(nameof(value)); - if (startsWith == null) - throw new ArgumentNullException(nameof(startsWith)); + if (startsWith == null) + throw new ArgumentNullException(nameof(startsWith)); - return value.StartsWith(startsWith) ? value : (startsWith + value); - } + return value.StartsWith(startsWith) ? value : (startsWith + value); + } - /// - /// Ensures the target string ends with the specified string. - /// - /// The target. - /// The value. - /// The target string with the value string at the end. - [DebuggerStepThrough] + /// + /// Ensures the target string ends with the specified string. + /// + /// The target. + /// The value. + /// The target string with the value string at the end. + [DebuggerStepThrough] public static string EnsureEndsWith(this string value, string endWith) { - if (value == null) - throw new ArgumentNullException(nameof(value)); + if (value == null) + throw new ArgumentNullException(nameof(value)); - if (endWith == null) - throw new ArgumentNullException(nameof(endWith)); + if (endWith == null) + throw new ArgumentNullException(nameof(endWith)); - if (value.Length >= endWith.Length) + if (value.Length >= endWith.Length) { if (string.Compare(value, value.Length - endWith.Length, endWith, 0, endWith.Length, StringComparison.OrdinalIgnoreCase) == 0) return value; @@ -576,25 +576,25 @@ public static string HtmlDecode(this string value) return HttpUtility.HtmlDecode(value); } - [Obsolete("The 'removeTags' parameter is not supported anymore. Use the parameterless method instead.")] - public static string RemoveHtml(this string source, ICollection removeTags) - { - return RemoveHtml(source); - } + [Obsolete("The 'removeTags' parameter is not supported anymore. Use the parameterless method instead.")] + public static string RemoveHtml(this string source, ICollection removeTags) + { + return RemoveHtml(source); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string RemoveHtml(this string source) - { - return HtmlUtils.StripTags(source).Trim().HtmlDecode(); - } - - /// - /// Replaces pascal casing with spaces. For example "CustomerId" would become "Customer Id". - /// Strings that already contain spaces are ignored. - /// - /// String to split - /// The string after being split - [DebuggerStepThrough] + { + return HtmlUtils.StripTags(source).Trim().HtmlDecode(); + } + + /// + /// Replaces pascal casing with spaces. For example "CustomerId" would become "Customer Id". + /// Strings that already contain spaces are ignored. + /// + /// String to split + /// The string after being split + [DebuggerStepThrough] public static string SplitPascalCase(this string value) { var psb = PooledStringBuilder.Rent(); @@ -621,71 +621,71 @@ public static string SplitPascalCase(this string value) return psb.ToStringAndReturn(); } - /// - /// Splits a string into a string array - /// - /// String value to split - /// If null then value is searched for a common delimiter like pipe, semicolon or comma - /// String array - [DebuggerStepThrough] - public static string[] SplitSafe(this string value, string separator) - { - if (string.IsNullOrEmpty(value)) - return new string[0]; - - // Do not use separator.IsEmpty() here because whitespace like " " is a valid separator. - // an empty separator "" returns array with value. - if (separator == null) - { - for (var i = 0; i < value.Length; i++) - { - var c = value[i]; - if (c == ';' || c == ',' || c == '|') - { - return value.Split(new char[] { c }, StringSplitOptions.RemoveEmptyEntries); - } - if (c == '\r' && (i + 1) < value.Length & value[i + 1] == '\n') - { - return value.GetLines(false, true).ToArray(); - } - } - - return new string[] { value }; - } - else - { - return value.Split(new string[] { separator }, StringSplitOptions.RemoveEmptyEntries); - } - } - - /// Splits a string into two strings - /// true: success, false: failure - [DebuggerStepThrough] + /// + /// Splits a string into a string array + /// + /// String value to split + /// If null then value is searched for a common delimiter like pipe, semicolon or comma + /// String array + [DebuggerStepThrough] + public static string[] SplitSafe(this string value, string separator) + { + if (string.IsNullOrEmpty(value)) + return new string[0]; + + // Do not use separator.IsEmpty() here because whitespace like " " is a valid separator. + // an empty separator "" returns array with value. + if (separator == null) + { + for (var i = 0; i < value.Length; i++) + { + var c = value[i]; + if (c == ';' || c == ',' || c == '|') + { + return value.Split(new char[] { c }, StringSplitOptions.RemoveEmptyEntries); + } + if (c == '\r' && (i + 1) < value.Length & value[i + 1] == '\n') + { + return value.GetLines(false, true).ToArray(); + } + } + + return new string[] { value }; + } + else + { + return value.Split(new string[] { separator }, StringSplitOptions.RemoveEmptyEntries); + } + } + + /// Splits a string into two strings + /// true: success, false: failure + [DebuggerStepThrough] [SuppressMessage("ReSharper", "StringIndexOfIsCultureSpecific.1")] - public static bool SplitToPair(this string value, out string leftPart, out string rightPart, string delimiter, bool splitAfterLast = false) - { - leftPart = value; - rightPart = ""; + public static bool SplitToPair(this string value, out string leftPart, out string rightPart, string delimiter, bool splitAfterLast = false) + { + leftPart = value; + rightPart = ""; - if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(delimiter)) - { - return false; - } + if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(delimiter)) + { + return false; + } - var idx = splitAfterLast - ? value.LastIndexOf(delimiter) - : value.IndexOf(delimiter); + var idx = splitAfterLast + ? value.LastIndexOf(delimiter) + : value.IndexOf(delimiter); - if (idx == -1) - { - return false; - } + if (idx == -1) + { + return false; + } - leftPart = value.Substring(0, idx); - rightPart = value.Substring(idx + delimiter.Length); + leftPart = value.Substring(0, idx); + rightPart = value.Substring(idx + delimiter.Length); - return true; - } + return true; + } [DebuggerStepThrough] public static string EncodeJsString(this string value) @@ -785,58 +785,58 @@ public static string RemoveEncloser(this string value, string start, string end, return value; } - /// Debug.WriteLine + /// Debug.WriteLine [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void Dump(this string value, bool appendMarks = false) + public static void Dump(this string value, bool appendMarks = false) { - Debug.WriteLine(value); - Debug.WriteLineIf(appendMarks, "------------------------------------------------"); - } + Debug.WriteLine(value); + Debug.WriteLineIf(appendMarks, "------------------------------------------------"); + } - /// Smart way to create a HTML attribute with a leading space. - /// Name of the attribute. - /// - /// - [SuppressMessage("ReSharper", "StringCompareIsCultureSpecific.3")] - public static string ToAttribute(this string value, string name, bool htmlEncode = true) + /// Smart way to create a HTML attribute with a leading space. + /// Name of the attribute. + /// + /// + [SuppressMessage("ReSharper", "StringCompareIsCultureSpecific.3")] + public static string ToAttribute(this string value, string name, bool htmlEncode = true) { - if (name.IsEmpty()) - return ""; + if (name.IsEmpty()) + return ""; - if (value == "" && name != "value" && !name.StartsWith("data")) - return ""; + if (value == "" && name != "value" && !name.StartsWith("data")) + return ""; - if (name == "maxlength" && (value == "" || value == "0")) - return ""; + if (name == "maxlength" && (value == "" || value == "0")) + return ""; - if (name == "checked" || name == "disabled" || name == "multiple") + if (name == "checked" || name == "disabled" || name == "multiple") { - if (value == "" || string.Compare(value, "false", true) == 0) - return ""; - value = (string.Compare(value, "true", true) == 0 ? name : value); - } - - if (name.StartsWith("data")) - name = name.Insert(4, "-"); - - return string.Format(" {0}=\"{1}\"", name, htmlEncode ? HttpUtility.HtmlEncode(value) : value); - } - - /// - /// Appends grow and uses delimiter if the string is not empty. - /// + if (value == "" || string.Compare(value, "false", true) == 0) + return ""; + value = (string.Compare(value, "true", true) == 0 ? name : value); + } + + if (name.StartsWith("data")) + name = name.Insert(4, "-"); + + return string.Format(" {0}=\"{1}\"", name, htmlEncode ? HttpUtility.HtmlEncode(value) : value); + } + + /// + /// Appends grow and uses delimiter if the string is not empty. + /// [DebuggerStepThrough] - public static string Grow(this string value, string grow, string delimiter) + public static string Grow(this string value, string grow, string delimiter) { - if (string.IsNullOrEmpty(value)) - return (string.IsNullOrEmpty(grow) ? "" : grow); + if (string.IsNullOrEmpty(value)) + return (string.IsNullOrEmpty(grow) ? "" : grow); - if (string.IsNullOrEmpty(grow)) - return (string.IsNullOrEmpty(value) ? "" : value); + if (string.IsNullOrEmpty(grow)) + return (string.IsNullOrEmpty(value) ? "" : value); - return value + delimiter + grow; - } + return value + delimiter + grow; + } /// /// Left-pads a string. Always returns empty string if source is null or empty. @@ -868,171 +868,171 @@ public static string LeftPad(this string value, string format = null, char pad = /// [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string NaIfEmpty(this string value) + public static string NaIfEmpty(this string value) { - return (string.IsNullOrWhiteSpace(value) ? "n/a" : value); - } + return (string.IsNullOrWhiteSpace(value) ? "n/a" : value); + } - /// - /// Replaces substring with position x1 to x2 by replaceBy. - /// + /// + /// Replaces substring with position x1 to x2 by replaceBy. + /// [DebuggerStepThrough] - public static string Replace(this string value, int x1, int x2, string replaceBy = null) + public static string Replace(this string value, int x1, int x2, string replaceBy = null) { - if (!string.IsNullOrWhiteSpace(value) && x1 > 0 && x2 > x1 && x2 < value.Length) + if (!string.IsNullOrWhiteSpace(value) && x1 > 0 && x2 > x1 && x2 < value.Length) { - return value.Substring(0, x1) + (replaceBy.EmptyNull()) + value.Substring(x2 + 1); - } - - return value; - } - - [DebuggerStepThrough] - public static string Replace(this string value, string oldValue, string newValue, StringComparison comparisonType) - { - try - { - int startIndex = 0; - while (true) - { - startIndex = value.IndexOf(oldValue, startIndex, comparisonType); - if (startIndex == -1) - break; - - value = value.Substring(0, startIndex) + newValue + value.Substring(startIndex + oldValue.Length); - - startIndex += newValue.Length; - } - } - catch (Exception exc) - { - exc.Dump(); - } - - return value; - } - - /// - /// Replaces digits in a string with culture native digits (if digit substitution for culture is required) - /// - [DebuggerStepThrough] - public static string ReplaceNativeDigits(this string value, IFormatProvider provider = null) - { - if (value == null) - throw new ArgumentNullException(nameof(value)); - - provider = provider ?? NumberFormatInfo.CurrentInfo; - var nfi = NumberFormatInfo.GetInstance(provider); - - if (nfi.DigitSubstitution == DigitShapes.None) - { - return value; - } - - var nativeDigits = nfi.NativeDigits; - var rg = new Regex(@"\d"); - - var result = rg.Replace(value, m => nativeDigits[m.Value.ToInt()]); - return result; - } - - [DebuggerStepThrough] + return value.Substring(0, x1) + (replaceBy.EmptyNull()) + value.Substring(x2 + 1); + } + + return value; + } + + [DebuggerStepThrough] + public static string Replace(this string value, string oldValue, string newValue, StringComparison comparisonType) + { + try + { + int startIndex = 0; + while (true) + { + startIndex = value.IndexOf(oldValue, startIndex, comparisonType); + if (startIndex == -1) + break; + + value = value.Substring(0, startIndex) + newValue + value.Substring(startIndex + oldValue.Length); + + startIndex += newValue.Length; + } + } + catch (Exception exc) + { + exc.Dump(); + } + + return value; + } + + /// + /// Replaces digits in a string with culture native digits (if digit substitution for culture is required) + /// + [DebuggerStepThrough] + public static string ReplaceNativeDigits(this string value, IFormatProvider provider = null) + { + if (value == null) + throw new ArgumentNullException(nameof(value)); + + provider = provider ?? NumberFormatInfo.CurrentInfo; + var nfi = NumberFormatInfo.GetInstance(provider); + + if (nfi.DigitSubstitution == DigitShapes.None) + { + return value; + } + + var nativeDigits = nfi.NativeDigits; + var rg = new Regex(@"\d"); + + var result = rg.Replace(value, m => nativeDigits[m.Value.ToInt()]); + return result; + } + + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string TrimSafe(this string value) + public static string TrimSafe(this string value) { - return (value.HasValue() ? value.Trim() : value); - } + return (value.HasValue() ? value.Trim() : value); + } [DebuggerStepThrough] - public static string Slugify(this string value, bool allowSpace = false, char[] allowChars = null) + public static string Slugify(this string value, bool allowSpace = false, char[] allowChars = null) { - string res = string.Empty; + string res = string.Empty; var psb = PooledStringBuilder.Rent(); - try + try { - if (!string.IsNullOrWhiteSpace(value)) + if (!string.IsNullOrWhiteSpace(value)) { var sb = (StringBuilder)psb; bool space = false; - char ch; + char ch; - for (int i = 0; i < value.Length; ++i) + for (int i = 0; i < value.Length; ++i) { - ch = value[i]; + ch = value[i]; - if (ch == ' ' || ch == '-') + if (ch == ' ' || ch == '-') { - if (allowSpace && ch == ' ') - sb.Append(' '); - else if (!space) - sb.Append('-'); - space = true; - continue; - } - - space = false; - - if ((ch >= 48 && ch <= 57) || (ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122) || ch == '_') - { - sb.Append(ch); - continue; - } - - if (allowChars != null && allowChars.Contains(ch)) + if (allowSpace && ch == ' ') + sb.Append(' '); + else if (!space) + sb.Append('-'); + space = true; + continue; + } + + space = false; + + if ((ch >= 48 && ch <= 57) || (ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122) || ch == '_') + { + sb.Append(ch); + continue; + } + + if (allowChars != null && allowChars.Contains(ch)) { - sb.Append(ch); - continue; - } - - if ((int)ch >= 128) - { - switch (ch) - { - case 'ä': sb.Append("ae"); break; - case 'ö': sb.Append("oe"); break; - case 'ü': sb.Append("ue"); break; - case 'ß': sb.Append("ss"); break; - case 'Ä': sb.Append("AE"); break; - case 'Ö': sb.Append("OE"); break; - case 'Ü': sb.Append("UE"); break; - default: - var c2 = ch.TryRemoveDiacritic(); - if ((c2 >= 'a' && c2 <= 'z') || (c2 >= 'A' && c2 <= 'Z')) - { - sb.Append(c2); - } - break; - } - } - } // for - - if (sb.Length > 0) + sb.Append(ch); + continue; + } + + if ((int)ch >= 128) + { + switch (ch) + { + case 'ä': sb.Append("ae"); break; + case 'ö': sb.Append("oe"); break; + case 'ü': sb.Append("ue"); break; + case 'ß': sb.Append("ss"); break; + case 'Ä': sb.Append("AE"); break; + case 'Ö': sb.Append("OE"); break; + case 'Ü': sb.Append("UE"); break; + default: + var c2 = ch.TryRemoveDiacritic(); + if ((c2 >= 'a' && c2 <= 'z') || (c2 >= 'A' && c2 <= 'Z')) + { + sb.Append(c2); + } + break; + } + } + } // for + + if (sb.Length > 0) { - res = sb.ToString().Trim(new char[] { ' ', '-' }); - - Regex pat = new Regex(@"(-{2,})"); // remove double SpaceChar - res = pat.Replace(res, "-"); - res = res.Replace("__", "_"); - } - } - } - catch (Exception ex) + res = sb.ToString().Trim(new char[] { ' ', '-' }); + + Regex pat = new Regex(@"(-{2,})"); // remove double SpaceChar + res = pat.Replace(res, "-"); + res = res.Replace("__", "_"); + } + } + } + catch (Exception ex) { - ex.Dump(); - } + ex.Dump(); + } finally { psb.Return(); } - return (res.Length > 0 ? res : "null"); - } + return (res.Length > 0 ? res : "null"); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string SanitizeHtmlId(this string value) { - return System.Web.Mvc.TagBuilder.CreateSanitizedId(value); + return System.Web.Mvc.TagBuilder.CreateSanitizedId(value); } [DebuggerStepThrough] @@ -1062,96 +1062,96 @@ public static string RegexReplace(this string input, string pattern, string repl } [DebuggerStepThrough] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string ToValidFileName(this string input, string replacement = "-") + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static string ToValidFileName(this string input, string replacement = "-") { - return string.Join( - replacement ?? "-", - input.ToSafe().Split(Path.GetInvalidFileNameChars())); - } + return string.Join( + replacement ?? "-", + input.ToSafe().Split(Path.GetInvalidFileNameChars())); + } [DebuggerStepThrough] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string ToValidPath(this string input, string replacement = "-") + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static string ToValidPath(this string input, string replacement = "-") { - return string.Join( - replacement ?? "-", - input.ToSafe().Split(Path.GetInvalidPathChars())); - } + return string.Join( + replacement ?? "-", + input.ToSafe().Split(Path.GetInvalidPathChars())); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int[] ToIntArray(this string s) - { - return Array.ConvertAll(s.SplitSafe(","), v => int.Parse(v.Trim())); - } - - [DebuggerStepThrough] - public static bool ToIntArrayContains(this string s, int value, bool defaultValue) - { - if (s == null) - return defaultValue; - var arr = s.ToIntArray(); - if (arr == null || arr.Count() <= 0) - return defaultValue; - - return arr.Contains(value); - } - - [DebuggerStepThrough] - public static string RemoveInvalidXmlChars(this string s) - { - if (s.IsEmpty()) - return s; - - return Regex.Replace(s, @"[^\u0009\u000A\u000D\u0020-\uD7FF\uE000-\uFFFD]", "", RegexOptions.Compiled); - } - - [DebuggerStepThrough] - public static string ReplaceCsvChars(this string s) - { - if (s.IsEmpty()) - { - return ""; - } - - s = s.Replace(';', ','); - s = s.Replace('\r', ' '); - s = s.Replace('\n', ' '); - return s.Replace("'", ""); - } - - [DebuggerStepThrough] - public static string HighlightKeywords(this string input, string keywords, string preMatch = "", string postMatch = "") - { + { + return Array.ConvertAll(s.SplitSafe(","), v => int.Parse(v.Trim())); + } + + [DebuggerStepThrough] + public static bool ToIntArrayContains(this string s, int value, bool defaultValue) + { + if (s == null) + return defaultValue; + var arr = s.ToIntArray(); + if (arr == null || arr.Count() <= 0) + return defaultValue; + + return arr.Contains(value); + } + + [DebuggerStepThrough] + public static string RemoveInvalidXmlChars(this string s) + { + if (s.IsEmpty()) + return s; + + return Regex.Replace(s, @"[^\u0009\u000A\u000D\u0020-\uD7FF\uE000-\uFFFD]", "", RegexOptions.Compiled); + } + + [DebuggerStepThrough] + public static string ReplaceCsvChars(this string s) + { + if (s.IsEmpty()) + { + return ""; + } + + s = s.Replace(';', ','); + s = s.Replace('\r', ' '); + s = s.Replace('\n', ' '); + return s.Replace("'", ""); + } + + [DebuggerStepThrough] + public static string HighlightKeywords(this string input, string keywords, string preMatch = "", string postMatch = "") + { Guard.NotNull(preMatch, nameof(preMatch)); Guard.NotNull(postMatch, nameof(postMatch)); - if (string.IsNullOrWhiteSpace(input) || string.IsNullOrWhiteSpace(keywords)) - { - return input; - } + if (string.IsNullOrWhiteSpace(input) || string.IsNullOrWhiteSpace(keywords)) + { + return input; + } - var pattern = String.Join("|", keywords.Trim().Split(' ', '-') - .Select(x => x.Trim()) - .Where(x => !string.IsNullOrWhiteSpace(x)) - .Select(x => Regex.Escape(x)) - .Distinct()); + var pattern = String.Join("|", keywords.Trim().Split(' ', '-') + .Select(x => x.Trim()) + .Where(x => !string.IsNullOrWhiteSpace(x)) + .Select(x => Regex.Escape(x)) + .Distinct()); - if (!string.IsNullOrWhiteSpace(pattern)) - { - var rg = new Regex(pattern, RegexOptions.IgnoreCase); - input = rg.Replace(input, m => preMatch + m.Value.EmptyNull().HtmlEncode() + postMatch); - } + if (!string.IsNullOrWhiteSpace(pattern)) + { + var rg = new Regex(pattern, RegexOptions.IgnoreCase); + input = rg.Replace(input, m => preMatch + m.Value.EmptyNull().HtmlEncode() + postMatch); + } - return input; - } + return input; + } - #endregion + #endregion - #region Helper + #region Helper - private static void EncodeJsChar(TextWriter writer, char c, char delimiter) + private static void EncodeJsChar(TextWriter writer, char c, char delimiter) { switch (c) { diff --git a/src/Libraries/SmartStore.Core/Extensions/TypeExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/TypeExtensions.cs index 234477a8af..5308d447ff 100644 --- a/src/Libraries/SmartStore.Core/Extensions/TypeExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/TypeExtensions.cs @@ -1,10 +1,10 @@ using System; +using System.Collections; using System.Collections.Generic; -using System.Linq; -using System.Reflection; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Collections; +using System.Linq; +using System.Reflection; using System.Runtime.CompilerServices; namespace SmartStore @@ -15,51 +15,51 @@ public static class TypeExtensions public static string AssemblyQualifiedNameWithoutVersion(this Type type) { - if (type == null) - throw new ArgumentNullException(nameof(type)); + if (type == null) + throw new ArgumentNullException(nameof(type)); - if (type.AssemblyQualifiedName != null) - { - var strArray = type.AssemblyQualifiedName.Split(new char[] { ',' }); - return string.Format("{0}, {1}", strArray[0].Trim(), strArray[1].Trim()); - } + if (type.AssemblyQualifiedName != null) + { + var strArray = type.AssemblyQualifiedName.Split(new char[] { ',' }); + return string.Format("{0}, {1}", strArray[0].Trim(), strArray[1].Trim()); + } + + return null; + } - return null; + public static bool IsNumericType(this Type type) + { + switch (Type.GetTypeCode(type)) + { + case TypeCode.Byte: + case TypeCode.SByte: + case TypeCode.UInt16: + case TypeCode.UInt32: + case TypeCode.UInt64: + case TypeCode.Int16: + case TypeCode.Int32: + case TypeCode.Int64: + case TypeCode.Decimal: + case TypeCode.Double: + case TypeCode.Single: + return true; + case TypeCode.Object: + if (type.IsNullable(out var innerType)) + { + return innerType.IsNumericType(); + } + return false; + default: + return false; + } } - public static bool IsNumericType(this Type type) - { - switch (Type.GetTypeCode(type)) - { - case TypeCode.Byte: - case TypeCode.SByte: - case TypeCode.UInt16: - case TypeCode.UInt32: - case TypeCode.UInt64: - case TypeCode.Int16: - case TypeCode.Int32: - case TypeCode.Int64: - case TypeCode.Decimal: - case TypeCode.Double: - case TypeCode.Single: - return true; - case TypeCode.Object: - if (type.IsNullable(out var innerType)) - { - return innerType.IsNumericType(); - } - return false; - default: - return false; - } - } - - public static bool IsSequenceType(this Type type) + public static bool IsSequenceType(this Type type) { - if (type == typeof(string)) - return false; + if (type == typeof(string)) + return false; - return type.IsArray || typeof(IEnumerable).IsAssignableFrom(type); + return type.IsArray || typeof(IEnumerable).IsAssignableFrom(type); } public static bool IsSequenceType(this Type type, out Type elementType) @@ -130,17 +130,17 @@ public static bool IsPredefinedType(this Type type) { return (string.Compare(type.FullName, "System.Xml.Linq.XElement", StringComparison.Ordinal) == 0); } - + return true; } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsPlainObjectType(this Type type) - { - return type.IsClass && !type.IsSequenceType() && !type.IsPredefinedType(); - } + { + return type.IsClass && !type.IsSequenceType() && !type.IsPredefinedType(); + } - public static bool IsInteger(this Type type) + public static bool IsInteger(this Type type) { switch (Type.GetTypeCode(type)) { @@ -174,11 +174,11 @@ public static Type GetNonNullableType(this Type type) public static bool IsNullable(this Type type, out Type elementType) { if (type != null && type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>)) - elementType = type.GetGenericArguments()[0]; + elementType = type.GetGenericArguments()[0]; else elementType = type; - return elementType != type; + return elementType != type; } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -189,10 +189,10 @@ public static bool IsEnumType(this Type type) public static bool IsConstructable(this Type type) { - if (type == null) - throw new ArgumentNullException(nameof(type)); + if (type == null) + throw new ArgumentNullException(nameof(type)); - if (type.IsAbstract || type.IsInterface || type.IsArray || type.IsGenericTypeDefinition || type == typeof(void)) + if (type.IsAbstract || type.IsInterface || type.IsArray || type.IsGenericTypeDefinition || type == typeof(void)) return false; if (!HasDefaultConstructor(type)) @@ -224,10 +224,10 @@ public static bool IsAnonymous(this Type type) [DebuggerStepThrough] public static bool HasDefaultConstructor(this Type type) { - if (type == null) - throw new ArgumentNullException(nameof(type)); + if (type == null) + throw new ArgumentNullException(nameof(type)); - if (type.IsValueType) + if (type.IsValueType) return true; return type.GetConstructors(BindingFlags.Instance | BindingFlags.Public) @@ -237,19 +237,19 @@ public static bool HasDefaultConstructor(this Type type) [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsSubClass(this Type type, Type check) { - return IsSubClass(type, check, out _); - } + return IsSubClass(type, check, out _); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool IsSubClass(this Type type, Type check, out Type implementingType) { - if (type == null) - throw new ArgumentNullException(nameof(type)); + if (type == null) + throw new ArgumentNullException(nameof(type)); - if (check == null) - throw new ArgumentNullException(nameof(check)); + if (check == null) + throw new ArgumentNullException(nameof(check)); - return IsSubClassInternal(type, type, check, out implementingType); + return IsSubClassInternal(type, type, check, out implementingType); } private static bool IsSubClassInternal(Type initialType, Type currentType, Type check, out Type implementingType) @@ -281,7 +281,7 @@ private static bool IsSubClassInternal(Type initialType, Type currentType, Type if (IsSubClassInternal(initialType, currentType.GetGenericTypeDefinition(), check, out implementingType)) { // INFO: this seems to be wrong! Don't we need the implementing base type (?!?) - implementingType = currentType; + implementingType = currentType; return true; } } @@ -470,15 +470,15 @@ public static bool HasAttribute(this ICustomAttributeProvider target return target.IsDefined(typeof(TAttribute), inherits); } - /// - /// Given a particular MemberInfo, return the custom attributes of the - /// given type on that member. - /// - /// Type of attribute to retrieve. - /// The member to look at. - /// True to include attributes inherited from base classes. - /// Array of found attributes. - public static TAttribute[] GetAttributes(this ICustomAttributeProvider target, bool inherits) where TAttribute : Attribute + /// + /// Given a particular MemberInfo, return the custom attributes of the + /// given type on that member. + /// + /// Type of attribute to retrieve. + /// The member to look at. + /// True to include attributes inherited from base classes. + /// Array of found attributes. + public static TAttribute[] GetAttributes(this ICustomAttributeProvider target, bool inherits) where TAttribute : Attribute { if (target.IsDefined(typeof(TAttribute), inherits)) { @@ -525,8 +525,8 @@ public static TAttribute[] GetAllAttributes(this MemberInfo member, return attributes.ToArray(); } - [SuppressMessage("ReSharper", "SuspiciousTypeConversion.Global")] - internal static IEnumerable SortAttributesIfPossible(IEnumerable attributes) + [SuppressMessage("ReSharper", "SuspiciousTypeConversion.Global")] + internal static IEnumerable SortAttributesIfPossible(IEnumerable attributes) where TAttribute : Attribute { if (typeof(IOrdered).IsAssignableFrom(typeof(TAttribute))) @@ -574,7 +574,7 @@ internal static Type FindIEnumerable(this Type seqType) if (seqType.IsGenericType) { - var args = seqType.GetGenericArguments(); + var args = seqType.GetGenericArguments(); foreach (var arg in args) { var ienum = typeof(IEnumerable<>).MakeGenericType(arg); diff --git a/src/Libraries/SmartStore.Core/Extensions/XPathExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/XPathExtensions.cs index d44109c7f2..d22ed21181 100644 --- a/src/Libraries/SmartStore.Core/Extensions/XPathExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/XPathExtensions.cs @@ -1,98 +1,97 @@ using System; -using System.ComponentModel; using System.Globalization; using System.Xml.XPath; using SmartStore.Core.Domain.Localization; namespace SmartStore { - public static class XPathExtensions - { - /// - /// Safe way to get the value of a xpath navigator item - /// - /// Type - /// The node - /// Optional xpath - /// Optional default value - /// For localized values. Xpath scheme: Localized/xpath[@culture = 'language.LanguageCulture'] - /// If null is passed, CultureInfo.InvariantCulture is used. - /// The value - public static T GetValue(this XPathNavigator node, string xpath = null, T defaultValue = default(T), Language language = null, CultureInfo culture = null) - { - try - { - if (node != null) - { - if (xpath.IsEmpty()) - { - if (node.Value.HasValue()) - return node.Value.Convert(culture); + public static class XPathExtensions + { + /// + /// Safe way to get the value of a xpath navigator item + /// + /// Type + /// The node + /// Optional xpath + /// Optional default value + /// For localized values. Xpath scheme: Localized/xpath[@culture = 'language.LanguageCulture'] + /// If null is passed, CultureInfo.InvariantCulture is used. + /// The value + public static T GetValue(this XPathNavigator node, string xpath = null, T defaultValue = default(T), Language language = null, CultureInfo culture = null) + { + try + { + if (node != null) + { + if (xpath.IsEmpty()) + { + if (node.Value.HasValue()) + return node.Value.Convert(culture); - return defaultValue; - } + return defaultValue; + } - if (language != null) - xpath = "Localized/{0}[@culture = '{1}']".FormatWith(xpath, language.LanguageCulture.EmptyNull().ToLower()); + if (language != null) + xpath = "Localized/{0}[@culture = '{1}']".FormatWith(xpath, language.LanguageCulture.EmptyNull().ToLower()); - var n = node.SelectSingleNode(xpath); + var n = node.SelectSingleNode(xpath); - if (n != null && n.Value.HasValue()) - return n.Value.Convert(culture); - } - } - catch (Exception exc) - { - exc.Dump(); - } + if (n != null && n.Value.HasValue()) + return n.Value.Convert(culture); + } + } + catch (Exception exc) + { + exc.Dump(); + } - return defaultValue; - } + return defaultValue; + } - /// - /// Safe way to get a string value of a xpath navigator item - /// - /// The node - /// Optional xpath - /// Optional default value - /// The value - public static string GetString(this XPathNavigator node, string xpath = null, string defaultValue = null) - { - // note: better not merge GetString(...) and GetValue(...) - try - { - if (node != null) - { - if (xpath.IsEmpty()) - return node.Value; + /// + /// Safe way to get a string value of a xpath navigator item + /// + /// The node + /// Optional xpath + /// Optional default value + /// The value + public static string GetString(this XPathNavigator node, string xpath = null, string defaultValue = null) + { + // note: better not merge GetString(...) and GetValue(...) + try + { + if (node != null) + { + if (xpath.IsEmpty()) + return node.Value; - var n = node.SelectSingleNode(xpath); + var n = node.SelectSingleNode(xpath); - if (n != null) - return n.Value; - } - } - catch (Exception exc) - { - exc.Dump(); - } + if (n != null) + return n.Value; + } + } + catch (Exception exc) + { + exc.Dump(); + } - return defaultValue; - } + return defaultValue; + } - /// - /// Safe way to get a localized string value of a xpath navigator item - /// - /// The node - /// For localized values. Xpath scheme: Localized/xpath[@culture = 'language.LanguageCulture'] - /// Optional xpath - /// Optional default value - /// The value - public static string GetString(this XPathNavigator node, Language language, string xpath, string defaultValue = null) - { - return node.GetString( - "Localized/{0}[@culture = '{1}']".FormatWith(xpath.EmptyNull(), language.LanguageCulture.EmptyNull().ToLower()), - defaultValue); - } - } + /// + /// Safe way to get a localized string value of a xpath navigator item + /// + /// The node + /// For localized values. Xpath scheme: Localized/xpath[@culture = 'language.LanguageCulture'] + /// Optional xpath + /// Optional default value + /// The value + public static string GetString(this XPathNavigator node, Language language, string xpath, string defaultValue = null) + { + return node.GetString( + "Localized/{0}[@culture = '{1}']".FormatWith(xpath.EmptyNull(), language.LanguageCulture.EmptyNull().ToLower()), + defaultValue); + } + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/XmlNodeExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/XmlNodeExtensions.cs index 601c4cef6d..8450b5f8f1 100644 --- a/src/Libraries/SmartStore.Core/Extensions/XmlNodeExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/XmlNodeExtensions.cs @@ -1,68 +1,68 @@ using System; -using System.ComponentModel; using System.Globalization; using System.Xml; namespace SmartStore { - public static class XmlNodeExtensions - { - /// Safe way to get inner text of an attribute. - public static T GetAttributeText(this XmlNode node, string attributeName, T defaultValue = default(T)) { - try + public static class XmlNodeExtensions + { + /// Safe way to get inner text of an attribute. + public static T GetAttributeText(this XmlNode node, string attributeName, T defaultValue = default(T)) + { + try { - if (node != null && attributeName.HasValue()) + if (node != null && attributeName.HasValue()) { - XmlAttribute attr = node.Attributes[attributeName]; - if (attr != null) + XmlAttribute attr = node.Attributes[attributeName]; + if (attr != null) { - return attr.InnerText.Convert(); - } - } - } - catch (Exception exc) + return attr.InnerText.Convert(); + } + } + } + catch (Exception exc) { - exc.Dump(); - } + exc.Dump(); + } - return defaultValue; - } + return defaultValue; + } - /// Safe way to get inner text of an attribute. - public static string GetAttributeText(this XmlNode node, string attributeName) + /// Safe way to get inner text of an attribute. + public static string GetAttributeText(this XmlNode node, string attributeName) { - return node.GetAttributeText(attributeName, null); - } + return node.GetAttributeText(attributeName, null); + } - /// Safe way to get inner text of a node. - public static T GetText(this XmlNode node, string xpath = null, T defaultValue = default(T), CultureInfo culture = null) + /// Safe way to get inner text of a node. + public static T GetText(this XmlNode node, string xpath = null, T defaultValue = default(T), CultureInfo culture = null) { - try + try { - if (node != null) + if (node != null) { - if (xpath.IsEmpty()) - return node.InnerText.Convert(); + if (xpath.IsEmpty()) + return node.InnerText.Convert(); - var n = node.SelectSingleNode(xpath); + var n = node.SelectSingleNode(xpath); - if (n != null && n.InnerText.HasValue()) - return n.InnerText.Convert(culture); + if (n != null && n.InnerText.HasValue()) + return n.InnerText.Convert(culture); } - } - catch (Exception exc) + } + catch (Exception exc) { - exc.Dump(); - } + exc.Dump(); + } - return defaultValue; - } + return defaultValue; + } - /// Safe way to get inner text of a node. - public static string GetText(this XmlNode node, string xpath = null, string defaultValue = default(string)) + /// Safe way to get inner text of a node. + public static string GetText(this XmlNode node, string xpath = null, string defaultValue = default(string)) { - return node.GetText(xpath, defaultValue); - } - } + return node.GetText(xpath, defaultValue); + } + } } diff --git a/src/Libraries/SmartStore.Core/Extensions/XmlWriterExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/XmlWriterExtensions.cs index ca4e1c2c71..da9685432b 100644 --- a/src/Libraries/SmartStore.Core/Extensions/XmlWriterExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/XmlWriterExtensions.cs @@ -1,53 +1,52 @@ -using System; -using System.Xml; +using System.Xml; using SmartStore.Core.Domain.Localization; namespace SmartStore { - public static class XmlWriterExtensions - { - public static void WriteCData(this XmlWriter writer, string name, string value, string prefix = null, string ns = null) + public static class XmlWriterExtensions + { + public static void WriteCData(this XmlWriter writer, string name, string value, string prefix = null, string ns = null) { - if (name.HasValue() && value != null) + if (name.HasValue() && value != null) { - if (prefix == null && ns == null) - writer.WriteStartElement(name); - else - writer.WriteStartElement(prefix, name, ns); - - writer.WriteCData(value.RemoveInvalidXmlChars()); - - writer.WriteEndElement(); - } - } - - /// - /// Created a simple or CData node element - /// - /// The writer - /// Node name - /// Node value - /// The language. Its culture is always converted to lowercase! - /// Whether to create simple or CData node - public static void Write(this XmlWriter writer, string name, string value, Language language = null, bool asCData = false) - { - if (name.HasValue() && value != null) - { - if (language != null && value.IsEmpty()) - return; // do not create too many empty nodes for empty localized values - - writer.WriteStartElement(name); - - if (language != null) - writer.WriteAttributeString("culture", language.LanguageCulture.EmptyNull().ToLower()); - - if (asCData) - writer.WriteCData(value.RemoveInvalidXmlChars()); - else - writer.WriteString(value.RemoveInvalidXmlChars()); - - writer.WriteEndElement(); - } - } - } + if (prefix == null && ns == null) + writer.WriteStartElement(name); + else + writer.WriteStartElement(prefix, name, ns); + + writer.WriteCData(value.RemoveInvalidXmlChars()); + + writer.WriteEndElement(); + } + } + + /// + /// Created a simple or CData node element + /// + /// The writer + /// Node name + /// Node value + /// The language. Its culture is always converted to lowercase! + /// Whether to create simple or CData node + public static void Write(this XmlWriter writer, string name, string value, Language language = null, bool asCData = false) + { + if (name.HasValue() && value != null) + { + if (language != null && value.IsEmpty()) + return; // do not create too many empty nodes for empty localized values + + writer.WriteStartElement(name); + + if (language != null) + writer.WriteAttributeString("culture", language.LanguageCulture.EmptyNull().ToLower()); + + if (asCData) + writer.WriteCData(value.RemoveInvalidXmlChars()); + else + writer.WriteString(value.RemoveInvalidXmlChars()); + + writer.WriteEndElement(); + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeController.cs b/src/Libraries/SmartStore.Core/Fakes/FakeController.cs index 1ff087bb77..2e2e4ee851 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeController.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeController.cs @@ -2,7 +2,7 @@ namespace SmartStore.Core.Fakes { - public class FakeController : Controller - { - } + public class FakeController : Controller + { + } } diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs index 68302e9a61..6da257d71a 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs @@ -26,35 +26,35 @@ public static FakeHttpContext Root() return new FakeHttpContext("~/"); } - public FakeHttpContext(string relativeUrl) - : this(relativeUrl, null, null, null, null, null, null) - { - } + public FakeHttpContext(string relativeUrl) + : this(relativeUrl, null, null, null, null, null, null) + { + } public FakeHttpContext(string relativeUrl, string method) : this(relativeUrl, method, null, null, null, null, null, null) { } - public FakeHttpContext(string relativeUrl, - IPrincipal principal, - NameValueCollection formParams, - NameValueCollection queryStringParams, - HttpCookieCollection cookies, - SessionStateItemCollection sessionItems, - NameValueCollection serverVariables) + public FakeHttpContext(string relativeUrl, + IPrincipal principal, + NameValueCollection formParams, + NameValueCollection queryStringParams, + HttpCookieCollection cookies, + SessionStateItemCollection sessionItems, + NameValueCollection serverVariables) : this(relativeUrl, null, principal, formParams, queryStringParams, cookies, sessionItems, serverVariables) { } - public FakeHttpContext(string relativeUrl, - string method, - IPrincipal principal, - NameValueCollection formParams, - NameValueCollection queryStringParams, - HttpCookieCollection cookies, - SessionStateItemCollection sessionItems, - NameValueCollection serverVariables) + public FakeHttpContext(string relativeUrl, + string method, + IPrincipal principal, + NameValueCollection formParams, + NameValueCollection queryStringParams, + HttpCookieCollection cookies, + SessionStateItemCollection sessionItems, + NameValueCollection serverVariables) { _relativeUrl = relativeUrl; _method = method; @@ -70,28 +70,16 @@ public FakeHttpContext(string relativeUrl, Handler = new FakeHttpHandler(); } - public override IHttpHandler Handler { get; set; } + public override IHttpHandler Handler { get; set; } - public override HttpRequestBase Request - { - get - { - return _request ?? new FakeHttpRequest(_relativeUrl, _method, _formParams, _queryStringParams, _cookies, _serverVariables); - } - } + public override HttpRequestBase Request => _request ?? new FakeHttpRequest(_relativeUrl, _method, _formParams, _queryStringParams, _cookies, _serverVariables); public void SetRequest(HttpRequestBase request) { _request = request; } - public override HttpResponseBase Response - { - get - { - return _response ?? new FakeHttpResponse(); - } - } + public override HttpResponseBase Response => _response ?? new FakeHttpResponse(); public void SetResponse(HttpResponseBase response) { @@ -100,22 +88,13 @@ public void SetResponse(HttpResponseBase response) public override IPrincipal User { - get { return _principal; } - set { _principal = value; } + get => _principal; + set => _principal = value; } - public override HttpSessionStateBase Session - { - get { return new FakeHttpSessionState(_sessionItems ?? new SessionStateItemCollection()); } - } + public override HttpSessionStateBase Session => new FakeHttpSessionState(_sessionItems ?? new SessionStateItemCollection()); - public override System.Collections.IDictionary Items - { - get - { - return _items; - } - } + public override System.Collections.IDictionary Items => _items; public override bool SkipAuthorization { get; set; } diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs index 5b5390d618..5bc4db024a 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs @@ -16,19 +16,19 @@ public class FakeHttpRequest : HttpRequestBase private readonly Uri _url; private readonly Uri _urlReferrer; private readonly string _httpMethod; - private RequestContext _requestContext; + private RequestContext _requestContext; - public FakeHttpRequest(string relativeUrl, Uri url, Uri urlReferrer) - : this(relativeUrl, HttpVerbs.Get.ToString("g"), url, urlReferrer, null, null, null, null) - { - } + public FakeHttpRequest(string relativeUrl, Uri url, Uri urlReferrer) + : this(relativeUrl, HttpVerbs.Get.ToString("g"), url, urlReferrer, null, null, null, null) + { + } - public FakeHttpRequest(string relativeUrl, - string method, + public FakeHttpRequest(string relativeUrl, + string method, NameValueCollection formParams, - NameValueCollection queryStringParams, - HttpCookieCollection cookies, - NameValueCollection serverVariables) + NameValueCollection queryStringParams, + HttpCookieCollection cookies, + NameValueCollection serverVariables) { _httpMethod = method; _relativeUrl = relativeUrl; @@ -39,73 +39,37 @@ public FakeHttpRequest(string relativeUrl, } - public FakeHttpRequest(string relativeUrl, - string method, - Uri url, - Uri urlReferrer, - NameValueCollection formParams, - NameValueCollection queryStringParams, - HttpCookieCollection cookies, - NameValueCollection serverVariables) - : this(relativeUrl, method, formParams, queryStringParams, cookies, serverVariables) - { - _url = url; - _urlReferrer = urlReferrer; - } - - public override NameValueCollection ServerVariables + public FakeHttpRequest(string relativeUrl, + string method, + Uri url, + Uri urlReferrer, + NameValueCollection formParams, + NameValueCollection queryStringParams, + HttpCookieCollection cookies, + NameValueCollection serverVariables) + : this(relativeUrl, method, formParams, queryStringParams, cookies, serverVariables) { - get - { - return _serverVariables; - } + _url = url; + _urlReferrer = urlReferrer; } - public override NameValueCollection Form - { - get { return _formParams; } - } + public override NameValueCollection ServerVariables => _serverVariables; - public override NameValueCollection QueryString - { - get { return _queryStringParams; } - } + public override NameValueCollection Form => _formParams; - public override HttpCookieCollection Cookies - { - get { return _cookies; } - } + public override NameValueCollection QueryString => _queryStringParams; - public override string AppRelativeCurrentExecutionFilePath - { - get { return _relativeUrl; } - } + public override HttpCookieCollection Cookies => _cookies; - public override Uri Url - { - get - { - return _url ?? new Uri("http://tempuri.org"); - } - } + public override string AppRelativeCurrentExecutionFilePath => _relativeUrl; - public override Uri UrlReferrer - { - get - { - return _urlReferrer ?? new Uri("http://tempuri.org"); - } - } + public override Uri Url => _url ?? new Uri("http://tempuri.org"); - public override string PathInfo - { - get { return ""; } - } + public override Uri UrlReferrer => _urlReferrer ?? new Uri("http://tempuri.org"); - public override string Path - { - get { return _url?.AbsolutePath ?? ApplicationPath ?? "/"; } - } + public override string PathInfo => ""; + + public override string Path => _url?.AbsolutePath ?? ApplicationPath ?? "/"; public override string ApplicationPath { @@ -119,37 +83,22 @@ public override string ApplicationPath } } - public override string HttpMethod - { - get - { - return _httpMethod; - } - } + public override string HttpMethod => _httpMethod; - public override string UserHostAddress + public override string UserHostAddress => null; + + public override string RawUrl => this.ApplicationPath; + public override bool IsSecureConnection => _url?.Scheme?.EmptyNull().StartsWith("https", StringComparison.OrdinalIgnoreCase) == true; + public override bool IsAuthenticated => false; + public override string[] UserLanguages => new string[] { }; + public override string UserAgent => "Smartstore"; + public override bool IsLocal => false; + + public override RequestContext RequestContext { - get { return null; } - } + get => _requestContext ?? new RequestContext(); - public override string RawUrl => this.ApplicationPath; - public override bool IsSecureConnection => _url?.Scheme?.EmptyNull().StartsWith("https", StringComparison.OrdinalIgnoreCase) == true; - public override bool IsAuthenticated => false; - public override string[] UserLanguages => new string[] { }; - public override string UserAgent => "Smartstore"; - public override bool IsLocal => false; - - public override RequestContext RequestContext - { - get - { - return _requestContext ?? new RequestContext(); - } - - set - { - _requestContext = value; - } - } - } + set => _requestContext = value; + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs index 299b379037..4b5719ed6e 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs @@ -6,18 +6,15 @@ namespace SmartStore.Core.Fakes public class FakeHttpResponse : HttpResponseBase { private readonly HttpCookieCollection _cookies; - private readonly StringBuilder _outputString = new StringBuilder(); + private readonly StringBuilder _outputString = new StringBuilder(); public FakeHttpResponse() { this._cookies = new HttpCookieCollection(); - } - - public string ResponseOutput - { - get { return _outputString.ToString(); } } + public string ResponseOutput => _outputString.ToString(); + public override int StatusCode { get; set; } public override string RedirectLocation { get; set; } @@ -32,12 +29,6 @@ public override string ApplyAppPathModifier(string virtualPath) return virtualPath; } - public override HttpCookieCollection Cookies - { - get - { - return _cookies; - } - } + public override HttpCookieCollection Cookies => _cookies; } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs index 97bd46062e..6d45307e06 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs @@ -14,20 +14,14 @@ public FakeHttpSessionState(SessionStateItemCollection sessionItems) _sessionItems = sessionItems; } - public override int Count - { - get { return _sessionItems.Count; } - } + public override int Count => _sessionItems.Count; - public override NameObjectCollectionBase.KeysCollection Keys - { - get { return _sessionItems.Keys; } - } + public override NameObjectCollectionBase.KeysCollection Keys => _sessionItems.Keys; public override object this[string name] { - get { return _sessionItems[name]; } - set { _sessionItems[name] = value; } + get => _sessionItems[name]; + set => _sessionItems[name] = value; } public bool Exists(string key) @@ -37,8 +31,8 @@ public bool Exists(string key) public override object this[int index] { - get { return _sessionItems[index]; } - set { _sessionItems[index] = value; } + get => _sessionItems[index]; + set => _sessionItems[index] = value; } public override void Add(string name, object value) diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeIdentity.cs b/src/Libraries/SmartStore.Core/Fakes/FakeIdentity.cs index 2ba265b28a..a4d9ba0d6c 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeIdentity.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeIdentity.cs @@ -12,20 +12,11 @@ public FakeIdentity(string userName) _name = userName; } - public string AuthenticationType - { - get { throw new NotImplementedException(); } - } + public string AuthenticationType => throw new NotImplementedException(); - public bool IsAuthenticated - { - get { return !String.IsNullOrEmpty(_name); } - } + public bool IsAuthenticated => !String.IsNullOrEmpty(_name); - public string Name - { - get { return _name; } - } + public string Name => _name; } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs b/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs index 276931651e..6205f1ca4b 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs @@ -15,10 +15,7 @@ public FakePrincipal(IIdentity identity, string[] roles) } - public IIdentity Identity - { - get { return _identity; } - } + public IIdentity Identity => _identity; public bool IsInRole(string role) { diff --git a/src/Libraries/SmartStore.Core/GenericEqualityComparer.cs b/src/Libraries/SmartStore.Core/GenericEqualityComparer.cs index dd66b7b1a7..e96d02f721 100644 --- a/src/Libraries/SmartStore.Core/GenericEqualityComparer.cs +++ b/src/Libraries/SmartStore.Core/GenericEqualityComparer.cs @@ -5,48 +5,48 @@ namespace SmartStore.Core { public sealed partial class GenericEqualityComparer : IEqualityComparer { - private readonly Func _equals; - private readonly Func _getHashcode; + private readonly Func _equals; + private readonly Func _getHashcode; - public GenericEqualityComparer(Func equals, Func getHashcode) - { - _getHashcode = getHashcode; - _equals = equals; - } + public GenericEqualityComparer(Func equals, Func getHashcode) + { + _getHashcode = getHashcode; + _equals = equals; + } - public static GenericEqualityComparer CompareMember(Func memberExpression) where TMember : IEquatable - { - return new GenericEqualityComparer( - (x, y) => memberExpression.Invoke(x).Equals((TMember)memberExpression.Invoke(y)), - x => - { - var invoked = memberExpression.Invoke(x); - return !ReferenceEquals(invoked, default(TMember)) ? invoked.GetHashCode() : 0; - }); - } + public static GenericEqualityComparer CompareMember(Func memberExpression) where TMember : IEquatable + { + return new GenericEqualityComparer( + (x, y) => memberExpression.Invoke(x).Equals((TMember)memberExpression.Invoke(y)), + x => + { + var invoked = memberExpression.Invoke(x); + return !ReferenceEquals(invoked, default(TMember)) ? invoked.GetHashCode() : 0; + }); + } - /// - /// Determines whether the specified objects are equal. - /// - /// - /// true if the specified objects are equal; otherwise, false. - /// - /// The first object of type to compare.The second object of type to compare. - public bool Equals(T x, T y) - { - return _equals.Invoke(x, y); - } + /// + /// Determines whether the specified objects are equal. + /// + /// + /// true if the specified objects are equal; otherwise, false. + /// + /// The first object of type to compare.The second object of type to compare. + public bool Equals(T x, T y) + { + return _equals.Invoke(x, y); + } - /// - /// Returns a hash code for the specified object. - /// - /// - /// A hash code for the specified object. - /// - /// The for which a hash code is to be returned.The type of is a reference type and is null. - public int GetHashCode(T obj) - { - return _getHashcode.Invoke(obj); - } - } + /// + /// Returns a hash code for the specified object. + /// + /// + /// A hash code for the specified object. + /// + /// The for which a hash code is to be returned.The type of is a reference type and is null. + public int GetHashCode(T obj) + { + return _getHashcode.Invoke(obj); + } + } } diff --git a/src/Libraries/SmartStore.Core/Html/BBCodeHelper.cs b/src/Libraries/SmartStore.Core/Html/BBCodeHelper.cs index b4e9c92eb0..268e22b441 100644 --- a/src/Libraries/SmartStore.Core/Html/BBCodeHelper.cs +++ b/src/Libraries/SmartStore.Core/Html/BBCodeHelper.cs @@ -11,7 +11,7 @@ public partial class BBCodeHelper private static readonly Regex regexUnderLine = new Regex(@"\[u\](.+?)\[/u\]", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex regexUrl1 = new Regex(@"\[url\=([^\]]+)\]([^\]]+)\[/url\]", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex regexUrl2 = new Regex(@"\[url\](.+?)\[/url\]", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly Regex regexQuote = new Regex(@"\[quote(=.+?)?\](.+?)\[/quote\]", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex regexQuote = new Regex(@"\[quote(=.+?)?\](.+?)\[/quote\]", RegexOptions.Compiled | RegexOptions.IgnoreCase); /// /// Formats the text @@ -25,13 +25,13 @@ public partial class BBCodeHelper /// A value indicating whether to replace Quote /// Formatted text public static string ToHtml( - string text, - bool replaceBold = true, - bool replaceItalic = true, + string text, + bool replaceBold = true, + bool replaceItalic = true, bool replaceUnderline = true, - bool replaceUrl = true, - bool replaceCode = true, - bool replaceQuote = true) + bool replaceUrl = true, + bool replaceCode = true, + bool replaceQuote = true) { if (String.IsNullOrEmpty(text)) return string.Empty; @@ -70,29 +70,29 @@ public static string ToHtml( if (replaceQuote) { - while (regexQuote.IsMatch(text)) - { - text = regexQuote.Replace(text, (m) => - { - var from = m.Groups[1].Value; - var quote = m.Groups[2].Value; - - if (quote.IsEmpty()) - { - return ""; - } - - string result = ""; - if (from.HasValue()) - { - result += "{0}:".FormatCurrent(from.Substring(1)); - } - - result += "
{0}
".FormatCurrent(quote); - - return result; - }); - } + while (regexQuote.IsMatch(text)) + { + text = regexQuote.Replace(text, (m) => + { + var from = m.Groups[1].Value; + var quote = m.Groups[2].Value; + + if (quote.IsEmpty()) + { + return ""; + } + + string result = ""; + if (from.HasValue()) + { + result += "{0}:".FormatCurrent(from.Substring(1)); + } + + result += "
{0}
".FormatCurrent(quote); + + return result; + }); + } } diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CLikeFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CLikeFormat.cs index 4a4f948734..122f9a2c43 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CLikeFormat.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CLikeFormat.cs @@ -17,32 +17,26 @@ * be misrepresented as being the original software. * * 3. This notice may not be removed or altered from any source distribution. - */ + */ #endregion namespace SmartStore.Core.Html.CodeFormatter { - /// - /// Provides a base class for formatting languages similar to C. - /// + /// + /// Provides a base class for formatting languages similar to C. + /// public abstract partial class CLikeFormat : CodeFormat - { - /// - /// Regular expression string to match single line and multi-line - /// comments (// and /* */). - /// - protected override string CommentRegex - { - get { return @"/\*.*?\*/|//.*?(?=\r|\n)"; } - } + { + /// + /// Regular expression string to match single line and multi-line + /// comments (// and /* */). + /// + protected override string CommentRegex => @"/\*.*?\*/|//.*?(?=\r|\n)"; - /// - /// Regular expression string to match string and character literals. - /// - protected override string StringRegex - { - get { return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; } - } - } + /// + /// Regular expression string to match string and character literals. + /// + protected override string StringRegex => @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; + } } diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CSharpFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CSharpFormat.cs index 1822293a6d..85fb7ed828 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CSharpFormat.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CSharpFormat.cs @@ -17,7 +17,7 @@ * be misrepresented as being the original software. * * 3. This notice may not be removed or altered from any source distribution. - */ + */ #endregion namespace SmartStore.Core.Html.CodeFormatter @@ -26,36 +26,24 @@ namespace SmartStore.Core.Html.CodeFormatter /// Generates color-coded HTML 4.01 from C# source code. /// public partial class CSharpFormat : CLikeFormat - { - /// - /// The list of C# keywords. - /// - protected override string Keywords - { - get - { - return "abstract as base bool break byte case catch char " - + "checked class const continue decimal default delegate do double else " - + "enum event explicit extern false finally fixed float for foreach goto " - + "if implicit in int interface internal is lock long namespace new null " - + "object operator out override partial params private protected public readonly " - + "ref return sbyte sealed short sizeof stackalloc static string struct " - + "switch this throw true try typeof uint ulong unchecked unsafe ushort " - + "using value virtual void volatile where while yield"; - } - } + { + /// + /// The list of C# keywords. + /// + protected override string Keywords => "abstract as base bool break byte case catch char " + + "checked class const continue decimal default delegate do double else " + + "enum event explicit extern false finally fixed float for foreach goto " + + "if implicit in int interface internal is lock long namespace new null " + + "object operator out override partial params private protected public readonly " + + "ref return sbyte sealed short sizeof stackalloc static string struct " + + "switch this throw true try typeof uint ulong unchecked unsafe ushort " + + "using value virtual void volatile where while yield"; - /// - /// The list of C# preprocessors. - /// - protected override string Preprocessors - { - get - { - return "#if #else #elif #endif #define #undef #warning " - + "#error #line #region #endregion #pragma"; - } - } - } + /// + /// The list of C# preprocessors. + /// + protected override string Preprocessors => "#if #else #elif #endif #define #undef #warning " + + "#error #line #region #endregion #pragma"; + } } diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormat.cs index efaef284bc..9fb8944681 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormat.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormat.cs @@ -17,7 +17,7 @@ * be misrepresented as being the original software. * * 3. This notice may not be removed or altered from any source distribution. - */ + */ #endregion using System.IO; @@ -26,144 +26,138 @@ namespace SmartStore.Core.Html.CodeFormatter { - /// - /// Provides a base class for formatting most programming languages. - /// + /// + /// Provides a base class for formatting most programming languages. + /// public abstract partial class CodeFormat : SourceFormat - { - /// - /// Must be overridden to provide a list of keywords defined in - /// each language. - /// - /// - /// Keywords must be separated with spaces. - /// - protected abstract string Keywords - { - get; - } + { + /// + /// Must be overridden to provide a list of keywords defined in + /// each language. + /// + /// + /// Keywords must be separated with spaces. + /// + protected abstract string Keywords + { + get; + } - /// - /// Can be overridden to provide a list of preprocessors defined in - /// each language. - /// - /// - /// Preprocessors must be separated with spaces. - /// - protected virtual string Preprocessors - { - get { return ""; } - } + /// + /// Can be overridden to provide a list of preprocessors defined in + /// each language. + /// + /// + /// Preprocessors must be separated with spaces. + /// + protected virtual string Preprocessors => ""; - /// - /// Must be overridden to provide a regular expression string - /// to match strings literals. - /// - protected abstract string StringRegex - { - get; - } + /// + /// Must be overridden to provide a regular expression string + /// to match strings literals. + /// + protected abstract string StringRegex + { + get; + } - /// - /// Must be overridden to provide a regular expression string - /// to match comments. - /// - protected abstract string CommentRegex - { - get; - } + /// + /// Must be overridden to provide a regular expression string + /// to match comments. + /// + protected abstract string CommentRegex + { + get; + } - /// - /// Determines if the language is case sensitive. - /// - /// true if the language is case sensitive, false - /// otherwise. The default is true. - /// - /// A case-insensitive language formatter must override this - /// property to return false. - /// - public virtual bool CaseSensitive - { - get { return true; } - } + /// + /// Determines if the language is case sensitive. + /// + /// true if the language is case sensitive, false + /// otherwise. The default is true. + /// + /// A case-insensitive language formatter must override this + /// property to return false. + /// + public virtual bool CaseSensitive => true; - /// - protected CodeFormat() - { - //generate the keyword and preprocessor regexes from the keyword lists - Regex r; - r = new Regex(@"\w+|-\w+|#\w+|@@\w+|#(?:\\(?:s|w)(?:\*|\+)?\w+)+|@\\w\*+"); - string regKeyword = r.Replace(Keywords, @"(?<=^|\W)$0(?=\W)"); - string regPreproc = r.Replace(Preprocessors, @"(?<=^|\s)$0(?=\s|$)"); - r = new Regex(@" +"); - regKeyword = r.Replace(regKeyword, @"|"); - regPreproc = r.Replace(regPreproc, @"|"); + /// + protected CodeFormat() + { + //generate the keyword and preprocessor regexes from the keyword lists + Regex r; + r = new Regex(@"\w+|-\w+|#\w+|@@\w+|#(?:\\(?:s|w)(?:\*|\+)?\w+)+|@\\w\*+"); + string regKeyword = r.Replace(Keywords, @"(?<=^|\W)$0(?=\W)"); + string regPreproc = r.Replace(Preprocessors, @"(?<=^|\s)$0(?=\s|$)"); + r = new Regex(@" +"); + regKeyword = r.Replace(regKeyword, @"|"); + regPreproc = r.Replace(regPreproc, @"|"); - if (regPreproc.Length == 0) - { - regPreproc = "(?!.*)_{37}(? 0) - { - regAll.Append(")|("); - regAll.Append(regPreproc); - } - regAll.Append(")|("); - regAll.Append(regKeyword); - regAll.Append(")"); + regAll.Append("("); + regAll.Append(CommentRegex); + regAll.Append(")|("); + regAll.Append(StringRegex); + if (regPreproc.Length > 0) + { + regAll.Append(")|("); + regAll.Append(regPreproc); + } + regAll.Append(")|("); + regAll.Append(regKeyword); + regAll.Append(")"); - RegexOptions caseInsensitive = CaseSensitive ? 0 : RegexOptions.IgnoreCase; - CodeRegex = new Regex(regAll.ToString(), RegexOptions.Singleline | caseInsensitive); - } + RegexOptions caseInsensitive = CaseSensitive ? 0 : RegexOptions.IgnoreCase; + CodeRegex = new Regex(regAll.ToString(), RegexOptions.Singleline | caseInsensitive); + } - /// - /// Called to evaluate the HTML fragment corresponding to each - /// matching token in the code. - /// - /// The resulting from a - /// single regular expression match. - /// A string containing the HTML code fragment. - protected override string MatchEval(Match match) - { - if(match.Groups[1].Success) //comment - { + /// + /// Called to evaluate the HTML fragment corresponding to each + /// matching token in the code. + /// + /// The resulting from a + /// single regular expression match. + /// A string containing the HTML code fragment. + protected override string MatchEval(Match match) + { + if (match.Groups[1].Success) //comment + { var reader = new StringReader(match.ToString()); - string line; + string line; var sb = new StringBuilder(); - while ((line = reader.ReadLine()) != null) - { - if(sb.Length > 0) - { - sb.Append("\n"); - } - sb.Append(""); - sb.Append(line); - sb.Append(""); - } - return sb.ToString(); - } - if(match.Groups[2].Success) //string literal - { - return "" + match.ToString() + ""; - } - if(match.Groups[3].Success) //preprocessor keyword - { - return "" + match.ToString() + ""; - } - if(match.Groups[4].Success) //keyword - { - return "" + match.ToString() + ""; - } - System.Diagnostics.Debug.Assert(false, "None of the above!"); - return ""; //none of the above - } - } + while ((line = reader.ReadLine()) != null) + { + if (sb.Length > 0) + { + sb.Append("\n"); + } + sb.Append(""); + sb.Append(line); + sb.Append(""); + } + return sb.ToString(); + } + if (match.Groups[2].Success) //string literal + { + return "" + match.ToString() + ""; + } + if (match.Groups[3].Success) //preprocessor keyword + { + return "" + match.ToString() + ""; + } + if (match.Groups[4].Success) //keyword + { + return "" + match.ToString() + ""; + } + System.Diagnostics.Debug.Assert(false, "None of the above!"); + return ""; //none of the above + } + } } diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs index e58e51d428..ff56b0f0d5 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs @@ -4,9 +4,9 @@ namespace SmartStore.Core.Html.CodeFormatter { - /// - /// Represents a code format helper - /// + /// + /// Represents a code format helper + /// public partial class CodeFormatHelper { #region Fields @@ -32,8 +32,8 @@ private static string CodeEvaluatorSimple(Match match) options.Language = "c#"; options.Code = match.Groups["inner"].Value; options.DisplayLineNumbers = false; - options.Title =string.Empty; - options.AlternateLineNumbers =false; + options.Title = string.Empty; + options.AlternateLineNumbers = false; string result = match.Value; result = Highlight(options, result); diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/HtmlFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/HtmlFormat.cs index 718ce0db1e..3592cb6354 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/HtmlFormat.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/HtmlFormat.cs @@ -17,7 +17,7 @@ * be misrepresented as being the original software. * * 3. This notice may not be removed or altered from any source distribution. - */ + */ #endregion using System.IO; @@ -26,124 +26,124 @@ namespace SmartStore.Core.Html.CodeFormatter { - /// - /// Generates color-coded HTML 4.01 from HTML/XML/ASPX source code. - /// - /// - /// - /// This implementation assumes that code inside <script> blocks - /// is JavaScript, and code inside <% %> blocks is C#. - /// - /// The default tab width is set to 2 characters in this class. - /// + /// + /// Generates color-coded HTML 4.01 from HTML/XML/ASPX source code. + /// + /// + /// + /// This implementation assumes that code inside <script> blocks + /// is JavaScript, and code inside <% %> blocks is C#. + /// + /// The default tab width is set to 2 characters in this class. + /// public partial class HtmlFormat : SourceFormat - { - private readonly CSharpFormat csf; //to format embedded C# code + { + private readonly CSharpFormat csf; //to format embedded C# code private readonly JavaScriptFormat jsf; //to format client-side JavaScript code private readonly Regex attribRegex; - /// - public HtmlFormat() - { - const string regJavaScript = @"(?<=<script(?:\s.*?)?>).+?(?=</script>)"; - const string regComment = @"<!--.*?-->"; - const string regAspTag = @"<%@.*?%>|<%|%>"; - const string regAspCode = @"(?<=<%).*?(?=%>)"; - const string regTagDelimiter = @"(?:</?!?\??(?!%)|(? + public HtmlFormat() + { + const string regJavaScript = @"(?<=<script(?:\s.*?)?>).+?(?=</script>)"; + const string regComment = @"<!--.*?-->"; + const string regAspTag = @"<%@.*?%>|<%|%>"; + const string regAspCode = @"(?<=<%).*?(?=%>)"; + const string regTagDelimiter = @"(?:</?!?\??(?!%)|(? - /// Called to evaluate the HTML fragment corresponding to each - /// attribute's name/value in the code. - /// - /// The resulting from a - /// single regular expression match. - /// A string containing the HTML code fragment. - private string AttributeMatchEval(Match match) - { - if(match.Groups[1].Success) //attribute value - return "" + match.ToString() + ""; + csf = new CSharpFormat(); + jsf = new JavaScriptFormat(); + } - if(match.Groups[2].Success) //attribute name - return "" + match.ToString() + ""; + /// + /// Called to evaluate the HTML fragment corresponding to each + /// attribute's name/value in the code. + /// + /// The resulting from a + /// single regular expression match. + /// A string containing the HTML code fragment. + private string AttributeMatchEval(Match match) + { + if (match.Groups[1].Success) //attribute value + return "" + match.ToString() + ""; - return match.ToString(); - } + if (match.Groups[2].Success) //attribute name + return "" + match.ToString() + ""; - /// - /// Called to evaluate the HTML fragment corresponding to each - /// matching token in the code. - /// - /// The resulting from a - /// single regular expression match. - /// A string containing the HTML code fragment. - protected override string MatchEval(Match match) - { - if(match.Groups[1].Success) //JavaScript code - { - //string s = match.ToString(); - return jsf.FormatSubCode(match.ToString()); - } - if(match.Groups[2].Success) //comment - { + return match.ToString(); + } + + /// + /// Called to evaluate the HTML fragment corresponding to each + /// matching token in the code. + /// + /// The resulting from a + /// single regular expression match. + /// A string containing the HTML code fragment. + protected override string MatchEval(Match match) + { + if (match.Groups[1].Success) //JavaScript code + { + //string s = match.ToString(); + return jsf.FormatSubCode(match.ToString()); + } + if (match.Groups[2].Success) //comment + { var reader = new StringReader(match.ToString()); - string line; + string line; var sb = new StringBuilder(); - while ((line = reader.ReadLine()) != null) - { - if(sb.Length > 0) - { - sb.Append("\n"); - } - sb.Append(""); - sb.Append(line); - sb.Append(""); - } - return sb.ToString(); - } - if(match.Groups[3].Success) //asp tag - { - return "" + match.ToString() + ""; - } - if(match.Groups[4].Success) //asp C# code - { - return csf.FormatSubCode(match.ToString()); - } - if(match.Groups[5].Success) //tag delimiter - { - return "" + match.ToString() + ""; - } - if(match.Groups[6].Success) //html tagname - { - return "" + match.ToString() + ""; - } - if(match.Groups[7].Success) //attributes - { - return attribRegex.Replace(match.ToString(), - new MatchEvaluator(this.AttributeMatchEval)); - } - if(match.Groups[8].Success) //entity - { - return "" + match.ToString() + ""; - } - return match.ToString(); - } - } + while ((line = reader.ReadLine()) != null) + { + if (sb.Length > 0) + { + sb.Append("\n"); + } + sb.Append(""); + sb.Append(line); + sb.Append(""); + } + return sb.ToString(); + } + if (match.Groups[3].Success) //asp tag + { + return "" + match.ToString() + ""; + } + if (match.Groups[4].Success) //asp C# code + { + return csf.FormatSubCode(match.ToString()); + } + if (match.Groups[5].Success) //tag delimiter + { + return "" + match.ToString() + ""; + } + if (match.Groups[6].Success) //html tagname + { + return "" + match.ToString() + ""; + } + if (match.Groups[7].Success) //attributes + { + return attribRegex.Replace(match.ToString(), + new MatchEvaluator(this.AttributeMatchEval)); + } + if (match.Groups[8].Success) //entity + { + return "" + match.ToString() + ""; + } + return match.ToString(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/JavaScriptFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/JavaScriptFormat.cs index 9f65a2bd50..6319d104c2 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/JavaScriptFormat.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/JavaScriptFormat.cs @@ -17,7 +17,7 @@ * be misrepresented as being the original software. * * 3. This notice may not be removed or altered from any source distribution. - */ + */ #endregion namespace SmartStore.Core.Html.CodeFormatter @@ -26,35 +26,23 @@ namespace SmartStore.Core.Html.CodeFormatter /// Generates color-coded HTML 4.01 from JavaSctript source code. /// public partial class JavaScriptFormat : CLikeFormat - { - /// - /// The list of JavaScript keywords. - /// - protected override string Keywords - { - get - { - return "var function abstract as base bool break byte case catch char " - + "checked class const continue decimal default delegate do double else " - + "enum event explicit extern false finally fixed float for foreach goto " - + "if implicit in int interface internal is lock long namespace new null " - + "object operator out override params private protected public readonly " - + "ref return sbyte sealed short sizeof stackalloc static string struct " - + "switch this throw true try typeof uint ulong unchecked unsafe ushort " - + "using virtual void while"; - } - } + { + /// + /// The list of JavaScript keywords. + /// + protected override string Keywords => "var function abstract as base bool break byte case catch char " + + "checked class const continue decimal default delegate do double else " + + "enum event explicit extern false finally fixed float for foreach goto " + + "if implicit in int interface internal is lock long namespace new null " + + "object operator out override params private protected public readonly " + + "ref return sbyte sealed short sizeof stackalloc static string struct " + + "switch this throw true try typeof uint ulong unchecked unsafe ushort " + + "using virtual void while"; - /// - /// Use the pre-processor color to mark directives that start with @. - /// - protected override string Preprocessors - { - get - { - return @"@\w*"; - } - } - } + /// + /// Use the pre-processor color to mark directives that start with @. + /// + protected override string Preprocessors => @"@\w*"; + } } diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/MshFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/MshFormat.cs index fbe7acbee1..17964eb843 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/MshFormat.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/MshFormat.cs @@ -1,52 +1,34 @@ namespace SmartStore.Core.Html.CodeFormatter { - /// - /// Generates color-coded HTML 4.01 from MSH (code name Monad) source code. - /// + /// + /// Generates color-coded HTML 4.01 from MSH (code name Monad) source code. + /// public partial class MshFormat : CodeFormat - { - /// - /// Regular expression string to match single line comments (#). - /// - protected override string CommentRegex - { - get { return @"#.*?(?=\r|\n)"; } - } + { + /// + /// Regular expression string to match single line comments (#). + /// + protected override string CommentRegex => @"#.*?(?=\r|\n)"; - /// - /// Regular expression string to match string and character literals. - /// - protected override string StringRegex - { - get { return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; } - } + /// + /// Regular expression string to match string and character literals. + /// + protected override string StringRegex => @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; - /// - /// The list of MSH keywords. - /// - protected override string Keywords - { - get - { - return "function filter global script local private if else" - + " elseif for foreach in while switch continue break" - + " return default param begin process end throw trap"; - } - } + /// + /// The list of MSH keywords. + /// + protected override string Keywords => "function filter global script local private if else" + + " elseif for foreach in while switch continue break" + + " return default param begin process end throw trap"; - /// - /// Use preprocessors property to hilight operators. - /// - protected override string Preprocessors - { - get - { - return "-band -bor -match -notmatch -like -notlike -eq -ne" - + " -gt -ge -lt -le -is -imatch -inotmatch -ilike" - + " -inotlike -ieq -ine -igt -ige -ilt -ile"; - } - } + /// + /// Use preprocessors property to hilight operators. + /// + protected override string Preprocessors => "-band -bor -match -notmatch -like -notlike -eq -ne" + + " -gt -ge -lt -le -is -imatch -inotmatch -ilike" + + " -inotlike -ieq -ine -igt -ige -ilt -ile"; - } + } } diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/SourceFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/SourceFormat.cs index a92c4d20f4..2b5b232219 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/SourceFormat.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/SourceFormat.cs @@ -17,7 +17,7 @@ * be misrepresented as being the original software. * * 3. This notice may not be removed or altered from any source distribution. - */ + */ #endregion using System; @@ -28,238 +28,238 @@ namespace SmartStore.Core.Html.CodeFormatter { - /// - /// Provides a base implementation for all code formatters. - /// - /// - /// - /// To display the formatted code on your web site, the web page must - /// refer to a stylesheet that defines the formatting for the different - /// CSS classes generated by CSharpFormat: - /// .csharpcode, pre, .rem, .kwrd, .str, .op, .preproc, .alt, .lnum. - /// - /// - /// Note that if you have multi-line comments in your source code - /// (like /* ... */), the "line numbers" or "alternate line background" - /// options will generate code that is not strictly HTML 4.01 compliant. - /// The code will still look good with IE5+ or Mozilla 0.8+. - /// - /// + /// + /// Provides a base implementation for all code formatters. + /// + /// + /// + /// To display the formatted code on your web site, the web page must + /// refer to a stylesheet that defines the formatting for the different + /// CSS classes generated by CSharpFormat: + /// .csharpcode, pre, .rem, .kwrd, .str, .op, .preproc, .alt, .lnum. + /// + /// + /// Note that if you have multi-line comments in your source code + /// (like /* ... */), the "line numbers" or "alternate line background" + /// options will generate code that is not strictly HTML 4.01 compliant. + /// The code will still look good with IE5+ or Mozilla 0.8+. + /// + /// public abstract partial class SourceFormat - { - /// - protected SourceFormat() - { - _tabSpaces = 4; - _lineNumbers = false; - _alternate = false; - _embedStyleSheet = false; - } + { + /// + protected SourceFormat() + { + _tabSpaces = 4; + _lineNumbers = false; + _alternate = false; + _embedStyleSheet = false; + } - private byte _tabSpaces; + private byte _tabSpaces; - /// - /// Gets or sets the tabs width. - /// - /// The number of space characters to substitute for tab - /// characters. The default is 4, unless overridden is a - /// derived class. - public byte TabSpaces - { - get { return _tabSpaces; } - set { _tabSpaces = value; } - } + /// + /// Gets or sets the tabs width. + /// + /// The number of space characters to substitute for tab + /// characters. The default is 4, unless overridden is a + /// derived class. + public byte TabSpaces + { + get => _tabSpaces; + set => _tabSpaces = value; + } - private bool _lineNumbers; + private bool _lineNumbers; - /// - /// Enables or disables line numbers in output. - /// - /// When true, line numbers are generated. - /// The default is false. - public bool LineNumbers - { - get { return _lineNumbers; } - set { _lineNumbers = value; } - } + /// + /// Enables or disables line numbers in output. + /// + /// When true, line numbers are generated. + /// The default is false. + public bool LineNumbers + { + get => _lineNumbers; + set => _lineNumbers = value; + } - private bool _alternate; + private bool _alternate; - /// - /// Enables or disables alternating line background. - /// - /// When true, lines background is alternated. - /// The default is false. - public bool Alternate - { - get { return _alternate; } - set { _alternate = value; } - } + /// + /// Enables or disables alternating line background. + /// + /// When true, lines background is alternated. + /// The default is false. + public bool Alternate + { + get => _alternate; + set => _alternate = value; + } - private bool _embedStyleSheet; + private bool _embedStyleSheet; - /// - /// Enables or disables the embedded CSS style sheet. - /// - /// When true, the CSS <style> element is included - /// in the HTML output. The default is false. - public bool EmbedStyleSheet - { - get { return _embedStyleSheet; } - set { _embedStyleSheet = value; } - } + /// + /// Enables or disables the embedded CSS style sheet. + /// + /// When true, the CSS <style> element is included + /// in the HTML output. The default is false. + public bool EmbedStyleSheet + { + get => _embedStyleSheet; + set => _embedStyleSheet = value; + } - /// Transform source code to HTML 4.01. - /// - /// - /// Transforms a source code stream to HTML 4.01. - /// - /// Source code stream. - /// A string containing the HTML formatted code. - public string FormatCode(Stream source) - { + /// Transform source code to HTML 4.01. + /// + /// + /// Transforms a source code stream to HTML 4.01. + /// + /// Source code stream. + /// A string containing the HTML formatted code. + public string FormatCode(Stream source) + { var reader = new StreamReader(source); - string s = reader.ReadToEnd(); - reader.Close(); - return FormatCode(s, _lineNumbers, _alternate, _embedStyleSheet, false); - } + string s = reader.ReadToEnd(); + reader.Close(); + return FormatCode(s, _lineNumbers, _alternate, _embedStyleSheet, false); + } - /// - /// Transforms a source code string to HTML 4.01. - /// - /// A string containing the HTML formatted code. - public string FormatCode(string source) - { - return FormatCode(source, _lineNumbers, _alternate, _embedStyleSheet, false); - } + /// + /// Transforms a source code string to HTML 4.01. + /// + /// A string containing the HTML formatted code. + public string FormatCode(string source) + { + return FormatCode(source, _lineNumbers, _alternate, _embedStyleSheet, false); + } - /// - /// Allows formatting a part of the code in a different language, - /// for example a JavaScript block inside an HTML file. - /// - public string FormatSubCode(string source) - { - return FormatCode(source, false, false, false, true); - } + /// + /// Allows formatting a part of the code in a different language, + /// for example a JavaScript block inside an HTML file. + /// + public string FormatSubCode(string source) + { + return FormatCode(source, false, false, false, true); + } - /// - /// Gets the CSS stylesheet as a stream. - /// - /// A text of the CSS definitions. - public static Stream GetCssStream() - { - return Assembly.GetExecutingAssembly().GetManifestResourceStream( - "Manoli.Utils.CSharpFormat.csharp.css"); - } + /// + /// Gets the CSS stylesheet as a stream. + /// + /// A text of the CSS definitions. + public static Stream GetCssStream() + { + return Assembly.GetExecutingAssembly().GetManifestResourceStream( + "Manoli.Utils.CSharpFormat.csharp.css"); + } - /// - /// Gets the CSS stylesheet as a string. - /// - /// A string containing the CSS definitions. - public static string GetCssString() - { + /// + /// Gets the CSS stylesheet as a string. + /// + /// A string containing the CSS definitions. + public static string GetCssString() + { var reader = new StreamReader(GetCssStream()); - return reader.ReadToEnd(); - } + return reader.ReadToEnd(); + } - private Regex codeRegex; + private Regex codeRegex; - /// - /// The regular expression used to capture language tokens. - /// - protected Regex CodeRegex - { - get { return codeRegex; } - set { codeRegex = value; } - } + /// + /// The regular expression used to capture language tokens. + /// + protected Regex CodeRegex + { + get => codeRegex; + set => codeRegex = value; + } - /// - /// Called to evaluate the HTML fragment corresponding to each - /// matching token in the code. - /// - /// The resulting from a - /// single regular expression match. - /// A string containing the HTML code fragment. - protected abstract string MatchEval(Match match); + /// + /// Called to evaluate the HTML fragment corresponding to each + /// matching token in the code. + /// + /// The resulting from a + /// single regular expression match. + /// A string containing the HTML code fragment. + protected abstract string MatchEval(Match match); - //does the formatting job - private string FormatCode(string source, bool lineNumbers, - bool alternate, bool embedStyleSheet, bool subCode) - { - //replace special characters + //does the formatting job + private string FormatCode(string source, bool lineNumbers, + bool alternate, bool embedStyleSheet, bool subCode) + { + //replace special characters var sb = new StringBuilder(source); - if(!subCode) - { - sb.Replace("&", "&"); - sb.Replace("<", "<"); - sb.Replace(">", ">"); - sb.Replace("\t", string.Empty.PadRight(_tabSpaces)); - } - - //color the code - source = codeRegex.Replace(sb.ToString(), new MatchEvaluator(this.MatchEval)); + if (!subCode) + { + sb.Replace("&", "&"); + sb.Replace("<", "<"); + sb.Replace(">", ">"); + sb.Replace("\t", string.Empty.PadRight(_tabSpaces)); + } - sb = new StringBuilder(); - - if (embedStyleSheet) - { - sb.Append("\n"); - } + //color the code + source = codeRegex.Replace(sb.ToString(), new MatchEvaluator(this.MatchEval)); - if (lineNumbers || alternate) //we have to process the code line by line - { - if(!subCode) - sb.Append("
\n"); + sb = new StringBuilder(); + + if (embedStyleSheet) + { + sb.Append("\n"); + } + + if (lineNumbers || alternate) //we have to process the code line by line + { + if (!subCode) + sb.Append("
\n"); var reader = new StringReader(source); - int i = 0; - string spaces = " "; - string line; - while ((line = reader.ReadLine()) != null) - { - i++; - if (alternate && ((i % 2) == 1)) - { - sb.Append("
");
-					}
-					else
-					{
-						sb.Append("
");
-					}
+                int i = 0;
+                string spaces = "    ";
+                string line;
+                while ((line = reader.ReadLine()) != null)
+                {
+                    i++;
+                    if (alternate && ((i % 2) == 1))
+                    {
+                        sb.Append("
");
+                    }
+                    else
+                    {
+                        sb.Append("
");
+                    }
+
+                    if (lineNumbers)
+                    {
+                        var order = (int)Math.Log10(i);
+                        sb.Append(""
+                            + spaces.Substring(0, 3 - order) + i.ToString()
+                            + ":  ");
+                    }
+
+                    if (line.Length == 0)
+                        sb.Append(" ");
+                    else
+                        sb.Append(line);
+                    sb.Append("
\n");
+                }
+                reader.Close();
+                if (!subCode)
+                    sb.Append("
"); + } + else + { + //have to use a 
 because IE below ver 6 does not understand 
+                //the "white-space: pre" CSS value
+                if (!subCode)
+                    sb.Append("
\n");
+                sb.Append(source);
+                if (!subCode)
+                    sb.Append("
");
+            }
 
-					if(lineNumbers)
-					{
-						var order = (int)Math.Log10(i);
-						sb.Append("" 
-							+ spaces.Substring(0, 3 - order) + i.ToString() 
-							+ ":  ");
-					}
-					
-					if(line.Length == 0)
-						sb.Append(" ");
-					else
-						sb.Append(line);
-					sb.Append("
\n"); - } - reader.Close(); - if(!subCode) - sb.Append("
"); - } - else - { - //have to use a 
 because IE below ver 6 does not understand 
-				//the "white-space: pre" CSS value
-				if(!subCode)
-					sb.Append("
\n");
-				sb.Append(source);
-				if(!subCode)
-					sb.Append("
");
-			}
-			
-			return sb.ToString();
-		}
+            return sb.ToString();
+        }
 
-	}
+    }
 }
diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs
index 74f58beed1..6aee1b6e6a 100644
--- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs
+++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs
@@ -19,127 +19,100 @@
  *      be misrepresented as being the original software.
  * 
  *   3. This notice may not be removed or altered from any source distribution.
- */ 
+ */
 #endregion
 
 namespace SmartStore.Core.Html.CodeFormatter
 {
-	/// 
-	/// Generates color-coded T-SQL source code.
-	/// 
+    /// 
+    /// Generates color-coded T-SQL source code.
+    /// 
     public partial class TsqlFormat : CodeFormat
-	{
-		/// 
-		/// Regular expression string to match single line 
-		/// comments (--). 
-		/// 
-		protected override string CommentRegex
-		{
-			get
-			{
-				return @"(?:--\s).*?(?=\r|\n)";
-			}
-		}
+    {
+        /// 
+        /// Regular expression string to match single line 
+        /// comments (--). 
+        /// 
+        protected override string CommentRegex => @"(?:--\s).*?(?=\r|\n)";
 
-		/// 
-		/// Regular expression string to match string literals. 
-		/// 
-		protected override string StringRegex
-		{
-			get
-			{
-				return @"''|'.*?'";
-			}
-		}
+        /// 
+        /// Regular expression string to match string literals. 
+        /// 
+        protected override string StringRegex => @"''|'.*?'";
 
-		/// 
-		/// Returns false, since T-SQL is not case sensitive.
-		/// 
-		public override bool CaseSensitive
-		{
-			get { return false; }
-		}
+        /// 
+        /// Returns false, since T-SQL is not case sensitive.
+        /// 
+        public override bool CaseSensitive => false;
 
 
-		/// 
-		/// The list of T-SQL keywords.
-		/// 
-		protected override string Keywords
-		{
-			get
-			{
-				return "absolute action ada add admin after aggregate "
-					+ "alias all allocate alter and any are array as asc "
-					+ "assertion at authorization avg backup before begin "
-					+ "between binary bit bit_length blob boolean both breadth "
-					+ "break browse bulk by call cascade cascaded case cast "
-					+ "catalog char char_length character character_length "
-					+ "check checkpoint class clob close clustered coalesce "
-					+ "collate collation column commit completion compute "
-					+ "connect connection constraint constraints constructor "
-					+ "contains containstable continue convert corresponding "
-					+ "count create cross cube current current_date current_path "
-					+ "current_role current_time current_timestamp current_user "
-					+ "cursor cycle data database date day dbcc deallocate dec "
-					+ "decimal declare default deferrable deferred delete deny "
-					+ "depth deref desc describe descriptor destroy destructor "
-					+ "deterministic diagnostics dictionary disconnect disk "
-					+ "distinct distributed domain double drop dummy dump "
-					+ "dynamic each else end end-exec equals errlvl escape "
-					+ "every except exception exec execute exists exit external "
-					+ "extract false fetch file fillfactor first float for "
-					+ "foreign fortran found free freetext freetexttable from "
-					+ "full function general get global go goto grant group "
-					+ "grouping having holdlock host hour identity identity_insert "
-					+ "identitycol if ignore immediate in include index indicator "
-					+ "initialize initially inner inout input insensitive insert "
-					+ "int integer intersect interval into is isolation iterate "
-					+ "join key kill language large last lateral leading left "
-					+ "less level like limit lineno load local localtime localtimestamp "
-					+ "locator lower map match max min minute modifies modify "
-					+ "module month names national natural nchar nclob new next "
-					+ "no nocheck nonclustered none not null nullif numeric object "
-					+ "octet_length of off offsets old on only open opendatasource "
-					+ "openquery openrowset openxml operation option or order "
-					+ "ordinality out outer output over overlaps pad parameter "
-					+ "parameters partial pascal path percent plan position "
-					+ "postfix precision prefix preorder prepare preserve "
-					+ "primary print prior privileges proc procedure "
-					+ "public raiserror read reads readtext real reconfigure "
-					+ "recursive ref references referencing relative replication "
-					+ "restore restrict result return returns revoke right role "
-					+ "rollback rollup routine row rowcount rowguidcol rows rule "
-					+ "save savepoint schema scope scroll search second section "
-					+ "select sequence session session_user set sets setuser "
-					+ "shutdown size smallint some space specific specifictype "
-					+ "sql sqlca sqlcode sqlerror sqlexception sqlstate sqlwarning "
-					+ "start state statement static statistics structure substring "
-					+ "sum system_user table temporary terminate textsize than then "
-					+ "time timestamp timezone_hour timezone_minute to top trailing "
-					+ "tran transaction translate translation treat trigger trim "
-					+ "true truncate tsequal under union unique unknown unnest "
-					+ "update updatetext upper usage use user using value values "
-					+ "varchar variable varying view waitfor when whenever where "
-					+ "while with without work write writetext year zone";
-			}
-		}
+        /// 
+        /// The list of T-SQL keywords.
+        /// 
+        protected override string Keywords => "absolute action ada add admin after aggregate "
+                    + "alias all allocate alter and any are array as asc "
+                    + "assertion at authorization avg backup before begin "
+                    + "between binary bit bit_length blob boolean both breadth "
+                    + "break browse bulk by call cascade cascaded case cast "
+                    + "catalog char char_length character character_length "
+                    + "check checkpoint class clob close clustered coalesce "
+                    + "collate collation column commit completion compute "
+                    + "connect connection constraint constraints constructor "
+                    + "contains containstable continue convert corresponding "
+                    + "count create cross cube current current_date current_path "
+                    + "current_role current_time current_timestamp current_user "
+                    + "cursor cycle data database date day dbcc deallocate dec "
+                    + "decimal declare default deferrable deferred delete deny "
+                    + "depth deref desc describe descriptor destroy destructor "
+                    + "deterministic diagnostics dictionary disconnect disk "
+                    + "distinct distributed domain double drop dummy dump "
+                    + "dynamic each else end end-exec equals errlvl escape "
+                    + "every except exception exec execute exists exit external "
+                    + "extract false fetch file fillfactor first float for "
+                    + "foreign fortran found free freetext freetexttable from "
+                    + "full function general get global go goto grant group "
+                    + "grouping having holdlock host hour identity identity_insert "
+                    + "identitycol if ignore immediate in include index indicator "
+                    + "initialize initially inner inout input insensitive insert "
+                    + "int integer intersect interval into is isolation iterate "
+                    + "join key kill language large last lateral leading left "
+                    + "less level like limit lineno load local localtime localtimestamp "
+                    + "locator lower map match max min minute modifies modify "
+                    + "module month names national natural nchar nclob new next "
+                    + "no nocheck nonclustered none not null nullif numeric object "
+                    + "octet_length of off offsets old on only open opendatasource "
+                    + "openquery openrowset openxml operation option or order "
+                    + "ordinality out outer output over overlaps pad parameter "
+                    + "parameters partial pascal path percent plan position "
+                    + "postfix precision prefix preorder prepare preserve "
+                    + "primary print prior privileges proc procedure "
+                    + "public raiserror read reads readtext real reconfigure "
+                    + "recursive ref references referencing relative replication "
+                    + "restore restrict result return returns revoke right role "
+                    + "rollback rollup routine row rowcount rowguidcol rows rule "
+                    + "save savepoint schema scope scroll search second section "
+                    + "select sequence session session_user set sets setuser "
+                    + "shutdown size smallint some space specific specifictype "
+                    + "sql sqlca sqlcode sqlerror sqlexception sqlstate sqlwarning "
+                    + "start state statement static statistics structure substring "
+                    + "sum system_user table temporary terminate textsize than then "
+                    + "time timestamp timezone_hour timezone_minute to top trailing "
+                    + "tran transaction translate translation treat trigger trim "
+                    + "true truncate tsequal under union unique unknown unnest "
+                    + "update updatetext upper usage use user using value values "
+                    + "varchar variable varying view waitfor when whenever where "
+                    + "while with without work write writetext year zone";
 
-		/// 
-		/// Use the pre-processor color to mark keywords that start with @@.
-		/// 
-		protected override string Preprocessors
-		{
-			get 
-			{ 
-				return @"@@CONNECTIONS @@CPU_BUSY @@CURSOR_ROWS @@DATEFIRST "
-					+ "@@DBTS @@ERROR @@FETCH_STATUS @@IDENTITY @@IDLE "
-					+ "@@IO_BUSY @@LANGID @@LANGUAGE @@LOCK_TIMEOUT "
-					+ "@@MAX_CONNECTIONS @@MAX_PRECISION @@NESTLEVEL @@OPTIONS "
-					+ "@@PACK_RECEIVED @@PACK_SENT @@PACKET_ERRORS @@PROCID "
-					+ "@@REMSERVER @@ROWCOUNT @@SERVERNAME @@SERVICENAME @@SPID "
-					+ "@@TEXTSIZE @@TIMETICKS @@TOTAL_ERRORS @@TOTAL_READ "
-					+ "@@TOTAL_WRITE @@TRANCOUNT @@VERSION";
-			}
-		}
-	}
+        /// 
+        /// Use the pre-processor color to mark keywords that start with @@.
+        /// 
+        protected override string Preprocessors => @"@@CONNECTIONS @@CPU_BUSY @@CURSOR_ROWS @@DATEFIRST "
+                    + "@@DBTS @@ERROR @@FETCH_STATUS @@IDENTITY @@IDLE "
+                    + "@@IO_BUSY @@LANGID @@LANGUAGE @@LOCK_TIMEOUT "
+                    + "@@MAX_CONNECTIONS @@MAX_PRECISION @@NESTLEVEL @@OPTIONS "
+                    + "@@PACK_RECEIVED @@PACK_SENT @@PACKET_ERRORS @@PROCID "
+                    + "@@REMSERVER @@ROWCOUNT @@SERVERNAME @@SERVICENAME @@SPID "
+                    + "@@TEXTSIZE @@TIMETICKS @@TOTAL_ERRORS @@TOTAL_READ "
+                    + "@@TOTAL_WRITE @@TRANCOUNT @@VERSION";
+    }
 }
diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/VisualBasicFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/VisualBasicFormat.cs
index 36fa1da139..b4a28e8503 100644
--- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/VisualBasicFormat.cs
+++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/VisualBasicFormat.cs
@@ -17,80 +17,59 @@
  *      be misrepresented as being the original software.
  * 
  *   3. This notice may not be removed or altered from any source distribution.
- */ 
+ */
 #endregion
 
 namespace SmartStore.Core.Html.CodeFormatter
 {
-	/// 
-	/// Generates color-coded HTML 4.01 from Visual Basic source code.
-	/// 
+    /// 
+    /// Generates color-coded HTML 4.01 from Visual Basic source code.
+    /// 
     public partial class VisualBasicFormat : CodeFormat
-	{
-		/// 
-		/// Determines if the language is case sensitive.
-		/// 
-		/// Always true, since VB is not case sensitive.
-		public override bool CaseSensitive
-		{
-			get { return false; }
-		}
+    {
+        /// 
+        /// Determines if the language is case sensitive.
+        /// 
+        /// Always true, since VB is not case sensitive.
+        public override bool CaseSensitive => false;
 
-		/// 
-		/// Regular expression string to match comments (' and REM). 
-		/// 
-		protected override string CommentRegex
-		{
-			get { return @"(?:'|REM\s).*?(?=\r|\n)"; }
-		}
+        /// 
+        /// Regular expression string to match comments (' and REM). 
+        /// 
+        protected override string CommentRegex => @"(?:'|REM\s).*?(?=\r|\n)";
 
-		/// 
-		/// Regular expression string to match string and character literals. 
-		/// 
-		protected override string StringRegex
-		{
-			get { return @"""""|"".*?"""; }
-		}
+        /// 
+        /// Regular expression string to match string and character literals. 
+        /// 
+        protected override string StringRegex => @"""""|"".*?""";
 
-		/// 
-		/// The list of VB keywords.
-		/// 
-		protected override string Keywords 
-		{
-			get 
-			{ 
-				return "AddHandler AddressOf AndAlso Alias And Ansi As Assembly "
-					+ "Auto Boolean ByRef Byte ByVal Call Case Catch "
-					+ "CBool CByte CChar CDate CDec CDbl Char CInt "
-					+ "Class CLng CObj Const CShort CSng CStr CType "
-					+ "Date Decimal Declare Default Delegate Dim DirectCast Do "
-					+ "Double Each Else ElseIf End EndIf Enum Erase Error "
-					+ "Event Exit False Finally For Friend Function Get "
-					+ "GetType Global GoSub GoTo Handles If Implements Imports In Inherits "
-					+ "Integer Interface Is Let Lib Like Long Loop "
-					+ "Me Mod Module MustInherit MustOverride MyBase MyClass Namespace "
-					+ "Narrowing New Next Not Nothing NotInheritable NotOverridable Object On "
-					+ "Operator Option Optional Or OrElse Overloads Overridable Overrides ParamArray "
-					+ "Preserve Private Property Protected Public RaiseEvent ReadOnly ReDim "
-					+ "REM RemoveHandler Resume Return Select Set Shadows Shared "
-					+ "Short Single Static Step Stop String Structure Sub "
-					+ "SyncLock Then Throw To True Try TryCast TypeOf Unicode "
-					+ "Until Variant Wend When While With Widening WithEvents WriteOnly Xor";
-			}
-		}
+        /// 
+        /// The list of VB keywords.
+        /// 
+        protected override string Keywords => "AddHandler AddressOf AndAlso Alias And Ansi As Assembly "
+                    + "Auto Boolean ByRef Byte ByVal Call Case Catch "
+                    + "CBool CByte CChar CDate CDec CDbl Char CInt "
+                    + "Class CLng CObj Const CShort CSng CStr CType "
+                    + "Date Decimal Declare Default Delegate Dim DirectCast Do "
+                    + "Double Each Else ElseIf End EndIf Enum Erase Error "
+                    + "Event Exit False Finally For Friend Function Get "
+                    + "GetType Global GoSub GoTo Handles If Implements Imports In Inherits "
+                    + "Integer Interface Is Let Lib Like Long Loop "
+                    + "Me Mod Module MustInherit MustOverride MyBase MyClass Namespace "
+                    + "Narrowing New Next Not Nothing NotInheritable NotOverridable Object On "
+                    + "Operator Option Optional Or OrElse Overloads Overridable Overrides ParamArray "
+                    + "Preserve Private Property Protected Public RaiseEvent ReadOnly ReDim "
+                    + "REM RemoveHandler Resume Return Select Set Shadows Shared "
+                    + "Short Single Static Step Stop String Structure Sub "
+                    + "SyncLock Then Throw To True Try TryCast TypeOf Unicode "
+                    + "Until Variant Wend When While With Widening WithEvents WriteOnly Xor";
 
-		/// 
-		/// The list of VB preprocessors.
-		/// 
-		protected override string Preprocessors
-		{
-			get 
-			{ 
-				return @"#\s*Const #\s*If #\s*Else #\s*ElseIf #\s*End\s+If "
-					+ @"#\s*ExternalSource #\s*End\s+ExternalSource "
-					+ @"#\s*Region #\s*End\s+Region";
-			}
-		}
-	}
+        /// 
+        /// The list of VB preprocessors.
+        /// 
+        protected override string Preprocessors => @"#\s*Const #\s*If #\s*Else #\s*ElseIf #\s*End\s+If "
+                    + @"#\s*ExternalSource #\s*End\s+ExternalSource "
+                    + @"#\s*Region #\s*End\s+Region";
+    }
 }
 
diff --git a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs b/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs
index 247a3d3a15..2428d3c4aa 100644
--- a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs
+++ b/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs
@@ -1,17 +1,15 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
-using System.Linq;
 using AngleSharp;
-using AngleSharp.Parser.Html;
-using AngleSharp.Parser.Css;
-using System.Collections.Generic;
 using AngleSharp.Dom;
-using AngleSharp.Dom.Html;
+using AngleSharp.Extensions;
+using AngleSharp.Parser.Html;
 using Ganss.XSS;
 using SmartStore.Utilities.ObjectPools;
-using AngleSharp.Extensions;
 
 namespace SmartStore.Core.Html
 {
@@ -20,96 +18,96 @@ namespace SmartStore.Core.Html
     ///
public partial class HtmlUtils { - private readonly static Regex _paragraphStartRegex = new Regex("

", RegexOptions.IgnoreCase); + private readonly static Regex _paragraphStartRegex = new Regex("

", RegexOptions.IgnoreCase); private readonly static Regex _paragraphEndRegex = new Regex("

", RegexOptions.IgnoreCase); - //private static Regex ampRegex = new Regex("&(?!(?:#[0-9]{2,4};|[a-z0-9]+;))", RegexOptions.Compiled | RegexOptions.IgnoreCase); - - /// - /// Formats the text - /// - /// Text - /// A value indicating whether to strip tags - /// A value indicating whether HTML is allowed - /// A value indicating whether HTML is allowed - /// A value indicating whether BBCode is allowed - /// A value indicating whether to resolve links - /// A value indicating whether to add "noFollow" tag - /// Formatted text - [Obsolete("Use specific formatter methods instead, e.g. StripTags(), SanitizeHtml() etc.")] - public static string FormatText( - string text, - bool stripTags, - bool convertPlainTextToHtml, - bool allowHtml, - bool allowBBCode, - bool resolveLinks, - bool addNoFollowTag) - { - - if (String.IsNullOrEmpty(text)) - return string.Empty; - - try - { - if (stripTags) - { - text = StripTags(text); - } - - if (allowHtml) - { - text = SanitizeHtml(text); - } - else - { - text = HttpUtility.HtmlEncode(text); - } - - if (convertPlainTextToHtml) - { - text = ConvertPlainTextToHtml(text); - } - - if (allowBBCode) - { - text = BBCodeHelper.ToHtml(text, true, true, true, true, true, true); - } - - if (resolveLinks) - { - text = ResolveLinksHelper.FormatText(text); - } - - if (addNoFollowTag) - { - //add noFollow tag. not implemented - } - } - catch (Exception exc) - { - text = string.Format("Text cannot be formatted. Error: {0}", exc.Message); - } - - return text; - } - - public static string SanitizeHtml(string html, bool isFragment = true) + //private static Regex ampRegex = new Regex("&(?!(?:#[0-9]{2,4};|[a-z0-9]+;))", RegexOptions.Compiled | RegexOptions.IgnoreCase); + + /// + /// Formats the text + /// + /// Text + /// A value indicating whether to strip tags + /// A value indicating whether HTML is allowed + /// A value indicating whether HTML is allowed + /// A value indicating whether BBCode is allowed + /// A value indicating whether to resolve links + /// A value indicating whether to add "noFollow" tag + /// Formatted text + [Obsolete("Use specific formatter methods instead, e.g. StripTags(), SanitizeHtml() etc.")] + public static string FormatText( + string text, + bool stripTags, + bool convertPlainTextToHtml, + bool allowHtml, + bool allowBBCode, + bool resolveLinks, + bool addNoFollowTag) + { + + if (String.IsNullOrEmpty(text)) + return string.Empty; + + try + { + if (stripTags) + { + text = StripTags(text); + } + + if (allowHtml) + { + text = SanitizeHtml(text); + } + else + { + text = HttpUtility.HtmlEncode(text); + } + + if (convertPlainTextToHtml) + { + text = ConvertPlainTextToHtml(text); + } + + if (allowBBCode) + { + text = BBCodeHelper.ToHtml(text, true, true, true, true, true, true); + } + + if (resolveLinks) + { + text = ResolveLinksHelper.FormatText(text); + } + + if (addNoFollowTag) + { + //add noFollow tag. not implemented + } + } + catch (Exception exc) + { + text = string.Format("Text cannot be formatted. Error: {0}", exc.Message); + } + + return text; + } + + public static string SanitizeHtml(string html, bool isFragment = true) { if (string.IsNullOrEmpty(html)) return string.Empty; - var sanitizer = new HtmlSanitizer(); + var sanitizer = new HtmlSanitizer(); - if (isFragment) - { - return sanitizer.Sanitize(html); - } - else - { - return sanitizer.SanitizeDocument(html); - } + if (isFragment) + { + return sanitizer.Sanitize(html); + } + else + { + return sanitizer.SanitizeDocument(html); + } } - + /// /// Strips tags /// @@ -117,96 +115,96 @@ public static string SanitizeHtml(string html, bool isFragment = true) /// Formatted text public static string StripTags(string html) { - if (html.IsEmpty()) - return string.Empty; + if (html.IsEmpty()) + return string.Empty; - var removeTags = new HashSet(StringComparer.OrdinalIgnoreCase) { "script", "style", "svg", "img" }; - var parser = new HtmlParser(); + var removeTags = new HashSet(StringComparer.OrdinalIgnoreCase) { "script", "style", "svg", "img" }; + var parser = new HtmlParser(); - using (var doc = parser.Parse(html)) + using (var doc = parser.Parse(html)) { - List removeElements = new List(); - - foreach (var el in doc.All) - { - if (removeTags.Contains(el.TagName)) - { - removeElements.Add(el); - } - } - - foreach (var el in removeElements) - { - el.Remove(); - } - - return doc.Body.TextContent; - } - } - - /// - /// Checks whether HTML code only contains whitespace stuff ( 

]]>) - /// - public static bool IsEmptyHtml(string html) - { - if (html.IsEmpty()) + List removeElements = new List(); + + foreach (var el in doc.All) + { + if (removeTags.Contains(el.TagName)) + { + removeElements.Add(el); + } + } + + foreach (var el in removeElements) + { + el.Remove(); + } + + return doc.Body.TextContent; + } + } + + /// + /// Checks whether HTML code only contains whitespace stuff ( 

]]>) + /// + public static bool IsEmptyHtml(string html) + { + if (html.IsEmpty()) { - return true; - } + return true; + } - if (html.Length > 500) + if (html.Length > 500) { - // (perf) we simply assume content if length is larger - return false; + // (perf) we simply assume content if length is larger + return false; } - var parser = new HtmlParser(); - using (var doc = parser.Parse(html)) + var parser = new HtmlParser(); + using (var doc = parser.Parse(html)) { - foreach (var el in doc.All) - { - switch (el.TagName.ToLower()) - { - case "html": - case "head": - case "br": - continue; - case "body": - if (el.ChildElementCount > 0) - { - continue; - } - else + foreach (var el in doc.All) + { + switch (el.TagName.ToLower()) + { + case "html": + case "head": + case "br": + continue; + case "body": + if (el.ChildElementCount > 0) { - return el.Text().Trim().IsEmpty(); - } - case "p": - case "div": - case "span": - var text = el.Text().Trim(); - if (text.IsEmpty() || text == " ") - { - continue; - } - else - { - return false; - } - default: - return false; - } - } - - return true; - } - } - - /// - /// Replace anchor text (remove a tag from the following url Name and output only the string "Name") - /// - /// Text - /// Text - public static string ReplaceAnchorTags(string text) + continue; + } + else + { + return el.Text().Trim().IsEmpty(); + } + case "p": + case "div": + case "span": + var text = el.Text().Trim(); + if (text.IsEmpty() || text == " ") + { + continue; + } + else + { + return false; + } + default: + return false; + } + } + + return true; + } + } + + /// + /// Replace anchor text (remove a tag from the following url Name and output only the string "Name") + /// + /// Text + /// Text + public static string ReplaceAnchorTags(string text) { if (String.IsNullOrEmpty(text)) return string.Empty; @@ -233,7 +231,7 @@ public static string ConvertPlainTextToHtml(string text) return text; } - + /// /// Converts HTML to plain text /// @@ -286,24 +284,24 @@ public static string ConvertPlainTextToTable(string text, string tableCssClass = builder.AppendFormat("", tableCssClass.HasValue() ? "class='" + tableCssClass + "'" : ""); - lines.Where(x => x.HasValue()).Each(x => - { - builder.Append("
{0}{0} {0}
{0}{0} {0}
"); @@ -338,35 +336,35 @@ public static string ConvertPlainTextToParagraph(string text) return builder.ToString(); } - /// - /// Converts all occurences of pixel-based inline font-size expression to relative 'em' - /// - /// - /// - /// - public static string RelativizeFontSizes(string html, int baseFontSizePx = 16) - { - Guard.NotEmpty(html, nameof(html)); - Guard.IsPositive(baseFontSizePx, nameof(baseFontSizePx)); - - var parser = new HtmlParser(new AngleSharp.Configuration().WithCss()); - var doc = parser.Parse(html); - - var nodes = doc.QuerySelectorAll("*[style]"); - foreach (var node in nodes) - { - if (node.Style.FontSize is string s && s.EndsWith("px")) - { - var size = s.Substring(0, s.Length - 2).Convert(); - if (size > 0) - { - //node.Style.FontSize = Math.Round(((double)size / (double)baseFontSizePx), 4) + "em"; - node.Style.FontSize = "{0}em".FormatInvariant(Math.Round(((double)size / (double)baseFontSizePx), 4)); - } - } - } - - return doc.Body.InnerHtml; - } + /// + /// Converts all occurences of pixel-based inline font-size expression to relative 'em' + /// + /// + /// + /// + public static string RelativizeFontSizes(string html, int baseFontSizePx = 16) + { + Guard.NotEmpty(html, nameof(html)); + Guard.IsPositive(baseFontSizePx, nameof(baseFontSizePx)); + + var parser = new HtmlParser(new AngleSharp.Configuration().WithCss()); + var doc = parser.Parse(html); + + var nodes = doc.QuerySelectorAll("*[style]"); + foreach (var node in nodes) + { + if (node.Style.FontSize is string s && s.EndsWith("px")) + { + var size = s.Substring(0, s.Length - 2).Convert(); + if (size > 0) + { + //node.Style.FontSize = Math.Round(((double)size / (double)baseFontSizePx), 4) + "em"; + node.Style.FontSize = "{0}em".FormatInvariant(Math.Round(((double)size / (double)baseFontSizePx), 4)); + } + } + } + + return doc.Body.InnerHtml; + } } } diff --git a/src/Libraries/SmartStore.Core/HttpSecurityMode.cs b/src/Libraries/SmartStore.Core/HttpSecurityMode.cs index 5317183015..f159ce2466 100644 --- a/src/Libraries/SmartStore.Core/HttpSecurityMode.cs +++ b/src/Libraries/SmartStore.Core/HttpSecurityMode.cs @@ -1,6 +1,4 @@ -using System; - -namespace SmartStore.Core +namespace SmartStore.Core { public enum HttpSecurityMode { diff --git a/src/Libraries/SmartStore.Core/IActivatable.cs b/src/Libraries/SmartStore.Core/IActivatable.cs index b42cb554fc..48f59e9969 100644 --- a/src/Libraries/SmartStore.Core/IActivatable.cs +++ b/src/Libraries/SmartStore.Core/IActivatable.cs @@ -1,9 +1,7 @@ -using System; - -namespace SmartStore.Core +namespace SmartStore.Core { - public interface IActivatable - { - bool IsActive { get; } - } + public interface IActivatable + { + bool IsActive { get; } + } } diff --git a/src/Libraries/SmartStore.Core/IAuditable.cs b/src/Libraries/SmartStore.Core/IAuditable.cs index 60f4342efc..cb6c94ac78 100644 --- a/src/Libraries/SmartStore.Core/IAuditable.cs +++ b/src/Libraries/SmartStore.Core/IAuditable.cs @@ -2,16 +2,16 @@ namespace SmartStore.Core { - public interface IAuditable - { - /// - /// Gets or sets the date and time of entity creation - /// - DateTime CreatedOnUtc { get; set; } + public interface IAuditable + { + /// + /// Gets or sets the date and time of entity creation + /// + DateTime CreatedOnUtc { get; set; } - /// - /// Gets or sets the date and time of entity update - /// - DateTime UpdatedOnUtc { get; set; } - } + /// + /// Gets or sets the date and time of entity update + /// + DateTime UpdatedOnUtc { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/IMergedData.cs b/src/Libraries/SmartStore.Core/IMergedData.cs index 8233a55987..2cf39de6dd 100644 --- a/src/Libraries/SmartStore.Core/IMergedData.cs +++ b/src/Libraries/SmartStore.Core/IMergedData.cs @@ -5,43 +5,43 @@ namespace SmartStore.Core { - public interface IMergedData - { - bool MergedDataIgnore { get; set; } - Dictionary MergedDataValues { get; } - } + public interface IMergedData + { + bool MergedDataIgnore { get; set; } + Dictionary MergedDataValues { get; } + } - public static class IMergedDataExtensions - { - public static T GetMergedDataValue(this IMergedData mergedData, string key, T defaultValue) - { - if (mergedData.MergedDataValues == null) - return defaultValue; + public static class IMergedDataExtensions + { + public static T GetMergedDataValue(this IMergedData mergedData, string key, T defaultValue) + { + if (mergedData.MergedDataValues == null) + return defaultValue; - if (mergedData.MergedDataIgnore) - return defaultValue; + if (mergedData.MergedDataIgnore) + return defaultValue; - if (mergedData is BaseEntity && HostingEnvironment.IsHosted) - { - // This is absolutely bad coding! But I don't see any alternatives. - // When the passed object is a (EF)-trackable entity, - // we cannot return the merged value while EF performs - // change detection, because entity properties could be set to modified, - // where in fact nothing has changed. - var dbContext = EngineContext.Current.Resolve(); - if (dbContext.IsDetectingChanges()) - { - return defaultValue; - } - } + if (mergedData is BaseEntity && HostingEnvironment.IsHosted) + { + // This is absolutely bad coding! But I don't see any alternatives. + // When the passed object is a (EF)-trackable entity, + // we cannot return the merged value while EF performs + // change detection, because entity properties could be set to modified, + // where in fact nothing has changed. + var dbContext = EngineContext.Current.Resolve(); + if (dbContext.IsDetectingChanges()) + { + return defaultValue; + } + } - object value; - if (mergedData.MergedDataValues.TryGetValue(key, out value)) - { - return (T)value; - } + object value; + if (mergedData.MergedDataValues.TryGetValue(key, out value)) + { + return (T)value; + } - return defaultValue; - } - } + return defaultValue; + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs b/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs index 0136dfe580..91e96b0ed5 100644 --- a/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs +++ b/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs @@ -12,7 +12,7 @@ public class DirectoryHasher { private static readonly string _appRootPath; private static readonly string _defaultStoragePath; - + private readonly string _path; private readonly string _searchPattern; private readonly bool _deep; @@ -49,10 +49,7 @@ public DirectoryHasher(string path, string searchPattern, bool deep = false, str _storagePath = storagePath ?? _defaultStoragePath; } - public bool HasChanged - { - get => LastHash != CurrentHash; - } + public bool HasChanged => LastHash != CurrentHash; public int? LastHash { @@ -67,15 +64,9 @@ public int? LastHash } } - public int CurrentHash - { - get => (_currentHash ?? (_currentHash = ComputeHash())).Value; - } + public int CurrentHash => (_currentHash ?? (_currentHash = ComputeHash())).Value; - public string LookupKey - { - get => _lookupKey ?? (_lookupKey = BuildLookupKey()); - } + public string LookupKey => _lookupKey ?? (_lookupKey = BuildLookupKey()); public void Refresh() { @@ -85,7 +76,7 @@ public void Refresh() //public void Reset() //{ // _lastHash = -1; - + // var path = Path.Combine(_storagePath, LookupKey + ".hash"); // if (File.Exists(path)) // { diff --git a/src/Libraries/SmartStore.Core/IO/IFile.cs b/src/Libraries/SmartStore.Core/IO/IFile.cs index 6d86299fc8..ca64f714e6 100644 --- a/src/Libraries/SmartStore.Core/IO/IFile.cs +++ b/src/Libraries/SmartStore.Core/IO/IFile.cs @@ -7,66 +7,66 @@ namespace SmartStore.Core.IO { public interface IFile { - /// - /// The path relative to the storage root - /// - string Path { get; } + /// + /// The path relative to the storage root + /// + string Path { get; } - /// - /// The path without the file part, but with trailing slash - /// - string Directory { get; } + /// + /// The path without the file part, but with trailing slash + /// + string Directory { get; } - /// - /// File name including extension - /// - string Name { get; } + /// + /// File name including extension + /// + string Name { get; } - /// - /// File name excluding extension - /// - string Title { get; } + /// + /// File name excluding extension + /// + string Title { get; } - /// - /// Size in bytes - /// - long Size { get; } + /// + /// Size in bytes + /// + long Size { get; } - /// - /// Expressed as UTC time - /// - DateTime LastUpdated { get; } + /// + /// Expressed as UTC time + /// + DateTime LastUpdated { get; } - /// - /// File extension including dot - /// - string Extension { get; } + /// + /// File extension including dot + /// + string Extension { get; } - /// - /// Dimensions, if the file is an image. - /// - Size Dimensions { get; } + /// + /// Dimensions, if the file is an image. + /// + Size Dimensions { get; } - bool Exists { get; } + bool Exists { get; } - /// - /// Creates a stream for reading from the file. - /// - Stream OpenRead(); + /// + /// Creates a stream for reading from the file. + /// + Stream OpenRead(); /// /// Creates a stream for writing to the file. /// Stream OpenWrite(); - /// - /// Creates a stream for writing to the file, and truncates the existing content. - /// - Stream CreateFile(); + /// + /// Creates a stream for writing to the file, and truncates the existing content. + /// + Stream CreateFile(); - /// - /// Asynchronously creates a stream for writing to the file, and truncates the existing content. - /// - Task CreateFileAsync(); - } + /// + /// Asynchronously creates a stream for writing to the file, and truncates the existing content. + /// + Task CreateFileAsync(); + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/IO/IFileSystem.cs b/src/Libraries/SmartStore.Core/IO/IFileSystem.cs index 7fcb6fc793..74598c9391 100644 --- a/src/Libraries/SmartStore.Core/IO/IFileSystem.cs +++ b/src/Libraries/SmartStore.Core/IO/IFileSystem.cs @@ -7,108 +7,108 @@ namespace SmartStore.Core.IO { public interface IFileSystem { - /// - /// Checks whether the underlying storage is remote, like 'Azure' for example. - /// - bool IsCloudStorage { get; } - - /// - /// Gets the root path - /// - string Root { get; } - - /// - /// Retrieves the public URL for a given file within the storage provider. - /// - /// The file to resolve the public url for. - /// - /// If true and the storage is in the cloud, returns the actual remote cloud URL to the resource. - /// If false, retrieves an app relative URL to delegate further processing to the media middleware (which can handle remote files) - /// - /// The public URL. - string GetPublicUrl(IFile file, bool forCloud = false); - - /// - /// Retrieves the public URL for a given file within the storage provider. - /// - /// The relative path within the storage provider. - /// - /// If true and the storage is in the cloud, returns the actual remote cloud URL to the resource. - /// If false, retrieves an app relative URL to delegate further processing to the media middleware (which can handle remote files) - /// - /// The public URL. - string GetPublicUrl(string path, bool forCloud = false); - - /// - /// Retrieves the path within the storage provider for a given public url. - /// - /// The virtual or public url of a file. - /// The storage path or null if the media is not in a correct format. - string GetStoragePath(string url); - - /// - /// Checks if the given file exists within the storage provider. - /// - /// The relative path within the storage provider. - /// True if the file exists; False otherwise. - bool FileExists(string path); - - /// - /// Checks if the given folder exists within the storage provider. - /// - /// The relative path within the storage provider. - /// True if the folder exists; False otherwise. - bool FolderExists(string path); - - /// - /// Retrieves a file within the storage provider. - /// - /// The relative path to the file within the storage provider. - /// The file. - /// If the file is not found. - IFile GetFile(string path); - - /// - /// Retrieves a folder within the storage provider. - /// - /// The relative path to the folder within the storage provider. - /// The folder. - /// If the folder is not found. - IFolder GetFolder(string path); - - /// - /// Retrieves a folder for file path within the storage provider. - /// - /// The relative path to the file within the storage provider. - /// The folder for the file. - /// If the file or the folder is not found. - IFolder GetFolderForFile(string path); - - /// - /// Retrieves the count of files within a path. - /// - /// The relative path to the folder in which to retrieve file count. - /// The file pattern to match - /// Optional. Files not matching the predicate are excluded. - /// Whether to count files in all subfolders also - /// Total count of files. - long CountFiles(string path, string pattern, Func predicate, bool deep = true); - - /// - /// Performs a deep search for files within a path. - /// - /// The relative path to the folder in which to process file search. - /// The file pattern to match - /// Whether to search in all subfolders also - /// Matching file names - IEnumerable SearchFiles(string path, string pattern, bool deep = true); - - /// - /// Lists the files within a storage provider's path. - /// - /// The relative path to the folder which files to list. - /// The list of files in the folder. - IEnumerable ListFiles(string path); + /// + /// Checks whether the underlying storage is remote, like 'Azure' for example. + /// + bool IsCloudStorage { get; } + + /// + /// Gets the root path + /// + string Root { get; } + + /// + /// Retrieves the public URL for a given file within the storage provider. + /// + /// The file to resolve the public url for. + /// + /// If true and the storage is in the cloud, returns the actual remote cloud URL to the resource. + /// If false, retrieves an app relative URL to delegate further processing to the media middleware (which can handle remote files) + /// + /// The public URL. + string GetPublicUrl(IFile file, bool forCloud = false); + + /// + /// Retrieves the public URL for a given file within the storage provider. + /// + /// The relative path within the storage provider. + /// + /// If true and the storage is in the cloud, returns the actual remote cloud URL to the resource. + /// If false, retrieves an app relative URL to delegate further processing to the media middleware (which can handle remote files) + /// + /// The public URL. + string GetPublicUrl(string path, bool forCloud = false); + + /// + /// Retrieves the path within the storage provider for a given public url. + /// + /// The virtual or public url of a file. + /// The storage path or null if the media is not in a correct format. + string GetStoragePath(string url); + + /// + /// Checks if the given file exists within the storage provider. + /// + /// The relative path within the storage provider. + /// True if the file exists; False otherwise. + bool FileExists(string path); + + /// + /// Checks if the given folder exists within the storage provider. + /// + /// The relative path within the storage provider. + /// True if the folder exists; False otherwise. + bool FolderExists(string path); + + /// + /// Retrieves a file within the storage provider. + /// + /// The relative path to the file within the storage provider. + /// The file. + /// If the file is not found. + IFile GetFile(string path); + + /// + /// Retrieves a folder within the storage provider. + /// + /// The relative path to the folder within the storage provider. + /// The folder. + /// If the folder is not found. + IFolder GetFolder(string path); + + /// + /// Retrieves a folder for file path within the storage provider. + /// + /// The relative path to the file within the storage provider. + /// The folder for the file. + /// If the file or the folder is not found. + IFolder GetFolderForFile(string path); + + /// + /// Retrieves the count of files within a path. + /// + /// The relative path to the folder in which to retrieve file count. + /// The file pattern to match + /// Optional. Files not matching the predicate are excluded. + /// Whether to count files in all subfolders also + /// Total count of files. + long CountFiles(string path, string pattern, Func predicate, bool deep = true); + + /// + /// Performs a deep search for files within a path. + /// + /// The relative path to the folder in which to process file search. + /// The file pattern to match + /// Whether to search in all subfolders also + /// Matching file names + IEnumerable SearchFiles(string path, string pattern, bool deep = true); + + /// + /// Lists the files within a storage provider's path. + /// + /// The relative path to the folder which files to list. + /// The list of files in the folder. + IEnumerable ListFiles(string path); /// /// Lists the folders within a storage provider's path. @@ -131,46 +131,46 @@ public interface IFileSystem /// If the folder doesn't exist. void DeleteFolder(string path); - /// - /// Renames a folder in the storage provider. - /// - /// The relative path to the folder to be renamed. - /// The relative path to the new folder. - void RenameFolder(string path, string newPath); - - /// - /// Copies a folder and all its content to another folder. - /// - /// Path of source folder - /// Path of destination folder - /// Whether to overwrite existing files - void CopyFolder(string path, string destinationPath, bool overwrite = true); - - /// - /// Checks whether the name of the file is unique within its directory. - /// When given file exists, this method appends [1...n] to the file title until - /// the check returns false. - /// - /// The path of file to check - /// The new unique path, or null if method returns false - /// - /// false when does not exist yet. true otherwise. - /// - bool CheckUniqueFileName(string path, out string newPath); - - /// - /// Deletes a file in the storage provider. - /// - /// The relative path to the file to be deleted. - /// If the file doesn't exist. - void DeleteFile(string path); - - /// - /// Renames a file in the storage provider. - /// - /// The relative path to the file to be renamed. - /// The relative path to the new file. - void RenameFile(string path, string newPath); + /// + /// Renames a folder in the storage provider. + /// + /// The relative path to the folder to be renamed. + /// The relative path to the new folder. + void RenameFolder(string path, string newPath); + + /// + /// Copies a folder and all its content to another folder. + /// + /// Path of source folder + /// Path of destination folder + /// Whether to overwrite existing files + void CopyFolder(string path, string destinationPath, bool overwrite = true); + + /// + /// Checks whether the name of the file is unique within its directory. + /// When given file exists, this method appends [1...n] to the file title until + /// the check returns false. + /// + /// The path of file to check + /// The new unique path, or null if method returns false + /// + /// false when does not exist yet. true otherwise. + /// + bool CheckUniqueFileName(string path, out string newPath); + + /// + /// Deletes a file in the storage provider. + /// + /// The relative path to the file to be deleted. + /// If the file doesn't exist. + void DeleteFile(string path); + + /// + /// Renames a file in the storage provider. + /// + /// The relative path to the file to be renamed. + /// The relative path to the new file. + void RenameFile(string path, string newPath); /// /// Creates a file in the storage provider. @@ -180,44 +180,44 @@ public interface IFileSystem /// The created file. IFile CreateFile(string path); - /// - /// Asynchronously creates a file in the storage provider. - /// - /// The relative path to the file to be created. - /// If the file already exists. - /// The created file. - Task CreateFileAsync(string path); - - /// - /// Copies a file in the storage provider. - /// - /// The relative path to the file to be copied. - /// The relative path to the new file. - /// Whether to overwrite a file with same name. - void CopyFile(string path, string newPath, bool overwrite = false); - - /// - /// Saves a stream in the storage provider. If the file already exists, it will be overwritten. - /// - /// The relative path to the file to be created. - /// The stream to be saved. - /// If the stream can't be saved due to access permissions. - void SaveStream(string path, Stream inputStream); - - /// - /// Asynchronously saves a stream in the storage provider. If the file already exists, it will be overwritten. - /// - /// The relative path to the file to be created. - /// The stream to be saved. - /// If the stream can't be saved due to access permissions. - Task SaveStreamAsync(string path, Stream inputStream); - - /// - /// Combines two paths. - /// - /// The parent path. - /// The child path. - /// The combined path. - string Combine(string path1, string path2); - } + /// + /// Asynchronously creates a file in the storage provider. + /// + /// The relative path to the file to be created. + /// If the file already exists. + /// The created file. + Task CreateFileAsync(string path); + + /// + /// Copies a file in the storage provider. + /// + /// The relative path to the file to be copied. + /// The relative path to the new file. + /// Whether to overwrite a file with same name. + void CopyFile(string path, string newPath, bool overwrite = false); + + /// + /// Saves a stream in the storage provider. If the file already exists, it will be overwritten. + /// + /// The relative path to the file to be created. + /// The stream to be saved. + /// If the stream can't be saved due to access permissions. + void SaveStream(string path, Stream inputStream); + + /// + /// Asynchronously saves a stream in the storage provider. If the file already exists, it will be overwritten. + /// + /// The relative path to the file to be created. + /// The stream to be saved. + /// If the stream can't be saved due to access permissions. + Task SaveStreamAsync(string path, Stream inputStream); + + /// + /// Combines two paths. + /// + /// The parent path. + /// The child path. + /// The combined path. + string Combine(string path1, string path2); + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/IO/IFileSystemExtensions.cs b/src/Libraries/SmartStore.Core/IO/IFileSystemExtensions.cs index 0d1659bad1..ee815cc1e8 100644 --- a/src/Libraries/SmartStore.Core/IO/IFileSystemExtensions.cs +++ b/src/Libraries/SmartStore.Core/IO/IFileSystemExtensions.cs @@ -1,26 +1,24 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; namespace SmartStore.Core.IO { - public static class IFileSystemExtensions - { - public static void WriteAllText(this IFileSystem fileSystem, string path, string contents, Encoding encoding = null) - { - Guard.NotEmpty(path, nameof(path)); - Guard.NotEmpty(contents, nameof(contents)); - - if (fileSystem.FileExists(path)) - { - fileSystem.DeleteFile(path); - } + public static class IFileSystemExtensions + { + public static void WriteAllText(this IFileSystem fileSystem, string path, string contents, Encoding encoding = null) + { + Guard.NotEmpty(path, nameof(path)); + Guard.NotEmpty(contents, nameof(contents)); + + if (fileSystem.FileExists(path)) + { + fileSystem.DeleteFile(path); + } - var file = fileSystem.CreateFile(path); + var file = fileSystem.CreateFile(path); using (var stream = file.OpenWrite()) using (var streamWriter = new StreamWriter(stream, encoding ?? new UTF8Encoding(false, true))) @@ -29,175 +27,175 @@ public static void WriteAllText(this IFileSystem fileSystem, string path, string } } - public static async Task WriteAllTextAsync(this IFileSystem fileSystem, string path, string contents, Encoding encoding = null) - { - Guard.NotEmpty(path, nameof(path)); - Guard.NotEmpty(contents, nameof(contents)); - - if (fileSystem.FileExists(path)) - { - fileSystem.DeleteFile(path); - } - - var file = fileSystem.CreateFile(path); - using (var stream = file.OpenWrite()) - using (var streamWriter = new StreamWriter(stream, encoding ?? new UTF8Encoding(false, true))) - { - await streamWriter.WriteAsync(contents); - } - } - - public static string ReadAllText(this IFileSystem fileSystem, string path) - { - Guard.NotEmpty(path, nameof(path)); - - if (!fileSystem.FileExists(path)) - { - return String.Empty; - } - - var file = fileSystem.GetFile(path); - using (var stream = file.OpenRead()) - using (var streamReader = new StreamReader(stream, Encoding.UTF8)) - { - return streamReader.ReadToEnd(); - } - } - - public static async Task ReadAllTextAsync(this IFileSystem fileSystem, string path) - { - Guard.NotEmpty(path, nameof(path)); - - if (!fileSystem.FileExists(path)) - { - return String.Empty; - } - - var file = fileSystem.GetFile(path); - using (var stream = file.OpenRead()) - using (var streamReader = new StreamReader(stream, Encoding.UTF8)) - { - return await streamReader.ReadToEndAsync(); - } - } - - - public static void WriteAllBytes(this IFileSystem fileSystem, string path, byte[] contents) - { - Guard.NotEmpty(path, nameof(path)); - Guard.NotNull(contents, nameof(contents)); - - if (fileSystem.FileExists(path)) - { - fileSystem.DeleteFile(path); - } - - var file = fileSystem.CreateFile(path); - using (var stream = file.OpenWrite()) - { - stream.Write(contents, 0, contents.Length); - } - } - - public static async Task WriteAllBytesAsync(this IFileSystem fileSystem, string path, byte[] contents) - { - Guard.NotEmpty(path, nameof(path)); - Guard.NotNull(contents, nameof(contents)); - - if (fileSystem.FileExists(path)) - { - fileSystem.DeleteFile(path); - } - - var file = await fileSystem.CreateFileAsync(path); - using (var stream = file.OpenWrite()) - { - await stream.WriteAsync(contents, 0, contents.Length); - } - } - - public static byte[] ReadAllBytes(this IFileSystem fileSystem, string path) - { - Guard.NotEmpty(path, nameof(path)); - - if (!fileSystem.FileExists(path)) - { - return null; - } - - var file = fileSystem.GetFile(path); - using (var stream = file.OpenRead()) - { - return stream.ToByteArray(); - } - } - - public static async Task ReadAllBytesAsync(this IFileSystem fileSystem, string path) - { - Guard.NotEmpty(path, nameof(path)); - - if (!fileSystem.FileExists(path)) - { - return null; - } - - var file = fileSystem.GetFile(path); - using (var stream = file.OpenRead()) - { - return await stream.ToByteArrayAsync(); - } - } - - - /// - /// Tries to save a stream in the storage provider. - /// - /// The relative path to the file to be created. - /// The stream to be saved. - /// True if success; False otherwise. - public static bool TrySaveStream(this IFileSystem fileSystem, string path, Stream inputStream) - { - try - { - if (fileSystem.FileExists(path)) - { - return false; - } - - fileSystem.SaveStream(path, inputStream); - } - catch - { - return false; - } - - return true; - } - - /// - /// Asynchronously tries to save a stream in the storage provider. - /// - /// The relative path to the file to be created. - /// The stream to be saved. - /// True if success; False otherwise. - public static async Task TrySaveStreamAsync(this IFileSystem fileSystem, string path, Stream inputStream) - { - try - { - if (fileSystem.FileExists(path)) - { - return false; - } - - await fileSystem.SaveStreamAsync(path, inputStream); - } - catch - { - return false; - } - - return true; - } + public static async Task WriteAllTextAsync(this IFileSystem fileSystem, string path, string contents, Encoding encoding = null) + { + Guard.NotEmpty(path, nameof(path)); + Guard.NotEmpty(contents, nameof(contents)); + + if (fileSystem.FileExists(path)) + { + fileSystem.DeleteFile(path); + } + + var file = fileSystem.CreateFile(path); + using (var stream = file.OpenWrite()) + using (var streamWriter = new StreamWriter(stream, encoding ?? new UTF8Encoding(false, true))) + { + await streamWriter.WriteAsync(contents); + } + } + + public static string ReadAllText(this IFileSystem fileSystem, string path) + { + Guard.NotEmpty(path, nameof(path)); + + if (!fileSystem.FileExists(path)) + { + return String.Empty; + } + + var file = fileSystem.GetFile(path); + using (var stream = file.OpenRead()) + using (var streamReader = new StreamReader(stream, Encoding.UTF8)) + { + return streamReader.ReadToEnd(); + } + } + + public static async Task ReadAllTextAsync(this IFileSystem fileSystem, string path) + { + Guard.NotEmpty(path, nameof(path)); + + if (!fileSystem.FileExists(path)) + { + return String.Empty; + } + + var file = fileSystem.GetFile(path); + using (var stream = file.OpenRead()) + using (var streamReader = new StreamReader(stream, Encoding.UTF8)) + { + return await streamReader.ReadToEndAsync(); + } + } + + + public static void WriteAllBytes(this IFileSystem fileSystem, string path, byte[] contents) + { + Guard.NotEmpty(path, nameof(path)); + Guard.NotNull(contents, nameof(contents)); + + if (fileSystem.FileExists(path)) + { + fileSystem.DeleteFile(path); + } + + var file = fileSystem.CreateFile(path); + using (var stream = file.OpenWrite()) + { + stream.Write(contents, 0, contents.Length); + } + } + + public static async Task WriteAllBytesAsync(this IFileSystem fileSystem, string path, byte[] contents) + { + Guard.NotEmpty(path, nameof(path)); + Guard.NotNull(contents, nameof(contents)); + + if (fileSystem.FileExists(path)) + { + fileSystem.DeleteFile(path); + } + + var file = await fileSystem.CreateFileAsync(path); + using (var stream = file.OpenWrite()) + { + await stream.WriteAsync(contents, 0, contents.Length); + } + } + + public static byte[] ReadAllBytes(this IFileSystem fileSystem, string path) + { + Guard.NotEmpty(path, nameof(path)); + + if (!fileSystem.FileExists(path)) + { + return null; + } + + var file = fileSystem.GetFile(path); + using (var stream = file.OpenRead()) + { + return stream.ToByteArray(); + } + } + + public static async Task ReadAllBytesAsync(this IFileSystem fileSystem, string path) + { + Guard.NotEmpty(path, nameof(path)); + + if (!fileSystem.FileExists(path)) + { + return null; + } + + var file = fileSystem.GetFile(path); + using (var stream = file.OpenRead()) + { + return await stream.ToByteArrayAsync(); + } + } + + + /// + /// Tries to save a stream in the storage provider. + /// + /// The relative path to the file to be created. + /// The stream to be saved. + /// True if success; False otherwise. + public static bool TrySaveStream(this IFileSystem fileSystem, string path, Stream inputStream) + { + try + { + if (fileSystem.FileExists(path)) + { + return false; + } + + fileSystem.SaveStream(path, inputStream); + } + catch + { + return false; + } + + return true; + } + + /// + /// Asynchronously tries to save a stream in the storage provider. + /// + /// The relative path to the file to be created. + /// The stream to be saved. + /// True if success; False otherwise. + public static async Task TrySaveStreamAsync(this IFileSystem fileSystem, string path, Stream inputStream) + { + try + { + if (fileSystem.FileExists(path)) + { + return false; + } + + await fileSystem.SaveStreamAsync(path, inputStream); + } + catch + { + return false; + } + + return true; + } /// /// Retrieves the count of files within a path. @@ -208,9 +206,9 @@ public static async Task TrySaveStreamAsync(this IFileSystem fileSystem, s /// Total count of files. [MethodImpl(MethodImplOptions.AggressiveInlining)] public static long CountFiles(this IFileSystem fileSystem, string path, string pattern, bool deep = true) - { - return fileSystem.CountFiles(path, pattern, null, deep); - } + { + return fileSystem.CountFiles(path, pattern, null, deep); + } /// /// Retrieves the count of files within a path. @@ -220,8 +218,8 @@ public static long CountFiles(this IFileSystem fileSystem, string path, string p /// Total count of files. [MethodImpl(MethodImplOptions.AggressiveInlining)] public static long CountFiles(this IFileSystem fileSystem, string path, bool deep = true) - { - return fileSystem.CountFiles(path, "*", null, deep); - } - } + { + return fileSystem.CountFiles(path, "*", null, deep); + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/IFolder.cs b/src/Libraries/SmartStore.Core/IO/IFolder.cs index 77f46d0546..49eda06377 100644 --- a/src/Libraries/SmartStore.Core/IO/IFolder.cs +++ b/src/Libraries/SmartStore.Core/IO/IFolder.cs @@ -2,36 +2,36 @@ namespace SmartStore.Core.IO { - public interface IFolder + public interface IFolder { - /// - /// The path relative to the storage root - /// - string Path { get; } + /// + /// The path relative to the storage root + /// + string Path { get; } - /// - /// The foldername - /// - string Name { get; } + /// + /// The foldername + /// + string Name { get; } - /// - /// Size sum of all containing files - including those in subfolders - in bytes - /// - long Size { get; } + /// + /// Size sum of all containing files - including those in subfolders - in bytes + /// + long Size { get; } - /// - /// Whether the folder exists - /// - bool Exists { get; } + /// + /// Whether the folder exists + /// + bool Exists { get; } - /// - /// Expressed as UTC time - /// - DateTime LastUpdated { get; } + /// + /// Expressed as UTC time + /// + DateTime LastUpdated { get; } - /// - /// The parent folder - /// - IFolder Parent { get; } - } + /// + /// The parent folder + /// + IFolder Parent { get; } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/IO/ImageHeader.cs b/src/Libraries/SmartStore.Core/IO/ImageHeader.cs index 59cf682e86..231e5b3fe6 100644 --- a/src/Libraries/SmartStore.Core/IO/ImageHeader.cs +++ b/src/Libraries/SmartStore.Core/IO/ImageHeader.cs @@ -8,436 +8,436 @@ namespace SmartStore.Core.IO { - /// - /// Taken from http://stackoverflow.com/questions/111345/getting-image-dimensions-without-reading-the-entire-file/111349 - /// Minor improvements including supporting unsigned 16-bit integers when decoding Jfif and added logic - /// to load the image using new Bitmap if reading the headers fails - /// - public static class ImageHeader - { - internal class UnknownImageFormatException : ArgumentException - { - public UnknownImageFormatException(string paramName = "", Exception e = null) - : base("Could not recognise image format.", paramName, e) - { - } - } - - private static Dictionary> _imageFormatDecoders = new Dictionary>() - { - { new byte[] { 0x42, 0x4D }, DecodeBitmap }, - { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif }, - { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 }, DecodeGif }, - { new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, DecodePng }, + /// + /// Taken from http://stackoverflow.com/questions/111345/getting-image-dimensions-without-reading-the-entire-file/111349 + /// Minor improvements including supporting unsigned 16-bit integers when decoding Jfif and added logic + /// to load the image using new Bitmap if reading the headers fails + /// + public static class ImageHeader + { + internal class UnknownImageFormatException : ArgumentException + { + public UnknownImageFormatException(string paramName = "", Exception e = null) + : base("Could not recognise image format.", paramName, e) + { + } + } + + private static readonly Dictionary> _imageFormatDecoders = new Dictionary>() + { + { new byte[] { 0x42, 0x4D }, DecodeBitmap }, + { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif }, + { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 }, DecodeGif }, + { new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, DecodePng }, { new byte[] { 0xff, 0xd8 }, DecodeJpeg }, //{ new byte[] { 0xff, 0xd8, 0xff, 0xe0 }, DecodeJpeg }, //{ new byte[] { 0xff }, DecodeJpeg2 } }; - private static int _maxMagicBytesLength = 0; - - static ImageHeader() - { - _maxMagicBytesLength = _imageFormatDecoders.Keys.OrderByDescending(x => x.Length).First().Length; - } - - /// - /// Gets the dimensions of an image. - /// - /// The path of the image to get the dimensions for. - /// The dimensions of the specified image. - public static Size GetDimensions(string path) - { - if (!File.Exists(path)) - { - throw new FileNotFoundException("File '{0}' does not exist.".FormatInvariant(path)); - } - - var mime = MimeTypes.MapNameToMimeType(path); - return GetDimensions(File.OpenRead(path), mime, false); - } - - /// - /// Gets the dimensions of an image. - /// - /// The bytes of the image to get the dimensions for. - /// The MIME type of the image. Can be null. - /// The dimensions of the specified image. - public static Size GetDimensions(byte[] buffer, string mime = null) - { - if (buffer == null || buffer.Length == 0) - { - return Size.Empty; - } - - return GetDimensions(new MemoryStream(buffer), mime, false); - } - - /// - /// Gets the dimensions of an image. - /// - /// The stream of the image to get the dimensions for. - /// If false, the passed stream will get disposed - /// The dimensions of the specified image. - public static Size GetDimensions(Stream input, bool leaveOpen = true) - { - return GetDimensions(input, null, leaveOpen); - } - - /// - /// Gets the dimensions of an image. - /// - /// The stream of the image to get the dimensions for. - /// The MIME type of the image. Can be null. - /// If false, the passed stream will get disposed - /// The dimensions of the specified image. - public static Size GetDimensions(Stream input, string mime, bool leaveOpen = true) - { - Guard.NotNull(input, nameof(input)); - - var gdip = false; - - if (!input.CanSeek || input.Length == 0) - { - return Size.Empty; - } - - try - { - //if (mime == "image/jpeg") - //{ - // // Reading JPEG header does not work reliably - // gdip = true; - // return GetDimensionsByGdip(input); - //} - if (mime == "image/svg+xml") - { - return GetDimensionsFromSvg(input); - } - - using (var reader = new BinaryReader(input, Encoding.Unicode, true)) - { - return GetDimensions(reader); - } - } - catch (Exception ex) - { - if (gdip) - { - throw ex; - } - - // something went wrong with fast image access, - // so get original size the classic way - try - { - input.Seek(0, SeekOrigin.Begin); - return GetDimensionsByGdip(input); - } - catch - { - throw ex; - } - } - finally - { - if (!leaveOpen) - { - input.Dispose(); - } - else - { - input.Seek(0, SeekOrigin.Begin); - } - } - } - - /// - /// Gets the dimensions of an image. - /// - /// The path of the image to get the dimensions of. - /// The dimensions of the specified image. - /// The image was of an unrecognised format. - public static Size GetDimensions(BinaryReader binaryReader) - { - byte[] magicBytes = new byte[_maxMagicBytesLength]; - for (int i = 0; i < _maxMagicBytesLength; i += 1) - { - magicBytes[i] = binaryReader.ReadByte(); - foreach (var kvPair in _imageFormatDecoders) - { - if (StartsWith(magicBytes, kvPair.Key)) - { - var size = kvPair.Value(binaryReader); - if (size.IsEmpty) + private static readonly int _maxMagicBytesLength = 0; + + static ImageHeader() + { + _maxMagicBytesLength = _imageFormatDecoders.Keys.OrderByDescending(x => x.Length).First().Length; + } + + /// + /// Gets the dimensions of an image. + /// + /// The path of the image to get the dimensions for. + /// The dimensions of the specified image. + public static Size GetDimensions(string path) + { + if (!File.Exists(path)) + { + throw new FileNotFoundException("File '{0}' does not exist.".FormatInvariant(path)); + } + + var mime = MimeTypes.MapNameToMimeType(path); + return GetDimensions(File.OpenRead(path), mime, false); + } + + /// + /// Gets the dimensions of an image. + /// + /// The bytes of the image to get the dimensions for. + /// The MIME type of the image. Can be null. + /// The dimensions of the specified image. + public static Size GetDimensions(byte[] buffer, string mime = null) + { + if (buffer == null || buffer.Length == 0) + { + return Size.Empty; + } + + return GetDimensions(new MemoryStream(buffer), mime, false); + } + + /// + /// Gets the dimensions of an image. + /// + /// The stream of the image to get the dimensions for. + /// If false, the passed stream will get disposed + /// The dimensions of the specified image. + public static Size GetDimensions(Stream input, bool leaveOpen = true) + { + return GetDimensions(input, null, leaveOpen); + } + + /// + /// Gets the dimensions of an image. + /// + /// The stream of the image to get the dimensions for. + /// The MIME type of the image. Can be null. + /// If false, the passed stream will get disposed + /// The dimensions of the specified image. + public static Size GetDimensions(Stream input, string mime, bool leaveOpen = true) + { + Guard.NotNull(input, nameof(input)); + + var gdip = false; + + if (!input.CanSeek || input.Length == 0) + { + return Size.Empty; + } + + try + { + //if (mime == "image/jpeg") + //{ + // // Reading JPEG header does not work reliably + // gdip = true; + // return GetDimensionsByGdip(input); + //} + if (mime == "image/svg+xml") + { + return GetDimensionsFromSvg(input); + } + + using (var reader = new BinaryReader(input, Encoding.Unicode, true)) + { + return GetDimensions(reader); + } + } + catch (Exception ex) + { + if (gdip) + { + throw ex; + } + + // something went wrong with fast image access, + // so get original size the classic way + try + { + input.Seek(0, SeekOrigin.Begin); + return GetDimensionsByGdip(input); + } + catch + { + throw ex; + } + } + finally + { + if (!leaveOpen) + { + input.Dispose(); + } + else + { + input.Seek(0, SeekOrigin.Begin); + } + } + } + + /// + /// Gets the dimensions of an image. + /// + /// The path of the image to get the dimensions of. + /// The dimensions of the specified image. + /// The image was of an unrecognised format. + public static Size GetDimensions(BinaryReader binaryReader) + { + byte[] magicBytes = new byte[_maxMagicBytesLength]; + for (int i = 0; i < _maxMagicBytesLength; i += 1) + { + magicBytes[i] = binaryReader.ReadByte(); + foreach (var kvPair in _imageFormatDecoders) + { + if (StartsWith(magicBytes, kvPair.Key)) + { + var size = kvPair.Value(binaryReader); + if (size.IsEmpty) { - break; + break; } - else + else { - return size; + return size; } - } - } - } - - throw new UnknownImageFormatException("binaryReader"); - } - - private static Size GetDimensionsByGdip(Stream input) - { - using (var b = Image.FromStream(input, false, false)) - { - return new Size(b.Width, b.Height); - } - } - - private static Size GetDimensionsFromSvg(Stream input) - { - using (var reader = XmlReader.Create(input)) - { - while (reader.Read()) - { - if (reader.IsStartElement()) - { - if (reader.Name == "svg") - { - var width = reader["width"]; - var height = reader["height"]; - - var size = new Size(width.ToInt(), height.ToInt()); - if (size.Width == 0 || size.Height == 0) - { - var viewBox = reader["viewBox"]; - if (viewBox.HasValue()) - { - var arrViewBox = viewBox.Trim().Split(' '); - if (arrViewBox.Length == 4) - { - size = new Size(arrViewBox[2].ToInt(), arrViewBox[3].ToInt()); - } - } - } - - return size; - } - } - } - } - - return Size.Empty; - } - - private static bool StartsWith(byte[] thisBytes, byte[] thatBytes) - { - for (int i = 0; i < thatBytes.Length; i += 1) - { - if (thisBytes[i] != thatBytes[i]) - { - return false; - } - } - - return true; - } - - private static short ReadLittleEndianInt16(BinaryReader binaryReader) - { - byte[] bytes = new byte[sizeof(short)]; - - for (int i = 0; i < sizeof(short); i += 1) - { - bytes[sizeof(short) - 1 - i] = binaryReader.ReadByte(); - } - return BitConverter.ToInt16(bytes, 0); - } - - private static ushort ReadLittleEndianUInt16(BinaryReader binaryReader) - { - byte[] bytes = new byte[sizeof(ushort)]; - - for (int i = 0; i < sizeof(ushort); i += 1) - { - bytes[sizeof(ushort) - 1 - i] = binaryReader.ReadByte(); - } - return BitConverter.ToUInt16(bytes, 0); - } - - private static int ReadLittleEndianInt32(BinaryReader binaryReader) - { - byte[] bytes = new byte[sizeof(int)]; - for (int i = 0; i < sizeof(int); i += 1) - { - bytes[sizeof(int) - 1 - i] = binaryReader.ReadByte(); - } - return BitConverter.ToInt32(bytes, 0); - } - - private static Size DecodeBitmap(BinaryReader binaryReader) - { - binaryReader.ReadBytes(16); - int width = binaryReader.ReadInt32(); - int height = binaryReader.ReadInt32(); - return new Size(width, height); - } - - private static Size DecodeGif(BinaryReader binaryReader) - { - int width = binaryReader.ReadInt16(); - int height = binaryReader.ReadInt16(); - return new Size(width, height); - } - - private static Size DecodePng(BinaryReader binaryReader) - { - binaryReader.ReadBytes(8); - int width = ReadLittleEndianInt32(binaryReader); - int height = ReadLittleEndianInt32(binaryReader); - return new Size(width, height); - } - - private static Size DecodeJpeg(BinaryReader reader) - { - string state = "started"; - while (true) - { - byte[] c; - if (state == "started") - { - c = reader.ReadBytes(1); - state = (c[0] == 0xFF) ? "sof" : "started"; - } - else if (state == "sof") - { - c = reader.ReadBytes(1); - if (c[0] >= 0xe0 && c[0] <= 0xef) - { - state = "skipframe"; - } - else if ((c[0] >= 0xC0 && c[0] <= 0xC3) || (c[0] >= 0xC5 && c[0] <= 0xC7) || (c[0] >= 0xC9 && c[0] <= 0xCB) || (c[0] >= 0xCD && c[0] <= 0xCF)) - { - state = "readsize"; - } - else if (c[0] == 0xFF) - { - state = "sof"; - } - else - { - state = "skipframe"; - } - } - else if (state == "skipframe") - { - c = reader.ReadBytes(2); - int skip = ReadInt(c) - 2; - reader.ReadBytes(skip); - state = "started"; - } - else if (state == "readsize") - { - c = reader.ReadBytes(7); - var width = ReadInt(new[] { c[5], c[6] }); - var height = ReadInt(new[] { c[3], c[4] }); - return new Size(width, height); - } - } - - throw new UnknownImageFormatException(); - } - - private static int ReadInt(byte[] chars) - { - return (chars[0] << 8) + chars[1]; - } - - #region Experiments - - //private static Size DecodeJpeg2(BinaryReader reader) - //{ - // bool found = false; - // bool eof = false; - - // while (!found || eof) - // { - // // read 0xFF and the type - // //reader.ReadByte(); - // byte type = reader.ReadByte(); - - // // get length - // int len = 0; - // switch (type) - // { - // // start and end of the image - // case 0xD8: - // case 0xD9: - // len = 0; - // break; - - // // restart interval - // case 0xDD: - // len = 2; - // break; - - // // the next two bytes is the length - // default: - // int lenHi = reader.ReadByte(); - // int lenLo = reader.ReadByte(); - // len = (lenHi << 8 | lenLo) - 2; - // break; - // } - - // // EOF? - // if (type == 0xD9) - // eof = true; - - // // process the data - // if (len > 0) - // { - // // read the data - // byte[] data = reader.ReadBytes(len); - - // // this is what we are looking for - // if (type == 0xC0) - // { - // int width = data[1] << 8 | data[2]; - // int height = data[3] << 8 | data[4]; - // return new Size(width, height); - // } - // } - // } - - // throw new UnknownImageFormatException(); - //} - - //private static Size DecodeJfif(BinaryReader reader) - //{ - // while (reader.ReadByte() == 0xff) - // { - // byte marker = reader.ReadByte(); - // short chunkLength = ReadLittleEndianInt16(reader); - // if (marker == 0xc0) - // { - // reader.ReadByte(); - // int height = ReadLittleEndianInt16(reader); - // int width = ReadLittleEndianInt16(reader); - // return new Size(width, height); - // } - - // if (chunkLength < 0) - // { - // ushort uchunkLength = (ushort)chunkLength; - // reader.ReadBytes(uchunkLength - 2); - // } - // else - // { - // reader.ReadBytes(chunkLength - 2); - // } - // } - - // throw new UnknownImageFormatException(); - //} - - #endregion - } + } + } + } + + throw new UnknownImageFormatException("binaryReader"); + } + + private static Size GetDimensionsByGdip(Stream input) + { + using (var b = Image.FromStream(input, false, false)) + { + return new Size(b.Width, b.Height); + } + } + + private static Size GetDimensionsFromSvg(Stream input) + { + using (var reader = XmlReader.Create(input)) + { + while (reader.Read()) + { + if (reader.IsStartElement()) + { + if (reader.Name == "svg") + { + var width = reader["width"]; + var height = reader["height"]; + + var size = new Size(width.ToInt(), height.ToInt()); + if (size.Width == 0 || size.Height == 0) + { + var viewBox = reader["viewBox"]; + if (viewBox.HasValue()) + { + var arrViewBox = viewBox.Trim().Split(' '); + if (arrViewBox.Length == 4) + { + size = new Size(arrViewBox[2].ToInt(), arrViewBox[3].ToInt()); + } + } + } + + return size; + } + } + } + } + + return Size.Empty; + } + + private static bool StartsWith(byte[] thisBytes, byte[] thatBytes) + { + for (int i = 0; i < thatBytes.Length; i += 1) + { + if (thisBytes[i] != thatBytes[i]) + { + return false; + } + } + + return true; + } + + private static short ReadLittleEndianInt16(BinaryReader binaryReader) + { + byte[] bytes = new byte[sizeof(short)]; + + for (int i = 0; i < sizeof(short); i += 1) + { + bytes[sizeof(short) - 1 - i] = binaryReader.ReadByte(); + } + return BitConverter.ToInt16(bytes, 0); + } + + private static ushort ReadLittleEndianUInt16(BinaryReader binaryReader) + { + byte[] bytes = new byte[sizeof(ushort)]; + + for (int i = 0; i < sizeof(ushort); i += 1) + { + bytes[sizeof(ushort) - 1 - i] = binaryReader.ReadByte(); + } + return BitConverter.ToUInt16(bytes, 0); + } + + private static int ReadLittleEndianInt32(BinaryReader binaryReader) + { + byte[] bytes = new byte[sizeof(int)]; + for (int i = 0; i < sizeof(int); i += 1) + { + bytes[sizeof(int) - 1 - i] = binaryReader.ReadByte(); + } + return BitConverter.ToInt32(bytes, 0); + } + + private static Size DecodeBitmap(BinaryReader binaryReader) + { + binaryReader.ReadBytes(16); + int width = binaryReader.ReadInt32(); + int height = binaryReader.ReadInt32(); + return new Size(width, height); + } + + private static Size DecodeGif(BinaryReader binaryReader) + { + int width = binaryReader.ReadInt16(); + int height = binaryReader.ReadInt16(); + return new Size(width, height); + } + + private static Size DecodePng(BinaryReader binaryReader) + { + binaryReader.ReadBytes(8); + int width = ReadLittleEndianInt32(binaryReader); + int height = ReadLittleEndianInt32(binaryReader); + return new Size(width, height); + } + + private static Size DecodeJpeg(BinaryReader reader) + { + string state = "started"; + while (true) + { + byte[] c; + if (state == "started") + { + c = reader.ReadBytes(1); + state = (c[0] == 0xFF) ? "sof" : "started"; + } + else if (state == "sof") + { + c = reader.ReadBytes(1); + if (c[0] >= 0xe0 && c[0] <= 0xef) + { + state = "skipframe"; + } + else if ((c[0] >= 0xC0 && c[0] <= 0xC3) || (c[0] >= 0xC5 && c[0] <= 0xC7) || (c[0] >= 0xC9 && c[0] <= 0xCB) || (c[0] >= 0xCD && c[0] <= 0xCF)) + { + state = "readsize"; + } + else if (c[0] == 0xFF) + { + state = "sof"; + } + else + { + state = "skipframe"; + } + } + else if (state == "skipframe") + { + c = reader.ReadBytes(2); + int skip = ReadInt(c) - 2; + reader.ReadBytes(skip); + state = "started"; + } + else if (state == "readsize") + { + c = reader.ReadBytes(7); + var width = ReadInt(new[] { c[5], c[6] }); + var height = ReadInt(new[] { c[3], c[4] }); + return new Size(width, height); + } + } + + throw new UnknownImageFormatException(); + } + + private static int ReadInt(byte[] chars) + { + return (chars[0] << 8) + chars[1]; + } + + #region Experiments + + //private static Size DecodeJpeg2(BinaryReader reader) + //{ + // bool found = false; + // bool eof = false; + + // while (!found || eof) + // { + // // read 0xFF and the type + // //reader.ReadByte(); + // byte type = reader.ReadByte(); + + // // get length + // int len = 0; + // switch (type) + // { + // // start and end of the image + // case 0xD8: + // case 0xD9: + // len = 0; + // break; + + // // restart interval + // case 0xDD: + // len = 2; + // break; + + // // the next two bytes is the length + // default: + // int lenHi = reader.ReadByte(); + // int lenLo = reader.ReadByte(); + // len = (lenHi << 8 | lenLo) - 2; + // break; + // } + + // // EOF? + // if (type == 0xD9) + // eof = true; + + // // process the data + // if (len > 0) + // { + // // read the data + // byte[] data = reader.ReadBytes(len); + + // // this is what we are looking for + // if (type == 0xC0) + // { + // int width = data[1] << 8 | data[2]; + // int height = data[3] << 8 | data[4]; + // return new Size(width, height); + // } + // } + // } + + // throw new UnknownImageFormatException(); + //} + + //private static Size DecodeJfif(BinaryReader reader) + //{ + // while (reader.ReadByte() == 0xff) + // { + // byte marker = reader.ReadByte(); + // short chunkLength = ReadLittleEndianInt16(reader); + // if (marker == 0xc0) + // { + // reader.ReadByte(); + // int height = ReadLittleEndianInt16(reader); + // int width = ReadLittleEndianInt16(reader); + // return new Size(width, height); + // } + + // if (chunkLength < 0) + // { + // ushort uchunkLength = (ushort)chunkLength; + // reader.ReadBytes(uchunkLength - 2); + // } + // else + // { + // reader.ReadBytes(chunkLength - 2); + // } + // } + + // throw new UnknownImageFormatException(); + //} + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs index 823cf4a2b0..4db3e64a4e 100644 --- a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs +++ b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs @@ -10,526 +10,520 @@ namespace SmartStore.Core.IO { - public class LocalFileSystem : IFileSystem - { - private string _root; - private string _publicPath; // /Shop/base - private string _storagePath; // C:\SMNET\base - private bool _isCloudStorage; // When public URL is outside of current app - - public LocalFileSystem() - : this(string.Empty, string.Empty) - { - } - - protected internal LocalFileSystem(string basePath) - : this(basePath, string.Empty) - { - } - - protected internal LocalFileSystem(string basePath, string publicPath) - { - basePath = basePath.EmptyNull(); - - var pathIsAbsolute = PathHelper.IsAbsolutePhysicalPath(basePath); - - NormalizeStoragePath(ref basePath, pathIsAbsolute); - - _publicPath = NormalizePublicPath(publicPath, basePath, pathIsAbsolute); - - _root = basePath; - } - - public bool IsCloudStorage - { - get { return _isCloudStorage; } - } - - private void NormalizeStoragePath(ref string basePath, bool basePathIsAbsolute) - { - if (basePathIsAbsolute) - { - // Path is fully qualified (UNC or absolute with drive letter) - - // In this case this is our root path... - basePath = basePath.TrimEnd(Path.DirectorySeparatorChar); - - // ...AND our physical storage path - _storagePath = basePath; - } - else - { - // Path is relative to the app root - basePath = basePath.TrimEnd('/').EnsureStartsWith("/"); - _storagePath = CommonHelper.MapPath("~" + basePath, false); - } - } - - private string NormalizePublicPath(string publicPath, string basePath, bool basePathIsAbsolute) - { - publicPath = publicPath.EmptyNull(); - - if (basePathIsAbsolute) - { - if (publicPath.IsEmpty() || (!publicPath.StartsWith("~/") && !publicPath.IsWebUrl(true))) - { - var streamMedia = CommonHelper.GetAppSetting("sm:StreamRemoteMedia", true); - if (!streamMedia) - { - throw new ArgumentException(@"When the base path is a fully qualified path and remote media streaming is disabled, + public class LocalFileSystem : IFileSystem + { + private readonly string _root; + private readonly string _publicPath; // /Shop/base + private string _storagePath; // C:\SMNET\base + private bool _isCloudStorage; // When public URL is outside of current app + + public LocalFileSystem() + : this(string.Empty, string.Empty) + { + } + + protected internal LocalFileSystem(string basePath) + : this(basePath, string.Empty) + { + } + + protected internal LocalFileSystem(string basePath, string publicPath) + { + basePath = basePath.EmptyNull(); + + var pathIsAbsolute = PathHelper.IsAbsolutePhysicalPath(basePath); + + NormalizeStoragePath(ref basePath, pathIsAbsolute); + + _publicPath = NormalizePublicPath(publicPath, basePath, pathIsAbsolute); + + _root = basePath; + } + + public bool IsCloudStorage => _isCloudStorage; + + private void NormalizeStoragePath(ref string basePath, bool basePathIsAbsolute) + { + if (basePathIsAbsolute) + { + // Path is fully qualified (UNC or absolute with drive letter) + + // In this case this is our root path... + basePath = basePath.TrimEnd(Path.DirectorySeparatorChar); + + // ...AND our physical storage path + _storagePath = basePath; + } + else + { + // Path is relative to the app root + basePath = basePath.TrimEnd('/').EnsureStartsWith("/"); + _storagePath = CommonHelper.MapPath("~" + basePath, false); + } + } + + private string NormalizePublicPath(string publicPath, string basePath, bool basePathIsAbsolute) + { + publicPath = publicPath.EmptyNull(); + + if (basePathIsAbsolute) + { + if (publicPath.IsEmpty() || (!publicPath.StartsWith("~/") && !publicPath.IsWebUrl(true))) + { + var streamMedia = CommonHelper.GetAppSetting("sm:StreamRemoteMedia", true); + if (!streamMedia) + { + throw new ArgumentException(@"When the base path is a fully qualified path and remote media streaming is disabled, the public path must not be empty, and either be a fully qualified URL or a virtual path (e.g.: ~/Media)", nameof(publicPath)); - } - } - } - - var appVirtualPath = HostingEnvironment.IsHosted - ? HostingEnvironment.ApplicationVirtualPath.TrimEnd('/') - : string.Empty; - - if (publicPath.StartsWith("~/")) - { - // prepend application virtual path - return appVirtualPath + publicPath.Substring(1); - } - - if (publicPath.IsEmpty() && !basePathIsAbsolute) - { - // > /MyAppRoot/Media - return appVirtualPath + basePath; - } - - _isCloudStorage = true; - - return publicPath; - } - - public string Root - { - get { return _root; } - } - - /// - /// Maps a relative path into the storage path. - /// - /// The relative path to be mapped. - /// The relative path combined with the storage path. - protected virtual string MapStorage(string path) - { - var mappedPath = string.IsNullOrEmpty(path) ? _storagePath : Path.Combine(_storagePath, Fix(path)); - return ValidatePath(_storagePath, mappedPath); - } - - /// - /// Maps a relative path into the public path. - /// - /// The relative path to be mapped. - /// The relative path combined with the public path in an URL friendly format ('/' character for directory separator). - protected virtual string MapPublic(string path) - { - return string.IsNullOrEmpty(path) ? _publicPath : HttpUtility.UrlDecode(Path.Combine(_publicPath, path).Replace(Path.DirectorySeparatorChar, '/')); - } - - static string Fix(string path) - { - return string.IsNullOrEmpty(path) - ? "" - : Path.DirectorySeparatorChar != '/' - ? path.Replace('/', Path.DirectorySeparatorChar).TrimStart('/', '\\') - : path.TrimStart('/', '\\'); - } - - public string GetPublicUrl(IFile file, bool forCloud = false) - { - return MapPublic(file.Path); - } - - public string GetPublicUrl(string path, bool forCloud = false) - { - return MapPublic(path); - } - - public virtual string GetStoragePath(string url) - { - if (url.HasValue()) - { - if (url.StartsWith("~/")) - { - url = VirtualPathUtility.ToAbsolute(url); - } - - if (url.StartsWith(_publicPath)) - { - return HttpUtility.UrlDecode(url.Substring(_publicPath.Length).Replace('/', Path.DirectorySeparatorChar)); - } - } - - return null; - } - - public bool FileExists(string path) - { - return File.Exists(MapStorage(path)); - } - - public bool FolderExists(string path) - { - return Directory.Exists(MapStorage(path)); - } - - public IFile GetFile(string path) - { - return new LocalFile(path, MapStorage(path)); - } - - public IFolder GetFolder(string path) - { - return new LocalFolder(path, MapStorage(path)); - } - - public IFolder GetFolderForFile(string path) - { - var fileInfo = new FileInfo(MapStorage(path)); - if (!fileInfo.Exists) - { - throw new FileNotFoundException("File " + path + " does not exist"); - } - - if (!fileInfo.Directory.Exists) - { - throw new DirectoryNotFoundException("Folder " + path + " does not exist"); - } - - // Get relative path of the folder - var folderPath = Path.GetDirectoryName(path); - - return new LocalFolder(folderPath, fileInfo.Directory); - } - - public long CountFiles(string path, string pattern, Func predicate, bool deep = true) - { - var files = SearchFiles(path, pattern, deep).AsParallel(); - - if (predicate != null) - { - return files.Count(predicate); - } - else - { - return files.Count(); - } - } - - public IEnumerable SearchFiles(string path, string pattern, bool deep = true) - { - // Get relative from absolute path - var index = _storagePath.EmptyNull().Length; - - return Directory - .EnumerateFiles(MapStorage(path), pattern, deep ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly) - .Select(x => x.Substring(index)); - } - - public IEnumerable ListFiles(string path) - { - var directoryInfo = new DirectoryInfo(MapStorage(path)); - - if (!directoryInfo.Exists) - { - throw new DirectoryNotFoundException("Directory " + path + " does not exist"); - } - - return directoryInfo - .EnumerateFiles() - .Where(fi => !IsHidden(fi)) - .Select(fi => new LocalFile(Path.Combine(path, fi.Name), fi)); - } - - public IEnumerable ListFolders(string path) - { - var directoryInfo = new DirectoryInfo(MapStorage(path)); - - if (!directoryInfo.Exists) - { - try - { - directoryInfo.Create(); - } - catch (Exception ex) - { - if (ex.IsFatal()) - { - throw; - } - throw new ArgumentException(string.Format("The folder could not be created at path: {0}. {1}", path, ex)); - } - } - - return directoryInfo - .EnumerateDirectories() - .Where(di => !IsHidden(di)) - .Select(di => new LocalFolder(Path.Combine(path, di.Name), di)); - } - - private static bool IsHidden(FileSystemInfo di) - { - return (di.Attributes & FileAttributes.Hidden) != 0; - } - - public IFolder CreateFolder(string path) - { - return new LocalFolder(path, Directory.CreateDirectory(MapStorage(path))); - } - - public void DeleteFolder(string path) - { - var directoryInfo = new DirectoryInfo(MapStorage(path)); - - if (!directoryInfo.Exists) - { - throw new DirectoryNotFoundException("Directory " + path + " does not exist."); - } - - directoryInfo.Delete(true); - } - - public void RenameFolder(string path, string newPath) - { - var sourceDirectory = new DirectoryInfo(MapStorage(path)); - if (!sourceDirectory.Exists) - { - throw new DirectoryNotFoundException("Directory " + path + "does not exist."); - } - - var targetDirectory = new DirectoryInfo(MapStorage(newPath)); - if (targetDirectory.Exists) - { - throw new ArgumentException("Directory " + newPath + " already exists."); - } - - Directory.Move(sourceDirectory.FullName, targetDirectory.FullName); - } - - public void CopyFolder(string path, string destinationPath, bool overwrite = true) - { - var sourceDirectory = new DirectoryInfo(MapStorage(path)); - if (!sourceDirectory.Exists) - { - throw new DirectoryNotFoundException("Directory " + path + "does not exist."); - } - - var targetPath = Combine(MapStorage(destinationPath), sourceDirectory.Name); - var destDirectory = new DirectoryInfo(targetPath); - if (!overwrite && destDirectory.Exists) - { - throw new ArgumentException("Directory " + destinationPath + " already exists."); - } - - if (!destDirectory.Exists) - { - destDirectory.Create(); - } - - FileSystemHelper.CopyDirectory(sourceDirectory, destDirectory, overwrite); - } - - public bool CheckUniqueFileName(string path, out string newPath) - { - Guard.NotEmpty(path, nameof(path)); - - newPath = null; - - var file = GetFile(path); - if (!file.Exists) - { - return false; - } - - var pattern = string.Concat(file.Title, "-*", file.Extension); - var dir = file.Directory; - var files = new HashSet(SearchFiles(dir, pattern, false).Select(x => Path.GetFileName(x)), StringComparer.OrdinalIgnoreCase); - - int i = 1; - while (true) - { - var fileName = string.Concat(file.Title, "-", i, file.Extension); - if (!files.Contains(fileName)) - { - // Found our gap - newPath = Combine(dir, fileName); - return true; - } - - i++; - } - } - - public IFile CreateFile(string path) - { - var fileInfo = new FileInfo(MapStorage(path)); - - if (fileInfo.Exists) - { - throw new ArgumentException("File " + path + " already exists"); - } - - // Ensure the directory exists - var dirName = Path.GetDirectoryName(fileInfo.FullName); - if (!Directory.Exists(dirName)) - { - Directory.CreateDirectory(dirName); - } - - File.WriteAllBytes(fileInfo.FullName, new byte[0]); + } + } + } + + var appVirtualPath = HostingEnvironment.IsHosted + ? HostingEnvironment.ApplicationVirtualPath.TrimEnd('/') + : string.Empty; + + if (publicPath.StartsWith("~/")) + { + // prepend application virtual path + return appVirtualPath + publicPath.Substring(1); + } + + if (publicPath.IsEmpty() && !basePathIsAbsolute) + { + // > /MyAppRoot/Media + return appVirtualPath + basePath; + } + + _isCloudStorage = true; + + return publicPath; + } + + public string Root => _root; + + /// + /// Maps a relative path into the storage path. + /// + /// The relative path to be mapped. + /// The relative path combined with the storage path. + protected virtual string MapStorage(string path) + { + var mappedPath = string.IsNullOrEmpty(path) ? _storagePath : Path.Combine(_storagePath, Fix(path)); + return ValidatePath(_storagePath, mappedPath); + } + + /// + /// Maps a relative path into the public path. + /// + /// The relative path to be mapped. + /// The relative path combined with the public path in an URL friendly format ('/' character for directory separator). + protected virtual string MapPublic(string path) + { + return string.IsNullOrEmpty(path) ? _publicPath : HttpUtility.UrlDecode(Path.Combine(_publicPath, path).Replace(Path.DirectorySeparatorChar, '/')); + } + + static string Fix(string path) + { + return string.IsNullOrEmpty(path) + ? "" + : Path.DirectorySeparatorChar != '/' + ? path.Replace('/', Path.DirectorySeparatorChar).TrimStart('/', '\\') + : path.TrimStart('/', '\\'); + } + + public string GetPublicUrl(IFile file, bool forCloud = false) + { + return MapPublic(file.Path); + } + + public string GetPublicUrl(string path, bool forCloud = false) + { + return MapPublic(path); + } + + public virtual string GetStoragePath(string url) + { + if (url.HasValue()) + { + if (url.StartsWith("~/")) + { + url = VirtualPathUtility.ToAbsolute(url); + } + + if (url.StartsWith(_publicPath)) + { + return HttpUtility.UrlDecode(url.Substring(_publicPath.Length).Replace('/', Path.DirectorySeparatorChar)); + } + } + + return null; + } + + public bool FileExists(string path) + { + return File.Exists(MapStorage(path)); + } + + public bool FolderExists(string path) + { + return Directory.Exists(MapStorage(path)); + } + + public IFile GetFile(string path) + { + return new LocalFile(path, MapStorage(path)); + } + + public IFolder GetFolder(string path) + { + return new LocalFolder(path, MapStorage(path)); + } + + public IFolder GetFolderForFile(string path) + { + var fileInfo = new FileInfo(MapStorage(path)); + if (!fileInfo.Exists) + { + throw new FileNotFoundException("File " + path + " does not exist"); + } + + if (!fileInfo.Directory.Exists) + { + throw new DirectoryNotFoundException("Folder " + path + " does not exist"); + } + + // Get relative path of the folder + var folderPath = Path.GetDirectoryName(path); + + return new LocalFolder(folderPath, fileInfo.Directory); + } + + public long CountFiles(string path, string pattern, Func predicate, bool deep = true) + { + var files = SearchFiles(path, pattern, deep).AsParallel(); + + if (predicate != null) + { + return files.Count(predicate); + } + else + { + return files.Count(); + } + } + + public IEnumerable SearchFiles(string path, string pattern, bool deep = true) + { + // Get relative from absolute path + var index = _storagePath.EmptyNull().Length; + + return Directory + .EnumerateFiles(MapStorage(path), pattern, deep ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly) + .Select(x => x.Substring(index)); + } + + public IEnumerable ListFiles(string path) + { + var directoryInfo = new DirectoryInfo(MapStorage(path)); + + if (!directoryInfo.Exists) + { + throw new DirectoryNotFoundException("Directory " + path + " does not exist"); + } + + return directoryInfo + .EnumerateFiles() + .Where(fi => !IsHidden(fi)) + .Select(fi => new LocalFile(Path.Combine(path, fi.Name), fi)); + } + + public IEnumerable ListFolders(string path) + { + var directoryInfo = new DirectoryInfo(MapStorage(path)); + + if (!directoryInfo.Exists) + { + try + { + directoryInfo.Create(); + } + catch (Exception ex) + { + if (ex.IsFatal()) + { + throw; + } + throw new ArgumentException(string.Format("The folder could not be created at path: {0}. {1}", path, ex)); + } + } + + return directoryInfo + .EnumerateDirectories() + .Where(di => !IsHidden(di)) + .Select(di => new LocalFolder(Path.Combine(path, di.Name), di)); + } + + private static bool IsHidden(FileSystemInfo di) + { + return (di.Attributes & FileAttributes.Hidden) != 0; + } + + public IFolder CreateFolder(string path) + { + return new LocalFolder(path, Directory.CreateDirectory(MapStorage(path))); + } + + public void DeleteFolder(string path) + { + var directoryInfo = new DirectoryInfo(MapStorage(path)); + + if (!directoryInfo.Exists) + { + throw new DirectoryNotFoundException("Directory " + path + " does not exist."); + } + + directoryInfo.Delete(true); + } + + public void RenameFolder(string path, string newPath) + { + var sourceDirectory = new DirectoryInfo(MapStorage(path)); + if (!sourceDirectory.Exists) + { + throw new DirectoryNotFoundException("Directory " + path + "does not exist."); + } + + var targetDirectory = new DirectoryInfo(MapStorage(newPath)); + if (targetDirectory.Exists) + { + throw new ArgumentException("Directory " + newPath + " already exists."); + } + + Directory.Move(sourceDirectory.FullName, targetDirectory.FullName); + } + + public void CopyFolder(string path, string destinationPath, bool overwrite = true) + { + var sourceDirectory = new DirectoryInfo(MapStorage(path)); + if (!sourceDirectory.Exists) + { + throw new DirectoryNotFoundException("Directory " + path + "does not exist."); + } + + var targetPath = Combine(MapStorage(destinationPath), sourceDirectory.Name); + var destDirectory = new DirectoryInfo(targetPath); + if (!overwrite && destDirectory.Exists) + { + throw new ArgumentException("Directory " + destinationPath + " already exists."); + } + + if (!destDirectory.Exists) + { + destDirectory.Create(); + } + + FileSystemHelper.CopyDirectory(sourceDirectory, destDirectory, overwrite); + } + + public bool CheckUniqueFileName(string path, out string newPath) + { + Guard.NotEmpty(path, nameof(path)); + + newPath = null; + + var file = GetFile(path); + if (!file.Exists) + { + return false; + } + + var pattern = string.Concat(file.Title, "-*", file.Extension); + var dir = file.Directory; + var files = new HashSet(SearchFiles(dir, pattern, false).Select(x => Path.GetFileName(x)), StringComparer.OrdinalIgnoreCase); + + int i = 1; + while (true) + { + var fileName = string.Concat(file.Title, "-", i, file.Extension); + if (!files.Contains(fileName)) + { + // Found our gap + newPath = Combine(dir, fileName); + return true; + } + + i++; + } + } + + public IFile CreateFile(string path) + { + var fileInfo = new FileInfo(MapStorage(path)); + + if (fileInfo.Exists) + { + throw new ArgumentException("File " + path + " already exists"); + } + + // Ensure the directory exists + var dirName = Path.GetDirectoryName(fileInfo.FullName); + if (!Directory.Exists(dirName)) + { + Directory.CreateDirectory(dirName); + } + + File.WriteAllBytes(fileInfo.FullName, new byte[0]); fileInfo.Refresh(); - return new LocalFile(path, fileInfo); - } - - public async Task CreateFileAsync(string path) - { - var fileInfo = new FileInfo(MapStorage(path)); - - if (fileInfo.Exists) - { - throw new ArgumentException("File " + path + " already exists"); - } - - // ensure the directory exists - var dirName = Path.GetDirectoryName(fileInfo.FullName); - if (!Directory.Exists(dirName)) - { - Directory.CreateDirectory(dirName); - } - - using (FileStream stream = new FileStream(fileInfo.FullName, FileMode.Create, FileAccess.Write, FileShare.Read, bufferSize: 4096, useAsync: true)) - { - await stream.WriteAsync(new byte[0], 0, 0); - } + return new LocalFile(path, fileInfo); + } + + public async Task CreateFileAsync(string path) + { + var fileInfo = new FileInfo(MapStorage(path)); + + if (fileInfo.Exists) + { + throw new ArgumentException("File " + path + " already exists"); + } + + // ensure the directory exists + var dirName = Path.GetDirectoryName(fileInfo.FullName); + if (!Directory.Exists(dirName)) + { + Directory.CreateDirectory(dirName); + } + + using (FileStream stream = new FileStream(fileInfo.FullName, FileMode.Create, FileAccess.Write, FileShare.Read, bufferSize: 4096, useAsync: true)) + { + await stream.WriteAsync(new byte[0], 0, 0); + } fileInfo.Refresh(); - return new LocalFile(path, fileInfo); - } - - public void DeleteFile(string path) - { - var fileInfo = new FileInfo(MapStorage(path)); - - if (fileInfo.Exists) - { - WaitForUnlockAndExecute(fileInfo, x => x.Delete()); - } - } - - public void RenameFile(string path, string newPath) - { - var sourceFileInfo = new FileInfo(MapStorage(path)); - if (!sourceFileInfo.Exists) - { - throw new FileNotFoundException("File " + path + " does not exist."); - } - - var targetFileInfo = new FileInfo(MapStorage(newPath)); - if (targetFileInfo.Exists) - { - throw new ArgumentException("File " + newPath + " already exists."); - } - - WaitForUnlockAndExecute(sourceFileInfo, x => File.Move(x.FullName, targetFileInfo.FullName)); - } - - public void CopyFile(string path, string newPath, bool overwrite = false) - { - var sourceFileInfo = new FileInfo(MapStorage(path)); - if (!sourceFileInfo.Exists) - { - throw new FileNotFoundException("File " + path + " does not exist"); - } - - var targetPath = MapStorage(newPath); - if (!overwrite) - { - var targetFileInfo = new FileInfo(targetPath); - if (targetFileInfo.Exists) - { - throw new ArgumentException("File " + newPath + " already exists"); - } - } - - WaitForUnlockAndExecute(sourceFileInfo, x => File.Copy(x.FullName, targetPath, overwrite)); - } - - public void SaveStream(string path, Stream inputStream) - { - using (var outputStream = File.OpenWrite(MapStorage(path))) - { - outputStream.SetLength(0); - inputStream.CopyTo(outputStream); - } - } - - public async Task SaveStreamAsync(string path, Stream inputStream) - { - using (var outputStream = File.OpenWrite(MapStorage(path))) - { - outputStream.SetLength(0); - await inputStream.CopyToAsync(outputStream); - } - } - - public string Combine(string path1, string path2) - { - return Path.Combine(path1, path2); - } - - private static void WaitForUnlockAndExecute(FileInfo fi, Action action) - { - try - { - action(fi); - } - catch (IOException) - { - if (!fi.WaitForUnlock(250)) - { - throw; - } - - action(fi); - } - } - - /// - /// Determines if a path lies within the base path boundaries. - /// If not, an exception is thrown. - /// - /// The base path which boundaries are not to be transposed. - /// The path to determine. - /// The mapped path if valid. - /// If the path is invalid. - internal static string ValidatePath(string basePath, string mappedPath) - { - bool valid = false; - string error = null; - - try - { - // Check that we are indeed within the storage directory boundaries - valid = Path.GetFullPath(mappedPath).StartsWith(Path.GetFullPath(basePath), StringComparison.OrdinalIgnoreCase); - } - catch (Exception exception) - { - // Make sure that if invalid for medium trust we give a proper exception - valid = false; - error = exception.Message; - } - - if (!valid) - { - throw new ArgumentException($"{error ?? "Invalid path."} mappedPath: {mappedPath.NaIfEmpty()}"); - } - - return mappedPath; - } + return new LocalFile(path, fileInfo); + } + + public void DeleteFile(string path) + { + var fileInfo = new FileInfo(MapStorage(path)); + + if (fileInfo.Exists) + { + WaitForUnlockAndExecute(fileInfo, x => x.Delete()); + } + } + + public void RenameFile(string path, string newPath) + { + var sourceFileInfo = new FileInfo(MapStorage(path)); + if (!sourceFileInfo.Exists) + { + throw new FileNotFoundException("File " + path + " does not exist."); + } + + var targetFileInfo = new FileInfo(MapStorage(newPath)); + if (targetFileInfo.Exists) + { + throw new ArgumentException("File " + newPath + " already exists."); + } + + WaitForUnlockAndExecute(sourceFileInfo, x => File.Move(x.FullName, targetFileInfo.FullName)); + } + + public void CopyFile(string path, string newPath, bool overwrite = false) + { + var sourceFileInfo = new FileInfo(MapStorage(path)); + if (!sourceFileInfo.Exists) + { + throw new FileNotFoundException("File " + path + " does not exist"); + } + + var targetPath = MapStorage(newPath); + if (!overwrite) + { + var targetFileInfo = new FileInfo(targetPath); + if (targetFileInfo.Exists) + { + throw new ArgumentException("File " + newPath + " already exists"); + } + } + + WaitForUnlockAndExecute(sourceFileInfo, x => File.Copy(x.FullName, targetPath, overwrite)); + } + + public void SaveStream(string path, Stream inputStream) + { + using (var outputStream = File.OpenWrite(MapStorage(path))) + { + outputStream.SetLength(0); + inputStream.CopyTo(outputStream); + } + } + + public async Task SaveStreamAsync(string path, Stream inputStream) + { + using (var outputStream = File.OpenWrite(MapStorage(path))) + { + outputStream.SetLength(0); + await inputStream.CopyToAsync(outputStream); + } + } + + public string Combine(string path1, string path2) + { + return Path.Combine(path1, path2); + } + + private static void WaitForUnlockAndExecute(FileInfo fi, Action action) + { + try + { + action(fi); + } + catch (IOException) + { + if (!fi.WaitForUnlock(250)) + { + throw; + } + + action(fi); + } + } + + /// + /// Determines if a path lies within the base path boundaries. + /// If not, an exception is thrown. + /// + /// The base path which boundaries are not to be transposed. + /// The path to determine. + /// The mapped path if valid. + /// If the path is invalid. + internal static string ValidatePath(string basePath, string mappedPath) + { + bool valid = false; + string error = null; + + try + { + // Check that we are indeed within the storage directory boundaries + valid = Path.GetFullPath(mappedPath).StartsWith(Path.GetFullPath(basePath), StringComparison.OrdinalIgnoreCase); + } + catch (Exception exception) + { + // Make sure that if invalid for medium trust we give a proper exception + valid = false; + error = exception.Message; + } + + if (!valid) + { + throw new ArgumentException($"{error ?? "Invalid path."} mappedPath: {mappedPath.NaIfEmpty()}"); + } + + return mappedPath; + } public class LocalFile : IFile { @@ -557,40 +551,19 @@ private FileInfo GetFileInfo() return _fileInfo ?? (_fileInfo = new FileInfo(_localPath)); } - public string Path - { - get { return _relativePath; } - } + public string Path => _relativePath; - public string Directory - { - get { return _relativePath.Substring(0, _relativePath.Length - Name.Length); } - } + public string Directory => _relativePath.Substring(0, _relativePath.Length - Name.Length); - public string Name - { - get { return _fileInfo?.Name ?? _name ?? (_name = System.IO.Path.GetFileName(_localPath)); } - } + public string Name => _fileInfo?.Name ?? _name ?? (_name = System.IO.Path.GetFileName(_localPath)); - public string Title - { - get { return System.IO.Path.GetFileNameWithoutExtension(_localPath); } - } + public string Title => System.IO.Path.GetFileNameWithoutExtension(_localPath); - public long Size - { - get { return GetFileInfo().Length; } - } + public long Size => GetFileInfo().Length; - public DateTime LastUpdated - { - get { return GetFileInfo().LastWriteTimeUtc; } - } + public DateTime LastUpdated => GetFileInfo().LastWriteTimeUtc; - public string Extension - { - get { return _fileInfo?.Extension ?? System.IO.Path.GetExtension(_localPath); } - } + public string Extension => _fileInfo?.Extension ?? System.IO.Path.GetExtension(_localPath); public Size Dimensions { @@ -601,7 +574,7 @@ public Size Dimensions try { var mime = MimeTypes.MapNameToMimeType(Name); - _dimensions = ImageHeader.GetDimensions(OpenRead(), mime, false); + _dimensions = ImageHeader.GetDimensions(OpenRead(), mime, false); } catch { @@ -611,20 +584,17 @@ public Size Dimensions return _dimensions.Value; } - internal set - { - _dimensions = value; - } + internal set => _dimensions = value; } public bool Exists { - get - { + get + { if (_fileInfo != null) return _fileInfo.Exists; - return System.IO.File.Exists(_localPath); + return System.IO.File.Exists(_localPath); } } @@ -635,13 +605,13 @@ public Stream OpenRead() public Stream OpenWrite() { - var fi = GetFileInfo(); - if (!fi.Directory.Exists) + var fi = GetFileInfo(); + if (!fi.Directory.Exists) { - System.IO.Directory.CreateDirectory(fi.Directory.FullName); + System.IO.Directory.CreateDirectory(fi.Directory.FullName); } - return new FileStream(_localPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true); + return new FileStream(_localPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true); } public Stream CreateFile() @@ -655,8 +625,8 @@ public Task CreateFileAsync() } } - public class LocalFolder : IFolder - { + public class LocalFolder : IFolder + { private readonly string _localPath; private readonly string _relativePath; private string _name; @@ -680,25 +650,13 @@ private DirectoryInfo GetDirInfo() return _dirInfo ?? (_dirInfo = new DirectoryInfo(_localPath)); } - public string Path - { - get { return _relativePath; } - } + public string Path => _relativePath; - public string Name - { - get { return _dirInfo?.Name ?? _name ?? (_name = GetDirName(_relativePath)); } - } + public string Name => _dirInfo?.Name ?? _name ?? (_name = GetDirName(_relativePath)); - public DateTime LastUpdated - { - get { return GetDirInfo().LastWriteTimeUtc; } - } + public DateTime LastUpdated => GetDirInfo().LastWriteTimeUtc; - public long Size - { - get { return GetDirectorySize(GetDirInfo()); } - } + public long Size => GetDirectorySize(GetDirInfo()); public bool Exists { @@ -712,18 +670,18 @@ public bool Exists } public IFolder Parent - { - get - { + { + get + { var parent = GetDirInfo().Parent; - + if (parent != null) - { - return new LocalFolder(System.IO.Path.GetDirectoryName(_relativePath), parent); - } - throw new ArgumentException("Directory " + _dirInfo.Name + " does not have a parent directory"); - } - } + { + return new LocalFolder(System.IO.Path.GetDirectoryName(_relativePath), parent); + } + throw new ArgumentException("Directory " + _dirInfo.Name + " does not have a parent directory"); + } + } private static string GetDirName(string fullPath) { @@ -739,29 +697,29 @@ private static string GetDirName(string fullPath) private static long GetDirectorySize(DirectoryInfo directoryInfo) - { - long size = 0; - - FileInfo[] fileInfos = directoryInfo.GetFiles(); - foreach (FileInfo fileInfo in fileInfos) - { - if (!IsHidden(fileInfo)) - { - size += fileInfo.Length; - } - } - DirectoryInfo[] directoryInfos = directoryInfo.GetDirectories(); - foreach (DirectoryInfo dInfo in directoryInfos) - { - if (!IsHidden(dInfo)) - { - size += GetDirectorySize(dInfo); - } - } - - return size; - } - } - - } + { + long size = 0; + + FileInfo[] fileInfos = directoryInfo.GetFiles(); + foreach (FileInfo fileInfo in fileInfos) + { + if (!IsHidden(fileInfo)) + { + size += fileInfo.Length; + } + } + DirectoryInfo[] directoryInfos = directoryInfo.GetDirectories(); + foreach (DirectoryInfo dInfo in directoryInfos) + { + if (!IsHidden(dInfo)) + { + size += GetDirectorySize(dInfo); + } + } + + return size; + } + } + + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/IO/LockFile/ILockFile.cs b/src/Libraries/SmartStore.Core/IO/LockFile/ILockFile.cs index 1856377808..32b901619a 100644 --- a/src/Libraries/SmartStore.Core/IO/LockFile/ILockFile.cs +++ b/src/Libraries/SmartStore.Core/IO/LockFile/ILockFile.cs @@ -1,19 +1,15 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace SmartStore.Core.IO { - /// - /// Represents a Lock File acquired on the file system - /// - /// - /// The instance needs to be disposed in order to release the lock explicitly - /// - public interface ILockFile : IDisposable - { - void Release(); - } + /// + /// Represents a Lock File acquired on the file system + /// + /// + /// The instance needs to be disposed in order to release the lock explicitly + /// + public interface ILockFile : IDisposable + { + void Release(); + } } diff --git a/src/Libraries/SmartStore.Core/IO/LockFile/ILockFileManager.cs b/src/Libraries/SmartStore.Core/IO/LockFile/ILockFileManager.cs index 9cd529bf1a..f3f04237cb 100644 --- a/src/Libraries/SmartStore.Core/IO/LockFile/ILockFileManager.cs +++ b/src/Libraries/SmartStore.Core/IO/LockFile/ILockFileManager.cs @@ -1,28 +1,26 @@ -using System; - -namespace SmartStore.Core.IO +namespace SmartStore.Core.IO { - /// - /// Abstraction for application-wide lock files creation. - /// - /// - /// All virtual paths passed in or returned are relative to "~/App_Data". - /// - public interface ILockFileManager - { - /// - /// Attempts to acquire an exclusive lock file. - /// - /// The filename of the lock file to create relative to ~/App_Data. - /// A reference to the lock file object if the lock is granted. - /// true if the lock is granted; otherwise, false. - bool TryAcquireLock(string path, out ILockFile lockFile); + /// + /// Abstraction for application-wide lock files creation. + /// + /// + /// All virtual paths passed in or returned are relative to "~/App_Data". + /// + public interface ILockFileManager + { + /// + /// Attempts to acquire an exclusive lock file. + /// + /// The filename of the lock file to create relative to ~/App_Data. + /// A reference to the lock file object if the lock is granted. + /// true if the lock is granted; otherwise, false. + bool TryAcquireLock(string path, out ILockFile lockFile); - /// - /// Wether a lock file is already existing. - /// - /// The filename of the lock file to test. - /// true if the lock file exists; otherwise, false. - bool IsLocked(string path); - } + /// + /// Wether a lock file is already existing. + /// + /// The filename of the lock file to test. + /// true if the lock file exists; otherwise, false. + bool IsLocked(string path); + } } diff --git a/src/Libraries/SmartStore.Core/IO/LockFile/LockFile.cs b/src/Libraries/SmartStore.Core/IO/LockFile/LockFile.cs index 1693635837..f4277071bc 100644 --- a/src/Libraries/SmartStore.Core/IO/LockFile/LockFile.cs +++ b/src/Libraries/SmartStore.Core/IO/LockFile/LockFile.cs @@ -1,54 +1,53 @@ -using System; +using System.IO; using System.Threading; -using System.IO; using SmartStore.Utilities.Threading; namespace SmartStore.Core.IO { - public class LockFile : ILockFile - { - private readonly string _path; - private readonly string _content; - private readonly IVirtualFolder _folder; - private readonly ReaderWriterLockSlim _rwLock; - private bool _released; + public class LockFile : ILockFile + { + private readonly string _path; + private readonly string _content; + private readonly IVirtualFolder _folder; + private readonly ReaderWriterLockSlim _rwLock; + private bool _released; - public LockFile(IVirtualFolder folder, string path, string content, ReaderWriterLockSlim rwLock) - { - _folder = folder; - _content = content; - _rwLock = rwLock; - _path = path; + public LockFile(IVirtualFolder folder, string path, string content, ReaderWriterLockSlim rwLock) + { + _folder = folder; + _content = content; + _rwLock = rwLock; + _path = path; - // create the physical lock file - _folder.CreateTextFile(_path, content); - } + // create the physical lock file + _folder.CreateTextFile(_path, content); + } - public void Dispose() - { - Release(); - } + public void Dispose() + { + Release(); + } - public void Release() - { - using (_rwLock.GetWriteLock()) - { - if (_released || !File.Exists(_folder.MapPath(_path))) - { - // nothing to do, might happen if re-granted or already released - // INFO: VirtualPathProvider caches file existence info, so not very reliable here. - return; - } + public void Release() + { + using (_rwLock.GetWriteLock()) + { + if (_released || !File.Exists(_folder.MapPath(_path))) + { + // nothing to do, might happen if re-granted or already released + // INFO: VirtualPathProvider caches file existence info, so not very reliable here. + return; + } - _released = true; + _released = true; - // check it has not been granted in the meantime - var current = _folder.ReadFile(_path); - if (current == _content) - { - _folder.DeleteFile(_path); - } - } - } - } + // check it has not been granted in the meantime + var current = _folder.ReadFile(_path); + if (current == _content) + { + _folder.DeleteFile(_path); + } + } + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/LockFile/LockFileManager.cs b/src/Libraries/SmartStore.Core/IO/LockFile/LockFileManager.cs index 20d00e3441..0965d810f2 100644 --- a/src/Libraries/SmartStore.Core/IO/LockFile/LockFileManager.cs +++ b/src/Libraries/SmartStore.Core/IO/LockFile/LockFileManager.cs @@ -1,95 +1,95 @@ using System; using System.Globalization; -using System.Threading; using System.IO; +using System.Threading; using SmartStore.Utilities.Threading; namespace SmartStore.Core.IO { - public class LockFileManager : ILockFileManager - { - private readonly IApplicationEnvironment _env; - private readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); + public class LockFileManager : ILockFileManager + { + private readonly IApplicationEnvironment _env; + private readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); + + static LockFileManager() + { + Expiration = TimeSpan.FromMinutes(10); + } - static LockFileManager() - { - Expiration = TimeSpan.FromMinutes(10); - } + public LockFileManager(IApplicationEnvironment env) + { + _env = env; + } - public LockFileManager(IApplicationEnvironment env) - { - _env = env; - } + public static TimeSpan Expiration + { + get; + private set; + } - public static TimeSpan Expiration - { - get; - private set; - } + public bool TryAcquireLock(string path, out ILockFile lockFile) + { + lockFile = null; - public bool TryAcquireLock(string path, out ILockFile lockFile) - { - lockFile = null; + if (!_rwLock.TryEnterWriteLock(0)) + { + return false; + } - if (!_rwLock.TryEnterWriteLock(0)) - { - return false; - } + try + { + if (IsLockedInternal(path)) + { + return false; + } - try - { - if (IsLockedInternal(path)) - { - return false; - } - - lockFile = new LockFile(_env.TenantFolder, path, DateTime.UtcNow.ToString("u"), _rwLock); - return true; - } - catch - { - // an error occured while reading/creating the lock file - return false; - } - finally - { - _rwLock.ExitWriteLock(); - } - } + lockFile = new LockFile(_env.TenantFolder, path, DateTime.UtcNow.ToString("u"), _rwLock); + return true; + } + catch + { + // an error occured while reading/creating the lock file + return false; + } + finally + { + _rwLock.ExitWriteLock(); + } + } - public bool IsLocked(string path) - { - using (_rwLock.GetWriteLock()) - { - try - { - return IsLockedInternal(path); - } - catch - { - // an error occured while reading the file - return true; - } - } - } + public bool IsLocked(string path) + { + using (_rwLock.GetWriteLock()) + { + try + { + return IsLockedInternal(path); + } + catch + { + // an error occured while reading the file + return true; + } + } + } - private bool IsLockedInternal(string path) - { - // INFO: VirtualPathProvider caches file existence info, so not very reliable here. - if (File.Exists(_env.TenantFolder.MapPath(path))) - { - var content = _env.TenantFolder.ReadFile(path); + private bool IsLockedInternal(string path) + { + // INFO: VirtualPathProvider caches file existence info, so not very reliable here. + if (File.Exists(_env.TenantFolder.MapPath(path))) + { + var content = _env.TenantFolder.ReadFile(path); - if (DateTime.TryParse(content, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var creationUtc)) - { - // if expired the file is not removed - // it should be automatically as there is a finalizer in LockFile - // or the next taker can do it, unless it also fails, again - return creationUtc.ToUniversalTime().Add(Expiration) > DateTime.UtcNow; - } - } + if (DateTime.TryParse(content, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var creationUtc)) + { + // if expired the file is not removed + // it should be automatically as there is a finalizer in LockFile + // or the next taker can do it, unless it also fails, again + return creationUtc.ToUniversalTime().Add(Expiration) > DateTime.UtcNow; + } + } - return false; - } - } + return false; + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/MimeTypes.cs b/src/Libraries/SmartStore.Core/IO/MimeTypes.cs index a0ec5b68bb..50c8e79c3c 100644 --- a/src/Libraries/SmartStore.Core/IO/MimeTypes.cs +++ b/src/Libraries/SmartStore.Core/IO/MimeTypes.cs @@ -1,766 +1,766 @@ using System; -using System.IO; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.IO; using Microsoft.Win32; namespace SmartStore.Core.IO -{ +{ public static class MimeTypes { - private static readonly char[] _pathSeparatorChars = new [] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar, Path.VolumeSeparatorChar }; - private static readonly Dictionary _mimeMap; - private static readonly Dictionary _extMap; + private static readonly char[] _pathSeparatorChars = new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar, Path.VolumeSeparatorChar }; + private static readonly Dictionary _mimeMap; + private static readonly Dictionary _extMap; - const string DefaultMimeType = "application/octet-stream"; + const string DefaultMimeType = "application/octet-stream"; - static MimeTypes() - { - // maps both ways, - // extension -> mime type - // and - // mime type -> extension - // - // any mime type on left side not pre-loaded on right side, are added automatically. - // Some mime types can map to multiple extensions, so to get a deterministic mapping, - // add those to the dictionary specifcially - // - // Some added based on http://www.iana.org/assignments/media-types/media-types.xhtml - // which lists mime types, but not extensions - // + static MimeTypes() + { + // maps both ways, + // extension -> mime type + // and + // mime type -> extension + // + // any mime type on left side not pre-loaded on right side, are added automatically. + // Some mime types can map to multiple extensions, so to get a deterministic mapping, + // add those to the dictionary specifcially + // + // Some added based on http://www.iana.org/assignments/media-types/media-types.xhtml + // which lists mime types, but not extensions + // - _mimeMap = new Dictionary(StringComparer.OrdinalIgnoreCase) - { + _mimeMap = new Dictionary(StringComparer.OrdinalIgnoreCase) + { #region Mime types > extension map {"application/fsharp-script", ".fsx"}, - {"application/msaccess", ".adp"}, - {"application/msword", ".doc"}, - {"application/octet-stream", ".bin"}, - {"application/onenote", ".one"}, - {"application/postscript", ".eps"}, - {"application/step", ".step"}, - {"application/vnd.ms-excel", ".xls"}, - {"application/vnd.ms-powerpoint", ".ppt"}, - {"application/vnd.ms-works", ".wks"}, - {"application/vnd.visio", ".vsd"}, - {"application/x-director", ".dir"}, - {"application/x-shockwave-flash", ".swf"}, - {"application/x-x509-ca-cert", ".cer"}, - {"application/x-zip-compressed", ".zip"}, - {"application/xhtml+xml", ".xhtml"}, - {"application/xml", ".xml"}, // anomoly, .xml -> text/xml, but application/xml -> many thingss, but all are xml, so safest is .xml + {"application/msaccess", ".adp"}, + {"application/msword", ".doc"}, + {"application/octet-stream", ".bin"}, + {"application/onenote", ".one"}, + {"application/postscript", ".eps"}, + {"application/step", ".step"}, + {"application/vnd.ms-excel", ".xls"}, + {"application/vnd.ms-powerpoint", ".ppt"}, + {"application/vnd.ms-works", ".wks"}, + {"application/vnd.visio", ".vsd"}, + {"application/x-director", ".dir"}, + {"application/x-shockwave-flash", ".swf"}, + {"application/x-x509-ca-cert", ".cer"}, + {"application/x-zip-compressed", ".zip"}, + {"application/xhtml+xml", ".xhtml"}, + {"application/xml", ".xml"}, // anomoly, .xml -> text/xml, but application/xml -> many thingss, but all are xml, so safest is .xml {"audio/aac", ".AAC"}, - {"audio/aiff", ".aiff"}, - {"audio/basic", ".snd"}, - {"audio/mid", ".midi"}, - {"audio/wav", ".wav"}, - {"audio/x-m4a", ".m4a"}, - {"audio/x-mpegurl", ".m3u"}, - {"audio/x-pn-realaudio", ".ra"}, - {"audio/x-smd", ".smd"}, - {"image/bmp", ".bmp"}, - {"image/jpeg", ".jpg"}, - {"image/pict", ".pic"}, - {"image/png", ".png"}, //Defined in [RFC-2045], [RFC-2048] + {"audio/aiff", ".aiff"}, + {"audio/basic", ".snd"}, + {"audio/mid", ".midi"}, + {"audio/wav", ".wav"}, + {"audio/x-m4a", ".m4a"}, + {"audio/x-mpegurl", ".m3u"}, + {"audio/x-pn-realaudio", ".ra"}, + {"audio/x-smd", ".smd"}, + {"image/bmp", ".bmp"}, + {"image/jpeg", ".jpg"}, + {"image/pict", ".pic"}, + {"image/png", ".png"}, //Defined in [RFC-2045], [RFC-2048] {"image/x-png", ".png"}, //See https://www.w3.org/TR/PNG/#A-Media-type :"It is recommended that implementations also recognize the media type "image/x-png"." {"image/tiff", ".tiff"}, - {"image/x-macpaint", ".mac"}, - {"image/x-quicktime", ".qti"}, - {"message/rfc822", ".eml"}, - {"text/html", ".html"}, - {"text/plain", ".txt"}, - {"text/scriptlet", ".wsc"}, - {"text/xml", ".xml"}, - {"video/3gpp", ".3gp"}, - {"video/3gpp2", ".3gp2"}, - {"video/mp4", ".mp4"}, - {"video/mpeg", ".mpg"}, - {"video/quicktime", ".mov"}, - {"video/vnd.dlna.mpeg-tts", ".m2t"}, - {"video/x-dv", ".dv"}, - {"video/x-la-asf", ".lsf"}, - {"video/x-ms-asf", ".asf"}, - {"x-world/x-vrml", ".xof"}, + {"image/x-macpaint", ".mac"}, + {"image/x-quicktime", ".qti"}, + {"message/rfc822", ".eml"}, + {"text/html", ".html"}, + {"text/plain", ".txt"}, + {"text/scriptlet", ".wsc"}, + {"text/xml", ".xml"}, + {"video/3gpp", ".3gp"}, + {"video/3gpp2", ".3gp2"}, + {"video/mp4", ".mp4"}, + {"video/mpeg", ".mpg"}, + {"video/quicktime", ".mov"}, + {"video/vnd.dlna.mpeg-tts", ".m2t"}, + {"video/x-dv", ".dv"}, + {"video/x-la-asf", ".lsf"}, + {"video/x-ms-asf", ".asf"}, + {"x-world/x-vrml", ".xof"}, #endregion }; - _extMap = new Dictionary(StringComparer.OrdinalIgnoreCase) - { + _extMap = new Dictionary(StringComparer.OrdinalIgnoreCase) + { #region Extension > mime type map {".323", "text/h323"}, - {".3g2", "video/3gpp2"}, - {".3gp", "video/3gpp"}, - {".3gp2", "video/3gpp2"}, - {".3gpp", "video/3gpp"}, - {".7z", "application/x-7z-compressed"}, - {".aa", "audio/audible"}, - {".AAC", "audio/aac"}, - {".aaf", "application/octet-stream"}, - {".aax", "audio/vnd.audible.aax"}, - {".ac3", "audio/ac3"}, - {".aca", "application/octet-stream"}, - {".accda", "application/msaccess.addin"}, - {".accdb", "application/msaccess"}, - {".accdc", "application/msaccess.cab"}, - {".accde", "application/msaccess"}, - {".accdr", "application/msaccess.runtime"}, - {".accdt", "application/msaccess"}, - {".accdw", "application/msaccess.webapplication"}, - {".accft", "application/msaccess.ftemplate"}, - {".acx", "application/internet-property-stream"}, - {".AddIn", "text/xml"}, - {".ade", "application/msaccess"}, - {".adobebridge", "application/x-bridge-url"}, - {".adp", "application/msaccess"}, - {".ADT", "audio/vnd.dlna.adts"}, - {".ADTS", "audio/aac"}, - {".afm", "application/octet-stream"}, - {".ai", "application/postscript"}, - {".aif", "audio/aiff"}, - {".aifc", "audio/aiff"}, - {".aiff", "audio/aiff"}, - {".air", "application/vnd.adobe.air-application-installer-package+zip"}, - {".amc", "application/mpeg"}, - {".anx", "application/annodex"}, - {".apk", "application/vnd.android.package-archive" }, - {".application", "application/x-ms-application"}, - {".art", "image/x-jg"}, - {".asa", "application/xml"}, - {".asax", "application/xml"}, - {".ascx", "application/xml"}, - {".asd", "application/octet-stream"}, - {".asf", "video/x-ms-asf"}, - {".ashx", "application/xml"}, - {".asi", "application/octet-stream"}, - {".asm", "text/plain"}, - {".asmx", "application/xml"}, - {".aspx", "application/xml"}, - {".asr", "video/x-ms-asf"}, - {".asx", "video/x-ms-asf"}, - {".atom", "application/atom+xml"}, - {".au", "audio/basic"}, - {".avi", "video/x-msvideo"}, - {".axa", "audio/annodex"}, - {".axs", "application/olescript"}, - {".axv", "video/annodex"}, - {".bas", "text/plain"}, - {".bcpio", "application/x-bcpio"}, - {".bin", "application/octet-stream"}, - {".bmp", "image/bmp"}, - {".c", "text/plain"}, - {".cab", "application/octet-stream"}, - {".caf", "audio/x-caf"}, - {".calx", "application/vnd.ms-office.calx"}, - {".cat", "application/vnd.ms-pki.seccat"}, - {".cc", "text/plain"}, - {".cd", "text/plain"}, - {".cdda", "audio/aiff"}, - {".cdf", "application/x-cdf"}, - {".cer", "application/x-x509-ca-cert"}, - {".cfg", "text/plain"}, - {".chm", "application/octet-stream"}, - {".class", "application/x-java-applet"}, - {".clp", "application/x-msclip"}, - {".cmd", "text/plain"}, - {".cmx", "image/x-cmx"}, - {".cnf", "text/plain"}, - {".cod", "image/cis-cod"}, - {".config", "application/xml"}, - {".contact", "text/x-ms-contact"}, - {".coverage", "application/xml"}, - {".cpio", "application/x-cpio"}, - {".cpp", "text/plain"}, - {".crd", "application/x-mscardfile"}, - {".crl", "application/pkix-crl"}, - {".crt", "application/x-x509-ca-cert"}, - {".cs", "text/plain"}, - {".csdproj", "text/plain"}, - {".csh", "application/x-csh"}, - {".csproj", "text/plain"}, - {".css", "text/css"}, - {".csv", "text/csv"}, - {".cur", "application/octet-stream"}, - {".cxx", "text/plain"}, - {".dat", "application/octet-stream"}, - {".datasource", "application/xml"}, - {".dbproj", "text/plain"}, - {".dcr", "application/x-director"}, - {".def", "text/plain"}, - {".deploy", "application/octet-stream"}, - {".der", "application/x-x509-ca-cert"}, - {".dgml", "application/xml"}, - {".dib", "image/bmp"}, - {".dif", "video/x-dv"}, - {".dir", "application/x-director"}, - {".disco", "text/xml"}, - {".divx", "video/divx"}, - {".dll", "application/x-msdownload"}, - {".dll.config", "text/xml"}, - {".dlm", "text/dlm"}, - {".doc", "application/msword"}, - {".docm", "application/vnd.ms-word.document.macroEnabled.12"}, - {".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"}, - {".dot", "application/msword"}, - {".dotm", "application/vnd.ms-word.template.macroEnabled.12"}, - {".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template"}, - {".dsp", "application/octet-stream"}, - {".dsw", "text/plain"}, - {".dtd", "text/xml"}, - {".dtsConfig", "text/xml"}, - {".dv", "video/x-dv"}, - {".dvi", "application/x-dvi"}, - {".dwf", "drawing/x-dwf"}, - {".dwg", "application/acad"}, - {".dwp", "application/octet-stream"}, - {".dxf", "application/x-dxf" }, - {".dxr", "application/x-director"}, - {".eml", "message/rfc822"}, - {".emz", "application/octet-stream"}, - {".eot", "application/vnd.ms-fontobject"}, - {".eps", "application/postscript"}, - {".etl", "application/etl"}, - {".etx", "text/x-setext"}, - {".evy", "application/envoy"}, - {".exe", "application/octet-stream"}, - {".exe.config", "text/xml"}, - {".fdf", "application/vnd.fdf"}, - {".fif", "application/fractals"}, - {".filters", "application/xml"}, - {".fla", "application/octet-stream"}, - {".flac", "audio/flac"}, - {".flr", "x-world/x-vrml"}, - {".flv", "video/x-flv"}, - {".fsscript", "application/fsharp-script"}, - {".fsx", "application/fsharp-script"}, - {".generictest", "application/xml"}, - {".gif", "image/gif"}, - {".gpx", "application/gpx+xml"}, - {".group", "text/x-ms-group"}, - {".gsm", "audio/x-gsm"}, - {".gtar", "application/x-gtar"}, - {".gz", "application/x-gzip"}, - {".h", "text/plain"}, - {".hdf", "application/x-hdf"}, - {".hdml", "text/x-hdml"}, - {".hhc", "application/x-oleobject"}, - {".hhk", "application/octet-stream"}, - {".hhp", "application/octet-stream"}, - {".hlp", "application/winhlp"}, - {".hpp", "text/plain"}, - {".hqx", "application/mac-binhex40"}, - {".hta", "application/hta"}, - {".htc", "text/x-component"}, - {".htm", "text/html"}, - {".html", "text/html"}, - {".htt", "text/webviewhtml"}, - {".hxa", "application/xml"}, - {".hxc", "application/xml"}, - {".hxd", "application/octet-stream"}, - {".hxe", "application/xml"}, - {".hxf", "application/xml"}, - {".hxh", "application/octet-stream"}, - {".hxi", "application/octet-stream"}, - {".hxk", "application/xml"}, - {".hxq", "application/octet-stream"}, - {".hxr", "application/octet-stream"}, - {".hxs", "application/octet-stream"}, - {".hxt", "text/html"}, - {".hxv", "application/xml"}, - {".hxw", "application/octet-stream"}, - {".hxx", "text/plain"}, - {".i", "text/plain"}, - {".ico", "image/x-icon"}, - {".ics", "application/octet-stream"}, - {".idl", "text/plain"}, - {".ief", "image/ief"}, - {".iii", "application/x-iphone"}, - {".inc", "text/plain"}, - {".inf", "application/octet-stream"}, - {".ini", "text/plain"}, - {".inl", "text/plain"}, - {".ins", "application/x-internet-signup"}, - {".ipa", "application/x-itunes-ipa"}, - {".ipg", "application/x-itunes-ipg"}, - {".ipproj", "text/plain"}, - {".ipsw", "application/x-itunes-ipsw"}, - {".iqy", "text/x-ms-iqy"}, - {".isp", "application/x-internet-signup"}, - {".ite", "application/x-itunes-ite"}, - {".itlp", "application/x-itunes-itlp"}, - {".itms", "application/x-itunes-itms"}, - {".itpc", "application/x-itunes-itpc"}, - {".IVF", "video/x-ivf"}, - {".jar", "application/java-archive"}, - {".java", "application/octet-stream"}, - {".jck", "application/liquidmotion"}, - {".jcz", "application/liquidmotion"}, - {".jfif", "image/pjpeg"}, - {".jnlp", "application/x-java-jnlp-file"}, - {".jpb", "application/octet-stream"}, - {".jpe", "image/jpeg"}, - {".jpeg", "image/jpeg"}, - {".jpg", "image/jpeg"}, - {".js", "application/javascript"}, - {".json", "application/json"}, - {".jsx", "text/jscript"}, - {".jsxbin", "text/plain"}, - {".latex", "application/x-latex"}, - {".library-ms", "application/windows-library+xml"}, - {".lit", "application/x-ms-reader"}, - {".loadtest", "application/xml"}, - {".lpk", "application/octet-stream"}, - {".lsf", "video/x-la-asf"}, - {".lst", "text/plain"}, - {".lsx", "video/x-la-asf"}, - {".lzh", "application/octet-stream"}, - {".m13", "application/x-msmediaview"}, - {".m14", "application/x-msmediaview"}, - {".m1v", "video/mpeg"}, - {".m2t", "video/vnd.dlna.mpeg-tts"}, - {".m2ts", "video/vnd.dlna.mpeg-tts"}, - {".m2v", "video/mpeg"}, - {".m3u", "audio/x-mpegurl"}, - {".m3u8", "audio/x-mpegurl"}, - {".m4a", "audio/m4a"}, - {".m4b", "audio/m4b"}, - {".m4p", "audio/m4p"}, - {".m4r", "audio/x-m4r"}, - {".m4v", "video/x-m4v"}, - {".mac", "image/x-macpaint"}, - {".mak", "text/plain"}, - {".man", "application/x-troff-man"}, - {".manifest", "application/x-ms-manifest"}, - {".map", "text/plain"}, - {".master", "application/xml"}, - {".mbox", "application/mbox"}, - {".mda", "application/msaccess"}, - {".mdb", "application/x-msaccess"}, - {".mde", "application/msaccess"}, - {".mdp", "application/octet-stream"}, - {".me", "application/x-troff-me"}, - {".mfp", "application/x-shockwave-flash"}, - {".mht", "message/rfc822"}, - {".mhtml", "message/rfc822"}, - {".mid", "audio/mid"}, - {".midi", "audio/mid"}, - {".mix", "application/octet-stream"}, - {".mk", "text/plain"}, - {".mk3d", "video/x-matroska-3d"}, - {".mka", "audio/x-matroska"}, - {".mkv", "video/x-matroska"}, - {".mmf", "application/x-smaf"}, - {".mno", "text/xml"}, - {".mny", "application/x-msmoney"}, - {".mod", "video/mpeg"}, - {".mov", "video/quicktime"}, - {".movie", "video/x-sgi-movie"}, - {".mp2", "video/mpeg"}, - {".mp2v", "video/mpeg"}, - {".mp3", "audio/mpeg"}, - {".mp4", "video/mp4"}, - {".mp4v", "video/mp4"}, - {".mpa", "video/mpeg"}, - {".mpe", "video/mpeg"}, - {".mpeg", "video/mpeg"}, - {".mpf", "application/vnd.ms-mediapackage"}, - {".mpg", "video/mpeg"}, - {".mpp", "application/vnd.ms-project"}, - {".mpv2", "video/mpeg"}, - {".mqv", "video/quicktime"}, - {".ms", "application/x-troff-ms"}, - {".msg", "application/vnd.ms-outlook"}, - {".msi", "application/octet-stream"}, - {".mso", "application/octet-stream"}, - {".mts", "video/vnd.dlna.mpeg-tts"}, - {".mtx", "application/xml"}, - {".mvb", "application/x-msmediaview"}, - {".mvc", "application/x-miva-compiled"}, - {".mxp", "application/x-mmxp"}, - {".nc", "application/x-netcdf"}, - {".nsc", "video/x-ms-asf"}, - {".nws", "message/rfc822"}, - {".ocx", "application/octet-stream"}, - {".oda", "application/oda"}, - {".odb", "application/vnd.oasis.opendocument.database"}, - {".odc", "application/vnd.oasis.opendocument.chart"}, - {".odf", "application/vnd.oasis.opendocument.formula"}, - {".odg", "application/vnd.oasis.opendocument.graphics"}, - {".odh", "text/plain"}, - {".odi", "application/vnd.oasis.opendocument.image"}, - {".odl", "text/plain"}, - {".odm", "application/vnd.oasis.opendocument.text-master"}, - {".odp", "application/vnd.oasis.opendocument.presentation"}, - {".ods", "application/vnd.oasis.opendocument.spreadsheet"}, - {".odt", "application/vnd.oasis.opendocument.text"}, - {".oga", "audio/ogg"}, - {".ogg", "audio/ogg"}, - {".ogv", "video/ogg"}, - {".ogx", "application/ogg"}, - {".one", "application/onenote"}, - {".onea", "application/onenote"}, - {".onepkg", "application/onenote"}, - {".onetmp", "application/onenote"}, - {".onetoc", "application/onenote"}, - {".onetoc2", "application/onenote"}, - {".opus", "audio/ogg"}, - {".orderedtest", "application/xml"}, - {".osdx", "application/opensearchdescription+xml"}, - {".otf", "application/font-sfnt"}, - {".otg", "application/vnd.oasis.opendocument.graphics-template"}, - {".oth", "application/vnd.oasis.opendocument.text-web"}, - {".otp", "application/vnd.oasis.opendocument.presentation-template"}, - {".ots", "application/vnd.oasis.opendocument.spreadsheet-template"}, - {".ott", "application/vnd.oasis.opendocument.text-template"}, - {".oxt", "application/vnd.openofficeorg.extension"}, - {".p10", "application/pkcs10"}, - {".p12", "application/x-pkcs12"}, - {".p7b", "application/x-pkcs7-certificates"}, - {".p7c", "application/pkcs7-mime"}, - {".p7m", "application/pkcs7-mime"}, - {".p7r", "application/x-pkcs7-certreqresp"}, - {".p7s", "application/pkcs7-signature"}, - {".pbm", "image/x-portable-bitmap"}, - {".pcast", "application/x-podcast"}, - {".pct", "image/pict"}, - {".pcx", "application/octet-stream"}, - {".pcz", "application/octet-stream"}, - {".pdf", "application/pdf"}, - {".pfb", "application/octet-stream"}, - {".pfm", "application/octet-stream"}, - {".pfx", "application/x-pkcs12"}, - {".pgm", "image/x-portable-graymap"}, - {".pic", "image/pict"}, - {".pict", "image/pict"}, - {".pjp", "image/jpeg"}, - {".pkgdef", "text/plain"}, - {".pkgundef", "text/plain"}, - {".pko", "application/vnd.ms-pki.pko"}, - {".pls", "audio/scpls"}, - {".pma", "application/x-perfmon"}, - {".pmc", "application/x-perfmon"}, - {".pml", "application/x-perfmon"}, - {".pmr", "application/x-perfmon"}, - {".pmw", "application/x-perfmon"}, - {".png", "image/png"}, - {".pnm", "image/x-portable-anymap"}, - {".pnt", "image/x-macpaint"}, - {".pntg", "image/x-macpaint"}, - {".pnz", "image/png"}, - {".pot", "application/vnd.ms-powerpoint"}, - {".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12"}, - {".potx", "application/vnd.openxmlformats-officedocument.presentationml.template"}, - {".ppa", "application/vnd.ms-powerpoint"}, - {".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12"}, - {".ppm", "image/x-portable-pixmap"}, - {".pps", "application/vnd.ms-powerpoint"}, - {".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12"}, - {".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"}, - {".ppt", "application/vnd.ms-powerpoint"}, - {".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12"}, - {".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"}, - {".prf", "application/pics-rules"}, - {".prm", "application/octet-stream"}, - {".prx", "application/octet-stream"}, - {".ps", "application/postscript"}, - {".psc1", "application/PowerShell"}, - {".psd", "application/octet-stream"}, - {".psess", "application/xml"}, - {".psm", "application/octet-stream"}, - {".psp", "application/octet-stream"}, - {".pst", "application/vnd.ms-outlook"}, - {".pub", "application/x-mspublisher"}, - {".pwz", "application/vnd.ms-powerpoint"}, - {".qht", "text/x-html-insertion"}, - {".qhtm", "text/x-html-insertion"}, - {".qt", "video/quicktime"}, - {".qti", "image/x-quicktime"}, - {".qtif", "image/x-quicktime"}, - {".qtl", "application/x-quicktimeplayer"}, - {".qxd", "application/octet-stream"}, - {".ra", "audio/x-pn-realaudio"}, - {".ram", "audio/x-pn-realaudio"}, - {".rar", "application/x-rar-compressed"}, - {".ras", "image/x-cmu-raster"}, - {".rat", "application/rat-file"}, - {".rc", "text/plain"}, - {".rc2", "text/plain"}, - {".rct", "text/plain"}, - {".rdlc", "application/xml"}, - {".reg", "text/plain"}, - {".resx", "application/xml"}, - {".rf", "image/vnd.rn-realflash"}, - {".rgb", "image/x-rgb"}, - {".rgs", "text/plain"}, - {".rm", "application/vnd.rn-realmedia"}, - {".rmi", "audio/mid"}, - {".rmp", "application/vnd.rn-rn_music_package"}, - {".roff", "application/x-troff"}, - {".rpm", "audio/x-pn-realaudio-plugin"}, - {".rqy", "text/x-ms-rqy"}, - {".rtf", "application/rtf"}, - {".rtx", "text/richtext"}, - {".rvt", "application/octet-stream" }, - {".ruleset", "application/xml"}, - {".s", "text/plain"}, - {".safariextz", "application/x-safari-safariextz"}, - {".scd", "application/x-msschedule"}, - {".scr", "text/plain"}, - {".sct", "text/scriptlet"}, - {".sd2", "audio/x-sd2"}, - {".sdp", "application/sdp"}, - {".sea", "application/octet-stream"}, - {".searchConnector-ms", "application/windows-search-connector+xml"}, - {".setpay", "application/set-payment-initiation"}, - {".setreg", "application/set-registration-initiation"}, - {".settings", "application/xml"}, - {".sgimb", "application/x-sgimb"}, - {".sgml", "text/sgml"}, - {".sh", "application/x-sh"}, - {".shar", "application/x-shar"}, - {".shtml", "text/html"}, - {".sit", "application/x-stuffit"}, - {".sitemap", "application/xml"}, - {".skin", "application/xml"}, - {".skp", "application/x-koan" }, - {".sldm", "application/vnd.ms-powerpoint.slide.macroEnabled.12"}, - {".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide"}, - {".slk", "application/vnd.ms-excel"}, - {".sln", "text/plain"}, - {".slupkg-ms", "application/x-ms-license"}, - {".smd", "audio/x-smd"}, - {".smi", "application/octet-stream"}, - {".smx", "audio/x-smd"}, - {".smz", "audio/x-smd"}, - {".snd", "audio/basic"}, - {".snippet", "application/xml"}, - {".snp", "application/octet-stream"}, - {".sol", "text/plain"}, - {".sor", "text/plain"}, - {".spc", "application/x-pkcs7-certificates"}, - {".spl", "application/futuresplash"}, - {".spx", "audio/ogg"}, - {".src", "application/x-wais-source"}, - {".srf", "text/plain"}, - {".SSISDeploymentManifest", "text/xml"}, - {".ssm", "application/streamingmedia"}, - {".sst", "application/vnd.ms-pki.certstore"}, - {".stl", "application/vnd.ms-pki.stl"}, - {".sv4cpio", "application/x-sv4cpio"}, - {".sv4crc", "application/x-sv4crc"}, - {".svc", "application/xml"}, - {".svg", "image/svg+xml"}, - {".swf", "application/x-shockwave-flash"}, - {".step", "application/step"}, - {".stp", "application/step"}, - {".t", "application/x-troff"}, - {".tar", "application/x-tar"}, - {".tcl", "application/x-tcl"}, - {".testrunconfig", "application/xml"}, - {".testsettings", "application/xml"}, - {".tex", "application/x-tex"}, - {".texi", "application/x-texinfo"}, - {".texinfo", "application/x-texinfo"}, - {".tgz", "application/x-compressed"}, - {".thmx", "application/vnd.ms-officetheme"}, - {".thn", "application/octet-stream"}, - {".tif", "image/tiff"}, - {".tiff", "image/tiff"}, - {".tlh", "text/plain"}, - {".tli", "text/plain"}, - {".toc", "application/octet-stream"}, - {".tr", "application/x-troff"}, - {".trm", "application/x-msterminal"}, - {".trx", "application/xml"}, - {".ts", "video/vnd.dlna.mpeg-tts"}, - {".tsv", "text/tab-separated-values"}, - {".ttf", "application/font-sfnt"}, - {".tts", "video/vnd.dlna.mpeg-tts"}, - {".txt", "text/plain"}, - {".u32", "application/octet-stream"}, - {".uls", "text/iuls"}, - {".user", "text/plain"}, - {".ustar", "application/x-ustar"}, - {".vb", "text/plain"}, - {".vbdproj", "text/plain"}, - {".vbk", "video/mpeg"}, - {".vbproj", "text/plain"}, - {".vbs", "text/vbscript"}, - {".vcf", "text/x-vcard"}, - {".vcproj", "application/xml"}, - {".vcs", "text/plain"}, - {".vcxproj", "application/xml"}, - {".vddproj", "text/plain"}, - {".vdp", "text/plain"}, - {".vdproj", "text/plain"}, - {".vdx", "application/vnd.ms-visio.viewer"}, - {".vml", "text/xml"}, - {".vscontent", "application/xml"}, - {".vsct", "text/xml"}, - {".vsd", "application/vnd.visio"}, - {".vsi", "application/ms-vsi"}, - {".vsix", "application/vsix"}, - {".vsixlangpack", "text/xml"}, - {".vsixmanifest", "text/xml"}, - {".vsmdi", "application/xml"}, - {".vspscc", "text/plain"}, - {".vss", "application/vnd.visio"}, - {".vsscc", "text/plain"}, - {".vssettings", "text/xml"}, - {".vssscc", "text/plain"}, - {".vst", "application/vnd.visio"}, - {".vstemplate", "text/xml"}, - {".vsto", "application/x-ms-vsto"}, - {".vsw", "application/vnd.visio"}, - {".vsx", "application/vnd.visio"}, - {".vtt", "text/vtt"}, - {".vtx", "application/vnd.visio"}, - {".wasm", "application/wasm"}, - {".wav", "audio/wav"}, - {".wave", "audio/wav"}, - {".wax", "audio/x-ms-wax"}, - {".wbk", "application/msword"}, - {".wbmp", "image/vnd.wap.wbmp"}, - {".wcm", "application/vnd.ms-works"}, - {".wdb", "application/vnd.ms-works"}, - {".wdp", "image/vnd.ms-photo"}, - {".webarchive", "application/x-safari-webarchive"}, - {".webm", "video/webm"}, - {".webp", "image/webp"}, /* https://en.wikipedia.org/wiki/WebP */ + {".3g2", "video/3gpp2"}, + {".3gp", "video/3gpp"}, + {".3gp2", "video/3gpp2"}, + {".3gpp", "video/3gpp"}, + {".7z", "application/x-7z-compressed"}, + {".aa", "audio/audible"}, + {".AAC", "audio/aac"}, + {".aaf", "application/octet-stream"}, + {".aax", "audio/vnd.audible.aax"}, + {".ac3", "audio/ac3"}, + {".aca", "application/octet-stream"}, + {".accda", "application/msaccess.addin"}, + {".accdb", "application/msaccess"}, + {".accdc", "application/msaccess.cab"}, + {".accde", "application/msaccess"}, + {".accdr", "application/msaccess.runtime"}, + {".accdt", "application/msaccess"}, + {".accdw", "application/msaccess.webapplication"}, + {".accft", "application/msaccess.ftemplate"}, + {".acx", "application/internet-property-stream"}, + {".AddIn", "text/xml"}, + {".ade", "application/msaccess"}, + {".adobebridge", "application/x-bridge-url"}, + {".adp", "application/msaccess"}, + {".ADT", "audio/vnd.dlna.adts"}, + {".ADTS", "audio/aac"}, + {".afm", "application/octet-stream"}, + {".ai", "application/postscript"}, + {".aif", "audio/aiff"}, + {".aifc", "audio/aiff"}, + {".aiff", "audio/aiff"}, + {".air", "application/vnd.adobe.air-application-installer-package+zip"}, + {".amc", "application/mpeg"}, + {".anx", "application/annodex"}, + {".apk", "application/vnd.android.package-archive" }, + {".application", "application/x-ms-application"}, + {".art", "image/x-jg"}, + {".asa", "application/xml"}, + {".asax", "application/xml"}, + {".ascx", "application/xml"}, + {".asd", "application/octet-stream"}, + {".asf", "video/x-ms-asf"}, + {".ashx", "application/xml"}, + {".asi", "application/octet-stream"}, + {".asm", "text/plain"}, + {".asmx", "application/xml"}, + {".aspx", "application/xml"}, + {".asr", "video/x-ms-asf"}, + {".asx", "video/x-ms-asf"}, + {".atom", "application/atom+xml"}, + {".au", "audio/basic"}, + {".avi", "video/x-msvideo"}, + {".axa", "audio/annodex"}, + {".axs", "application/olescript"}, + {".axv", "video/annodex"}, + {".bas", "text/plain"}, + {".bcpio", "application/x-bcpio"}, + {".bin", "application/octet-stream"}, + {".bmp", "image/bmp"}, + {".c", "text/plain"}, + {".cab", "application/octet-stream"}, + {".caf", "audio/x-caf"}, + {".calx", "application/vnd.ms-office.calx"}, + {".cat", "application/vnd.ms-pki.seccat"}, + {".cc", "text/plain"}, + {".cd", "text/plain"}, + {".cdda", "audio/aiff"}, + {".cdf", "application/x-cdf"}, + {".cer", "application/x-x509-ca-cert"}, + {".cfg", "text/plain"}, + {".chm", "application/octet-stream"}, + {".class", "application/x-java-applet"}, + {".clp", "application/x-msclip"}, + {".cmd", "text/plain"}, + {".cmx", "image/x-cmx"}, + {".cnf", "text/plain"}, + {".cod", "image/cis-cod"}, + {".config", "application/xml"}, + {".contact", "text/x-ms-contact"}, + {".coverage", "application/xml"}, + {".cpio", "application/x-cpio"}, + {".cpp", "text/plain"}, + {".crd", "application/x-mscardfile"}, + {".crl", "application/pkix-crl"}, + {".crt", "application/x-x509-ca-cert"}, + {".cs", "text/plain"}, + {".csdproj", "text/plain"}, + {".csh", "application/x-csh"}, + {".csproj", "text/plain"}, + {".css", "text/css"}, + {".csv", "text/csv"}, + {".cur", "application/octet-stream"}, + {".cxx", "text/plain"}, + {".dat", "application/octet-stream"}, + {".datasource", "application/xml"}, + {".dbproj", "text/plain"}, + {".dcr", "application/x-director"}, + {".def", "text/plain"}, + {".deploy", "application/octet-stream"}, + {".der", "application/x-x509-ca-cert"}, + {".dgml", "application/xml"}, + {".dib", "image/bmp"}, + {".dif", "video/x-dv"}, + {".dir", "application/x-director"}, + {".disco", "text/xml"}, + {".divx", "video/divx"}, + {".dll", "application/x-msdownload"}, + {".dll.config", "text/xml"}, + {".dlm", "text/dlm"}, + {".doc", "application/msword"}, + {".docm", "application/vnd.ms-word.document.macroEnabled.12"}, + {".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"}, + {".dot", "application/msword"}, + {".dotm", "application/vnd.ms-word.template.macroEnabled.12"}, + {".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template"}, + {".dsp", "application/octet-stream"}, + {".dsw", "text/plain"}, + {".dtd", "text/xml"}, + {".dtsConfig", "text/xml"}, + {".dv", "video/x-dv"}, + {".dvi", "application/x-dvi"}, + {".dwf", "drawing/x-dwf"}, + {".dwg", "application/acad"}, + {".dwp", "application/octet-stream"}, + {".dxf", "application/x-dxf" }, + {".dxr", "application/x-director"}, + {".eml", "message/rfc822"}, + {".emz", "application/octet-stream"}, + {".eot", "application/vnd.ms-fontobject"}, + {".eps", "application/postscript"}, + {".etl", "application/etl"}, + {".etx", "text/x-setext"}, + {".evy", "application/envoy"}, + {".exe", "application/octet-stream"}, + {".exe.config", "text/xml"}, + {".fdf", "application/vnd.fdf"}, + {".fif", "application/fractals"}, + {".filters", "application/xml"}, + {".fla", "application/octet-stream"}, + {".flac", "audio/flac"}, + {".flr", "x-world/x-vrml"}, + {".flv", "video/x-flv"}, + {".fsscript", "application/fsharp-script"}, + {".fsx", "application/fsharp-script"}, + {".generictest", "application/xml"}, + {".gif", "image/gif"}, + {".gpx", "application/gpx+xml"}, + {".group", "text/x-ms-group"}, + {".gsm", "audio/x-gsm"}, + {".gtar", "application/x-gtar"}, + {".gz", "application/x-gzip"}, + {".h", "text/plain"}, + {".hdf", "application/x-hdf"}, + {".hdml", "text/x-hdml"}, + {".hhc", "application/x-oleobject"}, + {".hhk", "application/octet-stream"}, + {".hhp", "application/octet-stream"}, + {".hlp", "application/winhlp"}, + {".hpp", "text/plain"}, + {".hqx", "application/mac-binhex40"}, + {".hta", "application/hta"}, + {".htc", "text/x-component"}, + {".htm", "text/html"}, + {".html", "text/html"}, + {".htt", "text/webviewhtml"}, + {".hxa", "application/xml"}, + {".hxc", "application/xml"}, + {".hxd", "application/octet-stream"}, + {".hxe", "application/xml"}, + {".hxf", "application/xml"}, + {".hxh", "application/octet-stream"}, + {".hxi", "application/octet-stream"}, + {".hxk", "application/xml"}, + {".hxq", "application/octet-stream"}, + {".hxr", "application/octet-stream"}, + {".hxs", "application/octet-stream"}, + {".hxt", "text/html"}, + {".hxv", "application/xml"}, + {".hxw", "application/octet-stream"}, + {".hxx", "text/plain"}, + {".i", "text/plain"}, + {".ico", "image/x-icon"}, + {".ics", "application/octet-stream"}, + {".idl", "text/plain"}, + {".ief", "image/ief"}, + {".iii", "application/x-iphone"}, + {".inc", "text/plain"}, + {".inf", "application/octet-stream"}, + {".ini", "text/plain"}, + {".inl", "text/plain"}, + {".ins", "application/x-internet-signup"}, + {".ipa", "application/x-itunes-ipa"}, + {".ipg", "application/x-itunes-ipg"}, + {".ipproj", "text/plain"}, + {".ipsw", "application/x-itunes-ipsw"}, + {".iqy", "text/x-ms-iqy"}, + {".isp", "application/x-internet-signup"}, + {".ite", "application/x-itunes-ite"}, + {".itlp", "application/x-itunes-itlp"}, + {".itms", "application/x-itunes-itms"}, + {".itpc", "application/x-itunes-itpc"}, + {".IVF", "video/x-ivf"}, + {".jar", "application/java-archive"}, + {".java", "application/octet-stream"}, + {".jck", "application/liquidmotion"}, + {".jcz", "application/liquidmotion"}, + {".jfif", "image/pjpeg"}, + {".jnlp", "application/x-java-jnlp-file"}, + {".jpb", "application/octet-stream"}, + {".jpe", "image/jpeg"}, + {".jpeg", "image/jpeg"}, + {".jpg", "image/jpeg"}, + {".js", "application/javascript"}, + {".json", "application/json"}, + {".jsx", "text/jscript"}, + {".jsxbin", "text/plain"}, + {".latex", "application/x-latex"}, + {".library-ms", "application/windows-library+xml"}, + {".lit", "application/x-ms-reader"}, + {".loadtest", "application/xml"}, + {".lpk", "application/octet-stream"}, + {".lsf", "video/x-la-asf"}, + {".lst", "text/plain"}, + {".lsx", "video/x-la-asf"}, + {".lzh", "application/octet-stream"}, + {".m13", "application/x-msmediaview"}, + {".m14", "application/x-msmediaview"}, + {".m1v", "video/mpeg"}, + {".m2t", "video/vnd.dlna.mpeg-tts"}, + {".m2ts", "video/vnd.dlna.mpeg-tts"}, + {".m2v", "video/mpeg"}, + {".m3u", "audio/x-mpegurl"}, + {".m3u8", "audio/x-mpegurl"}, + {".m4a", "audio/m4a"}, + {".m4b", "audio/m4b"}, + {".m4p", "audio/m4p"}, + {".m4r", "audio/x-m4r"}, + {".m4v", "video/x-m4v"}, + {".mac", "image/x-macpaint"}, + {".mak", "text/plain"}, + {".man", "application/x-troff-man"}, + {".manifest", "application/x-ms-manifest"}, + {".map", "text/plain"}, + {".master", "application/xml"}, + {".mbox", "application/mbox"}, + {".mda", "application/msaccess"}, + {".mdb", "application/x-msaccess"}, + {".mde", "application/msaccess"}, + {".mdp", "application/octet-stream"}, + {".me", "application/x-troff-me"}, + {".mfp", "application/x-shockwave-flash"}, + {".mht", "message/rfc822"}, + {".mhtml", "message/rfc822"}, + {".mid", "audio/mid"}, + {".midi", "audio/mid"}, + {".mix", "application/octet-stream"}, + {".mk", "text/plain"}, + {".mk3d", "video/x-matroska-3d"}, + {".mka", "audio/x-matroska"}, + {".mkv", "video/x-matroska"}, + {".mmf", "application/x-smaf"}, + {".mno", "text/xml"}, + {".mny", "application/x-msmoney"}, + {".mod", "video/mpeg"}, + {".mov", "video/quicktime"}, + {".movie", "video/x-sgi-movie"}, + {".mp2", "video/mpeg"}, + {".mp2v", "video/mpeg"}, + {".mp3", "audio/mpeg"}, + {".mp4", "video/mp4"}, + {".mp4v", "video/mp4"}, + {".mpa", "video/mpeg"}, + {".mpe", "video/mpeg"}, + {".mpeg", "video/mpeg"}, + {".mpf", "application/vnd.ms-mediapackage"}, + {".mpg", "video/mpeg"}, + {".mpp", "application/vnd.ms-project"}, + {".mpv2", "video/mpeg"}, + {".mqv", "video/quicktime"}, + {".ms", "application/x-troff-ms"}, + {".msg", "application/vnd.ms-outlook"}, + {".msi", "application/octet-stream"}, + {".mso", "application/octet-stream"}, + {".mts", "video/vnd.dlna.mpeg-tts"}, + {".mtx", "application/xml"}, + {".mvb", "application/x-msmediaview"}, + {".mvc", "application/x-miva-compiled"}, + {".mxp", "application/x-mmxp"}, + {".nc", "application/x-netcdf"}, + {".nsc", "video/x-ms-asf"}, + {".nws", "message/rfc822"}, + {".ocx", "application/octet-stream"}, + {".oda", "application/oda"}, + {".odb", "application/vnd.oasis.opendocument.database"}, + {".odc", "application/vnd.oasis.opendocument.chart"}, + {".odf", "application/vnd.oasis.opendocument.formula"}, + {".odg", "application/vnd.oasis.opendocument.graphics"}, + {".odh", "text/plain"}, + {".odi", "application/vnd.oasis.opendocument.image"}, + {".odl", "text/plain"}, + {".odm", "application/vnd.oasis.opendocument.text-master"}, + {".odp", "application/vnd.oasis.opendocument.presentation"}, + {".ods", "application/vnd.oasis.opendocument.spreadsheet"}, + {".odt", "application/vnd.oasis.opendocument.text"}, + {".oga", "audio/ogg"}, + {".ogg", "audio/ogg"}, + {".ogv", "video/ogg"}, + {".ogx", "application/ogg"}, + {".one", "application/onenote"}, + {".onea", "application/onenote"}, + {".onepkg", "application/onenote"}, + {".onetmp", "application/onenote"}, + {".onetoc", "application/onenote"}, + {".onetoc2", "application/onenote"}, + {".opus", "audio/ogg"}, + {".orderedtest", "application/xml"}, + {".osdx", "application/opensearchdescription+xml"}, + {".otf", "application/font-sfnt"}, + {".otg", "application/vnd.oasis.opendocument.graphics-template"}, + {".oth", "application/vnd.oasis.opendocument.text-web"}, + {".otp", "application/vnd.oasis.opendocument.presentation-template"}, + {".ots", "application/vnd.oasis.opendocument.spreadsheet-template"}, + {".ott", "application/vnd.oasis.opendocument.text-template"}, + {".oxt", "application/vnd.openofficeorg.extension"}, + {".p10", "application/pkcs10"}, + {".p12", "application/x-pkcs12"}, + {".p7b", "application/x-pkcs7-certificates"}, + {".p7c", "application/pkcs7-mime"}, + {".p7m", "application/pkcs7-mime"}, + {".p7r", "application/x-pkcs7-certreqresp"}, + {".p7s", "application/pkcs7-signature"}, + {".pbm", "image/x-portable-bitmap"}, + {".pcast", "application/x-podcast"}, + {".pct", "image/pict"}, + {".pcx", "application/octet-stream"}, + {".pcz", "application/octet-stream"}, + {".pdf", "application/pdf"}, + {".pfb", "application/octet-stream"}, + {".pfm", "application/octet-stream"}, + {".pfx", "application/x-pkcs12"}, + {".pgm", "image/x-portable-graymap"}, + {".pic", "image/pict"}, + {".pict", "image/pict"}, + {".pjp", "image/jpeg"}, + {".pkgdef", "text/plain"}, + {".pkgundef", "text/plain"}, + {".pko", "application/vnd.ms-pki.pko"}, + {".pls", "audio/scpls"}, + {".pma", "application/x-perfmon"}, + {".pmc", "application/x-perfmon"}, + {".pml", "application/x-perfmon"}, + {".pmr", "application/x-perfmon"}, + {".pmw", "application/x-perfmon"}, + {".png", "image/png"}, + {".pnm", "image/x-portable-anymap"}, + {".pnt", "image/x-macpaint"}, + {".pntg", "image/x-macpaint"}, + {".pnz", "image/png"}, + {".pot", "application/vnd.ms-powerpoint"}, + {".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12"}, + {".potx", "application/vnd.openxmlformats-officedocument.presentationml.template"}, + {".ppa", "application/vnd.ms-powerpoint"}, + {".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12"}, + {".ppm", "image/x-portable-pixmap"}, + {".pps", "application/vnd.ms-powerpoint"}, + {".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12"}, + {".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"}, + {".ppt", "application/vnd.ms-powerpoint"}, + {".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12"}, + {".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"}, + {".prf", "application/pics-rules"}, + {".prm", "application/octet-stream"}, + {".prx", "application/octet-stream"}, + {".ps", "application/postscript"}, + {".psc1", "application/PowerShell"}, + {".psd", "application/octet-stream"}, + {".psess", "application/xml"}, + {".psm", "application/octet-stream"}, + {".psp", "application/octet-stream"}, + {".pst", "application/vnd.ms-outlook"}, + {".pub", "application/x-mspublisher"}, + {".pwz", "application/vnd.ms-powerpoint"}, + {".qht", "text/x-html-insertion"}, + {".qhtm", "text/x-html-insertion"}, + {".qt", "video/quicktime"}, + {".qti", "image/x-quicktime"}, + {".qtif", "image/x-quicktime"}, + {".qtl", "application/x-quicktimeplayer"}, + {".qxd", "application/octet-stream"}, + {".ra", "audio/x-pn-realaudio"}, + {".ram", "audio/x-pn-realaudio"}, + {".rar", "application/x-rar-compressed"}, + {".ras", "image/x-cmu-raster"}, + {".rat", "application/rat-file"}, + {".rc", "text/plain"}, + {".rc2", "text/plain"}, + {".rct", "text/plain"}, + {".rdlc", "application/xml"}, + {".reg", "text/plain"}, + {".resx", "application/xml"}, + {".rf", "image/vnd.rn-realflash"}, + {".rgb", "image/x-rgb"}, + {".rgs", "text/plain"}, + {".rm", "application/vnd.rn-realmedia"}, + {".rmi", "audio/mid"}, + {".rmp", "application/vnd.rn-rn_music_package"}, + {".roff", "application/x-troff"}, + {".rpm", "audio/x-pn-realaudio-plugin"}, + {".rqy", "text/x-ms-rqy"}, + {".rtf", "application/rtf"}, + {".rtx", "text/richtext"}, + {".rvt", "application/octet-stream" }, + {".ruleset", "application/xml"}, + {".s", "text/plain"}, + {".safariextz", "application/x-safari-safariextz"}, + {".scd", "application/x-msschedule"}, + {".scr", "text/plain"}, + {".sct", "text/scriptlet"}, + {".sd2", "audio/x-sd2"}, + {".sdp", "application/sdp"}, + {".sea", "application/octet-stream"}, + {".searchConnector-ms", "application/windows-search-connector+xml"}, + {".setpay", "application/set-payment-initiation"}, + {".setreg", "application/set-registration-initiation"}, + {".settings", "application/xml"}, + {".sgimb", "application/x-sgimb"}, + {".sgml", "text/sgml"}, + {".sh", "application/x-sh"}, + {".shar", "application/x-shar"}, + {".shtml", "text/html"}, + {".sit", "application/x-stuffit"}, + {".sitemap", "application/xml"}, + {".skin", "application/xml"}, + {".skp", "application/x-koan" }, + {".sldm", "application/vnd.ms-powerpoint.slide.macroEnabled.12"}, + {".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide"}, + {".slk", "application/vnd.ms-excel"}, + {".sln", "text/plain"}, + {".slupkg-ms", "application/x-ms-license"}, + {".smd", "audio/x-smd"}, + {".smi", "application/octet-stream"}, + {".smx", "audio/x-smd"}, + {".smz", "audio/x-smd"}, + {".snd", "audio/basic"}, + {".snippet", "application/xml"}, + {".snp", "application/octet-stream"}, + {".sol", "text/plain"}, + {".sor", "text/plain"}, + {".spc", "application/x-pkcs7-certificates"}, + {".spl", "application/futuresplash"}, + {".spx", "audio/ogg"}, + {".src", "application/x-wais-source"}, + {".srf", "text/plain"}, + {".SSISDeploymentManifest", "text/xml"}, + {".ssm", "application/streamingmedia"}, + {".sst", "application/vnd.ms-pki.certstore"}, + {".stl", "application/vnd.ms-pki.stl"}, + {".sv4cpio", "application/x-sv4cpio"}, + {".sv4crc", "application/x-sv4crc"}, + {".svc", "application/xml"}, + {".svg", "image/svg+xml"}, + {".swf", "application/x-shockwave-flash"}, + {".step", "application/step"}, + {".stp", "application/step"}, + {".t", "application/x-troff"}, + {".tar", "application/x-tar"}, + {".tcl", "application/x-tcl"}, + {".testrunconfig", "application/xml"}, + {".testsettings", "application/xml"}, + {".tex", "application/x-tex"}, + {".texi", "application/x-texinfo"}, + {".texinfo", "application/x-texinfo"}, + {".tgz", "application/x-compressed"}, + {".thmx", "application/vnd.ms-officetheme"}, + {".thn", "application/octet-stream"}, + {".tif", "image/tiff"}, + {".tiff", "image/tiff"}, + {".tlh", "text/plain"}, + {".tli", "text/plain"}, + {".toc", "application/octet-stream"}, + {".tr", "application/x-troff"}, + {".trm", "application/x-msterminal"}, + {".trx", "application/xml"}, + {".ts", "video/vnd.dlna.mpeg-tts"}, + {".tsv", "text/tab-separated-values"}, + {".ttf", "application/font-sfnt"}, + {".tts", "video/vnd.dlna.mpeg-tts"}, + {".txt", "text/plain"}, + {".u32", "application/octet-stream"}, + {".uls", "text/iuls"}, + {".user", "text/plain"}, + {".ustar", "application/x-ustar"}, + {".vb", "text/plain"}, + {".vbdproj", "text/plain"}, + {".vbk", "video/mpeg"}, + {".vbproj", "text/plain"}, + {".vbs", "text/vbscript"}, + {".vcf", "text/x-vcard"}, + {".vcproj", "application/xml"}, + {".vcs", "text/plain"}, + {".vcxproj", "application/xml"}, + {".vddproj", "text/plain"}, + {".vdp", "text/plain"}, + {".vdproj", "text/plain"}, + {".vdx", "application/vnd.ms-visio.viewer"}, + {".vml", "text/xml"}, + {".vscontent", "application/xml"}, + {".vsct", "text/xml"}, + {".vsd", "application/vnd.visio"}, + {".vsi", "application/ms-vsi"}, + {".vsix", "application/vsix"}, + {".vsixlangpack", "text/xml"}, + {".vsixmanifest", "text/xml"}, + {".vsmdi", "application/xml"}, + {".vspscc", "text/plain"}, + {".vss", "application/vnd.visio"}, + {".vsscc", "text/plain"}, + {".vssettings", "text/xml"}, + {".vssscc", "text/plain"}, + {".vst", "application/vnd.visio"}, + {".vstemplate", "text/xml"}, + {".vsto", "application/x-ms-vsto"}, + {".vsw", "application/vnd.visio"}, + {".vsx", "application/vnd.visio"}, + {".vtt", "text/vtt"}, + {".vtx", "application/vnd.visio"}, + {".wasm", "application/wasm"}, + {".wav", "audio/wav"}, + {".wave", "audio/wav"}, + {".wax", "audio/x-ms-wax"}, + {".wbk", "application/msword"}, + {".wbmp", "image/vnd.wap.wbmp"}, + {".wcm", "application/vnd.ms-works"}, + {".wdb", "application/vnd.ms-works"}, + {".wdp", "image/vnd.ms-photo"}, + {".webarchive", "application/x-safari-webarchive"}, + {".webm", "video/webm"}, + {".webp", "image/webp"}, /* https://en.wikipedia.org/wiki/WebP */ {".webtest", "application/xml"}, - {".wiq", "application/xml"}, - {".wiz", "application/msword"}, - {".wks", "application/vnd.ms-works"}, - {".WLMP", "application/wlmoviemaker"}, - {".wlpginstall", "application/x-wlpg-detect"}, - {".wlpginstall3", "application/x-wlpg3-detect"}, - {".wm", "video/x-ms-wm"}, - {".wma", "audio/x-ms-wma"}, - {".wmd", "application/x-ms-wmd"}, - {".wmf", "application/x-msmetafile"}, - {".wml", "text/vnd.wap.wml"}, - {".wmlc", "application/vnd.wap.wmlc"}, - {".wmls", "text/vnd.wap.wmlscript"}, - {".wmlsc", "application/vnd.wap.wmlscriptc"}, - {".wmp", "video/x-ms-wmp"}, - {".wmv", "video/x-ms-wmv"}, - {".wmx", "video/x-ms-wmx"}, - {".wmz", "application/x-ms-wmz"}, - {".woff", "application/font-woff"}, - {".woff2", "application/font-woff2"}, - {".wpl", "application/vnd.ms-wpl"}, - {".wps", "application/vnd.ms-works"}, - {".wri", "application/x-mswrite"}, - {".wrl", "x-world/x-vrml"}, - {".wrz", "x-world/x-vrml"}, - {".wsc", "text/scriptlet"}, - {".wsdl", "text/xml"}, - {".wvx", "video/x-ms-wvx"}, - {".x", "application/directx"}, - {".xaf", "x-world/x-vrml"}, - {".xaml", "application/xaml+xml"}, - {".xap", "application/x-silverlight-app"}, - {".xbap", "application/x-ms-xbap"}, - {".xbm", "image/x-xbitmap"}, - {".xdr", "text/plain"}, - {".xht", "application/xhtml+xml"}, - {".xhtml", "application/xhtml+xml"}, - {".xla", "application/vnd.ms-excel"}, - {".xlam", "application/vnd.ms-excel.addin.macroEnabled.12"}, - {".xlc", "application/vnd.ms-excel"}, - {".xld", "application/vnd.ms-excel"}, - {".xlk", "application/vnd.ms-excel"}, - {".xll", "application/vnd.ms-excel"}, - {".xlm", "application/vnd.ms-excel"}, - {".xls", "application/vnd.ms-excel"}, - {".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12"}, - {".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12"}, - {".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}, - {".xlt", "application/vnd.ms-excel"}, - {".xltm", "application/vnd.ms-excel.template.macroEnabled.12"}, - {".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"}, - {".xlw", "application/vnd.ms-excel"}, - {".xml", "text/xml"}, - {".xmp", "application/octet-stream" }, - {".xmta", "application/xml"}, - {".xof", "x-world/x-vrml"}, - {".XOML", "text/plain"}, - {".xpm", "image/x-xpixmap"}, - {".xps", "application/vnd.ms-xpsdocument"}, - {".xrm-ms", "text/xml"}, - {".xsc", "application/xml"}, - {".xsd", "text/xml"}, - {".xsf", "text/xml"}, - {".xsl", "text/xml"}, - {".xslt", "text/xml"}, - {".xsn", "application/octet-stream"}, - {".xss", "application/xml"}, - {".xspf", "application/xspf+xml"}, - {".xtp", "application/octet-stream"}, - {".xwd", "image/x-xwindowdump"}, - {".z", "application/x-compress"}, - {".zip", "application/zip"}, + {".wiq", "application/xml"}, + {".wiz", "application/msword"}, + {".wks", "application/vnd.ms-works"}, + {".WLMP", "application/wlmoviemaker"}, + {".wlpginstall", "application/x-wlpg-detect"}, + {".wlpginstall3", "application/x-wlpg3-detect"}, + {".wm", "video/x-ms-wm"}, + {".wma", "audio/x-ms-wma"}, + {".wmd", "application/x-ms-wmd"}, + {".wmf", "application/x-msmetafile"}, + {".wml", "text/vnd.wap.wml"}, + {".wmlc", "application/vnd.wap.wmlc"}, + {".wmls", "text/vnd.wap.wmlscript"}, + {".wmlsc", "application/vnd.wap.wmlscriptc"}, + {".wmp", "video/x-ms-wmp"}, + {".wmv", "video/x-ms-wmv"}, + {".wmx", "video/x-ms-wmx"}, + {".wmz", "application/x-ms-wmz"}, + {".woff", "application/font-woff"}, + {".woff2", "application/font-woff2"}, + {".wpl", "application/vnd.ms-wpl"}, + {".wps", "application/vnd.ms-works"}, + {".wri", "application/x-mswrite"}, + {".wrl", "x-world/x-vrml"}, + {".wrz", "x-world/x-vrml"}, + {".wsc", "text/scriptlet"}, + {".wsdl", "text/xml"}, + {".wvx", "video/x-ms-wvx"}, + {".x", "application/directx"}, + {".xaf", "x-world/x-vrml"}, + {".xaml", "application/xaml+xml"}, + {".xap", "application/x-silverlight-app"}, + {".xbap", "application/x-ms-xbap"}, + {".xbm", "image/x-xbitmap"}, + {".xdr", "text/plain"}, + {".xht", "application/xhtml+xml"}, + {".xhtml", "application/xhtml+xml"}, + {".xla", "application/vnd.ms-excel"}, + {".xlam", "application/vnd.ms-excel.addin.macroEnabled.12"}, + {".xlc", "application/vnd.ms-excel"}, + {".xld", "application/vnd.ms-excel"}, + {".xlk", "application/vnd.ms-excel"}, + {".xll", "application/vnd.ms-excel"}, + {".xlm", "application/vnd.ms-excel"}, + {".xls", "application/vnd.ms-excel"}, + {".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12"}, + {".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12"}, + {".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}, + {".xlt", "application/vnd.ms-excel"}, + {".xltm", "application/vnd.ms-excel.template.macroEnabled.12"}, + {".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"}, + {".xlw", "application/vnd.ms-excel"}, + {".xml", "text/xml"}, + {".xmp", "application/octet-stream" }, + {".xmta", "application/xml"}, + {".xof", "x-world/x-vrml"}, + {".XOML", "text/plain"}, + {".xpm", "image/x-xpixmap"}, + {".xps", "application/vnd.ms-xpsdocument"}, + {".xrm-ms", "text/xml"}, + {".xsc", "application/xml"}, + {".xsd", "text/xml"}, + {".xsf", "text/xml"}, + {".xsl", "text/xml"}, + {".xslt", "text/xml"}, + {".xsn", "application/octet-stream"}, + {".xss", "application/xml"}, + {".xspf", "application/xspf+xml"}, + {".xtp", "application/octet-stream"}, + {".xwd", "image/x-xwindowdump"}, + {".z", "application/x-compress"}, + {".zip", "application/zip"}, #endregion }; - // Shuffle entries - ShuffleMap(_mimeMap, _extMap); - ShuffleMap(_extMap, _mimeMap); + // Shuffle entries + ShuffleMap(_mimeMap, _extMap); + ShuffleMap(_extMap, _mimeMap); - // Complement maps with entries from registry - try - { - using (var key = Registry.ClassesRoot.OpenSubKey(@"MIME\Database\Content Type", false)) - { - if (key != null) - { - var subKeyNames = key.GetSubKeyNames(); - foreach (var contentType in subKeyNames) - { - if (!_mimeMap.ContainsKey(contentType)) - { - // Our map does not contain this entry. We gonna add it. - using (var subKey = key.OpenSubKey(contentType, false)) - { - object extension = subKey.GetValue("Extension", null); - if (extension != null) - { - // MimeType > Extension - var ext = extension.ToString(); - _mimeMap.Add(contentType, ext); + // Complement maps with entries from registry + try + { + using (var key = Registry.ClassesRoot.OpenSubKey(@"MIME\Database\Content Type", false)) + { + if (key != null) + { + var subKeyNames = key.GetSubKeyNames(); + foreach (var contentType in subKeyNames) + { + if (!_mimeMap.ContainsKey(contentType)) + { + // Our map does not contain this entry. We gonna add it. + using (var subKey = key.OpenSubKey(contentType, false)) + { + object extension = subKey.GetValue("Extension", null); + if (extension != null) + { + // MimeType > Extension + var ext = extension.ToString(); + _mimeMap.Add(contentType, ext); - // Vice versa, Extension > MimeType - if (!_extMap.ContainsKey(ext)) - { - _extMap.Add(ext, contentType); - } - } - } - } - } - } - } - } - catch { } - } + // Vice versa, Extension > MimeType + if (!_extMap.ContainsKey(ext)) + { + _extMap.Add(ext, contentType); + } + } + } + } + } + } + } + } + catch { } + } - public static string MapNameToMimeType(string fileNameOrExtension) + public static string MapNameToMimeType(string fileNameOrExtension) { - var fileName = GetFileName(fileNameOrExtension); + var fileName = GetFileName(fileNameOrExtension); - for (int i = 0; i < fileName.Length; i++) - { - if ((fileName[i] == '.') && _extMap.TryGetValue(fileName.Substring(i), out var str)) - { - return str; - } - } + for (int i = 0; i < fileName.Length; i++) + { + if ((fileName[i] == '.') && _extMap.TryGetValue(fileName.Substring(i), out var str)) + { + return str; + } + } - return DefaultMimeType; + return DefaultMimeType; } /// @@ -774,34 +774,34 @@ public static string MapMimeTypeToExtension(string mimeType) if (mimeType.IsEmpty()) return null; - if (_mimeMap.TryGetValue(mimeType, out var extension)) - { - return extension.TrimStart('.'); - } + if (_mimeMap.TryGetValue(mimeType, out var extension)) + { + return extension.TrimStart('.'); + } - return null; + return null; } - private static void ShuffleMap(Dictionary source, Dictionary target) - { - foreach (var kvp in source) - { - if (!target.ContainsKey(kvp.Value)) - { - target.Add(kvp.Value, kvp.Key); - } - } - } + private static void ShuffleMap(Dictionary source, Dictionary target) + { + foreach (var kvp in source) + { + if (!target.ContainsKey(kvp.Value)) + { + target.Add(kvp.Value, kvp.Key); + } + } + } - private static string GetFileName(string path) - { - var startIndex = path.LastIndexOfAny(_pathSeparatorChars); - if (startIndex < 0) - { - return path; - } + private static string GetFileName(string path) + { + var startIndex = path.LastIndexOfAny(_pathSeparatorChars); + if (startIndex < 0) + { + return path; + } - return path.Substring(startIndex); - } - } + return path.Substring(startIndex); + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/SeekableReadOnlyStream.cs b/src/Libraries/SmartStore.Core/IO/SeekableReadOnlyStream.cs index ff741cd45a..041c4ce451 100644 --- a/src/Libraries/SmartStore.Core/IO/SeekableReadOnlyStream.cs +++ b/src/Libraries/SmartStore.Core/IO/SeekableReadOnlyStream.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.IO; namespace SmartStore.Core.IO @@ -20,8 +19,8 @@ public SeekableReadOnlyStream(Stream underlyingStream, int seekBackBufferSize) _seekBackBuffer = new byte[seekBackBufferSize]; } - public override bool CanRead { get { return true; } } - public override bool CanSeek { get { return true; } } + public override bool CanRead => true; + public override bool CanSeek => true; public override int Read(byte[] buffer, int offset, int count) { @@ -208,8 +207,8 @@ private long SeekFromEnd(long offset) public override long Position { - get { return _underlyingPosition - (_seekBackBufferCount - _seekBackBufferIndex); } - set { Seek(value, SeekOrigin.Begin); } + get => _underlyingPosition - (_seekBackBufferCount - _seekBackBufferIndex); + set => Seek(value, SeekOrigin.Begin); } protected override void Dispose(bool disposing) @@ -219,9 +218,9 @@ protected override void Dispose(bool disposing) base.Dispose(disposing); } - public override bool CanTimeout { get { return _underlyingStream.CanTimeout; } } - public override bool CanWrite { get { return _underlyingStream.CanWrite; } } - public override long Length { get { return _underlyingStream.Length; } } + public override bool CanTimeout => _underlyingStream.CanTimeout; + public override bool CanWrite => _underlyingStream.CanWrite; + public override long Length => _underlyingStream.Length; public override void SetLength(long value) { _underlyingStream.SetLength(value); } public override void Write(byte[] buffer, int offset, int count) { _underlyingStream.Write(buffer, offset, count); } public override void Flush() { _underlyingStream.Flush(); } diff --git a/src/Libraries/SmartStore.Core/IO/SymLink/FileSystemInfoExtensions.cs b/src/Libraries/SmartStore.Core/IO/SymLink/FileSystemInfoExtensions.cs index e3c55571d4..0c5032b1d4 100644 --- a/src/Libraries/SmartStore.Core/IO/SymLink/FileSystemInfoExtensions.cs +++ b/src/Libraries/SmartStore.Core/IO/SymLink/FileSystemInfoExtensions.cs @@ -1,20 +1,19 @@ -using System; -using System.IO; +using System.IO; using SmartStore.Core.IO; namespace SmartStore { - public static class FileSystemInfoExtensions - { - /// - /// Determines whether this file system entry is a symbolic link. - /// - /// The directory or file in question. - /// true if the entry is a symbolic link, false otherwise. - public static bool IsSymbolicLink(this FileSystemInfo fsi) - { - return SymbolicLink.IsSymbolicLink(fsi, out _); - } + public static class FileSystemInfoExtensions + { + /// + /// Determines whether this file system entry is a symbolic link. + /// + /// The directory or file in question. + /// true if the entry is a symbolic link, false otherwise. + public static bool IsSymbolicLink(this FileSystemInfo fsi) + { + return SymbolicLink.IsSymbolicLink(fsi, out _); + } /// /// Determines whether this file system entry is a symbolic link. @@ -33,8 +32,8 @@ public static bool IsSymbolicLink(this FileSystemInfo fsi, out string finalPathN /// The symbolic link in question. /// The path to the target. public static string GetFinalPathName(this FileSystemInfo fsi) - { - return SymbolicLink.GetFinalPathName(fsi.FullName); - } - } + { + return SymbolicLink.GetFinalPathName(fsi.FullName); + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/SymLink/SymbolicLink.cs b/src/Libraries/SmartStore.Core/IO/SymLink/SymbolicLink.cs index fe61575ad9..77e25d52df 100644 --- a/src/Libraries/SmartStore.Core/IO/SymLink/SymbolicLink.cs +++ b/src/Libraries/SmartStore.Core/IO/SymLink/SymbolicLink.cs @@ -1,45 +1,44 @@ using System; using System.ComponentModel; using System.IO; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; namespace SmartStore.Core.IO { - internal static class SymbolicLink - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr CreateFile( - [MarshalAs(UnmanagedType.LPTStr)] string filename, - [MarshalAs(UnmanagedType.U4)] uint access, - [MarshalAs(UnmanagedType.U4)] FileShare share, - IntPtr securityAttributes, // optional SECURITY_ATTRIBUTES struct or IntPtr.Zero - [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition, - [MarshalAs(UnmanagedType.U4)] uint flagsAndAttributes, - IntPtr templateFile); - - //[DllImport("kernel32.dll", EntryPoint = "CreateSymbolicLinkW", CharSet = CharSet.Unicode, SetLastError = true)] - //private static extern bool CreateSymbolicLink( - // [In] string lpSymlinkFileName, - // [In] string lpTargetFileName, - // [In] int dwFlags); - - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern uint GetFinalPathNameByHandle( - IntPtr hFile, - [MarshalAs(UnmanagedType.LPTStr)] StringBuilder lpszFilePath, - uint cchFilePath, - uint dwFlags); - - [DllImport("kernel32.dll", SetLastError = true)] - [return: MarshalAs(UnmanagedType.Bool)] - static extern bool CloseHandle(IntPtr hObject); - - private const int FILE_FLAG_BACKUP_SEMANTICS = 0x02000000; - private const uint FILE_READ_EA = 0x0008; - - private static readonly IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1); + internal static class SymbolicLink + { + [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] + private static extern IntPtr CreateFile( + [MarshalAs(UnmanagedType.LPTStr)] string filename, + [MarshalAs(UnmanagedType.U4)] uint access, + [MarshalAs(UnmanagedType.U4)] FileShare share, + IntPtr securityAttributes, // optional SECURITY_ATTRIBUTES struct or IntPtr.Zero + [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition, + [MarshalAs(UnmanagedType.U4)] uint flagsAndAttributes, + IntPtr templateFile); + + //[DllImport("kernel32.dll", EntryPoint = "CreateSymbolicLinkW", CharSet = CharSet.Unicode, SetLastError = true)] + //private static extern bool CreateSymbolicLink( + // [In] string lpSymlinkFileName, + // [In] string lpTargetFileName, + // [In] int dwFlags); + + [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] + private static extern uint GetFinalPathNameByHandle( + IntPtr hFile, + [MarshalAs(UnmanagedType.LPTStr)] StringBuilder lpszFilePath, + uint cchFilePath, + uint dwFlags); + + [DllImport("kernel32.dll", SetLastError = true)] + [return: MarshalAs(UnmanagedType.Bool)] + static extern bool CloseHandle(IntPtr hObject); + + private const int FILE_FLAG_BACKUP_SEMANTICS = 0x02000000; + private const uint FILE_READ_EA = 0x0008; + + private static readonly IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1); public static bool IsSymbolicLink(FileSystemInfo fsi, out string finalPathName) { @@ -48,8 +47,8 @@ public static bool IsSymbolicLink(FileSystemInfo fsi, out string finalPathName) finalPathName = null; // FileSystemInfo.Exists has some problems with symbolic links - var exists = (fsi is DirectoryInfo) - ? Directory.Exists(fsi.FullName) + var exists = (fsi is DirectoryInfo) + ? Directory.Exists(fsi.FullName) : File.Exists(fsi.FullName); if (!exists) @@ -74,44 +73,44 @@ public static bool IsSymbolicLink(FileSystemInfo fsi, out string finalPathName) } public static string GetFinalPathName(string path) - { - Guard.NotEmpty(path, nameof(path)); - - var h = CreateFile(path, - FILE_READ_EA, - FileShare.ReadWrite | FileShare.Delete, - IntPtr.Zero, - FileMode.Open, - FILE_FLAG_BACKUP_SEMANTICS, - IntPtr.Zero); - - if (h == INVALID_HANDLE_VALUE) - { - throw new Win32Exception(Marshal.GetLastWin32Error()); - } - - try - { - var sb = new StringBuilder(1024); - var res = GetFinalPathNameByHandle(h, sb, 1024, 0); - if (res == 0) - { - throw new Win32Exception(Marshal.GetLastWin32Error()); - } - - var result = sb.ToString(); - - if (result.Length >= 4 && result.StartsWith(@"\\?\")) - { - return result.Substring(4);// remove "\\?\" - } - - return result; - } - finally - { - CloseHandle(h); - } - } - } + { + Guard.NotEmpty(path, nameof(path)); + + var h = CreateFile(path, + FILE_READ_EA, + FileShare.ReadWrite | FileShare.Delete, + IntPtr.Zero, + FileMode.Open, + FILE_FLAG_BACKUP_SEMANTICS, + IntPtr.Zero); + + if (h == INVALID_HANDLE_VALUE) + { + throw new Win32Exception(Marshal.GetLastWin32Error()); + } + + try + { + var sb = new StringBuilder(1024); + var res = GetFinalPathNameByHandle(h, sb, 1024, 0); + if (res == 0) + { + throw new Win32Exception(Marshal.GetLastWin32Error()); + } + + var result = sb.ToString(); + + if (result.Length >= 4 && result.StartsWith(@"\\?\")) + { + return result.Substring(4);// remove "\\?\" + } + + return result; + } + finally + { + CloseHandle(h); + } + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs index 2d78ea0447..a7eea24f4e 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs @@ -2,160 +2,160 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Web.Hosting; -using System.Web.Caching; -using SmartStore.Utilities; using System.Web; +using System.Web.Caching; +using System.Web.Hosting; using SmartStore.Core.Logging; +using SmartStore.Utilities; namespace SmartStore.Core.IO { - public class DefaultVirtualPathProvider : IVirtualPathProvider - { - private readonly ILogger _logger; - - public DefaultVirtualPathProvider(ILogger logger) - { - _logger = logger; - } - - public virtual string Combine(params string[] paths) - { - return Path.Combine(paths).Replace(Path.DirectorySeparatorChar, '/'); - } - - public virtual bool DirectoryExists(string virtualPath) - { - return HostingEnvironment.VirtualPathProvider.DirectoryExists(virtualPath); - } - - public virtual bool FileExists(string virtualPath) - { - return HostingEnvironment.VirtualPathProvider.FileExists(virtualPath); - } - - public virtual CacheDependency GetCacheDependency(string virtualPath, IEnumerable dependencies, DateTime utcStart) - { - return HostingEnvironment.VirtualPathProvider.GetCacheDependency(virtualPath, dependencies, utcStart); - } - - public virtual string GetCacheKey(string virtualPath) - { - return HostingEnvironment.VirtualPathProvider.GetCacheKey(virtualPath); - } - - public virtual IEnumerable ListDirectories(string virtualPath) - { - return HostingEnvironment - .VirtualPathProvider - .GetDirectory(virtualPath) - .Directories - .OfType() - .Select(d => VirtualPathUtility.ToAppRelative(d.VirtualPath)); - } - - public virtual IEnumerable ListFiles(string virtualPath) - { - return HostingEnvironment - .VirtualPathProvider - .GetDirectory(virtualPath) - .Files - .OfType() - .Select(f => VirtualPathUtility.ToAppRelative(f.VirtualPath)); - } - - public virtual string GetFileHash(string virtualPath, IEnumerable dependencies) - { - return HostingEnvironment.VirtualPathProvider.GetFileHash(virtualPath, dependencies); - } - - public virtual string MapPath(string virtualPath) - { - return CommonHelper.MapPath(virtualPath); - } - - public virtual string Normalize(string virtualPath) - { - return HostingEnvironment.VirtualPathProvider.GetFile(virtualPath).VirtualPath; - } - - public virtual Stream OpenFile(string virtualPath) - { - return HostingEnvironment.VirtualPathProvider.GetFile(virtualPath).Open(); - } - - public virtual string ToAppRelative(string virtualPath) - { - if (IsMalformedVirtualPath(virtualPath)) - return null; - - try - { - string result = VirtualPathUtility.ToAppRelative(virtualPath); - - // In some cases, ToAppRelative doesn't normalize the path. In those cases, - // the path is invalid. - // Example: - // ApplicationPath: /Foo - // VirtualPath : ~/Bar/../Blah/Blah2 - // Result : /Blah/Blah2 <= that is not an app relative path! - if (!result.StartsWith("~/")) - { - _logger.Info("Path '{0}' cannot be made app relative: Path returned ('{1}') is not app relative.".FormatCurrent(virtualPath, result)); - return null; - } - return result; - } - catch (Exception e) - { - // The initial path might have been invalid (e.g. path indicates a path outside the application root) - _logger.Info(e, "Path '{0}' cannot be made app relative".FormatCurrent(virtualPath)); - return null; - } - } - - /// - /// We want to reject path that contains ".." going outside of the application root. - /// ToAppRelative does that already, but we want to do the same while avoiding exceptions. - /// - /// Note: This method doesn't detect all cases of malformed paths, it merely checks - /// for *some* cases of malformed paths, so this is not a replacement for full virtual path - /// verification through VirtualPathUtilty methods. - /// In other words, !IsMalformed does *not* imply "IsWellformed". - /// - public bool IsMalformedVirtualPath(string virtualPath) - { - if (string.IsNullOrEmpty(virtualPath)) - return true; - - if (virtualPath.IndexOf("..", StringComparison.OrdinalIgnoreCase) >= 0) - { - virtualPath = virtualPath.Replace(Path.DirectorySeparatorChar, '/'); - string rootPrefix = virtualPath.StartsWith("~/") ? "~/" : virtualPath.StartsWith("/") ? "/" : ""; - if (!string.IsNullOrEmpty(rootPrefix)) - { - string[] terms = virtualPath.Substring(rootPrefix.Length).Split('/'); - int depth = 0; - foreach (var term in terms) - { - if (term == "..") - { - if (depth == 0) - { - _logger.Info("Path '{0}' cannot be made app relative: Too many '..'".FormatCurrent(virtualPath)); - return true; - } - depth--; - } - else - { - depth++; - } - } - } - } - - return false; - } - } + public class DefaultVirtualPathProvider : IVirtualPathProvider + { + private readonly ILogger _logger; + + public DefaultVirtualPathProvider(ILogger logger) + { + _logger = logger; + } + + public virtual string Combine(params string[] paths) + { + return Path.Combine(paths).Replace(Path.DirectorySeparatorChar, '/'); + } + + public virtual bool DirectoryExists(string virtualPath) + { + return HostingEnvironment.VirtualPathProvider.DirectoryExists(virtualPath); + } + + public virtual bool FileExists(string virtualPath) + { + return HostingEnvironment.VirtualPathProvider.FileExists(virtualPath); + } + + public virtual CacheDependency GetCacheDependency(string virtualPath, IEnumerable dependencies, DateTime utcStart) + { + return HostingEnvironment.VirtualPathProvider.GetCacheDependency(virtualPath, dependencies, utcStart); + } + + public virtual string GetCacheKey(string virtualPath) + { + return HostingEnvironment.VirtualPathProvider.GetCacheKey(virtualPath); + } + + public virtual IEnumerable ListDirectories(string virtualPath) + { + return HostingEnvironment + .VirtualPathProvider + .GetDirectory(virtualPath) + .Directories + .OfType() + .Select(d => VirtualPathUtility.ToAppRelative(d.VirtualPath)); + } + + public virtual IEnumerable ListFiles(string virtualPath) + { + return HostingEnvironment + .VirtualPathProvider + .GetDirectory(virtualPath) + .Files + .OfType() + .Select(f => VirtualPathUtility.ToAppRelative(f.VirtualPath)); + } + + public virtual string GetFileHash(string virtualPath, IEnumerable dependencies) + { + return HostingEnvironment.VirtualPathProvider.GetFileHash(virtualPath, dependencies); + } + + public virtual string MapPath(string virtualPath) + { + return CommonHelper.MapPath(virtualPath); + } + + public virtual string Normalize(string virtualPath) + { + return HostingEnvironment.VirtualPathProvider.GetFile(virtualPath).VirtualPath; + } + + public virtual Stream OpenFile(string virtualPath) + { + return HostingEnvironment.VirtualPathProvider.GetFile(virtualPath).Open(); + } + + public virtual string ToAppRelative(string virtualPath) + { + if (IsMalformedVirtualPath(virtualPath)) + return null; + + try + { + string result = VirtualPathUtility.ToAppRelative(virtualPath); + + // In some cases, ToAppRelative doesn't normalize the path. In those cases, + // the path is invalid. + // Example: + // ApplicationPath: /Foo + // VirtualPath : ~/Bar/../Blah/Blah2 + // Result : /Blah/Blah2 <= that is not an app relative path! + if (!result.StartsWith("~/")) + { + _logger.Info("Path '{0}' cannot be made app relative: Path returned ('{1}') is not app relative.".FormatCurrent(virtualPath, result)); + return null; + } + return result; + } + catch (Exception e) + { + // The initial path might have been invalid (e.g. path indicates a path outside the application root) + _logger.Info(e, "Path '{0}' cannot be made app relative".FormatCurrent(virtualPath)); + return null; + } + } + + /// + /// We want to reject path that contains ".." going outside of the application root. + /// ToAppRelative does that already, but we want to do the same while avoiding exceptions. + /// + /// Note: This method doesn't detect all cases of malformed paths, it merely checks + /// for *some* cases of malformed paths, so this is not a replacement for full virtual path + /// verification through VirtualPathUtilty methods. + /// In other words, !IsMalformed does *not* imply "IsWellformed". + /// + public bool IsMalformedVirtualPath(string virtualPath) + { + if (string.IsNullOrEmpty(virtualPath)) + return true; + + if (virtualPath.IndexOf("..", StringComparison.OrdinalIgnoreCase) >= 0) + { + virtualPath = virtualPath.Replace(Path.DirectorySeparatorChar, '/'); + string rootPrefix = virtualPath.StartsWith("~/") ? "~/" : virtualPath.StartsWith("/") ? "/" : ""; + if (!string.IsNullOrEmpty(rootPrefix)) + { + string[] terms = virtualPath.Substring(rootPrefix.Length).Split('/'); + int depth = 0; + foreach (var term in terms) + { + if (term == "..") + { + if (depth == 0) + { + _logger.Info("Path '{0}' cannot be made app relative: Too many '..'".FormatCurrent(virtualPath)); + return true; + } + depth--; + } + else + { + depth++; + } + } + } + } + + return false; + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualFolder.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualFolder.cs index e4177560ad..b363e0f4bd 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualFolder.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualFolder.cs @@ -1,65 +1,63 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; using System.Threading.Tasks; namespace SmartStore.Core.IO { - /// - /// Abstraction over the virtual files/directories of a web site. - /// - public interface IVirtualFolder - { - IVirtualPathProvider VirtualPathProvider { get; } - - /// - /// Virtual root path, e.g. ~/App_Data or ~/Themes - /// - string RootPath { get; } - - string GetVirtualPath(string relativePath); - - string MapPath(string relativePath); - string Combine(params string[] paths); - - bool DirectoryExists(string relativePath); - bool FileExists(string relativePath); - - IEnumerable ListDirectories(string relativePath); - IEnumerable ListFiles(string relativePath, bool deep = false); - string GetDirectoryName(string relativePath); - - Stream OpenFile(string relativePath); - void CreateTextFile(string relativePath, string content); - Task CreateTextFileAsync(string relativePath, string content); - Stream CreateFile(string relativePath); - void CreateDirectory(string relativePath); - - void DeleteFile(string relativePath); - void DeleteDirectory(string relativePath); - - string ReadFile(string relativePath); - Task ReadFileAsync(string relativePath); - void CopyFile(string relativePath, Stream destination); - - DateTime GetFileLastWriteTimeUtc(string relativePath); - } - - public static class IVirtualFolderExtensions - { - public static bool TryDeleteDirectory(this IVirtualFolder folder, string relativePath) - { - try - { - folder.DeleteDirectory(relativePath); - return true; - } - catch - { - return false; - } - } - } + /// + /// Abstraction over the virtual files/directories of a web site. + /// + public interface IVirtualFolder + { + IVirtualPathProvider VirtualPathProvider { get; } + + /// + /// Virtual root path, e.g. ~/App_Data or ~/Themes + /// + string RootPath { get; } + + string GetVirtualPath(string relativePath); + + string MapPath(string relativePath); + string Combine(params string[] paths); + + bool DirectoryExists(string relativePath); + bool FileExists(string relativePath); + + IEnumerable ListDirectories(string relativePath); + IEnumerable ListFiles(string relativePath, bool deep = false); + string GetDirectoryName(string relativePath); + + Stream OpenFile(string relativePath); + void CreateTextFile(string relativePath, string content); + Task CreateTextFileAsync(string relativePath, string content); + Stream CreateFile(string relativePath); + void CreateDirectory(string relativePath); + + void DeleteFile(string relativePath); + void DeleteDirectory(string relativePath); + + string ReadFile(string relativePath); + Task ReadFileAsync(string relativePath); + void CopyFile(string relativePath, Stream destination); + + DateTime GetFileLastWriteTimeUtc(string relativePath); + } + + public static class IVirtualFolderExtensions + { + public static bool TryDeleteDirectory(this IVirtualFolder folder, string relativePath) + { + try + { + folder.DeleteDirectory(relativePath); + return true; + } + catch + { + return false; + } + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs index 8fd1c36c90..2a7d3717f0 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs @@ -1,41 +1,40 @@ using System; using System.Collections.Generic; -using System.Linq; using System.IO; using System.Web.Caching; namespace SmartStore.Core.IO -{ +{ public interface IVirtualPathProvider { - string MapPath(string virtualPath); - string Combine(params string[] paths); - string Normalize(string virtualPath); - string ToAppRelative(string virtualPath); + string MapPath(string virtualPath); + string Combine(params string[] paths); + string Normalize(string virtualPath); + string ToAppRelative(string virtualPath); - bool DirectoryExists(string virtualPath); - bool FileExists(string virtualPath); + bool DirectoryExists(string virtualPath); + bool FileExists(string virtualPath); - CacheDependency GetCacheDependency(string virtualPath, IEnumerable dependencies, DateTime utcStart); - string GetCacheKey(string virtualPath); - string GetFileHash(string virtualPath, IEnumerable dependencies); + CacheDependency GetCacheDependency(string virtualPath, IEnumerable dependencies, DateTime utcStart); + string GetCacheKey(string virtualPath); + string GetFileHash(string virtualPath, IEnumerable dependencies); - IEnumerable ListDirectories(string virtualPath); - IEnumerable ListFiles(string virtualPath); + IEnumerable ListDirectories(string virtualPath); + IEnumerable ListFiles(string virtualPath); - Stream OpenFile(string virtualPath); + Stream OpenFile(string virtualPath); } - public static class IVirtualPathProviderExtensions - { - public static string GetFileHash(this IVirtualPathProvider vpp, string virtualPath) - { - return vpp.GetFileHash(virtualPath, new[] { virtualPath }); - } + public static class IVirtualPathProviderExtensions + { + public static string GetFileHash(this IVirtualPathProvider vpp, string virtualPath) + { + return vpp.GetFileHash(virtualPath, new[] { virtualPath }); + } - public static CacheDependency GetCacheDependency(this IVirtualPathProvider vpp, string virtualPath, DateTime utcStart) - { - return vpp.GetCacheDependency(virtualPath, new[] { virtualPath }, utcStart); - } - } + public static CacheDependency GetCacheDependency(this IVirtualPathProvider vpp, string virtualPath, DateTime utcStart) + { + return vpp.GetCacheDependency(virtualPath, new[] { virtualPath }, utcStart); + } + } } diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/VirtualFolder.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/VirtualFolder.cs index 6355143bc6..0798c23a4d 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/VirtualFolder.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/VirtualFolder.cs @@ -7,231 +7,225 @@ namespace SmartStore.Core.IO { - public class VirtualFolder : IVirtualFolder - { - private readonly IVirtualPathProvider _vpp; - private readonly ILogger _logger; - private readonly string _root; - - public VirtualFolder(string root, IVirtualPathProvider vpp) - : this(root, vpp, NullLogger.Instance) - { - } - - public VirtualFolder(string root, IVirtualPathProvider vpp, ILogger logger) - { - Guard.NotEmpty(root, nameof(root)); - Guard.NotNull(vpp, nameof(vpp)); - Guard.NotNull(logger, nameof(logger)); - - if (!root.StartsWith("~/")) - { - throw new ArgumentException("Root path must be a valid application relative path starting with '~/'", nameof(root)); - } - - _root = root.Replace(Path.DirectorySeparatorChar, '/').EnsureEndsWith("/"); - _vpp = vpp; - _logger = logger; - } - - public IVirtualPathProvider VirtualPathProvider - { - get { return _vpp; } - } - - public string RootPath - { - get { return _root; } - } - - public virtual string MapPath(string relativePath) - { - return _vpp.MapPath(GetVirtualPath(relativePath)); - } - - public virtual string Combine(params string[] paths) - { - return _vpp.Combine(paths); - } - - public virtual bool DirectoryExists(string relativePath) - { - return _vpp.DirectoryExists(GetVirtualPath(relativePath)); - } - - public virtual bool FileExists(string relativePath) - { - return _vpp.FileExists(GetVirtualPath(relativePath)); - } - - public virtual IEnumerable ListDirectories(string relativePath) - { - var path = GetVirtualPath(relativePath); - - if (!_vpp.DirectoryExists(path)) - { - return Enumerable.Empty(); - } - - return _vpp.ListDirectories(path).Select(x => x.Substring(_root.Length)); - } - - public virtual IEnumerable ListFiles(string relativePath, bool deep = false) - { - var path = GetVirtualPath(relativePath); - - if (!_vpp.DirectoryExists(path)) - { - return Enumerable.Empty(); - } - - var files = _vpp.ListFiles(path).Select(x => x.Substring(_root.Length)); - - if (deep) - { - return files.Concat(ListDirectories(path).SelectMany(d => ListFiles(d, true))); - } - - return files; - } - - public virtual string GetDirectoryName(string relativePath) - { - return Path.GetDirectoryName(relativePath).Replace(Path.DirectorySeparatorChar, '/'); - } - - public virtual Stream OpenFile(string relativePath) - { - return _vpp.OpenFile(GetVirtualPath(relativePath)); - } - - public void CreateTextFile(string relativePath, string content) - { - Guard.NotEmpty(relativePath, nameof(relativePath)); - - using (var stream = CreateFile(relativePath)) - { - using (var tw = new StreamWriter(stream)) - { - tw.Write(content); - } - } - } - - public async Task CreateTextFileAsync(string relativePath, string content) - { - Guard.NotEmpty(relativePath, nameof(relativePath)); - - using (var stream = CreateFile(relativePath)) - { - using (var tw = new StreamWriter(stream)) - { - await tw.WriteAsync(content); - } - } - } - - public virtual Stream CreateFile(string relativePath) - { - var filePath = MapPath(relativePath); - var folderPath = Path.GetDirectoryName(filePath); - - if (!Directory.Exists(folderPath)) - { - Directory.CreateDirectory(folderPath); - } - - return File.Create(filePath); - } - - public virtual DateTime GetFileLastWriteTimeUtc(string relativePath) - { - return File.GetLastWriteTimeUtc(MapPath(relativePath)); - } - - public virtual void DeleteFile(string relativePath) - { - File.Delete(MapPath(relativePath)); - } - - public virtual void CreateDirectory(string relativePath) - { - Directory.CreateDirectory(MapPath(relativePath)); - } - - public virtual void DeleteDirectory(string relativePath) - { - Directory.Delete(MapPath(relativePath), true); - } - - public virtual string ReadFile(string relativePath) - { - Guard.NotEmpty(relativePath, nameof(relativePath)); - - var path = GetVirtualPath(relativePath); - - if (!_vpp.FileExists(path)) - { - return null; - } - - using (var stream = _vpp.OpenFile(path)) - { - using (var reader = new StreamReader(stream)) - { - return reader.ReadToEnd(); - } - } - } - - public virtual async Task ReadFileAsync(string relativePath) - { - Guard.NotEmpty(relativePath, nameof(relativePath)); - - var path = GetVirtualPath(relativePath); - - if (!_vpp.FileExists(path)) - { - return null; - } - - using (var stream = _vpp.OpenFile(path)) - { - using (var reader = new StreamReader(stream)) - { - return await reader.ReadToEndAsync(); - } - } - } - - public virtual void CopyFile(string relativePath, Stream destination) - { - Guard.NotEmpty(relativePath, nameof(relativePath)); - Guard.NotNull(destination, nameof(destination)); - - var path = GetVirtualPath(relativePath); - - if (!_vpp.FileExists(path)) - { - throw Error.InvalidOperation("File '{0}' does not exist".FormatInvariant(path)); - } - - using (var stream = _vpp.OpenFile(path)) - { - stream.CopyTo(destination); - } - } - - public string GetVirtualPath(string relativePath) - { - Guard.NotNull(relativePath, nameof(relativePath)); - - if (relativePath.StartsWith("~/")) - { - return relativePath; - } - - return _root + relativePath.EmptyNull().Replace(Path.DirectorySeparatorChar, '/').TrimStart('/'); - } - } + public class VirtualFolder : IVirtualFolder + { + private readonly IVirtualPathProvider _vpp; + private readonly ILogger _logger; + private readonly string _root; + + public VirtualFolder(string root, IVirtualPathProvider vpp) + : this(root, vpp, NullLogger.Instance) + { + } + + public VirtualFolder(string root, IVirtualPathProvider vpp, ILogger logger) + { + Guard.NotEmpty(root, nameof(root)); + Guard.NotNull(vpp, nameof(vpp)); + Guard.NotNull(logger, nameof(logger)); + + if (!root.StartsWith("~/")) + { + throw new ArgumentException("Root path must be a valid application relative path starting with '~/'", nameof(root)); + } + + _root = root.Replace(Path.DirectorySeparatorChar, '/').EnsureEndsWith("/"); + _vpp = vpp; + _logger = logger; + } + + public IVirtualPathProvider VirtualPathProvider => _vpp; + + public string RootPath => _root; + + public virtual string MapPath(string relativePath) + { + return _vpp.MapPath(GetVirtualPath(relativePath)); + } + + public virtual string Combine(params string[] paths) + { + return _vpp.Combine(paths); + } + + public virtual bool DirectoryExists(string relativePath) + { + return _vpp.DirectoryExists(GetVirtualPath(relativePath)); + } + + public virtual bool FileExists(string relativePath) + { + return _vpp.FileExists(GetVirtualPath(relativePath)); + } + + public virtual IEnumerable ListDirectories(string relativePath) + { + var path = GetVirtualPath(relativePath); + + if (!_vpp.DirectoryExists(path)) + { + return Enumerable.Empty(); + } + + return _vpp.ListDirectories(path).Select(x => x.Substring(_root.Length)); + } + + public virtual IEnumerable ListFiles(string relativePath, bool deep = false) + { + var path = GetVirtualPath(relativePath); + + if (!_vpp.DirectoryExists(path)) + { + return Enumerable.Empty(); + } + + var files = _vpp.ListFiles(path).Select(x => x.Substring(_root.Length)); + + if (deep) + { + return files.Concat(ListDirectories(path).SelectMany(d => ListFiles(d, true))); + } + + return files; + } + + public virtual string GetDirectoryName(string relativePath) + { + return Path.GetDirectoryName(relativePath).Replace(Path.DirectorySeparatorChar, '/'); + } + + public virtual Stream OpenFile(string relativePath) + { + return _vpp.OpenFile(GetVirtualPath(relativePath)); + } + + public void CreateTextFile(string relativePath, string content) + { + Guard.NotEmpty(relativePath, nameof(relativePath)); + + using (var stream = CreateFile(relativePath)) + { + using (var tw = new StreamWriter(stream)) + { + tw.Write(content); + } + } + } + + public async Task CreateTextFileAsync(string relativePath, string content) + { + Guard.NotEmpty(relativePath, nameof(relativePath)); + + using (var stream = CreateFile(relativePath)) + { + using (var tw = new StreamWriter(stream)) + { + await tw.WriteAsync(content); + } + } + } + + public virtual Stream CreateFile(string relativePath) + { + var filePath = MapPath(relativePath); + var folderPath = Path.GetDirectoryName(filePath); + + if (!Directory.Exists(folderPath)) + { + Directory.CreateDirectory(folderPath); + } + + return File.Create(filePath); + } + + public virtual DateTime GetFileLastWriteTimeUtc(string relativePath) + { + return File.GetLastWriteTimeUtc(MapPath(relativePath)); + } + + public virtual void DeleteFile(string relativePath) + { + File.Delete(MapPath(relativePath)); + } + + public virtual void CreateDirectory(string relativePath) + { + Directory.CreateDirectory(MapPath(relativePath)); + } + + public virtual void DeleteDirectory(string relativePath) + { + Directory.Delete(MapPath(relativePath), true); + } + + public virtual string ReadFile(string relativePath) + { + Guard.NotEmpty(relativePath, nameof(relativePath)); + + var path = GetVirtualPath(relativePath); + + if (!_vpp.FileExists(path)) + { + return null; + } + + using (var stream = _vpp.OpenFile(path)) + { + using (var reader = new StreamReader(stream)) + { + return reader.ReadToEnd(); + } + } + } + + public virtual async Task ReadFileAsync(string relativePath) + { + Guard.NotEmpty(relativePath, nameof(relativePath)); + + var path = GetVirtualPath(relativePath); + + if (!_vpp.FileExists(path)) + { + return null; + } + + using (var stream = _vpp.OpenFile(path)) + { + using (var reader = new StreamReader(stream)) + { + return await reader.ReadToEndAsync(); + } + } + } + + public virtual void CopyFile(string relativePath, Stream destination) + { + Guard.NotEmpty(relativePath, nameof(relativePath)); + Guard.NotNull(destination, nameof(destination)); + + var path = GetVirtualPath(relativePath); + + if (!_vpp.FileExists(path)) + { + throw Error.InvalidOperation("File '{0}' does not exist".FormatInvariant(path)); + } + + using (var stream = _vpp.OpenFile(path)) + { + stream.CopyTo(destination); + } + } + + public string GetVirtualPath(string relativePath) + { + Guard.NotNull(relativePath, nameof(relativePath)); + + if (relativePath.StartsWith("~/")) + { + return relativePath; + } + + return _root + relativePath.EmptyNull().Replace(Path.DirectorySeparatorChar, '/').TrimStart('/'); + } + } } diff --git a/src/Libraries/SmartStore.Core/IPageable.cs b/src/Libraries/SmartStore.Core/IPageable.cs index 9131f20d99..d0d046c4c0 100644 --- a/src/Libraries/SmartStore.Core/IPageable.cs +++ b/src/Libraries/SmartStore.Core/IPageable.cs @@ -1,12 +1,12 @@ using System; -using System.Runtime.Serialization; using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Threading.Tasks; namespace SmartStore.Core -{ +{ /// /// A collection of objects that has been split into pages. /// @@ -77,43 +77,43 @@ public interface IPageable : IEnumerable } - /// - /// Paged list interface - /// - public interface IPagedList : IPageable, IList - { - /// - /// Gets underlying query without any paging applied - /// - IQueryable SourceQuery { get; } - - /// - /// Allows modification of the underlying query before it is executed. - /// - /// The alteration function. The underlying query is passed, the modified query should be returned. - /// The current instance for chaining - IPagedList AlterQuery(Func, IQueryable> alterer); - - /// - /// Applies the initial paging arguments to the passed query - /// - /// The query - /// A query with applied paging args - IQueryable ApplyPaging(IQueryable query); - - /// - /// Loads the data synchronously. - /// - /// When true, always reloads data. When false, first checks to see whether data has been loaded already and skips if so. - /// Returns itself for chaining. - IPagedList Load(bool force = false); - - /// - /// Loads the data asynchronously. - /// - /// When true, always reloads data. When false, first checks to see whether data has been loaded already and skips if so. - /// Returns itself for chaining. - Task> LoadAsync(bool force = false); + /// + /// Paged list interface + /// + public interface IPagedList : IPageable, IList + { + /// + /// Gets underlying query without any paging applied + /// + IQueryable SourceQuery { get; } + + /// + /// Allows modification of the underlying query before it is executed. + /// + /// The alteration function. The underlying query is passed, the modified query should be returned. + /// The current instance for chaining + IPagedList AlterQuery(Func, IQueryable> alterer); + + /// + /// Applies the initial paging arguments to the passed query + /// + /// The query + /// A query with applied paging args + IQueryable ApplyPaging(IQueryable query); + + /// + /// Loads the data synchronously. + /// + /// When true, always reloads data. When false, first checks to see whether data has been loaded already and skips if so. + /// Returns itself for chaining. + IPagedList Load(bool force = false); + + /// + /// Loads the data asynchronously. + /// + /// When true, always reloads data. When false, first checks to see whether data has been loaded already and skips if so. + /// Returns itself for chaining. + Task> LoadAsync(bool force = false); /// /// The total number of items asynchronously. diff --git a/src/Libraries/SmartStore.Core/ISoftDeletable.cs b/src/Libraries/SmartStore.Core/ISoftDeletable.cs index 88fe0be01b..2dd6ec0c6a 100644 --- a/src/Libraries/SmartStore.Core/ISoftDeletable.cs +++ b/src/Libraries/SmartStore.Core/ISoftDeletable.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; - -namespace SmartStore.Core +namespace SmartStore.Core { - public interface ISoftDeletable - { - bool Deleted { get; } - } + public interface ISoftDeletable + { + bool Deleted { get; } + } } diff --git a/src/Libraries/SmartStore.Core/IStoreContext.cs b/src/Libraries/SmartStore.Core/IStoreContext.cs index 1802ddbf23..27b78be39f 100644 --- a/src/Libraries/SmartStore.Core/IStoreContext.cs +++ b/src/Libraries/SmartStore.Core/IStoreContext.cs @@ -2,44 +2,44 @@ namespace SmartStore.Core { - /// - /// Store context - /// - public interface IStoreContext - { - /// - /// Sets a store override to be used for the current request - /// - /// The store override or null to remove the override - void SetRequestStore(int? storeId); + /// + /// Store context + /// + public interface IStoreContext + { + /// + /// Sets a store override to be used for the current request + /// + /// The store override or null to remove the override + void SetRequestStore(int? storeId); - /// - /// Sets a store override to be used for the current user's session (e.g. for preview mode) - /// - /// The store override or null to remove the override - void SetPreviewStore(int? storeId); + /// + /// Sets a store override to be used for the current user's session (e.g. for preview mode) + /// + /// The store override or null to remove the override + void SetPreviewStore(int? storeId); - /// - /// Gets the store override for the current request - /// - /// The store override or null - int? GetRequestStore(); + /// + /// Gets the store override for the current request + /// + /// The store override or null + int? GetRequestStore(); - /// - /// Gets the store override for the current session - /// - /// The store override or null - int? GetPreviewStore(); - - /// - /// Gets or sets the current store - /// - /// Setter is for virtualization and testing purposes - Store CurrentStore { get; set; } + /// + /// Gets the store override for the current session + /// + /// The store override or null + int? GetPreviewStore(); - /// - /// IsSingleStoreMode ? 0 : CurrentStore.Id - /// - int CurrentStoreIdIfMultiStoreMode { get; } - } + /// + /// Gets or sets the current store + /// + /// Setter is for virtualization and testing purposes + Store CurrentStore { get; set; } + + /// + /// IsSingleStoreMode ? 0 : CurrentStore.Id + /// + int CurrentStoreIdIfMultiStoreMode { get; } + } } diff --git a/src/Libraries/SmartStore.Core/ITransient.cs b/src/Libraries/SmartStore.Core/ITransient.cs index 761dcee833..d07cf7c224 100644 --- a/src/Libraries/SmartStore.Core/ITransient.cs +++ b/src/Libraries/SmartStore.Core/ITransient.cs @@ -1,9 +1,7 @@ -using System; - -namespace SmartStore +namespace SmartStore { - public interface ITransient - { - bool IsTransient { get; set; } - } + public interface ITransient + { + bool IsTransient { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/IWebHelper.cs b/src/Libraries/SmartStore.Core/IWebHelper.cs index b32c43be24..31cd154105 100644 --- a/src/Libraries/SmartStore.Core/IWebHelper.cs +++ b/src/Libraries/SmartStore.Core/IWebHelper.cs @@ -10,21 +10,21 @@ public partial interface IWebHelper /// URL referrer string GetUrlReferrer(); - /// - /// Gets a unique client identifier - /// - /// A unique identifier - /// - /// The client identifier is a hashed combination of client ip address and user agent. - /// This method returns null if IP or user agent (or both) cannot be determined. - /// - string GetClientIdent(); - - /// - /// Get context IP address - /// - /// URL referrer - string GetCurrentIpAddress(); + /// + /// Gets a unique client identifier + /// + /// A unique identifier + /// + /// The client identifier is a hashed combination of client ip address and user agent. + /// This method returns null if IP or user agent (or both) cannot be determined. + /// + string GetClientIdent(); + + /// + /// Get context IP address + /// + /// URL referrer + string GetCurrentIpAddress(); /// /// Gets this page name @@ -46,7 +46,7 @@ public partial interface IWebHelper /// /// true - secured, false - not secured bool IsCurrentConnectionSecured(); - + /// /// Gets server variable by name /// @@ -84,7 +84,7 @@ public partial interface IWebHelper /// .ashx /// bool IsStaticResource(HttpRequest request); - + /// /// Maps a virtual path to a physical disk path. /// @@ -109,7 +109,7 @@ public partial interface IWebHelper /// Query string to remove /// New url string RemoveQueryString(string url, string queryString); - + /// /// Gets query string value by name /// diff --git a/src/Libraries/SmartStore.Core/Infrastructure/AppDomainTypeFinder.cs b/src/Libraries/SmartStore.Core/Infrastructure/AppDomainTypeFinder.cs index 4ed72318a1..83884bda73 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/AppDomainTypeFinder.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/AppDomainTypeFinder.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using System.IO; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; @@ -18,37 +16,34 @@ namespace SmartStore.Core.Infrastructure /// public class AppDomainTypeFinder : ITypeFinder { - private static object s_lock = new object(); + private static readonly object s_lock = new object(); - private readonly Regex _systemAssembliesPattern = new Regex(@"^System|^mscorlib|^Microsoft", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); + private readonly Regex _systemAssembliesPattern = new Regex(@"^System|^mscorlib|^Microsoft", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); - private bool _ignoreReflectionErrors = true; - private bool _loadAppDomainAssemblies = true; + private readonly bool _ignoreReflectionErrors = true; + private bool _loadAppDomainAssemblies = true; private IList _customAssemblyNames = new List(); - public AppDomainTypeFinder() - { - Logger = NullLogger.Instance; - } - - public ILogger Logger - { - get; - set; - } + public AppDomainTypeFinder() + { + Logger = NullLogger.Instance; + } - public virtual AppDomain App + public ILogger Logger { - get { return AppDomain.CurrentDomain; } + get; + set; } + public virtual AppDomain App => AppDomain.CurrentDomain; + /// - /// Gets or sets wether SmartStore should iterate assemblies in the app domain when loading SmartStore types. Loading patterns are applied when loading these assemblies. - /// + /// Gets or sets wether SmartStore should iterate assemblies in the app domain when loading SmartStore types. Loading patterns are applied when loading these assemblies. + /// public bool LoadAppDomainAssemblies { - get { return _loadAppDomainAssemblies; } - set { _loadAppDomainAssemblies = value; } + get => _loadAppDomainAssemblies; + set => _loadAppDomainAssemblies = value; } /// @@ -56,8 +51,8 @@ public bool LoadAppDomainAssemblies /// public IList CustomAssemblyNames { - get { return _customAssemblyNames; } - set { _customAssemblyNames = value; } + get => _customAssemblyNames; + set => _customAssemblyNames = value; } public IEnumerable FindClassesOfType(Type assignTypeFrom, IEnumerable assemblies, bool onlyConcreteClasses = true) @@ -66,94 +61,94 @@ public IEnumerable FindClassesOfType(Type assignTypeFrom, IEnumerable GetAssemblies(bool ignoreInactivePlugins = false) - { - var assemblies = new HashSet(); + public virtual IEnumerable GetAssemblies(bool ignoreInactivePlugins = false) + { + var assemblies = new HashSet(); - var addedAssemblyNames = new HashSet(StringComparer.OrdinalIgnoreCase); + var addedAssemblyNames = new HashSet(StringComparer.OrdinalIgnoreCase); - if (_loadAppDomainAssemblies) - { - AddAppDomainAssemblies(addedAssemblyNames, assemblies); - } + if (_loadAppDomainAssemblies) + { + AddAppDomainAssemblies(addedAssemblyNames, assemblies); + } - AddCustomAssemblies(addedAssemblyNames, assemblies); + AddCustomAssemblies(addedAssemblyNames, assemblies); - if (ignoreInactivePlugins) - { - return assemblies.Where(x => PluginManager.IsActivePluginAssembly(x)).AsReadOnly(); - } + if (ignoreInactivePlugins) + { + return assemblies.Where(x => PluginManager.IsActivePluginAssembly(x)).AsReadOnly(); + } - return assemblies.AsReadOnly(); - } + return assemblies.AsReadOnly(); + } - /// - /// Iterates all assemblies in the AppDomain and if its name matches the configured patterns adds it to our list. - /// - /// - /// - private void AddAppDomainAssemblies(HashSet addedAssemblyNames, HashSet assemblies) + /// + /// Iterates all assemblies in the AppDomain and if its name matches the configured patterns adds it to our list. + /// + /// + /// + private void AddAppDomainAssemblies(HashSet addedAssemblyNames, HashSet assemblies) { - var domainAssemblies = AppDomain.CurrentDomain.GetAssemblies(); + var domainAssemblies = AppDomain.CurrentDomain.GetAssemblies(); - foreach (var assembly in domainAssemblies) + foreach (var assembly in domainAssemblies) { if (Matches(assembly)) { @@ -175,50 +170,50 @@ protected virtual void AddCustomAssemblies(HashSet addedAssemblyNames, H { if (!addedAssemblyNames.Contains(assemblyName)) { - try - { - var assembly = Assembly.Load(assemblyName); - assemblies.Add(assembly); - Logger.DebugFormat("Loaded custom assembly '{0}'", assemblyName); - } - finally - { - addedAssemblyNames.Add(assemblyName); - } + try + { + var assembly = Assembly.Load(assemblyName); + assemblies.Add(assembly); + Logger.DebugFormat("Loaded custom assembly '{0}'", assemblyName); + } + finally + { + addedAssemblyNames.Add(assemblyName); + } } } } - /// - /// Checks whether an assembly is one of the shipped system or 3rd party assemblies that don't need to be investigated. - /// - /// The assembly to check. - /// True if the assembly should be loaded into SmartStore. - public virtual bool Matches(Assembly assembly) - { + /// + /// Checks whether an assembly is one of the shipped system or 3rd party assemblies that don't need to be investigated. + /// + /// The assembly to check. + /// True if the assembly should be loaded into SmartStore. + public virtual bool Matches(Assembly assembly) + { var name = assembly.FullName; - // Check if passed assembly is a system assembly - if (_systemAssembliesPattern.IsMatch(name)) - { - return false; - } - - // Check if the passed assembly starts with "SmartStore." - if (name.StartsWith("SmartStore.", StringComparison.OrdinalIgnoreCase)) - { - return true; - } - - // Check if any of the referenced assemblies of the passed assembly start with "SmartStore." - // In this case it's obviously a SmartStore plugin. - if (assembly.GetReferencedAssemblies().Any(x => x.FullName.StartsWith("SmartStore.", StringComparison.OrdinalIgnoreCase))) - { - return true; - } - - return false; - } + // Check if passed assembly is a system assembly + if (_systemAssembliesPattern.IsMatch(name)) + { + return false; + } + + // Check if the passed assembly starts with "SmartStore." + if (name.StartsWith("SmartStore.", StringComparison.OrdinalIgnoreCase)) + { + return true; + } + + // Check if any of the referenced assemblies of the passed assembly start with "SmartStore." + // In this case it's obviously a SmartStore plugin. + if (assembly.GetReferencedAssemblies().Any(x => x.FullName.StartsWith("SmartStore.", StringComparison.OrdinalIgnoreCase))) + { + return true; + } + + return false; + } protected virtual bool DoesTypeImplementOpenGeneric(Type type, Type openGeneric) { @@ -236,11 +231,11 @@ protected virtual bool DoesTypeImplementOpenGeneric(Type type, Type openGeneric) return false; } - catch + catch { return false; } } - + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationEnvironment.cs b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationEnvironment.cs index f2582a6096..15ba56ebc8 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationEnvironment.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationEnvironment.cs @@ -6,42 +6,31 @@ namespace SmartStore.Core { - public class ApplicationEnvironment : IApplicationEnvironment - { - public ApplicationEnvironment(IVirtualPathProvider vpp, ILogger logger) - { - WebRootFolder = new VirtualFolder("~/", vpp, logger); - AppDataFolder = new VirtualFolder("~/App_Data/", vpp, logger); - ThemesFolder = new VirtualFolder(CommonHelper.GetAppSetting("sm:ThemesBasePath", "~/Themes/"), vpp, logger); - PluginsFolder = new VirtualFolder("~/Plugins/", vpp, logger); + public class ApplicationEnvironment : IApplicationEnvironment + { + public ApplicationEnvironment(IVirtualPathProvider vpp, ILogger logger) + { + WebRootFolder = new VirtualFolder("~/", vpp, logger); + AppDataFolder = new VirtualFolder("~/App_Data/", vpp, logger); + ThemesFolder = new VirtualFolder(CommonHelper.GetAppSetting("sm:ThemesBasePath", "~/Themes/"), vpp, logger); + PluginsFolder = new VirtualFolder("~/Plugins/", vpp, logger); - if (DataSettings.Current.IsValid()) - { - TenantFolder = new VirtualFolder(DataSettings.Current.TenantPath, vpp, logger); - } - } + if (DataSettings.Current.IsValid()) + { + TenantFolder = new VirtualFolder(DataSettings.Current.TenantPath, vpp, logger); + } + } - public virtual string MachineName - { - get - { - return Environment.MachineName; - } - } + public virtual string MachineName => Environment.MachineName; - public virtual string EnvironmentIdentifier - { - get - { - // use the current host and the process id as two servers could run on the same machine - return Environment.MachineName + "-" + System.Diagnostics.Process.GetCurrentProcess().Id; - } - } + public virtual string EnvironmentIdentifier => + // use the current host and the process id as two servers could run on the same machine + Environment.MachineName + "-" + System.Diagnostics.Process.GetCurrentProcess().Id; - public virtual IVirtualFolder WebRootFolder { get; private set; } - public virtual IVirtualFolder AppDataFolder { get; private set; } - public virtual IVirtualFolder ThemesFolder { get; private set; } - public virtual IVirtualFolder PluginsFolder { get; private set; } - public virtual IVirtualFolder TenantFolder { get; private set; } - } + public virtual IVirtualFolder WebRootFolder { get; private set; } + public virtual IVirtualFolder AppDataFolder { get; private set; } + public virtual IVirtualFolder ThemesFolder { get; private set; } + public virtual IVirtualFolder PluginsFolder { get; private set; } + public virtual IVirtualFolder TenantFolder { get; private set; } + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs index 766adcf12d..14b51e277c 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs @@ -1,9 +1,9 @@ using System; -using System.Linq; using System.Collections.Generic; +using System.Linq; using System.Web; -using System.Web.Mvc.Filters; using System.Web.Mvc; +using System.Web.Mvc.Filters; using SmartStore.Core.Logging; namespace SmartStore.Core.Infrastructure @@ -156,7 +156,7 @@ private static List GetStarterModuleInfos() .Select(x => new StarterModuleInfo { ModuleType = x }) .ToList(); } - + return _starterModuleInfos; } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs b/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs index c236a5b0f2..9463d4a094 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs @@ -1,12 +1,12 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Linq.Expressions; using System.Reflection; -using SmartStore.Utilities; -using System.Collections.Concurrent; -using System.Diagnostics.CodeAnalysis; using SmartStore.ComponentModel; +using SmartStore.Utilities; namespace SmartStore { @@ -23,7 +23,7 @@ public abstract class ComparableObject { private readonly HashSet _extraSignatureProperties = new HashSet(StringComparer.OrdinalIgnoreCase); - private static readonly ConcurrentDictionary _signaturePropertyNames = new ConcurrentDictionary(); + private static readonly ConcurrentDictionary _signaturePropertyNames = new ConcurrentDictionary(); public override bool Equals(object obj) { @@ -51,19 +51,19 @@ public override int GetHashCode() var signatureProperties = GetSignatureProperties().ToArray(); Type t = this.GetType(); - var combiner = HashCodeCombiner.Start(); + var combiner = HashCodeCombiner.Start(); - // It's possible for two objects to return the same hash code based on - // identically valued properties, even if they're of two different types, - // so we include the object's type in the hash calculation - combiner.Add(t.GetHashCode()); + // It's possible for two objects to return the same hash code based on + // identically valued properties, even if they're of two different types, + // so we include the object's type in the hash calculation + combiner.Add(t.GetHashCode()); foreach (var prop in signatureProperties) { var value = prop.GetValue(this); if (value != null) - combiner.Add(value.GetHashCode()); + combiner.Add(value.GetHashCode()); } if (signatureProperties.Length > 0) @@ -118,17 +118,17 @@ protected virtual bool HasSameSignatureAs(ComparableObject compareTo) /// public IEnumerable GetSignatureProperties() { - var type = GetType(); - var propertyNames = GetSignaturePropertyNamesCore(); - - foreach (var name in propertyNames) - { - var fastProperty = FastProperty.GetProperty(type, name); - if (fastProperty != null) - { - yield return fastProperty; - } - } + var type = GetType(); + var propertyNames = GetSignaturePropertyNamesCore(); + + foreach (var name in propertyNames) + { + var fastProperty = FastProperty.GetProperty(type, name); + if (fastProperty != null) + { + yield return fastProperty; + } + } } /// @@ -138,22 +138,22 @@ public IEnumerable GetSignatureProperties() protected virtual string[] GetSignaturePropertyNamesCore() { Type type = this.GetType(); - string[] names; + string[] names; - if (!_signaturePropertyNames.TryGetValue(type, out names)) - { - names = type.GetProperties(BindingFlags.Public | BindingFlags.Instance) - .Where(p => Attribute.IsDefined(p, typeof(ObjectSignatureAttribute), true)) - .Select(p => p.Name) - .ToArray(); + if (!_signaturePropertyNames.TryGetValue(type, out names)) + { + names = type.GetProperties(BindingFlags.Public | BindingFlags.Instance) + .Where(p => Attribute.IsDefined(p, typeof(ObjectSignatureAttribute), true)) + .Select(p => p.Name) + .ToArray(); - _signaturePropertyNames.TryAdd(type, names); - } + _signaturePropertyNames.TryAdd(type, names); + } - if (_extraSignatureProperties.Count == 0) - { - return names; - } + if (_extraSignatureProperties.Count == 0) + { + return names; + } return names.Union(_extraSignatureProperties).ToArray(); } @@ -168,7 +168,7 @@ protected void RegisterSignatureProperty(string propertyName) { Guard.NotEmpty(propertyName, nameof(propertyName)); - _extraSignatureProperties.Add(propertyName); + _extraSignatureProperties.Add(propertyName); } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs index e59bd5f44a..ae9af5f59e 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs @@ -4,86 +4,86 @@ namespace SmartStore.Core.Infrastructure { - /// - /// Holds some state for the current HttpContext or thread - /// - /// The type of data to store - public class ContextState where T : class - { - private readonly string _name; - private readonly Func _defaultValue; + /// + /// Holds some state for the current HttpContext or thread + /// + /// The type of data to store + public class ContextState where T : class + { + private readonly string _name; + private readonly Func _defaultValue; - public ContextState(string name) - { - _name = name; - } + public ContextState(string name) + { + _name = name; + } - public ContextState(string name, Func defaultValue) - { - _name = name; - _defaultValue = defaultValue; - } + public ContextState(string name, Func defaultValue) + { + _name = name; + _defaultValue = defaultValue; + } - public T GetState() - { - var key = BuildKey(); + public T GetState() + { + var key = BuildKey(); - if (HttpContext.Current == null) - { - var data = CallContext.GetData(key); - - if (data == null) - { - if (_defaultValue != null) - { - CallContext.SetData(key, data = _defaultValue()); - return data as T; - } - } - - return data as T; - } + if (HttpContext.Current == null) + { + var data = CallContext.GetData(key); - if (HttpContext.Current.Items[key] == null) - { - HttpContext.Current.Items[key] = _defaultValue?.Invoke(); - } + if (data == null) + { + if (_defaultValue != null) + { + CallContext.SetData(key, data = _defaultValue()); + return data as T; + } + } - return HttpContext.Current.Items[key] as T; - } + return data as T; + } - public void SetState(T state) - { - if (HttpContext.Current == null) - { - CallContext.SetData(BuildKey(), state); - } - else - { - HttpContext.Current.Items[BuildKey()] = state; - } - } + if (HttpContext.Current.Items[key] == null) + { + HttpContext.Current.Items[key] = _defaultValue?.Invoke(); + } - public void RemoveState() - { - var key = BuildKey(); + return HttpContext.Current.Items[key] as T; + } - if (HttpContext.Current == null) - { - CallContext.FreeNamedDataSlot(key); - } - else - { - if (HttpContext.Current.Items.Contains(key)) - { - HttpContext.Current.Items.Remove(key); - } - } - } + public void SetState(T state) + { + if (HttpContext.Current == null) + { + CallContext.SetData(BuildKey(), state); + } + else + { + HttpContext.Current.Items[BuildKey()] = state; + } + } - private string BuildKey() - { - return "__ContextState." + _name; - } - } + public void RemoveState() + { + var key = BuildKey(); + + if (HttpContext.Current == null) + { + CallContext.FreeNamedDataSlot(key); + } + else + { + if (HttpContext.Current.Items.Contains(key)) + { + HttpContext.Current.Items.Remove(key); + } + } + } + + private string BuildKey() + { + return "__ContextState." + _name; + } + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs index f101841492..d32030bcbd 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Web; using Autofac.Integration.Mvc; @@ -10,68 +9,68 @@ namespace SmartStore.Core.Infrastructure.DependencyManagement /// that creates a nested lifetime scope for each HTTP request. /// public class AutofacRequestLifetimeHttpModule : IHttpModule - { - public void Init(HttpApplication context) - { - Guard.NotNull(context, nameof(context)); + { + public void Init(HttpApplication context) + { + Guard.NotNull(context, nameof(context)); - context.EndRequest += OnEndRequest; - } + context.EndRequest += OnEndRequest; + } - public static void OnEndRequest(object sender, EventArgs e) - { - if (LifetimeScopeProvider != null) - { - LifetimeScopeProvider.EndLifetimeScope(); - } + public static void OnEndRequest(object sender, EventArgs e) + { + if (LifetimeScopeProvider != null) + { + LifetimeScopeProvider.EndLifetimeScope(); + } - // Dispose all other disposable object in HttpContext.Items - PurgeContextItems(sender as HttpApplication); - } + // Dispose all other disposable object in HttpContext.Items + PurgeContextItems(sender as HttpApplication); + } - private static void PurgeContextItems(HttpApplication app) - { - var items = app?.Context?.Items; + private static void PurgeContextItems(HttpApplication app) + { + var items = app?.Context?.Items; - if (items != null) - { - int size = items.Count; - if (size > 0) - { - var keys = new object[size]; - items.Keys.CopyTo(keys, 0); + if (items != null) + { + int size = items.Count; + if (size > 0) + { + var keys = new object[size]; + items.Keys.CopyTo(keys, 0); - for (int i = 0; i < size; i++) - { - var obj = items[keys[i]] as IDisposable; - if (obj != null) - { - try - { - obj.Dispose(); - } - catch { } - } - } - } - } - } + for (int i = 0; i < size; i++) + { + var obj = items[keys[i]] as IDisposable; + if (obj != null) + { + try + { + obj.Dispose(); + } + catch { } + } + } + } + } + } - public static void SetLifetimeScopeProvider(ILifetimeScopeProvider lifetimeScopeProvider) - { - LifetimeScopeProvider = lifetimeScopeProvider ?? throw new ArgumentNullException("lifetimeScopeProvider"); - } + public static void SetLifetimeScopeProvider(ILifetimeScopeProvider lifetimeScopeProvider) + { + LifetimeScopeProvider = lifetimeScopeProvider ?? throw new ArgumentNullException("lifetimeScopeProvider"); + } - internal static ILifetimeScopeProvider LifetimeScopeProvider - { - get; - private set; - } + internal static ILifetimeScopeProvider LifetimeScopeProvider + { + get; + private set; + } - public void Dispose() - { - } + public void Dispose() + { + } - } + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs index fb00780d8e..dbbef7fe1a 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs @@ -16,48 +16,45 @@ namespace SmartStore.Core.Infrastructure.DependencyManagement public class ContainerManager { private readonly IContainer _container; - private readonly ConcurrentDictionary _cachedActivators = new ConcurrentDictionary(); + private readonly ConcurrentDictionary _cachedActivators = new ConcurrentDictionary(); public ContainerManager(IContainer container) { _container = container; } - public IContainer Container - { - get { return _container; } - } + public IContainer Container => _container; [DebuggerStepThrough] public T Resolve(object key = null, ILifetimeScope scope = null) where T : class { if (key == null) { - return (scope ?? Scope()).Resolve(); + return (scope ?? Scope()).Resolve(); } - return (scope ?? Scope()).ResolveKeyed(key); + return (scope ?? Scope()).ResolveKeyed(key); } [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public T ResolveNamed(string name, ILifetimeScope scope = null) where T : class { - return (scope ?? Scope()).ResolveNamed(name); + return (scope ?? Scope()).ResolveNamed(name); } [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public object Resolve(Type type, ILifetimeScope scope = null) { - return (scope ?? Scope()).Resolve(type); + return (scope ?? Scope()).Resolve(type); } [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public object ResolveNamed(string name, Type type, ILifetimeScope scope = null) { - return (scope ?? Scope()).ResolveNamed(name, type); + return (scope ?? Scope()).ResolveNamed(name, type); } [DebuggerStepThrough] @@ -65,10 +62,10 @@ public T[] ResolveAll(object key = null, ILifetimeScope scope = null) { if (key == null) { - return (scope ?? Scope()).Resolve>().ToArray(); + return (scope ?? Scope()).Resolve>().ToArray(); } - return (scope ?? Scope()).ResolveKeyed>(key).ToArray(); + return (scope ?? Scope()).ResolveKeyed>(key).ToArray(); } public T ResolveUnregistered(ILifetimeScope scope = null) where T : class @@ -76,144 +73,138 @@ public T ResolveUnregistered(ILifetimeScope scope = null) where T : class return ResolveUnregistered(typeof(T), scope) as T; } - public object ResolveUnregistered(Type type, ILifetimeScope scope = null) - { - object[] parameterInstances = null; - - if (!_cachedActivators.TryGetValue(type, out FastActivator activator)) - { - var constructors = type.GetConstructors(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); - foreach (var constructor in constructors) - { - var parameterTypes = constructor.GetParameters().Select(p => p.ParameterType).ToArray(); - if (TryResolveAll(parameterTypes, out parameterInstances, scope)) - { - activator = new FastActivator(constructor); - _cachedActivators.TryAdd(type, activator); - break; - } - } - } - - if (activator != null) - { - if (parameterInstances == null) - { - TryResolveAll(activator.ParameterTypes, out parameterInstances, scope); + public object ResolveUnregistered(Type type, ILifetimeScope scope = null) + { + object[] parameterInstances = null; + + if (!_cachedActivators.TryGetValue(type, out FastActivator activator)) + { + var constructors = type.GetConstructors(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); + foreach (var constructor in constructors) + { + var parameterTypes = constructor.GetParameters().Select(p => p.ParameterType).ToArray(); + if (TryResolveAll(parameterTypes, out parameterInstances, scope)) + { + activator = new FastActivator(constructor); + _cachedActivators.TryAdd(type, activator); + break; + } } + } - if (parameterInstances != null) - { - return activator.Activate(parameterInstances); - } - } + if (activator != null) + { + if (parameterInstances == null) + { + TryResolveAll(activator.ParameterTypes, out parameterInstances, scope); + } + + if (parameterInstances != null) + { + return activator.Activate(parameterInstances); + } + } throw new SmartException("No constructor for {0} was found that had all the dependencies satisfied.".FormatInvariant(type.Name.NaIfEmpty())); } - private bool TryResolveAll(Type[] types, out object[] instances, ILifetimeScope scope = null) - { - instances = null; + private bool TryResolveAll(Type[] types, out object[] instances, ILifetimeScope scope = null) + { + instances = null; - try - { - var instances2 = new object[types.Length]; + try + { + var instances2 = new object[types.Length]; - for (int i = 0; i < types.Length; i++) - { - var service = Resolve(types[i], scope); - if (service == null) - { - return false; - } + for (int i = 0; i < types.Length; i++) + { + var service = Resolve(types[i], scope); + if (service == null) + { + return false; + } - instances2[i] = service; - } + instances2[i] = service; + } - instances = instances2; - return true; - } - catch (Exception ex) - { - _container.Resolve().GetLogger(this.GetType()).Error(ex); - return false; - } - } + instances = instances2; + return true; + } + catch (Exception ex) + { + _container.Resolve().GetLogger(this.GetType()).Error(ex); + return false; + } + } [DebuggerStepThrough] public bool TryResolve(Type serviceType, ILifetimeScope scope, out object instance) { - instance = null; + instance = null; - try - { - return (scope ?? Scope()).TryResolve(serviceType, out instance); - } - catch - { - return false; - } + try + { + return (scope ?? Scope()).TryResolve(serviceType, out instance); + } + catch + { + return false; + } } [DebuggerStepThrough] public bool TryResolve(ILifetimeScope scope, out T instance) - where T : class - { - instance = default(T); + where T : class + { + instance = default(T); - try - { - return (scope ?? Scope()).TryResolve(out instance); - } - catch - { - return false; - } - } + try + { + return (scope ?? Scope()).TryResolve(out instance); + } + catch + { + return false; + } + } - public bool IsRegistered(Type serviceType, ILifetimeScope scope = null) + public bool IsRegistered(Type serviceType, ILifetimeScope scope = null) { - return (scope ?? Scope()).IsRegistered(serviceType); + return (scope ?? Scope()).IsRegistered(serviceType); } - public object ResolveOptional(Type serviceType, ILifetimeScope scope = null) + public object ResolveOptional(Type serviceType, ILifetimeScope scope = null) { - return (scope ?? Scope()).ResolveOptional(serviceType); + return (scope ?? Scope()).ResolveOptional(serviceType); } - public T InjectProperties(T instance, ILifetimeScope scope = null) - { - return (scope ?? Scope()).InjectProperties(instance); - } + public T InjectProperties(T instance, ILifetimeScope scope = null) + { + return (scope ?? Scope()).InjectProperties(instance); + } - public T InjectUnsetProperties(T instance, ILifetimeScope scope = null) - { - return (scope ?? Scope()).InjectUnsetProperties(instance); - } + public T InjectUnsetProperties(T instance, ILifetimeScope scope = null) + { + return (scope ?? Scope()).InjectUnsetProperties(instance); + } [DebuggerStepThrough] public ILifetimeScope Scope() { - var scope = _container.Resolve().GetLifetimeScope(null); - return scope ?? _container; + var scope = _container.Resolve().GetLifetimeScope(null); + return scope ?? _container; } - public ILifetimeScopeAccessor ScopeAccessor - { - get - { - return _container.Resolve(); - } - } + public ILifetimeScopeAccessor ScopeAccessor => _container.Resolve(); } public static class ContainerManagerExtensions { - public static IRegistrationBuilder WithNullCache(this IRegistrationBuilder registration) where TReflectionActivatorData : ReflectionActivatorData - { - return registration.WithParameter(Autofac.Core.ResolvedParameter.ForNamed("null")); - } + public static IRegistrationBuilder WithNullCache(this IRegistrationBuilder registration) where TReflectionActivatorData : ReflectionActivatorData + { + return registration.WithParameter(Autofac.Core.ResolvedParameter.ForNamed("null")); + } } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs index 43e163cbfc..b4b0886ac5 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs @@ -1,103 +1,99 @@ using System; -using System.Diagnostics; using System.Web; using Autofac; using SmartStore.Utilities; namespace SmartStore.Core.Infrastructure.DependencyManagement { - public class DefaultLifetimeScopeAccessor : ILifetimeScopeAccessor - { + public class DefaultLifetimeScopeAccessor : ILifetimeScopeAccessor + { class ContextAwareScope : IDisposable { - private readonly Action _disposer; + private readonly Action _disposer; - public ContextAwareScope(Action disposer) + public ContextAwareScope(Action disposer) { - _disposer = disposer; + _disposer = disposer; } - public void Dispose() + public void Dispose() { - _disposer?.Invoke(); + _disposer?.Invoke(); } } - private ContextState _state; - private readonly ILifetimeScope _rootContainer; - internal static readonly object ScopeTag = "AutofacWebRequest"; - - public DefaultLifetimeScopeAccessor(ILifetimeScope rootContainer) - { - Guard.NotNull(rootContainer, nameof(rootContainer)); - - //rootContainer.ChildLifetimeScopeBeginning += OnScopeBeginning; - - _rootContainer = rootContainer; - _state = new ContextState("CustomLifetimeScopeProvider.WorkScope"); - } - - public ILifetimeScope ApplicationContainer - { - get { return _rootContainer; } - } - - public IDisposable BeginContextAwareScope() - { - // Stack-like behaviour for Non-HttpContext thread: - // Only the first call returns a disposer, all nested calls to this method are void. - return HttpContext.Current != null - ? (IDisposable)ActionDisposable.Empty - : new ContextAwareScope( - _state.GetState() == null - ? this.EndLifetimeScope - : (Action)null); - } - - public void EndLifetimeScope() - { - try - { - var scope = _state.GetState(); - if (scope != null) - { - scope.Dispose(); - _state.RemoveState(); - } - } - catch { } - } - - public ILifetimeScope GetLifetimeScope(Action configurationAction) - { - var scope = _state.GetState(); - if (scope == null) - { - _state.SetState((scope = BeginLifetimeScope(configurationAction))); - //scope.CurrentScopeEnding += OnScopeEnding; - } - - return scope; - } - - //private void OnScopeBeginning(object sender, LifetimeScopeBeginningEventArgs args) - //{ - // bool isWeb = System.Web.HttpContext.Current != null; - // Debug.WriteLine("Scope Begin, Web: " + isWeb); - //} - - //private void OnScopeEnding(object sender, LifetimeScopeEndingEventArgs args) - //{ - // bool isWeb = System.Web.HttpContext.Current != null; - // Debug.WriteLine("Scope END, Web: " + isWeb); - //} - - public ILifetimeScope BeginLifetimeScope(Action configurationAction) - { - return (configurationAction == null) - ? _rootContainer.BeginLifetimeScope(ScopeTag) - : _rootContainer.BeginLifetimeScope(ScopeTag, configurationAction); - } - - } + private readonly ContextState _state; + private readonly ILifetimeScope _rootContainer; + internal static readonly object ScopeTag = "AutofacWebRequest"; + + public DefaultLifetimeScopeAccessor(ILifetimeScope rootContainer) + { + Guard.NotNull(rootContainer, nameof(rootContainer)); + + //rootContainer.ChildLifetimeScopeBeginning += OnScopeBeginning; + + _rootContainer = rootContainer; + _state = new ContextState("CustomLifetimeScopeProvider.WorkScope"); + } + + public ILifetimeScope ApplicationContainer => _rootContainer; + + public IDisposable BeginContextAwareScope() + { + // Stack-like behaviour for Non-HttpContext thread: + // Only the first call returns a disposer, all nested calls to this method are void. + return HttpContext.Current != null + ? (IDisposable)ActionDisposable.Empty + : new ContextAwareScope( + _state.GetState() == null + ? this.EndLifetimeScope + : (Action)null); + } + + public void EndLifetimeScope() + { + try + { + var scope = _state.GetState(); + if (scope != null) + { + scope.Dispose(); + _state.RemoveState(); + } + } + catch { } + } + + public ILifetimeScope GetLifetimeScope(Action configurationAction) + { + var scope = _state.GetState(); + if (scope == null) + { + _state.SetState((scope = BeginLifetimeScope(configurationAction))); + //scope.CurrentScopeEnding += OnScopeEnding; + } + + return scope; + } + + //private void OnScopeBeginning(object sender, LifetimeScopeBeginningEventArgs args) + //{ + // bool isWeb = System.Web.HttpContext.Current != null; + // Debug.WriteLine("Scope Begin, Web: " + isWeb); + //} + + //private void OnScopeEnding(object sender, LifetimeScopeEndingEventArgs args) + //{ + // bool isWeb = System.Web.HttpContext.Current != null; + // Debug.WriteLine("Scope END, Web: " + isWeb); + //} + + public ILifetimeScope BeginLifetimeScope(Action configurationAction) + { + return (configurationAction == null) + ? _rootContainer.BeginLifetimeScope(ScopeTag) + : _rootContainer.BeginLifetimeScope(ScopeTag, configurationAction); + } + + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs index 78421250f6..eab1548dc0 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs @@ -4,32 +4,29 @@ namespace SmartStore.Core.Infrastructure.DependencyManagement { - public class DefaultLifetimeScopeProvider : ILifetimeScopeProvider - { - private readonly ILifetimeScopeAccessor _accessor; + public class DefaultLifetimeScopeProvider : ILifetimeScopeProvider + { + private readonly ILifetimeScopeAccessor _accessor; - public DefaultLifetimeScopeProvider(ILifetimeScopeAccessor accessor) - { - Guard.NotNull(accessor, nameof(accessor)); + public DefaultLifetimeScopeProvider(ILifetimeScopeAccessor accessor) + { + Guard.NotNull(accessor, nameof(accessor)); - this._accessor = accessor; - AutofacRequestLifetimeHttpModule.SetLifetimeScopeProvider(this); - } + this._accessor = accessor; + AutofacRequestLifetimeHttpModule.SetLifetimeScopeProvider(this); + } - public ILifetimeScope ApplicationContainer - { - get { return _accessor.ApplicationContainer; } - } + public ILifetimeScope ApplicationContainer => _accessor.ApplicationContainer; - public void EndLifetimeScope() - { - _accessor.EndLifetimeScope(); - } + public void EndLifetimeScope() + { + _accessor.EndLifetimeScope(); + } - public ILifetimeScope GetLifetimeScope(Action configurationAction) - { - return _accessor.GetLifetimeScope(configurationAction); - } + public ILifetimeScope GetLifetimeScope(Action configurationAction) + { + return _accessor.GetLifetimeScope(configurationAction); + } - } + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ILifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ILifetimeScopeAccessor.cs index ee09073226..da03f8fba5 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ILifetimeScopeAccessor.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ILifetimeScopeAccessor.cs @@ -1,52 +1,51 @@ using System; -using System.Collections.Generic; using Autofac; namespace SmartStore.Core.Infrastructure.DependencyManagement { - public interface ILifetimeScopeAccessor - { - /// - /// Gets the global, application-wide container. - /// - ILifetimeScope ApplicationContainer { get; } + public interface ILifetimeScopeAccessor + { + /// + /// Gets the global, application-wide container. + /// + ILifetimeScope ApplicationContainer { get; } - /// - /// Ends the current lifetime scope. - /// - void EndLifetimeScope(); + /// + /// Ends the current lifetime scope. + /// + void EndLifetimeScope(); - /// - /// Gets a nested lifetime scope that services can be resolved from - /// - /// A configuration action that will execute during lifetime scope creation. - /// - /// A new or existing nested lifetime scope. - /// - ILifetimeScope GetLifetimeScope(Action configurationAction); + /// + /// Gets a nested lifetime scope that services can be resolved from + /// + /// A configuration action that will execute during lifetime scope creation. + /// + /// A new or existing nested lifetime scope. + /// + ILifetimeScope GetLifetimeScope(Action configurationAction); - /// - /// Either creates a new lifetime scope when HttpContext.Current is null, - /// OR returns the current http context scoped lifetime. - /// - /// - /// A disposable object which does nothing when internal lifetime scope is bound to the http context, - /// OR ends the lifetime scope otherwise. - /// - /// - /// This method is intended for usage in background threads or tasks. There may be situations where HttpContext is present, - /// especially when a task was started with TaskScheduler.FromCurrentSynchronizationContext(). In this case it may not be - /// desirable to create a new scope, but use the existing, http context bound scope instead. - /// - IDisposable BeginContextAwareScope(); + /// + /// Either creates a new lifetime scope when HttpContext.Current is null, + /// OR returns the current http context scoped lifetime. + /// + /// + /// A disposable object which does nothing when internal lifetime scope is bound to the http context, + /// OR ends the lifetime scope otherwise. + /// + /// + /// This method is intended for usage in background threads or tasks. There may be situations where HttpContext is present, + /// especially when a task was started with TaskScheduler.FromCurrentSynchronizationContext(). In this case it may not be + /// desirable to create a new scope, but use the existing, http context bound scope instead. + /// + IDisposable BeginContextAwareScope(); - /// - /// Creates a nested lifetime scope that services can be resolved from - /// - /// A configuration action that will execute during lifetime scope creation. - /// - /// A new nested lifetime scope. - /// - ILifetimeScope BeginLifetimeScope(Action configurationAction); - } + /// + /// Creates a nested lifetime scope that services can be resolved from + /// + /// A configuration action that will execute during lifetime scope creation. + /// + /// A new nested lifetime scope. + /// + ILifetimeScope BeginLifetimeScope(Action configurationAction); + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/Work.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/Work.cs index afcba925eb..7c2bf558aa 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/Work.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/Work.cs @@ -2,21 +2,15 @@ namespace SmartStore.Core.Infrastructure.DependencyManagement { - public class Work where T : class - { - private readonly Func, T> _resolve; + public class Work where T : class + { + private readonly Func, T> _resolve; - public Work(Func, T> resolve) - { - _resolve = resolve; - } + public Work(Func, T> resolve) + { + _resolve = resolve; + } - public T Value - { - get - { - return _resolve(this); - } - } - } + public T Value => _resolve(this); + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DisposableObject.cs b/src/Libraries/SmartStore.Core/Infrastructure/DisposableObject.cs index c470370f23..34dc6784b2 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DisposableObject.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DisposableObject.cs @@ -12,7 +12,7 @@ public abstract class DisposableObject : IDisposable public virtual bool IsDisposed { [DebuggerStepThrough] - get { return _isDisposed; } + get => _isDisposed; } [DebuggerStepThrough] @@ -36,11 +36,11 @@ protected void CheckDisposed(string errorMessage) [DebuggerStepThrough] public void Dispose() { - if (!_isDisposed) - { - Dispose(true); - GC.SuppressFinalize(this); - } + if (!_isDisposed) + { + Dispose(true); + GC.SuppressFinalize(this); + } } protected void Dispose(bool disposing) diff --git a/src/Libraries/SmartStore.Core/Infrastructure/EngineContext.cs b/src/Libraries/SmartStore.Core/Infrastructure/EngineContext.cs index e610c7b134..2a40869ee4 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/EngineContext.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/EngineContext.cs @@ -1,8 +1,6 @@ using System; using System.Configuration; -using System.Diagnostics; using System.Runtime.CompilerServices; -using SmartStore.Core.Configuration; using SmartStore.Utilities; namespace SmartStore.Core.Infrastructure @@ -35,29 +33,29 @@ public static void Replace(IEngine engine) { Singleton.Instance = engine; } - + /// /// Creates a factory instance and adds a http application injecting facility. /// /// A new factory public static IEngine CreateEngineInstance() { - var engineTypeSetting = CommonHelper.GetAppSetting("sm:EngineType"); - if (engineTypeSetting.HasValue()) + var engineTypeSetting = CommonHelper.GetAppSetting("sm:EngineType"); + if (engineTypeSetting.HasValue()) { - var engineType = Type.GetType(engineTypeSetting); + var engineType = Type.GetType(engineTypeSetting); if (engineType == null) - { - throw new ConfigurationErrorsException("The type '" + engineType + "' could not be found. Please check the configuration at /configuration/appSettings/add[@key=sm:EngineType] or check for missing assemblies."); - } - + { + throw new ConfigurationErrorsException("The type '" + engineType + "' could not be found. Please check the configuration at /configuration/appSettings/add[@key=sm:EngineType] or check for missing assemblies."); + } + if (!typeof(IEngine).IsAssignableFrom(engineType)) - { - throw new ConfigurationErrorsException("The type '" + engineType + "' doesn't implement 'SmartStore.Core.Infrastructure.IEngine' and cannot be configured in /configuration/appSettings/add[@key=sm:EngineType] for that purpose."); - } + { + throw new ConfigurationErrorsException("The type '" + engineType + "' doesn't implement 'SmartStore.Core.Infrastructure.IEngine' and cannot be configured in /configuration/appSettings/add[@key=sm:EngineType] for that purpose."); + } - return Activator.CreateInstance(engineType) as IEngine; + return Activator.CreateInstance(engineType) as IEngine; } return new SmartStoreEngine(); diff --git a/src/Libraries/SmartStore.Core/Infrastructure/Error.cs b/src/Libraries/SmartStore.Core/Infrastructure/Error.cs index 1b73c2f89c..bb09490f09 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/Error.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/Error.cs @@ -1,6 +1,6 @@ using System; -using System.Globalization; using System.Diagnostics; +using System.Globalization; using System.Runtime.CompilerServices; namespace SmartStore diff --git a/src/Libraries/SmartStore.Core/Infrastructure/Guard.cs b/src/Libraries/SmartStore.Core/Infrastructure/Guard.cs index b21c366e30..15aaef296c 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/Guard.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/Guard.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Linq; @@ -10,13 +9,13 @@ namespace SmartStore public class Guard { const string AgainstMessage = "Assertion evaluation failed with 'false'."; - const string ImplementsMessage = "Type '{0}' must implement type '{1}'."; - const string InheritsFromMessage = "Type '{0}' must inherit from type '{1}'."; - const string IsTypeOfMessage = "Type '{0}' must be of type '{1}'."; - const string IsEqualMessage = "Compared objects must be equal."; - const string IsPositiveMessage = "Argument '{0}' must be a positive value. Value: '{1}'."; - const string IsTrueMessage = "True expected for '{0}' but the condition was False."; - const string NotNegativeMessage = "Argument '{0}' cannot be a negative value. Value: '{1}'."; + const string ImplementsMessage = "Type '{0}' must implement type '{1}'."; + const string InheritsFromMessage = "Type '{0}' must inherit from type '{1}'."; + const string IsTypeOfMessage = "Type '{0}' must be of type '{1}'."; + const string IsEqualMessage = "Compared objects must be equal."; + const string IsPositiveMessage = "Argument '{0}' must be a positive value. Value: '{1}'."; + const string IsTrueMessage = "True expected for '{0}' but the condition was False."; + const string NotNegativeMessage = "Argument '{0}' cannot be a negative value. Value: '{1}'."; const string NotEmptyStringMessage = "String parameter '{0}' cannot be null or all whitespace."; const string NotEmptyColMessage = "Collection cannot be null and must contain at least one item."; const string NotEmptyGuidMessage = "Argument '{0}' cannot be an empty guid."; @@ -32,160 +31,160 @@ private Guard() { } - #region 3.0 + #region 3.0 - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void NotNull(object arg, string argName) - { - if (arg == null) - throw new ArgumentNullException(argName); - } + { + if (arg == null) + throw new ArgumentNullException(argName); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void NotEmpty(string arg, string argName) - { - if (string.IsNullOrWhiteSpace(arg)) - throw Error.Argument(argName, NotEmptyStringMessage, argName); - } + { + if (string.IsNullOrWhiteSpace(arg)) + throw Error.Argument(argName, NotEmptyStringMessage, argName); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void NotEmpty(ICollection arg, string argName) - { - if (arg == null || !arg.Any()) - throw Error.Argument(argName, NotEmptyColMessage); - } + { + if (arg == null || !arg.Any()) + throw Error.Argument(argName, NotEmptyColMessage); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void NotEmpty(Guid arg, string argName) - { - if (arg == Guid.Empty) - throw Error.Argument(argName, NotEmptyGuidMessage, argName); - } + { + if (arg == Guid.Empty) + throw Error.Argument(argName, NotEmptyGuidMessage, argName); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void InRange(T arg, T min, T max, string argName) where T : struct, IComparable - { - if (arg.CompareTo(min) < 0 || arg.CompareTo(max) > 0) - throw Error.ArgumentOutOfRange(argName, InRangeMessage, argName, min, max); - } + { + if (arg.CompareTo(min) < 0 || arg.CompareTo(max) > 0) + throw Error.ArgumentOutOfRange(argName, InRangeMessage, argName, min, max); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void NotOutOfLength(string arg, int maxLength, string argName) - { - if (arg.Trim().Length > maxLength) - { - throw Error.Argument(argName, NotOutOfLengthMessage, argName, maxLength); - } - } - - [DebuggerStepThrough] + { + if (arg.Trim().Length > maxLength) + { + throw Error.Argument(argName, NotOutOfLengthMessage, argName, maxLength); + } + } + + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void NotNegative(T arg, string argName, string message = NotNegativeMessage) where T : struct, IComparable - { - if (arg.CompareTo(default(T)) < 0) - throw Error.ArgumentOutOfRange(argName, message.FormatInvariant(argName, arg)); - } + { + if (arg.CompareTo(default(T)) < 0) + throw Error.ArgumentOutOfRange(argName, message.FormatInvariant(argName, arg)); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void NotZero(T arg, string argName) where T : struct, IComparable - { - if (arg.CompareTo(default(T)) == 0) - throw Error.ArgumentOutOfRange(argName, NotZeroMessage, argName, arg); - } + { + if (arg.CompareTo(default(T)) == 0) + throw Error.ArgumentOutOfRange(argName, NotZeroMessage, argName, arg); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Against(bool assertion, string message = AgainstMessage) where TException : Exception - { - if (assertion) - throw (TException)Activator.CreateInstance(typeof(TException), message); - } + { + if (assertion) + throw (TException)Activator.CreateInstance(typeof(TException), message); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Against(Func assertion, string message = AgainstMessage) where TException : Exception - { - //Execute the lambda and if it evaluates to true then throw the exception. - if (assertion()) - throw (TException)Activator.CreateInstance(typeof(TException), message); - } + { + //Execute the lambda and if it evaluates to true then throw the exception. + if (assertion()) + throw (TException)Activator.CreateInstance(typeof(TException), message); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void IsPositive(T arg, string argName, string message = IsPositiveMessage) where T : struct, IComparable - { - if (arg.CompareTo(default(T)) < 1) - throw Error.ArgumentOutOfRange(argName, message.FormatInvariant(argName)); - } + { + if (arg.CompareTo(default(T)) < 1) + throw Error.ArgumentOutOfRange(argName, message.FormatInvariant(argName)); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void IsTrue(bool arg, string argName, string message = IsTrueMessage) - { - if (!arg) - throw Error.Argument(argName, message.FormatInvariant(argName)); - } + { + if (!arg) + throw Error.Argument(argName, message.FormatInvariant(argName)); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void IsEnumType(Type arg, string argName) - { - NotNull(arg, argName); + { + NotNull(arg, argName); - if (!arg.IsEnum) - throw Error.Argument(argName, IsEnumTypeMessage, arg.FullName); - } + if (!arg.IsEnum) + throw Error.Argument(argName, IsEnumTypeMessage, arg.FullName); + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void IsEnumType(Type enumType, object arg, string argName) - { - NotNull(arg, argName); + { + NotNull(arg, argName); - if (!Enum.IsDefined(enumType, arg)) - { - throw Error.ArgumentOutOfRange(argName, IsEnumTypeMessage2, argName, enumType.FullName); - } - } + if (!Enum.IsDefined(enumType, arg)) + { + throw Error.ArgumentOutOfRange(argName, IsEnumTypeMessage2, argName, enumType.FullName); + } + } - [DebuggerStepThrough] + [DebuggerStepThrough] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void NotDisposed(DisposableObject arg, string argName) - { - NotNull(arg, argName); - - if (arg.IsDisposed) - throw Error.ObjectDisposed(argName); - } - - [DebuggerStepThrough] - public static void PagingArgsValid(int indexArg, int sizeArg, string indexArgName, string sizeArgName) - { - NotNegative(indexArg, indexArgName, "PageIndex cannot be below 0"); - - if (indexArg > 0) - { - // if pageIndex is specified (> 0), PageSize CANNOT be 0 - IsPositive(sizeArg, sizeArgName, "PageSize cannot be below 1 if a PageIndex greater 0 was provided."); - } - else - { - // pageIndex 0 actually means: take all! - NotNegative(sizeArg, sizeArgName); - } - } - - #endregion + { + NotNull(arg, argName); + + if (arg.IsDisposed) + throw Error.ObjectDisposed(argName); + } [DebuggerStepThrough] - [Obsolete("Use NotNull() with nameof operator instead")] + public static void PagingArgsValid(int indexArg, int sizeArg, string indexArgName, string sizeArgName) + { + NotNegative(indexArg, indexArgName, "PageIndex cannot be below 0"); + + if (indexArg > 0) + { + // if pageIndex is specified (> 0), PageSize CANNOT be 0 + IsPositive(sizeArg, sizeArgName, "PageSize cannot be below 1 if a PageIndex greater 0 was provided."); + } + else + { + // pageIndex 0 actually means: take all! + NotNegative(sizeArg, sizeArgName); + } + } + + #endregion + + [DebuggerStepThrough] + [Obsolete("Use NotNull() with nameof operator instead")] public static void ArgumentNotNull(object arg, string argName) { if (arg == null) @@ -193,27 +192,27 @@ public static void ArgumentNotNull(object arg, string argName) } [DebuggerStepThrough] - [Obsolete("Use NotNull() with nameof operator instead")] - public static void ArgumentNotNull(Func arg) + [Obsolete("Use NotNull() with nameof operator instead")] + public static void ArgumentNotNull(Func arg) { if (arg() == null) throw new ArgumentNullException(GetParamName(arg)); } [DebuggerStepThrough] - [Obsolete("Use NotEmpty() with nameof operator instead")] - public static void ArgumentNotEmpty(Func arg) + [Obsolete("Use NotEmpty() with nameof operator instead")] + public static void ArgumentNotEmpty(Func arg) { - if (arg().IsEmpty()) - { - var argName = GetParamName(arg); - throw Error.Argument(argName, "String parameter '{0}' cannot be null or all whitespace.", argName); - } + if (arg().IsEmpty()) + { + var argName = GetParamName(arg); + throw Error.Argument(argName, "String parameter '{0}' cannot be null or all whitespace.", argName); + } } [DebuggerStepThrough] - [Obsolete("Use NotEmpty() with nameof operator instead")] - public static void ArgumentNotEmpty(string arg, string argName) + [Obsolete("Use NotEmpty() with nameof operator instead")] + public static void ArgumentNotEmpty(string arg, string argName) { if (arg.IsEmpty()) throw Error.Argument(argName, "String parameter '{0}' cannot be null or all whitespace.", argName); diff --git a/src/Libraries/SmartStore.Core/Infrastructure/IApplicationEnvironment.cs b/src/Libraries/SmartStore.Core/Infrastructure/IApplicationEnvironment.cs index c105628a46..4dbf9dc23a 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/IApplicationEnvironment.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/IApplicationEnvironment.cs @@ -1,17 +1,16 @@ -using System; -using SmartStore.Core.IO; +using SmartStore.Core.IO; namespace SmartStore.Core { - public interface IApplicationEnvironment - { - string MachineName { get; } - string EnvironmentIdentifier { get; } + public interface IApplicationEnvironment + { + string MachineName { get; } + string EnvironmentIdentifier { get; } - IVirtualFolder WebRootFolder { get; } - IVirtualFolder AppDataFolder { get; } - IVirtualFolder ThemesFolder { get; } - IVirtualFolder PluginsFolder { get; } - IVirtualFolder TenantFolder { get; } - } + IVirtualFolder WebRootFolder { get; } + IVirtualFolder AppDataFolder { get; } + IVirtualFolder ThemesFolder { get; } + IVirtualFolder PluginsFolder { get; } + IVirtualFolder TenantFolder { get; } + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs b/src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs index 4454dfc343..cbe93c2a1d 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using SmartStore.Core.Configuration; using SmartStore.Core.Infrastructure.DependencyManagement; namespace SmartStore.Core.Infrastructure @@ -14,17 +12,17 @@ namespace SmartStore.Core.Infrastructure public interface IEngine { ContainerManager ContainerManager { get; } - + /// /// Initialize components and plugins in the SmartStore environment. /// void Initialize(); - /// - /// Determines whether the app has been installed, successfully bootstrapped - /// AND the very first HTTP request has been issued. - /// - bool IsFullyInitialized { get; set; } + /// + /// Determines whether the app has been installed, successfully bootstrapped + /// AND the very first HTTP request has been issued. + /// + bool IsFullyInitialized { get; set; } T Resolve(string name = null) where T : class; diff --git a/src/Libraries/SmartStore.Core/Infrastructure/IOrdered.cs b/src/Libraries/SmartStore.Core/Infrastructure/IOrdered.cs index 087ee4505d..ca93fcbd3d 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/IOrdered.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/IOrdered.cs @@ -1,6 +1,4 @@ -using System; - -namespace SmartStore +namespace SmartStore { public interface IOrdered { diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ITypeFinder.cs b/src/Libraries/SmartStore.Core/Infrastructure/ITypeFinder.cs index b43be647d3..e9f44832e4 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ITypeFinder.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ITypeFinder.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Reflection; @@ -12,50 +11,47 @@ namespace SmartStore.Core.Infrastructure /// public interface ITypeFinder { - ///// - ///// Gets all SmartStore specific assemblies (core & all plugins) - ///// - ///// Indicates whether uninstalled plugin's assemblies should be ignored - ///// A list of assemblies that should be loaded by the SmartStore factory. - IEnumerable GetAssemblies(bool ignoreInactivePlugins = false); - IEnumerable FindClassesOfType(Type assignTypeFrom, IEnumerable assemblies, bool onlyConcreteClasses = true); + ///// + ///// Gets all SmartStore specific assemblies (core & all plugins) + ///// + ///// Indicates whether uninstalled plugin's assemblies should be ignored + ///// A list of assemblies that should be loaded by the SmartStore factory. + IEnumerable GetAssemblies(bool ignoreInactivePlugins = false); + IEnumerable FindClassesOfType(Type assignTypeFrom, IEnumerable assemblies, bool onlyConcreteClasses = true); } - public class NullTypeFinder : ITypeFinder - { - private static readonly ITypeFinder s_instance = new NullTypeFinder(); - - public static ITypeFinder Instance - { - get { return s_instance; } - } - - public IEnumerable GetAssemblies(bool ignoreInactivePlugins = false) - { - return Enumerable.Empty(); - } - - public IEnumerable FindClassesOfType(Type assignTypeFrom, IEnumerable assemblies, bool onlyConcreteClasses = true) - { - return Enumerable.Empty(); - } - } - - public static class ITypeFinderExtensions - { - public static IEnumerable FindClassesOfType(this ITypeFinder finder, bool onlyConcreteClasses = true, bool ignoreInactivePlugins = false) - { - return finder.FindClassesOfType(typeof(T), finder.GetAssemblies(ignoreInactivePlugins), onlyConcreteClasses); - } - - public static IEnumerable FindClassesOfType(this ITypeFinder finder, Type assignTypeFrom, bool onlyConcreteClasses = true, bool ignoreInactivePlugins = false) - { - return finder.FindClassesOfType(assignTypeFrom, finder.GetAssemblies(ignoreInactivePlugins), onlyConcreteClasses); - } - - public static IEnumerable FindClassesOfType(this ITypeFinder finder, IEnumerable assemblies, bool onlyConcreteClasses = true) - { - return finder.FindClassesOfType(typeof(T), assemblies, onlyConcreteClasses); - } - } + public class NullTypeFinder : ITypeFinder + { + private static readonly ITypeFinder s_instance = new NullTypeFinder(); + + public static ITypeFinder Instance => s_instance; + + public IEnumerable GetAssemblies(bool ignoreInactivePlugins = false) + { + return Enumerable.Empty(); + } + + public IEnumerable FindClassesOfType(Type assignTypeFrom, IEnumerable assemblies, bool onlyConcreteClasses = true) + { + return Enumerable.Empty(); + } + } + + public static class ITypeFinderExtensions + { + public static IEnumerable FindClassesOfType(this ITypeFinder finder, bool onlyConcreteClasses = true, bool ignoreInactivePlugins = false) + { + return finder.FindClassesOfType(typeof(T), finder.GetAssemblies(ignoreInactivePlugins), onlyConcreteClasses); + } + + public static IEnumerable FindClassesOfType(this ITypeFinder finder, Type assignTypeFrom, bool onlyConcreteClasses = true, bool ignoreInactivePlugins = false) + { + return finder.FindClassesOfType(assignTypeFrom, finder.GetAssemblies(ignoreInactivePlugins), onlyConcreteClasses); + } + + public static IEnumerable FindClassesOfType(this ITypeFinder finder, IEnumerable assemblies, bool onlyConcreteClasses = true) + { + return finder.FindClassesOfType(typeof(T), assemblies, onlyConcreteClasses); + } + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/RegularExpressions.cs b/src/Libraries/SmartStore.Core/Infrastructure/RegularExpressions.cs index f97c203129..f28d4bbab9 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/RegularExpressions.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/RegularExpressions.cs @@ -1,6 +1,4 @@ -using System; -using System.Text; -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; namespace SmartStore { @@ -18,20 +16,20 @@ public static class RegularExpressions public static readonly Regex IsPositiveInteger = new Regex(@"^\d{1,10}", RegexOptions.Compiled); public static readonly Regex IsNumeric = new Regex("(" + ValidRealPattern + ")|(" + ValidIntegerPattern + ")", RegexOptions.Compiled); - // //public static readonly Regex IsWebUrl = new Regex(@"(http|https)://([\w-]+\.)+[\w-]+(/[\w- ./?%&=]*)?", RegexOptions.Singleline | RegexOptions.Compiled); - ///// see https://msdn.microsoft.com/en-us/library/ms998267.aspx - //public static readonly Regex IsWebUrl = new Regex(@"^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_\=~]*)?$", RegexOptions.Singleline | RegexOptions.Compiled); + // //public static readonly Regex IsWebUrl = new Regex(@"(http|https)://([\w-]+\.)+[\w-]+(/[\w- ./?%&=]*)?", RegexOptions.Singleline | RegexOptions.Compiled); + ///// see https://msdn.microsoft.com/en-us/library/ms998267.aspx + //public static readonly Regex IsWebUrl = new Regex(@"^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_\=~]*)?$", RegexOptions.Singleline | RegexOptions.Compiled); - public static readonly Regex IsEmail = new Regex("^(?:[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\/\\=\\?\\^\\`\\{\\|\\}\\~]+\\.)*[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\/\\=\\?\\^\\`\\{\\|\\}\\~]+@(?:(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9\\-](?!\\.)){0,61}[a-zA-Z0-9]?\\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\\-](?!$)){0,61}[a-zA-Z0-9]?)|(?:\\[(?:(?:[01]?\\d{1,2}|2[0-4]\\d|25[0-5])\\.){3}(?:[01]?\\d{1,2}|2[0-4]\\d|25[0-5])\\]))$", RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.IgnoreCase); + public static readonly Regex IsEmail = new Regex("^(?:[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\/\\=\\?\\^\\`\\{\\|\\}\\~]+\\.)*[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\/\\=\\?\\^\\`\\{\\|\\}\\~]+@(?:(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9\\-](?!\\.)){0,61}[a-zA-Z0-9]?\\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\\-](?!$)){0,61}[a-zA-Z0-9]?)|(?:\\[(?:(?:[01]?\\d{1,2}|2[0-4]\\d|25[0-5])\\.){3}(?:[01]?\\d{1,2}|2[0-4]\\d|25[0-5])\\]))$", RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.IgnoreCase); public static readonly Regex IsGuid = new Regex(@"\{?[a-fA-F0-9]{8}(?:-(?:[a-fA-F0-9]){4}){3}-[a-fA-F0-9]{12}\}?", RegexOptions.Compiled); public static readonly Regex IsBase64Guid = new Regex(@"[a-zA-Z0-9+/=]{22,24}", RegexOptions.Compiled); public static readonly Regex IsCultureCode = new Regex(@"^[a-z]{2}(-[A-Z]{2})?$", RegexOptions.Singleline | RegexOptions.Compiled); - public static readonly Regex IsYearRange = new Regex(@"^(\d{4})-(\d{4})$", RegexOptions.Compiled); + public static readonly Regex IsYearRange = new Regex(@"^(\d{4})-(\d{4})$", RegexOptions.Compiled); - public static readonly Regex IsIban = new Regex(@"[a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16}", RegexOptions.Singleline | RegexOptions.Compiled); - public static readonly Regex IsBic = new Regex(@"([a-zA-Z]{4}[a-zA-Z]{2}[a-zA-Z0-9]{2}([a-zA-Z0-9]{3})?)", RegexOptions.Singleline | RegexOptions.Compiled); + public static readonly Regex IsIban = new Regex(@"[a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16}", RegexOptions.Singleline | RegexOptions.Compiled); + public static readonly Regex IsBic = new Regex(@"([a-zA-Z]{4}[a-zA-Z]{2}[a-zA-Z0-9]{2}([a-zA-Z0-9]{3})?)", RegexOptions.Singleline | RegexOptions.Compiled); } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/Singleton.cs b/src/Libraries/SmartStore.Core/Infrastructure/Singleton.cs index 4acec28cca..a28b7c56f8 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/Singleton.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/Singleton.cs @@ -19,7 +19,7 @@ public class Singleton : Singleton /// public static T Instance { - get { return instance; } + get => instance; set { instance = value; @@ -40,10 +40,7 @@ static SingletonList() } /// The singleton instance for the specified type T. Only one instance (at the time) of this list for each type of T. - public new static IList Instance - { - get { return Singleton>.Instance; } - } + public new static IList Instance => Singleton>.Instance; } /// @@ -59,10 +56,7 @@ static SingletonDictionary() } /// The singleton instance for the specified type T. Only one instance (at the time) of this dictionary for each type of T. - public new static IDictionary Instance - { - get { return Singleton>.Instance; } - } + public new static IDictionary Instance => Singleton>.Instance; } /// @@ -78,9 +72,6 @@ static Singleton() static readonly IDictionary allSingletons; /// Dictionary of type to singleton instances. - public static IDictionary AllSingletons - { - get { return allSingletons; } - } + public static IDictionary AllSingletons => allSingletons; } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs index 7028b2ab70..5fabdf7d55 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using System.Web.Mvc; using Autofac; -using Autofac.Core; using Autofac.Integration.Mvc; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure.DependencyManagement; @@ -18,134 +17,134 @@ public class SmartStoreEngine : IEngine { private ContainerManager _containerManager; - public SmartStoreEngine() - { - Logger = NullLogger.Instance; - } + public SmartStoreEngine() + { + Logger = NullLogger.Instance; + } - protected ILogger Logger - { - get; - private set; - } + protected ILogger Logger + { + get; + private set; + } - protected virtual void RunStartupTasks() + protected virtual void RunStartupTasks() { - var typeFinder = _containerManager.Resolve(); + var typeFinder = _containerManager.Resolve(); var startUpTaskTypes = typeFinder.FindClassesOfType(ignoreInactivePlugins: true); var startUpTasks = new List(); foreach (var startUpTaskType in startUpTaskTypes) { - startUpTasks.Add((IApplicationStart)Activator.CreateInstance(startUpTaskType)); + startUpTasks.Add((IApplicationStart)Activator.CreateInstance(startUpTaskType)); + } + + // execute tasks async grouped by order + var groupedTasks = startUpTasks.OrderBy(st => st.Order).ToLookup(x => x.Order); + foreach (var tasks in groupedTasks) + { + Parallel.ForEach(tasks, task => + { + try + { + Logger.DebugFormat("Executing startup task '{0}'", task.GetType().FullName); + task.Start(); + } + catch (Exception ex) + { + Logger.ErrorFormat(ex, "Error while executing startup task '{0}'", task.GetType().FullName); + } + }); + } + } + + protected virtual ITypeFinder CreateTypeFinder() + { + return new WebAppTypeFinder(); + } + + protected virtual object CreateDependencyResolver(IContainer container) + { + var scopeProvider = container.Resolve(); + var dependencyResolver = new AutofacDependencyResolver(container, scopeProvider); + return dependencyResolver; + } + + protected virtual ContainerManager RegisterDependencies() + { + var typeFinder = CreateTypeFinder(); + + // core dependencies + var builder = new ContainerBuilder(); + builder.RegisterInstance(this).As(); + builder.RegisterInstance(typeFinder).As(); + + // Autofac + builder.Register(x => new DefaultLifetimeScopeAccessor(x.Resolve())).As().SingleInstance(); + builder.Register(x => new DefaultLifetimeScopeProvider(x.Resolve())).As().SingleInstance(); + builder.Register(x => new AutofacDependencyResolver(x.Resolve(), x.Resolve())).As().SingleInstance(); + + // Logging dependencies should be available very early + builder.RegisterModule(new LoggingModule()); + + // Register dependencies provided by other assemblies + var registrarTypes = typeFinder.FindClassesOfType(); + var registrarInstances = new List(); + foreach (var type in registrarTypes) + { + registrarInstances.Add((IDependencyRegistrar)Activator.CreateInstance(type)); + } + + // Sort + registrarInstances = registrarInstances.OrderBy(t => t.Order).ToList(); + foreach (var registrar in registrarInstances) + { + var type = registrar.GetType(); + Debug.WriteLine("Executing dependency registrar '{0}'.".FormatInvariant(type.FullName)); + registrar.Register(builder, typeFinder, PluginManager.IsActivePluginAssembly(type.Assembly)); } - // execute tasks async grouped by order - var groupedTasks = startUpTasks.OrderBy(st => st.Order).ToLookup(x => x.Order); - foreach (var tasks in groupedTasks) - { - Parallel.ForEach(tasks, task => - { - try - { - Logger.DebugFormat("Executing startup task '{0}'", task.GetType().FullName); - task.Start(); - } - catch (Exception ex) - { - Logger.ErrorFormat(ex, "Error while executing startup task '{0}'", task.GetType().FullName); - } - }); - } + var container = builder.Build(); + _containerManager = new ContainerManager(container); + + // MVC dependency resolver + DependencyResolver.SetResolver(container.Resolve()); + + // Logger + this.Logger = container.Resolve().GetLogger("SmartStore.Bootstrapper"); + ((AppDomainTypeFinder)typeFinder).Logger = this.Logger; + + return _containerManager; } - protected virtual ITypeFinder CreateTypeFinder() - { - return new WebAppTypeFinder(); - } - - protected virtual object CreateDependencyResolver(IContainer container) - { - var scopeProvider = container.Resolve(); - var dependencyResolver = new AutofacDependencyResolver(container, scopeProvider); - return dependencyResolver; - } - - protected virtual ContainerManager RegisterDependencies() - { - var typeFinder = CreateTypeFinder(); - - // core dependencies - var builder = new ContainerBuilder(); - builder.RegisterInstance(this).As(); - builder.RegisterInstance(typeFinder).As(); - - // Autofac - builder.Register(x => new DefaultLifetimeScopeAccessor(x.Resolve())).As().SingleInstance(); - builder.Register(x => new DefaultLifetimeScopeProvider(x.Resolve())).As().SingleInstance(); - builder.Register(x => new AutofacDependencyResolver(x.Resolve(), x.Resolve())).As().SingleInstance(); - - // Logging dependencies should be available very early - builder.RegisterModule(new LoggingModule()); - - // Register dependencies provided by other assemblies - var registrarTypes = typeFinder.FindClassesOfType(); - var registrarInstances = new List(); - foreach (var type in registrarTypes) - { - registrarInstances.Add((IDependencyRegistrar)Activator.CreateInstance(type)); - } - - // Sort - registrarInstances = registrarInstances.OrderBy(t => t.Order).ToList(); - foreach (var registrar in registrarInstances) - { - var type = registrar.GetType(); - Debug.WriteLine("Executing dependency registrar '{0}'.".FormatInvariant(type.FullName)); - registrar.Register(builder, typeFinder, PluginManager.IsActivePluginAssembly(type.Assembly)); - } - - var container = builder.Build(); - _containerManager = new ContainerManager(container); - - // MVC dependency resolver - DependencyResolver.SetResolver(container.Resolve()); - - // Logger - this.Logger = container.Resolve().GetLogger("SmartStore.Bootstrapper"); - ((AppDomainTypeFinder)typeFinder).Logger = this.Logger; - - return _containerManager; - } - /// /// Initialize components and plugins /// public void Initialize() { - RegisterDependencies(); + RegisterDependencies(); - if (DataSettings.DatabaseIsInstalled()) - { - RunStartupTasks(); - } + if (DataSettings.DatabaseIsInstalled()) + { + RunStartupTasks(); + } } - public bool IsFullyInitialized - { - get; - set; - } + public bool IsFullyInitialized + { + get; + set; + } [DebuggerStepThrough] - public T Resolve(string name = null) where T : class - { + public T Resolve(string name = null) where T : class + { if (name.HasValue()) { return ContainerManager.ResolveNamed(name); } return ContainerManager.Resolve(); - } + } [DebuggerStepThrough] public object Resolve(Type type, string name = null) @@ -163,14 +162,8 @@ public T[] ResolveAll() return ContainerManager.ResolveAll(); } - public IContainer Container - { - get { return _containerManager.Container; } - } + public IContainer Container => _containerManager.Container; - public ContainerManager ContainerManager - { - get { return _containerManager; } - } - } + public ContainerManager ContainerManager => _containerManager; + } } diff --git a/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs b/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs index f72dbb3878..2807664521 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using System.IO; using System.Linq; using System.Reflection; using System.Web; @@ -20,15 +18,15 @@ public class WebAppTypeFinder : AppDomainTypeFinder { private bool _ensureBinFolderAssembliesLoaded; - private readonly Lazy> _allAssembliesResolver; - private readonly Lazy> _activeAssembliesResolver; + private readonly Lazy> _allAssembliesResolver; + private readonly Lazy> _activeAssembliesResolver; - public WebAppTypeFinder() + public WebAppTypeFinder() { - _ensureBinFolderAssembliesLoaded = CommonHelper.GetAppSetting("sm:EnableDynamicDiscovery", true); - _allAssembliesResolver = new Lazy>(() => this.GetAssembliesInternal(false)); - _activeAssembliesResolver = new Lazy>(() => this.GetAssembliesInternal(true)); - } + _ensureBinFolderAssembliesLoaded = CommonHelper.GetAppSetting("sm:EnableDynamicDiscovery", true); + _allAssembliesResolver = new Lazy>(() => this.GetAssembliesInternal(false)); + _activeAssembliesResolver = new Lazy>(() => this.GetAssembliesInternal(true)); + } /// /// Gets or sets wether assemblies in the bin folder of the web application should be explicitly checked for being loaded on application load. @@ -36,9 +34,9 @@ public WebAppTypeFinder() /// public bool EnsureBinFolderAssembliesLoaded { - get { return _ensureBinFolderAssembliesLoaded; } - set { _ensureBinFolderAssembliesLoaded = value; } - } + get => _ensureBinFolderAssembliesLoaded; + set => _ensureBinFolderAssembliesLoaded = value; + } /// /// Gets a physical disk path of \Bin directory @@ -58,105 +56,105 @@ public virtual string GetBinDirectory() } } - public override IEnumerable GetAssemblies(bool ignoreInactivePlugins = false) - { - if (ignoreInactivePlugins) - { - return _activeAssembliesResolver.Value; - } - else - { - return _allAssembliesResolver.Value; - } - } - - private IEnumerable GetAssembliesInternal(bool ignoreInactivePlugins) - { - if (ignoreInactivePlugins) - { - var allAssemblies = _allAssembliesResolver.Value; - return allAssemblies.Where(x => PluginManager.IsActivePluginAssembly(x)).AsReadOnly(); - } - - if (this.EnsureBinFolderAssembliesLoaded) - { - LoadPluginAssemblies(); - } - - return base.GetAssemblies(false); - } - - /// - /// Makes sure matching plugin assemblies are loaded into the app domain. - /// - protected virtual void LoadPluginAssemblies() - { - var alreadyLoadedAssemblyNames = new HashSet( - AppDomain.CurrentDomain.GetAssemblies().Select(x => x.FullName), - StringComparer.OrdinalIgnoreCase); - - var pluginAssemblies = new HashSet(PluginManager.ReferencedPlugins.Select(x => x.Assembly.Assembly)); - - foreach (var assembly in pluginAssemblies) - { - try - { - if (assembly == null) - continue; - - if (!alreadyLoadedAssemblyNames.Contains(assembly.FullName)) - { - App.Load(assembly.FullName); - Logger.DebugFormat("Loaded plugin assembly '{0}'", assembly.FullName); - } - } - catch (Exception ex) - { - Logger.Error(ex); - } - } - } - - #region Obsolete - - ///// - ///// Makes sure matching assemblies in the supplied folder are loaded into the app domain. - ///// - ///// The physical path to a directory containing dlls to load into the app domain. - //protected virtual void LoadCandidateAssembliesFromFolder(string path) - //{ - // var alreadyLoadedAssemblyNames = new HashSet(); - // var appDomainAssemblies = base.GetAssemblies(); - - // foreach (var a in appDomainAssemblies) - // { - // alreadyLoadedAssemblyNames.Add(a.FullName); - // } - - // if (!Directory.Exists(path)) - // { - // return; - // } - - // var dlls = Directory.GetFiles(path, "*.dll"); - - // foreach (string dllPath in dlls) - // { - // try - // { - // var an = AssemblyName.GetAssemblyName(dllPath); - // if (!alreadyLoadedAssemblyNames.Contains(an.FullName) && Matches(an.FullName)) - // { - // App.Load(an); - // } - // } - // catch (BadImageFormatException ex) - // { - // Trace.TraceError(ex.ToString()); - // } - // } - //} - - #endregion - } + public override IEnumerable GetAssemblies(bool ignoreInactivePlugins = false) + { + if (ignoreInactivePlugins) + { + return _activeAssembliesResolver.Value; + } + else + { + return _allAssembliesResolver.Value; + } + } + + private IEnumerable GetAssembliesInternal(bool ignoreInactivePlugins) + { + if (ignoreInactivePlugins) + { + var allAssemblies = _allAssembliesResolver.Value; + return allAssemblies.Where(x => PluginManager.IsActivePluginAssembly(x)).AsReadOnly(); + } + + if (this.EnsureBinFolderAssembliesLoaded) + { + LoadPluginAssemblies(); + } + + return base.GetAssemblies(false); + } + + /// + /// Makes sure matching plugin assemblies are loaded into the app domain. + /// + protected virtual void LoadPluginAssemblies() + { + var alreadyLoadedAssemblyNames = new HashSet( + AppDomain.CurrentDomain.GetAssemblies().Select(x => x.FullName), + StringComparer.OrdinalIgnoreCase); + + var pluginAssemblies = new HashSet(PluginManager.ReferencedPlugins.Select(x => x.Assembly.Assembly)); + + foreach (var assembly in pluginAssemblies) + { + try + { + if (assembly == null) + continue; + + if (!alreadyLoadedAssemblyNames.Contains(assembly.FullName)) + { + App.Load(assembly.FullName); + Logger.DebugFormat("Loaded plugin assembly '{0}'", assembly.FullName); + } + } + catch (Exception ex) + { + Logger.Error(ex); + } + } + } + + #region Obsolete + + ///// + ///// Makes sure matching assemblies in the supplied folder are loaded into the app domain. + ///// + ///// The physical path to a directory containing dlls to load into the app domain. + //protected virtual void LoadCandidateAssembliesFromFolder(string path) + //{ + // var alreadyLoadedAssemblyNames = new HashSet(); + // var appDomainAssemblies = base.GetAssemblies(); + + // foreach (var a in appDomainAssemblies) + // { + // alreadyLoadedAssemblyNames.Add(a.FullName); + // } + + // if (!Directory.Exists(path)) + // { + // return; + // } + + // var dlls = Directory.GetFiles(path, "*.dll"); + + // foreach (string dllPath in dlls) + // { + // try + // { + // var an = AssemblyName.GetAssemblyName(dllPath); + // if (!alreadyLoadedAssemblyNames.Contains(an.FullName) && Matches(an.FullName)) + // { + // App.Load(an); + // } + // } + // catch (BadImageFormatException ex) + // { + // Trace.TraceError(ex.ToString()); + // } + // } + //} + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Linq/Expanders/IPathExpander.cs b/src/Libraries/SmartStore.Core/Linq/Expanders/IPathExpander.cs index aaf66dc839..6c29db695c 100644 --- a/src/Libraries/SmartStore.Core/Linq/Expanders/IPathExpander.cs +++ b/src/Libraries/SmartStore.Core/Linq/Expanders/IPathExpander.cs @@ -1,10 +1,9 @@ using System; -using System.Linq; using System.Linq.Expressions; namespace SmartStore.Linq { - + /// /// Instructs the unit of work to eager load entities. /// diff --git a/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs b/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs index 135a404a50..85df064f60 100644 --- a/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs +++ b/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; using System.Reflection; using SmartStore.Utilities; @@ -16,13 +15,7 @@ public LambdaPathExpander() _expands = new List(); } - public IList Expands - { - get - { - return _expands; - } - } + public IList Expands => _expands; public virtual void Expand(Expression> path) { @@ -61,7 +54,7 @@ public virtual void Expand(Type type, string path) if (prop == null) throw new ArgumentException("The property or member '{0}' does not exist in type '{1}'.".FormatInvariant(member, t.FullName)); - Type memberType = prop.PropertyType; + Type memberType = prop.PropertyType; DoExpand(t, member); diff --git a/src/Libraries/SmartStore.Core/Linq/Expanders/StringPathExpander.cs b/src/Libraries/SmartStore.Core/Linq/Expanders/StringPathExpander.cs index ca3f29bc24..77c816ad54 100644 --- a/src/Libraries/SmartStore.Core/Linq/Expanders/StringPathExpander.cs +++ b/src/Libraries/SmartStore.Core/Linq/Expanders/StringPathExpander.cs @@ -7,7 +7,7 @@ namespace SmartStore.Linq { - + public class StringPathExpander : IPathExpander { private readonly IList _expands; @@ -17,13 +17,7 @@ public StringPathExpander() _expands = new List(); } - public IList Expands - { - get - { - return _expands; - } - } + public IList Expands => _expands; public virtual void Expand(Expression> path) { diff --git a/src/Libraries/SmartStore.Core/Linq/ExpressionStarter.cs b/src/Libraries/SmartStore.Core/Linq/ExpressionStarter.cs index 2dc8902748..da2f6bc694 100644 --- a/src/Libraries/SmartStore.Core/Linq/ExpressionStarter.cs +++ b/src/Libraries/SmartStore.Core/Linq/ExpressionStarter.cs @@ -15,9 +15,9 @@ public class ExpressionStarter { private Expression> _predicate; - internal ExpressionStarter() - : this(false) - { + internal ExpressionStarter() + : this(false) + { } internal ExpressionStarter(bool defaultExpression) @@ -107,19 +107,19 @@ public static implicit operator ExpressionStarter(Expression> r #region Implement Expression methods and properties - public Func Compile() - { - return Predicate.Compile(); + public Func Compile() + { + return Predicate.Compile(); } - public Func Compile(DebugInfoGenerator debugInfoGenerator) - { - return Predicate.Compile(debugInfoGenerator); + public Func Compile(DebugInfoGenerator debugInfoGenerator) + { + return Predicate.Compile(debugInfoGenerator); } - public Expression> Update(Expression body, IEnumerable parameters) - { - return Predicate.Update(body, parameters); + public Expression> Update(Expression body, IEnumerable parameters) + { + return Predicate.Update(body, parameters); } #endregion @@ -140,14 +140,14 @@ public Expression> Update(Expression body, IEnumerable Predicate.TailCall; - public void CompileToMethod(MethodBuilder method) - { - Predicate.CompileToMethod(method); + public void CompileToMethod(MethodBuilder method) + { + Predicate.CompileToMethod(method); } - public void CompileToMethod(MethodBuilder method, DebugInfoGenerator debugInfoGenerator) - { - Predicate.CompileToMethod(method, debugInfoGenerator); + public void CompileToMethod(MethodBuilder method, DebugInfoGenerator debugInfoGenerator) + { + Predicate.CompileToMethod(method, debugInfoGenerator); } #endregion diff --git a/src/Libraries/SmartStore.Core/Linq/Expressions/MemberAccessPathVisitor.cs b/src/Libraries/SmartStore.Core/Linq/Expressions/MemberAccessPathVisitor.cs index e2369449a4..2378763d0d 100644 --- a/src/Libraries/SmartStore.Core/Linq/Expressions/MemberAccessPathVisitor.cs +++ b/src/Libraries/SmartStore.Core/Linq/Expressions/MemberAccessPathVisitor.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; using System.Reflection; using System.Text; diff --git a/src/Libraries/SmartStore.Core/Linq/LinqContainsPredicateBuilder.cs b/src/Libraries/SmartStore.Core/Linq/LinqContainsPredicateBuilder.cs index 909318e2c3..dc6879aac8 100644 --- a/src/Libraries/SmartStore.Core/Linq/LinqContainsPredicateBuilder.cs +++ b/src/Libraries/SmartStore.Core/Linq/LinqContainsPredicateBuilder.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; namespace SmartStore.Linq diff --git a/src/Libraries/SmartStore.Core/Linq/PredicateBuilder.cs b/src/Libraries/SmartStore.Core/Linq/PredicateBuilder.cs index 0115da0eb6..3041ea8726 100644 --- a/src/Libraries/SmartStore.Core/Linq/PredicateBuilder.cs +++ b/src/Libraries/SmartStore.Core/Linq/PredicateBuilder.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.Linq.Expressions; namespace SmartStore.Linq @@ -37,15 +36,15 @@ protected override Expression VisitParameter(ParameterExpression node) } /// Start an expression - public static ExpressionStarter New(Expression> expr = null) - { - return new ExpressionStarter(expr); + public static ExpressionStarter New(Expression> expr = null) + { + return new ExpressionStarter(expr); } /// Create an expression with a stub expression true or false to use when the expression is not yet started. - public static ExpressionStarter New(bool defaultExpression) - { - return new ExpressionStarter(defaultExpression); + public static ExpressionStarter New(bool defaultExpression) + { + return new ExpressionStarter(defaultExpression); } [Obsolete("Use PredicateBuilder.New() instead.")] diff --git a/src/Libraries/SmartStore.Core/Localization/ILocalizationFileResolver.cs b/src/Libraries/SmartStore.Core/Localization/ILocalizationFileResolver.cs index e734c92653..905030ede6 100644 --- a/src/Libraries/SmartStore.Core/Localization/ILocalizationFileResolver.cs +++ b/src/Libraries/SmartStore.Core/Localization/ILocalizationFileResolver.cs @@ -1,44 +1,42 @@ -using System; - -namespace SmartStore.Core.Localization +namespace SmartStore.Core.Localization { - /// - /// Responsible for finding a localization file for client scripts - /// - public interface ILocalizationFileResolver - { - /// - /// Tries to find a matching localization file for a given culture in the following order - /// (assuming is 'de-DE', is 'lang-*.js' and is 'en-US'): - /// - /// Exact match > lang-de-DE.js - /// Neutral culture > lang-de.js - /// Any region for language > lang-de-CH.js - /// Exact match for fallback culture > lang-en-US.js - /// Neutral fallback culture > lang-en.js - /// Any region for fallback language > lang-en-GB.js - /// - /// - /// The ISO culture code to get a localization file for, e.g. 'de-DE' - /// The virtual path to search in - /// The pattern to match, e.g. 'lang-*.js'. The wildcard char MUST exist. - /// - /// Whether caching should be enabled. If false, no attempt is made to read from cache, nor writing the result to the cache. - /// Cache duration is 24 hours. Automatic eviction on file change is NOT performed. - /// - /// Optional. - /// Result - LocalizationFileResolveResult Resolve( - string culture, - string virtualPath, - string pattern, - bool cache = true, - string fallbackCulture = "en"); - } + /// + /// Responsible for finding a localization file for client scripts + /// + public interface ILocalizationFileResolver + { + /// + /// Tries to find a matching localization file for a given culture in the following order + /// (assuming is 'de-DE', is 'lang-*.js' and is 'en-US'): + /// + /// Exact match > lang-de-DE.js + /// Neutral culture > lang-de.js + /// Any region for language > lang-de-CH.js + /// Exact match for fallback culture > lang-en-US.js + /// Neutral fallback culture > lang-en.js + /// Any region for fallback language > lang-en-GB.js + /// + /// + /// The ISO culture code to get a localization file for, e.g. 'de-DE' + /// The virtual path to search in + /// The pattern to match, e.g. 'lang-*.js'. The wildcard char MUST exist. + /// + /// Whether caching should be enabled. If false, no attempt is made to read from cache, nor writing the result to the cache. + /// Cache duration is 24 hours. Automatic eviction on file change is NOT performed. + /// + /// Optional. + /// Result + LocalizationFileResolveResult Resolve( + string culture, + string virtualPath, + string pattern, + bool cache = true, + string fallbackCulture = "en"); + } - public class LocalizationFileResolveResult - { - public string Culture { get; set; } - public string VirtualPath { get; set; } - } + public class LocalizationFileResolveResult + { + public string Culture { get; set; } + public string VirtualPath { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Localization/LocalizationFileResolver.cs b/src/Libraries/SmartStore.Core/Localization/LocalizationFileResolver.cs index fc02435c1e..7a97e459b3 100644 --- a/src/Libraries/SmartStore.Core/Localization/LocalizationFileResolver.cs +++ b/src/Libraries/SmartStore.Core/Localization/LocalizationFileResolver.cs @@ -1,152 +1,148 @@ using System; -using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; using System.Web; using SmartStore.Core.Caching; using SmartStore.Utilities; namespace SmartStore.Core.Localization { - public class LocalizationFileResolver : ILocalizationFileResolver - { - private readonly ICacheManager _cache; - - public LocalizationFileResolver(ICacheManager cache) - { - _cache = cache; - } - - public LocalizationFileResolveResult Resolve( - string culture, - string virtualPath, - string pattern, - bool cache = true, - string fallbackCulture = "en") - { - Guard.NotEmpty(culture, nameof(culture)); - Guard.NotEmpty(virtualPath, nameof(virtualPath)); - Guard.NotEmpty(pattern, nameof(pattern)); - - if (pattern.IndexOf('*') < 0) - { - throw new ArgumentException("The pattern must contain a wildcard char for substitution, e.g. 'lang-*.js'.", nameof(pattern)); - } - - virtualPath = FixPath(virtualPath); - var cacheKey = "core:locfile:" + virtualPath.ToLower() + pattern + "/" + culture; - string result = null; - - if (cache && _cache.Contains(cacheKey)) - { - result = _cache.Get(cacheKey); - return result != null ? CreateResult(result, virtualPath, pattern) : null; - } - - if (!LocalizationHelper.IsValidCultureCode(culture)) - { - throw new ArgumentException($"'{culture}' is not a valid culture code.", nameof(culture)); - } - - var ci = CultureInfo.GetCultureInfo(culture); - var directory = new DirectoryInfo(CommonHelper.MapPath(virtualPath, false)); - - if (!directory.Exists) - { - throw new DirectoryNotFoundException($"Path '{virtualPath}' does not exist."); - } - - // 1: Match passed culture - result = ResolveMatchingFile(ci, directory, pattern); - - if (result == null && fallbackCulture.HasValue() && culture != fallbackCulture) - { - if (!LocalizationHelper.IsValidCultureCode(fallbackCulture)) - { - throw new ArgumentException($"'{culture}' is not a valid culture code.", nameof(fallbackCulture)); - } - - // 2: Match fallback culture - ci = CultureInfo.GetCultureInfo(fallbackCulture); - result = ResolveMatchingFile(ci, directory, pattern); - } - - if (cache) - { - _cache.Put(cacheKey, result, TimeSpan.FromHours(24)); - } - - if (result.HasValue()) - { - return CreateResult(result, virtualPath, pattern); - } - - return null; - } - - private string ResolveMatchingFile(CultureInfo ci, DirectoryInfo directory, string pattern) - { - string result = null; - - // 1: Exact match - // ----------------------------------------------------- - var fileName = pattern.Replace("*", ci.Name); - if (File.Exists(Path.Combine(directory.FullName, fileName))) - { - result = ci.Name; - } - - // 2: Match neutral culture, e.g. de-DE > de - // ----------------------------------------------------- - if (result == null && !ci.IsNeutralCulture && ci.Parent != null) - { - ci = ci.Parent; - fileName = pattern.Replace("*", ci.Name); - if (File.Exists(Path.Combine(directory.FullName, fileName))) - { - result = ci.Name; - } - } - - // 2: Match any region, e.g. de-DE > de-CH - // ----------------------------------------------------- - if (result == null && ci.IsNeutralCulture) - { - // Convert pattern to Regex: "lang-*.js" > "^lang.(.+?).js$" - var rgPattern = "^" + pattern.Replace("*", @"(.+?)") + "$"; - var rgFileName = new Regex(rgPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase); - - foreach (var fi in directory.EnumerateFiles(pattern.Replace("*", ci.Name + "-*"), SearchOption.TopDirectoryOnly)) - { - var culture = rgFileName.Match(fi.Name).Groups[1].Value; - if (LocalizationHelper.IsValidCultureCode(culture)) - { - result = culture; - break; - } - } - } - - return result; - } - - private string FixPath(string virtualPath) - { - return VirtualPathUtility.ToAppRelative(virtualPath).EnsureEndsWith("/"); - } - - private LocalizationFileResolveResult CreateResult(string culture, string virtualPath, string pattern) - { - var fileName = pattern.Replace("*", culture); - return new LocalizationFileResolveResult - { - Culture = culture, - VirtualPath = VirtualPathUtility.ToAbsolute(virtualPath + fileName) - }; - } - } + public class LocalizationFileResolver : ILocalizationFileResolver + { + private readonly ICacheManager _cache; + + public LocalizationFileResolver(ICacheManager cache) + { + _cache = cache; + } + + public LocalizationFileResolveResult Resolve( + string culture, + string virtualPath, + string pattern, + bool cache = true, + string fallbackCulture = "en") + { + Guard.NotEmpty(culture, nameof(culture)); + Guard.NotEmpty(virtualPath, nameof(virtualPath)); + Guard.NotEmpty(pattern, nameof(pattern)); + + if (pattern.IndexOf('*') < 0) + { + throw new ArgumentException("The pattern must contain a wildcard char for substitution, e.g. 'lang-*.js'.", nameof(pattern)); + } + + virtualPath = FixPath(virtualPath); + var cacheKey = "core:locfile:" + virtualPath.ToLower() + pattern + "/" + culture; + string result = null; + + if (cache && _cache.Contains(cacheKey)) + { + result = _cache.Get(cacheKey); + return result != null ? CreateResult(result, virtualPath, pattern) : null; + } + + if (!LocalizationHelper.IsValidCultureCode(culture)) + { + throw new ArgumentException($"'{culture}' is not a valid culture code.", nameof(culture)); + } + + var ci = CultureInfo.GetCultureInfo(culture); + var directory = new DirectoryInfo(CommonHelper.MapPath(virtualPath, false)); + + if (!directory.Exists) + { + throw new DirectoryNotFoundException($"Path '{virtualPath}' does not exist."); + } + + // 1: Match passed culture + result = ResolveMatchingFile(ci, directory, pattern); + + if (result == null && fallbackCulture.HasValue() && culture != fallbackCulture) + { + if (!LocalizationHelper.IsValidCultureCode(fallbackCulture)) + { + throw new ArgumentException($"'{culture}' is not a valid culture code.", nameof(fallbackCulture)); + } + + // 2: Match fallback culture + ci = CultureInfo.GetCultureInfo(fallbackCulture); + result = ResolveMatchingFile(ci, directory, pattern); + } + + if (cache) + { + _cache.Put(cacheKey, result, TimeSpan.FromHours(24)); + } + + if (result.HasValue()) + { + return CreateResult(result, virtualPath, pattern); + } + + return null; + } + + private string ResolveMatchingFile(CultureInfo ci, DirectoryInfo directory, string pattern) + { + string result = null; + + // 1: Exact match + // ----------------------------------------------------- + var fileName = pattern.Replace("*", ci.Name); + if (File.Exists(Path.Combine(directory.FullName, fileName))) + { + result = ci.Name; + } + + // 2: Match neutral culture, e.g. de-DE > de + // ----------------------------------------------------- + if (result == null && !ci.IsNeutralCulture && ci.Parent != null) + { + ci = ci.Parent; + fileName = pattern.Replace("*", ci.Name); + if (File.Exists(Path.Combine(directory.FullName, fileName))) + { + result = ci.Name; + } + } + + // 2: Match any region, e.g. de-DE > de-CH + // ----------------------------------------------------- + if (result == null && ci.IsNeutralCulture) + { + // Convert pattern to Regex: "lang-*.js" > "^lang.(.+?).js$" + var rgPattern = "^" + pattern.Replace("*", @"(.+?)") + "$"; + var rgFileName = new Regex(rgPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase); + + foreach (var fi in directory.EnumerateFiles(pattern.Replace("*", ci.Name + "-*"), SearchOption.TopDirectoryOnly)) + { + var culture = rgFileName.Match(fi.Name).Groups[1].Value; + if (LocalizationHelper.IsValidCultureCode(culture)) + { + result = culture; + break; + } + } + } + + return result; + } + + private string FixPath(string virtualPath) + { + return VirtualPathUtility.ToAppRelative(virtualPath).EnsureEndsWith("/"); + } + + private LocalizationFileResolveResult CreateResult(string culture, string virtualPath, string pattern) + { + var fileName = pattern.Replace("*", culture); + return new LocalizationFileResolveResult + { + Culture = culture, + VirtualPath = VirtualPathUtility.ToAbsolute(virtualPath + fileName) + }; + } + } } diff --git a/src/Libraries/SmartStore.Core/Localization/LocalizationHelper.cs b/src/Libraries/SmartStore.Core/Localization/LocalizationHelper.cs index 324083d31d..cebbe01c4a 100644 --- a/src/Libraries/SmartStore.Core/Localization/LocalizationHelper.cs +++ b/src/Libraries/SmartStore.Core/Localization/LocalizationHelper.cs @@ -6,7 +6,7 @@ namespace SmartStore.Core.Localization { - public static class LocalizationHelper + public static class LocalizationHelper { private readonly static HashSet _cultureCodes = new HashSet( @@ -20,70 +20,70 @@ public static bool IsValidCultureCode(string locale) return locale.HasValue() && _cultureCodes.Contains(locale); } - /// - /// Enumerates all parent cultures, excluding the top-most invariant culture - /// - /// The ISO culture code, e.g. de-DE, en-US or just en - /// Parent cultures - public static IEnumerable EnumerateParentCultures(string locale) - { - if (locale.IsEmpty() || !_cultureCodes.Contains(locale)) - { - return Enumerable.Empty(); - } + /// + /// Enumerates all parent cultures, excluding the top-most invariant culture + /// + /// The ISO culture code, e.g. de-DE, en-US or just en + /// Parent cultures + public static IEnumerable EnumerateParentCultures(string locale) + { + if (locale.IsEmpty() || !_cultureCodes.Contains(locale)) + { + return Enumerable.Empty(); + } - return EnumerateParentCultures(CultureInfo.GetCultureInfo(locale)); - } + return EnumerateParentCultures(CultureInfo.GetCultureInfo(locale)); + } - /// - /// Enumerates all parent cultures, excluding the top-most invariant culture - /// - /// The culture info to enumerate parents for - /// Parent cultures - public static IEnumerable EnumerateParentCultures(CultureInfo culture) - { - if (culture == null) - { - yield break; - } + /// + /// Enumerates all parent cultures, excluding the top-most invariant culture + /// + /// The culture info to enumerate parents for + /// Parent cultures + public static IEnumerable EnumerateParentCultures(CultureInfo culture) + { + if (culture == null) + { + yield break; + } - while (culture.Parent.TwoLetterISOLanguageName != "iv") - { - yield return culture.Parent; - culture = culture.Parent; - } - } + while (culture.Parent.TwoLetterISOLanguageName != "iv") + { + yield return culture.Parent; + culture = culture.Parent; + } + } - public static string GetLanguageNativeName(string locale) - { - try - { - if (locale.HasValue()) - { - var info = CultureInfo.GetCultureInfoByIetfLanguageTag(locale); - if (info != null) - return info.NativeName; - } - } - catch { } + public static string GetLanguageNativeName(string locale) + { + try + { + if (locale.HasValue()) + { + var info = CultureInfo.GetCultureInfoByIetfLanguageTag(locale); + if (info != null) + return info.NativeName; + } + } + catch { } - return null; - } + return null; + } - public static string GetCurrencySymbol(string locale) - { - try - { - if (locale.HasValue()) - { - var info = new RegionInfo(locale); - if (info != null) - return info.CurrencySymbol; - } - } - catch { } + public static string GetCurrencySymbol(string locale) + { + try + { + if (locale.HasValue()) + { + var info = new RegionInfo(locale); + if (info != null) + return info.CurrencySymbol; + } + } + catch { } - return null; - } - } + return null; + } + } } diff --git a/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs b/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs index 5965d20b51..82dc95d9ee 100644 --- a/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs +++ b/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs @@ -3,8 +3,8 @@ namespace SmartStore.Core.Localization { - [Serializable] - public class LocalizedString : IHtmlString + [Serializable] + public class LocalizedString : IHtmlString { private readonly string _localized; private readonly string _textHint; @@ -30,48 +30,33 @@ public static LocalizedString TextOrDefault(string text, LocalizedString default return new LocalizedString(text); } - public string TextHint - { - get { return _textHint; } - } + public string TextHint => _textHint; - public object[] Args - { - get { return _args; } - } + public object[] Args => _args; - public string Text - { - get { return _localized; } - } + public string Text => _localized; + + /// + /// Returns a js encoded string which already contains delimiters. + /// + public IHtmlString JsText => System.Web.Mvc.MvcHtmlString.Create(_localized.EncodeJsString()); - /// - /// Returns a js encoded string which already contains delimiters. - /// - public IHtmlString JsText - { - get - { - return System.Web.Mvc.MvcHtmlString.Create(_localized.EncodeJsString()); - } - } - - public static implicit operator string(LocalizedString obj) + public static implicit operator string(LocalizedString obj) { return obj.Text; } - public static implicit operator LocalizedString(string obj) - { - return new LocalizedString(obj); - } + public static implicit operator LocalizedString(string obj) + { + return new LocalizedString(obj); + } public override string ToString() { return _localized; } - public string ToHtmlString() + public string ToHtmlString() { return _localized; } diff --git a/src/Libraries/SmartStore.Core/Localization/Localizer.cs b/src/Libraries/SmartStore.Core/Localization/Localizer.cs index bb96ea085b..9b173a53b1 100644 --- a/src/Libraries/SmartStore.Core/Localization/Localizer.cs +++ b/src/Libraries/SmartStore.Core/Localization/Localizer.cs @@ -1,5 +1,5 @@ namespace SmartStore.Core.Localization { public delegate LocalizedString Localizer(string key, params object[] args); - public delegate LocalizedString LocalizerEx(string key, int languageId, params object[] args); + public delegate LocalizedString LocalizerEx(string key, int languageId, params object[] args); } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Localization/NullLocalizer.cs b/src/Libraries/SmartStore.Core/Localization/NullLocalizer.cs index 0b43a01c1d..fb77afe3ec 100644 --- a/src/Libraries/SmartStore.Core/Localization/NullLocalizer.cs +++ b/src/Libraries/SmartStore.Core/Localization/NullLocalizer.cs @@ -1,26 +1,18 @@ -using System; - -namespace SmartStore.Core.Localization +namespace SmartStore.Core.Localization { - public static class NullLocalizer - { - private static readonly Localizer _instance; - private static readonly LocalizerEx _instanceEx; + public static class NullLocalizer + { + private static readonly Localizer _instance; + private static readonly LocalizerEx _instanceEx; - static NullLocalizer() - { - _instance = (format, args) => new LocalizedString((args == null || args.Length == 0) ? format : string.Format(format, args)); - _instanceEx = (format, languageId, args) => new LocalizedString((args == null || args.Length == 0) ? format : string.Format(format, args)); - } + static NullLocalizer() + { + _instance = (format, args) => new LocalizedString((args == null || args.Length == 0) ? format : string.Format(format, args)); + _instanceEx = (format, languageId, args) => new LocalizedString((args == null || args.Length == 0) ? format : string.Format(format, args)); + } - public static Localizer Instance - { - get { return _instance; } - } + public static Localizer Instance => _instance; - public static LocalizerEx InstanceEx - { - get { return _instanceEx; } - } - } + public static LocalizerEx InstanceEx => _instanceEx; + } } diff --git a/src/Libraries/SmartStore.Core/Logging/IChronometer.cs b/src/Libraries/SmartStore.Core/Logging/IChronometer.cs index fb02512a32..ce8e9064d2 100644 --- a/src/Libraries/SmartStore.Core/Logging/IChronometer.cs +++ b/src/Libraries/SmartStore.Core/Logging/IChronometer.cs @@ -3,44 +3,41 @@ namespace SmartStore.Core.Logging { - public interface IChronometer : IDisposable - { - void StepStart(string key, string message); - void StepStop(string key); - } - - public static class IChronometerExtensions - { - public static IDisposable Step(this IChronometer chronometer, string message) - { - Guard.NotEmpty(message, nameof(message)); - - var key = "step" + CommonHelper.GenerateRandomDigitCode(10); - - chronometer.StepStart(key, message); - return new ActionDisposable(() => chronometer.StepStop(key)); - } - } - - public class NullChronometer : IChronometer - { - private static readonly IChronometer _instance = new NullChronometer(); - - public static IChronometer Instance - { - get { return _instance; } - } - - public void StepStart(string key, string message) - { - } - - public void StepStop(string key) - { - } - - public void Dispose() - { - } - } + public interface IChronometer : IDisposable + { + void StepStart(string key, string message); + void StepStop(string key); + } + + public static class IChronometerExtensions + { + public static IDisposable Step(this IChronometer chronometer, string message) + { + Guard.NotEmpty(message, nameof(message)); + + var key = "step" + CommonHelper.GenerateRandomDigitCode(10); + + chronometer.StepStart(key, message); + return new ActionDisposable(() => chronometer.StepStop(key)); + } + } + + public class NullChronometer : IChronometer + { + private static readonly IChronometer _instance = new NullChronometer(); + + public static IChronometer Instance => _instance; + + public void StepStart(string key, string message) + { + } + + public void StepStop(string key) + { + } + + public void Dispose() + { + } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/ICustomerActivityService.cs b/src/Libraries/SmartStore.Core/Logging/ICustomerActivityService.cs index 3ff8526a96..8ae000f45b 100644 --- a/src/Libraries/SmartStore.Core/Logging/ICustomerActivityService.cs +++ b/src/Libraries/SmartStore.Core/Logging/ICustomerActivityService.cs @@ -5,10 +5,10 @@ namespace SmartStore.Core.Logging { - /// - /// Customer activity service interface - /// - public partial interface ICustomerActivityService + /// + /// Customer activity service interface + /// + public partial interface ICustomerActivityService { /// /// Inserts an activity log type item @@ -74,27 +74,27 @@ ActivityLog InsertActivity(string systemKeyword, /// Activity log void DeleteActivity(ActivityLog activityLog); - /// - /// Gets all activity log items - /// - /// Log item creation from; null to load all customers - /// Log item creation to; null to load all customers - /// Customer identifier; null to load all customers - /// Activity log type identifier - /// Page index - /// Page size - /// Customer email - /// Customer system name - /// Activity log collection - IPagedList GetAllActivities( - DateTime? createdOnFrom, + /// + /// Gets all activity log items + /// + /// Log item creation from; null to load all customers + /// Log item creation to; null to load all customers + /// Customer identifier; null to load all customers + /// Activity log type identifier + /// Page index + /// Page size + /// Customer email + /// Customer system name + /// Activity log collection + IPagedList GetAllActivities( + DateTime? createdOnFrom, DateTime? createdOnTo, - int? customerId, + int? customerId, int activityLogTypeId, - int pageIndex, - int pageSize, - string email = null, - bool? customerSystemAccount = null); + int pageIndex, + int pageSize, + string email = null, + bool? customerSystemAccount = null); /// /// Gets an activity log item @@ -103,16 +103,16 @@ IPagedList GetAllActivities( /// Activity log item ActivityLog GetActivityById(int activityLogId); - /// - /// Gets activity logs be identifier - /// - /// Activity log identifiers - /// List of activity logs - IList GetActivityByIds(int[] activityLogIds); + /// + /// Gets activity logs be identifier + /// + /// Activity log identifiers + /// List of activity logs + IList GetActivityByIds(int[] activityLogIds); - /// - /// Clears activity log - /// - void ClearAllActivities(); + /// + /// Clears activity log + /// + void ClearAllActivities(); } } diff --git a/src/Libraries/SmartStore.Core/Logging/ILogger.cs b/src/Libraries/SmartStore.Core/Logging/ILogger.cs index edec0f8dd0..3d985cb8bb 100644 --- a/src/Libraries/SmartStore.Core/Logging/ILogger.cs +++ b/src/Libraries/SmartStore.Core/Logging/ILogger.cs @@ -2,25 +2,25 @@ namespace SmartStore.Core.Logging { - /// - /// Interface that all loggers implement - /// - public partial interface ILogger + /// + /// Interface that all loggers implement + /// + public partial interface ILogger { - /// - /// Checks if this logger is enabled for a given passed as parameter. - /// - /// true if this logger is enabled for level, otherwise false - /// Result - bool IsEnabledFor(LogLevel level); + /// + /// Checks if this logger is enabled for a given passed as parameter. + /// + /// true if this logger is enabled for level, otherwise false + /// Result + bool IsEnabledFor(LogLevel level); - /// - /// Generates a logging event for the specified level using the message and exception - /// - /// The level of the message to be logged - /// The exception to log, including its stack trace. Pass null to not log an exception - /// The message object to log - /// An Object array containing zero or more objects to format. Can be null. - void Log(LogLevel level, Exception exception, string message, object[] args); + /// + /// Generates a logging event for the specified level using the message and exception + /// + /// The level of the message to be logged + /// The exception to log, including its stack trace. Pass null to not log an exception + /// The message object to log + /// An Object array containing zero or more objects to format. Can be null. + void Log(LogLevel level, Exception exception, string message, object[] args); } } diff --git a/src/Libraries/SmartStore.Core/Logging/ILoggerFactory.cs b/src/Libraries/SmartStore.Core/Logging/ILoggerFactory.cs index 89f159f187..31ed223fec 100644 --- a/src/Libraries/SmartStore.Core/Logging/ILoggerFactory.cs +++ b/src/Libraries/SmartStore.Core/Logging/ILoggerFactory.cs @@ -2,18 +2,18 @@ namespace SmartStore.Core.Logging { - public interface ILoggerFactory - { - ILogger GetLogger(Type type); - ILogger GetLogger(string name); - void FlushAll(); - } + public interface ILoggerFactory + { + ILogger GetLogger(Type type); + ILogger GetLogger(string name); + void FlushAll(); + } - public static class ILoggerFactoryExtensions - { - public static ILogger CreateLogger(this ILoggerFactory factory) where T : class - { - return factory.GetLogger(typeof(T)); - } - } + public static class ILoggerFactoryExtensions + { + public static ILogger CreateLogger(this ILoggerFactory factory) where T : class + { + return factory.GetLogger(typeof(T)); + } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/LogLevel.cs b/src/Libraries/SmartStore.Core/Logging/LogLevel.cs index 8792dbee72..d370399f51 100644 --- a/src/Libraries/SmartStore.Core/Logging/LogLevel.cs +++ b/src/Libraries/SmartStore.Core/Logging/LogLevel.cs @@ -8,7 +8,7 @@ public enum LogLevel Debug = 10, Information = 20, Warning = 30, - Error = 40 , + Error = 40, Fatal = 50 } } diff --git a/src/Libraries/SmartStore.Core/Logging/LoggingExtensions.cs b/src/Libraries/SmartStore.Core/Logging/LoggingExtensions.cs index cd9e45dc31..40081ea027 100644 --- a/src/Libraries/SmartStore.Core/Logging/LoggingExtensions.cs +++ b/src/Libraries/SmartStore.Core/Logging/LoggingExtensions.cs @@ -5,71 +5,191 @@ namespace SmartStore.Core.Logging { public static class LoggingExtensions { - public static bool IsDebugEnabled(this ILogger l) => l.IsEnabledFor(LogLevel.Debug); - public static bool IsInfoEnabled(this ILogger l) => l.IsEnabledFor(LogLevel.Information); - public static bool IsWarnEnabled(this ILogger l) => l.IsEnabledFor(LogLevel.Warning); - public static bool IsErrorEnabled(this ILogger l) => l.IsEnabledFor(LogLevel.Error); - public static bool IsFatalEnabled(this ILogger l) => l.IsEnabledFor(LogLevel.Fatal); - - - - public static void Debug(this ILogger l, string msg) => FilteredLog(l, LogLevel.Debug, null, msg, null); - public static void Debug(this ILogger l, Func msgFactory) => FilteredLog(l, LogLevel.Debug, null, msgFactory); - public static void Debug(this ILogger l, Exception ex, string msg) => FilteredLog(l, LogLevel.Debug, ex, msg, null); - public static void DebugFormat(this ILogger l, string msg, params object[] args) => FilteredLog(l, LogLevel.Debug, null, msg, args); - public static void DebugFormat(this ILogger l, Exception ex, string msg, params object[] args) => FilteredLog(l, LogLevel.Debug, ex, msg, args); - - public static void Info(this ILogger l, string msg) => FilteredLog(l, LogLevel.Information, null, msg, null); - public static void Info(this ILogger l, Func msgFactory) => FilteredLog(l, LogLevel.Information, null, msgFactory); - public static void Info(this ILogger l, Exception ex, string msg) => FilteredLog(l, LogLevel.Information, ex, msg, null); - public static void InfoFormat(this ILogger l, string msg, params object[] args) => FilteredLog(l, LogLevel.Information, null, msg, args); - public static void InfoFormat(this ILogger l, Exception ex, string msg, params object[] args) => FilteredLog(l, LogLevel.Information, ex, msg, args); - - public static void Warn(this ILogger l, string msg) => FilteredLog(l, LogLevel.Warning, null, msg, null); - public static void Warn(this ILogger l, Func msgFactory) => FilteredLog(l, LogLevel.Warning, null, msgFactory); - public static void Warn(this ILogger l, Exception ex, string msg) => FilteredLog(l, LogLevel.Warning, ex, msg, null); - public static void WarnFormat(this ILogger l, string msg, params object[] args) => FilteredLog(l, LogLevel.Warning, null, msg, args); - public static void WarnFormat(this ILogger l, Exception ex, string msg, params object[] args) => FilteredLog(l, LogLevel.Warning, ex, msg, args); - - public static void Error(this ILogger l, string msg) => FilteredLog(l, LogLevel.Error, null, msg, null); - public static void Error(this ILogger l, Func msgFactory) => FilteredLog(l, LogLevel.Error, null, msgFactory); - public static void Error(this ILogger l, Exception ex) => FilteredLog(l, LogLevel.Error, ex, null, null); - public static void Error(this ILogger l, Exception ex, string msg) => FilteredLog(l, LogLevel.Error, ex, msg, null); - public static void ErrorFormat(this ILogger l, string msg, params object[] args) => FilteredLog(l, LogLevel.Error, null, msg, args); - public static void ErrorFormat(this ILogger l, Exception ex, string msg, params object[] args) => FilteredLog(l, LogLevel.Error, ex, msg, args); - - public static void Fatal(this ILogger l, string msg) => FilteredLog(l, LogLevel.Fatal, null, msg, null); - public static void Fatal(this ILogger l, Func msgFactory) => FilteredLog(l, LogLevel.Fatal, null, msgFactory); - public static void Fatal(this ILogger l, Exception ex) => FilteredLog(l, LogLevel.Fatal, ex, null, null); - public static void Fatal(this ILogger l, Exception ex, string msg) => FilteredLog(l, LogLevel.Fatal, ex, msg, null); - public static void FatalFormat(this ILogger l, string msg, params object[] args) => FilteredLog(l, LogLevel.Fatal, null, msg, args); - public static void FatalFormat(this ILogger l, Exception ex, string msg, params object[] args) => FilteredLog(l, LogLevel.Fatal, ex, msg, args); - - public static void ErrorsAll(this ILogger logger, Exception exception) - { - while (exception != null) - { - FilteredLog(logger, LogLevel.Error, exception, exception.Message, null); - exception = exception.InnerException; - } - } + public static bool IsDebugEnabled(this ILogger l) + { + return l.IsEnabledFor(LogLevel.Debug); + } + + public static bool IsInfoEnabled(this ILogger l) + { + return l.IsEnabledFor(LogLevel.Information); + } + + public static bool IsWarnEnabled(this ILogger l) + { + return l.IsEnabledFor(LogLevel.Warning); + } + + public static bool IsErrorEnabled(this ILogger l) + { + return l.IsEnabledFor(LogLevel.Error); + } + + public static bool IsFatalEnabled(this ILogger l) + { + return l.IsEnabledFor(LogLevel.Fatal); + } + + public static void Debug(this ILogger l, string msg) + { + FilteredLog(l, LogLevel.Debug, null, msg, null); + } + + public static void Debug(this ILogger l, Func msgFactory) + { + FilteredLog(l, LogLevel.Debug, null, msgFactory); + } + + public static void Debug(this ILogger l, Exception ex, string msg) + { + FilteredLog(l, LogLevel.Debug, ex, msg, null); + } + + public static void DebugFormat(this ILogger l, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Debug, null, msg, args); + } + + public static void DebugFormat(this ILogger l, Exception ex, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Debug, ex, msg, args); + } + + public static void Info(this ILogger l, string msg) + { + FilteredLog(l, LogLevel.Information, null, msg, null); + } + + public static void Info(this ILogger l, Func msgFactory) + { + FilteredLog(l, LogLevel.Information, null, msgFactory); + } + + public static void Info(this ILogger l, Exception ex, string msg) + { + FilteredLog(l, LogLevel.Information, ex, msg, null); + } + + public static void InfoFormat(this ILogger l, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Information, null, msg, args); + } + + public static void InfoFormat(this ILogger l, Exception ex, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Information, ex, msg, args); + } + + public static void Warn(this ILogger l, string msg) + { + FilteredLog(l, LogLevel.Warning, null, msg, null); + } + + public static void Warn(this ILogger l, Func msgFactory) + { + FilteredLog(l, LogLevel.Warning, null, msgFactory); + } + + public static void Warn(this ILogger l, Exception ex, string msg) + { + FilteredLog(l, LogLevel.Warning, ex, msg, null); + } + + public static void WarnFormat(this ILogger l, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Warning, null, msg, args); + } + + public static void WarnFormat(this ILogger l, Exception ex, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Warning, ex, msg, args); + } + + public static void Error(this ILogger l, string msg) + { + FilteredLog(l, LogLevel.Error, null, msg, null); + } + + public static void Error(this ILogger l, Func msgFactory) + { + FilteredLog(l, LogLevel.Error, null, msgFactory); + } + + public static void Error(this ILogger l, Exception ex) + { + FilteredLog(l, LogLevel.Error, ex, null, null); + } + + public static void Error(this ILogger l, Exception ex, string msg) + { + FilteredLog(l, LogLevel.Error, ex, msg, null); + } + + public static void ErrorFormat(this ILogger l, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Error, null, msg, args); + } + + public static void ErrorFormat(this ILogger l, Exception ex, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Error, ex, msg, args); + } + + public static void Fatal(this ILogger l, string msg) + { + FilteredLog(l, LogLevel.Fatal, null, msg, null); + } + + public static void Fatal(this ILogger l, Func msgFactory) + { + FilteredLog(l, LogLevel.Fatal, null, msgFactory); + } + + public static void Fatal(this ILogger l, Exception ex) + { + FilteredLog(l, LogLevel.Fatal, ex, null, null); + } + + public static void Fatal(this ILogger l, Exception ex, string msg) + { + FilteredLog(l, LogLevel.Fatal, ex, msg, null); + } + + public static void FatalFormat(this ILogger l, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Fatal, null, msg, args); + } + + public static void FatalFormat(this ILogger l, Exception ex, string msg, params object[] args) + { + FilteredLog(l, LogLevel.Fatal, ex, msg, args); + } + + public static void ErrorsAll(this ILogger logger, Exception exception) + { + while (exception != null) + { + FilteredLog(logger, LogLevel.Error, exception, exception.Message, null); + exception = exception.InnerException; + } + } [MethodImpl(MethodImplOptions.AggressiveInlining)] private static void FilteredLog(ILogger logger, LogLevel level, Exception exception, string message, object[] objects) - { - if (logger.IsEnabledFor(level)) - { - logger.Log(level, exception, message, objects); - } - } + { + if (logger.IsEnabledFor(level)) + { + logger.Log(level, exception, message, objects); + } + } [MethodImpl(MethodImplOptions.AggressiveInlining)] private static void FilteredLog(ILogger logger, LogLevel level, Exception exception, Func messageFactory) - { - if (logger.IsEnabledFor(level)) - { - logger.Log(level, exception, messageFactory(), null); - } - } - } + { + if (logger.IsEnabledFor(level)) + { + logger.Log(level, exception, messageFactory(), null); + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/LoggingModule.cs b/src/Libraries/SmartStore.Core/Logging/LoggingModule.cs index 8f69742577..34ca8cea69 100644 --- a/src/Libraries/SmartStore.Core/Logging/LoggingModule.cs +++ b/src/Libraries/SmartStore.Core/Logging/LoggingModule.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Reflection; @@ -12,133 +11,133 @@ namespace SmartStore.Core.Logging { - public class LoggingModule : Autofac.Module - { - protected override void Load(ContainerBuilder builder) - { - builder.RegisterType().As().SingleInstance(); - - builder.RegisterType().As().SingleInstance(); - - // call GetLogger in response to the request for an ILogger implementation - if (DataSettings.DatabaseIsInstalled()) - { - builder.Register(GetContextualLogger).As().ExternallyOwned(); - } - else - { - // the install logger should append to a rolling text file only. - builder.Register(GetInstallLogger).As().ExternallyOwned(); - } - } - - protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) - { - bool hasCtorLogger = false; - bool hasPropertyLogger = false; - - FastProperty[] loggerProperties = null; - - var ra = registration.Activator as ReflectionActivator; - if (ra != null) - { - // // Look for ctor parameters of type "ILogger" - var ctors = ra.ConstructorFinder.FindConstructors(ra.LimitType); - var loggerParameters = ctors.SelectMany(ctor => ctor.GetParameters()).Where(pi => pi.ParameterType == typeof(ILogger)); - hasCtorLogger = loggerParameters.Any(); - - // Autowire properties - // Look for settable properties of type "ILogger" - loggerProperties = ra.LimitType - .GetProperties(BindingFlags.SetProperty | BindingFlags.Public | BindingFlags.Instance) - .Select(p => new - { - PropertyInfo = p, - p.PropertyType, - IndexParameters = p.GetIndexParameters(), - Accessors = p.GetAccessors(false) - }) - .Where(x => x.PropertyType == typeof(ILogger)) // must be a logger - .Where(x => x.IndexParameters.Count() == 0) // must not be an indexer - .Where(x => x.Accessors.Length != 1 || x.Accessors[0].ReturnType == typeof(void)) //must have get/set, or only set - .Select(x => FastProperty.Create(x.PropertyInfo)) - .ToArray(); - - hasPropertyLogger = loggerProperties.Length > 0; - - // Ignore components known to be without logger dependencies - if (!hasCtorLogger && !hasPropertyLogger) - return; - - if (hasPropertyLogger) - { - registration.Metadata.Add("LoggerProperties", loggerProperties); - } - } - - if (hasCtorLogger) - { - registration.Preparing += (sender, args) => - { - var logger = GetLoggerFor(args.Component.Activator.LimitType, args.Context); - args.Parameters = new[] { TypedParameter.From(logger) }.Concat(args.Parameters); - }; - } - - if (hasPropertyLogger) - { - registration.Activating += (sender, args) => - { - var logger = GetLoggerFor(args.Component.Activator.LimitType, args.Context); - var loggerProps = args.Component.Metadata.Get("LoggerProperties") as FastProperty[]; - if (loggerProps != null) - { - foreach (var prop in loggerProps) - { - prop.SetValue(args.Instance, logger); - } - } - }; - } - } - - private ILogger GetLoggerFor(Type componentType, IComponentContext ctx) - { - return ctx.Resolve(new TypedParameter(typeof(Type), componentType)); - } - - private static ILogger GetContextualLogger(IComponentContext context, IEnumerable parameters) - { - // return an ILogger in response to Resolve(componentTypeParameter) - var loggerFactory = context.Resolve(); - - Type containingType = null; - - if (parameters != null && parameters.Any()) - { - if (parameters.Any(x => x is TypedParameter)) - { - containingType = parameters.TypedAs(); - } - else if (parameters.Any(x => x is NamedParameter)) - { - containingType = parameters.Named("Autofac.AutowiringPropertyInjector.InstanceType"); - } - } - - if (containingType != null) - { - return loggerFactory.GetLogger(containingType); - } - else - { - return loggerFactory.GetLogger("SmartStore"); - } - } - - private static ILogger GetInstallLogger(IComponentContext context) - { - return context.Resolve().GetLogger("Install"); - } - } + public class LoggingModule : Autofac.Module + { + protected override void Load(ContainerBuilder builder) + { + builder.RegisterType().As().SingleInstance(); + + builder.RegisterType().As().SingleInstance(); + + // call GetLogger in response to the request for an ILogger implementation + if (DataSettings.DatabaseIsInstalled()) + { + builder.Register(GetContextualLogger).As().ExternallyOwned(); + } + else + { + // the install logger should append to a rolling text file only. + builder.Register(GetInstallLogger).As().ExternallyOwned(); + } + } + + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) + { + bool hasCtorLogger = false; + bool hasPropertyLogger = false; + + FastProperty[] loggerProperties = null; + + var ra = registration.Activator as ReflectionActivator; + if (ra != null) + { + // // Look for ctor parameters of type "ILogger" + var ctors = ra.ConstructorFinder.FindConstructors(ra.LimitType); + var loggerParameters = ctors.SelectMany(ctor => ctor.GetParameters()).Where(pi => pi.ParameterType == typeof(ILogger)); + hasCtorLogger = loggerParameters.Any(); + + // Autowire properties + // Look for settable properties of type "ILogger" + loggerProperties = ra.LimitType + .GetProperties(BindingFlags.SetProperty | BindingFlags.Public | BindingFlags.Instance) + .Select(p => new + { + PropertyInfo = p, + p.PropertyType, + IndexParameters = p.GetIndexParameters(), + Accessors = p.GetAccessors(false) + }) + .Where(x => x.PropertyType == typeof(ILogger)) // must be a logger + .Where(x => x.IndexParameters.Count() == 0) // must not be an indexer + .Where(x => x.Accessors.Length != 1 || x.Accessors[0].ReturnType == typeof(void)) //must have get/set, or only set + .Select(x => FastProperty.Create(x.PropertyInfo)) + .ToArray(); + + hasPropertyLogger = loggerProperties.Length > 0; + + // Ignore components known to be without logger dependencies + if (!hasCtorLogger && !hasPropertyLogger) + return; + + if (hasPropertyLogger) + { + registration.Metadata.Add("LoggerProperties", loggerProperties); + } + } + + if (hasCtorLogger) + { + registration.Preparing += (sender, args) => + { + var logger = GetLoggerFor(args.Component.Activator.LimitType, args.Context); + args.Parameters = new[] { TypedParameter.From(logger) }.Concat(args.Parameters); + }; + } + + if (hasPropertyLogger) + { + registration.Activating += (sender, args) => + { + var logger = GetLoggerFor(args.Component.Activator.LimitType, args.Context); + var loggerProps = args.Component.Metadata.Get("LoggerProperties") as FastProperty[]; + if (loggerProps != null) + { + foreach (var prop in loggerProps) + { + prop.SetValue(args.Instance, logger); + } + } + }; + } + } + + private ILogger GetLoggerFor(Type componentType, IComponentContext ctx) + { + return ctx.Resolve(new TypedParameter(typeof(Type), componentType)); + } + + private static ILogger GetContextualLogger(IComponentContext context, IEnumerable parameters) + { + // return an ILogger in response to Resolve(componentTypeParameter) + var loggerFactory = context.Resolve(); + + Type containingType = null; + + if (parameters != null && parameters.Any()) + { + if (parameters.Any(x => x is TypedParameter)) + { + containingType = parameters.TypedAs(); + } + else if (parameters.Any(x => x is NamedParameter)) + { + containingType = parameters.Named("Autofac.AutowiringPropertyInjector.InstanceType"); + } + } + + if (containingType != null) + { + return loggerFactory.GetLogger(containingType); + } + else + { + return loggerFactory.GetLogger("SmartStore"); + } + } + + private static ILogger GetInstallLogger(IComponentContext context) + { + return context.Resolve().GetLogger("Install"); + } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/Notifier.cs b/src/Libraries/SmartStore.Core/Logging/Notifier.cs index beeba094a4..04afde9843 100644 --- a/src/Libraries/SmartStore.Core/Logging/Notifier.cs +++ b/src/Libraries/SmartStore.Core/Logging/Notifier.cs @@ -1,70 +1,65 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.CompilerServices; -using System.Text; using SmartStore.Core.Localization; namespace SmartStore.Core.Logging { - public interface INotifier - { - void Add(NotifyType type, LocalizedString message, bool durable = true); - ICollection Entries { get; } - } - - public class Notifier : INotifier - { - private readonly HashSet _entries = new HashSet(); + public interface INotifier + { + void Add(NotifyType type, LocalizedString message, bool durable = true); + ICollection Entries { get; } + } - public void Add(NotifyType type, LocalizedString message, bool durable = true) - { - _entries.Add(new NotifyEntry { Type = type, Message = message, Durable = durable }); - } + public class Notifier : INotifier + { + private readonly HashSet _entries = new HashSet(); - public ICollection Entries - { - get { return _entries; } - } - } + public void Add(NotifyType type, LocalizedString message, bool durable = true) + { + _entries.Add(new NotifyEntry { Type = type, Message = message, Durable = durable }); + } - public static class INotifierExtension - { + public ICollection Entries => _entries; + } + + public static class INotifierExtension + { [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Information(this INotifier notifier, LocalizedString message, bool durable = true) - { - notifier.Add(NotifyType.Info, message, durable); - } + { + notifier.Add(NotifyType.Info, message, durable); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Success(this INotifier notifier, LocalizedString message, bool durable = true) - { - notifier.Add(NotifyType.Success, message, durable); - } + { + notifier.Add(NotifyType.Success, message, durable); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Warning(this INotifier notifier, LocalizedString message, bool durable = true) - { - notifier.Add(NotifyType.Warning, message, durable); - } + { + notifier.Add(NotifyType.Warning, message, durable); + } - public static void Error(this INotifier notifier, Exception exception, bool durable = true) - { - if (exception == null) - return; + public static void Error(this INotifier notifier, Exception exception, bool durable = true) + { + if (exception == null) + return; - while (exception.InnerException != null) + while (exception.InnerException != null) { - exception = exception.InnerException; + exception = exception.InnerException; } - notifier.Add(NotifyType.Error, exception.Message, durable); - } + notifier.Add(NotifyType.Error, exception.Message, durable); + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Error(this INotifier notifier, LocalizedString message, bool durable = true) - { - notifier.Add(NotifyType.Error, message, durable); - } - } + { + notifier.Add(NotifyType.Error, message, durable); + } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/NotifyEntry.cs b/src/Libraries/SmartStore.Core/Logging/NotifyEntry.cs index 1196fc4790..a1bf825772 100644 --- a/src/Libraries/SmartStore.Core/Logging/NotifyEntry.cs +++ b/src/Libraries/SmartStore.Core/Logging/NotifyEntry.cs @@ -1,28 +1,27 @@ using System; -using System.Collections.Generic; using SmartStore.Core.Localization; namespace SmartStore.Core.Logging { - public enum NotifyType - { - Info, - Success, - Warning, - Error - } + public enum NotifyType + { + Info, + Success, + Warning, + Error + } - [Serializable] - public class NotifyEntry : ComparableObject - { - [ObjectSignature] - public NotifyType Type { get; set; } + [Serializable] + public class NotifyEntry : ComparableObject + { + [ObjectSignature] + public NotifyType Type { get; set; } - [ObjectSignature] - public LocalizedString Message { get; set; } + [ObjectSignature] + public LocalizedString Message { get; set; } - public bool Durable { get; set; } - } + public bool Durable { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/NullLogger.cs b/src/Libraries/SmartStore.Core/Logging/NullLogger.cs index ffdb5139a5..1ca0bf46cb 100644 --- a/src/Libraries/SmartStore.Core/Logging/NullLogger.cs +++ b/src/Libraries/SmartStore.Core/Logging/NullLogger.cs @@ -1,35 +1,35 @@ using System; -using SmartStore.Core.Domain.Customers; -using SmartStore.Core.Domain.Logging; namespace SmartStore.Core.Logging { public partial class NullLogger : ILogger { - private static readonly ILogger s_instance = new NullLogger(); + private static readonly ILogger s_instance = new NullLogger(); + + public static ILogger Instance => s_instance; - public static ILogger Instance - { - get - { - return s_instance; - } - } - public bool IsEnabledFor(LogLevel level) { return false; } - public void Log(LogLevel level, Exception exception, string message, object[] args) - { - } - } + public void Log(LogLevel level, Exception exception, string message, object[] args) + { + } + } + + public class NullLoggerFactory : ILoggerFactory + { + public ILogger GetLogger(Type type) + { + return NullLogger.Instance; + } + + public ILogger GetLogger(string name) + { + return NullLogger.Instance; + } - public class NullLoggerFactory : ILoggerFactory - { - public ILogger GetLogger(Type type) => NullLogger.Instance; - public ILogger GetLogger(string name) => NullLogger.Instance; - public void FlushAll() { } - } + public void FlushAll() { } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs b/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs index ede0263089..073e3d5d3d 100644 --- a/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs +++ b/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs @@ -7,14 +7,14 @@ namespace SmartStore.Core.Logging { - public class TraceLogger : DisposableObject, ILogger - { - private readonly TraceSource _traceSource; - private readonly StreamWriter _streamWriter; + public class TraceLogger : DisposableObject, ILogger + { + private readonly TraceSource _traceSource; + private readonly StreamWriter _streamWriter; - public TraceLogger() : this(GetDefaultFileName()) - { - } + public TraceLogger() : this(GetDefaultFileName()) + { + } private static string GetDefaultFileName() { @@ -31,12 +31,12 @@ private static string GetDefaultFileName() } public TraceLogger(string fileName) - { - Guard.NotEmpty(fileName, nameof(fileName)); + { + Guard.NotEmpty(fileName, nameof(fileName)); - _traceSource = new TraceSource("SmartStore"); - _traceSource.Switch = new SourceSwitch("LogSwitch", "Error"); - _traceSource.Listeners.Remove("Default"); + _traceSource = new TraceSource("SmartStore"); + _traceSource.Switch = new SourceSwitch("LogSwitch", "Error"); + _traceSource.Listeners.Remove("Default"); if (CommonHelper.IsDevEnvironment) { @@ -57,69 +57,69 @@ public TraceLogger(string fileName) }; try - { - // force UTF-8 encoding (even if the text just contains ANSI characters) - var append = File.Exists(fileName); - _streamWriter = new StreamWriter(fileName, append, Encoding.UTF8); - - textListener.Writer = _streamWriter; - - _traceSource.Listeners.Add(textListener); - } - catch (IOException) - { - // file is locked by another process - } - - // Allow the trace source to send messages to - // listeners for all event types. Currently only - // error messages or higher go to the listeners. - // Messages must get past the source switch to - // get to the listeners, regardless of the settings - // for the listeners. - _traceSource.Switch.Level = SourceLevels.All; - } - - public bool IsEnabledFor(LogLevel level) - { + { + // force UTF-8 encoding (even if the text just contains ANSI characters) + var append = File.Exists(fileName); + _streamWriter = new StreamWriter(fileName, append, Encoding.UTF8); + + textListener.Writer = _streamWriter; + + _traceSource.Listeners.Add(textListener); + } + catch (IOException) + { + // file is locked by another process + } + + // Allow the trace source to send messages to + // listeners for all event types. Currently only + // error messages or higher go to the listeners. + // Messages must get past the source switch to + // get to the listeners, regardless of the settings + // for the listeners. + _traceSource.Switch.Level = SourceLevels.All; + } + + public bool IsEnabledFor(LogLevel level) + { return _traceSource.Switch.ShouldTrace(LogLevelToEventType(level)); - } + } + + public void Log(LogLevel level, Exception exception, string message, object[] args) + { + var type = LogLevelToEventType(level); - public void Log(LogLevel level, Exception exception, string message, object[] args) - { - var type = LogLevelToEventType(level); + if (exception != null && !exception.IsFatal()) + { + message = message.Grow(exception.ToString(), Environment.NewLine); + } - if (exception != null && !exception.IsFatal()) - { - message = message.Grow(exception.ToString(), Environment.NewLine); - } + if (message.HasValue()) + { + var msg = args != null && args.Any() + ? message.FormatCurrent(args) + : message; - if (message.HasValue()) - { - var msg = args != null && args.Any() - ? message.FormatCurrent(args) - : message; + _traceSource.TraceEvent(type, (int)type, msg); + } + } - _traceSource.TraceEvent(type, (int)type, msg); + private TraceEventType LogLevelToEventType(LogLevel level) + { + switch (level) + { + case LogLevel.Debug: + return TraceEventType.Verbose; + case LogLevel.Error: + return TraceEventType.Error; + case LogLevel.Fatal: + return TraceEventType.Critical; + case LogLevel.Warning: + return TraceEventType.Warning; + default: + return TraceEventType.Information; } - } - - private TraceEventType LogLevelToEventType(LogLevel level) - { - switch (level) - { - case LogLevel.Debug: - return TraceEventType.Verbose; - case LogLevel.Error: - return TraceEventType.Error; - case LogLevel.Fatal: - return TraceEventType.Critical; - case LogLevel.Warning: - return TraceEventType.Warning; - default: - return TraceEventType.Information; - } - } + } //private LogLevel EventTypeToLogLevel(TraceEventType eventType) //{ @@ -139,20 +139,20 @@ private TraceEventType LogLevelToEventType(LogLevel level) //} public void Flush() - { - _traceSource.Flush(); - } - - protected override void OnDispose(bool disposing) - { - _traceSource.Flush(); - _traceSource.Close(); - - if (_streamWriter != null) - { - _streamWriter.Close(); - _streamWriter.Dispose(); - } - } - } + { + _traceSource.Flush(); + } + + protected override void OnDispose(bool disposing) + { + _traceSource.Flush(); + _traceSource.Close(); + + if (_streamWriter != null) + { + _streamWriter.Close(); + _streamWriter.Dispose(); + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs index 6bd1f49e02..be5b37a6b1 100644 --- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs +++ b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using System.Globalization; using System.Web; -using log4net; using log4net.Core; using log4net.Util; using SmartStore.Core.Data; @@ -12,149 +11,146 @@ namespace SmartStore.Core.Logging { - [DebuggerDisplay("Logger: {Name}")] - public class Log4netLogger : ILogger - { - private static readonly Type _declaringType = typeof(Log4netLogger); - private static readonly ContextState> _state; - - private readonly log4net.Core.ILogger _logger; - - static Log4netLogger() - { - _state = new ContextState>("Log4netLogger.LogicalThreadContext", () => new Dictionary(StringComparer.OrdinalIgnoreCase)); - } - - public Log4netLogger(log4net.Core.ILogger logger) - { - Guard.NotNull(logger, nameof(logger)); - - _logger = logger; - } - - public string Name - { - get { return _logger.Name; } - } - - public bool IsEnabledFor(LogLevel level) - { - return _logger.IsEnabledFor(ConvertLevel(level)); - } - - public void Log(LogLevel level, Exception exception, string message, object[] args) - { - var logLevel = ConvertLevel(level); - - if (message == null && exception != null) - { - message = exception.Message; - } - - object messageObj = message; - - if (args != null && args.Length > 0) - { - messageObj = new SystemStringFormat(CultureInfo.CurrentUICulture, message, args); - } - - var loggingEvent = new LoggingEvent( - _declaringType, - _logger.Repository, - _logger.Name, - logLevel, - messageObj, - exception); - - loggingEvent.Properties["LevelId"] = (int)level; - TryAddExtendedThreadInfo(loggingEvent); - - _logger.Log(loggingEvent); - } - - protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent) - { - var isAppInitialized = EngineContext.Current.IsFullyInitialized; - - // Don't knowingly run into exception - var httpRequest = isAppInitialized ? HttpContext.Current.SafeGetHttpRequest() : null; - - if (httpRequest == null) - { - loggingEvent.Properties["CustomerId"] = DBNull.Value; - loggingEvent.Properties["Url"] = DBNull.Value; - loggingEvent.Properties["Referrer"] = DBNull.Value; - loggingEvent.Properties["HttpMethod"] = DBNull.Value; - loggingEvent.Properties["Ip"] = DBNull.Value; - - return; - } - - var props = _state.GetState(); - - // Load the log4net thread with additional properties if they are available - var threadInfoMissing = !props.ContainsKey("sm:ThreadInfoAdded"); - - if (threadInfoMissing) - { - using (new ActionDisposable(() => props["sm:ThreadInfoAdded"] = true)) - { - if (DataSettings.DatabaseIsInstalled() && isAppInitialized) - { - var container = EngineContext.Current.ContainerManager; - - // CustomerId - if (container.TryResolve(null, out IWorkContext workContext)) - { - try - { - props["CustomerId"] = workContext.CurrentCustomer.Id; - } - catch - { - props["CustomerId"] = DBNull.Value; - } - } - - - // Url & stuff - if (container.TryResolve(null, out IWebHelper webHelper)) - { - try - { - props["Url"] = webHelper.GetThisPageUrl(true); - props["Referrer"] = webHelper.GetUrlReferrer(); - props["HttpMethod"] = httpRequest?.HttpMethod; - props["Ip"] = webHelper.GetCurrentIpAddress(); - } - catch { } - } - } - } - } - - loggingEvent.Properties["CustomerId"] = props.Get("CustomerId") ?? DBNull.Value; - loggingEvent.Properties["Url"] = props.Get("Url") ?? DBNull.Value; - loggingEvent.Properties["Referrer"] = props.Get("Referrer") ?? DBNull.Value; - loggingEvent.Properties["HttpMethod"] = props.Get("HttpMethod") ?? DBNull.Value; - loggingEvent.Properties["Ip"] = props.Get("Ip") ?? DBNull.Value; - } - - private static Level ConvertLevel(LogLevel level) - { - switch (level) - { - case LogLevel.Information: - return Level.Info; - case LogLevel.Warning: - return Level.Warn; - case LogLevel.Error: - return Level.Error; - case LogLevel.Fatal: - return Level.Fatal; - default: - return Level.Debug; - } - } - } + [DebuggerDisplay("Logger: {Name}")] + public class Log4netLogger : ILogger + { + private static readonly Type _declaringType = typeof(Log4netLogger); + private static readonly ContextState> _state; + + private readonly log4net.Core.ILogger _logger; + + static Log4netLogger() + { + _state = new ContextState>("Log4netLogger.LogicalThreadContext", () => new Dictionary(StringComparer.OrdinalIgnoreCase)); + } + + public Log4netLogger(log4net.Core.ILogger logger) + { + Guard.NotNull(logger, nameof(logger)); + + _logger = logger; + } + + public string Name => _logger.Name; + + public bool IsEnabledFor(LogLevel level) + { + return _logger.IsEnabledFor(ConvertLevel(level)); + } + + public void Log(LogLevel level, Exception exception, string message, object[] args) + { + var logLevel = ConvertLevel(level); + + if (message == null && exception != null) + { + message = exception.Message; + } + + object messageObj = message; + + if (args != null && args.Length > 0) + { + messageObj = new SystemStringFormat(CultureInfo.CurrentUICulture, message, args); + } + + var loggingEvent = new LoggingEvent( + _declaringType, + _logger.Repository, + _logger.Name, + logLevel, + messageObj, + exception); + + loggingEvent.Properties["LevelId"] = (int)level; + TryAddExtendedThreadInfo(loggingEvent); + + _logger.Log(loggingEvent); + } + + protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent) + { + var isAppInitialized = EngineContext.Current.IsFullyInitialized; + + // Don't knowingly run into exception + var httpRequest = isAppInitialized ? HttpContext.Current.SafeGetHttpRequest() : null; + + if (httpRequest == null) + { + loggingEvent.Properties["CustomerId"] = DBNull.Value; + loggingEvent.Properties["Url"] = DBNull.Value; + loggingEvent.Properties["Referrer"] = DBNull.Value; + loggingEvent.Properties["HttpMethod"] = DBNull.Value; + loggingEvent.Properties["Ip"] = DBNull.Value; + + return; + } + + var props = _state.GetState(); + + // Load the log4net thread with additional properties if they are available + var threadInfoMissing = !props.ContainsKey("sm:ThreadInfoAdded"); + + if (threadInfoMissing) + { + using (new ActionDisposable(() => props["sm:ThreadInfoAdded"] = true)) + { + if (DataSettings.DatabaseIsInstalled() && isAppInitialized) + { + var container = EngineContext.Current.ContainerManager; + + // CustomerId + if (container.TryResolve(null, out IWorkContext workContext)) + { + try + { + props["CustomerId"] = workContext.CurrentCustomer.Id; + } + catch + { + props["CustomerId"] = DBNull.Value; + } + } + + + // Url & stuff + if (container.TryResolve(null, out IWebHelper webHelper)) + { + try + { + props["Url"] = webHelper.GetThisPageUrl(true); + props["Referrer"] = webHelper.GetUrlReferrer(); + props["HttpMethod"] = httpRequest?.HttpMethod; + props["Ip"] = webHelper.GetCurrentIpAddress(); + } + catch { } + } + } + } + } + + loggingEvent.Properties["CustomerId"] = props.Get("CustomerId") ?? DBNull.Value; + loggingEvent.Properties["Url"] = props.Get("Url") ?? DBNull.Value; + loggingEvent.Properties["Referrer"] = props.Get("Referrer") ?? DBNull.Value; + loggingEvent.Properties["HttpMethod"] = props.Get("HttpMethod") ?? DBNull.Value; + loggingEvent.Properties["Ip"] = props.Get("Ip") ?? DBNull.Value; + } + + private static Level ConvertLevel(LogLevel level) + { + switch (level) + { + case LogLevel.Information: + return Level.Info; + case LogLevel.Warning: + return Level.Warn; + case LogLevel.Error: + return Level.Error; + case LogLevel.Fatal: + return Level.Fatal; + default: + return Level.Debug; + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs index 6b6f26299d..b949429081 100644 --- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs +++ b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs @@ -1,16 +1,13 @@ using System; using System.Collections.Concurrent; using System.Data; -using System.Diagnostics; using System.IO; using System.Linq; using System.Web.Hosting; using log4net; using log4net.Appender; using log4net.Config; -using log4net.Core; using log4net.Repository; -using log4net.Util; using SmartStore.Core.Data; using SmartStore.Utilities; @@ -22,21 +19,21 @@ public class Log4netLoggerFactory : ILoggerFactory, IRegisteredObject public Log4netLoggerFactory() { - if (HostingEnvironment.IsHosted) - { - var configFile = GetConfigFile(CommonHelper.GetAppSetting("log4net.Config", @"Config\log4net.config")); + if (HostingEnvironment.IsHosted) + { + var configFile = GetConfigFile(CommonHelper.GetAppSetting("log4net.Config", @"Config\log4net.config")); - XmlConfigurator.ConfigureAndWatch(configFile); + XmlConfigurator.ConfigureAndWatch(configFile); - var repository = LogManager.GetRepository(); - repository.ConfigurationChanged += OnConfigurationChanged; - TryConfigureDbAppender(repository); + var repository = LogManager.GetRepository(); + repository.ConfigurationChanged += OnConfigurationChanged; + TryConfigureDbAppender(repository); - HostingEnvironment.RegisterObject(this); - } + HostingEnvironment.RegisterObject(this); + } } - private void OnConfigurationChanged(object sender, EventArgs e) + private void OnConfigurationChanged(object sender, EventArgs e) { _loggerCache.Clear(); TryConfigureDbAppender(sender as ILoggerRepository); @@ -98,33 +95,33 @@ public void FlushAll() } - #region IRegisteredObject - - public void Stop(bool immediate) - { - RemoveEmptyLogFiles(); - HostingEnvironment.UnregisterObject(this); - } - - internal static void RemoveEmptyLogFiles() - { - var fileAppenders = LogManager.GetRepository()?.GetAppenders()?.OfType(); - if (fileAppenders != null) - { - foreach (var appender in fileAppenders) - { - // Delete log file if it's empty - var logFile = new FileInfo(appender.File); - if (logFile.Exists && logFile.Length <= 0) - { - logFile.Delete(); - } - } - } - } - - #endregion - } + #region IRegisteredObject + + public void Stop(bool immediate) + { + RemoveEmptyLogFiles(); + HostingEnvironment.UnregisterObject(this); + } + + internal static void RemoveEmptyLogFiles() + { + var fileAppenders = LogManager.GetRepository()?.GetAppenders()?.OfType(); + if (fileAppenders != null) + { + foreach (var appender in fileAppenders) + { + // Delete log file if it's empty + var logFile = new FileInfo(appender.File); + if (logFile.Exists && logFile.Length <= 0) + { + logFile.Delete(); + } + } + } + } + + #endregion + } //public class DbAppender : AdoNetAppender //{ diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/SmartFileAppender.cs b/src/Libraries/SmartStore.Core/Logging/log4net/SmartFileAppender.cs index 2894412966..c9f11411f2 100644 --- a/src/Libraries/SmartStore.Core/Logging/log4net/SmartFileAppender.cs +++ b/src/Libraries/SmartStore.Core/Logging/log4net/SmartFileAppender.cs @@ -1,11 +1,10 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using log4net.Appender; using log4net.Util; namespace SmartStore.Core.Logging { - public class SmartFileAppender : RollingFileAppender + public class SmartFileAppender : RollingFileAppender { /// /// Dictionary of already known suffixes (based on previous attempts) for a given filename. diff --git a/src/Libraries/SmartStore.Core/Money.cs b/src/Libraries/SmartStore.Core/Money.cs index 613c4fc05b..88fe208a27 100644 --- a/src/Libraries/SmartStore.Core/Money.cs +++ b/src/Libraries/SmartStore.Core/Money.cs @@ -1,140 +1,124 @@ using System; -using System.Collections.Generic; using System.Globalization; using System.Runtime.Serialization; using SmartStore.Core.Domain.Directory; namespace SmartStore { - public class Money : IConvertible, IFormattable, IComparable, IComparable, IEquatable - { - public Money(Currency currency) - : this(0m, currency) - { - } - - public Money(float amount, Currency currency) - : this((decimal)amount, currency, false) - { - } - - public Money(double amount, Currency currency) - : this((decimal)amount, currency, false) - { - } - - public Money(decimal amount, Currency currency) - : this(amount, currency, false) - { - } - - public Money(decimal amount, Currency currency, bool hideCurrency) - { - Guard.NotNull(currency, nameof(currency)); - - Amount = amount; - Currency = currency; - HideCurrency = hideCurrency; - } - - [IgnoreDataMember] - public bool HideCurrency - { - get; - internal set; - } - - [IgnoreDataMember] - public Currency Currency - { - get; - internal set; - } - - /// - /// Gets the number of decimal digits for the associated currency. - /// - public int DecimalDigits - { - get => string.Equals(Currency?.CurrencyCode, "btc", StringComparison.OrdinalIgnoreCase) ? 8 : Currency.NumberFormat.CurrencyDecimalDigits; - } - - /// - /// The internal unrounded raw amount - /// - public decimal Amount - { - get; - set; - } - - /// - /// Rounds the amount to the number of significant decimal digits - /// of the associated currency using MidpointRounding.AwayFromZero. - /// - public decimal RoundedAmount - { - get - { - return decimal.Round(Amount, DecimalDigits); - } - } - - /// - /// Truncates the amount to the number of significant decimal digits - /// of the associated currency. - /// - public decimal TruncatedAmount - { - get => (decimal)((long)Math.Truncate(Amount * DecimalDigits)) / DecimalDigits; - } - - /// - /// The formatted amount - /// - public string Formatted - { - get => ToString(true, false); - } - - private static void GuardCurrenciesAreEqual(Money a, Money b) - { - if (a.Currency != b.Currency) - throw new InvalidOperationException("Cannot operate on money values with different currencies."); - } - - #region Compare - - public override int GetHashCode() - { - if (Amount == 0) - return 0; - - return Amount.GetHashCode() ^ Currency.GetHashCode(); - } - - public int CompareTo(Money other) - { - return ((IComparable)this).CompareTo(other); - } - - int IComparable.CompareTo(object obj) - { - if (obj == null || !(obj is Money)) - return 1; - - Money other = (Money)obj; - - if (this.Amount == other.Amount) - return 0; - if (this.Amount < other.Amount) - return -1; - - return 1; - } - - public override bool Equals(object obj) - { + public class Money : IConvertible, IFormattable, IComparable, IComparable, IEquatable + { + public Money(Currency currency) + : this(0m, currency) + { + } + + public Money(float amount, Currency currency) + : this((decimal)amount, currency, false) + { + } + + public Money(double amount, Currency currency) + : this((decimal)amount, currency, false) + { + } + + public Money(decimal amount, Currency currency) + : this(amount, currency, false) + { + } + + public Money(decimal amount, Currency currency, bool hideCurrency) + { + Guard.NotNull(currency, nameof(currency)); + + Amount = amount; + Currency = currency; + HideCurrency = hideCurrency; + } + + [IgnoreDataMember] + public bool HideCurrency + { + get; + internal set; + } + + [IgnoreDataMember] + public Currency Currency + { + get; + internal set; + } + + /// + /// Gets the number of decimal digits for the associated currency. + /// + public int DecimalDigits => string.Equals(Currency?.CurrencyCode, "btc", StringComparison.OrdinalIgnoreCase) ? 8 : Currency.NumberFormat.CurrencyDecimalDigits; + + /// + /// The internal unrounded raw amount + /// + public decimal Amount + { + get; + set; + } + + /// + /// Rounds the amount to the number of significant decimal digits + /// of the associated currency using MidpointRounding.AwayFromZero. + /// + public decimal RoundedAmount => decimal.Round(Amount, DecimalDigits); + + /// + /// Truncates the amount to the number of significant decimal digits + /// of the associated currency. + /// + public decimal TruncatedAmount => (decimal)((long)Math.Truncate(Amount * DecimalDigits)) / DecimalDigits; + + /// + /// The formatted amount + /// + public string Formatted => ToString(true, false); + + private static void GuardCurrenciesAreEqual(Money a, Money b) + { + if (a.Currency != b.Currency) + throw new InvalidOperationException("Cannot operate on money values with different currencies."); + } + + #region Compare + + public override int GetHashCode() + { + if (Amount == 0) + return 0; + + return Amount.GetHashCode() ^ Currency.GetHashCode(); + } + + public int CompareTo(Money other) + { + return ((IComparable)this).CompareTo(other); + } + + int IComparable.CompareTo(object obj) + { + if (obj == null || !(obj is Money)) + return 1; + + Money other = (Money)obj; + + if (this.Amount == other.Amount) + return 0; + if (this.Amount < other.Amount) + return -1; + + return 1; + } + + public override bool Equals(object obj) + { // Prevent stack overflow. if (obj != null) { @@ -144,340 +128,613 @@ public override bool Equals(object obj) return false; } - bool IEquatable.Equals(Money other) - { - if (other == null) - return false; - - if (ReferenceEquals(this, other)) - return true; - - if (other.Amount == 0 && this.Amount == 0) - return true; - - return other.Amount == this.Amount && other.Currency == this.Currency; - } - - public static bool operator ==(Money a, Money b) => a.Equals(b); - public static bool operator !=(Money a, Money b) => !a.Equals(b); - - public static bool operator >(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - return a.Amount > b.Amount; - } - - public static bool operator <(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - return a.Amount < b.Amount; - } - - public static bool operator <=(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - return a.Amount <= b.Amount; - - } - - public static bool operator >=(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - return a.Amount >= b.Amount; - - } - - public static bool operator ==(Money a, int b) => a.Amount == b; - public static bool operator !=(Money a, int b) => a.Amount != b; - public static bool operator >(Money a, int b) => a.Amount > b; - public static bool operator <(Money a, int b) => a.Amount < b; - public static bool operator <=(Money a, int b) => a.Amount <= b; - public static bool operator >=(Money a, int b) => a.Amount >= b; - - public static bool operator ==(Money a, float b) => a.Amount == (decimal)b; - public static bool operator !=(Money a, float b) => a.Amount != (decimal)b; - public static bool operator >(Money a, float b) => a.Amount > (decimal)b; - public static bool operator <(Money a, float b) => a.Amount < (decimal)b; - public static bool operator <=(Money a, float b) => a.Amount <= (decimal)b; - public static bool operator >=(Money a, float b) => a.Amount >= (decimal)b; - - public static bool operator ==(Money a, double b) => a.Amount == (decimal)b; - public static bool operator !=(Money a, double b) => a.Amount != (decimal)b; - public static bool operator >(Money a, double b) => a.Amount > (decimal)b; - public static bool operator <(Money a, double b) => a.Amount < (decimal)b; - public static bool operator <=(Money a, double b) => a.Amount <= (decimal)b; - public static bool operator >=(Money a, double b) => a.Amount >= (decimal)b; - - public static bool operator ==(Money a, decimal b) => a.Amount == b; - public static bool operator !=(Money a, decimal b) => a.Amount != b; - public static bool operator >(Money a, decimal b) => a.Amount > b; - public static bool operator <(Money a, decimal b) => a.Amount < b; - public static bool operator <=(Money a, decimal b) => a.Amount <= b; - public static bool operator >=(Money a, decimal b) => a.Amount >= b; - - #endregion - - #region Format - - string IFormattable.ToString(string format, IFormatProvider formatProvider) - { - return this.ToString(!HideCurrency, false); - } - - string IConvertible.ToString(IFormatProvider provider) - { - return this.ToString(!HideCurrency, false); - } - - public override string ToString() - { - return this.ToString(!HideCurrency, false); - } - - public string ToString(bool showCurrency) - { - return this.ToString(showCurrency, false); - } - - public string ToString(bool showCurrency, bool useISOCodeAsSymbol) - { - var fmt = Currency.NumberFormat; - - if (Currency.CustomFormatting.HasValue()) - { - return RoundedAmount.ToString(Currency.CustomFormatting, fmt); - } - else - { - if (!showCurrency || useISOCodeAsSymbol) - { - fmt = (NumberFormatInfo)Currency.NumberFormat.Clone(); - fmt.CurrencySymbol = !showCurrency ? "" : Currency.CurrencyCode; - } - - return RoundedAmount.ToString("C", fmt); - } - } - - #endregion - - #region Convert - - // For truthy checks in templating - public static explicit operator bool(Money money) => money.Amount != 0; - public static explicit operator string(Money money) => money.ToString(true, false); - public static explicit operator byte(Money money) => System.Convert.ToByte(money.Amount); - public static explicit operator decimal(Money money) => money.Amount; - public static explicit operator double(Money money) => System.Convert.ToDouble(money.Amount); - public static explicit operator float(Money money) => System.Convert.ToSingle(money.Amount); - public static explicit operator int(Money money) => System.Convert.ToInt32(money.Amount); - public static explicit operator long(Money money) => System.Convert.ToInt64(money.Amount); - public static explicit operator sbyte(Money money) => System.Convert.ToSByte(money.Amount); - public static explicit operator short(Money money) => System.Convert.ToInt16(money.Amount); - public static explicit operator ushort(Money money) => System.Convert.ToUInt16(money.Amount); - public static explicit operator uint(Money money) => System.Convert.ToUInt32(money.Amount); - public static explicit operator ulong(Money money) => System.Convert.ToUInt64(money.Amount); - - TypeCode IConvertible.GetTypeCode() => TypeCode.Decimal; - object IConvertible.ToType(Type conversionType, IFormatProvider provider) => System.Convert.ChangeType(this.Amount, conversionType, provider); - bool IConvertible.ToBoolean(IFormatProvider provider) => Amount != 0; - char IConvertible.ToChar(IFormatProvider provider) => throw Error.InvalidCast(typeof(Money), typeof(char)); - DateTime IConvertible.ToDateTime(IFormatProvider provider) => throw Error.InvalidCast(typeof(Money), typeof(DateTime)); - byte IConvertible.ToByte(IFormatProvider provider) => (byte)this.Amount; - decimal IConvertible.ToDecimal(IFormatProvider provider) => this.Amount; - double IConvertible.ToDouble(IFormatProvider provider) => (double)this.Amount; - short IConvertible.ToInt16(IFormatProvider provider) => (short)this.Amount; - int IConvertible.ToInt32(IFormatProvider provider) => (int)this.Amount; - long IConvertible.ToInt64(IFormatProvider provider) => (long)this.Amount; - sbyte IConvertible.ToSByte(IFormatProvider provider) => (sbyte)this.Amount; - float IConvertible.ToSingle(IFormatProvider provider) => (float)this.Amount; - ushort IConvertible.ToUInt16(IFormatProvider provider) => (ushort)this.Amount; - uint IConvertible.ToUInt32(IFormatProvider provider) => (uint)this.Amount; - ulong IConvertible.ToUInt64(IFormatProvider provider) => (ulong)this.Amount; - - #endregion - - #region Add - - public static Money operator ++(Money a) - { - a.Amount++; - return a; - } - - public static Money operator +(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - return new Money(a.Amount + b.Amount, a.Currency); - } - - public static Money operator +(Money a, int b) => a + (decimal)b; - public static Money operator +(Money a, float b) => a + (decimal)b; - public static Money operator +(Money a, double b) => a + (decimal)b; - public static Money operator +(Money a, decimal b) => new Money(a.Amount + b, a.Currency); - - #endregion - - #region Substract - - public static Money operator --(Money a) - { - a.Amount--; - return a; - } - - public static Money operator -(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - return new Money(a.Amount - b.Amount, a.Currency); - } - - public static Money operator -(Money a, int b) => a + (decimal)b; - public static Money operator -(Money a, float b) => a + (decimal)b; - public static Money operator -(Money a, double b) => a + (decimal)b; - public static Money operator -(Money a, decimal b) => new Money(a.Amount - b, a.Currency); - - #endregion - - #region Multiply - - public static Money operator *(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - return new Money(a.Amount - b.Amount, a.Currency); - } - - public static Money operator *(Money a, int b) => a * (decimal)b; - public static Money operator *(Money a, float b) => a * (decimal)b; - public static Money operator *(Money a, double b) => a * (decimal)b; - public static Money operator *(Money a, decimal b) => new Money(a.Amount * b, a.Currency); - - #endregion - - #region Divide - - public static Money operator /(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - return new Money(a.Amount / b.Amount, a.Currency); - } - - public static Money operator /(Money a, int b) => a / (decimal)b; - public static Money operator /(Money a, float b) => a / (decimal)b; - public static Money operator /(Money a, double b) => a / (decimal)b; - public static Money operator /(Money a, decimal b) => new Money(a.Amount / b, a.Currency); - - #endregion - - #region Exchange & Math - - ///// - ///// Rounds the amount if enabled for the currency or if is true - ///// - ///// Round also if disabled for the currency - ///// A new instance with the rounded amount - //public Money Round(bool force = false) - //{ - - //} - - public Money ConvertTo(Currency toCurrency) - { - if (Currency == toCurrency) - return this; - - return new Money((Amount * Currency.Rate) / toCurrency.Rate, toCurrency); - } - - /// - /// Evenly distributes the amount over n parts, resolving remainders that occur due to rounding - /// errors, thereby garuanteeing the postcondition: result->sum(r|r.amount) = this.amount and - /// x elements in result are greater than at least one of the other elements, where x = amount mod n. - /// - /// Number of parts over which the amount is to be distibuted. - /// Array with distributed Money amounts. - public Money[] Allocate(int n) - { - var cents = Math.Pow(10, DecimalDigits); - var lowResult = ((long)Math.Truncate((double)Amount / n * cents)) / cents; - var highResult = lowResult + 1.0d / cents; - var results = new Money[n]; - var remainder = (int)(((double)Amount * cents) % n); - - for (var i = 0; i < remainder; i++) - results[i] = new Money((decimal)highResult, Currency); - - for (var i = remainder; i < n; i++) - results[i] = new Money((decimal)lowResult, Currency); - - return results; - } - - /// - /// Gets the ratio of one money to another. - /// - /// The numerator of the operation. - /// The denominator of the operation. - /// A decimal from 0.0 to 1.0 of the ratio between the two money values. - public static decimal GetRatio(Money numerator, Money denominator) - { - if (numerator == 0) - return 0; - - if (denominator == 0) - throw new DivideByZeroException("Attempted to divide by zero!"); - - GuardCurrenciesAreEqual(numerator, denominator); - - return numerator.Amount / denominator.Amount; - } - - /// - /// Gets the smallest money, given the two values. - /// - /// The first money to compare. - /// The second money to compare. - /// The smallest money value of the arguments. - public static Money Min(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - - if (a == b) - return a; - else if (a > b) - return b; - else - return a; - } - - /// - /// Gets the largest money, given the two values. - /// - /// The first money to compare. - /// The second money to compare. - /// The largest money value of the arguments. - public static Money Max(Money a, Money b) - { - GuardCurrenciesAreEqual(a, b); - - if (a == b) - return a; - else if (a > b) - return a; - else - return b; - } - - /// - /// Gets the absolute value of the . - /// - /// The value of money to convert. - /// The money value as an absolute value. - public static Money Abs(Money value) - { - return new Money(Math.Abs(value.Amount), value.Currency); - } - - #endregion - } + bool IEquatable.Equals(Money other) + { + if (other == null) + return false; + + if (ReferenceEquals(this, other)) + return true; + + if (other.Amount == 0 && this.Amount == 0) + return true; + + return other.Amount == this.Amount && other.Currency == this.Currency; + } + + public static bool operator ==(Money a, Money b) + { + return a.Equals(b); + } + + public static bool operator !=(Money a, Money b) + { + return !a.Equals(b); + } + + public static bool operator >(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + return a.Amount > b.Amount; + } + + public static bool operator <(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + return a.Amount < b.Amount; + } + + public static bool operator <=(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + return a.Amount <= b.Amount; + + } + + public static bool operator >=(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + return a.Amount >= b.Amount; + + } + + public static bool operator ==(Money a, int b) + { + return a.Amount == b; + } + + public static bool operator !=(Money a, int b) + { + return a.Amount != b; + } + + public static bool operator >(Money a, int b) + { + return a.Amount > b; + } + + public static bool operator <(Money a, int b) + { + return a.Amount < b; + } + + public static bool operator <=(Money a, int b) + { + return a.Amount <= b; + } + + public static bool operator >=(Money a, int b) + { + return a.Amount >= b; + } + + public static bool operator ==(Money a, float b) + { + return a.Amount == (decimal)b; + } + + public static bool operator !=(Money a, float b) + { + return a.Amount != (decimal)b; + } + + public static bool operator >(Money a, float b) + { + return a.Amount > (decimal)b; + } + + public static bool operator <(Money a, float b) + { + return a.Amount < (decimal)b; + } + + public static bool operator <=(Money a, float b) + { + return a.Amount <= (decimal)b; + } + + public static bool operator >=(Money a, float b) + { + return a.Amount >= (decimal)b; + } + + public static bool operator ==(Money a, double b) + { + return a.Amount == (decimal)b; + } + + public static bool operator !=(Money a, double b) + { + return a.Amount != (decimal)b; + } + + public static bool operator >(Money a, double b) + { + return a.Amount > (decimal)b; + } + + public static bool operator <(Money a, double b) + { + return a.Amount < (decimal)b; + } + + public static bool operator <=(Money a, double b) + { + return a.Amount <= (decimal)b; + } + + public static bool operator >=(Money a, double b) + { + return a.Amount >= (decimal)b; + } + + public static bool operator ==(Money a, decimal b) + { + return a.Amount == b; + } + + public static bool operator !=(Money a, decimal b) + { + return a.Amount != b; + } + + public static bool operator >(Money a, decimal b) + { + return a.Amount > b; + } + + public static bool operator <(Money a, decimal b) + { + return a.Amount < b; + } + + public static bool operator <=(Money a, decimal b) + { + return a.Amount <= b; + } + + public static bool operator >=(Money a, decimal b) + { + return a.Amount >= b; + } + + #endregion + + #region Format + + string IFormattable.ToString(string format, IFormatProvider formatProvider) + { + return this.ToString(!HideCurrency, false); + } + + string IConvertible.ToString(IFormatProvider provider) + { + return this.ToString(!HideCurrency, false); + } + + public override string ToString() + { + return this.ToString(!HideCurrency, false); + } + + public string ToString(bool showCurrency) + { + return this.ToString(showCurrency, false); + } + + public string ToString(bool showCurrency, bool useISOCodeAsSymbol) + { + var fmt = Currency.NumberFormat; + + if (Currency.CustomFormatting.HasValue()) + { + return RoundedAmount.ToString(Currency.CustomFormatting, fmt); + } + else + { + if (!showCurrency || useISOCodeAsSymbol) + { + fmt = (NumberFormatInfo)Currency.NumberFormat.Clone(); + fmt.CurrencySymbol = !showCurrency ? "" : Currency.CurrencyCode; + } + + return RoundedAmount.ToString("C", fmt); + } + } + + #endregion + + #region Convert + + // For truthy checks in templating + public static explicit operator bool(Money money) + { + return money.Amount != 0; + } + + public static explicit operator string(Money money) + { + return money.ToString(true, false); + } + + public static explicit operator byte(Money money) + { + return System.Convert.ToByte(money.Amount); + } + + public static explicit operator decimal(Money money) + { + return money.Amount; + } + + public static explicit operator double(Money money) + { + return System.Convert.ToDouble(money.Amount); + } + + public static explicit operator float(Money money) + { + return System.Convert.ToSingle(money.Amount); + } + + public static explicit operator int(Money money) + { + return System.Convert.ToInt32(money.Amount); + } + + public static explicit operator long(Money money) + { + return System.Convert.ToInt64(money.Amount); + } + + public static explicit operator sbyte(Money money) + { + return System.Convert.ToSByte(money.Amount); + } + + public static explicit operator short(Money money) + { + return System.Convert.ToInt16(money.Amount); + } + + public static explicit operator ushort(Money money) + { + return System.Convert.ToUInt16(money.Amount); + } + + public static explicit operator uint(Money money) + { + return System.Convert.ToUInt32(money.Amount); + } + + public static explicit operator ulong(Money money) + { + return System.Convert.ToUInt64(money.Amount); + } + + TypeCode IConvertible.GetTypeCode() + { + return TypeCode.Decimal; + } + + object IConvertible.ToType(Type conversionType, IFormatProvider provider) + { + return System.Convert.ChangeType(this.Amount, conversionType, provider); + } + + bool IConvertible.ToBoolean(IFormatProvider provider) + { + return Amount != 0; + } + + char IConvertible.ToChar(IFormatProvider provider) + { + throw Error.InvalidCast(typeof(Money), typeof(char)); + } + + DateTime IConvertible.ToDateTime(IFormatProvider provider) + { + throw Error.InvalidCast(typeof(Money), typeof(DateTime)); + } + + byte IConvertible.ToByte(IFormatProvider provider) + { + return (byte)this.Amount; + } + + decimal IConvertible.ToDecimal(IFormatProvider provider) + { + return this.Amount; + } + + double IConvertible.ToDouble(IFormatProvider provider) + { + return (double)this.Amount; + } + + short IConvertible.ToInt16(IFormatProvider provider) + { + return (short)this.Amount; + } + + int IConvertible.ToInt32(IFormatProvider provider) + { + return (int)this.Amount; + } + + long IConvertible.ToInt64(IFormatProvider provider) + { + return (long)this.Amount; + } + + sbyte IConvertible.ToSByte(IFormatProvider provider) + { + return (sbyte)this.Amount; + } + + float IConvertible.ToSingle(IFormatProvider provider) + { + return (float)this.Amount; + } + + ushort IConvertible.ToUInt16(IFormatProvider provider) + { + return (ushort)this.Amount; + } + + uint IConvertible.ToUInt32(IFormatProvider provider) + { + return (uint)this.Amount; + } + + ulong IConvertible.ToUInt64(IFormatProvider provider) + { + return (ulong)this.Amount; + } + + #endregion + + #region Add + + public static Money operator ++(Money a) + { + a.Amount++; + return a; + } + + public static Money operator +(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + return new Money(a.Amount + b.Amount, a.Currency); + } + + public static Money operator +(Money a, int b) + { + return a + (decimal)b; + } + + public static Money operator +(Money a, float b) + { + return a + (decimal)b; + } + + public static Money operator +(Money a, double b) + { + return a + (decimal)b; + } + + public static Money operator +(Money a, decimal b) + { + return new Money(a.Amount + b, a.Currency); + } + + #endregion + + #region Substract + + public static Money operator --(Money a) + { + a.Amount--; + return a; + } + + public static Money operator -(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + return new Money(a.Amount - b.Amount, a.Currency); + } + + public static Money operator -(Money a, int b) + { + return a + (decimal)b; + } + + public static Money operator -(Money a, float b) + { + return a + (decimal)b; + } + + public static Money operator -(Money a, double b) + { + return a + (decimal)b; + } + + public static Money operator -(Money a, decimal b) + { + return new Money(a.Amount - b, a.Currency); + } + + #endregion + + #region Multiply + + public static Money operator *(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + return new Money(a.Amount - b.Amount, a.Currency); + } + + public static Money operator *(Money a, int b) + { + return a * (decimal)b; + } + + public static Money operator *(Money a, float b) + { + return a * (decimal)b; + } + + public static Money operator *(Money a, double b) + { + return a * (decimal)b; + } + + public static Money operator *(Money a, decimal b) + { + return new Money(a.Amount * b, a.Currency); + } + + #endregion + + #region Divide + + public static Money operator /(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + return new Money(a.Amount / b.Amount, a.Currency); + } + + public static Money operator /(Money a, int b) + { + return a / (decimal)b; + } + + public static Money operator /(Money a, float b) + { + return a / (decimal)b; + } + + public static Money operator /(Money a, double b) + { + return a / (decimal)b; + } + + public static Money operator /(Money a, decimal b) + { + return new Money(a.Amount / b, a.Currency); + } + + #endregion + + #region Exchange & Math + + ///// + ///// Rounds the amount if enabled for the currency or if is true + ///// + ///// Round also if disabled for the currency + ///// A new instance with the rounded amount + //public Money Round(bool force = false) + //{ + + //} + + public Money ConvertTo(Currency toCurrency) + { + if (Currency == toCurrency) + return this; + + return new Money((Amount * Currency.Rate) / toCurrency.Rate, toCurrency); + } + + /// + /// Evenly distributes the amount over n parts, resolving remainders that occur due to rounding + /// errors, thereby garuanteeing the postcondition: result->sum(r|r.amount) = this.amount and + /// x elements in result are greater than at least one of the other elements, where x = amount mod n. + /// + /// Number of parts over which the amount is to be distibuted. + /// Array with distributed Money amounts. + public Money[] Allocate(int n) + { + var cents = Math.Pow(10, DecimalDigits); + var lowResult = ((long)Math.Truncate((double)Amount / n * cents)) / cents; + var highResult = lowResult + 1.0d / cents; + var results = new Money[n]; + var remainder = (int)(((double)Amount * cents) % n); + + for (var i = 0; i < remainder; i++) + results[i] = new Money((decimal)highResult, Currency); + + for (var i = remainder; i < n; i++) + results[i] = new Money((decimal)lowResult, Currency); + + return results; + } + + /// + /// Gets the ratio of one money to another. + /// + /// The numerator of the operation. + /// The denominator of the operation. + /// A decimal from 0.0 to 1.0 of the ratio between the two money values. + public static decimal GetRatio(Money numerator, Money denominator) + { + if (numerator == 0) + return 0; + + if (denominator == 0) + throw new DivideByZeroException("Attempted to divide by zero!"); + + GuardCurrenciesAreEqual(numerator, denominator); + + return numerator.Amount / denominator.Amount; + } + + /// + /// Gets the smallest money, given the two values. + /// + /// The first money to compare. + /// The second money to compare. + /// The smallest money value of the arguments. + public static Money Min(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + + if (a == b) + return a; + else if (a > b) + return b; + else + return a; + } + + /// + /// Gets the largest money, given the two values. + /// + /// The first money to compare. + /// The second money to compare. + /// The largest money value of the arguments. + public static Money Max(Money a, Money b) + { + GuardCurrenciesAreEqual(a, b); + + if (a == b) + return a; + else if (a > b) + return a; + else + return b; + } + + /// + /// Gets the absolute value of the . + /// + /// The value of money to convert. + /// The money value as an absolute value. + public static Money Abs(Money value) + { + return new Money(Math.Abs(value.Amount), value.Currency); + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/ExtensionDescriptor.cs b/src/Libraries/SmartStore.Core/Packaging/ExtensionDescriptor.cs index 2d014ace46..f9c6c83a14 100644 --- a/src/Libraries/SmartStore.Core/Packaging/ExtensionDescriptor.cs +++ b/src/Libraries/SmartStore.Core/Packaging/ExtensionDescriptor.cs @@ -1,36 +1,34 @@ using System; -using System.Collections.Generic; -using System.Linq; namespace SmartStore.Core.Packaging { - public class ExtensionDescriptor - { - /// - /// Virtual path base, "~/Themes" or "~/Plugins" - /// - public string Location { get; set; } + public class ExtensionDescriptor + { + /// + /// Virtual path base, "~/Themes" or "~/Plugins" + /// + public string Location { get; set; } - /// - /// Folder name under virtual path base - /// - public string Id { get; set; } + /// + /// Folder name under virtual path base + /// + public string Id { get; set; } - /// - /// The extension type: Plugin | Theme - /// - public string ExtensionType { get; set; } + /// + /// The extension type: Plugin | Theme + /// + public string ExtensionType { get; set; } - // extension metadata - public string Name { get; set; } - public string Path { get; set; } - public string Description { get; set; } - public Version Version { get; set; } - public Version MinAppVersion { get; set; } - public string Author { get; set; } - public string WebSite { get; set; } - public string Tags { get; set; } - } + // extension metadata + public string Name { get; set; } + public string Path { get; set; } + public string Description { get; set; } + public Version Version { get; set; } + public Version MinAppVersion { get; set; } + public string Author { get; set; } + public string WebSite { get; set; } + public string Tags { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs index d02cc71cce..988efe48c4 100644 --- a/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs +++ b/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs @@ -1,115 +1,114 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; using System.IO; +using System.Linq; using SmartStore.Core.Logging; using SmartStore.Utilities; namespace SmartStore.Core.Packaging { - public interface IFolderUpdater - { - void Backup(DirectoryInfo existingFolder, DirectoryInfo backupfolder, params string[] ignorePatterns); - void Restore(DirectoryInfo backupfolder, DirectoryInfo existingFolder); - } - - [SuppressMessage("ReSharper", "NotAccessedField.Local")] - public class FolderUpdater : IFolderUpdater - { - public class FolderContent - { - public DirectoryInfo Folder { get; set; } - public IEnumerable Files { get; set; } - } - - private readonly ILogger _logger; - - public FolderUpdater(ILogger logger) - { - _logger = logger; - } - - public void Backup(DirectoryInfo existingFolder, DirectoryInfo backupfolder, params string[] ignorePatterns) - { - var ignores = ignorePatterns.Select(x => new Wildcard(x)); - CopyFolder(GetFolderContent(existingFolder, ignores), backupfolder); - } - - public void Restore(DirectoryInfo backupfolder, DirectoryInfo existingFolder) - { - CopyFolder(GetFolderContent(backupfolder, Enumerable.Empty()), existingFolder); - } - - private void CopyFolder(FolderContent source, DirectoryInfo dest) - { - foreach (var file in source.Files) - { - CopyFile(source.Folder, file, dest); - } - } - - private void CopyFile(DirectoryInfo sourceFolder, string fileName, DirectoryInfo destinationFolder) - { - var sourceFile = new FileInfo(Path.Combine(sourceFolder.FullName, fileName)); - var destFile = new FileInfo(Path.Combine(destinationFolder.FullName, fileName)); - - // If destination file exist, overwrite only if changed - if (destFile.Exists) - { - if (sourceFile.Length == destFile.Length) - { - var source = File.ReadAllBytes(sourceFile.FullName); - var dest = File.ReadAllBytes(destFile.FullName); - if (source.SequenceEqual(dest)) - { - return; - } - } - } - - // Create destination directory - if (!destFile.Directory.Exists) - { - destFile.Directory.Create(); - } - - File.Copy(sourceFile.FullName, destFile.FullName, true); - } - - private FolderContent GetFolderContent(DirectoryInfo folder, IEnumerable ignores) - { - var files = new List(); - GetFolderContent(folder, "", files, ignores); - return new FolderContent { Folder = folder, Files = files }; - } - - [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] - private void GetFolderContent(DirectoryInfo folder, string prefix, List files, IEnumerable ignores) - { - if (!folder.Exists) - return; - - if (ignores.Any(w => w.IsMatch(prefix))) - return; - - foreach (var file in folder.GetFiles()) - { - var path = Path.Combine(prefix, file.Name); - var ignore = ignores.Any(w => w.IsMatch(path)); - if (!ignore) - { - files.Add(path); - } - } - - foreach (var child in folder.GetDirectories()) - { - GetFolderContent(child, Path.Combine(prefix, child.Name), files, ignores); - } - } - - } + public interface IFolderUpdater + { + void Backup(DirectoryInfo existingFolder, DirectoryInfo backupfolder, params string[] ignorePatterns); + void Restore(DirectoryInfo backupfolder, DirectoryInfo existingFolder); + } + + [SuppressMessage("ReSharper", "NotAccessedField.Local")] + public class FolderUpdater : IFolderUpdater + { + public class FolderContent + { + public DirectoryInfo Folder { get; set; } + public IEnumerable Files { get; set; } + } + + private readonly ILogger _logger; + + public FolderUpdater(ILogger logger) + { + _logger = logger; + } + + public void Backup(DirectoryInfo existingFolder, DirectoryInfo backupfolder, params string[] ignorePatterns) + { + var ignores = ignorePatterns.Select(x => new Wildcard(x)); + CopyFolder(GetFolderContent(existingFolder, ignores), backupfolder); + } + + public void Restore(DirectoryInfo backupfolder, DirectoryInfo existingFolder) + { + CopyFolder(GetFolderContent(backupfolder, Enumerable.Empty()), existingFolder); + } + + private void CopyFolder(FolderContent source, DirectoryInfo dest) + { + foreach (var file in source.Files) + { + CopyFile(source.Folder, file, dest); + } + } + + private void CopyFile(DirectoryInfo sourceFolder, string fileName, DirectoryInfo destinationFolder) + { + var sourceFile = new FileInfo(Path.Combine(sourceFolder.FullName, fileName)); + var destFile = new FileInfo(Path.Combine(destinationFolder.FullName, fileName)); + + // If destination file exist, overwrite only if changed + if (destFile.Exists) + { + if (sourceFile.Length == destFile.Length) + { + var source = File.ReadAllBytes(sourceFile.FullName); + var dest = File.ReadAllBytes(destFile.FullName); + if (source.SequenceEqual(dest)) + { + return; + } + } + } + + // Create destination directory + if (!destFile.Directory.Exists) + { + destFile.Directory.Create(); + } + + File.Copy(sourceFile.FullName, destFile.FullName, true); + } + + private FolderContent GetFolderContent(DirectoryInfo folder, IEnumerable ignores) + { + var files = new List(); + GetFolderContent(folder, "", files, ignores); + return new FolderContent { Folder = folder, Files = files }; + } + + [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] + private void GetFolderContent(DirectoryInfo folder, string prefix, List files, IEnumerable ignores) + { + if (!folder.Exists) + return; + + if (ignores.Any(w => w.IsMatch(prefix))) + return; + + foreach (var file in folder.GetFiles()) + { + var path = Path.Combine(prefix, file.Name); + var ignore = ignores.Any(w => w.IsMatch(path)); + if (!ignore) + { + files.Add(path); + } + } + + foreach (var child in folder.GetDirectories()) + { + GetFolderContent(child, Path.Combine(prefix, child.Name), files, ignores); + } + } + + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/IPackageBuilder.cs b/src/Libraries/SmartStore.Core/Packaging/IPackageBuilder.cs index ed9f9fcde6..259ca2e6ae 100644 --- a/src/Libraries/SmartStore.Core/Packaging/IPackageBuilder.cs +++ b/src/Libraries/SmartStore.Core/Packaging/IPackageBuilder.cs @@ -1,13 +1,12 @@ -using System; -using System.IO; -using SmartStore.Core.Themes; +using System.IO; using SmartStore.Core.Plugins; +using SmartStore.Core.Themes; namespace SmartStore.Core.Packaging { - public interface IPackageBuilder - { - Stream BuildPackage(PluginDescriptor pluginDescriptor); - Stream BuildPackage(ThemeManifest themeManifest); - } + public interface IPackageBuilder + { + Stream BuildPackage(PluginDescriptor pluginDescriptor); + Stream BuildPackage(ThemeManifest themeManifest); + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/IPackageInstaller.cs b/src/Libraries/SmartStore.Core/Packaging/IPackageInstaller.cs index 44005d3956..187858ab75 100644 --- a/src/Libraries/SmartStore.Core/Packaging/IPackageInstaller.cs +++ b/src/Libraries/SmartStore.Core/Packaging/IPackageInstaller.cs @@ -1,13 +1,11 @@ -using System; -using System.IO; -using NuGet; +using System.IO; namespace SmartStore.Core.Packaging { - public interface IPackageInstaller - { - //PackageInfo Install(string packageId, string version, string location, string applicationFolder); - PackageInfo Install(Stream packageStream, string location, string applicationPath); - void Uninstall(string packageId, string applicationFolder); - } + public interface IPackageInstaller + { + //PackageInfo Install(string packageId, string version, string location, string applicationFolder); + PackageInfo Install(Stream packageStream, string location, string applicationPath); + void Uninstall(string packageId, string applicationFolder); + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/IPackageManager.cs b/src/Libraries/SmartStore.Core/Packaging/IPackageManager.cs index 2478640a74..c497d2be95 100644 --- a/src/Libraries/SmartStore.Core/Packaging/IPackageManager.cs +++ b/src/Libraries/SmartStore.Core/Packaging/IPackageManager.cs @@ -1,15 +1,13 @@ -using System; -using System.IO; -using NuGet; +using System.IO; namespace SmartStore.Core.Packaging { - public interface IPackageManager - { - PackageInfo Install(Stream packageStream, string location, string applicationPath); - void Uninstall(string packageId, string applicationPath); + public interface IPackageManager + { + PackageInfo Install(Stream packageStream, string location, string applicationPath); + void Uninstall(string packageId, string applicationPath); - PackagingResult BuildPluginPackage(string pluginName); - PackagingResult BuildThemePackage(string themeName); - } -} + PackagingResult BuildPluginPackage(string pluginName); + PackagingResult BuildThemePackage(string themeName); + } +} diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs index 8a06699b59..644b6b15a7 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs @@ -1,107 +1,100 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using NuGet; using SmartStore.Core.Plugins; using SmartStore.Core.Themes; -using NuGet; namespace SmartStore.Core.Packaging { - internal abstract class ExtensionReferenceRepository : PackageRepositoryBase - { - - public ExtensionReferenceRepository(IProjectSystem project, IPackageRepository sourceRepository) - { - Guard.NotNull(project, nameof(project)); - Guard.NotNull(sourceRepository, nameof(sourceRepository)); - - Project = project; - SourceRepository = sourceRepository; - } - - public IProjectSystem Project - { - get; - set; - } - - public IPackageRepository SourceRepository - { - get; - set; - } - - public override void AddPackage(IPackage package) { } - - public override void RemovePackage(IPackage package) { } - - - public override string Source - { - get { return Project.Root; } - } - - public override bool SupportsPrereleasePackages - { - get { return true; } - } - } - - /// - /// This repository implementation informs about what plugin packages are already installed. - /// - internal class PluginReferenceRepository : ExtensionReferenceRepository - { - private readonly IList _descriptors; - - public PluginReferenceRepository(IProjectSystem project, IPackageRepository sourceRepository, IPluginFinder pluginFinder) - : base(project, sourceRepository) - { - _descriptors = pluginFinder.GetPluginDescriptors().ToList(); - } - - public override IQueryable GetPackages() - { - IEnumerable repositoryPackages = SourceRepository.GetPackages().ToList(); - IEnumerable packages = from plugin in _descriptors - let id = PackagingUtils.BuildPackageId(plugin.SystemName, "Plugin") - let version = plugin.Version != null ? new SemanticVersion(plugin.Version) : null - let package = repositoryPackages.FirstOrDefault(p => p.Id == id && (version == null || p.Version == version)) - where package != null - select package; - - return packages.AsQueryable(); - } - - } - - /// - /// This repository implementation informs about what theme packages are already installed. - /// - internal class ThemeReferenceRepository : ExtensionReferenceRepository - { - private readonly ICollection _themeManifests; - - public ThemeReferenceRepository(IProjectSystem project, IPackageRepository sourceRepository, IThemeRegistry themeRegistry) - : base(project, sourceRepository) - { - _themeManifests = themeRegistry.GetThemeManifests(true); - } - - public override IQueryable GetPackages() - { - IEnumerable repositoryPackages = SourceRepository.GetPackages().ToList(); - IEnumerable packages = from theme in _themeManifests - let id = PackagingUtils.BuildPackageId(theme.ThemeName, "Theme") - let version = theme.Version != null ? new SemanticVersion(theme.Version) : null - let package = repositoryPackages.FirstOrDefault(p => p.Id == id && (version == null || p.Version == version)) - where package != null - select package; - - return packages.AsQueryable(); - } - - } + internal abstract class ExtensionReferenceRepository : PackageRepositoryBase + { + + public ExtensionReferenceRepository(IProjectSystem project, IPackageRepository sourceRepository) + { + Guard.NotNull(project, nameof(project)); + Guard.NotNull(sourceRepository, nameof(sourceRepository)); + + Project = project; + SourceRepository = sourceRepository; + } + + public IProjectSystem Project + { + get; + set; + } + + public IPackageRepository SourceRepository + { + get; + set; + } + + public override void AddPackage(IPackage package) { } + + public override void RemovePackage(IPackage package) { } + + + public override string Source => Project.Root; + + public override bool SupportsPrereleasePackages => true; + } + + /// + /// This repository implementation informs about what plugin packages are already installed. + /// + internal class PluginReferenceRepository : ExtensionReferenceRepository + { + private readonly IList _descriptors; + + public PluginReferenceRepository(IProjectSystem project, IPackageRepository sourceRepository, IPluginFinder pluginFinder) + : base(project, sourceRepository) + { + _descriptors = pluginFinder.GetPluginDescriptors().ToList(); + } + + public override IQueryable GetPackages() + { + IEnumerable repositoryPackages = SourceRepository.GetPackages().ToList(); + IEnumerable packages = from plugin in _descriptors + let id = PackagingUtils.BuildPackageId(plugin.SystemName, "Plugin") + let version = plugin.Version != null ? new SemanticVersion(plugin.Version) : null + let package = repositoryPackages.FirstOrDefault(p => p.Id == id && (version == null || p.Version == version)) + where package != null + select package; + + return packages.AsQueryable(); + } + + } + + /// + /// This repository implementation informs about what theme packages are already installed. + /// + internal class ThemeReferenceRepository : ExtensionReferenceRepository + { + private readonly ICollection _themeManifests; + + public ThemeReferenceRepository(IProjectSystem project, IPackageRepository sourceRepository, IThemeRegistry themeRegistry) + : base(project, sourceRepository) + { + _themeManifests = themeRegistry.GetThemeManifests(true); + } + + public override IQueryable GetPackages() + { + IEnumerable repositoryPackages = SourceRepository.GetPackages().ToList(); + IEnumerable packages = from theme in _themeManifests + let id = PackagingUtils.BuildPackageId(theme.ThemeName, "Theme") + let version = theme.Version != null ? new SemanticVersion(theme.Version) : null + let package = repositoryPackages.FirstOrDefault(p => p.Id == id && (version == null || p.Version == version)) + where package != null + select package; + + return packages.AsQueryable(); + } + + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs index a32cae4e91..22e5a3c580 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs @@ -1,97 +1,85 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Reflection; using System.Runtime.Versioning; using NuGet; namespace SmartStore.Core.Packaging { - internal class FileBasedProjectSystem : PhysicalFileSystem, IProjectSystem - { - - public FileBasedProjectSystem(string root) - : base(root) - { - } - - public void AddFrameworkReference(string name) - { - throw new NotSupportedException(); - } - - public void AddImport(string targetPath, ProjectImportLocation location) - { - throw new NotSupportedException(); - } - - public void AddReference(string referencePath, Stream stream) - { - throw new NotSupportedException(); - } - - public bool FileExistsInProject(string path) - { - return FileExists(path); - } - - public bool IsBindingRedirectSupported - { - get { return false; } - } - - public bool IsSupportedFile(string path) - { - return true; - } - - public string ProjectName - { - get { return Root; } - } - - protected virtual string GetReferencePath(string name) - { - return Path.Combine("bin", name); - } - - public bool ReferenceExists(string name) - { - string path = GetReferencePath(name); - return FileExists(path); - } - - public void RemoveImport(string targetPath) - { - throw new NotSupportedException(); - } - - public void RemoveReference(string name) - { - throw new NotSupportedException(); - } - - public string ResolvePath(string path) - { - return GetFullPath(path); - } - - public FrameworkName TargetFramework - { - get { return VersionUtility.DefaultTargetFramework; } - } - - public dynamic GetPropertyValue(string propertyName) - { - if (propertyName == null) - { - return null; - } - - // Return empty string for the root namespace of this project. - return propertyName.Equals("RootNamespace", StringComparison.OrdinalIgnoreCase) ? String.Empty : null; - } - } + internal class FileBasedProjectSystem : PhysicalFileSystem, IProjectSystem + { + + public FileBasedProjectSystem(string root) + : base(root) + { + } + + public void AddFrameworkReference(string name) + { + throw new NotSupportedException(); + } + + public void AddImport(string targetPath, ProjectImportLocation location) + { + throw new NotSupportedException(); + } + + public void AddReference(string referencePath, Stream stream) + { + throw new NotSupportedException(); + } + + public bool FileExistsInProject(string path) + { + return FileExists(path); + } + + public bool IsBindingRedirectSupported => false; + + public bool IsSupportedFile(string path) + { + return true; + } + + public string ProjectName => Root; + + protected virtual string GetReferencePath(string name) + { + return Path.Combine("bin", name); + } + + public bool ReferenceExists(string name) + { + string path = GetReferencePath(name); + return FileExists(path); + } + + public void RemoveImport(string targetPath) + { + throw new NotSupportedException(); + } + + public void RemoveReference(string name) + { + throw new NotSupportedException(); + } + + public string ResolvePath(string path) + { + return GetFullPath(path); + } + + public FrameworkName TargetFramework => VersionUtility.DefaultTargetFramework; + + public dynamic GetPropertyValue(string propertyName) + { + if (propertyName == null) + { + return null; + } + + // Return empty string for the root namespace of this project. + return propertyName.Equals("RootNamespace", StringComparison.OrdinalIgnoreCase) ? String.Empty : null; + } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs index f2c4c8a65f..8a2942f601 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs @@ -5,37 +5,37 @@ namespace SmartStore.Core.Packaging { - internal class NugetLogger : NuGet.ILogger - { - private readonly Log.ILogger _logger; + internal class NugetLogger : NuGet.ILogger + { + private readonly Log.ILogger _logger; - public NugetLogger(Log.ILogger logger) - { - _logger = logger; - } + public NugetLogger(Log.ILogger logger) + { + _logger = logger; + } - public void Log(MessageLevel level, string message, params object[] args) - { - switch (level) - { - case MessageLevel.Debug: - _logger.Debug(String.Format(message, args)); - break; - case MessageLevel.Error: - _logger.Error(String.Format(message, args)); - break; - case MessageLevel.Info: - _logger.Info(String.Format(message, args)); - break; - case MessageLevel.Warning: - _logger.Warn(String.Format(message, args)); - break; - } - } + public void Log(MessageLevel level, string message, params object[] args) + { + switch (level) + { + case MessageLevel.Debug: + _logger.Debug(String.Format(message, args)); + break; + case MessageLevel.Error: + _logger.Error(String.Format(message, args)); + break; + case MessageLevel.Info: + _logger.Info(String.Format(message, args)); + break; + case MessageLevel.Warning: + _logger.Warn(String.Format(message, args)); + break; + } + } - public FileConflictResolution ResolveFileConflict(string message) - { - return FileConflictResolution.OverwriteAll; - } - } + public FileConflictResolution ResolveFileConflict(string message) + { + return FileConflictResolution.OverwriteAll; + } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs index 5d98420378..24d9271ae6 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs @@ -1,34 +1,24 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; using NuGet; -using SmartStore.Utilities; namespace SmartStore.Core.Packaging { - /// - /// This repository implementation fakes a source (remote) repository - /// - internal class NullSourceRepository : PackageRepositoryBase - { - public override IQueryable GetPackages() - { - return Enumerable.Empty().AsQueryable(); - } + /// + /// This repository implementation fakes a source (remote) repository + /// + internal class NullSourceRepository : PackageRepositoryBase + { + public override IQueryable GetPackages() + { + return Enumerable.Empty().AsQueryable(); + } - public override string Source - { - get { return string.Empty; } - } + public override string Source => string.Empty; - public override bool SupportsPrereleasePackages - { - get { return true; } - } + public override bool SupportsPrereleasePackages => true; - public override void AddPackage(IPackage package) { } + public override void AddPackage(IPackage package) { } - public override void RemovePackage(IPackage package) { } - } + public override void RemovePackage(IPackage package) { } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs b/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs index c156852da3..d3d23fda59 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs @@ -1,201 +1,189 @@ using System; using System.Collections.Generic; -using System.Linq; using System.IO; +using System.Linq; +using System.Runtime.Versioning; +using NuGet; +using SmartStore.Core.IO; using SmartStore.Core.Plugins; using SmartStore.Core.Themes; -using NuGet; using NuGetPackageBuilder = NuGet.PackageBuilder; -using SmartStore.Core.IO; -using System.Runtime.Versioning; namespace SmartStore.Core.Packaging { - public class PackageBuilder : IPackageBuilder - { - private readonly IApplicationEnvironment _env; + public class PackageBuilder : IPackageBuilder + { + private readonly IApplicationEnvironment _env; - public PackageBuilder(IApplicationEnvironment env) - { - this._env = env; - } + public PackageBuilder(IApplicationEnvironment env) + { + this._env = env; + } - private static readonly string[] _ignoredThemeExtensions = new[] { + private static readonly string[] _ignoredThemeExtensions = new[] { "obj", "pdb", "exclude" }; - private static readonly string[] _ignoredThemePaths = new[] { + private static readonly string[] _ignoredThemePaths = new[] { "/obj/" }; - private static bool IgnoreFile(string filePath) - { - return String.IsNullOrEmpty(filePath) || - _ignoredThemePaths.Any(filePath.Contains) || - _ignoredThemeExtensions.Contains(Path.GetExtension(filePath).NullEmpty() ?? ""); - } - - - public Stream BuildPackage(PluginDescriptor pluginDescriptor) - { - return BuildPackage(pluginDescriptor.ConvertToExtensionDescriptor()); - } - - public Stream BuildPackage(ThemeManifest themeManifest) - { - return BuildPackage(themeManifest.ConvertToExtensionDescriptor()); - } - - private Stream BuildPackage(ExtensionDescriptor extensionDescriptor) - { - var context = new BuildContext(); - BeginPackage(context); - try - { - EstablishPaths(context, _env.WebRootFolder, extensionDescriptor.Id, extensionDescriptor.ExtensionType); - SetCoreProperties(context, extensionDescriptor); - EmbedFiles(context); - } - finally - { - EndPackage(context); - } - - if (context.Stream.CanSeek) - { - context.Stream.Seek(0, SeekOrigin.Begin); - } - - return context.Stream; - } - - private static void BeginPackage(BuildContext context) - { - context.Stream = new MemoryStream(); - context.Builder = new NuGetPackageBuilder(); - } - - private static void EndPackage(BuildContext context) - { - context.Builder.Save(context.Stream); - } - - private static void SetCoreProperties(BuildContext context, ExtensionDescriptor extensionDescriptor) - { - context.Builder.Id = PackagingUtils.BuildPackageId(extensionDescriptor.Id, extensionDescriptor.ExtensionType); - context.Builder.Version = new SemanticVersion(extensionDescriptor.Version); - context.Builder.Title = extensionDescriptor.Name ?? extensionDescriptor.Id; - context.Builder.Description = extensionDescriptor.Description.NullEmpty() ?? "No Description"; - context.Builder.Authors.Add(extensionDescriptor.Author ?? "Unknown"); - - if (Uri.IsWellFormedUriString(extensionDescriptor.WebSite, UriKind.Absolute)) - { - context.Builder.ProjectUrl = new Uri(extensionDescriptor.WebSite); - } - } - - private static void EstablishPaths(BuildContext context, IVirtualFolder webRootFolder, string extensionName, string extensionType = "Plugin") - { - context.SourceFolder = webRootFolder; - if (extensionType.IsCaseInsensitiveEqual("theme")) - { - context.SourcePath = "Themes/" + extensionName + "/"; - context.TargetPath = "\\Content\\Themes\\" + extensionName + "\\"; - } - else - { - context.SourcePath = "Plugins/" + extensionName + "/"; - context.TargetPath = "\\Content\\Plugins\\" + extensionName + "\\"; - } - } - - private static void EmbedFiles(BuildContext context) - { - var basePath = context.SourcePath; - foreach (var path in context.SourceFolder.ListFiles(context.SourcePath, true)) - { - // skip ignores files - if (IgnoreFile(path)) - { - continue; - } - // full virtual path given but we need the relative path so it can be put into - // the package that way (the package itself is the logical base path). - // Get it by stripping the basePath off including the slash. - var relativePath = path.Replace(basePath, ""); - EmbedVirtualFile(context, relativePath); - } - } - - private static void EmbedVirtualFile(BuildContext context, string relativePath) - { - var file = new VirtualPackageFile( - context.SourceFolder, - context.SourcePath + relativePath, - context.TargetPath + relativePath); - context.Builder.Files.Add(file); - } - - - #region Nested type: BuildContext - - private class BuildContext - { - public Stream Stream { get; set; } - public NuGetPackageBuilder Builder { get; set; } - - public IVirtualFolder SourceFolder { get; set; } - public string SourcePath { get; set; } - public string TargetPath { get; set; } - } - - #endregion - - #region Nested type: VirtualPackageFile - - private class VirtualPackageFile : IPackageFile - { - private readonly IVirtualFolder _webRootFolder; - private readonly string _relativePath; - private readonly string _packagePath; - - public VirtualPackageFile(IVirtualFolder webRootFolder, string relativePath, string packagePath) - { - _webRootFolder = webRootFolder; - _relativePath = relativePath; - _packagePath = packagePath; - } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Supposed to return an open stream.")] - public Stream GetStream() - { - var stream = new MemoryStream(); - _webRootFolder.CopyFile(_relativePath, stream); - stream.Seek(0, SeekOrigin.Begin); - return stream; - } - - public string Path - { - get { return _packagePath; } - } - - public string EffectivePath - { - get { return _packagePath; } - } - - public FrameworkName TargetFramework - { - get { return null; } - } - - public IEnumerable SupportedFrameworks - { - get { return Enumerable.Empty(); } - } - } - - #endregion - } + private static bool IgnoreFile(string filePath) + { + return String.IsNullOrEmpty(filePath) || + _ignoredThemePaths.Any(filePath.Contains) || + _ignoredThemeExtensions.Contains(Path.GetExtension(filePath).NullEmpty() ?? ""); + } + + + public Stream BuildPackage(PluginDescriptor pluginDescriptor) + { + return BuildPackage(pluginDescriptor.ConvertToExtensionDescriptor()); + } + + public Stream BuildPackage(ThemeManifest themeManifest) + { + return BuildPackage(themeManifest.ConvertToExtensionDescriptor()); + } + + private Stream BuildPackage(ExtensionDescriptor extensionDescriptor) + { + var context = new BuildContext(); + BeginPackage(context); + try + { + EstablishPaths(context, _env.WebRootFolder, extensionDescriptor.Id, extensionDescriptor.ExtensionType); + SetCoreProperties(context, extensionDescriptor); + EmbedFiles(context); + } + finally + { + EndPackage(context); + } + + if (context.Stream.CanSeek) + { + context.Stream.Seek(0, SeekOrigin.Begin); + } + + return context.Stream; + } + + private static void BeginPackage(BuildContext context) + { + context.Stream = new MemoryStream(); + context.Builder = new NuGetPackageBuilder(); + } + + private static void EndPackage(BuildContext context) + { + context.Builder.Save(context.Stream); + } + + private static void SetCoreProperties(BuildContext context, ExtensionDescriptor extensionDescriptor) + { + context.Builder.Id = PackagingUtils.BuildPackageId(extensionDescriptor.Id, extensionDescriptor.ExtensionType); + context.Builder.Version = new SemanticVersion(extensionDescriptor.Version); + context.Builder.Title = extensionDescriptor.Name ?? extensionDescriptor.Id; + context.Builder.Description = extensionDescriptor.Description.NullEmpty() ?? "No Description"; + context.Builder.Authors.Add(extensionDescriptor.Author ?? "Unknown"); + + if (Uri.IsWellFormedUriString(extensionDescriptor.WebSite, UriKind.Absolute)) + { + context.Builder.ProjectUrl = new Uri(extensionDescriptor.WebSite); + } + } + + private static void EstablishPaths(BuildContext context, IVirtualFolder webRootFolder, string extensionName, string extensionType = "Plugin") + { + context.SourceFolder = webRootFolder; + if (extensionType.IsCaseInsensitiveEqual("theme")) + { + context.SourcePath = "Themes/" + extensionName + "/"; + context.TargetPath = "\\Content\\Themes\\" + extensionName + "\\"; + } + else + { + context.SourcePath = "Plugins/" + extensionName + "/"; + context.TargetPath = "\\Content\\Plugins\\" + extensionName + "\\"; + } + } + + private static void EmbedFiles(BuildContext context) + { + var basePath = context.SourcePath; + foreach (var path in context.SourceFolder.ListFiles(context.SourcePath, true)) + { + // skip ignores files + if (IgnoreFile(path)) + { + continue; + } + // full virtual path given but we need the relative path so it can be put into + // the package that way (the package itself is the logical base path). + // Get it by stripping the basePath off including the slash. + var relativePath = path.Replace(basePath, ""); + EmbedVirtualFile(context, relativePath); + } + } + + private static void EmbedVirtualFile(BuildContext context, string relativePath) + { + var file = new VirtualPackageFile( + context.SourceFolder, + context.SourcePath + relativePath, + context.TargetPath + relativePath); + context.Builder.Files.Add(file); + } + + + #region Nested type: BuildContext + + private class BuildContext + { + public Stream Stream { get; set; } + public NuGetPackageBuilder Builder { get; set; } + + public IVirtualFolder SourceFolder { get; set; } + public string SourcePath { get; set; } + public string TargetPath { get; set; } + } + + #endregion + + #region Nested type: VirtualPackageFile + + private class VirtualPackageFile : IPackageFile + { + private readonly IVirtualFolder _webRootFolder; + private readonly string _relativePath; + private readonly string _packagePath; + + public VirtualPackageFile(IVirtualFolder webRootFolder, string relativePath, string packagePath) + { + _webRootFolder = webRootFolder; + _relativePath = relativePath; + _packagePath = packagePath; + } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Supposed to return an open stream.")] + public Stream GetStream() + { + var stream = new MemoryStream(); + _webRootFolder.CopyFile(_relativePath, stream); + stream.Seek(0, SeekOrigin.Begin); + return stream; + } + + public string Path => _packagePath; + + public string EffectivePath => _packagePath; + + public FrameworkName TargetFramework => null; + + public IEnumerable SupportedFrameworks => Enumerable.Empty(); + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageInfo.cs b/src/Libraries/SmartStore.Core/Packaging/PackageInfo.cs index 2de699d27a..410c992ec2 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackageInfo.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackageInfo.cs @@ -1,17 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace SmartStore.Core.Packaging +namespace SmartStore.Core.Packaging { - public class PackageInfo - { - public string Id { get; set; } - public string Name { get; set; } - public string Version { get; set; } - public string Type { get; set; } - public string Path { get; set; } - public ExtensionDescriptor ExtensionDescriptor { get; set; } - } + public class PackageInfo + { + public string Id { get; set; } + public string Name { get; set; } + public string Version { get; set; } + public string Type { get; set; } + public string Path { get; set; } + public ExtensionDescriptor ExtensionDescriptor { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs b/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs index 935b00e542..98e98970dd 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs @@ -1,299 +1,296 @@ using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; -using System.Linq; using NuGet; -using NuGetPackageManager = NuGet.PackageManager; +using SmartStore.Core.IO; +using SmartStore.Core.Localization; using SmartStore.Core.Logging; -using Log = SmartStore.Core.Logging; using SmartStore.Core.Plugins; using SmartStore.Core.Themes; -using SmartStore.Core.IO; -using SmartStore.Core; -using SmartStore.Core.Localization; +using Log = SmartStore.Core.Logging; namespace SmartStore.Core.Packaging { - public class PackageInstaller : IPackageInstaller - { - private readonly IVirtualPathProvider _virtualPathProvider; - private readonly IPluginFinder _pluginFinder; - private readonly IThemeRegistry _themeRegistry; - private readonly IFolderUpdater _folderUpdater; - private readonly INotifier _notifier; - private readonly Log.ILogger _logger; - - public PackageInstaller( - IVirtualPathProvider virtualPathProvider, - IPluginFinder pluginFinder, - IThemeRegistry themeRegistry, - IFolderUpdater folderUpdater, - INotifier notifier, - Log.ILogger logger) - { - _virtualPathProvider = virtualPathProvider; - _pluginFinder = pluginFinder; - _themeRegistry = themeRegistry; - _folderUpdater = folderUpdater; - _notifier = notifier; - _logger = logger; - } - - public Localizer T { get; set; } - - //public PackageInfo Install(string packageId, string version, string location, string applicationFolder) - //{ - // // instantiates the appropriate package repository - // IPackageRepository packageRepository = PackageRepositoryFactory.Default.CreateRepository(location); - - // // gets an IPackage instance from the repository - // var packageVersion = String.IsNullOrEmpty(version) ? null : new SemanticVersion(version); - // var package = packageRepository.FindPackage(packageId, packageVersion); - // if (package == null) - // { - // throw new ArgumentException("The specified package could not be found, id:{0} version:{1}".FormatCurrent(packageId, version.IsEmpty() ? "No version" : version)); - // } - - // return InstallPackage(package, packageRepository, location, applicationFolder); - //} - - public PackageInfo Install(Stream packageStream, string location, string applicationPath) - { - Guard.NotNull(packageStream, nameof(packageStream)); - - IPackage package; - try - { - package = new ZipPackage(packageStream); - - } - catch (Exception ex) - { - throw new SmartException(T("Admin.Packaging.StreamError"), ex); - } - - // instantiates the appropriate package repository - var packageRepository = new NullSourceRepository(); - return InstallPackage(package, packageRepository, location, applicationPath); - } - - /// - /// Tries to install the package - /// - /// The package to install - /// The repository - /// The virtual location of the package file, usually ~/App_Data - /// The virtual app root path, usually ~/ - /// An instance of type - protected PackageInfo InstallPackage(IPackage package, IPackageRepository packageRepository, string location, string applicationPath) - { - bool previousInstalled; - - // 1. See if extension was previous installed and backup its folder if so - try - { - previousInstalled = BackupExtensionFolder(package.ExtensionFolder(), package.ExtensionId()); - } - catch (Exception exception) - { - throw new SmartException(T("Admin.Packaging.BackupError"), exception); - } - - if (previousInstalled) - { - // 2. If extension is installed, need to un-install first - try - { - UninstallExtensionIfNeeded(package); - } - catch (Exception exception) - { - throw new SmartException(T("Admin.Packaging.UninstallError"), exception); - } - } - - var packageInfo = ExecuteInstall(package, packageRepository, location, applicationPath); - - // check if the new package is compatible with current SmartStore version - var descriptor = package.GetExtensionDescriptor(packageInfo.Type); - - if (descriptor != null) - { - packageInfo.ExtensionDescriptor = descriptor; - - if (!PluginManager.IsAssumedCompatible(descriptor.MinAppVersion)) - { - if (previousInstalled) - { - // restore the previous version - RestoreExtensionFolder(package.ExtensionFolder(), package.ExtensionId()); - } - else - { - // just uninstall the new package - Uninstall(package.Id, _virtualPathProvider.MapPath("~\\")); - } - - var msg = T("Admin.Packaging.IsIncompatible", SmartStoreVersion.CurrentFullVersion); - _logger.Error(msg); - throw new SmartException(msg); - } - } - - return packageInfo; - } - - /// - /// Executes a package installation. - /// - /// The package to install. - /// The repository for the package. - /// The source location. - /// The path where to install the package. - /// The package information. - protected PackageInfo ExecuteInstall(IPackage package, IPackageRepository packageRepository, string sourceLocation, string targetPath) - { - var logger = new NugetLogger(_logger); - - var project = new FileBasedProjectSystem(targetPath) { Logger = logger }; - - IPackageRepository referenceRepository; - if (package.IsTheme()) - { - referenceRepository = new ThemeReferenceRepository(project, packageRepository, _themeRegistry); - } - else - { - referenceRepository = new PluginReferenceRepository(project, packageRepository, _pluginFinder); - } - - var projectManager = new ProjectManager( - packageRepository, - new DefaultPackagePathResolver(targetPath), - project, - referenceRepository - ) { Logger = logger }; - - // add the package to the project - projectManager.AddPackageReference(package, true, false); - - return new PackageInfo - { - Id = package.Id, - Name = package.Title ?? package.Id, - Version = package.Version.ToString(), - Type = package.IsTheme() ? "Theme" : "Plugin", - Path = targetPath - }; - } - - public void Uninstall(string packageId, string applicationFolder) - { - string extensionFullPath = string.Empty; - - if (packageId.StartsWith(PackagingUtils.GetExtensionPrefix("Theme"))) - { - extensionFullPath = _virtualPathProvider.MapPath("~/Themes/" + packageId.Substring(PackagingUtils.GetExtensionPrefix("Theme").Length)); - } - else if (packageId.StartsWith(PackagingUtils.GetExtensionPrefix("Plugin"))) - { - extensionFullPath = _virtualPathProvider.MapPath("~/Plugins/" + packageId.Substring(PackagingUtils.GetExtensionPrefix("Plugin").Length)); - } - - if (string.IsNullOrEmpty(extensionFullPath) || !System.IO.Directory.Exists(extensionFullPath)) - { - throw new SmartException(T("Admin.Packaging.NotFound", packageId)); - } - - // If the package was not installed through nuget we still need to try to uninstall it by removing its directory - if (Directory.Exists(extensionFullPath)) - { - Directory.Delete(extensionFullPath, true); - } - } - - [SuppressMessage("ReSharper", "UnusedMethodReturnValue.Local")] - private bool RestoreExtensionFolder(string extensionFolder, string extensionId) - { - var virtualSource = _virtualPathProvider.Combine("~", extensionFolder, extensionId); - var source = new DirectoryInfo(_virtualPathProvider.MapPath(virtualSource)); - - if (source.Exists) - { - var tempPath = _virtualPathProvider.Combine("~/App_Data", "_Backup", extensionFolder, extensionId); - string localTempPath = null; - for (int i = 0; i < 1000; i++) - { - localTempPath = _virtualPathProvider.MapPath(tempPath) + (i == 0 ? "" : "." + i.ToString()); - if (!System.IO.Directory.Exists(localTempPath)) - { - System.IO.Directory.CreateDirectory(localTempPath); - break; - } - localTempPath = null; - } - - if (localTempPath == null) - { - throw new SmartException(T("Admin.Packaging.TooManyBackups", tempPath)); - } - - var backupFolder = new DirectoryInfo(localTempPath); - _folderUpdater.Restore(backupFolder, source); - _notifier.Information(T("Admin.Packaging.RestoreSuccess", virtualSource)); - - return true; - } - - return false; - } - - private bool BackupExtensionFolder(string extensionFolder, string extensionId) - { - var source = new DirectoryInfo(_virtualPathProvider.MapPath(_virtualPathProvider.Combine("~", extensionFolder, extensionId))); - - if (source.Exists) - { - var tempPath = _virtualPathProvider.Combine("~/App_Data", "_Backup", extensionFolder, extensionId); - string localTempPath = null; - for (int i = 0; i < 1000; i++) - { - localTempPath = _virtualPathProvider.MapPath(tempPath) + (i == 0 ? "" : "." + i.ToString()); - if (!System.IO.Directory.Exists(localTempPath)) - { - System.IO.Directory.CreateDirectory(localTempPath); - break; - } - localTempPath = null; - } - - if (localTempPath == null) - { - throw new SmartException(T("Admin.Packaging.TooManyBackups", tempPath)); - } - - var backupFolder = new DirectoryInfo(localTempPath); - _folderUpdater.Backup(source, backupFolder); - _notifier.Information(T("Admin.Packaging.BackupSuccess", backupFolder.Name)); - - return true; - } - - return false; - } - - private void UninstallExtensionIfNeeded(IPackage package) - { - // Nuget requires to un-install the currently installed packages if the new - // package is the same version or an older version - try - { - Uninstall(package.Id, _virtualPathProvider.MapPath("~\\")); - //_notifier.Information("Successfully un-installed local package {0}".FormatInvariant(package.ExtensionId())); - } - catch { } - } - } + public class PackageInstaller : IPackageInstaller + { + private readonly IVirtualPathProvider _virtualPathProvider; + private readonly IPluginFinder _pluginFinder; + private readonly IThemeRegistry _themeRegistry; + private readonly IFolderUpdater _folderUpdater; + private readonly INotifier _notifier; + private readonly Log.ILogger _logger; + + public PackageInstaller( + IVirtualPathProvider virtualPathProvider, + IPluginFinder pluginFinder, + IThemeRegistry themeRegistry, + IFolderUpdater folderUpdater, + INotifier notifier, + Log.ILogger logger) + { + _virtualPathProvider = virtualPathProvider; + _pluginFinder = pluginFinder; + _themeRegistry = themeRegistry; + _folderUpdater = folderUpdater; + _notifier = notifier; + _logger = logger; + } + + public Localizer T { get; set; } + + //public PackageInfo Install(string packageId, string version, string location, string applicationFolder) + //{ + // // instantiates the appropriate package repository + // IPackageRepository packageRepository = PackageRepositoryFactory.Default.CreateRepository(location); + + // // gets an IPackage instance from the repository + // var packageVersion = String.IsNullOrEmpty(version) ? null : new SemanticVersion(version); + // var package = packageRepository.FindPackage(packageId, packageVersion); + // if (package == null) + // { + // throw new ArgumentException("The specified package could not be found, id:{0} version:{1}".FormatCurrent(packageId, version.IsEmpty() ? "No version" : version)); + // } + + // return InstallPackage(package, packageRepository, location, applicationFolder); + //} + + public PackageInfo Install(Stream packageStream, string location, string applicationPath) + { + Guard.NotNull(packageStream, nameof(packageStream)); + + IPackage package; + try + { + package = new ZipPackage(packageStream); + + } + catch (Exception ex) + { + throw new SmartException(T("Admin.Packaging.StreamError"), ex); + } + + // instantiates the appropriate package repository + var packageRepository = new NullSourceRepository(); + return InstallPackage(package, packageRepository, location, applicationPath); + } + + /// + /// Tries to install the package + /// + /// The package to install + /// The repository + /// The virtual location of the package file, usually ~/App_Data + /// The virtual app root path, usually ~/ + /// An instance of type + protected PackageInfo InstallPackage(IPackage package, IPackageRepository packageRepository, string location, string applicationPath) + { + bool previousInstalled; + + // 1. See if extension was previous installed and backup its folder if so + try + { + previousInstalled = BackupExtensionFolder(package.ExtensionFolder(), package.ExtensionId()); + } + catch (Exception exception) + { + throw new SmartException(T("Admin.Packaging.BackupError"), exception); + } + + if (previousInstalled) + { + // 2. If extension is installed, need to un-install first + try + { + UninstallExtensionIfNeeded(package); + } + catch (Exception exception) + { + throw new SmartException(T("Admin.Packaging.UninstallError"), exception); + } + } + + var packageInfo = ExecuteInstall(package, packageRepository, location, applicationPath); + + // check if the new package is compatible with current SmartStore version + var descriptor = package.GetExtensionDescriptor(packageInfo.Type); + + if (descriptor != null) + { + packageInfo.ExtensionDescriptor = descriptor; + + if (!PluginManager.IsAssumedCompatible(descriptor.MinAppVersion)) + { + if (previousInstalled) + { + // restore the previous version + RestoreExtensionFolder(package.ExtensionFolder(), package.ExtensionId()); + } + else + { + // just uninstall the new package + Uninstall(package.Id, _virtualPathProvider.MapPath("~\\")); + } + + var msg = T("Admin.Packaging.IsIncompatible", SmartStoreVersion.CurrentFullVersion); + _logger.Error(msg); + throw new SmartException(msg); + } + } + + return packageInfo; + } + + /// + /// Executes a package installation. + /// + /// The package to install. + /// The repository for the package. + /// The source location. + /// The path where to install the package. + /// The package information. + protected PackageInfo ExecuteInstall(IPackage package, IPackageRepository packageRepository, string sourceLocation, string targetPath) + { + var logger = new NugetLogger(_logger); + + var project = new FileBasedProjectSystem(targetPath) { Logger = logger }; + + IPackageRepository referenceRepository; + if (package.IsTheme()) + { + referenceRepository = new ThemeReferenceRepository(project, packageRepository, _themeRegistry); + } + else + { + referenceRepository = new PluginReferenceRepository(project, packageRepository, _pluginFinder); + } + + var projectManager = new ProjectManager( + packageRepository, + new DefaultPackagePathResolver(targetPath), + project, + referenceRepository + ) + { Logger = logger }; + + // add the package to the project + projectManager.AddPackageReference(package, true, false); + + return new PackageInfo + { + Id = package.Id, + Name = package.Title ?? package.Id, + Version = package.Version.ToString(), + Type = package.IsTheme() ? "Theme" : "Plugin", + Path = targetPath + }; + } + + public void Uninstall(string packageId, string applicationFolder) + { + string extensionFullPath = string.Empty; + + if (packageId.StartsWith(PackagingUtils.GetExtensionPrefix("Theme"))) + { + extensionFullPath = _virtualPathProvider.MapPath("~/Themes/" + packageId.Substring(PackagingUtils.GetExtensionPrefix("Theme").Length)); + } + else if (packageId.StartsWith(PackagingUtils.GetExtensionPrefix("Plugin"))) + { + extensionFullPath = _virtualPathProvider.MapPath("~/Plugins/" + packageId.Substring(PackagingUtils.GetExtensionPrefix("Plugin").Length)); + } + + if (string.IsNullOrEmpty(extensionFullPath) || !System.IO.Directory.Exists(extensionFullPath)) + { + throw new SmartException(T("Admin.Packaging.NotFound", packageId)); + } + + // If the package was not installed through nuget we still need to try to uninstall it by removing its directory + if (Directory.Exists(extensionFullPath)) + { + Directory.Delete(extensionFullPath, true); + } + } + + [SuppressMessage("ReSharper", "UnusedMethodReturnValue.Local")] + private bool RestoreExtensionFolder(string extensionFolder, string extensionId) + { + var virtualSource = _virtualPathProvider.Combine("~", extensionFolder, extensionId); + var source = new DirectoryInfo(_virtualPathProvider.MapPath(virtualSource)); + + if (source.Exists) + { + var tempPath = _virtualPathProvider.Combine("~/App_Data", "_Backup", extensionFolder, extensionId); + string localTempPath = null; + for (int i = 0; i < 1000; i++) + { + localTempPath = _virtualPathProvider.MapPath(tempPath) + (i == 0 ? "" : "." + i.ToString()); + if (!System.IO.Directory.Exists(localTempPath)) + { + System.IO.Directory.CreateDirectory(localTempPath); + break; + } + localTempPath = null; + } + + if (localTempPath == null) + { + throw new SmartException(T("Admin.Packaging.TooManyBackups", tempPath)); + } + + var backupFolder = new DirectoryInfo(localTempPath); + _folderUpdater.Restore(backupFolder, source); + _notifier.Information(T("Admin.Packaging.RestoreSuccess", virtualSource)); + + return true; + } + + return false; + } + + private bool BackupExtensionFolder(string extensionFolder, string extensionId) + { + var source = new DirectoryInfo(_virtualPathProvider.MapPath(_virtualPathProvider.Combine("~", extensionFolder, extensionId))); + + if (source.Exists) + { + var tempPath = _virtualPathProvider.Combine("~/App_Data", "_Backup", extensionFolder, extensionId); + string localTempPath = null; + for (int i = 0; i < 1000; i++) + { + localTempPath = _virtualPathProvider.MapPath(tempPath) + (i == 0 ? "" : "." + i.ToString()); + if (!System.IO.Directory.Exists(localTempPath)) + { + System.IO.Directory.CreateDirectory(localTempPath); + break; + } + localTempPath = null; + } + + if (localTempPath == null) + { + throw new SmartException(T("Admin.Packaging.TooManyBackups", tempPath)); + } + + var backupFolder = new DirectoryInfo(localTempPath); + _folderUpdater.Backup(source, backupFolder); + _notifier.Information(T("Admin.Packaging.BackupSuccess", backupFolder.Name)); + + return true; + } + + return false; + } + + private void UninstallExtensionIfNeeded(IPackage package) + { + // Nuget requires to un-install the currently installed packages if the new + // package is the same version or an older version + try + { + Uninstall(package.Id, _virtualPathProvider.MapPath("~\\")); + //_notifier.Information("Successfully un-installed local package {0}".FormatInvariant(package.ExtensionId())); + } + catch { } + } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs b/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs index 2d1285007f..0e399621c1 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs @@ -1,98 +1,95 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.IO; -using NuGet; -using Log = SmartStore.Core.Logging; using SmartStore.Core.Plugins; using SmartStore.Core.Themes; +using Log = SmartStore.Core.Logging; namespace SmartStore.Core.Packaging { - public class PackageManager : IPackageManager - { - private readonly IPluginFinder _pluginFinder; - private readonly IThemeRegistry _themeRegistry; - private readonly IPackageBuilder _packageBuilder; - private readonly IPackageInstaller _packageInstaller; - private readonly Log.ILogger _logger; + public class PackageManager : IPackageManager + { + private readonly IPluginFinder _pluginFinder; + private readonly IThemeRegistry _themeRegistry; + private readonly IPackageBuilder _packageBuilder; + private readonly IPackageInstaller _packageInstaller; + private readonly Log.ILogger _logger; - public PackageManager( - IPluginFinder pluginFinder, - IThemeRegistry themeRegistry, - IPackageBuilder packageBuilder, - IPackageInstaller packageInstaller, - Log.ILogger logger) - { - _pluginFinder = pluginFinder; - _themeRegistry = themeRegistry; - _packageBuilder = packageBuilder; - _packageInstaller = packageInstaller; - _logger = logger; - } + public PackageManager( + IPluginFinder pluginFinder, + IThemeRegistry themeRegistry, + IPackageBuilder packageBuilder, + IPackageInstaller packageInstaller, + Log.ILogger logger) + { + _pluginFinder = pluginFinder; + _themeRegistry = themeRegistry; + _packageBuilder = packageBuilder; + _packageInstaller = packageInstaller; + _logger = logger; + } - private PackageInfo DoInstall(Func installer) - { - try - { - return installer(); - } - catch (SmartException) - { - throw; - } - catch (Exception exception) - { - var message = "There was an error installing the requested package. " + - "This can happen if the server does not have write access to the '~/Plugins' or '~/Themes' folder of the web site. " + - "If the site is running in shared hosted environement, adding write access to these folders sometimes needs to be done manually through the Hoster control panel. " + - "Once Themes and Plugins have been installed, it is recommended to remove write access to these folders."; - throw new SmartException(message, exception); - } - } + private PackageInfo DoInstall(Func installer) + { + try + { + return installer(); + } + catch (SmartException) + { + throw; + } + catch (Exception exception) + { + var message = "There was an error installing the requested package. " + + "This can happen if the server does not have write access to the '~/Plugins' or '~/Themes' folder of the web site. " + + "If the site is running in shared hosted environement, adding write access to these folders sometimes needs to be done manually through the Hoster control panel. " + + "Once Themes and Plugins have been installed, it is recommended to remove write access to these folders."; + throw new SmartException(message, exception); + } + } - public PackageInfo Install(Stream packageStream, string location, string applicationPath) - { - return DoInstall(() => _packageInstaller.Install(packageStream, location, applicationPath)); - } + public PackageInfo Install(Stream packageStream, string location, string applicationPath) + { + return DoInstall(() => _packageInstaller.Install(packageStream, location, applicationPath)); + } - public void Uninstall(string packageId, string applicationPath) - { - _packageInstaller.Uninstall(packageId, applicationPath); - } + public void Uninstall(string packageId, string applicationPath) + { + _packageInstaller.Uninstall(packageId, applicationPath); + } - public PackagingResult BuildPluginPackage(string pluginName) - { - var pluginDescriptor = _pluginFinder.GetPluginDescriptorBySystemName(pluginName); - if (pluginDescriptor == null) - { - return null; - } - return new PackagingResult - { - ExtensionType = "Plugin", - PackageName = pluginDescriptor.FolderName, - PackageVersion = pluginDescriptor.Version.ToString(), - PackageStream = _packageBuilder.BuildPackage(pluginDescriptor) - }; - } + public PackagingResult BuildPluginPackage(string pluginName) + { + var pluginDescriptor = _pluginFinder.GetPluginDescriptorBySystemName(pluginName); + if (pluginDescriptor == null) + { + return null; + } + return new PackagingResult + { + ExtensionType = "Plugin", + PackageName = pluginDescriptor.FolderName, + PackageVersion = pluginDescriptor.Version.ToString(), + PackageStream = _packageBuilder.BuildPackage(pluginDescriptor) + }; + } - public PackagingResult BuildThemePackage(string themeName) - { - var themeManifest = _themeRegistry.GetThemeManifest(themeName); - if (themeName == null) - { - return null; - } - return new PackagingResult - { - ExtensionType = "Theme", - PackageName = themeManifest.ThemeName, - PackageVersion = themeManifest.Version, - PackageStream = _packageBuilder.BuildPackage(themeManifest) - }; - } - } + public PackagingResult BuildThemePackage(string themeName) + { + var themeManifest = _themeRegistry.GetThemeManifest(themeName); + if (themeName == null) + { + return null; + } + return new PackagingResult + { + ExtensionType = "Theme", + PackageName = themeManifest.ThemeName, + PackageVersion = themeManifest.Version, + PackageStream = _packageBuilder.BuildPackage(themeManifest) + }; + } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/PackagingResult.cs b/src/Libraries/SmartStore.Core/Packaging/PackagingResult.cs index 69e054e009..312e737439 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackagingResult.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackagingResult.cs @@ -2,12 +2,12 @@ namespace SmartStore.Core.Packaging { - public class PackagingResult - { - public string ExtensionType { get; set; } + public class PackagingResult + { + public string ExtensionType { get; set; } - public string PackageName { get; set; } - public string PackageVersion { get; set; } - public Stream PackageStream { get; set; } - } + public string PackageName { get; set; } + public string PackageVersion { get; set; } + public Stream PackageStream { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs index 0d50f65851..cbaa6e0cd0 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Web.Hosting; @@ -9,140 +8,140 @@ namespace SmartStore.Core.Packaging { - public static class PackagingUtils - { - public static string GetExtensionPrefix(string extensionType) - { - return string.Format("SmartStore.{0}.", extensionType); - } - - public static string BuildPackageId(string extensionName, string extensionType) - { - return GetExtensionPrefix(extensionType) + extensionName; - } - - internal static bool IsTheme(this IPackage package) - { - return IsTheme(package.Id); - } - - public static bool IsTheme(this PackageInfo info) - { - return IsTheme(info.Id); - } - - internal static string ExtensionFolder(this IPackage package) - { - return ExtensionFolder(package.IsTheme()); - } - - internal static string ExtensionId(this IPackage package) - { - return ExtensionId(package.IsTheme(), package.Id); - } - - public static string ExtensionId(this PackageInfo info) - { - return ExtensionId(info.IsTheme(), info.Id); - } - - public static bool IsTheme(string packageId) - { - return packageId.StartsWith(GetExtensionPrefix("Theme")); - } - - private static string ExtensionFolder(bool isTheme) - { - return isTheme ? "Themes" : "Plugins"; - } - - private static string ExtensionId(bool isTheme, string packageId) - { - return isTheme ? - packageId.Substring(GetExtensionPrefix("Theme").Length) : - packageId.Substring(GetExtensionPrefix("Plugin").Length); - } - - internal static ExtensionDescriptor ConvertToExtensionDescriptor(this PluginDescriptor pluginDescriptor) - { - // TODO: (pkg) Add Icons to extension manifests - var descriptor = new ExtensionDescriptor - { - ExtensionType = "Plugin", - Location = "~/Plugins", - Path = pluginDescriptor.PhysicalPath, - Id = pluginDescriptor.FolderName, - Author = pluginDescriptor.Author, - MinAppVersion = pluginDescriptor.MinAppVersion, - Version = pluginDescriptor.Version, - Name = pluginDescriptor.FriendlyName, - Description = pluginDescriptor.Description, - WebSite = pluginDescriptor.Url, // TODO: (pkg) Add author url to plugin manifests, - Tags = string.Empty // TODO: (pkg) Add tags to plugin manifests, - }; - - return descriptor; - } - - internal static ExtensionDescriptor ConvertToExtensionDescriptor(this ThemeManifest themeManifest) - { - var descriptor = new ExtensionDescriptor - { - ExtensionType = "Theme", - Location = "~/Themes", - Path = themeManifest.Path, - Id = themeManifest.ThemeName, - Author = themeManifest.Author.HasValue() ? themeManifest.Author : "[Unknown]", - MinAppVersion = SmartStoreVersion.Version, // TODO: (pkg) Add SupportedVersion to theme manifests - Version = new Version(themeManifest.Version), - Name = themeManifest.ThemeTitle, - Description = string.Empty, // TODO: (pkg) Add description to theme manifests - WebSite = themeManifest.Url, - Tags = string.Empty // TODO: (pkg) Add tags to theme manifests, - }; - - return descriptor; - } - - internal static ExtensionDescriptor GetExtensionDescriptor(this IPackage package, string extensionType) - { - bool isTheme = extensionType.IsCaseInsensitiveEqual("Theme"); - - IPackageFile packageFile = package.GetFiles().FirstOrDefault(file => - { - var fileName = Path.GetFileName(file.Path); - return fileName != null && fileName.Equals(isTheme ? "theme.config" : "Description.txt", StringComparison.OrdinalIgnoreCase); - }); - - ExtensionDescriptor descriptor = null; - - if (packageFile != null) - { - var filePath = packageFile.EffectivePath; - if (filePath.HasValue()) - { - filePath = Path.Combine(HostingEnvironment.MapPath("~/"), filePath); - if (isTheme) - { - var themeManifest = ThemeManifest.Create(Path.GetDirectoryName(filePath)); - if (themeManifest != null) - { - descriptor = themeManifest.ConvertToExtensionDescriptor(); - } - } - else // is a Plugin - { - var pluginDescriptor = PluginFileParser.ParsePluginDescriptionFile(filePath); - if (pluginDescriptor != null) - { - descriptor = pluginDescriptor.ConvertToExtensionDescriptor(); - } - } - } - } - - return descriptor; - } - } + public static class PackagingUtils + { + public static string GetExtensionPrefix(string extensionType) + { + return string.Format("SmartStore.{0}.", extensionType); + } + + public static string BuildPackageId(string extensionName, string extensionType) + { + return GetExtensionPrefix(extensionType) + extensionName; + } + + internal static bool IsTheme(this IPackage package) + { + return IsTheme(package.Id); + } + + public static bool IsTheme(this PackageInfo info) + { + return IsTheme(info.Id); + } + + internal static string ExtensionFolder(this IPackage package) + { + return ExtensionFolder(package.IsTheme()); + } + + internal static string ExtensionId(this IPackage package) + { + return ExtensionId(package.IsTheme(), package.Id); + } + + public static string ExtensionId(this PackageInfo info) + { + return ExtensionId(info.IsTheme(), info.Id); + } + + public static bool IsTheme(string packageId) + { + return packageId.StartsWith(GetExtensionPrefix("Theme")); + } + + private static string ExtensionFolder(bool isTheme) + { + return isTheme ? "Themes" : "Plugins"; + } + + private static string ExtensionId(bool isTheme, string packageId) + { + return isTheme ? + packageId.Substring(GetExtensionPrefix("Theme").Length) : + packageId.Substring(GetExtensionPrefix("Plugin").Length); + } + + internal static ExtensionDescriptor ConvertToExtensionDescriptor(this PluginDescriptor pluginDescriptor) + { + // TODO: (pkg) Add Icons to extension manifests + var descriptor = new ExtensionDescriptor + { + ExtensionType = "Plugin", + Location = "~/Plugins", + Path = pluginDescriptor.PhysicalPath, + Id = pluginDescriptor.FolderName, + Author = pluginDescriptor.Author, + MinAppVersion = pluginDescriptor.MinAppVersion, + Version = pluginDescriptor.Version, + Name = pluginDescriptor.FriendlyName, + Description = pluginDescriptor.Description, + WebSite = pluginDescriptor.Url, // TODO: (pkg) Add author url to plugin manifests, + Tags = string.Empty // TODO: (pkg) Add tags to plugin manifests, + }; + + return descriptor; + } + + internal static ExtensionDescriptor ConvertToExtensionDescriptor(this ThemeManifest themeManifest) + { + var descriptor = new ExtensionDescriptor + { + ExtensionType = "Theme", + Location = "~/Themes", + Path = themeManifest.Path, + Id = themeManifest.ThemeName, + Author = themeManifest.Author.HasValue() ? themeManifest.Author : "[Unknown]", + MinAppVersion = SmartStoreVersion.Version, // TODO: (pkg) Add SupportedVersion to theme manifests + Version = new Version(themeManifest.Version), + Name = themeManifest.ThemeTitle, + Description = string.Empty, // TODO: (pkg) Add description to theme manifests + WebSite = themeManifest.Url, + Tags = string.Empty // TODO: (pkg) Add tags to theme manifests, + }; + + return descriptor; + } + + internal static ExtensionDescriptor GetExtensionDescriptor(this IPackage package, string extensionType) + { + bool isTheme = extensionType.IsCaseInsensitiveEqual("Theme"); + + IPackageFile packageFile = package.GetFiles().FirstOrDefault(file => + { + var fileName = Path.GetFileName(file.Path); + return fileName != null && fileName.Equals(isTheme ? "theme.config" : "Description.txt", StringComparison.OrdinalIgnoreCase); + }); + + ExtensionDescriptor descriptor = null; + + if (packageFile != null) + { + var filePath = packageFile.EffectivePath; + if (filePath.HasValue()) + { + filePath = Path.Combine(HostingEnvironment.MapPath("~/"), filePath); + if (isTheme) + { + var themeManifest = ThemeManifest.Create(Path.GetDirectoryName(filePath)); + if (themeManifest != null) + { + descriptor = themeManifest.ConvertToExtensionDescriptor(); + } + } + else // is a Plugin + { + var pluginDescriptor = PluginFileParser.ParsePluginDescriptionFile(filePath); + if (pluginDescriptor != null) + { + descriptor = pluginDescriptor.ConvertToExtensionDescriptor(); + } + } + } + } + + return descriptor; + } + } } diff --git a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs index 8d4fb58dab..0e5cae0836 100644 --- a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs +++ b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs @@ -14,221 +14,222 @@ namespace SmartStore.Core.Packaging { public sealed class AppUpdater : DisposableObject - { - public const string UpdatePackagePath = "~/App_Data/Update"; - - private static readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); - private TraceLogger _logger; - - #region Package update - - [SuppressMessage("ReSharper", "RedundantAssignment")] - public bool InstallablePackageExists() - { - string packagePath = null; - var package = FindPackage(false, out packagePath); - - if (package == null) - return false; - - if (!ValidatePackage(package)) - return false; - - if (!CheckEnvironment()) - return false; - - return true; - } - - internal bool TryUpdateFromPackage() - { - // NEVER EVER (!!!) make an attempt to auto-update in a dev environment!!!!!!! - if (CommonHelper.IsDevEnvironment) - return false; - - using (_rwLock.GetUpgradeableReadLock()) - { - try - { - string packagePath = null; - var package = FindPackage(true, out packagePath); - - if (package == null) - return false; - - if (!ValidatePackage(package)) - return false; - - if (!CheckEnvironment()) - return false; - - using (_rwLock.GetWriteLock()) - { - Backup(); - - var info = ExecuteUpdate(package); - - if (info != null) - { - var newPath = packagePath + ".applied"; - if (File.Exists(newPath)) - { - File.Delete(packagePath); - } - else - { - File.Move(packagePath, newPath); - } - } - - return info != null; - } - } - catch (Exception ex) - { - _logger.Error(ex, "An error occured while updating the application"); - return false; - } - } - } - - private TraceLogger CreateLogger(IPackage package) - { - var logFile = Path.Combine(CommonHelper.MapPath(UpdatePackagePath, false), "Updater.{0}.log".FormatInvariant(package.Version.ToString())); - return new TraceLogger(logFile); - } - - private IPackage FindPackage(bool createLogger, out string path) - { - path = null; - var dir = CommonHelper.MapPath(UpdatePackagePath, false); - - if (!Directory.Exists(dir)) - return null; - - var files = Directory.GetFiles(dir, "SmartStore.*.nupkg", SearchOption.TopDirectoryOnly); - - // TODO: allow more than one package in folder and return newest - if (files.Length == 0 || files.Length > 1) - return null; - - try - { - path = files[0]; - IPackage package = new ZipPackage(files[0]); - if (createLogger) - { - _logger = CreateLogger(package); - _logger.Info("Found update package '{0}'".FormatInvariant(package.GetFullName())); - } - return package; - } - catch { } - - return null; - } - - private bool ValidatePackage(IPackage package) - { - if (package.Id != "SmartStore") - return false; - - var currentVersion = new SemanticVersion(SmartStoreVersion.Version); - return package.Version > currentVersion; - } - - private bool CheckEnvironment() - { - // TODO: Check it :-) - return true; - } - - private void Backup() - { - var source = new DirectoryInfo(CommonHelper.MapPath("~/")); - - var tempPath = CommonHelper.MapPath("~/App_Data/_Backup/App/SmartStore"); - string localTempPath = null; - for (int i = 0; i < 50; i++) - { - localTempPath = tempPath + (i == 0 ? "" : "." + i.ToString()); - if (!Directory.Exists(localTempPath)) - { - Directory.CreateDirectory(localTempPath); - break; - } - localTempPath = null; - } - - if (localTempPath == null) - { - var exception = new SmartException("Too many backups in '{0}'.".FormatInvariant(tempPath)); - _logger.Error(exception); - throw exception; - } - - var backupFolder = new DirectoryInfo(localTempPath); - var folderUpdater = new FolderUpdater(_logger); - folderUpdater.Backup(source, backupFolder, "App_Data", "Media"); - - _logger.Info("Backup successfully created in folder '{0}'.".FormatInvariant(localTempPath)); - } - - private PackageInfo ExecuteUpdate(IPackage package) - { - var appPath = CommonHelper.MapPath("~/"); - - var logger = new NugetLogger(_logger); - - var project = new FileBasedProjectSystem(appPath) { Logger = logger }; - - var nullRepository = new NullSourceRepository(); - - var projectManager = new ProjectManager( - nullRepository, - new DefaultPackagePathResolver(appPath), - project, - nullRepository - ) { Logger = logger }; - - // Perform the update - projectManager.AddPackageReference(package, true, false); - - var info = new PackageInfo - { - Id = package.Id, - Name = package.Title ?? package.Id, - Version = package.Version.ToString(), - Type = "App", - Path = appPath - }; - - _logger.Info("Update '{0}' successfully executed.".FormatInvariant(info.Name)); - - return info; - } - - #endregion - - #region Migrations - - internal void ExecuteMigrations() - { - if (!DataSettings.DatabaseIsInstalled()) - return; - - var currentVersion = SmartStoreVersion.Version; - var prevVersion = DataSettings.Current.AppVersion ?? new Version(1, 0); - - if (prevVersion < new Version(3, 0, 0)) - { - throw new ApplicationException($"Smartstore {currentVersion} does not support automatic upgrade from version {prevVersion}. Please upgrade to version 3.x first."); - } - - TryMigrateDefaultTenant(); - - if (prevVersion >= currentVersion) - return; + { + public const string UpdatePackagePath = "~/App_Data/Update"; + + private static readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); + private TraceLogger _logger; + + #region Package update + + [SuppressMessage("ReSharper", "RedundantAssignment")] + public bool InstallablePackageExists() + { + string packagePath = null; + var package = FindPackage(false, out packagePath); + + if (package == null) + return false; + + if (!ValidatePackage(package)) + return false; + + if (!CheckEnvironment()) + return false; + + return true; + } + + internal bool TryUpdateFromPackage() + { + // NEVER EVER (!!!) make an attempt to auto-update in a dev environment!!!!!!! + if (CommonHelper.IsDevEnvironment) + return false; + + using (_rwLock.GetUpgradeableReadLock()) + { + try + { + string packagePath = null; + var package = FindPackage(true, out packagePath); + + if (package == null) + return false; + + if (!ValidatePackage(package)) + return false; + + if (!CheckEnvironment()) + return false; + + using (_rwLock.GetWriteLock()) + { + Backup(); + + var info = ExecuteUpdate(package); + + if (info != null) + { + var newPath = packagePath + ".applied"; + if (File.Exists(newPath)) + { + File.Delete(packagePath); + } + else + { + File.Move(packagePath, newPath); + } + } + + return info != null; + } + } + catch (Exception ex) + { + _logger.Error(ex, "An error occured while updating the application"); + return false; + } + } + } + + private TraceLogger CreateLogger(IPackage package) + { + var logFile = Path.Combine(CommonHelper.MapPath(UpdatePackagePath, false), "Updater.{0}.log".FormatInvariant(package.Version.ToString())); + return new TraceLogger(logFile); + } + + private IPackage FindPackage(bool createLogger, out string path) + { + path = null; + var dir = CommonHelper.MapPath(UpdatePackagePath, false); + + if (!Directory.Exists(dir)) + return null; + + var files = Directory.GetFiles(dir, "SmartStore.*.nupkg", SearchOption.TopDirectoryOnly); + + // TODO: allow more than one package in folder and return newest + if (files.Length == 0 || files.Length > 1) + return null; + + try + { + path = files[0]; + IPackage package = new ZipPackage(files[0]); + if (createLogger) + { + _logger = CreateLogger(package); + _logger.Info("Found update package '{0}'".FormatInvariant(package.GetFullName())); + } + return package; + } + catch { } + + return null; + } + + private bool ValidatePackage(IPackage package) + { + if (package.Id != "SmartStore") + return false; + + var currentVersion = new SemanticVersion(SmartStoreVersion.Version); + return package.Version > currentVersion; + } + + private bool CheckEnvironment() + { + // TODO: Check it :-) + return true; + } + + private void Backup() + { + var source = new DirectoryInfo(CommonHelper.MapPath("~/")); + + var tempPath = CommonHelper.MapPath("~/App_Data/_Backup/App/SmartStore"); + string localTempPath = null; + for (int i = 0; i < 50; i++) + { + localTempPath = tempPath + (i == 0 ? "" : "." + i.ToString()); + if (!Directory.Exists(localTempPath)) + { + Directory.CreateDirectory(localTempPath); + break; + } + localTempPath = null; + } + + if (localTempPath == null) + { + var exception = new SmartException("Too many backups in '{0}'.".FormatInvariant(tempPath)); + _logger.Error(exception); + throw exception; + } + + var backupFolder = new DirectoryInfo(localTempPath); + var folderUpdater = new FolderUpdater(_logger); + folderUpdater.Backup(source, backupFolder, "App_Data", "Media"); + + _logger.Info("Backup successfully created in folder '{0}'.".FormatInvariant(localTempPath)); + } + + private PackageInfo ExecuteUpdate(IPackage package) + { + var appPath = CommonHelper.MapPath("~/"); + + var logger = new NugetLogger(_logger); + + var project = new FileBasedProjectSystem(appPath) { Logger = logger }; + + var nullRepository = new NullSourceRepository(); + + var projectManager = new ProjectManager( + nullRepository, + new DefaultPackagePathResolver(appPath), + project, + nullRepository + ) + { Logger = logger }; + + // Perform the update + projectManager.AddPackageReference(package, true, false); + + var info = new PackageInfo + { + Id = package.Id, + Name = package.Title ?? package.Id, + Version = package.Version.ToString(), + Type = "App", + Path = appPath + }; + + _logger.Info("Update '{0}' successfully executed.".FormatInvariant(info.Name)); + + return info; + } + + #endregion + + #region Migrations + + internal void ExecuteMigrations() + { + if (!DataSettings.DatabaseIsInstalled()) + return; + + var currentVersion = SmartStoreVersion.Version; + var prevVersion = DataSettings.Current.AppVersion ?? new Version(1, 0); + + if (prevVersion < new Version(3, 0, 0)) + { + throw new ApplicationException($"Smartstore {currentVersion} does not support automatic upgrade from version {prevVersion}. Please upgrade to version 3.x first."); + } + + TryMigrateDefaultTenant(); + + if (prevVersion >= currentVersion) + return; if (prevVersion < new Version(2, 1)) { @@ -244,144 +245,144 @@ internal void ExecuteMigrations() } DataSettings.Current.AppVersion = currentVersion; - DataSettings.Current.Save(); - } - - private bool TryMigrateDefaultTenant() - { - // We introduced basic multi-tenancy in V3 [...] - - if (!IsPreTenancyVersion()) - { - return false; - } - - var tenantDir = Directory.CreateDirectory(CommonHelper.MapPath("~/App_Data/Tenants/Default")); - var tenantTempDir = tenantDir.CreateSubdirectory("_temp"); - - var appDataDir = CommonHelper.MapPath("~/App_Data"); - - // Move Settings.txt - File.Move(Path.Combine(appDataDir, "Settings.txt"), Path.Combine(tenantDir.FullName, "Settings.txt")); - - // Move InstalledPlugins.txt - File.Move(Path.Combine(appDataDir, "InstalledPlugins.txt"), Path.Combine(tenantDir.FullName, "InstalledPlugins.txt")); - - // Move SmartStore.db.sdf - var path = Path.Combine(appDataDir, "SmartStore.db.sdf"); - if (File.Exists(path)) - { - File.Move(path, Path.Combine(tenantDir.FullName, "SmartStore.db.sdf")); - } - - Func moveTenantFolder = (sourceFolder, targetFolder) => - { - var sourcePath = Path.Combine(appDataDir, sourceFolder); - - if (Directory.Exists(sourcePath)) - { - Directory.Move(sourcePath, Path.Combine(tenantDir.FullName, targetFolder ?? sourceFolder)); - return true; - } - - return false; - }; - - // Move tenant specific Folders - moveTenantFolder("ImportProfiles", null); - moveTenantFolder("ExportProfiles", null); - moveTenantFolder("Indexing", null); - moveTenantFolder("Lucene", null); - moveTenantFolder("_temp\\BizBackups", null); - moveTenantFolder("_temp\\ShopConnector", null); - - // Move all media files and folders to new subfolder "Default" - var mediaInfos = (new DirectoryInfo(CommonHelper.MapPath("~/Media"))).EnumerateFileSystemInfos().Where(x => !x.Name.IsCaseInsensitiveEqual("Default")); - var mediaFiles = mediaInfos.OfType(); - var mediaDirs = mediaInfos.OfType().ToArray(); - var tenantMediaDir = new DirectoryInfo(CommonHelper.MapPath("~/Media/Default")); - if (!tenantMediaDir.Exists) - { - tenantMediaDir.Create(); - } - - foreach (var dir in mediaDirs) - { - dir.MoveTo(Path.Combine(tenantMediaDir.FullName, dir.Name)); - } - - foreach (var file in mediaFiles) - { - file.MoveTo(Path.Combine(tenantMediaDir.FullName, file.Name)); - } - - return true; - } - - private bool IsPreTenancyVersion() - { - var appDataDir = CommonHelper.MapPath("~/App_Data"); - - return File.Exists(Path.Combine(appDataDir, "Settings.txt")) - && File.Exists(Path.Combine(appDataDir, "InstalledPlugins.txt")) - && !Directory.Exists(Path.Combine(appDataDir, "Tenants\\Default")); - } - - private void MigrateInitial() - { - var installedPlugins = PluginFileParser.ParseInstalledPluginsFile(); - if (installedPlugins.Count == 0) - return; - - var renamedPlugins = new List(); - - var pluginRenameMap = new Dictionary - { - { "CurrencyExchange.ECB", null /* null means: remove it */ }, - { "CurrencyExchange.MoneyConverter", null }, - { "ExternalAuth.OpenId", null }, - { "Tax.Free", null }, - { "Api.WebApi", "SmartStore.WebApi" }, - { "DiscountRequirement.MustBeAssignedToCustomerRole", "SmartStore.DiscountRules" }, - { "DiscountRequirement.HadSpentAmount", "SmartStore.DiscountRules" }, - { "DiscountRequirement.HasAllProducts", "SmartStore.DiscountRules" }, - { "DiscountRequirement.HasOneProduct", "SmartStore.DiscountRules" }, - { "DiscountRequirement.Store", "SmartStore.DiscountRules" }, - { "DiscountRequirement.BillingCountryIs", "SmartStore.DiscountRules" }, - { "DiscountRequirement.ShippingCountryIs", "SmartStore.DiscountRules" }, - { "DiscountRequirement.HasPaymentMethod", "SmartStore.DiscountRules.HasPaymentMethod" }, - { "DiscountRequirement.HasShippingOption", "SmartStore.DiscountRules.HasShippingOption" }, - { "DiscountRequirement.PurchasedAllProducts", "SmartStore.DiscountRules.PurchasedProducts" }, - { "DiscountRequirement.PurchasedOneProduct", "SmartStore.DiscountRules.PurchasedProducts" }, - { "PromotionFeed.Froogle", "SmartStore.GoogleMerchantCenter" }, - { "PromotionFeed.Billiger", "SmartStore.Billiger" }, - { "PromotionFeed.ElmarShopinfo", "SmartStore.ElmarShopinfo" }, - { "PromotionFeed.Guenstiger", "SmartStore.Guenstiger" }, - { "Payments.AccardaKar", "SmartStore.AccardaKar" }, - { "Payments.AmazonPay", "SmartStore.AmazonPay" }, - { "Developer.DevTools", "SmartStore.DevTools" }, - { "ExternalAuth.Facebook", "SmartStore.FacebookAuth" }, - { "ExternalAuth.Twitter", "SmartStore.TwitterAuth" }, - { "SMS.Clickatell", "SmartStore.Clickatell" }, - { "Widgets.GoogleAnalytics", "SmartStore.GoogleAnalytics" }, - { "Misc.DemoShop", "SmartStore.DemoShopControlling" }, - { "Admin.OrderNumberFormatter", "SmartStore.OrderNumberFormatter" }, - { "Admin.Debitoor", "SmartStore.Debitoor" }, + DataSettings.Current.Save(); + } + + private bool TryMigrateDefaultTenant() + { + // We introduced basic multi-tenancy in V3 [...] + + if (!IsPreTenancyVersion()) + { + return false; + } + + var tenantDir = Directory.CreateDirectory(CommonHelper.MapPath("~/App_Data/Tenants/Default")); + var tenantTempDir = tenantDir.CreateSubdirectory("_temp"); + + var appDataDir = CommonHelper.MapPath("~/App_Data"); + + // Move Settings.txt + File.Move(Path.Combine(appDataDir, "Settings.txt"), Path.Combine(tenantDir.FullName, "Settings.txt")); + + // Move InstalledPlugins.txt + File.Move(Path.Combine(appDataDir, "InstalledPlugins.txt"), Path.Combine(tenantDir.FullName, "InstalledPlugins.txt")); + + // Move SmartStore.db.sdf + var path = Path.Combine(appDataDir, "SmartStore.db.sdf"); + if (File.Exists(path)) + { + File.Move(path, Path.Combine(tenantDir.FullName, "SmartStore.db.sdf")); + } + + Func moveTenantFolder = (sourceFolder, targetFolder) => + { + var sourcePath = Path.Combine(appDataDir, sourceFolder); + + if (Directory.Exists(sourcePath)) + { + Directory.Move(sourcePath, Path.Combine(tenantDir.FullName, targetFolder ?? sourceFolder)); + return true; + } + + return false; + }; + + // Move tenant specific Folders + moveTenantFolder("ImportProfiles", null); + moveTenantFolder("ExportProfiles", null); + moveTenantFolder("Indexing", null); + moveTenantFolder("Lucene", null); + moveTenantFolder("_temp\\BizBackups", null); + moveTenantFolder("_temp\\ShopConnector", null); + + // Move all media files and folders to new subfolder "Default" + var mediaInfos = (new DirectoryInfo(CommonHelper.MapPath("~/Media"))).EnumerateFileSystemInfos().Where(x => !x.Name.IsCaseInsensitiveEqual("Default")); + var mediaFiles = mediaInfos.OfType(); + var mediaDirs = mediaInfos.OfType().ToArray(); + var tenantMediaDir = new DirectoryInfo(CommonHelper.MapPath("~/Media/Default")); + if (!tenantMediaDir.Exists) + { + tenantMediaDir.Create(); + } + + foreach (var dir in mediaDirs) + { + dir.MoveTo(Path.Combine(tenantMediaDir.FullName, dir.Name)); + } + + foreach (var file in mediaFiles) + { + file.MoveTo(Path.Combine(tenantMediaDir.FullName, file.Name)); + } + + return true; + } + + private bool IsPreTenancyVersion() + { + var appDataDir = CommonHelper.MapPath("~/App_Data"); + + return File.Exists(Path.Combine(appDataDir, "Settings.txt")) + && File.Exists(Path.Combine(appDataDir, "InstalledPlugins.txt")) + && !Directory.Exists(Path.Combine(appDataDir, "Tenants\\Default")); + } + + private void MigrateInitial() + { + var installedPlugins = PluginFileParser.ParseInstalledPluginsFile(); + if (installedPlugins.Count == 0) + return; + + var renamedPlugins = new List(); + + var pluginRenameMap = new Dictionary + { + { "CurrencyExchange.ECB", null /* null means: remove it */ }, + { "CurrencyExchange.MoneyConverter", null }, + { "ExternalAuth.OpenId", null }, + { "Tax.Free", null }, + { "Api.WebApi", "SmartStore.WebApi" }, + { "DiscountRequirement.MustBeAssignedToCustomerRole", "SmartStore.DiscountRules" }, + { "DiscountRequirement.HadSpentAmount", "SmartStore.DiscountRules" }, + { "DiscountRequirement.HasAllProducts", "SmartStore.DiscountRules" }, + { "DiscountRequirement.HasOneProduct", "SmartStore.DiscountRules" }, + { "DiscountRequirement.Store", "SmartStore.DiscountRules" }, + { "DiscountRequirement.BillingCountryIs", "SmartStore.DiscountRules" }, + { "DiscountRequirement.ShippingCountryIs", "SmartStore.DiscountRules" }, + { "DiscountRequirement.HasPaymentMethod", "SmartStore.DiscountRules.HasPaymentMethod" }, + { "DiscountRequirement.HasShippingOption", "SmartStore.DiscountRules.HasShippingOption" }, + { "DiscountRequirement.PurchasedAllProducts", "SmartStore.DiscountRules.PurchasedProducts" }, + { "DiscountRequirement.PurchasedOneProduct", "SmartStore.DiscountRules.PurchasedProducts" }, + { "PromotionFeed.Froogle", "SmartStore.GoogleMerchantCenter" }, + { "PromotionFeed.Billiger", "SmartStore.Billiger" }, + { "PromotionFeed.ElmarShopinfo", "SmartStore.ElmarShopinfo" }, + { "PromotionFeed.Guenstiger", "SmartStore.Guenstiger" }, + { "Payments.AccardaKar", "SmartStore.AccardaKar" }, + { "Payments.AmazonPay", "SmartStore.AmazonPay" }, + { "Developer.DevTools", "SmartStore.DevTools" }, + { "ExternalAuth.Facebook", "SmartStore.FacebookAuth" }, + { "ExternalAuth.Twitter", "SmartStore.TwitterAuth" }, + { "SMS.Clickatell", "SmartStore.Clickatell" }, + { "Widgets.GoogleAnalytics", "SmartStore.GoogleAnalytics" }, + { "Misc.DemoShop", "SmartStore.DemoShopControlling" }, + { "Admin.OrderNumberFormatter", "SmartStore.OrderNumberFormatter" }, + { "Admin.Debitoor", "SmartStore.Debitoor" }, { "Widgets.ETracker", "SmartStore.ETracker" }, { "Payments.PayPalDirect", "SmartStore.PayPal" }, { "Payments.PayPalStandard", "SmartStore.PayPal" }, { "Payments.PayPalExpress", "SmartStore.PayPal" }, - { "Developer.Glimpse", "SmartStore.Glimpse" }, - { "Import.Biz", "SmartStore.BizImporter" }, - { "Payments.Sofortueberweisung", "SmartStore.Sofortueberweisung" }, - { "Payments.PostFinanceECommerce", "SmartStore.PostFinanceECommerce" }, - { "Misc.MailChimp", "SmartStore.MailChimp" }, - { "Mobile.SMS.Verizon", "SmartStore.Verizon" }, - { "Widgets.LivePersonChat", "SmartStore.LivePersonChat" }, - { "Payments.CashOnDelivery", "SmartStore.OfflinePayment" }, - { "Payments.Invoice", "SmartStore.OfflinePayment" }, - { "Payments.PayInStore", "SmartStore.OfflinePayment" }, - { "Payments.Prepayment", "SmartStore.OfflinePayment" }, + { "Developer.Glimpse", "SmartStore.Glimpse" }, + { "Import.Biz", "SmartStore.BizImporter" }, + { "Payments.Sofortueberweisung", "SmartStore.Sofortueberweisung" }, + { "Payments.PostFinanceECommerce", "SmartStore.PostFinanceECommerce" }, + { "Misc.MailChimp", "SmartStore.MailChimp" }, + { "Mobile.SMS.Verizon", "SmartStore.Verizon" }, + { "Widgets.LivePersonChat", "SmartStore.LivePersonChat" }, + { "Payments.CashOnDelivery", "SmartStore.OfflinePayment" }, + { "Payments.Invoice", "SmartStore.OfflinePayment" }, + { "Payments.PayInStore", "SmartStore.OfflinePayment" }, + { "Payments.Prepayment", "SmartStore.OfflinePayment" }, { "Payments.IPaymentCreditCard", "SmartStore.IPayment" }, { "Payments.IPaymentDirectDebit", "SmartStore.IPayment" }, { "Payments.AuthorizeNet", "SmartStore.AuthorizeNet" }, @@ -389,43 +390,43 @@ private void MigrateInitial() { "Shipping.CanadaPost", "SmartStore.CanadaPost" }, { "Shipping.Fedex", "SmartStore.Fedex" }, { "Shipping.UPS", "SmartStore.UPS" }, - { "Payments.Manual", "SmartStore.OfflinePayment" }, + { "Payments.Manual", "SmartStore.OfflinePayment" }, { "Shipping.USPS", "SmartStore.USPS" }, { "Widgets.TrustedShopsSeal", "SmartStore.TrustedShops" }, { "Widgets.TrustedShopsCustomerReviews", "SmartStore.TrustedShops" }, { "Widgets.TrustedShopsCustomerProtection", "SmartStore.TrustedShops" }, { "Shipping.ByWeight", "SmartStore.ShippingByWeight" }, - { "Payments.DirectDebit", "SmartStore.OfflinePayment" }, - { "Tax.FixedRate", "SmartStore.Tax" }, - { "Tax.CountryStateZip", "SmartStore.Tax" }, + { "Payments.DirectDebit", "SmartStore.OfflinePayment" }, + { "Tax.FixedRate", "SmartStore.Tax" }, + { "Tax.CountryStateZip", "SmartStore.Tax" }, { "Shipping.ByTotal", "SmartStore.Shipping" }, { "Shipping.FixedRate", "SmartStore.Shipping" } - }; - - foreach (var name in installedPlugins) - { - if (pluginRenameMap.ContainsKey(name)) - { - string newName = pluginRenameMap[name]; - if (newName != null && !renamedPlugins.Contains(newName)) - { - renamedPlugins.Add(newName); - } - } - else - { - renamedPlugins.Add(name); - } - } - - PluginFileParser.SaveInstalledPluginsFile(renamedPlugins); - } + }; + + foreach (var name in installedPlugins) + { + if (pluginRenameMap.ContainsKey(name)) + { + string newName = pluginRenameMap[name]; + if (newName != null && !renamedPlugins.Contains(newName)) + { + renamedPlugins.Add(newName); + } + } + else + { + renamedPlugins.Add(name); + } + } + + PluginFileParser.SaveInstalledPluginsFile(renamedPlugins); + } private void DeleteSearchIndex() { - var tenantPath = CommonHelper.MapPath(DataSettings.Current.TenantPath); + var tenantPath = CommonHelper.MapPath(DataSettings.Current.TenantPath); - try + try { var indexingDir = new DirectoryInfo(Path.Combine(tenantPath, "Indexing")); if (indexingDir.Exists) @@ -446,19 +447,19 @@ private void DeleteSearchIndex() catch { } } - #endregion - - protected override void OnDispose(bool disposing) - { - if (disposing) - { - if (_logger != null) - { - _logger.Dispose(); - _logger = null; - } - } - } - } + #endregion + + protected override void OnDispose(bool disposing) + { + if (disposing) + { + if (_logger != null) + { + _logger.Dispose(); + _logger = null; + } + } + } + } } diff --git a/src/Libraries/SmartStore.Core/PagedList.cs b/src/Libraries/SmartStore.Core/PagedList.cs index 731374737a..96539bf667 100644 --- a/src/Libraries/SmartStore.Core/PagedList.cs +++ b/src/Libraries/SmartStore.Core/PagedList.cs @@ -62,24 +62,18 @@ public int TotalCount public int PageNumber { - get - { - return this.PageIndex + 1; - } - set - { - this.PageIndex = value - 1; - } + get => this.PageIndex + 1; + set => this.PageIndex = value - 1; } public int TotalPages { - get + get { - if (this.PageSize == 0) - return 0; + if (this.PageSize == 0) + return 0; - var total = this.TotalCount / this.PageSize; + var total = this.TotalCount / this.PageSize; if (this.TotalCount % this.PageSize > 0) total++; @@ -88,53 +82,17 @@ public int TotalPages } } - public bool HasPreviousPage - { - get - { - return this.PageIndex > 0; - } - } + public bool HasPreviousPage => this.PageIndex > 0; - public bool HasNextPage - { - get - { - return (this.PageIndex < (this.TotalPages - 1)); - } - } + public bool HasNextPage => (this.PageIndex < (this.TotalPages - 1)); - public int FirstItemIndex - { - get - { - return (this.PageIndex * this.PageSize) + 1; - } - } + public int FirstItemIndex => (this.PageIndex * this.PageSize) + 1; - public int LastItemIndex - { - get - { - return Math.Min(this.TotalCount, ((this.PageIndex * this.PageSize) + this.PageSize)); - } - } + public int LastItemIndex => Math.Min(this.TotalCount, ((this.PageIndex * this.PageSize) + this.PageSize)); - public bool IsFirstPage - { - get - { - return (this.PageIndex <= 0); - } - } + public bool IsFirstPage => (this.PageIndex <= 0); - public bool IsLastPage - { - get - { - return (this.PageIndex >= (this.TotalPages - 1)); - } - } + public bool IsLastPage => (this.PageIndex >= (this.TotalPages - 1)); public virtual IEnumerator GetEnumerator() { @@ -145,19 +103,19 @@ public virtual IEnumerator GetEnumerator() public class PagedList : PagedListBase { public PagedList(int pageIndex, int pageSize, int totalItemsCount) - : base(pageIndex, pageSize, totalItemsCount) + : base(pageIndex, pageSize, totalItemsCount) { } - public static PagedList Create(IEnumerable source, int pageIndex, int pageSize) - { - return new PagedList(source, pageIndex, pageSize); - } + public static PagedList Create(IEnumerable source, int pageIndex, int pageSize) + { + return new PagedList(source, pageIndex, pageSize); + } - public static PagedList Create(IEnumerable source, int pageIndex, int pageSize, int totalCount) - { - return new PagedList(source, pageIndex, pageSize, totalCount); - } - } + public static PagedList Create(IEnumerable source, int pageIndex, int pageSize, int totalCount) + { + return new PagedList(source, pageIndex, pageSize, totalCount); + } + } } diff --git a/src/Libraries/SmartStore.Core/PagedList`T.cs b/src/Libraries/SmartStore.Core/PagedList`T.cs index 15bec86988..3796a1350a 100644 --- a/src/Libraries/SmartStore.Core/PagedList`T.cs +++ b/src/Libraries/SmartStore.Core/PagedList`T.cs @@ -1,198 +1,189 @@ using System; +using System.Collections; using System.Collections.Generic; -using System.Linq; +using System.Collections.ObjectModel; using System.Data.Entity; using System.Data.Entity.Infrastructure; -using System.Collections; -using System.Collections.ObjectModel; +using System.Linq; using System.Threading.Tasks; namespace SmartStore.Core { public class PagedList : IPagedList { - private bool _isEfQuery; - private bool _queryIsPagedAlready; - private int? _totalCount; + private bool _isEfQuery; + private bool _queryIsPagedAlready; + private int? _totalCount; - private List _list; + private List _list; - /// The 0-based page index - public PagedList(IEnumerable source, int pageIndex, int pageSize) - { - Guard.NotNull(source, "source"); + /// The 0-based page index + public PagedList(IEnumerable source, int pageIndex, int pageSize) + { + Guard.NotNull(source, "source"); - Init(source.AsQueryable(), pageIndex, pageSize, null); - } + Init(source.AsQueryable(), pageIndex, pageSize, null); + } - /// The 0-based page index - public PagedList(IEnumerable source, int pageIndex, int pageSize, int totalCount) + /// The 0-based page index + public PagedList(IEnumerable source, int pageIndex, int pageSize, int totalCount) { Guard.NotNull(source, "source"); Init(source.AsQueryable(), pageIndex, pageSize, totalCount); } - private void Init(IQueryable source, int pageIndex, int pageSize, int? totalCount) - { - Guard.NotNull(source, nameof(source)); - Guard.PagingArgsValid(pageIndex, pageSize, "pageIndex", "pageSize"); - - SourceQuery = source; - PageIndex = pageIndex; - PageSize = pageSize; - - _totalCount = totalCount; - _queryIsPagedAlready = totalCount.HasValue; - _isEfQuery = source.Provider is IDbAsyncQueryProvider; - } - - private void EnsureIsLoaded() - { - if (_list == null) - { - if (_totalCount == null) - { - _totalCount = SourceQuery.Count(); - } - - if (_queryIsPagedAlready) - { - _list = SourceQuery.ToList(); - } - else - { - _list = ApplyPaging(SourceQuery).ToList(); - } - } - } - - private async Task EnsureIsLoadedAsync() - { - if (_list == null) - { - if (_totalCount == null) - { - _totalCount = await SourceQuery.CountAsync(); - } - - if (_queryIsPagedAlready) - { - _list = await SourceQuery.ToListAsync(); - } - else - { - _list = await ApplyPaging(SourceQuery).ToListAsync(); - } - } - } - - #region IPageable Members - - public IQueryable SourceQuery { get; private set; } - - public IPagedList AlterQuery(Func, IQueryable> alterer) - { - var result = alterer?.Invoke(SourceQuery); - SourceQuery = result ?? throw new InvalidOperationException("The '{0}' delegate must not return NULL.".FormatInvariant(nameof(alterer))); - - return this; - } - - public IQueryable ApplyPaging(IQueryable query) - { - if (PageIndex == 0 && PageSize == int.MaxValue) - { - // Paging unnecessary - return query; - } - else - { - var skip = PageIndex * PageSize; - if (_isEfQuery) - { - return skip == 0 - ? query.Take(() => PageSize) - : query.Skip(() => skip).Take(() => PageSize); - } - else - { - return skip == 0 - ? query.Take(PageSize) - : query.Skip(skip).Take(PageSize); - } - } - } - - public IPagedList Load(bool force = false) - { - // Returns instance for chaining. - if (force && _list != null) - { - _list.Clear(); - _list = null; - } - - EnsureIsLoaded(); - - return this; - } - - public async Task> LoadAsync(bool force = false) - { - // Returns instance for chaining. - if (force && _list != null) - { - _list.Clear(); - _list = null; - } - - await EnsureIsLoadedAsync(); - - return this; - } - - public int PageIndex { get; set; } - - public int PageSize { get; set; } - - public async Task GetTotalCountAsync() - { - if (!_totalCount.HasValue) - { - _totalCount = await SourceQuery.CountAsync(); - } - - return _totalCount.Value; - } - - public int TotalCount + private void Init(IQueryable source, int pageIndex, int pageSize, int? totalCount) { - get - { - if (!_totalCount.HasValue) - { - _totalCount = SourceQuery.Count(); - } - - return _totalCount.Value; - } - set - { - _totalCount = value; - } + Guard.NotNull(source, nameof(source)); + Guard.PagingArgsValid(pageIndex, pageSize, "pageIndex", "pageSize"); + + SourceQuery = source; + PageIndex = pageIndex; + PageSize = pageSize; + + _totalCount = totalCount; + _queryIsPagedAlready = totalCount.HasValue; + _isEfQuery = source.Provider is IDbAsyncQueryProvider; } - public int PageNumber + private void EnsureIsLoaded() { - get + if (_list == null) { - return this.PageIndex + 1; + if (_totalCount == null) + { + _totalCount = SourceQuery.Count(); + } + + if (_queryIsPagedAlready) + { + _list = SourceQuery.ToList(); + } + else + { + _list = ApplyPaging(SourceQuery).ToList(); + } } - set + } + + private async Task EnsureIsLoadedAsync() + { + if (_list == null) + { + if (_totalCount == null) + { + _totalCount = await SourceQuery.CountAsync(); + } + + if (_queryIsPagedAlready) + { + _list = await SourceQuery.ToListAsync(); + } + else + { + _list = await ApplyPaging(SourceQuery).ToListAsync(); + } + } + } + + #region IPageable Members + + public IQueryable SourceQuery { get; private set; } + + public IPagedList AlterQuery(Func, IQueryable> alterer) + { + var result = alterer?.Invoke(SourceQuery); + SourceQuery = result ?? throw new InvalidOperationException("The '{0}' delegate must not return NULL.".FormatInvariant(nameof(alterer))); + + return this; + } + + public IQueryable ApplyPaging(IQueryable query) + { + if (PageIndex == 0 && PageSize == int.MaxValue) + { + // Paging unnecessary + return query; + } + else + { + var skip = PageIndex * PageSize; + if (_isEfQuery) + { + return skip == 0 + ? query.Take(() => PageSize) + : query.Skip(() => skip).Take(() => PageSize); + } + else + { + return skip == 0 + ? query.Take(PageSize) + : query.Skip(skip).Take(PageSize); + } + } + } + + public IPagedList Load(bool force = false) + { + // Returns instance for chaining. + if (force && _list != null) + { + _list.Clear(); + _list = null; + } + + EnsureIsLoaded(); + + return this; + } + + public async Task> LoadAsync(bool force = false) + { + // Returns instance for chaining. + if (force && _list != null) + { + _list.Clear(); + _list = null; + } + + await EnsureIsLoadedAsync(); + + return this; + } + + public int PageIndex { get; set; } + + public int PageSize { get; set; } + + public async Task GetTotalCountAsync() + { + if (!_totalCount.HasValue) + { + _totalCount = await SourceQuery.CountAsync(); + } + + return _totalCount.Value; + } + + public int TotalCount + { + get { - this.PageIndex = value - 1; + if (!_totalCount.HasValue) + { + _totalCount = SourceQuery.Count(); + } + + return _totalCount.Value; } + set => _totalCount = value; + } + + public int PageNumber + { + get => this.PageIndex + 1; + set => this.PageIndex = value - 1; } public int TotalPages @@ -208,170 +199,131 @@ public int TotalPages } } - public bool HasPreviousPage + public bool HasPreviousPage => this.PageIndex > 0; + + public bool HasNextPage => (this.PageIndex < (this.TotalPages - 1)); + + public int FirstItemIndex => (this.PageIndex * this.PageSize) + 1; + + public int LastItemIndex => Math.Min(this.TotalCount, ((this.PageIndex * this.PageSize) + this.PageSize)); + + public bool IsFirstPage => (this.PageIndex <= 0); + + public bool IsLastPage => (this.PageIndex >= (this.TotalPages - 1)); + + #endregion + + #region IList Members + + public void Add(T item) + { + EnsureIsLoaded(); + _list.Add(item); + } + + public void Clear() { - get + if (_list != null) { - return this.PageIndex > 0; + _list.Clear(); + _list = null; } } - public bool HasNextPage + public bool Contains(T item) { - get - { - return (this.PageIndex < (this.TotalPages - 1)); - } + EnsureIsLoaded(); + return _list.Contains(item); } - public int FirstItemIndex + public void CopyTo(T[] array, int arrayIndex) { - get + EnsureIsLoaded(); + _list.CopyTo(array, arrayIndex); + } + + public bool Remove(T item) + { + if (_list != null) { - return (this.PageIndex * this.PageSize) + 1; + return _list.Remove(item); } + + return false; } - public int LastItemIndex + public int Count { get { - return Math.Min(this.TotalCount, ((this.PageIndex * this.PageSize) + this.PageSize)); + EnsureIsLoaded(); + return _list.Count; } } - public bool IsFirstPage + public bool IsReadOnly => false; + + public int IndexOf(T item) { - get + EnsureIsLoaded(); + return _list.IndexOf(item); + } + + public void Insert(int index, T item) + { + EnsureIsLoaded(); + _list.Insert(index, item); + } + + public void RemoveAt(int index) + { + if (_list != null) { - return (this.PageIndex <= 0); + _list.RemoveAt(index); } } - public bool IsLastPage + public T this[int index] { get { - return (this.PageIndex >= (this.TotalPages - 1)); + EnsureIsLoaded(); + return _list[index]; } + set + { + EnsureIsLoaded(); + _list[index] = value; + } + } + + IEnumerator IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + + public IEnumerator GetEnumerator() + { + EnsureIsLoaded(); + return _list.GetEnumerator(); + } + + #endregion + + #region Utils + + public void AddRange(IEnumerable collection) + { + EnsureIsLoaded(); + _list.AddRange(collection); + } + + public ReadOnlyCollection AsReadOnly() + { + EnsureIsLoaded(); + return _list.AsReadOnly(); } - #endregion - - #region IList Members - - public void Add(T item) - { - EnsureIsLoaded(); - _list.Add(item); - } - - public void Clear() - { - if (_list != null) - { - _list.Clear(); - _list = null; - } - } - - public bool Contains(T item) - { - EnsureIsLoaded(); - return _list.Contains(item); - } - - public void CopyTo(T[] array, int arrayIndex) - { - EnsureIsLoaded(); - _list.CopyTo(array, arrayIndex); - } - - public bool Remove(T item) - { - if (_list != null) - { - return _list.Remove(item); - } - - return false; - } - - public int Count - { - get - { - EnsureIsLoaded(); - return _list.Count; - } - } - - public bool IsReadOnly - { - get { return false; } - } - - public int IndexOf(T item) - { - EnsureIsLoaded(); - return _list.IndexOf(item); - } - - public void Insert(int index, T item) - { - EnsureIsLoaded(); - _list.Insert(index, item); - } - - public void RemoveAt(int index) - { - if (_list != null) - { - _list.RemoveAt(index); - } - } - - public T this[int index] - { - get - { - EnsureIsLoaded(); - return _list[index]; - } - set - { - EnsureIsLoaded(); - _list[index] = value; - } - } - - IEnumerator IEnumerable.GetEnumerator() - { - return this.GetEnumerator(); - } - - public IEnumerator GetEnumerator() - { - EnsureIsLoaded(); - return _list.GetEnumerator(); - } - - #endregion - - #region Utils - - public void AddRange(IEnumerable collection) - { - EnsureIsLoaded(); - _list.AddRange(collection); - } - - public ReadOnlyCollection AsReadOnly() - { - EnsureIsLoaded(); - return _list.AsReadOnly(); - } - - #endregion - } + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/BasePlugin.cs b/src/Libraries/SmartStore.Core/Plugins/BasePlugin.cs index 80ae85fd5a..560532bcd6 100644 --- a/src/Libraries/SmartStore.Core/Plugins/BasePlugin.cs +++ b/src/Libraries/SmartStore.Core/Plugins/BasePlugin.cs @@ -10,7 +10,7 @@ public abstract class BasePlugin : IPlugin /// /// Install plugin /// - public virtual void Install() + public virtual void Install() { PluginManager.MarkPluginAsInstalled(this.PluginDescriptor.SystemName); } @@ -18,7 +18,7 @@ public virtual void Install() /// /// Uninstall plugin /// - public virtual void Uninstall() + public virtual void Uninstall() { PluginManager.MarkPluginAsUninstalled(this.PluginDescriptor.SystemName); } diff --git a/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs b/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs index 5a0308eb79..aaee54810c 100644 --- a/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs +++ b/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs @@ -1,19 +1,18 @@ -using System; -using System.Web.Routing; +using System.Web.Routing; namespace SmartStore.Core.Plugins { - /// - /// Marks a concrete provider or plugin implementation as configurable through the backend - /// - public interface IConfigurable - { - /// - /// Gets a route for provider or plugin configuration - /// - /// Action name - /// Controller name - /// Route values - void GetConfigurationRoute(out string actionName, out string controllerName, out RouteValueDictionary routeValues); - } + /// + /// Marks a concrete provider or plugin implementation as configurable through the backend + /// + public interface IConfigurable + { + /// + /// Gets a route for provider or plugin configuration + /// + /// Action name + /// Controller name + /// Route values + void GetConfigurationRoute(out string actionName, out string controllerName, out RouteValueDictionary routeValues); + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/ICookiePublisher.cs b/src/Libraries/SmartStore.Core/Plugins/ICookiePublisher.cs index 39eb636d9e..865fe5062b 100644 --- a/src/Libraries/SmartStore.Core/Plugins/ICookiePublisher.cs +++ b/src/Libraries/SmartStore.Core/Plugins/ICookiePublisher.cs @@ -1,58 +1,56 @@ -using SmartStore.Core.Domain.Localization; -using System; -using System.Runtime.Serialization; -using System.Web.Routing; +using System.Runtime.Serialization; +using SmartStore.Core.Domain.Localization; namespace SmartStore.Core.Plugins { - /// - /// Marks a module as a cookie publisher. - /// - public interface ICookiePublisher - { - /// - /// Gets the cookie info of the cookie publisher (e.g. plugin or other module). - /// - CookieInfo GetCookieInfo(); - } + /// + /// Marks a module as a cookie publisher. + /// + public interface ICookiePublisher + { + /// + /// Gets the cookie info of the cookie publisher (e.g. plugin or other module). + /// + CookieInfo GetCookieInfo(); + } - /// - /// Plugin cookie infos. - /// - public class CookieInfo : BaseEntity, ILocalizedEntity - { - /// - /// Name of the plugin. - /// - [DataMember] - public string Name { get; set; } + /// + /// Plugin cookie infos. + /// + public class CookieInfo : BaseEntity, ILocalizedEntity + { + /// + /// Name of the plugin. + /// + [DataMember] + public string Name { get; set; } - /// - /// Description of the cookie (e.g. purpose of using the cookie). - /// - [DataMember] - public string Description { get; set; } + /// + /// Description of the cookie (e.g. purpose of using the cookie). + /// + [DataMember] + public string Description { get; set; } - /// - /// SelectedStoreIds - /// - [DataMember] - public int[] SelectedStoreIds { get; set; } + /// + /// SelectedStoreIds + /// + [DataMember] + public int[] SelectedStoreIds { get; set; } - /// - /// Type of the cookie. - /// - [DataMember] - public CookieType CookieType { get; set; } - } + /// + /// Type of the cookie. + /// + [DataMember] + public CookieType CookieType { get; set; } + } - /// - /// Type of the cookie. - /// - public enum CookieType - { - Required, - Analytics, - ThirdParty - } + /// + /// Type of the cookie. + /// + public enum CookieType + { + Required, + Analytics, + ThirdParty + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/IPluginFinder.cs b/src/Libraries/SmartStore.Core/Plugins/IPluginFinder.cs index 51afd082ee..8240e3f247 100644 --- a/src/Libraries/SmartStore.Core/Plugins/IPluginFinder.cs +++ b/src/Libraries/SmartStore.Core/Plugins/IPluginFinder.cs @@ -3,51 +3,51 @@ namespace SmartStore.Core.Plugins { - /// - /// Plugin finder - /// + /// + /// Plugin finder + /// public interface IPluginFinder { - /// - /// Gets plugins - /// - /// The type of plugins to get. - /// A value indicating whether to load only installed plugins - /// Plugins - IEnumerable GetPlugins(bool installedOnly = true) where T : class, IPlugin; + /// + /// Gets plugins + /// + /// The type of plugins to get. + /// A value indicating whether to load only installed plugins + /// Plugins + IEnumerable GetPlugins(bool installedOnly = true) where T : class, IPlugin; - /// - /// Get plugin descriptors - /// - /// A value indicating whether to load only installed plugins - /// Plugin descriptors - IEnumerable GetPluginDescriptors(bool installedOnly = true); + /// + /// Get plugin descriptors + /// + /// A value indicating whether to load only installed plugins + /// Plugin descriptors + IEnumerable GetPluginDescriptors(bool installedOnly = true); - /// - /// Get plugin descriptors - /// - /// The type of plugin to get. - /// A value indicating whether to load only installed plugins - /// Plugin descriptors - IEnumerable GetPluginDescriptors(bool installedOnly = true) where T : class, IPlugin; + /// + /// Get plugin descriptors + /// + /// The type of plugin to get. + /// A value indicating whether to load only installed plugins + /// Plugin descriptors + IEnumerable GetPluginDescriptors(bool installedOnly = true) where T : class, IPlugin; PluginDescriptor GetPluginDescriptorByAssembly(Assembly assembly, bool installedOnly = true); - /// - /// Get a plugin descriptor by its system name - /// - /// Plugin system name - /// A value indicating whether to load only installed plugins - /// >Plugin descriptor + /// + /// Get a plugin descriptor by its system name + /// + /// Plugin system name + /// A value indicating whether to load only installed plugins + /// >Plugin descriptor PluginDescriptor GetPluginDescriptorBySystemName(string systemName, bool installedOnly = true); - /// - /// Get a plugin descriptor by its system name - /// - /// The type of plugin to get. - /// Plugin system name - /// A value indicating whether to load only installed plugins - /// >Plugin descriptor + /// + /// Get a plugin descriptor by its system name + /// + /// The type of plugin to get. + /// Plugin system name + /// A value indicating whether to load only installed plugins + /// >Plugin descriptor PluginDescriptor GetPluginDescriptorBySystemName(string systemName, bool installedOnly = true) where T : class, IPlugin; } } diff --git a/src/Libraries/SmartStore.Core/Plugins/LoadPluginResult.cs b/src/Libraries/SmartStore.Core/Plugins/LoadPluginResult.cs index 2e51056df1..c153efcdd9 100644 --- a/src/Libraries/SmartStore.Core/Plugins/LoadPluginResult.cs +++ b/src/Libraries/SmartStore.Core/Plugins/LoadPluginResult.cs @@ -1,16 +1,12 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; +using System.IO; namespace SmartStore.Core.Plugins { - public class LoadPluginResult - { - public FileInfo DescriptionFile { get; set; } - public PluginDescriptor Descriptor { get; set; } - public bool IsIncompatible { get; set; } - public bool Success { get; set; } - } + public class LoadPluginResult + { + public FileInfo DescriptionFile { get; set; } + public PluginDescriptor Descriptor { get; set; } + public bool IsIncompatible { get; set; } + public bool Success { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginDescriptor.cs b/src/Libraries/SmartStore.Core/Plugins/PluginDescriptor.cs index ab6a32754e..fd0685dbe3 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginDescriptor.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginDescriptor.cs @@ -1,41 +1,39 @@ using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; +using System.Linq; using System.Reflection; +using System.Runtime.Serialization; using System.Xml; using SmartStore.Core.Infrastructure; -using System.Linq; -using SmartStore.Utilities; -using System.Runtime.Serialization; namespace SmartStore.Core.Plugins { - /// - /// Information about an assembly referenced by a plugin. - /// - public sealed class AssemblyReference - { - /// - /// File in ASP.NET temp folder - /// - public FileInfo File { get; internal set; } - /// - /// The original assembly file that a shadow copy was made from it - /// - public FileInfo OriginalFile { get; internal set; } - /// - /// The assembly that has been shadow copied and was loaded into the AppDomain - /// - public Assembly Assembly { get; internal set; } - - /// - /// Exception thrown during activation/probing - /// - internal Exception ActivationException { get; set; } - } - - [DataContract] + /// + /// Information about an assembly referenced by a plugin. + /// + public sealed class AssemblyReference + { + /// + /// File in ASP.NET temp folder + /// + public FileInfo File { get; internal set; } + /// + /// The original assembly file that a shadow copy was made from it + /// + public FileInfo OriginalFile { get; internal set; } + /// + /// The assembly that has been shadow copied and was loaded into the AppDomain + /// + public Assembly Assembly { get; internal set; } + + /// + /// Exception thrown during activation/probing + /// + internal Exception ActivationException { get; set; } + } + + [DataContract] public class PluginDescriptor : IComparable { private string _resourceRootKey; @@ -47,13 +45,13 @@ public PluginDescriptor() MinAppVersion = SmartStoreVersion.Version; } - // Unit tests - public PluginDescriptor(Assembly referencedAssembly, FileInfo originalAssemblyFile, Type pluginClrType) - : this() - { - Assembly = new AssemblyReference { Assembly = referencedAssembly, OriginalFile = originalAssemblyFile, File = originalAssemblyFile }; - PluginClrType = pluginClrType; - } + // Unit tests + public PluginDescriptor(Assembly referencedAssembly, FileInfo originalAssemblyFile, Type pluginClrType) + : this() + { + Assembly = new AssemblyReference { Assembly = referencedAssembly, OriginalFile = originalAssemblyFile, File = originalAssemblyFile }; + PluginClrType = pluginClrType; + } /// /// Plugin file name @@ -65,29 +63,29 @@ public PluginDescriptor(Assembly referencedAssembly, FileInfo originalAssemblyFi /// public string PhysicalPath { get; set; } - /// - /// Gets the folder name - /// - [DataMember] - public string FolderName { get; internal set; } - - /// - /// The virtual path of the runtime plugin - /// - public string VirtualPath { get; set; } - - /// - /// Gets the file name of the brand image (without path) - /// or an empty string if no image is specified - /// - public string BrandImageFileName + /// + /// Gets the folder name + /// + [DataMember] + public string FolderName { get; internal set; } + + /// + /// The virtual path of the runtime plugin + /// + public string VirtualPath { get; set; } + + /// + /// Gets the file name of the brand image (without path) + /// or an empty string if no image is specified + /// + public string BrandImageFileName { get { if (_brandImageFileName == null) { // "null" means we haven't checked yet! - var filesToCheck = new [] { "branding.png", "branding.gif", "branding.jpg", "branding.jpeg" }; + var filesToCheck = new[] { "branding.png", "branding.gif", "branding.jpg", "branding.jpeg" }; var dir = this.PhysicalPath; foreach (var file in filesToCheck) { @@ -112,146 +110,139 @@ public string BrandImageFileName /// public Type PluginClrType { get; set; } - /// - /// The plugin assembly. - /// - public AssemblyReference Assembly { get; internal set; } = new AssemblyReference(); + /// + /// The plugin assembly. + /// + public AssemblyReference Assembly { get; internal set; } = new AssemblyReference(); - /// - /// List of assemblies files found in the plugin folder, except the main plugin assembly. - /// - internal AssemblyReference[] ReferencedLocalAssemblies { get; set; } = new AssemblyReference[0]; + /// + /// List of assemblies files found in the plugin folder, except the main plugin assembly. + /// + internal AssemblyReference[] ReferencedLocalAssemblies { get; set; } = new AssemblyReference[0]; - /// - /// Gets or sets the plugin group - /// - [DataMember] - public string Group { get; internal set; } + /// + /// Gets or sets the plugin group + /// + [DataMember] + public string Group { get; internal set; } - public bool IsInKnownGroup - { - get - { - return PluginFileParser.KnownGroups.Contains(this.Group, StringComparer.OrdinalIgnoreCase); - } - } + public bool IsInKnownGroup => PluginFileParser.KnownGroups.Contains(this.Group, StringComparer.OrdinalIgnoreCase); /// /// Gets or sets the friendly name /// [DataMember] - public string FriendlyName { get; set; } + public string FriendlyName { get; set; } /// /// Gets or sets the system name /// [DataMember] - public string SystemName { get; set; } + public string SystemName { get; set; } /// /// Gets the plugin description /// [DataMember] - public string Description { get; set; } + public string Description { get; set; } /// /// Gets or sets the version /// [DataMember] - public Version Version { get; set; } + public Version Version { get; set; } /// /// Gets or sets the minimum supported app version /// [DataMember] - public Version MinAppVersion { get; set; } + public Version MinAppVersion { get; set; } /// /// Gets or sets the author /// [DataMember] - public string Author { get; set; } + public string Author { get; set; } - /// - /// Gets or sets the project/marketplace url - /// - [DataMember] - public string Url { get; set; } + /// + /// Gets or sets the project/marketplace url + /// + [DataMember] + public string Url { get; set; } /// /// Gets or sets the display order /// [DataMember] - public int DisplayOrder { get; set; } + public int DisplayOrder { get; set; } /// /// Gets or sets a value indicating whether the plugin is installed /// [DataMember] - public bool Installed { get; set; } + public bool Installed { get; set; } - /// - /// Gets a value indicating whether the plugin is incompatible with the current application version - /// - [DataMember] - public bool Incompatible { get; set; } - - /// - /// Gets or sets the value indicating whether the plugin is configurable - /// - /// - /// A plugin is configurable when it implements the interface - /// - [DataMember] - public bool IsConfigurable { get; set; } - - /// - /// Gets or sets the root key of string resources. - /// - /// - /// Tries to get it from first entry of resource XML file if not specified. - /// In that case the first resource name should not contain a dot if it's not part of the root key. - /// Otherwise you get the wrong root key. - /// - public string ResourceRootKey - { - get { - if (_resourceRootKey == null) - { - _resourceRootKey = ""; - - try - { - // Try to get root-key from first entry of XML file - var localizationDir = new DirectoryInfo(Path.Combine(PhysicalPath, "Localization")); - - if (localizationDir.Exists) - { - var localizationFile = localizationDir.EnumerateFiles("*.xml").FirstOrDefault(); - if (localizationFile != null) - { - XmlDocument doc = new XmlDocument(); - doc.Load(localizationFile.FullName); - var key = doc.SelectSingleNode(@"//Language/LocaleResource")?.Attributes["Name"]?.InnerText; - if (key.HasValue() && key.Contains('.')) - { - _resourceRootKey = key.Substring(0, key.LastIndexOf('.')); - } - } - } - } - catch (Exception ex) - { - ex.Dump(); - } - } - - return _resourceRootKey; - } - set { - _resourceRootKey = value; - } - } + /// + /// Gets a value indicating whether the plugin is incompatible with the current application version + /// + [DataMember] + public bool Incompatible { get; set; } + + /// + /// Gets or sets the value indicating whether the plugin is configurable + /// + /// + /// A plugin is configurable when it implements the interface + /// + [DataMember] + public bool IsConfigurable { get; set; } + + /// + /// Gets or sets the root key of string resources. + /// + /// + /// Tries to get it from first entry of resource XML file if not specified. + /// In that case the first resource name should not contain a dot if it's not part of the root key. + /// Otherwise you get the wrong root key. + /// + public string ResourceRootKey + { + get + { + if (_resourceRootKey == null) + { + _resourceRootKey = ""; + + try + { + // Try to get root-key from first entry of XML file + var localizationDir = new DirectoryInfo(Path.Combine(PhysicalPath, "Localization")); + + if (localizationDir.Exists) + { + var localizationFile = localizationDir.EnumerateFiles("*.xml").FirstOrDefault(); + if (localizationFile != null) + { + XmlDocument doc = new XmlDocument(); + doc.Load(localizationFile.FullName); + var key = doc.SelectSingleNode(@"//Language/LocaleResource")?.Attributes["Name"]?.InnerText; + if (key.HasValue() && key.Contains('.')) + { + _resourceRootKey = key.Substring(0, key.LastIndexOf('.')); + } + } + } + } + catch (Exception ex) + { + ex.Dump(); + } + } + + return _resourceRootKey; + } + set => _resourceRootKey = value; + } public T Instance() where T : class, IPlugin { @@ -274,20 +265,20 @@ public IPlugin Instance() return Instance(); } - [SuppressMessage("ReSharper", "StringCompareToIsCultureSpecific")] - public int CompareTo(PluginDescriptor other) + [SuppressMessage("ReSharper", "StringCompareToIsCultureSpecific")] + public int CompareTo(PluginDescriptor other) { - if (DisplayOrder != other.DisplayOrder) - return DisplayOrder.CompareTo(other.DisplayOrder); - else if (FriendlyName != null) - return FriendlyName.CompareTo(other.FriendlyName); - return 0; + if (DisplayOrder != other.DisplayOrder) + return DisplayOrder.CompareTo(other.DisplayOrder); + else if (FriendlyName != null) + return FriendlyName.CompareTo(other.FriendlyName); + return 0; } - public string GetSettingKey(string name) - { - return "PluginSetting.{0}.{1}".FormatWith(SystemName, name); - } + public string GetSettingKey(string name) + { + return "PluginSetting.{0}.{1}".FormatWith(SystemName, name); + } public override string ToString() { diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginFileParser.cs b/src/Libraries/SmartStore.Core/Plugins/PluginFileParser.cs index 14e0f87b26..7f07271fa6 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginFileParser.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginFileParser.cs @@ -17,12 +17,12 @@ internal class GroupComparer : Comparer { public override int Compare(string x, string y) { - return Array.FindIndex( KnownGroups, s => s == x) - Array.FindIndex(KnownGroups, s => s == y); + return Array.FindIndex(KnownGroups, s => s == x) - Array.FindIndex(KnownGroups, s => s == y); } } - - internal readonly static string[] KnownGroups = new string[] - { + + internal readonly static string[] KnownGroups = new string[] + { "Admin", "Marketing", "Payment", @@ -30,47 +30,47 @@ public override int Compare(string x, string y) "Tax", "Analytics", "CMS", - "Media", + "Media", "SEO", "Data", "Globalization", "Api", - "Mobile", + "Mobile", "Social", - "Security", + "Security", "Developer", - "Sales", - "Design", - "Performance", - "B2B", - "Storefront", - "Law" + "Sales", + "Design", + "Performance", + "B2B", + "Storefront", + "Law" }; public readonly static IComparer KnownGroupComparer = new GroupComparer(); - public readonly static string InstalledPluginsFilePath; + public readonly static string InstalledPluginsFilePath; - static PluginFileParser() - { - InstalledPluginsFilePath = Path.Combine(CommonHelper.MapPath(DataSettings.Current.TenantPath), "InstalledPlugins.txt"); - } + static PluginFileParser() + { + InstalledPluginsFilePath = Path.Combine(CommonHelper.MapPath(DataSettings.Current.TenantPath), "InstalledPlugins.txt"); + } - public static HashSet ParseInstalledPluginsFile(string filePath = null) + public static HashSet ParseInstalledPluginsFile(string filePath = null) { - filePath = filePath ?? InstalledPluginsFilePath; + filePath = filePath ?? InstalledPluginsFilePath; - var lines = new HashSet(StringComparer.OrdinalIgnoreCase); + var lines = new HashSet(StringComparer.OrdinalIgnoreCase); - // Read and parse the file + // Read and parse the file if (!File.Exists(filePath)) - return lines; + return lines; var text = File.ReadAllText(filePath); if (text.IsEmpty()) - { - return lines; - } - + { + return lines; + } + using (var reader = new StringReader(text)) { string str; @@ -91,7 +91,7 @@ public static void SaveInstalledPluginsFile(ICollection pluginSystemName if (pluginSystemNames == null || pluginSystemNames.Count == 0) return; - filePath = filePath ?? InstalledPluginsFilePath; + filePath = filePath ?? InstalledPluginsFilePath; string result = ""; foreach (var sn in pluginSystemNames) @@ -108,9 +108,9 @@ public static PluginDescriptor ParsePluginDescriptionFile(string filePath) if (String.IsNullOrEmpty(text)) return descriptor; - string dirName = Path.GetDirectoryName(filePath); - descriptor.PhysicalPath = dirName; - descriptor.FolderName = new DirectoryInfo(dirName).Name; + string dirName = Path.GetDirectoryName(filePath); + descriptor.PhysicalPath = dirName; + descriptor.FolderName = new DirectoryInfo(dirName).Name; var settings = new List(); using (var reader = new StringReader(text)) @@ -171,9 +171,9 @@ public static PluginDescriptor ParsePluginDescriptionFile(string filePath) case "Author": descriptor.Author = value; break; - case "Url": - descriptor.Url = value; - break; + case "Url": + descriptor.Url = value; + break; case "DisplayOrder": { int displayOrder; @@ -184,31 +184,31 @@ public static PluginDescriptor ParsePluginDescriptionFile(string filePath) case "FileName": descriptor.PluginFileName = value; break; - case "ResourceRootKey": - descriptor.ResourceRootKey = value; - break; + case "ResourceRootKey": + descriptor.ResourceRootKey = value; + break; } } - if (IsKnownGroup(group)) - { - descriptor.Group = group; - } - else - { - descriptor.Group = "Misc"; - } + if (IsKnownGroup(group)) + { + descriptor.Group = group; + } + else + { + descriptor.Group = "Misc"; + } return descriptor; } - private static bool IsKnownGroup(string group) - { - if (group.IsEmpty()) - return false; - return KnownGroups.Contains(group, StringComparer.OrdinalIgnoreCase); - } - + private static bool IsKnownGroup(string group) + { + if (group.IsEmpty()) + return false; + return KnownGroups.Contains(group, StringComparer.OrdinalIgnoreCase); + } + public static void SavePluginDescriptionFile(PluginDescriptor plugin) { if (plugin == null) @@ -232,10 +232,10 @@ public static void SavePluginDescriptionFile(PluginDescriptor plugin) keyValues.Add(new KeyValuePair("Version", plugin.Version.ToString())); keyValues.Add(new KeyValuePair("MinAppVersion", string.Join(",", plugin.MinAppVersion))); keyValues.Add(new KeyValuePair("Author", plugin.Author)); - keyValues.Add(new KeyValuePair("Url", plugin.Url)); + keyValues.Add(new KeyValuePair("Url", plugin.Url)); keyValues.Add(new KeyValuePair("DisplayOrder", plugin.DisplayOrder.ToString())); keyValues.Add(new KeyValuePair("FileName", plugin.PluginFileName)); - keyValues.Add(new KeyValuePair("ResourceRootKey", plugin.ResourceRootKey)); + keyValues.Add(new KeyValuePair("ResourceRootKey", plugin.ResourceRootKey)); var sb = new StringBuilder(); for (int i = 0; i < keyValues.Count; i++) @@ -243,7 +243,7 @@ public static void SavePluginDescriptionFile(PluginDescriptor plugin) var key = keyValues[i].Key; var value = keyValues[i].Value; sb.AppendFormat("{0}: {1}", key, value); - if (i != keyValues.Count -1) + if (i != keyValues.Count - 1) sb.Append(Environment.NewLine); } diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginFinder.cs b/src/Libraries/SmartStore.Core/Plugins/PluginFinder.cs index 4eddd033dd..b39142bf1a 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginFinder.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginFinder.cs @@ -7,130 +7,130 @@ namespace SmartStore.Core.Plugins { public class PluginFinder : IPluginFinder { - private IList _plugins; - private readonly IDictionary _nameMap = new Dictionary(StringComparer.InvariantCultureIgnoreCase); - private readonly IDictionary _assemblyMap = new Dictionary(); - - private static readonly object _lock = new object(); - - private PluginFinder() - { - lock (_lock) - { - LoadPlugins(); - } - } - - public static IPluginFinder Current { get; } = new PluginFinder(); - - private void LoadPlugins() - { - if (_plugins != null) - return; - - var plugins = PluginManager.ReferencedPlugins.ToList(); - plugins.Sort(); //sort - _plugins = plugins; - - foreach (var plugin in plugins) - { - _nameMap[plugin.SystemName] = plugin; - if (plugin.Assembly.Assembly != null) - { - _assemblyMap[plugin.Assembly.Assembly] = plugin; - } - } - } - - /// - /// Gets plugins - /// - /// The type of plugins to get. - /// A value indicating whether to load only installed plugins - /// Plugins - public virtual IEnumerable GetPlugins(bool installedOnly = true) where T : class, IPlugin + private IList _plugins; + private readonly IDictionary _nameMap = new Dictionary(StringComparer.InvariantCultureIgnoreCase); + private readonly IDictionary _assemblyMap = new Dictionary(); + + private static readonly object _lock = new object(); + + private PluginFinder() + { + lock (_lock) + { + LoadPlugins(); + } + } + + public static IPluginFinder Current { get; } = new PluginFinder(); + + private void LoadPlugins() + { + if (_plugins != null) + return; + + var plugins = PluginManager.ReferencedPlugins.ToList(); + plugins.Sort(); //sort + _plugins = plugins; + + foreach (var plugin in plugins) + { + _nameMap[plugin.SystemName] = plugin; + if (plugin.Assembly.Assembly != null) + { + _assemblyMap[plugin.Assembly.Assembly] = plugin; + } + } + } + + /// + /// Gets plugins + /// + /// The type of plugins to get. + /// A value indicating whether to load only installed plugins + /// Plugins + public virtual IEnumerable GetPlugins(bool installedOnly = true) where T : class, IPlugin { foreach (var plugin in _plugins) if (typeof(T).IsAssignableFrom(plugin.PluginClrType)) if (!installedOnly || plugin.Installed) - yield return plugin.Instance(); + yield return plugin.Instance(); } - /// - /// Get plugin descriptors - /// - /// A value indicating whether to load only installed plugins - /// Plugin descriptors - public virtual IEnumerable GetPluginDescriptors(bool installedOnly = true) + /// + /// Get plugin descriptors + /// + /// A value indicating whether to load only installed plugins + /// Plugin descriptors + public virtual IEnumerable GetPluginDescriptors(bool installedOnly = true) { foreach (var plugin in _plugins) if (!installedOnly || plugin.Installed) - yield return plugin; + yield return plugin; } - /// - /// Get plugin descriptors - /// - /// The type of plugin to get. - /// A value indicating whether to load only installed plugins - /// Plugin descriptors - public virtual IEnumerable GetPluginDescriptors(bool installedOnly = true) - where T : class, IPlugin + /// + /// Get plugin descriptors + /// + /// The type of plugin to get. + /// A value indicating whether to load only installed plugins + /// Plugin descriptors + public virtual IEnumerable GetPluginDescriptors(bool installedOnly = true) + where T : class, IPlugin { foreach (var plugin in _plugins) if (typeof(T).IsAssignableFrom(plugin.PluginClrType)) if (!installedOnly || plugin.Installed) - yield return plugin; + yield return plugin; } public virtual PluginDescriptor GetPluginDescriptorByAssembly(Assembly assembly, bool installedOnly = true) { - if (assembly != null && _assemblyMap.TryGetValue(assembly, out var descriptor)) - { - if (!installedOnly || descriptor.Installed) - return descriptor; - } + if (assembly != null && _assemblyMap.TryGetValue(assembly, out var descriptor)) + { + if (!installedOnly || descriptor.Installed) + return descriptor; + } - return null; + return null; } - /// - /// Get a plugin descriptor by its system name - /// - /// Plugin system name - /// A value indicating whether to load only installed plugins - /// >Plugin descriptor + /// + /// Get a plugin descriptor by its system name + /// + /// Plugin system name + /// A value indicating whether to load only installed plugins + /// >Plugin descriptor public virtual PluginDescriptor GetPluginDescriptorBySystemName(string systemName, bool installedOnly = true) { - if (systemName.HasValue() && _nameMap.TryGetValue(systemName, out var descriptor)) - { - if (!installedOnly || descriptor.Installed) - return descriptor; - } + if (systemName.HasValue() && _nameMap.TryGetValue(systemName, out var descriptor)) + { + if (!installedOnly || descriptor.Installed) + return descriptor; + } - return null; + return null; } - /// - /// Get a plugin descriptor by its system name - /// - /// The type of plugin to get. - /// Plugin system name - /// A value indicating whether to load only installed plugins - /// >Plugin descriptor + /// + /// Get a plugin descriptor by its system name + /// + /// The type of plugin to get. + /// Plugin system name + /// A value indicating whether to load only installed plugins + /// >Plugin descriptor public virtual PluginDescriptor GetPluginDescriptorBySystemName(string systemName, bool installedOnly = true) where T : class, IPlugin { - if (systemName.HasValue() && _nameMap.TryGetValue(systemName, out var descriptor)) - { - if (!installedOnly || descriptor.Installed) - { - if (typeof(T).IsAssignableFrom(descriptor.PluginClrType)) - return descriptor; - } - } - - return null; + if (systemName.HasValue() && _nameMap.TryGetValue(systemName, out var descriptor)) + { + if (!installedOnly || descriptor.Installed) + { + if (typeof(T).IsAssignableFrom(descriptor.PluginClrType)) + return descriptor; + } + } + + return null; } - + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginManager.Cache.cs b/src/Libraries/SmartStore.Core/Plugins/PluginManager.Cache.cs index 50e9a457cf..b7a84dedc6 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.Cache.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.Cache.cs @@ -1,300 +1,299 @@ using System; using System.Collections.Generic; -using System.Globalization; +using System.Diagnostics; using System.IO; using System.Linq; using System.Text; -using System.Diagnostics; using SmartStore.Core.Data; +using SmartStore.Core.IO; using SmartStore.Core.Logging; using SmartStore.Utilities; -using SmartStore.Core.IO; namespace SmartStore.Core.Plugins { - public partial class PluginManager - { + public partial class PluginManager + { #region PluginsHasher class PluginsHasher : DirectoryHasher { - private readonly IEnumerable _plugins; + private readonly IEnumerable _plugins; - public PluginsHasher(IEnumerable plugins) - : base(CommonHelper.MapPath(PluginsLocation), null, false, CommonHelper.MapPath(DataSettings.Current.TenantPath)) + public PluginsHasher(IEnumerable plugins) + : base(CommonHelper.MapPath(PluginsLocation), null, false, CommonHelper.MapPath(DataSettings.Current.TenantPath)) { - _plugins = plugins; + _plugins = plugins; } protected override int ComputeHash() { - var hashCombiner = new HashCodeCombiner(); - - // Add each *.dll, Description.txt, web.config to the hash - var arrPlugins = _plugins.OrderBy(x => x.FolderName).ToArray(); - foreach (var p in arrPlugins) - { - if (p.Assembly.OriginalFile != null) - { - hashCombiner.Add(p.Assembly.OriginalFile); - } - - p.ReferencedLocalAssemblies.Each(x => hashCombiner.Add(x.OriginalFile)); - - hashCombiner.Add(Path.Combine(p.PhysicalPath, "Description.txt")); - hashCombiner.Add(Path.Combine(p.PhysicalPath, "web.config")); - hashCombiner.Add(p.Installed); - } - - return hashCombiner.CombinedHash; - } + var hashCombiner = new HashCodeCombiner(); + + // Add each *.dll, Description.txt, web.config to the hash + var arrPlugins = _plugins.OrderBy(x => x.FolderName).ToArray(); + foreach (var p in arrPlugins) + { + if (p.Assembly.OriginalFile != null) + { + hashCombiner.Add(p.Assembly.OriginalFile); + } + + p.ReferencedLocalAssemblies.Each(x => hashCombiner.Add(x.OriginalFile)); + + hashCombiner.Add(Path.Combine(p.PhysicalPath, "Description.txt")); + hashCombiner.Add(Path.Combine(p.PhysicalPath, "web.config")); + hashCombiner.Add(p.Installed); + } + + return hashCombiner.CombinedHash; + } } - #endregion + #endregion - private static ICollection _lastPluginAssemblies; + private static ICollection _lastPluginAssemblies; /// /// true when any plugin file has been changed since previous application start. /// public static bool PluginChangeDetected { get; private set; } - /// - /// This checks if any of our plugins have changed, if so it will go - /// - /// - /// Returns true if there were changes to plugins and a cleanup was required, otherwise false is returned. - /// - private static bool DetectAndCleanStalePlugins(IEnumerable plugins, PluginsHasher hasher) - { - // Check if anything has been changed, or if we are in debug mode then always perform cleanup - if (hasher.HasChanged) - { - PluginChangeDetected = true; - Logger.DebugFormat("Plugin changes detected in hash."); - - var lastAssemblies = GetLastPluginsAssemblies(); - - // We need to read the old assembly list and clean them out from the shadow copy folder - var staleFiles = lastAssemblies - .Select(x => new FileInfo(Path.Combine(_shadowCopyDir.FullName, x))) - .ToArray(); - - // If that fails, then we will try to remove it the hard way by renaming it to .delete if it doesn't delete nicely - if (staleFiles.Length > 5) - { - staleFiles.AsParallel().ForAll(f => TryDeleteStaleFile(f)); - } - else - { - staleFiles.Each(f => TryDeleteStaleFile(f)); - } - - return true; - } - - // No plugin changes found - return false; - } - - /// - /// Loads the file names of the last shadow copied plugin assemblies from disk - /// - /// - private static ICollection GetLastPluginsAssemblies() - { - if (_lastPluginAssemblies == null) - { - var filePath = Path.Combine(CommonHelper.MapPath(DataSettings.Current.TenantPath), "plugins.assemblies"); - - if (!File.Exists(filePath)) - { - _lastPluginAssemblies = new List(); - } - else - { - var list = new HashSet(StringComparer.OrdinalIgnoreCase); - - var file = File.ReadAllText(filePath, Encoding.UTF8); - var sr = new StringReader(file); - while (true) - { - var f = sr.ReadLine(); - if (f != null && f.HasValue()) - { - list.Add(f); - } - else - { - break; - } - } - - _lastPluginAssemblies = list; - } - } - - return _lastPluginAssemblies; - } - - private static void SavePluginsAssemblies(IEnumerable plugins) - { - var list = new HashSet(StringComparer.OrdinalIgnoreCase); - - foreach (var p in plugins) - { - p.ReferencedLocalAssemblies.Each(x => list.Add(x.OriginalFile.Name)); - - if (p.Assembly.OriginalFile != null) - { - list.Add(p.Assembly.OriginalFile.Name); - } - } - - var sb = new StringBuilder(); - foreach (var f in list) - { - sb.AppendLine(f); - } - - var filePath = Path.Combine(CommonHelper.MapPath(DataSettings.Current.TenantPath), "plugins.assemblies"); - File.WriteAllText(filePath, sb.ToString(), Encoding.UTF8); - - _lastPluginAssemblies = null; - } - - /// - /// Tries to delete the file. If it doesn't go nicely, we'll force rename it to .delete, if that already exists and we cannot - /// remove the .delete file then we rename to Guid + .delete - /// - /// - /// If it deletes nicely return true, otherwise false - private static bool TryDeleteStaleFile(FileInfo f) - { - Debug.WriteLine("Trying to delete shadow copied file " + f.FullName); - - // This is a special case: people may have been usign the CodeGen folder before so we need to cleanup those - // files too, even if we are no longer using it - if (CleanupDeletePluginFiles(new FileInfo(f.FullName + ".delete"))) - return true; - - try - { - f.Delete(); - return true; - } - catch { } - - // If the file doesn't delete, then create the .delete file for it, hopefully the BuildManager will clean up next time - var newName = GetNewDeleteName(f); - - try - { - File.Move(f.FullName, newName); - } - catch (UnauthorizedAccessException) - { - var ex = new UnauthorizedAccessException(string.Format("Access to the path '{0}' is denied, ensure that read, write and modify permissions are allowed.", Path.GetDirectoryName(newName))); + /// + /// This checks if any of our plugins have changed, if so it will go + /// + /// + /// Returns true if there were changes to plugins and a cleanup was required, otherwise false is returned. + /// + private static bool DetectAndCleanStalePlugins(IEnumerable plugins, PluginsHasher hasher) + { + // Check if anything has been changed, or if we are in debug mode then always perform cleanup + if (hasher.HasChanged) + { + PluginChangeDetected = true; + Logger.DebugFormat("Plugin changes detected in hash."); + + var lastAssemblies = GetLastPluginsAssemblies(); + + // We need to read the old assembly list and clean them out from the shadow copy folder + var staleFiles = lastAssemblies + .Select(x => new FileInfo(Path.Combine(_shadowCopyDir.FullName, x))) + .ToArray(); + + // If that fails, then we will try to remove it the hard way by renaming it to .delete if it doesn't delete nicely + if (staleFiles.Length > 5) + { + staleFiles.AsParallel().ForAll(f => TryDeleteStaleFile(f)); + } + else + { + staleFiles.Each(f => TryDeleteStaleFile(f)); + } + + return true; + } + + // No plugin changes found + return false; + } + + /// + /// Loads the file names of the last shadow copied plugin assemblies from disk + /// + /// + private static ICollection GetLastPluginsAssemblies() + { + if (_lastPluginAssemblies == null) + { + var filePath = Path.Combine(CommonHelper.MapPath(DataSettings.Current.TenantPath), "plugins.assemblies"); + + if (!File.Exists(filePath)) + { + _lastPluginAssemblies = new List(); + } + else + { + var list = new HashSet(StringComparer.OrdinalIgnoreCase); + + var file = File.ReadAllText(filePath, Encoding.UTF8); + var sr = new StringReader(file); + while (true) + { + var f = sr.ReadLine(); + if (f != null && f.HasValue()) + { + list.Add(f); + } + else + { + break; + } + } + + _lastPluginAssemblies = list; + } + } + + return _lastPluginAssemblies; + } + + private static void SavePluginsAssemblies(IEnumerable plugins) + { + var list = new HashSet(StringComparer.OrdinalIgnoreCase); + + foreach (var p in plugins) + { + p.ReferencedLocalAssemblies.Each(x => list.Add(x.OriginalFile.Name)); + + if (p.Assembly.OriginalFile != null) + { + list.Add(p.Assembly.OriginalFile.Name); + } + } + + var sb = new StringBuilder(); + foreach (var f in list) + { + sb.AppendLine(f); + } + + var filePath = Path.Combine(CommonHelper.MapPath(DataSettings.Current.TenantPath), "plugins.assemblies"); + File.WriteAllText(filePath, sb.ToString(), Encoding.UTF8); + + _lastPluginAssemblies = null; + } + + /// + /// Tries to delete the file. If it doesn't go nicely, we'll force rename it to .delete, if that already exists and we cannot + /// remove the .delete file then we rename to Guid + .delete + /// + /// + /// If it deletes nicely return true, otherwise false + private static bool TryDeleteStaleFile(FileInfo f) + { + Debug.WriteLine("Trying to delete shadow copied file " + f.FullName); + + // This is a special case: people may have been usign the CodeGen folder before so we need to cleanup those + // files too, even if we are no longer using it + if (CleanupDeletePluginFiles(new FileInfo(f.FullName + ".delete"))) + return true; + + try + { + f.Delete(); + return true; + } + catch { } + + // If the file doesn't delete, then create the .delete file for it, hopefully the BuildManager will clean up next time + var newName = GetNewDeleteName(f); + + try + { + File.Move(f.FullName, newName); + } + catch (UnauthorizedAccessException) + { + var ex = new UnauthorizedAccessException(string.Format("Access to the path '{0}' is denied, ensure that read, write and modify permissions are allowed.", Path.GetDirectoryName(newName))); Logger.Error(ex.Message); throw ex; - } - catch (IOException) - { + } + catch (IOException) + { Logger.Error(f.FullName + " rename failed, cannot remove stale plugin"); - throw; - } + throw; + } - // Make it an empty file - try - { - (new StreamWriter(newName)).Close(); - } - catch { } + // Make it an empty file + try + { + (new StreamWriter(newName)).Close(); + } + catch { } Logger.Error("Stale plugin " + f.FullName + " failed to cleanup successfully. A .delete file has been created for it."); - return false; - } - - /// - /// Returns the .delete file name for a particular file. If just the file name + .delete already exists and is locked, - /// then this returns a Guid + .delete format. - /// - /// - /// - private static string GetNewDeleteName(FileInfo pluginFile) - { - var deleteName = pluginFile.FullName + ".delete"; - - try - { - if (File.Exists(deleteName)) - File.Delete(deleteName); - } - catch - { + return false; + } + + /// + /// Returns the .delete file name for a particular file. If just the file name + .delete already exists and is locked, + /// then this returns a Guid + .delete format. + /// + /// + /// + private static string GetNewDeleteName(FileInfo pluginFile) + { + var deleteName = pluginFile.FullName + ".delete"; + + try + { + if (File.Exists(deleteName)) + File.Delete(deleteName); + } + catch + { Logger.Error("Cannot remove file " + deleteName + ".It is locked, renaming to.delete file with GUID"); // Cannot delete, so we will need to use a GUID deleteName = pluginFile.FullName + Guid.NewGuid().ToString("N") + ".delete"; - } - - return deleteName; - } - - /// - /// When given a .delete file, this will attempt to delete the base file that the .delete was created from - /// and then the .delete file itself. if both are removed, then it will return true. - /// - /// - /// - private static bool CleanupDeletePluginFiles(FileInfo f) - { - if (f.Extension != ".delete") - return false; - - var baseFileName = Path.GetDirectoryName(f.FullName) + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(f.FullName); - - // NOTE: this is to remove our old GUID named files... we shouldn't have any of these but sometimes things are just locked - var base64Files = f.Directory.GetFiles(Path.GetFileName(baseFileName) + "???????????????????????????????????" + ".delete").ToList(); - Func delFile = x => - { - if (x.IsEmpty()) - return true; - - if (File.Exists(x)) - { - try - { - File.Delete(x); - } - catch - { - return false; - } - } - return true; - }; - - // Always try deleting old guid named files - foreach (var x in base64Files) - { - delFile(x.FullName); - } - - // Try to delete the .dll file - if (!delFile(baseFileName)) - { - return false; - } - - try - { - // Now try to remove the .delete file - f.Delete(); - } - catch { } - - return true; - } - } + } + + return deleteName; + } + + /// + /// When given a .delete file, this will attempt to delete the base file that the .delete was created from + /// and then the .delete file itself. if both are removed, then it will return true. + /// + /// + /// + private static bool CleanupDeletePluginFiles(FileInfo f) + { + if (f.Extension != ".delete") + return false; + + var baseFileName = Path.GetDirectoryName(f.FullName) + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(f.FullName); + + // NOTE: this is to remove our old GUID named files... we shouldn't have any of these but sometimes things are just locked + var base64Files = f.Directory.GetFiles(Path.GetFileName(baseFileName) + "???????????????????????????????????" + ".delete").ToList(); + Func delFile = x => + { + if (x.IsEmpty()) + return true; + + if (File.Exists(x)) + { + try + { + File.Delete(x); + } + catch + { + return false; + } + } + return true; + }; + + // Always try deleting old guid named files + foreach (var x in base64Files) + { + delFile(x.FullName); + } + + // Try to delete the .dll file + if (!delFile(baseFileName)) + { + return false; + } + + try + { + // Now try to remove the .delete file + f.Delete(); + } + catch { } + + return true; + } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs index f0ed27ac57..d8a3f158af 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs @@ -5,17 +5,17 @@ using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.InteropServices; using System.Web; using System.Web.Compilation; -using System.Runtime.InteropServices; using Microsoft.Web.Infrastructure.DynamicModuleHelper; +using SmartStore.Core.Data; +using SmartStore.Core.Infrastructure; using SmartStore.Core.Infrastructure.DependencyManagement; -using SmartStore.Core.Plugins; +using SmartStore.Core.Logging; using SmartStore.Core.Packaging; +using SmartStore.Core.Plugins; using SmartStore.Utilities; -using SmartStore.Core.Data; -using SmartStore.Core.Logging; -using SmartStore.Core.Infrastructure; // Contributor: Umbraco (http://www.umbraco.com). Thanks a lot! // SEE THIS POST for full details of what this does @@ -29,13 +29,13 @@ namespace SmartStore.Core.Plugins /// public partial class PluginManager { - [DllImport("kernel32.dll", SetLastError = true)] - private static extern bool SetDllDirectory(string lpPathName); + [DllImport("kernel32.dll", SetLastError = true)] + private static extern bool SetDllDirectory(string lpPathName); - private static readonly object _lock = new object(); + private static readonly object _lock = new object(); private static DirectoryInfo _shadowCopyDir; - private static readonly ConcurrentDictionary _referencedPlugins = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); - private static HashSet _inactiveAssemblies = new HashSet(); + private static readonly ConcurrentDictionary _referencedPlugins = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); + private static readonly HashSet _inactiveAssemblies = new HashSet(); private static ILogger Logger { get; set; } = NullLogger.Instance; @@ -43,7 +43,7 @@ private static IDisposable ActivateLogger() { var logger = new TraceLogger(); Logger = logger; - return new ActionDisposable(() => + return new ActionDisposable(() => { logger.Dispose(); Logger = NullLogger.Instance; @@ -59,33 +59,30 @@ private static IDisposable ActivateLogger() /// Returns a collection of all referenced plugin assemblies that have been shadow copied /// public static IEnumerable ReferencedPlugins - { - get - { - return _referencedPlugins.Values; - } - // for unit testing purposes - internal set - { - foreach (var x in value) - { - if (!_referencedPlugins.ContainsKey(x.SystemName)) - { - _referencedPlugins[x.SystemName] = x; - } - } - } - } - - /// - /// Returns a collection of all plugins which are not compatible with the current version - /// - public static IEnumerable IncompatiblePlugins - { - get; - // for unit testing purposes - internal set; - } + { + get => _referencedPlugins.Values; + // for unit testing purposes + internal set + { + foreach (var x in value) + { + if (!_referencedPlugins.ContainsKey(x.SystemName)) + { + _referencedPlugins[x.SystemName] = x; + } + } + } + } + + /// + /// Returns a collection of all plugins which are not compatible with the current version + /// + public static IEnumerable IncompatiblePlugins + { + get; + // for unit testing purposes + internal set; + } /// /// Initialize @@ -97,8 +94,8 @@ public static void Initialize() Logger.Debug("===================== APPINIT START"); InitializeCore(); Logger.Debug("===================== APPINIT END"); - } - } + } + } private static void InitializeCore() { @@ -136,7 +133,7 @@ private static void InitializeCore() var plugins = LoadPluginDescriptors().ToArray(); var compatiblePlugins = plugins.Where(x => !x.Incompatible).ToArray(); - var hasher = new PluginsHasher(compatiblePlugins); + var hasher = new PluginsHasher(compatiblePlugins); Logger.DebugFormat("Loaded plugin descriptors. {0} total, {1} incompatible.", plugins.Length, plugins.Length - compatiblePlugins.Length); @@ -171,8 +168,8 @@ private static void InitializeCore() if (dirty && DataSettings.DatabaseIsInstalled()) { - // Save current hash of all deployed plugins to disk - hasher.Persist(); + // Save current hash of all deployed plugins to disk + hasher.Persist(); // Save names of all deployed assemblies to disk (so we can nuke them later) SavePluginsAssemblies(_referencedPlugins.Values); @@ -243,132 +240,132 @@ void FinalizePlugin(PluginDescriptor p) } } - /// - /// Loads and parses the descriptors of all installed plugins - /// - /// All descriptors - private static IEnumerable LoadPluginDescriptors() - { - // TODO: Add verbose exception handling / raising here since this is happening on app startup and could - // prevent app from starting altogether - - var pluginsDir = new DirectoryInfo(CommonHelper.MapPath(PluginsLocation)); - - if (!pluginsDir.Exists) - { - pluginsDir.Create(); - return Enumerable.Empty(); - } - - // Determine all plugin folders: ~/Plugins/{SystemName} - var allPluginDirs = pluginsDir.EnumerateDirectories().ToArray() - .Where(x => !x.Name.IsMatch("bin") && !x.Name.IsMatch("_Backup")) - .OrderBy(x => x.Name) - .ToArray(); - - var installedPluginSystemNames = PluginFileParser.ParseInstalledPluginsFile().AsSynchronized(); - - // Load/activate all plugins - return allPluginDirs - .AsParallel() - .AsOrdered() - .Select(d => LoadPluginDescriptor(d, installedPluginSystemNames)) - .Where(x => x != null); - } - - private static PluginDescriptor LoadPluginDescriptor(DirectoryInfo d, ICollection installedPluginSystemNames) - { - var descriptionFile = new FileInfo(Path.Combine(d.FullName, "Description.txt")); - if (!descriptionFile.Exists) - { - return null; - } - - // Load descriptor file (Description.txt) - var descriptor = PluginFileParser.ParsePluginDescriptionFile(descriptionFile.FullName); - - // Some validation - if (descriptor.SystemName.IsEmpty()) - { - throw new SmartException("The plugin descriptor '{0}' does not define a plugin system name. Try assigning the plugin a unique name and recompile.".FormatInvariant(descriptionFile.FullName)); - } - - if (descriptor.PluginFileName.IsEmpty()) - { - throw new SmartException("The plugin descriptor '{0}' does not define a plugin assembly file name. Try assigning the plugin a file name and recompile.".FormatInvariant(descriptionFile.FullName)); - } - - descriptor.VirtualPath = PluginsLocation + "/" + descriptor.FolderName; - - // Set 'Installed' property - descriptor.Installed = installedPluginSystemNames.Contains(descriptor.SystemName); - - // Ensure that version of plugin is valid - if (!IsAssumedCompatible(descriptor)) - { - // Set 'Incompatible' property and return - descriptor.Incompatible = true; - return descriptor; - } - - var skipDlls = new HashSet(new[] { "log4net.dll" }, StringComparer.OrdinalIgnoreCase); - - // Get list of all DLLs in plugin folders (not in 'bin' or '_Backup'!) - var pluginBinaries = descriptionFile.Directory.EnumerateFiles("*.dll", SearchOption.AllDirectories).ToArray() - .Where(x => IsPackagePluginFolder(x.Directory) && !skipDlls.Contains(x.Name)) - .OrderBy(x => x.Name) - .ToDictionarySafe(x => x.Name, StringComparer.OrdinalIgnoreCase); - - // Set 'OriginalAssemblyFile' property - descriptor.Assembly.OriginalFile = pluginBinaries.Get(descriptor.PluginFileName); - - if (descriptor.Assembly.OriginalFile == null) - { - throw new SmartException("The main assembly '{0}' for plugin '{1}' could not be found.".FormatInvariant(descriptor.PluginFileName, descriptor.SystemName)); - } - - // Load all other referenced local assemblies now - var otherAssemblyFiles = pluginBinaries - .Where(x => !x.Key.IsCaseInsensitiveEqual(descriptor.PluginFileName)) - .Select(x => x.Value); - - descriptor.ReferencedLocalAssemblies = otherAssemblyFiles.Select(x => new AssemblyReference { OriginalFile = x }).ToArray(); - - return descriptor; - } - - private static void ActivatePlugin(PluginDescriptor plugin) - { - // Init plugin type (only one plugin per assembly is allowed) - bool pluginFound = false; - bool preStarterFound = !plugin.Installed; - var exportedTypes = plugin.Assembly.Assembly.GetExportedTypes(); - - foreach (var t in exportedTypes) - { - if (typeof(IPlugin).IsAssignableFrom(t) && !t.IsInterface && t.IsClass && !t.IsAbstract) - { - plugin.PluginClrType = t; - plugin.IsConfigurable = typeof(IConfigurable).IsAssignableFrom(t); - pluginFound = true; - } - else if (plugin.Installed && typeof(IPreApplicationStart).IsAssignableFrom(t) && !t.IsInterface && t.IsClass && !t.IsAbstract && t.HasDefaultConstructor()) - { - try - { - var preStarter = Activator.CreateInstance(t) as IPreApplicationStart; - preStarter.Start(); - } - catch { } - preStarterFound = true; - } - - if (pluginFound && preStarterFound) - { - break; - } - } - } + /// + /// Loads and parses the descriptors of all installed plugins + /// + /// All descriptors + private static IEnumerable LoadPluginDescriptors() + { + // TODO: Add verbose exception handling / raising here since this is happening on app startup and could + // prevent app from starting altogether + + var pluginsDir = new DirectoryInfo(CommonHelper.MapPath(PluginsLocation)); + + if (!pluginsDir.Exists) + { + pluginsDir.Create(); + return Enumerable.Empty(); + } + + // Determine all plugin folders: ~/Plugins/{SystemName} + var allPluginDirs = pluginsDir.EnumerateDirectories().ToArray() + .Where(x => !x.Name.IsMatch("bin") && !x.Name.IsMatch("_Backup")) + .OrderBy(x => x.Name) + .ToArray(); + + var installedPluginSystemNames = PluginFileParser.ParseInstalledPluginsFile().AsSynchronized(); + + // Load/activate all plugins + return allPluginDirs + .AsParallel() + .AsOrdered() + .Select(d => LoadPluginDescriptor(d, installedPluginSystemNames)) + .Where(x => x != null); + } + + private static PluginDescriptor LoadPluginDescriptor(DirectoryInfo d, ICollection installedPluginSystemNames) + { + var descriptionFile = new FileInfo(Path.Combine(d.FullName, "Description.txt")); + if (!descriptionFile.Exists) + { + return null; + } + + // Load descriptor file (Description.txt) + var descriptor = PluginFileParser.ParsePluginDescriptionFile(descriptionFile.FullName); + + // Some validation + if (descriptor.SystemName.IsEmpty()) + { + throw new SmartException("The plugin descriptor '{0}' does not define a plugin system name. Try assigning the plugin a unique name and recompile.".FormatInvariant(descriptionFile.FullName)); + } + + if (descriptor.PluginFileName.IsEmpty()) + { + throw new SmartException("The plugin descriptor '{0}' does not define a plugin assembly file name. Try assigning the plugin a file name and recompile.".FormatInvariant(descriptionFile.FullName)); + } + + descriptor.VirtualPath = PluginsLocation + "/" + descriptor.FolderName; + + // Set 'Installed' property + descriptor.Installed = installedPluginSystemNames.Contains(descriptor.SystemName); + + // Ensure that version of plugin is valid + if (!IsAssumedCompatible(descriptor)) + { + // Set 'Incompatible' property and return + descriptor.Incompatible = true; + return descriptor; + } + + var skipDlls = new HashSet(new[] { "log4net.dll" }, StringComparer.OrdinalIgnoreCase); + + // Get list of all DLLs in plugin folders (not in 'bin' or '_Backup'!) + var pluginBinaries = descriptionFile.Directory.EnumerateFiles("*.dll", SearchOption.AllDirectories).ToArray() + .Where(x => IsPackagePluginFolder(x.Directory) && !skipDlls.Contains(x.Name)) + .OrderBy(x => x.Name) + .ToDictionarySafe(x => x.Name, StringComparer.OrdinalIgnoreCase); + + // Set 'OriginalAssemblyFile' property + descriptor.Assembly.OriginalFile = pluginBinaries.Get(descriptor.PluginFileName); + + if (descriptor.Assembly.OriginalFile == null) + { + throw new SmartException("The main assembly '{0}' for plugin '{1}' could not be found.".FormatInvariant(descriptor.PluginFileName, descriptor.SystemName)); + } + + // Load all other referenced local assemblies now + var otherAssemblyFiles = pluginBinaries + .Where(x => !x.Key.IsCaseInsensitiveEqual(descriptor.PluginFileName)) + .Select(x => x.Value); + + descriptor.ReferencedLocalAssemblies = otherAssemblyFiles.Select(x => new AssemblyReference { OriginalFile = x }).ToArray(); + + return descriptor; + } + + private static void ActivatePlugin(PluginDescriptor plugin) + { + // Init plugin type (only one plugin per assembly is allowed) + bool pluginFound = false; + bool preStarterFound = !plugin.Installed; + var exportedTypes = plugin.Assembly.Assembly.GetExportedTypes(); + + foreach (var t in exportedTypes) + { + if (typeof(IPlugin).IsAssignableFrom(t) && !t.IsInterface && t.IsClass && !t.IsAbstract) + { + plugin.PluginClrType = t; + plugin.IsConfigurable = typeof(IConfigurable).IsAssignableFrom(t); + pluginFound = true; + } + else if (plugin.Installed && typeof(IPreApplicationStart).IsAssignableFrom(t) && !t.IsInterface && t.IsClass && !t.IsAbstract && t.HasDefaultConstructor()) + { + try + { + var preStarter = Activator.CreateInstance(t) as IPreApplicationStart; + preStarter.Start(); + } + catch { } + preStarterFound = true; + } + + if (pluginFound && preStarterFound) + { + break; + } + } + } /// /// Mark plugin as installed @@ -376,17 +373,17 @@ private static void ActivatePlugin(PluginDescriptor plugin) /// Plugin system name public static void MarkPluginAsInstalled(string systemName) { - Guard.NotEmpty(systemName, nameof(systemName)); + Guard.NotEmpty(systemName, nameof(systemName)); - var installedPluginSystemNames = GetInstalledPluginNames(); + var installedPluginSystemNames = GetInstalledPluginNames(); - bool installed = installedPluginSystemNames.Contains(systemName); - if (!installed) - { - installedPluginSystemNames.Add(systemName); - } + bool installed = installedPluginSystemNames.Contains(systemName); + if (!installed) + { + installedPluginSystemNames.Add(systemName); + } - PluginFileParser.SaveInstalledPluginsFile(installedPluginSystemNames); + PluginFileParser.SaveInstalledPluginsFile(installedPluginSystemNames); } /// @@ -395,16 +392,16 @@ public static void MarkPluginAsInstalled(string systemName) /// Plugin system name public static void MarkPluginAsUninstalled(string systemName) { - Guard.NotEmpty(systemName, nameof(systemName)); + Guard.NotEmpty(systemName, nameof(systemName)); - var installedPluginSystemNames = GetInstalledPluginNames(); - bool installed = installedPluginSystemNames.Contains(systemName); - if (installed) - { - installedPluginSystemNames.Remove(systemName); - } + var installedPluginSystemNames = GetInstalledPluginNames(); + bool installed = installedPluginSystemNames.Contains(systemName); + if (installed) + { + installedPluginSystemNames.Remove(systemName); + } - PluginFileParser.SaveInstalledPluginsFile(installedPluginSystemNames); + PluginFileParser.SaveInstalledPluginsFile(installedPluginSystemNames); } /// @@ -417,20 +414,20 @@ public static void MarkAllPluginsAsUninstalled() File.Delete(filePath); } - private static ICollection GetInstalledPluginNames() - { - var filePath = PluginFileParser.InstalledPluginsFilePath; - if (!File.Exists(filePath)) - { - using (File.Create(filePath)) - { - // We use 'using' to close the file after it's created - } - } - - var installedPluginSystemNames = PluginFileParser.ParseInstalledPluginsFile(); - return installedPluginSystemNames; - } + private static ICollection GetInstalledPluginNames() + { + var filePath = PluginFileParser.InstalledPluginsFilePath; + if (!File.Exists(filePath)) + { + using (File.Create(filePath)) + { + // We use 'using' to close the file after it's created + } + } + + var installedPluginSystemNames = PluginFileParser.ParseInstalledPluginsFile(); + return installedPluginSystemNames; + } /// /// Gets a value indicating whether a plugin is assumed @@ -445,68 +442,68 @@ private static ICollection GetInstalledPluginNames() /// true when the plugin is assumed to be compatible public static bool IsAssumedCompatible(PluginDescriptor descriptor) { - Guard.NotNull(descriptor, nameof(descriptor)); + Guard.NotNull(descriptor, nameof(descriptor)); - return IsAssumedCompatible(descriptor.MinAppVersion); + return IsAssumedCompatible(descriptor.MinAppVersion); } - /// - /// Gets a value indicating whether the given min. required app version is assumed - /// to be compatible with the current app version - /// - /// - /// A plugin is generally compatible when both app version and plugin's - /// MinorAppVersion are equal, OR - when app version is greater - it is - /// assumed to be compatible when no breaking changes occured since MinorAppVersion. - /// - /// The min. app version to check for - /// true when the extension's version is assumed to be compatible - public static bool IsAssumedCompatible(Version minAppVersion) - { - Guard.NotNull(minAppVersion, nameof(minAppVersion)); - - if (SmartStoreVersion.Version == minAppVersion) - { - return true; - } - - if (SmartStoreVersion.Version < minAppVersion) - { - return false; - } - - bool compatible = true; - - foreach (var version in SmartStoreVersion.BreakingChangesHistory) - { - if (version > minAppVersion) - { - // there was a breaking change in a version greater - // than plugin's MinorAppVersion. - compatible = false; - break; - } - - if (version <= minAppVersion) - { - break; - } - } - - return compatible; - } - - /// - /// Gets a value indicating whether a plugin - /// is registered and installed. - /// - /// The system name of the plugin to check for - /// true if the plugin exists, false otherwise - public static bool PluginExists(string systemName) - { - Guard.NotEmpty(systemName, nameof(systemName)); - return _referencedPlugins.ContainsKey(systemName); - } + /// + /// Gets a value indicating whether the given min. required app version is assumed + /// to be compatible with the current app version + /// + /// + /// A plugin is generally compatible when both app version and plugin's + /// MinorAppVersion are equal, OR - when app version is greater - it is + /// assumed to be compatible when no breaking changes occured since MinorAppVersion. + /// + /// The min. app version to check for + /// true when the extension's version is assumed to be compatible + public static bool IsAssumedCompatible(Version minAppVersion) + { + Guard.NotNull(minAppVersion, nameof(minAppVersion)); + + if (SmartStoreVersion.Version == minAppVersion) + { + return true; + } + + if (SmartStoreVersion.Version < minAppVersion) + { + return false; + } + + bool compatible = true; + + foreach (var version in SmartStoreVersion.BreakingChangesHistory) + { + if (version > minAppVersion) + { + // there was a breaking change in a version greater + // than plugin's MinorAppVersion. + compatible = false; + break; + } + + if (version <= minAppVersion) + { + break; + } + } + + return compatible; + } + + /// + /// Gets a value indicating whether a plugin + /// is registered and installed. + /// + /// The system name of the plugin to check for + /// true if the plugin exists, false otherwise + public static bool PluginExists(string systemName) + { + Guard.NotEmpty(systemName, nameof(systemName)); + return _referencedPlugins.ContainsKey(systemName); + } /// /// Gets a value indicating whether the plugin assembly @@ -519,34 +516,34 @@ public static bool IsActivePluginAssembly(Assembly assembly) return !_inactiveAssemblies.Contains(assembly); } - private static void SetPrivateEnvPath() - { - string envPath = Environment.GetEnvironmentVariable("PATH"); + private static void SetPrivateEnvPath() + { + string envPath = Environment.GetEnvironmentVariable("PATH"); - if (Environment.Is64BitProcess) - { - envPath = envPath.EnsureEndsWith(";") + Path.Combine(AppDomain.CurrentDomain.RelativeSearchPath, "amd64"); - envPath = envPath.EnsureEndsWith(";") + Path.Combine(AppDomain.CurrentDomain.RelativeSearchPath, "x64"); - } - else - { - envPath = envPath.EnsureEndsWith(";") + Path.Combine(AppDomain.CurrentDomain.RelativeSearchPath, "x86"); - } + if (Environment.Is64BitProcess) + { + envPath = envPath.EnsureEndsWith(";") + Path.Combine(AppDomain.CurrentDomain.RelativeSearchPath, "amd64"); + envPath = envPath.EnsureEndsWith(";") + Path.Combine(AppDomain.CurrentDomain.RelativeSearchPath, "x64"); + } + else + { + envPath = envPath.EnsureEndsWith(";") + Path.Combine(AppDomain.CurrentDomain.RelativeSearchPath, "x86"); + } - Environment.SetEnvironmentVariable("PATH", envPath, EnvironmentVariableTarget.Process); - } + Environment.SetEnvironmentVariable("PATH", envPath, EnvironmentVariableTarget.Process); + } - private static void SetNativeDllPath() - { - var currentDomain = AppDomain.CurrentDomain; - var privateBinPath = currentDomain.SetupInformation.PrivateBinPath.NullEmpty() ?? currentDomain.BaseDirectory; - var dir = Path.Combine(privateBinPath, Environment.Is64BitProcess ? "x64" : "x86"); + private static void SetNativeDllPath() + { + var currentDomain = AppDomain.CurrentDomain; + var privateBinPath = currentDomain.SetupInformation.PrivateBinPath.NullEmpty() ?? currentDomain.BaseDirectory; + var dir = Path.Combine(privateBinPath, Environment.Is64BitProcess ? "x64" : "x86"); Logger.DebugFormat("Setting native DLL path to '{0}'.", dir); - SetDllDirectory(dir); - } + SetDllDirectory(dir); + } /// /// Perform file deploy @@ -555,74 +552,74 @@ private static void SetNativeDllPath() /// Reference to the shadow copied Assembly private static Assembly Probe(AssemblyReference ar, PluginDescriptor d, bool shadowCopy) { - var file = ar.OriginalFile; - - try - { - if (file.Directory == null || file.Directory.Parent == null) - { - throw new InvalidOperationException("The plugin directory for the " + file.Name + - " file exists in a folder outside of the allowed SmartStore folder hierarchy"); - } - - ar.File = InitializeFullTrust(file, shadowCopy); - - // Load assembly locked, because concurrent load calls - even with different assemblies - - // will result in strange app init behaviour. - lock (_lock) - { - // We can now register the plugin definition - ar.Assembly = Assembly.Load(AssemblyName.GetAssemblyName(ar.File.FullName)); - - // Add the reference to the build manager - if (ar.Assembly != null) - { - // Loading assembly can fail in parallel loops. - // In this case, we'll probe again later in a sequential loop. - BuildManager.AddReferencedAssembly(ar.Assembly); - } - } - - ar.ActivationException = null; - } - catch (UnauthorizedAccessException ex) - { + var file = ar.OriginalFile; + + try + { + if (file.Directory == null || file.Directory.Parent == null) + { + throw new InvalidOperationException("The plugin directory for the " + file.Name + + " file exists in a folder outside of the allowed SmartStore folder hierarchy"); + } + + ar.File = InitializeFullTrust(file, shadowCopy); + + // Load assembly locked, because concurrent load calls - even with different assemblies - + // will result in strange app init behaviour. + lock (_lock) + { + // We can now register the plugin definition + ar.Assembly = Assembly.Load(AssemblyName.GetAssemblyName(ar.File.FullName)); + + // Add the reference to the build manager + if (ar.Assembly != null) + { + // Loading assembly can fail in parallel loops. + // In this case, we'll probe again later in a sequential loop. + BuildManager.AddReferencedAssembly(ar.Assembly); + } + } + + ar.ActivationException = null; + } + catch (UnauthorizedAccessException ex) + { Logger.Error(ex.Message); // Throw the exception if its UnauthorizedAccessException as this will - // be because we most likely cannot copy to the dynamic folder. - throw; - } - catch (ReflectionTypeLoadException ex) - { - var msg = string.Empty; - foreach (var e in ex.LoaderExceptions) - { - msg += e.Message + Environment.NewLine; - } - - ar.ActivationException = CreateException(msg, ex); - } - catch (Exception ex) - { - var msg = string.Empty; - for (var e = ex; e != null; e = e.InnerException) - { - msg += e.Message + Environment.NewLine; - } - - ar.ActivationException = CreateException(msg, ex); - } - - return ar.Assembly; - - Exception CreateException(string message, Exception innerException) - { - return new SmartException( - "Error loading plugin '{0}'".FormatInvariant(d.SystemName) + Environment.NewLine + message, - innerException); - } - } + // be because we most likely cannot copy to the dynamic folder. + throw; + } + catch (ReflectionTypeLoadException ex) + { + var msg = string.Empty; + foreach (var e in ex.LoaderExceptions) + { + msg += e.Message + Environment.NewLine; + } + + ar.ActivationException = CreateException(msg, ex); + } + catch (Exception ex) + { + var msg = string.Empty; + for (var e = ex; e != null; e = e.InnerException) + { + msg += e.Message + Environment.NewLine; + } + + ar.ActivationException = CreateException(msg, ex); + } + + return ar.Assembly; + + Exception CreateException(string message, Exception innerException) + { + return new SmartException( + "Error loading plugin '{0}'".FormatInvariant(d.SystemName) + Environment.NewLine + message, + innerException); + } + } /// /// Used to initialize plugins when running in Full Trust @@ -633,19 +630,19 @@ private static FileInfo InitializeFullTrust(FileInfo dll, bool shadowCopy) { var probedDll = new FileInfo(Path.Combine(_shadowCopyDir.FullName, dll.Name)); - // If instructed to not perform the copy, just return the path to where it is supposed to be - if (!shadowCopy && probedDll.Exists) - return probedDll; + // If instructed to not perform the copy, just return the path to where it is supposed to be + if (!shadowCopy && probedDll.Exists) + return probedDll; - try + try { File.Copy(dll.FullName, probedDll.FullName, true); } - catch (UnauthorizedAccessException) - { - throw new UnauthorizedAccessException(string.Format("Access to the path '{0}' is denied, ensure that read, write and modify permissions are allowed.", probedDll.Directory.FullName)); - } - catch (IOException) + catch (UnauthorizedAccessException) + { + throw new UnauthorizedAccessException(string.Format("Access to the path '{0}' is denied, ensure that read, write and modify permissions are allowed.", probedDll.Directory.FullName)); + } + catch (IOException) { Logger.WarnFormat("'{0}' is locked, attempting to rename.", probedDll.FullName); @@ -654,15 +651,15 @@ private static FileInfo InitializeFullTrust(FileInfo dll, bool shadowCopy) // Which releases the lock, so that it what we are doing here, once it's renamed, we can re-shadow copy try { - // If all else fails during the cleanup and we cannot copy over so we need to rename with a GUID - var deleteName = GetNewDeleteName(probedDll); - File.Move(probedDll.FullName, deleteName); + // If all else fails during the cleanup and we cannot copy over so we need to rename with a GUID + var deleteName = GetNewDeleteName(probedDll); + File.Move(probedDll.FullName, deleteName); + } + catch (UnauthorizedAccessException) + { + throw new UnauthorizedAccessException(string.Format("Access to the path '{0}' is denied, ensure that read, write and modify permissions are allowed.", probedDll.Directory.FullName)); } - catch (UnauthorizedAccessException) - { - throw new UnauthorizedAccessException(string.Format("Access to the path '{0}' is denied, ensure that read, write and modify permissions are allowed.", probedDll.Directory.FullName)); - } - catch (IOException exc) + catch (IOException exc) { throw new IOException(probedDll.FullName + " rename failed, cannot initialize plugin", exc); } @@ -686,5 +683,5 @@ private static bool IsPackagePluginFolder(DirectoryInfo folder) if (!folder.Parent.Name.Equals("Plugins", StringComparison.InvariantCultureIgnoreCase)) return false; return true; } - } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/DependentWidgetsAttribute.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/DependentWidgetsAttribute.cs index 384b6a7627..6fe776760e 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/DependentWidgetsAttribute.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/DependentWidgetsAttribute.cs @@ -1,28 +1,24 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace SmartStore.Core.Plugins { - /// - /// Enables provider developers to specify one or many widgets, which - /// should automatically get (de)activated when the provider gets (de)activated. - /// Useful in scenarios where separate widgets are responsible for the displaying of provider data. - /// - /// - /// A widget should definitely NOT depend on multiple providers as the activation - /// only occurs on a single item base. - /// - [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] - public class DependentWidgetsAttribute : Attribute - { - public DependentWidgetsAttribute(params string[] widgetSystemNames) - { - WidgetSystemNames = widgetSystemNames; - } + /// + /// Enables provider developers to specify one or many widgets, which + /// should automatically get (de)activated when the provider gets (de)activated. + /// Useful in scenarios where separate widgets are responsible for the displaying of provider data. + /// + /// + /// A widget should definitely NOT depend on multiple providers as the activation + /// only occurs on a single item base. + /// + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public class DependentWidgetsAttribute : Attribute + { + public DependentWidgetsAttribute(params string[] widgetSystemNames) + { + WidgetSystemNames = widgetSystemNames; + } - public string[] WidgetSystemNames { get; private set; } - } + public string[] WidgetSystemNames { get; private set; } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/DisplayOrderAttribute.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/DisplayOrderAttribute.cs index 33a8b3b13e..a60b19aeed 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/DisplayOrderAttribute.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/DisplayOrderAttribute.cs @@ -2,14 +2,14 @@ namespace SmartStore.Core.Plugins { - [AttributeUsage(AttributeTargets.Class, AllowMultiple=false, Inherited=false)] - public sealed class DisplayOrderAttribute : Attribute - { - public DisplayOrderAttribute(int displayOrder) - { - DisplayOrder = displayOrder; - } + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public sealed class DisplayOrderAttribute : Attribute + { + public DisplayOrderAttribute(int displayOrder) + { + DisplayOrder = displayOrder; + } - public int DisplayOrder { get; set; } - } + public int DisplayOrder { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/FriendlyNameAttribute.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/FriendlyNameAttribute.cs index ec406c905b..c95cea4e2d 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/FriendlyNameAttribute.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/FriendlyNameAttribute.cs @@ -2,18 +2,18 @@ namespace SmartStore.Core.Plugins { - [AttributeUsage(AttributeTargets.Class, AllowMultiple=false, Inherited=false)] - public sealed class FriendlyNameAttribute : Attribute - { - public FriendlyNameAttribute(string name) - { - Guard.NotNull(name, nameof(name)); + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public sealed class FriendlyNameAttribute : Attribute + { + public FriendlyNameAttribute(string name) + { + Guard.NotNull(name, nameof(name)); - Name = name; - } + Name = name; + } - public string Name { get; set; } + public string Name { get; set; } - public string Description { get; set; } - } + public string Description { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/IProvider.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/IProvider.cs index fae747723b..409e07edd2 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/IProvider.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/IProvider.cs @@ -2,42 +2,33 @@ namespace SmartStore.Core.Plugins { - public interface IProvider - { - } - - public sealed class Provider where TProvider : IProvider - { - private readonly Lazy _lazy; - - public Provider(Lazy lazy) - { - this._lazy = lazy; - } - - public TProvider Value - { - get { return _lazy.Value; } - } - - public ProviderMetadata Metadata - { - get { return _lazy.Metadata; } - } - - public bool IsValueCreated - { - get { return _lazy.IsValueCreated; } - } - - public Lazy ToLazy() - { - return _lazy; - } - - public override string ToString() - { - return _lazy.Metadata.SystemName; - } - } + public interface IProvider + { + } + + public sealed class Provider where TProvider : IProvider + { + private readonly Lazy _lazy; + + public Provider(Lazy lazy) + { + this._lazy = lazy; + } + + public TProvider Value => _lazy.Value; + + public ProviderMetadata Metadata => _lazy.Metadata; + + public bool IsValueCreated => _lazy.IsValueCreated; + + public Lazy ToLazy() + { + return _lazy; + } + + public override string ToString() + { + return _lazy.Metadata.SystemName; + } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/IProviderManager.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/IProviderManager.cs index c2a10fe5b8..4585578355 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/IProviderManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/IProviderManager.cs @@ -1,17 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; namespace SmartStore.Core.Plugins { - public interface IProviderManager - { - Provider GetProvider(string systemName, int storeId = 0) where TProvider : IProvider; + public interface IProviderManager + { + Provider GetProvider(string systemName, int storeId = 0) where TProvider : IProvider; - Provider GetProvider(string systemName, int storeId = 0); + Provider GetProvider(string systemName, int storeId = 0); - IEnumerable> GetAllProviders(int storeId = 0) where TProvider : IProvider; + IEnumerable> GetAllProviders(int storeId = 0) where TProvider : IProvider; - IEnumerable> GetAllProviders(int storeId = 0); - } + IEnumerable> GetAllProviders(int storeId = 0); + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/IUserEditable.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/IUserEditable.cs index 8544372396..453b22f101 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/IUserEditable.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/IUserEditable.cs @@ -1,8 +1,6 @@ -using System; - -namespace SmartStore.Core.Plugins +namespace SmartStore.Core.Plugins { - public interface IUserEditable - { - } + public interface IUserEditable + { + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/IsHiddenAttribute.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/IsHiddenAttribute.cs index 6ba32b9d5a..b2b0036669 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/IsHiddenAttribute.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/IsHiddenAttribute.cs @@ -2,14 +2,14 @@ namespace SmartStore.Core.Plugins { - [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] - public sealed class IsHiddenAttribute : Attribute - { - public IsHiddenAttribute(bool isHidden) - { - IsHidden = isHidden; - } + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public sealed class IsHiddenAttribute : Attribute + { + public IsHiddenAttribute(bool isHidden) + { + IsHidden = isHidden; + } - public bool IsHidden { get; set; } - } + public bool IsHidden { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/ProviderMetadata.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/ProviderMetadata.cs index 8b806c43fc..ab44fa593b 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/ProviderMetadata.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/ProviderMetadata.cs @@ -4,143 +4,143 @@ namespace SmartStore.Core.Plugins { - public interface IProviderMetadata - { - /// - /// Gets the provider system name - /// - string SystemName { get; } - - /// - /// Gets the resource key pattern for user data (e.g. FriendlyName) - /// - /// - /// Plugins.{1}.{0} > 0 = provider system name, 1 = propertyname - /// - string ResourceKeyPattern { get; } - - /// - /// Gets the provider friendly name - /// - string FriendlyName { get; } - - /// - /// Gets the provider description - /// - string Description { get; } - - /// - /// Gets the provider display order - /// - int DisplayOrder { get; } - } - - public class ProviderMetadata : IProviderMetadata - { - /// - /// Gets or sets the provider type - /// - public Type ProviderType { get; set; } - - /// - /// Gets or sets the provider's group name - /// - public string GroupName { get; set; } - - /// - /// Gets or sets the provider system name - /// - public string SystemName { get; set; } - - /// - /// Gets or sets the resource key pattern for user data (e.g. FriendlyName) - /// - /// - /// Plugins.{1}.{0} > 0 = provider system name, 1 = propertyname - /// - public string ResourceKeyPattern { get; set; } - - /// - /// Gets or sets the setting key pattern for user data (e.g. DisplayOrder) - /// - /// - /// Plugins.{0}.{1} > 0 = provider system name, 1 = propertyname - /// - public string SettingKeyPattern { get; set; } - - /// - /// Gets or sets the provider friendly name - /// - public string FriendlyName { get; set; } - - /// - /// Gets or sets the provider description - /// - public string Description { get; set; } - - /// - /// Gets or sets the display order - /// - public int DisplayOrder { get; set; } - - /// - /// Gets or sets a value indicating whether the provider is configurable (by implementing ) - /// - public bool IsConfigurable { get; set; } - - /// - /// Gets or sets a value indicating whether the provider is editable by the user (by implementing ) - /// - /// - /// A provider is editable if the user is allowed to change display order and/or localize display name - /// - public bool IsEditable { get; set; } - - /// - /// Gets or sets a value indicating whether the provider is hidden (by decorating with ) - /// - public bool IsHidden { get; set; } - - /// - /// Gets or sets flags that reflects what features of export data processing is supported by a provider - /// - public ExportFeatures ExportFeatures { get; set; } - - /// - /// Gets or sets an array of widget system names, which depend on the current provider - /// - /// - /// Dependent widgets get automatically (de)activated when their parent providers get (de)activated - /// - public string[] DependentWidgets { get; set; } - - /// - /// Gets or sets the instance in which the provider is implemented - /// - /// The value is null, if the provider is part of the application core - public PluginDescriptor PluginDescriptor { get; set; } - - public string GetSettingKey(string name) - { - return SettingKeyPattern.FormatWith(SystemName, name); - } - - public override string ToString() - { - return "Provider '{0}' - {1}".FormatCurrent(SystemName, FriendlyName); - } - - public override bool Equals(object obj) - { - var other = obj as ProviderMetadata; - return other != null && - SystemName != null && - SystemName.Equals(other.SystemName); - } - - public override int GetHashCode() - { - return HashCodeCombiner.Start().Add(typeof(ProviderMetadata)).Add(SystemName).CombinedHash; - } - } + public interface IProviderMetadata + { + /// + /// Gets the provider system name + /// + string SystemName { get; } + + /// + /// Gets the resource key pattern for user data (e.g. FriendlyName) + /// + /// + /// Plugins.{1}.{0} > 0 = provider system name, 1 = propertyname + /// + string ResourceKeyPattern { get; } + + /// + /// Gets the provider friendly name + /// + string FriendlyName { get; } + + /// + /// Gets the provider description + /// + string Description { get; } + + /// + /// Gets the provider display order + /// + int DisplayOrder { get; } + } + + public class ProviderMetadata : IProviderMetadata + { + /// + /// Gets or sets the provider type + /// + public Type ProviderType { get; set; } + + /// + /// Gets or sets the provider's group name + /// + public string GroupName { get; set; } + + /// + /// Gets or sets the provider system name + /// + public string SystemName { get; set; } + + /// + /// Gets or sets the resource key pattern for user data (e.g. FriendlyName) + /// + /// + /// Plugins.{1}.{0} > 0 = provider system name, 1 = propertyname + /// + public string ResourceKeyPattern { get; set; } + + /// + /// Gets or sets the setting key pattern for user data (e.g. DisplayOrder) + /// + /// + /// Plugins.{0}.{1} > 0 = provider system name, 1 = propertyname + /// + public string SettingKeyPattern { get; set; } + + /// + /// Gets or sets the provider friendly name + /// + public string FriendlyName { get; set; } + + /// + /// Gets or sets the provider description + /// + public string Description { get; set; } + + /// + /// Gets or sets the display order + /// + public int DisplayOrder { get; set; } + + /// + /// Gets or sets a value indicating whether the provider is configurable (by implementing ) + /// + public bool IsConfigurable { get; set; } + + /// + /// Gets or sets a value indicating whether the provider is editable by the user (by implementing ) + /// + /// + /// A provider is editable if the user is allowed to change display order and/or localize display name + /// + public bool IsEditable { get; set; } + + /// + /// Gets or sets a value indicating whether the provider is hidden (by decorating with ) + /// + public bool IsHidden { get; set; } + + /// + /// Gets or sets flags that reflects what features of export data processing is supported by a provider + /// + public ExportFeatures ExportFeatures { get; set; } + + /// + /// Gets or sets an array of widget system names, which depend on the current provider + /// + /// + /// Dependent widgets get automatically (de)activated when their parent providers get (de)activated + /// + public string[] DependentWidgets { get; set; } + + /// + /// Gets or sets the instance in which the provider is implemented + /// + /// The value is null, if the provider is part of the application core + public PluginDescriptor PluginDescriptor { get; set; } + + public string GetSettingKey(string name) + { + return SettingKeyPattern.FormatWith(SystemName, name); + } + + public override string ToString() + { + return "Provider '{0}' - {1}".FormatCurrent(SystemName, FriendlyName); + } + + public override bool Equals(object obj) + { + var other = obj as ProviderMetadata; + return other != null && + SystemName != null && + SystemName.Equals(other.SystemName); + } + + public override int GetHashCode() + { + return HashCodeCombiner.Start().Add(typeof(ProviderMetadata)).Add(SystemName).CombinedHash; + } + } } diff --git a/src/Libraries/SmartStore.Core/Plugins/Providers/SystemNameAttribute.cs b/src/Libraries/SmartStore.Core/Plugins/Providers/SystemNameAttribute.cs index 4bbb2e7a4e..0946be4c34 100644 --- a/src/Libraries/SmartStore.Core/Plugins/Providers/SystemNameAttribute.cs +++ b/src/Libraries/SmartStore.Core/Plugins/Providers/SystemNameAttribute.cs @@ -2,15 +2,15 @@ namespace SmartStore.Core.Plugins { - [AttributeUsage(AttributeTargets.Class, AllowMultiple=false, Inherited=false)] - public sealed class SystemNameAttribute : Attribute - { - public SystemNameAttribute(string name) - { - Guard.NotEmpty(name, nameof(name)); - Name = name; - } + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public sealed class SystemNameAttribute : Attribute + { + public SystemNameAttribute(string name) + { + Guard.NotEmpty(name, nameof(name)); + Name = name; + } - public string Name { get; set; } - } + public string Name { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/RouteInfo.cs b/src/Libraries/SmartStore.Core/RouteInfo.cs index 84827ddd44..e98f9d9004 100644 --- a/src/Libraries/SmartStore.Core/RouteInfo.cs +++ b/src/Libraries/SmartStore.Core/RouteInfo.cs @@ -1,29 +1,28 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Web.Routing; using Newtonsoft.Json; namespace SmartStore { - [JsonConverter(typeof(RouteInfoConverter))] - public class RouteInfo - { - public RouteInfo(RouteInfo cloneFrom) - : this(cloneFrom.Action, cloneFrom.Controller, new RouteValueDictionary(cloneFrom.RouteValues)) - { - Guard.NotNull(cloneFrom, nameof(cloneFrom)); - } + [JsonConverter(typeof(RouteInfoConverter))] + public class RouteInfo + { + public RouteInfo(RouteInfo cloneFrom) + : this(cloneFrom.Action, cloneFrom.Controller, new RouteValueDictionary(cloneFrom.RouteValues)) + { + Guard.NotNull(cloneFrom, nameof(cloneFrom)); + } public RouteInfo(string action, object routeValues) : this(action, null, routeValues) { } - public RouteInfo(string action, string controller, object routeValues) - : this(action, controller, new RouteValueDictionary(routeValues)) - { - } + public RouteInfo(string action, string controller, object routeValues) + : this(action, controller, new RouteValueDictionary(routeValues)) + { + } public RouteInfo(string action, IDictionary routeValues) : this(action, null, routeValues) @@ -31,103 +30,100 @@ public RouteInfo(string action, IDictionary routeValues) } public RouteInfo(string action, string controller, IDictionary routeValues) - : this(action, controller, new RouteValueDictionary(routeValues)) - { - Guard.NotNull(routeValues, nameof(routeValues)); - } + : this(action, controller, new RouteValueDictionary(routeValues)) + { + Guard.NotNull(routeValues, nameof(routeValues)); + } public RouteInfo(string action, RouteValueDictionary routeValues) : this(action, null, routeValues) { } - [JsonConstructor] + [JsonConstructor] public RouteInfo(string action, string controller, RouteValueDictionary routeValues) - { - Guard.NotEmpty(action, nameof(action)); - Guard.NotNull(routeValues, nameof(routeValues)); - - this.Action = action; - this.Controller = controller; - this.RouteValues = routeValues; - } - - public string Action - { - get; - private set; - } - - public string Controller - { - get; - private set; - } - - public RouteValueDictionary RouteValues - { - get; - private set; - } - } - - #region JsonConverter - - public class RouteInfoConverter : JsonConverter - { - public override bool CanWrite - { - get { return false; } - } - - public override bool CanConvert(Type objectType) - { - return objectType == typeof(RouteInfo); - } - - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - string action = null; - string controller = null; - RouteValueDictionary routeValues = null; - - reader.Read(); - while (reader.TokenType == JsonToken.PropertyName) - { - string a = reader.Value.ToString(); - if (string.Equals(a, "Action", StringComparison.OrdinalIgnoreCase)) - { - reader.Read(); - action = serializer.Deserialize(reader); - } - else if (string.Equals(a, "Controller", StringComparison.OrdinalIgnoreCase)) - { - reader.Read(); - controller = serializer.Deserialize(reader); - } - else if (string.Equals(a, "RouteValues", StringComparison.OrdinalIgnoreCase)) - { - reader.Read(); - routeValues = serializer.Deserialize(reader); - } - else - { - reader.Skip(); - } - - reader.Read(); - } - - var routeInfo = Activator.CreateInstance(objectType, new object[] { action, controller, routeValues }); - - return routeInfo; - } - - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - throw new NotSupportedException(); - } - } - - #endregion + { + Guard.NotEmpty(action, nameof(action)); + Guard.NotNull(routeValues, nameof(routeValues)); + + this.Action = action; + this.Controller = controller; + this.RouteValues = routeValues; + } + + public string Action + { + get; + private set; + } + + public string Controller + { + get; + private set; + } + + public RouteValueDictionary RouteValues + { + get; + private set; + } + } + + #region JsonConverter + + public class RouteInfoConverter : JsonConverter + { + public override bool CanWrite => false; + + public override bool CanConvert(Type objectType) + { + return objectType == typeof(RouteInfo); + } + + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + string action = null; + string controller = null; + RouteValueDictionary routeValues = null; + + reader.Read(); + while (reader.TokenType == JsonToken.PropertyName) + { + string a = reader.Value.ToString(); + if (string.Equals(a, "Action", StringComparison.OrdinalIgnoreCase)) + { + reader.Read(); + action = serializer.Deserialize(reader); + } + else if (string.Equals(a, "Controller", StringComparison.OrdinalIgnoreCase)) + { + reader.Read(); + controller = serializer.Deserialize(reader); + } + else if (string.Equals(a, "RouteValues", StringComparison.OrdinalIgnoreCase)) + { + reader.Read(); + routeValues = serializer.Deserialize(reader); + } + else + { + reader.Skip(); + } + + reader.Read(); + } + + var routeInfo = Activator.CreateInstance(objectType, new object[] { action, controller, routeValues }); + + return routeInfo; + } + + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + throw new NotSupportedException(); + } + } + + #endregion } diff --git a/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs b/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs index 7fc5677ce9..587be18e1f 100644 --- a/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs +++ b/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs @@ -37,9 +37,6 @@ public partial class RuleEntity : BaseEntity public int DisplayOrder { get; set; } [NotMapped] - public bool IsGroup - { - get => RuleType.IsCaseInsensitiveEqual("Group"); - } + public bool IsGroup => RuleType.IsCaseInsensitiveEqual("Group"); } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs b/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs index 232b478a02..96d4bb591e 100644 --- a/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs +++ b/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs @@ -53,8 +53,8 @@ public partial class RuleSetEntity : BaseEntity, IAuditable public virtual ICollection Rules { - get { return _rules ?? (_rules = new HashSet()); } - protected internal set { _rules = value; } + get => _rules ?? (_rules = new HashSet()); + protected internal set => _rules = value; } /// @@ -62,8 +62,8 @@ public virtual ICollection Rules /// public virtual ICollection Discounts { - get { return _discounts ?? (_discounts = new HashSet()); } - protected set { _discounts = value; } + get => _discounts ?? (_discounts = new HashSet()); + protected set => _discounts = value; } /// @@ -71,8 +71,8 @@ public virtual ICollection Discounts /// public virtual ICollection ShippingMethods { - get { return _shippingMethods ?? (_shippingMethods = new HashSet()); } - protected set { _shippingMethods = value; } + get => _shippingMethods ?? (_shippingMethods = new HashSet()); + protected set => _shippingMethods = value; } /// @@ -80,8 +80,8 @@ public virtual ICollection ShippingMethods /// public virtual ICollection PaymentMethods { - get { return _paymentMethods ?? (_paymentMethods = new HashSet()); } - protected set { _paymentMethods = value; } + get => _paymentMethods ?? (_paymentMethods = new HashSet()); + protected set => _paymentMethods = value; } /// @@ -89,8 +89,8 @@ public virtual ICollection PaymentMethods /// public virtual ICollection CustomerRoles { - get { return _customerRoles ?? (_customerRoles = new HashSet()); } - protected set { _customerRoles = value; } + get => _customerRoles ?? (_customerRoles = new HashSet()); + protected set => _customerRoles = value; } /// @@ -98,8 +98,8 @@ public virtual ICollection CustomerRoles /// public virtual ICollection Categories { - get { return _categories ?? (_categories = new HashSet()); } - protected set { _categories = value; } + get => _categories ?? (_categories = new HashSet()); + protected set => _categories = value; } } } diff --git a/src/Libraries/SmartStore.Core/Rules/Exceptions/InvalidRuleOperatorException.cs b/src/Libraries/SmartStore.Core/Rules/Exceptions/InvalidRuleOperatorException.cs index 3bb110bf4d..2361ffe53b 100644 --- a/src/Libraries/SmartStore.Core/Rules/Exceptions/InvalidRuleOperatorException.cs +++ b/src/Libraries/SmartStore.Core/Rules/Exceptions/InvalidRuleOperatorException.cs @@ -1,14 +1,10 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace SmartStore.Rules { public sealed class InvalidRuleOperatorException : NotSupportedException { - public InvalidRuleOperatorException(RuleExpression expression) + public InvalidRuleOperatorException(RuleExpression expression) : base("The rule type '{0}' does not support the rule operator '{1}'.".FormatInvariant(expression.Descriptor.Name, expression.Operator)) { // TODO: expression.Descriptor.Name could be null or empty (?) diff --git a/src/Libraries/SmartStore.Core/Rules/Filters/ExpressionHelper.cs b/src/Libraries/SmartStore.Core/Rules/Filters/ExpressionHelper.cs index e14befde6d..4ae4d8fa92 100644 --- a/src/Libraries/SmartStore.Core/Rules/Filters/ExpressionHelper.cs +++ b/src/Libraries/SmartStore.Core/Rules/Filters/ExpressionHelper.cs @@ -151,7 +151,7 @@ public static Expression CreateConstantExpression(object value, Type type = null public static LambdaExpression CreateLambdaExpression(ParameterExpression p, Expression body) { return Expression.Lambda( - new FilterExpressionVisitor(p).Visit(body), + new FilterExpressionVisitor(p).Visit(body), new[] { p }); } } diff --git a/src/Libraries/SmartStore.Core/Rules/Filters/FilterDescriptor.cs b/src/Libraries/SmartStore.Core/Rules/Filters/FilterDescriptor.cs index cba9a28dc7..b27e7df330 100644 --- a/src/Libraries/SmartStore.Core/Rules/Filters/FilterDescriptor.cs +++ b/src/Libraries/SmartStore.Core/Rules/Filters/FilterDescriptor.cs @@ -1,13 +1,7 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using SmartStore.Core.Domain.Customers; -using SmartStore.Core.Domain.Orders; namespace SmartStore.Rules.Filters { @@ -28,7 +22,7 @@ public virtual Expression GetExpression(RuleOperator op, Expression valueExpress } } - public class FilterDescriptor : FilterDescriptor where T : class + public class FilterDescriptor : FilterDescriptor where T : class { public FilterDescriptor(Expression> expression) : base(expression) // TODO { @@ -81,12 +75,12 @@ public override Expression GetExpression(RuleOperator op, Expression valueExpres } } - public class AnyFilterDescriptor : PredicateFilterDescriptor - where T : class + public class AnyFilterDescriptor : PredicateFilterDescriptor + where T : class where TAny : class { public AnyFilterDescriptor( - Expression>> path, + Expression>> path, Expression> anyPredicate) : base("Any", path, anyPredicate) { diff --git a/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpression.cs b/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpression.cs index 9d664f9042..1d3f1df065 100644 --- a/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpression.cs +++ b/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpression.cs @@ -1,7 +1,4 @@ -using System; -using System.Globalization; -using System.Linq; -using System.Linq.Expressions; +using System.Linq.Expressions; namespace SmartStore.Rules.Filters { @@ -18,7 +15,7 @@ protected virtual Expression CreateBodyExpression(ParameterExpression node, bool { return this.Descriptor.GetExpression( this.Operator, - ExpressionHelper.CreateValueExpression(Descriptor.MemberExpression.Body.Type, this.Value), + ExpressionHelper.CreateValueExpression(Descriptor.MemberExpression.Body.Type, this.Value), liftToNull); } } diff --git a/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpressionGroup.cs b/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpressionGroup.cs index 94b002fb7b..a5e13fc09b 100644 --- a/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpressionGroup.cs +++ b/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpressionGroup.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace SmartStore.Rules.Filters { @@ -27,10 +25,7 @@ public FilterExpressionGroup(Type entityType) public bool IsSubGroup { get; set; } public IRuleProvider Provider { get; set; } - public IEnumerable Expressions - { - get => _expressions; - } + public IEnumerable Expressions => _expressions; public void AddExpressions(params IRuleExpression[] expressions) { diff --git a/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpressionVisitor.cs b/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpressionVisitor.cs index d65a823a34..31ab7948b5 100644 --- a/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpressionVisitor.cs +++ b/src/Libraries/SmartStore.Core/Rules/Filters/FilterExpressionVisitor.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; +using System.Linq.Expressions; namespace SmartStore.Rules.Filters { diff --git a/src/Libraries/SmartStore.Core/Rules/Filters/QueryableExtensions.cs b/src/Libraries/SmartStore.Core/Rules/Filters/QueryableExtensions.cs index f82b7e60d6..7352727c7b 100644 --- a/src/Libraries/SmartStore.Core/Rules/Filters/QueryableExtensions.cs +++ b/src/Libraries/SmartStore.Core/Rules/Filters/QueryableExtensions.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace SmartStore.Rules.Filters { diff --git a/src/Libraries/SmartStore.Core/Rules/IRuleConstraint.cs b/src/Libraries/SmartStore.Core/Rules/IRuleConstraint.cs index b303e4cf28..7ecb6fbb36 100644 --- a/src/Libraries/SmartStore.Core/Rules/IRuleConstraint.cs +++ b/src/Libraries/SmartStore.Core/Rules/IRuleConstraint.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SmartStore.Rules +namespace SmartStore.Rules { public interface IRuleConstraint { diff --git a/src/Libraries/SmartStore.Core/Rules/IRuleVisitor.cs b/src/Libraries/SmartStore.Core/Rules/IRuleVisitor.cs index 4c74dd3609..70b7cbfe4b 100644 --- a/src/Libraries/SmartStore.Core/Rules/IRuleVisitor.cs +++ b/src/Libraries/SmartStore.Core/Rules/IRuleVisitor.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using SmartStore.Rules.Domain; +using SmartStore.Rules.Domain; namespace SmartStore.Rules { diff --git a/src/Libraries/SmartStore.Core/Rules/Operators/CommonOperators.cs b/src/Libraries/SmartStore.Core/Rules/Operators/CommonOperators.cs index de57ade318..a732b49424 100644 --- a/src/Libraries/SmartStore.Core/Rules/Operators/CommonOperators.cs +++ b/src/Libraries/SmartStore.Core/Rules/Operators/CommonOperators.cs @@ -1,12 +1,11 @@ -using System; -using System.Linq.Expressions; +using System.Linq.Expressions; using SmartStore.Rules.Filters; namespace SmartStore.Rules.Operators { internal sealed class EqualOperator : RuleOperator { - internal EqualOperator() + internal EqualOperator() : base("=") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) @@ -23,7 +22,7 @@ protected override Expression GenerateExpression(Expression left, Expression rig internal sealed class NotEqualOperator : RuleOperator { - internal NotEqualOperator() + internal NotEqualOperator() : base("!=") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) @@ -40,26 +39,26 @@ protected override Expression GenerateExpression(Expression left, Expression rig internal sealed class IsNullOperator : RuleOperator { - internal IsNullOperator() + internal IsNullOperator() : base("IsNull") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) { return Expression.Equal( - left, + left, ExpressionHelper.CreateConstantExpression(null, GetBodyType(left))); } } internal sealed class IsNotNullOperator : RuleOperator { - internal IsNotNullOperator() + internal IsNotNullOperator() : base("IsNotNull") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) { return Expression.NotEqual( - left, + left, ExpressionHelper.CreateConstantExpression(null, GetBodyType(left))); } } diff --git a/src/Libraries/SmartStore.Core/Rules/Operators/ListOperators.cs b/src/Libraries/SmartStore.Core/Rules/Operators/ListOperators.cs index 3a0d101e17..12b3b240ca 100644 --- a/src/Libraries/SmartStore.Core/Rules/Operators/ListOperators.cs +++ b/src/Libraries/SmartStore.Core/Rules/Operators/ListOperators.cs @@ -13,7 +13,7 @@ internal NotInOperator() internal class InOperator : RuleOperator { - internal InOperator() + internal InOperator() : this("In", false) { } protected InOperator(string op, bool negate) @@ -39,7 +39,7 @@ protected override Expression GenerateExpression(Expression left /* member expre var containsMethod = ExpressionHelper.GetCollectionContainsMethod(itemType); return Expression.Equal( - Expression.Call(right, containsMethod, left), + Expression.Call(right, containsMethod, left), Negate ? ExpressionHelper.FalseLiteral : ExpressionHelper.TrueLiteral); } diff --git a/src/Libraries/SmartStore.Core/Rules/Operators/NumericOperators.cs b/src/Libraries/SmartStore.Core/Rules/Operators/NumericOperators.cs index be536465b1..0e6435c69e 100644 --- a/src/Libraries/SmartStore.Core/Rules/Operators/NumericOperators.cs +++ b/src/Libraries/SmartStore.Core/Rules/Operators/NumericOperators.cs @@ -1,11 +1,10 @@ -using System; -using System.Linq.Expressions; +using System.Linq.Expressions; namespace SmartStore.Rules.Operators { internal sealed class LessThanOperator : RuleOperator { - internal LessThanOperator() + internal LessThanOperator() : base("<") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) @@ -16,7 +15,7 @@ protected override Expression GenerateExpression(Expression left, Expression rig internal sealed class LessThanOrEqualOperator : RuleOperator { - internal LessThanOrEqualOperator() + internal LessThanOrEqualOperator() : base("<=") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) @@ -27,7 +26,7 @@ protected override Expression GenerateExpression(Expression left, Expression rig internal sealed class GreaterThanOperator : RuleOperator { - internal GreaterThanOperator() + internal GreaterThanOperator() : base(">") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) @@ -38,7 +37,7 @@ protected override Expression GenerateExpression(Expression left, Expression rig internal sealed class GreaterThanOrEqualOperator : RuleOperator { - internal GreaterThanOrEqualOperator() + internal GreaterThanOrEqualOperator() : base(">=") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) diff --git a/src/Libraries/SmartStore.Core/Rules/Operators/StringOperators.cs b/src/Libraries/SmartStore.Core/Rules/Operators/StringOperators.cs index 1ffa12af6b..731871e018 100644 --- a/src/Libraries/SmartStore.Core/Rules/Operators/StringOperators.cs +++ b/src/Libraries/SmartStore.Core/Rules/Operators/StringOperators.cs @@ -1,5 +1,4 @@ -using System; -using System.Linq.Expressions; +using System.Linq.Expressions; using SmartStore.Rules.Filters; namespace SmartStore.Rules.Operators @@ -66,28 +65,28 @@ protected override Expression GenerateExpression(Expression left, Expression rig internal sealed class StartsWithOperator : RuleOperator { - internal StartsWithOperator() + internal StartsWithOperator() : base("StartsWith") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) { var methodInfo = ExpressionHelper.StringStartsWithMethod; return Expression.Equal( - methodInfo.ToCaseInsensitiveStringMethodCall(left, right, liftToNull), + methodInfo.ToCaseInsensitiveStringMethodCall(left, right, liftToNull), ExpressionHelper.TrueLiteral); } } internal sealed class EndsWithOperator : RuleOperator { - internal EndsWithOperator() + internal EndsWithOperator() : base("EndsWith") { } protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) { var methodInfo = ExpressionHelper.StringEndsWithMethod; return Expression.Equal( - methodInfo.ToCaseInsensitiveStringMethodCall(left, right, liftToNull), + methodInfo.ToCaseInsensitiveStringMethodCall(left, right, liftToNull), ExpressionHelper.TrueLiteral); } } @@ -100,7 +99,7 @@ internal NotContainsOperator() internal class ContainsOperator : RuleOperator { - internal ContainsOperator() + internal ContainsOperator() : this("Contains", false) { } protected ContainsOperator(string op, bool negate) @@ -114,7 +113,7 @@ protected ContainsOperator(string op, bool negate) protected override Expression GenerateExpression(Expression left, Expression right, bool liftToNull) { return Expression.Equal( - ExpressionHelper.StringContainsMethod.ToCaseInsensitiveStringMethodCall(left, right, liftToNull), + ExpressionHelper.StringContainsMethod.ToCaseInsensitiveStringMethodCall(left, right, liftToNull), Negate ? ExpressionHelper.FalseLiteral : ExpressionHelper.TrueLiteral); } } diff --git a/src/Libraries/SmartStore.Core/Rules/Rendering/RuleTemplateSelector.cs b/src/Libraries/SmartStore.Core/Rules/Rendering/RuleTemplateSelector.cs index 3d8dc1680f..fe6353cd0f 100644 --- a/src/Libraries/SmartStore.Core/Rules/Rendering/RuleTemplateSelector.cs +++ b/src/Libraries/SmartStore.Core/Rules/Rendering/RuleTemplateSelector.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; - -namespace SmartStore.Rules +namespace SmartStore.Rules { public class RuleTemplateSelector : IRuleTemplateSelector { @@ -19,8 +16,8 @@ public RuleTemplateInfo GetTemplate(RuleDescriptor descriptor) protected virtual string GetValueTemplateName(RuleDescriptor descriptor) { - if (descriptor.Metadata.TryGetValue("ValueTemplateName", out var val) && - val is string name && + if (descriptor.Metadata.TryGetValue("ValueTemplateName", out var val) && + val is string name && name.HasValue()) { return name; diff --git a/src/Libraries/SmartStore.Core/Rules/RuleDescriptor.cs b/src/Libraries/SmartStore.Core/Rules/RuleDescriptor.cs index d1ff56f26e..8bba30e8e6 100644 --- a/src/Libraries/SmartStore.Core/Rules/RuleDescriptor.cs +++ b/src/Libraries/SmartStore.Core/Rules/RuleDescriptor.cs @@ -20,13 +20,7 @@ protected RuleDescriptor(RuleScope scope) public string Description { get; set; } public string GroupKey { get; set; } - public bool IsValid - { - get - { - return false == (this is InvalidRuleDescriptor); - } - } + public bool IsValid => false == (this is InvalidRuleDescriptor); public RuleType RuleType { get; set; } public RuleValueSelectList SelectList { get; set; } @@ -49,7 +43,7 @@ public RuleOperator[] Operators public class InvalidRuleDescriptor : RuleDescriptor { - public InvalidRuleDescriptor(RuleScope scope) + public InvalidRuleDescriptor(RuleScope scope) : base(scope) { RuleType = RuleType.String; diff --git a/src/Libraries/SmartStore.Core/Rules/RuleExpressionGroup.cs b/src/Libraries/SmartStore.Core/Rules/RuleExpressionGroup.cs index 5026beba23..06c7d0b244 100644 --- a/src/Libraries/SmartStore.Core/Rules/RuleExpressionGroup.cs +++ b/src/Libraries/SmartStore.Core/Rules/RuleExpressionGroup.cs @@ -29,10 +29,7 @@ public class RuleExpressionGroup : RuleExpression, IRuleExpressionGroup public bool IsSubGroup { get; set; } public IRuleProvider Provider { get; set; } - public IEnumerable Expressions - { - get => _expressions; - } + public IEnumerable Expressions => _expressions; public virtual void AddExpressions(params IRuleExpression[] expressions) { diff --git a/src/Libraries/SmartStore.Core/Rules/RuleModule.cs b/src/Libraries/SmartStore.Core/Rules/RuleModule.cs index f88b5dcfa4..680e80118d 100644 --- a/src/Libraries/SmartStore.Core/Rules/RuleModule.cs +++ b/src/Libraries/SmartStore.Core/Rules/RuleModule.cs @@ -4,9 +4,9 @@ namespace SmartStore.Rules { public class RuleModule : Autofac.Module - { - protected override void Load(ContainerBuilder builder) - { + { + protected override void Load(ContainerBuilder builder) + { builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); @@ -21,5 +21,5 @@ protected override void Load(ContainerBuilder builder) return key => cc.ResolveKeyed(key); }); } - } + } } diff --git a/src/Libraries/SmartStore.Core/Rules/RuleOperator.cs b/src/Libraries/SmartStore.Core/Rules/RuleOperator.cs index 73decf47ad..84846ea32c 100644 --- a/src/Libraries/SmartStore.Core/Rules/RuleOperator.cs +++ b/src/Libraries/SmartStore.Core/Rules/RuleOperator.cs @@ -41,11 +41,20 @@ protected RuleOperator(string op) public string Operator { get; set; } - public override string ToString() => Operator; + public override string ToString() + { + return Operator; + } - public static implicit operator string(RuleOperator obj) => obj.Operator; + public static implicit operator string(RuleOperator obj) + { + return obj.Operator; + } - public static implicit operator RuleOperator(string obj) => GetOperator(obj); + public static implicit operator RuleOperator(string obj) + { + return GetOperator(obj); + } public static RuleOperator GetOperator(string op) { @@ -57,7 +66,7 @@ public static RuleOperator GetOperator(string op) if (_map.TryGetValue(op, out var instance)) { return instance; - } + } throw new InvalidCastException("No rule operator has been registered for '{0}'.".FormatInvariant(op)); } @@ -91,8 +100,8 @@ public bool Match(object left, object right) public virtual bool Match(TLeft left, object right) { var body = GetExpression( - ExpressionHelper.CreateConstantExpression(left, typeof(TLeft)), - ExpressionHelper.CreateConstantExpression(right), + ExpressionHelper.CreateConstantExpression(left, typeof(TLeft)), + ExpressionHelper.CreateConstantExpression(right), true); var lambda = Expression.Lambda>(body); @@ -185,7 +194,7 @@ private bool TryConvertNullableValue(Expression left, ref Expression right) if (!handled) { right = Expression.Constant(value, targetType); - } + } } catch { diff --git a/src/Libraries/SmartStore.Core/Search/AcquireWriterContext.cs b/src/Libraries/SmartStore.Core/Search/AcquireWriterContext.cs index e0df140361..f1ce494345 100644 --- a/src/Libraries/SmartStore.Core/Search/AcquireWriterContext.cs +++ b/src/Libraries/SmartStore.Core/Search/AcquireWriterContext.cs @@ -8,43 +8,43 @@ namespace SmartStore.Core.Search { - public enum AcquirementReason - { - Indexing, - Deleting - } + public enum AcquirementReason + { + Indexing, + Deleting + } - public class AcquireWriterContext - { - public AcquireWriterContext(AcquirementReason reason) - { - Reason = reason; - Languages = new List(); - Currencies = new List(); - StoreMappings = new Multimap(); - CustomerRoleIds = new int[0]; - CustomerRoleMappings = new Multimap(); - DeliveryTimes = new Dictionary(); - Manufacturers = new Dictionary(); - Categories = new Dictionary(); - Translations = new Dictionary(StringComparer.OrdinalIgnoreCase); - CustomProperties = new Dictionary(); - } + public class AcquireWriterContext + { + public AcquireWriterContext(AcquirementReason reason) + { + Reason = reason; + Languages = new List(); + Currencies = new List(); + StoreMappings = new Multimap(); + CustomerRoleIds = new int[0]; + CustomerRoleMappings = new Multimap(); + DeliveryTimes = new Dictionary(); + Manufacturers = new Dictionary(); + Categories = new Dictionary(); + Translations = new Dictionary(StringComparer.OrdinalIgnoreCase); + CustomProperties = new Dictionary(); + } - /// - /// Reason for writer acquirement - /// - public AcquirementReason Reason { get; private set; } + /// + /// Reason for writer acquirement + /// + public AcquirementReason Reason { get; private set; } - /// - /// All languages - /// - public IList Languages { get; set; } + /// + /// All languages + /// + public IList Languages { get; set; } - /// - /// Currency codes used for indexing - /// - public IList Currencies { get; set; } + /// + /// Currency codes used for indexing + /// + public IList Currencies { get; set; } /// /// All stores @@ -56,40 +56,40 @@ public AcquireWriterContext(AcquirementReason reason) /// public Multimap StoreMappings { get; set; } - /// - /// Array of all customer role identifiers - /// - public int[] CustomerRoleIds { get; set; } + /// + /// Array of all customer role identifiers + /// + public int[] CustomerRoleIds { get; set; } - /// - /// Map of product to customer role identifiers if the product is limited to certain customer roles - /// - public Multimap CustomerRoleMappings { get; set; } + /// + /// Map of product to customer role identifiers if the product is limited to certain customer roles + /// + public Multimap CustomerRoleMappings { get; set; } /// /// All manufacturers /// public Dictionary Manufacturers { get; set; } - /// - /// All categories - /// - public Dictionary Categories { get; set; } + /// + /// All categories + /// + public Dictionary Categories { get; set; } - /// - /// All delivery times - /// - public Dictionary DeliveryTimes { get; set; } + /// + /// All delivery times + /// + public Dictionary DeliveryTimes { get; set; } - /// - /// All translations for global scopes (like Category, Manufacturer etc.) - /// - public Dictionary Translations { get; set; } + /// + /// All translations for global scopes (like Category, Manufacturer etc.) + /// + public Dictionary Translations { get; set; } - /// - /// Use this dictionary for any custom data required along indexing - /// - public Dictionary CustomProperties { get; set; } + /// + /// Use this dictionary for any custom data required along indexing + /// + public Dictionary CustomProperties { get; set; } public void Clear() { @@ -103,5 +103,5 @@ public void Clear() Translations.Clear(); CustomProperties.Clear(); } - } + } } diff --git a/src/Libraries/SmartStore.Core/Search/DefaultIndexManager.cs b/src/Libraries/SmartStore.Core/Search/DefaultIndexManager.cs index 0fe4f85550..941ab39578 100644 --- a/src/Libraries/SmartStore.Core/Search/DefaultIndexManager.cs +++ b/src/Libraries/SmartStore.Core/Search/DefaultIndexManager.cs @@ -5,22 +5,22 @@ namespace SmartStore.Core.Search { public class DefaultIndexManager : IIndexManager - { - private readonly IEnumerable> _providers; + { + private readonly IEnumerable> _providers; - public DefaultIndexManager(IEnumerable> providers) - { - _providers = providers; - } + public DefaultIndexManager(IEnumerable> providers) + { + _providers = providers; + } - public bool HasAnyProvider(string scope, bool activeOnly = true) - { + public bool HasAnyProvider(string scope, bool activeOnly = true) + { return _providers.Any(x => !activeOnly || x.Value.IsActive(scope)); - } + } - public IIndexProvider GetIndexProvider(string scope, bool activeOnly = true) - { - return _providers.FirstOrDefault(x => !activeOnly || x.Value.IsActive(scope))?.Value; - } - } + public IIndexProvider GetIndexProvider(string scope, bool activeOnly = true) + { + return _providers.FirstOrDefault(x => !activeOnly || x.Value.IsActive(scope))?.Value; + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Events/IndexSegmentProcessedEvent.cs b/src/Libraries/SmartStore.Core/Search/Events/IndexSegmentProcessedEvent.cs index b235921138..32f6d85bd7 100644 --- a/src/Libraries/SmartStore.Core/Search/Events/IndexSegmentProcessedEvent.cs +++ b/src/Libraries/SmartStore.Core/Search/Events/IndexSegmentProcessedEvent.cs @@ -1,43 +1,42 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace SmartStore.Core.Search { - public class IndexSegmentProcessedEvent - { - public IndexSegmentProcessedEvent(string scope, IEnumerable operations, bool isRebuild) - { - Guard.NotEmpty(scope, nameof(scope)); - Guard.NotNull(operations, nameof(operations)); + public class IndexSegmentProcessedEvent + { + public IndexSegmentProcessedEvent(string scope, IEnumerable operations, bool isRebuild) + { + Guard.NotEmpty(scope, nameof(scope)); + Guard.NotNull(operations, nameof(operations)); - Scope = scope; - IsRebuild = isRebuild; - Operations = operations; - Metadata = new Dictionary(); - } + Scope = scope; + IsRebuild = isRebuild; + Operations = operations; + Metadata = new Dictionary(); + } - public string Scope - { - get; - private set; - } + public string Scope + { + get; + private set; + } - public bool IsRebuild - { - get; - private set; - } + public bool IsRebuild + { + get; + private set; + } - public IEnumerable Operations - { - get; - private set; - } + public IEnumerable Operations + { + get; + private set; + } - public IDictionary Metadata - { - get; - private set; - } - } + public IDictionary Metadata + { + get; + private set; + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Events/IndexingCompletedEvent.cs b/src/Libraries/SmartStore.Core/Search/Events/IndexingCompletedEvent.cs index b1304aae56..b15bf32629 100644 --- a/src/Libraries/SmartStore.Core/Search/Events/IndexingCompletedEvent.cs +++ b/src/Libraries/SmartStore.Core/Search/Events/IndexingCompletedEvent.cs @@ -1,27 +1,25 @@ -using System; - -namespace SmartStore.Core.Search +namespace SmartStore.Core.Search { - public class IndexingCompletedEvent - { - public IndexingCompletedEvent(IndexInfo indexInfo, bool wasRebuilt) - { - Guard.NotNull(indexInfo, nameof(indexInfo)); + public class IndexingCompletedEvent + { + public IndexingCompletedEvent(IndexInfo indexInfo, bool wasRebuilt) + { + Guard.NotNull(indexInfo, nameof(indexInfo)); - IndexInfo = indexInfo; - WasRebuilt = wasRebuilt; - } + IndexInfo = indexInfo; + WasRebuilt = wasRebuilt; + } - public IndexInfo IndexInfo - { - get; - private set; - } + public IndexInfo IndexInfo + { + get; + private set; + } - public bool WasRebuilt - { - get; - private set; - } - } + public bool WasRebuilt + { + get; + private set; + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Search/Facets/Facet.cs b/src/Libraries/SmartStore.Core/Search/Facets/Facet.cs index 84a88b2109..1fd5f17bcc 100644 --- a/src/Libraries/SmartStore.Core/Search/Facets/Facet.cs +++ b/src/Libraries/SmartStore.Core/Search/Facets/Facet.cs @@ -3,69 +3,69 @@ namespace SmartStore.Core.Search.Facets { - [DebuggerDisplay("Key: {Key}, IsChoice: {IsChoice}, HitCount: {HitCount}, Value: {Value}")] - public class Facet - { - public Facet(FacetValue value) - : this(value.ToString(), value) - { - } + [DebuggerDisplay("Key: {Key}, IsChoice: {IsChoice}, HitCount: {HitCount}, Value: {Value}")] + public class Facet + { + public Facet(FacetValue value) + : this(value.ToString(), value) + { + } - public Facet(string key, FacetValue value) - { - Guard.NotEmpty(key, nameof(key)); - Guard.NotNull(value, nameof(value)); + public Facet(string key, FacetValue value) + { + Guard.NotEmpty(key, nameof(key)); + Guard.NotNull(value, nameof(value)); - Key = key; - Value = value; - Children = new List(); - IsChoice = true; - Published = true; - } + Key = key; + Value = value; + Children = new List(); + IsChoice = true; + Published = true; + } - public string Key - { - get; - private set; - } + public string Key + { + get; + private set; + } - public FacetValue Value - { - get; - private set; - } + public FacetValue Value + { + get; + private set; + } - /// - /// Gets or sets whether the facet can be selected - /// - public bool IsChoice - { - get; - set; - } + /// + /// Gets or sets whether the facet can be selected + /// + public bool IsChoice + { + get; + set; + } - public bool Published - { - get; - set; - } + public bool Published + { + get; + set; + } - public long HitCount - { - get; - set; - } + public long HitCount + { + get; + set; + } - public FacetGroup FacetGroup - { - get; - internal set; - } + public FacetGroup FacetGroup + { + get; + internal set; + } - public IList Children - { - get; - set; - } - } + public IList Children + { + get; + set; + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Facets/FacetDescriptor.cs b/src/Libraries/SmartStore.Core/Search/Facets/FacetDescriptor.cs index d0e8b5b8e7..4292617e5f 100644 --- a/src/Libraries/SmartStore.Core/Search/Facets/FacetDescriptor.cs +++ b/src/Libraries/SmartStore.Core/Search/Facets/FacetDescriptor.cs @@ -5,131 +5,125 @@ namespace SmartStore.Core.Search.Facets { - public enum FacetSorting - { - HitsDesc, - ValueAsc, - LabelAsc, - DisplayOrder - } - - /// - /// A filter and its selection to be applied, e.g. Color=Red. - /// - [Serializable] - public class FacetDescriptor - { - private readonly List _values; - - public FacetDescriptor(string key) - { - Guard.NotEmpty(key, nameof(key)); - - _values = new List(); - Key = key; - } - - /// - /// Gets the key / field name. - /// - public string Key - { - get; - private set; - } - - /// - /// Gets or sets the label. - /// - public string Label - { - get; - set; - } - - /// - /// Gets the values for this facet. - /// - public ICollection Values - { - get - { - return _values; - } - } - - /// - /// Adds a facet value. - /// - /// Facet value - public FacetDescriptor AddValue(params FacetValue[] values) - { - _values.AddRange(values); - return this; - } - - /// - /// Gets or sets the boolean value operator. - /// - //public ValueOperator Operator - //{ - // get; - // set; - //} - - /// - /// Gets or sets whether selection of multiple values is allowed. - /// - public bool IsMultiSelect - { - get; - set; - } - - /// - /// Gets or sets the minimum number of hits a choice would need to have to be returned. - /// - public int MinHitCount - { - get; - set; - } - - /// - /// Gets or sets the maximum number of choices to return. Default = 0 which means all. - /// - public int MaxChoicesCount - { - get; - set; - } - - /// - /// Gets or sets the result choices sort order. - /// - public FacetSorting OrderBy - { - get; - set; - } - - /// - /// Gets or sets the display order. - /// - public int DisplayOrder - { - get; - set; - } - - public override string ToString() - { - var sb = new StringBuilder(); - - sb.Append("FieldName: ").Append(Key).Append(" "); - sb.Append("Values: " + string.Join(",", _values.Select(x => x.Value.ToString()))).Append(" "); - - return sb.ToString(); - } - } + public enum FacetSorting + { + HitsDesc, + ValueAsc, + LabelAsc, + DisplayOrder + } + + /// + /// A filter and its selection to be applied, e.g. Color=Red. + /// + [Serializable] + public class FacetDescriptor + { + private readonly List _values; + + public FacetDescriptor(string key) + { + Guard.NotEmpty(key, nameof(key)); + + _values = new List(); + Key = key; + } + + /// + /// Gets the key / field name. + /// + public string Key + { + get; + private set; + } + + /// + /// Gets or sets the label. + /// + public string Label + { + get; + set; + } + + /// + /// Gets the values for this facet. + /// + public ICollection Values => _values; + + /// + /// Adds a facet value. + /// + /// Facet value + public FacetDescriptor AddValue(params FacetValue[] values) + { + _values.AddRange(values); + return this; + } + + /// + /// Gets or sets the boolean value operator. + /// + //public ValueOperator Operator + //{ + // get; + // set; + //} + + /// + /// Gets or sets whether selection of multiple values is allowed. + /// + public bool IsMultiSelect + { + get; + set; + } + + /// + /// Gets or sets the minimum number of hits a choice would need to have to be returned. + /// + public int MinHitCount + { + get; + set; + } + + /// + /// Gets or sets the maximum number of choices to return. Default = 0 which means all. + /// + public int MaxChoicesCount + { + get; + set; + } + + /// + /// Gets or sets the result choices sort order. + /// + public FacetSorting OrderBy + { + get; + set; + } + + /// + /// Gets or sets the display order. + /// + public int DisplayOrder + { + get; + set; + } + + public override string ToString() + { + var sb = new StringBuilder(); + + sb.Append("FieldName: ").Append(Key).Append(" "); + sb.Append("Values: " + string.Join(",", _values.Select(x => x.Value.ToString()))).Append(" "); + + return sb.ToString(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Facets/FacetEnums.cs b/src/Libraries/SmartStore.Core/Search/Facets/FacetEnums.cs index 2ca081d194..5e6644f6f5 100644 --- a/src/Libraries/SmartStore.Core/Search/Facets/FacetEnums.cs +++ b/src/Libraries/SmartStore.Core/Search/Facets/FacetEnums.cs @@ -1,20 +1,20 @@ namespace SmartStore.Core.Search.Facets { - public enum FacetTemplateHint - { - /// - /// Render facets as checkboxes - /// - Checkboxes = 0, + public enum FacetTemplateHint + { + /// + /// Render facets as checkboxes + /// + Checkboxes = 0, - /// - /// Custom facet rendering like color or picture boxes - /// - Custom, + /// + /// Custom facet rendering like color or picture boxes + /// + Custom, - /// - /// Render facets as a numeric range filter - /// - NumericRange - } + /// + /// Render facets as a numeric range filter + /// + NumericRange + } } diff --git a/src/Libraries/SmartStore.Core/Search/Facets/FacetExtensions.cs b/src/Libraries/SmartStore.Core/Search/Facets/FacetExtensions.cs index 4d706d00bc..e4c4333b86 100644 --- a/src/Libraries/SmartStore.Core/Search/Facets/FacetExtensions.cs +++ b/src/Libraries/SmartStore.Core/Search/Facets/FacetExtensions.cs @@ -3,94 +3,94 @@ namespace SmartStore.Core.Search.Facets { - public static class FacetExtensions - { - /// - /// Orders a facet sequence - /// - /// Facets - /// Facet descriptor - /// Ordered facets - public static IOrderedEnumerable OrderBy(this IEnumerable source, FacetDescriptor descriptor) - { - Guard.NotNull(descriptor, nameof(descriptor)); + public static class FacetExtensions + { + /// + /// Orders a facet sequence + /// + /// Facets + /// Facet descriptor + /// Ordered facets + public static IOrderedEnumerable OrderBy(this IEnumerable source, FacetDescriptor descriptor) + { + Guard.NotNull(descriptor, nameof(descriptor)); - return source.OrderBy(descriptor.OrderBy, descriptor.IsMultiSelect); - } + return source.OrderBy(descriptor.OrderBy, descriptor.IsMultiSelect); + } - /// - /// Orders a facet sequence - /// - /// Facets - /// Type of sorting - /// Whether to display selected facets first - /// Ordered facets - public static IOrderedEnumerable OrderBy(this IEnumerable source, FacetSorting sorting, bool selectedFirst = true) - { - Guard.NotNull(source, nameof(source)); + /// + /// Orders a facet sequence + /// + /// Facets + /// Type of sorting + /// Whether to display selected facets first + /// Ordered facets + public static IOrderedEnumerable OrderBy(this IEnumerable source, FacetSorting sorting, bool selectedFirst = true) + { + Guard.NotNull(source, nameof(source)); - switch (sorting) - { - case FacetSorting.ValueAsc: - if (selectedFirst) - return source - .OrderByDescending(x => x.Value.IsSelected) - .ThenBy(x => x.Value.Value); - else - return source.OrderBy(x => x.Value.Value); + switch (sorting) + { + case FacetSorting.ValueAsc: + if (selectedFirst) + return source + .OrderByDescending(x => x.Value.IsSelected) + .ThenBy(x => x.Value.Value); + else + return source.OrderBy(x => x.Value.Value); - case FacetSorting.LabelAsc: - if (selectedFirst) - return source - .OrderByDescending(x => x.Value.IsSelected) - .ThenBy(x => x.Value.Label); - else - return source.OrderBy(x => x.Value.Label); + case FacetSorting.LabelAsc: + if (selectedFirst) + return source + .OrderByDescending(x => x.Value.IsSelected) + .ThenBy(x => x.Value.Label); + else + return source.OrderBy(x => x.Value.Label); - case FacetSorting.DisplayOrder: - if (selectedFirst) - return source - .OrderByDescending(x => x.Value.IsSelected) - .ThenBy(x => x.Value.DisplayOrder); - else - return source.OrderBy(x => x.Value.DisplayOrder); + case FacetSorting.DisplayOrder: + if (selectedFirst) + return source + .OrderByDescending(x => x.Value.IsSelected) + .ThenBy(x => x.Value.DisplayOrder); + else + return source.OrderBy(x => x.Value.DisplayOrder); - default: - if (selectedFirst) - return source - .OrderByDescending(x => x.Value.IsSelected) - .ThenByDescending(x => x.HitCount) - .ThenBy(x => x.Value.Label); - else - return source - .OrderByDescending(x => x.HitCount) - .ThenBy(x => x.Value.Label); - } - } + default: + if (selectedFirst) + return source + .OrderByDescending(x => x.Value.IsSelected) + .ThenByDescending(x => x.HitCount) + .ThenBy(x => x.Value.Label); + else + return source + .OrderByDescending(x => x.HitCount) + .ThenBy(x => x.Value.Label); + } + } - /// - /// Removes a facet - /// - /// List of facets - /// Facet value - /// Whether to compare the upper value - public static void RemoveFacet(this IList facets, object value, bool upperValue) - { - Facet facet = null; + /// + /// Removes a facet + /// + /// List of facets + /// Facet value + /// Whether to compare the upper value + public static void RemoveFacet(this IList facets, object value, bool upperValue) + { + Facet facet = null; - if (upperValue) - { - facet = facets.FirstOrDefault(x => x.Value.UpperValue != null && x.Value.UpperValue.Equals(value)); - } - else - { - facet = facets.FirstOrDefault(x => x.Value.Value != null && x.Value.Value.Equals(value)); - } + if (upperValue) + { + facet = facets.FirstOrDefault(x => x.Value.UpperValue != null && x.Value.UpperValue.Equals(value)); + } + else + { + facet = facets.FirstOrDefault(x => x.Value.Value != null && x.Value.Value.Equals(value)); + } - if (facet != null) - { - facets.Remove(facet); - } - } - } + if (facet != null) + { + facets.Remove(facet); + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Facets/FacetGroup.cs b/src/Libraries/SmartStore.Core/Search/Facets/FacetGroup.cs index e6d9ffc48e..35b2f1b56d 100644 --- a/src/Libraries/SmartStore.Core/Search/Facets/FacetGroup.cs +++ b/src/Libraries/SmartStore.Core/Search/Facets/FacetGroup.cs @@ -5,82 +5,82 @@ namespace SmartStore.Core.Search.Facets { - public enum FacetGroupKind - { - Unknown = -1, - Category, - Brand, - Price, - Rating, - DeliveryTime, - Availability, - NewArrivals, - Attribute, - Variant, + public enum FacetGroupKind + { + Unknown = -1, + Category, + Brand, + Price, + Rating, + DeliveryTime, + Availability, + NewArrivals, + Attribute, + Variant, Forum, Customer, Date - } + } - [DebuggerDisplay("Key: {Key}, Label: {Label}, Kind: {Kind}")] - public class FacetGroup - { - private readonly Dictionary _facets; - private FacetGroupKind? _kind; + [DebuggerDisplay("Key: {Key}, Label: {Label}, Kind: {Kind}")] + public class FacetGroup + { + private readonly Dictionary _facets; + private FacetGroupKind? _kind; - public FacetGroup() - : this (string.Empty, string.Empty, string.Empty, false, false, 0, Enumerable.Empty()) - { - } + public FacetGroup() + : this(string.Empty, string.Empty, string.Empty, false, false, 0, Enumerable.Empty()) + { + } - public FacetGroup( + public FacetGroup( string scope, - string key, - string label, - bool isMultiSelect, - bool hasChildren, - int displayOrder, - IEnumerable facets) - { + string key, + string label, + bool isMultiSelect, + bool hasChildren, + int displayOrder, + IEnumerable facets) + { Guard.NotNull(scope, nameof(scope)); Guard.NotNull(key, nameof(key)); - Guard.NotNull(facets, nameof(facets)); + Guard.NotNull(facets, nameof(facets)); Scope = scope; - Key = key; - Label = label; - IsMultiSelect = isMultiSelect; - DisplayOrder = displayOrder; + Key = key; + Label = label; + IsMultiSelect = isMultiSelect; + DisplayOrder = displayOrder; IsScrollable = true; - _facets = new Dictionary(StringComparer.OrdinalIgnoreCase); - - facets.Each(x => - { - x.FacetGroup = this; - x.Children.Each(y => y.FacetGroup = this); - - try - { - _facets.Add(x.Key, x); - } - catch (Exception ex) - { - ex.Dump(); - } - }); - } - - public static FacetGroupKind GetKindByKey(string scope, string key) - { - if (key.StartsWith("attrid")) - { - return FacetGroupKind.Attribute; - } - else if (key.StartsWith("variantid")) - { - return FacetGroupKind.Variant; - } + _facets = new Dictionary(StringComparer.OrdinalIgnoreCase); + + facets.Each(x => + { + x.FacetGroup = this; + x.Children.Each(y => y.FacetGroup = this); + + try + { + _facets.Add(x.Key, x); + } + catch (Exception ex) + { + ex.Dump(); + } + }); + } + + public static FacetGroupKind GetKindByKey(string scope, string key) + { + if (key.StartsWith("attrid")) + { + return FacetGroupKind.Attribute; + } + else if (key.StartsWith("variantid")) + { + return FacetGroupKind.Variant; + } switch (key) { @@ -105,7 +105,7 @@ public static FacetGroupKind GetKindByKey(string scope, string key) return FacetGroupKind.Customer; default: return FacetGroupKind.Unknown; - } + } } public string Scope @@ -115,34 +115,34 @@ public string Scope } public string Key - { - get; - private set; - } - - public string Label - { - get; - private set; - } - - public bool IsMultiSelect - { - get; - private set; - } + { + get; + private set; + } + + public string Label + { + get; + private set; + } + + public bool IsMultiSelect + { + get; + private set; + } public bool HasChildren - { - get; - private set; - } + { + get; + private set; + } - public int DisplayOrder - { - get; - private set; - } + public int DisplayOrder + { + get; + private set; + } public bool IsScrollable { @@ -150,49 +150,43 @@ public bool IsScrollable set; } - public IEnumerable Facets - { - get - { - return _facets.Values; - } - } - - public IEnumerable SelectedFacets - { - get - { - var parents = _facets.Values.Where(x => x.Value.IsSelected); - var children = _facets.Values.SelectMany(x => x.Children).Where(x => x.Value.IsSelected); - - return parents.Concat(children); - } - } - - public Facet GetFacet(string key) - { - Guard.NotEmpty(key, nameof(key)); - - return _facets.Get(key); - } - - public FacetGroupKind Kind - { - get - { - if (_kind == null) - { - _kind = GetKindByKey(Scope, Key); - } - - return _kind.Value; - } - } - - public FacetTemplateHint TemplateHint - { - get; - set; - } - } + public IEnumerable Facets => _facets.Values; + + public IEnumerable SelectedFacets + { + get + { + var parents = _facets.Values.Where(x => x.Value.IsSelected); + var children = _facets.Values.SelectMany(x => x.Children).Where(x => x.Value.IsSelected); + + return parents.Concat(children); + } + } + + public Facet GetFacet(string key) + { + Guard.NotEmpty(key, nameof(key)); + + return _facets.Get(key); + } + + public FacetGroupKind Kind + { + get + { + if (_kind == null) + { + _kind = GetKindByKey(Scope, Key); + } + + return _kind.Value; + } + } + + public FacetTemplateHint TemplateHint + { + get; + set; + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Facets/FacetValue.cs b/src/Libraries/SmartStore.Core/Search/Facets/FacetValue.cs index 80e54b44af..b3d68a6c20 100644 --- a/src/Libraries/SmartStore.Core/Search/Facets/FacetValue.cs +++ b/src/Libraries/SmartStore.Core/Search/Facets/FacetValue.cs @@ -4,156 +4,150 @@ namespace SmartStore.Core.Search.Facets { - [Serializable] - public class FacetValue : IEquatable, ICloneable - { - public FacetValue() - { - } - - public FacetValue(object value, IndexTypeCode typeCode) - { - Value = value; - TypeCode = typeCode; - IsRange = false; - } - - public FacetValue(object value, object upperValue, IndexTypeCode typeCode, bool includesLower, bool includesUpper) - { - Value = value; - UpperValue = upperValue; - TypeCode = typeCode; - IncludesLower = includesLower; - IncludesUpper = includesUpper; - IsRange = true; - } - - public object Value - { - get; - set; - } - - public object UpperValue - { - get; - set; - } - - public IndexTypeCode TypeCode - { - get; - set; - } - - public bool IncludesLower - { - get; - set; - } - - public bool IncludesUpper - { - get; - set; - } - - public bool IsRange - { - get; - set; - } - - public bool IsSelected - { - get; - set; - } - - public bool IsEmpty - { - get - { - return TypeCode == IndexTypeCode.Empty && Value == null; - } - } - - #region Metadata - - public string Label { get; set; } - - public int ParentId { get; set; } - - public int DisplayOrder { get; set; } - - public FacetSorting? Sorting { get; set; } - - public string PictureUrl { get; set; } - - public string Color { get; set; } - - #endregion - - public override int GetHashCode() - { - if (Value != null && UpperValue != null) - { - var combiner = HashCodeCombiner - .Start() - .Add(Value) - .Add(UpperValue); - - return combiner.CombinedHash; - } - else if (UpperValue != null) - { - return UpperValue.GetHashCode(); - } - else if (Value != null) - { - return Value.GetHashCode(); - } - - return 0; - } - - public bool Equals(FacetValue other) - { - if (other == null || other.TypeCode != TypeCode || other.IsRange != IsRange) - { - return false; - } - - if (other.IsRange) - { - if (other.IncludesLower != IncludesLower || other.IncludesUpper != IncludesUpper) - { - return false; - } - - if (other.Value == null && Value == null && other.UpperValue == null && UpperValue == null) - { - return true; - } - - if (other.UpperValue != null && !other.UpperValue.Equals(UpperValue)) - { - return false; - } - } - - if (other.Value == null && Value == null) - { - return true; - } - - return other.Value != null && other.Value.Equals(Value); - } - - public override bool Equals(object obj) - { - return this.Equals(obj as FacetValue); - } + [Serializable] + public class FacetValue : IEquatable, ICloneable + { + public FacetValue() + { + } + + public FacetValue(object value, IndexTypeCode typeCode) + { + Value = value; + TypeCode = typeCode; + IsRange = false; + } + + public FacetValue(object value, object upperValue, IndexTypeCode typeCode, bool includesLower, bool includesUpper) + { + Value = value; + UpperValue = upperValue; + TypeCode = typeCode; + IncludesLower = includesLower; + IncludesUpper = includesUpper; + IsRange = true; + } + + public object Value + { + get; + set; + } + + public object UpperValue + { + get; + set; + } + + public IndexTypeCode TypeCode + { + get; + set; + } + + public bool IncludesLower + { + get; + set; + } + + public bool IncludesUpper + { + get; + set; + } + + public bool IsRange + { + get; + set; + } + + public bool IsSelected + { + get; + set; + } + + public bool IsEmpty => TypeCode == IndexTypeCode.Empty && Value == null; + + #region Metadata + + public string Label { get; set; } + + public int ParentId { get; set; } + + public int DisplayOrder { get; set; } + + public FacetSorting? Sorting { get; set; } + + public string PictureUrl { get; set; } + + public string Color { get; set; } + + #endregion + + public override int GetHashCode() + { + if (Value != null && UpperValue != null) + { + var combiner = HashCodeCombiner + .Start() + .Add(Value) + .Add(UpperValue); + + return combiner.CombinedHash; + } + else if (UpperValue != null) + { + return UpperValue.GetHashCode(); + } + else if (Value != null) + { + return Value.GetHashCode(); + } + + return 0; + } + + public bool Equals(FacetValue other) + { + if (other == null || other.TypeCode != TypeCode || other.IsRange != IsRange) + { + return false; + } + + if (other.IsRange) + { + if (other.IncludesLower != IncludesLower || other.IncludesUpper != IncludesUpper) + { + return false; + } + + if (other.Value == null && Value == null && other.UpperValue == null && UpperValue == null) + { + return true; + } + + if (other.UpperValue != null && !other.UpperValue.Equals(UpperValue)) + { + return false; + } + } + + if (other.Value == null && Value == null) + { + return true; + } + + return other.Value != null && other.Value.Equals(Value); + } + + public override bool Equals(object obj) + { + return this.Equals(obj as FacetValue); + } protected virtual string ConvertToString(object value) { @@ -179,39 +173,39 @@ protected virtual string ConvertToString(object value) return string.Empty; } - public override string ToString() - { - var result = string.Empty; + public override string ToString() + { + var result = string.Empty; var valueStr = ConvertToString(Value); - if (IsRange) - { + if (IsRange) + { var upperValueStr = ConvertToString(UpperValue); - if (upperValueStr.HasValue()) - { - result = string.Concat(valueStr, "~", upperValueStr); - } - else - { - result = valueStr; - } - } - else - { - result = valueStr; - } - - return result; - } - - public FacetValue Clone() - { - return (FacetValue)this.MemberwiseClone(); - } - - object ICloneable.Clone() - { - return this.MemberwiseClone(); - } - } + if (upperValueStr.HasValue()) + { + result = string.Concat(valueStr, "~", upperValueStr); + } + else + { + result = valueStr; + } + } + else + { + result = valueStr; + } + + return result; + } + + public FacetValue Clone() + { + return (FacetValue)this.MemberwiseClone(); + } + + object ICloneable.Clone() + { + return this.MemberwiseClone(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Filter/CombinedSearchFilter.cs b/src/Libraries/SmartStore.Core/Search/Filter/CombinedSearchFilter.cs index 46f00c7d3c..e984b56574 100644 --- a/src/Libraries/SmartStore.Core/Search/Filter/CombinedSearchFilter.cs +++ b/src/Libraries/SmartStore.Core/Search/Filter/CombinedSearchFilter.cs @@ -3,51 +3,45 @@ namespace SmartStore.Core.Search { - public class CombinedSearchFilter : SearchFilterBase, ICombinedSearchFilter - { - private readonly IList _filters; + public class CombinedSearchFilter : SearchFilterBase, ICombinedSearchFilter + { + private readonly IList _filters; - public CombinedSearchFilter() - { - _filters = new List(); - } + public CombinedSearchFilter() + { + _filters = new List(); + } - public CombinedSearchFilter(IEnumerable filters) - { - Guard.NotNull(filters, nameof(filters)); + public CombinedSearchFilter(IEnumerable filters) + { + Guard.NotNull(filters, nameof(filters)); - _filters = new List(filters); - } + _filters = new List(filters); + } - public ICollection Filters - { - get - { - return _filters; - } - } + public ICollection Filters => _filters; - #region Fluent builder + #region Fluent builder - public CombinedSearchFilter Add(ISearchFilter filter) - { - Guard.NotNull(filter, nameof(filter)); + public CombinedSearchFilter Add(ISearchFilter filter) + { + Guard.NotNull(filter, nameof(filter)); - _filters.Add(filter); + _filters.Add(filter); - return this; - } + return this; + } - #endregion + #endregion - public override string ToString() - { - if (_filters.Any()) - { - return string.Concat("(", string.Join(", ", _filters.Select(x => x.ToString())), ")"); - } + public override string ToString() + { + if (_filters.Any()) + { + return string.Concat("(", string.Join(", ", _filters.Select(x => x.ToString())), ")"); + } - return ""; - } - } + return ""; + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Filter/ISearchFilter.cs b/src/Libraries/SmartStore.Core/Search/Filter/ISearchFilter.cs index d0adf644f1..ca96bc8536 100644 --- a/src/Libraries/SmartStore.Core/Search/Filter/ISearchFilter.cs +++ b/src/Libraries/SmartStore.Core/Search/Filter/ISearchFilter.cs @@ -1,33 +1,32 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace SmartStore.Core.Search { - public interface ISearchFilter - { - SearchFilterOccurence Occurence { get; } - float Boost { get; } - } + public interface ISearchFilter + { + SearchFilterOccurence Occurence { get; } + float Boost { get; } + } - public interface ICombinedSearchFilter : ISearchFilter - { - ICollection Filters { get; } - } + public interface ICombinedSearchFilter : ISearchFilter + { + ICollection Filters { get; } + } - public interface IAttributeSearchFilter : ISearchFilter - { - string FieldName { get; } - IndexTypeCode TypeCode { get; } - object Term { get; } - bool IsExactMatch { get; } - bool IsNotAnalyzed { get; } - int ParentId { get; } - } + public interface IAttributeSearchFilter : ISearchFilter + { + string FieldName { get; } + IndexTypeCode TypeCode { get; } + object Term { get; } + bool IsExactMatch { get; } + bool IsNotAnalyzed { get; } + int ParentId { get; } + } - public interface IRangeSearchFilter : IAttributeSearchFilter - { - object UpperTerm { get; } - bool IncludesLower { get; } - bool IncludesUpper { get; } - } + public interface IRangeSearchFilter : IAttributeSearchFilter + { + object UpperTerm { get; } + bool IncludesLower { get; } + bool IncludesUpper { get; } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Filter/RangeSearchFilter.cs b/src/Libraries/SmartStore.Core/Search/Filter/RangeSearchFilter.cs index fda82e8457..78b4615ec5 100644 --- a/src/Libraries/SmartStore.Core/Search/Filter/RangeSearchFilter.cs +++ b/src/Libraries/SmartStore.Core/Search/Filter/RangeSearchFilter.cs @@ -1,31 +1,31 @@ namespace SmartStore.Core.Search { - public class RangeSearchFilter : SearchFilter, IRangeSearchFilter - { - public object UpperTerm - { - get; - protected internal set; - } + public class RangeSearchFilter : SearchFilter, IRangeSearchFilter + { + public object UpperTerm + { + get; + protected internal set; + } - public bool IncludesLower - { - get; - protected internal set; - } + public bool IncludesLower + { + get; + protected internal set; + } - public bool IncludesUpper - { - get; - protected internal set; - } + public bool IncludesUpper + { + get; + protected internal set; + } - public override string ToString() - { - return "{0}: {1} - {2}".FormatInvariant( - FieldName, - Term != null ? Term.ToString() : "*", - UpperTerm != null ? UpperTerm.ToString() : "*"); - } - } + public override string ToString() + { + return "{0}: {1} - {2}".FormatInvariant( + FieldName, + Term != null ? Term.ToString() : "*", + UpperTerm != null ? UpperTerm.ToString() : "*"); + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Filter/SearchFilter.cs b/src/Libraries/SmartStore.Core/Search/Filter/SearchFilter.cs index f212279f70..aa6ddba8a6 100644 --- a/src/Libraries/SmartStore.Core/Search/Filter/SearchFilter.cs +++ b/src/Libraries/SmartStore.Core/Search/Filter/SearchFilter.cs @@ -2,211 +2,211 @@ namespace SmartStore.Core.Search { - public class SearchFilter : SearchFilterBase, IAttributeSearchFilter - { - protected SearchFilter() - : base() - { - } - - public string FieldName - { - get; - protected set; - } - - public IndexTypeCode TypeCode - { - get; - protected set; - } - - public object Term - { - get; - protected set; - } - - public bool IsExactMatch - { - get; - protected set; - } - - public bool IsNotAnalyzed - { - get; - protected set; - } - - public int ParentId - { - get; - protected set; - } - - #region Fluent builder - - /// - /// Mark a clause as a mandatory match. By default all clauses are optional. - /// + public class SearchFilter : SearchFilterBase, IAttributeSearchFilter + { + protected SearchFilter() + : base() + { + } + + public string FieldName + { + get; + protected set; + } + + public IndexTypeCode TypeCode + { + get; + protected set; + } + + public object Term + { + get; + protected set; + } + + public bool IsExactMatch + { + get; + protected set; + } + + public bool IsNotAnalyzed + { + get; + protected set; + } + + public int ParentId + { + get; + protected set; + } + + #region Fluent builder + + /// + /// Mark a clause as a mandatory match. By default all clauses are optional. + /// /// Whether the clause is mandatory or not. - public SearchFilter Mandatory(bool mandatory = true) - { + public SearchFilter Mandatory(bool mandatory = true) + { Occurence = mandatory ? SearchFilterOccurence.Must : SearchFilterOccurence.MustNot; return this; - } + } /// /// Mark a clause as a forbidden match (MustNot). /// public SearchFilter Forbidden() - { - Occurence = SearchFilterOccurence.MustNot; - return this; - } + { + Occurence = SearchFilterOccurence.MustNot; + return this; + } /// /// Specifies whether the clause should be matched exactly, like 'app' won't match 'apple' (applied on string clauses only). /// public SearchFilter ExactMatch() - { - IsExactMatch = true; - return this; - } - - /// - /// Specifies that the searched value will not be tokenized (applied on string clauses only) - /// - public SearchFilter NotAnalyzed() - { - IsNotAnalyzed = true; - return this; - } - - /// - /// Applies a parent identifier. - /// - /// Parent identifier - public SearchFilter HasParent(int parentId) - { - ParentId = parentId; - return this; - } - - /// - /// Applies a specific boost to a clause. - /// - /// A value greater than zero, by which the score will be multiplied. - /// If greater than 1, it will improve the weight of a clause - public SearchFilter Weighted(float weight) - { - Boost = weight; - return this; - } - - #endregion - - #region Static factories - - public static CombinedSearchFilter Combined(params ISearchFilter[] filters) - { - var filter = new CombinedSearchFilter(filters); - filter.Occurence = SearchFilterOccurence.Must; - return filter; - } - - public static SearchFilter ByField(string fieldName, string term) - { - return ByField(fieldName, term, IndexTypeCode.String); - } - - public static SearchFilter ByField(string fieldName, int term) - { - return ByField(fieldName, term, IndexTypeCode.Int32); - } - - public static SearchFilter ByField(string fieldName, bool term) - { - return ByField(fieldName, term, IndexTypeCode.Boolean); - } - - public static SearchFilter ByField(string fieldName, double term) - { - return ByField(fieldName, term, IndexTypeCode.Double); - } - - public static SearchFilter ByField(string fieldName, DateTime term) - { - return ByField(fieldName, term, IndexTypeCode.DateTime); - } - - private static SearchFilter ByField(string fieldName, object term, IndexTypeCode typeCode) - { - Guard.NotEmpty(fieldName, nameof(fieldName)); - - return new SearchFilter - { - FieldName = fieldName, - Term = term, - TypeCode = typeCode - }; - } - - - public static RangeSearchFilter ByRange(string fieldName, string lower, string upper, bool includeLower = true, bool includeUpper = true) - { - return ByRange(fieldName, lower, upper, IndexTypeCode.String, includeLower, includeUpper); - } - - public static RangeSearchFilter ByRange(string fieldName, int? lower, int? upper, bool includeLower = true, bool includeUpper = true) - { - return ByRange(fieldName, lower, upper, IndexTypeCode.Int32, includeLower, includeUpper); - } - - public static RangeSearchFilter ByRange(string fieldName, double? lower, double? upper, bool includeLower = true, bool includeUpper = true) - { - return ByRange(fieldName, lower, upper, IndexTypeCode.Double, includeLower, includeUpper); - } - - public static RangeSearchFilter ByRange(string fieldName, DateTime? lower, DateTime? upper, bool includeLower = true, bool includeUpper = true) - { - return ByRange(fieldName, lower, upper, IndexTypeCode.DateTime, includeLower, includeUpper); - } - - private static RangeSearchFilter ByRange( - string fieldName, - object lowerTerm, - object upperTerm, - IndexTypeCode typeCode, - bool includeLower, - bool includeUpper) - { - Guard.NotEmpty(fieldName, nameof(fieldName)); - - return new RangeSearchFilter - { - FieldName = fieldName, - Term = lowerTerm, - UpperTerm = upperTerm, - TypeCode = typeCode, - IncludesLower = includeLower, - IncludesUpper = includeUpper - }; - } - - #endregion - - public override string ToString() - { - return $"{FieldName}: {Term.ToString()}"; - } - } - - public enum SearchFilterOccurence - { - Must = 0, - Should = 1, - MustNot = 2 - } + { + IsExactMatch = true; + return this; + } + + /// + /// Specifies that the searched value will not be tokenized (applied on string clauses only) + /// + public SearchFilter NotAnalyzed() + { + IsNotAnalyzed = true; + return this; + } + + /// + /// Applies a parent identifier. + /// + /// Parent identifier + public SearchFilter HasParent(int parentId) + { + ParentId = parentId; + return this; + } + + /// + /// Applies a specific boost to a clause. + /// + /// A value greater than zero, by which the score will be multiplied. + /// If greater than 1, it will improve the weight of a clause + public SearchFilter Weighted(float weight) + { + Boost = weight; + return this; + } + + #endregion + + #region Static factories + + public static CombinedSearchFilter Combined(params ISearchFilter[] filters) + { + var filter = new CombinedSearchFilter(filters); + filter.Occurence = SearchFilterOccurence.Must; + return filter; + } + + public static SearchFilter ByField(string fieldName, string term) + { + return ByField(fieldName, term, IndexTypeCode.String); + } + + public static SearchFilter ByField(string fieldName, int term) + { + return ByField(fieldName, term, IndexTypeCode.Int32); + } + + public static SearchFilter ByField(string fieldName, bool term) + { + return ByField(fieldName, term, IndexTypeCode.Boolean); + } + + public static SearchFilter ByField(string fieldName, double term) + { + return ByField(fieldName, term, IndexTypeCode.Double); + } + + public static SearchFilter ByField(string fieldName, DateTime term) + { + return ByField(fieldName, term, IndexTypeCode.DateTime); + } + + private static SearchFilter ByField(string fieldName, object term, IndexTypeCode typeCode) + { + Guard.NotEmpty(fieldName, nameof(fieldName)); + + return new SearchFilter + { + FieldName = fieldName, + Term = term, + TypeCode = typeCode + }; + } + + + public static RangeSearchFilter ByRange(string fieldName, string lower, string upper, bool includeLower = true, bool includeUpper = true) + { + return ByRange(fieldName, lower, upper, IndexTypeCode.String, includeLower, includeUpper); + } + + public static RangeSearchFilter ByRange(string fieldName, int? lower, int? upper, bool includeLower = true, bool includeUpper = true) + { + return ByRange(fieldName, lower, upper, IndexTypeCode.Int32, includeLower, includeUpper); + } + + public static RangeSearchFilter ByRange(string fieldName, double? lower, double? upper, bool includeLower = true, bool includeUpper = true) + { + return ByRange(fieldName, lower, upper, IndexTypeCode.Double, includeLower, includeUpper); + } + + public static RangeSearchFilter ByRange(string fieldName, DateTime? lower, DateTime? upper, bool includeLower = true, bool includeUpper = true) + { + return ByRange(fieldName, lower, upper, IndexTypeCode.DateTime, includeLower, includeUpper); + } + + private static RangeSearchFilter ByRange( + string fieldName, + object lowerTerm, + object upperTerm, + IndexTypeCode typeCode, + bool includeLower, + bool includeUpper) + { + Guard.NotEmpty(fieldName, nameof(fieldName)); + + return new RangeSearchFilter + { + FieldName = fieldName, + Term = lowerTerm, + UpperTerm = upperTerm, + TypeCode = typeCode, + IncludesLower = includeLower, + IncludesUpper = includeUpper + }; + } + + #endregion + + public override string ToString() + { + return $"{FieldName}: {Term.ToString()}"; + } + } + + public enum SearchFilterOccurence + { + Must = 0, + Should = 1, + MustNot = 2 + } } diff --git a/src/Libraries/SmartStore.Core/Search/Filter/SearchFilterBase.cs b/src/Libraries/SmartStore.Core/Search/Filter/SearchFilterBase.cs index 29bb1f590b..f8d8ae3d14 100644 --- a/src/Libraries/SmartStore.Core/Search/Filter/SearchFilterBase.cs +++ b/src/Libraries/SmartStore.Core/Search/Filter/SearchFilterBase.cs @@ -1,30 +1,28 @@ -using System; - -namespace SmartStore.Core.Search +namespace SmartStore.Core.Search { - public abstract class SearchFilterBase : ISearchFilter - { - protected SearchFilterBase() - { - Occurence = SearchFilterOccurence.Should; - } + public abstract class SearchFilterBase : ISearchFilter + { + protected SearchFilterBase() + { + Occurence = SearchFilterOccurence.Should; + } - public float Boost - { - get; - protected internal set; - } + public float Boost + { + get; + protected internal set; + } - public SearchFilterOccurence Occurence - { - get; - protected internal set; - } + public SearchFilterOccurence Occurence + { + get; + protected internal set; + } - #region Fluent builder + #region Fluent builder - // [...] + // [...] - #endregion - } + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Search/IIndexDocument.cs b/src/Libraries/SmartStore.Core/Search/IIndexDocument.cs index 72ad6f3ccb..6c3db5a6d1 100644 --- a/src/Libraries/SmartStore.Core/Search/IIndexDocument.cs +++ b/src/Libraries/SmartStore.Core/Search/IIndexDocument.cs @@ -2,53 +2,53 @@ namespace SmartStore.Core.Search { - /// - /// Abstraction of document to be stored in the underlying index providers - /// - public interface IIndexDocument : IEnumerable - { - /// - /// The primary key of the indexed entity - /// - /// Implementors: the id must be persisted internally as an - int Id { get; } + /// + /// Abstraction of document to be stored in the underlying index providers + /// + public interface IIndexDocument : IEnumerable + { + /// + /// The primary key of the indexed entity + /// + /// Implementors: the id must be persisted internally as an + int Id { get; } - /// - /// Identifies the type of a document, can be null - /// - SearchDocumentType? DocumentType { get; } + /// + /// Identifies the type of a document, can be null + /// + SearchDocumentType? DocumentType { get; } - /// - /// The number of fields in this document - /// - int Count { get; } + /// + /// The number of fields in this document + /// + int Count { get; } - /// - /// Adds a field to this document - /// - /// The field to add - void Add(IndexField field); + /// + /// Adds a field to this document + /// + /// The field to add + void Add(IndexField field); - /// - /// Removes a field from this document - /// - /// The name of the field - /// The number of removed fields - /// A document can contain fields with the same name. This method removes ALL fields with the passed name. - int Remove(string name); + /// + /// Removes a field from this document + /// + /// The name of the field + /// The number of removed fields + /// A document can contain fields with the same name. This method removes ALL fields with the passed name. + int Remove(string name); - /// - /// Whether at least one field with the passed name exists in the document - /// - /// The name of the field(s) - /// true if field exists, false otherwise - bool Contains(string name); + /// + /// Whether at least one field with the passed name exists in the document + /// + /// The name of the field(s) + /// true if field exists, false otherwise + bool Contains(string name); - /// - /// Enumerates all fields with the passed name - /// - /// The name of the field(s) - /// The sequence - IEnumerable this[string name] { get; } - } + /// + /// Enumerates all fields with the passed name + /// + /// The name of the field(s) + /// The sequence + IEnumerable this[string name] { get; } + } } diff --git a/src/Libraries/SmartStore.Core/Search/IIndexManager.cs b/src/Libraries/SmartStore.Core/Search/IIndexManager.cs index 72868d85b5..8e4301c158 100644 --- a/src/Libraries/SmartStore.Core/Search/IIndexManager.cs +++ b/src/Libraries/SmartStore.Core/Search/IIndexManager.cs @@ -4,7 +4,7 @@ /// A simple factory for registered search index providers /// public interface IIndexManager - { + { /// /// Whether at least one provider is available, which implements /// @@ -14,12 +14,12 @@ public interface IIndexManager /// Primarily used to skip indexing processes bool HasAnyProvider(string scope, bool activeOnly = true); - /// - /// Returns the instance of the first registered index provider (e.g. a Lucene provider) - /// + /// + /// Returns the instance of the first registered index provider (e.g. a Lucene provider) + /// /// Index scope name - /// Whether only active providers should be queried for - /// The index provider implementation instance - IIndexProvider GetIndexProvider(string scope, bool activeOnly = true); - } + /// Whether only active providers should be queried for + /// The index provider implementation instance + IIndexProvider GetIndexProvider(string scope, bool activeOnly = true); + } } diff --git a/src/Libraries/SmartStore.Core/Search/IIndexOperation.cs b/src/Libraries/SmartStore.Core/Search/IIndexOperation.cs index 27453c616e..553e3f24fc 100644 --- a/src/Libraries/SmartStore.Core/Search/IIndexOperation.cs +++ b/src/Libraries/SmartStore.Core/Search/IIndexOperation.cs @@ -1,35 +1,29 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SmartStore.Core.Search +namespace SmartStore.Core.Search { - public enum IndexOperationType - { - Index, - Delete - } + public enum IndexOperationType + { + Index, + Delete + } - /// - /// Represents an indexing operation - /// - public interface IIndexOperation - { - /// - /// The type of the operation - /// - IndexOperationType OperationType { get; } + /// + /// Represents an indexing operation + /// + public interface IIndexOperation + { + /// + /// The type of the operation + /// + IndexOperationType OperationType { get; } - /// - /// The document being inserted to or deleted from the index storage - /// - IIndexDocument Document { get; } + /// + /// The document being inserted to or deleted from the index storage + /// + IIndexDocument Document { get; } - /// - /// The database entity from which was created - /// - BaseEntity Entity { get; } - } + /// + /// The database entity from which was created + /// + BaseEntity Entity { get; } + } } diff --git a/src/Libraries/SmartStore.Core/Search/IIndexProvider.cs b/src/Libraries/SmartStore.Core/Search/IIndexProvider.cs index b63ac0261c..6b9464f068 100644 --- a/src/Libraries/SmartStore.Core/Search/IIndexProvider.cs +++ b/src/Libraries/SmartStore.Core/Search/IIndexProvider.cs @@ -2,8 +2,8 @@ namespace SmartStore.Core.Search { - public interface IIndexProvider - { + public interface IIndexProvider + { /// /// Gets a value indicating whether the search index given by scope is active /// @@ -15,32 +15,32 @@ public interface IIndexProvider /// IEnumerable EnumerateIndexes(); - /// - /// Creates an empty document - /// - /// The primary key of the indexed entity - /// Identifies the type of a document, can be null - /// The document instance - IIndexDocument CreateDocument(int id, SearchDocumentType? documentType); + /// + /// Creates an empty document + /// + /// The primary key of the indexed entity + /// Identifies the type of a document, can be null + /// The document instance + IIndexDocument CreateDocument(int id, SearchDocumentType? documentType); - /// - /// Returns a provider specific implementation of the interface - /// which allows interaction with the underlying index store for managing the index and containing documents. - /// - /// The index name - /// The index store - /// - /// This methods always returns an object instance, even if the index does not exist yet. - /// - IIndexStore GetIndexStore(string scope); + /// + /// Returns a provider specific implementation of the interface + /// which allows interaction with the underlying index store for managing the index and containing documents. + /// + /// The index name + /// The index store + /// + /// This methods always returns an object instance, even if the index does not exist yet. + /// + IIndexStore GetIndexStore(string scope); - /// - /// Returns a provider specific implementation of the interface - /// which allows executing queries against an index store. - /// - /// The index store - /// The query to execute against the store - /// The search engine instance - ISearchEngine GetSearchEngine(IIndexStore store, ISearchQuery query); - } + /// + /// Returns a provider specific implementation of the interface + /// which allows executing queries against an index store. + /// + /// The index store + /// The query to execute against the store + /// The search engine instance + ISearchEngine GetSearchEngine(IIndexStore store, ISearchQuery query); + } } diff --git a/src/Libraries/SmartStore.Core/Search/IIndexStore.cs b/src/Libraries/SmartStore.Core/Search/IIndexStore.cs index 36e7fe6a23..6a0d6df230 100644 --- a/src/Libraries/SmartStore.Core/Search/IIndexStore.cs +++ b/src/Libraries/SmartStore.Core/Search/IIndexStore.cs @@ -3,27 +3,27 @@ namespace SmartStore.Core.Search { - public interface IIndexStore - { - /// - /// Creates a new index if it doesn't exist already - /// - void CreateIfNotExists(); + public interface IIndexStore + { + /// + /// Creates a new index if it doesn't exist already + /// + void CreateIfNotExists(); - /// - /// Deletes the index - /// - void Delete(); + /// + /// Deletes the index + /// + void Delete(); - /// - /// Returns the name of the index - /// - string Scope { get; } + /// + /// Returns the name of the index + /// + string Scope { get; } - /// - /// Checks whether the index is already existing or not - /// - bool Exists { get; } + /// + /// Checks whether the index is already existing or not + /// + bool Exists { get; } /// /// Gets the size of the index in bytes. @@ -41,64 +41,64 @@ public interface IIndexStore /// Type of document, use null to get all documents int GetDocumentCount(SearchDocumentType? documentType); - /// - /// Returns every field's name available in the index - /// - IEnumerable GetAllFields(); + /// + /// Returns every field's name available in the index + /// + IEnumerable GetAllFields(); - /// - /// Removes all documents from the index - /// - void Clear(); + /// + /// Removes all documents from the index + /// + void Clear(); - /// - /// Acquires an index writer - /// - /// Provides information about the indexing operation - /// - /// This method creates a transient writer instance which automatically gets released on dispose. - /// - IDisposable AcquireWriter(AcquireWriterContext writerContext); + /// + /// Acquires an index writer + /// + /// Provides information about the indexing operation + /// + /// This method creates a transient writer instance which automatically gets released on dispose. + /// + IDisposable AcquireWriter(AcquireWriterContext writerContext); - /// - /// Adds a set of new documents to the index - /// - /// - /// This method will delete already existing documents before saving them - /// - void SaveDocuments(IEnumerable documents); + /// + /// Adds a set of new documents to the index + /// + /// + /// This method will delete already existing documents before saving them + /// + void SaveDocuments(IEnumerable documents); - /// - /// Removes a set of existing documents from the index - /// - void DeleteDocuments(IEnumerable documents); + /// + /// Removes a set of existing documents from the index + /// + void DeleteDocuments(IEnumerable documents); - /// - /// Removes a set of existing documents from the index - /// - /// Type of document - void DeleteDocuments(SearchDocumentType documentType); - } + /// + /// Removes a set of existing documents from the index + /// + /// Type of document + void DeleteDocuments(SearchDocumentType documentType); + } - public static class IIndexStoreExtensions - { - /// - /// Adds a new document to the index - /// - /// - /// This method will delete a document with the same entity id - if it exists - before saving it. - /// - public static void SaveDocument(this IIndexStore store, IIndexDocument document) - { - store.SaveDocuments(new[] { document }); - } + public static class IIndexStoreExtensions + { + /// + /// Adds a new document to the index + /// + /// + /// This method will delete a document with the same entity id - if it exists - before saving it. + /// + public static void SaveDocument(this IIndexStore store, IIndexDocument document) + { + store.SaveDocuments(new[] { document }); + } - /// - /// Removes an existing document from the index - /// - public static void DeleteDocument(this IIndexStore store, IIndexDocument document) - { - store.DeleteDocuments(new[] { document }); - } - } + /// + /// Removes an existing document from the index + /// + public static void DeleteDocument(this IIndexStore store, IIndexDocument document) + { + store.DeleteDocuments(new[] { document }); + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/ISearchAlias.cs b/src/Libraries/SmartStore.Core/Search/ISearchAlias.cs index a822492057..81f1129163 100644 --- a/src/Libraries/SmartStore.Core/Search/ISearchAlias.cs +++ b/src/Libraries/SmartStore.Core/Search/ISearchAlias.cs @@ -1,12 +1,12 @@ namespace SmartStore.Core.Search { - /// - /// Represents an entity which supports SEO friendly search alias - /// - public interface ISearchAlias - { - int Id { get; set; } + /// + /// Represents an entity which supports SEO friendly search alias + /// + public interface ISearchAlias + { + int Id { get; set; } - string Alias { get; set; } - } + string Alias { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Search/ISearchEngine.cs b/src/Libraries/SmartStore.Core/Search/ISearchEngine.cs index 12235f2d44..96a651765e 100644 --- a/src/Libraries/SmartStore.Core/Search/ISearchEngine.cs +++ b/src/Libraries/SmartStore.Core/Search/ISearchEngine.cs @@ -3,43 +3,43 @@ namespace SmartStore.Core.Search { - public interface ISearchEngine - { - /// - /// Search query - /// - ISearchQuery Query { get; } + public interface ISearchEngine + { + /// + /// Search query + /// + ISearchQuery Query { get; } - /// - /// Get search hit by entity identifier - /// - /// Entity identifier - /// Search hit - ISearchHit Get(int id); + /// + /// Get search hit by entity identifier + /// + /// Entity identifier + /// Search hit + ISearchHit Get(int id); - /// - /// Get total number of search hits - /// - /// Total number of search hits - int Count(); + /// + /// Get total number of search hits + /// + /// Total number of search hits + int Count(); - /// - /// Search - /// - /// Search hits - IEnumerable Search(); + /// + /// Search + /// + /// Search hits + IEnumerable Search(); - /// - /// Gets the facet map for drilldown navigation - /// - /// The facet groups - IDictionary GetFacetMap(); + /// + /// Gets the facet map for drilldown navigation + /// + /// The facet groups + IDictionary GetFacetMap(); - /// - /// Performs spell checking ("Diy you mean?") - /// - /// Suggestions/corrections or an empty array - string[] CheckSpelling(); + /// + /// Performs spell checking ("Diy you mean?") + /// + /// Suggestions/corrections or an empty array + string[] CheckSpelling(); /// /// Highlights chosen terms in a text, extracting the most relevant sections diff --git a/src/Libraries/SmartStore.Core/Search/ISearchHit.cs b/src/Libraries/SmartStore.Core/Search/ISearchHit.cs index af39c9a495..03c09a4299 100644 --- a/src/Libraries/SmartStore.Core/Search/ISearchHit.cs +++ b/src/Libraries/SmartStore.Core/Search/ISearchHit.cs @@ -3,18 +3,18 @@ namespace SmartStore.Core.Search { - public interface ISearchHit - { - int EntityId { get; } - float Score { get; } + public interface ISearchHit + { + int EntityId { get; } + float Score { get; } - int GetInt(string name); - double GetDouble(string name); - bool GetBoolean(string name); - string GetString(string name); - string GetString(string name, string languageSeoCode); - DateTime GetDateTime(string name); + int GetInt(string name); + double GetDouble(string name); + bool GetBoolean(string name); + string GetString(string name); + string GetString(string name, string languageSeoCode); + DateTime GetDateTime(string name); - IEnumerable GetStoredFieldNames(); - } + IEnumerable GetStoredFieldNames(); + } } diff --git a/src/Libraries/SmartStore.Core/Search/ISearchQuery.cs b/src/Libraries/SmartStore.Core/Search/ISearchQuery.cs index 28ba070494..46d60e6761 100644 --- a/src/Libraries/SmartStore.Core/Search/ISearchQuery.cs +++ b/src/Libraries/SmartStore.Core/Search/ISearchQuery.cs @@ -4,50 +4,50 @@ namespace SmartStore.Core.Search { public interface ISearchQuery - { - // Language, Currency & Store - int? LanguageId { get; } - string LanguageCulture { get; } - string CurrencyCode { get; } + { + // Language, Currency & Store + int? LanguageId { get; } + string LanguageCulture { get; } + string CurrencyCode { get; } int? StoreId { get; } // Search term string[] Fields { get; } - string Term { get; } - SearchMode Mode { get; } - bool EscapeTerm { get; } - bool IsFuzzySearch { get; } - - // Filtering - ICollection Filters { get; } - - // Facets - IReadOnlyDictionary FacetDescriptors { get; } - - // Paging - int Skip { get; } - int Take { get; } - - // Sorting - ICollection Sorting { get; } - - /// - /// Maximum number of suggestions returned from spell checker - /// - int SpellCheckerMaxSuggestions { get; } - - /// - /// Defines how many characters must be in the query before suggestions are provided - /// - int SpellCheckerMinQueryLength { get; } - - /// - /// The maximum number of product hits up to which suggestions are provided - /// - int SpellCheckerMaxHitCount { get; } - - // Misc - string Origin { get; } - IDictionary CustomData { get; } - } + string Term { get; } + SearchMode Mode { get; } + bool EscapeTerm { get; } + bool IsFuzzySearch { get; } + + // Filtering + ICollection Filters { get; } + + // Facets + IReadOnlyDictionary FacetDescriptors { get; } + + // Paging + int Skip { get; } + int Take { get; } + + // Sorting + ICollection Sorting { get; } + + /// + /// Maximum number of suggestions returned from spell checker + /// + int SpellCheckerMaxSuggestions { get; } + + /// + /// Defines how many characters must be in the query before suggestions are provided + /// + int SpellCheckerMinQueryLength { get; } + + /// + /// The maximum number of product hits up to which suggestions are provided + /// + int SpellCheckerMaxHitCount { get; } + + // Misc + string Origin { get; } + IDictionary CustomData { get; } + } } diff --git a/src/Libraries/SmartStore.Core/Search/IndexDocument.cs b/src/Libraries/SmartStore.Core/Search/IndexDocument.cs index 0fce13d090..a63c2a9f7f 100644 --- a/src/Libraries/SmartStore.Core/Search/IndexDocument.cs +++ b/src/Libraries/SmartStore.Core/Search/IndexDocument.cs @@ -6,103 +6,97 @@ namespace SmartStore.Core.Search { - public class IndexDocument : IIndexDocument - { - protected readonly Multimap _fields; - - public IndexDocument(int id) - : this(id, null) - { - } - - public IndexDocument(int id, SearchDocumentType? documentType) - { - _fields = new Multimap(StringComparer.OrdinalIgnoreCase); - - Add(new IndexField("id", id).Store()); - - if (documentType.HasValue) - { - Add(new IndexField("doctype", (int)documentType.Value).Store()); - } - } - - public int Id - { - get - { - return (int)_fields["id"].FirstOrDefault().Value; - } - } - - public virtual SearchDocumentType? DocumentType - { - get - { - if (_fields.ContainsKey("doctype")) - { - return (SearchDocumentType)_fields["doctype"].FirstOrDefault().Value; - } - return null; - } - } - - public int Count => _fields.TotalValueCount; - - public virtual void Add(IndexField field) - { - if (field.Name.IsCaseInsensitiveEqual("id") && _fields.ContainsKey("id")) - { - // special treatment for id field: allow only one! - _fields.RemoveAll("id"); - } - - if (field.Name.IsCaseInsensitiveEqual("doctype") && _fields.ContainsKey("doctype")) - { - _fields.RemoveAll("doctype"); - } - - _fields.Add(field.Name, field); - } - - public int Remove(string name) - { - if (_fields.ContainsKey(name)) - { - var num = _fields[name].Count; - _fields.RemoveAll(name); - return num; - } - - return 0; - } - - public bool Contains(string name) - { - return _fields.ContainsKey(name); - } - - public IEnumerable this[string name] - { - get - { - if (_fields.ContainsKey(name)) - { - return _fields[name]; - } - - return Enumerable.Empty(); - } - } - - public IEnumerator GetEnumerator() - { - return _fields.SelectMany(x => x.Value).GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - } + public class IndexDocument : IIndexDocument + { + protected readonly Multimap _fields; + + public IndexDocument(int id) + : this(id, null) + { + } + + public IndexDocument(int id, SearchDocumentType? documentType) + { + _fields = new Multimap(StringComparer.OrdinalIgnoreCase); + + Add(new IndexField("id", id).Store()); + + if (documentType.HasValue) + { + Add(new IndexField("doctype", (int)documentType.Value).Store()); + } + } + + public int Id => (int)_fields["id"].FirstOrDefault().Value; + + public virtual SearchDocumentType? DocumentType + { + get + { + if (_fields.ContainsKey("doctype")) + { + return (SearchDocumentType)_fields["doctype"].FirstOrDefault().Value; + } + return null; + } + } + + public int Count => _fields.TotalValueCount; + + public virtual void Add(IndexField field) + { + if (field.Name.IsCaseInsensitiveEqual("id") && _fields.ContainsKey("id")) + { + // special treatment for id field: allow only one! + _fields.RemoveAll("id"); + } + + if (field.Name.IsCaseInsensitiveEqual("doctype") && _fields.ContainsKey("doctype")) + { + _fields.RemoveAll("doctype"); + } + + _fields.Add(field.Name, field); + } + + public int Remove(string name) + { + if (_fields.ContainsKey(name)) + { + var num = _fields[name].Count; + _fields.RemoveAll(name); + return num; + } + + return 0; + } + + public bool Contains(string name) + { + return _fields.ContainsKey(name); + } + + public IEnumerable this[string name] + { + get + { + if (_fields.ContainsKey(name)) + { + return _fields[name]; + } + + return Enumerable.Empty(); + } + } + + public IEnumerator GetEnumerator() + { + return _fields.SelectMany(x => x.Value).GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/IndexField.cs b/src/Libraries/SmartStore.Core/Search/IndexField.cs index 396b9abc8f..3bb2801287 100644 --- a/src/Libraries/SmartStore.Core/Search/IndexField.cs +++ b/src/Libraries/SmartStore.Core/Search/IndexField.cs @@ -2,121 +2,121 @@ namespace SmartStore.Core.Search { - public class IndexField - { - public IndexField(string name, bool value) - : this(name, value, IndexTypeCode.Boolean) - { - } - - public IndexField(string name, int value) - : this(name, value, IndexTypeCode.Int32) - { - } - - public IndexField(string name, double value) - : this(name, value, IndexTypeCode.Double) - { - } - - public IndexField(string name, DateTime value) - : this(name, value, IndexTypeCode.DateTime) - { - } - - public IndexField(string name, string value) - : this(name, value, IndexTypeCode.String) - { - } - - private IndexField(string name, object value, IndexTypeCode typeCode) - { - Guard.NotEmpty(name, nameof(name)); - - Name = name; - Value = value; - TypeCode = typeCode; - } - - public IndexField Store(bool store = true) - { - Stored = store; - return this; - } - - public IndexField Analyze(bool analyze = true) - { - Analyzed = analyze; - return this; - } - - public IndexField RemoveTags(bool removeTags = true) - { - ShouldRemoveTags = removeTags; - return this; - } - - public IndexField Boost(float factor) - { - Boosted = factor; - return this; - } - - public string Name - { - get; - private set; - } - - public object Value - { - get; - private set; - } - - public IndexTypeCode TypeCode - { - get; - private set; - } - - public bool Stored - { - get; - private set; - } - - public bool Analyzed - { - get; - private set; - } - - public bool ShouldRemoveTags - { - get; - private set; - } - - public float Boosted - { - get; - private set; - } - - public override string ToString() - { - return Name + ": " + Value.ToString().NaIfEmpty(); - } - } - - public enum IndexTypeCode - { - Empty = 0, - Boolean = 3, - Int32 = 9, - Double = 14, - DateTime = 16, - String = 18 - } + public class IndexField + { + public IndexField(string name, bool value) + : this(name, value, IndexTypeCode.Boolean) + { + } + + public IndexField(string name, int value) + : this(name, value, IndexTypeCode.Int32) + { + } + + public IndexField(string name, double value) + : this(name, value, IndexTypeCode.Double) + { + } + + public IndexField(string name, DateTime value) + : this(name, value, IndexTypeCode.DateTime) + { + } + + public IndexField(string name, string value) + : this(name, value, IndexTypeCode.String) + { + } + + private IndexField(string name, object value, IndexTypeCode typeCode) + { + Guard.NotEmpty(name, nameof(name)); + + Name = name; + Value = value; + TypeCode = typeCode; + } + + public IndexField Store(bool store = true) + { + Stored = store; + return this; + } + + public IndexField Analyze(bool analyze = true) + { + Analyzed = analyze; + return this; + } + + public IndexField RemoveTags(bool removeTags = true) + { + ShouldRemoveTags = removeTags; + return this; + } + + public IndexField Boost(float factor) + { + Boosted = factor; + return this; + } + + public string Name + { + get; + private set; + } + + public object Value + { + get; + private set; + } + + public IndexTypeCode TypeCode + { + get; + private set; + } + + public bool Stored + { + get; + private set; + } + + public bool Analyzed + { + get; + private set; + } + + public bool ShouldRemoveTags + { + get; + private set; + } + + public float Boosted + { + get; + private set; + } + + public override string ToString() + { + return Name + ": " + Value.ToString().NaIfEmpty(); + } + } + + public enum IndexTypeCode + { + Empty = 0, + Boolean = 3, + Int32 = 9, + Double = 14, + DateTime = 16, + String = 18 + } } diff --git a/src/Libraries/SmartStore.Core/Search/IndexInfo.cs b/src/Libraries/SmartStore.Core/Search/IndexInfo.cs index 7389b7a5cf..b0fbc4b5cc 100644 --- a/src/Libraries/SmartStore.Core/Search/IndexInfo.cs +++ b/src/Libraries/SmartStore.Core/Search/IndexInfo.cs @@ -6,103 +6,103 @@ namespace SmartStore.Core.Search { - public enum IndexingStatus - { - Unavailable = -1, - Idle = 0, - Rebuilding = 1, - Updating = 2 - } - - public class IndexInfo - { - public IndexInfo(string scope) - { + public enum IndexingStatus + { + Unavailable = -1, + Idle = 0, + Rebuilding = 1, + Updating = 2 + } + + public class IndexInfo + { + public IndexInfo(string scope) + { Guard.NotEmpty(scope, nameof(scope)); Scope = scope; - Fields = new string[0]; - } + Fields = new string[0]; + } - public string Scope { get; private set; } - public int DocumentCount { get; set; } + public string Scope { get; private set; } + public int DocumentCount { get; set; } public long IndexSize { get; set; } public int LastAddedDocumentId { get; set; } public IEnumerable Fields { get; set; } - // loaded from status file - public DateTime? LastIndexedUtc { get; set; } - public TimeSpan? LastIndexingDuration { get; set; } - public bool IsModified { get; set; } - public IndexingStatus Status { get; set; } - public string Error { get; set; } - - /// - /// Indicates that the index should be rebuilt from scratch, because - /// some global settings have changed (like tax rates for example) - /// - public bool ShouldRebuild { get; set; } - - public string ToXml() - { - return new XDocument( - new XElement("info", - new XElement("status", Status), - new XElement("last-indexed-utc", LastIndexedUtc?.ToString("u")), - new XElement("last-indexing-duration", LastIndexingDuration?.ToString("c")), - new XElement("is-modified", IsModified ? "true" : "false"), - new XElement("error", Error), - new XElement("should-rebuild", ShouldRebuild ? "true" : "false"), - new XElement("document-count", DocumentCount), + // loaded from status file + public DateTime? LastIndexedUtc { get; set; } + public TimeSpan? LastIndexingDuration { get; set; } + public bool IsModified { get; set; } + public IndexingStatus Status { get; set; } + public string Error { get; set; } + + /// + /// Indicates that the index should be rebuilt from scratch, because + /// some global settings have changed (like tax rates for example) + /// + public bool ShouldRebuild { get; set; } + + public string ToXml() + { + return new XDocument( + new XElement("info", + new XElement("status", Status), + new XElement("last-indexed-utc", LastIndexedUtc?.ToString("u")), + new XElement("last-indexing-duration", LastIndexingDuration?.ToString("c")), + new XElement("is-modified", IsModified ? "true" : "false"), + new XElement("error", Error), + new XElement("should-rebuild", ShouldRebuild ? "true" : "false"), + new XElement("document-count", DocumentCount), new XElement("index-size", IndexSize), new XElement("last-added-document-id", LastAddedDocumentId), new XElement("fields", string.Join(", ", Fields ?? Enumerable.Empty())) - )).ToString(); - } + )).ToString(); + } - public static IndexInfo FromXml(string xml, string scope) - { + public static IndexInfo FromXml(string xml, string scope) + { var info = new IndexInfo(scope); - try - { - var doc = XDocument.Parse(xml); - - var lastIndexed = doc.Descendants("last-indexed-utc").FirstOrDefault()?.Value; - if (lastIndexed.HasValue()) - { - info.LastIndexedUtc = lastIndexed.Convert()?.ToUniversalTime(); - } - - var lastDuration = doc.Descendants("last-indexing-duration").FirstOrDefault()?.Value; - if (lastDuration.HasValue()) - { - info.LastIndexingDuration = lastDuration.Convert(); - } - - var isModified = doc.Descendants("is-modified").FirstOrDefault()?.Value; - if (isModified.HasValue()) - { - info.IsModified = isModified.Convert(); - } - else - { - info.IsModified = lastIndexed.HasValue(); - } - - var status = doc.Descendants("status").FirstOrDefault()?.Value; - if (status.HasValue()) - { - info.Status = status.Convert(); - } - - info.Error = doc.Descendants("error").FirstOrDefault()?.Value; - - var documentCount = doc.Descendants("document-count").FirstOrDefault()?.Value; - if (documentCount.HasValue()) - { - info.DocumentCount = documentCount.ToInt(); - } + try + { + var doc = XDocument.Parse(xml); + + var lastIndexed = doc.Descendants("last-indexed-utc").FirstOrDefault()?.Value; + if (lastIndexed.HasValue()) + { + info.LastIndexedUtc = lastIndexed.Convert()?.ToUniversalTime(); + } + + var lastDuration = doc.Descendants("last-indexing-duration").FirstOrDefault()?.Value; + if (lastDuration.HasValue()) + { + info.LastIndexingDuration = lastDuration.Convert(); + } + + var isModified = doc.Descendants("is-modified").FirstOrDefault()?.Value; + if (isModified.HasValue()) + { + info.IsModified = isModified.Convert(); + } + else + { + info.IsModified = lastIndexed.HasValue(); + } + + var status = doc.Descendants("status").FirstOrDefault()?.Value; + if (status.HasValue()) + { + info.Status = status.Convert(); + } + + info.Error = doc.Descendants("error").FirstOrDefault()?.Value; + + var documentCount = doc.Descendants("document-count").FirstOrDefault()?.Value; + if (documentCount.HasValue()) + { + info.DocumentCount = documentCount.ToInt(); + } var indexSize = doc.Descendants("index-size").FirstOrDefault()?.Value; if (indexSize.HasValue() && CommonHelper.TryConvert(indexSize, out long size)) @@ -117,20 +117,20 @@ public static IndexInfo FromXml(string xml, string scope) } var fields = doc.Descendants("fields").FirstOrDefault()?.Value; - if (fields.HasValue()) - { - info.Fields = fields.SplitSafe(", "); - } - - var shouldRebuild = doc.Descendants("should-rebuild").FirstOrDefault()?.Value; - if (shouldRebuild.HasValue()) - { - info.ShouldRebuild = shouldRebuild.Convert(); - } - } - catch { } - - return info; - } - } + if (fields.HasValue()) + { + info.Fields = fields.SplitSafe(", "); + } + + var shouldRebuild = doc.Descendants("should-rebuild").FirstOrDefault()?.Value; + if (shouldRebuild.HasValue()) + { + info.ShouldRebuild = shouldRebuild.Convert(); + } + } + catch { } + + return info; + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/IndexProviderBase.cs b/src/Libraries/SmartStore.Core/Search/IndexProviderBase.cs index 15662c3768..a6e57e771b 100644 --- a/src/Libraries/SmartStore.Core/Search/IndexProviderBase.cs +++ b/src/Libraries/SmartStore.Core/Search/IndexProviderBase.cs @@ -2,8 +2,8 @@ namespace SmartStore.Core.Search { - public abstract class IndexProviderBase : IIndexProvider - { + public abstract class IndexProviderBase : IIndexProvider + { public virtual bool IsActive(string scope) { return true; @@ -11,15 +11,15 @@ public virtual bool IsActive(string scope) public abstract IEnumerable EnumerateIndexes(); - public virtual IIndexDocument CreateDocument(int id, SearchDocumentType? documentType) - { - Guard.IsPositive(id, nameof(id)); + public virtual IIndexDocument CreateDocument(int id, SearchDocumentType? documentType) + { + Guard.IsPositive(id, nameof(id)); - return new IndexDocument(id, documentType); - } + return new IndexDocument(id, documentType); + } - public abstract IIndexStore GetIndexStore(string scope); + public abstract IIndexStore GetIndexStore(string scope); - public abstract ISearchEngine GetSearchEngine(IIndexStore store, ISearchQuery query); - } + public abstract ISearchEngine GetSearchEngine(IIndexStore store, ISearchQuery query); + } } diff --git a/src/Libraries/SmartStore.Core/Search/SearchDocumentType.cs b/src/Libraries/SmartStore.Core/Search/SearchDocumentType.cs index c2597f571d..a919aabc71 100644 --- a/src/Libraries/SmartStore.Core/Search/SearchDocumentType.cs +++ b/src/Libraries/SmartStore.Core/Search/SearchDocumentType.cs @@ -1,17 +1,17 @@ namespace SmartStore.Core.Search { - public enum SearchDocumentType - { - Product = 0, - Category, - Manufacturer, - DeliveryTime, - Attribute, - AttributeValue, - Variant, - VariantValue, + public enum SearchDocumentType + { + Product = 0, + Category, + Manufacturer, + DeliveryTime, + Attribute, + AttributeValue, + Variant, + VariantValue, Customer, Forum, ForumPost - } + } } diff --git a/src/Libraries/SmartStore.Core/Search/SearchEnums.cs b/src/Libraries/SmartStore.Core/Search/SearchEnums.cs index a280714d51..dd85018a4e 100644 --- a/src/Libraries/SmartStore.Core/Search/SearchEnums.cs +++ b/src/Libraries/SmartStore.Core/Search/SearchEnums.cs @@ -1,20 +1,20 @@ namespace SmartStore.Core.Search { - public enum SearchMode - { - /// - /// Term search - /// - ExactMatch = 0, - - /// - /// Prefix term search - /// - StartsWith, + public enum SearchMode + { + /// + /// Term search + /// + ExactMatch = 0, - /// - /// Wildcard search - /// - Contains - } + /// + /// Prefix term search + /// + StartsWith, + + /// + /// Wildcard search + /// + Contains + } } diff --git a/src/Libraries/SmartStore.Core/Search/SearchQuery.cs b/src/Libraries/SmartStore.Core/Search/SearchQuery.cs index c74e37e286..b9e10af195 100644 --- a/src/Libraries/SmartStore.Core/Search/SearchQuery.cs +++ b/src/Libraries/SmartStore.Core/Search/SearchQuery.cs @@ -10,164 +10,155 @@ namespace SmartStore.Core.Search { public enum SearchResultFlags - { - WithHits = 1 << 0, - WithFacets = 1 << 1, - WithSuggestions = 1 << 2, - Full = WithHits | WithFacets | WithSuggestions - } - - public class SearchQuery : SearchQuery - { - /// - /// Initializes a new instance of the class without a search term being set - /// - public SearchQuery() - : base((string[])null, null) - { - } - - public SearchQuery(string field, string term, SearchMode mode = SearchMode.Contains, bool escape = false, bool isFuzzySearch = false) - : base(field.HasValue() ? new[] { field } : null, term, mode, escape, isFuzzySearch) - { - } - - public SearchQuery(string[] fields, string term, SearchMode mode = SearchMode.Contains, bool escape = false, bool isFuzzySearch = false) - : base(fields, term, mode, escape, isFuzzySearch) - { - } - } - - public class SearchQuery : ISearchQuery where TQuery : class, ISearchQuery - { - private readonly Dictionary _facetDescriptors; - private Dictionary _customData; - - protected SearchQuery(string[] fields, string term, SearchMode mode = SearchMode.Contains, bool escape = false, bool isFuzzySearch = false) - { - Fields = fields; - Term = term; - Mode = mode; - EscapeTerm = escape; - IsFuzzySearch = isFuzzySearch; - - Filters = new List(); - Sorting = new List(); - _facetDescriptors = new Dictionary(StringComparer.OrdinalIgnoreCase); - - Take = int.MaxValue; - - SpellCheckerMinQueryLength = 4; - SpellCheckerMaxHitCount = 3; - - ResultFlags = SearchResultFlags.WithHits; - } - - // Language, Currency & Store - public int? LanguageId { get; protected set; } - public string LanguageCulture { get; protected set; } - public string CurrencyCode { get; protected set; } + { + WithHits = 1 << 0, + WithFacets = 1 << 1, + WithSuggestions = 1 << 2, + Full = WithHits | WithFacets | WithSuggestions + } + + public class SearchQuery : SearchQuery + { + /// + /// Initializes a new instance of the class without a search term being set + /// + public SearchQuery() + : base((string[])null, null) + { + } + + public SearchQuery(string field, string term, SearchMode mode = SearchMode.Contains, bool escape = false, bool isFuzzySearch = false) + : base(field.HasValue() ? new[] { field } : null, term, mode, escape, isFuzzySearch) + { + } + + public SearchQuery(string[] fields, string term, SearchMode mode = SearchMode.Contains, bool escape = false, bool isFuzzySearch = false) + : base(fields, term, mode, escape, isFuzzySearch) + { + } + } + + public class SearchQuery : ISearchQuery where TQuery : class, ISearchQuery + { + private readonly Dictionary _facetDescriptors; + private Dictionary _customData; + + protected SearchQuery(string[] fields, string term, SearchMode mode = SearchMode.Contains, bool escape = false, bool isFuzzySearch = false) + { + Fields = fields; + Term = term; + Mode = mode; + EscapeTerm = escape; + IsFuzzySearch = isFuzzySearch; + + Filters = new List(); + Sorting = new List(); + _facetDescriptors = new Dictionary(StringComparer.OrdinalIgnoreCase); + + Take = int.MaxValue; + + SpellCheckerMinQueryLength = 4; + SpellCheckerMaxHitCount = 3; + + ResultFlags = SearchResultFlags.WithHits; + } + + // Language, Currency & Store + public int? LanguageId { get; protected set; } + public string LanguageCulture { get; protected set; } + public string CurrencyCode { get; protected set; } public int? StoreId { get; protected set; } // Search term public string[] Fields { get; set; } - public string Term { get; set; } - public bool EscapeTerm { get; protected set; } - public SearchMode Mode { get; protected set; } - public bool IsFuzzySearch { get; protected set; } + public string Term { get; set; } + public bool EscapeTerm { get; protected set; } + public SearchMode Mode { get; protected set; } + public bool IsFuzzySearch { get; protected set; } - // Filtering - public ICollection Filters { get; } + // Filtering + public ICollection Filters { get; } - // Facets - public IReadOnlyDictionary FacetDescriptors - { - get { return _facetDescriptors; } - } + // Facets + public IReadOnlyDictionary FacetDescriptors => _facetDescriptors; - // Paging - public int Skip { get; protected set; } - public int Take { get; protected set; } - public int PageIndex - { - get - { - if (Take == 0) - return 0; + // Paging + public int Skip { get; protected set; } + public int Take { get; protected set; } + public int PageIndex + { + get + { + if (Take == 0) + return 0; - return Math.Max(Skip / Take, 0); - } - } + return Math.Max(Skip / Take, 0); + } + } - // Sorting - public ICollection Sorting { get; } + // Sorting + public ICollection Sorting { get; } - // Spell checker - public int SpellCheckerMaxSuggestions { get; protected set; } - public int SpellCheckerMinQueryLength { get; protected set; } - public int SpellCheckerMaxHitCount { get; protected set; } + // Spell checker + public int SpellCheckerMaxSuggestions { get; protected set; } + public int SpellCheckerMinQueryLength { get; protected set; } + public int SpellCheckerMaxHitCount { get; protected set; } - // Result control - public SearchResultFlags ResultFlags { get; protected set; } + // Result control + public SearchResultFlags ResultFlags { get; protected set; } - // Misc - public string Origin { get; protected set; } + // Misc + public string Origin { get; protected set; } - public IDictionary CustomData - { - get - { - return _customData ?? (_customData = new Dictionary(StringComparer.OrdinalIgnoreCase)); - } - } + public IDictionary CustomData => _customData ?? (_customData = new Dictionary(StringComparer.OrdinalIgnoreCase)); - #region Fluent builder + #region Fluent builder - public virtual TQuery HasStoreId(int id) - { - Guard.NotNegative(id, nameof(id)); + public virtual TQuery HasStoreId(int id) + { + Guard.NotNegative(id, nameof(id)); - StoreId = id; + StoreId = id; - return (this as TQuery); - } + return (this as TQuery); + } - public TQuery WithLanguage(Language language) - { - Guard.NotNull(language, nameof(language)); - Guard.NotEmpty(language.LanguageCulture, nameof(language.LanguageCulture)); + public TQuery WithLanguage(Language language) + { + Guard.NotNull(language, nameof(language)); + Guard.NotEmpty(language.LanguageCulture, nameof(language.LanguageCulture)); - LanguageId = language.Id; - LanguageCulture = language.LanguageCulture; + LanguageId = language.Id; + LanguageCulture = language.LanguageCulture; - return (this as TQuery); - } + return (this as TQuery); + } - public TQuery WithCurrency(Currency currency) - { - Guard.NotNull(currency, nameof(currency)); - Guard.NotEmpty(currency.CurrencyCode, nameof(currency.CurrencyCode)); + public TQuery WithCurrency(Currency currency) + { + Guard.NotNull(currency, nameof(currency)); + Guard.NotEmpty(currency.CurrencyCode, nameof(currency.CurrencyCode)); - CurrencyCode = currency.CurrencyCode; + CurrencyCode = currency.CurrencyCode; - return (this as TQuery); - } + return (this as TQuery); + } - public TQuery Slice(int skip, int take) - { - Guard.NotNegative(skip, nameof(skip)); - Guard.NotNegative(take, nameof(take)); + public TQuery Slice(int skip, int take) + { + Guard.NotNegative(skip, nameof(skip)); + Guard.NotNegative(take, nameof(take)); - Skip = skip; - Take = take; + Skip = skip; + Take = take; - return (this as TQuery); - } + return (this as TQuery); + } - public TQuery CheckSpelling(int maxSuggestions, int minQueryLength = 4, int maxHitCount = 3) - { - Guard.IsPositive(minQueryLength, nameof(minQueryLength)); - Guard.IsPositive(maxHitCount, nameof(maxHitCount)); + public TQuery CheckSpelling(int maxSuggestions, int minQueryLength = 4, int maxHitCount = 3) + { + Guard.IsPositive(minQueryLength, nameof(minQueryLength)); + Guard.IsPositive(maxHitCount, nameof(maxHitCount)); if (maxSuggestions > 0) { @@ -178,117 +169,117 @@ public TQuery CheckSpelling(int maxSuggestions, int minQueryLength = 4, int maxH ResultFlags &= ~SearchResultFlags.WithSuggestions; } - SpellCheckerMaxSuggestions = Math.Max(maxSuggestions, 0); - SpellCheckerMinQueryLength = minQueryLength; - SpellCheckerMaxHitCount = maxHitCount; + SpellCheckerMaxSuggestions = Math.Max(maxSuggestions, 0); + SpellCheckerMinQueryLength = minQueryLength; + SpellCheckerMaxHitCount = maxHitCount; + + return (this as TQuery); + } - return (this as TQuery); - } + public TQuery WithFilter(ISearchFilter filter) + { + Guard.NotNull(filter, nameof(filter)); - public TQuery WithFilter(ISearchFilter filter) - { - Guard.NotNull(filter, nameof(filter)); + Filters.Add(filter); - Filters.Add(filter); + return (this as TQuery); + } - return (this as TQuery); - } + public TQuery SortBy(SearchSort sort) + { + Guard.NotNull(sort, nameof(sort)); - public TQuery SortBy(SearchSort sort) - { - Guard.NotNull(sort, nameof(sort)); + Sorting.Add(sort); - Sorting.Add(sort); + return (this as TQuery); + } - return (this as TQuery); - } + public TQuery BuildHits(bool build) + { + if (build) + { + ResultFlags = ResultFlags | SearchResultFlags.WithHits; + } + else + { + ResultFlags &= ~SearchResultFlags.WithHits; + } - public TQuery BuildHits(bool build) - { - if (build) - { - ResultFlags = ResultFlags | SearchResultFlags.WithHits; - } - else - { - ResultFlags &= ~SearchResultFlags.WithHits; - } + return (this as TQuery); + } - return (this as TQuery); - } + public TQuery BuildFacetMap(bool build) + { + if (build) + { + ResultFlags = ResultFlags | SearchResultFlags.WithFacets; + } + else + { + ResultFlags &= ~SearchResultFlags.WithFacets; + } - public TQuery BuildFacetMap(bool build) - { - if (build) - { - ResultFlags = ResultFlags | SearchResultFlags.WithFacets; - } - else - { - ResultFlags &= ~SearchResultFlags.WithFacets; - } - - return (this as TQuery); - } + return (this as TQuery); + } - public TQuery WithFacet(FacetDescriptor facetDescription) - { - Guard.NotNull(facetDescription, nameof(facetDescription)); + public TQuery WithFacet(FacetDescriptor facetDescription) + { + Guard.NotNull(facetDescription, nameof(facetDescription)); - if (_facetDescriptors.ContainsKey(facetDescription.Key)) - { - throw new InvalidOperationException("A facet description object with the same key has already been added. Key: {0}".FormatInvariant(facetDescription.Key)); - } + if (_facetDescriptors.ContainsKey(facetDescription.Key)) + { + throw new InvalidOperationException("A facet description object with the same key has already been added. Key: {0}".FormatInvariant(facetDescription.Key)); + } - _facetDescriptors.Add(facetDescription.Key, facetDescription); + _facetDescriptors.Add(facetDescription.Key, facetDescription); - return (this as TQuery); - } + return (this as TQuery); + } - public TQuery OriginatesFrom(string origin) - { - Guard.NotEmpty(origin, nameof(origin)); + public TQuery OriginatesFrom(string origin) + { + Guard.NotEmpty(origin, nameof(origin)); - Origin = origin; + Origin = origin; - return (this as TQuery); - } + return (this as TQuery); + } - #endregion + #endregion - public override string ToString() - { + public override string ToString() + { var psb = PooledStringBuilder.Rent(); var sb = (StringBuilder)psb; if (Term.HasValue()) - { - var fields = (Fields != null && Fields.Length > 0 ? string.Join(", ", Fields) : "".NaIfEmpty()); + { + var fields = (Fields != null && Fields.Length > 0 ? string.Join(", ", Fields) : "".NaIfEmpty()); - sb.AppendFormat("'{0}' in {1}", Term, fields); + sb.AppendFormat("'{0}' in {1}", Term, fields); - var parameters = string.Join(" ", EscapeTerm ? "escape" : "", IsFuzzySearch ? "fuzzy" : Mode.ToString()).TrimSafe(); + var parameters = string.Join(" ", EscapeTerm ? "escape" : "", IsFuzzySearch ? "fuzzy" : Mode.ToString()).TrimSafe(); - if (parameters.HasValue()) - { - sb.AppendFormat(" ({0})", parameters); - } - } + if (parameters.HasValue()) + { + sb.AppendFormat(" ({0})", parameters); + } + } - foreach (var filter in Filters) - { - if (sb.Length > 0) - { - sb.Append(" "); - } + foreach (var filter in Filters) + { + if (sb.Length > 0) + { + sb.Append(" "); + } - sb.Append(filter.ToString()); - } + sb.Append(filter.ToString()); + } - return psb.ToStringAndReturn(); - } + return psb.ToStringAndReturn(); + } #region Utilities diff --git a/src/Libraries/SmartStore.Core/Search/SearchSort.cs b/src/Libraries/SmartStore.Core/Search/SearchSort.cs index 423ad608db..388fd97d3f 100644 --- a/src/Libraries/SmartStore.Core/Search/SearchSort.cs +++ b/src/Libraries/SmartStore.Core/Search/SearchSort.cs @@ -1,82 +1,82 @@ namespace SmartStore.Core.Search { - public class SearchSort - { - private SearchSort(string name, IndexTypeCode typeCode, bool descending) - { - FieldName = name; - TypeCode = typeCode; - Descending = descending; - } + public class SearchSort + { + private SearchSort(string name, IndexTypeCode typeCode, bool descending) + { + FieldName = name; + TypeCode = typeCode; + Descending = descending; + } - public string FieldName - { - get; - private set; - } + public string FieldName + { + get; + private set; + } - /// - /// In this context, actually means Score - /// - public IndexTypeCode TypeCode - { - get; - private set; - } + /// + /// In this context, actually means Score + /// + public IndexTypeCode TypeCode + { + get; + private set; + } - public bool Descending - { - get; - private set; - } + public bool Descending + { + get; + private set; + } - public override string ToString() - { - if (FieldName.IsEmpty()) - { - return "RELEVANCE"; - } - else - { - return "{0} {1}".FormatInvariant(FieldName, Descending ? "DESC" : "ASC"); - } - } + public override string ToString() + { + if (FieldName.IsEmpty()) + { + return "RELEVANCE"; + } + else + { + return "{0} {1}".FormatInvariant(FieldName, Descending ? "DESC" : "ASC"); + } + } - public static SearchSort ByRelevance(bool descending = false) - { - return new SearchSort(null, IndexTypeCode.Empty, descending); - } + public static SearchSort ByRelevance(bool descending = false) + { + return new SearchSort(null, IndexTypeCode.Empty, descending); + } - public static SearchSort ByStringField(string fieldName, bool descending = false) - { - return ByField(fieldName, IndexTypeCode.String, descending); - } + public static SearchSort ByStringField(string fieldName, bool descending = false) + { + return ByField(fieldName, IndexTypeCode.String, descending); + } - public static SearchSort ByIntField(string fieldName, bool descending = false) - { - return ByField(fieldName, IndexTypeCode.Int32, descending); - } + public static SearchSort ByIntField(string fieldName, bool descending = false) + { + return ByField(fieldName, IndexTypeCode.Int32, descending); + } - public static SearchSort ByBooleanField(string fieldName, bool descending = false) - { - return ByField(fieldName, IndexTypeCode.Boolean, descending); - } + public static SearchSort ByBooleanField(string fieldName, bool descending = false) + { + return ByField(fieldName, IndexTypeCode.Boolean, descending); + } - public static SearchSort ByDoubleField(string fieldName, bool descending = false) - { - return ByField(fieldName, IndexTypeCode.Double, descending); - } + public static SearchSort ByDoubleField(string fieldName, bool descending = false) + { + return ByField(fieldName, IndexTypeCode.Double, descending); + } - public static SearchSort ByDateTimeField(string fieldName, bool descending = false) - { - return ByField(fieldName, IndexTypeCode.DateTime, descending); - } + public static SearchSort ByDateTimeField(string fieldName, bool descending = false) + { + return ByField(fieldName, IndexTypeCode.DateTime, descending); + } - private static SearchSort ByField(string fieldName, IndexTypeCode typeCode, bool descending = false) - { - Guard.NotEmpty(fieldName, nameof(fieldName)); + private static SearchSort ByField(string fieldName, IndexTypeCode typeCode, bool descending = false) + { + Guard.NotEmpty(fieldName, nameof(fieldName)); - return new SearchSort(fieldName, typeCode, descending); - } - } + return new SearchSort(fieldName, typeCode, descending); + } + } } diff --git a/src/Libraries/SmartStore.Core/Search/Settings/ForumSearchSettings.cs b/src/Libraries/SmartStore.Core/Search/Settings/ForumSearchSettings.cs index b213e2e56b..8831ea2c2d 100644 --- a/src/Libraries/SmartStore.Core/Search/Settings/ForumSearchSettings.cs +++ b/src/Libraries/SmartStore.Core/Search/Settings/ForumSearchSettings.cs @@ -5,15 +5,15 @@ namespace SmartStore.Core.Search { public class ForumSearchSettings : ISettings - { - public ForumSearchSettings() - { - SearchMode = SearchMode.Contains; - SearchFields = new List { "username", "text" }; + { + public ForumSearchSettings() + { + SearchMode = SearchMode.Contains; + SearchFields = new List { "username", "text" }; DefaultSortOrder = ForumTopicSorting.Relevance; InstantSearchEnabled = true; - InstantSearchNumberOfHits = 10; - InstantSearchTermMinLength = 2; + InstantSearchNumberOfHits = 10; + InstantSearchTermMinLength = 2; FilterMinHitCount = 1; FilterMaxChoicesCount = 20; @@ -22,15 +22,15 @@ public ForumSearchSettings() DateDisplayOrder = 3; } - /// - /// Gets or sets the search mode. - /// - public SearchMode SearchMode { get; set; } + /// + /// Gets or sets the search mode. + /// + public SearchMode SearchMode { get; set; } - /// - /// Gets or sets name of fields to be searched. The name field is always searched. - /// - public List SearchFields { get; set; } + /// + /// Gets or sets name of fields to be searched. The name field is always searched. + /// + public List SearchFields { get; set; } /// /// Gets or sets the default sort order in search results. @@ -42,15 +42,15 @@ public ForumSearchSettings() /// public bool InstantSearchEnabled { get; set; } - /// - /// Gets or sets the number of hits to return when using "instant-search" feature. - /// - public int InstantSearchNumberOfHits { get; set; } + /// + /// Gets or sets the number of hits to return when using "instant-search" feature. + /// + public int InstantSearchNumberOfHits { get; set; } - /// - /// Gets or sets a minimum instant-search term length. - /// - public int InstantSearchTermMinLength { get; set; } + /// + /// Gets or sets a minimum instant-search term length. + /// + public int InstantSearchTermMinLength { get; set; } /// /// Gets or sets the minimum hit count for a filter value. Values with a lower hit count are not displayed. diff --git a/src/Libraries/SmartStore.Core/Search/Settings/SearchSettings.cs b/src/Libraries/SmartStore.Core/Search/Settings/SearchSettings.cs index 5a578b8383..9a581da895 100644 --- a/src/Libraries/SmartStore.Core/Search/Settings/SearchSettings.cs +++ b/src/Libraries/SmartStore.Core/Search/Settings/SearchSettings.cs @@ -4,67 +4,67 @@ namespace SmartStore.Core.Search { - public class SearchSettings : ISettings - { - public SearchSettings() - { - SearchMode = SearchMode.Contains; - SearchFields = new List { "sku", "shortdescription", "tagname", "manufacturer", "category" }; - InstantSearchEnabled = true; - ShowProductImagesInInstantSearch = true; - InstantSearchNumberOfProducts = 10; - InstantSearchTermMinLength = 2; - FilterMinHitCount = 1; - FilterMaxChoicesCount = 20; + public class SearchSettings : ISettings + { + public SearchSettings() + { + SearchMode = SearchMode.Contains; + SearchFields = new List { "sku", "shortdescription", "tagname", "manufacturer", "category" }; + InstantSearchEnabled = true; + ShowProductImagesInInstantSearch = true; + InstantSearchNumberOfProducts = 10; + InstantSearchTermMinLength = 2; + FilterMinHitCount = 1; + FilterMaxChoicesCount = 20; DefaultSortOrder = ProductSortingEnum.Relevance; - BrandDisplayOrder = 1; - PriceDisplayOrder = 2; - RatingDisplayOrder = 3; - DeliveryTimeDisplayOrder = 4; - AvailabilityDisplayOrder = 5; - NewArrivalsDisplayOrder = 6; - } - - /// - /// Gets or sets the search mode - /// - public SearchMode SearchMode { get; set; } - - /// - /// Gets or sets name of fields to be searched. The name field is always searched. - /// - public List SearchFields { get; set; } - - /// - /// Gets or sets a value indicating whether instant-search is enabled - /// - public bool InstantSearchEnabled { get; set; } - - /// - /// Gets or sets a value indicating whether to show product images in instant-search result - /// - public bool ShowProductImagesInInstantSearch { get; set; } - - /// - /// Gets or sets the number of products to return when using "instant-search" feature - /// - public int InstantSearchNumberOfProducts { get; set; } - - /// - /// Gets or sets a minimum instant-search term length - /// - public int InstantSearchTermMinLength { get; set; } - - /// - /// Gets or sets the minimum hit count for a filter value. Values with a lower hit count are not displayed. - /// - public int FilterMinHitCount { get; set; } - - /// - /// Gets or sets the maximum number of filter values to be displayed. - /// - public int FilterMaxChoicesCount { get; set; } + BrandDisplayOrder = 1; + PriceDisplayOrder = 2; + RatingDisplayOrder = 3; + DeliveryTimeDisplayOrder = 4; + AvailabilityDisplayOrder = 5; + NewArrivalsDisplayOrder = 6; + } + + /// + /// Gets or sets the search mode + /// + public SearchMode SearchMode { get; set; } + + /// + /// Gets or sets name of fields to be searched. The name field is always searched. + /// + public List SearchFields { get; set; } + + /// + /// Gets or sets a value indicating whether instant-search is enabled + /// + public bool InstantSearchEnabled { get; set; } + + /// + /// Gets or sets a value indicating whether to show product images in instant-search result + /// + public bool ShowProductImagesInInstantSearch { get; set; } + + /// + /// Gets or sets the number of products to return when using "instant-search" feature + /// + public int InstantSearchNumberOfProducts { get; set; } + + /// + /// Gets or sets a minimum instant-search term length + /// + public int InstantSearchTermMinLength { get; set; } + + /// + /// Gets or sets the minimum hit count for a filter value. Values with a lower hit count are not displayed. + /// + public int FilterMinHitCount { get; set; } + + /// + /// Gets or sets the maximum number of filter values to be displayed. + /// + public int FilterMaxChoicesCount { get; set; } /// /// Gets or sets the default sort order in search results @@ -76,34 +76,34 @@ public SearchSettings() /// public bool UseCatalogSearchInBackend { get; set; } - /// - /// Specifies whether the product page should be opened directly if the search term matches a SKU, MPN or GTIN. - /// - public bool SearchProductByIdentificationNumber { get; set; } - - // TBD: what about area specific searchin setting (product, blog, etc.) - - #region Common facet settings - - /// - /// Gets or sets the a value indicating whether to include or exclude not available products by default. - /// - public bool IncludeNotAvailable { get; set; } + /// + /// Specifies whether the product page should be opened directly if the search term matches a SKU, MPN or GTIN. + /// + public bool SearchProductByIdentificationNumber { get; set; } - public bool BrandDisabled { get; set; } - public bool PriceDisabled { get; set; } - public bool RatingDisabled { get; set; } - public bool DeliveryTimeDisabled { get; set; } - public bool AvailabilityDisabled { get; set; } - public bool NewArrivalsDisabled { get; set; } + // TBD: what about area specific searchin setting (product, blog, etc.) - public int BrandDisplayOrder { get; set; } - public int PriceDisplayOrder { get; set; } - public int RatingDisplayOrder { get; set; } - public int DeliveryTimeDisplayOrder { get; set; } - public int AvailabilityDisplayOrder { get; set; } - public int NewArrivalsDisplayOrder { get; set; } + #region Common facet settings - #endregion - } + /// + /// Gets or sets the a value indicating whether to include or exclude not available products by default. + /// + public bool IncludeNotAvailable { get; set; } + + public bool BrandDisabled { get; set; } + public bool PriceDisabled { get; set; } + public bool RatingDisabled { get; set; } + public bool DeliveryTimeDisabled { get; set; } + public bool AvailabilityDisabled { get; set; } + public bool NewArrivalsDisabled { get; set; } + + public int BrandDisplayOrder { get; set; } + public int PriceDisplayOrder { get; set; } + public int RatingDisplayOrder { get; set; } + public int DeliveryTimeDisplayOrder { get; set; } + public int AvailabilityDisplayOrder { get; set; } + public int NewArrivalsDisplayOrder { get; set; } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/Security/IPermissionService.cs b/src/Libraries/SmartStore.Core/Security/IPermissionService.cs index 5b472a1e4e..4acfba9ad5 100644 --- a/src/Libraries/SmartStore.Core/Security/IPermissionService.cs +++ b/src/Libraries/SmartStore.Core/Security/IPermissionService.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using SmartStore.Collections; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Security; diff --git a/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs b/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs index 201ee0a082..48d48e2d78 100644 --- a/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs +++ b/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs @@ -7,32 +7,32 @@ namespace SmartStore.Core { public class SmartStoreIdentity : ClaimsIdentity - { - [SecuritySafeCritical] - public SmartStoreIdentity(int customerId, string name, string type) - : base(new GenericIdentity(name, type)) - { - CustomerId = customerId; - } + { + [SecuritySafeCritical] + public SmartStoreIdentity(int customerId, string name, string type) + : base(new GenericIdentity(name, type)) + { + CustomerId = customerId; + } - public int CustomerId { get; private set; } + public int CustomerId { get; private set; } - public override bool IsAuthenticated { get { return CustomerId != 0; } } - } + public override bool IsAuthenticated => CustomerId != 0; + } - public class SmartStorePrincipal : IPrincipal - { - public SmartStorePrincipal(Customer customer, string type) - { - Identity = new SmartStoreIdentity(customer.Id, customer.Username.NullEmpty() ?? customer.Email, type); - } + public class SmartStorePrincipal : IPrincipal + { + public SmartStorePrincipal(Customer customer, string type) + { + Identity = new SmartStoreIdentity(customer.Id, customer.Username.NullEmpty() ?? customer.Email, type); + } - public bool IsInRole(string role) - { - return Identity != null && Identity.IsAuthenticated && role.HasValue() && Roles.IsUserInRole(Identity.Name, role); - } + public bool IsInRole(string role) + { + return Identity != null && Identity.IsAuthenticated && role.HasValue() && Roles.IsUserInRole(Identity.Name, role); + } - public IIdentity Identity { get; private set; } - } + public IIdentity Identity { get; private set; } + } } diff --git a/src/Libraries/SmartStore.Core/SmartException.cs b/src/Libraries/SmartStore.Core/SmartException.cs index 0b620fa609..d3137ece3f 100644 --- a/src/Libraries/SmartStore.Core/SmartException.cs +++ b/src/Libraries/SmartStore.Core/SmartException.cs @@ -31,9 +31,9 @@ public SmartException(string message) /// The exception message format. /// The exception message arguments. public SmartException(string messageFormat, params object[] args) - : base(string.Format(messageFormat, args)) - { - } + : base(string.Format(messageFormat, args)) + { + } /// /// Initializes a new instance of the Exception class with serialized data. diff --git a/src/Libraries/SmartStore.Core/SmartStoreVersion.cs b/src/Libraries/SmartStore.Core/SmartStoreVersion.cs index 07d57f98ae..9a2b475c10 100644 --- a/src/Libraries/SmartStore.Core/SmartStoreVersion.cs +++ b/src/Libraries/SmartStore.Core/SmartStoreVersion.cs @@ -1,35 +1,34 @@ using System; -using System.Linq; using System.Collections.Generic; +using System.Linq; using System.Reflection; -using SmartStore; namespace SmartStore.Core { - public class HelpTopic - { - public static HelpTopic CronExpressions = new HelpTopic("cron", "Managing+Scheduled+Tasks#ManagingScheduledTasks-Cron", "Geplante+Aufgaben+verwalten#GeplanteAufgabenverwalten-CronAusdruck"); - - public HelpTopic(string name, string enPath, string dePath) - { - Guard.NotEmpty(name, nameof(name)); - Guard.NotEmpty(enPath, nameof(enPath)); - Guard.NotEmpty(dePath, nameof(dePath)); - - Name = name; - EnPath = enPath; - DePath = dePath; - } - - public string Name { get; private set; } - public string EnPath { get; private set; } - public string DePath { get; private set; } - } - - public static class SmartStoreVersion + public class HelpTopic + { + public static HelpTopic CronExpressions = new HelpTopic("cron", "Managing+Scheduled+Tasks#ManagingScheduledTasks-Cron", "Geplante+Aufgaben+verwalten#GeplanteAufgabenverwalten-CronAusdruck"); + + public HelpTopic(string name, string enPath, string dePath) + { + Guard.NotEmpty(name, nameof(name)); + Guard.NotEmpty(enPath, nameof(enPath)); + Guard.NotEmpty(dePath, nameof(dePath)); + + Name = name; + EnPath = enPath; + DePath = dePath; + } + + public string Name { get; private set; } + public string EnPath { get; private set; } + public string DePath { get; private set; } + } + + public static class SmartStoreVersion { private static readonly Version s_infoVersion = new Version("1.0.0.0"); - private static readonly List s_breakingChangesHistory = new List + private static readonly List s_breakingChangesHistory = new List { // IMPORTANT: Add app versions from low to high // NOTE: do not specify build & revision unless you have good reasons for it. @@ -38,12 +37,12 @@ public static class SmartStoreVersion new Version("1.2"), new Version("1.2.1"), new Version("2.0"), - new Version("2.1"), - new Version("2.2"), + new Version("2.1"), + new Version("2.2"), new Version("2.5"), - new Version("3.0"), - new Version("3.1"), - new Version("3.1.5"), + new Version("3.0"), + new Version("3.1"), + new Version("3.1.5"), new Version("3.2"), new Version("3.2.1"), new Version("3.2.2"), @@ -51,9 +50,9 @@ public static class SmartStoreVersion new Version("4.0.1") }; - private const string HELP_BASEURL = "https://docs.smartstore.com/display/"; + private const string HELP_BASEURL = "https://docs.smartstore.com/display/"; - static SmartStoreVersion() + static SmartStoreVersion() { s_breakingChangesHistory.Reverse(); @@ -62,65 +61,47 @@ static SmartStoreVersion() if (infoVersionAttr != null) { s_infoVersion = new Version(infoVersionAttr.InformationalVersion); - } + } } /// /// Gets the app version /// - public static string CurrentVersion - { - get - { - return "{0}.{1}".FormatInvariant(s_infoVersion.Major, s_infoVersion.Minor); - } - } + public static string CurrentVersion => "{0}.{1}".FormatInvariant(s_infoVersion.Major, s_infoVersion.Minor); /// /// Gets the app full version /// - public static string CurrentFullVersion + public static string CurrentFullVersion => s_infoVersion.ToString(); + + public static Version Version => s_infoVersion; + + public static string GenerateHelpUrl(string languageCode, HelpTopic topic) { - get - { - return s_infoVersion.ToString(); - } + Guard.NotEmpty(languageCode, nameof(languageCode)); + Guard.NotNull(topic, nameof(topic)); + + var path = languageCode.IsCaseInsensitiveEqual("de") ? topic.DePath : topic.EnPath; + return GenerateHelpUrl(languageCode, path); } - public static Version Version + public static string GenerateHelpUrl(string languageCode, string path) { - get - { - return s_infoVersion; - } + Guard.NotEmpty(languageCode, nameof(languageCode)); + + return String.Concat( + HELP_BASEURL, + GetUserGuideSpaceKey(languageCode), + "/", + path.EmptyNull().Trim().TrimStart('/', '\\')); } - public static string GenerateHelpUrl(string languageCode, HelpTopic topic) - { - Guard.NotEmpty(languageCode, nameof(languageCode)); - Guard.NotNull(topic, nameof(topic)); - - var path = languageCode.IsCaseInsensitiveEqual("de") ? topic.DePath : topic.EnPath; - return GenerateHelpUrl(languageCode, path); - } - - public static string GenerateHelpUrl(string languageCode, string path) - { - Guard.NotEmpty(languageCode, nameof(languageCode)); - - return String.Concat( - HELP_BASEURL, - GetUserGuideSpaceKey(languageCode), - "/", - path.EmptyNull().Trim().TrimStart('/', '\\')); - } - - public static string GetUserGuideSpaceKey(string languageCode) - { - return languageCode.IsCaseInsensitiveEqual("de") - ? "SDDE40" - : "SMNET40"; - } + public static string GetUserGuideSpaceKey(string languageCode) + { + return languageCode.IsCaseInsensitiveEqual("de") + ? "SDDE40" + : "SMNET40"; + } /// /// Gets a list of Smartstore versions in which breaking changes occured, @@ -130,12 +111,6 @@ public static string GetUserGuideSpaceKey(string languageCode) /// A plugin's MinAppVersion is checked against this list to assume /// it's compatibility with the current app version. /// - internal static IEnumerable BreakingChangesHistory - { - get - { - return s_breakingChangesHistory.AsEnumerable(); - } - } + internal static IEnumerable BreakingChangesHistory => s_breakingChangesHistory.AsEnumerable(); } } diff --git a/src/Libraries/SmartStore.Core/Templating/DefaultTemplateManager.cs b/src/Libraries/SmartStore.Core/Templating/DefaultTemplateManager.cs index 8395d04364..482d2ea87c 100644 --- a/src/Libraries/SmartStore.Core/Templating/DefaultTemplateManager.cs +++ b/src/Libraries/SmartStore.Core/Templating/DefaultTemplateManager.cs @@ -4,66 +4,66 @@ namespace SmartStore.Templating { - public partial class DefaultTemplateManager : ITemplateManager - { - private readonly ConcurrentDictionary _templates; - private readonly ITemplateEngine _engine; + public partial class DefaultTemplateManager : ITemplateManager + { + private readonly ConcurrentDictionary _templates; + private readonly ITemplateEngine _engine; - public DefaultTemplateManager(ITemplateEngine engine) - { - _templates = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); - _engine = engine; - } + public DefaultTemplateManager(ITemplateEngine engine) + { + _templates = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); + _engine = engine; + } - public IReadOnlyDictionary All() - { - return _templates; - } + public IReadOnlyDictionary All() + { + return _templates; + } - public bool Contains(string name) - { - Guard.NotEmpty(name, nameof(name)); + public bool Contains(string name) + { + Guard.NotEmpty(name, nameof(name)); - return _templates.ContainsKey(name); - } + return _templates.ContainsKey(name); + } - public ITemplate Get(string name) - { - Guard.NotEmpty(name, nameof(name)); + public ITemplate Get(string name) + { + Guard.NotEmpty(name, nameof(name)); - _templates.TryGetValue(name, out var template); - return template; - } + _templates.TryGetValue(name, out var template); + return template; + } - public void Put(string name, ITemplate template) - { - Guard.NotEmpty(name, nameof(name)); - Guard.NotNull(template, nameof(template)); + public void Put(string name, ITemplate template) + { + Guard.NotEmpty(name, nameof(name)); + Guard.NotNull(template, nameof(template)); - _templates[name] = template; - } + _templates[name] = template; + } - public ITemplate GetOrAdd(string name, Func sourceFactory) - { - Guard.NotEmpty(name, nameof(name)); - Guard.NotNull(sourceFactory, nameof(sourceFactory)); + public ITemplate GetOrAdd(string name, Func sourceFactory) + { + Guard.NotEmpty(name, nameof(name)); + Guard.NotNull(sourceFactory, nameof(sourceFactory)); - return _templates.GetOrAdd(name, key => - { - return _engine.Compile(sourceFactory()); - }); - } + return _templates.GetOrAdd(name, key => + { + return _engine.Compile(sourceFactory()); + }); + } - public bool TryRemove(string name, out ITemplate template) - { - Guard.NotEmpty(name, nameof(name)); + public bool TryRemove(string name, out ITemplate template) + { + Guard.NotEmpty(name, nameof(name)); - return _templates.TryRemove(name, out template); - } + return _templates.TryRemove(name, out template); + } - public void Clear() - { - _templates.Clear(); - } - } + public void Clear() + { + _templates.Clear(); + } + } } diff --git a/src/Libraries/SmartStore.Core/Templating/ITemplate.cs b/src/Libraries/SmartStore.Core/Templating/ITemplate.cs index 3014ba0e20..c1a796f060 100644 --- a/src/Libraries/SmartStore.Core/Templating/ITemplate.cs +++ b/src/Libraries/SmartStore.Core/Templating/ITemplate.cs @@ -2,26 +2,26 @@ namespace SmartStore.Templating { - /// - /// A compiled template intended to be stored in a singleton storage. - /// - public interface ITemplate - { - /// - /// Gets the original template source - /// - string Source { get; } + /// + /// A compiled template intended to be stored in a singleton storage. + /// + public interface ITemplate + { + /// + /// Gets the original template source + /// + string Source { get; } - /// - /// Renders the template in - /// - /// - /// The model object which contains the data for the template. - /// Can be a subclass of , - /// a plain class object, or an anonymous type. - /// - /// Provider to use for formatting numbers, dates, money etc. - /// The processed template result - string Render(object model, IFormatProvider formatProvider); - } + /// + /// Renders the template in + /// + /// + /// The model object which contains the data for the template. + /// Can be a subclass of , + /// a plain class object, or an anonymous type. + /// + /// Provider to use for formatting numbers, dates, money etc. + /// The processed template result + string Render(object model, IFormatProvider formatProvider); + } } diff --git a/src/Libraries/SmartStore.Core/Templating/ITemplateEngine.cs b/src/Libraries/SmartStore.Core/Templating/ITemplateEngine.cs index 56e5868375..c6f6092cbb 100644 --- a/src/Libraries/SmartStore.Core/Templating/ITemplateEngine.cs +++ b/src/Libraries/SmartStore.Core/Templating/ITemplateEngine.cs @@ -4,50 +4,50 @@ namespace SmartStore.Templating { - /// - /// Represents a model object for testing purposes. A test model - /// becomes necessary when the database does not contain any data - /// for the previews/tested model. - /// - public interface ITestModel - { - /// - /// The name of the model to use as hash key, e.g. Product, Order, Customer etc. - /// - string ModelName { get; } - } + /// + /// Represents a model object for testing purposes. A test model + /// becomes necessary when the database does not contain any data + /// for the previews/tested model. + /// + public interface ITestModel + { + /// + /// The name of the model to use as hash key, e.g. Product, Order, Customer etc. + /// + string ModelName { get; } + } - /// - /// Responsible for compiling and rendering the templates - /// - public interface ITemplateEngine - { - /// - /// Compiles a template for faster rendering - /// - /// The template source - /// Compiled template - ITemplate Compile(string source); + /// + /// Responsible for compiling and rendering the templates + /// + public interface ITemplateEngine + { + /// + /// Compiles a template for faster rendering + /// + /// The template source + /// Compiled template + ITemplate Compile(string source); - /// - /// Directly renders a template source - /// - /// The template source - /// - /// The model object which contains the data for the template. - /// Can be a subclass of , - /// a plain class object, or an anonymous type. - /// - /// Provider to use for formatting numbers, dates, money etc. - /// The processed template result - string Render(string source, object model, IFormatProvider formatProvider); + /// + /// Directly renders a template source + /// + /// The template source + /// + /// The model object which contains the data for the template. + /// Can be a subclass of , + /// a plain class object, or an anonymous type. + /// + /// Provider to use for formatting numbers, dates, money etc. + /// The processed template result + string Render(string source, object model, IFormatProvider formatProvider); - /// - /// Creates a test model for the passed entity to be used during preview and test. - /// - /// The entity to create a test model for. - /// The model prefix - /// An object which implements and contains some test data for the declared properties of - ITestModel CreateTestModelFor(BaseEntity entity, string modelPrefix); - } + /// + /// Creates a test model for the passed entity to be used during preview and test. + /// + /// The entity to create a test model for. + /// The model prefix + /// An object which implements and contains some test data for the declared properties of + ITestModel CreateTestModelFor(BaseEntity entity, string modelPrefix); + } } diff --git a/src/Libraries/SmartStore.Core/Templating/ITemplateManager.cs b/src/Libraries/SmartStore.Core/Templating/ITemplateManager.cs index affe05aeb1..80e75d44c2 100644 --- a/src/Libraries/SmartStore.Core/Templating/ITemplateManager.cs +++ b/src/Libraries/SmartStore.Core/Templating/ITemplateManager.cs @@ -3,58 +3,58 @@ namespace SmartStore.Templating { - /// - /// Responsible for managing all compiled templates - /// - public interface ITemplateManager - { - /// - /// Gets all compiled templates - /// - /// - IReadOnlyDictionary All(); + /// + /// Responsible for managing all compiled templates + /// + public interface ITemplateManager + { + /// + /// Gets all compiled templates + /// + /// + IReadOnlyDictionary All(); - /// - /// Checks whether a compiled template exists in the storage - /// - /// Template name - /// true when the template exists - bool Contains(string name); + /// + /// Checks whether a compiled template exists in the storage + /// + /// Template name + /// true when the template exists + bool Contains(string name); - /// - /// Gets a compiled template matching the passed name - /// - /// Template name to get. - /// An instance of or null - ITemplate Get(string name); + /// + /// Gets a compiled template matching the passed name + /// + /// Template name to get. + /// An instance of or null + ITemplate Get(string name); - /// - /// Saves a compiled template in the storage. Any existing template gets overridden. - /// - /// The name to use as template key - /// The compiled template - void Put(string name, ITemplate template); + /// + /// Saves a compiled template in the storage. Any existing template gets overridden. + /// + /// The name to use as template key + /// The compiled template + void Put(string name, ITemplate template); - /// - /// Either gets a template with the passed name, or compiles and stores - /// a template if it does not exist yet. - /// - /// Template name - /// The factory used to generate/obtain the template source. - /// The compiled template - ITemplate GetOrAdd(string name, Func sourceFactory); + /// + /// Either gets a template with the passed name, or compiles and stores + /// a template if it does not exist yet. + /// + /// Template name + /// The factory used to generate/obtain the template source. + /// The compiled template + ITemplate GetOrAdd(string name, Func sourceFactory); - /// - /// Attempts to remove and return the compiled template that has the specified name. - /// - /// The name of the template to remove and return. - /// The removed template or null - /// true if the template was removed, false otherwise. - bool TryRemove(string name, out ITemplate template); + /// + /// Attempts to remove and return the compiled template that has the specified name. + /// + /// The name of the template to remove and return. + /// The removed template or null + /// true if the template was removed, false otherwise. + bool TryRemove(string name, out ITemplate template); - /// - /// Removes all compiled templates from the storage. - /// - void Clear(); - } + /// + /// Removes all compiled templates from the storage. + /// + void Clear(); + } } diff --git a/src/Libraries/SmartStore.Core/Templating/NullTemplateEngine.cs b/src/Libraries/SmartStore.Core/Templating/NullTemplateEngine.cs index 04f166dbf9..ec3a7d99b9 100644 --- a/src/Libraries/SmartStore.Core/Templating/NullTemplateEngine.cs +++ b/src/Libraries/SmartStore.Core/Templating/NullTemplateEngine.cs @@ -3,47 +3,47 @@ namespace SmartStore.Templating { - public class NullTemplateEngine : ITemplateEngine - { - private readonly static ITemplateEngine _instance = new NullTemplateEngine(); - - public static ITemplateEngine Instance => _instance; - - public ITemplate Compile(string template) - { - return new NullTemplate(template); - } - - public string Render(string source, object data, IFormatProvider formatProvider) - { - return source; - } - - public ITestModel CreateTestModelFor(BaseEntity entity, string modelPrefix) - { - return new NullTestModel(); - } - - internal class NullTestModel : ITestModel - { - public string ModelName => "TestModel"; - } - - internal class NullTemplate : ITemplate - { - private readonly string _source; - - public NullTemplate(string source) - { - _source = source; - } - - public string Source => _source; - - public string Render(object data, IFormatProvider formatProvider) - { - return _source; - } - } - } + public class NullTemplateEngine : ITemplateEngine + { + private readonly static ITemplateEngine _instance = new NullTemplateEngine(); + + public static ITemplateEngine Instance => _instance; + + public ITemplate Compile(string template) + { + return new NullTemplate(template); + } + + public string Render(string source, object data, IFormatProvider formatProvider) + { + return source; + } + + public ITestModel CreateTestModelFor(BaseEntity entity, string modelPrefix) + { + return new NullTestModel(); + } + + internal class NullTestModel : ITestModel + { + public string ModelName => "TestModel"; + } + + internal class NullTemplate : ITemplate + { + private readonly string _source; + + public NullTemplate(string source) + { + _source = source; + } + + public string Source => _source; + + public string Render(object data, IFormatProvider formatProvider) + { + return _source; + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Themes/DefaultThemeRegistry.cs b/src/Libraries/SmartStore.Core/Themes/DefaultThemeRegistry.cs index 2776b10b5f..a4ee39dfb7 100644 --- a/src/Libraries/SmartStore.Core/Themes/DefaultThemeRegistry.cs +++ b/src/Libraries/SmartStore.Core/Themes/DefaultThemeRegistry.cs @@ -8,7 +8,6 @@ using System.Threading; using SmartStore.Collections; using SmartStore.Core.Events; -using SmartStore.Core.Infrastructure.DependencyManagement; using SmartStore.Core.Logging; using SmartStore.Utilities; @@ -16,519 +15,519 @@ namespace SmartStore.Core.Themes { public partial class DefaultThemeRegistry : DisposableObject, IThemeRegistry { - private readonly bool _enableMonitoring; - private readonly string _themesBasePath; - private readonly IEventPublisher _eventPublisher; - private readonly IApplicationEnvironment _env; - private readonly ConcurrentDictionary _themes = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); - private readonly ConcurrentDictionary _eventQueue = new ConcurrentDictionary(); + private readonly bool _enableMonitoring; + private readonly string _themesBasePath; + private readonly IEventPublisher _eventPublisher; + private readonly IApplicationEnvironment _env; + private readonly ConcurrentDictionary _themes = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); + private readonly ConcurrentDictionary _eventQueue = new ConcurrentDictionary(); - private readonly Regex _fileFilterPattern = new Regex(@"^\.(config|png|gif|jpg|jpeg|css|less|js|cshtml|svg|json)$", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private readonly Regex _fileFilterPattern = new Regex(@"^\.(config|png|gif|jpg|jpeg|css|less|js|cshtml|svg|json)$", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private FileSystemWatcher _monitorFolders; - private FileSystemWatcher _monitorFiles; + private FileSystemWatcher _monitorFolders; + private FileSystemWatcher _monitorFiles; - public DefaultThemeRegistry(IEventPublisher eventPublisher, IApplicationEnvironment env, bool? enableMonitoring, string themesBasePath, bool autoLoadThemes) + public DefaultThemeRegistry(IEventPublisher eventPublisher, IApplicationEnvironment env, bool? enableMonitoring, string themesBasePath, bool autoLoadThemes) { - _enableMonitoring = enableMonitoring ?? CommonHelper.GetAppSetting("sm:MonitorThemesFolder", true); - _eventPublisher = eventPublisher; - _env = env; - _themesBasePath = themesBasePath.NullEmpty() ?? _env.ThemesFolder.RootPath; + _enableMonitoring = enableMonitoring ?? CommonHelper.GetAppSetting("sm:MonitorThemesFolder", true); + _eventPublisher = eventPublisher; + _env = env; + _themesBasePath = themesBasePath.NullEmpty() ?? _env.ThemesFolder.RootPath; - Logger = NullLogger.Instance; + Logger = NullLogger.Instance; - if (autoLoadThemes) - { - // load all themes initially - ReloadThemes(); - } + if (autoLoadThemes) + { + // load all themes initially + ReloadThemes(); + } - CreateFileSystemWatchers(); + CreateFileSystemWatchers(); - // start FS watcher - this.StartMonitoring(false); + // start FS watcher + this.StartMonitoring(false); } - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } - #region IThemeRegistry + #region IThemeRegistry - public bool ThemeManifestExists(string themeName) + public bool ThemeManifestExists(string themeName) { if (themeName.IsEmpty()) return false; - ThemeManifest manifest; - if (_themes.TryGetValue(themeName, out manifest)) - { - return manifest.State == ThemeManifestState.Active; - } + ThemeManifest manifest; + if (_themes.TryGetValue(themeName, out manifest)) + { + return manifest.State == ThemeManifestState.Active; + } - return false; + return false; } - public ThemeManifest GetThemeManifest(string themeName) - { - ThemeManifest value; - if (themeName.HasValue() && _themes.TryGetValue(themeName, out value)) - { - return value; - } - return null; - } - - public ICollection GetThemeManifests(bool includeHidden = false) - { - var allThemes = _themes.Values; - - if (includeHidden) - { - return allThemes.AsReadOnly(); - } - else - { - return allThemes.Where(x => x.State == ThemeManifestState.Active).AsReadOnly(); - } - } - - public void AddThemeManifest(ThemeManifest manifest) - { - AddThemeManifestInternal(manifest, false); - } - - private void AddThemeManifestInternal(ThemeManifest manifest, bool isInit) - { - Guard.NotNull(manifest, nameof(manifest)); - - if (!isInit) - { - TryRemoveManifest(manifest.ThemeName); - } - - ThemeManifest baseManifest = null; - if (manifest.BaseThemeName != null) - { - if (!_themes.TryGetValue(manifest.BaseThemeName, out baseManifest)) - { - manifest.State = ThemeManifestState.MissingBaseTheme; - } - } - - manifest.BaseTheme = baseManifest; - var added = _themes.TryAdd(manifest.ThemeName, manifest); - if (added && !isInit) - { - // post process - var children = GetChildrenOf(manifest.ThemeName, false); - foreach (var child in children) - { - child.BaseTheme = manifest; - child.State = ThemeManifestState.Active; - } - } - } - - [SuppressMessage("ReSharper", "AssignmentInConditionalExpression")] - private bool TryRemoveManifest(string themeName) - { - bool result; - ThemeManifest existing; - if (result = _themes.TryRemove(themeName, out existing)) - { - _eventPublisher.Publish(new ThemeTouchedEvent(themeName)); - - existing.BaseTheme = null; - - // set all direct children as broken - var children = GetChildrenOf(themeName, false); - foreach (var child in children) - { - child.BaseTheme = null; - child.State = ThemeManifestState.MissingBaseTheme; - _eventPublisher.Publish(new ThemeTouchedEvent(child.ThemeName)); - } - } - - return result; - } - - public bool IsChildThemeOf(string themeName, string baseTheme) - { - if (themeName.IsEmpty() && baseTheme.IsEmpty()) - { - return false; - } - - if (themeName.Equals(baseTheme, StringComparison.OrdinalIgnoreCase)) - { - return false; - } - - var current = GetThemeManifest(themeName); - if (current == null) - return false; - - while (current.BaseThemeName != null) - { - if (baseTheme.Equals(current.BaseThemeName, StringComparison.OrdinalIgnoreCase)) - { - return true; - } - - if (!_themes.TryGetValue(current.BaseThemeName, out current)) - { - return false; - } - //currentBaseName = current.BaseThemeName; - } - - return false; - } - - public IEnumerable GetChildrenOf(string themeName, bool deep = true) - { - Guard.NotEmpty(themeName, nameof(themeName)); - - if (!ThemeManifestExists(themeName)) - Enumerable.Empty(); - - var derivedThemes = _themes.Values.Where(x => x.BaseThemeName != null && !x.ThemeName.IsCaseInsensitiveEqual(themeName)); - if (!deep) - { - derivedThemes = derivedThemes.Where(x => x.BaseThemeName.IsCaseInsensitiveEqual(themeName)); - } - else - { - derivedThemes = derivedThemes.Where(x => IsChildThemeOf(x.ThemeName, themeName)); - } - - return derivedThemes; - } - - public void ReloadThemes() - { - _themes.Clear(); - - var folder = _env.ThemesFolder; - var folderDatas = new List(); - var dirs = folder.ListDirectories(""); - - // create folder (meta)datas first - foreach (var path in dirs) - { - try - { - var folderData = ThemeManifest.CreateThemeFolderData(folder.MapPath(path), _themesBasePath); - if (folderData != null) - { - folderDatas.Add(folderData); - } - } - catch (Exception ex) - { - Logger.Error(ex, "Unable to create folder data for folder '{0}'".FormatCurrent(path)); - } - } - - // perform topological sort (BaseThemes first...) - IEnumerable sortedThemeFolders; - try - { - sortedThemeFolders = folderDatas.ToArray().SortTopological(StringComparer.OrdinalIgnoreCase).Cast(); - } - catch (CyclicDependencyException) - { - var ex = new CyclicDependencyException("Cyclic theme dependencies detected. Please check the 'baseTheme' attribute of your themes and ensure that they do not reference themselves (in)directly."); - Logger.Error(ex); - throw ex; - } - catch - { - throw; - } - - // create theme manifests - foreach (var themeFolder in sortedThemeFolders) - { - try - { - var manifest = ThemeManifest.Create(themeFolder); - if (manifest != null) - { - AddThemeManifestInternal(manifest, true); - } - } - catch (Exception ex) - { - Logger.Error(ex, "Unable to create manifest for theme '{0}'".FormatCurrent(themeFolder.FolderName)); - } - } - } + public ThemeManifest GetThemeManifest(string themeName) + { + ThemeManifest value; + if (themeName.HasValue() && _themes.TryGetValue(themeName, out value)) + { + return value; + } + return null; + } + + public ICollection GetThemeManifests(bool includeHidden = false) + { + var allThemes = _themes.Values; + + if (includeHidden) + { + return allThemes.AsReadOnly(); + } + else + { + return allThemes.Where(x => x.State == ThemeManifestState.Active).AsReadOnly(); + } + } + + public void AddThemeManifest(ThemeManifest manifest) + { + AddThemeManifestInternal(manifest, false); + } + + private void AddThemeManifestInternal(ThemeManifest manifest, bool isInit) + { + Guard.NotNull(manifest, nameof(manifest)); + + if (!isInit) + { + TryRemoveManifest(manifest.ThemeName); + } + + ThemeManifest baseManifest = null; + if (manifest.BaseThemeName != null) + { + if (!_themes.TryGetValue(manifest.BaseThemeName, out baseManifest)) + { + manifest.State = ThemeManifestState.MissingBaseTheme; + } + } + + manifest.BaseTheme = baseManifest; + var added = _themes.TryAdd(manifest.ThemeName, manifest); + if (added && !isInit) + { + // post process + var children = GetChildrenOf(manifest.ThemeName, false); + foreach (var child in children) + { + child.BaseTheme = manifest; + child.State = ThemeManifestState.Active; + } + } + } + + [SuppressMessage("ReSharper", "AssignmentInConditionalExpression")] + private bool TryRemoveManifest(string themeName) + { + bool result; + ThemeManifest existing; + if (result = _themes.TryRemove(themeName, out existing)) + { + _eventPublisher.Publish(new ThemeTouchedEvent(themeName)); + + existing.BaseTheme = null; + + // set all direct children as broken + var children = GetChildrenOf(themeName, false); + foreach (var child in children) + { + child.BaseTheme = null; + child.State = ThemeManifestState.MissingBaseTheme; + _eventPublisher.Publish(new ThemeTouchedEvent(child.ThemeName)); + } + } + + return result; + } + + public bool IsChildThemeOf(string themeName, string baseTheme) + { + if (themeName.IsEmpty() && baseTheme.IsEmpty()) + { + return false; + } + + if (themeName.Equals(baseTheme, StringComparison.OrdinalIgnoreCase)) + { + return false; + } + + var current = GetThemeManifest(themeName); + if (current == null) + return false; + + while (current.BaseThemeName != null) + { + if (baseTheme.Equals(current.BaseThemeName, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + + if (!_themes.TryGetValue(current.BaseThemeName, out current)) + { + return false; + } + //currentBaseName = current.BaseThemeName; + } + + return false; + } + + public IEnumerable GetChildrenOf(string themeName, bool deep = true) + { + Guard.NotEmpty(themeName, nameof(themeName)); + + if (!ThemeManifestExists(themeName)) + Enumerable.Empty(); + + var derivedThemes = _themes.Values.Where(x => x.BaseThemeName != null && !x.ThemeName.IsCaseInsensitiveEqual(themeName)); + if (!deep) + { + derivedThemes = derivedThemes.Where(x => x.BaseThemeName.IsCaseInsensitiveEqual(themeName)); + } + else + { + derivedThemes = derivedThemes.Where(x => IsChildThemeOf(x.ThemeName, themeName)); + } + + return derivedThemes; + } + + public void ReloadThemes() + { + _themes.Clear(); + + var folder = _env.ThemesFolder; + var folderDatas = new List(); + var dirs = folder.ListDirectories(""); + + // create folder (meta)datas first + foreach (var path in dirs) + { + try + { + var folderData = ThemeManifest.CreateThemeFolderData(folder.MapPath(path), _themesBasePath); + if (folderData != null) + { + folderDatas.Add(folderData); + } + } + catch (Exception ex) + { + Logger.Error(ex, "Unable to create folder data for folder '{0}'".FormatCurrent(path)); + } + } + + // perform topological sort (BaseThemes first...) + IEnumerable sortedThemeFolders; + try + { + sortedThemeFolders = folderDatas.ToArray().SortTopological(StringComparer.OrdinalIgnoreCase).Cast(); + } + catch (CyclicDependencyException) + { + var ex = new CyclicDependencyException("Cyclic theme dependencies detected. Please check the 'baseTheme' attribute of your themes and ensure that they do not reference themselves (in)directly."); + Logger.Error(ex); + throw ex; + } + catch + { + throw; + } + + // create theme manifests + foreach (var themeFolder in sortedThemeFolders) + { + try + { + var manifest = ThemeManifest.Create(themeFolder); + if (manifest != null) + { + AddThemeManifestInternal(manifest, true); + } + } + catch (Exception ex) + { + Logger.Error(ex, "Unable to create manifest for theme '{0}'".FormatCurrent(themeFolder.FolderName)); + } + } + } + + #endregion + + #region Monitoring & Events + + private void CreateFileSystemWatchers() + { + _monitorFiles = new FileSystemWatcher(); + _monitorFiles.Path = CommonHelper.MapPath(_themesBasePath); + _monitorFiles.InternalBufferSize = 32768; // 32 instead of the default 8 KB + _monitorFiles.Filter = "*.*"; + _monitorFiles.NotifyFilter = NotifyFilters.CreationTime | NotifyFilters.LastWrite | NotifyFilters.FileName; + _monitorFiles.IncludeSubdirectories = true; + _monitorFiles.Changed += (s, e) => OnThemeFileChanged(e.Name, e.FullPath, ThemeFileChangeType.Modified); + _monitorFiles.Deleted += (s, e) => OnThemeFileChanged(e.Name, e.FullPath, ThemeFileChangeType.Deleted); + _monitorFiles.Created += (s, e) => OnThemeFileChanged(e.Name, e.FullPath, ThemeFileChangeType.Created); + _monitorFiles.Renamed += (s, e) => + { + OnThemeFileChanged(e.OldName, e.OldFullPath, ThemeFileChangeType.Deleted); + OnThemeFileChanged(e.Name, e.FullPath, ThemeFileChangeType.Created); + }; + + _monitorFolders = new FileSystemWatcher(); + _monitorFolders.Path = CommonHelper.MapPath(_themesBasePath); + _monitorFolders.Filter = "*"; + _monitorFolders.NotifyFilter = NotifyFilters.DirectoryName; + _monitorFolders.IncludeSubdirectories = false; + _monitorFolders.Renamed += (s, e) => OnThemeFolderRenamed(e.Name, e.FullPath, e.OldName, e.OldFullPath); + _monitorFolders.Deleted += (s, e) => OnThemeFolderDeleted(e.Name, e.FullPath); + } + + public void StartMonitoring(bool force) + { + var shouldStart = force || _enableMonitoring; + + if (shouldStart && !_monitorFiles.EnableRaisingEvents) + _monitorFiles.EnableRaisingEvents = true; + if (shouldStart && !_monitorFolders.EnableRaisingEvents) + _monitorFolders.EnableRaisingEvents = true; + } + + public void StopMonitoring() + { + if (_monitorFiles.EnableRaisingEvents) + _monitorFiles.EnableRaisingEvents = false; + if (_monitorFolders.EnableRaisingEvents) + _monitorFolders.EnableRaisingEvents = false; + } + + private bool ShouldThrottleEvent(EventThrottleKey key) + { + Timer timer; + if (_eventQueue.TryGetValue(key, out timer)) + { + // do nothing. The same event was published a tick ago. + return true; + } + + _eventQueue[key] = new Timer(RemoveFromEventQueue, key, 500, Timeout.Infinite); + return false; + } + + private void RemoveFromEventQueue(object key) + { + Timer timer; + if (_eventQueue.TryRemove((EventThrottleKey)key, out timer)) + { + timer.Dispose(); + } + } + + private void OnThemeFileChanged(string name, string fullPath, ThemeFileChangeType changeType) + { + // Enable event throttling by allowing the very same event to be published only all 500 ms. + var throttleKey = new EventThrottleKey(name, changeType); + if (ShouldThrottleEvent(throttleKey)) + { + return; + } + + if (!_fileFilterPattern.IsMatch(Path.GetExtension(name))) + return; + + var idx = name.IndexOf('\\'); + if (idx < 0) + { + // must be a subfolder of "~/Themes/" + return; + } + + var themeName = name.Substring(0, idx); + var relativePath = name.Substring(themeName.Length + 1).Replace('\\', '/'); + var isConfigFile = relativePath.IsCaseInsensitiveEqual("theme.config"); + + if (changeType == ThemeFileChangeType.Modified && !isConfigFile) + { + // Monitor changes only for root theme.config + return; + } + + BaseThemeChangedEventArgs baseThemeChangedArgs = null; + + if (isConfigFile) + { + // config file changes always result in refreshing the corresponding theme manifest + var di = new DirectoryInfo(Path.GetDirectoryName(fullPath)); + + string oldBaseThemeName = null; + var oldManifest = this.GetThemeManifest(di.Name); + if (oldManifest != null) + { + oldBaseThemeName = oldManifest.BaseThemeName; + } + + try + { + // FS watcher in conjunction with some text editors fires change events twice and locks the file. + // Let's wait max. 250ms till the lock is gone (hopefully). + var fi = new FileInfo(fullPath); + fi.WaitForUnlock(250); + + var newManifest = ThemeManifest.Create(di.FullName, _themesBasePath); + if (newManifest != null) + { + this.AddThemeManifestInternal(newManifest, false); + + if (!oldBaseThemeName.IsCaseInsensitiveEqual(newManifest.BaseThemeName)) + { + baseThemeChangedArgs = new BaseThemeChangedEventArgs + { + ThemeName = newManifest.ThemeName, + BaseTheme = newManifest.BaseTheme != null ? newManifest.BaseTheme.ThemeName : null, + OldBaseTheme = oldBaseThemeName + }; + } + + Logger.Debug("Changed theme manifest for '{0}'".FormatCurrent(name)); + } + else + { + // something went wrong (most probably no 'theme.config'): remove the manifest + TryRemoveManifest(di.Name); + } + } + catch (Exception ex) + { + Logger.Error(ex, "Could not touch theme manifest '{0}': {1}".FormatCurrent(name, ex.Message)); + TryRemoveManifest(di.Name); + } + } + + if (baseThemeChangedArgs != null) + { + RaiseBaseThemeChanged(baseThemeChangedArgs); + } + + RaiseThemeFileChanged(new ThemeFileChangedEventArgs + { + ChangeType = changeType, + FullPath = fullPath, + ThemeName = themeName, + RelativePath = relativePath, + IsConfigurationFile = isConfigFile + }); + } + + private void OnThemeFolderRenamed(string name, string fullPath, string oldName, string oldFullPath) + { + TryRemoveManifest(oldName); + + try + { + var newManifest = GetThemeManifest(name); + if (newManifest != null) + { + this.AddThemeManifestInternal(newManifest, false); + Logger.Debug("Changed theme manifest for '{0}'".FormatCurrent(name)); + } + } + catch (Exception ex) + { + Logger.Error(ex, "Could not touch theme manifest '{0}'".FormatCurrent(name)); + } + + RaiseThemeFolderRenamed(new ThemeFolderRenamedEventArgs + { + FullPath = fullPath, + Name = name, + OldFullPath = oldFullPath, + OldName = oldName + }); + } + + private void OnThemeFolderDeleted(string name, string fullPath) + { + TryRemoveManifest(name); + + RaiseThemeFolderDeleted(new ThemeFolderDeletedEventArgs + { + FullPath = fullPath, + Name = name + }); + } + + public event EventHandler ThemeFileChanged; + protected void RaiseThemeFileChanged(ThemeFileChangedEventArgs e) + { + if (ThemeFileChanged != null) + ThemeFileChanged(this, e); + } + + public event EventHandler ThemeFolderRenamed; + protected void RaiseThemeFolderRenamed(ThemeFolderRenamedEventArgs e) + { + if (ThemeFolderRenamed != null) + ThemeFolderRenamed(this, e); + } + + public event EventHandler ThemeFolderDeleted; + protected void RaiseThemeFolderDeleted(ThemeFolderDeletedEventArgs e) + { + if (ThemeFolderDeleted != null) + ThemeFolderDeleted(this, e); + } + + public event EventHandler BaseThemeChanged; + protected void RaiseBaseThemeChanged(BaseThemeChangedEventArgs e) + { + if (BaseThemeChanged != null) + BaseThemeChanged(this, e); + } #endregion - #region Monitoring & Events - - private void CreateFileSystemWatchers() - { - _monitorFiles = new FileSystemWatcher(); - _monitorFiles.Path = CommonHelper.MapPath(_themesBasePath); - _monitorFiles.InternalBufferSize = 32768; // 32 instead of the default 8 KB - _monitorFiles.Filter = "*.*"; - _monitorFiles.NotifyFilter = NotifyFilters.CreationTime | NotifyFilters.LastWrite | NotifyFilters.FileName; - _monitorFiles.IncludeSubdirectories = true; - _monitorFiles.Changed += (s, e) => OnThemeFileChanged(e.Name, e.FullPath, ThemeFileChangeType.Modified); - _monitorFiles.Deleted += (s, e) => OnThemeFileChanged(e.Name, e.FullPath, ThemeFileChangeType.Deleted); - _monitorFiles.Created += (s, e) => OnThemeFileChanged(e.Name, e.FullPath, ThemeFileChangeType.Created); - _monitorFiles.Renamed += (s, e) => - { - OnThemeFileChanged(e.OldName, e.OldFullPath, ThemeFileChangeType.Deleted); - OnThemeFileChanged(e.Name, e.FullPath, ThemeFileChangeType.Created); - }; - - _monitorFolders = new FileSystemWatcher(); - _monitorFolders.Path = CommonHelper.MapPath(_themesBasePath); - _monitorFolders.Filter = "*"; - _monitorFolders.NotifyFilter = NotifyFilters.DirectoryName; - _monitorFolders.IncludeSubdirectories = false; - _monitorFolders.Renamed += (s, e) => OnThemeFolderRenamed(e.Name, e.FullPath, e.OldName, e.OldFullPath); - _monitorFolders.Deleted += (s, e) => OnThemeFolderDeleted(e.Name, e.FullPath); - } - - public void StartMonitoring(bool force) - { - var shouldStart = force || _enableMonitoring; - - if (shouldStart && !_monitorFiles.EnableRaisingEvents) - _monitorFiles.EnableRaisingEvents = true; - if (shouldStart && !_monitorFolders.EnableRaisingEvents) - _monitorFolders.EnableRaisingEvents = true; - } - - public void StopMonitoring() - { - if (_monitorFiles.EnableRaisingEvents) - _monitorFiles.EnableRaisingEvents = false; - if (_monitorFolders.EnableRaisingEvents) - _monitorFolders.EnableRaisingEvents = false; - } - - private bool ShouldThrottleEvent(EventThrottleKey key) - { - Timer timer; - if (_eventQueue.TryGetValue(key, out timer)) - { - // do nothing. The same event was published a tick ago. - return true; - } - - _eventQueue[key] = new Timer(RemoveFromEventQueue, key, 500, Timeout.Infinite); - return false; - } - - private void RemoveFromEventQueue(object key) - { - Timer timer; - if (_eventQueue.TryRemove((EventThrottleKey)key, out timer)) - { - timer.Dispose(); - } - } - - private void OnThemeFileChanged(string name, string fullPath, ThemeFileChangeType changeType) - { - // Enable event throttling by allowing the very same event to be published only all 500 ms. - var throttleKey = new EventThrottleKey(name, changeType); - if (ShouldThrottleEvent(throttleKey)) - { - return; - } - - if (!_fileFilterPattern.IsMatch(Path.GetExtension(name))) - return; - - var idx = name.IndexOf('\\'); - if (idx < 0) - { - // must be a subfolder of "~/Themes/" - return; - } - - var themeName = name.Substring(0, idx); - var relativePath = name.Substring(themeName.Length + 1).Replace('\\', '/'); - var isConfigFile = relativePath.IsCaseInsensitiveEqual("theme.config"); - - if (changeType == ThemeFileChangeType.Modified && !isConfigFile) - { - // Monitor changes only for root theme.config - return; - } - - BaseThemeChangedEventArgs baseThemeChangedArgs = null; - - if (isConfigFile) - { - // config file changes always result in refreshing the corresponding theme manifest - var di = new DirectoryInfo(Path.GetDirectoryName(fullPath)); - - string oldBaseThemeName = null; - var oldManifest = this.GetThemeManifest(di.Name); - if (oldManifest != null) - { - oldBaseThemeName = oldManifest.BaseThemeName; - } - - try - { - // FS watcher in conjunction with some text editors fires change events twice and locks the file. - // Let's wait max. 250ms till the lock is gone (hopefully). - var fi = new FileInfo(fullPath); - fi.WaitForUnlock(250); - - var newManifest = ThemeManifest.Create(di.FullName, _themesBasePath); - if (newManifest != null) - { - this.AddThemeManifestInternal(newManifest, false); - - if (!oldBaseThemeName.IsCaseInsensitiveEqual(newManifest.BaseThemeName)) - { - baseThemeChangedArgs = new BaseThemeChangedEventArgs - { - ThemeName = newManifest.ThemeName, - BaseTheme = newManifest.BaseTheme != null ? newManifest.BaseTheme.ThemeName : null, - OldBaseTheme = oldBaseThemeName - }; - } - - Logger.Debug("Changed theme manifest for '{0}'".FormatCurrent(name)); - } - else - { - // something went wrong (most probably no 'theme.config'): remove the manifest - TryRemoveManifest(di.Name); - } - } - catch (Exception ex) - { - Logger.Error(ex, "Could not touch theme manifest '{0}': {1}".FormatCurrent(name, ex.Message)); - TryRemoveManifest(di.Name); - } - } - - if (baseThemeChangedArgs != null) - { - RaiseBaseThemeChanged(baseThemeChangedArgs); - } - - RaiseThemeFileChanged(new ThemeFileChangedEventArgs - { - ChangeType = changeType, - FullPath = fullPath, - ThemeName = themeName, - RelativePath = relativePath, - IsConfigurationFile = isConfigFile - }); - } - - private void OnThemeFolderRenamed(string name, string fullPath, string oldName, string oldFullPath) - { - TryRemoveManifest(oldName); - - try - { - var newManifest = GetThemeManifest(name); - if (newManifest != null) - { - this.AddThemeManifestInternal(newManifest, false); - Logger.Debug("Changed theme manifest for '{0}'".FormatCurrent(name)); - } - } - catch (Exception ex) - { - Logger.Error(ex, "Could not touch theme manifest '{0}'".FormatCurrent(name)); - } - - RaiseThemeFolderRenamed(new ThemeFolderRenamedEventArgs - { - FullPath = fullPath, - Name = name, - OldFullPath = oldFullPath, - OldName = oldName - }); - } - - private void OnThemeFolderDeleted(string name, string fullPath) - { - TryRemoveManifest(name); - - RaiseThemeFolderDeleted(new ThemeFolderDeletedEventArgs - { - FullPath = fullPath, - Name = name - }); - } - - public event EventHandler ThemeFileChanged; - protected void RaiseThemeFileChanged(ThemeFileChangedEventArgs e) - { - if (ThemeFileChanged != null) - ThemeFileChanged(this, e); - } - - public event EventHandler ThemeFolderRenamed; - protected void RaiseThemeFolderRenamed(ThemeFolderRenamedEventArgs e) - { - if (ThemeFolderRenamed != null) - ThemeFolderRenamed(this, e); - } - - public event EventHandler ThemeFolderDeleted; - protected void RaiseThemeFolderDeleted(ThemeFolderDeletedEventArgs e) - { - if (ThemeFolderDeleted != null) - ThemeFolderDeleted(this, e); - } - - public event EventHandler BaseThemeChanged; - protected void RaiseBaseThemeChanged(BaseThemeChangedEventArgs e) - { - if (BaseThemeChanged != null) - BaseThemeChanged(this, e); - } - - #endregion - - #region Disposable - - protected override void OnDispose(bool disposing) - { - if (disposing) - { - if (_monitorFiles != null) - { - _monitorFiles.EnableRaisingEvents = false; - _monitorFiles.Dispose(); - _monitorFiles = null; - } - - if (_monitorFolders != null) - { - _monitorFolders.EnableRaisingEvents = false; - _monitorFolders.Dispose(); - _monitorFolders = null; - } - } - } - - #endregion - - private class EventThrottleKey : Tuple - { - public EventThrottleKey(string name, ThemeFileChangeType changeType) - : base(name, changeType) - { - } - } - } + #region Disposable + + protected override void OnDispose(bool disposing) + { + if (disposing) + { + if (_monitorFiles != null) + { + _monitorFiles.EnableRaisingEvents = false; + _monitorFiles.Dispose(); + _monitorFiles = null; + } + + if (_monitorFolders != null) + { + _monitorFolders.EnableRaisingEvents = false; + _monitorFolders.Dispose(); + _monitorFolders = null; + } + } + } + + #endregion + + private class EventThrottleKey : Tuple + { + public EventThrottleKey(string name, ThemeFileChangeType changeType) + : base(name, changeType) + { + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Themes/IThemeContext.cs b/src/Libraries/SmartStore.Core/Themes/IThemeContext.cs index 1162ab331d..4999465cf0 100644 --- a/src/Libraries/SmartStore.Core/Themes/IThemeContext.cs +++ b/src/Libraries/SmartStore.Core/Themes/IThemeContext.cs @@ -11,29 +11,29 @@ public interface IThemeContext /// string WorkingThemeName { get; set; } - /// - /// Sets a theme override to be used for the current request - /// - /// The theme override or null to remove the override - void SetRequestTheme(string theme); + /// + /// Sets a theme override to be used for the current request + /// + /// The theme override or null to remove the override + void SetRequestTheme(string theme); - /// - /// Sets a theme override to be used for the current user's session (e.g. for preview mode) - /// - /// The theme override or null to remove the override - void SetPreviewTheme(string theme); + /// + /// Sets a theme override to be used for the current user's session (e.g. for preview mode) + /// + /// The theme override or null to remove the override + void SetPreviewTheme(string theme); - /// - /// Gets the theme override for the current request - /// - /// The theme override or null - string GetRequestTheme(); + /// + /// Gets the theme override for the current request + /// + /// The theme override or null + string GetRequestTheme(); - /// - /// Gets the theme override for the current session - /// - /// The theme override or null - string GetPreviewTheme(); + /// + /// Gets the theme override for the current session + /// + /// The theme override or null + string GetPreviewTheme(); /// /// Gets or sets the manifest of the current working theme diff --git a/src/Libraries/SmartStore.Core/Themes/IThemeFileResolver.cs b/src/Libraries/SmartStore.Core/Themes/IThemeFileResolver.cs index 6c76b038ab..9e2f5d879a 100644 --- a/src/Libraries/SmartStore.Core/Themes/IThemeFileResolver.cs +++ b/src/Libraries/SmartStore.Core/Themes/IThemeFileResolver.cs @@ -1,9 +1,7 @@ -using System; - -namespace SmartStore.Core.Themes +namespace SmartStore.Core.Themes { - public interface IThemeFileResolver - { - InheritedThemeFileResult Resolve(string virtualPath); - } + public interface IThemeFileResolver + { + InheritedThemeFileResult Resolve(string virtualPath); + } } diff --git a/src/Libraries/SmartStore.Core/Themes/IThemeRegistry.cs b/src/Libraries/SmartStore.Core/Themes/IThemeRegistry.cs index 94bade5e85..c095783f33 100644 --- a/src/Libraries/SmartStore.Core/Themes/IThemeRegistry.cs +++ b/src/Libraries/SmartStore.Core/Themes/IThemeRegistry.cs @@ -5,130 +5,130 @@ namespace SmartStore.Core.Themes { public partial interface IThemeRegistry { - - /// - /// Gets all registered theme manifests - /// - /// Specifies whether inactive themes should also be included in the return list - /// A collection of manifests - ICollection GetThemeManifests(bool includeHidden = false); - - /// - /// Gets a single theme manifest by theme name - /// - /// The name of the theme to get a manifest for - /// A ThemeManifest instance or null, if theme is not registered - ThemeManifest GetThemeManifest(string themeName); - - /// - /// Gets a value indicating whether a theme is registered - /// - /// The theme name to check - /// true if theme exists, false otherwise + + /// + /// Gets all registered theme manifests + /// + /// Specifies whether inactive themes should also be included in the return list + /// A collection of manifests + ICollection GetThemeManifests(bool includeHidden = false); + + /// + /// Gets a single theme manifest by theme name + /// + /// The name of the theme to get a manifest for + /// A ThemeManifest instance or null, if theme is not registered + ThemeManifest GetThemeManifest(string themeName); + + /// + /// Gets a value indicating whether a theme is registered + /// + /// The theme name to check + /// true if theme exists, false otherwise bool ThemeManifestExists(string themeName); - /// - /// Registers a theme manifest - /// - /// The theme manifest to register - /// If an equal theme exists already, it gets removed first. - void AddThemeManifest(ThemeManifest manifest); - - /// - /// Gets a value indicating whether a theme is a child of another theme - /// - /// The name of the theme to test - /// The name of the base theme - /// true when is based on , false othwerise - /// - /// This method walks up the complete hierarchy chain of to determine the result. - /// - bool IsChildThemeOf(string themeName, string baseTheme); - - /// - /// Gets all derived child themes - /// - /// The name of the theme to get the children for - /// When true, the method gets all child themes in the hierarchy chain, otherwise it only returns direct children. - /// The manifests of matching themes - IEnumerable GetChildrenOf(string themeName, bool deep = true); - - /// - /// Starts/resumes raising file system events - /// - /// - /// When true, monitoring gets started regardless of the global setting (web.config > appSettings > sm:MonitorThemesFolder), - /// otherwise this method does nothing when the setting is false. - /// - void StartMonitoring(bool force); - - /// - /// Stops/pauses raising file system events - /// - void StopMonitoring(); - - /// - /// Clears all parsed theme manifests and reloads them - /// - void ReloadThemes(); - - /// - /// Event raised when an inheritable (static) theme file has been created or deleted, - /// OR when the theme.config file has been modified. - /// - event EventHandler ThemeFileChanged; - - /// - /// Event raised when a theme folder has been renamed. - /// - event EventHandler ThemeFolderRenamed; - - /// - /// Event raised when a theme folder has been deleted. - /// - event EventHandler ThemeFolderDeleted; - - /// - /// Event raised when a theme's base theme changes. - /// - event EventHandler BaseThemeChanged; + /// + /// Registers a theme manifest + /// + /// The theme manifest to register + /// If an equal theme exists already, it gets removed first. + void AddThemeManifest(ThemeManifest manifest); + + /// + /// Gets a value indicating whether a theme is a child of another theme + /// + /// The name of the theme to test + /// The name of the base theme + /// true when is based on , false othwerise + /// + /// This method walks up the complete hierarchy chain of to determine the result. + /// + bool IsChildThemeOf(string themeName, string baseTheme); + + /// + /// Gets all derived child themes + /// + /// The name of the theme to get the children for + /// When true, the method gets all child themes in the hierarchy chain, otherwise it only returns direct children. + /// The manifests of matching themes + IEnumerable GetChildrenOf(string themeName, bool deep = true); + + /// + /// Starts/resumes raising file system events + /// + /// + /// When true, monitoring gets started regardless of the global setting (web.config > appSettings > sm:MonitorThemesFolder), + /// otherwise this method does nothing when the setting is false. + /// + void StartMonitoring(bool force); + + /// + /// Stops/pauses raising file system events + /// + void StopMonitoring(); + + /// + /// Clears all parsed theme manifests and reloads them + /// + void ReloadThemes(); + + /// + /// Event raised when an inheritable (static) theme file has been created or deleted, + /// OR when the theme.config file has been modified. + /// + event EventHandler ThemeFileChanged; + + /// + /// Event raised when a theme folder has been renamed. + /// + event EventHandler ThemeFolderRenamed; + + /// + /// Event raised when a theme folder has been deleted. + /// + event EventHandler ThemeFolderDeleted; + + /// + /// Event raised when a theme's base theme changes. + /// + event EventHandler BaseThemeChanged; + } + + + public class ThemeFileChangedEventArgs : EventArgs + { + public string FullPath { get; set; } + public string ThemeName { get; set; } + public string RelativePath { get; set; } + public bool IsConfigurationFile { get; set; } + public ThemeFileChangeType ChangeType { get; set; } } + public class ThemeFolderRenamedEventArgs : EventArgs + { + public string FullPath { get; set; } + public string Name { get; set; } + public string OldFullPath { get; set; } + public string OldName { get; set; } + } - public class ThemeFileChangedEventArgs : EventArgs - { - public string FullPath { get; set; } - public string ThemeName { get; set; } - public string RelativePath { get; set; } - public bool IsConfigurationFile { get; set; } - public ThemeFileChangeType ChangeType { get; set; } - } - - public class ThemeFolderRenamedEventArgs : EventArgs - { - public string FullPath { get; set; } - public string Name { get; set; } - public string OldFullPath { get; set; } - public string OldName { get; set; } - } - - public class ThemeFolderDeletedEventArgs : EventArgs - { - public string FullPath { get; set; } - public string Name { get; set; } - } - - public class BaseThemeChangedEventArgs : EventArgs - { - public string ThemeName { get; set; } - public string BaseTheme { get; set; } - public string OldBaseTheme { get; set; } - } - - public enum ThemeFileChangeType - { - Created, - Deleted, - Modified - } + public class ThemeFolderDeletedEventArgs : EventArgs + { + public string FullPath { get; set; } + public string Name { get; set; } + } + + public class BaseThemeChangedEventArgs : EventArgs + { + public string ThemeName { get; set; } + public string BaseTheme { get; set; } + public string OldBaseTheme { get; set; } + } + + public enum ThemeFileChangeType + { + Created, + Deleted, + Modified + } } diff --git a/src/Libraries/SmartStore.Core/Themes/InheritedThemeFileResult.cs b/src/Libraries/SmartStore.Core/Themes/InheritedThemeFileResult.cs index 77d708c5c8..99d38490e9 100644 --- a/src/Libraries/SmartStore.Core/Themes/InheritedThemeFileResult.cs +++ b/src/Libraries/SmartStore.Core/Themes/InheritedThemeFileResult.cs @@ -1,44 +1,42 @@ -using System; - -namespace SmartStore.Core.Themes +namespace SmartStore.Core.Themes { - public class InheritedThemeFileResult - { - /// - /// The unrooted relative path of the file (without ~/Themes/ThemeName/) - /// - public string RelativePath { get; set; } - - /// - /// The original virtual path - /// - public string OriginalVirtualPath { get; set; } - - /// - /// The result virtual path (the path in which the file is actually located) - /// - public string ResultVirtualPath { get; set; } - - /// - /// The result physical path (the path in which the file is actually located) - /// - public string ResultPhysicalPath { get; set; } - - /// - /// The name of the requesting theme - /// - public string OriginalThemeName { get; set; } - - /// - /// The name of the resulting theme where the file is actually located - /// - public string ResultThemeName { get; set; } - - public bool IsBased { get; set; } - - /// - /// The query string, e.g. '?base' - /// - public string Query { get; set; } - } + public class InheritedThemeFileResult + { + /// + /// The unrooted relative path of the file (without ~/Themes/ThemeName/) + /// + public string RelativePath { get; set; } + + /// + /// The original virtual path + /// + public string OriginalVirtualPath { get; set; } + + /// + /// The result virtual path (the path in which the file is actually located) + /// + public string ResultVirtualPath { get; set; } + + /// + /// The result physical path (the path in which the file is actually located) + /// + public string ResultPhysicalPath { get; set; } + + /// + /// The name of the requesting theme + /// + public string OriginalThemeName { get; set; } + + /// + /// The name of the resulting theme where the file is actually located + /// + public string ResultThemeName { get; set; } + + public bool IsBased { get; set; } + + /// + /// The query string, e.g. '?base' + /// + public string Query { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeFolderData.cs b/src/Libraries/SmartStore.Core/Themes/ThemeFolderData.cs index e557505cc9..62f866de60 100644 --- a/src/Libraries/SmartStore.Core/Themes/ThemeFolderData.cs +++ b/src/Libraries/SmartStore.Core/Themes/ThemeFolderData.cs @@ -3,29 +3,26 @@ namespace SmartStore.Core.Themes { - internal class ThemeFolderData : ITopologicSortable - { - public string FolderName { get; set; } - public string FullPath { get; set; } - public bool IsSymbolicLink { get; set; } - public string VirtualBasePath { get; set; } - public XmlDocument Configuration { get; set; } - public string BaseTheme { get; set; } + internal class ThemeFolderData : ITopologicSortable + { + public string FolderName { get; set; } + public string FullPath { get; set; } + public bool IsSymbolicLink { get; set; } + public string VirtualBasePath { get; set; } + public XmlDocument Configuration { get; set; } + public string BaseTheme { get; set; } - string ITopologicSortable.Key - { - get { return FolderName; } - } + string ITopologicSortable.Key => FolderName; - string[] ITopologicSortable.DependsOn - { - get - { - if (BaseTheme == null) - return null; + string[] ITopologicSortable.DependsOn + { + get + { + if (BaseTheme == null) + return null; - return new [] { BaseTheme }; - } - } - } + return new[] { BaseTheme }; + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeManifest.cs b/src/Libraries/SmartStore.Core/Themes/ThemeManifest.cs index 1efdae47d2..f107635a81 100644 --- a/src/Libraries/SmartStore.Core/Themes/ThemeManifest.cs +++ b/src/Libraries/SmartStore.Core/Themes/ThemeManifest.cs @@ -1,348 +1,336 @@ using System; using System.Collections.Generic; +using System.IO; using System.Xml; using SmartStore.Collections; -using System.IO; namespace SmartStore.Core.Themes { - public class ThemeManifest : ComparableObject + public class ThemeManifest : ComparableObject { internal ThemeManifest() { } - #region Methods + #region Methods - public static ThemeManifest Create(string themePath, string virtualBasePath = "~/Themes/") - { - Guard.NotEmpty(themePath, nameof(themePath)); + public static ThemeManifest Create(string themePath, string virtualBasePath = "~/Themes/") + { + Guard.NotEmpty(themePath, nameof(themePath)); - var folderData = CreateThemeFolderData(themePath, virtualBasePath); - if (folderData != null) - { - return Create(folderData); - } + var folderData = CreateThemeFolderData(themePath, virtualBasePath); + if (folderData != null) + { + return Create(folderData); + } - return null; - } + return null; + } - internal static ThemeManifest Create(ThemeFolderData folderData) - { - Guard.NotNull(folderData, nameof(folderData)); + internal static ThemeManifest Create(ThemeFolderData folderData) + { + Guard.NotNull(folderData, nameof(folderData)); - var materializer = new ThemeManifestMaterializer(folderData); - var manifest = materializer.Materialize(); + var materializer = new ThemeManifestMaterializer(folderData); + var manifest = materializer.Materialize(); - return manifest; - } + return manifest; + } - internal static ThemeFolderData CreateThemeFolderData(string themePath, string virtualBasePath = "~/Themes/") - { - if (themePath.IsEmpty()) - return null; + internal static ThemeFolderData CreateThemeFolderData(string themePath, string virtualBasePath = "~/Themes/") + { + if (themePath.IsEmpty()) + return null; - virtualBasePath = virtualBasePath.EnsureEndsWith("/"); + virtualBasePath = virtualBasePath.EnsureEndsWith("/"); - var themeDirectory = new DirectoryInfo(themePath); + var themeDirectory = new DirectoryInfo(themePath); - var isSymLink = themeDirectory.IsSymbolicLink(out var finalPathName); - if (isSymLink) - { - themeDirectory = new DirectoryInfo(finalPathName); - } + var isSymLink = themeDirectory.IsSymbolicLink(out var finalPathName); + if (isSymLink) + { + themeDirectory = new DirectoryInfo(finalPathName); + } - var themeConfigFile = new FileInfo(System.IO.Path.Combine(themeDirectory.FullName, "theme.config")); + var themeConfigFile = new FileInfo(System.IO.Path.Combine(themeDirectory.FullName, "theme.config")); - if (themeConfigFile.Exists) - { - var doc = new XmlDocument(); - doc.Load(themeConfigFile.FullName); + if (themeConfigFile.Exists) + { + var doc = new XmlDocument(); + doc.Load(themeConfigFile.FullName); - Guard.Against(doc.DocumentElement == null, "The theme configuration document must have a root element."); + Guard.Against(doc.DocumentElement == null, "The theme configuration document must have a root element."); - var root = doc.DocumentElement; + var root = doc.DocumentElement; - var baseTheme = root.GetAttribute("baseTheme").TrimSafe().NullEmpty(); - if (baseTheme != null && baseTheme.IsCaseInsensitiveEqual(themeDirectory.Name)) - { - // Don't let theme point to itself! - baseTheme = null; - } + var baseTheme = root.GetAttribute("baseTheme").TrimSafe().NullEmpty(); + if (baseTheme != null && baseTheme.IsCaseInsensitiveEqual(themeDirectory.Name)) + { + // Don't let theme point to itself! + baseTheme = null; + } - return new ThemeFolderData - { - FolderName = themeDirectory.Name, - FullPath = themeDirectory.FullName, - IsSymbolicLink = isSymLink, - Configuration = doc, - VirtualBasePath = virtualBasePath, - BaseTheme = baseTheme - }; - } + return new ThemeFolderData + { + FolderName = themeDirectory.Name, + FullPath = themeDirectory.FullName, + IsSymbolicLink = isSymLink, + Configuration = doc, + VirtualBasePath = virtualBasePath, + BaseTheme = baseTheme + }; + } - return null; - } + return null; + } - #endregion + #endregion - #region Properties + #region Properties - public XmlElement ConfigurationNode - { - get; - protected internal set; - } + public XmlElement ConfigurationNode + { + get; + protected internal set; + } /// /// Gets the virtual theme base path (e.g.: ~/Themes) /// - public string Location - { - get; - protected internal set; - } - - /// - /// Determines whether the theme directory is a symbolic link to another target. - /// - public bool IsSymbolicLink - { - get; - protected internal set; - } - - /// - /// Gets the physical path of the theme. In case of a symbolic link, - /// returns the link's target path. - /// - public string Path - { - get; - protected internal set; - } - - public string PreviewImageUrl - { - get; - protected internal set; - } - - public string PreviewText - { - get; - protected internal set; - } - - [ObjectSignature] - public string ThemeName - { - get; - protected internal set; - } - - public string BaseThemeName - { - get; - internal set; - } - - public ThemeManifest BaseTheme - { - get; - internal set; - } - - public string ThemeTitle - { - get; - protected internal set; - } - - public string Author - { - get; - protected internal set; - } - - public string Url - { - get; - protected internal set; - } - - public string Version - { - get; - protected internal set; - } - - private IDictionary _variables; - public IDictionary Variables - { - get - { - if (this.BaseTheme == null) - { - return _variables; - } - - var baseVars = this.BaseTheme.Variables; - var mergedVars = new Dictionary(baseVars, StringComparer.OrdinalIgnoreCase); - var newVars = new List(); - - foreach (var localVar in _variables) - { - if (mergedVars.ContainsKey(localVar.Key)) - { - // Overridden var in child: update existing. - var baseVar = mergedVars[localVar.Key]; - mergedVars[localVar.Key] = new ThemeVariableInfo - { - Name = baseVar.Name, - Type = baseVar.Type, - SelectRef = baseVar.SelectRef, - DefaultValue = localVar.Value.DefaultValue, - Manifest = localVar.Value.Manifest - }; - } - else - { - // New var in child: add to temp list. - newVars.Add(localVar.Value); - } - } - - var merged = new Dictionary(StringComparer.OrdinalIgnoreCase); - - foreach (var newVar in newVars) - { - // New child theme vars must come first in final list - // to avoid wrong references in existing vars - merged.Add(newVar.Name, newVar); - } - - foreach (var kvp in mergedVars) - { - merged.Add(kvp.Key, kvp.Value); - } - - return merged; - } - internal set - { - _variables = value; - } - } - - private Multimap _selects; - public Multimap Selects - { - get - { - if (this.BaseTheme == null) - { - return _selects; - } - - var baseSelects = this.BaseTheme.Selects; - var merged = new Multimap(); - baseSelects.Each(x => merged.AddRange(x.Key, x.Value)); - foreach (var localSelect in _selects) - { - if (!merged.ContainsKey(localSelect.Key)) - { - // New Select in child: add to list. - merged.AddRange(localSelect.Key, localSelect.Value); - } - else - { - // Do nothing: we don't support overriding Selects - } - } - - return merged; - } - internal set - { - _selects = value; - } - } - - private ThemeManifestState _state; - public ThemeManifestState State - { - get - { - if (_state == ThemeManifestState.Active) - { - // active state does not mean, that it actually IS active: check state of base themes! - var baseTheme = this.BaseTheme; - while (baseTheme != null) - { - if (baseTheme.State != ThemeManifestState.Active) - { - return baseTheme.State; - } - baseTheme = baseTheme.BaseTheme; - } - } - - return _state; - } - protected internal set - { - _state = value; - } - } - - internal string FullPath + public string Location + { + get; + protected internal set; + } + + /// + /// Determines whether the theme directory is a symbolic link to another target. + /// + public bool IsSymbolicLink + { + get; + protected internal set; + } + + /// + /// Gets the physical path of the theme. In case of a symbolic link, + /// returns the link's target path. + /// + public string Path + { + get; + protected internal set; + } + + public string PreviewImageUrl + { + get; + protected internal set; + } + + public string PreviewText + { + get; + protected internal set; + } + + [ObjectSignature] + public string ThemeName { - get { return System.IO.Path.Combine(this.Path, "theme.config"); } - } - - public override string ToString() - { - return "{0} (Parent: {1}, State: {2})".FormatInvariant(ThemeName, BaseThemeName ?? "-", State.ToString()); - } - - #endregion - - #region Dispose - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected void Dispose(bool disposing) - { - if (disposing) - { - BaseTheme = null; - if (_variables != null) - { - foreach (var pair in _variables) - { - pair.Value.Dispose(); - } - _variables.Clear(); - } - } - } - - ~ThemeManifest() + get; + protected internal set; + } + + public string BaseThemeName + { + get; + internal set; + } + + public ThemeManifest BaseTheme + { + get; + internal set; + } + + public string ThemeTitle + { + get; + protected internal set; + } + + public string Author + { + get; + protected internal set; + } + + public string Url + { + get; + protected internal set; + } + + public string Version + { + get; + protected internal set; + } + + private IDictionary _variables; + public IDictionary Variables + { + get + { + if (this.BaseTheme == null) + { + return _variables; + } + + var baseVars = this.BaseTheme.Variables; + var mergedVars = new Dictionary(baseVars, StringComparer.OrdinalIgnoreCase); + var newVars = new List(); + + foreach (var localVar in _variables) + { + if (mergedVars.ContainsKey(localVar.Key)) + { + // Overridden var in child: update existing. + var baseVar = mergedVars[localVar.Key]; + mergedVars[localVar.Key] = new ThemeVariableInfo + { + Name = baseVar.Name, + Type = baseVar.Type, + SelectRef = baseVar.SelectRef, + DefaultValue = localVar.Value.DefaultValue, + Manifest = localVar.Value.Manifest + }; + } + else + { + // New var in child: add to temp list. + newVars.Add(localVar.Value); + } + } + + var merged = new Dictionary(StringComparer.OrdinalIgnoreCase); + + foreach (var newVar in newVars) + { + // New child theme vars must come first in final list + // to avoid wrong references in existing vars + merged.Add(newVar.Name, newVar); + } + + foreach (var kvp in mergedVars) + { + merged.Add(kvp.Key, kvp.Value); + } + + return merged; + } + internal set => _variables = value; + } + + private Multimap _selects; + public Multimap Selects + { + get + { + if (this.BaseTheme == null) + { + return _selects; + } + + var baseSelects = this.BaseTheme.Selects; + var merged = new Multimap(); + baseSelects.Each(x => merged.AddRange(x.Key, x.Value)); + foreach (var localSelect in _selects) + { + if (!merged.ContainsKey(localSelect.Key)) + { + // New Select in child: add to list. + merged.AddRange(localSelect.Key, localSelect.Value); + } + else + { + // Do nothing: we don't support overriding Selects + } + } + + return merged; + } + internal set => _selects = value; + } + + private ThemeManifestState _state; + public ThemeManifestState State + { + get + { + if (_state == ThemeManifestState.Active) + { + // active state does not mean, that it actually IS active: check state of base themes! + var baseTheme = this.BaseTheme; + while (baseTheme != null) + { + if (baseTheme.State != ThemeManifestState.Active) + { + return baseTheme.State; + } + baseTheme = baseTheme.BaseTheme; + } + } + + return _state; + } + protected internal set => _state = value; + } + + internal string FullPath => System.IO.Path.Combine(this.Path, "theme.config"); + + public override string ToString() + { + return "{0} (Parent: {1}, State: {2})".FormatInvariant(ThemeName, BaseThemeName ?? "-", State.ToString()); + } + + #endregion + + #region Dispose + + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + protected void Dispose(bool disposing) + { + if (disposing) + { + BaseTheme = null; + if (_variables != null) + { + foreach (var pair in _variables) + { + pair.Value.Dispose(); + } + _variables.Clear(); + } + } + } + + ~ThemeManifest() { Dispose(false); } - #endregion - } + #endregion + } - public enum ThemeManifestState - { - MissingBaseTheme = -1, - Active = 0, - } + public enum ThemeManifestState + { + MissingBaseTheme = -1, + Active = 0, + } } diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeManifestMaterializer.cs b/src/Libraries/SmartStore.Core/Themes/ThemeManifestMaterializer.cs index 98f1058002..2c54653a22 100644 --- a/src/Libraries/SmartStore.Core/Themes/ThemeManifestMaterializer.cs +++ b/src/Libraries/SmartStore.Core/Themes/ThemeManifestMaterializer.cs @@ -2,39 +2,38 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Text; using System.Xml; using SmartStore.Collections; namespace SmartStore.Core.Themes -{ +{ internal class ThemeManifestMaterializer { private readonly ThemeManifest _manifest; public ThemeManifestMaterializer(ThemeFolderData folderData) { - Guard.NotNull(folderData, nameof(folderData)); + Guard.NotNull(folderData, nameof(folderData)); _manifest = new ThemeManifest(); - _manifest.ThemeName = folderData.FolderName; - _manifest.BaseThemeName = folderData.BaseTheme; + _manifest.ThemeName = folderData.FolderName; + _manifest.BaseThemeName = folderData.BaseTheme; _manifest.Location = folderData.VirtualBasePath; _manifest.Path = folderData.FullPath; - _manifest.IsSymbolicLink = folderData.IsSymbolicLink; + _manifest.IsSymbolicLink = folderData.IsSymbolicLink; _manifest.ConfigurationNode = folderData.Configuration.DocumentElement; } - + public ThemeManifest Materialize() { var root = _manifest.ConfigurationNode; - _manifest.ThemeTitle = root.GetAttribute("title").NullEmpty() ?? _manifest.ThemeName; + _manifest.ThemeTitle = root.GetAttribute("title").NullEmpty() ?? _manifest.ThemeName; _manifest.PreviewImageUrl = root.GetAttribute("previewImageUrl").NullEmpty() ?? "~/Themes/{0}/preview.png".FormatCurrent(_manifest.ThemeName); _manifest.PreviewText = root.GetAttribute("previewText").ToSafe(); _manifest.Author = root.GetAttribute("author").ToSafe(); - _manifest.Url = root.GetAttribute("url").ToSafe(); + _manifest.Url = root.GetAttribute("url").ToSafe(); _manifest.Version = root.GetAttribute("version").ToSafe().HasValue() ? root.GetAttribute("version") : "1.0"; _manifest.Selects = MaterializeSelects(); @@ -43,9 +42,9 @@ public ThemeManifest Materialize() return _manifest; } - [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] - [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] - private Multimap MaterializeSelects() + [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] + [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] + private Multimap MaterializeSelects() { var selects = new Multimap(); var root = _manifest.ConfigurationNode; @@ -118,12 +117,12 @@ private ThemeVariableInfo MaterializeVariable(XmlElement xel) string selectRef = null; var varType = ConvertVarType(type, xel, out selectRef); - if (varType != ThemeVariableType.String && value.IsEmpty()) - { - throw new SmartException("A value is required for non-string 'Var' elements. Affected: '{0}' - element: {1}", _manifest.FullPath, xel.OuterXml); - } + if (varType != ThemeVariableType.String && value.IsEmpty()) + { + throw new SmartException("A value is required for non-string 'Var' elements. Affected: '{0}' - element: {1}", _manifest.FullPath, xel.OuterXml); + } - var info = new ThemeVariableInfo + var info = new ThemeVariableInfo { Name = name, DefaultValue = value, diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeSwitchedEvent.cs b/src/Libraries/SmartStore.Core/Themes/ThemeSwitchedEvent.cs index c076712e4b..25a50006c9 100644 --- a/src/Libraries/SmartStore.Core/Themes/ThemeSwitchedEvent.cs +++ b/src/Libraries/SmartStore.Core/Themes/ThemeSwitchedEvent.cs @@ -1,6 +1,4 @@ -using System; - -namespace SmartStore.Core.Themes +namespace SmartStore.Core.Themes { public class ThemeSwitchedEvent { diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeTouchedEvent.cs b/src/Libraries/SmartStore.Core/Themes/ThemeTouchedEvent.cs index cdef95b538..7d8622181b 100644 --- a/src/Libraries/SmartStore.Core/Themes/ThemeTouchedEvent.cs +++ b/src/Libraries/SmartStore.Core/Themes/ThemeTouchedEvent.cs @@ -1,15 +1,13 @@ -using System; - -namespace SmartStore.Core.Themes +namespace SmartStore.Core.Themes { - public class ThemeTouchedEvent - { - public ThemeTouchedEvent(string themeName) - { - Guard.NotEmpty(themeName, nameof(themeName)); - this.ThemeName = themeName; - } - - public string ThemeName { get; set; } - } + public class ThemeTouchedEvent + { + public ThemeTouchedEvent(string themeName) + { + Guard.NotEmpty(themeName, nameof(themeName)); + this.ThemeName = themeName; + } + + public string ThemeName { get; set; } + } } diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeVariableInfo.cs b/src/Libraries/SmartStore.Core/Themes/ThemeVariableInfo.cs index 0fbb373a9d..f6609f6cc0 100644 --- a/src/Libraries/SmartStore.Core/Themes/ThemeVariableInfo.cs +++ b/src/Libraries/SmartStore.Core/Themes/ThemeVariableInfo.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace SmartStore.Core.Themes -{ +namespace SmartStore.Core.Themes +{ /// /// Represents deserialized metadata for a theme variable /// diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeVariableType.cs b/src/Libraries/SmartStore.Core/Themes/ThemeVariableType.cs index f07e5cf7ef..a36cb21465 100644 --- a/src/Libraries/SmartStore.Core/Themes/ThemeVariableType.cs +++ b/src/Libraries/SmartStore.Core/Themes/ThemeVariableType.cs @@ -1,6 +1,4 @@ -using System; - -namespace SmartStore.Core.Themes +namespace SmartStore.Core.Themes { public enum ThemeVariableType { diff --git a/src/Libraries/SmartStore.Core/Utilities/ActionDisposable.cs b/src/Libraries/SmartStore.Core/Utilities/ActionDisposable.cs index 8512b7fdcf..b568462120 100644 --- a/src/Libraries/SmartStore.Core/Utilities/ActionDisposable.cs +++ b/src/Libraries/SmartStore.Core/Utilities/ActionDisposable.cs @@ -13,7 +13,7 @@ public struct ActionDisposable : IDisposable public ActionDisposable(Action action) { - Guard.NotNull(action, nameof(action)); + Guard.NotNull(action, nameof(action)); _action = action; } diff --git a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs index f2b87c8b64..0b1cd338e5 100644 --- a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs @@ -3,165 +3,165 @@ using System.Collections.Generic; using System.Configuration; using System.Dynamic; -using System.Linq; using System.Globalization; using System.IO; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Runtime.Serialization.Formatters.Binary; using System.Security.Cryptography; +using System.Text; using System.Web.Hosting; using System.Web.Mvc; -using SmartStore.ComponentModel; -using System.Text; using Newtonsoft.Json; -using System.Runtime.Serialization.Formatters.Binary; -using System.Runtime.CompilerServices; +using SmartStore.ComponentModel; namespace SmartStore.Utilities { public static partial class CommonHelper { - private static bool? _isDevEnvironment; - - [ThreadStatic] - private static Random _random; - - private static Random GetRandomizer() - { - if (_random == null) - { - _random = new Random(); - } - - return _random; - } - - /// + private static bool? _isDevEnvironment; + + [ThreadStatic] + private static Random _random; + + private static Random GetRandomizer() + { + if (_random == null) + { + _random = new Random(); + } + + return _random; + } + + /// /// Generate random digit code /// /// Length /// Result string public static string GenerateRandomDigitCode(int length) { - var buffer = new int[length]; - for (int i = 0; i < length; ++i) - { - buffer[i] = GetRandomizer().Next(10); - } - - return string.Join("", buffer); - } - - /// - /// Returns a random number within the range to - 1. - /// - /// Minimum number - /// Maximum number (exclusive!). - /// Random integer number. - public static int GenerateRandomInteger(int min = 0, int max = 2147483647) - { - var randomNumberBuffer = new byte[10]; - new RNGCryptoServiceProvider().GetBytes(randomNumberBuffer); - return new Random(BitConverter.ToInt32(randomNumberBuffer, 0)).Next(min, max); - } - - /// - /// Maps a virtual path to a physical disk path. - /// - /// The path to map. E.g. "~/bin" - /// Specifies if the app root should be resolved when mapped directory does not exist - /// The physical path. E.g. "c:\inetpub\wwwroot\bin" - /// - /// This method is able to resolve the web application root - /// even when it's called during design-time (e.g. from EF design-time tools). - /// - public static string MapPath(string path, bool findAppRoot = true) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - - if (HostingEnvironment.IsHosted) - { - // hosted - return HostingEnvironment.MapPath(path); - } - else - { - // not hosted. For example, running in unit tests or EF tooling - string baseDirectory = AppDomain.CurrentDomain.BaseDirectory; - path = path.Replace("~/", "").TrimStart('/').Replace('/', '\\'); - - var testPath = Path.Combine(baseDirectory, path); - - if (findAppRoot /* && !Directory.Exists(testPath)*/) - { - // most likely we're in unit tests or design-mode (EF migration scaffolding)... - // find solution root directory first - var dir = FindSolutionRoot(baseDirectory); - - // concat the web root - if (dir != null) - { - baseDirectory = Path.Combine(dir.FullName, "Presentation\\SmartStore.Web"); - testPath = Path.Combine(baseDirectory, path); - } - } - - return testPath; - } - } - - public static bool IsDevEnvironment - { - get - { - if (!_isDevEnvironment.HasValue) - { - _isDevEnvironment = IsDevEnvironmentInternal(); - } - - return _isDevEnvironment.Value; - } - } - - private static bool IsDevEnvironmentInternal() - { - if (!HostingEnvironment.IsHosted) - return true; - - if (HostingEnvironment.IsDevelopmentEnvironment) - return true; - - if (System.Diagnostics.Debugger.IsAttached) - return true; - - // if there's a 'SmartStore.NET.sln' in one of the parent folders, - // then we're likely in a dev environment - if (FindSolutionRoot(HostingEnvironment.MapPath("~/")) != null) - return true; - - return false; - } - - private static DirectoryInfo FindSolutionRoot(string currentDir) - { - var dir = Directory.GetParent(currentDir); - while (true) - { - if (dir == null || IsSolutionRoot(dir)) - break; - - dir = dir.Parent; - } - - return dir; - } - - private static bool IsSolutionRoot(DirectoryInfo dir) - { - return File.Exists(Path.Combine(dir.FullName, "SmartStoreNET.sln")); - } - - public static bool TryConvert(object value, out T convertedValue) - { + var buffer = new int[length]; + for (int i = 0; i < length; ++i) + { + buffer[i] = GetRandomizer().Next(10); + } + + return string.Join("", buffer); + } + + /// + /// Returns a random number within the range to - 1. + /// + /// Minimum number + /// Maximum number (exclusive!). + /// Random integer number. + public static int GenerateRandomInteger(int min = 0, int max = 2147483647) + { + var randomNumberBuffer = new byte[10]; + new RNGCryptoServiceProvider().GetBytes(randomNumberBuffer); + return new Random(BitConverter.ToInt32(randomNumberBuffer, 0)).Next(min, max); + } + + /// + /// Maps a virtual path to a physical disk path. + /// + /// The path to map. E.g. "~/bin" + /// Specifies if the app root should be resolved when mapped directory does not exist + /// The physical path. E.g. "c:\inetpub\wwwroot\bin" + /// + /// This method is able to resolve the web application root + /// even when it's called during design-time (e.g. from EF design-time tools). + /// + public static string MapPath(string path, bool findAppRoot = true) + { + if (path == null) + throw new ArgumentNullException(nameof(path)); + + if (HostingEnvironment.IsHosted) + { + // hosted + return HostingEnvironment.MapPath(path); + } + else + { + // not hosted. For example, running in unit tests or EF tooling + string baseDirectory = AppDomain.CurrentDomain.BaseDirectory; + path = path.Replace("~/", "").TrimStart('/').Replace('/', '\\'); + + var testPath = Path.Combine(baseDirectory, path); + + if (findAppRoot /* && !Directory.Exists(testPath)*/) + { + // most likely we're in unit tests or design-mode (EF migration scaffolding)... + // find solution root directory first + var dir = FindSolutionRoot(baseDirectory); + + // concat the web root + if (dir != null) + { + baseDirectory = Path.Combine(dir.FullName, "Presentation\\SmartStore.Web"); + testPath = Path.Combine(baseDirectory, path); + } + } + + return testPath; + } + } + + public static bool IsDevEnvironment + { + get + { + if (!_isDevEnvironment.HasValue) + { + _isDevEnvironment = IsDevEnvironmentInternal(); + } + + return _isDevEnvironment.Value; + } + } + + private static bool IsDevEnvironmentInternal() + { + if (!HostingEnvironment.IsHosted) + return true; + + if (HostingEnvironment.IsDevelopmentEnvironment) + return true; + + if (System.Diagnostics.Debugger.IsAttached) + return true; + + // if there's a 'SmartStore.NET.sln' in one of the parent folders, + // then we're likely in a dev environment + if (FindSolutionRoot(HostingEnvironment.MapPath("~/")) != null) + return true; + + return false; + } + + private static DirectoryInfo FindSolutionRoot(string currentDir) + { + var dir = Directory.GetParent(currentDir); + while (true) + { + if (dir == null || IsSolutionRoot(dir)) + break; + + dir = dir.Parent; + } + + return dir; + } + + private static bool IsSolutionRoot(DirectoryInfo dir) + { + return File.Exists(Path.Combine(dir.FullName, "SmartStoreNET.sln")); + } + + public static bool TryConvert(object value, out T convertedValue) + { convertedValue = default(T); if (TryConvert(value, typeof(T), CultureInfo.InvariantCulture, out object result)) @@ -190,7 +190,7 @@ public static bool TryConvert(object value, CultureInfo culture, out T conver [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool TryConvert(object value, Type to, out object convertedValue) - { + { return TryConvert(value, to, CultureInfo.InvariantCulture, out convertedValue); } @@ -205,7 +205,7 @@ public static bool TryConvert(object value, Type to, CultureInfo culture, out ob { return to == typeof(string) || to.IsPredefinedSimpleType() == false; } - + if (to != typeof(object) && to.IsInstanceOfType(value)) { convertedValue = value; @@ -246,202 +246,202 @@ public static bool TryConvert(object value, Type to, CultureInfo culture, out ob } public static ExpandoObject ToExpando(object value) - { - Guard.NotNull(value, nameof(value)); - - var anonymousDictionary = HtmlHelper.AnonymousObjectToHtmlAttributes(value); - IDictionary expando = new ExpandoObject(); - foreach (var item in anonymousDictionary) - { - expando.Add(item); - } - return (ExpandoObject)expando; - } - - public static IDictionary ObjectToDictionary(object obj) - { - if (obj == null) - return new Dictionary(); - - return FastProperty.ObjectToDictionary( - obj, - key => key.Replace("_", "-").Replace("@", "")); - } - - /// - /// Gets a setting from the application's web.config appSettings node - /// - /// The type to convert the setting value to - /// The key of the setting - /// The default value to return if the setting does not exist - /// The casted setting value - public static T GetAppSetting(string key, T defValue = default(T)) - { - Guard.NotEmpty(key, nameof(key)); - - var setting = ConfigurationManager.AppSettings[key]; - - if (setting == null) - { - return defValue; - } - - return setting.Convert(); - } - - public static bool HasConnectionString(string connectionStringName) - { - var conString = ConfigurationManager.ConnectionStrings[connectionStringName]; - if (conString != null && conString.ConnectionString.HasValue()) - { - return true; - } - - return false; - } - - private static bool TryAction(Func func, out T output) - { - Guard.NotNull(func, nameof(func)); - - try - { - output = func(); - return true; - } - catch - { - output = default(T); - return false; - } - } - - public static bool IsTruthy(object value) - { - if (value == null) - return false; - - switch (value) - { - case string x: - return x.HasValue(); - case bool x: - return x == true; - case DateTime x: - return x > DateTime.MinValue; - case TimeSpan x: - return x > TimeSpan.MinValue; - case Guid x: - return x != Guid.Empty; - case IComparable x: - return x.CompareTo(0) != 0; - case IEnumerable x: - return x.Any(); - case IEnumerable x: - return x.GetEnumerator().MoveNext(); - } - - if (value.GetType().IsNullable(out var wrappedType)) - { - return IsTruthy(Convert.ChangeType(value, wrappedType)); - } - - return true; - } - - public static long GetObjectSizeInBytes(object obj, HashSet instanceLookup = null) - { - if (obj == null) - return 0; - - var type = obj.GetType(); - var genericArguments = type.GetGenericArguments(); - - long size = 0; - - if (obj is string str) - { - size = Encoding.Default.GetByteCount(str); - } - else if (obj is StringBuilder sb) - { - size = Encoding.Default.GetByteCount(sb.ToString()); - } - else if (type.IsEnum) - { - size = System.Runtime.InteropServices.Marshal.SizeOf(Enum.GetUnderlyingType(type)); - } - else if (type.IsPredefinedSimpleType() || type.IsPredefinedGenericType()) - { - //size = System.Runtime.InteropServices.Marshal.SizeOf(Nullable.GetUnderlyingType(type) ?? type); // crashes often - size = 8; // mean/average - } - else if (obj is Stream stream) - { - size = stream.Length; - } - else if (obj is IDictionary dic) - { - foreach (var item in dic.Values) - { - size += GetObjectSizeInBytes(item, instanceLookup); - } - } - else if (obj is IEnumerable e) - { - foreach (var item in e) - { - size += GetObjectSizeInBytes(item, instanceLookup); - } - } - else - { - if (instanceLookup == null) - { - instanceLookup = new HashSet(ReferenceEqualityComparer.Default); - } - - if (!type.IsValueType && instanceLookup.Contains(obj)) - { - return 0; - } - - instanceLookup.Add(obj); - - var serialized = false; - - if (type.IsSerializable && genericArguments.All(x => x.IsSerializable)) - { - try - { - using (var s = new MemoryStream()) - { - var formatter = new BinaryFormatter(); - formatter.Serialize(s, obj); - size = s.Length; - - serialized = true; - } - } - catch { } - } - - if (!serialized) - { - // Serialization failed or is not supported: make JSON. - var json = JsonConvert.SerializeObject(obj, new JsonSerializerSettings - { + { + Guard.NotNull(value, nameof(value)); + + var anonymousDictionary = HtmlHelper.AnonymousObjectToHtmlAttributes(value); + IDictionary expando = new ExpandoObject(); + foreach (var item in anonymousDictionary) + { + expando.Add(item); + } + return (ExpandoObject)expando; + } + + public static IDictionary ObjectToDictionary(object obj) + { + if (obj == null) + return new Dictionary(); + + return FastProperty.ObjectToDictionary( + obj, + key => key.Replace("_", "-").Replace("@", "")); + } + + /// + /// Gets a setting from the application's web.config appSettings node + /// + /// The type to convert the setting value to + /// The key of the setting + /// The default value to return if the setting does not exist + /// The casted setting value + public static T GetAppSetting(string key, T defValue = default(T)) + { + Guard.NotEmpty(key, nameof(key)); + + var setting = ConfigurationManager.AppSettings[key]; + + if (setting == null) + { + return defValue; + } + + return setting.Convert(); + } + + public static bool HasConnectionString(string connectionStringName) + { + var conString = ConfigurationManager.ConnectionStrings[connectionStringName]; + if (conString != null && conString.ConnectionString.HasValue()) + { + return true; + } + + return false; + } + + private static bool TryAction(Func func, out T output) + { + Guard.NotNull(func, nameof(func)); + + try + { + output = func(); + return true; + } + catch + { + output = default(T); + return false; + } + } + + public static bool IsTruthy(object value) + { + if (value == null) + return false; + + switch (value) + { + case string x: + return x.HasValue(); + case bool x: + return x == true; + case DateTime x: + return x > DateTime.MinValue; + case TimeSpan x: + return x > TimeSpan.MinValue; + case Guid x: + return x != Guid.Empty; + case IComparable x: + return x.CompareTo(0) != 0; + case IEnumerable x: + return x.Any(); + case IEnumerable x: + return x.GetEnumerator().MoveNext(); + } + + if (value.GetType().IsNullable(out var wrappedType)) + { + return IsTruthy(Convert.ChangeType(value, wrappedType)); + } + + return true; + } + + public static long GetObjectSizeInBytes(object obj, HashSet instanceLookup = null) + { + if (obj == null) + return 0; + + var type = obj.GetType(); + var genericArguments = type.GetGenericArguments(); + + long size = 0; + + if (obj is string str) + { + size = Encoding.Default.GetByteCount(str); + } + else if (obj is StringBuilder sb) + { + size = Encoding.Default.GetByteCount(sb.ToString()); + } + else if (type.IsEnum) + { + size = System.Runtime.InteropServices.Marshal.SizeOf(Enum.GetUnderlyingType(type)); + } + else if (type.IsPredefinedSimpleType() || type.IsPredefinedGenericType()) + { + //size = System.Runtime.InteropServices.Marshal.SizeOf(Nullable.GetUnderlyingType(type) ?? type); // crashes often + size = 8; // mean/average + } + else if (obj is Stream stream) + { + size = stream.Length; + } + else if (obj is IDictionary dic) + { + foreach (var item in dic.Values) + { + size += GetObjectSizeInBytes(item, instanceLookup); + } + } + else if (obj is IEnumerable e) + { + foreach (var item in e) + { + size += GetObjectSizeInBytes(item, instanceLookup); + } + } + else + { + if (instanceLookup == null) + { + instanceLookup = new HashSet(ReferenceEqualityComparer.Default); + } + + if (!type.IsValueType && instanceLookup.Contains(obj)) + { + return 0; + } + + instanceLookup.Add(obj); + + var serialized = false; + + if (type.IsSerializable && genericArguments.All(x => x.IsSerializable)) + { + try + { + using (var s = new MemoryStream()) + { + var formatter = new BinaryFormatter(); + formatter.Serialize(s, obj); + size = s.Length; + + serialized = true; + } + } + catch { } + } + + if (!serialized) + { + // Serialization failed or is not supported: make JSON. + var json = JsonConvert.SerializeObject(obj, new JsonSerializerSettings + { ContractResolver = SmartContractResolver.Instance, DateFormatHandling = DateFormatHandling.IsoDateFormat, - DateTimeZoneHandling = DateTimeZoneHandling.Utc, - MaxDepth = 10, - ReferenceLoopHandling = ReferenceLoopHandling.Ignore - }); - size = Encoding.Default.GetByteCount(json); - } - } - - return size; - } - } + DateTimeZoneHandling = DateTimeZoneHandling.Utc, + MaxDepth = 10, + ReferenceLoopHandling = ReferenceLoopHandling.Ignore + }); + size = Encoding.Default.GetByteCount(json); + } + } + + return size; + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/DictionaryConverter.cs b/src/Libraries/SmartStore.Core/Utilities/DictionaryConverter.cs index d60545f8fa..80417db07f 100644 --- a/src/Libraries/SmartStore.Core/Utilities/DictionaryConverter.cs +++ b/src/Libraries/SmartStore.Core/Utilities/DictionaryConverter.cs @@ -1,10 +1,10 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Collections; using System.Reflection; using System.Runtime.Serialization; +using System.Text; using SmartStore.ComponentModel; namespace SmartStore.Utilities @@ -140,7 +140,7 @@ public static void Populate(IDictionary source, object target, o { foreach (var fastProp in FastProperty.GetProperties(t).Values) { - var pi = fastProp.Property; + var pi = fastProp.Property; if (!pi.PropertyType.IsPredefinedSimpleType() && source.TryGetValue(pi.Name, out var value) && value is IDictionary) { @@ -197,7 +197,7 @@ private static object RetrieveArrayValues(PropertyInfo arrayProp, IDictionary problems) { - var pi = prop.Property; + var pi = prop.Property; - if (!pi.CanWrite) + if (!pi.CanWrite) return; try diff --git a/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs b/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs index 18ba757bb1..fd56c6faff 100644 --- a/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs +++ b/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs @@ -15,150 +15,150 @@ namespace SmartStore.Utilities { - public class FileDownloadManager - { - private const int _bufferSize = 16384; - - private readonly HttpRequestBase _httpRequest; - - public FileDownloadManager(HttpRequestBase httpRequest) - { - _httpRequest = httpRequest; - } - - /// - /// Downloads a single file synchronously - /// - /// The URL to download the file from (either a fully qualified URL or an app relative/absolute path) - /// Specifies whether the FormsAuthenticationCookie should be sent - /// Timeout in milliseconds - /// Specifiers whether the file is located on the local server - public FileDownloadResponse DownloadFile(string url, bool sendAuthCookie = false, int? timeout = null, bool isLocal = false) - { - Guard.NotEmpty(url, nameof(url)); - - url = WebHelper.GetAbsoluteUrl(url, _httpRequest); - - HttpWebRequest req; - - if (isLocal) - { - req = WebHelper.CreateHttpRequestForSafeLocalCall(new Uri(url)); - } - else - { - req = WebRequest.CreateHttp(url); - req.UserAgent = "Smartstore"; - } - - if (timeout.HasValue) - { - req.Timeout = timeout.Value; - } - - if (sendAuthCookie) - { - req.SetFormsAuthenticationCookie(_httpRequest); - req.SetAnonymousIdentCookie(_httpRequest); + public class FileDownloadManager + { + private const int _bufferSize = 16384; + + private readonly HttpRequestBase _httpRequest; + + public FileDownloadManager(HttpRequestBase httpRequest) + { + _httpRequest = httpRequest; + } + + /// + /// Downloads a single file synchronously + /// + /// The URL to download the file from (either a fully qualified URL or an app relative/absolute path) + /// Specifies whether the FormsAuthenticationCookie should be sent + /// Timeout in milliseconds + /// Specifiers whether the file is located on the local server + public FileDownloadResponse DownloadFile(string url, bool sendAuthCookie = false, int? timeout = null, bool isLocal = false) + { + Guard.NotEmpty(url, nameof(url)); + + url = WebHelper.GetAbsoluteUrl(url, _httpRequest); + + HttpWebRequest req; + + if (isLocal) + { + req = WebHelper.CreateHttpRequestForSafeLocalCall(new Uri(url)); + } + else + { + req = WebRequest.CreateHttp(url); + req.UserAgent = "Smartstore"; + } + + if (timeout.HasValue) + { + req.Timeout = timeout.Value; + } + + if (sendAuthCookie) + { + req.SetFormsAuthenticationCookie(_httpRequest); + req.SetAnonymousIdentCookie(_httpRequest); req.SetVisitorCookie(_httpRequest); - } - - using (var resp = (HttpWebResponse)req.GetResponse()) - using (var stream = resp.GetResponseStream()) - { - if (resp.StatusCode == HttpStatusCode.OK) - { - var data = stream.ToByteArray(); - if (data != null && data.Length != 0) - { - string fileName = null; - - var contentDisposition = resp.Headers["Content-Disposition"]; - if (contentDisposition.HasValue()) - { - var cd = new ContentDisposition(contentDisposition); - fileName = cd.FileName; - } - - if (fileName.IsEmpty()) - { - try - { - var uri = new Uri(url); - fileName = Path.GetFileName(uri.LocalPath); - } - catch { } - } - - return new FileDownloadResponse(data, fileName, resp.ContentType); - } - } - } - - return null; - } - - /// - /// Starts asynchronous download of files and saves them to disk - /// - /// Download context - /// Items to be downloaded - public async Task DownloadAsync(FileDownloadManagerContext context, IEnumerable items) - { - await DownloadFilesAsync(context, items); - } - - private async Task DownloadFilesAsync(FileDownloadManagerContext context, IEnumerable items) - { - try - { - using (var client = new HttpClient()) - { - client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue(); - client.DefaultRequestHeaders.CacheControl.NoCache = true; - client.DefaultRequestHeaders.Add("Connection", "Keep-alive"); - - if (context.Timeout.TotalMilliseconds > 0 && context.Timeout != Timeout.InfiniteTimeSpan) - client.Timeout = context.Timeout; - - IEnumerable downloadTasksQuery = - from item in items - select ProcessUrl(context, client, item); - - // now execute the bunch - List downloadTasks = downloadTasksQuery.ToList(); - - while (downloadTasks.Count > 0) - { - // identify the first task that completes - Task firstFinishedTask = await Task.WhenAny(downloadTasks); - - // process only once - downloadTasks.Remove(firstFinishedTask); - - await firstFinishedTask; - } - } - } - catch (Exception ex) - { + } + + using (var resp = (HttpWebResponse)req.GetResponse()) + using (var stream = resp.GetResponseStream()) + { + if (resp.StatusCode == HttpStatusCode.OK) + { + var data = stream.ToByteArray(); + if (data != null && data.Length != 0) + { + string fileName = null; + + var contentDisposition = resp.Headers["Content-Disposition"]; + if (contentDisposition.HasValue()) + { + var cd = new ContentDisposition(contentDisposition); + fileName = cd.FileName; + } + + if (fileName.IsEmpty()) + { + try + { + var uri = new Uri(url); + fileName = Path.GetFileName(uri.LocalPath); + } + catch { } + } + + return new FileDownloadResponse(data, fileName, resp.ContentType); + } + } + } + + return null; + } + + /// + /// Starts asynchronous download of files and saves them to disk + /// + /// Download context + /// Items to be downloaded + public async Task DownloadAsync(FileDownloadManagerContext context, IEnumerable items) + { + await DownloadFilesAsync(context, items); + } + + private async Task DownloadFilesAsync(FileDownloadManagerContext context, IEnumerable items) + { + try + { + using (var client = new HttpClient()) + { + client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue(); + client.DefaultRequestHeaders.CacheControl.NoCache = true; + client.DefaultRequestHeaders.Add("Connection", "Keep-alive"); + + if (context.Timeout.TotalMilliseconds > 0 && context.Timeout != Timeout.InfiniteTimeSpan) + client.Timeout = context.Timeout; + + IEnumerable downloadTasksQuery = + from item in items + select ProcessUrl(context, client, item); + + // now execute the bunch + List downloadTasks = downloadTasksQuery.ToList(); + + while (downloadTasks.Count > 0) + { + // identify the first task that completes + Task firstFinishedTask = await Task.WhenAny(downloadTasks); + + // process only once + downloadTasks.Remove(firstFinishedTask); + + await firstFinishedTask; + } + } + } + catch (Exception ex) + { if (context.Logger != null) { context.Logger.ErrorsAll(ex); } - } - } - - private async Task ProcessUrl(FileDownloadManagerContext context, HttpClient client, FileDownloadManagerItem item) - { - try - { - var count = 0; - var canceled = false; - var bytes = new byte[_bufferSize]; - - using (var response = await client.GetAsync(item.Url)) - { + } + } + + private async Task ProcessUrl(FileDownloadManagerContext context, HttpClient client, FileDownloadManagerItem item) + { + try + { + var count = 0; + var canceled = false; + var bytes = new byte[_bufferSize]; + + using (var response = await client.GetAsync(item.Url)) + { if (response.IsSuccessStatusCode) { if (response.Content.Headers.ContentType != null) @@ -200,15 +200,15 @@ private async Task ProcessUrl(FileDownloadManagerContext context, HttpClient cli item.ErrorMessage = response.StatusCode.ToString(); } } - } - catch (Exception ex) - { - try - { - item.Success = false; - item.ErrorMessage = ex.ToAllMessages(); - - var webExc = ex.InnerException as WebException; + } + catch (Exception ex) + { + try + { + item.Success = false; + item.ErrorMessage = ex.ToAllMessages(); + + var webExc = ex.InnerException as WebException; if (webExc != null) { item.ExceptionStatus = webExc.Status; @@ -218,135 +218,129 @@ private async Task ProcessUrl(FileDownloadManagerContext context, HttpClient cli { context.Logger.Error(ex, item.ToString()); } - } - catch { } - } - } - } - - - public class FileDownloadResponse - { - public FileDownloadResponse(byte[] data, string fileName, string contentType) - { - Guard.NotNull(data, nameof(data)); - - Data = data; - FileName = fileName; - ContentType = contentType; - } - - /// - /// The downloaded file's byte array - /// - public byte[] Data { get; private set; } - - /// - /// The file name - /// - public string FileName { get; private set; } - - /// - /// The mime type opf the downloaded file - /// - public string ContentType { get; private set; } - } - - public class FileDownloadManagerContext - { - /// - /// Optional logger to log errors - /// - public ILogger Logger { get; set; } - - /// - /// Cancellation token - /// - public CancellationToken CancellationToken { get; set; } - - /// - /// Timeout for the HTTP client - /// - public TimeSpan Timeout { get; set; } - } - - public class FileDownloadManagerItem - { - /// - /// Identifier of the item - /// - public int Id { get; set; } - - /// - /// New identifier of the downloaded item - /// - public int NewId { get; set; } - - /// - /// Display order of the item - /// - public int DisplayOrder { get; set; } - - /// - /// Download URL - /// - public string Url { get; set; } - - /// - /// Absolute path for saving the item - /// - public string Path { get; set; } - - /// - /// File name without file extension - /// - public string FileName { get; set; } - - /// - /// Mime type of the item - /// - public string MimeType { get; set; } - - /// - /// Whether the operation succeeded - /// - public bool? Success { get; set; } - - /// - /// Exception status if an exception of type WebException occurred - /// - public WebExceptionStatus ExceptionStatus { get; set; } - - /// - /// Error message - /// - public string ErrorMessage { get; set; } - - /// - /// Whether the operation timed out - /// - public bool HasTimedOut - { - get - { - return ExceptionStatus == WebExceptionStatus.Timeout || ExceptionStatus == WebExceptionStatus.RequestCanceled; - } - } - - /// - /// Use dictionary for any required extra data - /// - public IDictionary CustomProperties { get; set; } - - public override string ToString() - { - var str = "Result: {0} {1}{2}, {3}".FormatInvariant( - Success, - ExceptionStatus.ToString(), - ErrorMessage.HasValue() ? " ({0})".FormatInvariant(ErrorMessage) : "", - Path); - - return str; - } - } + } + catch { } + } + } + } + + + public class FileDownloadResponse + { + public FileDownloadResponse(byte[] data, string fileName, string contentType) + { + Guard.NotNull(data, nameof(data)); + + Data = data; + FileName = fileName; + ContentType = contentType; + } + + /// + /// The downloaded file's byte array + /// + public byte[] Data { get; private set; } + + /// + /// The file name + /// + public string FileName { get; private set; } + + /// + /// The mime type opf the downloaded file + /// + public string ContentType { get; private set; } + } + + public class FileDownloadManagerContext + { + /// + /// Optional logger to log errors + /// + public ILogger Logger { get; set; } + + /// + /// Cancellation token + /// + public CancellationToken CancellationToken { get; set; } + + /// + /// Timeout for the HTTP client + /// + public TimeSpan Timeout { get; set; } + } + + public class FileDownloadManagerItem + { + /// + /// Identifier of the item + /// + public int Id { get; set; } + + /// + /// New identifier of the downloaded item + /// + public int NewId { get; set; } + + /// + /// Display order of the item + /// + public int DisplayOrder { get; set; } + + /// + /// Download URL + /// + public string Url { get; set; } + + /// + /// Absolute path for saving the item + /// + public string Path { get; set; } + + /// + /// File name without file extension + /// + public string FileName { get; set; } + + /// + /// Mime type of the item + /// + public string MimeType { get; set; } + + /// + /// Whether the operation succeeded + /// + public bool? Success { get; set; } + + /// + /// Exception status if an exception of type WebException occurred + /// + public WebExceptionStatus ExceptionStatus { get; set; } + + /// + /// Error message + /// + public string ErrorMessage { get; set; } + + /// + /// Whether the operation timed out + /// + public bool HasTimedOut => ExceptionStatus == WebExceptionStatus.Timeout || ExceptionStatus == WebExceptionStatus.RequestCanceled; + + /// + /// Use dictionary for any required extra data + /// + public IDictionary CustomProperties { get; set; } + + public override string ToString() + { + var str = "Result: {0} {1}{2}, {3}".FormatInvariant( + Success, + ExceptionStatus.ToString(), + ErrorMessage.HasValue() ? " ({0})".FormatInvariant(ErrorMessage) : "", + Path); + + return str; + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Utilities/FileSystemHelper.cs b/src/Libraries/SmartStore.Core/Utilities/FileSystemHelper.cs index 59bdf70326..3eafe1afae 100644 --- a/src/Libraries/SmartStore.Core/Utilities/FileSystemHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/FileSystemHelper.cs @@ -1,321 +1,319 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; -using System.Threading; using SmartStore.Core.Data; namespace SmartStore.Utilities { public static class FileSystemHelper - { - private static readonly string _pathTemp = CommonHelper.MapPath(CommonHelper.GetAppSetting("sm:TempDirectory", "~/App_Data/_temp")); - private static readonly string _pathTempTenant = CommonHelper.MapPath(DataSettings.Current.TenantPath + "/_temp"); - - /// - /// Returns physical path to application temp directory - /// - /// Name of a sub directory to be created and returned (optional) - public static string TempDir(string subDirectory = null) - { - return TempDirInternal(_pathTemp, subDirectory); - } - - /// - /// Returns physical path to current tenant temp directory - /// - /// Name of a sub directory to be created and returned (optional) - public static string TempDirTenant(string subDirectory = null) - { - return TempDirInternal(_pathTempTenant, subDirectory); - } - - private static string TempDirInternal(string path, string subDirectory = null) - { - if (!Directory.Exists(path)) - { - Directory.CreateDirectory(path); - } - - if (subDirectory.HasValue()) - { - path = Path.Combine(path, subDirectory); - - if (!Directory.Exists(path)) - { - Directory.CreateDirectory(path); - } - } - - return path; - } + { + private static readonly string _pathTemp = CommonHelper.MapPath(CommonHelper.GetAppSetting("sm:TempDirectory", "~/App_Data/_temp")); + private static readonly string _pathTempTenant = CommonHelper.MapPath(DataSettings.Current.TenantPath + "/_temp"); + + /// + /// Returns physical path to application temp directory + /// + /// Name of a sub directory to be created and returned (optional) + public static string TempDir(string subDirectory = null) + { + return TempDirInternal(_pathTemp, subDirectory); + } + + /// + /// Returns physical path to current tenant temp directory + /// + /// Name of a sub directory to be created and returned (optional) + public static string TempDirTenant(string subDirectory = null) + { + return TempDirInternal(_pathTempTenant, subDirectory); + } + + private static string TempDirInternal(string path, string subDirectory = null) + { + if (!Directory.Exists(path)) + { + Directory.CreateDirectory(path); + } + + if (subDirectory.HasValue()) + { + path = Path.Combine(path, subDirectory); + + if (!Directory.Exists(path)) + { + Directory.CreateDirectory(path); + } + } + + return path; + } /// /// Safe way to cleanup temporary directories. Should be called via scheduled task. /// public static void ClearTempDirectories() - { - var olderThan = TimeSpan.FromHours(5); - - ClearDirectory(new DirectoryInfo(TempDir()), false, olderThan); - ClearDirectory(new DirectoryInfo(TempDirTenant()), false, olderThan); - } - - /// - /// Safe way to delete all directory content - /// - /// Directory path - /// Delete dir too if it doesn't contain any entries after deletion anymore - /// Delete only files older than this TimeSpan - /// Name of files not to be deleted - public static void ClearDirectory(string path, bool deleteIfEmpfy, TimeSpan olderThan, params string[] exceptFileNames) - { - if (path.IsEmpty()) - return; - - ClearDirectory(new DirectoryInfo(path), deleteIfEmpfy, olderThan, exceptFileNames); - } - - /// - /// Safe way to delete all directory content - /// - /// Directory path - /// Delete dir too if it doesn't contain any entries after deletion anymore - /// Name of files not to be deleted - public static void ClearDirectory(string path, bool deleteIfEmpfy, params string[] exceptFileNames) - { - if (path.IsEmpty()) - return; - - ClearDirectory(new DirectoryInfo(path), deleteIfEmpfy, TimeSpan.Zero, exceptFileNames); - } - - /// - /// Safe way to delete all directory content - /// - /// Directory info object - /// Delete dir too if it doesn't contain any entries after deletion anymore - /// Name of files not to be deleted - public static void ClearDirectory(DirectoryInfo dir, bool deleteIfEmpfy, params string[] exceptFileNames) - { - Guard.NotNull(dir, nameof(dir)); - - ClearDirectory(dir, deleteIfEmpfy, TimeSpan.Zero, exceptFileNames); - } - - /// - /// Safe way to delete all directory content - /// - /// Directory info object - /// Delete dir too if it doesn't contain any entries after deletion anymore - /// Delete only files older than this TimeSpan - /// Name of files not to be deleted - public static void ClearDirectory(DirectoryInfo dir, bool deleteIfEmpfy, TimeSpan olderThan, params string[] exceptFileNames) - { - Guard.NotNull(dir, nameof(dir)); - - if (!dir.Exists) - return; - - var olderThanDate = DateTime.UtcNow.Subtract(olderThan); - - for (int i = 0; i < 10; i++) - { - try - { - foreach (var fsi in dir.EnumerateFileSystemInfos()) - { - if (fsi is FileInfo file) - { - if (file.LastWriteTimeUtc >= olderThanDate) - continue; - - if (exceptFileNames.Any(x => x.IsCaseInsensitiveEqual(file.Name))) - continue; - - if (file.IsReadOnly) - { - file.IsReadOnly = false; - } - - file.Delete(); - } - else if (fsi is DirectoryInfo subDir) - { - ClearDirectory(subDir, true, olderThan, exceptFileNames); - } - - } - - break; - } - catch (Exception ex) - { - ex.Dump(); - } - } - - if (deleteIfEmpfy) - { - try - { - if (!dir.EnumerateFileSystemInfos().Any()) - { - dir.Delete(true); - } - } - catch (Exception ex) - { - ex.Dump(); - } - } - } - - /// - /// Safe way to delete a file. - /// - public static bool DeleteFile(string path) - { - if (path.IsEmpty()) - return true; - - try - { - if (Directory.Exists(path)) - { - throw new UnauthorizedAccessException("Deleting folders not possible due to security reasons: {0}".FormatWith(path)); - } - - // No exception, if file doesn't exists - File.Delete(path); - return true; - } - catch (Exception ex) - { - ex.Dump(); - return false; - } - } - - /// - /// Safe way to copy a file. - /// - public static bool CopyFile(string sourcePath, string destinationPath, bool overwrite = true, bool deleteSource = false) - { - bool result = true; - try - { - File.Copy(sourcePath, destinationPath, overwrite); - - if (deleteSource) - DeleteFile(sourcePath); - } - catch (Exception exc) - { - result = false; - exc.Dump(); - } - - return result; - } - - /// - /// Safe way to copy a directory and all content. - /// - /// Source directory - /// Target directory - /// Whether to overwrite existing files - public static bool CopyDirectory(DirectoryInfo source, DirectoryInfo target, bool overwrite = true) - { - if (target.FullName.EnsureEndsWith("\\").StartsWith(source.FullName.EnsureEndsWith("\\"), StringComparison.CurrentCultureIgnoreCase)) - { - // Cannot copy a folder into itself. - return false; - } - - var result = true; - - foreach (FileInfo fi in source.GetFiles()) - { - try - { - fi.CopyTo(Path.Combine(target.ToString(), fi.Name), overwrite); - } - catch (Exception ex) - { - result = false; - ex.Dump(); - } - } - - foreach (DirectoryInfo sourceSubDir in source.GetDirectories()) - { - try - { - DirectoryInfo targetSubDir = target.CreateSubdirectory(sourceSubDir.Name); - CopyDirectory(sourceSubDir, targetSubDir, overwrite); - } - catch (Exception ex) - { - result = false; - ex.Dump(); - } - } - - return result; - } - - /// - /// Creates a non existing directory name - /// - /// Path of a directory - /// Default name for directory. null to use a guid. - /// Non existing directory name - public static string CreateNonExistingDirectoryName(string directoryPath, string defaultName) - { - if (defaultName.IsEmpty()) - defaultName = Guid.NewGuid().ToString(); - - if (directoryPath.IsEmpty() || !Directory.Exists(directoryPath)) - return defaultName; - - var newName = defaultName; - - for (int i = 1; i < 999999 && Directory.Exists(Path.Combine(directoryPath, newName)); ++i) - { - newName = defaultName + i.ToString(); - } - - return newName; - } - - /// - /// Safe way to count files in a directory - /// - /// A directory path - /// File count - public static int CountFiles(string directoryPath) - { - try - { - return Directory.GetFiles(directoryPath).Length; - } - catch { } - - return 0; - } - - /// - /// Safe way to empty a file - /// - /// File path - public static void ClearFile(string path) - { - try - { - if (path.HasValue()) File.WriteAllText(path, ""); - } - catch { } - } - } + { + var olderThan = TimeSpan.FromHours(5); + + ClearDirectory(new DirectoryInfo(TempDir()), false, olderThan); + ClearDirectory(new DirectoryInfo(TempDirTenant()), false, olderThan); + } + + /// + /// Safe way to delete all directory content + /// + /// Directory path + /// Delete dir too if it doesn't contain any entries after deletion anymore + /// Delete only files older than this TimeSpan + /// Name of files not to be deleted + public static void ClearDirectory(string path, bool deleteIfEmpfy, TimeSpan olderThan, params string[] exceptFileNames) + { + if (path.IsEmpty()) + return; + + ClearDirectory(new DirectoryInfo(path), deleteIfEmpfy, olderThan, exceptFileNames); + } + + /// + /// Safe way to delete all directory content + /// + /// Directory path + /// Delete dir too if it doesn't contain any entries after deletion anymore + /// Name of files not to be deleted + public static void ClearDirectory(string path, bool deleteIfEmpfy, params string[] exceptFileNames) + { + if (path.IsEmpty()) + return; + + ClearDirectory(new DirectoryInfo(path), deleteIfEmpfy, TimeSpan.Zero, exceptFileNames); + } + + /// + /// Safe way to delete all directory content + /// + /// Directory info object + /// Delete dir too if it doesn't contain any entries after deletion anymore + /// Name of files not to be deleted + public static void ClearDirectory(DirectoryInfo dir, bool deleteIfEmpfy, params string[] exceptFileNames) + { + Guard.NotNull(dir, nameof(dir)); + + ClearDirectory(dir, deleteIfEmpfy, TimeSpan.Zero, exceptFileNames); + } + + /// + /// Safe way to delete all directory content + /// + /// Directory info object + /// Delete dir too if it doesn't contain any entries after deletion anymore + /// Delete only files older than this TimeSpan + /// Name of files not to be deleted + public static void ClearDirectory(DirectoryInfo dir, bool deleteIfEmpfy, TimeSpan olderThan, params string[] exceptFileNames) + { + Guard.NotNull(dir, nameof(dir)); + + if (!dir.Exists) + return; + + var olderThanDate = DateTime.UtcNow.Subtract(olderThan); + + for (int i = 0; i < 10; i++) + { + try + { + foreach (var fsi in dir.EnumerateFileSystemInfos()) + { + if (fsi is FileInfo file) + { + if (file.LastWriteTimeUtc >= olderThanDate) + continue; + + if (exceptFileNames.Any(x => x.IsCaseInsensitiveEqual(file.Name))) + continue; + + if (file.IsReadOnly) + { + file.IsReadOnly = false; + } + + file.Delete(); + } + else if (fsi is DirectoryInfo subDir) + { + ClearDirectory(subDir, true, olderThan, exceptFileNames); + } + + } + + break; + } + catch (Exception ex) + { + ex.Dump(); + } + } + + if (deleteIfEmpfy) + { + try + { + if (!dir.EnumerateFileSystemInfos().Any()) + { + dir.Delete(true); + } + } + catch (Exception ex) + { + ex.Dump(); + } + } + } + + /// + /// Safe way to delete a file. + /// + public static bool DeleteFile(string path) + { + if (path.IsEmpty()) + return true; + + try + { + if (Directory.Exists(path)) + { + throw new UnauthorizedAccessException("Deleting folders not possible due to security reasons: {0}".FormatWith(path)); + } + + // No exception, if file doesn't exists + File.Delete(path); + return true; + } + catch (Exception ex) + { + ex.Dump(); + return false; + } + } + + /// + /// Safe way to copy a file. + /// + public static bool CopyFile(string sourcePath, string destinationPath, bool overwrite = true, bool deleteSource = false) + { + bool result = true; + try + { + File.Copy(sourcePath, destinationPath, overwrite); + + if (deleteSource) + DeleteFile(sourcePath); + } + catch (Exception exc) + { + result = false; + exc.Dump(); + } + + return result; + } + + /// + /// Safe way to copy a directory and all content. + /// + /// Source directory + /// Target directory + /// Whether to overwrite existing files + public static bool CopyDirectory(DirectoryInfo source, DirectoryInfo target, bool overwrite = true) + { + if (target.FullName.EnsureEndsWith("\\").StartsWith(source.FullName.EnsureEndsWith("\\"), StringComparison.CurrentCultureIgnoreCase)) + { + // Cannot copy a folder into itself. + return false; + } + + var result = true; + + foreach (FileInfo fi in source.GetFiles()) + { + try + { + fi.CopyTo(Path.Combine(target.ToString(), fi.Name), overwrite); + } + catch (Exception ex) + { + result = false; + ex.Dump(); + } + } + + foreach (DirectoryInfo sourceSubDir in source.GetDirectories()) + { + try + { + DirectoryInfo targetSubDir = target.CreateSubdirectory(sourceSubDir.Name); + CopyDirectory(sourceSubDir, targetSubDir, overwrite); + } + catch (Exception ex) + { + result = false; + ex.Dump(); + } + } + + return result; + } + + /// + /// Creates a non existing directory name + /// + /// Path of a directory + /// Default name for directory. null to use a guid. + /// Non existing directory name + public static string CreateNonExistingDirectoryName(string directoryPath, string defaultName) + { + if (defaultName.IsEmpty()) + defaultName = Guid.NewGuid().ToString(); + + if (directoryPath.IsEmpty() || !Directory.Exists(directoryPath)) + return defaultName; + + var newName = defaultName; + + for (int i = 1; i < 999999 && Directory.Exists(Path.Combine(directoryPath, newName)); ++i) + { + newName = defaultName + i.ToString(); + } + + return newName; + } + + /// + /// Safe way to count files in a directory + /// + /// A directory path + /// File count + public static int CountFiles(string directoryPath) + { + try + { + return Directory.GetFiles(directoryPath).Length; + } + catch { } + + return 0; + } + + /// + /// Safe way to empty a file + /// + /// File path + public static void ClearFile(string path) + { + try + { + if (path.HasValue()) File.WriteAllText(path, ""); + } + catch { } + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/HashCodeCombiner.cs b/src/Libraries/SmartStore.Core/Utilities/HashCodeCombiner.cs index e5f178c72f..a3627f2a66 100644 --- a/src/Libraries/SmartStore.Core/Utilities/HashCodeCombiner.cs +++ b/src/Libraries/SmartStore.Core/Utilities/HashCodeCombiner.cs @@ -11,126 +11,126 @@ Copied over from Microsoft.Framework.Internal namespace SmartStore.Utilities { - public struct HashCodeCombiner - { - private long _combinedHash64; - - public int CombinedHash - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - get { return _combinedHash64.GetHashCode(); } - } - - public string CombinedHashString - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - get { return _combinedHash64.GetHashCode().ToString("x", CultureInfo.InvariantCulture); } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private HashCodeCombiner(long seed) - { - _combinedHash64 = seed; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public HashCodeCombiner Add(IEnumerable e) - { - if (e == null) - { - Add(0); - } - else - { - var count = 0; - foreach (object o in e) - { - Add(o); - count++; - } - Add(count); - } - return this; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static implicit operator int (HashCodeCombiner self) - { - return self.CombinedHash; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public HashCodeCombiner Add(int i) - { - _combinedHash64 = ((_combinedHash64 << 5) + _combinedHash64) ^ i; - return this; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public HashCodeCombiner Add(string s) - { - var hashCode = (s != null) ? s.GetHashCode() : 0; - return Add(hashCode); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public HashCodeCombiner Add(object o) - { - var hashCode = (o != null) ? o.GetHashCode() : 0; - return Add(hashCode); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public HashCodeCombiner Add(DateTime d) - { - return Add(d.GetHashCode()); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public HashCodeCombiner Add(TValue value, IEqualityComparer comparer) - { - var hashCode = value != null ? comparer.GetHashCode(value) : 0; - return Add(hashCode); - } - - public HashCodeCombiner Add(FileSystemInfo fi, bool deep = true) - { - Guard.NotNull(fi, nameof(fi)); - - if (!fi.Exists) - return this; - - Add(fi.FullName.ToLower()); - Add(fi.CreationTimeUtc); - Add(fi.LastWriteTimeUtc); - - if (fi is FileInfo file) - { - Add(file.Length.GetHashCode()); - } - - if (fi is DirectoryInfo dir) - { - foreach (var f in dir.GetFiles()) - { - Add(f); - } - if (deep) - { - foreach (var s in dir.GetDirectories()) - { - Add(s); - } - } - } - - return this; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static HashCodeCombiner Start() - { - return new HashCodeCombiner(0x1505L); - } - } + public struct HashCodeCombiner + { + private long _combinedHash64; + + public int CombinedHash + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get => _combinedHash64.GetHashCode(); + } + + public string CombinedHashString + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get => _combinedHash64.GetHashCode().ToString("x", CultureInfo.InvariantCulture); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private HashCodeCombiner(long seed) + { + _combinedHash64 = seed; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public HashCodeCombiner Add(IEnumerable e) + { + if (e == null) + { + Add(0); + } + else + { + var count = 0; + foreach (object o in e) + { + Add(o); + count++; + } + Add(count); + } + return this; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static implicit operator int(HashCodeCombiner self) + { + return self.CombinedHash; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public HashCodeCombiner Add(int i) + { + _combinedHash64 = ((_combinedHash64 << 5) + _combinedHash64) ^ i; + return this; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public HashCodeCombiner Add(string s) + { + var hashCode = (s != null) ? s.GetHashCode() : 0; + return Add(hashCode); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public HashCodeCombiner Add(object o) + { + var hashCode = (o != null) ? o.GetHashCode() : 0; + return Add(hashCode); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public HashCodeCombiner Add(DateTime d) + { + return Add(d.GetHashCode()); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public HashCodeCombiner Add(TValue value, IEqualityComparer comparer) + { + var hashCode = value != null ? comparer.GetHashCode(value) : 0; + return Add(hashCode); + } + + public HashCodeCombiner Add(FileSystemInfo fi, bool deep = true) + { + Guard.NotNull(fi, nameof(fi)); + + if (!fi.Exists) + return this; + + Add(fi.FullName.ToLower()); + Add(fi.CreationTimeUtc); + Add(fi.LastWriteTimeUtc); + + if (fi is FileInfo file) + { + Add(file.Length.GetHashCode()); + } + + if (fi is DirectoryInfo dir) + { + foreach (var f in dir.GetFiles()) + { + Add(f); + } + if (deep) + { + foreach (var s in dir.GetDirectories()) + { + Add(s); + } + } + } + + return this; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static HashCodeCombiner Start() + { + return new HashCodeCombiner(0x1505L); + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/ImagingHelper.cs b/src/Libraries/SmartStore.Core/Utilities/ImagingHelper.cs index 3d6ef4d3c5..2833cac71f 100644 --- a/src/Libraries/SmartStore.Core/Utilities/ImagingHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/ImagingHelper.cs @@ -3,65 +3,65 @@ namespace SmartStore.Utilities { - public static class ImagingHelper - { - public static int GetPerceivedBrightness(string htmlColor) - { + public static class ImagingHelper + { + public static int GetPerceivedBrightness(string htmlColor) + { if (String.IsNullOrEmpty(htmlColor)) htmlColor = "#ffffff"; - + return GetPerceivedBrightness(ColorTranslator.FromHtml(htmlColor)); - } + } - /// - /// Calculates the perceived brightness of a color. - /// - /// The color - /// - /// A number in the range of 0 (black) to 255 (White). - /// For text contrast colors, an optimal cutoff value is 130. - /// - public static int GetPerceivedBrightness(Color color) - { - return (int)Math.Sqrt( - color.R * color.R * .241 + - color.G * color.G * .691 + - color.B * color.B * .068); - } + /// + /// Calculates the perceived brightness of a color. + /// + /// The color + /// + /// A number in the range of 0 (black) to 255 (White). + /// For text contrast colors, an optimal cutoff value is 130. + /// + public static int GetPerceivedBrightness(Color color) + { + return (int)Math.Sqrt( + color.R * color.R * .241 + + color.G * color.G * .691 + + color.B * color.B * .068); + } - /// - /// Recalculates an image size while keeping aspect ratio - /// - /// Original size - /// New max size - /// The rescaled size - public static Size Rescale(Size original, int maxSize) - { - Guard.IsPositive(maxSize, nameof(maxSize)); + /// + /// Recalculates an image size while keeping aspect ratio + /// + /// Original size + /// New max size + /// The rescaled size + public static Size Rescale(Size original, int maxSize) + { + Guard.IsPositive(maxSize, nameof(maxSize)); - return Rescale(original, new Size(maxSize, maxSize)); - } + return Rescale(original, new Size(maxSize, maxSize)); + } - /// - /// Recalculates an image size while keeping aspect ratio - /// - /// Original size - /// New max size - /// The rescaled size - public static Size Rescale(Size original, Size maxSize) - { - if (original.IsEmpty || maxSize.IsEmpty || (original.Width <= maxSize.Width && original.Height <= maxSize.Height)) - { - return original; - } + /// + /// Recalculates an image size while keeping aspect ratio + /// + /// Original size + /// New max size + /// The rescaled size + public static Size Rescale(Size original, Size maxSize) + { + if (original.IsEmpty || maxSize.IsEmpty || (original.Width <= maxSize.Width && original.Height <= maxSize.Height)) + { + return original; + } - // Figure out the ratio - double ratioX = (double)maxSize.Width / (double)original.Width; - double ratioY = (double)maxSize.Height / (double)original.Height; - // use whichever multiplier is smaller - double ratio = ratioX < ratioY ? ratioX : ratioY; + // Figure out the ratio + double ratioX = (double)maxSize.Width / (double)original.Width; + double ratioY = (double)maxSize.Height / (double)original.Height; + // use whichever multiplier is smaller + double ratio = ratioX < ratioY ? ratioX : ratioY; - return new Size(Convert.ToInt32(original.Width * ratio), Convert.ToInt32(original.Height * ratio)); - } - } + return new Size(Convert.ToInt32(original.Width * ratio), Convert.ToInt32(original.Height * ratio)); + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/Inflector.cs b/src/Libraries/SmartStore.Core/Utilities/Inflector.cs index 0bff363b4a..bce11264dd 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Inflector.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Inflector.cs @@ -11,14 +11,14 @@ namespace SmartStore.Utilities // TODO: Inflector ist leider Englisch! Irgend 'ne Chance das zu lokalisieren??!! public static class Inflector { - #region fields + #region fields - private static readonly Regex HtmlCaseRegex = new Regex( - "(? _plurals = new List(); + private static readonly List _plurals = new List(); private static readonly List _singulars = new List(); private static readonly List _uncountables = new List(); @@ -185,7 +185,7 @@ public static string Singularize(string word) public static string Titleize(string word) { return Regex.Replace(Humanize(Underscore(word)), @"\b([a-z])", - delegate(Match match) + delegate (Match match) { return match.Captures[0].Value.ToUpper(); }); @@ -210,7 +210,7 @@ public static string Humanize(string lowercaseAndUnderscoredWord) public static string Pascalize(string lowercaseAndUnderscoredWord) { return Regex.Replace(lowercaseAndUnderscoredWord, "(?:^|_)(.)", - delegate(Match match) + delegate (Match match) { return match.Groups[1].Value.ToUpper(); }); @@ -226,17 +226,17 @@ public static string Camelize(string lowercaseAndUnderscoredWord) return Uncapitalize(Pascalize(lowercaseAndUnderscoredWord)); } - public static string Handleize(string input) - { - return HtmlCaseRegex.Replace(input, "-$1$2").ToLowerInvariant(); - } - - /// - /// Makes an underscored form from the expression in the string. - /// - /// string. The word to underscore. - /// string. The word with underscore seperators. - public static string Underscore(string pascalCasedWord) + public static string Handleize(string input) + { + return HtmlCaseRegex.Replace(input, "-$1$2").ToLowerInvariant(); + } + + /// + /// Makes an underscored form from the expression in the string. + /// + /// string. The word to underscore. + /// string. The word with underscore seperators. + public static string Underscore(string pascalCasedWord) { return Regex.Replace( Regex.Replace( diff --git a/src/Libraries/SmartStore.Core/Utilities/ObjectDumper.cs b/src/Libraries/SmartStore.Core/Utilities/ObjectDumper.cs index 788859fa99..da44bc6362 100644 --- a/src/Libraries/SmartStore.Core/Utilities/ObjectDumper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/ObjectDumper.cs @@ -5,26 +5,26 @@ namespace SmartStore.Core.Utilities { - public static class ObjectDumper - { - public static void Dump(object value, TextWriter writer) - { - writer.WriteLine(Dump(value)); - } + public static class ObjectDumper + { + public static void Dump(object value, TextWriter writer) + { + writer.WriteLine(Dump(value)); + } - public static string Dump(object value) - { - return JsonConvert.SerializeObject(value, Formatting.Indented); - } + public static string Dump(object value) + { + return JsonConvert.SerializeObject(value, Formatting.Indented); + } - public static void ToConsole(object value) - { - Console.WriteLine(Dump(value)); - } + public static void ToConsole(object value) + { + Console.WriteLine(Dump(value)); + } - public static void ToDebug(object value) - { - Debug.WriteLine(Dump(value)); - } - } + public static void ToDebug(object value) + { + Debug.WriteLine(Dump(value)); + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/ObjectPools/IPooledObject.cs b/src/Libraries/SmartStore.Core/Utilities/ObjectPools/IPooledObject.cs index 72623e66ae..902051f3a3 100644 --- a/src/Libraries/SmartStore.Core/Utilities/ObjectPools/IPooledObject.cs +++ b/src/Libraries/SmartStore.Core/Utilities/ObjectPools/IPooledObject.cs @@ -1,6 +1,4 @@ -using System; - -namespace SmartStore.Utilities.ObjectPools +namespace SmartStore.Utilities.ObjectPools { public interface IPooledObject { diff --git a/src/Libraries/SmartStore.Core/Utilities/ObjectPools/LeakTrackingObjectPool.cs b/src/Libraries/SmartStore.Core/Utilities/ObjectPools/LeakTrackingObjectPool.cs index 240d7fae8d..bfd40d991f 100644 --- a/src/Libraries/SmartStore.Core/Utilities/ObjectPools/LeakTrackingObjectPool.cs +++ b/src/Libraries/SmartStore.Core/Utilities/ObjectPools/LeakTrackingObjectPool.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.Runtime.CompilerServices; diff --git a/src/Libraries/SmartStore.Core/Utilities/ObjectPools/ObjectPool.cs b/src/Libraries/SmartStore.Core/Utilities/ObjectPools/ObjectPool.cs index 94aa2c99b3..29cdf9e79f 100644 --- a/src/Libraries/SmartStore.Core/Utilities/ObjectPools/ObjectPool.cs +++ b/src/Libraries/SmartStore.Core/Utilities/ObjectPools/ObjectPool.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Runtime.CompilerServices; -using System.Text; using System.Threading; -using System.Threading.Tasks; namespace SmartStore.Utilities.ObjectPools { diff --git a/src/Libraries/SmartStore.Core/Utilities/ObjectPools/PooledStringBuilder.cs b/src/Libraries/SmartStore.Core/Utilities/ObjectPools/PooledStringBuilder.cs index 4cd909e00b..fca491cc22 100644 --- a/src/Libraries/SmartStore.Core/Utilities/ObjectPools/PooledStringBuilder.cs +++ b/src/Libraries/SmartStore.Core/Utilities/ObjectPools/PooledStringBuilder.cs @@ -1,5 +1,4 @@ -using System; -using System.Diagnostics; +using System.Diagnostics; using System.Runtime.CompilerServices; using System.Text; @@ -63,10 +62,7 @@ public static PooledStringBuilder Rent(string value = null) public int MaxCapacity { get; private set; } - public int Length - { - get { return this.Builder.Length; } - } + public int Length => this.Builder.Length; [MethodImpl(MethodImplOptions.AggressiveInlining)] public StringBuilder Append(string value) diff --git a/src/Libraries/SmartStore.Core/Utilities/PathHelper.cs b/src/Libraries/SmartStore.Core/Utilities/PathHelper.cs index c63fec0593..18159409ee 100644 --- a/src/Libraries/SmartStore.Core/Utilities/PathHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/PathHelper.cs @@ -1,223 +1,221 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; namespace SmartStore.Utilities { - public static class PathHelper - { - private static readonly char[] _invalidPathChars; - private static readonly char[] _invalidFileNameChars; - private static readonly Regex _invalidCharsPattern; - - static PathHelper() - { - _invalidPathChars = Path.GetInvalidPathChars(); - _invalidFileNameChars = Path.GetInvalidFileNameChars(); - - var invalidChars = Regex.Escape(new string(_invalidPathChars) + new string(_invalidFileNameChars)); - _invalidCharsPattern = new Regex(string.Format(@"[{0}]+", invalidChars)); - } - - /// - /// Checks whether path is empty or starts with '/' or '\' - /// - public static bool IsRootedPath(string basepath) - { - return (string.IsNullOrEmpty(basepath) || basepath[0] == '/' || basepath[0] == '\\'); - } - - /// - /// Checks whether path starts with '~/' - /// - public static bool IsAppRelativePath(string path) - { - if (path == null) - return false; - - int len = path.Length; - - // Empty string case - if (len == 0) return false; - - // It must start with ~ - if (path[0] != '~') - return false; - - // Single character case: "~" - if (len == 1) - return true; - - // If it's longer, checks if it starts with "~/" or "~\" - return path[1] == '\\' || path[1] == '/'; - } - - /// - /// Determines the relative path from to - /// - /// From path - /// To path - /// Directory separator - /// The relative path - public static string MakeRelativePath(string fromPath, string toPath, string sep = "\\") - { - var fromParts = fromPath.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); - var toParts = toPath.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); - - var matchedParts = fromParts - .Zip(toParts, (x, y) => string.Compare(x, y, true) == 0) - .TakeWhile(x => x).Count(); - - return string.Join("", Enumerable.Range(0, fromParts.Length - matchedParts) - .Select(x => ".." + sep)) + - string.Join(sep, toParts.Skip(matchedParts)); - } - - /// - /// Checks if virtual path contains a protocol, which is referred to as a scheme in the - /// URI spec. - /// - public static bool HasScheme(string virtualPath) - { - // URIs have the format :, e.g. mailto:user@ms.com, - // http://server/, nettcp://server/, etc. The cannot contain slashes. - // The virtualPath passed to this method may be absolute or relative. Although - // ':' is only allowed in the if it is encoded, the - // virtual path that we're receiving here may be decoded, so it is impossible - // for us to determine if virtualPath has a scheme. We will be conservative - // and err on the side of assuming it has a scheme when we cannot tell for certain. - // To do this, we first check for ':'. If not found, then it doesn't have a scheme. - // If ':' is found, then as long as we find a '/' before the ':', it cannot be - // a scheme because schemes don't contain '/'. Otherwise, we will assume it has a - // scheme. - int indexOfColon = virtualPath.IndexOf(':'); - if (indexOfColon == -1) - return false; - int indexOfSlash = virtualPath.IndexOf('/'); - return (indexOfSlash == -1 || indexOfColon < indexOfSlash); - } - - /// - /// Ensures that a path is a valid app root path by checking whether it starts - /// with '~/' and prepending it if needed and by replacing '\' with '/' - /// - /// Relative path - /// Normalized root path - public static string NormalizeAppRelativePath(string path) - { - if (path.IsEmpty()) - return path; - - path = path.Replace('\\', '/'); - - if (!path.StartsWith("~/")) - { - if (path.StartsWith("~")) - path = path.Substring(1); - - path = (path.StartsWith("/") ? "~" : "~/") + path; - } - - return path; - } - - /// - /// Checks whether a path is a safe app root path. - /// - /// Relative path - public static bool IsSafeAppRootPath(string path) - { - if (path.EmptyNull().Length > 2 && !path.IsCaseInsensitiveEqual("con") && !HasInvalidPathChars(path)) - { - try - { - var mappedPath = CommonHelper.MapPath(path); - var appPath = CommonHelper.MapPath("~/"); - return !mappedPath.IsCaseInsensitiveEqual(appPath); - } - catch { } - } - - return false; - } - - /// - /// Replaces all occurences of any illegal path or file name char by '-' - /// - /// Path/File name - /// Sanitized path/file name - public static string SanitizeFileName(string name) - { - if (name.IsEmpty()) - return name; - - return _invalidCharsPattern.Replace(name, "-"); - } - - public static bool HasInvalidPathChars(string path, bool checkWildcardChars = false) - { - if (path == null) - return false; - - return path.IndexOfAny(_invalidPathChars) >= 0 - || (checkWildcardChars && ContainsWildcardChars(path, 0)); - } - - public static bool HasInvalidFileNameChars(string fileName, bool checkWildcardChars = false) - { - if (fileName == null) - return false; - - return fileName.IndexOfAny(_invalidFileNameChars) >= 0 - || (checkWildcardChars && ContainsWildcardChars(fileName, 0)); - } - - private static bool ContainsWildcardChars(string path, int startIndex = 0) - { - for (int i = startIndex; i < path.Length; i++) - { - switch (path[i]) - { - case '*': - case '?': - return true; - } - } - - return false; - } - - /// - /// Checks whether the given path is a fully qualified absolute path (either UNC or rooted with drive letter) - /// - /// Path to check - /// true if path is fully qualified - public static bool IsAbsolutePhysicalPath(string path) - { - if ((path == null) || (path.Length < 3)) - { - return false; - } - - return (((path[1] == ':') && IsDirectorySeparatorChar(path[2])) || IsUncSharePath(path)); - } - - internal static bool IsUncSharePath(string path) => - (((path.Length > 2) && IsDirectorySeparatorChar(path[0])) && IsDirectorySeparatorChar(path[1])); - - - private static bool IsDirectorySeparatorChar(char ch) - { - if (ch != '\\') - { - return (ch == '/'); - } - - return true; - } - } + public static class PathHelper + { + private static readonly char[] _invalidPathChars; + private static readonly char[] _invalidFileNameChars; + private static readonly Regex _invalidCharsPattern; + + static PathHelper() + { + _invalidPathChars = Path.GetInvalidPathChars(); + _invalidFileNameChars = Path.GetInvalidFileNameChars(); + + var invalidChars = Regex.Escape(new string(_invalidPathChars) + new string(_invalidFileNameChars)); + _invalidCharsPattern = new Regex(string.Format(@"[{0}]+", invalidChars)); + } + + /// + /// Checks whether path is empty or starts with '/' or '\' + /// + public static bool IsRootedPath(string basepath) + { + return (string.IsNullOrEmpty(basepath) || basepath[0] == '/' || basepath[0] == '\\'); + } + + /// + /// Checks whether path starts with '~/' + /// + public static bool IsAppRelativePath(string path) + { + if (path == null) + return false; + + int len = path.Length; + + // Empty string case + if (len == 0) return false; + + // It must start with ~ + if (path[0] != '~') + return false; + + // Single character case: "~" + if (len == 1) + return true; + + // If it's longer, checks if it starts with "~/" or "~\" + return path[1] == '\\' || path[1] == '/'; + } + + /// + /// Determines the relative path from to + /// + /// From path + /// To path + /// Directory separator + /// The relative path + public static string MakeRelativePath(string fromPath, string toPath, string sep = "\\") + { + var fromParts = fromPath.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); + var toParts = toPath.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); + + var matchedParts = fromParts + .Zip(toParts, (x, y) => string.Compare(x, y, true) == 0) + .TakeWhile(x => x).Count(); + + return string.Join("", Enumerable.Range(0, fromParts.Length - matchedParts) + .Select(x => ".." + sep)) + + string.Join(sep, toParts.Skip(matchedParts)); + } + + /// + /// Checks if virtual path contains a protocol, which is referred to as a scheme in the + /// URI spec. + /// + public static bool HasScheme(string virtualPath) + { + // URIs have the format :, e.g. mailto:user@ms.com, + // http://server/, nettcp://server/, etc. The cannot contain slashes. + // The virtualPath passed to this method may be absolute or relative. Although + // ':' is only allowed in the if it is encoded, the + // virtual path that we're receiving here may be decoded, so it is impossible + // for us to determine if virtualPath has a scheme. We will be conservative + // and err on the side of assuming it has a scheme when we cannot tell for certain. + // To do this, we first check for ':'. If not found, then it doesn't have a scheme. + // If ':' is found, then as long as we find a '/' before the ':', it cannot be + // a scheme because schemes don't contain '/'. Otherwise, we will assume it has a + // scheme. + int indexOfColon = virtualPath.IndexOf(':'); + if (indexOfColon == -1) + return false; + int indexOfSlash = virtualPath.IndexOf('/'); + return (indexOfSlash == -1 || indexOfColon < indexOfSlash); + } + + /// + /// Ensures that a path is a valid app root path by checking whether it starts + /// with '~/' and prepending it if needed and by replacing '\' with '/' + /// + /// Relative path + /// Normalized root path + public static string NormalizeAppRelativePath(string path) + { + if (path.IsEmpty()) + return path; + + path = path.Replace('\\', '/'); + + if (!path.StartsWith("~/")) + { + if (path.StartsWith("~")) + path = path.Substring(1); + + path = (path.StartsWith("/") ? "~" : "~/") + path; + } + + return path; + } + + /// + /// Checks whether a path is a safe app root path. + /// + /// Relative path + public static bool IsSafeAppRootPath(string path) + { + if (path.EmptyNull().Length > 2 && !path.IsCaseInsensitiveEqual("con") && !HasInvalidPathChars(path)) + { + try + { + var mappedPath = CommonHelper.MapPath(path); + var appPath = CommonHelper.MapPath("~/"); + return !mappedPath.IsCaseInsensitiveEqual(appPath); + } + catch { } + } + + return false; + } + + /// + /// Replaces all occurences of any illegal path or file name char by '-' + /// + /// Path/File name + /// Sanitized path/file name + public static string SanitizeFileName(string name) + { + if (name.IsEmpty()) + return name; + + return _invalidCharsPattern.Replace(name, "-"); + } + + public static bool HasInvalidPathChars(string path, bool checkWildcardChars = false) + { + if (path == null) + return false; + + return path.IndexOfAny(_invalidPathChars) >= 0 + || (checkWildcardChars && ContainsWildcardChars(path, 0)); + } + + public static bool HasInvalidFileNameChars(string fileName, bool checkWildcardChars = false) + { + if (fileName == null) + return false; + + return fileName.IndexOfAny(_invalidFileNameChars) >= 0 + || (checkWildcardChars && ContainsWildcardChars(fileName, 0)); + } + + private static bool ContainsWildcardChars(string path, int startIndex = 0) + { + for (int i = startIndex; i < path.Length; i++) + { + switch (path[i]) + { + case '*': + case '?': + return true; + } + } + + return false; + } + + /// + /// Checks whether the given path is a fully qualified absolute path (either UNC or rooted with drive letter) + /// + /// Path to check + /// true if path is fully qualified + public static bool IsAbsolutePhysicalPath(string path) + { + if ((path == null) || (path.Length < 3)) + { + return false; + } + + return (((path[1] == ':') && IsDirectorySeparatorChar(path[2])) || IsUncSharePath(path)); + } + + internal static bool IsUncSharePath(string path) + { + return (((path.Length > 2) && IsDirectorySeparatorChar(path[0])) && IsDirectorySeparatorChar(path[1])); + } + + private static bool IsDirectorySeparatorChar(char ch) + { + if (ch != '\\') + { + return (ch == '/'); + } + + return true; + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/Prettifier.cs b/src/Libraries/SmartStore.Core/Utilities/Prettifier.cs index d9486c3f29..95e9c181a5 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Prettifier.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Prettifier.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; -using System.Linq; using System.Text; using System.Xml; @@ -10,8 +8,8 @@ namespace SmartStore.Utilities { public static class Prettifier { - [SuppressMessage("ReSharper", "RedundantAssignment")] - public static string BytesToString(long bytes) + [SuppressMessage("ReSharper", "RedundantAssignment")] + public static string BytesToString(long bytes) { double result = bytes; double dsize = bytes; @@ -46,7 +44,7 @@ public static string PrettifyXML(string xml) { if (xml.IsEmpty() || xml.IsWhiteSpace()) return xml; - + // first read the xml ignoring whitespace using (var xmlReader = XmlReader.Create(new StringReader(xml), new XmlReaderSettings { IgnoreWhitespace = true, CheckCharacters = false })) { diff --git a/src/Libraries/SmartStore.Core/Utilities/Retry.cs b/src/Libraries/SmartStore.Core/Utilities/Retry.cs index 916b64e3b2..a7ec849ce6 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Retry.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Retry.cs @@ -3,140 +3,140 @@ namespace SmartStore.Utilities { - /// - /// Provides functionality to automatically try the given piece of logic some number of times before re-throwing the exception. - /// This is useful for any piece of code which may experience transient failures. Be cautious of passing code with two distinct - /// actions given that if the second or subsequent piece of logic fails, the first will also be retried upon each retry. - /// - public static class Retry - { - /// - /// Executes an action with retry logic. - /// - /// The action to be executed. - /// The maximum number of attempts. - /// Timespan to wait between attempts of the operation - /// The callback executed when an attempt is failed. - public static void Run(Action operation, int attempts, TimeSpan? wait = null, Action onFailed = null) - { - Guard.NotNull(operation, nameof(operation)); - - Run(Operation, attempts, wait, onFailed); - - bool Operation() - { - operation(); - return true; - } - } - - /// - /// Executes a function with retry logic. - /// - /// The function to be executed. - /// The maximum number of attempts. - /// Timespan to wait between attempts of the operation - /// The callback executed when an attempt is failed. - public static T Run(Func operation, int attempts, TimeSpan? wait, Action onFailed = null) - { - Guard.NotNull(operation, nameof(operation)); - - if (attempts < 1) - { - throw new ArgumentOutOfRangeException(nameof(attempts), attempts, "The maximum number of attempts must not be less than 1."); - } - - var attempt = 0; - - while (true) - { - if (attempt > 0 && wait != null) - { - Task.Delay(wait.Value).Wait(); - } - - try - { - // Call the function passed in by the caller. - return operation(); - } - catch (Exception ex) - { - attempt++; - - onFailed?.Invoke(attempt, ex); - - if (attempt >= attempts) - { - throw; - } - } - } - } - - - /// - /// Executes an asynchronous action with retry logic. - /// - /// The asynchronous action to be executed. - /// The maximum number of attempts. - /// Timespan to wait between attempts of the operation - /// The callback executed when an attempt is failed. - public static async Task RunAsync(Func operation, int attempts, TimeSpan? wait = null, Action onFailed = null) - { - Guard.NotNull(operation, nameof(operation)); - - async Task wrapper() - { - await operation(); - return true; - } - - await RunAsync(wrapper, attempts, wait, onFailed); - } - - /// - /// Executes an asynchronous function with retry logic. - /// - /// The asynchronous function to be executed. - /// The maximum number of attempts. - /// Timespan to wait between attempts of the operation - /// The callback executed when an attempt is failed. - public static async Task RunAsync(Func> operation, int attempts, TimeSpan? wait, Action onFailed = null) - { - Guard.NotNull(operation, nameof(operation)); - - if (attempts < 1) - { - throw new ArgumentOutOfRangeException(nameof(attempts), attempts, "The maximum number of attempts must not be less than 1."); - } - - var attempt = 0; - - while (true) - { - if (attempt > 0 && wait != null) - { - await Task.Delay(wait.Value); - } - - try - { - // Call the function passed in by the caller. - return await operation(); - } - catch (Exception ex) - { - attempt++; - - onFailed?.Invoke(attempt, ex); - - if (attempt >= attempts) - { - throw; - } - } - } - } - } + /// + /// Provides functionality to automatically try the given piece of logic some number of times before re-throwing the exception. + /// This is useful for any piece of code which may experience transient failures. Be cautious of passing code with two distinct + /// actions given that if the second or subsequent piece of logic fails, the first will also be retried upon each retry. + /// + public static class Retry + { + /// + /// Executes an action with retry logic. + /// + /// The action to be executed. + /// The maximum number of attempts. + /// Timespan to wait between attempts of the operation + /// The callback executed when an attempt is failed. + public static void Run(Action operation, int attempts, TimeSpan? wait = null, Action onFailed = null) + { + Guard.NotNull(operation, nameof(operation)); + + Run(Operation, attempts, wait, onFailed); + + bool Operation() + { + operation(); + return true; + } + } + + /// + /// Executes a function with retry logic. + /// + /// The function to be executed. + /// The maximum number of attempts. + /// Timespan to wait between attempts of the operation + /// The callback executed when an attempt is failed. + public static T Run(Func operation, int attempts, TimeSpan? wait, Action onFailed = null) + { + Guard.NotNull(operation, nameof(operation)); + + if (attempts < 1) + { + throw new ArgumentOutOfRangeException(nameof(attempts), attempts, "The maximum number of attempts must not be less than 1."); + } + + var attempt = 0; + + while (true) + { + if (attempt > 0 && wait != null) + { + Task.Delay(wait.Value).Wait(); + } + + try + { + // Call the function passed in by the caller. + return operation(); + } + catch (Exception ex) + { + attempt++; + + onFailed?.Invoke(attempt, ex); + + if (attempt >= attempts) + { + throw; + } + } + } + } + + + /// + /// Executes an asynchronous action with retry logic. + /// + /// The asynchronous action to be executed. + /// The maximum number of attempts. + /// Timespan to wait between attempts of the operation + /// The callback executed when an attempt is failed. + public static async Task RunAsync(Func operation, int attempts, TimeSpan? wait = null, Action onFailed = null) + { + Guard.NotNull(operation, nameof(operation)); + + async Task wrapper() + { + await operation(); + return true; + } + + await RunAsync(wrapper, attempts, wait, onFailed); + } + + /// + /// Executes an asynchronous function with retry logic. + /// + /// The asynchronous function to be executed. + /// The maximum number of attempts. + /// Timespan to wait between attempts of the operation + /// The callback executed when an attempt is failed. + public static async Task RunAsync(Func> operation, int attempts, TimeSpan? wait, Action onFailed = null) + { + Guard.NotNull(operation, nameof(operation)); + + if (attempts < 1) + { + throw new ArgumentOutOfRangeException(nameof(attempts), attempts, "The maximum number of attempts must not be less than 1."); + } + + var attempt = 0; + + while (true) + { + if (attempt > 0 && wait != null) + { + await Task.Delay(wait.Value); + } + + try + { + // Call the function passed in by the caller. + return await operation(); + } + catch (Exception ex) + { + attempt++; + + onFailed?.Invoke(attempt, ex); + + if (attempt >= attempts) + { + throw; + } + } + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/SeoHelper.cs b/src/Libraries/SmartStore.Core/Utilities/SeoHelper.cs index 6dbfbd56f5..b3d32b4486 100644 --- a/src/Libraries/SmartStore.Core/Utilities/SeoHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/SeoHelper.cs @@ -8,25 +8,25 @@ namespace SmartStore.Utilities { - public static class SeoHelper - { - private static readonly object _lock = new object(); - private static Dictionary _userSeoCharacterTable; - - /// - /// Get SEO friendly string - /// - /// String to be converted - /// A value indicating whether non western chars should be converted - /// A value indicating whether Unicode chars are allowed - /// Raw data of semicolon separated char conversions - /// SEO friendly string - [SuppressMessage("ReSharper", "PossibleNullReferenceException")] + public static class SeoHelper + { + private static readonly object _lock = new object(); + private static Dictionary _userSeoCharacterTable; + + /// + /// Get SEO friendly string + /// + /// String to be converted + /// A value indicating whether non western chars should be converted + /// A value indicating whether Unicode chars are allowed + /// Raw data of semicolon separated char conversions + /// SEO friendly string + [SuppressMessage("ReSharper", "PossibleNullReferenceException")] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string GetSeName(string name, bool convertNonWesternChars, bool allowUnicodeChars, string charConversions = null) - { + { return GetSeName(name, convertNonWesternChars, allowUnicodeChars, true, charConversions); - } + } /// /// Get SEO friendly string @@ -39,10 +39,10 @@ public static string GetSeName(string name, bool convertNonWesternChars, bool al /// SEO friendly string [SuppressMessage("ReSharper", "PossibleNullReferenceException")] public static string GetSeName( - string name, - bool convertNonWesternChars, - bool allowUnicodeChars, - bool allowForwardSlash, + string name, + bool convertNonWesternChars, + bool allowUnicodeChars, + bool allowForwardSlash, string charConversions = null) { // Return empty value if text is null @@ -136,31 +136,31 @@ public static string GetSeName( } public static void ResetUserSeoCharacterTable() - { - if (_userSeoCharacterTable != null) - { - _userSeoCharacterTable.Clear(); - _userSeoCharacterTable = null; - } - } - - private static void InitializeUserSeoCharacterTable(string charConversions) - { - lock (_lock) - { - if (_userSeoCharacterTable == null) - { - _userSeoCharacterTable = new Dictionary(); - - foreach (var conversion in charConversions.SplitSafe(Environment.NewLine)) - { - if (conversion.SplitToPair(out var strLeft, out var strRight, ";") && strLeft.HasValue() && !_userSeoCharacterTable.ContainsKey(strLeft[0])) - { - _userSeoCharacterTable.Add(strLeft[0], strRight); - } - } - } - } - } - } + { + if (_userSeoCharacterTable != null) + { + _userSeoCharacterTable.Clear(); + _userSeoCharacterTable = null; + } + } + + private static void InitializeUserSeoCharacterTable(string charConversions) + { + lock (_lock) + { + if (_userSeoCharacterTable == null) + { + _userSeoCharacterTable = new Dictionary(); + + foreach (var conversion in charConversions.SplitSafe(Environment.NewLine)) + { + if (conversion.SplitToPair(out var strLeft, out var strRight, ";") && strLeft.HasValue() && !_userSeoCharacterTable.ContainsKey(strLeft[0])) + { + _userSeoCharacterTable.Add(strLeft[0], strRight); + } + } + } + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/SmartSyndicationFeed.cs b/src/Libraries/SmartStore.Core/Utilities/SmartSyndicationFeed.cs index 57302ecc08..b850c568ea 100644 --- a/src/Libraries/SmartStore.Core/Utilities/SmartSyndicationFeed.cs +++ b/src/Libraries/SmartStore.Core/Utilities/SmartSyndicationFeed.cs @@ -8,60 +8,60 @@ namespace SmartStore.Utilities { public class SmartSyndicationFeed : SyndicationFeed - { - public SmartSyndicationFeed(Uri feedAlternateLink, string title, string description = null) - : base(title, description ?? title, feedAlternateLink, null, DateTime.UtcNow) - { - } + { + public SmartSyndicationFeed(Uri feedAlternateLink, string title, string description = null) + : base(title, description ?? title, feedAlternateLink, null, DateTime.UtcNow) + { + } - public static string UrlAtom => "http://www.w3.org/2005/Atom"; - public static string UrlPurlContent => "http://purl.org/rss/1.0/modules/content/"; + public static string UrlAtom => "http://www.w3.org/2005/Atom"; + public static string UrlPurlContent => "http://purl.org/rss/1.0/modules/content/"; - public void AddNamespaces(bool purlContent) - { - AttributeExtensions.Add(new XmlQualifiedName("atom", XNamespace.Xmlns.NamespaceName), UrlAtom); + public void AddNamespaces(bool purlContent) + { + AttributeExtensions.Add(new XmlQualifiedName("atom", XNamespace.Xmlns.NamespaceName), UrlAtom); - if (purlContent) - { - AttributeExtensions.Add(new XmlQualifiedName("content", XNamespace.Xmlns.ToString()), UrlPurlContent); - } - } + if (purlContent) + { + AttributeExtensions.Add(new XmlQualifiedName("content", XNamespace.Xmlns.ToString()), UrlPurlContent); + } + } - public void Init(string selfLink, Language language = null) - { - ElementExtensions.Add( - new XElement(((XNamespace)UrlAtom) + "link", - new XAttribute("href", selfLink), - new XAttribute("rel", "self"), - new XAttribute("type", "application/rss+xml"))); + public void Init(string selfLink, Language language = null) + { + ElementExtensions.Add( + new XElement(((XNamespace)UrlAtom) + "link", + new XAttribute("href", selfLink), + new XAttribute("rel", "self"), + new XAttribute("type", "application/rss+xml"))); - if (language != null) - { - Language = language.LanguageCulture.EmptyNull().ToLower(); - } - } + if (language != null) + { + Language = language.LanguageCulture.EmptyNull().ToLower(); + } + } - public SyndicationItem CreateItem(string title, string synopsis, string url, DateTimeOffset published, string contentEncoded = null) - { - var item = new SyndicationItem( - title.RemoveInvalidXmlChars().EmptyNull(), - synopsis.RemoveInvalidXmlChars().EmptyNull(), - new Uri(url), - url, - published); + public SyndicationItem CreateItem(string title, string synopsis, string url, DateTimeOffset published, string contentEncoded = null) + { + var item = new SyndicationItem( + title.RemoveInvalidXmlChars().EmptyNull(), + synopsis.RemoveInvalidXmlChars().EmptyNull(), + new Uri(url), + url, + published); - if (contentEncoded != null) - { - item.ElementExtensions.Add("encoded", UrlPurlContent, contentEncoded.RemoveInvalidXmlChars().EmptyNull()); - } + if (contentEncoded != null) + { + item.ElementExtensions.Add("encoded", UrlPurlContent, contentEncoded.RemoveInvalidXmlChars().EmptyNull()); + } - return item; - } + return item; + } - public bool AddEnclosure(SyndicationItem item, MediaFile file, string fileUrl) - { - if (file != null && fileUrl.HasValue()) - { + public bool AddEnclosure(SyndicationItem item, MediaFile file, string fileUrl) + { + if (file != null && fileUrl.HasValue()) + { // We do not have the size behind fileUrl but the original file size should be fine. long fileLength = file.Size; if (fileLength <= 0) @@ -70,14 +70,14 @@ public bool AddEnclosure(SyndicationItem item, MediaFile file, string fileUrl) fileLength = 10000; } - var enclosure = SyndicationLink.CreateMediaEnclosureLink(new Uri(fileUrl), file.MimeType.EmptyNull(), fileLength); + var enclosure = SyndicationLink.CreateMediaEnclosureLink(new Uri(fileUrl), file.MimeType.EmptyNull(), fileLength); - item.Links.Add(enclosure); + item.Links.Add(enclosure); - return true; - } + return true; + } - return false; - } - } + return false; + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs b/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs index 5a4b428145..72cd4bf8b6 100644 --- a/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs +++ b/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections; +using System.Collections; using System.Collections.Generic; -using System.Linq; -using System.Text; namespace SmartStore.Utilities { diff --git a/src/Libraries/SmartStore.Core/Utilities/Threading/KeyedLock.cs b/src/Libraries/SmartStore.Core/Utilities/Threading/KeyedLock.cs index a98e771f12..158dff77d1 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Threading/KeyedLock.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Threading/KeyedLock.cs @@ -6,117 +6,117 @@ namespace SmartStore.Utilities.Threading { - public sealed class KeyedLock - { - private static readonly TimeSpan _noTimeout = TimeSpan.FromMilliseconds(-1); - private static readonly ConcurrentDictionary _locks = new ConcurrentDictionary(); + public sealed class KeyedLock + { + private static readonly TimeSpan _noTimeout = TimeSpan.FromMilliseconds(-1); + private static readonly ConcurrentDictionary _locks = new ConcurrentDictionary(); - private int _waiterCount; + private int _waiterCount; - private KeyedLock(object key) - { - Key = key; - Semaphore = new SemaphoreSlim(1, 1); - } + private KeyedLock(object key) + { + Key = key; + Semaphore = new SemaphoreSlim(1, 1); + } - private object Key { get; set; } - private SemaphoreSlim Semaphore { get; set; } + private object Key { get; set; } + private SemaphoreSlim Semaphore { get; set; } - public bool HasWaiters - { - get { return _waiterCount > 1; } - } + public bool HasWaiters => _waiterCount > 1; - public int WaiterCount - { - get { return _waiterCount; } - } + public int WaiterCount => _waiterCount; - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void IncrementCount() => Interlocked.Increment(ref _waiterCount); + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private void IncrementCount() + { + Interlocked.Increment(ref _waiterCount); + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void DecrementCount() => Interlocked.Decrement(ref _waiterCount); + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void DecrementCount() + { + Interlocked.Decrement(ref _waiterCount); + } - public static bool IsLockHeld(object key) - { - return _locks.ContainsKey(key); - } + public static bool IsLockHeld(object key) + { + return _locks.ContainsKey(key); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static IDisposable Lock(object key) - { - return Lock(key, _noTimeout); - } + { + return Lock(key, _noTimeout); + } - public static IDisposable Lock(object key, TimeSpan timeout) - { - var keyedLock = GetOrCreateLock(key); - keyedLock.Semaphore.Wait(timeout); - return new Releaser(keyedLock); - } + public static IDisposable Lock(object key, TimeSpan timeout) + { + var keyedLock = GetOrCreateLock(key); + keyedLock.Semaphore.Wait(timeout); + return new Releaser(keyedLock); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Task LockAsync(object key) - { - return LockAsync(key, _noTimeout, CancellationToken.None); - } + { + return LockAsync(key, _noTimeout, CancellationToken.None); + } - public static Task LockAsync(object key, TimeSpan timeout) - { - return LockAsync(key, timeout, CancellationToken.None); - } + public static Task LockAsync(object key, TimeSpan timeout) + { + return LockAsync(key, timeout, CancellationToken.None); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Task LockAsync(object key, CancellationToken cancellationToken) - { - return LockAsync(key, _noTimeout, cancellationToken); - } - - public static Task LockAsync(object key, TimeSpan timeout, CancellationToken cancellationToken) - { - var keyedLock = GetOrCreateLock(key); - var wait = keyedLock.Semaphore.WaitAsync(timeout, cancellationToken); - - return wait.IsCompleted - ? Task.FromResult(new Releaser(keyedLock) as IDisposable) - : wait.ContinueWith((t, s) => new Releaser((KeyedLock)s) as IDisposable, - keyedLock, - CancellationToken.None, - TaskContinuationOptions.ExecuteSynchronously, - TaskScheduler.Default); - } - - private static KeyedLock GetOrCreateLock(object key) - { - Guard.NotNull(key, nameof(key)); - - var item = _locks.GetOrAdd(key, k => new KeyedLock(key)); - item.IncrementCount(); - return item; - } - - sealed class Releaser : IDisposable - { - private KeyedLock _item; - - public Releaser(KeyedLock item) - { - _item = item; - } - - public void Dispose() - { - _item.DecrementCount(); - if (_item.WaiterCount == 0) - { - // Remove from dict - _locks.TryRemove(_item.Key, out _); - } - - _item.Semaphore.Release(); - _item = null; - } - } - } + { + return LockAsync(key, _noTimeout, cancellationToken); + } + + public static Task LockAsync(object key, TimeSpan timeout, CancellationToken cancellationToken) + { + var keyedLock = GetOrCreateLock(key); + var wait = keyedLock.Semaphore.WaitAsync(timeout, cancellationToken); + + return wait.IsCompleted + ? Task.FromResult(new Releaser(keyedLock) as IDisposable) + : wait.ContinueWith((t, s) => new Releaser((KeyedLock)s) as IDisposable, + keyedLock, + CancellationToken.None, + TaskContinuationOptions.ExecuteSynchronously, + TaskScheduler.Default); + } + + private static KeyedLock GetOrCreateLock(object key) + { + Guard.NotNull(key, nameof(key)); + + var item = _locks.GetOrAdd(key, k => new KeyedLock(key)); + item.IncrementCount(); + return item; + } + + sealed class Releaser : IDisposable + { + private KeyedLock _item; + + public Releaser(KeyedLock item) + { + _item = item; + } + + public void Dispose() + { + _item.DecrementCount(); + if (_item.WaiterCount == 0) + { + // Remove from dict + _locks.TryRemove(_item.Key, out _); + } + + _item.Semaphore.Release(); + _item = null; + } + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/Threading/LockExtensions.cs b/src/Libraries/SmartStore.Core/Utilities/Threading/LockExtensions.cs index ec05c3c650..4e4abcf113 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Threading/LockExtensions.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Threading/LockExtensions.cs @@ -1,7 +1,7 @@ using System; -using System.Threading; using System.Diagnostics; using System.Runtime.CompilerServices; +using System.Threading; namespace SmartStore.Utilities.Threading { diff --git a/src/Libraries/SmartStore.Core/Utilities/Throttle.cs b/src/Libraries/SmartStore.Core/Utilities/Throttle.cs index a380e15142..a203d90faf 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Throttle.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Throttle.cs @@ -1,13 +1,12 @@ using System; -using System.Collections.Generic; using System.Collections.Concurrent; using System.Runtime.CompilerServices; namespace SmartStore.Core.Utilities { - public static class Throttle - { - private readonly static ConcurrentDictionary _checks = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); + public static class Throttle + { + private readonly static ConcurrentDictionary _checks = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); /// /// Performs a throttled check. @@ -18,54 +17,54 @@ public static class Throttle /// Check result [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool Check(string key, TimeSpan interval, Func check) - { - return Check(key, interval, false, check); - } + { + return Check(key, interval, false, check); + } - /// - /// Performs a throttled check. - /// - /// Identifier for the check process - /// Interval between actual checks - /// - /// The check factory - /// Check result - public static bool Check(string key, TimeSpan interval, bool recheckWhenFalse, Func check) - { - Guard.NotEmpty(key, nameof(key)); - Guard.NotNull(check, nameof(check)); + /// + /// Performs a throttled check. + /// + /// Identifier for the check process + /// Interval between actual checks + /// + /// The check factory + /// Check result + public static bool Check(string key, TimeSpan interval, bool recheckWhenFalse, Func check) + { + Guard.NotEmpty(key, nameof(key)); + Guard.NotNull(check, nameof(check)); - bool added = false; - var now = DateTime.UtcNow; + bool added = false; + var now = DateTime.UtcNow; - var entry = _checks.GetOrAdd(key, x => - { - added = true; - return new CheckEntry { Value = check(), NextCheckUtc = (now + interval) }; - }); + var entry = _checks.GetOrAdd(key, x => + { + added = true; + return new CheckEntry { Value = check(), NextCheckUtc = (now + interval) }; + }); - if (added) - { - return entry.Value; - } + if (added) + { + return entry.Value; + } - var ok = entry.Value; - var isOverdue = (!ok && recheckWhenFalse) || (now > entry.NextCheckUtc); + var ok = entry.Value; + var isOverdue = (!ok && recheckWhenFalse) || (now > entry.NextCheckUtc); - if (isOverdue) - { - // Check is overdue: recheck - ok = check(); - _checks.TryUpdate(key, new CheckEntry { Value = ok, NextCheckUtc = (now + interval) }, entry); - } + if (isOverdue) + { + // Check is overdue: recheck + ok = check(); + _checks.TryUpdate(key, new CheckEntry { Value = ok, NextCheckUtc = (now + interval) }, entry); + } - return ok; - } + return ok; + } - class CheckEntry - { - public bool Value { get; set; } - public DateTime NextCheckUtc { get; set; } - } - } + class CheckEntry + { + public bool Value { get; set; } + public DateTime NextCheckUtc { get; set; } + } + } } diff --git a/src/Libraries/SmartStore.Core/Utilities/TypeHelper.cs b/src/Libraries/SmartStore.Core/Utilities/TypeHelper.cs index 2fb3f5bc09..6fbef73089 100644 --- a/src/Libraries/SmartStore.Core/Utilities/TypeHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/TypeHelper.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.Reflection; -using System.Collections; -using System.ComponentModel; -using System.Linq; -using System.Globalization; -using System.IO; using System.Linq.Expressions; namespace SmartStore.Utilities @@ -37,25 +30,25 @@ public static Type GetElementType(Type type) return type; } - /// - /// Exctracts and returns the name of a property accessor lambda - /// - /// The containing type - /// The accessor lambda - /// When true, returns the result as '[TyoeName].[PropertyName]'. - /// The property name - public static string NameOf(Expression> propertyAccessor, bool includeTypeName = false) - { - Guard.NotNull(propertyAccessor, nameof(propertyAccessor)); + /// + /// Exctracts and returns the name of a property accessor lambda + /// + /// The containing type + /// The accessor lambda + /// When true, returns the result as '[TyoeName].[PropertyName]'. + /// The property name + public static string NameOf(Expression> propertyAccessor, bool includeTypeName = false) + { + Guard.NotNull(propertyAccessor, nameof(propertyAccessor)); - var name = propertyAccessor.ExtractPropertyInfo().Name; + var name = propertyAccessor.ExtractPropertyInfo().Name; - if (includeTypeName) - { - return typeof(T).Name + "." + name; - } + if (includeTypeName) + { + return typeof(T).Name + "." + name; + } - return name; - } + return name; + } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Utilities/Wildcard.cs b/src/Libraries/SmartStore.Core/Utilities/Wildcard.cs index 1d9ba4d877..3878d286fa 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Wildcard.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Wildcard.cs @@ -1,6 +1,6 @@ using System; -using System.Text; using System.Linq; +using System.Text; using System.Text.RegularExpressions; using System.Threading; using SmartStore.Utilities.ObjectPools; @@ -20,18 +20,18 @@ public class Wildcard : Regex /// private static bool m_isForward; - private readonly string _pattern; + private readonly string _pattern; - /// - /// Initializes a new instance of the class. - /// - /// The wildcard pattern. - /// - /// Specifies whether number ranges (e.g. 1234-5678) should - /// be converted to a regular expression pattern. - /// - public Wildcard(string pattern, bool parseNumberRanges = false) - : this(pattern, RegexOptions.None, parseNumberRanges) + /// + /// Initializes a new instance of the class. + /// + /// The wildcard pattern. + /// + /// Specifies whether number ranges (e.g. 1234-5678) should + /// be converted to a regular expression pattern. + /// + public Wildcard(string pattern, bool parseNumberRanges = false) + : this(pattern, RegexOptions.None, parseNumberRanges) { } @@ -44,25 +44,19 @@ public Wildcard(string pattern, bool parseNumberRanges = false) /// be converted to a regular expression pattern. /// /// The regular expression options. - public Wildcard(string pattern, RegexOptions options, bool parseNumberRanges = false) - : this(WildcardToRegex(pattern, parseNumberRanges), options, Timeout.InfiniteTimeSpan) + public Wildcard(string pattern, RegexOptions options, bool parseNumberRanges = false) + : this(WildcardToRegex(pattern, parseNumberRanges), options, Timeout.InfiniteTimeSpan) { - + } - internal Wildcard(string parsedPattern, RegexOptions options, TimeSpan matchTimeout) - : base(parsedPattern, options, matchTimeout) - { - _pattern = parsedPattern; - } + internal Wildcard(string parsedPattern, RegexOptions options, TimeSpan matchTimeout) + : base(parsedPattern, options, matchTimeout) + { + _pattern = parsedPattern; + } - public string Pattern - { - get - { - return _pattern; - } - } + public string Pattern => _pattern; /// /// Searches all number range terms and converts them @@ -74,26 +68,26 @@ private static string WildcardToRegex(string pattern, bool parseNumberRanges) { m_isForward = true; - // Replace ? with . and * with .* - // Prepend ^, append $ - // Escape all chars except []^ - pattern = ToGlobPattern(pattern); - - // convert the number ranges into regular expression - if (parseNumberRanges) - { - var re = new Regex("[0-9]+-[0-9]+"); - MatchCollection collection = re.Matches(pattern); - foreach (Match match in collection) - { - string[] split = match.Value.Split(new char[] { '-' }); - int leadingZeroesCount = split[0].TakeWhile(x => x == '0').Count(); - int min = Int32.Parse(split[0]); - int max = Int32.Parse(split[1]); - - pattern = pattern.Replace(match.Value, ConvertNumberRange(min, max, leadingZeroesCount)); - } - } + // Replace ? with . and * with .* + // Prepend ^, append $ + // Escape all chars except []^ + pattern = ToGlobPattern(pattern); + + // convert the number ranges into regular expression + if (parseNumberRanges) + { + var re = new Regex("[0-9]+-[0-9]+"); + MatchCollection collection = re.Matches(pattern); + foreach (Match match in collection) + { + string[] split = match.Value.Split(new char[] { '-' }); + int leadingZeroesCount = split[0].TakeWhile(x => x == '0').Count(); + int min = Int32.Parse(split[0]); + int max = Int32.Parse(split[1]); + + pattern = pattern.Replace(match.Value, ConvertNumberRange(min, max, leadingZeroesCount)); + } + } return pattern; } @@ -114,42 +108,42 @@ private static string ConvertNumberRange(int min, int max, int leadingZeroesCoun string prefix = new String('0', leadingZeroesCount); // for leading zeroes string pattern = string.Empty; - if (min > -1 && max - min < 10) - { - // special treatment: the below function has issues with too small ranges - for (var i = min; i <= max; i++) - { - pattern += prefix + i.ToString() + (i < max ? "|" : ""); - } - } - else - { - - int currentValue = min; + if (min > -1 && max - min < 10) + { + // special treatment: the below function has issues with too small ranges + for (var i = min; i <= max; i++) + { + pattern += prefix + i.ToString() + (i < max ? "|" : ""); + } + } + else + { + + int currentValue = min; int radix = 1; - while (m_isForward || radix != 0) - { + while (m_isForward || radix != 0) + { int tempMax = GetNextMaximum(currentValue, max, radix); if (tempMax >= currentValue) - { - pattern += prefix + ParseRange(currentValue, tempMax, radix); - if (!(!m_isForward && radix == 1)) - { - pattern += "|"; - } - } - radix += (m_isForward ? 1 : -1); - currentValue = tempMax + 1; - } - } + { + pattern += prefix + ParseRange(currentValue, tempMax, radix); + if (!(!m_isForward && radix == 1)) + { + pattern += "|"; + } + } + radix += (m_isForward ? 1 : -1); + currentValue = tempMax + 1; + } + } //add a negative look behind and a negative look ahead in order //to avoid that 122-321 is found in 2308. return @"((? /// Gets the next maximum value in condition to the current value. /// @@ -161,7 +155,7 @@ private static string ConvertNumberRange(int min, int max, int leadingZeroesCoun /// private static int GetNextMaximum(int currentValue, int maximum, int radix) { - //backward + //backward if (!m_isForward) { if (radix != 1) @@ -179,7 +173,7 @@ private static int GetNextMaximum(int currentValue, int maximum, int radix) radix--; tempMax = ((maximum / (int)Math.Pow(10, radix))) * (int)Math.Pow(10, radix) - 1; } - + return tempMax; } @@ -216,12 +210,12 @@ private static string GetRangePattern(int beginDigit, int endDigit, int count) { if (count == 0) { - return string.Empty; + return string.Empty; } if (beginDigit == endDigit) { - return beginDigit.ToString(); + return beginDigit.ToString(); } string pattern = string.Format("[{0}-{1}]", beginDigit, endDigit); @@ -244,27 +238,27 @@ private static int ExtractDigit(int value, int digit) return Int32.Parse(value.ToString()[digit].ToString()); } - #region Escaping + #region Escaping - /* -------------------------------------------------------------- + /* -------------------------------------------------------------- Stuff here partly copied over from .NET's internal RegexParser class and modified for performance reasons: we don't want to escape '[^]' chars, but Regex.Escape() does. Besides, wen need '*' and '?' as wildcard chars. -------------------------------------------------------------- */ - const byte W = 6; // wildcard char - const byte Q = 5; // quantifier - const byte S = 4; // ordinary stopper - const byte Z = 3; // ScanBlank stopper - const byte X = 2; // whitespace - const byte E = 1; // should be escaped + const byte W = 6; // wildcard char + const byte Q = 5; // quantifier + const byte S = 4; // ordinary stopper + const byte Z = 3; // ScanBlank stopper + const byte X = 2; // whitespace + const byte E = 1; // should be escaped - /* + /* * For categorizing ASCII characters. */ - private static readonly byte[] _category = new byte[] - { + private static readonly byte[] _category = new byte[] + { // 0 1 2 3 4 5 6 7 8 9 A B C D E F 0 1 2 3 4 5 6 7 8 9 A B C D E F 0,0,0,0,0,0,0,0,0,X,X,0,X,X,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @@ -273,85 +267,85 @@ Stuff here partly copied over from .NET's internal RegexParser 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,S,0,0,0, // ' a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,Q,S,0,0,0 - }; - - private static bool IsMetachar(char ch) - { - return (ch <= '|' && _category[ch] >= E); - } - - private static bool IsGlob(char ch) - { - return (ch <= '|' && _category[ch] >= W); - } - - private static string ToGlobPattern(string input) - { - Guard.NotNull(input, nameof(input)); - - for (int i = 0; i < input.Length; i++) - { - if (IsMetachar(input[i])) - { + }; + + private static bool IsMetachar(char ch) + { + return (ch <= '|' && _category[ch] >= E); + } + + private static bool IsGlob(char ch) + { + return (ch <= '|' && _category[ch] >= W); + } + + private static string ToGlobPattern(string input) + { + Guard.NotNull(input, nameof(input)); + + for (int i = 0; i < input.Length; i++) + { + if (IsMetachar(input[i])) + { var psb = PooledStringBuilder.Rent("^"); var sb = (StringBuilder)psb; - char ch = input[i]; - int lastpos; - - sb.Append(input, 0, i); - do - { - if (IsGlob(ch)) - { - sb.Append('.'); // '?' > '.' - if (ch == '*') sb.Append('*'); // '*' > '.*' - } - else - { - sb.Append('\\'); - switch (ch) - { - case '\n': - ch = 'n'; - break; - case '\r': - ch = 'r'; - break; - case '\t': - ch = 't'; - break; - case '\f': - ch = 'f'; - break; - } - sb.Append(ch); - } - - i++; - lastpos = i; - - while (i < input.Length) - { - ch = input[i]; - if (IsMetachar(ch)) - break; - - i++; - } - - sb.Append(input, lastpos, i - lastpos); - } while (i < input.Length); - - sb.Append('$'); - return psb.ToStringAndReturn(); - } - } - - return '^' + input + '$'; - } - - #endregion - } + char ch = input[i]; + int lastpos; + + sb.Append(input, 0, i); + do + { + if (IsGlob(ch)) + { + sb.Append('.'); // '?' > '.' + if (ch == '*') sb.Append('*'); // '*' > '.*' + } + else + { + sb.Append('\\'); + switch (ch) + { + case '\n': + ch = 'n'; + break; + case '\r': + ch = 'r'; + break; + case '\t': + ch = 't'; + break; + case '\f': + ch = 'f'; + break; + } + sb.Append(ch); + } + + i++; + lastpos = i; + + while (i < input.Length) + { + ch = input[i]; + if (IsMetachar(ch)) + break; + + i++; + } + + sb.Append(input, lastpos, i - lastpos); + } while (i < input.Length); + + sb.Append('$'); + return psb.ToStringAndReturn(); + } + } + + return '^' + input + '$'; + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Core/WebHelper.cs b/src/Libraries/SmartStore.Core/WebHelper.cs index b0f849407c..abd0b44dd1 100644 --- a/src/Libraries/SmartStore.Core/WebHelper.cs +++ b/src/Libraries/SmartStore.Core/WebHelper.cs @@ -1,8 +1,13 @@ using System; +using System.Collections.Concurrent; +using System.Collections.Generic; using System.Configuration; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; +using System.Net; +using System.Net.Sockets; +using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Web; @@ -12,33 +17,28 @@ using SmartStore.Core.Domain.Stores; using SmartStore.Core.Infrastructure; using SmartStore.Utilities; -using System.Net; -using System.Text; -using System.Collections.Generic; -using System.Collections.Concurrent; -using System.Net.Sockets; namespace SmartStore.Core { public partial class WebHelper : IWebHelper { - private static object s_lock = new object(); - private static bool? s_optimizedCompilationsEnabled; - private static AspNetHostingPermissionLevel? s_trustLevel; - private static readonly Regex s_staticExts = new Regex(@"(.*?)\.(css|js|png|jpg|jpeg|gif|webp|liquid|bmp|html|htm|xml|txt|pdf|doc|xls|rar|zip|7z|ico|eot|svg|ttf|woff|woff2|otf|json)", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly Regex s_htmlPathPattern = new Regex(@"(?<=(?:href|src)=(?:""|'))(?!https?://)(?[^(?:""|')]+)", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Multiline); - private static readonly Regex s_cssPathPattern = new Regex(@"url\('(?.+)'\)", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Multiline); - private static ConcurrentDictionary s_safeLocalHostNames = new ConcurrentDictionary(); - - private readonly HttpContextBase _httpContext; + private static readonly object s_lock = new object(); + private static bool? s_optimizedCompilationsEnabled; + private static AspNetHostingPermissionLevel? s_trustLevel; + private static readonly Regex s_staticExts = new Regex(@"(.*?)\.(css|js|png|jpg|jpeg|gif|webp|liquid|bmp|html|htm|xml|txt|pdf|doc|xls|rar|zip|7z|ico|eot|svg|ttf|woff|woff2|otf|json)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex s_htmlPathPattern = new Regex(@"(?<=(?:href|src)=(?:""|'))(?!https?://)(?[^(?:""|')]+)", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Multiline); + private static readonly Regex s_cssPathPattern = new Regex(@"url\('(?.+)'\)", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Multiline); + private static readonly ConcurrentDictionary s_safeLocalHostNames = new ConcurrentDictionary(); + + private readonly HttpContextBase _httpContext; private bool? _isCurrentConnectionSecured; - private string _storeHost; - private string _storeHostSsl; - private string _ipAddress; - private bool? _appPathPossiblyAppended; - private bool? _appPathPossiblyAppendedSsl; + private string _storeHost; + private string _storeHostSsl; + private string _ipAddress; + private bool? _appPathPossiblyAppended; + private bool? _appPathPossiblyAppendedSsl; - private Store _currentStore; + private Store _currentStore; public WebHelper(HttpContextBase httpContext) { @@ -50,57 +50,57 @@ public virtual string GetUrlReferrer() return _httpContext.SafeGetHttpRequest()?.UrlReferrer?.ToString() ?? string.Empty; } - public virtual string GetClientIdent() - { - var ipAddress = this.GetCurrentIpAddress(); - var userAgent = _httpContext.SafeGetHttpRequest()?.UserAgent.EmptyNull(); - - if (ipAddress.HasValue() && userAgent.HasValue()) - { - return (ipAddress + userAgent).GetHashCode().ToString(); - } - - return null; - } - - public virtual string GetCurrentIpAddress() - { - if (_ipAddress != null) - { - return _ipAddress; - } - - var httpRequest = _httpContext.SafeGetHttpRequest(); - if (httpRequest == null) - { - return string.Empty; - } - - var vars = httpRequest.ServerVariables; - - var keysToCheck = new string[] - { - "HTTP_CLIENT_IP", - "HTTP_X_FORWARDED_FOR", - "HTTP_X_FORWARDED", - "HTTP_X_CLUSTER_CLIENT_IP", - "HTTP_FORWARDED_FOR", - "HTTP_FORWARDED", - "REMOTE_ADDR", - "HTTP_CF_CONNECTING_IP" - }; - - string result = null; + public virtual string GetClientIdent() + { + var ipAddress = this.GetCurrentIpAddress(); + var userAgent = _httpContext.SafeGetHttpRequest()?.UserAgent.EmptyNull(); + + if (ipAddress.HasValue() && userAgent.HasValue()) + { + return (ipAddress + userAgent).GetHashCode().ToString(); + } + + return null; + } + + public virtual string GetCurrentIpAddress() + { + if (_ipAddress != null) + { + return _ipAddress; + } + + var httpRequest = _httpContext.SafeGetHttpRequest(); + if (httpRequest == null) + { + return string.Empty; + } + + var vars = httpRequest.ServerVariables; + + var keysToCheck = new string[] + { + "HTTP_CLIENT_IP", + "HTTP_X_FORWARDED_FOR", + "HTTP_X_FORWARDED", + "HTTP_X_CLUSTER_CLIENT_IP", + "HTTP_FORWARDED_FOR", + "HTTP_FORWARDED", + "REMOTE_ADDR", + "HTTP_CF_CONNECTING_IP" + }; + + string result = null; IPAddress ipv6 = null; - foreach (var key in keysToCheck) - { - var ipString = vars[key]; + foreach (var key in keysToCheck) + { + var ipString = vars[key]; + + if (!string.IsNullOrEmpty(ipString)) + { + var arrStrings = ipString.Split(','); - if (!string.IsNullOrEmpty(ipString)) - { - var arrStrings = ipString.Split(','); - // Iterate list from end to start (IPv6 addresses usually have precedence) for (int i = arrStrings.Length - 1; i >= 0; i--) { @@ -119,20 +119,20 @@ public virtual string GetCurrentIpAddress() } } } - } - } + } + } if (string.IsNullOrEmpty(result) && ipv6 != null) { - result = ipv6.ToString() == "::1" + result = ipv6.ToString() == "::1" ? "127.0.0.1" : ipv6.MapToIPv4().ToString(); } - return (_ipAddress = result.EmptyNull()); - } + return (_ipAddress = result.EmptyNull()); + } - public virtual string GetThisPageUrl(bool includeQueryString) + public virtual string GetThisPageUrl(bool includeQueryString) { bool useSsl = IsCurrentConnectionSecured(); return GetThisPageUrl(includeQueryString, useSsl); @@ -141,44 +141,44 @@ public virtual string GetThisPageUrl(bool includeQueryString) public virtual string GetThisPageUrl(bool includeQueryString, bool useSsl) { string url = string.Empty; - var httpRequest = _httpContext.SafeGetHttpRequest(); + var httpRequest = _httpContext.SafeGetHttpRequest(); - if (httpRequest == null) + if (httpRequest == null) return url; - var authority = httpRequest.Url.GetLeftPart(UriPartial.Authority); - var path = httpRequest.RawUrl; - var schemeChanges = useSsl != IsCurrentConnectionSecured(); - - if (!schemeChanges && includeQueryString) - { - // Return as is - return authority + path; - } - - if (schemeChanges) - { - authority = GetStoreHost(useSsl, out bool appPathPossiblyAppended).TrimEnd('/'); - if (appPathPossiblyAppended) - { - path = _httpContext.GetOriginalAppRelativePath().TrimStart('~'); - if (includeQueryString && httpRequest.Url?.Query != null) - { - path += httpRequest.Url.Query; - } - } - } - - if (!includeQueryString) - { - var queryIndex = path.IndexOf('?'); - if (queryIndex > -1) - { - path = path.Substring(0, queryIndex); - } - } - - return authority + path; + var authority = httpRequest.Url.GetLeftPart(UriPartial.Authority); + var path = httpRequest.RawUrl; + var schemeChanges = useSsl != IsCurrentConnectionSecured(); + + if (!schemeChanges && includeQueryString) + { + // Return as is + return authority + path; + } + + if (schemeChanges) + { + authority = GetStoreHost(useSsl, out bool appPathPossiblyAppended).TrimEnd('/'); + if (appPathPossiblyAppended) + { + path = _httpContext.GetOriginalAppRelativePath().TrimStart('~'); + if (includeQueryString && httpRequest.Url?.Query != null) + { + path += httpRequest.Url.Query; + } + } + } + + if (!includeQueryString) + { + var queryIndex = path.IndexOf('?'); + if (queryIndex > -1) + { + path = path.Substring(0, queryIndex); + } + } + + return authority + path; } public virtual bool IsCurrentConnectionSecured() @@ -186,8 +186,8 @@ public virtual bool IsCurrentConnectionSecured() if (!_isCurrentConnectionSecured.HasValue) { _isCurrentConnectionSecured = false; - var httpRequest = _httpContext.SafeGetHttpRequest(); - if (httpRequest != null) + var httpRequest = _httpContext.SafeGetHttpRequest(); + if (httpRequest != null) { _isCurrentConnectionSecured = httpRequest.IsHttps(); } @@ -195,14 +195,14 @@ public virtual bool IsCurrentConnectionSecured() return _isCurrentConnectionSecured.Value; } - + public virtual string ServerVariables(string name) { - return _httpContext.SafeGetHttpRequest()?.ServerVariables[name].EmptyNull(); + return _httpContext.SafeGetHttpRequest()?.ServerVariables[name].EmptyNull(); } - [SuppressMessage("ReSharper", "UnusedMember.Local")] - private string GetHostPart(string url) + [SuppressMessage("ReSharper", "UnusedMember.Local")] + private string GetHostPart(string url) { var uri = new Uri(url); var host = uri.GetComponents(UriComponents.Scheme | UriComponents.Host, UriFormat.Unescaped); @@ -211,14 +211,14 @@ private string GetHostPart(string url) private string GetStoreHost(bool useSsl, out bool appPathPossiblyAppended) { - string cached = useSsl ? _storeHostSsl : _storeHost; - if (cached != null) - { - appPathPossiblyAppended = useSsl ? _appPathPossiblyAppendedSsl.Value : _appPathPossiblyAppended.Value; - return cached; - } - - appPathPossiblyAppended = false; + string cached = useSsl ? _storeHostSsl : _storeHost; + if (cached != null) + { + appPathPossiblyAppended = useSsl ? _appPathPossiblyAppendedSsl.Value : _appPathPossiblyAppended.Value; + return cached; + } + + appPathPossiblyAppended = false; var result = ""; var httpHost = ServerVariables("HTTP_HOST"); @@ -238,86 +238,86 @@ private string GetStoreHost(bool useSsl, out bool appPathPossiblyAppended) } else { - // Let's resolve IWorkContext here. - // Do not inject it via contructor because it'll cause circular references - - if (_currentStore == null) - { - if (EngineContext.Current.ContainerManager.TryResolve(null, out IStoreContext storeContext)) // Unit test safe! - { - _currentStore = storeContext.CurrentStore; - if (_currentStore == null) - throw new Exception("Current store cannot be loaded"); - } - } - - if (_currentStore != null) - { - var securityMode = _currentStore.GetSecurityMode(); - - if (httpHost.IsEmpty()) - { - // HTTP_HOST variable is not available. - // It's possible only when HttpContext is not available (for example, running in a schedule task) - result = _currentStore.Url.EnsureEndsWith("/"); - - appPathPossiblyAppended = true; - } - - if (useSsl) - { - if (securityMode == HttpSecurityMode.SharedSsl) - { - // Secure URL for shared ssl specified. - // So a store owner doesn't want it to be resolved automatically. - // In this case let's use the specified secure URL - result = _currentStore.SecureUrl.EmptyNull(); - - if (!result.StartsWith("https://", StringComparison.OrdinalIgnoreCase)) - { - result = "https://" + result; - } - - appPathPossiblyAppended = true; - } - else - { - // Secure URL is not specified. - // So a store owner wants it to be resolved automatically. - result = result.Replace("http:/", "https:/"); - } - } - else // no ssl - { - if (securityMode == HttpSecurityMode.SharedSsl) - { - // SSL is enabled in this store and shared ssl URL is specified. - // So a store owner doesn't want it to be resolved automatically. - // In this case let's use the specified non-secure URL - - result = _currentStore.Url; - appPathPossiblyAppended = true; - } - } - } - } - - // cache results for request - result = result.EnsureEndsWith("/"); - if (useSsl) - { - _storeHostSsl = result; - _appPathPossiblyAppendedSsl = appPathPossiblyAppended; - } - else - { - _storeHost = result; - _appPathPossiblyAppended = appPathPossiblyAppended; - } + // Let's resolve IWorkContext here. + // Do not inject it via contructor because it'll cause circular references + + if (_currentStore == null) + { + if (EngineContext.Current.ContainerManager.TryResolve(null, out IStoreContext storeContext)) // Unit test safe! + { + _currentStore = storeContext.CurrentStore; + if (_currentStore == null) + throw new Exception("Current store cannot be loaded"); + } + } + + if (_currentStore != null) + { + var securityMode = _currentStore.GetSecurityMode(); + + if (httpHost.IsEmpty()) + { + // HTTP_HOST variable is not available. + // It's possible only when HttpContext is not available (for example, running in a schedule task) + result = _currentStore.Url.EnsureEndsWith("/"); + + appPathPossiblyAppended = true; + } + + if (useSsl) + { + if (securityMode == HttpSecurityMode.SharedSsl) + { + // Secure URL for shared ssl specified. + // So a store owner doesn't want it to be resolved automatically. + // In this case let's use the specified secure URL + result = _currentStore.SecureUrl.EmptyNull(); + + if (!result.StartsWith("https://", StringComparison.OrdinalIgnoreCase)) + { + result = "https://" + result; + } + + appPathPossiblyAppended = true; + } + else + { + // Secure URL is not specified. + // So a store owner wants it to be resolved automatically. + result = result.Replace("http:/", "https:/"); + } + } + else // no ssl + { + if (securityMode == HttpSecurityMode.SharedSsl) + { + // SSL is enabled in this store and shared ssl URL is specified. + // So a store owner doesn't want it to be resolved automatically. + // In this case let's use the specified non-secure URL + + result = _currentStore.Url; + appPathPossiblyAppended = true; + } + } + } + } + + // cache results for request + result = result.EnsureEndsWith("/"); + if (useSsl) + { + _storeHostSsl = result; + _appPathPossiblyAppendedSsl = appPathPossiblyAppended; + } + else + { + _storeHost = result; + _appPathPossiblyAppended = appPathPossiblyAppended; + } return result; } - + public virtual string GetStoreLocation() { bool useSsl = IsCurrentConnectionSecured(); @@ -333,7 +333,7 @@ public virtual string GetStoreLocation(bool useSsl) result = result.Substring(0, result.Length - 1); } - var httpRequest = _httpContext.SafeGetHttpRequest(); + var httpRequest = _httpContext.SafeGetHttpRequest(); if (httpRequest != null) { @@ -343,7 +343,7 @@ public virtual string GetStoreLocation(bool useSsl) // in a shared ssl scenario the user defined https url could contain // the app path already. In this case we must not append. result += appPath; - } + } } if (!result.EndsWith("/")) @@ -353,485 +353,485 @@ public virtual string GetStoreLocation(bool useSsl) return result; } - + public virtual bool IsStaticResource(HttpRequest request) { - return IsStaticResourceRequested(new HttpRequestWrapper(request)); + return IsStaticResourceRequested(new HttpRequestWrapper(request)); + } + + public static bool IsStaticResourceRequested(HttpRequest request) + { + Guard.NotNull(request, nameof(request)); + return s_staticExts.IsMatch(request.Path); + } + + public static bool IsStaticResourceRequested(HttpRequestBase request) + { + // unit testable + Guard.NotNull(request, nameof(request)); + return s_staticExts.IsMatch(request.Path); } - public static bool IsStaticResourceRequested(HttpRequest request) - { - Guard.NotNull(request, nameof(request)); - return s_staticExts.IsMatch(request.Path); - } - - public static bool IsStaticResourceRequested(HttpRequestBase request) - { - // unit testable - Guard.NotNull(request, nameof(request)); - return s_staticExts.IsMatch(request.Path); - } - public virtual string MapPath(string path) { - return CommonHelper.MapPath(path, false); + return CommonHelper.MapPath(path, false); } - + public virtual string ModifyQueryString(string url, string queryStringModification, string anchor) { - url = url.EmptyNull(); - queryStringModification = queryStringModification.EmptyNull(); - - string curAnchor = null; - - var hsIndex = url.LastIndexOf('#'); - if (hsIndex >= 0) - { - curAnchor = url.Substring(hsIndex); - url = url.Substring(0, hsIndex); - } - - var parts = url.Split(new[] { '?' }); - var current = new QueryString(parts.Length == 2 ? parts[1] : ""); - var modify = new QueryString(queryStringModification); - - foreach (var nv in modify.AllKeys) - { - current.Add(nv, modify[nv], true); - } - - var result = string.Concat( - parts[0], - current.ToString(false), - anchor.NullEmpty() == null ? (curAnchor == null ? "" : "#" + curAnchor) : "#" + anchor - ); - - return result; + url = url.EmptyNull(); + queryStringModification = queryStringModification.EmptyNull(); + + string curAnchor = null; + + var hsIndex = url.LastIndexOf('#'); + if (hsIndex >= 0) + { + curAnchor = url.Substring(hsIndex); + url = url.Substring(0, hsIndex); + } + + var parts = url.Split(new[] { '?' }); + var current = new QueryString(parts.Length == 2 ? parts[1] : ""); + var modify = new QueryString(queryStringModification); + + foreach (var nv in modify.AllKeys) + { + current.Add(nv, modify[nv], true); + } + + var result = string.Concat( + parts[0], + current.ToString(false), + anchor.NullEmpty() == null ? (curAnchor == null ? "" : "#" + curAnchor) : "#" + anchor + ); + + return result; } public virtual string RemoveQueryString(string url, string queryString) { - var parts = url.SplitSafe("?"); + var parts = url.SplitSafe("?"); - var current = new QueryString(parts.Length == 2 ? parts[1] : ""); + var current = new QueryString(parts.Length == 2 ? parts[1] : ""); - if (current.Count > 0 && queryString.HasValue()) - { - current.Remove(queryString); - } + if (current.Count > 0 && queryString.HasValue()) + { + current.Remove(queryString); + } - var result = string.Concat(parts[0], current.ToString(false)); - return result; + var result = string.Concat(parts[0], current.ToString(false)); + return result; } - + public virtual T QueryString(string name) { - var queryParam = _httpContext.SafeGetHttpRequest()?.QueryString[name]; + var queryParam = _httpContext.SafeGetHttpRequest()?.QueryString[name]; - if (!string.IsNullOrEmpty(queryParam)) - { - return queryParam.Convert(); - } + if (!string.IsNullOrEmpty(queryParam)) + { + return queryParam.Convert(); + } return default(T); } - + public virtual void RestartAppDomain(bool makeRedirect = false, string redirectUrl = "", bool aggressive = false) { - HttpRuntime.UnloadAppDomain(); - - if (aggressive) - { - // When plugins are (un)installed, 'aggressive' is always true. - if (OptimizedCompilationsEnabled) - { - // Very hackish: - // If optimizedCompilations is on per web.config, touching top-level resources - // like global.asax or bin folder is meaningless, 'cause ASP.NET skips these for - // hash calculation. This way we can throw in plugins like crazy without invalidating - // ASP.NET temp files, which boosts app startup performance dramatically. - // Unfortunately, MVC keeps a controller cache file in the temp files folder, which NEVER - // gets nuked, unless the 'compilation' element in web.config is changed. - // We MUST delete this file in order to ensure that it gets re-created with our new controller types in it. - DeleteMvcTypeCacheFiles(); - } - else - { - // Without optimizedCompilations, touching anything in the bin folder nukes ASP.NET temp folder completely, - // including compiled views, MVC cache files etc. - TryWriteBinFolder(); - } - } - else - { - // without this, MVC may fail resolving controllers for newly installed plugins after IIS restart - Thread.Sleep(250); - } + HttpRuntime.UnloadAppDomain(); + + if (aggressive) + { + // When plugins are (un)installed, 'aggressive' is always true. + if (OptimizedCompilationsEnabled) + { + // Very hackish: + // If optimizedCompilations is on per web.config, touching top-level resources + // like global.asax or bin folder is meaningless, 'cause ASP.NET skips these for + // hash calculation. This way we can throw in plugins like crazy without invalidating + // ASP.NET temp files, which boosts app startup performance dramatically. + // Unfortunately, MVC keeps a controller cache file in the temp files folder, which NEVER + // gets nuked, unless the 'compilation' element in web.config is changed. + // We MUST delete this file in order to ensure that it gets re-created with our new controller types in it. + DeleteMvcTypeCacheFiles(); + } + else + { + // Without optimizedCompilations, touching anything in the bin folder nukes ASP.NET temp folder completely, + // including compiled views, MVC cache files etc. + TryWriteBinFolder(); + } + } + else + { + // without this, MVC may fail resolving controllers for newly installed plugins after IIS restart + Thread.Sleep(250); + } // If setting up plugins requires an AppDomain restart, it's very unlikely the // current request can be processed correctly. So, we redirect to the same URL, so that the // new request will come to the newly started AppDomain. if (_httpContext != null && makeRedirect) { - if (_httpContext.Request.RequestType == "GET") - { - if (string.IsNullOrEmpty(redirectUrl)) - { - redirectUrl = GetThisPageUrl(true); - } - _httpContext.Response.Redirect(redirectUrl, true /*endResponse*/); - } - else - { - // Don't redirect posts... - _httpContext.Response.ContentType = "text/html"; - _httpContext.Response.WriteFile("~/refresh.html"); - _httpContext.Response.End(); - } + if (_httpContext.Request.RequestType == "GET") + { + if (string.IsNullOrEmpty(redirectUrl)) + { + redirectUrl = GetThisPageUrl(true); + } + _httpContext.Response.Redirect(redirectUrl, true /*endResponse*/); + } + else + { + // Don't redirect posts... + _httpContext.Response.ContentType = "text/html"; + _httpContext.Response.WriteFile("~/refresh.html"); + _httpContext.Response.End(); + } + } + } + + private void DeleteMvcTypeCacheFiles() + { + try + { + var userCacheDir = Path.Combine(HttpRuntime.CodegenDir, "UserCache"); + + File.Delete(Path.Combine(userCacheDir, "MVC-ControllerTypeCache.xml")); + File.Delete(Path.Combine(userCacheDir, "MVC-AreaRegistrationTypeCache.xml")); + } + catch { } + } + + private bool TryWriteBinFolder() + { + try + { + var binMarker = MapPath("~/bin/HostRestart"); + Directory.CreateDirectory(binMarker); + + using (var stream = File.CreateText(Path.Combine(binMarker, "marker.txt"))) + { + stream.WriteLine("Restart on '{0}'", DateTime.UtcNow); + stream.Flush(); + } + return true; + } + catch + { + return false; + } + } + + internal static bool OptimizedCompilationsEnabled + { + get + { + if (!s_optimizedCompilationsEnabled.HasValue) + { + var section = (CompilationSection)ConfigurationManager.GetSection("system.web/compilation"); + s_optimizedCompilationsEnabled = section.OptimizeCompilations; + } + + return s_optimizedCompilationsEnabled.Value; } } - private void DeleteMvcTypeCacheFiles() - { - try - { - var userCacheDir = Path.Combine(HttpRuntime.CodegenDir, "UserCache"); - - File.Delete(Path.Combine(userCacheDir, "MVC-ControllerTypeCache.xml")); - File.Delete(Path.Combine(userCacheDir, "MVC-AreaRegistrationTypeCache.xml")); - } - catch { } - } - - private bool TryWriteBinFolder() - { - try - { - var binMarker = MapPath("~/bin/HostRestart"); - Directory.CreateDirectory(binMarker); - - using (var stream = File.CreateText(Path.Combine(binMarker, "marker.txt"))) - { - stream.WriteLine("Restart on '{0}'", DateTime.UtcNow); - stream.Flush(); - } - return true; - } - catch - { - return false; - } - } - - internal static bool OptimizedCompilationsEnabled - { - get - { - if (!s_optimizedCompilationsEnabled.HasValue) - { - var section = (CompilationSection)ConfigurationManager.GetSection("system.web/compilation"); - s_optimizedCompilationsEnabled = section.OptimizeCompilations; - } - - return s_optimizedCompilationsEnabled.Value; - } - } - - /// - /// Finds the trust level of the running application (http://blogs.msdn.com/dmitryr/archive/2007/01/23/finding-out-the-current-trust-level-in-asp-net.aspx) - /// - /// The current trust level. - public static AspNetHostingPermissionLevel GetTrustLevel() - { - if (!s_trustLevel.HasValue) - { - // set minimum - s_trustLevel = AspNetHostingPermissionLevel.None; - - // determine maximum - foreach (AspNetHostingPermissionLevel trustLevel in - new [] { + /// + /// Finds the trust level of the running application (http://blogs.msdn.com/dmitryr/archive/2007/01/23/finding-out-the-current-trust-level-in-asp-net.aspx) + /// + /// The current trust level. + public static AspNetHostingPermissionLevel GetTrustLevel() + { + if (!s_trustLevel.HasValue) + { + // set minimum + s_trustLevel = AspNetHostingPermissionLevel.None; + + // determine maximum + foreach (AspNetHostingPermissionLevel trustLevel in + new[] { AspNetHostingPermissionLevel.Unrestricted, AspNetHostingPermissionLevel.High, AspNetHostingPermissionLevel.Medium, AspNetHostingPermissionLevel.Low, - AspNetHostingPermissionLevel.Minimal + AspNetHostingPermissionLevel.Minimal }) - { - try - { - new AspNetHostingPermission(trustLevel).Demand(); - s_trustLevel = trustLevel; - break; //we've set the highest permission we can - } - catch (System.Security.SecurityException) - { - continue; - } - } - } - return s_trustLevel.Value; - } - - /// - /// Prepends protocol and host to all (relative) urls in a html string - /// - /// The html string - /// Request object - /// The transformed result html - /// - /// All html attributed named src and href are affected, also occurences of url('path') within embedded stylesheets. - /// - public static string MakeAllUrlsAbsolute(string html, HttpRequestBase request) - { - Guard.NotNull(request, nameof(request)); - - if (request.Url == null) - { - return html; - } - - return MakeAllUrlsAbsolute(html, request.Url.Scheme, request.Url.Authority); - } - - /// - /// Prepends protocol and host to all (relative) urls in a html string - /// - /// The html string - /// The protocol to prepend, e.g. http - /// The host name to prepend, e.g. www.mysite.com - /// The transformed result html - /// - /// All html attributed named src and href are affected, also occurences of url('path') within embedded stylesheets. - /// - public static string MakeAllUrlsAbsolute(string html, string protocol, string host) - { - Guard.NotEmpty(html, nameof(html)); - Guard.NotEmpty(protocol, nameof(protocol)); - Guard.NotEmpty(host, nameof(host)); - - string baseUrl = protocol.EnsureEndsWith("://") + host.TrimEnd('/'); - - MatchEvaluator evaluator = (match) => - { - var url = match.Groups["url"].Value; - return "{0}{1}".FormatCurrent(baseUrl, url.EnsureStartsWith("/")); - }; - - html = s_htmlPathPattern.Replace(html, evaluator); - html = s_cssPathPattern.Replace(html, evaluator); - - return html; - } - - /// - /// Prepends protocol and host to the given (relative) url - /// - /// Changes the protocol if passed. - [SuppressMessage("ReSharper", "AccessToModifiedClosure")] - public static string GetAbsoluteUrl(string url, HttpRequestBase request, bool enforceScheme = false, string protocol = null) - { - Guard.NotEmpty(url, nameof(url)); - Guard.NotNull(request, nameof(request)); - - if (request.Url == null) - { - return url; - } - - if (url.Contains("://")) - { - return url; - } - - protocol = protocol ?? request.Url.Scheme; - - if (url.StartsWith("//")) - { - return enforceScheme - ? String.Concat(protocol, ":", url) - : url; - } - - if (url.StartsWith("~")) - { - url = VirtualPathUtility.ToAbsolute(url); - } - - url = string.Format("{0}://{1}{2}", protocol, request.Url.Authority, url); - return url; - } - - public static string GetPublicIPAddress() - { - string result = string.Empty; - - try - { - using (var client = new WebClient()) - { - client.Headers["User-Agent"] = "Mozilla/4.0 (Compatible; Windows NT 5.1; MSIE 6.0) (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)"; - try - { - byte[] arr = client.DownloadData("http://checkip.amazonaws.com/"); - string response = Encoding.UTF8.GetString(arr); - result = response.Trim(); - } - catch { } - } - } - catch { } - - var checkers = new string[] - { - "https://ipinfo.io/ip", - "https://api.ipify.org", - "https://icanhazip.com", - "https://wtfismyip.com/text", - "http://bot.whatismyipaddress.com/" - }; - - if (string.IsNullOrEmpty(result)) - { - using (var client = new WebClient()) - { - foreach (var checker in checkers) - { - try - { - result = client.DownloadString(checker).Replace("\n", ""); - if (!string.IsNullOrEmpty(result)) - { - break; - } - } - catch { } - } - } - } - - if (string.IsNullOrEmpty(result)) - { - try - { - var url = "http://checkip.dyndns.org"; - var req = WebRequest.Create(url); - using (var resp = req.GetResponse()) - { - using (var sr = new StreamReader(resp.GetResponseStream())) - { - var response = sr.ReadToEnd().Trim(); - var a = response.Split(':'); - var a2 = a[1].Substring(1); - var a3 = a2.Split('<'); - result = a3[0]; - } - } - } - catch { } - } - - return result; - } - - public static HttpWebRequest CreateHttpRequestForSafeLocalCall(Uri requestUri) - { - Guard.NotNull(requestUri, nameof(requestUri)); - - var safeHostName = GetSafeLocalHostName(requestUri); - - var uri = requestUri; - - if (!requestUri.Host.Equals(safeHostName, StringComparison.OrdinalIgnoreCase)) - { - var url = String.Format("{0}://{1}{2}", - requestUri.Scheme, - requestUri.IsDefaultPort ? safeHostName : safeHostName + ":" + requestUri.Port, - requestUri.PathAndQuery); - uri = new Uri(url); - } - - var request = WebRequest.CreateHttp(uri); - request.ServerCertificateValidationCallback += (sender, cert, chain, errors) => true; - request.ServicePoint.Expect100Continue = false; - request.UserAgent = "Smartstore {0}".FormatInvariant(SmartStoreVersion.CurrentFullVersion); - - return request; - } - - private static string GetSafeLocalHostName(Uri requestUri) - { - return s_safeLocalHostNames.GetOrAdd(requestUri.Port, (port) => - { - // first try original host - if (TestHost(requestUri, requestUri.Host, 5000)) - { - return requestUri.Host; - } - - // try loopback - var hostName = Dns.GetHostName(); - var hosts = new List { "localhost", hostName, "127.0.0.1" }; - foreach (var host in hosts) - { - if (TestHost(requestUri, host, 500)) - { - return host; - } - } - - // try local IP addresses - hosts.Clear(); - var ipAddresses = Dns.GetHostAddresses(hostName).Where(x => x.AddressFamily == AddressFamily.InterNetwork).Select(x => x.ToString()); - hosts.AddRange(ipAddresses); - - foreach (var host in hosts) - { - if (TestHost(requestUri, host, 500)) - { - return host; - } - } - - // None of the hosts are callable. WTF? - return requestUri.Host; - }); - } - - private static bool TestHost(Uri originalUri, string host, int timeout) - { - var url = String.Format("{0}://{1}/taskscheduler/noop", - originalUri.Scheme, - originalUri.IsDefaultPort ? host : host + ":" + originalUri.Port); - var uri = new Uri(url); - - var request = WebRequest.CreateHttp(uri); - request.ServerCertificateValidationCallback += (sender, cert, chain, errors) => true; - request.ServicePoint.Expect100Continue = false; - request.UserAgent = "Smartstore"; - request.Timeout = timeout; - - HttpWebResponse response = null; - - try - { - response = (HttpWebResponse)request.GetResponse(); - if (response.StatusCode == HttpStatusCode.OK) - { - return true; - } - } - catch - { - // try the next host - } - finally - { - if (response != null) - response.Dispose(); - } - - return false; - } - } + { + try + { + new AspNetHostingPermission(trustLevel).Demand(); + s_trustLevel = trustLevel; + break; //we've set the highest permission we can + } + catch (System.Security.SecurityException) + { + continue; + } + } + } + return s_trustLevel.Value; + } + + /// + /// Prepends protocol and host to all (relative) urls in a html string + /// + /// The html string + /// Request object + /// The transformed result html + /// + /// All html attributed named src and href are affected, also occurences of url('path') within embedded stylesheets. + /// + public static string MakeAllUrlsAbsolute(string html, HttpRequestBase request) + { + Guard.NotNull(request, nameof(request)); + + if (request.Url == null) + { + return html; + } + + return MakeAllUrlsAbsolute(html, request.Url.Scheme, request.Url.Authority); + } + + /// + /// Prepends protocol and host to all (relative) urls in a html string + /// + /// The html string + /// The protocol to prepend, e.g. http + /// The host name to prepend, e.g. www.mysite.com + /// The transformed result html + /// + /// All html attributed named src and href are affected, also occurences of url('path') within embedded stylesheets. + /// + public static string MakeAllUrlsAbsolute(string html, string protocol, string host) + { + Guard.NotEmpty(html, nameof(html)); + Guard.NotEmpty(protocol, nameof(protocol)); + Guard.NotEmpty(host, nameof(host)); + + string baseUrl = protocol.EnsureEndsWith("://") + host.TrimEnd('/'); + + MatchEvaluator evaluator = (match) => + { + var url = match.Groups["url"].Value; + return "{0}{1}".FormatCurrent(baseUrl, url.EnsureStartsWith("/")); + }; + + html = s_htmlPathPattern.Replace(html, evaluator); + html = s_cssPathPattern.Replace(html, evaluator); + + return html; + } + + /// + /// Prepends protocol and host to the given (relative) url + /// + /// Changes the protocol if passed. + [SuppressMessage("ReSharper", "AccessToModifiedClosure")] + public static string GetAbsoluteUrl(string url, HttpRequestBase request, bool enforceScheme = false, string protocol = null) + { + Guard.NotEmpty(url, nameof(url)); + Guard.NotNull(request, nameof(request)); + + if (request.Url == null) + { + return url; + } + + if (url.Contains("://")) + { + return url; + } + + protocol = protocol ?? request.Url.Scheme; + + if (url.StartsWith("//")) + { + return enforceScheme + ? String.Concat(protocol, ":", url) + : url; + } + + if (url.StartsWith("~")) + { + url = VirtualPathUtility.ToAbsolute(url); + } + + url = string.Format("{0}://{1}{2}", protocol, request.Url.Authority, url); + return url; + } + + public static string GetPublicIPAddress() + { + string result = string.Empty; + + try + { + using (var client = new WebClient()) + { + client.Headers["User-Agent"] = "Mozilla/4.0 (Compatible; Windows NT 5.1; MSIE 6.0) (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)"; + try + { + byte[] arr = client.DownloadData("http://checkip.amazonaws.com/"); + string response = Encoding.UTF8.GetString(arr); + result = response.Trim(); + } + catch { } + } + } + catch { } + + var checkers = new string[] + { + "https://ipinfo.io/ip", + "https://api.ipify.org", + "https://icanhazip.com", + "https://wtfismyip.com/text", + "http://bot.whatismyipaddress.com/" + }; + + if (string.IsNullOrEmpty(result)) + { + using (var client = new WebClient()) + { + foreach (var checker in checkers) + { + try + { + result = client.DownloadString(checker).Replace("\n", ""); + if (!string.IsNullOrEmpty(result)) + { + break; + } + } + catch { } + } + } + } + + if (string.IsNullOrEmpty(result)) + { + try + { + var url = "http://checkip.dyndns.org"; + var req = WebRequest.Create(url); + using (var resp = req.GetResponse()) + { + using (var sr = new StreamReader(resp.GetResponseStream())) + { + var response = sr.ReadToEnd().Trim(); + var a = response.Split(':'); + var a2 = a[1].Substring(1); + var a3 = a2.Split('<'); + result = a3[0]; + } + } + } + catch { } + } + + return result; + } + + public static HttpWebRequest CreateHttpRequestForSafeLocalCall(Uri requestUri) + { + Guard.NotNull(requestUri, nameof(requestUri)); + + var safeHostName = GetSafeLocalHostName(requestUri); + + var uri = requestUri; + + if (!requestUri.Host.Equals(safeHostName, StringComparison.OrdinalIgnoreCase)) + { + var url = String.Format("{0}://{1}{2}", + requestUri.Scheme, + requestUri.IsDefaultPort ? safeHostName : safeHostName + ":" + requestUri.Port, + requestUri.PathAndQuery); + uri = new Uri(url); + } + + var request = WebRequest.CreateHttp(uri); + request.ServerCertificateValidationCallback += (sender, cert, chain, errors) => true; + request.ServicePoint.Expect100Continue = false; + request.UserAgent = "Smartstore {0}".FormatInvariant(SmartStoreVersion.CurrentFullVersion); + + return request; + } + + private static string GetSafeLocalHostName(Uri requestUri) + { + return s_safeLocalHostNames.GetOrAdd(requestUri.Port, (port) => + { + // first try original host + if (TestHost(requestUri, requestUri.Host, 5000)) + { + return requestUri.Host; + } + + // try loopback + var hostName = Dns.GetHostName(); + var hosts = new List { "localhost", hostName, "127.0.0.1" }; + foreach (var host in hosts) + { + if (TestHost(requestUri, host, 500)) + { + return host; + } + } + + // try local IP addresses + hosts.Clear(); + var ipAddresses = Dns.GetHostAddresses(hostName).Where(x => x.AddressFamily == AddressFamily.InterNetwork).Select(x => x.ToString()); + hosts.AddRange(ipAddresses); + + foreach (var host in hosts) + { + if (TestHost(requestUri, host, 500)) + { + return host; + } + } + + // None of the hosts are callable. WTF? + return requestUri.Host; + }); + } + + private static bool TestHost(Uri originalUri, string host, int timeout) + { + var url = String.Format("{0}://{1}/taskscheduler/noop", + originalUri.Scheme, + originalUri.IsDefaultPort ? host : host + ":" + originalUri.Port); + var uri = new Uri(url); + + var request = WebRequest.CreateHttp(uri); + request.ServerCertificateValidationCallback += (sender, cert, chain, errors) => true; + request.ServicePoint.Expect100Continue = false; + request.UserAgent = "Smartstore"; + request.Timeout = timeout; + + HttpWebResponse response = null; + + try + { + response = (HttpWebResponse)request.GetResponse(); + if (response.StatusCode == HttpStatusCode.OK) + { + return true; + } + } + catch + { + // try the next host + } + finally + { + if (response != null) + response.Dispose(); + } + + return false; + } + } } diff --git a/src/Libraries/SmartStore.Core/XmlHelper.cs b/src/Libraries/SmartStore.Core/XmlHelper.cs index 47c806b66b..cc5f65923b 100644 --- a/src/Libraries/SmartStore.Core/XmlHelper.cs +++ b/src/Libraries/SmartStore.Core/XmlHelper.cs @@ -7,184 +7,184 @@ namespace SmartStore.Core { - /// - /// Xml helper class - /// - public partial class XmlHelper - { - private readonly static Regex s_xmlEncodePattern = new Regex(@"[^\u0009\u000A\u000D\u0020-\uD7FF\uE000-\uFFFD]", RegexOptions.Compiled); - - #region Methods - - /// - /// XML Encode - /// - /// String - /// Encoded string - public static string XmlEncode(string str) - { - if (str == null) - return null; - - str = s_xmlEncodePattern.Replace(str, ""); - return XmlEncodeAsIs(str); - } - - /// - /// XML Encode as is - /// - /// String - /// Encoded string - public static string XmlEncodeAsIs(string str) - { - if (str == null) - return null; - - using (var sw = new StringWriter()) - { - using (var xwr = new XmlTextWriter(sw)) - { - xwr.WriteString(str); - return sw.ToString(); - } - } - } - - /// - /// Encodes an attribute - /// - /// Attribute - /// Encoded attribute - public static string XmlEncodeAttribute(string str) - { - if (str == null) - return null; - str = s_xmlEncodePattern.Replace(str, ""); - return XmlEncodeAttributeAsIs(str); - } - - /// - /// Encodes an attribute as is - /// - /// Attribute - /// Encoded attribute - public static string XmlEncodeAttributeAsIs(string str) - { - return XmlEncodeAsIs(str).Replace("\"", """); - } - - /// - /// Decodes an attribute - /// - /// Attribute - /// Decoded attribute - public static string XmlDecode(string str) - { - var sb = new StringBuilder(str); - return sb.Replace(""", "\"").Replace("'", "'").Replace("<", "<").Replace(">", ">").Replace("&", "&").ToString(); - } - - /// - /// Serializes a datetime - /// - /// Datetime - /// Serialized datetime - public static string SerializeDateTime(DateTime dateTime) - { - var xmlS = new XmlSerializer(typeof(DateTime)); - var sb = new StringBuilder(); - using (var sw = new StringWriter(sb)) - { - xmlS.Serialize(sw, dateTime); - return sb.ToString(); - } - } - - /// - /// Deserializes a datetime - /// - /// Datetime - /// Deserialized datetime - public static DateTime DeserializeDateTime(string dateTime) - { - var xmlS = new XmlSerializer(typeof(DateTime)); - using (var sr = new StringReader(dateTime)) - { - object test = xmlS.Deserialize(sr); - return (DateTime)test; - } - } - - /// - /// Serializes an object instance to a XML formatted string - /// - /// Object type - /// Object instance - /// XML string - public static string Serialize(T instance) - { - return Serialize(instance, typeof(T)); - } - - /// - /// Serializes an object instance to a XML formatted string - /// - /// Object instance - /// Object type - /// XML string - public static string Serialize(object instance, Type type) - { - if (instance == null) - return null; - - Guard.NotNull(type, nameof(type)); - - using (var writer = new StringWriter()) - { - var xmlSerializer = new XmlSerializer(type); - - xmlSerializer.Serialize(writer, instance); - return writer.ToString(); - } - } - - /// - /// Deserializes a XML formatted string to an object instance - /// - /// Object type - /// XML string - /// Object instance - public static T Deserialize(string xml) - { - return (T)Deserialize(xml, typeof(T)); - } - - /// - /// Deserializes a XML formatted string to an object instance - /// - /// XML string - /// Object type - /// Object instance - public static object Deserialize(string xml, Type type) - { - Guard.NotNull(type, nameof(type)); - - try - { - if (xml.HasValue()) - { - using (var reader = new StringReader(xml)) - { - var serializer = new XmlSerializer(type); - return serializer.Deserialize(reader); - } - } - } - catch { } - - return Activator.CreateInstance(type); - } - - #endregion - } + /// + /// Xml helper class + /// + public partial class XmlHelper + { + private readonly static Regex s_xmlEncodePattern = new Regex(@"[^\u0009\u000A\u000D\u0020-\uD7FF\uE000-\uFFFD]", RegexOptions.Compiled); + + #region Methods + + /// + /// XML Encode + /// + /// String + /// Encoded string + public static string XmlEncode(string str) + { + if (str == null) + return null; + + str = s_xmlEncodePattern.Replace(str, ""); + return XmlEncodeAsIs(str); + } + + /// + /// XML Encode as is + /// + /// String + /// Encoded string + public static string XmlEncodeAsIs(string str) + { + if (str == null) + return null; + + using (var sw = new StringWriter()) + { + using (var xwr = new XmlTextWriter(sw)) + { + xwr.WriteString(str); + return sw.ToString(); + } + } + } + + /// + /// Encodes an attribute + /// + /// Attribute + /// Encoded attribute + public static string XmlEncodeAttribute(string str) + { + if (str == null) + return null; + str = s_xmlEncodePattern.Replace(str, ""); + return XmlEncodeAttributeAsIs(str); + } + + /// + /// Encodes an attribute as is + /// + /// Attribute + /// Encoded attribute + public static string XmlEncodeAttributeAsIs(string str) + { + return XmlEncodeAsIs(str).Replace("\"", """); + } + + /// + /// Decodes an attribute + /// + /// Attribute + /// Decoded attribute + public static string XmlDecode(string str) + { + var sb = new StringBuilder(str); + return sb.Replace(""", "\"").Replace("'", "'").Replace("<", "<").Replace(">", ">").Replace("&", "&").ToString(); + } + + /// + /// Serializes a datetime + /// + /// Datetime + /// Serialized datetime + public static string SerializeDateTime(DateTime dateTime) + { + var xmlS = new XmlSerializer(typeof(DateTime)); + var sb = new StringBuilder(); + using (var sw = new StringWriter(sb)) + { + xmlS.Serialize(sw, dateTime); + return sb.ToString(); + } + } + + /// + /// Deserializes a datetime + /// + /// Datetime + /// Deserialized datetime + public static DateTime DeserializeDateTime(string dateTime) + { + var xmlS = new XmlSerializer(typeof(DateTime)); + using (var sr = new StringReader(dateTime)) + { + object test = xmlS.Deserialize(sr); + return (DateTime)test; + } + } + + /// + /// Serializes an object instance to a XML formatted string + /// + /// Object type + /// Object instance + /// XML string + public static string Serialize(T instance) + { + return Serialize(instance, typeof(T)); + } + + /// + /// Serializes an object instance to a XML formatted string + /// + /// Object instance + /// Object type + /// XML string + public static string Serialize(object instance, Type type) + { + if (instance == null) + return null; + + Guard.NotNull(type, nameof(type)); + + using (var writer = new StringWriter()) + { + var xmlSerializer = new XmlSerializer(type); + + xmlSerializer.Serialize(writer, instance); + return writer.ToString(); + } + } + + /// + /// Deserializes a XML formatted string to an object instance + /// + /// Object type + /// XML string + /// Object instance + public static T Deserialize(string xml) + { + return (T)Deserialize(xml, typeof(T)); + } + + /// + /// Deserializes a XML formatted string to an object instance + /// + /// XML string + /// Object type + /// Object instance + public static object Deserialize(string xml, Type type) + { + Guard.NotNull(type, nameof(type)); + + try + { + if (xml.HasValue()) + { + using (var reader = new StringReader(xml)) + { + var serializer = new XmlSerializer(type); + return serializer.Deserialize(reader); + } + } + } + catch { } + + return Activator.CreateInstance(type); + } + + #endregion + } } From 19bb95ec8b3c08bc6bf59bf5ee3ce39ebcea0165 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 11 Sep 2020 20:15:09 +0200 Subject: [PATCH 200/695] Applied code cleanup to SmartStore.Services --- .../Affiliates/AffiliateService.cs | 2 +- .../Affiliates/IAffiliateService.cs | 2 +- .../External/AuthorizationResult.cs | 5 +- .../Authentication/External/AuthorizeState.cs | 9 +- .../External/ExternalAuthorizer.cs | 58 +- .../External/IExternalAuthenticationMethod.cs | 2 +- .../External/IExternalProviderAuthorizer.cs | 14 +- .../External/OpenAuthenticationParameters.cs | 5 +- .../External/OpenAuthenticationService.cs | 52 +- .../OpenAuthentificationExtentions.cs | 4 +- .../Authentication/External/UserClaims.cs | 2 +- .../FormsAuthenticationService.cs | 44 +- .../Authentication/IAuthenticationService.cs | 2 +- .../Blogs/BlogExtensions.cs | 2 +- .../Blogs/BlogMessageFactoryExtensions.cs | 22 +- .../SmartStore.Services/Blogs/BlogService.cs | 78 +- .../SmartStore.Services/Blogs/IBlogService.cs | 2 +- .../Caching/ClearCacheTask.cs | 20 +- .../Cart/Rules/CartRuleContext.cs | 7 +- .../Cart/Rules/CartRuleProvider.cs | 2 +- .../Cart/Rules/ListRuleBase.cs | 10 +- .../Catalog/AdjustInventoryResult.cs | 68 +- .../Catalog/BackInStockSubscriptionService.cs | 48 +- .../CatalogMessageFactoryExtensions.cs | 114 +- .../Catalog/CategoryExtensions.cs | 124 +- .../Catalog/CategoryTemplateService.cs | 4 +- .../Catalog/CategoryTreeChangeHandler.cs | 496 ++-- .../Catalog/CompareProductsService.cs | 38 +- .../Catalog/CopyProductService.cs | 712 +++--- .../Catalog/Extensions/ProductUrlHelper.cs | 2 +- .../Extensions/ProductUrlHelperExtensions.cs | 220 +- .../ProductVariantQueryExtensions.cs | 210 +- .../IBackInStockSubscriptionService.cs | 4 +- .../Catalog/ICategoryService.cs | 248 +- .../Catalog/ICopyProductService.cs | 26 +- .../Catalog/IManufacturerService.cs | 84 +- .../Catalog/IPriceCalculationService.cs | 374 +-- .../Catalog/IPriceFormatter.cs | 72 +- .../Catalog/IProductAttributeFormatter.cs | 2 +- .../Catalog/IProductAttributeParser.cs | 128 +- .../Catalog/IProductAttributeService.cs | 434 ++-- .../Catalog/IProductService.cs | 272 +-- .../Catalog/IProductTagService.cs | 2 +- .../Catalog/ISpecificationAttributeService.cs | 12 +- .../Catalog/Importer/CategoryImporter.cs | 726 +++--- .../Catalog/Importer/ProductImporter.cs | 766 +++--- .../Catalog/ManufacturerService.cs | 204 +- .../Catalog/ManufacturerTemplateService.cs | 2 +- .../Modelling/CheckoutAttributeQueryItem.cs | 78 +- .../Catalog/Modelling/GiftCardQueryItem.cs | 60 +- .../Modelling/IProductVariantQueryFactory.cs | 26 +- .../Catalog/Modelling/ProductVariantQuery.cs | 126 +- .../Modelling/ProductVariantQueryFactory.cs | 454 ++-- .../Modelling/ProductVariantQueryItem.cs | 110 +- .../ProductVariantQueryModelBinder.cs | 58 +- .../Catalog/PriceCalculationContext.cs | 286 +-- .../Catalog/PriceCalculationService.cs | 1012 ++++---- .../Catalog/PriceFormatter.cs | 72 +- .../Catalog/ProductAttributeExtensions.cs | 118 +- .../Catalog/ProductAttributeFormatter.cs | 68 +- .../Catalog/ProductAttributeParser.cs | 590 ++--- .../Catalog/ProductAttributeService.cs | 1188 ++++----- .../Catalog/ProductExtensions.cs | 536 ++-- .../Catalog/ProductService.cs | 1332 +++++----- .../Catalog/ProductTagService.cs | 56 +- .../Catalog/ProductTemplateService.cs | 6 +- .../Catalog/RecentlyViewedProductsService.cs | 32 +- .../Catalog/Rules/ProductRuleProvider.cs | 4 +- .../Catalog/SpecificationAttributeService.cs | 416 ++-- .../Catalog/TierPriceExtensions.cs | 24 +- .../Cms/Blocks/BlockHandlerBase.cs | 237 +- .../Cms/Blocks/BlockMetadata.cs | 126 +- .../Cms/Blocks/IBindableBlock.cs | 51 +- .../Cms/Blocks/IBindableBlockHandler.cs | 70 +- .../SmartStore.Services/Cms/Blocks/IBlock.cs | 14 +- .../Cms/Blocks/IBlockContainer.cs | 92 +- .../Cms/Blocks/IBlockEntity.cs | 28 +- .../Cms/Blocks/IBlockHandler.cs | 180 +- .../SmartStore.Services/Cms/ILinkResolver.cs | 26 +- .../SmartStore.Services/Cms/IWidgetService.cs | 6 +- .../SmartStore.Services/Cms/LinkResolver.cs | 324 +-- .../Cms/LinkResolverInvalidator.cs | 132 +- .../Cms/LinkResolverResult.cs | 48 +- .../Cms/Menus/IMenuStorage.cs | 2 +- .../Cms/Menus/MenuStorage.cs | 66 +- .../Cms/WidgetExtensions.cs | 26 +- .../SmartStore.Services/Cms/WidgetService.cs | 124 +- .../Common/AddressExtensions.cs | 236 +- .../Common/AddressService.cs | 200 +- .../Common/GenericAttributeExtensions.cs | 46 +- .../Common/GenericAttributeService.cs | 336 +-- .../Common/IAddressService.cs | 58 +- .../Common/IGenericAttributeService.cs | 74 +- .../SmartStore.Services/Common/IUserAgent.cs | 306 +-- .../Common/MaintenanceService.cs | 2 +- .../Common/MobileDeviceHelper.cs | 6 +- .../Common/TempFileCleanupTask.cs | 20 +- .../Common/UAParserUserAgent.cs | 470 ++-- .../SmartStore.Services/CommonServices.cs | 156 +- .../Configuration/SettingService.cs | 925 +++---- .../Customers/ChangePasswordRequest.cs | 2 +- .../Customers/CookieManager.cs | 323 +-- .../Customers/CustomerContentService.cs | 12 +- .../Customers/CustomerExtensions.cs | 445 ++-- .../CustomerMessageFactoryExtensions.cs | 126 +- .../Customers/CustomerRegistrationRequest.cs | 2 +- .../Customers/CustomerRegistrationResult.cs | 13 +- .../Customers/CustomerRegistrationService.cs | 78 +- .../Customers/CustomerReportService.cs | 6 +- .../Customers/CustomerSearchQuery.cs | 212 +- .../Customers/CustomerService.cs | 696 +++--- .../Events/CustomerAnonymizedEvent.cs | 52 +- .../Customers/Events/CustomerExportedEvent.cs | 24 +- .../Customers/Events/CustomerLogedInEvent.cs | 18 +- .../Events/CustomerRegisteredEvent.cs | 18 +- .../SmartStore.Services/Customers/GdprTool.cs | 842 +++---- .../Customers/ICookieManager.cs | 56 +- .../Customers/ICustomerReportService.cs | 2 +- .../Customers/ICustomerService.cs | 156 +- .../Customers/IGdprTool.cs | 54 +- .../Customers/Importer/CustomerImporter.cs | 934 ++++--- .../Customers/PasswordChangeResult.cs | 11 +- .../Customers/Rules/ITargetGroupService.cs | 4 +- .../Rules/TargetGroupFilterDescriptor.cs | 4 +- .../Customers/Rules/TargetGroupService.cs | 12 +- .../Customers/Tasks/DeleteGuestsTask.cs | 2 +- .../DataExchange/Csv/CsvConfiguration.cs | 552 ++--- .../Csv/CsvConfigurationConverter.cs | 96 +- .../DataExchange/Csv/CsvDataReader.cs | 680 +++--- .../DataExchange/Csv/CsvWriter.cs | 352 +-- .../DataExchange/Excel/ExcelDataReader.cs | 1129 +++++---- .../DataExchange/Export/DataExportResult.cs | 83 +- .../DataExchange/Export/DataExportTask.cs | 98 +- .../DataExchange/Export/DataExporter.cs | 2154 ++++++++--------- .../Export/Deployment/DataDeploymentResult.cs | 29 +- .../Export/Deployment/EmailFilePublisher.cs | 90 +- .../Deployment/FileSystemFilePublisher.cs | 28 +- .../Export/Deployment/FtpFilePublisher.cs | 332 +-- .../Export/Deployment/HttpFilePublisher.cs | 108 +- .../Export/Deployment/IFilePublisher.cs | 48 +- .../Deployment/PublicFolderPublisher.cs | 60 +- .../Export/DynamicEntityHelper.cs | 1826 +++++++------- .../Export/Events/RowExportingEvent.cs | 52 +- .../Export/ExportConfigurationInfo.cs | 36 +- .../Export/ExportDataSegmenter.cs | 226 +- .../Export/ExportExecuteContext.cs | 356 ++- .../DataExchange/Export/ExportExtensions.cs | 424 ++-- .../Export/ExportFeaturesAttribute.cs | 18 +- .../Export/ExportProfileService.cs | 668 ++--- .../DataExchange/Export/ExportProviderBase.cs | 71 +- .../DataExchange/Export/ExportXmlHelper.cs | 1932 ++++++++------- .../DataExchange/Export/IDataExporter.cs | 90 +- .../Export/IExportProfileService.cs | 200 +- .../DataExchange/Export/IExportProvider.cs | 50 +- .../Export/Internal/CategoryExportContext.cs | 110 +- .../Export/Internal/CustomerExportContext.cs | 88 +- .../Export/Internal/DataExporterContext.cs | 187 +- .../Export/Internal/DynamicEntity.cs | 58 +- .../Internal/ManufacturerExportContext.cs | 108 +- .../Export/Internal/OrderExportContext.cs | 266 +- .../Export/ProductExportContext.cs | 136 +- .../DataExchange/ISyncMappingService.cs | 330 +-- .../Import/ColumnMapping/ColumnMap.cs | 273 ++- .../ColumnMapping/ColumnMapConverter.cs | 106 +- .../DataExchange/Import/DataImportTask.cs | 48 +- .../DataExchange/Import/DataImporter.cs | 388 +-- .../Import/DataTable/IDataTable.cs | 108 +- .../Import/DataTable/LightweightDataTable.cs | 764 +++--- .../DataExchange/Import/EntityImporterBase.cs | 406 ++-- .../Import/Events/ImportExecutedEvent.cs | 26 +- .../Import/Events/ImportExecutingEvent.cs | 26 +- .../DataExchange/Import/IDataImporter.cs | 50 +- .../DataExchange/Import/IEntityImporter.cs | 8 +- .../Import/IImportProfileService.cs | 102 +- .../Import/ImportDataSegmenter.cs | 380 ++- .../Import/ImportExecuteContext.cs | 392 ++- .../DataExchange/Import/ImportExtensions.cs | 62 +- .../DataExchange/Import/ImportExtraData.cs | 16 +- .../DataExchange/Import/ImportFile.cs | 8 +- .../DataExchange/Import/ImportMessage.cs | 162 +- .../Import/ImportProfileService.cs | 638 ++--- .../DataExchange/Import/ImportResult.cs | 363 ++- .../DataExchange/Import/ImportRow.cs | 598 +++-- .../Import/Internal/DataImporterContext.cs | 30 +- .../DataExchange/SyncMappingService.cs | 264 +- .../Directory/CountryService.cs | 112 +- .../Directory/CurrencyExtensions.cs | 20 +- .../Directory/CurrencyService.cs | 96 +- .../Directory/DeliveryTimeService.cs | 34 +- .../Directory/EcbExchangeRateProvider.cs | 146 +- .../Directory/GeoCountryLookup.cs | 2 +- .../Directory/ICountryService.cs | 14 +- .../Directory/ICurrencyService.cs | 6 +- .../Directory/IDeliveryTimeService.cs | 14 +- .../Directory/IMeasureService.cs | 2 +- .../Directory/IQuantityUnitService.cs | 8 +- .../Directory/IStateProvinceService.cs | 26 +- .../Directory/MeasureService.cs | 38 +- .../Directory/QuantityUnitService.cs | 43 +- .../Directory/StateProvinceService.cs | 38 +- .../Directory/UpdateExchangeRateTask.cs | 22 +- .../Discounts/DiscountExtentions.cs | 50 +- .../Discounts/DiscountService.cs | 128 +- .../Discounts/IDiscountService.cs | 20 +- .../Events/ConsumerRegistry.cs | 228 +- .../Events/ConsumerResolver.cs | 90 +- .../Events/DefaultMessageBus.cs | 40 +- .../Events/EventPublisher.cs | 78 +- .../Events/IMessageBroker.cs | 10 +- .../SmartStore.Services/Events/IMessageBus.cs | 10 +- .../Forums/ForumExtensions.cs | 18 +- .../Forums/ForumMessageFactoryExtensions.cs | 70 +- .../Forums/ForumService.cs | 70 +- .../Helpers/DateTimeHelper.cs | 39 +- .../Hooks/AclEntityHook.cs | 52 +- .../Hooks/AuditableHook.cs | 32 +- .../Hooks/FixProductMainPictureHook.cs | 88 +- .../Hooks/LocalizedEntityHook.cs | 58 +- .../Hooks/LocalizedEntityRelationHook.cs | 166 +- .../Hooks/ProductVariantAttributeHook.cs | 48 +- .../Hooks/ProductVariantAttributeValueHook.cs | 48 +- .../Hooks/SearchQueryAliasHook.cs | 834 +++---- .../Hooks/SettingSaveHook.cs | 28 +- .../Hooks/SlugSupportedHook.cs | 58 +- .../Hooks/SoftDeletableHook.cs | 60 +- .../Hooks/StoreMappingEntityHook.cs | 70 +- .../Hooks/StoreSaveHook.cs | 66 +- .../Hooks/UpdateCustomerFullNameHook.cs | 82 +- .../SmartStore.Services/ICommonServices.cs | 94 +- .../SmartStore.Services/IScopedService.cs | 34 +- .../Localization/ILanguageService.cs | 52 +- .../Localization/ILocalizationService.cs | 52 +- .../Localization/ILocalizedEntityService.cs | 78 +- .../Localization/LanguageService.cs | 298 +-- .../Localization/LocalizationExtensions.cs | 200 +- .../Localization/LocalizationService.cs | 889 +++---- .../Localization/LocalizedEntityHelper.cs | 2 +- .../Localization/LocalizedEntityService.cs | 724 +++--- .../Localization/LocalizedUrlHelper.cs | 6 +- .../Localization/LocalizedValue.cs | 285 ++- .../Logging/CustomerActivityService.cs | 189 +- .../Logging/DbLogService.cs | 274 +-- .../Logging/DeleteLogsTask.cs | 4 +- .../Logging/ILogService.cs | 88 +- .../Media/Album/AlbumRegistry.cs | 4 +- .../Media/Album/FolderService.cs | 6 +- .../Media/Album/MediaFolderInfo.cs | 5 +- .../Media/Album/SystemAlbumProvider.cs | 2 +- .../Media/DownloadService.cs | 104 +- .../SmartStore.Services/Media/Events.cs | 150 +- .../Extensions/IMediaServiceExtensions.cs | 6 +- .../Extensions/IMediaTrackerExtensions.cs | 150 +- .../Media/Extensions/MediaFileExtensions.cs | 112 +- .../Media/Handlers/ImageHandler.cs | 2 +- .../Media/Handlers/ImageHandlerBase.cs | 2 +- .../Media/Handlers/MediaHandlerContext.cs | 98 +- .../Media/IDownloadService.cs | 62 +- .../Media/IMediaService.cs | 2 +- .../Media/IMediaUrlGenerator.cs | 4 +- .../Media/Imaging/CachedImage.cs | 120 +- .../Media/Imaging/DefaultImageProcessor.cs | 379 ++- .../Media/Imaging/IImage.cs | 2 +- .../Media/Imaging/IImageCache.cs | 94 +- .../Media/Imaging/IImageProcessor.cs | 12 +- .../Media/Imaging/ImageCache.cs | 366 +-- .../Media/Imaging/ImageWrapper.cs | 4 +- .../Media/Imaging/Impl/IPImage.cs | 11 +- .../Media/Imaging/Impl/IPImageFactory.cs | 84 +- .../Media/Imaging/Impl/IPImageFormat.cs | 7 +- .../Media/Imaging/Impl/IPImageTransformer.cs | 2 +- .../Media/Imaging/ProcessImageException.cs | 84 +- .../Media/Imaging/ProcessImageQuery.cs | 508 ++-- .../Media/Imaging/ProcessImageResult.cs | 42 +- .../Media/Imaging/UnsupportedImageFormat.cs | 10 +- .../Media/MediaFileInfo.cs | 21 +- .../Media/MediaFileSystem.cs | 96 +- .../SmartStore.Services/Media/MediaHelper.cs | 366 +-- .../Media/MediaPathData.cs | 141 +- .../Media/MediaService.Folder.cs | 12 +- .../SmartStore.Services/Media/MediaService.cs | 57 +- .../Media/MediaServiceFileSystemAdapter.cs | 25 +- .../Media/MediaTypes/IMediaTypeResolver.cs | 2 +- .../Media/MediaTypes/MediaType.cs | 25 +- .../Media/MediaTypes/MediaTypeResolver.cs | 6 +- .../Media/MediaUrlGenerator.cs | 175 +- .../Media/Migration/MediaMigrator.cs | 40 +- .../Media/Migration/MediaMigrator3.cs | 2 +- .../Migration/SeedingDbMigrationConsumer.cs | 2 +- .../Media/Search/MediaSearchResult.cs | 2 +- .../Media/Search/MediaSearcher.cs | 4 +- .../Storage/DatabaseMediaStorageProvider.cs | 537 ++-- .../Storage/FileSystemMediaStorageProvider.cs | 512 ++-- .../Media/Storage/IMediaMover.cs | 20 +- .../Media/Storage/IMediaStorageProvider.cs | 114 +- .../Media/Storage/ISupportsMediaMoving.cs | 60 +- .../Media/Storage/MediaMover.cs | 202 +- .../Media/Storage/MediaMoverContext.cs | 68 +- .../Media/Storage/MediaStorageItem.cs | 8 +- .../Media/Tracking/MediaTracker.cs | 16 +- .../Media/Tracking/MediaTrackerHook.cs | 14 +- .../Tracking/TrackedMediaPropertyTable.cs | 2 +- .../Media/TransientMediaClearTask.cs | 48 +- .../Messages/CampaignService.cs | 78 +- .../Messages/CreateAttachmentsConsumer.cs | 134 +- .../Messages/EmailAccountService.cs | 88 +- .../SmartStore.Services/Messages/Events.cs | 142 +- .../Messages/ICampaignService.cs | 4 +- .../Messages/IEmailAccountService.cs | 10 +- .../Messages/IMessageFactory.cs | 180 +- .../Messages/IMessageModelProvider.cs | 196 +- .../Messages/IMessageTemplateService.cs | 22 +- .../Messages/IModelPart.cs | 74 +- .../INewsLetterSubscriptionService.cs | 32 +- .../Messages/IQueuedEmailService.cs | 60 +- .../NewsLetterSubscriptionImporter.cs | 266 +- .../Messages/MessageContext.cs | 139 +- .../Messages/MessageFactory.cs | 1218 +++++----- .../MessageModelProvider.OrderParts.cs | 774 +++--- .../Messages/MessageModelProvider.Utils.cs | 256 +- .../Messages/MessageModelProvider.cs | 2116 ++++++++-------- .../Messages/MessageTemplateService.cs | 234 +- .../Messages/NewsLetterSubscriptionService.cs | 168 +- .../Messages/QueuedEmailService.cs | 402 +-- .../Messages/QueuedMessagesClearTask.cs | 10 +- .../Messages/QueuedMessagesSendTask.cs | 44 +- .../Messages/TemplateModel.cs | 30 +- .../SmartStore.Services/News/INewsService.cs | 12 +- .../News/NewsMessageFactoryExtensions.cs | 22 +- .../SmartStore.Services/News/NewsService.cs | 92 +- .../Orders/AddToCartContext.cs | 52 +- .../Orders/AutoUpdateOrderItemContext.cs | 188 +- .../Orders/CheckoutAttributeExtensions.cs | 2 +- .../Orders/CheckoutAttributeFormatter.cs | 12 +- .../Orders/CheckoutAttributeParser.cs | 66 +- .../Orders/CheckoutAttributeService.cs | 110 +- .../Orders/CheckoutState.cs | 52 +- .../Orders/EventPublisherExtensions.cs | 44 +- .../Orders/GiftCardService.cs | 6 +- .../Orders/ICheckoutAttributeFormatter.cs | 4 +- .../Orders/ICheckoutAttributeService.cs | 40 +- .../Orders/IGiftCardService.cs | 4 +- .../Orders/IOrderProcessingService.cs | 38 +- .../Orders/IOrderReportService.cs | 4 +- .../Orders/IOrderService.cs | 144 +- .../Orders/IOrderTotalCalculationService.cs | 20 +- .../Orders/IShoppingCartService.cs | 286 +-- .../Orders/OrderExtensions.cs | 324 +-- .../Orders/OrderMessageFactoryExtensions.cs | 234 +- .../Orders/OrderProcessingService.cs | 1088 ++++----- .../Orders/OrderReportService.cs | 4 +- .../Orders/OrderService.cs | 324 +-- .../Orders/OrderTotalCalculationService.cs | 1178 ++++----- .../Orders/PlaceOrderResult.cs | 9 +- .../Orders/ShoppingCartExtensions.cs | 28 +- .../Orders/ShoppingCartTotal.cs | 10 +- .../Payments/CancelRecurringPaymentResult.cs | 9 +- .../Payments/CapturePaymentHook.cs | 134 +- .../Payments/CapturePaymentResult.cs | 19 +- .../Payments/IPaymentMethod.cs | 30 +- .../Payments/IPaymentMethodFilter.cs | 54 +- .../Payments/IPaymentService.cs | 92 +- .../Payments/PaymentExtentions.cs | 92 +- .../Payments/PaymentMethodBase.cs | 450 ++-- .../Payments/PaymentMethodType.cs | 8 +- .../Payments/PaymentPluginBase.cs | 42 +- .../Payments/PaymentService.cs | 494 ++-- .../Payments/PostProcessPaymentRequest.cs | 16 +- .../Payments/PreProcessPaymentResult.cs | 12 +- .../Payments/ProcessPaymentRequest.cs | 76 +- .../Payments/ProcessPaymentResult.cs | 12 +- .../Payments/ProcessPaymentResultBase.cs | 29 +- .../Payments/RefundPaymentResult.cs | 19 +- .../Payments/VoidPaymentResult.cs | 19 +- .../Pdf/Content/IPdfContent.cs | 24 +- .../Pdf/Content/PdfHtmlContent.cs | 203 +- .../Pdf/Content/PdfUrlContent.cs | 283 ++- .../SmartStore.Services/Pdf/IPdfConverter.cs | 18 +- .../Pdf/Options/IPdfOptions.cs | 20 +- .../Pdf/Options/PdfHeaderFooterOptions.cs | 147 +- .../Pdf/Options/PdfPageOptions.cs | 102 +- .../Pdf/Options/PdfTocOptions.cs | 142 +- .../Pdf/PdfConvertSettings.cs | 212 +- .../SmartStore.Services/Pdf/PdfPageMargins.cs | 24 +- .../Pdf/PdfPagePrientation.cs | 12 +- .../SmartStore.Services/Pdf/PdfPageSize.cs | 14 +- .../Pdf/WkHtmlToPdfConverter.cs | 308 +-- .../SmartStore.Services/Polls/IPollService.cs | 6 +- .../SmartStore.Services/Polls/PollService.cs | 104 +- .../SmartStore.Services/ScopedServiceBase.cs | 108 +- .../Search/Catalog/CatalogSearchEvents.cs | 32 +- .../Search/Catalog/CatalogSearchQuery.cs | 432 ++-- .../Search/Catalog/CatalogSearchResult.cs | 130 +- .../Search/Catalog/CatalogSearchService.cs | 398 +-- .../Search/Catalog/ICatalogSearchService.cs | 36 +- .../Catalog/LinqCatalogSearchService.cs | 854 +++---- .../CatalogSearchQueryAliasMapper.cs | 936 +++---- .../Modelling/CatalogSearchQueryFactory.cs | 1080 ++++----- .../CatalogSearchQueryModelBinder.cs | 60 +- .../ICatalogSearchQueryAliasMapper.cs | 160 +- .../Modelling/ICatalogSearchQueryFactory.cs | 26 +- .../Search/Extensions/FacetUrlHelper.cs | 358 +-- .../Search/Extensions/FacetUtility.cs | 226 +- .../Search/Extensions/UrlHelperExtensions.cs | 46 +- .../Search/Forum/ForumSearchEvents.cs | 30 +- .../Search/Forum/ForumSearchQuery.cs | 48 +- .../Search/Forum/ForumSearchResult.cs | 64 +- .../Search/Forum/ForumSearchService.cs | 182 +- .../Search/Forum/IForumSearchService.cs | 4 +- .../Search/Forum/LinqForumSearchService.cs | 28 +- .../Modelling/ForumSearchQueryAliasMapper.cs | 94 +- .../Modelling/ForumSearchQueryModelBinder.cs | 52 +- .../Modelling/IForumSearchQueryAliasMapper.cs | 28 +- .../Modelling/IForumSearchQueryFactory.cs | 4 +- .../Search/Rendering/FacetTemplateProvider.cs | 32 +- .../Rendering/IFacetTemplateProvider.cs | 8 +- .../Rendering/IFacetTemplateSelector.cs | 8 +- .../Security/AclService.cs | 368 +-- .../Security/IAclService.cs | 282 +-- .../Security/InstallPermissionsStarter.cs | 2 +- .../Security/StandardPermissionProvider.cs | 2 +- .../Seo/IUrlRecordService.cs | 134 +- .../Seo/IXmlSitemapGenerator.cs | 68 +- .../SmartStore.Services/Seo/NamedEntity.cs | 24 +- .../SmartStore.Services/Seo/SeoExtensions.cs | 242 +- .../Seo/Tasks/RebuildXmlSitemapTask.cs | 74 +- .../Seo/UrlRecordService.cs | 872 +++---- .../Seo/XmlSitemapBuildContext.cs | 68 +- .../Seo/XmlSitemapGenerator.cs | 1342 +++++----- .../SmartStore.Services/Seo/XmlSitemapNode.cs | 94 +- .../Seo/XmlSitemapPartition.cs | 18 +- .../SmartStore.Services/ServiceCacheBuster.cs | 48 +- .../Shipping/GetShippingOptionRequest.cs | 8 +- .../Shipping/GetShippingOptionResponse.cs | 8 +- .../Shipping/IShipmentService.cs | 16 +- .../IShippingRateComputationMethod.cs | 8 +- .../Shipping/IShippingService.cs | 22 +- .../Shipping/ShipmentService.cs | 142 +- .../Shipping/ShippingExtentions.cs | 8 +- .../Shipping/ShippingService.cs | 342 +-- .../Tracking/GeneralShipmentTracker.cs | 10 +- .../Stores/IStoreMappingService.cs | 278 +-- .../Stores/IStoreService.cs | 102 +- .../Stores/StoreMappingService.cs | 468 ++-- .../Stores/StoreService.cs | 208 +- .../Tasks/CronExpression.cs | 100 +- .../Tasks/IScheduleTaskService.cs | 104 +- .../SmartStore.Services/Tasks/ITask.cs | 40 +- .../Tasks/ITaskExecutor.cs | 6 +- .../Tasks/ITaskScheduler.cs | 76 +- .../Tasks/ScheduleTaskService.cs | 276 +-- .../Tasks/TaskExecutionContext.cs | 202 +- .../SmartStore.Services/Tasks/TaskExecutor.cs | 138 +- .../Tasks/TaskScheduler.cs | 267 +- .../Tasks/TaskSchedulerStarter.cs | 8 +- .../Tax/CalculateTaxResult.cs | 8 +- .../Tax/FreeTaxProvider.cs | 12 +- .../SmartStore.Services/Tax/ITaxService.cs | 288 +-- .../Tax/TaxCategoryService.cs | 16 +- .../SmartStore.Services/Tax/TaxService.cs | 424 ++-- .../Themes/ThemeValidationException.cs | 20 +- .../Themes/ThemeVariablesService.cs | 490 ++-- .../Topics/ITopicService.cs | 40 +- .../Topics/TopicService.cs | 248 +- 463 files changed, 38917 insertions(+), 39478 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Affiliates/AffiliateService.cs b/src/Libraries/SmartStore.Services/Affiliates/AffiliateService.cs index 2ab394c1f4..25abf782ae 100644 --- a/src/Libraries/SmartStore.Services/Affiliates/AffiliateService.cs +++ b/src/Libraries/SmartStore.Services/Affiliates/AffiliateService.cs @@ -20,7 +20,7 @@ public virtual Affiliate GetAffiliateById(int affiliateId) { if (affiliateId == 0) return null; - + return _affiliateRepository.GetById(affiliateId); } diff --git a/src/Libraries/SmartStore.Services/Affiliates/IAffiliateService.cs b/src/Libraries/SmartStore.Services/Affiliates/IAffiliateService.cs index c81ca3cd53..ab8dfe25a2 100644 --- a/src/Libraries/SmartStore.Services/Affiliates/IAffiliateService.cs +++ b/src/Libraries/SmartStore.Services/Affiliates/IAffiliateService.cs @@ -39,6 +39,6 @@ public partial interface IAffiliateService /// /// Affiliate void UpdateAffiliate(Affiliate affiliate); - + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizationResult.cs b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizationResult.cs index 1458b333e5..f1a4d248cf 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizationResult.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizationResult.cs @@ -17,10 +17,7 @@ public void AddError(string error) this.Errors.Add(error); } - public bool Success - { - get { return this.Errors.Count == 0; } - } + public bool Success => this.Errors.Count == 0; public OpenAuthenticationStatus Status { get; private set; } diff --git a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs index 35e853bbfc..da90c9f326 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs @@ -10,7 +10,7 @@ public partial class AuthorizeState public IList Errors { get; set; } private readonly string _returnUrl; - + public AuthorizeState(string returnUrl, OpenAuthenticationStatus openAuthenticationStatus) { Errors = new List(); @@ -29,11 +29,8 @@ public AuthorizeState(string returnUrl, AuthorizationResult authorizationResult) } public OpenAuthenticationStatus AuthenticationStatus { get; private set; } - - public bool Success - { - get { return (this.Errors.Count == 0); } - } + + public bool Success => (this.Errors.Count == 0); public void AddError(string error) { diff --git a/src/Libraries/SmartStore.Services/Authentication/External/ExternalAuthorizer.cs b/src/Libraries/SmartStore.Services/Authentication/External/ExternalAuthorizer.cs index 7eab4cd87a..c46a48d693 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/ExternalAuthorizer.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/ExternalAuthorizer.cs @@ -26,25 +26,25 @@ public partial class ExternalAuthorizer : IExternalAuthorizer private readonly CustomerSettings _customerSettings; private readonly ExternalAuthenticationSettings _externalAuthenticationSettings; private readonly IShoppingCartService _shoppingCartService; - private readonly IMessageFactory _messageFactory; - private readonly LocalizationSettings _localizationSettings; + private readonly IMessageFactory _messageFactory; + private readonly LocalizationSettings _localizationSettings; #endregion #region Ctor public ExternalAuthorizer( - IAuthenticationService authenticationService, + IAuthenticationService authenticationService, IOpenAuthenticationService openAuthenticationService, IGenericAttributeService genericAttributeService, ICustomerRegistrationService customerRegistrationService, - ICustomerActivityService customerActivityService, - ILocalizationService localizationService, - IWorkContext workContext, - CustomerSettings customerSettings, + ICustomerActivityService customerActivityService, + ILocalizationService localizationService, + IWorkContext workContext, + CustomerSettings customerSettings, ExternalAuthenticationSettings externalAuthenticationSettings, IShoppingCartService shoppingCartService, - IMessageFactory messageFactory, - LocalizationSettings localizationSettings) + IMessageFactory messageFactory, + LocalizationSettings localizationSettings) { _authenticationService = authenticationService; _openAuthenticationService = openAuthenticationService; @@ -130,13 +130,13 @@ public virtual AuthorizationResult Authorize(OpenAuthenticationParameters parame var registrationResult = _customerRegistrationService.RegisterCustomer(registrationRequest); if (registrationResult.Success) { - // store other parameters (form fields) - if (details.FirstName.HasValue()) - currentCustomer.FirstName = details.FirstName; + // store other parameters (form fields) + if (details.FirstName.HasValue()) + currentCustomer.FirstName = details.FirstName; if (details.LastName.HasValue()) - currentCustomer.LastName = details.LastName; + currentCustomer.LastName = details.LastName; - userFound = currentCustomer; + userFound = currentCustomer; _openAuthenticationService.AssociateExternalAccountWithUser(currentCustomer, parameters); ExternalAuthorizerHelper.RemoveParameters(); @@ -145,7 +145,7 @@ public virtual AuthorizationResult Authorize(OpenAuthenticationParameters parame //authenticate if (isApproved) _authenticationService.SignIn(userFound ?? userLoggedIn, false); - + //notifications if (_customerSettings.NotifyNewCustomerRegistration) _messageFactory.SendCustomerRegisteredNotificationMessage(currentCustomer, _localizationSettings.DefaultAdminLanguageId); @@ -153,24 +153,24 @@ public virtual AuthorizationResult Authorize(OpenAuthenticationParameters parame switch (_customerSettings.UserRegistrationType) { case UserRegistrationType.EmailValidation: - { - // email validation message - _genericAttributeService.SaveAttribute(currentCustomer, SystemCustomerAttributeNames.AccountActivationToken, Guid.NewGuid().ToString()); - _messageFactory.SendCustomerEmailValidationMessage(currentCustomer, _workContext.WorkingLanguage.Id); + { + // email validation message + _genericAttributeService.SaveAttribute(currentCustomer, SystemCustomerAttributeNames.AccountActivationToken, Guid.NewGuid().ToString()); + _messageFactory.SendCustomerEmailValidationMessage(currentCustomer, _workContext.WorkingLanguage.Id); - return new AuthorizationResult(OpenAuthenticationStatus.AutoRegisteredEmailValidation); - } + return new AuthorizationResult(OpenAuthenticationStatus.AutoRegisteredEmailValidation); + } case UserRegistrationType.AdminApproval: - { - return new AuthorizationResult(OpenAuthenticationStatus.AutoRegisteredAdminApproval); - } + { + return new AuthorizationResult(OpenAuthenticationStatus.AutoRegisteredAdminApproval); + } case UserRegistrationType.Standard: - { - // send customer welcome message - _messageFactory.SendCustomerWelcomeMessage(currentCustomer, _workContext.WorkingLanguage.Id); + { + // send customer welcome message + _messageFactory.SendCustomerWelcomeMessage(currentCustomer, _workContext.WorkingLanguage.Id); - return new AuthorizationResult(OpenAuthenticationStatus.AutoRegisteredStandard); - } + return new AuthorizationResult(OpenAuthenticationStatus.AutoRegisteredStandard); + } default: break; } diff --git a/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs b/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs index 6e8029ce4a..e7eed71acb 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs @@ -9,7 +9,7 @@ namespace SmartStore.Services.Authentication.External /// Provides an interface for creating external authentication methods /// public partial interface IExternalAuthenticationMethod : IProvider, IUserEditable - { + { /// /// Gets a route for displaying plugin in public store /// diff --git a/src/Libraries/SmartStore.Services/Authentication/External/IExternalProviderAuthorizer.cs b/src/Libraries/SmartStore.Services/Authentication/External/IExternalProviderAuthorizer.cs index d46a5ba1db..afc3348198 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/IExternalProviderAuthorizer.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/IExternalProviderAuthorizer.cs @@ -5,12 +5,12 @@ namespace SmartStore.Services.Authentication.External { public partial interface IExternalProviderAuthorizer { - /// - /// Authorize response - /// - /// Return URL - /// true - Verify response;false - request authentication;null - determine automatically - /// Authorize state - AuthorizeState Authorize(string returnUrl, bool? verifyResponse = null); + /// + /// Authorize response + /// + /// Return URL + /// true - Verify response;false - request authentication;null - determine automatically + /// Authorize state + AuthorizeState Authorize(string returnUrl, bool? verifyResponse = null); } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationParameters.cs b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationParameters.cs index 1348bcadd3..e8a84d18b3 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationParameters.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationParameters.cs @@ -14,9 +14,6 @@ public abstract partial class OpenAuthenticationParameters public string OAuthToken { get; set; } public string OAuthAccessToken { get; set; } - public virtual IList UserClaims - { - get { return new List(0); } - } + public virtual IList UserClaims => new List(0); } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationService.cs index aad91d8ff2..1cbca5a9f4 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationService.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationService.cs @@ -17,34 +17,34 @@ public partial class OpenAuthenticationService : IOpenAuthenticationService private readonly IPluginFinder _pluginFinder; private readonly ExternalAuthenticationSettings _externalAuthenticationSettings; private readonly IRepository _externalAuthenticationRecordRepository; - private readonly ISettingService _settingService; - private readonly IProviderManager _providerManager; + private readonly ISettingService _settingService; + private readonly IProviderManager _providerManager; public OpenAuthenticationService( - IRepository externalAuthenticationRecordRepository, + IRepository externalAuthenticationRecordRepository, IPluginFinder pluginFinder, ExternalAuthenticationSettings externalAuthenticationSettings, ICustomerService customerService, - ISettingService settingService, - IProviderManager providerManager) + ISettingService settingService, + IProviderManager providerManager) { this._externalAuthenticationRecordRepository = externalAuthenticationRecordRepository; this._pluginFinder = pluginFinder; this._externalAuthenticationSettings = externalAuthenticationSettings; this._customerService = customerService; - this._settingService = settingService; - this._providerManager = providerManager; + this._settingService = settingService; + this._providerManager = providerManager; } - /// - /// Load all external authentication methods - /// - /// Load records allows only in specified store; pass 0 to load all records - /// External authentication methods - public virtual IEnumerable> LoadAllExternalAuthenticationMethods(int storeId = 0) - { - return _providerManager.GetAllProviders(storeId); - } + /// + /// Load all external authentication methods + /// + /// Load records allows only in specified store; pass 0 to load all records + /// External authentication methods + public virtual IEnumerable> LoadAllExternalAuthenticationMethods(int storeId = 0) + { + return _providerManager.GetAllProviders(storeId); + } /// /// Load active external authentication methods @@ -53,11 +53,11 @@ public virtual IEnumerable> LoadAllExter /// Payment methods public virtual IEnumerable> LoadActiveExternalAuthenticationMethods(int storeId = 0) { - var allMethods = LoadAllExternalAuthenticationMethods(storeId); - var activeMethods = allMethods - .Where(p => _externalAuthenticationSettings.ActiveAuthenticationMethodSystemNames.Contains(p.Metadata.SystemName, StringComparer.InvariantCultureIgnoreCase)); + var allMethods = LoadAllExternalAuthenticationMethods(storeId); + var activeMethods = allMethods + .Where(p => _externalAuthenticationSettings.ActiveAuthenticationMethodSystemNames.Contains(p.Metadata.SystemName, StringComparer.InvariantCultureIgnoreCase)); - return activeMethods; + return activeMethods; } /// @@ -67,7 +67,7 @@ public virtual IEnumerable> LoadActiveEx /// Found external authentication method public virtual Provider LoadExternalAuthenticationMethodBySystemName(string systemName, int storeId = 0) { - return _providerManager.GetProvider(systemName, storeId); + return _providerManager.GetProvider(systemName, storeId); } @@ -83,11 +83,11 @@ public virtual void AssociateExternalAccountWithUser(Customer customer, OpenAuth if (parameters.UserClaims != null) foreach (var userClaim in parameters.UserClaims .Where(x => x.Contact != null && !String.IsNullOrEmpty(x.Contact.Email))) - { - //found - email = userClaim.Contact.Email; - break; - } + { + //found + email = userClaim.Contact.Email; + break; + } var externalAuthenticationRecord = new ExternalAuthenticationRecord() { diff --git a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthentificationExtentions.cs b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthentificationExtentions.cs index 1db598a637..41295dfd59 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthentificationExtentions.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthentificationExtentions.cs @@ -7,7 +7,7 @@ namespace SmartStore.Services.Authentication.External { public static class OpenAuthenticationExtentions { - public static bool IsMethodActive(this Provider method, ExternalAuthenticationSettings settings) + public static bool IsMethodActive(this Provider method, ExternalAuthenticationSettings settings) { if (method == null) throw new ArgumentNullException("method"); @@ -18,7 +18,7 @@ public static bool IsMethodActive(this Provider m if (settings.ActiveAuthenticationMethodSystemNames == null) return false; - return settings.ActiveAuthenticationMethodSystemNames.Contains(method.Metadata.SystemName, StringComparer.OrdinalIgnoreCase); + return settings.ActiveAuthenticationMethodSystemNames.Contains(method.Metadata.SystemName, StringComparer.OrdinalIgnoreCase); } } } diff --git a/src/Libraries/SmartStore.Services/Authentication/External/UserClaims.cs b/src/Libraries/SmartStore.Services/Authentication/External/UserClaims.cs index 5e2ab5f934..c080e859c0 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/UserClaims.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/UserClaims.cs @@ -142,6 +142,6 @@ public partial class BirthDateClaims public DateTime? WholeBirthDate { get; set; } public int Year { get; set; } public string Raw { get; set; } - public DateTime GeneratedBirthDate { get { return new DateTime(Year, Month, DayOfMonth); } } + public DateTime GeneratedBirthDate => new DateTime(Year, Month, DayOfMonth); } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs index 835057dcb4..096871bf47 100644 --- a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs +++ b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs @@ -20,8 +20,8 @@ public partial class FormsAuthenticationService : IAuthenticationService private Customer _cachedCustomer; public FormsAuthenticationService( - HttpContextBase httpContext, - ICustomerService customerService, + HttpContextBase httpContext, + ICustomerService customerService, CustomerSettings customerSettings, PrivacySettings privacySettings) { @@ -35,29 +35,29 @@ public FormsAuthenticationService( public virtual void SignIn(Customer customer, bool createPersistentCookie) { var now = DateTime.UtcNow.ToLocalTime(); - var name = _customerSettings.CustomerLoginType != CustomerLoginType.Email ? customer.Username : customer.Email; + var name = _customerSettings.CustomerLoginType != CustomerLoginType.Email ? customer.Username : customer.Email; - var ticket = new FormsAuthenticationTicket( + var ticket = new FormsAuthenticationTicket( 1 /*version*/, - name, + name, now, now.Add(_expirationTimeSpan), createPersistentCookie, - name, + name, FormsAuthentication.FormsCookiePath); var encryptedTicket = FormsAuthentication.Encrypt(ticket); - var cookie = new HttpCookie(FormsAuthentication.FormsCookieName, encryptedTicket) - { - HttpOnly = true, + var cookie = new HttpCookie(FormsAuthentication.FormsCookieName, encryptedTicket) + { + HttpOnly = true, Path = FormsAuthentication.FormsCookiePath, - Secure = FormsAuthentication.RequireSSL, + Secure = FormsAuthentication.RequireSSL, SameSite = FormsAuthentication.RequireSSL ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax }; - if (ticket.IsPersistent) + if (ticket.IsPersistent) { cookie.Expires = ticket.Expiration; } @@ -79,13 +79,13 @@ public virtual void SignOut() public virtual Customer GetAuthenticatedCustomer() { - if (_cachedCustomer != null) - return _cachedCustomer; + if (_cachedCustomer != null) + return _cachedCustomer; - if (_httpContext?.Request == null || !_httpContext.Request.IsAuthenticated) - return null; + if (_httpContext?.Request == null || !_httpContext.Request.IsAuthenticated) + return null; - Customer customer = null; + Customer customer = null; if (_httpContext.User.Identity is FormsIdentity formsIdent) { @@ -97,16 +97,16 @@ public virtual Customer GetAuthenticatedCustomer() } if (customer != null && customer.Active && !customer.Deleted && customer.IsRegistered()) - { - _cachedCustomer = customer; - } + { + _cachedCustomer = customer; + } - return _cachedCustomer; - } + return _cachedCustomer; + } public virtual Customer GetAuthenticatedCustomerFromTicket(FormsAuthenticationTicket ticket) { - Guard.NotNull(ticket, nameof(ticket)); + Guard.NotNull(ticket, nameof(ticket)); var usernameOrEmail = ticket.UserData; diff --git a/src/Libraries/SmartStore.Services/Authentication/IAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/IAuthenticationService.cs index 16248f3ac8..6ebbb2baf7 100644 --- a/src/Libraries/SmartStore.Services/Authentication/IAuthenticationService.cs +++ b/src/Libraries/SmartStore.Services/Authentication/IAuthenticationService.cs @@ -5,7 +5,7 @@ namespace SmartStore.Services.Authentication /// /// Authentication service interface /// - public partial interface IAuthenticationService + public partial interface IAuthenticationService { void SignIn(Customer customer, bool createPersistentCookie); void SignOut(); diff --git a/src/Libraries/SmartStore.Services/Blogs/BlogExtensions.cs b/src/Libraries/SmartStore.Services/Blogs/BlogExtensions.cs index 172050bd20..1c54dec053 100644 --- a/src/Libraries/SmartStore.Services/Blogs/BlogExtensions.cs +++ b/src/Libraries/SmartStore.Services/Blogs/BlogExtensions.cs @@ -20,7 +20,7 @@ public static class BlogExtensions public static IList GetPostsByDate(this IList source, DateTime dateFrom, DateTime dateTo) { - var list = source.ToList().FindAll(delegate(BlogPost p) + var list = source.ToList().FindAll(delegate (BlogPost p) { return (dateFrom.Date <= p.CreatedOnUtc && p.CreatedOnUtc.Date <= dateTo); }); diff --git a/src/Libraries/SmartStore.Services/Blogs/BlogMessageFactoryExtensions.cs b/src/Libraries/SmartStore.Services/Blogs/BlogMessageFactoryExtensions.cs index 7ef5c96706..32e138fe47 100644 --- a/src/Libraries/SmartStore.Services/Blogs/BlogMessageFactoryExtensions.cs +++ b/src/Libraries/SmartStore.Services/Blogs/BlogMessageFactoryExtensions.cs @@ -5,15 +5,15 @@ namespace SmartStore.Services.Blogs { - public static class BlogMessageFactoryExtensions - { - /// - /// Sends a blog comment notification message to a store owner - /// - public static CreateMessageResult SendBlogCommentNotificationMessage(this IMessageFactory factory, BlogComment blogComment, int languageId = 0) - { - Guard.NotNull(blogComment, nameof(blogComment)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.BlogCommentStoreOwner, languageId, customer: blogComment.Customer), true, blogComment); - } - } + public static class BlogMessageFactoryExtensions + { + /// + /// Sends a blog comment notification message to a store owner + /// + public static CreateMessageResult SendBlogCommentNotificationMessage(this IMessageFactory factory, BlogComment blogComment, int languageId = 0) + { + Guard.NotNull(blogComment, nameof(blogComment)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.BlogCommentStoreOwner, languageId, customer: blogComment.Customer), true, blogComment); + } + } } diff --git a/src/Libraries/SmartStore.Services/Blogs/BlogService.cs b/src/Libraries/SmartStore.Services/Blogs/BlogService.cs index 69176c7e3e..7be8d8c260 100644 --- a/src/Libraries/SmartStore.Services/Blogs/BlogService.cs +++ b/src/Libraries/SmartStore.Services/Blogs/BlogService.cs @@ -14,21 +14,21 @@ namespace SmartStore.Services.Blogs public partial class BlogService : IBlogService, IXmlSitemapPublisher { private readonly IRepository _blogPostRepository; - private readonly IRepository _storeMappingRepository; + private readonly IRepository _storeMappingRepository; private readonly SeoSettings _seoSettings; public BlogService(IRepository blogPostRepository, - IRepository storeMappingRepository, + IRepository storeMappingRepository, SeoSettings seoSettings) { _blogPostRepository = blogPostRepository; - _storeMappingRepository = storeMappingRepository; + _storeMappingRepository = storeMappingRepository; _seoSettings = seoSettings; this.QuerySettings = DbQuerySettings.Default; } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } public virtual void DeleteBlogPost(BlogPost blogPost) { @@ -43,11 +43,11 @@ public virtual BlogPost GetBlogPostById(int blogPostId) if (blogPostId == 0) return null; - return _blogPostRepository.GetById(blogPostId); + return _blogPostRepository.GetById(blogPostId); } - public virtual IPagedList GetAllBlogPosts(int storeId, int languageId, - DateTime? dateFrom, DateTime? dateTo, int pageIndex, int pageSize, bool showHidden = false, DateTime? maxAge = null, + public virtual IPagedList GetAllBlogPosts(int storeId, int languageId, + DateTime? dateFrom, DateTime? dateTo, int pageIndex, int pageSize, bool showHidden = false, DateTime? maxAge = null, string title = "", string intro = "", string body = "", string tag = "") { var query = _blogPostRepository.Table; @@ -61,8 +61,8 @@ public virtual IPagedList GetAllBlogPosts(int storeId, int languageId, if (languageId > 0) query = query.Where(b => languageId == b.LanguageId); - if (maxAge.HasValue) - query = query.Where(b => b.CreatedOnUtc >= maxAge.Value); + if (maxAge.HasValue) + query = query.Where(b => b.CreatedOnUtc >= maxAge.Value); if (title.HasValue()) @@ -82,44 +82,44 @@ public virtual IPagedList GetAllBlogPosts(int storeId, int languageId, query = query.Where(b => b.IsPublished); } - if (storeId > 0 && !QuerySettings.IgnoreMultiStore) - { - // Store mapping - query = from bp in query - join sm in _storeMappingRepository.Table - on new { c1 = bp.Id, c2 = "BlogPost" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into bp_sm - from sm in bp_sm.DefaultIfEmpty() - where !bp.LimitedToStores || storeId == sm.StoreId - select bp; - - //only distinct blog posts (group by ID) - query = from bp in query - group bp by bp.Id into bpGroup - orderby bpGroup.Key - select bpGroup.FirstOrDefault(); - } + if (storeId > 0 && !QuerySettings.IgnoreMultiStore) + { + // Store mapping + query = from bp in query + join sm in _storeMappingRepository.Table + on new { c1 = bp.Id, c2 = "BlogPost" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into bp_sm + from sm in bp_sm.DefaultIfEmpty() + where !bp.LimitedToStores || storeId == sm.StoreId + select bp; + + //only distinct blog posts (group by ID) + query = from bp in query + group bp by bp.Id into bpGroup + orderby bpGroup.Key + select bpGroup.FirstOrDefault(); + } query = query.OrderByDescending(b => b.CreatedOnUtc); - + var blogPosts = new PagedList(query, pageIndex, pageSize); return blogPosts; } - public virtual IPagedList GetAllBlogPostsByTag( - int storeId, - int languageId, - string tag, - int pageIndex, - int pageSize, - bool showHidden = false, + public virtual IPagedList GetAllBlogPostsByTag( + int storeId, + int languageId, + string tag, + int pageIndex, + int pageSize, + bool showHidden = false, DateTime? maxAge = null) { tag = tag.Trim(); //we laod all records and only then filter them by tag - var blogPostsAll = GetAllBlogPosts(storeId, languageId, null, null, 0, int.MaxValue, showHidden, maxAge); + var blogPostsAll = GetAllBlogPosts(storeId, languageId, null, null, 0, int.MaxValue, showHidden, maxAge); var taggedBlogPosts = new List(); - + foreach (var blogPost in blogPostsAll) { var tags = blogPost.ParseTags().Select(x => SeoHelper.GetSeName(x, @@ -137,11 +137,11 @@ public virtual IPagedList GetAllBlogPostsByTag( return result; } - public virtual IList GetAllBlogPostTags(int storeId, int languageId, bool showHidden = false) + public virtual IList GetAllBlogPostTags(int storeId, int languageId, bool showHidden = false) { var blogPostTags = new List(); - var blogPosts = GetAllBlogPosts(storeId, languageId, null, null, 0, int.MaxValue, showHidden); + var blogPosts = GetAllBlogPosts(storeId, languageId, null, null, 0, int.MaxValue, showHidden); foreach (var blogPost in blogPosts) { var tags = blogPost.ParseTags(); @@ -180,7 +180,7 @@ public virtual void UpdateBlogPost(BlogPost blogPost) _blogPostRepository.Update(blogPost); } - + public virtual void UpdateCommentTotals(BlogPost blogPost) { if (blogPost == null) @@ -208,7 +208,7 @@ public XmlSitemapProvider PublishXmlSitemap(XmlSitemapBuildContext context) { if (!context.LoadSetting().XmlSitemapIncludesBlog || !context.LoadSetting().Enabled) return null; - + var query = GetAllBlogPosts(context.RequestStoreId, 0, null, null, 0, int.MaxValue).SourceQuery; return new BlogPostXmlSitemapResult { Query = query }; diff --git a/src/Libraries/SmartStore.Services/Blogs/IBlogService.cs b/src/Libraries/SmartStore.Services/Blogs/IBlogService.cs index e670d6e49f..0b0d9eb501 100644 --- a/src/Libraries/SmartStore.Services/Blogs/IBlogService.cs +++ b/src/Libraries/SmartStore.Services/Blogs/IBlogService.cs @@ -36,7 +36,7 @@ public partial interface IBlogService /// The maximum age of returned blog posts /// Blog posts IPagedList GetAllBlogPosts(int storeId, int languageId, - DateTime? dateFrom, DateTime? dateTo, int pageIndex, int pageSize, bool showHidden = false, DateTime? maxAge = null, + DateTime? dateFrom, DateTime? dateTo, int pageIndex, int pageSize, bool showHidden = false, DateTime? maxAge = null, string title = "", string intro = "", string body = "", string tag = ""); /// diff --git a/src/Libraries/SmartStore.Services/Caching/ClearCacheTask.cs b/src/Libraries/SmartStore.Services/Caching/ClearCacheTask.cs index 2ebfdd303e..cbb5717df4 100644 --- a/src/Libraries/SmartStore.Services/Caching/ClearCacheTask.cs +++ b/src/Libraries/SmartStore.Services/Caching/ClearCacheTask.cs @@ -10,19 +10,19 @@ namespace SmartStore.Services.Caching /// public partial class ClearCacheTask : ITask { - private readonly ICacheManager _cacheManager; - - public ClearCacheTask(ICacheManager cacheManager) - { - _cacheManager = cacheManager; - } - - /// + private readonly ICacheManager _cacheManager; + + public ClearCacheTask(ICacheManager cacheManager) + { + _cacheManager = cacheManager; + } + + /// /// Executes a task /// - public void Execute(TaskExecutionContext ctx) + public void Execute(TaskExecutionContext ctx) { - _cacheManager.Clear(); + _cacheManager.Clear(); } } } diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs index dfb249f4fd..529c7e6414 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleContext.cs @@ -9,7 +9,7 @@ public class CartRuleContext { private readonly Func _sessionKeyBuilder; private object _sessionKey; - + internal CartRuleContext(Func sessionKeyBuilder) { _sessionKeyBuilder = sessionKeyBuilder; @@ -19,9 +19,6 @@ internal CartRuleContext(Func sessionKeyBuilder) public Store Store { get; set; } public IWorkContext WorkContext { get; set; } - public object SessionKey - { - get => _sessionKey ?? (_sessionKey = _sessionKeyBuilder?.Invoke() ?? 0); - } + public object SessionKey => _sessionKey ?? (_sessionKey = _sessionKeyBuilder?.Invoke() ?? 0); } } diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs index ea9d8ad22b..81027afa12 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/CartRuleProvider.cs @@ -147,7 +147,7 @@ public IRule GetProcessor(RuleExpression expression) { var group = expression as RuleExpressionGroup; var descriptor = expression.Descriptor as CartRuleDescriptor; - + if (group == null && descriptor == null) { throw new InvalidOperationException($"Missing cart rule descriptor for expression {expression.Id} ('{expression.RawValue.EmptyNull()}')."); diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/ListRuleBase.cs b/src/Libraries/SmartStore.Services/Cart/Rules/ListRuleBase.cs index 17f0636689..93c301ee8c 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/ListRuleBase.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/ListRuleBase.cs @@ -13,9 +13,15 @@ protected ListRuleBase(IEqualityComparer comparer = null) _comparer = comparer; } - protected virtual T GetValue(CartRuleContext context) => default; + protected virtual T GetValue(CartRuleContext context) + { + return default; + } - protected virtual IEnumerable GetValues(CartRuleContext context) => default; + protected virtual IEnumerable GetValues(CartRuleContext context) + { + return default; + } public virtual bool Match(CartRuleContext context, RuleExpression expression) { diff --git a/src/Libraries/SmartStore.Services/Catalog/AdjustInventoryResult.cs b/src/Libraries/SmartStore.Services/Catalog/AdjustInventoryResult.cs index 91867ebe55..aac4efb6ea 100644 --- a/src/Libraries/SmartStore.Services/Catalog/AdjustInventoryResult.cs +++ b/src/Libraries/SmartStore.Services/Catalog/AdjustInventoryResult.cs @@ -1,50 +1,32 @@  namespace SmartStore.Services.Catalog { - public class AdjustInventoryResult - { - private int? _stockQuantityOld; - private int? _stockQuantityNew; + public class AdjustInventoryResult + { + private int? _stockQuantityOld; + private int? _stockQuantityNew; - /// - /// The stock quantity before adjustment - /// - public int StockQuantityOld - { - get - { - return _stockQuantityOld ?? 0; - } - set - { - _stockQuantityOld = value; - } - } + /// + /// The stock quantity before adjustment + /// + public int StockQuantityOld + { + get => _stockQuantityOld ?? 0; + set => _stockQuantityOld = value; + } - /// - /// The stock quantity after adjustment - /// - public int StockQuantityNew - { - get - { - return _stockQuantityNew ?? 0; - } - set - { - _stockQuantityNew = value; - } - } + /// + /// The stock quantity after adjustment + /// + public int StockQuantityNew + { + get => _stockQuantityNew ?? 0; + set => _stockQuantityNew = value; + } - /// - /// Determines whether the adjustment resulted in a clear, unique stock quantity update. For instance false for bundle products. - /// - public bool HasClearStockQuantityResult - { - get - { - return _stockQuantityOld.HasValue && _stockQuantityNew.HasValue; - } - } - } + /// + /// Determines whether the adjustment resulted in a clear, unique stock quantity update. For instance false for bundle products. + /// + public bool HasClearStockQuantityResult => _stockQuantityOld.HasValue && _stockQuantityNew.HasValue; + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/BackInStockSubscriptionService.cs b/src/Libraries/SmartStore.Services/Catalog/BackInStockSubscriptionService.cs index 38a945b869..53feaaacaa 100644 --- a/src/Libraries/SmartStore.Services/Catalog/BackInStockSubscriptionService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/BackInStockSubscriptionService.cs @@ -19,22 +19,22 @@ public partial class BackInStockSubscriptionService : IBackInStockSubscriptionSe private readonly IRepository _backInStockSubscriptionRepository; private readonly IMessageFactory _messageFactory; - private readonly IWorkContext _workContext; + private readonly IWorkContext _workContext; private readonly IEventPublisher _eventPublisher; #endregion - + #region Ctor public BackInStockSubscriptionService( - IRepository backInStockSubscriptionRepository, - IMessageFactory messageFactory, - IWorkContext workContext, + IRepository backInStockSubscriptionRepository, + IMessageFactory messageFactory, + IWorkContext workContext, IEventPublisher eventPublisher) { _backInStockSubscriptionRepository = backInStockSubscriptionRepository; _messageFactory = messageFactory; - _workContext = workContext; + _workContext = workContext; _eventPublisher = eventPublisher; } @@ -67,9 +67,9 @@ public virtual IPagedList GetAllSubscriptionsByCustomer var query = _backInStockSubscriptionRepository.Table; //customer query = query.Where(biss => biss.CustomerId == customerId); - //store - if (storeId > 0) - query = query.Where(biss => biss.StoreId == storeId); + //store + if (storeId > 0) + query = query.Where(biss => biss.StoreId == storeId); //product query = query.Where(biss => !biss.Product.Deleted); query = query.OrderByDescending(biss => biss.CreatedOnUtc); @@ -86,14 +86,14 @@ public virtual IPagedList GetAllSubscriptionsByCustomer /// Page size /// Subscriptions public virtual IPagedList GetAllSubscriptionsByProductId(int productId, - int storeId, int pageIndex, int pageSize) + int storeId, int pageIndex, int pageSize) { var query = _backInStockSubscriptionRepository.Table; //product query = query.Where(biss => biss.ProductId == productId); - //store - if (storeId > 0) - query = query.Where(biss => biss.StoreId == storeId); + //store + if (storeId > 0) + query = query.Where(biss => biss.StoreId == storeId); //customer query = query.Where(biss => !biss.Customer.Deleted); query = query.OrderByDescending(biss => biss.CreatedOnUtc); @@ -109,11 +109,11 @@ public virtual IPagedList GetAllSubscriptionsByProductI /// Subscriptions public virtual BackInStockSubscription FindSubscription(int customerId, int productId, int storeId) { - var query = - from biss in _backInStockSubscriptionRepository.Table - orderby biss.CreatedOnUtc descending - where biss.CustomerId == customerId && biss.ProductId == productId && biss.StoreId == storeId - select biss; + var query = + from biss in _backInStockSubscriptionRepository.Table + orderby biss.CreatedOnUtc descending + where biss.CustomerId == customerId && biss.ProductId == productId && biss.StoreId == storeId + select biss; var subscription = query.FirstOrDefault(); return subscription; @@ -164,17 +164,17 @@ public virtual void UpdateSubscription(BackInStockSubscription subscription) /// Number of sent email public virtual int SendNotificationsToSubscribers(Product product) { - if (product == null) - throw new ArgumentNullException("product"); + if (product == null) + throw new ArgumentNullException("product"); int result = 0; - var subscriptions = GetAllSubscriptionsByProductId(product.Id, 0, 0, int.MaxValue); + var subscriptions = GetAllSubscriptionsByProductId(product.Id, 0, 0, int.MaxValue); foreach (var subscription in subscriptions) { // Ensure that customer is registered (simple and fast way) - if (subscription.Customer.Email.IsEmail()) + if (subscription.Customer.Email.IsEmail()) { - _messageFactory.SendBackInStockNotification(subscription); + _messageFactory.SendBackInStockNotification(subscription); result++; } } @@ -182,7 +182,7 @@ public virtual int SendNotificationsToSubscribers(Product product) DeleteSubscription(subscriptions[i]); return result; } - + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Catalog/CatalogMessageFactoryExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/CatalogMessageFactoryExtensions.cs index cb0fb7fb1d..1645fdad3f 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CatalogMessageFactoryExtensions.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CatalogMessageFactoryExtensions.cs @@ -7,73 +7,73 @@ namespace SmartStore.Services.Catalog { - public static class CatalogMessageFactoryExtensions - { - /// - /// Sends "email a friend" message - /// - public static CreateMessageResult SendShareProductMessage(this IMessageFactory factory, Customer customer, Product product, - string fromEmail, string toEmail, string personalMessage, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - Guard.NotNull(product, nameof(product)); + public static class CatalogMessageFactoryExtensions + { + /// + /// Sends "email a friend" message + /// + public static CreateMessageResult SendShareProductMessage(this IMessageFactory factory, Customer customer, Product product, + string fromEmail, string toEmail, string personalMessage, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(product, nameof(product)); - var model = new NamedModelPart("Message") - { - ["Body"] = personalMessage.NullEmpty(), - ["From"] = fromEmail.NullEmpty(), - ["To"] = toEmail.NullEmpty() - }; + var model = new NamedModelPart("Message") + { + ["Body"] = personalMessage.NullEmpty(), + ["From"] = fromEmail.NullEmpty(), + ["To"] = toEmail.NullEmpty() + }; - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ShareProduct, languageId, customer: customer), true, product, model); - } + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ShareProduct, languageId, customer: customer), true, product, model); + } - public static CreateMessageResult SendProductQuestionMessage(this IMessageFactory factory, Customer customer, Product product, - string senderEmail, string senderName, string senderPhone, string question, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - Guard.NotNull(product, nameof(product)); + public static CreateMessageResult SendProductQuestionMessage(this IMessageFactory factory, Customer customer, Product product, + string senderEmail, string senderName, string senderPhone, string question, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(product, nameof(product)); - var model = new NamedModelPart("Message") - { - ["Message"] = question.NullEmpty(), - ["SenderEmail"] = senderEmail.NullEmpty(), - ["SenderName"] = senderName.NullEmpty(), - ["SenderPhone"] = senderPhone.NullEmpty() - }; + var model = new NamedModelPart("Message") + { + ["Message"] = question.NullEmpty(), + ["SenderEmail"] = senderEmail.NullEmpty(), + ["SenderName"] = senderName.NullEmpty(), + ["SenderPhone"] = senderPhone.NullEmpty() + }; - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ProductQuestion, languageId, customer: customer), true, product, model); - } + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ProductQuestion, languageId, customer: customer), true, product, model); + } - /// - /// Sends a product review notification message to a store owner - /// - public static CreateMessageResult SendProductReviewNotificationMessage(this IMessageFactory factory, ProductReview productReview, int languageId = 0) - { - Guard.NotNull(productReview, nameof(productReview)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ProductReviewStoreOwner, languageId, customer: productReview.Customer), true, productReview, productReview.Product); - } + /// + /// Sends a product review notification message to a store owner + /// + public static CreateMessageResult SendProductReviewNotificationMessage(this IMessageFactory factory, ProductReview productReview, int languageId = 0) + { + Guard.NotNull(productReview, nameof(productReview)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ProductReviewStoreOwner, languageId, customer: productReview.Customer), true, productReview, productReview.Product); + } - /// - /// Sends a "quantity below" notification to a store owner - /// - public static CreateMessageResult SendQuantityBelowStoreOwnerNotification(this IMessageFactory factory, Product product, int languageId = 0) - { - Guard.NotNull(product, nameof(product)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.QuantityBelowStoreOwner, languageId), true, product); - } + /// + /// Sends a "quantity below" notification to a store owner + /// + public static CreateMessageResult SendQuantityBelowStoreOwnerNotification(this IMessageFactory factory, Product product, int languageId = 0) + { + Guard.NotNull(product, nameof(product)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.QuantityBelowStoreOwner, languageId), true, product); + } - /// - /// Sends a 'Back in stock' notification message to a customer - /// - public static CreateMessageResult SendBackInStockNotification(this IMessageFactory factory, BackInStockSubscription subscription) - { - Guard.NotNull(subscription, nameof(subscription)); + /// + /// Sends a 'Back in stock' notification message to a customer + /// + public static CreateMessageResult SendBackInStockNotification(this IMessageFactory factory, BackInStockSubscription subscription) + { + Guard.NotNull(subscription, nameof(subscription)); - var customer = subscription.Customer; + var customer = subscription.Customer; var languageId = customer.GetAttribute(SystemCustomerAttributeNames.LanguageId); return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.BackInStockCustomer, languageId, subscription.StoreId, customer), true, subscription.Product); - } - } + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/CategoryExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/CategoryExtensions.cs index d7977f972b..b62bb38a57 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CategoryExtensions.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CategoryExtensions.cs @@ -132,70 +132,70 @@ private IEnumerable SortInternal(int parentId, ILookup lookup) /// A ProductCategory that has the specified values; otherwise null public static ProductCategory FindProductCategory(this IList source, int productId, int categoryId) { - foreach (var productCategory in source) - { - if (productCategory.ProductId == productId && productCategory.CategoryId == categoryId) - return productCategory; - } + foreach (var productCategory in source) + { + if (productCategory.ProductId == productId && productCategory.CategoryId == categoryId) + return productCategory; + } return null; } - public static string GetCategoryNameIndented(this TreeNode treeNode, - string indentWith = "--", - int? languageId = null, - bool withAlias = true) - { - Guard.NotNull(treeNode, nameof(treeNode)); - - var sb = new StringBuilder(); - var indentSize = treeNode.Depth - 1; - for (int i = 0; i < indentSize; i++) - { - sb.Append(indentWith); - } - - var cat = treeNode.Value; - - var name = languageId.HasValue - ? cat.GetLocalized(n => n.Name, languageId.Value) - : cat.Name; - - sb.Append(name); - - if (withAlias && cat.Alias.HasValue()) - { - sb.Append(" ("); - sb.Append(cat.Alias); - sb.Append(")"); - } - - return sb.ToString(); - } - - /// - /// Builds a category breadcrumb (path) for a particular category node - /// - /// The category node - /// The id of language. Pass null to skip localization. - /// true appends the category alias - if specified - to the name - /// The separator string - /// Category breadcrumb path - public static string GetCategoryPath(this ICategoryNode categoryNode, - ICategoryService categoryService, - int? languageId = null, - string aliasPattern = null, - string separator = " ") - { - Guard.NotNull(categoryNode, nameof(categoryNode)); - - var treeNode = categoryService.GetCategoryTree(categoryNode.Id, true); - if (treeNode != null) - { - return categoryService.GetCategoryPath(treeNode, languageId, aliasPattern, separator); - } - - return string.Empty; - } - } + public static string GetCategoryNameIndented(this TreeNode treeNode, + string indentWith = "--", + int? languageId = null, + bool withAlias = true) + { + Guard.NotNull(treeNode, nameof(treeNode)); + + var sb = new StringBuilder(); + var indentSize = treeNode.Depth - 1; + for (int i = 0; i < indentSize; i++) + { + sb.Append(indentWith); + } + + var cat = treeNode.Value; + + var name = languageId.HasValue + ? cat.GetLocalized(n => n.Name, languageId.Value) + : cat.Name; + + sb.Append(name); + + if (withAlias && cat.Alias.HasValue()) + { + sb.Append(" ("); + sb.Append(cat.Alias); + sb.Append(")"); + } + + return sb.ToString(); + } + + /// + /// Builds a category breadcrumb (path) for a particular category node + /// + /// The category node + /// The id of language. Pass null to skip localization. + /// true appends the category alias - if specified - to the name + /// The separator string + /// Category breadcrumb path + public static string GetCategoryPath(this ICategoryNode categoryNode, + ICategoryService categoryService, + int? languageId = null, + string aliasPattern = null, + string separator = " ") + { + Guard.NotNull(categoryNode, nameof(categoryNode)); + + var treeNode = categoryService.GetCategoryTree(categoryNode.Id, true); + if (treeNode != null) + { + return categoryService.GetCategoryPath(treeNode, languageId, aliasPattern, separator); + } + + return string.Empty; + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/CategoryTemplateService.cs b/src/Libraries/SmartStore.Services/Catalog/CategoryTemplateService.cs index c455ddc0c6..ff50dcd3b9 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CategoryTemplateService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CategoryTemplateService.cs @@ -12,7 +12,7 @@ public partial class CategoryTemplateService : ICategoryTemplateService private readonly IRepository _categoryTemplateRepository; private readonly IEventPublisher _eventPublisher; - public CategoryTemplateService(IRepository categoryTemplateRepository, IEventPublisher eventPublisher) + public CategoryTemplateService(IRepository categoryTemplateRepository, IEventPublisher eventPublisher) { _categoryTemplateRepository = categoryTemplateRepository; _eventPublisher = eventPublisher; @@ -35,7 +35,7 @@ orderby pt.DisplayOrder var templates = query.ToList(); return templates; } - + public virtual CategoryTemplate GetCategoryTemplateById(int categoryTemplateId) { if (categoryTemplateId == 0) diff --git a/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs b/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs index b39f394a40..d30e8f4ccc 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CategoryTreeChangeHandler.cs @@ -16,276 +16,276 @@ namespace SmartStore.Services.Catalog { - public enum CategoryTreeChangeReason - { - ElementCounts, - Data, - Localization, - StoreMapping, - Acl, - Hierarchy - } + public enum CategoryTreeChangeReason + { + ElementCounts, + Data, + Localization, + StoreMapping, + Acl, + Hierarchy + } - public class CategoryTreeChangedEvent - { - public CategoryTreeChangedEvent(CategoryTreeChangeReason reason) - { - Reason = reason; - } + public class CategoryTreeChangedEvent + { + public CategoryTreeChangedEvent(CategoryTreeChangeReason reason) + { + Reason = reason; + } - public CategoryTreeChangeReason Reason { get; private set; } - } + public CategoryTreeChangeReason Reason { get; private set; } + } - public class CategoryTreeChangeHook : IDbSaveHook, IConsumer - { - private readonly ICommonServices _services; + public class CategoryTreeChangeHook : IDbSaveHook, IConsumer + { + private readonly ICommonServices _services; - private readonly bool[] _handledReasons = new bool[(int)CategoryTreeChangeReason.Hierarchy + 1]; - private bool _invalidated; + private readonly bool[] _handledReasons = new bool[(int)CategoryTreeChangeReason.Hierarchy + 1]; + private bool _invalidated; - // Hierarchy affecting category prop names - private static readonly string[] _h = new string[] { "ParentCategoryId", "Published", "Deleted", "DisplayOrder" }; - // Visibility affecting category prop names - private static readonly string[] _a = new string[] { "LimitedToStores", "SubjectToAcl" }; - // Data affecting category prop names - private static readonly string[] _d = new string[] { "Name", "Alias", "ExternalLink", "PictureId", "BadgeText", "BadgeStyle" }; + // Hierarchy affecting category prop names + private static readonly string[] _h = new string[] { "ParentCategoryId", "Published", "Deleted", "DisplayOrder" }; + // Visibility affecting category prop names + private static readonly string[] _a = new string[] { "LimitedToStores", "SubjectToAcl" }; + // Data affecting category prop names + private static readonly string[] _d = new string[] { "Name", "Alias", "ExternalLink", "PictureId", "BadgeText", "BadgeStyle" }; - private static readonly HashSet _candidateTypes = new HashSet - { - typeof(Product), - typeof(Category), - typeof(ProductCategory), - typeof(Setting), - typeof(Language), - typeof(LocalizedProperty), - typeof(StoreMapping), - typeof(AclRecord) - }; + private static readonly HashSet _candidateTypes = new HashSet + { + typeof(Product), + typeof(Category), + typeof(ProductCategory), + typeof(Setting), + typeof(Language), + typeof(LocalizedProperty), + typeof(StoreMapping), + typeof(AclRecord) + }; - public CategoryTreeChangeHook(ICommonServices services) - { - _services = services; - } + public CategoryTreeChangeHook(ICommonServices services) + { + _services = services; + } - public void OnBeforeSave(IHookedEntity entry) - { - if (_invalidated) - return; + public void OnBeforeSave(IHookedEntity entry) + { + if (_invalidated) + return; - if (entry.InitialState != EntityState.Modified) - throw new NotSupportedException(); + if (entry.InitialState != EntityState.Modified) + throw new NotSupportedException(); - var cache = _services.Cache; - var entity = entry.Entity; - - if (entity is Product) - { - var modProps = _services.DbContext.GetModifiedProperties(entity); - var toxicPropNames = Product.GetVisibilityAffectingPropertyNames(); - if (modProps.Keys.Any(x => toxicPropNames.Contains(x))) - { - // No eviction, just notification - PublishEvent(CategoryTreeChangeReason.ElementCounts); - } - } - else if (entity is ProductCategory) - { - var modProps = _services.DbContext.GetModifiedProperties(entity); - if (modProps.ContainsKey("CategoryId")) - { - // No eviction, just notification - PublishEvent(CategoryTreeChangeReason.ElementCounts); - } - } - else if (entity is Category category) - { - var modProps = _services.DbContext.GetModifiedProperties(entity); + var cache = _services.Cache; + var entity = entry.Entity; - if (modProps.Keys.Any(x => _h.Contains(x))) - { - // Hierarchy affecting properties has changed. Nuke each tree. - cache.RemoveByPattern(CategoryService.CATEGORY_TREE_PATTERN_KEY); - PublishEvent(CategoryTreeChangeReason.Hierarchy); - _invalidated = true; - } - else if (modProps.Keys.Any(x => _a.Contains(x))) - { - if (modProps.ContainsKey("LimitedToStores")) - { - // Don't nuke store agnostic trees - cache.RemoveByPattern(BuildCacheKeyPattern("*", "*", "[^0]*")); - PublishEvent(CategoryTreeChangeReason.StoreMapping); - } - if (modProps.ContainsKey("SubjectToAcl")) - { - // Don't nuke ACL agnostic trees - cache.RemoveByPattern(BuildCacheKeyPattern("*", "[^0]*", "*")); - PublishEvent(CategoryTreeChangeReason.Acl); - } - } - else if (modProps.Keys.Any(x => _d.Contains(x))) - { - // Only data has changed. Don't nuke trees, update corresponding cache entries instead. - var keys = cache.Keys(CategoryService.CATEGORY_TREE_PATTERN_KEY).ToArray(); - foreach (var key in keys) - { - var tree = cache.Get>(key); - if (tree != null) - { - var node = tree.SelectNodeById(entity.Id); - if (node != null) - { - var value = node.Value as CategoryNode; - if (value == null) - { - // Cannot update. Nuke tree. - cache.Remove(key); - } - else - { - value.Name = category.Name; + if (entity is Product) + { + var modProps = _services.DbContext.GetModifiedProperties(entity); + var toxicPropNames = Product.GetVisibilityAffectingPropertyNames(); + if (modProps.Keys.Any(x => toxicPropNames.Contains(x))) + { + // No eviction, just notification + PublishEvent(CategoryTreeChangeReason.ElementCounts); + } + } + else if (entity is ProductCategory) + { + var modProps = _services.DbContext.GetModifiedProperties(entity); + if (modProps.ContainsKey("CategoryId")) + { + // No eviction, just notification + PublishEvent(CategoryTreeChangeReason.ElementCounts); + } + } + else if (entity is Category category) + { + var modProps = _services.DbContext.GetModifiedProperties(entity); + + if (modProps.Keys.Any(x => _h.Contains(x))) + { + // Hierarchy affecting properties has changed. Nuke each tree. + cache.RemoveByPattern(CategoryService.CATEGORY_TREE_PATTERN_KEY); + PublishEvent(CategoryTreeChangeReason.Hierarchy); + _invalidated = true; + } + else if (modProps.Keys.Any(x => _a.Contains(x))) + { + if (modProps.ContainsKey("LimitedToStores")) + { + // Don't nuke store agnostic trees + cache.RemoveByPattern(BuildCacheKeyPattern("*", "*", "[^0]*")); + PublishEvent(CategoryTreeChangeReason.StoreMapping); + } + if (modProps.ContainsKey("SubjectToAcl")) + { + // Don't nuke ACL agnostic trees + cache.RemoveByPattern(BuildCacheKeyPattern("*", "[^0]*", "*")); + PublishEvent(CategoryTreeChangeReason.Acl); + } + } + else if (modProps.Keys.Any(x => _d.Contains(x))) + { + // Only data has changed. Don't nuke trees, update corresponding cache entries instead. + var keys = cache.Keys(CategoryService.CATEGORY_TREE_PATTERN_KEY).ToArray(); + foreach (var key in keys) + { + var tree = cache.Get>(key); + if (tree != null) + { + var node = tree.SelectNodeById(entity.Id); + if (node != null) + { + var value = node.Value as CategoryNode; + if (value == null) + { + // Cannot update. Nuke tree. + cache.Remove(key); + } + else + { + value.Name = category.Name; value.ExternalLink = category.ExternalLink; - value.Alias = category.Alias; - value.MediaFileId = category.MediaFileId; - value.BadgeText = category.BadgeText; - value.BadgeStyle = category.BadgeStyle; + value.Alias = category.Alias; + value.MediaFileId = category.MediaFileId; + value.BadgeText = category.BadgeText; + value.BadgeStyle = category.BadgeStyle; - // Persist to cache store - cache.Put(key, tree, CategoryService.CategoryTreeCacheDuration); - } - } - } - } + // Persist to cache store + cache.Put(key, tree, CategoryService.CategoryTreeCacheDuration); + } + } + } + } - // Publish event only once - PublishEvent(CategoryTreeChangeReason.Data); - } - } - else - { - throw new NotSupportedException(); - } - } + // Publish event only once + PublishEvent(CategoryTreeChangeReason.Data); + } + } + else + { + throw new NotSupportedException(); + } + } - public void OnAfterSave(IHookedEntity entry) - { - if (_invalidated) - return; + public void OnAfterSave(IHookedEntity entry) + { + if (_invalidated) + return; - if (!_candidateTypes.Contains(entry.EntityType)) - throw new NotSupportedException(); + if (!_candidateTypes.Contains(entry.EntityType)) + throw new NotSupportedException(); - // INFO: Acl & StoreMapping affect element counts + // INFO: Acl & StoreMapping affect element counts - var cache = _services.Cache; - var isNewOrDeleted = entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Deleted; - var entity = entry.Entity; + var cache = _services.Cache; + var isNewOrDeleted = entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Deleted; + var entity = entry.Entity; - if (entity is Product) - { - // INFO: 'Modified' case already handled in 'OnBeforeSave()' - if (entry.InitialState == EntityState.Deleted || (entry.InitialState == EntityState.Added && ((Product)entity).Published)) - { - // No eviction, just notification, but for PUBLISHED products only - PublishEvent(CategoryTreeChangeReason.ElementCounts); - } - } - else if (entity is ProductCategory && isNewOrDeleted) - { - // INFO: 'Modified' case already handled in 'OnBeforeSave()' - // New or deleted product category mappings affect counts - PublishEvent(CategoryTreeChangeReason.ElementCounts); - } - else if (entity is Category && isNewOrDeleted) - { - // INFO: 'Modified' case already handled in 'OnBeforeSave()' - // Hierarchy affecting change, nuke all. - cache.RemoveByPattern(CategoryService.CATEGORY_TREE_PATTERN_KEY); - PublishEvent(CategoryTreeChangeReason.Hierarchy); - _invalidated = true; - } - else if (entity is Setting) - { - var name = (entity as Setting).Name.ToLowerInvariant(); - if (name == "catalogsettings.showcategoryproductnumber" || name == "catalogsettings.showcategoryproductnumberincludingsubcategories") - { - PublishEvent(CategoryTreeChangeReason.ElementCounts); - } - } - else if (entity is Language && entry.InitialState == EntityState.Deleted) - { - PublishEvent(CategoryTreeChangeReason.Localization); - } - else if (entity is LocalizedProperty) - { - var lp = entity as LocalizedProperty; - var key = lp.LocaleKey; - if (lp.LocaleKeyGroup == "Category" && (key == "Name" || key == "BadgeText")) - { - PublishEvent(CategoryTreeChangeReason.Localization); - } - } - else if (entity is StoreMapping) - { - var stm = entity as StoreMapping; - if (stm.EntityName == "Product") - { - PublishEvent(CategoryTreeChangeReason.ElementCounts); - } - else if (stm.EntityName == "Category") - { - // Don't nuke store agnostic trees - cache.RemoveByPattern(BuildCacheKeyPattern("*", "*", "[^0]*")); - PublishEvent(CategoryTreeChangeReason.StoreMapping); - } - } - else if (entity is AclRecord) - { - var acl = entity as AclRecord; - if (!acl.IsIdle) - { - if (acl.EntityName == "Product") - { - PublishEvent(CategoryTreeChangeReason.ElementCounts); - } - else if (acl.EntityName == "Category") - { - // Don't nuke ACL agnostic trees - cache.RemoveByPattern(BuildCacheKeyPattern("*", "[^0]*", "*")); - PublishEvent(CategoryTreeChangeReason.Acl); - } - } - } - } + if (entity is Product) + { + // INFO: 'Modified' case already handled in 'OnBeforeSave()' + if (entry.InitialState == EntityState.Deleted || (entry.InitialState == EntityState.Added && ((Product)entity).Published)) + { + // No eviction, just notification, but for PUBLISHED products only + PublishEvent(CategoryTreeChangeReason.ElementCounts); + } + } + else if (entity is ProductCategory && isNewOrDeleted) + { + // INFO: 'Modified' case already handled in 'OnBeforeSave()' + // New or deleted product category mappings affect counts + PublishEvent(CategoryTreeChangeReason.ElementCounts); + } + else if (entity is Category && isNewOrDeleted) + { + // INFO: 'Modified' case already handled in 'OnBeforeSave()' + // Hierarchy affecting change, nuke all. + cache.RemoveByPattern(CategoryService.CATEGORY_TREE_PATTERN_KEY); + PublishEvent(CategoryTreeChangeReason.Hierarchy); + _invalidated = true; + } + else if (entity is Setting) + { + var name = (entity as Setting).Name.ToLowerInvariant(); + if (name == "catalogsettings.showcategoryproductnumber" || name == "catalogsettings.showcategoryproductnumberincludingsubcategories") + { + PublishEvent(CategoryTreeChangeReason.ElementCounts); + } + } + else if (entity is Language && entry.InitialState == EntityState.Deleted) + { + PublishEvent(CategoryTreeChangeReason.Localization); + } + else if (entity is LocalizedProperty) + { + var lp = entity as LocalizedProperty; + var key = lp.LocaleKey; + if (lp.LocaleKeyGroup == "Category" && (key == "Name" || key == "BadgeText")) + { + PublishEvent(CategoryTreeChangeReason.Localization); + } + } + else if (entity is StoreMapping) + { + var stm = entity as StoreMapping; + if (stm.EntityName == "Product") + { + PublishEvent(CategoryTreeChangeReason.ElementCounts); + } + else if (stm.EntityName == "Category") + { + // Don't nuke store agnostic trees + cache.RemoveByPattern(BuildCacheKeyPattern("*", "*", "[^0]*")); + PublishEvent(CategoryTreeChangeReason.StoreMapping); + } + } + else if (entity is AclRecord) + { + var acl = entity as AclRecord; + if (!acl.IsIdle) + { + if (acl.EntityName == "Product") + { + PublishEvent(CategoryTreeChangeReason.ElementCounts); + } + else if (acl.EntityName == "Category") + { + // Don't nuke ACL agnostic trees + cache.RemoveByPattern(BuildCacheKeyPattern("*", "[^0]*", "*")); + PublishEvent(CategoryTreeChangeReason.Acl); + } + } + } + } - public void HandleEvent(IndexingCompletedEvent message) - { - if (message.IndexInfo.IsModified) - { - PublishEvent(CategoryTreeChangeReason.ElementCounts); - } - } + public void HandleEvent(IndexingCompletedEvent message) + { + if (message.IndexInfo.IsModified) + { + PublishEvent(CategoryTreeChangeReason.ElementCounts); + } + } - private void PublishEvent(CategoryTreeChangeReason reason) - { - if (_handledReasons[(int)reason] == false) - { - _services.EventPublisher.Publish(new CategoryTreeChangedEvent(reason)); - _handledReasons[(int)reason] = true; - } - } + private void PublishEvent(CategoryTreeChangeReason reason) + { + if (_handledReasons[(int)reason] == false) + { + _services.EventPublisher.Publish(new CategoryTreeChangedEvent(reason)); + _handledReasons[(int)reason] = true; + } + } - private string BuildCacheKeyPattern(string includeHiddenToken = "*", string rolesToken = "*", string storeToken = "*") - { - return CategoryService.CATEGORY_TREE_KEY.FormatInvariant(includeHiddenToken, rolesToken, storeToken); - } + private string BuildCacheKeyPattern(string includeHiddenToken = "*", string rolesToken = "*", string storeToken = "*") + { + return CategoryService.CATEGORY_TREE_KEY.FormatInvariant(includeHiddenToken, rolesToken, storeToken); + } - public void OnBeforeSaveCompleted() - { - } + public void OnBeforeSaveCompleted() + { + } - public void OnAfterSaveCompleted() - { - } - } + public void OnAfterSaveCompleted() + { + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs b/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs index 0edc385302..1d5730b812 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs @@ -17,18 +17,18 @@ public partial class CompareProductsService : ICompareProductsService private readonly HttpContextBase _httpContext; private readonly IProductService _productService; - private readonly ICatalogSearchService _catalogSearchService; + private readonly ICatalogSearchService _catalogSearchService; private readonly PrivacySettings _privacySettings; public CompareProductsService( HttpContextBase httpContext, - IProductService productService, - ICatalogSearchService catalogSearchService, + IProductService productService, + ICatalogSearchService catalogSearchService, PrivacySettings privacySettings) { _httpContext = httpContext; _productService = productService; - _catalogSearchService = catalogSearchService; + _catalogSearchService = catalogSearchService; _privacySettings = privacySettings; } @@ -93,16 +93,16 @@ public virtual IList GetComparedProducts() public virtual int GetComparedProductsCount() { - var productIds = GetComparedProductIds(); - if (productIds.Count == 0) - return 0; + var productIds = GetComparedProductIds(); + if (productIds.Count == 0) + return 0; - var searchQuery = new CatalogSearchQuery() - .VisibleOnly() - .WithProductIds(productIds.ToArray()) - .BuildHits(false); + var searchQuery = new CatalogSearchQuery() + .VisibleOnly() + .WithProductIds(productIds.ToArray()) + .BuildHits(false); - var result = _catalogSearchService.Search(searchQuery); + var result = _catalogSearchService.Search(searchQuery); return result.TotalHitsCount; } @@ -146,13 +146,13 @@ public virtual void AddProductToCompareList(int productId) var oldProductIds = GetComparedProductIds(); var newProductIds = new List(); newProductIds.Add(productId); - - foreach (int oldProductId in oldProductIds) - { - if (oldProductId != productId) - newProductIds.Add(oldProductId); - } - + + foreach (int oldProductId in oldProductIds) + { + if (oldProductId != productId) + newProductIds.Add(oldProductId); + } + var compareCookie = _httpContext.Request.Cookies.Get(COMPARE_PRODUCTS_COOKIE_NAME) ?? new HttpCookie(COMPARE_PRODUCTS_COOKIE_NAME); compareCookie.Values.Clear(); diff --git a/src/Libraries/SmartStore.Services/Catalog/CopyProductService.cs b/src/Libraries/SmartStore.Services/Catalog/CopyProductService.cs index 44c4ddb02f..664c3ee529 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CopyProductService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CopyProductService.cs @@ -18,208 +18,208 @@ namespace SmartStore.Services.Catalog { public partial class CopyProductService : ICopyProductService { - private readonly IRepository _productRepository; - private readonly IRepository _relatedProductRepository; - private readonly IRepository _crossSellProductRepository; - private readonly ICommonServices _services; - private readonly IProductService _productService; + private readonly IRepository _productRepository; + private readonly IRepository _relatedProductRepository; + private readonly IRepository _crossSellProductRepository; + private readonly ICommonServices _services; + private readonly IProductService _productService; private readonly IProductAttributeService _productAttributeService; private readonly ILanguageService _languageService; private readonly ILocalizedEntityService _localizedEntityService; private readonly IDownloadService _downloadService; private readonly IProductAttributeParser _productAttributeParser; private readonly IUrlRecordService _urlRecordService; - private readonly IStoreMappingService _storeMappingService; - private readonly ICatalogSearchService _catalogSearchService; - private readonly SeoSettings _seoSettings; - - public CopyProductService( - IRepository productRepository, - IRepository relatedProductRepository, - IRepository crossSellProductRepository, - ICommonServices services, - IProductService productService, + private readonly IStoreMappingService _storeMappingService; + private readonly ICatalogSearchService _catalogSearchService; + private readonly SeoSettings _seoSettings; + + public CopyProductService( + IRepository productRepository, + IRepository relatedProductRepository, + IRepository crossSellProductRepository, + ICommonServices services, + IProductService productService, IProductAttributeService productAttributeService, - ILanguageService languageService, + ILanguageService languageService, ILocalizedEntityService localizedEntityService, IDownloadService downloadService, IProductAttributeParser productAttributeParser, - IUrlRecordService urlRecordService, - IStoreMappingService storeMappingService, - ICatalogSearchService catalogSearchService, - SeoSettings seoSettings) + IUrlRecordService urlRecordService, + IStoreMappingService storeMappingService, + ICatalogSearchService catalogSearchService, + SeoSettings seoSettings) { - _productRepository = productRepository; - _relatedProductRepository = relatedProductRepository; - _crossSellProductRepository = crossSellProductRepository; - _services = services; - _productService = productService; + _productRepository = productRepository; + _relatedProductRepository = relatedProductRepository; + _crossSellProductRepository = crossSellProductRepository; + _services = services; + _productService = productService; _productAttributeService = productAttributeService; _languageService = languageService; _localizedEntityService = localizedEntityService; _downloadService = downloadService; _productAttributeParser = productAttributeParser; - _urlRecordService = urlRecordService; - _storeMappingService = storeMappingService; - _catalogSearchService = catalogSearchService; - _seoSettings = seoSettings; + _urlRecordService = urlRecordService; + _storeMappingService = storeMappingService; + _catalogSearchService = catalogSearchService; + _seoSettings = seoSettings; } - public Localizer T { get; set; } = NullLocalizer.Instance; + public Localizer T { get; set; } = NullLocalizer.Instance; public virtual Product CopyProduct( - Product product, - string newName, - bool isPublished, - bool copyAssociatedProducts = true) + Product product, + string newName, + bool isPublished, + bool copyAssociatedProducts = true) { - Guard.NotNull(product, nameof(product)); - Guard.NotEmpty(newName, nameof(newName)); - - using (_services.Chronometer.Step("Copy product " + product.Id)) - { - Product clone = null; - var utcNow = DateTime.UtcNow; - var languages = _languageService.GetAllLanguages(true); - int? sampleDownloadId = null; - - using (var scope = new DbContextScope(ctx: _productRepository.Context, - autoCommit: false, - autoDetectChanges: false, - proxyCreation: true, - validateOnSave: false, - forceNoTracking: true, - hooksEnabled: false)) - { - if (product.HasSampleDownload) - { + Guard.NotNull(product, nameof(product)); + Guard.NotEmpty(newName, nameof(newName)); + + using (_services.Chronometer.Step("Copy product " + product.Id)) + { + Product clone = null; + var utcNow = DateTime.UtcNow; + var languages = _languageService.GetAllLanguages(true); + int? sampleDownloadId = null; + + using (var scope = new DbContextScope(ctx: _productRepository.Context, + autoCommit: false, + autoDetectChanges: false, + proxyCreation: true, + validateOnSave: false, + forceNoTracking: true, + hooksEnabled: false)) + { + if (product.HasSampleDownload) + { var sampleDownload = _downloadService.GetDownloadById((int)product.SampleDownloadId); - var sampleDownloadClone = CopyDownload(sampleDownload); + var sampleDownloadClone = CopyDownload(sampleDownload); sampleDownloadId = sampleDownloadClone.Id; } - // Product - clone = new Product - { - ProductTypeId = product.ProductTypeId, - ParentGroupedProductId = product.ParentGroupedProductId, + // Product + clone = new Product + { + ProductTypeId = product.ProductTypeId, + ParentGroupedProductId = product.ParentGroupedProductId, Visibility = product.Visibility, Condition = product.Condition, - Name = newName, - ShortDescription = product.ShortDescription, - FullDescription = product.FullDescription, - ProductTemplateId = product.ProductTemplateId, - AdminComment = product.AdminComment, - ShowOnHomePage = product.ShowOnHomePage, - HomePageDisplayOrder = product.HomePageDisplayOrder, - MetaKeywords = product.MetaKeywords, - MetaDescription = product.MetaDescription, - MetaTitle = product.MetaTitle, - AllowCustomerReviews = product.AllowCustomerReviews, - LimitedToStores = product.LimitedToStores, - Sku = product.Sku, - ManufacturerPartNumber = product.ManufacturerPartNumber, - Gtin = product.Gtin, - IsGiftCard = product.IsGiftCard, - GiftCardType = product.GiftCardType, - RequireOtherProducts = product.RequireOtherProducts, - RequiredProductIds = product.RequiredProductIds, - AutomaticallyAddRequiredProducts = product.AutomaticallyAddRequiredProducts, - IsDownload = product.IsDownload, - UnlimitedDownloads = product.UnlimitedDownloads, - MaxNumberOfDownloads = product.MaxNumberOfDownloads, - DownloadExpirationDays = product.DownloadExpirationDays, - DownloadActivationType = product.DownloadActivationType, - HasSampleDownload = product.HasSampleDownload, - SampleDownloadId = sampleDownloadId, - HasUserAgreement = product.HasUserAgreement, - UserAgreementText = product.UserAgreementText, - IsRecurring = product.IsRecurring, - RecurringCycleLength = product.RecurringCycleLength, - RecurringCyclePeriod = product.RecurringCyclePeriod, - RecurringTotalCycles = product.RecurringTotalCycles, - IsShipEnabled = product.IsShipEnabled, - IsFreeShipping = product.IsFreeShipping, - AdditionalShippingCharge = product.AdditionalShippingCharge, - IsEsd = product.IsEsd, - IsTaxExempt = product.IsTaxExempt, - TaxCategoryId = product.TaxCategoryId, - ManageInventoryMethod = product.ManageInventoryMethod, - StockQuantity = product.StockQuantity, - DisplayStockAvailability = product.DisplayStockAvailability, - DisplayStockQuantity = product.DisplayStockQuantity, - MinStockQuantity = product.MinStockQuantity, - LowStockActivityId = product.LowStockActivityId, - NotifyAdminForQuantityBelow = product.NotifyAdminForQuantityBelow, - BackorderMode = product.BackorderMode, - AllowBackInStockSubscriptions = product.AllowBackInStockSubscriptions, - OrderMinimumQuantity = product.OrderMinimumQuantity, - OrderMaximumQuantity = product.OrderMaximumQuantity, - QuantityStep = product.QuantityStep, - QuantiyControlType = product.QuantiyControlType, - HideQuantityControl = product.HideQuantityControl, - AllowedQuantities = product.AllowedQuantities, - DisableBuyButton = product.DisableBuyButton, - DisableWishlistButton = product.DisableWishlistButton, - AvailableForPreOrder = product.AvailableForPreOrder, - CallForPrice = product.CallForPrice, - Price = product.Price, - OldPrice = product.OldPrice, - ProductCost = product.ProductCost, - SpecialPrice = product.SpecialPrice, - SpecialPriceStartDateTimeUtc = product.SpecialPriceStartDateTimeUtc, - SpecialPriceEndDateTimeUtc = product.SpecialPriceEndDateTimeUtc, - CustomerEntersPrice = product.CustomerEntersPrice, - MinimumCustomerEnteredPrice = product.MinimumCustomerEnteredPrice, - MaximumCustomerEnteredPrice = product.MaximumCustomerEnteredPrice, - LowestAttributeCombinationPrice = product.LowestAttributeCombinationPrice, - Weight = product.Weight, - Length = product.Length, - Width = product.Width, - Height = product.Height, - AvailableStartDateTimeUtc = product.AvailableStartDateTimeUtc, - AvailableEndDateTimeUtc = product.AvailableEndDateTimeUtc, - DisplayOrder = product.DisplayOrder, - Published = isPublished, - Deleted = product.Deleted, - IsSystemProduct = product.IsSystemProduct, - DeliveryTimeId = product.DeliveryTimeId, - QuantityUnitId = product.QuantityUnitId, - BasePriceEnabled = product.BasePriceEnabled, - BasePriceMeasureUnit = product.BasePriceMeasureUnit, - BasePriceAmount = product.BasePriceAmount, - BasePriceBaseAmount = product.BasePriceBaseAmount, - BundleTitleText = product.BundleTitleText, - BundlePerItemShipping = product.BundlePerItemShipping, - BundlePerItemPricing = product.BundlePerItemPricing, - BundlePerItemShoppingCart = product.BundlePerItemShoppingCart, - CustomsTariffNumber = product.CustomsTariffNumber, - CountryOfOriginId = product.CountryOfOriginId, - CreatedOnUtc = utcNow, - UpdatedOnUtc = utcNow - }; - - // Category mappings - foreach (var pc in product.ProductCategories) - { - clone.ProductCategories.Add(new ProductCategory - { - CategoryId = pc.CategoryId, - IsFeaturedProduct = pc.IsFeaturedProduct, - DisplayOrder = pc.DisplayOrder - }); - } - - // Manufacturer mappings - foreach (var pm in product.ProductManufacturers) - { - clone.ProductManufacturers.Add(new ProductManufacturer - { - ManufacturerId = pm.ManufacturerId, - IsFeaturedProduct = pm.IsFeaturedProduct, - DisplayOrder = pm.DisplayOrder - }); - } + Name = newName, + ShortDescription = product.ShortDescription, + FullDescription = product.FullDescription, + ProductTemplateId = product.ProductTemplateId, + AdminComment = product.AdminComment, + ShowOnHomePage = product.ShowOnHomePage, + HomePageDisplayOrder = product.HomePageDisplayOrder, + MetaKeywords = product.MetaKeywords, + MetaDescription = product.MetaDescription, + MetaTitle = product.MetaTitle, + AllowCustomerReviews = product.AllowCustomerReviews, + LimitedToStores = product.LimitedToStores, + Sku = product.Sku, + ManufacturerPartNumber = product.ManufacturerPartNumber, + Gtin = product.Gtin, + IsGiftCard = product.IsGiftCard, + GiftCardType = product.GiftCardType, + RequireOtherProducts = product.RequireOtherProducts, + RequiredProductIds = product.RequiredProductIds, + AutomaticallyAddRequiredProducts = product.AutomaticallyAddRequiredProducts, + IsDownload = product.IsDownload, + UnlimitedDownloads = product.UnlimitedDownloads, + MaxNumberOfDownloads = product.MaxNumberOfDownloads, + DownloadExpirationDays = product.DownloadExpirationDays, + DownloadActivationType = product.DownloadActivationType, + HasSampleDownload = product.HasSampleDownload, + SampleDownloadId = sampleDownloadId, + HasUserAgreement = product.HasUserAgreement, + UserAgreementText = product.UserAgreementText, + IsRecurring = product.IsRecurring, + RecurringCycleLength = product.RecurringCycleLength, + RecurringCyclePeriod = product.RecurringCyclePeriod, + RecurringTotalCycles = product.RecurringTotalCycles, + IsShipEnabled = product.IsShipEnabled, + IsFreeShipping = product.IsFreeShipping, + AdditionalShippingCharge = product.AdditionalShippingCharge, + IsEsd = product.IsEsd, + IsTaxExempt = product.IsTaxExempt, + TaxCategoryId = product.TaxCategoryId, + ManageInventoryMethod = product.ManageInventoryMethod, + StockQuantity = product.StockQuantity, + DisplayStockAvailability = product.DisplayStockAvailability, + DisplayStockQuantity = product.DisplayStockQuantity, + MinStockQuantity = product.MinStockQuantity, + LowStockActivityId = product.LowStockActivityId, + NotifyAdminForQuantityBelow = product.NotifyAdminForQuantityBelow, + BackorderMode = product.BackorderMode, + AllowBackInStockSubscriptions = product.AllowBackInStockSubscriptions, + OrderMinimumQuantity = product.OrderMinimumQuantity, + OrderMaximumQuantity = product.OrderMaximumQuantity, + QuantityStep = product.QuantityStep, + QuantiyControlType = product.QuantiyControlType, + HideQuantityControl = product.HideQuantityControl, + AllowedQuantities = product.AllowedQuantities, + DisableBuyButton = product.DisableBuyButton, + DisableWishlistButton = product.DisableWishlistButton, + AvailableForPreOrder = product.AvailableForPreOrder, + CallForPrice = product.CallForPrice, + Price = product.Price, + OldPrice = product.OldPrice, + ProductCost = product.ProductCost, + SpecialPrice = product.SpecialPrice, + SpecialPriceStartDateTimeUtc = product.SpecialPriceStartDateTimeUtc, + SpecialPriceEndDateTimeUtc = product.SpecialPriceEndDateTimeUtc, + CustomerEntersPrice = product.CustomerEntersPrice, + MinimumCustomerEnteredPrice = product.MinimumCustomerEnteredPrice, + MaximumCustomerEnteredPrice = product.MaximumCustomerEnteredPrice, + LowestAttributeCombinationPrice = product.LowestAttributeCombinationPrice, + Weight = product.Weight, + Length = product.Length, + Width = product.Width, + Height = product.Height, + AvailableStartDateTimeUtc = product.AvailableStartDateTimeUtc, + AvailableEndDateTimeUtc = product.AvailableEndDateTimeUtc, + DisplayOrder = product.DisplayOrder, + Published = isPublished, + Deleted = product.Deleted, + IsSystemProduct = product.IsSystemProduct, + DeliveryTimeId = product.DeliveryTimeId, + QuantityUnitId = product.QuantityUnitId, + BasePriceEnabled = product.BasePriceEnabled, + BasePriceMeasureUnit = product.BasePriceMeasureUnit, + BasePriceAmount = product.BasePriceAmount, + BasePriceBaseAmount = product.BasePriceBaseAmount, + BundleTitleText = product.BundleTitleText, + BundlePerItemShipping = product.BundlePerItemShipping, + BundlePerItemPricing = product.BundlePerItemPricing, + BundlePerItemShoppingCart = product.BundlePerItemShoppingCart, + CustomsTariffNumber = product.CustomsTariffNumber, + CountryOfOriginId = product.CountryOfOriginId, + CreatedOnUtc = utcNow, + UpdatedOnUtc = utcNow + }; + + // Category mappings + foreach (var pc in product.ProductCategories) + { + clone.ProductCategories.Add(new ProductCategory + { + CategoryId = pc.CategoryId, + IsFeaturedProduct = pc.IsFeaturedProduct, + DisplayOrder = pc.DisplayOrder + }); + } + + // Manufacturer mappings + foreach (var pm in product.ProductManufacturers) + { + clone.ProductManufacturers.Add(new ProductManufacturer + { + ManufacturerId = pm.ManufacturerId, + IsFeaturedProduct = pm.IsFeaturedProduct, + DisplayOrder = pm.DisplayOrder + }); + } // Picture mappings foreach (var pp in product.ProductPictures) @@ -238,121 +238,121 @@ public virtual Product CopyProduct( // Product specifications foreach (var psa in product.ProductSpecificationAttributes) - { - clone.ProductSpecificationAttributes.Add(new ProductSpecificationAttribute - { - SpecificationAttributeOptionId = psa.SpecificationAttributeOptionId, - AllowFiltering = psa.AllowFiltering, - ShowOnProductPage = psa.ShowOnProductPage, - DisplayOrder = psa.DisplayOrder - }); - } - - // Tier prices - foreach (var tp in product.TierPrices) - { - clone.TierPrices.Add(new TierPrice - { - StoreId = tp.StoreId, - CustomerRoleId = tp.CustomerRoleId, - Quantity = tp.Quantity, - Price = tp.Price, - CalculationMethod = tp.CalculationMethod - }); + { + clone.ProductSpecificationAttributes.Add(new ProductSpecificationAttribute + { + SpecificationAttributeOptionId = psa.SpecificationAttributeOptionId, + AllowFiltering = psa.AllowFiltering, + ShowOnProductPage = psa.ShowOnProductPage, + DisplayOrder = psa.DisplayOrder + }); + } + + // Tier prices + foreach (var tp in product.TierPrices) + { + clone.TierPrices.Add(new TierPrice + { + StoreId = tp.StoreId, + CustomerRoleId = tp.CustomerRoleId, + Quantity = tp.Quantity, + Price = tp.Price, + CalculationMethod = tp.CalculationMethod + }); clone.HasTierPrices = true; } - // Discount mapping - foreach (var discount in product.AppliedDiscounts) - { + // Discount mapping + foreach (var discount in product.AppliedDiscounts) + { clone.AppliedDiscounts.Add(discount); clone.HasDiscountsApplied = true; } - // Tags - foreach (var tag in product.ProductTags) - { - clone.ProductTags.Add(tag); - } - - // >>>>>>> Put clone to db (from here on we need the product clone's ID) - _productRepository.Insert(clone); - Commit(); - - // Related products mapping - foreach (var rp in _productService.GetRelatedProductsByProductId1(product.Id, true)) - { - _relatedProductRepository.Insert(new RelatedProduct - { - ProductId1 = clone.Id, - ProductId2 = rp.ProductId2, - DisplayOrder = rp.DisplayOrder - }); - } - - // CrossSell products mapping - foreach (var csp in _productService.GetCrossSellProductsByProductId1(product.Id, true)) - { - _crossSellProductRepository.Insert(new CrossSellProduct - { - ProductId1 = clone.Id, - ProductId2 = csp.ProductId2 - }); - } - - // Store mapping - var selectedStoreIds = _storeMappingService.GetStoresIdsWithAccess(product); - foreach (var id in selectedStoreIds) - { - _storeMappingService.InsertStoreMapping(clone, id); - } - - // SEO - ProcessSlug(clone); - - // Localization - ProcessLocalization(product, clone, languages); - - // Attributes and attribute combinations. + // Tags + foreach (var tag in product.ProductTags) + { + clone.ProductTags.Add(tag); + } + + // >>>>>>> Put clone to db (from here on we need the product clone's ID) + _productRepository.Insert(clone); + Commit(); + + // Related products mapping + foreach (var rp in _productService.GetRelatedProductsByProductId1(product.Id, true)) + { + _relatedProductRepository.Insert(new RelatedProduct + { + ProductId1 = clone.Id, + ProductId2 = rp.ProductId2, + DisplayOrder = rp.DisplayOrder + }); + } + + // CrossSell products mapping + foreach (var csp in _productService.GetCrossSellProductsByProductId1(product.Id, true)) + { + _crossSellProductRepository.Insert(new CrossSellProduct + { + ProductId1 = clone.Id, + ProductId2 = csp.ProductId2 + }); + } + + // Store mapping + var selectedStoreIds = _storeMappingService.GetStoresIdsWithAccess(product); + foreach (var id in selectedStoreIds) + { + _storeMappingService.InsertStoreMapping(clone, id); + } + + // SEO + ProcessSlug(clone); + + // Localization + ProcessLocalization(product, clone, languages); + + // Attributes and attribute combinations. ProcessAttributes(product, clone, languages); // Update computed properties. clone.LowestAttributeCombinationPrice = _productAttributeService.GetLowestCombinationPrice(clone.Id); - // Associated products. - if (copyAssociatedProducts && product.ProductType != ProductType.BundledProduct) - { - ProcessAssociatedProducts(product, clone, isPublished); - } + // Associated products. + if (copyAssociatedProducts && product.ProductType != ProductType.BundledProduct) + { + ProcessAssociatedProducts(product, clone, isPublished); + } - // Bundle items - ProcessBundleItems(product, clone); + // Bundle items + ProcessBundleItems(product, clone); // Downloads CopyDownloads(product.Id, clone.Id, "Product"); - + // >>>>>>> Our final commit Commit(); - } + } - return clone; - } + return clone; + } } - private void Commit() - { - _services.DbContext.SaveChanges(); - } + private void Commit() + { + _services.DbContext.SaveChanges(); + } - private Dictionary CopyDownloads(int productId, int cloneId, string entityName = "") - { - var downloads = _downloadService.GetDownloadsFor(productId, entityName); + private Dictionary CopyDownloads(int productId, int cloneId, string entityName = "") + { + var downloads = _downloadService.GetDownloadsFor(productId, entityName); var clonedDownloads = new Dictionary(); if (!downloads.Any()) - { - return null; - } + { + return null; + } using (var scope = new DbContextScope(ctx: _productRepository.Context, autoCommit: true)) { @@ -362,10 +362,10 @@ private Dictionary CopyDownloads(int productId, int cloneId, stri var clone = CopyDownload(download); clonedDownloads[clone.Id] = clone; } - } - - return clonedDownloads; - } + } + + return clonedDownloads; + } private Download CopyDownload(Download download) { @@ -374,7 +374,7 @@ private Download CopyDownload(Download download) DownloadGuid = Guid.NewGuid(), UseDownloadUrl = download.UseDownloadUrl, DownloadUrl = download.DownloadUrl, - MediaFile = download.MediaFile, + MediaFile = download.MediaFile, UpdatedOnUtc = DateTime.UtcNow, EntityId = download.EntityId, EntityName = download.EntityName, @@ -382,96 +382,96 @@ private Download CopyDownload(Download download) FileVersion = download.FileVersion }; - _services.DbContext.Set().Add(clone); - _services.DbContext.SaveChanges(); + _services.DbContext.Set().Add(clone); + _services.DbContext.SaveChanges(); return clone; } private void ProcessSlug(Product clone) - { - using (var scope = new DbContextScope(ctx: _productRepository.Context, autoCommit: true)) - { - var slug = clone.ValidateSeName("", clone.Name, true, _urlRecordService, _seoSettings); - _urlRecordService.SaveSlug(clone, slug, 0); - } - } - - private void ProcessLocalization(Product product, Product clone, IEnumerable languages) - { - using (var scope = new DbContextScope(ctx: _productRepository.Context, autoCommit: true)) - { - foreach (var lang in languages) - { - var name = product.GetLocalized(x => x.Name, lang, false, false); - if (!String.IsNullOrEmpty(name)) - _localizedEntityService.SaveLocalizedValue(clone, x => x.Name, name, lang.Id); - - var shortDescription = product.GetLocalized(x => x.ShortDescription, lang, false, false); - if (!String.IsNullOrEmpty(shortDescription)) - _localizedEntityService.SaveLocalizedValue(clone, x => x.ShortDescription, shortDescription, lang.Id); - - var fullDescription = product.GetLocalized(x => x.FullDescription, lang, false, false); - if (!String.IsNullOrEmpty(fullDescription)) - _localizedEntityService.SaveLocalizedValue(clone, x => x.FullDescription, fullDescription, lang.Id); - - var metaKeywords = product.GetLocalized(x => x.MetaKeywords, lang, false, false); - if (!String.IsNullOrEmpty(metaKeywords)) - _localizedEntityService.SaveLocalizedValue(clone, x => x.MetaKeywords, metaKeywords, lang.Id); - - var metaDescription = product.GetLocalized(x => x.MetaDescription, lang, false, false); - if (!String.IsNullOrEmpty(metaDescription)) - _localizedEntityService.SaveLocalizedValue(clone, x => x.MetaDescription, metaDescription, lang.Id); - - var metaTitle = product.GetLocalized(x => x.MetaTitle, lang, false, false); - if (!String.IsNullOrEmpty(metaTitle)) - _localizedEntityService.SaveLocalizedValue(clone, x => x.MetaTitle, metaTitle, lang.Id); - - var bundleTitleText = product.GetLocalized(x => x.BundleTitleText, lang, false, false); - if (!String.IsNullOrEmpty(bundleTitleText)) - _localizedEntityService.SaveLocalizedValue(clone, x => x.BundleTitleText, bundleTitleText, lang.Id); - - // Search engine name. - var slug = clone.ValidateSeName("", name, false, _urlRecordService, _seoSettings, lang.Id); - _urlRecordService.SaveSlug(clone, slug, lang.Id); - } - } - } - - private void ProcessAssociatedProducts(Product product, Product clone, bool isPublished) - { - var searchQuery = new CatalogSearchQuery().HasParentGroupedProduct(product.Id); - - var query = _catalogSearchService.PrepareQuery(searchQuery); - var associatedProducts = query.OrderBy(p => p.DisplayOrder).ToList(); - - foreach (var associatedProduct in associatedProducts) - { - var associatedProductCopy = CopyProduct(associatedProduct, T("Admin.Common.CopyOf", associatedProduct.Name), isPublished, false); - associatedProductCopy.ParentGroupedProductId = clone.Id; - } - } - - private void ProcessBundleItems(Product product, Product clone) - { - var bundledItems = _productService.GetBundleItems(product.Id, true); - - foreach (var bundleItem in bundledItems) - { - var newBundleItem = bundleItem.Item.Clone(); - newBundleItem.BundleProductId = clone.Id; - - _productService.InsertBundleItem(newBundleItem); - - foreach (var itemFilter in bundleItem.Item.AttributeFilters) - { - var newItemFilter = itemFilter.Clone(); - newItemFilter.BundleItemId = newBundleItem.Id; - - _productAttributeService.InsertProductBundleItemAttributeFilter(newItemFilter); - } - } - } + { + using (var scope = new DbContextScope(ctx: _productRepository.Context, autoCommit: true)) + { + var slug = clone.ValidateSeName("", clone.Name, true, _urlRecordService, _seoSettings); + _urlRecordService.SaveSlug(clone, slug, 0); + } + } + + private void ProcessLocalization(Product product, Product clone, IEnumerable languages) + { + using (var scope = new DbContextScope(ctx: _productRepository.Context, autoCommit: true)) + { + foreach (var lang in languages) + { + var name = product.GetLocalized(x => x.Name, lang, false, false); + if (!String.IsNullOrEmpty(name)) + _localizedEntityService.SaveLocalizedValue(clone, x => x.Name, name, lang.Id); + + var shortDescription = product.GetLocalized(x => x.ShortDescription, lang, false, false); + if (!String.IsNullOrEmpty(shortDescription)) + _localizedEntityService.SaveLocalizedValue(clone, x => x.ShortDescription, shortDescription, lang.Id); + + var fullDescription = product.GetLocalized(x => x.FullDescription, lang, false, false); + if (!String.IsNullOrEmpty(fullDescription)) + _localizedEntityService.SaveLocalizedValue(clone, x => x.FullDescription, fullDescription, lang.Id); + + var metaKeywords = product.GetLocalized(x => x.MetaKeywords, lang, false, false); + if (!String.IsNullOrEmpty(metaKeywords)) + _localizedEntityService.SaveLocalizedValue(clone, x => x.MetaKeywords, metaKeywords, lang.Id); + + var metaDescription = product.GetLocalized(x => x.MetaDescription, lang, false, false); + if (!String.IsNullOrEmpty(metaDescription)) + _localizedEntityService.SaveLocalizedValue(clone, x => x.MetaDescription, metaDescription, lang.Id); + + var metaTitle = product.GetLocalized(x => x.MetaTitle, lang, false, false); + if (!String.IsNullOrEmpty(metaTitle)) + _localizedEntityService.SaveLocalizedValue(clone, x => x.MetaTitle, metaTitle, lang.Id); + + var bundleTitleText = product.GetLocalized(x => x.BundleTitleText, lang, false, false); + if (!String.IsNullOrEmpty(bundleTitleText)) + _localizedEntityService.SaveLocalizedValue(clone, x => x.BundleTitleText, bundleTitleText, lang.Id); + + // Search engine name. + var slug = clone.ValidateSeName("", name, false, _urlRecordService, _seoSettings, lang.Id); + _urlRecordService.SaveSlug(clone, slug, lang.Id); + } + } + } + + private void ProcessAssociatedProducts(Product product, Product clone, bool isPublished) + { + var searchQuery = new CatalogSearchQuery().HasParentGroupedProduct(product.Id); + + var query = _catalogSearchService.PrepareQuery(searchQuery); + var associatedProducts = query.OrderBy(p => p.DisplayOrder).ToList(); + + foreach (var associatedProduct in associatedProducts) + { + var associatedProductCopy = CopyProduct(associatedProduct, T("Admin.Common.CopyOf", associatedProduct.Name), isPublished, false); + associatedProductCopy.ParentGroupedProductId = clone.Id; + } + } + + private void ProcessBundleItems(Product product, Product clone) + { + var bundledItems = _productService.GetBundleItems(product.Id, true); + + foreach (var bundleItem in bundledItems) + { + var newBundleItem = bundleItem.Item.Clone(); + newBundleItem.BundleProductId = clone.Id; + + _productService.InsertBundleItem(newBundleItem); + + foreach (var itemFilter in bundleItem.Item.AttributeFilters) + { + var newItemFilter = itemFilter.Clone(); + newItemFilter.BundleItemId = newBundleItem.Id; + + _productAttributeService.InsertProductBundleItemAttributeFilter(newItemFilter); + } + } + } private void ProcessAttributes(Product product, Product clone, IEnumerable languages) { @@ -622,5 +622,5 @@ private void ProcessAttributes(Product product, Product clone, IEnumerable>>>>> Commit combinations. Commit(); } - } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs index ce2b90d9d2..7c7f4df528 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs @@ -14,7 +14,7 @@ namespace SmartStore.Services.Catalog.Extensions { - public class ProductUrlHelper + public class ProductUrlHelper { private readonly HttpRequestBase _httpRequest; private readonly ICommonServices _services; diff --git a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelperExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelperExtensions.cs index 296b46b366..249d8eec8c 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelperExtensions.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelperExtensions.cs @@ -8,45 +8,45 @@ namespace SmartStore.Services.Catalog.Extensions { - public static class ProductUrlHelperExtensions - { - /// - /// Creates a product URL including variant query string. - /// - /// Product URL helper - /// Product identifier - /// Product SEO name - /// Bundle item identifier. Use 0 if it's not a bundle item. - /// Variant values - /// Product URL - public static string GetProductUrl( - this ProductUrlHelper helper, - int productId, - string productSeName, - int bundleItemId, - params ProductVariantAttributeValue[] variantValues) - { - Guard.NotZero(productId, nameof(productId)); - - var query = new ProductVariantQuery(); - - foreach (var value in variantValues) - { - var attribute = value.ProductVariantAttribute; - - query.AddVariant(new ProductVariantQueryItem(value.Id.ToString()) - { - ProductId = productId, - BundleItemId = bundleItemId, - AttributeId = attribute.ProductAttributeId, - VariantAttributeId = attribute.Id, - Alias = attribute.ProductAttribute.Alias, - ValueAlias = value.Alias - }); - } - - return helper.GetProductUrl(query, productSeName); - } + public static class ProductUrlHelperExtensions + { + /// + /// Creates a product URL including variant query string. + /// + /// Product URL helper + /// Product identifier + /// Product SEO name + /// Bundle item identifier. Use 0 if it's not a bundle item. + /// Variant values + /// Product URL + public static string GetProductUrl( + this ProductUrlHelper helper, + int productId, + string productSeName, + int bundleItemId, + params ProductVariantAttributeValue[] variantValues) + { + Guard.NotZero(productId, nameof(productId)); + + var query = new ProductVariantQuery(); + + foreach (var value in variantValues) + { + var attribute = value.ProductVariantAttribute; + + query.AddVariant(new ProductVariantQueryItem(value.Id.ToString()) + { + ProductId = productId, + BundleItemId = bundleItemId, + AttributeId = attribute.ProductAttributeId, + VariantAttributeId = attribute.Id, + Alias = attribute.ProductAttribute.Alias, + ValueAlias = value.Alias + }); + } + + return helper.GetProductUrl(query, productSeName); + } /// /// Creates a product URL including variant query string. @@ -57,75 +57,75 @@ public static string GetProductUrl( /// Product URL [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string GetProductUrl( - this ProductUrlHelper helper, - Product product, - params ProductVariantAttributeValue[] variantValues) - { - Guard.NotNull(product, nameof(product)); - - return helper.GetProductUrl(product.Id, product.GetSeName(), 0, variantValues); - } - - /// - /// Creates a product URL including variant query string. - /// - /// Product URL helper - /// Product SEO name - /// Organized shopping cart item - /// Product URL - public static string GetProductUrl( - this ProductUrlHelper helper, - string productSeName, - OrganizedShoppingCartItem cartItem) - { - Guard.NotNull(cartItem, nameof(cartItem)); - - var query = new ProductVariantQuery(); - var product = cartItem.Item.Product; - - if (product.ProductType != ProductType.BundledProduct) - { - helper.DeserializeQuery(query, product.Id, cartItem.Item.AttributesXml); - } - else if (cartItem.ChildItems != null && product.BundlePerItemPricing) - { - foreach (var childItem in cartItem.ChildItems.Where(x => x.Item.Id != cartItem.Item.Id)) - { - helper.DeserializeQuery(query, childItem.Item.ProductId, childItem.Item.AttributesXml, childItem.BundleItemData.Item.Id); - } - } - - return helper.GetProductUrl(query, productSeName); - } - - /// - /// Creates a product URL including variant query string. - /// - /// Product URL helper - /// Product SEO name - /// Order item - /// Product URL - public static string GetProductUrl( - this ProductUrlHelper helper, - string productSeName, - OrderItem orderItem) - { - Guard.NotNull(orderItem, nameof(orderItem)); - - var query = new ProductVariantQuery(); - - if (orderItem.Product.ProductType != ProductType.BundledProduct) - { - helper.DeserializeQuery(query, orderItem.ProductId, orderItem.AttributesXml); - } - else if (orderItem.Product.BundlePerItemPricing && orderItem.BundleData.HasValue()) - { - var bundleData = orderItem.GetBundleData(); - - bundleData.ForEach(x => helper.DeserializeQuery(query, x.ProductId, x.AttributesXml, x.BundleItemId)); - } - - return helper.GetProductUrl(query, productSeName); - } - } + this ProductUrlHelper helper, + Product product, + params ProductVariantAttributeValue[] variantValues) + { + Guard.NotNull(product, nameof(product)); + + return helper.GetProductUrl(product.Id, product.GetSeName(), 0, variantValues); + } + + /// + /// Creates a product URL including variant query string. + /// + /// Product URL helper + /// Product SEO name + /// Organized shopping cart item + /// Product URL + public static string GetProductUrl( + this ProductUrlHelper helper, + string productSeName, + OrganizedShoppingCartItem cartItem) + { + Guard.NotNull(cartItem, nameof(cartItem)); + + var query = new ProductVariantQuery(); + var product = cartItem.Item.Product; + + if (product.ProductType != ProductType.BundledProduct) + { + helper.DeserializeQuery(query, product.Id, cartItem.Item.AttributesXml); + } + else if (cartItem.ChildItems != null && product.BundlePerItemPricing) + { + foreach (var childItem in cartItem.ChildItems.Where(x => x.Item.Id != cartItem.Item.Id)) + { + helper.DeserializeQuery(query, childItem.Item.ProductId, childItem.Item.AttributesXml, childItem.BundleItemData.Item.Id); + } + } + + return helper.GetProductUrl(query, productSeName); + } + + /// + /// Creates a product URL including variant query string. + /// + /// Product URL helper + /// Product SEO name + /// Order item + /// Product URL + public static string GetProductUrl( + this ProductUrlHelper helper, + string productSeName, + OrderItem orderItem) + { + Guard.NotNull(orderItem, nameof(orderItem)); + + var query = new ProductVariantQuery(); + + if (orderItem.Product.ProductType != ProductType.BundledProduct) + { + helper.DeserializeQuery(query, orderItem.ProductId, orderItem.AttributesXml); + } + else if (orderItem.Product.BundlePerItemPricing && orderItem.BundleData.HasValue()) + { + var bundleData = orderItem.GetBundleData(); + + bundleData.ForEach(x => helper.DeserializeQuery(query, x.ProductId, x.AttributesXml, x.BundleItemId)); + } + + return helper.GetProductUrl(query, productSeName); + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs index e58af6d6ed..da76ad1190 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs @@ -10,130 +10,130 @@ namespace SmartStore.Services.Catalog.Extensions { - public static class ProductVariantQueryExtensions - { - public static string CreateSelectedAttributesXml( - this ProductVariantQuery query, - int productId, - int bundleItemId, - IEnumerable variantAttributes, - IProductAttributeParser productAttributeParser, - ILocalizationService localization, - IDownloadService downloadService, - CatalogSettings catalogSettings, - HttpRequestBase request, - List warnings) - { - var result = string.Empty; + public static class ProductVariantQueryExtensions + { + public static string CreateSelectedAttributesXml( + this ProductVariantQuery query, + int productId, + int bundleItemId, + IEnumerable variantAttributes, + IProductAttributeParser productAttributeParser, + ILocalizationService localization, + IDownloadService downloadService, + CatalogSettings catalogSettings, + HttpRequestBase request, + List warnings) + { + var result = string.Empty; - foreach (var pva in variantAttributes) - { - var selectedItems = query.Variants.Where(x => - x.ProductId == productId && - x.BundleItemId == bundleItemId && - x.AttributeId == pva.ProductAttributeId && - x.VariantAttributeId == pva.Id); + foreach (var pva in variantAttributes) + { + var selectedItems = query.Variants.Where(x => + x.ProductId == productId && + x.BundleItemId == bundleItemId && + x.AttributeId == pva.ProductAttributeId && + x.VariantAttributeId == pva.Id); - switch (pva.AttributeControlType) - { - case AttributeControlType.DropdownList: - case AttributeControlType.RadioList: - case AttributeControlType.Boxes: - { - var firstItemValue = selectedItems.FirstOrDefault()?.Value; - if (firstItemValue.HasValue()) - { - var selectedAttributeId = firstItemValue.SplitSafe(",").SafeGet(0).ToInt(); - if (selectedAttributeId > 0) - { - result = productAttributeParser.AddProductAttribute(result, pva, selectedAttributeId.ToString()); - } - } - } - break; + switch (pva.AttributeControlType) + { + case AttributeControlType.DropdownList: + case AttributeControlType.RadioList: + case AttributeControlType.Boxes: + { + var firstItemValue = selectedItems.FirstOrDefault()?.Value; + if (firstItemValue.HasValue()) + { + var selectedAttributeId = firstItemValue.SplitSafe(",").SafeGet(0).ToInt(); + if (selectedAttributeId > 0) + { + result = productAttributeParser.AddProductAttribute(result, pva, selectedAttributeId.ToString()); + } + } + } + break; - case AttributeControlType.Checkboxes: - foreach (var item in selectedItems) - { - var selectedAttributeId = item.Value.SplitSafe(",").SafeGet(0).ToInt(); - if (selectedAttributeId > 0) - { - result = productAttributeParser.AddProductAttribute(result, pva, selectedAttributeId.ToString()); - } - } - break; + case AttributeControlType.Checkboxes: + foreach (var item in selectedItems) + { + var selectedAttributeId = item.Value.SplitSafe(",").SafeGet(0).ToInt(); + if (selectedAttributeId > 0) + { + result = productAttributeParser.AddProductAttribute(result, pva, selectedAttributeId.ToString()); + } + } + break; - case AttributeControlType.TextBox: - case AttributeControlType.MultilineTextbox: - { - var selectedValue = string.Join(",", selectedItems.Select(x => x.Value)); - if (selectedValue.HasValue()) - { - result = productAttributeParser.AddProductAttribute(result, pva, selectedValue); - } - } - break; + case AttributeControlType.TextBox: + case AttributeControlType.MultilineTextbox: + { + var selectedValue = string.Join(",", selectedItems.Select(x => x.Value)); + if (selectedValue.HasValue()) + { + result = productAttributeParser.AddProductAttribute(result, pva, selectedValue); + } + } + break; - case AttributeControlType.Datepicker: - { - var firstItemDate = selectedItems.FirstOrDefault()?.Date; - if (firstItemDate.HasValue) - { - result = productAttributeParser.AddProductAttribute(result, pva, firstItemDate.Value.ToString("D")); - } - } - break; + case AttributeControlType.Datepicker: + { + var firstItemDate = selectedItems.FirstOrDefault()?.Date; + if (firstItemDate.HasValue) + { + result = productAttributeParser.AddProductAttribute(result, pva, firstItemDate.Value.ToString("D")); + } + } + break; - case AttributeControlType.FileUpload: - if (request == null) - { - var firstItemValue = selectedItems.FirstOrDefault()?.Value; - Guid.TryParse(firstItemValue, out var downloadGuid); + case AttributeControlType.FileUpload: + if (request == null) + { + var firstItemValue = selectedItems.FirstOrDefault()?.Value; + Guid.TryParse(firstItemValue, out var downloadGuid); - var download = downloadService.GetDownloadByGuid(downloadGuid); - if (download != null) - { + var download = downloadService.GetDownloadByGuid(downloadGuid); + if (download != null) + { if (download.IsTransient) { download.IsTransient = false; downloadService.UpdateDownload(download); } - result = productAttributeParser.AddProductAttribute(result, pva, download.DownloadGuid.ToString()); - } - } - else - { + result = productAttributeParser.AddProductAttribute(result, pva, download.DownloadGuid.ToString()); + } + } + else + { var postedFile = request.Files[ProductVariantQueryItem.CreateKey(productId, bundleItemId, pva.ProductAttributeId, pva.Id)]; - if (postedFile != null && postedFile.FileName.HasValue()) - { - if (postedFile.ContentLength > catalogSettings.FileUploadMaximumSizeBytes) - { - warnings.Add(localization.GetResource("ShoppingCart.MaximumUploadedFileSize").FormatInvariant((int)(catalogSettings.FileUploadMaximumSizeBytes / 1024))); - } - else - { - var download = new Download - { - DownloadGuid = Guid.NewGuid(), - UseDownloadUrl = false, - DownloadUrl = "", - UpdatedOnUtc = DateTime.UtcNow, + if (postedFile != null && postedFile.FileName.HasValue()) + { + if (postedFile.ContentLength > catalogSettings.FileUploadMaximumSizeBytes) + { + warnings.Add(localization.GetResource("ShoppingCart.MaximumUploadedFileSize").FormatInvariant((int)(catalogSettings.FileUploadMaximumSizeBytes / 1024))); + } + else + { + var download = new Download + { + DownloadGuid = Guid.NewGuid(), + UseDownloadUrl = false, + DownloadUrl = "", + UpdatedOnUtc = DateTime.UtcNow, EntityId = productId, EntityName = "ProductAttribute" }; downloadService.InsertDownload(download, postedFile.InputStream, postedFile.FileName); - result = productAttributeParser.AddProductAttribute(result, pva, download.DownloadGuid.ToString()); - } - } - } - break; - } - } + result = productAttributeParser.AddProductAttribute(result, pva, download.DownloadGuid.ToString()); + } + } + } + break; + } + } - return result; - } - } + return result; + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/IBackInStockSubscriptionService.cs b/src/Libraries/SmartStore.Services/Catalog/IBackInStockSubscriptionService.cs index eb802ed5cf..5fb2732286 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IBackInStockSubscriptionService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IBackInStockSubscriptionService.cs @@ -23,7 +23,7 @@ public partial interface IBackInStockSubscriptionService /// Page size /// Subscriptions IPagedList GetAllSubscriptionsByCustomerId(int customerId, - int storeId, int pageIndex, int pageSize); + int storeId, int pageIndex, int pageSize); /// /// Gets all subscriptions @@ -34,7 +34,7 @@ IPagedList GetAllSubscriptionsByCustomerId(int customer /// Page size /// Subscriptions IPagedList GetAllSubscriptionsByProductId(int productId, - int storeId, int pageIndex, int pageSize); + int storeId, int pageIndex, int pageSize); /// /// Gets all subscriptions diff --git a/src/Libraries/SmartStore.Services/Catalog/ICategoryService.cs b/src/Libraries/SmartStore.Services/Catalog/ICategoryService.cs index bd7261d40e..c7659168e7 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ICategoryService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ICategoryService.cs @@ -44,40 +44,40 @@ void InheritStoresIntoChildren(int categoryId, /// Whether to delete child categories or to set them to no parent. void DeleteCategory(Category category, bool deleteChilds = false); - /// - /// Builds LINQ query for categories - /// - /// Category name filter - /// A value indicating whether to show hidden records - /// Alias filter - /// Store identifier; 0 to load all records - /// Category query - IQueryable BuildCategoriesQuery( - string categoryName = "", - bool showHidden = false, - string alias = null, - int storeId = 0); + /// + /// Builds LINQ query for categories + /// + /// Category name filter + /// A value indicating whether to show hidden records + /// Alias filter + /// Store identifier; 0 to load all records + /// Category query + IQueryable BuildCategoriesQuery( + string categoryName = "", + bool showHidden = false, + string alias = null, + int storeId = 0); - /// - /// Gets all categories - /// - /// Category name filter - /// Page index - /// Page size - /// A value indicating whether to show hidden records - /// Alias filter - /// (Obsolete) Whether to apply instances to the actual categories query. Never applied when is true - /// A value indicating whether categories without parent category in provided category list (source) should be ignored - /// Store identifier; 0 to load all records - /// Categories - IPagedList GetAllCategories( - string categoryName = "", - int pageIndex = 0, - int pageSize = int.MaxValue, - bool showHidden = false, - string alias = null, - bool ignoreDetachedCategories = true, - int storeId = 0); + /// + /// Gets all categories + /// + /// Category name filter + /// Page index + /// Page size + /// A value indicating whether to show hidden records + /// Alias filter + /// (Obsolete) Whether to apply instances to the actual categories query. Never applied when is true + /// A value indicating whether categories without parent category in provided category list (source) should be ignored + /// Store identifier; 0 to load all records + /// Categories + IPagedList GetAllCategories( + string categoryName = "", + int pageIndex = 0, + int pageSize = int.MaxValue, + bool showHidden = false, + string alias = null, + bool ignoreDetachedCategories = true, + int storeId = 0); /// /// Gets all categories filtered by parent category identifier @@ -92,7 +92,7 @@ IPagedList GetAllCategories( /// /// Categories IList GetAllCategoriesDisplayedOnHomePage(); - + /// /// Gets a category /// @@ -140,10 +140,10 @@ IPagedList GetAllCategories( /// A value indicating whether to show hidden records /// Product a category mapping collection IPagedList GetProductCategoriesByCategoryId( - int categoryId, - int pageIndex, - int pageSize, - bool showHidden = false); + int categoryId, + int pageIndex, + int pageSize, + bool showHidden = false); /// /// Gets a product category mapping collection @@ -153,21 +153,21 @@ IPagedList GetProductCategoriesByCategoryId( /// Product category mapping collection IList GetProductCategoriesByProductId(int productId, bool showHidden = false); - /// - /// Gets product category mappings - /// - /// Product identifiers - /// A value indicating whether to filter categories with applied discounts - /// A value indicating whether to show hidden records - /// Map with product category mappings - Multimap GetProductCategoriesByProductIds(int[] productIds, bool? hasDiscountsApplied = null, bool showHidden = false); + /// + /// Gets product category mappings + /// + /// Product identifiers + /// A value indicating whether to filter categories with applied discounts + /// A value indicating whether to show hidden records + /// Map with product category mappings + Multimap GetProductCategoriesByProductIds(int[] productIds, bool? hasDiscountsApplied = null, bool showHidden = false); - /// - /// Gets product category mappings - /// - /// Category identifiers - /// Map with product category mappings - Multimap GetProductCategoriesByCategoryIds(int[] categoryIds); + /// + /// Gets product category mappings + /// + /// Category identifiers + /// Map with product category mappings + Multimap GetProductCategoriesByCategoryIds(int[] categoryIds); /// /// Gets a product category mapping @@ -188,84 +188,84 @@ IPagedList GetProductCategoriesByCategoryId( /// >Product category mapping void UpdateProductCategory(ProductCategory productCategory); - /// - /// Gets the category trail - /// - /// The category node - /// Trail - IEnumerable GetCategoryTrail(ICategoryNode node); + /// + /// Gets the category trail + /// + /// The category node + /// Trail + IEnumerable GetCategoryTrail(ICategoryNode node); - /// - /// Builds a category breadcrumb (path) for a particular category node - /// - /// The category node - /// The id of language. Pass null to skip localization. - /// How the category alias - if specified - should be appended to the category name (e.g. ({0})) - /// The separator string - /// Category breadcrumb path - string GetCategoryPath( - TreeNode treeNode, - int? languageId = null, - string aliasPattern = null, - string separator = " "); + /// + /// Builds a category breadcrumb (path) for a particular category node + /// + /// The category node + /// The id of language. Pass null to skip localization. + /// How the category alias - if specified - should be appended to the category name (e.g. ({0})) + /// The separator string + /// Category breadcrumb path + string GetCategoryPath( + TreeNode treeNode, + int? languageId = null, + string aliasPattern = null, + string separator = " "); - /// - /// Gets the tree representation of categories - /// - /// Specifies which node to return as root - /// false excludes unpublished and ACL-inaccessible categories - /// > 0 = apply store mapping, 0 to bypass store mapping - /// The category tree representation - /// - /// This method puts the tree result into application cache, so subsequent calls are very fast. - /// Localization is up to the caller because the nodes only contain unlocalized data. - /// Subscribe to the CategoryTreeChanged event if you need to evict cache entries which depend - /// on this method's result. - /// - TreeNode GetCategoryTree( - int rootCategoryId = 0, - bool includeHidden = false, - int storeId = 0); + /// + /// Gets the tree representation of categories + /// + /// Specifies which node to return as root + /// false excludes unpublished and ACL-inaccessible categories + /// > 0 = apply store mapping, 0 to bypass store mapping + /// The category tree representation + /// + /// This method puts the tree result into application cache, so subsequent calls are very fast. + /// Localization is up to the caller because the nodes only contain unlocalized data. + /// Subscribe to the CategoryTreeChanged event if you need to evict cache entries which depend + /// on this method's result. + /// + TreeNode GetCategoryTree( + int rootCategoryId = 0, + bool includeHidden = false, + int storeId = 0); - /// - /// Get count of all categories - /// - /// Count - int CountAllCategories(); - } + /// + /// Get count of all categories + /// + /// Count + int CountAllCategories(); + } - public static class ICategoryServiceExtensions - { - /// - /// Builds a category breadcrumb for a particular product - /// - /// The product - /// The id of language. Pass null to skip localization. - /// The id of store. Pass null to skip store filtering. - /// The separator string - /// Category breadcrumb for product - public static string GetCategoryPath(this ICategoryService categoryService, - Product product, - int? languageId = null, - int? storeId = null, - string separator = " ") - { - Guard.NotNull(product, nameof(product)); + public static class ICategoryServiceExtensions + { + /// + /// Builds a category breadcrumb for a particular product + /// + /// The product + /// The id of language. Pass null to skip localization. + /// The id of store. Pass null to skip store filtering. + /// The separator string + /// Category breadcrumb for product + public static string GetCategoryPath(this ICategoryService categoryService, + Product product, + int? languageId = null, + int? storeId = null, + string separator = " ") + { + Guard.NotNull(product, nameof(product)); - string result = string.Empty; + string result = string.Empty; - var pc = categoryService.GetProductCategoriesByProductId(product.Id).FirstOrDefault(); - if (pc != null) - { - var node = categoryService.GetCategoryTree(pc.CategoryId, false, storeId ?? 0); - if (node != null) - { - result = categoryService.GetCategoryPath(node, languageId, null, separator); - } - } + var pc = categoryService.GetProductCategoriesByProductId(product.Id).FirstOrDefault(); + if (pc != null) + { + var node = categoryService.GetCategoryTree(pc.CategoryId, false, storeId ?? 0); + if (node != null) + { + result = categoryService.GetCategoryPath(node, languageId, null, separator); + } + } - return result; - } - } + return result; + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ICopyProductService.cs b/src/Libraries/SmartStore.Services/Catalog/ICopyProductService.cs index d07be96577..3d02e61910 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ICopyProductService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ICopyProductService.cs @@ -7,18 +7,18 @@ namespace SmartStore.Services.Catalog /// public partial interface ICopyProductService { - /// - /// Creates a duplicate of a product with all it's dependencies. - /// - /// The product to copy. - /// The name of the product duplicate. - /// A value indicating whether the product duplicate should be published. - /// A value indicating whether to copy associated products. - /// Product duplicate. - Product CopyProduct( - Product product, - string newName, - bool isPublished, - bool copyAssociatedProducts = true); + /// + /// Creates a duplicate of a product with all it's dependencies. + /// + /// The product to copy. + /// The name of the product duplicate. + /// A value indicating whether the product duplicate should be published. + /// A value indicating whether to copy associated products. + /// Product duplicate. + Product CopyProduct( + Product product, + string newName, + bool isPublished, + bool copyAssociatedProducts = true); } } diff --git a/src/Libraries/SmartStore.Services/Catalog/IManufacturerService.cs b/src/Libraries/SmartStore.Services/Catalog/IManufacturerService.cs index bd389fa21e..480c9196b5 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IManufacturerService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IManufacturerService.cs @@ -6,10 +6,10 @@ namespace SmartStore.Services.Catalog { - /// - /// Manufacturer service - /// - public partial interface IManufacturerService + /// + /// Manufacturer service + /// + public partial interface IManufacturerService { /// /// Deletes a manufacturer @@ -17,13 +17,13 @@ public partial interface IManufacturerService /// Manufacturer void DeleteManufacturer(Manufacturer manufacturer); - /// - /// Get manufacturer query - /// - /// A value indicating whether to show hidden records - /// Store identifier - /// Manufacturer query - IQueryable GetManufacturers(bool showHidden = false, int storeId = 0); + /// + /// Get manufacturer query + /// + /// A value indicating whether to show hidden records + /// Store identifier + /// Manufacturer query + IQueryable GetManufacturers(bool showHidden = false, int storeId = 0); /// /// Gets all manufacturers @@ -32,25 +32,25 @@ public partial interface IManufacturerService /// Manufacturer collection IList GetAllManufacturers(bool showHidden = false); - /// - /// Gets all manufacturers - /// - /// Manufacturer name - /// Whether to filter result by store identifier - /// A value indicating whether to show hidden records - /// Manufacturer collection - IList GetAllManufacturers(string manufacturerName, int storeId = 0, bool showHidden = false); - - /// - /// Gets all manufacturers - /// - /// Manufacturer name - /// Page index - /// Page size - /// Whether to filter result by store identifier - /// A value indicating whether to show hidden records - /// Manufacturers - IPagedList GetAllManufacturers(string manufacturerName, + /// + /// Gets all manufacturers + /// + /// Manufacturer name + /// Whether to filter result by store identifier + /// A value indicating whether to show hidden records + /// Manufacturer collection + IList GetAllManufacturers(string manufacturerName, int storeId = 0, bool showHidden = false); + + /// + /// Gets all manufacturers + /// + /// Manufacturer name + /// Page index + /// Page size + /// Whether to filter result by store identifier + /// A value indicating whether to show hidden records + /// Manufacturers + IPagedList GetAllManufacturers(string manufacturerName, int pageIndex, int pageSize, int storeId = 0, bool showHidden = false); /// @@ -79,18 +79,18 @@ IPagedList GetAllManufacturers(string manufacturerName, /// Manufacturer void UpdateManufacturer(Manufacturer manufacturer); - /// - /// Update HasDiscountsApplied property (used for performance optimization) - /// - /// Manufacturer - void UpdateHasDiscountsApplied(Manufacturer manufacturer); - - /// - /// Deletes a product manufacturer mapping - /// - /// Product manufacturer mapping - void DeleteProductManufacturer(ProductManufacturer productManufacturer); - + /// + /// Update HasDiscountsApplied property (used for performance optimization) + /// + /// Manufacturer + void UpdateHasDiscountsApplied(Manufacturer manufacturer); + + /// + /// Deletes a product manufacturer mapping + /// + /// Product manufacturer mapping + void DeleteProductManufacturer(ProductManufacturer productManufacturer); + /// /// Gets product manufacturer collection /// diff --git a/src/Libraries/SmartStore.Services/Catalog/IPriceCalculationService.cs b/src/Libraries/SmartStore.Services/Catalog/IPriceCalculationService.cs index 9ae18bbdb1..90daa5573a 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IPriceCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IPriceCalculationService.cs @@ -7,10 +7,10 @@ namespace SmartStore.Services.Catalog { - /// - /// Price calculation service - /// - public partial interface IPriceCalculationService + /// + /// Price calculation service + /// + public partial interface IPriceCalculationService { /// /// Creates a price calculation context @@ -22,183 +22,183 @@ public partial interface IPriceCalculationService /// Price calculation context PriceCalculationContext CreatePriceCalculationContext(IEnumerable products = null, Customer customer = null, int? storeId = null, bool includeHidden = true); - /// - /// Get product special price (is valid) - /// - /// Product - /// Product special price - decimal? GetSpecialPrice(Product product); - - /// - /// Gets the final price - /// - /// Product - /// A value indicating whether include discounts or not for final price computation - /// Final price - decimal GetFinalPrice(Product product, bool includeDiscounts); - - /// - /// Gets the final price - /// - /// Product - /// The customer - /// A value indicating whether include discounts or not for final price computation - /// Final price - decimal GetFinalPrice(Product product, - Customer customer, - bool includeDiscounts); - - /// - /// Gets the final price - /// - /// Product - /// The customer - /// Additional charge - /// A value indicating whether include discounts or not for final price computation - /// Final price - decimal GetFinalPrice(Product product, - Customer customer, - decimal additionalCharge, - bool includeDiscounts); - - /// - /// Gets the final price - /// - /// Product - /// The customer - /// Additional charge - /// A value indicating whether include discounts or not for final price computation - /// Shopping cart item quantity - /// A product bundle item - /// Object with cargo data for better performance - /// Final price - decimal GetFinalPrice(Product product, - Customer customer, - decimal additionalCharge, - bool includeDiscounts, - int quantity, - ProductBundleItemData bundleItem = null, - PriceCalculationContext context = null, + /// + /// Get product special price (is valid) + /// + /// Product + /// Product special price + decimal? GetSpecialPrice(Product product); + + /// + /// Gets the final price + /// + /// Product + /// A value indicating whether include discounts or not for final price computation + /// Final price + decimal GetFinalPrice(Product product, bool includeDiscounts); + + /// + /// Gets the final price + /// + /// Product + /// The customer + /// A value indicating whether include discounts or not for final price computation + /// Final price + decimal GetFinalPrice(Product product, + Customer customer, + bool includeDiscounts); + + /// + /// Gets the final price + /// + /// Product + /// The customer + /// Additional charge + /// A value indicating whether include discounts or not for final price computation + /// Final price + decimal GetFinalPrice(Product product, + Customer customer, + decimal additionalCharge, + bool includeDiscounts); + + /// + /// Gets the final price + /// + /// Product + /// The customer + /// Additional charge + /// A value indicating whether include discounts or not for final price computation + /// Shopping cart item quantity + /// A product bundle item + /// Object with cargo data for better performance + /// Final price + decimal GetFinalPrice(Product product, + Customer customer, + decimal additionalCharge, + bool includeDiscounts, + int quantity, + ProductBundleItemData bundleItem = null, + PriceCalculationContext context = null, bool isTierPrice = false); - /// - /// Gets the final price including bundle per-item pricing - /// - /// Product - /// Bundle items - /// The customer - /// Additional charge - /// A value indicating whether include discounts or not for final price computation - /// Shopping cart item quantity - /// A product bundle item - /// Object with cargo data for better performance - /// Final price - decimal GetFinalPrice(Product product, - IEnumerable bundleItems, - Customer customer, - decimal additionalCharge, - bool includeDiscounts, - int quantity, - ProductBundleItemData bundleItem = null, - PriceCalculationContext context = null); - - /// - /// Get the lowest possible price for a product. - /// - /// Product - /// The customer - /// Object with cargo data for better performance - /// Whether to display the from message. - /// The lowest price. - decimal GetLowestPrice(Product product, Customer customer, PriceCalculationContext context, out bool displayFromMessage); - - /// - /// Get the lowest price of a grouped product. - /// - /// Grouped product - /// The customer - /// Object with cargo data for better performance - /// Products associated to product - /// The associated product with the lowest price - /// The lowest price. - decimal? GetLowestPrice(Product product, Customer customer, PriceCalculationContext context, IEnumerable associatedProducts, out Product lowestPriceProduct); - - /// - /// Get the initial price including preselected attributes - /// - /// Product - /// The customer - /// The currency - /// Object with cargo data for better performance - /// Preselected price - decimal GetPreselectedPrice(Product product, Customer customer, Currency currency, PriceCalculationContext context); - - /// - /// Gets the product cost - /// - /// Product - /// Shopping cart item attributes in XML - /// Product cost - decimal GetProductCost(Product product, string attributesXml); - - /// - /// Gets discount amount - /// - /// Product - /// Discount amount - decimal GetDiscountAmount(Product product); - - /// - /// Gets discount amount - /// - /// Product - /// The customer - /// Discount amount - decimal GetDiscountAmount(Product product, - Customer customer); - - /// - /// Gets discount amount - /// - /// Product - /// The customer - /// Additional charge - /// Discount amount - decimal GetDiscountAmount(Product product, - Customer customer, - decimal additionalCharge); - - /// - /// Gets discount amount - /// - /// Product - /// The customer - /// Additional charge - /// Applied discount - /// Discount amount - decimal GetDiscountAmount(Product product, - Customer customer, - decimal additionalCharge, - out Discount appliedDiscount); - - /// - /// Gets discount amount - /// - /// Product - /// The customer - /// Additional charge - /// Product quantity - /// Applied discount - /// A product bundle item - /// Object with cargo data for better performance + /// + /// Gets the final price including bundle per-item pricing + /// + /// Product + /// Bundle items + /// The customer + /// Additional charge + /// A value indicating whether include discounts or not for final price computation + /// Shopping cart item quantity + /// A product bundle item + /// Object with cargo data for better performance + /// Final price + decimal GetFinalPrice(Product product, + IEnumerable bundleItems, + Customer customer, + decimal additionalCharge, + bool includeDiscounts, + int quantity, + ProductBundleItemData bundleItem = null, + PriceCalculationContext context = null); + + /// + /// Get the lowest possible price for a product. + /// + /// Product + /// The customer + /// Object with cargo data for better performance + /// Whether to display the from message. + /// The lowest price. + decimal GetLowestPrice(Product product, Customer customer, PriceCalculationContext context, out bool displayFromMessage); + + /// + /// Get the lowest price of a grouped product. + /// + /// Grouped product + /// The customer + /// Object with cargo data for better performance + /// Products associated to product + /// The associated product with the lowest price + /// The lowest price. + decimal? GetLowestPrice(Product product, Customer customer, PriceCalculationContext context, IEnumerable associatedProducts, out Product lowestPriceProduct); + + /// + /// Get the initial price including preselected attributes + /// + /// Product + /// The customer + /// The currency + /// Object with cargo data for better performance + /// Preselected price + decimal GetPreselectedPrice(Product product, Customer customer, Currency currency, PriceCalculationContext context); + + /// + /// Gets the product cost + /// + /// Product + /// Shopping cart item attributes in XML + /// Product cost + decimal GetProductCost(Product product, string attributesXml); + + /// + /// Gets discount amount + /// + /// Product + /// Discount amount + decimal GetDiscountAmount(Product product); + + /// + /// Gets discount amount + /// + /// Product + /// The customer + /// Discount amount + decimal GetDiscountAmount(Product product, + Customer customer); + + /// + /// Gets discount amount + /// + /// Product + /// The customer + /// Additional charge + /// Discount amount + decimal GetDiscountAmount(Product product, + Customer customer, + decimal additionalCharge); + + /// + /// Gets discount amount + /// + /// Product + /// The customer + /// Additional charge + /// Applied discount + /// Discount amount + decimal GetDiscountAmount(Product product, + Customer customer, + decimal additionalCharge, + out Discount appliedDiscount); + + /// + /// Gets discount amount + /// + /// Product + /// The customer + /// Additional charge + /// Product quantity + /// Applied discount + /// A product bundle item + /// Object with cargo data for better performance /// Final product price without discount. - /// Discount amount - decimal GetDiscountAmount(Product product, - Customer customer, - decimal additionalCharge, - int quantity, - out Discount appliedDiscount, - ProductBundleItemData bundleItem = null, - PriceCalculationContext context = null, + /// Discount amount + decimal GetDiscountAmount(Product product, + Customer customer, + decimal additionalCharge, + int quantity, + out Discount appliedDiscount, + ProductBundleItemData bundleItem = null, + PriceCalculationContext context = null, decimal? finalPrice = null); @@ -217,7 +217,7 @@ decimal GetDiscountAmount(Product product, /// A value indicating whether include discounts or not for price computation /// Shopping cart unit price (one item) decimal GetUnitPrice(OrganizedShoppingCartItem shoppingCartItem, bool includeDiscounts); - + @@ -226,7 +226,7 @@ decimal GetDiscountAmount(Product product, /// /// The shopping cart item /// Discount amount - decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartItem); + decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartItem); /// /// Gets discount amount @@ -237,12 +237,12 @@ decimal GetDiscountAmount(Product product, decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartItem, out Discount appliedDiscount); - /// - /// Gets the price adjustment of a variant attribute value - /// - /// Product variant attribute value - /// Price adjustment of a variant attribute value - decimal GetProductVariantAttributeValuePriceAdjustment(ProductVariantAttributeValue attributeValue, + /// + /// Gets the price adjustment of a variant attribute value + /// + /// Product variant attribute value + /// Price adjustment of a variant attribute value + decimal GetProductVariantAttributeValuePriceAdjustment(ProductVariantAttributeValue attributeValue, Product product, Customer customer, PriceCalculationContext context, int productQuantity = 1); } } diff --git a/src/Libraries/SmartStore.Services/Catalog/IPriceFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/IPriceFormatter.cs index 584c3f40e9..fd814f7798 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IPriceFormatter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IPriceFormatter.cs @@ -66,17 +66,17 @@ public partial interface IPriceFormatter /// Price string FormatPrice(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax); - /// - /// Formats the price - /// - /// Price - /// A value indicating whether to show a currency - /// Target currency - /// Language - /// A value indicating whether price includes tax - /// A value indicating whether to show tax suffix - /// Price - string FormatPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax); + /// + /// Formats the price + /// + /// Price + /// A value indicating whether to show a currency + /// Target currency + /// Language + /// A value indicating whether price includes tax + /// A value indicating whether to show tax suffix + /// Price + string FormatPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax); /// /// Formats the price @@ -110,19 +110,19 @@ public partial interface IPriceFormatter /// Price string FormatShippingPrice(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax); - /// - /// Formats the shipping price - /// - /// Price - /// A value indicating whether to show a currency - /// Target currency code - /// Language - /// A value indicating whether price includes tax - /// A value indicating whether to show tax suffix - /// Price - string FormatShippingPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax); - - /// + /// + /// Formats the shipping price + /// + /// Price + /// A value indicating whether to show a currency + /// Target currency code + /// Language + /// A value indicating whether price includes tax + /// A value indicating whether to show tax suffix + /// Price + string FormatShippingPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax); + + /// /// Formats the shipping price /// /// Price @@ -133,7 +133,7 @@ public partial interface IPriceFormatter /// A value indicating whether to show tax suffix /// Price string FormatShippingPrice(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax, bool showTax); - + /// /// Formats the shipping price /// @@ -166,17 +166,17 @@ public partial interface IPriceFormatter /// Price string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax); - /// - /// Formats the payment method additional fee - /// - /// Price - /// A value indicating whether to show a currency - /// Target currency code - /// Language - /// A value indicating whether price includes tax - /// A value indicating whether to show tax suffix - /// Price - string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax); + /// + /// Formats the payment method additional fee + /// + /// Price + /// A value indicating whether to show a currency + /// Target currency code + /// Language + /// A value indicating whether price includes tax + /// A value indicating whether to show tax suffix + /// Price + string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax); /// /// Formats the payment method additional fee diff --git a/src/Libraries/SmartStore.Services/Catalog/IProductAttributeFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/IProductAttributeFormatter.cs index d91cea4f4c..20cc18f050 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IProductAttributeFormatter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IProductAttributeFormatter.cs @@ -36,7 +36,7 @@ string FormatAttributes( string separator = "
", bool htmlEncode = true, bool renderPrices = true, - bool renderProductAttributes = true, + bool renderProductAttributes = true, bool renderGiftCardAttributes = true, bool allowHyperlinks = true); } diff --git a/src/Libraries/SmartStore.Services/Catalog/IProductAttributeParser.cs b/src/Libraries/SmartStore.Services/Catalog/IProductAttributeParser.cs index 0017183f46..e244522dea 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IProductAttributeParser.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IProductAttributeParser.cs @@ -4,33 +4,33 @@ namespace SmartStore.Services.Catalog { - /// - /// Product attribute parser interface - /// - public partial interface IProductAttributeParser + /// + /// Product attribute parser interface + /// + public partial interface IProductAttributeParser { - #region Product attributes + #region Product attributes - /// - /// Parses, prefetches & caches all passed attribute definitions for the current request - /// - /// All attribute definitions to prefetch + /// + /// Parses, prefetches & caches all passed attribute definitions for the current request + /// + /// All attribute definitions to prefetch /// Number of fetched attributes - int PrefetchProductVariantAttributes(IEnumerable attributesXml); + int PrefetchProductVariantAttributes(IEnumerable attributesXml); - /// - /// Gets selected product variant attributes as a map of integer ids with their corresponding values. - /// - /// XML formatted attributes - /// The deserialized map - Multimap DeserializeProductVariantAttributes(string attributesXml); + /// + /// Gets selected product variant attributes as a map of integer ids with their corresponding values. + /// + /// XML formatted attributes + /// The deserialized map + Multimap DeserializeProductVariantAttributes(string attributesXml); - /// - /// Gets selected product variant attributes - /// - /// XML formatted attributes - /// Selected product variant attributes - IList ParseProductVariantAttributes(string attributesXml); + /// + /// Gets selected product variant attributes + /// + /// XML formatted attributes + /// Selected product variant attributes + IList ParseProductVariantAttributes(string attributesXml); /// /// Get product variant attribute values @@ -52,13 +52,13 @@ public partial interface IProductAttributeParser /// Collection of product variant attribute values ICollection ParseProductVariantAttributeValues(Multimap attributeCombination, IEnumerable attributes); - /// - /// Gets selected product variant attribute value - /// - /// XML formatted attributes - /// Product variant attribute identifier - /// Product variant attribute value - IList ParseValues(string attributesXml, int productVariantAttributeId); + /// + /// Gets selected product variant attribute value + /// + /// XML formatted attributes + /// Product variant attribute identifier + /// Product variant attribute value + IList ParseValues(string attributesXml, int productVariantAttributeId); /// /// Adds an attribute @@ -69,44 +69,44 @@ public partial interface IProductAttributeParser /// Attributes string AddProductAttribute(string attributesXml, ProductVariantAttribute pva, string value); - /// - /// Creates formatted xml for a list of product variant attribute values - /// - /// The attributes map - /// Attributes XML - string CreateAttributesXml(Multimap attributes); - - /// - /// Are attributes equal - /// - /// The attributes of the first product - /// The attributes of the second product - /// Result - bool AreProductAttributesEqual(string attributeXml1, string attributeXml2); - - /// - /// Finds a product variant attribute combination by attributes stored in XML - /// - /// Product identifier - /// XML formatted attributes - /// Found product variant attribute combination - ProductVariantAttributeCombination FindProductVariantAttributeCombination(int productId, string attributesXml); + /// + /// Creates formatted xml for a list of product variant attribute values + /// + /// The attributes map + /// Attributes XML + string CreateAttributesXml(Multimap attributes); + + /// + /// Are attributes equal + /// + /// The attributes of the first product + /// The attributes of the second product + /// Result + bool AreProductAttributesEqual(string attributeXml1, string attributeXml2); + + /// + /// Finds a product variant attribute combination by attributes stored in XML + /// + /// Product identifier + /// XML formatted attributes + /// Found product variant attribute combination + ProductVariantAttributeCombination FindProductVariantAttributeCombination(int productId, string attributesXml); - #endregion + #endregion - #region Gift card attributes + #region Gift card attributes - /// - /// Add gift card attrbibutes - /// - /// XML formatted attributes - /// Recipient name - /// Recipient email - /// Sender name - /// Sender email - /// Message - /// Attributes - string AddGiftCardAttribute(string attributesXml, string recipientName, + /// + /// Add gift card attrbibutes + /// + /// XML formatted attributes + /// Recipient name + /// Recipient email + /// Sender name + /// Sender email + /// Message + /// Attributes + string AddGiftCardAttribute(string attributesXml, string recipientName, string recipientEmail, string senderName, string senderEmail, string giftCardMessage); /// diff --git a/src/Libraries/SmartStore.Services/Catalog/IProductAttributeService.cs b/src/Libraries/SmartStore.Services/Catalog/IProductAttributeService.cs index 396acb9a8a..9053d4dec3 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IProductAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IProductAttributeService.cs @@ -46,101 +46,101 @@ public partial interface IProductAttributeService /// Product attribute void UpdateProductAttribute(ProductAttribute productAttribute); - /// - /// Gets the export mappings for a given field prefix. - /// - /// The export field prefix, e.g. gmc. - /// A multimap with export field names to ProductAttribute.Id mappings. - Multimap GetExportFieldMappings(string fieldPrefix); - - #endregion - - #region Product attribute options - - /// - /// Gets an attribute option by id - /// - /// Product attribute option identifier - /// Product attribute option - ProductAttributeOption GetProductAttributeOptionById(int id); - - /// - /// Gets all attribute options by options set identifier - /// - /// Attribute options set identifier - /// List of attribute options - IList GetProductAttributeOptionsByOptionsSetId(int optionsSetId); - - /// - /// Gets all attribute options by attribute identifier - /// - /// Attribute identifier - /// List of attribute options - IList GetProductAttributeOptionsByAttributeId(int attributeId); - - /// - /// Deletes an attribute option - /// - /// Product attribute option - void DeleteProductAttributeOption(ProductAttributeOption productAttributeOption); - - /// - /// Inserts an attribute option - /// - /// Product attribute option - void InsertProductAttributeOption(ProductAttributeOption productAttributeOption); - - /// - /// Updates an attribute option - /// - /// Product attribute option - void UpdateProductAttributeOption(ProductAttributeOption productAttributeOption); - - #endregion - - #region Product attribute options sets - - /// - /// Gets an attribute options set by id - /// - /// Product attribute options set identifier - /// Product attribute options set - ProductAttributeOptionsSet GetProductAttributeOptionsSetById(int id); - - /// - /// Gets all attribute options sets by attribute identifier - /// - /// - /// - IList GetProductAttributeOptionsSetsByAttributeId(int productAttributeId); - - /// - /// Deletes an attribute options set - /// - /// Product attribute options set - void DeleteProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet); - - /// - /// Inserts an attribute options set - /// - /// Product attribute options set - void InsertProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet); - - /// - /// Updates an attribute options set - /// - /// Product attribute options set - void UpdateProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet); - - #endregion - - #region Product variant attributes mappings (ProductVariantAttribute) - - /// - /// Deletes a product variant attribute mapping - /// - /// Product variant attribute mapping - void DeleteProductVariantAttribute(ProductVariantAttribute productVariantAttribute); + /// + /// Gets the export mappings for a given field prefix. + /// + /// The export field prefix, e.g. gmc. + /// A multimap with export field names to ProductAttribute.Id mappings. + Multimap GetExportFieldMappings(string fieldPrefix); + + #endregion + + #region Product attribute options + + /// + /// Gets an attribute option by id + /// + /// Product attribute option identifier + /// Product attribute option + ProductAttributeOption GetProductAttributeOptionById(int id); + + /// + /// Gets all attribute options by options set identifier + /// + /// Attribute options set identifier + /// List of attribute options + IList GetProductAttributeOptionsByOptionsSetId(int optionsSetId); + + /// + /// Gets all attribute options by attribute identifier + /// + /// Attribute identifier + /// List of attribute options + IList GetProductAttributeOptionsByAttributeId(int attributeId); + + /// + /// Deletes an attribute option + /// + /// Product attribute option + void DeleteProductAttributeOption(ProductAttributeOption productAttributeOption); + + /// + /// Inserts an attribute option + /// + /// Product attribute option + void InsertProductAttributeOption(ProductAttributeOption productAttributeOption); + + /// + /// Updates an attribute option + /// + /// Product attribute option + void UpdateProductAttributeOption(ProductAttributeOption productAttributeOption); + + #endregion + + #region Product attribute options sets + + /// + /// Gets an attribute options set by id + /// + /// Product attribute options set identifier + /// Product attribute options set + ProductAttributeOptionsSet GetProductAttributeOptionsSetById(int id); + + /// + /// Gets all attribute options sets by attribute identifier + /// + /// + /// + IList GetProductAttributeOptionsSetsByAttributeId(int productAttributeId); + + /// + /// Deletes an attribute options set + /// + /// Product attribute options set + void DeleteProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet); + + /// + /// Inserts an attribute options set + /// + /// Product attribute options set + void InsertProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet); + + /// + /// Updates an attribute options set + /// + /// Product attribute options set + void UpdateProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet); + + #endregion + + #region Product variant attributes mappings (ProductVariantAttribute) + + /// + /// Deletes a product variant attribute mapping + /// + /// Product variant attribute mapping + void DeleteProductVariantAttribute(ProductVariantAttribute productVariantAttribute); /// /// Gets product variant attribute mappings by product identifier @@ -149,13 +149,13 @@ public partial interface IProductAttributeService /// Product variant attribute mapping collection IList GetProductVariantAttributesByProductId(int productId); - /// - /// Gets product variant attribute mappings by multiple product identifiers - /// - /// The product identifiers - /// An optional control type filter. null loads all controls regardless of type. - /// A map with product id as key and a collection of variant attributes as value. - Multimap GetProductVariantAttributesByProductIds(int[] productIds, AttributeControlType? controlType); + /// + /// Gets product variant attribute mappings by multiple product identifiers + /// + /// The product identifiers + /// An optional control type filter. null loads all controls regardless of type. + /// A map with product id as key and a collection of variant attributes as value. + Multimap GetProductVariantAttributesByProductIds(int[] productIds, AttributeControlType? controlType); /// /// Gets a product variant attribute mapping @@ -164,13 +164,13 @@ public partial interface IProductAttributeService /// Product variant attribute mapping ProductVariantAttribute GetProductVariantAttributeById(int productVariantAttributeId); - /// - /// Gets product variant attribute mappings - /// - /// Enumerable of product variant attribute mapping identifiers - /// Collection of already loaded product attribute mappings to reduce database round trips - /// - IList GetProductVariantAttributesByIds(IEnumerable productVariantAttributeIds, IEnumerable attributes = null); + /// + /// Gets product variant attribute mappings + /// + /// Enumerable of product variant attribute mapping identifiers + /// Collection of already loaded product attribute mappings to reduce database round trips + /// + IList GetProductVariantAttributesByIds(IEnumerable productVariantAttributeIds, IEnumerable attributes = null); /// /// Inserts a product variant attribute mapping @@ -184,24 +184,24 @@ public partial interface IProductAttributeService /// The product variant attribute mapping void UpdateProductVariantAttribute(ProductVariantAttribute productVariantAttribute); - /// - /// Copies attribute options (if any) to product variant attribute values. Existing values are ignored (identified by name field). - /// - /// The product variant attribute mapping - /// Product attribute options set identifier - /// Indicates whether to delete all existing product variant attribute values - /// Number of inserted product variant attribute values - int CopyAttributeOptions(ProductVariantAttribute productVariantAttribute, int productAttributeOptionsSetId, bool deleteExistingValues); + /// + /// Copies attribute options (if any) to product variant attribute values. Existing values are ignored (identified by name field). + /// + /// The product variant attribute mapping + /// Product attribute options set identifier + /// Indicates whether to delete all existing product variant attribute values + /// Number of inserted product variant attribute values + int CopyAttributeOptions(ProductVariantAttribute productVariantAttribute, int productAttributeOptionsSetId, bool deleteExistingValues); - #endregion + #endregion - #region Product variant attribute values (ProductVariantAttributeValue) + #region Product variant attribute values (ProductVariantAttributeValue) - /// - /// Deletes a product variant attribute value - /// - /// Product variant attribute value - void DeleteProductVariantAttributeValue(ProductVariantAttributeValue productVariantAttributeValue); + /// + /// Deletes a product variant attribute value + /// + /// Product variant attribute value + void DeleteProductVariantAttributeValue(ProductVariantAttributeValue productVariantAttributeValue); /// /// Gets product variant attribute values by product identifier @@ -246,37 +246,37 @@ public partial interface IProductAttributeService /// Product variant attribute combination void DeleteProductVariantAttributeCombination(ProductVariantAttributeCombination combination); - /// - /// Gets all product variant attribute combinations - /// - /// Product identifier - /// Page index - /// Page size - /// Specifies whether loaded entities should be tracked by the state manager - /// Product variant attribute combination collection - IPagedList GetAllProductVariantAttributeCombinations(int productId, int pageIndex, int pageSize, bool untracked = true); - - /// - /// Gets a distinct list of picture identifiers. - /// Only pictures that are explicitly assigned to combinations are taken into account. - /// - /// Product id - /// Picture ids - IList GetAllProductVariantAttributeCombinationPictureIds(int productId); - - /// - /// Gets product variant attribute combinations by multiple product identifiers - /// - /// The product identifiers - /// A map with product id as key and a collection of product variant attribute combinations as value. - Multimap GetProductVariantAttributeCombinations(int[] productIds); - - /// - /// Get the lowest price of all combinations for a product - /// - /// Product identifier - /// Lowest price - decimal? GetLowestCombinationPrice(int productId); + /// + /// Gets all product variant attribute combinations + /// + /// Product identifier + /// Page index + /// Page size + /// Specifies whether loaded entities should be tracked by the state manager + /// Product variant attribute combination collection + IPagedList GetAllProductVariantAttributeCombinations(int productId, int pageIndex, int pageSize, bool untracked = true); + + /// + /// Gets a distinct list of picture identifiers. + /// Only pictures that are explicitly assigned to combinations are taken into account. + /// + /// Product id + /// Picture ids + IList GetAllProductVariantAttributeCombinationPictureIds(int productId); + + /// + /// Gets product variant attribute combinations by multiple product identifiers + /// + /// The product identifiers + /// A map with product id as key and a collection of product variant attribute combinations as value. + Multimap GetProductVariantAttributeCombinations(int[] productIds); + + /// + /// Get the lowest price of all combinations for a product + /// + /// Product identifier + /// Lowest price + decimal? GetLowestCombinationPrice(int productId); /// /// Gets a product variant attribute combination by identifier @@ -285,12 +285,12 @@ public partial interface IProductAttributeService /// Product variant attribute combination ProductVariantAttributeCombination GetProductVariantAttributeCombinationById(int productVariantAttributeCombinationId); - /// - /// Gets a product variant attribute combination by SKU - /// - /// SKU - /// Product variant attribute combination - ProductVariantAttributeCombination GetProductVariantAttributeCombinationBySku(string sku); + /// + /// Gets a product variant attribute combination by SKU + /// + /// SKU + /// Product variant attribute combination + ProductVariantAttributeCombination GetProductVariantAttributeCombinationBySku(string sku); /// /// Gets a product variant attribute combination by GTIN. @@ -318,10 +318,10 @@ public partial interface IProductAttributeService /// Product variant attribute combination void UpdateProductVariantAttributeCombination(ProductVariantAttributeCombination combination); - /// - /// Creates all variant attributes combinations - /// - void CreateAllProductVariantAttributeCombinations(Product product); + /// + /// Creates all variant attributes combinations + /// + void CreateAllProductVariantAttributeCombinations(Product product); /// /// Gets a value indicating the existence of any attribute combination for a product @@ -330,58 +330,58 @@ public partial interface IProductAttributeService #endregion - #region Product bundle item attribute filter - - /// - /// Inserts a product bundle item attribute filter - /// - /// Product bundle item attribute filter - void InsertProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter); - - /// - /// Updates the product bundle item attribute filter - /// - /// Product bundle item attribute filter - void UpdateProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter); - - /// - /// Deletes a product bundle item attribute filter - /// - /// Product bundle item attribute filter - void DeleteProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter); - - /// - /// Deletes all attribute filters of a bundle item - /// - /// Bundle item - void DeleteProductBundleItemAttributeFilter(ProductBundleItem bundleItem); - - /// - /// Deletes product bundle item attribute filters - /// - /// Attribute identifier - /// Attribute value identifier - void DeleteProductBundleItemAttributeFilter(int attributeId, int attributeValueId); - - /// - /// Deletes product bundle item attribute filters - /// - /// Attribute identifier - void DeleteProductBundleItemAttributeFilter(int attributeId); - - #endregion + #region Product bundle item attribute filter + + /// + /// Inserts a product bundle item attribute filter + /// + /// Product bundle item attribute filter + void InsertProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter); + + /// + /// Updates the product bundle item attribute filter + /// + /// Product bundle item attribute filter + void UpdateProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter); + + /// + /// Deletes a product bundle item attribute filter + /// + /// Product bundle item attribute filter + void DeleteProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter); + + /// + /// Deletes all attribute filters of a bundle item + /// + /// Bundle item + void DeleteProductBundleItemAttributeFilter(ProductBundleItem bundleItem); + + /// + /// Deletes product bundle item attribute filters + /// + /// Attribute identifier + /// Attribute value identifier + void DeleteProductBundleItemAttributeFilter(int attributeId, int attributeValueId); + + /// + /// Deletes product bundle item attribute filters + /// + /// Attribute identifier + void DeleteProductBundleItemAttributeFilter(int attributeId); + + #endregion } - public static class IProductAttributeServiceExtensions - { - /// - /// Gets all product variant attribute combinations - /// - /// Product identifier - /// Product variant attribute combination collection - public static IList GetAllProductVariantAttributeCombinations(this IProductAttributeService service, int productId) - { - return service.GetAllProductVariantAttributeCombinations(productId, 0, int.MaxValue, true); - } - } + public static class IProductAttributeServiceExtensions + { + /// + /// Gets all product variant attribute combinations + /// + /// Product identifier + /// Product variant attribute combination collection + public static IList GetAllProductVariantAttributeCombinations(this IProductAttributeService service, int productId) + { + return service.GetAllProductVariantAttributeCombinations(productId, 0, int.MaxValue, true); + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/IProductService.cs b/src/Libraries/SmartStore.Services/Catalog/IProductService.cs index 45795dc3a3..1f8adbf816 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IProductService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IProductService.cs @@ -39,7 +39,7 @@ public partial interface IProductService /// /// Product collection IList GetAllProductsDisplayedOnHomePage(); - + /// /// Gets product /// @@ -55,18 +55,18 @@ public partial interface IProductService /// Products IList GetProductsByIds(int[] productIds, ProductLoadFlags flags = ProductLoadFlags.None); - /// - /// Get product by system name. - /// - /// System name - /// Product entity. - Product GetProductBySystemName(string systemName); + /// + /// Get product by system name. + /// + /// System name + /// Product entity. + Product GetProductBySystemName(string systemName); - /// - /// Inserts a product - /// - /// Product - void InsertProduct(Product product); + /// + /// Inserts a product + /// + /// Product + void InsertProduct(Product product); /// /// Updates the product @@ -79,7 +79,7 @@ public partial interface IProductService /// /// Product void UpdateProductReviewTotals(Product product); - + /// /// Get low stock products /// @@ -100,12 +100,12 @@ public partial interface IProductService /// Product Product GetProductByGtin(string gtin); - /// - /// Gets a product by manufacturer part number (MPN) - /// - /// Manufacturer part number - /// Product - Product GetProductByManufacturerPartNumber(string manufacturerPartNumber); + /// + /// Gets a product by manufacturer part number (MPN) + /// + /// Manufacturer part number + /// Product + Product GetProductByManufacturerPartNumber(string manufacturerPartNumber); /// /// Gets a product by SKU, GTIN or MPN. @@ -128,22 +128,22 @@ Product GetProductByIdentificationNumber( /// Product Product GetProductByName(string name); - /// - /// Adjusts inventory - /// - /// Shopping cart item - /// A value indicating whether to increase or descrease product stock quantity - /// Adjust inventory result - AdjustInventoryResult AdjustInventory(OrganizedShoppingCartItem sci, bool decrease); + /// + /// Adjusts inventory + /// + /// Shopping cart item + /// A value indicating whether to increase or descrease product stock quantity + /// Adjust inventory result + AdjustInventoryResult AdjustInventory(OrganizedShoppingCartItem sci, bool decrease); - /// - /// Adjusts inventory - /// - /// Order item - /// A value indicating whether to increase or descrease product stock quantity - /// Quantity - /// Adjust inventory result - AdjustInventoryResult AdjustInventory(OrderItem orderItem, bool decrease, int quantity); + /// + /// Adjusts inventory + /// + /// Order item + /// A value indicating whether to increase or descrease product stock quantity + /// Quantity + /// Adjust inventory result + AdjustInventoryResult AdjustInventory(OrderItem orderItem, bool decrease, int quantity); /// /// Adjusts inventory @@ -161,11 +161,11 @@ Product GetProductByIdentificationNumber( /// Product void UpdateHasTierPricesProperty(Product product); - /// - /// Update LowestAttributeCombinationPrice property (used for performance optimization) - /// - /// Product - void UpdateLowestAttributeCombinationPriceProperty(Product product); + /// + /// Update LowestAttributeCombinationPrice property (used for performance optimization) + /// + /// Product + void UpdateLowestAttributeCombinationPriceProperty(Product product); /// /// Update HasDiscountsApplied property (used for performance optimization) @@ -233,12 +233,12 @@ Product GetProductByIdentificationNumber( /// Related product void UpdateRelatedProduct(RelatedProduct relatedProduct); - /// - /// Ensure existence of all mutually related products - /// - /// First product identifier - /// Number of inserted related products - int EnsureMutuallyRelatedProducts(int productId1); + /// + /// Ensure existence of all mutually related products + /// + /// First product identifier + /// Number of inserted related products + int EnsureMutuallyRelatedProducts(int productId1); #endregion @@ -258,20 +258,20 @@ Product GetProductByIdentificationNumber( /// Cross-sell product collection IList GetCrossSellProductsByProductId1(int productId1, bool showHidden = false); - /// - /// Gets a cross-sell product collection by many product identifiers - /// - /// A sequence of alpha product identifiers - /// A value indicating whether to show hidden records - /// Cross-sell product collection - IList GetCrossSellProductsByProductIds(IEnumerable productIds, bool showHidden = false); + /// + /// Gets a cross-sell product collection by many product identifiers + /// + /// A sequence of alpha product identifiers + /// A value indicating whether to show hidden records + /// Cross-sell product collection + IList GetCrossSellProductsByProductIds(IEnumerable productIds, bool showHidden = false); - /// - /// Gets a cross-sell product - /// - /// Cross-sell product identifier - /// Cross-sell product - CrossSellProduct GetCrossSellProductById(int crossSellProductId); + /// + /// Gets a cross-sell product + /// + /// Cross-sell product identifier + /// Cross-sell product + CrossSellProduct GetCrossSellProductById(int crossSellProductId); /// /// Inserts a cross-sell product @@ -284,24 +284,24 @@ Product GetProductByIdentificationNumber( /// /// Cross-sell product void UpdateCrossSellProduct(CrossSellProduct crossSellProduct); - + /// /// Gets a cross-sells /// /// Shopping cart /// Number of products to return /// Cross-sells - IList GetCrosssellProductsByShoppingCart(IList cart, int numberOfProducts); + IList GetCrosssellProductsByShoppingCart(IList cart, int numberOfProducts); - /// - /// Ensure existence of all mutually cross selling products - /// - /// First product identifier - /// Number of inserted cross selling products - int EnsureMutuallyCrossSellProducts(int productId1); + /// + /// Ensure existence of all mutually cross selling products + /// + /// First product identifier + /// Number of inserted cross selling products + int EnsureMutuallyCrossSellProducts(int productId1); #endregion - + #region Tier prices /// @@ -317,14 +317,14 @@ Product GetProductByIdentificationNumber( /// Tier price TierPrice GetTierPriceById(int tierPriceId); - /// - /// Gets tier prices by product identifiers - /// - /// Product identifiers - /// Filter tier prices by customer - /// Filter tier prices by store - /// Map of tier prices - Multimap GetTierPricesByProductIds(int[] productIds, Customer customer = null, int storeId = 0); + /// + /// Gets tier prices by product identifiers + /// + /// Product identifiers + /// Filter tier prices by customer + /// Filter tier prices by store + /// Map of tier prices + Multimap GetTierPricesByProductIds(int[] productIds, Customer customer = null, int storeId = 0); /// /// Inserts a tier price @@ -389,48 +389,48 @@ Multimap GetProductPicturesByProductIds( #endregion - #region Bundled products - - /// - /// Inserts a product bundle item - /// - /// Product bundle item - void InsertBundleItem(ProductBundleItem bundleItem); - - /// - /// Updates a product bundle item - /// - /// Product bundle item - void UpdateBundleItem(ProductBundleItem bundleItem); - - /// - /// Deletes a product bundle item - /// - /// Product bundle item - void DeleteBundleItem(ProductBundleItem bundleItem); - - /// - /// Get a product bundle item by item identifier - /// - /// Product bundle item identifier - /// Product bundle item - ProductBundleItem GetBundleItemById(int bundleItemId); - - /// - /// Gets a list of bundle items for a particular product identifier - /// - /// Product identifier - /// A value indicating whether to show hidden records - /// List of bundle items - IList GetBundleItems(int bundleProductId, bool showHidden = false); - - /// - /// Get bundle items by product identifiers - /// - /// Product identifiers - /// A value indicating whether to show hidden records - /// Map of bundle items - Multimap GetBundleItemsByProductIds(int[] productIds, bool showHidden = false); + #region Bundled products + + /// + /// Inserts a product bundle item + /// + /// Product bundle item + void InsertBundleItem(ProductBundleItem bundleItem); + + /// + /// Updates a product bundle item + /// + /// Product bundle item + void UpdateBundleItem(ProductBundleItem bundleItem); + + /// + /// Deletes a product bundle item + /// + /// Product bundle item + void DeleteBundleItem(ProductBundleItem bundleItem); + + /// + /// Get a product bundle item by item identifier + /// + /// Product bundle item identifier + /// Product bundle item + ProductBundleItem GetBundleItemById(int bundleItemId); + + /// + /// Gets a list of bundle items for a particular product identifier + /// + /// Product identifier + /// A value indicating whether to show hidden records + /// List of bundle items + IList GetBundleItems(int bundleProductId, bool showHidden = false); + + /// + /// Get bundle items by product identifiers + /// + /// Product identifiers + /// A value indicating whether to show hidden records + /// Map of bundle items + Multimap GetBundleItemsByProductIds(int[] productIds, bool showHidden = false); /// /// Checks whether a product is a bundle item. @@ -442,23 +442,23 @@ Multimap GetProductPicturesByProductIds( #endregion } - [Flags] - public enum ProductLoadFlags - { - None = 0, - WithCategories = 1 << 0, - WithManufacturers = 1 << 1, - WithPictures = 1 << 2, - WithReviews = 1 << 3, - WithSpecificationAttributes = 1 << 4, - WithAttributes = 1 << 5, - WithAttributeValues = 1 << 7, - WithAttributeCombinations = 1 << 8, - WithTags = 1 << 9, - WithTierPrices = 1 << 10, - WithDiscounts = 1 << 11, - WithBundleItems = 1 << 12, - WithDeliveryTime = 1 << 13, - Full = WithCategories | WithManufacturers | WithPictures | WithReviews | WithSpecificationAttributes | WithAttributes | WithAttributeValues | WithAttributeCombinations | WithTags | WithTierPrices | WithDiscounts | WithBundleItems | WithDeliveryTime - } + [Flags] + public enum ProductLoadFlags + { + None = 0, + WithCategories = 1 << 0, + WithManufacturers = 1 << 1, + WithPictures = 1 << 2, + WithReviews = 1 << 3, + WithSpecificationAttributes = 1 << 4, + WithAttributes = 1 << 5, + WithAttributeValues = 1 << 7, + WithAttributeCombinations = 1 << 8, + WithTags = 1 << 9, + WithTierPrices = 1 << 10, + WithDiscounts = 1 << 11, + WithBundleItems = 1 << 12, + WithDeliveryTime = 1 << 13, + Full = WithCategories | WithManufacturers | WithPictures | WithReviews | WithSpecificationAttributes | WithAttributes | WithAttributeValues | WithAttributeCombinations | WithTags | WithTierPrices | WithDiscounts | WithBundleItems | WithDeliveryTime + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/IProductTagService.cs b/src/Libraries/SmartStore.Services/Catalog/IProductTagService.cs index 38d8504af3..70476562ae 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IProductTagService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IProductTagService.cs @@ -33,7 +33,7 @@ public partial interface IProductTagService : IScopedService /// Product tag identifier /// Product tag ProductTag GetProductTagById(int productTagId); - + /// /// Gets product tag by name /// diff --git a/src/Libraries/SmartStore.Services/Catalog/ISpecificationAttributeService.cs b/src/Libraries/SmartStore.Services/Catalog/ISpecificationAttributeService.cs index 63bd9f6256..f6a6d13873 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ISpecificationAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ISpecificationAttributeService.cs @@ -25,12 +25,12 @@ public partial interface ISpecificationAttributeService /// Specification attribute query IQueryable GetSpecificationAttributes(); - /// - /// Gets specification attributes by identifier - /// - /// Identifiers - /// Specification attribute query - IQueryable GetSpecificationAttributesByIds(int[] ids); + /// + /// Gets specification attributes by identifier + /// + /// Identifiers + /// Specification attribute query + IQueryable GetSpecificationAttributesByIds(int[] ids); /// /// Deletes a specification attribute diff --git a/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs b/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs index 885cabfd8b..9fa4702856 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs @@ -17,171 +17,171 @@ namespace SmartStore.Services.Catalog.Importer { public class CategoryImporter : EntityImporterBase - { - private readonly IRepository _categoryRepository; - private readonly ICategoryTemplateService _categoryTemplateService; + { + private readonly IRepository _categoryRepository; + private readonly ICategoryTemplateService _categoryTemplateService; private readonly IMediaService _mediaService; private readonly ILocalizedEntityService _localizedEntityService; - private readonly FileDownloadManager _fileDownloadManager; - - private static readonly Dictionary>> _localizableProperties = new Dictionary>> - { - { "Name", x => x.Name }, - { "FullName", x => x.FullName }, - { "Description", x => x.Description }, - { "BottomDescription", x => x.BottomDescription }, - { "MetaKeywords", x => x.MetaKeywords }, - { "MetaDescription", x => x.MetaDescription }, - { "MetaTitle", x => x.MetaTitle } - }; - - public CategoryImporter( - IRepository categoryRepository, - ICategoryTemplateService categoryTemplateService, + private readonly FileDownloadManager _fileDownloadManager; + + private static readonly Dictionary>> _localizableProperties = new Dictionary>> + { + { "Name", x => x.Name }, + { "FullName", x => x.FullName }, + { "Description", x => x.Description }, + { "BottomDescription", x => x.BottomDescription }, + { "MetaKeywords", x => x.MetaKeywords }, + { "MetaDescription", x => x.MetaDescription }, + { "MetaTitle", x => x.MetaTitle } + }; + + public CategoryImporter( + IRepository categoryRepository, + ICategoryTemplateService categoryTemplateService, IMediaService mediaService, ILocalizedEntityService localizedEntityService, - FileDownloadManager fileDownloadManager) - { - _categoryRepository = categoryRepository; - _categoryTemplateService = categoryTemplateService; + FileDownloadManager fileDownloadManager) + { + _categoryRepository = categoryRepository; + _categoryTemplateService = categoryTemplateService; _mediaService = mediaService; - _localizedEntityService = localizedEntityService; - _fileDownloadManager = fileDownloadManager; - } - - protected override void Import(ImportExecuteContext context) - { - var srcToDestId = new Dictionary(); - - var templateViewPaths = _categoryTemplateService.GetAllCategoryTemplates().ToDictionarySafe(x => x.ViewPath, x => x.Id); - - using (var scope = new DbContextScope(ctx: context.Services.DbContext, hooksEnabled: false, autoDetectChanges: false, proxyCreation: false, validateOnSave: false)) - { - var segmenter = context.DataSegmenter; - - Initialize(context); - - while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch()) - { - var batch = segmenter.GetCurrentBatch(); - - // Perf: detach all entities - _categoryRepository.Context.DetachAll(true); - - context.SetProgress(segmenter.CurrentSegmentFirstRowIndex - 1, segmenter.TotalRows); - - try - { - ProcessCategories(context, batch, templateViewPaths, srcToDestId); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessCategories"); - } - - // Reduce batch to saved (valid) products. - // No need to perform import operations on errored products. - batch = batch.Where(x => x.Entity != null && !x.IsTransient).ToArray(); - - // Update result object. - context.Result.NewRecords += batch.Count(x => x.IsNew && !x.IsTransient); - context.Result.ModifiedRecords += batch.Count(x => !x.IsNew && !x.IsTransient); - - // Process slugs. - if (segmenter.HasColumn("SeName", true) || batch.Any(x => x.IsNew || x.NameChanged)) - { - try - { - _categoryRepository.Context.AutoDetectChangesEnabled = true; - ProcessSlugs(context, batch, typeof(Category).Name); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessSlugs"); - } - finally - { - _categoryRepository.Context.AutoDetectChangesEnabled = false; - } - } - - // Process store mappings. - if (segmenter.HasColumn("StoreIds")) - { - try - { - ProcessStoreMappings(context, batch); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessStoreMappings"); - } - } - - // Localizations. - try - { - ProcessLocalizations(context, batch, _localizableProperties); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessLocalizedProperties"); - } - - // Process pictures. - if (segmenter.HasColumn("ImageUrl") && !segmenter.IsIgnored("PictureId")) - { - try - { - _categoryRepository.Context.AutoDetectChangesEnabled = true; - ProcessPictures(context, batch); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessPictures"); - } - finally - { - _categoryRepository.Context.AutoDetectChangesEnabled = false; - } - } + _localizedEntityService = localizedEntityService; + _fileDownloadManager = fileDownloadManager; + } + + protected override void Import(ImportExecuteContext context) + { + var srcToDestId = new Dictionary(); + + var templateViewPaths = _categoryTemplateService.GetAllCategoryTemplates().ToDictionarySafe(x => x.ViewPath, x => x.Id); + + using (var scope = new DbContextScope(ctx: context.Services.DbContext, hooksEnabled: false, autoDetectChanges: false, proxyCreation: false, validateOnSave: false)) + { + var segmenter = context.DataSegmenter; + + Initialize(context); + + while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch()) + { + var batch = segmenter.GetCurrentBatch(); + + // Perf: detach all entities + _categoryRepository.Context.DetachAll(true); + + context.SetProgress(segmenter.CurrentSegmentFirstRowIndex - 1, segmenter.TotalRows); + + try + { + ProcessCategories(context, batch, templateViewPaths, srcToDestId); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessCategories"); + } + + // Reduce batch to saved (valid) products. + // No need to perform import operations on errored products. + batch = batch.Where(x => x.Entity != null && !x.IsTransient).ToArray(); + + // Update result object. + context.Result.NewRecords += batch.Count(x => x.IsNew && !x.IsTransient); + context.Result.ModifiedRecords += batch.Count(x => !x.IsNew && !x.IsTransient); + + // Process slugs. + if (segmenter.HasColumn("SeName", true) || batch.Any(x => x.IsNew || x.NameChanged)) + { + try + { + _categoryRepository.Context.AutoDetectChangesEnabled = true; + ProcessSlugs(context, batch, typeof(Category).Name); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessSlugs"); + } + finally + { + _categoryRepository.Context.AutoDetectChangesEnabled = false; + } + } + + // Process store mappings. + if (segmenter.HasColumn("StoreIds")) + { + try + { + ProcessStoreMappings(context, batch); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessStoreMappings"); + } + } + + // Localizations. + try + { + ProcessLocalizations(context, batch, _localizableProperties); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessLocalizedProperties"); + } + + // Process pictures. + if (segmenter.HasColumn("ImageUrl") && !segmenter.IsIgnored("PictureId")) + { + try + { + _categoryRepository.Context.AutoDetectChangesEnabled = true; + ProcessPictures(context, batch); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessPictures"); + } + finally + { + _categoryRepository.Context.AutoDetectChangesEnabled = false; + } + } context.Services.EventPublisher.Publish(new ImportBatchExecutedEvent(context, batch)); } - // Map parent id of inserted categories. - if (srcToDestId.Any() && segmenter.HasColumn("Id") && segmenter.HasColumn("ParentCategoryId") && !segmenter.IsIgnored("ParentCategoryId")) - { - segmenter.Reset(); - - while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch()) - { - var batch = segmenter.GetCurrentBatch(); - _categoryRepository.Context.DetachAll(unchangedEntitiesOnly: false); - - try - { - ProcessParentMappings(context, batch, srcToDestId); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessParentMappings"); - } - } - } - } - } - - protected virtual int ProcessPictures( - ImportExecuteContext context, - IEnumerable> batch) - { - foreach (var row in batch) - { - try - { - var srcId = row.GetDataValue("Id"); - var imageUrl = row.GetDataValue("ImageUrl"); + // Map parent id of inserted categories. + if (srcToDestId.Any() && segmenter.HasColumn("Id") && segmenter.HasColumn("ParentCategoryId") && !segmenter.IsIgnored("ParentCategoryId")) + { + segmenter.Reset(); + + while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch()) + { + var batch = segmenter.GetCurrentBatch(); + _categoryRepository.Context.DetachAll(unchangedEntitiesOnly: false); + + try + { + ProcessParentMappings(context, batch, srcToDestId); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessParentMappings"); + } + } + } + } + } + + protected virtual int ProcessPictures( + ImportExecuteContext context, + IEnumerable> batch) + { + foreach (var row in batch) + { + try + { + var srcId = row.GetDataValue("Id"); + var imageUrl = row.GetDataValue("ImageUrl"); if (imageUrl.IsEmpty()) { continue; @@ -228,229 +228,217 @@ protected virtual int ProcessPictures( { context.Result.AddInfo("Download of an image failed.", row.GetRowInfo(), "ImageUrls"); } - } - catch (Exception ex) - { - context.Result.AddWarning(ex.ToAllMessages(), row.GetRowInfo(), "ImageUrls"); - } - } - - var num = _categoryRepository.Context.SaveChanges(); - return num; - } - - protected virtual int ProcessLocalizations( - ImportExecuteContext context, - IEnumerable> batch, - string[] localizedProperties) - { - if (localizedProperties.Length == 0) - { - return 0; - } - - bool shouldSave = false; - - foreach (var row in batch) - { - foreach (var prop in localizedProperties) - { - var lambda = _localizableProperties[prop]; - foreach (var lang in context.Languages) - { - var code = lang.UniqueSeoCode; - string value; - - if (row.TryGetDataValue(prop /* ColumnName */, code, out value)) - { - _localizedEntityService.SaveLocalizedValue(row.Entity, lambda, value, lang.Id); - shouldSave = true; - } - } - } - } - - if (shouldSave) - { - // commit whole batch at once - return context.Services.DbContext.SaveChanges(); - } - - return 0; - } - - protected virtual int ProcessParentMappings( - ImportExecuteContext context, - IEnumerable> batch, - Dictionary srcToDestId) - { - foreach (var row in batch) - { - var id = row.GetDataValue("Id"); - var rawParentId = row.GetDataValue("ParentCategoryId"); - var parentId = rawParentId.ToInt(-1); - - if (id != 0 && parentId != -1 && srcToDestId.ContainsKey(id) && srcToDestId.ContainsKey(parentId)) - { - // only touch hierarchical data if child and parent were inserted - if (srcToDestId[id].Inserted && srcToDestId[parentId].Inserted && srcToDestId[id].DestinationId != 0) - { - var category = _categoryRepository.GetById(srcToDestId[id].DestinationId); - if (category != null) - { - category.ParentCategoryId = srcToDestId[parentId].DestinationId; - - _categoryRepository.Update(category); - } - } - } - } - - var num = _categoryRepository.Context.SaveChanges(); - - return num; - } - - protected virtual int ProcessCategories( - ImportExecuteContext context, - IEnumerable> batch, - Dictionary templateViewPaths, - Dictionary srcToDestId) - { - _categoryRepository.AutoCommitEnabled = true; - - var defaultTemplateId = templateViewPaths["CategoryTemplate.ProductsInGridOrLines"]; + } + catch (Exception ex) + { + context.Result.AddWarning(ex.ToAllMessages(), row.GetRowInfo(), "ImageUrls"); + } + } + + var num = _categoryRepository.Context.SaveChanges(); + return num; + } + + protected virtual int ProcessLocalizations( + ImportExecuteContext context, + IEnumerable> batch, + string[] localizedProperties) + { + if (localizedProperties.Length == 0) + { + return 0; + } + + bool shouldSave = false; + + foreach (var row in batch) + { + foreach (var prop in localizedProperties) + { + var lambda = _localizableProperties[prop]; + foreach (var lang in context.Languages) + { + var code = lang.UniqueSeoCode; + string value; + + if (row.TryGetDataValue(prop /* ColumnName */, code, out value)) + { + _localizedEntityService.SaveLocalizedValue(row.Entity, lambda, value, lang.Id); + shouldSave = true; + } + } + } + } + + if (shouldSave) + { + // commit whole batch at once + return context.Services.DbContext.SaveChanges(); + } + + return 0; + } + + protected virtual int ProcessParentMappings( + ImportExecuteContext context, + IEnumerable> batch, + Dictionary srcToDestId) + { + foreach (var row in batch) + { + var id = row.GetDataValue("Id"); + var rawParentId = row.GetDataValue("ParentCategoryId"); + var parentId = rawParentId.ToInt(-1); + + if (id != 0 && parentId != -1 && srcToDestId.ContainsKey(id) && srcToDestId.ContainsKey(parentId)) + { + // only touch hierarchical data if child and parent were inserted + if (srcToDestId[id].Inserted && srcToDestId[parentId].Inserted && srcToDestId[id].DestinationId != 0) + { + var category = _categoryRepository.GetById(srcToDestId[id].DestinationId); + if (category != null) + { + category.ParentCategoryId = srcToDestId[parentId].DestinationId; + + _categoryRepository.Update(category); + } + } + } + } + + var num = _categoryRepository.Context.SaveChanges(); + + return num; + } + + protected virtual int ProcessCategories( + ImportExecuteContext context, + IEnumerable> batch, + Dictionary templateViewPaths, + Dictionary srcToDestId) + { + _categoryRepository.AutoCommitEnabled = true; + + var defaultTemplateId = templateViewPaths["CategoryTemplate.ProductsInGridOrLines"]; var hasNameColumn = context.DataSegmenter.HasColumn("Name"); foreach (var row in batch) - { - Category category = null; - var id = row.GetDataValue("Id"); - var name = row.GetDataValue("Name"); - - foreach (var keyName in context.KeyFieldNames) - { - switch (keyName) - { - case "Id": - if (id != 0) - category = _categoryRepository.GetById(id); - break; - case "Name": - if (name.HasValue()) - category = _categoryRepository.Table.FirstOrDefault(x => x.Name == name); - break; - } - - if (category != null) - break; - } - - if (category == null) - { - if (context.UpdateOnly) - { - ++context.Result.SkippedRecords; - continue; - } + { + Category category = null; + var id = row.GetDataValue("Id"); + var name = row.GetDataValue("Name"); + + foreach (var keyName in context.KeyFieldNames) + { + switch (keyName) + { + case "Id": + if (id != 0) + category = _categoryRepository.GetById(id); + break; + case "Name": + if (name.HasValue()) + category = _categoryRepository.Table.FirstOrDefault(x => x.Name == name); + break; + } + + if (category != null) + break; + } + + if (category == null) + { + if (context.UpdateOnly) + { + ++context.Result.SkippedRecords; + continue; + } // A name is required for new categories. if (!row.HasDataValue("Name")) { - ++context.Result.SkippedRecords; - context.Result.AddError("The 'Name' field is required for new categories. Skipping row.", row.GetRowInfo(), "Name"); - continue; - } - - category = new Category(); - } - - row.Initialize(category, name ?? category.Name); - - if (!row.IsNew && hasNameColumn && !category.Name.Equals(name, StringComparison.OrdinalIgnoreCase)) - { - // Perf: use this later for SeName updates. - row.NameChanged = true; - } - - row.SetProperty(context.Result, (x) => x.Name); - row.SetProperty(context.Result, (x) => x.FullName); - row.SetProperty(context.Result, (x) => x.Description); - row.SetProperty(context.Result, (x) => x.BottomDescription); - row.SetProperty(context.Result, (x) => x.MetaKeywords); - row.SetProperty(context.Result, (x) => x.MetaDescription); - row.SetProperty(context.Result, (x) => x.MetaTitle); - row.SetProperty(context.Result, (x) => x.PageSize); - row.SetProperty(context.Result, (x) => x.AllowCustomersToSelectPageSize); - row.SetProperty(context.Result, (x) => x.PageSizeOptions); - row.SetProperty(context.Result, (x) => x.ShowOnHomePage); - row.SetProperty(context.Result, (x) => x.HasDiscountsApplied); - row.SetProperty(context.Result, (x) => x.Published, true); - row.SetProperty(context.Result, (x) => x.DisplayOrder); - row.SetProperty(context.Result, (x) => x.Alias); - row.SetProperty(context.Result, (x) => x.DefaultViewMode); - // With new entities, "LimitedToStores" is an implicit field, meaning - // it has to be set to true by code if it's absent but "StoreIds" exists. - row.SetProperty(context.Result, (x) => x.LimitedToStores, !row.GetDataValue>("StoreIds").IsNullOrEmpty()); - - string tvp; - if (row.TryGetDataValue("CategoryTemplateViewPath", out tvp, row.IsTransient)) - { - category.CategoryTemplateId = (tvp.HasValue() && templateViewPaths.ContainsKey(tvp) ? templateViewPaths[tvp] : defaultTemplateId); - } - - if (id != 0 && !srcToDestId.ContainsKey(id)) - { - srcToDestId.Add(id, new ImportCategoryMapping { Inserted = row.IsTransient }); - } - - if (row.IsTransient) - { - _categoryRepository.Insert(category); - } - else - { - _categoryRepository.Update(category); - } - } - - // Commit whole batch at once. - var num = _categoryRepository.Context.SaveChanges(); - - // Get new category ids. - foreach (var row in batch) - { - var id = row.GetDataValue("Id"); + ++context.Result.SkippedRecords; + context.Result.AddError("The 'Name' field is required for new categories. Skipping row.", row.GetRowInfo(), "Name"); + continue; + } + + category = new Category(); + } + + row.Initialize(category, name ?? category.Name); + + if (!row.IsNew && hasNameColumn && !category.Name.Equals(name, StringComparison.OrdinalIgnoreCase)) + { + // Perf: use this later for SeName updates. + row.NameChanged = true; + } + + row.SetProperty(context.Result, (x) => x.Name); + row.SetProperty(context.Result, (x) => x.FullName); + row.SetProperty(context.Result, (x) => x.Description); + row.SetProperty(context.Result, (x) => x.BottomDescription); + row.SetProperty(context.Result, (x) => x.MetaKeywords); + row.SetProperty(context.Result, (x) => x.MetaDescription); + row.SetProperty(context.Result, (x) => x.MetaTitle); + row.SetProperty(context.Result, (x) => x.PageSize); + row.SetProperty(context.Result, (x) => x.AllowCustomersToSelectPageSize); + row.SetProperty(context.Result, (x) => x.PageSizeOptions); + row.SetProperty(context.Result, (x) => x.ShowOnHomePage); + row.SetProperty(context.Result, (x) => x.HasDiscountsApplied); + row.SetProperty(context.Result, (x) => x.Published, true); + row.SetProperty(context.Result, (x) => x.DisplayOrder); + row.SetProperty(context.Result, (x) => x.Alias); + row.SetProperty(context.Result, (x) => x.DefaultViewMode); + // With new entities, "LimitedToStores" is an implicit field, meaning + // it has to be set to true by code if it's absent but "StoreIds" exists. + row.SetProperty(context.Result, (x) => x.LimitedToStores, !row.GetDataValue>("StoreIds").IsNullOrEmpty()); + + string tvp; + if (row.TryGetDataValue("CategoryTemplateViewPath", out tvp, row.IsTransient)) + { + category.CategoryTemplateId = (tvp.HasValue() && templateViewPaths.ContainsKey(tvp) ? templateViewPaths[tvp] : defaultTemplateId); + } + + if (id != 0 && !srcToDestId.ContainsKey(id)) + { + srcToDestId.Add(id, new ImportCategoryMapping { Inserted = row.IsTransient }); + } + + if (row.IsTransient) + { + _categoryRepository.Insert(category); + } + else + { + _categoryRepository.Update(category); + } + } + + // Commit whole batch at once. + var num = _categoryRepository.Context.SaveChanges(); + + // Get new category ids. + foreach (var row in batch) + { + var id = row.GetDataValue("Id"); if (id != 0 && srcToDestId.ContainsKey(id)) { srcToDestId[id].DestinationId = row.Entity.Id; } - } - - return num; - } - - public static string[] SupportedKeyFields - { - get - { - return new string[] { "Id", "Name" }; - } - } - - public static string[] DefaultKeyFields - { - get - { - return new string[] { "Name", "Id" }; - } - } - - public class ImportCategoryMapping - { - public int DestinationId { get; set; } - public bool Inserted { get; set; } - } - } + } + + return num; + } + + public static string[] SupportedKeyFields => new string[] { "Id", "Name" }; + + public static string[] DefaultKeyFields => new string[] { "Name", "Id" }; + + public class ImportCategoryMapping + { + public int DestinationId { get; set; } + public bool Inserted { get; set; } + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs b/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs index 4f656bb7dc..cd422d6c03 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs @@ -114,7 +114,7 @@ protected override void Import(ImportExecuteContext context) } protected virtual void ImportProducts(ImportExecuteContext context) - { + { var segmenter = context.DataSegmenter; var srcToDestId = new Dictionary(); var templateViewPaths = _productTemplateService.GetAllProductTemplates().ToDictionarySafe(x => x.ViewPath, x => x.Id); @@ -598,178 +598,178 @@ protected virtual void ImportAttributeCombinations(ImportExecuteContext context) } protected virtual int ProcessProducts( - ImportExecuteContext context, - IEnumerable> batch, - Dictionary templateViewPaths, - Dictionary srcToDestId) - { - _productRepository.AutoCommitEnabled = false; - - var defaultTemplateId = templateViewPaths["Product"]; + ImportExecuteContext context, + IEnumerable> batch, + Dictionary templateViewPaths, + Dictionary srcToDestId) + { + _productRepository.AutoCommitEnabled = false; + + var defaultTemplateId = templateViewPaths["Product"]; var hasNameColumn = context.DataSegmenter.HasColumn("Name"); - + foreach (var row in batch) - { - Product product = null; - var id = row.GetDataValue("Id"); - - foreach (var keyName in context.KeyFieldNames) - { - var keyValue = row.GetDataValue(keyName); - - if (keyValue.HasValue() || id > 0) - { - switch (keyName) - { - case "Id": - product = _productRepository.GetById(id); // get it uncached - break; - case "Sku": - product = _productService.GetProductBySku(keyValue); - break; - case "Gtin": - product = _productService.GetProductByGtin(keyValue); - break; - case "ManufacturerPartNumber": - product = _productService.GetProductByManufacturerPartNumber(keyValue); - break; - case "Name": - product = _productService.GetProductByName(keyValue); - break; - } - } - - if (product != null) - break; - } - - if (product == null) - { - if (context.UpdateOnly) - { - ++context.Result.SkippedRecords; - continue; - } - - // A name is required for new products. - if (!row.HasDataValue("Name")) - { - ++context.Result.SkippedRecords; - context.Result.AddError("The 'Name' field is required for new products. Skipping row.", row.GetRowInfo(), "Name"); - continue; - } - - product = new Product(); - } - - var name = row.GetDataValue("Name"); - - row.Initialize(product, name ?? product.Name); - - if (!row.IsNew && hasNameColumn) - { - if (!product.Name.Equals(name, StringComparison.OrdinalIgnoreCase)) - { - // Perf: use this later for SeName updates. - row.NameChanged = true; - } - } - - row.SetProperty(context.Result, (x) => x.ProductTypeId, (int)ProductType.SimpleProduct); - row.SetProperty(context.Result, (x) => x.Name); - row.SetProperty(context.Result, (x) => x.ShortDescription); - row.SetProperty(context.Result, (x) => x.FullDescription); - row.SetProperty(context.Result, (x) => x.AdminComment); - row.SetProperty(context.Result, (x) => x.ShowOnHomePage); - row.SetProperty(context.Result, (x) => x.HomePageDisplayOrder); - row.SetProperty(context.Result, (x) => x.MetaKeywords); - row.SetProperty(context.Result, (x) => x.MetaDescription); - row.SetProperty(context.Result, (x) => x.MetaTitle); - row.SetProperty(context.Result, (x) => x.AllowCustomerReviews, true); - row.SetProperty(context.Result, (x) => x.ApprovedRatingSum); - row.SetProperty(context.Result, (x) => x.NotApprovedRatingSum); - row.SetProperty(context.Result, (x) => x.ApprovedTotalReviews); - row.SetProperty(context.Result, (x) => x.NotApprovedTotalReviews); - row.SetProperty(context.Result, (x) => x.Published, true); - row.SetProperty(context.Result, (x) => x.Sku); - row.SetProperty(context.Result, (x) => x.ManufacturerPartNumber); - row.SetProperty(context.Result, (x) => x.Gtin); - row.SetProperty(context.Result, (x) => x.IsGiftCard); - row.SetProperty(context.Result, (x) => x.GiftCardTypeId); - row.SetProperty(context.Result, (x) => x.RequireOtherProducts); - row.SetProperty(context.Result, (x) => x.RequiredProductIds); // TODO: global scope - row.SetProperty(context.Result, (x) => x.AutomaticallyAddRequiredProducts); - row.SetProperty(context.Result, (x) => x.IsDownload); - //row.SetProperty(context.Result, (x) => x.DownloadId); - //row.SetProperty(context.Result, (x) => x.UnlimitedDownloads, true); - row.SetProperty(context.Result, (x) => x.MaxNumberOfDownloads, 10); - row.SetProperty(context.Result, (x) => x.DownloadExpirationDays); - row.SetProperty(context.Result, (x) => x.DownloadActivationTypeId, 1); - row.SetProperty(context.Result, (x) => x.HasSampleDownload); - row.SetProperty(context.Result, (x) => x.SampleDownloadId, (int?)null, ZeroToNull); // TODO: global scope - row.SetProperty(context.Result, (x) => x.HasUserAgreement); - row.SetProperty(context.Result, (x) => x.UserAgreementText); - row.SetProperty(context.Result, (x) => x.IsRecurring); - row.SetProperty(context.Result, (x) => x.RecurringCycleLength, 100); - row.SetProperty(context.Result, (x) => x.RecurringCyclePeriodId); - row.SetProperty(context.Result, (x) => x.RecurringTotalCycles, 10); - row.SetProperty(context.Result, (x) => x.IsShipEnabled, true); - row.SetProperty(context.Result, (x) => x.IsFreeShipping); - row.SetProperty(context.Result, (x) => x.AdditionalShippingCharge); - row.SetProperty(context.Result, (x) => x.IsEsd); - row.SetProperty(context.Result, (x) => x.IsTaxExempt); - row.SetProperty(context.Result, (x) => x.TaxCategoryId, 1); // TODO: global scope - row.SetProperty(context.Result, (x) => x.ManageInventoryMethodId); - row.SetProperty(context.Result, (x) => x.StockQuantity, 10000); - row.SetProperty(context.Result, (x) => x.DisplayStockAvailability); - row.SetProperty(context.Result, (x) => x.DisplayStockQuantity); - row.SetProperty(context.Result, (x) => x.MinStockQuantity); - row.SetProperty(context.Result, (x) => x.LowStockActivityId); - row.SetProperty(context.Result, (x) => x.NotifyAdminForQuantityBelow, 1); - row.SetProperty(context.Result, (x) => x.BackorderModeId); - row.SetProperty(context.Result, (x) => x.AllowBackInStockSubscriptions); - row.SetProperty(context.Result, (x) => x.OrderMinimumQuantity, 1); - row.SetProperty(context.Result, (x) => x.OrderMaximumQuantity, 100); - row.SetProperty(context.Result, (x) => x.QuantityStep, 1); - row.SetProperty(context.Result, (x) => x.HideQuantityControl); + { + Product product = null; + var id = row.GetDataValue("Id"); + + foreach (var keyName in context.KeyFieldNames) + { + var keyValue = row.GetDataValue(keyName); + + if (keyValue.HasValue() || id > 0) + { + switch (keyName) + { + case "Id": + product = _productRepository.GetById(id); // get it uncached + break; + case "Sku": + product = _productService.GetProductBySku(keyValue); + break; + case "Gtin": + product = _productService.GetProductByGtin(keyValue); + break; + case "ManufacturerPartNumber": + product = _productService.GetProductByManufacturerPartNumber(keyValue); + break; + case "Name": + product = _productService.GetProductByName(keyValue); + break; + } + } + + if (product != null) + break; + } + + if (product == null) + { + if (context.UpdateOnly) + { + ++context.Result.SkippedRecords; + continue; + } + + // A name is required for new products. + if (!row.HasDataValue("Name")) + { + ++context.Result.SkippedRecords; + context.Result.AddError("The 'Name' field is required for new products. Skipping row.", row.GetRowInfo(), "Name"); + continue; + } + + product = new Product(); + } + + var name = row.GetDataValue("Name"); + + row.Initialize(product, name ?? product.Name); + + if (!row.IsNew && hasNameColumn) + { + if (!product.Name.Equals(name, StringComparison.OrdinalIgnoreCase)) + { + // Perf: use this later for SeName updates. + row.NameChanged = true; + } + } + + row.SetProperty(context.Result, (x) => x.ProductTypeId, (int)ProductType.SimpleProduct); + row.SetProperty(context.Result, (x) => x.Name); + row.SetProperty(context.Result, (x) => x.ShortDescription); + row.SetProperty(context.Result, (x) => x.FullDescription); + row.SetProperty(context.Result, (x) => x.AdminComment); + row.SetProperty(context.Result, (x) => x.ShowOnHomePage); + row.SetProperty(context.Result, (x) => x.HomePageDisplayOrder); + row.SetProperty(context.Result, (x) => x.MetaKeywords); + row.SetProperty(context.Result, (x) => x.MetaDescription); + row.SetProperty(context.Result, (x) => x.MetaTitle); + row.SetProperty(context.Result, (x) => x.AllowCustomerReviews, true); + row.SetProperty(context.Result, (x) => x.ApprovedRatingSum); + row.SetProperty(context.Result, (x) => x.NotApprovedRatingSum); + row.SetProperty(context.Result, (x) => x.ApprovedTotalReviews); + row.SetProperty(context.Result, (x) => x.NotApprovedTotalReviews); + row.SetProperty(context.Result, (x) => x.Published, true); + row.SetProperty(context.Result, (x) => x.Sku); + row.SetProperty(context.Result, (x) => x.ManufacturerPartNumber); + row.SetProperty(context.Result, (x) => x.Gtin); + row.SetProperty(context.Result, (x) => x.IsGiftCard); + row.SetProperty(context.Result, (x) => x.GiftCardTypeId); + row.SetProperty(context.Result, (x) => x.RequireOtherProducts); + row.SetProperty(context.Result, (x) => x.RequiredProductIds); // TODO: global scope + row.SetProperty(context.Result, (x) => x.AutomaticallyAddRequiredProducts); + row.SetProperty(context.Result, (x) => x.IsDownload); + //row.SetProperty(context.Result, (x) => x.DownloadId); + //row.SetProperty(context.Result, (x) => x.UnlimitedDownloads, true); + row.SetProperty(context.Result, (x) => x.MaxNumberOfDownloads, 10); + row.SetProperty(context.Result, (x) => x.DownloadExpirationDays); + row.SetProperty(context.Result, (x) => x.DownloadActivationTypeId, 1); + row.SetProperty(context.Result, (x) => x.HasSampleDownload); + row.SetProperty(context.Result, (x) => x.SampleDownloadId, (int?)null, ZeroToNull); // TODO: global scope + row.SetProperty(context.Result, (x) => x.HasUserAgreement); + row.SetProperty(context.Result, (x) => x.UserAgreementText); + row.SetProperty(context.Result, (x) => x.IsRecurring); + row.SetProperty(context.Result, (x) => x.RecurringCycleLength, 100); + row.SetProperty(context.Result, (x) => x.RecurringCyclePeriodId); + row.SetProperty(context.Result, (x) => x.RecurringTotalCycles, 10); + row.SetProperty(context.Result, (x) => x.IsShipEnabled, true); + row.SetProperty(context.Result, (x) => x.IsFreeShipping); + row.SetProperty(context.Result, (x) => x.AdditionalShippingCharge); + row.SetProperty(context.Result, (x) => x.IsEsd); + row.SetProperty(context.Result, (x) => x.IsTaxExempt); + row.SetProperty(context.Result, (x) => x.TaxCategoryId, 1); // TODO: global scope + row.SetProperty(context.Result, (x) => x.ManageInventoryMethodId); + row.SetProperty(context.Result, (x) => x.StockQuantity, 10000); + row.SetProperty(context.Result, (x) => x.DisplayStockAvailability); + row.SetProperty(context.Result, (x) => x.DisplayStockQuantity); + row.SetProperty(context.Result, (x) => x.MinStockQuantity); + row.SetProperty(context.Result, (x) => x.LowStockActivityId); + row.SetProperty(context.Result, (x) => x.NotifyAdminForQuantityBelow, 1); + row.SetProperty(context.Result, (x) => x.BackorderModeId); + row.SetProperty(context.Result, (x) => x.AllowBackInStockSubscriptions); + row.SetProperty(context.Result, (x) => x.OrderMinimumQuantity, 1); + row.SetProperty(context.Result, (x) => x.OrderMaximumQuantity, 100); + row.SetProperty(context.Result, (x) => x.QuantityStep, 1); + row.SetProperty(context.Result, (x) => x.HideQuantityControl); row.SetProperty(context.Result, (x) => x.AllowedQuantities); - row.SetProperty(context.Result, (x) => x.DisableBuyButton); - row.SetProperty(context.Result, (x) => x.DisableWishlistButton); - row.SetProperty(context.Result, (x) => x.AvailableForPreOrder); - row.SetProperty(context.Result, (x) => x.CallForPrice); - row.SetProperty(context.Result, (x) => x.Price); - row.SetProperty(context.Result, (x) => x.OldPrice); - row.SetProperty(context.Result, (x) => x.ProductCost); - row.SetProperty(context.Result, (x) => x.SpecialPrice); - row.SetProperty(context.Result, (x) => x.SpecialPriceStartDateTimeUtc); - row.SetProperty(context.Result, (x) => x.SpecialPriceEndDateTimeUtc); - row.SetProperty(context.Result, (x) => x.CustomerEntersPrice); - row.SetProperty(context.Result, (x) => x.MinimumCustomerEnteredPrice); - row.SetProperty(context.Result, (x) => x.MaximumCustomerEnteredPrice, 1000); - // HasTierPrices... ignore as long as no tier prices are imported - // LowestAttributeCombinationPrice... ignore as long as no combinations are imported - row.SetProperty(context.Result, (x) => x.Weight); - row.SetProperty(context.Result, (x) => x.Length); - row.SetProperty(context.Result, (x) => x.Width); - row.SetProperty(context.Result, (x) => x.Height); - row.SetProperty(context.Result, (x) => x.DisplayOrder); - row.SetProperty(context.Result, (x) => x.DeliveryTimeId); // TODO: global scope - row.SetProperty(context.Result, (x) => x.QuantityUnitId); // TODO: global scope - row.SetProperty(context.Result, (x) => x.BasePriceEnabled); - row.SetProperty(context.Result, (x) => x.BasePriceMeasureUnit); - row.SetProperty(context.Result, (x) => x.BasePriceAmount); - row.SetProperty(context.Result, (x) => x.BasePriceBaseAmount); - row.SetProperty(context.Result, (x) => x.BundleTitleText); - row.SetProperty(context.Result, (x) => x.BundlePerItemShipping); - row.SetProperty(context.Result, (x) => x.BundlePerItemPricing); - row.SetProperty(context.Result, (x) => x.BundlePerItemShoppingCart); - row.SetProperty(context.Result, (x) => x.AvailableStartDateTimeUtc); - row.SetProperty(context.Result, (x) => x.AvailableEndDateTimeUtc); - // With new entities, "LimitedToStores" is an implicit field, meaning - // it has to be set to true by code if it's absent but "StoreIds" exists. - row.SetProperty(context.Result, (x) => x.LimitedToStores, !row.GetDataValue>("StoreIds").IsNullOrEmpty()); - row.SetProperty(context.Result, (x) => x.CustomsTariffNumber); - row.SetProperty(context.Result, (x) => x.CountryOfOriginId); + row.SetProperty(context.Result, (x) => x.DisableBuyButton); + row.SetProperty(context.Result, (x) => x.DisableWishlistButton); + row.SetProperty(context.Result, (x) => x.AvailableForPreOrder); + row.SetProperty(context.Result, (x) => x.CallForPrice); + row.SetProperty(context.Result, (x) => x.Price); + row.SetProperty(context.Result, (x) => x.OldPrice); + row.SetProperty(context.Result, (x) => x.ProductCost); + row.SetProperty(context.Result, (x) => x.SpecialPrice); + row.SetProperty(context.Result, (x) => x.SpecialPriceStartDateTimeUtc); + row.SetProperty(context.Result, (x) => x.SpecialPriceEndDateTimeUtc); + row.SetProperty(context.Result, (x) => x.CustomerEntersPrice); + row.SetProperty(context.Result, (x) => x.MinimumCustomerEnteredPrice); + row.SetProperty(context.Result, (x) => x.MaximumCustomerEnteredPrice, 1000); + // HasTierPrices... ignore as long as no tier prices are imported + // LowestAttributeCombinationPrice... ignore as long as no combinations are imported + row.SetProperty(context.Result, (x) => x.Weight); + row.SetProperty(context.Result, (x) => x.Length); + row.SetProperty(context.Result, (x) => x.Width); + row.SetProperty(context.Result, (x) => x.Height); + row.SetProperty(context.Result, (x) => x.DisplayOrder); + row.SetProperty(context.Result, (x) => x.DeliveryTimeId); // TODO: global scope + row.SetProperty(context.Result, (x) => x.QuantityUnitId); // TODO: global scope + row.SetProperty(context.Result, (x) => x.BasePriceEnabled); + row.SetProperty(context.Result, (x) => x.BasePriceMeasureUnit); + row.SetProperty(context.Result, (x) => x.BasePriceAmount); + row.SetProperty(context.Result, (x) => x.BasePriceBaseAmount); + row.SetProperty(context.Result, (x) => x.BundleTitleText); + row.SetProperty(context.Result, (x) => x.BundlePerItemShipping); + row.SetProperty(context.Result, (x) => x.BundlePerItemPricing); + row.SetProperty(context.Result, (x) => x.BundlePerItemShoppingCart); + row.SetProperty(context.Result, (x) => x.AvailableStartDateTimeUtc); + row.SetProperty(context.Result, (x) => x.AvailableEndDateTimeUtc); + // With new entities, "LimitedToStores" is an implicit field, meaning + // it has to be set to true by code if it's absent but "StoreIds" exists. + row.SetProperty(context.Result, (x) => x.LimitedToStores, !row.GetDataValue>("StoreIds").IsNullOrEmpty()); + row.SetProperty(context.Result, (x) => x.CustomsTariffNumber); + row.SetProperty(context.Result, (x) => x.CountryOfOriginId); if (row.TryGetDataValue("QuantiyControlType", out int qct)) { @@ -784,74 +784,74 @@ protected virtual int ProcessProducts( product.Condition = (ProductCondition)conditionValue; } - if (row.TryGetDataValue("ProductTemplateViewPath", out string tvp, row.IsTransient)) - { - product.ProductTemplateId = tvp.HasValue() && templateViewPaths.ContainsKey(tvp) ? templateViewPaths[tvp] : defaultTemplateId; - } - - if (id != 0 && !srcToDestId.ContainsKey(id)) - { - srcToDestId.Add(id, new ImportProductMapping { Inserted = row.IsTransient }); - } - - if (row.IsTransient) - { - _productRepository.Insert(product); - } - else - { - //_productRepository.Update(product); // unnecessary: we use DetectChanges() - } - } - - // Commit whole batch at once. - var num = _productRepository.Context.SaveChanges(); - - // Get new product ids. - foreach (var row in batch) - { - var id = row.GetDataValue("Id"); + if (row.TryGetDataValue("ProductTemplateViewPath", out string tvp, row.IsTransient)) + { + product.ProductTemplateId = tvp.HasValue() && templateViewPaths.ContainsKey(tvp) ? templateViewPaths[tvp] : defaultTemplateId; + } + + if (id != 0 && !srcToDestId.ContainsKey(id)) + { + srcToDestId.Add(id, new ImportProductMapping { Inserted = row.IsTransient }); + } + + if (row.IsTransient) + { + _productRepository.Insert(product); + } + else + { + //_productRepository.Update(product); // unnecessary: we use DetectChanges() + } + } + + // Commit whole batch at once. + var num = _productRepository.Context.SaveChanges(); + + // Get new product ids. + foreach (var row in batch) + { + var id = row.GetDataValue("Id"); if (id != 0 && srcToDestId.ContainsKey(id)) { srcToDestId[id].DestinationId = row.Entity.Id; } - } - - return num; - } - - protected virtual int ProcessProductMappings( - ImportExecuteContext context, - IEnumerable> batch, - Dictionary srcToDestId) - { - _productRepository.AutoCommitEnabled = false; - - foreach (var row in batch) - { - var id = row.GetDataValue("Id"); - var parentGroupedProductId = row.GetDataValue("ParentGroupedProductId"); - - if (id != 0 && parentGroupedProductId != 0 && srcToDestId.ContainsKey(id) && srcToDestId.ContainsKey(parentGroupedProductId)) - { - if (srcToDestId[id].DestinationId != 0) - { - var product = _productRepository.GetById(srcToDestId[id].DestinationId); - if (product != null) - { - product.ParentGroupedProductId = srcToDestId[parentGroupedProductId].DestinationId; - //_productRepository.Update(product); // unnecessary: we use DetectChanges() - } - } - } - } - - var num = _productRepository.Context.SaveChanges(); - return num; - } - - protected virtual void ProcessProductPictures(ImportExecuteContext context, IEnumerable> batch) - { + } + + return num; + } + + protected virtual int ProcessProductMappings( + ImportExecuteContext context, + IEnumerable> batch, + Dictionary srcToDestId) + { + _productRepository.AutoCommitEnabled = false; + + foreach (var row in batch) + { + var id = row.GetDataValue("Id"); + var parentGroupedProductId = row.GetDataValue("ParentGroupedProductId"); + + if (id != 0 && parentGroupedProductId != 0 && srcToDestId.ContainsKey(id) && srcToDestId.ContainsKey(parentGroupedProductId)) + { + if (srcToDestId[id].DestinationId != 0) + { + var product = _productRepository.GetById(srcToDestId[id].DestinationId); + if (product != null) + { + product.ParentGroupedProductId = srcToDestId[parentGroupedProductId].DestinationId; + //_productRepository.Update(product); // unnecessary: we use DetectChanges() + } + } + } + } + + var num = _productRepository.Context.SaveChanges(); + return num; + } + + protected virtual void ProcessProductPictures(ImportExecuteContext context, IEnumerable> batch) + { _productRepository.AutoCommitEnabled = false; var numberOfPictures = context.ExtraData.NumberOfPictures ?? int.MaxValue; @@ -859,8 +859,8 @@ protected virtual void ProcessProductPictures(ImportExecuteContext context, IEnu var tmpFileMap = _productService.GetProductPicturesByProductIds(productIds, null, MediaLoadFlags.None); foreach (var row in batch) - { - var imageUrls = row.GetDataValue>("ImageUrls"); + { + var imageUrls = row.GetDataValue>("ImageUrls"); if (imageUrls.IsNullOrEmpty()) { continue; @@ -868,38 +868,38 @@ protected virtual void ProcessProductPictures(ImportExecuteContext context, IEnu var productId = row.Entity.Id; var imageNumber = 0; - var displayOrder = -1; - var imageFiles = new List(); + var displayOrder = -1; + var imageFiles = new List(); - // Collect required image file infos. - foreach (var urlOrPath in imageUrls) - { - var image = CreateDownloadImage(context, urlOrPath, ++imageNumber); + // Collect required image file infos. + foreach (var urlOrPath in imageUrls) + { + var image = CreateDownloadImage(context, urlOrPath, ++imageNumber); - if (image != null) - imageFiles.Add(image); + if (image != null) + imageFiles.Add(image); - if (imageFiles.Count >= numberOfPictures) - break; - } + if (imageFiles.Count >= numberOfPictures) + break; + } - // Download images. - if (imageFiles.Any(x => x.Url.HasValue())) - { - // Async downloading in batch processing is inefficient cause only the image processing benefits from async, - // not the record processing itself. A per record processing may speed up the import. + // Download images. + if (imageFiles.Any(x => x.Url.HasValue())) + { + // Async downloading in batch processing is inefficient cause only the image processing benefits from async, + // not the record processing itself. A per record processing may speed up the import. - AsyncRunner.RunSync(() => _fileDownloadManager.DownloadAsync(DownloaderContext, imageFiles.Where(x => x.Url.HasValue() && !x.Success.HasValue))); - } + AsyncRunner.RunSync(() => _fileDownloadManager.DownloadAsync(DownloaderContext, imageFiles.Where(x => x.Url.HasValue() && !x.Success.HasValue))); + } // Import images. foreach (var image in imageFiles.OrderBy(x => x.DisplayOrder)) - { - try - { - if ((image.Success ?? false) && File.Exists(image.Path)) - { - Succeeded(image); + { + try + { + if ((image.Success ?? false) && File.Exists(image.Path)) + { + Succeeded(image); using (var stream = File.OpenRead(image.Path)) { if ((stream?.Length ?? 0) > 0) @@ -931,7 +931,7 @@ protected virtual void ProcessProductPictures(ImportExecuteContext context, IEnu tmpFileMap.Add(productId, productMediaFile); // Update for FixProductMainPictureIds. row.Entity.UpdatedOnUtc = DateTime.UtcNow; - + //_productRepository.Update(row.Entity); } } @@ -941,107 +941,107 @@ protected virtual void ProcessProductPictures(ImportExecuteContext context, IEnu } } } - } - else if (image.Url.HasValue()) - { - context.Result.AddInfo($"Download failed for image {image.Url}.", row.GetRowInfo(), "ImageUrls" + image.DisplayOrder.ToString()); - } - } - catch (Exception ex) - { - context.Result.AddWarning(ex.ToAllMessages(), row.GetRowInfo(), "ImageUrls" + image.DisplayOrder.ToString()); - } - } - } + } + else if (image.Url.HasValue()) + { + context.Result.AddInfo($"Download failed for image {image.Url}.", row.GetRowInfo(), "ImageUrls" + image.DisplayOrder.ToString()); + } + } + catch (Exception ex) + { + context.Result.AddWarning(ex.ToAllMessages(), row.GetRowInfo(), "ImageUrls" + image.DisplayOrder.ToString()); + } + } + } _productRepository.Context.SaveChanges(); } - protected virtual int ProcessProductManufacturers(ImportExecuteContext context, IEnumerable> batch) - { - _productManufacturerRepository.AutoCommitEnabled = false; - - foreach (var row in batch) - { - var manufacturerIds = row.GetDataValue>("ManufacturerIds"); - if (!manufacturerIds.IsNullOrEmpty()) - { - try - { - foreach (var id in manufacturerIds) - { - if (_productManufacturerRepository.TableUntracked.Where(x => x.ProductId == row.Entity.Id && x.ManufacturerId == id).FirstOrDefault() == null) - { - // Ensure that manufacturer exists. - var manufacturer = _manufacturerService.GetManufacturerById(id); - if (manufacturer != null) - { - var productManufacturer = new ProductManufacturer - { - ProductId = row.Entity.Id, - ManufacturerId = manufacturer.Id, - IsFeaturedProduct = false, - DisplayOrder = 1 - }; - _productManufacturerRepository.Insert(productManufacturer); - } - } - } - } - catch (Exception ex) - { - context.Result.AddWarning(ex.Message, row.GetRowInfo(), "ManufacturerIds"); - } - } - } - - // Commit whole batch at once. - var num = _productManufacturerRepository.Context.SaveChanges(); - return num; - } - - protected virtual int ProcessProductCategories(ImportExecuteContext context, IEnumerable> batch) - { - _productCategoryRepository.AutoCommitEnabled = false; - - foreach (var row in batch) - { - var categoryIds = row.GetDataValue>("CategoryIds"); - if (!categoryIds.IsNullOrEmpty()) - { - try - { - foreach (var id in categoryIds) - { - if (!_productCategoryRepository.TableUntracked.Any(x => x.ProductId == row.Entity.Id && x.CategoryId == id)) - { - // Ensure that category exists. - var category = _categoryService.GetCategoryById(id); - if (category != null) - { - var productCategory = new ProductCategory - { - ProductId = row.Entity.Id, - CategoryId = category.Id, - IsFeaturedProduct = false, - DisplayOrder = 1 - }; - _productCategoryRepository.Insert(productCategory); - } - } - } - } - catch (Exception ex) - { - context.Result.AddWarning(ex.Message, row.GetRowInfo(), "CategoryIds"); - } - } - } - - // Commit whole batch at once, - var num = _productCategoryRepository.Context.SaveChanges(); - return num; - } + protected virtual int ProcessProductManufacturers(ImportExecuteContext context, IEnumerable> batch) + { + _productManufacturerRepository.AutoCommitEnabled = false; + + foreach (var row in batch) + { + var manufacturerIds = row.GetDataValue>("ManufacturerIds"); + if (!manufacturerIds.IsNullOrEmpty()) + { + try + { + foreach (var id in manufacturerIds) + { + if (_productManufacturerRepository.TableUntracked.Where(x => x.ProductId == row.Entity.Id && x.ManufacturerId == id).FirstOrDefault() == null) + { + // Ensure that manufacturer exists. + var manufacturer = _manufacturerService.GetManufacturerById(id); + if (manufacturer != null) + { + var productManufacturer = new ProductManufacturer + { + ProductId = row.Entity.Id, + ManufacturerId = manufacturer.Id, + IsFeaturedProduct = false, + DisplayOrder = 1 + }; + _productManufacturerRepository.Insert(productManufacturer); + } + } + } + } + catch (Exception ex) + { + context.Result.AddWarning(ex.Message, row.GetRowInfo(), "ManufacturerIds"); + } + } + } + + // Commit whole batch at once. + var num = _productManufacturerRepository.Context.SaveChanges(); + return num; + } + + protected virtual int ProcessProductCategories(ImportExecuteContext context, IEnumerable> batch) + { + _productCategoryRepository.AutoCommitEnabled = false; + + foreach (var row in batch) + { + var categoryIds = row.GetDataValue>("CategoryIds"); + if (!categoryIds.IsNullOrEmpty()) + { + try + { + foreach (var id in categoryIds) + { + if (!_productCategoryRepository.TableUntracked.Any(x => x.ProductId == row.Entity.Id && x.CategoryId == id)) + { + // Ensure that category exists. + var category = _categoryService.GetCategoryById(id); + if (category != null) + { + var productCategory = new ProductCategory + { + ProductId = row.Entity.Id, + CategoryId = category.Id, + IsFeaturedProduct = false, + DisplayOrder = 1 + }; + _productCategoryRepository.Insert(productCategory); + } + } + } + } + catch (Exception ex) + { + context.Result.AddWarning(ex.Message, row.GetRowInfo(), "CategoryIds"); + } + } + } + + // Commit whole batch at once, + var num = _productCategoryRepository.Context.SaveChanges(); + return num; + } protected virtual void ProcessProductTags(ImportExecuteContext context, IEnumerable> batch) { @@ -1133,35 +1133,23 @@ protected virtual void ProcessProductTags(ImportExecuteContext context, IEnumera } private int? ZeroToNull(object value, CultureInfo culture) - { - if (CommonHelper.TryConvert(value, culture, out int result) && result > 0) - { - return result; - } - - return (int?)null; - } - - public static string[] SupportedKeyFields - { - get - { - return new string[] { "Id", "Sku", "Gtin", "ManufacturerPartNumber", "Name" }; - } - } - - public static string[] DefaultKeyFields - { - get - { - return new string[] { "Sku", "Gtin", "ManufacturerPartNumber" }; - } - } - - public class ImportProductMapping - { - public int DestinationId { get; set; } - public bool Inserted { get; set; } - } - } + { + if (CommonHelper.TryConvert(value, culture, out int result) && result > 0) + { + return result; + } + + return (int?)null; + } + + public static string[] SupportedKeyFields => new string[] { "Id", "Sku", "Gtin", "ManufacturerPartNumber", "Name" }; + + public static string[] DefaultKeyFields => new string[] { "Sku", "Gtin", "ManufacturerPartNumber" }; + + public class ImportProductMapping + { + public int DestinationId { get; set; } + public bool Inserted { get; set; } + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs b/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs index b2bca811ef..218387e4cc 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs @@ -25,46 +25,46 @@ public partial class ManufacturerService : IManufacturerService, IXmlSitemapPubl private readonly IRepository _manufacturerRepository; private readonly IRepository _productManufacturerRepository; private readonly IRepository _productRepository; - private readonly IRepository _storeMappingRepository; + private readonly IRepository _storeMappingRepository; private readonly IRepository _aclRepository; private readonly IWorkContext _workContext; - private readonly IStoreContext _storeContext; + private readonly IStoreContext _storeContext; private readonly IRequestCache _requestCache; - public ManufacturerService(IRequestCache requestCache, + public ManufacturerService(IRequestCache requestCache, IRepository manufacturerRepository, IRepository productManufacturerRepository, IRepository productRepository, - IRepository storeMappingRepository, + IRepository storeMappingRepository, IRepository aclRepository, IWorkContext workContext, - IStoreContext storeContext) + IStoreContext storeContext) { _requestCache = requestCache; _manufacturerRepository = manufacturerRepository; _productManufacturerRepository = productManufacturerRepository; _productRepository = productRepository; - _storeMappingRepository = storeMappingRepository; + _storeMappingRepository = storeMappingRepository; _aclRepository = aclRepository; - _workContext = workContext; - _storeContext = storeContext; + _workContext = workContext; + _storeContext = storeContext; - QuerySettings = DbQuerySettings.Default; - } + QuerySettings = DbQuerySettings.Default; + } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } public virtual void DeleteManufacturer(Manufacturer manufacturer) { if (manufacturer == null) throw new ArgumentNullException("manufacturer"); - + manufacturer.Deleted = true; UpdateManufacturer(manufacturer); } - public virtual IQueryable GetManufacturers(bool showHidden = false, int storeId = 0) - { + public virtual IQueryable GetManufacturers(bool showHidden = false, int storeId = 0) + { var grouping = false; var entityName = nameof(Manufacturer); var query = _manufacturerRepository.Table.Where(m => !m.Deleted); @@ -76,16 +76,16 @@ public virtual IQueryable GetManufacturers(bool showHidden = false // Store mapping. if (!showHidden && storeId > 0 && !QuerySettings.IgnoreMultiStore) - { - query = from m in query - join sm in _storeMappingRepository.Table - on new { m1 = m.Id, m2 = entityName } equals new { m1 = sm.EntityId, m2 = sm.EntityName } into m_sm - from sm in m_sm.DefaultIfEmpty() - where !m.LimitedToStores || storeId == sm.StoreId - select m; + { + query = from m in query + join sm in _storeMappingRepository.Table + on new { m1 = m.Id, m2 = entityName } equals new { m1 = sm.EntityId, m2 = sm.EntityName } into m_sm + from sm in m_sm.DefaultIfEmpty() + where !m.LimitedToStores || storeId == sm.StoreId + select m; grouping = true; - } + } // ACL (access control list). if (!showHidden && !QuerySettings.IgnoreAcl) @@ -104,7 +104,7 @@ from a in ma.DefaultIfEmpty() if (grouping) { - query = + query = from m in query group m by m.Id into mGroup orderby mGroup.Key @@ -112,7 +112,7 @@ orderby mGroup.Key } return query; - } + } public virtual IList GetAllManufacturers(bool showHidden = false) { @@ -121,19 +121,19 @@ public virtual IList GetAllManufacturers(bool showHidden = false) public virtual IList GetAllManufacturers(string manufacturerName, int storeId = 0, bool showHidden = false) { - var query = GetManufacturers(showHidden, storeId); + var query = GetManufacturers(showHidden, storeId); - if (manufacturerName.HasValue()) - query = query.Where(m => m.Name.Contains(manufacturerName)); + if (manufacturerName.HasValue()) + query = query.Where(m => m.Name.Contains(manufacturerName)); - query = query.OrderBy(m => m.DisplayOrder) - .ThenBy(m => m.Name); + query = query.OrderBy(m => m.DisplayOrder) + .ThenBy(m => m.Name); var manufacturers = query.ToList(); return manufacturers; } - public virtual IPagedList GetAllManufacturers(string manufacturerName, + public virtual IPagedList GetAllManufacturers(string manufacturerName, int pageIndex, int pageSize, int storeId = 0, bool showHidden = false) { var manufacturers = GetAllManufacturers(manufacturerName, storeId, showHidden); @@ -145,8 +145,8 @@ public virtual Manufacturer GetManufacturerById(int manufacturerId) if (manufacturerId == 0) return null; - return _manufacturerRepository.GetByIdCached(manufacturerId, "db.manu.id-" + manufacturerId); - } + return _manufacturerRepository.GetByIdCached(manufacturerId, "db.manu.id-" + manufacturerId); + } public virtual IList GetManufacturersByIds(int[] manufacturerIds) { @@ -189,15 +189,15 @@ public virtual void UpdateManufacturer(Manufacturer manufacturer) _requestCache.RemoveByPattern(PRODUCTMANUFACTURERS_PATTERN_KEY); } - public virtual void UpdateHasDiscountsApplied(Manufacturer manufacturer) - { - Guard.NotNull(manufacturer, nameof(manufacturer)); + public virtual void UpdateHasDiscountsApplied(Manufacturer manufacturer) + { + Guard.NotNull(manufacturer, nameof(manufacturer)); - manufacturer.HasDiscountsApplied = manufacturer.AppliedDiscounts.Count > 0; - UpdateManufacturer(manufacturer); - } + manufacturer.HasDiscountsApplied = manufacturer.AppliedDiscounts.Count > 0; + UpdateManufacturer(manufacturer); + } - public virtual void DeleteProductManufacturer(ProductManufacturer productManufacturer) + public virtual void DeleteProductManufacturer(ProductManufacturer productManufacturer) { if (productManufacturer == null) throw new ArgumentNullException("productManufacturer"); @@ -248,65 +248,65 @@ public virtual IList GetProductManufacturersByProductId(int var key = string.Format(PRODUCTMANUFACTURERS_ALLBYPRODUCTID_KEY, showHidden, productId, rolesToken, storeToken); return _requestCache.Get(key, () => - { - var query = from pm in _productManufacturerRepository.Table - join m in _manufacturerRepository.Table on pm.ManufacturerId equals m.Id - where pm.ProductId == productId && !m.Deleted && (showHidden || m.Published) - select pm; + { + var query = from pm in _productManufacturerRepository.Table + join m in _manufacturerRepository.Table on pm.ManufacturerId equals m.Id + where pm.ProductId == productId && !m.Deleted && (showHidden || m.Published) + select pm; query = ApplyHiddenProductManufacturerFilter(query, storeId, showHidden); query = query.OrderBy(pm => pm.DisplayOrder); query = query.Include(pm => pm.Manufacturer.MediaFile); var productManufacturers = query.ToList(); - return productManufacturers; - }); + return productManufacturers; + }); } - public virtual Multimap GetProductManufacturersByManufacturerIds(int[] manufacturerIds, bool showHidden = false) - { - Guard.NotNull(manufacturerIds, nameof(manufacturerIds)); + public virtual Multimap GetProductManufacturersByManufacturerIds(int[] manufacturerIds, bool showHidden = false) + { + Guard.NotNull(manufacturerIds, nameof(manufacturerIds)); var query = _productManufacturerRepository.TableUntracked - .Where(x => manufacturerIds.Contains(x.ManufacturerId)); + .Where(x => manufacturerIds.Contains(x.ManufacturerId)); query = ApplyHiddenProductManufacturerFilter(query, _storeContext.CurrentStore.Id, showHidden); query = query.OrderBy(pm => pm.DisplayOrder); var map = query - .ToList() - .ToMultimap(x => x.ManufacturerId, x => x); + .ToList() + .ToMultimap(x => x.ManufacturerId, x => x); - return map; - } + return map; + } - public virtual Multimap GetProductManufacturersByProductIds(int[] productIds, bool showHidden = false) - { - Guard.NotNull(productIds, nameof(productIds)); + public virtual Multimap GetProductManufacturersByProductIds(int[] productIds, bool showHidden = false) + { + Guard.NotNull(productIds, nameof(productIds)); if (!productIds.Any()) { return new Multimap(); } - var query = - from pm in _productManufacturerRepository.TableUntracked - //join m in _manufacturerRepository.TableUntracked on pm.ManufacturerId equals m.Id // Eager loading does not work with this join - where !pm.Manufacturer.Deleted && productIds.Contains(pm.ProductId) - select pm; + var query = + from pm in _productManufacturerRepository.TableUntracked + //join m in _manufacturerRepository.TableUntracked on pm.ManufacturerId equals m.Id // Eager loading does not work with this join + where !pm.Manufacturer.Deleted && productIds.Contains(pm.ProductId) + select pm; query = ApplyHiddenProductManufacturerFilter(query, _storeContext.CurrentStore.Id, showHidden); query = query.Include(x => x.Manufacturer.MediaFile); - var map = query - .OrderBy(x => x.ProductId) - .ThenBy(x => x.DisplayOrder) - .ToList() - .ToMultimap(x => x.ProductId, x => x); + var map = query + .OrderBy(x => x.ProductId) + .ThenBy(x => x.DisplayOrder) + .ToList() + .ToMultimap(x => x.ProductId, x => x); + + return map; + } - return map; - } - public virtual ProductManufacturer GetProductManufacturerById(int productManufacturerId) { if (productManufacturerId == 0) @@ -346,7 +346,7 @@ protected virtual IQueryable ApplyHiddenProductManufacturer // Store mapping. if (!showHidden && storeId > 0 && !QuerySettings.IgnoreMultiStore) { - query = + query = from pm in query join m in _manufacturerRepository.Table on pm.ManufacturerId equals m.Id join sm in _storeMappingRepository.Table @@ -390,35 +390,35 @@ orderby pmGroup.Key #region XML Sitemap public XmlSitemapProvider PublishXmlSitemap(XmlSitemapBuildContext context) - { - if (!context.LoadSetting().XmlSitemapIncludesManufacturers) - return null; - - var query = GetManufacturers(false, context.RequestStoreId).OrderBy(x => x.DisplayOrder).ThenBy(x => x.Name); - return new ManufacturerXmlSitemapResult { Query = query }; - } - - class ManufacturerXmlSitemapResult : XmlSitemapProvider - { - public IQueryable Query { get; set; } - - public override int GetTotalCount() - { - return Query.Count(); - } - - public override IEnumerable Enlist() - { - var topics = Query.Select(x => new { x.Id, x.UpdatedOnUtc }).ToList(); - foreach (var x in topics) - { - yield return new NamedEntity { EntityName = "Manufacturer", Id = x.Id, LastMod = x.UpdatedOnUtc }; - } - } - - public override int Order => int.MinValue + 100; - } - - #endregion - } + { + if (!context.LoadSetting().XmlSitemapIncludesManufacturers) + return null; + + var query = GetManufacturers(false, context.RequestStoreId).OrderBy(x => x.DisplayOrder).ThenBy(x => x.Name); + return new ManufacturerXmlSitemapResult { Query = query }; + } + + class ManufacturerXmlSitemapResult : XmlSitemapProvider + { + public IQueryable Query { get; set; } + + public override int GetTotalCount() + { + return Query.Count(); + } + + public override IEnumerable Enlist() + { + var topics = Query.Select(x => new { x.Id, x.UpdatedOnUtc }).ToList(); + foreach (var x in topics) + { + yield return new NamedEntity { EntityName = "Manufacturer", Id = x.Id, LastMod = x.UpdatedOnUtc }; + } + } + + public override int Order => int.MinValue + 100; + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ManufacturerTemplateService.cs b/src/Libraries/SmartStore.Services/Catalog/ManufacturerTemplateService.cs index eae06162de..82df97a567 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ManufacturerTemplateService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ManufacturerTemplateService.cs @@ -35,7 +35,7 @@ orderby pt.DisplayOrder var templates = query.ToList(); return templates; } - + public virtual ManufacturerTemplate GetManufacturerTemplateById(int manufacturerTemplateId) { if (manufacturerTemplateId == 0) diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/CheckoutAttributeQueryItem.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/CheckoutAttributeQueryItem.cs index cc35919d93..81014679e0 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/CheckoutAttributeQueryItem.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/CheckoutAttributeQueryItem.cs @@ -2,48 +2,48 @@ namespace SmartStore.Services.Catalog.Modelling { - public class CheckoutAttributeQueryItem - { - public CheckoutAttributeQueryItem(int attributeId, string value) - { - Value = value ?? string.Empty; - AttributeId = attributeId; - } + public class CheckoutAttributeQueryItem + { + public CheckoutAttributeQueryItem(int attributeId, string value) + { + Value = value ?? string.Empty; + AttributeId = attributeId; + } - /// - /// Key used for form names. - /// - /// Checkout attribute identifier - /// Key - public static string CreateKey(int attributeId) - { - return $"cattr{attributeId}"; - } + /// + /// Key used for form names. + /// + /// Checkout attribute identifier + /// Key + public static string CreateKey(int attributeId) + { + return $"cattr{attributeId}"; + } - public string Value { get; private set; } - public int AttributeId { get; private set; } - public DateTime? Date { get; set; } - public bool IsFile { get; set; } - public bool IsText { get; set; } + public string Value { get; private set; } + public int AttributeId { get; private set; } + public DateTime? Date { get; set; } + public bool IsFile { get; set; } + public bool IsText { get; set; } - public override string ToString() - { - var key = CreateKey(AttributeId); + public override string ToString() + { + var key = CreateKey(AttributeId); - if (Date.HasValue) - { - return key + "-date"; - } - else if (IsFile) - { - return key + "-file"; - } - else if (IsText) - { - return key + "-text"; - } + if (Date.HasValue) + { + return key + "-date"; + } + else if (IsFile) + { + return key + "-file"; + } + else if (IsText) + { + return key + "-text"; + } - return key; - } - } + return key; + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/GiftCardQueryItem.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/GiftCardQueryItem.cs index df61daf13b..26cc81b71e 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/GiftCardQueryItem.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/GiftCardQueryItem.cs @@ -1,40 +1,40 @@ namespace SmartStore.Services.Catalog.Modelling { - public class GiftCardQueryItem - { - public GiftCardQueryItem(string name, string value) - { - Guard.NotEmpty(name, nameof(name)); + public class GiftCardQueryItem + { + public GiftCardQueryItem(string name, string value) + { + Guard.NotEmpty(name, nameof(name)); - Name = name.ToLower(); - Value = value ?? string.Empty; + Name = name.ToLower(); + Value = value ?? string.Empty; - if (Name.StartsWith(".")) - { - Name = Name.Substring(1); - } - } + if (Name.StartsWith(".")) + { + Name = Name.Substring(1); + } + } - public static string CreateKey(int productId, int bundleItemId, string name) - { - if (name.HasValue()) - { - return $"giftcard{productId}-{bundleItemId}-.{name.EmptyNull().ToLower()}"; - } + public static string CreateKey(int productId, int bundleItemId, string name) + { + if (name.HasValue()) + { + return $"giftcard{productId}-{bundleItemId}-.{name.EmptyNull().ToLower()}"; + } - // Just return field prefix for partial views. - return $"giftcard{productId}-{bundleItemId}-"; - } + // Just return field prefix for partial views. + return $"giftcard{productId}-{bundleItemId}-"; + } - public string Name { get; private set; } - public string Value { get; private set; } + public string Name { get; private set; } + public string Value { get; private set; } - public int ProductId { get; set; } - public int BundleItemId { get; set; } + public int ProductId { get; set; } + public int BundleItemId { get; set; } - public override string ToString() - { - return CreateKey(ProductId, BundleItemId, Name); - } - } + public override string ToString() + { + return CreateKey(ProductId, BundleItemId, Name); + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/IProductVariantQueryFactory.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/IProductVariantQueryFactory.cs index 119a770832..178e8d4efc 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/IProductVariantQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/IProductVariantQueryFactory.cs @@ -1,17 +1,17 @@ namespace SmartStore.Services.Catalog.Modelling { - public interface IProductVariantQueryFactory - { - /// - /// The last created product variant query. The MVC model binder uses this property to avoid repeated binding. - /// - ProductVariantQuery Current { get; } + public interface IProductVariantQueryFactory + { + /// + /// The last created product variant query. The MVC model binder uses this property to avoid repeated binding. + /// + ProductVariantQuery Current { get; } - /// - /// Creates a name value collection with product variants from the current - /// by looking up corresponding keys in posted form and/or query string - /// - /// Product variant query - ProductVariantQuery CreateFromQuery(); - } + /// + /// Creates a name value collection with product variants from the current + /// by looking up corresponding keys in posted form and/or query string + /// + /// Product variant query + ProductVariantQuery CreateFromQuery(); + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQuery.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQuery.cs index e8fe50918a..bcbdc7f8db 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQuery.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQuery.cs @@ -3,79 +3,61 @@ namespace SmartStore.Services.Catalog.Modelling { - public class ProductVariantQuery - { - private readonly List _variants; - private readonly List _giftCards; - private readonly List _checkoutAttributes; - - public ProductVariantQuery() - { - _variants = new List(); - _giftCards = new List(); - _checkoutAttributes = new List(); - } + public class ProductVariantQuery + { + private readonly List _variants; + private readonly List _giftCards; + private readonly List _checkoutAttributes; + + public ProductVariantQuery() + { + _variants = new List(); + _giftCards = new List(); + _checkoutAttributes = new List(); + } public int VariantCombinationId { get; set; } - public IReadOnlyList Variants - { - get - { - return _variants; - } - } - - public IReadOnlyList GiftCards - { - get - { - return _giftCards; - } - } - - public IReadOnlyList CheckoutAttributes - { - get - { - return _checkoutAttributes; - } - } - - public void AddVariant(ProductVariantQueryItem item) - { - _variants.Add(item); - } - - public void AddGiftCard(GiftCardQueryItem item) - { - _giftCards.Add(item); - } - - public void AddCheckoutAttribute(CheckoutAttributeQueryItem item) - { - _checkoutAttributes.Add(item); - } - - public string GetGiftCardValue(int productId, int bundleItemId, string name) - { - return _giftCards.FirstOrDefault(x => - x.ProductId == productId && - x.BundleItemId == bundleItemId && - x.Name.IsCaseInsensitiveEqual(name)) - ?.Value; - } - - public override string ToString() - { - var groups = new string[] - { - string.Join("&", Variants.Select(x => x.ToString())), - string.Join("&", GiftCards.Select(x => x.ToString())), - string.Join("&", CheckoutAttributes.Select(x => x.ToString())) - }; - - return string.Join("&", groups.Where(x => x.HasValue())); - } - } + public IReadOnlyList Variants => _variants; + + public IReadOnlyList GiftCards => _giftCards; + + public IReadOnlyList CheckoutAttributes => _checkoutAttributes; + + public void AddVariant(ProductVariantQueryItem item) + { + _variants.Add(item); + } + + public void AddGiftCard(GiftCardQueryItem item) + { + _giftCards.Add(item); + } + + public void AddCheckoutAttribute(CheckoutAttributeQueryItem item) + { + _checkoutAttributes.Add(item); + } + + public string GetGiftCardValue(int productId, int bundleItemId, string name) + { + return _giftCards.FirstOrDefault(x => + x.ProductId == productId && + x.BundleItemId == bundleItemId && + x.Name.IsCaseInsensitiveEqual(name)) + ?.Value; + } + + public override string ToString() + { + var groups = new string[] + { + string.Join("&", Variants.Select(x => x.ToString())), + string.Join("&", GiftCards.Select(x => x.ToString())), + string.Join("&", CheckoutAttributes.Select(x => x.ToString())) + }; + + return string.Join("&", groups.Where(x => x.HasValue())); + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs index 04543438ff..771093c047 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs @@ -9,68 +9,68 @@ namespace SmartStore.Services.Catalog.Modelling { public class ProductVariantQueryFactory : IProductVariantQueryFactory - { - internal static readonly Regex IsVariantKey = new Regex(@"pvari[0-9]+-[0-9]+-[0-9]+-[0-9]+", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); - internal static readonly Regex IsVariantAliasKey = new Regex(@"\w+-[0-9]+-[0-9]+-[0-9]+", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); - internal static readonly Regex IsGiftCardKey = new Regex(@"giftcard[0-9]+-[0-9]+-\.\w+$", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); - internal static readonly Regex IsCheckoutAttributeKey = new Regex(@"cattr[0-9]+", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); - - protected readonly HttpContextBase _httpContext; - protected readonly ICommonServices _services; - protected readonly ICatalogSearchQueryAliasMapper _catalogSearchQueryAliasMapper; - private Multimap _queryItems; - - public ProductVariantQueryFactory( - HttpContextBase httpContext, - ICommonServices services, - ICatalogSearchQueryAliasMapper catalogSearchQueryAliasMapper) - { - _httpContext = httpContext; - _services = services; - _catalogSearchQueryAliasMapper = catalogSearchQueryAliasMapper; - } - - protected Multimap QueryItems - { - get - { - if (_queryItems == null) - { - _queryItems = new Multimap(); - - if (_httpContext.Request?.Unvalidated != null) - { - var form = _httpContext.Request.Unvalidated.Form; - - if (form != null) - { - foreach (var key in form.AllKeys) - { - if (key.HasValue()) - { - _queryItems.AddRange(key, form[key].SplitSafe(",")); - } - } - } + { + internal static readonly Regex IsVariantKey = new Regex(@"pvari[0-9]+-[0-9]+-[0-9]+-[0-9]+", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); + internal static readonly Regex IsVariantAliasKey = new Regex(@"\w+-[0-9]+-[0-9]+-[0-9]+", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); + internal static readonly Regex IsGiftCardKey = new Regex(@"giftcard[0-9]+-[0-9]+-\.\w+$", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); + internal static readonly Regex IsCheckoutAttributeKey = new Regex(@"cattr[0-9]+", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); + + protected readonly HttpContextBase _httpContext; + protected readonly ICommonServices _services; + protected readonly ICatalogSearchQueryAliasMapper _catalogSearchQueryAliasMapper; + private Multimap _queryItems; + + public ProductVariantQueryFactory( + HttpContextBase httpContext, + ICommonServices services, + ICatalogSearchQueryAliasMapper catalogSearchQueryAliasMapper) + { + _httpContext = httpContext; + _services = services; + _catalogSearchQueryAliasMapper = catalogSearchQueryAliasMapper; + } + + protected Multimap QueryItems + { + get + { + if (_queryItems == null) + { + _queryItems = new Multimap(); + + if (_httpContext.Request?.Unvalidated != null) + { + var form = _httpContext.Request.Unvalidated.Form; + + if (form != null) + { + foreach (var key in form.AllKeys) + { + if (key.HasValue()) + { + _queryItems.AddRange(key, form[key].SplitSafe(",")); + } + } + } var query = _httpContext.Request.Unvalidated.QueryString; if (query != null) - { - foreach (var key in query.AllKeys) - { - if (key.HasValue()) - { - _queryItems.AddRange(key, query[key].SplitSafe(",")); - } - } - } - } - } - - return _queryItems; - } - } + { + foreach (var key in query.AllKeys) + { + if (key.HasValue()) + { + _queryItems.AddRange(key, query[key].SplitSafe(",")); + } + } + } + } + } + + return _queryItems; + } + } public ProductVariantQuery Current { get; private set; } @@ -123,53 +123,53 @@ public ProductVariantQuery CreateFromQuery() } private DateTime? ConvertToDate(string key, string value) - { - var year = 0; - var month = 0; - var day = 0; - - if (key.EndsWith("-date")) - { - // Convert from one query string item. - var dateItems = value.SplitSafe("-"); - year = dateItems.SafeGet(0).ToInt(); - month = dateItems.SafeGet(1).ToInt(); - day = dateItems.SafeGet(2).ToInt(); - } - else if (key.EndsWith("-year")) - { - // Convert from three form controls. - var dateKey = key.Replace("-year", ""); - year = value.ToInt(); - month = QueryItems[dateKey + "-month"].FirstOrDefault()?.ToInt() ?? 0; - day = QueryItems[dateKey + "-day"].FirstOrDefault()?.ToInt() ?? 0; - } - - if (year > 0 && month > 0 && day > 0) - { - try - { - return new DateTime(year, month, day); - } - catch { } - } - - return null; - } - - protected virtual void ConvertVariant(ProductVariantQuery query, string key, ICollection values) - { - var ids = key.Replace("pvari", "").SplitSafe("-"); - if (ids.Length < 4) - return; - - var isDate = key.EndsWith("-date") || key.EndsWith("-year"); - var isFile = key.EndsWith("-file"); - var isText = key.EndsWith("-text"); - - if (isDate || isFile || isText) - { - var value = isText ? string.Join(",", values) : values.First(); + { + var year = 0; + var month = 0; + var day = 0; + + if (key.EndsWith("-date")) + { + // Convert from one query string item. + var dateItems = value.SplitSafe("-"); + year = dateItems.SafeGet(0).ToInt(); + month = dateItems.SafeGet(1).ToInt(); + day = dateItems.SafeGet(2).ToInt(); + } + else if (key.EndsWith("-year")) + { + // Convert from three form controls. + var dateKey = key.Replace("-year", ""); + year = value.ToInt(); + month = QueryItems[dateKey + "-month"].FirstOrDefault()?.ToInt() ?? 0; + day = QueryItems[dateKey + "-day"].FirstOrDefault()?.ToInt() ?? 0; + } + + if (year > 0 && month > 0 && day > 0) + { + try + { + return new DateTime(year, month, day); + } + catch { } + } + + return null; + } + + protected virtual void ConvertVariant(ProductVariantQuery query, string key, ICollection values) + { + var ids = key.Replace("pvari", "").SplitSafe("-"); + if (ids.Length < 4) + return; + + var isDate = key.EndsWith("-date") || key.EndsWith("-year"); + var isFile = key.EndsWith("-file"); + var isText = key.EndsWith("-text"); + + if (isDate || isFile || isText) + { + var value = isText ? string.Join(",", values) : values.First(); var variant = new ProductVariantQueryItem(value) { ProductId = ids[0].ToInt(), @@ -181,16 +181,16 @@ protected virtual void ConvertVariant(ProductVariantQuery query, string key, ICo }; if (isDate) - { - variant.Date = ConvertToDate(key, value); - } - - query.AddVariant(variant); - } - else - { - foreach (var value in values) - { + { + variant.Date = ConvertToDate(key, value); + } + + query.AddVariant(variant); + } + else + { + foreach (var value in values) + { var variant = new ProductVariantQueryItem(value) { ProductId = ids[0].ToInt(), @@ -200,42 +200,42 @@ protected virtual void ConvertVariant(ProductVariantQuery query, string key, ICo }; query.AddVariant(variant); - } - } - } - - protected virtual void ConvertVariantAlias(ProductVariantQuery query, string key, ICollection values, int languageId) - { - var ids = key.SplitSafe("-"); - var len = ids.Length; - if (len < 4) - return; - - var isDate = key.EndsWith("-date") || key.EndsWith("-year"); - var isFile = key.EndsWith("-file"); - var isText = key.EndsWith("-text"); - - if (isDate || isFile || isText) - { - ids = ids.Take(len - 1).ToArray(); - len = ids.Length; - } - - var alias = string.Join("-", ids.Take(len - 3)); - var attributeId = _catalogSearchQueryAliasMapper.GetVariantIdByAlias(alias, languageId); - if (attributeId == 0) - return; - - var productId = ids.SafeGet(len - 3).ToInt(); - var bundleItemId = ids.SafeGet(len - 2).ToInt(); - var variantAttributeId = ids.SafeGet(len - 1).ToInt(); - - if (productId == 0 || variantAttributeId == 0) - return; - - if (isDate || isFile || isText) - { - var value = isText ? string.Join(",", values) : values.First(); + } + } + } + + protected virtual void ConvertVariantAlias(ProductVariantQuery query, string key, ICollection values, int languageId) + { + var ids = key.SplitSafe("-"); + var len = ids.Length; + if (len < 4) + return; + + var isDate = key.EndsWith("-date") || key.EndsWith("-year"); + var isFile = key.EndsWith("-file"); + var isText = key.EndsWith("-text"); + + if (isDate || isFile || isText) + { + ids = ids.Take(len - 1).ToArray(); + len = ids.Length; + } + + var alias = string.Join("-", ids.Take(len - 3)); + var attributeId = _catalogSearchQueryAliasMapper.GetVariantIdByAlias(alias, languageId); + if (attributeId == 0) + return; + + var productId = ids.SafeGet(len - 3).ToInt(); + var bundleItemId = ids.SafeGet(len - 2).ToInt(); + var variantAttributeId = ids.SafeGet(len - 1).ToInt(); + + if (productId == 0 || variantAttributeId == 0) + return; + + if (isDate || isFile || isText) + { + var value = isText ? string.Join(",", values) : values.First(); var variant = new ProductVariantQueryItem(value) { ProductId = productId, @@ -248,27 +248,27 @@ protected virtual void ConvertVariantAlias(ProductVariantQuery query, string key }; if (isDate) - { - variant.Date = ConvertToDate(key, value); - } - - query.AddVariant(variant); - } - else - { - foreach (var value in values) - { - // We cannot use GetVariantOptionIdByAlias. It doesn't necessarily provide a ProductVariantAttributeValue.Id associated with this product. - //var optionId = _catalogSearchQueryAliasMapper.GetVariantOptionIdByAlias(value, attributeId, languageId); - var optionId = 0; - string valueAlias = null; - - var valueIds = value.SplitSafe("-"); - if (valueIds.Length >= 2) - { - optionId = valueIds.SafeGet(valueIds.Length - 1).ToInt(); - valueAlias = string.Join("-", valueIds.Take(valueIds.Length - 1)); - } + { + variant.Date = ConvertToDate(key, value); + } + + query.AddVariant(variant); + } + else + { + foreach (var value in values) + { + // We cannot use GetVariantOptionIdByAlias. It doesn't necessarily provide a ProductVariantAttributeValue.Id associated with this product. + //var optionId = _catalogSearchQueryAliasMapper.GetVariantOptionIdByAlias(value, attributeId, languageId); + var optionId = 0; + string valueAlias = null; + + var valueIds = value.SplitSafe("-"); + if (valueIds.Length >= 2) + { + optionId = valueIds.SafeGet(valueIds.Length - 1).ToInt(); + valueAlias = string.Join("-", valueIds.Take(valueIds.Length - 1)); + } var variant = new ProductVariantQueryItem(optionId == 0 ? value : optionId.ToString()) { @@ -280,42 +280,42 @@ protected virtual void ConvertVariantAlias(ProductVariantQuery query, string key }; if (optionId != 0) - { - variant.ValueAlias = valueAlias; - } - - query.AddVariant(variant); - } - } - } - - protected virtual void ConvertGiftCard(ProductVariantQuery query, string key, string value) - { - var elements = key.Replace("giftcard", "").SplitSafe("-"); - if (elements.Length > 2) - { - var giftCard = new GiftCardQueryItem(elements[2], value); - giftCard.ProductId = elements[0].ToInt(); - giftCard.BundleItemId = elements[1].ToInt(); - - query.AddGiftCard(giftCard); - } - } - - protected virtual void ConvertCheckoutAttribute(ProductVariantQuery query, string key, ICollection values) - { - var ids = key.Replace("cattr", "").SplitSafe("-"); - if (ids.Length <= 0) - return; - - var attributeId = ids[0].ToInt(); - var isDate = key.EndsWith("-date") || key.EndsWith("-year"); - var isFile = key.EndsWith("-file"); - var isText = key.EndsWith("-text"); - - if (isDate || isFile || isText) - { - var value = isText ? string.Join(",", values) : values.First(); + { + variant.ValueAlias = valueAlias; + } + + query.AddVariant(variant); + } + } + } + + protected virtual void ConvertGiftCard(ProductVariantQuery query, string key, string value) + { + var elements = key.Replace("giftcard", "").SplitSafe("-"); + if (elements.Length > 2) + { + var giftCard = new GiftCardQueryItem(elements[2], value); + giftCard.ProductId = elements[0].ToInt(); + giftCard.BundleItemId = elements[1].ToInt(); + + query.AddGiftCard(giftCard); + } + } + + protected virtual void ConvertCheckoutAttribute(ProductVariantQuery query, string key, ICollection values) + { + var ids = key.Replace("cattr", "").SplitSafe("-"); + if (ids.Length <= 0) + return; + + var attributeId = ids[0].ToInt(); + var isDate = key.EndsWith("-date") || key.EndsWith("-year"); + var isFile = key.EndsWith("-file"); + var isText = key.EndsWith("-text"); + + if (isDate || isFile || isText) + { + var value = isText ? string.Join(",", values) : values.First(); var attribute = new CheckoutAttributeQueryItem(attributeId, value) { IsFile = isFile, @@ -323,23 +323,23 @@ protected virtual void ConvertCheckoutAttribute(ProductVariantQuery query, strin }; if (isDate) - { - attribute.Date = ConvertToDate(key, value); - } - - query.AddCheckoutAttribute(attribute); - } - else - { - foreach (var value in values) - { - query.AddCheckoutAttribute(new CheckoutAttributeQueryItem(attributeId, value)); - } - } - } - - protected virtual void ConvertItems(HttpRequestBase request, ProductVariantQuery query, string key, ICollection values) - { - } - } + { + attribute.Date = ConvertToDate(key, value); + } + + query.AddCheckoutAttribute(attribute); + } + else + { + foreach (var value in values) + { + query.AddCheckoutAttribute(new CheckoutAttributeQueryItem(attributeId, value)); + } + } + } + + protected virtual void ConvertItems(HttpRequestBase request, ProductVariantQuery query, string key, ICollection values) + { + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryItem.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryItem.cs index a41f3ea64b..aacf8f9997 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryItem.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryItem.cs @@ -2,59 +2,59 @@ namespace SmartStore.Services.Catalog.Modelling { - public class ProductVariantQueryItem - { - public ProductVariantQueryItem(string value) - { - Value = value ?? string.Empty; - } - - /// - /// Key used for form names. - /// - /// Product identifier - /// Bundle item identifier. 0 if not a bundle item. - /// Product attribute identifier - /// Product variant attribute identifier - /// Key - public static string CreateKey(int productId, int bundleItemId, int attributeId, int variantAttributeId) - { - return $"pvari{productId}-{bundleItemId}-{attributeId}-{variantAttributeId}"; - } - - public string Value { get; private set; } - - public int ProductId { get; set; } - public int BundleItemId { get; set; } - public int AttributeId { get; set; } - public int VariantAttributeId { get; set; } - public DateTime? Date { get; set; } - public bool IsFile { get; set; } - public bool IsText { get; set; } - - public string Alias { get; set; } - public string ValueAlias { get; set; } - - public override string ToString() - { - var key = Alias.HasValue() - ? $"{Alias}-{ProductId}-{BundleItemId}-{VariantAttributeId}" - : CreateKey(ProductId, BundleItemId, AttributeId, VariantAttributeId); - - if (Date.HasValue) - { - return key + "-date"; - } - else if (IsFile) - { - return key + "-file"; - } - else if (IsText) - { - return key + "-text"; - } - - return key; - } - } + public class ProductVariantQueryItem + { + public ProductVariantQueryItem(string value) + { + Value = value ?? string.Empty; + } + + /// + /// Key used for form names. + /// + /// Product identifier + /// Bundle item identifier. 0 if not a bundle item. + /// Product attribute identifier + /// Product variant attribute identifier + /// Key + public static string CreateKey(int productId, int bundleItemId, int attributeId, int variantAttributeId) + { + return $"pvari{productId}-{bundleItemId}-{attributeId}-{variantAttributeId}"; + } + + public string Value { get; private set; } + + public int ProductId { get; set; } + public int BundleItemId { get; set; } + public int AttributeId { get; set; } + public int VariantAttributeId { get; set; } + public DateTime? Date { get; set; } + public bool IsFile { get; set; } + public bool IsText { get; set; } + + public string Alias { get; set; } + public string ValueAlias { get; set; } + + public override string ToString() + { + var key = Alias.HasValue() + ? $"{Alias}-{ProductId}-{BundleItemId}-{VariantAttributeId}" + : CreateKey(ProductId, BundleItemId, AttributeId, VariantAttributeId); + + if (Date.HasValue) + { + return key + "-date"; + } + else if (IsFile) + { + return key + "-file"; + } + else if (IsText) + { + return key + "-text"; + } + + return key; + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs index 536553d3ff..ebb79e92b8 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs @@ -3,39 +3,39 @@ namespace SmartStore.Services.Catalog.Modelling { - [ModelBinderType(typeof(ProductVariantQuery))] - public class ProductAttributeQueryModelBinder : IModelBinder - { - private readonly IProductVariantQueryFactory _factory; + [ModelBinderType(typeof(ProductVariantQuery))] + public class ProductAttributeQueryModelBinder : IModelBinder + { + private readonly IProductVariantQueryFactory _factory; - public ProductAttributeQueryModelBinder(IProductVariantQueryFactory factory) - { - _factory = factory; - } + public ProductAttributeQueryModelBinder(IProductVariantQueryFactory factory) + { + _factory = factory; + } - public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) - { - if (_factory.Current != null) - { - // Don't bind again for current request - return _factory.Current; - } + public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) + { + if (_factory.Current != null) + { + // Don't bind again for current request + return _factory.Current; + } - if (controllerContext.IsChildAction) - { - // Never attempt to bind in child actions. We require the binding to happen in a parent action. - return _factory.Current; - } + if (controllerContext.IsChildAction) + { + // Never attempt to bind in child actions. We require the binding to happen in a parent action. + return _factory.Current; + } - var modelType = bindingContext.ModelType; + var modelType = bindingContext.ModelType; - if (modelType != typeof(ProductVariantQuery)) - { - return new ProductVariantQuery(); - } + if (modelType != typeof(ProductVariantQuery)) + { + return new ProductVariantQuery(); + } - var query = _factory.CreateFromQuery(); - return query; - } - } + var query = _factory.CreateFromQuery(); + return query; + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationContext.cs b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationContext.cs index eea8195b4f..14a4cf1495 100644 --- a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationContext.cs +++ b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationContext.cs @@ -11,72 +11,72 @@ namespace SmartStore.Services.Catalog /// Cargo data to reduce database round trips during price calculation /// public class PriceCalculationContext - { - protected List _productIds; - private List _productIdsTierPrices; - private List _productIdsAppliedDiscounts; - private List _bundledProductIds; + { + protected List _productIds; + private List _productIdsTierPrices; + private List _productIdsAppliedDiscounts; + private List _bundledProductIds; private List _groupedProductIds; private Func> _funcAttributes; - private Func> _funcAttributeCombinations; - private Func> _funcTierPrices; - private Func> _funcProductCategories; - private Func> _funcProductManufacturers; - private Func> _funcAppliedDiscounts; - private Func> _funcProductBundleItems; + private Func> _funcAttributeCombinations; + private Func> _funcTierPrices; + private Func> _funcProductCategories; + private Func> _funcProductManufacturers; + private Func> _funcAppliedDiscounts; + private Func> _funcProductBundleItems; private Func> _funcAssociatedProducts; private LazyMultimap _attributes; - private LazyMultimap _attributeCombinations; - private LazyMultimap _tierPrices; - private LazyMultimap _productCategories; - private LazyMultimap _productManufacturers; - private LazyMultimap _appliedDiscounts; - private LazyMultimap _productBundleItems; + private LazyMultimap _attributeCombinations; + private LazyMultimap _tierPrices; + private LazyMultimap _productCategories; + private LazyMultimap _productManufacturers; + private LazyMultimap _appliedDiscounts; + private LazyMultimap _productBundleItems; private LazyMultimap _associatedProducts; public PriceCalculationContext(IEnumerable products, - Func> attributes, - Func> attributeCombinations, - Func> tierPrices, - Func> productCategories, - Func> productManufacturers, - Func> appliedDiscounts, - Func> productBundleItems, + Func> attributes, + Func> attributeCombinations, + Func> tierPrices, + Func> productCategories, + Func> productManufacturers, + Func> appliedDiscounts, + Func> productBundleItems, Func> associatedProducts) - { - if (products == null) - { - _productIds = new List(); - _productIdsTierPrices = new List(); - _productIdsAppliedDiscounts = new List(); - _bundledProductIds = new List(); + { + if (products == null) + { + _productIds = new List(); + _productIdsTierPrices = new List(); + _productIdsAppliedDiscounts = new List(); + _bundledProductIds = new List(); _groupedProductIds = new List(); - } - else - { - _productIds = new List(products.Select(x => x.Id)); - _productIdsTierPrices = new List(products.Where(x => x.HasTierPrices).Select(x => x.Id)); - _productIdsAppliedDiscounts = new List(products.Where(x => x.HasDiscountsApplied).Select(x => x.Id)); - _bundledProductIds = new List(products.Where(x => x.ProductType == ProductType.BundledProduct).Select(x => x.Id)); + } + else + { + _productIds = new List(products.Select(x => x.Id)); + _productIdsTierPrices = new List(products.Where(x => x.HasTierPrices).Select(x => x.Id)); + _productIdsAppliedDiscounts = new List(products.Where(x => x.HasDiscountsApplied).Select(x => x.Id)); + _bundledProductIds = new List(products.Where(x => x.ProductType == ProductType.BundledProduct).Select(x => x.Id)); _groupedProductIds = new List(products.Where(x => x.ProductType == ProductType.GroupedProduct).Select(x => x.Id)); } - _funcAttributes = attributes; - _funcAttributeCombinations = attributeCombinations; - _funcTierPrices = tierPrices; - _funcProductCategories = productCategories; - _funcProductManufacturers = productManufacturers; - _funcAppliedDiscounts = appliedDiscounts; - _funcProductBundleItems = productBundleItems; + _funcAttributes = attributes; + _funcAttributeCombinations = attributeCombinations; + _funcTierPrices = tierPrices; + _funcProductCategories = productCategories; + _funcProductManufacturers = productManufacturers; + _funcAppliedDiscounts = appliedDiscounts; + _funcProductBundleItems = productBundleItems; _funcAssociatedProducts = associatedProducts; - } + } - public IReadOnlyList ProductIds => _productIds; + public IReadOnlyList ProductIds => _productIds; - public void Clear() - { + public void Clear() + { _attributes?.Clear(); _attributeCombinations?.Clear(); _tierPrices?.Clear(); @@ -88,91 +88,91 @@ public void Clear() _bundledProductIds.Clear(); _groupedProductIds.Clear(); - } - - public LazyMultimap Attributes - { - get - { - if (_attributes == null) - { - _attributes = new LazyMultimap(keys => _funcAttributes(keys), _productIds); - } - return _attributes; - } - } - - public LazyMultimap AttributeCombinations - { - get - { - if (_attributeCombinations == null) - { - _attributeCombinations = new LazyMultimap(keys => _funcAttributeCombinations(keys), _productIds); - } - return _attributeCombinations; - } - } - - public LazyMultimap TierPrices - { - get - { - if (_tierPrices == null) - { - _tierPrices = new LazyMultimap(keys => _funcTierPrices(keys), _productIdsTierPrices); - } - return _tierPrices; - } - } - - public LazyMultimap ProductCategories - { - get - { - if (_productCategories == null) - { - _productCategories = new LazyMultimap(keys => _funcProductCategories(keys), _productIds); - } - return _productCategories; - } - } - - public LazyMultimap ProductManufacturers - { - get - { - if (_productManufacturers == null) - { - _productManufacturers = new LazyMultimap(keys => _funcProductManufacturers(keys), _productIds); - } - return _productManufacturers; - } - } - - public LazyMultimap AppliedDiscounts - { - get - { - if (_appliedDiscounts == null) - { - _appliedDiscounts = new LazyMultimap(keys => _funcAppliedDiscounts(keys), _productIdsAppliedDiscounts); - } - return _appliedDiscounts; - } - } - - public LazyMultimap ProductBundleItems - { - get - { - if (_productBundleItems == null) - { - _productBundleItems = new LazyMultimap(keys => _funcProductBundleItems(keys), _bundledProductIds); - } - return _productBundleItems; - } - } + } + + public LazyMultimap Attributes + { + get + { + if (_attributes == null) + { + _attributes = new LazyMultimap(keys => _funcAttributes(keys), _productIds); + } + return _attributes; + } + } + + public LazyMultimap AttributeCombinations + { + get + { + if (_attributeCombinations == null) + { + _attributeCombinations = new LazyMultimap(keys => _funcAttributeCombinations(keys), _productIds); + } + return _attributeCombinations; + } + } + + public LazyMultimap TierPrices + { + get + { + if (_tierPrices == null) + { + _tierPrices = new LazyMultimap(keys => _funcTierPrices(keys), _productIdsTierPrices); + } + return _tierPrices; + } + } + + public LazyMultimap ProductCategories + { + get + { + if (_productCategories == null) + { + _productCategories = new LazyMultimap(keys => _funcProductCategories(keys), _productIds); + } + return _productCategories; + } + } + + public LazyMultimap ProductManufacturers + { + get + { + if (_productManufacturers == null) + { + _productManufacturers = new LazyMultimap(keys => _funcProductManufacturers(keys), _productIds); + } + return _productManufacturers; + } + } + + public LazyMultimap AppliedDiscounts + { + get + { + if (_appliedDiscounts == null) + { + _appliedDiscounts = new LazyMultimap(keys => _funcAppliedDiscounts(keys), _productIdsAppliedDiscounts); + } + return _appliedDiscounts; + } + } + + public LazyMultimap ProductBundleItems + { + get + { + if (_productBundleItems == null) + { + _productBundleItems = new LazyMultimap(keys => _funcProductBundleItems(keys), _bundledProductIds); + } + return _productBundleItems; + } + } public LazyMultimap AssociatedProducts { @@ -188,14 +188,14 @@ public LazyMultimap AssociatedProducts } public void Collect(IEnumerable productIds) - { - Attributes.Collect(productIds); - AttributeCombinations.Collect(productIds); - TierPrices.Collect(productIds); - ProductCategories.Collect(productIds); - AppliedDiscounts.Collect(productIds); - ProductBundleItems.Collect(productIds); + { + Attributes.Collect(productIds); + AttributeCombinations.Collect(productIds); + TierPrices.Collect(productIds); + ProductCategories.Collect(productIds); + AppliedDiscounts.Collect(productIds); + ProductBundleItems.Collect(productIds); AssociatedProducts.Collect(productIds); - } - } + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs index 9897a102b9..1c1c86a845 100644 --- a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs @@ -23,51 +23,51 @@ public partial class PriceCalculationService : IPriceCalculationService { private readonly IDiscountService _discountService; private readonly ICategoryService _categoryService; - private readonly IManufacturerService _manufacturerService; - private readonly IProductAttributeParser _productAttributeParser; - private readonly IProductService _productService; + private readonly IManufacturerService _manufacturerService; + private readonly IProductAttributeParser _productAttributeParser; + private readonly IProductService _productService; private readonly CatalogSettings _catalogSettings; - private readonly IProductAttributeService _productAttributeService; - private readonly IDownloadService _downloadService; - private readonly ICommonServices _services; - private readonly HttpRequestBase _httpRequestBase; - private readonly ITaxService _taxService; - private readonly TaxSettings _taxSettings; - - public PriceCalculationService( + private readonly IProductAttributeService _productAttributeService; + private readonly IDownloadService _downloadService; + private readonly ICommonServices _services; + private readonly HttpRequestBase _httpRequestBase; + private readonly ITaxService _taxService; + private readonly TaxSettings _taxSettings; + + public PriceCalculationService( IDiscountService discountService, - ICategoryService categoryService, - IManufacturerService manufacturerService, - IProductAttributeParser productAttributeParser, - IProductService productService, + ICategoryService categoryService, + IManufacturerService manufacturerService, + IProductAttributeParser productAttributeParser, + IProductService productService, CatalogSettings catalogSettings, - IProductAttributeService productAttributeService, - IDownloadService downloadService, - ICommonServices services, - HttpRequestBase httpRequestBase, - ITaxService taxService, - TaxSettings taxSettings) + IProductAttributeService productAttributeService, + IDownloadService downloadService, + ICommonServices services, + HttpRequestBase httpRequestBase, + ITaxService taxService, + TaxSettings taxSettings) { _discountService = discountService; _categoryService = categoryService; - _manufacturerService = manufacturerService; + _manufacturerService = manufacturerService; _productAttributeParser = productAttributeParser; - _productService = productService; + _productService = productService; _catalogSettings = catalogSettings; - _productAttributeService = productAttributeService; - _downloadService = downloadService; - _services = services; - _httpRequestBase = httpRequestBase; - _taxService = taxService; - _taxSettings = taxSettings; + _productAttributeService = productAttributeService; + _downloadService = downloadService; + _services = services; + _httpRequestBase = httpRequestBase; + _taxService = taxService; + _taxSettings = taxSettings; } - + #region Utilities /// /// Gets allowed discounts /// - /// Product + /// Product /// Customer /// Discounts protected virtual ICollection GetAllowedDiscounts(Product product, Customer customer, PriceCalculationContext context = null) @@ -76,47 +76,47 @@ protected virtual ICollection GetAllowedDiscounts(Product product, Cus if (_catalogSettings.IgnoreDiscounts) return result; - // check discounts assigned to the product - if (product.HasDiscountsApplied) + // check discounts assigned to the product + if (product.HasDiscountsApplied) { // We use this property ("HasDiscountsApplied") for performance optimziation to avoid unnecessary database calls - IEnumerable appliedDiscounts = null; - - if (context == null) - { - appliedDiscounts = product.AppliedDiscounts; - } - else - { - if (!context.AppliedDiscounts.FullyLoaded) - { - context.AppliedDiscounts.LoadAll(); - } - appliedDiscounts = context.AppliedDiscounts.GetOrLoad(product.Id); - } - - if (appliedDiscounts != null) - { - foreach (var discount in appliedDiscounts) - { - if (discount.DiscountType == DiscountType.AssignedToSkus && !result.Contains(discount) && _discountService.IsDiscountValid(discount, customer)) - { - result.Add(discount); - } - } - } + IEnumerable appliedDiscounts = null; + + if (context == null) + { + appliedDiscounts = product.AppliedDiscounts; + } + else + { + if (!context.AppliedDiscounts.FullyLoaded) + { + context.AppliedDiscounts.LoadAll(); + } + appliedDiscounts = context.AppliedDiscounts.GetOrLoad(product.Id); + } + + if (appliedDiscounts != null) + { + foreach (var discount in appliedDiscounts) + { + if (discount.DiscountType == DiscountType.AssignedToSkus && !result.Contains(discount) && _discountService.IsDiscountValid(discount, customer)) + { + result.Add(discount); + } + } + } } // check discounts assigned to categories var discountsAssignedToCategories = _discountService.GetAllDiscounts(DiscountType.AssignedToCategories); if (discountsAssignedToCategories != null && discountsAssignedToCategories.Any()) { - IEnumerable productCategories = null; - - if (context == null) - productCategories = _categoryService.GetProductCategoriesByProductId(product.Id); - else - productCategories = context.ProductCategories.GetOrLoad(product.Id); + IEnumerable productCategories = null; + + if (context == null) + productCategories = _categoryService.GetProductCategoriesByProductId(product.Id); + else + productCategories = context.ProductCategories.GetOrLoad(product.Id); if (productCategories != null) { @@ -130,10 +130,10 @@ protected virtual ICollection GetAllowedDiscounts(Product product, Cus foreach (var discount in categoryDiscounts) { - if (discount.DiscountType == DiscountType.AssignedToCategories && !result.Contains(discount) && _discountService.IsDiscountValid(discount, customer)) - { - result.Add(discount); - } + if (discount.DiscountType == DiscountType.AssignedToCategories && !result.Contains(discount) && _discountService.IsDiscountValid(discount, customer)) + { + result.Add(discount); + } } } } @@ -144,34 +144,34 @@ protected virtual ICollection GetAllowedDiscounts(Product product, Cus var discountsAssignedToManufacturers = _discountService.GetAllDiscounts(DiscountType.AssignedToManufacturers); if (discountsAssignedToManufacturers != null && discountsAssignedToManufacturers.Any()) - { - IEnumerable productManufacturers = null; - - if (context == null) - productManufacturers = _manufacturerService.GetProductManufacturersByProductId(product.Id); - else - productManufacturers = context.ProductManufacturers.GetOrLoad(product.Id); - - if (productManufacturers != null) - { - foreach (var productManufacturer in productManufacturers) - { - var manu = productManufacturer.Manufacturer; - if (manu.HasDiscountsApplied) - { - var manuDiscounts = manu.AppliedDiscounts; - - foreach (var discount in manuDiscounts) - { - if (discount.DiscountType == DiscountType.AssignedToManufacturers && !result.Contains(discount) && _discountService.IsDiscountValid(discount, customer)) - { - result.Add(discount); - } - } - } - } - } - } + { + IEnumerable productManufacturers = null; + + if (context == null) + productManufacturers = _manufacturerService.GetProductManufacturersByProductId(product.Id); + else + productManufacturers = context.ProductManufacturers.GetOrLoad(product.Id); + + if (productManufacturers != null) + { + foreach (var productManufacturer in productManufacturers) + { + var manu = productManufacturer.Manufacturer; + if (manu.HasDiscountsApplied) + { + var manuDiscounts = manu.AppliedDiscounts; + + foreach (var discount in manuDiscounts) + { + if (discount.DiscountType == DiscountType.AssignedToManufacturers && !result.Contains(discount) && _discountService.IsDiscountValid(discount, customer)) + { + result.Add(discount); + } + } + } + } + } + } return result; } @@ -185,28 +185,28 @@ protected virtual ICollection GetAllowedDiscounts(Product product, Cus /// Price protected virtual decimal? GetMinimumTierPrice(Product product, Customer customer, int quantity, PriceCalculationContext context = null) { - if (!product.HasTierPrices) + if (!product.HasTierPrices) return decimal.Zero; - IEnumerable tierPrices = null; - - if (context == null) - { - tierPrices = product.TierPrices - .OrderBy(tp => tp.Quantity) - .FilterByStore(_services.StoreContext.CurrentStore.Id) - .FilterForCustomer(customer) - .ToList() - .RemoveDuplicatedQuantities(); - } - else - { - tierPrices = context.TierPrices.GetOrLoad(product.Id) - .RemoveDuplicatedQuantities(); - } - - if (tierPrices == null) - return decimal.Zero; + IEnumerable tierPrices = null; + + if (context == null) + { + tierPrices = product.TierPrices + .OrderBy(tp => tp.Quantity) + .FilterByStore(_services.StoreContext.CurrentStore.Id) + .FilterForCustomer(customer) + .ToList() + .RemoveDuplicatedQuantities(); + } + else + { + tierPrices = context.TierPrices.GetOrLoad(product.Id) + .RemoveDuplicatedQuantities(); + } + + if (tierPrices == null) + return decimal.Zero; int previousQty = 1; decimal? previousPrice = null; @@ -232,10 +232,10 @@ protected virtual ICollection GetAllowedDiscounts(Product product, Cus { previousPrice = product.Price - tierPrice.Price; } - + previousQty = tierPrice.Quantity; } - + return previousPrice; } @@ -281,163 +281,163 @@ protected virtual decimal GetTierPriceAttributeAdjustment(Product product, Custo { previousPrice = adjustment - (adjustment / 100 * tierPrice.Price); } - + previousQty = tierPrice.Quantity; } - + return previousPrice; } protected virtual decimal GetPreselectedPrice( Product product, Customer customer, - Currency currency, + Currency currency, PriceCalculationContext context, ProductBundleItemData bundleItem, IEnumerable bundleItems) { var taxRate = decimal.Zero; - var attributesTotalPriceBase = decimal.Zero; - var preSelectedPriceAdjustmentBase = decimal.Zero; - var isBundle = product.ProductType == ProductType.BundledProduct; - var isBundleItemPricing = bundleItem != null && bundleItem.Item.BundleProduct.BundlePerItemPricing; - var isBundlePricing = bundleItem != null && !bundleItem.Item.BundleProduct.BundlePerItemPricing; - var bundleItemId = bundleItem == null ? 0 : bundleItem.Item.Id; - - var query = new ProductVariantQuery(); - var selectedAttributeValues = new List(); - var attributes = context.Attributes.GetOrLoad(product.Id); - - // 1. Fill query with initially selected attributes. - foreach (var attribute in attributes.Where(x => x.ProductVariantAttributeValues.Any() && x.ShouldHaveValues())) - { - int preSelectedValueId = 0; - ProductVariantAttributeValue defaultValue = null; - var selectedValueIds = new List(); - var pvaValues = attribute.ProductVariantAttributeValues; - - foreach (var pvaValue in pvaValues) - { + var attributesTotalPriceBase = decimal.Zero; + var preSelectedPriceAdjustmentBase = decimal.Zero; + var isBundle = product.ProductType == ProductType.BundledProduct; + var isBundleItemPricing = bundleItem != null && bundleItem.Item.BundleProduct.BundlePerItemPricing; + var isBundlePricing = bundleItem != null && !bundleItem.Item.BundleProduct.BundlePerItemPricing; + var bundleItemId = bundleItem == null ? 0 : bundleItem.Item.Id; + + var query = new ProductVariantQuery(); + var selectedAttributeValues = new List(); + var attributes = context.Attributes.GetOrLoad(product.Id); + + // 1. Fill query with initially selected attributes. + foreach (var attribute in attributes.Where(x => x.ProductVariantAttributeValues.Any() && x.ShouldHaveValues())) + { + int preSelectedValueId = 0; + ProductVariantAttributeValue defaultValue = null; + var selectedValueIds = new List(); + var pvaValues = attribute.ProductVariantAttributeValues; + + foreach (var pvaValue in pvaValues) + { ProductBundleItemAttributeFilter attributeFilter = null; if (bundleItem?.Item?.FilterOut(pvaValue, out attributeFilter) ?? false) - continue; - - if (preSelectedValueId == 0 && attributeFilter != null && attributeFilter.IsPreSelected) - preSelectedValueId = attributeFilter.AttributeValueId; - - if (!isBundlePricing && pvaValue.IsPreSelected) - { - var includingTax = _services.WorkContext.TaxDisplayType == TaxDisplayType.IncludingTax; - var attributeValuePriceAdjustment = GetProductVariantAttributeValuePriceAdjustment(pvaValue, product, customer, context, 1); - var priceAdjustmentBase = _taxService.GetProductPrice(product, product.TaxCategoryId, attributeValuePriceAdjustment, - includingTax, customer, currency, _taxSettings.PricesIncludeTax, out taxRate); - - preSelectedPriceAdjustmentBase = decimal.Add(preSelectedPriceAdjustmentBase, priceAdjustmentBase); - } - } - - // Value pre-selected by a bundle item filter discards the default pre-selection. - if (preSelectedValueId != 0 && (defaultValue = pvaValues.FirstOrDefault(x => x.Id == preSelectedValueId)) != null) - { - //defaultValue.IsPreSelected = true; - selectedAttributeValues.Add(defaultValue); - query.AddVariant(new ProductVariantQueryItem(defaultValue.Id.ToString()) - { - ProductId = product.Id, - BundleItemId = bundleItemId, - AttributeId = attribute.ProductAttributeId, - VariantAttributeId = attribute.Id, - Alias = attribute.ProductAttribute.Alias, - ValueAlias = defaultValue.Alias - }); - } - else - { - foreach (var value in pvaValues.Where(x => x.IsPreSelected)) - { - selectedAttributeValues.Add(value); - query.AddVariant(new ProductVariantQueryItem(value.Id.ToString()) - { - ProductId = product.Id, - BundleItemId = bundleItemId, - AttributeId = attribute.ProductAttributeId, - VariantAttributeId = attribute.Id, - Alias = attribute.ProductAttribute.Alias, - ValueAlias = value.Alias - }); - } - } - } - - // 2. Find attribute combination for selected attributes and merge it. - if (!isBundle && query.Variants.Any()) - { - var attributeXml = query.CreateSelectedAttributesXml(product.Id, bundleItemId, attributes, _productAttributeParser, _services.Localization, - _downloadService, _catalogSettings, _httpRequestBase, new List()); - - var combinations = context.AttributeCombinations.GetOrLoad(product.Id); - - var selectedCombination = combinations.FirstOrDefault(x => _productAttributeParser.AreProductAttributesEqual(x.AttributesXml, attributeXml)); - - if (selectedCombination != null && selectedCombination.IsActive && selectedCombination.Price.HasValue) - { - product.MergedDataValues = new Dictionary { { "Price", selectedCombination.Price.Value } }; - - if (selectedCombination.BasePriceAmount.HasValue) - product.MergedDataValues.Add("BasePriceAmount", selectedCombination.BasePriceAmount.Value); - - if (selectedCombination.BasePriceBaseAmount.HasValue) - product.MergedDataValues.Add("BasePriceBaseAmount", selectedCombination.BasePriceBaseAmount.Value); - } - } - - if (_catalogSettings.EnableDynamicPriceUpdate && !isBundlePricing) - { - if (selectedAttributeValues.Count > 0) - { - selectedAttributeValues.Each(x => attributesTotalPriceBase += GetProductVariantAttributeValuePriceAdjustment(x, product, customer, context, 1)); - } - else - { - attributesTotalPriceBase = preSelectedPriceAdjustmentBase; - } - } - - if (bundleItem != null) - { - bundleItem.AdditionalCharge = attributesTotalPriceBase; - } - - var result = GetFinalPrice(product, bundleItems, customer, attributesTotalPriceBase, true, 1, bundleItem, context); - return result; - } - - public virtual PriceCalculationContext CreatePriceCalculationContext( - IEnumerable products = null, - Customer customer = null, - int? storeId = null, + continue; + + if (preSelectedValueId == 0 && attributeFilter != null && attributeFilter.IsPreSelected) + preSelectedValueId = attributeFilter.AttributeValueId; + + if (!isBundlePricing && pvaValue.IsPreSelected) + { + var includingTax = _services.WorkContext.TaxDisplayType == TaxDisplayType.IncludingTax; + var attributeValuePriceAdjustment = GetProductVariantAttributeValuePriceAdjustment(pvaValue, product, customer, context, 1); + var priceAdjustmentBase = _taxService.GetProductPrice(product, product.TaxCategoryId, attributeValuePriceAdjustment, + includingTax, customer, currency, _taxSettings.PricesIncludeTax, out taxRate); + + preSelectedPriceAdjustmentBase = decimal.Add(preSelectedPriceAdjustmentBase, priceAdjustmentBase); + } + } + + // Value pre-selected by a bundle item filter discards the default pre-selection. + if (preSelectedValueId != 0 && (defaultValue = pvaValues.FirstOrDefault(x => x.Id == preSelectedValueId)) != null) + { + //defaultValue.IsPreSelected = true; + selectedAttributeValues.Add(defaultValue); + query.AddVariant(new ProductVariantQueryItem(defaultValue.Id.ToString()) + { + ProductId = product.Id, + BundleItemId = bundleItemId, + AttributeId = attribute.ProductAttributeId, + VariantAttributeId = attribute.Id, + Alias = attribute.ProductAttribute.Alias, + ValueAlias = defaultValue.Alias + }); + } + else + { + foreach (var value in pvaValues.Where(x => x.IsPreSelected)) + { + selectedAttributeValues.Add(value); + query.AddVariant(new ProductVariantQueryItem(value.Id.ToString()) + { + ProductId = product.Id, + BundleItemId = bundleItemId, + AttributeId = attribute.ProductAttributeId, + VariantAttributeId = attribute.Id, + Alias = attribute.ProductAttribute.Alias, + ValueAlias = value.Alias + }); + } + } + } + + // 2. Find attribute combination for selected attributes and merge it. + if (!isBundle && query.Variants.Any()) + { + var attributeXml = query.CreateSelectedAttributesXml(product.Id, bundleItemId, attributes, _productAttributeParser, _services.Localization, + _downloadService, _catalogSettings, _httpRequestBase, new List()); + + var combinations = context.AttributeCombinations.GetOrLoad(product.Id); + + var selectedCombination = combinations.FirstOrDefault(x => _productAttributeParser.AreProductAttributesEqual(x.AttributesXml, attributeXml)); + + if (selectedCombination != null && selectedCombination.IsActive && selectedCombination.Price.HasValue) + { + product.MergedDataValues = new Dictionary { { "Price", selectedCombination.Price.Value } }; + + if (selectedCombination.BasePriceAmount.HasValue) + product.MergedDataValues.Add("BasePriceAmount", selectedCombination.BasePriceAmount.Value); + + if (selectedCombination.BasePriceBaseAmount.HasValue) + product.MergedDataValues.Add("BasePriceBaseAmount", selectedCombination.BasePriceBaseAmount.Value); + } + } + + if (_catalogSettings.EnableDynamicPriceUpdate && !isBundlePricing) + { + if (selectedAttributeValues.Count > 0) + { + selectedAttributeValues.Each(x => attributesTotalPriceBase += GetProductVariantAttributeValuePriceAdjustment(x, product, customer, context, 1)); + } + else + { + attributesTotalPriceBase = preSelectedPriceAdjustmentBase; + } + } + + if (bundleItem != null) + { + bundleItem.AdditionalCharge = attributesTotalPriceBase; + } + + var result = GetFinalPrice(product, bundleItems, customer, attributesTotalPriceBase, true, 1, bundleItem, context); + return result; + } + + public virtual PriceCalculationContext CreatePriceCalculationContext( + IEnumerable products = null, + Customer customer = null, + int? storeId = null, bool includeHidden = true) - { - if (customer == null) - customer = _services.WorkContext.CurrentCustomer; - - if (!storeId.HasValue) - storeId = _services.StoreContext.CurrentStore.Id; - - var context = new PriceCalculationContext(products, - x => _productAttributeService.GetProductVariantAttributesByProductIds(x, null), - x => _productAttributeService.GetProductVariantAttributeCombinations(x), - x => _productService.GetTierPricesByProductIds(x, customer, storeId.Value), - x => _categoryService.GetProductCategoriesByProductIds(x, includeHidden), - x => _manufacturerService.GetProductManufacturersByProductIds(x, includeHidden), - x => _productService.GetAppliedDiscountsByProductIds(x), - x => _productService.GetBundleItemsByProductIds(x, includeHidden), + { + if (customer == null) + customer = _services.WorkContext.CurrentCustomer; + + if (!storeId.HasValue) + storeId = _services.StoreContext.CurrentStore.Id; + + var context = new PriceCalculationContext(products, + x => _productAttributeService.GetProductVariantAttributesByProductIds(x, null), + x => _productAttributeService.GetProductVariantAttributeCombinations(x), + x => _productService.GetTierPricesByProductIds(x, customer, storeId.Value), + x => _categoryService.GetProductCategoriesByProductIds(x, includeHidden), + x => _manufacturerService.GetProductManufacturersByProductIds(x, includeHidden), + x => _productService.GetAppliedDiscountsByProductIds(x), + x => _productService.GetBundleItemsByProductIds(x, includeHidden), x => _productService.GetAssociatedProductsByProductIds(x, includeHidden) - ); + ); - return context; - } + return context; + } #endregion @@ -450,28 +450,28 @@ public virtual PriceCalculationContext CreatePriceCalculationContext( /// Product special price public virtual decimal? GetSpecialPrice(Product product) { - if (product == null) - throw new ArgumentNullException("product"); + if (product == null) + throw new ArgumentNullException("product"); if (!product.SpecialPrice.HasValue) return null; //check date range DateTime now = DateTime.UtcNow; - if (product.SpecialPriceStartDateTimeUtc.HasValue) + if (product.SpecialPriceStartDateTimeUtc.HasValue) { - DateTime startDate = DateTime.SpecifyKind(product.SpecialPriceStartDateTimeUtc.Value, DateTimeKind.Utc); + DateTime startDate = DateTime.SpecifyKind(product.SpecialPriceStartDateTimeUtc.Value, DateTimeKind.Utc); if (startDate.CompareTo(now) > 0) return null; } - if (product.SpecialPriceEndDateTimeUtc.HasValue) + if (product.SpecialPriceEndDateTimeUtc.HasValue) { - DateTime endDate = DateTime.SpecifyKind(product.SpecialPriceEndDateTimeUtc.Value, DateTimeKind.Utc); + DateTime endDate = DateTime.SpecifyKind(product.SpecialPriceEndDateTimeUtc.Value, DateTimeKind.Utc); if (endDate.CompareTo(now) < 0) return null; } - return product.SpecialPrice.Value; + return product.SpecialPrice.Value; } /// @@ -483,7 +483,7 @@ public virtual PriceCalculationContext CreatePriceCalculationContext( public virtual decimal GetFinalPrice(Product product, bool includeDiscounts) { var customer = _services.WorkContext.CurrentCustomer; - return GetFinalPrice(product, customer, includeDiscounts); + return GetFinalPrice(product, customer, includeDiscounts); } /// @@ -495,7 +495,7 @@ public virtual decimal GetFinalPrice(Product product, bool includeDiscounts) /// Final price public virtual decimal GetFinalPrice(Product product, Customer customer, bool includeDiscounts) { - return GetFinalPrice(product, customer, decimal.Zero, includeDiscounts); + return GetFinalPrice(product, customer, decimal.Zero, includeDiscounts); } /// @@ -506,29 +506,29 @@ public virtual decimal GetFinalPrice(Product product, Customer customer, bool in /// Additional charge /// A value indicating whether include discounts or not for final price computation /// Final price - public virtual decimal GetFinalPrice(Product product, - Customer customer, - decimal additionalCharge, + public virtual decimal GetFinalPrice(Product product, + Customer customer, + decimal additionalCharge, bool includeDiscounts) { return GetFinalPrice(product, customer, additionalCharge, includeDiscounts, 1); } - public virtual decimal GetFinalPrice( - Product product, + public virtual decimal GetFinalPrice( + Product product, Customer customer, - decimal additionalCharge, - bool includeDiscounts, + decimal additionalCharge, + bool includeDiscounts, int quantity, - ProductBundleItemData bundleItem = null, - PriceCalculationContext context = null, - bool isTierPrice = false) - { + ProductBundleItemData bundleItem = null, + PriceCalculationContext context = null, + bool isTierPrice = false) + { // Initial price. - var result = product.Price; + var result = product.Price; // Special price. - var specialPrice = GetSpecialPrice(product); + var specialPrice = GetSpecialPrice(product); if (specialPrice.HasValue) { result = specialPrice.Value; @@ -571,7 +571,7 @@ public virtual decimal GetFinalPrice( // Discount + additional charge. if (includeDiscounts) { - var discountAmount = GetDiscountAmount(product, customer, additionalCharge, quantity, out var appliedDiscount, bundleItem, context); + var discountAmount = GetDiscountAmount(product, customer, additionalCharge, quantity, out var appliedDiscount, bundleItem, context); result = result + additionalCharge - discountAmount; } else @@ -582,47 +582,47 @@ public virtual decimal GetFinalPrice( return Math.Max(result, decimal.Zero); } - public virtual decimal GetFinalPrice( - Product product, - IEnumerable bundleItems, - Customer customer, - decimal additionalCharge, - bool includeDiscounts, - int quantity, - ProductBundleItemData bundleItem = null, - PriceCalculationContext context = null) - { - if (product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing) - { - var result = decimal.Zero; - var items = bundleItems; - - if (items == null) - { - items = context == null - ? _productService.GetBundleItems(product.Id) - : context.ProductBundleItems.GetOrLoad(product.Id).Select(x => new ProductBundleItemData(x)).ToList(); - } - - foreach (var itemData in items.Where(x => x != null && x.Item != null)) - { - var itemPrice = GetFinalPrice(itemData.Item.Product, customer, itemData.AdditionalCharge, includeDiscounts, 1, itemData, context); - - result += decimal.Multiply(itemPrice, itemData.Item.Quantity); - } - - return result < decimal.Zero ? decimal.Zero : result; - } - - return GetFinalPrice(product, customer, additionalCharge, includeDiscounts, quantity, bundleItem, context); - } - - public virtual decimal GetLowestPrice(Product product, Customer customer, PriceCalculationContext context, out bool displayFromMessage) - { + public virtual decimal GetFinalPrice( + Product product, + IEnumerable bundleItems, + Customer customer, + decimal additionalCharge, + bool includeDiscounts, + int quantity, + ProductBundleItemData bundleItem = null, + PriceCalculationContext context = null) + { + if (product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing) + { + var result = decimal.Zero; + var items = bundleItems; + + if (items == null) + { + items = context == null + ? _productService.GetBundleItems(product.Id) + : context.ProductBundleItems.GetOrLoad(product.Id).Select(x => new ProductBundleItemData(x)).ToList(); + } + + foreach (var itemData in items.Where(x => x != null && x.Item != null)) + { + var itemPrice = GetFinalPrice(itemData.Item.Product, customer, itemData.AdditionalCharge, includeDiscounts, 1, itemData, context); + + result += decimal.Multiply(itemPrice, itemData.Item.Quantity); + } + + return result < decimal.Zero ? decimal.Zero : result; + } + + return GetFinalPrice(product, customer, additionalCharge, includeDiscounts, quantity, bundleItem, context); + } + + public virtual decimal GetLowestPrice(Product product, Customer customer, PriceCalculationContext context, out bool displayFromMessage) + { Guard.NotNull(product, nameof(product)); - if (product.ProductType == ProductType.GroupedProduct) - throw Error.InvalidOperation("Choose the other override for products of type grouped product."); + if (product.ProductType == ProductType.GroupedProduct) + throw Error.InvalidOperation("Choose the other override for products of type grouped product."); // Note, attribute price adjustments will not be taken into account here. if (context == null) @@ -630,7 +630,7 @@ public virtual decimal GetLowestPrice(Product product, Customer customer, PriceC context = CreatePriceCalculationContext(customer: customer); } - var isBundlePerItemPricing = product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing; + var isBundlePerItemPricing = product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing; var lowestPrice = GetFinalPrice(product, null, customer, decimal.Zero, true, int.MaxValue, null, context); displayFromMessage = isBundlePerItemPricing; @@ -645,80 +645,80 @@ public virtual decimal GetLowestPrice(Product product, Customer customer, PriceC } if (lowestPrice == decimal.Zero && product.Price == decimal.Zero) - { - lowestPrice = product.LowestAttributeCombinationPrice ?? decimal.Zero; - } - - if (!displayFromMessage && product.ProductType != ProductType.BundledProduct) - { - var attributes = context.Attributes.GetOrLoad(product.Id); - displayFromMessage = attributes.Any(x => x.ProductVariantAttributeValues.Any(y => y.PriceAdjustment != decimal.Zero)); - } - - if (!displayFromMessage && product.HasTierPrices && !isBundlePerItemPricing) - { - var tierPrices = context.TierPrices.GetOrLoad(product.Id) - .RemoveDuplicatedQuantities(); - - displayFromMessage = tierPrices.Count > 0 && !(tierPrices.Count == 1 && tierPrices.First().Quantity <= 1); - } - - return lowestPrice; - } - - public virtual decimal? GetLowestPrice( - Product product, - Customer customer, - PriceCalculationContext context, - IEnumerable associatedProducts, - out Product lowestPriceProduct) - { - if (product == null) - throw new ArgumentNullException("product"); - - if (associatedProducts == null) - throw new ArgumentNullException("associatedProducts"); - - if (product.ProductType != ProductType.GroupedProduct) - throw Error.InvalidOperation("Choose the other override for products not of type grouped product."); - - lowestPriceProduct = null; - decimal? lowestPrice = null; + { + lowestPrice = product.LowestAttributeCombinationPrice ?? decimal.Zero; + } + + if (!displayFromMessage && product.ProductType != ProductType.BundledProduct) + { + var attributes = context.Attributes.GetOrLoad(product.Id); + displayFromMessage = attributes.Any(x => x.ProductVariantAttributeValues.Any(y => y.PriceAdjustment != decimal.Zero)); + } + + if (!displayFromMessage && product.HasTierPrices && !isBundlePerItemPricing) + { + var tierPrices = context.TierPrices.GetOrLoad(product.Id) + .RemoveDuplicatedQuantities(); + + displayFromMessage = tierPrices.Count > 0 && !(tierPrices.Count == 1 && tierPrices.First().Quantity <= 1); + } + + return lowestPrice; + } + + public virtual decimal? GetLowestPrice( + Product product, + Customer customer, + PriceCalculationContext context, + IEnumerable associatedProducts, + out Product lowestPriceProduct) + { + if (product == null) + throw new ArgumentNullException("product"); + + if (associatedProducts == null) + throw new ArgumentNullException("associatedProducts"); + + if (product.ProductType != ProductType.GroupedProduct) + throw Error.InvalidOperation("Choose the other override for products not of type grouped product."); + + lowestPriceProduct = null; + decimal? lowestPrice = null; if (context == null) { context = CreatePriceCalculationContext(customer: customer); } - foreach (var associatedProduct in associatedProducts) - { - var tmpPrice = GetFinalPrice(associatedProduct, customer, decimal.Zero, true, int.MaxValue, null, context); + foreach (var associatedProduct in associatedProducts) + { + var tmpPrice = GetFinalPrice(associatedProduct, customer, decimal.Zero, true, int.MaxValue, null, context); - if (associatedProduct.LowestAttributeCombinationPrice.HasValue && associatedProduct.LowestAttributeCombinationPrice.Value < tmpPrice) - { - tmpPrice = associatedProduct.LowestAttributeCombinationPrice.Value; - } + if (associatedProduct.LowestAttributeCombinationPrice.HasValue && associatedProduct.LowestAttributeCombinationPrice.Value < tmpPrice) + { + tmpPrice = associatedProduct.LowestAttributeCombinationPrice.Value; + } - if (!lowestPrice.HasValue || tmpPrice < lowestPrice.Value) - { - lowestPrice = tmpPrice; - lowestPriceProduct = associatedProduct; - } - } + if (!lowestPrice.HasValue || tmpPrice < lowestPrice.Value) + { + lowestPrice = tmpPrice; + lowestPriceProduct = associatedProduct; + } + } if (lowestPriceProduct == null) { lowestPriceProduct = associatedProducts.FirstOrDefault(); } - return lowestPrice; - } + return lowestPrice; + } - public virtual decimal GetPreselectedPrice(Product product, Customer customer, Currency currency, PriceCalculationContext context) - { + public virtual decimal GetPreselectedPrice(Product product, Customer customer, Currency currency, PriceCalculationContext context) + { Guard.NotNull(product, nameof(product)); - var result = decimal.Zero; + var result = decimal.Zero; if (context == null) { @@ -749,37 +749,37 @@ public virtual decimal GetPreselectedPrice(Product product, Customer customer, C result = GetPreselectedPrice(product, customer, currency, context, null, null); } - return result; - } + return result; + } - /// - /// Gets the product cost - /// - /// Product - /// Shopping cart item attributes in XML - /// Product cost - public virtual decimal GetProductCost(Product product, string attributesXml) - { - if (product == null) - throw new ArgumentNullException("product"); - - decimal result = product.ProductCost; - - _productAttributeParser - .ParseProductVariantAttributeValues(attributesXml) - .Where(x => x.ValueType == ProductVariantAttributeValueType.ProductLinkage) - .ToList() - .Each(x => - { - var linkedProduct = _productService.GetProductById(x.LinkedProductId); - - if (linkedProduct != null) - result += (linkedProduct.ProductCost * x.Quantity); - }); - - return result; - } + /// + /// Gets the product cost + /// + /// Product + /// Shopping cart item attributes in XML + /// Product cost + public virtual decimal GetProductCost(Product product, string attributesXml) + { + if (product == null) + throw new ArgumentNullException("product"); + + decimal result = product.ProductCost; + + _productAttributeParser + .ParseProductVariantAttributeValues(attributesXml) + .Where(x => x.ValueType == ProductVariantAttributeValueType.ProductLinkage) + .ToList() + .Each(x => + { + var linkedProduct = _productService.GetProductById(x.LinkedProductId); + + if (linkedProduct != null) + result += (linkedProduct.ProductCost * x.Quantity); + }); + + return result; + } /// /// Gets discount amount @@ -798,7 +798,7 @@ public virtual decimal GetDiscountAmount(Product product) /// Product /// The customer /// Discount amount - public virtual decimal GetDiscountAmount(Product product, + public virtual decimal GetDiscountAmount(Product product, Customer customer) { return GetDiscountAmount(product, customer, decimal.Zero); @@ -811,8 +811,8 @@ public virtual decimal GetDiscountAmount(Product product, /// The customer /// Additional charge /// Discount amount - public virtual decimal GetDiscountAmount(Product product, - Customer customer, + public virtual decimal GetDiscountAmount(Product product, + Customer customer, decimal additionalCharge) { return GetDiscountAmount(product, customer, additionalCharge, out var appliedDiscount); @@ -826,64 +826,64 @@ public virtual decimal GetDiscountAmount(Product product, /// Additional charge /// Applied discount /// Discount amount - public virtual decimal GetDiscountAmount(Product product, + public virtual decimal GetDiscountAmount(Product product, Customer customer, - decimal additionalCharge, + decimal additionalCharge, out Discount appliedDiscount) { return GetDiscountAmount(product, customer, additionalCharge, 1, out appliedDiscount); } public virtual decimal GetDiscountAmount( - Product product, + Product product, Customer customer, decimal additionalCharge, int quantity, out Discount appliedDiscount, - ProductBundleItemData bundleItem = null, - PriceCalculationContext context = null, + ProductBundleItemData bundleItem = null, + PriceCalculationContext context = null, decimal? finalPrice = null) { appliedDiscount = null; var appliedDiscountAmount = decimal.Zero; - if (bundleItem != null && bundleItem.Item != null) - { - if (bundleItem.Item.Discount.HasValue && bundleItem.Item.BundleProduct.BundlePerItemPricing) - { - appliedDiscount = new Discount - { - UsePercentage = bundleItem.Item.DiscountPercentage, - DiscountPercentage = bundleItem.Item.Discount.Value, - DiscountAmount = bundleItem.Item.Discount.Value - }; + if (bundleItem != null && bundleItem.Item != null) + { + if (bundleItem.Item.Discount.HasValue && bundleItem.Item.BundleProduct.BundlePerItemPricing) + { + appliedDiscount = new Discount + { + UsePercentage = bundleItem.Item.DiscountPercentage, + DiscountPercentage = bundleItem.Item.Discount.Value, + DiscountAmount = bundleItem.Item.Discount.Value + }; var finalPriceWithoutDiscount = finalPrice ?? GetFinalPrice(product, customer, additionalCharge, false, quantity, bundleItem, context); - appliedDiscountAmount = appliedDiscount.GetDiscountAmount(finalPriceWithoutDiscount); - } - } - else - { - // Don't apply when customer entered price or discounts should be ignored in any case. - if (product.CustomerEntersPrice || _catalogSettings.IgnoreDiscounts) - { - return appliedDiscountAmount; - } - - var allowedDiscounts = GetAllowedDiscounts(product, customer, context); - if (allowedDiscounts.Count == 0) - { - return appliedDiscountAmount; - } + appliedDiscountAmount = appliedDiscount.GetDiscountAmount(finalPriceWithoutDiscount); + } + } + else + { + // Don't apply when customer entered price or discounts should be ignored in any case. + if (product.CustomerEntersPrice || _catalogSettings.IgnoreDiscounts) + { + return appliedDiscountAmount; + } + + var allowedDiscounts = GetAllowedDiscounts(product, customer, context); + if (allowedDiscounts.Count == 0) + { + return appliedDiscountAmount; + } var finalPriceWithoutDiscount = finalPrice ?? GetFinalPrice(product, customer, additionalCharge, false, quantity, bundleItem, context); - appliedDiscount = allowedDiscounts.GetPreferredDiscount(finalPriceWithoutDiscount); + appliedDiscount = allowedDiscounts.GetPreferredDiscount(finalPriceWithoutDiscount); - if (appliedDiscount != null) - { - appliedDiscountAmount = appliedDiscount.GetDiscountAmount(finalPriceWithoutDiscount); - } - } + if (appliedDiscount != null) + { + appliedDiscountAmount = appliedDiscount.GetDiscountAmount(finalPriceWithoutDiscount); + } + } return appliedDiscountAmount; } @@ -908,57 +908,57 @@ public virtual decimal GetSubTotal(OrganizedShoppingCartItem shoppingCartItem, b /// Shopping cart unit price (one item) public virtual decimal GetUnitPrice(OrganizedShoppingCartItem shoppingCartItem, bool includeDiscounts) { - decimal finalPrice = decimal.Zero; + decimal finalPrice = decimal.Zero; var customer = shoppingCartItem.Item.Customer; - var product = shoppingCartItem.Item.Product; + var product = shoppingCartItem.Item.Product; if (product != null) { - if (product.CustomerEntersPrice) + if (product.CustomerEntersPrice) { finalPrice = shoppingCartItem.Item.CustomerEnteredPrice; } - else if (product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing) - { - if (shoppingCartItem.ChildItems != null) - { - foreach (var bundleItem in shoppingCartItem.ChildItems) - { - bundleItem.Item.Product.MergeWithCombination(bundleItem.Item.AttributesXml, _productAttributeParser); - } - - var bundleItems = shoppingCartItem.ChildItems + else if (product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing) + { + if (shoppingCartItem.ChildItems != null) + { + foreach (var bundleItem in shoppingCartItem.ChildItems) + { + bundleItem.Item.Product.MergeWithCombination(bundleItem.Item.AttributesXml, _productAttributeParser); + } + + var bundleItems = shoppingCartItem.ChildItems .Where(x => x.BundleItemData != null && x.BundleItemData.Item != null) .Select(x => x.BundleItemData).ToList(); - finalPrice = GetFinalPrice(product, bundleItems, customer, decimal.Zero, includeDiscounts, shoppingCartItem.Item.Quantity); - } - } + finalPrice = GetFinalPrice(product, bundleItems, customer, decimal.Zero, includeDiscounts, shoppingCartItem.Item.Quantity); + } + } else { - product.MergeWithCombination(shoppingCartItem.Item.AttributesXml, _productAttributeParser); + product.MergeWithCombination(shoppingCartItem.Item.AttributesXml, _productAttributeParser); - var attributesTotalPrice = decimal.Zero; - var pvaValuesEnum = _productAttributeParser.ParseProductVariantAttributeValues(shoppingCartItem.Item.AttributesXml); + var attributesTotalPrice = decimal.Zero; + var pvaValuesEnum = _productAttributeParser.ParseProductVariantAttributeValues(shoppingCartItem.Item.AttributesXml); - if (pvaValuesEnum != null) - { - var pvaValues = pvaValuesEnum.ToList(); + if (pvaValuesEnum != null) + { + var pvaValues = pvaValuesEnum.ToList(); - foreach (var pvaValue in pvaValues) - { - attributesTotalPrice += GetProductVariantAttributeValuePriceAdjustment(pvaValue, product, customer, null, shoppingCartItem.Item.Quantity); - } - } + foreach (var pvaValue in pvaValues) + { + attributesTotalPrice += GetProductVariantAttributeValuePriceAdjustment(pvaValue, product, customer, null, shoppingCartItem.Item.Quantity); + } + } - finalPrice = GetFinalPrice(product, customer, attributesTotalPrice, includeDiscounts, shoppingCartItem.Item.Quantity, shoppingCartItem.BundleItemData); + finalPrice = GetFinalPrice(product, customer, attributesTotalPrice, includeDiscounts, shoppingCartItem.Item.Quantity, shoppingCartItem.BundleItemData); } } finalPrice = finalPrice.RoundIfEnabledFor(_services.WorkContext.WorkingCurrency); return finalPrice; } - + /// @@ -966,7 +966,7 @@ public virtual decimal GetUnitPrice(OrganizedShoppingCartItem shoppingCartItem, /// /// The shopping cart item /// Discount amount - public virtual decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartItem) + public virtual decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartItem) { return GetDiscountAmount(shoppingCartItem, out var appliedDiscount); } @@ -979,14 +979,14 @@ public virtual decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartI /// Discount amount public virtual decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartItem, out Discount appliedDiscount) { - appliedDiscount = null; + appliedDiscount = null; - var customer = shoppingCartItem.Item.Customer; - var totalDiscountAmount = decimal.Zero; - var product = shoppingCartItem.Item.Product; - var quantity = shoppingCartItem.Item.Quantity; + var customer = shoppingCartItem.Item.Customer; + var totalDiscountAmount = decimal.Zero; + var product = shoppingCartItem.Item.Product; + var quantity = shoppingCartItem.Item.Quantity; - if (product != null) + if (product != null) { var attributesTotalPrice = decimal.Zero; var pvaValues = _productAttributeParser.ParseProductVariantAttributeValues(shoppingCartItem.Item.AttributesXml).ToList(); @@ -996,26 +996,26 @@ public virtual decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartI attributesTotalPrice += GetProductVariantAttributeValuePriceAdjustment(pvaValue, product, customer, null, quantity); } - var productDiscountAmount = GetDiscountAmount(product, customer, attributesTotalPrice, quantity, out appliedDiscount); - totalDiscountAmount = productDiscountAmount * quantity; + var productDiscountAmount = GetDiscountAmount(product, customer, attributesTotalPrice, quantity, out appliedDiscount); + totalDiscountAmount = productDiscountAmount * quantity; } totalDiscountAmount = totalDiscountAmount.RoundIfEnabledFor(_services.WorkContext.WorkingCurrency); - return totalDiscountAmount; + return totalDiscountAmount; } - /// - /// Gets the price adjustment of a variant attribute value - /// - /// Product variant attribute value - /// Price adjustment of a variant attribute value - public virtual decimal GetProductVariantAttributeValuePriceAdjustment(ProductVariantAttributeValue attributeValue, + /// + /// Gets the price adjustment of a variant attribute value + /// + /// Product variant attribute value + /// Price adjustment of a variant attribute value + public virtual decimal GetProductVariantAttributeValuePriceAdjustment(ProductVariantAttributeValue attributeValue, Product product, Customer customer, PriceCalculationContext context, int productQuantity = 1) - { + { Guard.NotNull(attributeValue, nameof(attributeValue)); - if (attributeValue.ValueType == ProductVariantAttributeValueType.Simple) + if (attributeValue.ValueType == ProductVariantAttributeValueType.Simple) { if (productQuantity > 1 && attributeValue.PriceAdjustment > 0) { @@ -1025,23 +1025,23 @@ public virtual decimal GetProductVariantAttributeValuePriceAdjustment(ProductVar return tierPriceAttributeAdjustment; } } - + return attributeValue.PriceAdjustment; } - + if (attributeValue.ValueType == ProductVariantAttributeValueType.ProductLinkage) - { - var linkedProduct = _productService.GetProductById(attributeValue.LinkedProductId); - - if (linkedProduct != null) - { - var productPrice = GetFinalPrice(linkedProduct, true) * attributeValue.Quantity; - return productPrice; - } - } - - return decimal.Zero; - } + { + var linkedProduct = _productService.GetProductById(attributeValue.LinkedProductId); + + if (linkedProduct != null) + { + var productPrice = GetFinalPrice(linkedProduct, true) * attributeValue.Quantity; + return productPrice; + } + } + + return decimal.Zero; + } #endregion } diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs index 5ea1ec97ed..2a15907376 100644 --- a/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs @@ -56,7 +56,7 @@ public string FormatPrice(decimal price, bool showCurrency, bool showTax) public string FormatPrice(decimal price, bool showCurrency, string currencyCode, bool showTax, Language language) { - var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; + var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; var priceIncludesTax = _workContext.TaxDisplayType == TaxDisplayType.IncludingTax; return FormatPrice(price, showCurrency, currency, language, priceIncludesTax, showTax); @@ -64,15 +64,15 @@ public string FormatPrice(decimal price, bool showCurrency, string currencyCode, public string FormatPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax) { - bool showTax = _taxSettings.DisplayTaxSuffix; - return FormatPrice(price, showCurrency, currencyCode, language, priceIncludesTax, showTax); + bool showTax = _taxSettings.DisplayTaxSuffix; + return FormatPrice(price, showCurrency, currencyCode, language, priceIncludesTax, showTax); } - public string FormatPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax) - { - var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; - return FormatPrice(price, showCurrency, currency, language, priceIncludesTax, showTax); - } + public string FormatPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax) + { + var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; + return FormatPrice(price, showCurrency, currency, language, priceIncludesTax, showTax); + } public string FormatPrice(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax) { @@ -80,29 +80,29 @@ public string FormatPrice(decimal price, bool showCurrency, Currency targetCurre return FormatPrice(price, showCurrency, targetCurrency, language, priceIncludesTax, showTax); } - public string FormatPrice(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax, bool showTax) - { - var formatted = new Money(price, targetCurrency).ToString(showCurrency); + public string FormatPrice(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax, bool showTax) + { + var formatted = new Money(price, targetCurrency).ToString(showCurrency); - if (showTax) - { - // Show tax suffix - var resKey = "Products." + (priceIncludesTax ? "InclTaxSuffix" : "ExclTaxSuffix"); - var taxFormatStr = _localizationService.GetResource(resKey, language.Id, false).NullEmpty() ?? (priceIncludesTax ? "{0} incl. tax" : "{0} excl. tax"); + if (showTax) + { + // Show tax suffix + var resKey = "Products." + (priceIncludesTax ? "InclTaxSuffix" : "ExclTaxSuffix"); + var taxFormatStr = _localizationService.GetResource(resKey, language.Id, false).NullEmpty() ?? (priceIncludesTax ? "{0} incl. tax" : "{0} excl. tax"); - formatted = string.Format(taxFormatStr, formatted); - } + formatted = string.Format(taxFormatStr, formatted); + } - return formatted; - } + return formatted; + } - public string FormatShippingPrice(decimal price, bool showCurrency) + public string FormatShippingPrice(decimal price, bool showCurrency) { var targetCurrency = _workContext.WorkingCurrency; var language = _workContext.WorkingLanguage; - var priceIncludesTax = _workContext.TaxDisplayType == TaxDisplayType.IncludingTax; + var priceIncludesTax = _workContext.TaxDisplayType == TaxDisplayType.IncludingTax; return FormatShippingPrice(price, showCurrency, targetCurrency, language, priceIncludesTax); } @@ -113,20 +113,20 @@ public string FormatShippingPrice(decimal price, bool showCurrency, Currency tar return FormatShippingPrice(price, showCurrency, targetCurrency, language, priceIncludesTax, showTax); } - public string FormatShippingPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax) - { - var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; - return FormatPrice(price, showCurrency, currency, language, priceIncludesTax, showTax); - } + public string FormatShippingPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax) + { + var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; + return FormatPrice(price, showCurrency, currency, language, priceIncludesTax, showTax); + } public string FormatShippingPrice(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax, bool showTax) { return FormatPrice(price, showCurrency, targetCurrency, language, priceIncludesTax, showTax); } - + public string FormatShippingPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax) { - var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; + var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; return FormatShippingPrice(price, showCurrency, currency, language, priceIncludesTax); } @@ -136,7 +136,7 @@ public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency) { var targetCurrency = _workContext.WorkingCurrency; var language = _workContext.WorkingLanguage; - var priceIncludesTax = _workContext.TaxDisplayType == TaxDisplayType.IncludingTax; + var priceIncludesTax = _workContext.TaxDisplayType == TaxDisplayType.IncludingTax; return FormatPaymentMethodAdditionalFee(price, showCurrency, targetCurrency, language, priceIncludesTax); } @@ -147,11 +147,11 @@ public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, return FormatPaymentMethodAdditionalFee(price, showCurrency, targetCurrency, language, priceIncludesTax, showTax); } - public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax) - { - var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; - return FormatPrice(price, showCurrency, currency, language, priceIncludesTax, showTax); - } + public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax, bool showTax) + { + var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; + return FormatPrice(price, showCurrency, currency, language, priceIncludesTax, showTax); + } public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax, bool showTax) { @@ -160,7 +160,7 @@ public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax) { - var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; + var currency = _currencyService.GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }; return FormatPaymentMethodAdditionalFee(price, showCurrency, currency, language, priceIncludesTax); } diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeExtensions.cs index 7ce8def364..b2674af953 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeExtensions.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeExtensions.cs @@ -5,7 +5,7 @@ namespace SmartStore.Services.Catalog { - public static class ProductAttributeExtensions + public static class ProductAttributeExtensions { /// /// A value indicating whether this product variant attribute should have values @@ -19,73 +19,73 @@ public static bool ShouldHaveValues(this ProductVariantAttribute productVariantA if (productVariantAttribute.AttributeControlType == AttributeControlType.TextBox || productVariantAttribute.AttributeControlType == AttributeControlType.MultilineTextbox || - productVariantAttribute.AttributeControlType == AttributeControlType.Datepicker || + productVariantAttribute.AttributeControlType == AttributeControlType.Datepicker || productVariantAttribute.AttributeControlType == AttributeControlType.FileUpload) return false; // All other attribute control types support values. return true; } - - public static string AddProductAttribute(this ProductVariantAttribute pva, string attributes, string value) - { - string result = string.Empty; - try - { - var xmlDoc = new XmlDocument(); - if (String.IsNullOrEmpty(attributes)) - { - var element1 = xmlDoc.CreateElement("Attributes"); - xmlDoc.AppendChild(element1); - } - else - { - xmlDoc.LoadXml(attributes); - } - var rootElement = (XmlElement)xmlDoc.SelectSingleNode(@"//Attributes"); - XmlElement pvaElement = null; - //find existing - var nodeList1 = xmlDoc.SelectNodes(@"//Attributes/ProductVariantAttribute"); - foreach (XmlNode node1 in nodeList1) - { - if (node1.Attributes != null && node1.Attributes["ID"] != null) - { - string str1 = node1.Attributes["ID"].InnerText.Trim(); - int id = 0; - if (int.TryParse(str1, out id)) - { - if (id == pva.Id) - { - pvaElement = (XmlElement)node1; - break; - } - } - } - } + public static string AddProductAttribute(this ProductVariantAttribute pva, string attributes, string value) + { + string result = string.Empty; + try + { + var xmlDoc = new XmlDocument(); + if (String.IsNullOrEmpty(attributes)) + { + var element1 = xmlDoc.CreateElement("Attributes"); + xmlDoc.AppendChild(element1); + } + else + { + xmlDoc.LoadXml(attributes); + } + var rootElement = (XmlElement)xmlDoc.SelectSingleNode(@"//Attributes"); + + XmlElement pvaElement = null; + //find existing + var nodeList1 = xmlDoc.SelectNodes(@"//Attributes/ProductVariantAttribute"); + foreach (XmlNode node1 in nodeList1) + { + if (node1.Attributes != null && node1.Attributes["ID"] != null) + { + string str1 = node1.Attributes["ID"].InnerText.Trim(); + int id = 0; + if (int.TryParse(str1, out id)) + { + if (id == pva.Id) + { + pvaElement = (XmlElement)node1; + break; + } + } + } + } - //create new one if not found - if (pvaElement == null) - { - pvaElement = xmlDoc.CreateElement("ProductVariantAttribute"); - pvaElement.SetAttribute("ID", pva.Id.ToString()); - rootElement.AppendChild(pvaElement); - } + //create new one if not found + if (pvaElement == null) + { + pvaElement = xmlDoc.CreateElement("ProductVariantAttribute"); + pvaElement.SetAttribute("ID", pva.Id.ToString()); + rootElement.AppendChild(pvaElement); + } - var pvavElement = xmlDoc.CreateElement("ProductVariantAttributeValue"); - pvaElement.AppendChild(pvavElement); + var pvavElement = xmlDoc.CreateElement("ProductVariantAttributeValue"); + pvaElement.AppendChild(pvavElement); - var pvavVElement = xmlDoc.CreateElement("Value"); - pvavVElement.InnerText = value; - pvavElement.AppendChild(pvavVElement); + var pvavVElement = xmlDoc.CreateElement("Value"); + pvavVElement.InnerText = value; + pvavElement.AppendChild(pvavVElement); - result = xmlDoc.OuterXml; - } - catch (Exception exc) - { - Debug.Write(exc.ToString()); - } - return result; - } - } + result = xmlDoc.OuterXml; + } + catch (Exception exc) + { + Debug.Write(exc.ToString()); + } + return result; + } + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs index 5b676afbc4..2877c4800f 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs @@ -21,41 +21,41 @@ public partial class ProductAttributeFormatter : IProductAttributeFormatter private readonly IWorkContext _workContext; private readonly IProductAttributeService _productAttributeService; private readonly IProductAttributeParser _productAttributeParser; - private readonly IPriceCalculationService _priceCalculationService; + private readonly IPriceCalculationService _priceCalculationService; private readonly ICurrencyService _currencyService; private readonly ILocalizationService _localizationService; private readonly ITaxService _taxService; private readonly IPriceFormatter _priceFormatter; private readonly IDownloadService _downloadService; private readonly IWebHelper _webHelper; - private readonly ShoppingCartSettings _shoppingCartSettings; - private readonly CatalogSettings _catalogSettings; + private readonly ShoppingCartSettings _shoppingCartSettings; + private readonly CatalogSettings _catalogSettings; - public ProductAttributeFormatter(IWorkContext workContext, + public ProductAttributeFormatter(IWorkContext workContext, IProductAttributeService productAttributeService, IProductAttributeParser productAttributeParser, - IPriceCalculationService priceCalculationService, + IPriceCalculationService priceCalculationService, ICurrencyService currencyService, ILocalizationService localizationService, ITaxService taxService, IPriceFormatter priceFormatter, IDownloadService downloadService, IWebHelper webHelper, - ShoppingCartSettings shoppingCartSettings, - CatalogSettings catalogSettings) + ShoppingCartSettings shoppingCartSettings, + CatalogSettings catalogSettings) { _workContext = workContext; _productAttributeService = productAttributeService; _productAttributeParser = productAttributeParser; - _priceCalculationService = priceCalculationService; + _priceCalculationService = priceCalculationService; _currencyService = currencyService; _localizationService = localizationService; _taxService = taxService; _priceFormatter = priceFormatter; _downloadService = downloadService; _webHelper = webHelper; - _shoppingCartSettings = shoppingCartSettings; - _catalogSettings = catalogSettings; + _shoppingCartSettings = shoppingCartSettings; + _catalogSettings = catalogSettings; } /// @@ -183,40 +183,40 @@ public string FormatAttributes( if (pvaValue != null) { pvaAttribute = "{0}: {1}".FormatInvariant( - pva.ProductAttribute.GetLocalized(a => a.Name, languageId), - pvaValue.GetLocalized(a => a.Name, languageId)); + pva.ProductAttribute.GetLocalized(a => a.Name, languageId), + pvaValue.GetLocalized(a => a.Name, languageId)); if (renderPrices) { - var attributeValuePriceAdjustment = _priceCalculationService.GetProductVariantAttributeValuePriceAdjustment(pvaValue, product, customer, null, 1); - var priceAdjustmentBase = _taxService.GetProductPrice(product, attributeValuePriceAdjustment, customer, out var taxRate); + var attributeValuePriceAdjustment = _priceCalculationService.GetProductVariantAttributeValuePriceAdjustment(pvaValue, product, customer, null, 1); + var priceAdjustmentBase = _taxService.GetProductPrice(product, attributeValuePriceAdjustment, customer, out var taxRate); var priceAdjustment = _currencyService.ConvertFromPrimaryStoreCurrency(priceAdjustmentBase, _workContext.WorkingCurrency); - if (_shoppingCartSettings.ShowLinkedAttributeValueQuantity && + if (_shoppingCartSettings.ShowLinkedAttributeValueQuantity && pvaValue.ValueType == ProductVariantAttributeValueType.ProductLinkage && - pvaValue.Quantity > 1) - { - pvaAttribute += string.Format(" {0}", pvaValue.Quantity); - } + pvaValue.Quantity > 1) + { + pvaAttribute += string.Format(" {0}", pvaValue.Quantity); + } - if (_catalogSettings.ShowVariantCombinationPriceAdjustment) - { - if (priceAdjustmentBase > 0) - { - pvaAttribute += " (+{0})".FormatInvariant(_priceFormatter.FormatPrice(priceAdjustment, true, false)); - } - else if (priceAdjustmentBase < decimal.Zero) - { - pvaAttribute += " (-{0})".FormatInvariant(_priceFormatter.FormatPrice(-priceAdjustment, true, false)); - } - } + if (_catalogSettings.ShowVariantCombinationPriceAdjustment) + { + if (priceAdjustmentBase > 0) + { + pvaAttribute += " (+{0})".FormatInvariant(_priceFormatter.FormatPrice(priceAdjustment, true, false)); + } + else if (priceAdjustmentBase < decimal.Zero) + { + pvaAttribute += " (-{0})".FormatInvariant(_priceFormatter.FormatPrice(-priceAdjustment, true, false)); + } + } } } - if (htmlEncode) - { - pvaAttribute = HttpUtility.HtmlEncode(pvaAttribute); - } + if (htmlEncode) + { + pvaAttribute = HttpUtility.HtmlEncode(pvaAttribute); + } } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeParser.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeParser.cs index 7c6f33ce38..bca2b50f26 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeParser.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeParser.cs @@ -12,154 +12,154 @@ namespace SmartStore.Services.Catalog { - public partial class ProductAttributeParser : IProductAttributeParser + public partial class ProductAttributeParser : IProductAttributeParser { - // 0 = ProductId, 1 = AttributeXml - private const string ATTRIBUTECOMBINATION_BY_IDXML_KEY = "parsedattributecombination.id-{0}-{1}"; + // 0 = ProductId, 1 = AttributeXml + private const string ATTRIBUTECOMBINATION_BY_IDXML_KEY = "parsedattributecombination.id-{0}-{1}"; - // 0 = AttributeXml - private const string ATTRIBUTEVALUES_BY_XML_KEY = "parsedattributevalues-{0}"; + // 0 = AttributeXml + private const string ATTRIBUTEVALUES_BY_XML_KEY = "parsedattributevalues-{0}"; private const string ATTRIBUTEVALUES_PATTERN_KEY = "parsedattributevalues-*"; private readonly IProductAttributeService _productAttributeService; - private readonly IRepository _pvacRepository; - private readonly IRequestCache _requestCache; + private readonly IRepository _pvacRepository; + private readonly IRequestCache _requestCache; - public ProductAttributeParser( - IProductAttributeService productAttributeService, - IRepository pvacRepository, - IRequestCache requestCache) + public ProductAttributeParser( + IProductAttributeService productAttributeService, + IRepository pvacRepository, + IRequestCache requestCache) { _productAttributeService = productAttributeService; - _pvacRepository = pvacRepository; - _requestCache = requestCache; + _pvacRepository = pvacRepository; + _requestCache = requestCache; - Logger = NullLogger.Instance; - } + Logger = NullLogger.Instance; + } - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } - #region Product attributes + #region Product attributes - public virtual int PrefetchProductVariantAttributes(IEnumerable attributesXml) - { + public virtual int PrefetchProductVariantAttributes(IEnumerable attributesXml) + { if (attributesXml == null || !attributesXml.Any()) { return 0; } - // Determine uncached attributes - var unfetched = attributesXml - .Where(xml => xml.HasValue()) - .Distinct() - .Where(xml => !_requestCache.Contains(ATTRIBUTEVALUES_BY_XML_KEY.FormatInvariant(xml))) - .ToArray(); - - var infos = new List(unfetched.Length); - - foreach (var xml in unfetched) - { - var valueIds = new HashSet(); - var map = DeserializeProductVariantAttributes(xml); - var attributes = _productAttributeService.GetProductVariantAttributesByIds(map.Keys); - - foreach (var attribute in attributes) - { - // Only types that have attribute values! Otherwise entered text is misinterpreted as an attribute value id. - if (!attribute.ShouldHaveValues()) - continue; - - var ids = - from id in map[attribute.Id] - where id.HasValue() - select id.ToInt(); - - valueIds.UnionWith(ids); - } - - var info = new AttributeMapInfo - { - AttributesXml = xml, - DeserializedMap = map, - AllValueIds = valueIds.ToArray() - }; - - infos.Add(info); - } - - // Get all value ids across all maps (each map has many attributes) - var allValueIds = infos.SelectMany(x => x.AllValueIds) - .Distinct() - .ToArray(); - - // Load ALL requested attribute values into a single dictionary in one go (key is Id) - var attributeValues = _productAttributeService.GetProductVariantAttributeValuesByIds(allValueIds).ToDictionarySafe(x => x.Id); - - // Create a single cache entry for each passed xml - foreach (var info in infos) - { - var cachedValues = new List(); - - // Ensure value id order in cached result list is correct - foreach (var id in info.AllValueIds) - { - if (attributeValues.TryGetValue(id, out var value)) - { - cachedValues.Add(value); - } - } - - // Put it in cache - var cacheKey = ATTRIBUTEVALUES_BY_XML_KEY.FormatInvariant(info.AttributesXml); - _requestCache.Put(cacheKey, cachedValues); - } + // Determine uncached attributes + var unfetched = attributesXml + .Where(xml => xml.HasValue()) + .Distinct() + .Where(xml => !_requestCache.Contains(ATTRIBUTEVALUES_BY_XML_KEY.FormatInvariant(xml))) + .ToArray(); + + var infos = new List(unfetched.Length); + + foreach (var xml in unfetched) + { + var valueIds = new HashSet(); + var map = DeserializeProductVariantAttributes(xml); + var attributes = _productAttributeService.GetProductVariantAttributesByIds(map.Keys); + + foreach (var attribute in attributes) + { + // Only types that have attribute values! Otherwise entered text is misinterpreted as an attribute value id. + if (!attribute.ShouldHaveValues()) + continue; + + var ids = + from id in map[attribute.Id] + where id.HasValue() + select id.ToInt(); + + valueIds.UnionWith(ids); + } + + var info = new AttributeMapInfo + { + AttributesXml = xml, + DeserializedMap = map, + AllValueIds = valueIds.ToArray() + }; + + infos.Add(info); + } + + // Get all value ids across all maps (each map has many attributes) + var allValueIds = infos.SelectMany(x => x.AllValueIds) + .Distinct() + .ToArray(); + + // Load ALL requested attribute values into a single dictionary in one go (key is Id) + var attributeValues = _productAttributeService.GetProductVariantAttributeValuesByIds(allValueIds).ToDictionarySafe(x => x.Id); + + // Create a single cache entry for each passed xml + foreach (var info in infos) + { + var cachedValues = new List(); + + // Ensure value id order in cached result list is correct + foreach (var id in info.AllValueIds) + { + if (attributeValues.TryGetValue(id, out var value)) + { + cachedValues.Add(value); + } + } + + // Put it in cache + var cacheKey = ATTRIBUTEVALUES_BY_XML_KEY.FormatInvariant(info.AttributesXml); + _requestCache.Put(cacheKey, cachedValues); + } return unfetched.Length; } - public virtual IList ParseProductVariantAttributes(string attributesXml) - { - var values = ParseProductVariantAttributeValues(attributesXml); - var attrMap = DeserializeProductVariantAttributes(attributesXml); - var attrs = _productAttributeService.GetProductVariantAttributesByIds(attrMap.Keys, values.Select(x => x.ProductVariantAttribute).Distinct().ToList()); + public virtual IList ParseProductVariantAttributes(string attributesXml) + { + var values = ParseProductVariantAttributeValues(attributesXml); + var attrMap = DeserializeProductVariantAttributes(attributesXml); + var attrs = _productAttributeService.GetProductVariantAttributesByIds(attrMap.Keys, values.Select(x => x.ProductVariantAttribute).Distinct().ToList()); - return attrs; - } + return attrs; + } - public virtual IEnumerable ParseProductVariantAttributeValues(string attributeXml) - { - if (attributeXml.IsEmpty()) - return new List(); + public virtual IEnumerable ParseProductVariantAttributeValues(string attributeXml) + { + if (attributeXml.IsEmpty()) + return new List(); - var cacheKey = ATTRIBUTEVALUES_BY_XML_KEY.FormatInvariant(attributeXml); + var cacheKey = ATTRIBUTEVALUES_BY_XML_KEY.FormatInvariant(attributeXml); - var result = _requestCache.Get(cacheKey, () => - { - var allValueIds = new HashSet(); - var attrMap = DeserializeProductVariantAttributes(attributeXml); - var attributes = _productAttributeService.GetProductVariantAttributesByIds(attrMap.Keys); + var result = _requestCache.Get(cacheKey, () => + { + var allValueIds = new HashSet(); + var attrMap = DeserializeProductVariantAttributes(attributeXml); + var attributes = _productAttributeService.GetProductVariantAttributesByIds(attrMap.Keys); - foreach (var attribute in attributes) - { - // Only types that have attribute values! Otherwise entered text is misinterpreted as an attribute value id. - if (!attribute.ShouldHaveValues()) - continue; + foreach (var attribute in attributes) + { + // Only types that have attribute values! Otherwise entered text is misinterpreted as an attribute value id. + if (!attribute.ShouldHaveValues()) + continue; - var ids = - from id in attrMap[attribute.Id] - where id.HasValue() - select id.ToInt(); + var ids = + from id in attrMap[attribute.Id] + where id.HasValue() + select id.ToInt(); - allValueIds.UnionWith(ids); - } + allValueIds.UnionWith(ids); + } - var values = _productAttributeService.GetProductVariantAttributeValuesByIds(allValueIds.ToArray()); + var values = _productAttributeService.GetProductVariantAttributeValuesByIds(allValueIds.ToArray()); - return values; - }); + return values; + }); - return result; - } + return result; + } public virtual void ClearCachedAttributeValues() { @@ -167,77 +167,77 @@ public virtual void ClearCachedAttributeValues() } public virtual Multimap DeserializeProductVariantAttributes(string attributesXml) - { - var attrs = new Multimap(); - if (String.IsNullOrEmpty(attributesXml)) - return attrs; - - try - { - var doc = XDocument.Parse(attributesXml); - - // Attributes/ProductVariantAttribute - foreach (var node1 in doc.Descendants("ProductVariantAttribute")) - { - string sid = node1.Attribute("ID").Value; - if (sid.HasValue()) - { - if (int.TryParse(sid, out var id)) - { - // ProductVariantAttributeValue/Value - foreach (var node2 in node1.Descendants("Value")) - { - attrs.Add(id, node2.Value); - } - } - } - } - } - catch (Exception exception) - { - Logger.Error(exception); - } - - return attrs; - } - - public virtual ICollection ParseProductVariantAttributeValues(Multimap attributeCombination, IEnumerable attributes) - { - var result = new HashSet(); - - if (attributeCombination == null || !attributeCombination.Any()) - return result; - - var allValueIds = new HashSet(); - - foreach (var pva in attributes.Where(x => x.ShouldHaveValues()).OrderBy(x => x.DisplayOrder).ToArray()) - { - if (attributeCombination.ContainsKey(pva.Id)) - { - var pvaValuesStr = attributeCombination[pva.Id]; - var ids = pvaValuesStr.Where(x => x.HasValue()).Select(x => x.ToInt()); - - allValueIds.UnionWith(ids); - } - } - - foreach (int id in allValueIds) - { - foreach (var attribute in attributes) - { - var attributeValue = attribute.ProductVariantAttributeValues.FirstOrDefault(x => x.Id == id); - if (attributeValue != null) - { - result.Add(attributeValue); - break; - } - } - } - - return result; - } - - public virtual IList ParseValues(string attributesXml, int productVariantAttributeId) + { + var attrs = new Multimap(); + if (String.IsNullOrEmpty(attributesXml)) + return attrs; + + try + { + var doc = XDocument.Parse(attributesXml); + + // Attributes/ProductVariantAttribute + foreach (var node1 in doc.Descendants("ProductVariantAttribute")) + { + string sid = node1.Attribute("ID").Value; + if (sid.HasValue()) + { + if (int.TryParse(sid, out var id)) + { + // ProductVariantAttributeValue/Value + foreach (var node2 in node1.Descendants("Value")) + { + attrs.Add(id, node2.Value); + } + } + } + } + } + catch (Exception exception) + { + Logger.Error(exception); + } + + return attrs; + } + + public virtual ICollection ParseProductVariantAttributeValues(Multimap attributeCombination, IEnumerable attributes) + { + var result = new HashSet(); + + if (attributeCombination == null || !attributeCombination.Any()) + return result; + + var allValueIds = new HashSet(); + + foreach (var pva in attributes.Where(x => x.ShouldHaveValues()).OrderBy(x => x.DisplayOrder).ToArray()) + { + if (attributeCombination.ContainsKey(pva.Id)) + { + var pvaValuesStr = attributeCombination[pva.Id]; + var ids = pvaValuesStr.Where(x => x.HasValue()).Select(x => x.ToInt()); + + allValueIds.UnionWith(ids); + } + } + + foreach (int id in allValueIds) + { + foreach (var attribute in attributes) + { + var attributeValue = attribute.ProductVariantAttributeValues.FirstOrDefault(x => x.Id == id); + if (attributeValue != null) + { + result.Add(attributeValue); + break; + } + } + } + + return result; + } + + public virtual IList ParseValues(string attributesXml, int productVariantAttributeId) { var selectedProductVariantAttributeValues = new List(); try @@ -268,132 +268,132 @@ public virtual IList ParseValues(string attributesXml, int productVarian } catch (Exception exception) { - Logger.Error(exception); - } + Logger.Error(exception); + } return selectedProductVariantAttributeValues; } public virtual string AddProductAttribute(string attributesXml, ProductVariantAttribute pva, string value) { - return pva.AddProductAttribute(attributesXml, value); + return pva.AddProductAttribute(attributesXml, value); } - public virtual string CreateAttributesXml(Multimap attributes) - { - Guard.NotNull(attributes, nameof(attributes)); + public virtual string CreateAttributesXml(Multimap attributes) + { + Guard.NotNull(attributes, nameof(attributes)); - if (attributes.Count == 0) - return null; + if (attributes.Count == 0) + return null; - var doc = new XmlDocument(); - var root = doc.AppendChild(doc.CreateElement("Attributes")); + var doc = new XmlDocument(); + var root = doc.AppendChild(doc.CreateElement("Attributes")); - foreach (var attr in attributes) - { - var xelAttr = root.AppendChild(doc.CreateElement("ProductVariantAttribute")) as XmlElement; - xelAttr.SetAttribute("ID", attr.Key.ToString()); + foreach (var attr in attributes) + { + var xelAttr = root.AppendChild(doc.CreateElement("ProductVariantAttribute")) as XmlElement; + xelAttr.SetAttribute("ID", attr.Key.ToString()); - foreach (var val in attr.Value) - { - var xelAttrValue = xelAttr.AppendChild(doc.CreateElement("ProductVariantAttributeValue")); - var xelValue = xelAttrValue.AppendChild(doc.CreateElement("Value")); - xelValue.InnerText = val; - } - } + foreach (var val in attr.Value) + { + var xelAttrValue = xelAttr.AppendChild(doc.CreateElement("ProductVariantAttributeValue")); + var xelValue = xelAttrValue.AppendChild(doc.CreateElement("Value")); + xelValue.InnerText = val; + } + } - return doc.OuterXml; - } + return doc.OuterXml; + } - public virtual bool AreProductAttributesEqual(string attributeXml1, string attributeXml2) + public virtual bool AreProductAttributesEqual(string attributeXml1, string attributeXml2) { - if (attributeXml1 == attributeXml2) - return true; + if (attributeXml1 == attributeXml2) + return true; - var attributes1 = DeserializeProductVariantAttributes(attributeXml1); + var attributes1 = DeserializeProductVariantAttributes(attributeXml1); var attributes2 = DeserializeProductVariantAttributes(attributeXml2); - if (attributes1.Count != attributes2.Count) - return false; - - foreach (var kvp in attributes1) - { - if (!attributes2.ContainsKey(kvp.Key)) - { - // the second list does not contain this id: not equal! - return false; - } - - // compare the values - var values1 = kvp.Value; - var values2 = attributes2[kvp.Key]; - - if (values1.Count != values2.Count) - { - // number of values differ: not equal! - return false; - } - - foreach (var value1 in values1) - { - var str1 = value1.TrimSafe(); - - if (!values2.Any(x => x.TrimSafe().IsCaseInsensitiveEqual(str1))) - { - // the second values list for this attribute does not contain this value: not equal! - return false; - } - } - } + if (attributes1.Count != attributes2.Count) + return false; + + foreach (var kvp in attributes1) + { + if (!attributes2.ContainsKey(kvp.Key)) + { + // the second list does not contain this id: not equal! + return false; + } + + // compare the values + var values1 = kvp.Value; + var values2 = attributes2[kvp.Key]; + + if (values1.Count != values2.Count) + { + // number of values differ: not equal! + return false; + } + + foreach (var value1 in values1) + { + var str1 = value1.TrimSafe(); + + if (!values2.Any(x => x.TrimSafe().IsCaseInsensitiveEqual(str1))) + { + // the second values list for this attribute does not contain this value: not equal! + return false; + } + } + } return true; } - public virtual ProductVariantAttributeCombination FindProductVariantAttributeCombination(int productId, string attributesXml) - { - if (attributesXml.IsEmpty()) - return null; + public virtual ProductVariantAttributeCombination FindProductVariantAttributeCombination(int productId, string attributesXml) + { + if (attributesXml.IsEmpty()) + return null; - var cacheKey = ATTRIBUTECOMBINATION_BY_IDXML_KEY.FormatInvariant(productId, attributesXml); + var cacheKey = ATTRIBUTECOMBINATION_BY_IDXML_KEY.FormatInvariant(productId, attributesXml); - var result = _requestCache.Get(cacheKey, () => - { - var query = from x in _pvacRepository.TableUntracked - where x.ProductId == productId - select new - { - x.Id, - x.AttributesXml - }; + var result = _requestCache.Get(cacheKey, () => + { + var query = from x in _pvacRepository.TableUntracked + where x.ProductId == productId + select new + { + x.Id, + x.AttributesXml + }; - var combinations = query.ToList(); - if (combinations.Count == 0) - return null; + var combinations = query.ToList(); + if (combinations.Count == 0) + return null; - foreach (var combination in combinations) - { - bool attributesEqual = AreProductAttributesEqual(combination.AttributesXml, attributesXml); - if (attributesEqual) - return _productAttributeService.GetProductVariantAttributeCombinationById(combination.Id); - } + foreach (var combination in combinations) + { + bool attributesEqual = AreProductAttributesEqual(combination.AttributesXml, attributesXml); + if (attributesEqual) + return _productAttributeService.GetProductVariantAttributeCombinationById(combination.Id); + } - return null; - }); + return null; + }); - return result; - } + return result; + } - #endregion + #endregion - #region Gift card attributes + #region Gift card attributes - public string AddGiftCardAttribute( - string attributesXml, - string recipientName, + public string AddGiftCardAttribute( + string attributesXml, + string recipientName, string recipientEmail, - string senderName, - string senderEmail, - string giftCardMessage) + string senderName, + string senderEmail, + string giftCardMessage) { var result = string.Empty; @@ -448,19 +448,19 @@ public string AddGiftCardAttribute( } catch (Exception exception) { - Logger.Error(exception); + Logger.Error(exception); } return result; } public void GetGiftCardAttribute( - string attributesXml, - out string recipientName, + string attributesXml, + out string recipientName, out string recipientEmail, - out string senderName, + out string senderName, out string senderEmail, - out string giftCardMessage) + out string giftCardMessage) { recipientName = string.Empty; recipientEmail = string.Empty; @@ -492,17 +492,17 @@ public void GetGiftCardAttribute( } catch (Exception exception) { - Logger.Error(exception); - } + Logger.Error(exception); + } } #endregion - class AttributeMapInfo - { - public string AttributesXml { get; set; } - public Multimap DeserializedMap { get; set; } - public int[] AllValueIds { get; set; } - } + class AttributeMapInfo + { + public string AttributesXml { get; set; } + public Multimap DeserializedMap { get; set; } + public int[] AllValueIds { get; set; } + } } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs index b307a31348..39b45da0fb 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs @@ -16,75 +16,75 @@ namespace SmartStore.Services.Catalog { public partial class ProductAttributeService : IProductAttributeService { - // 0 = ProductId, 1 = PageIndex, 2 = PageSize - private const string PRODUCTVARIANTATTRIBUTES_COMBINATIONS_BY_ID_KEY = "SmartStore.productvariantattribute.combinations.id-{0}-{1}-{2}"; - private const string PRODUCTVARIANTATTRIBUTES_PATTERN_KEY = "SmartStore.productvariantattribute.*"; - - // 0 = Attribute value ids, e.g. 16-254-1245 - private const string PRODUCTVARIANTATTRIBUTEVALUES_BY_IDS_KEY = "SmartStore.productvariantattributevalues.ids-{0}"; - private const string PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY = "SmartStore.productvariantattributevalues*"; - - private readonly IRepository _productAttributeRepository; - private readonly IRepository _productAttributeOptionRepository; - private readonly IRepository _productAttributeOptionsSetRepository; - private readonly IRepository _productVariantAttributeRepository; + // 0 = ProductId, 1 = PageIndex, 2 = PageSize + private const string PRODUCTVARIANTATTRIBUTES_COMBINATIONS_BY_ID_KEY = "SmartStore.productvariantattribute.combinations.id-{0}-{1}-{2}"; + private const string PRODUCTVARIANTATTRIBUTES_PATTERN_KEY = "SmartStore.productvariantattribute.*"; + + // 0 = Attribute value ids, e.g. 16-254-1245 + private const string PRODUCTVARIANTATTRIBUTEVALUES_BY_IDS_KEY = "SmartStore.productvariantattributevalues.ids-{0}"; + private const string PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY = "SmartStore.productvariantattributevalues*"; + + private readonly IRepository _productAttributeRepository; + private readonly IRepository _productAttributeOptionRepository; + private readonly IRepository _productAttributeOptionsSetRepository; + private readonly IRepository _productVariantAttributeRepository; private readonly IRepository _pvacRepository; private readonly IRepository _productVariantAttributeValueRepository; - private readonly IRepository _productBundleItemAttributeFilterRepository; - private readonly ILocalizedEntityService _localizedEntityService; + private readonly IRepository _productBundleItemAttributeFilterRepository; + private readonly ILocalizedEntityService _localizedEntityService; private readonly IRequestCache _requestCache; public ProductAttributeService( - IRequestCache requestCache, + IRequestCache requestCache, IRepository productAttributeRepository, - IRepository productAttributeOptionRepository, - IRepository productAttributeOptionsSetRepository, - IRepository productVariantAttributeRepository, + IRepository productAttributeOptionRepository, + IRepository productAttributeOptionsSetRepository, + IRepository productVariantAttributeRepository, IRepository pvacRepository, IRepository productVariantAttributeValueRepository, - IRepository productBundleItemAttributeFilterRepository, - ILocalizedEntityService localizedEntityService) + IRepository productBundleItemAttributeFilterRepository, + ILocalizedEntityService localizedEntityService) { _requestCache = requestCache; _productAttributeRepository = productAttributeRepository; - _productAttributeOptionRepository = productAttributeOptionRepository; - _productAttributeOptionsSetRepository = productAttributeOptionsSetRepository; + _productAttributeOptionRepository = productAttributeOptionRepository; + _productAttributeOptionsSetRepository = productAttributeOptionsSetRepository; _productVariantAttributeRepository = productVariantAttributeRepository; _pvacRepository = pvacRepository; _productVariantAttributeValueRepository = productVariantAttributeValueRepository; - _productBundleItemAttributeFilterRepository = productBundleItemAttributeFilterRepository; - _localizedEntityService = localizedEntityService; - } + _productBundleItemAttributeFilterRepository = productBundleItemAttributeFilterRepository; + _localizedEntityService = localizedEntityService; + } - public Localizer T { get; set; } = NullLocalizer.Instance; + public Localizer T { get; set; } = NullLocalizer.Instance; private IList GetSwitchedLoadedAttributeMappings(ICollection productVariantAttributeIds) - { - if (productVariantAttributeIds != null && productVariantAttributeIds.Count > 0) - { - if (productVariantAttributeIds.Count == 1) - { - var pva = GetProductVariantAttributeById(productVariantAttributeIds.First()); - if (pva != null) - { - return new List { pva }; - } - } - else - { - return _productVariantAttributeRepository - .GetMany(productVariantAttributeIds) - .OrderBy(x => x.DisplayOrder) - .ToList(); - } - } - - return new List(); - } - - #region Product attributes - - public virtual void DeleteProductAttribute(ProductAttribute productAttribute) + { + if (productVariantAttributeIds != null && productVariantAttributeIds.Count > 0) + { + if (productVariantAttributeIds.Count == 1) + { + var pva = GetProductVariantAttributeById(productVariantAttributeIds.First()); + if (pva != null) + { + return new List { pva }; + } + } + else + { + return _productVariantAttributeRepository + .GetMany(productVariantAttributeIds) + .OrderBy(x => x.DisplayOrder) + .ToList(); + } + } + + return new List(); + } + + #region Product attributes + + public virtual void DeleteProductAttribute(ProductAttribute productAttribute) { if (productAttribute == null) throw new ArgumentNullException("productAttribute"); @@ -93,7 +93,7 @@ public virtual void DeleteProductAttribute(ProductAttribute productAttribute) //cache _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } public virtual IPagedList GetAllProductAttributes(int pageIndex, int pageSize, bool untracked = true) @@ -111,18 +111,18 @@ public virtual ProductAttribute GetProductAttributeById(int productAttributeId) if (productAttributeId == 0) return null; - return _productAttributeRepository.GetByIdCached(productAttributeId, "db.prodattr.id-" + productAttributeId); - } + return _productAttributeRepository.GetByIdCached(productAttributeId, "db.prodattr.id-" + productAttributeId); + } public virtual void InsertProductAttribute(ProductAttribute productAttribute) { if (productAttribute == null) throw new ArgumentNullException("productAttribute"); - _productAttributeRepository.Insert(productAttribute); - + _productAttributeRepository.Insert(productAttribute); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } public virtual void UpdateProductAttribute(ProductAttribute productAttribute) @@ -130,164 +130,164 @@ public virtual void UpdateProductAttribute(ProductAttribute productAttribute) if (productAttribute == null) throw new ArgumentNullException("productAttribute"); - _productAttributeRepository.Update(productAttribute); + _productAttributeRepository.Update(productAttribute); _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } - public virtual Multimap GetExportFieldMappings(string fieldPrefix) - { - Guard.NotEmpty(fieldPrefix, nameof(fieldPrefix)); + public virtual Multimap GetExportFieldMappings(string fieldPrefix) + { + Guard.NotEmpty(fieldPrefix, nameof(fieldPrefix)); - var result = new Multimap(StringComparer.OrdinalIgnoreCase); + var result = new Multimap(StringComparer.OrdinalIgnoreCase); - if (!fieldPrefix.EndsWith(":")) - { - fieldPrefix = fieldPrefix + ":"; - } + if (!fieldPrefix.EndsWith(":")) + { + fieldPrefix = fieldPrefix + ":"; + } - var mappings = _productAttributeRepository.TableUntracked - .Where(x => !string.IsNullOrEmpty(x.ExportMappings)) - .Select(x => new - { - x.Id, - x.ExportMappings - }) - .ToList(); + var mappings = _productAttributeRepository.TableUntracked + .Where(x => !string.IsNullOrEmpty(x.ExportMappings)) + .Select(x => new + { + x.Id, + x.ExportMappings + }) + .ToList(); - foreach (var mapping in mappings) - { - var rows = mapping.ExportMappings.SplitSafe(Environment.NewLine) - .Where(x => x.StartsWith(fieldPrefix, StringComparison.InvariantCultureIgnoreCase)); + foreach (var mapping in mappings) + { + var rows = mapping.ExportMappings.SplitSafe(Environment.NewLine) + .Where(x => x.StartsWith(fieldPrefix, StringComparison.InvariantCultureIgnoreCase)); - foreach (var row in rows) - { - var exportFieldName = row.Substring(fieldPrefix.Length).TrimEnd(); - if (exportFieldName.HasValue()) - { - result.Add(exportFieldName, mapping.Id); - } - } - } + foreach (var row in rows) + { + var exportFieldName = row.Substring(fieldPrefix.Length).TrimEnd(); + if (exportFieldName.HasValue()) + { + result.Add(exportFieldName, mapping.Id); + } + } + } - return result; - } + return result; + } - #endregion + #endregion - #region Product attribute options + #region Product attribute options - public virtual ProductAttributeOption GetProductAttributeOptionById(int id) - { + public virtual ProductAttributeOption GetProductAttributeOptionById(int id) + { if (id == 0) { return null; } - return _productAttributeOptionRepository.GetById(id); - } + return _productAttributeOptionRepository.GetById(id); + } - public virtual IList GetProductAttributeOptionsByOptionsSetId(int optionsSetId) - { - if (optionsSetId == 0) - return new List(); + public virtual IList GetProductAttributeOptionsByOptionsSetId(int optionsSetId) + { + if (optionsSetId == 0) + return new List(); - var entities = _productAttributeOptionRepository.Table - .Where(x => x.ProductAttributeOptionsSetId == optionsSetId) - .OrderBy(x => x.DisplayOrder) - .ThenBy(x => x.Name) - .ToList(); + var entities = _productAttributeOptionRepository.Table + .Where(x => x.ProductAttributeOptionsSetId == optionsSetId) + .OrderBy(x => x.DisplayOrder) + .ThenBy(x => x.Name) + .ToList(); - return entities; - } + return entities; + } - public virtual IList GetProductAttributeOptionsByAttributeId(int attributeId) - { - if (attributeId == 0) - return new List(); + public virtual IList GetProductAttributeOptionsByAttributeId(int attributeId) + { + if (attributeId == 0) + return new List(); - var entities = - from o in _productAttributeOptionRepository.Table - join os in _productAttributeOptionsSetRepository.Table on o.ProductAttributeOptionsSetId equals os.Id - where os.ProductAttributeId == attributeId - select o; + var entities = + from o in _productAttributeOptionRepository.Table + join os in _productAttributeOptionsSetRepository.Table on o.ProductAttributeOptionsSetId equals os.Id + where os.ProductAttributeId == attributeId + select o; - return entities.ToList(); - } + return entities.ToList(); + } - public virtual void DeleteProductAttributeOption(ProductAttributeOption productAttributeOption) - { - Guard.NotNull(productAttributeOption, nameof(productAttributeOption)); + public virtual void DeleteProductAttributeOption(ProductAttributeOption productAttributeOption) + { + Guard.NotNull(productAttributeOption, nameof(productAttributeOption)); - _productAttributeOptionRepository.Delete(productAttributeOption); - } + _productAttributeOptionRepository.Delete(productAttributeOption); + } - public virtual void InsertProductAttributeOption(ProductAttributeOption productAttributeOption) - { - Guard.NotNull(productAttributeOption, nameof(productAttributeOption)); + public virtual void InsertProductAttributeOption(ProductAttributeOption productAttributeOption) + { + Guard.NotNull(productAttributeOption, nameof(productAttributeOption)); - _productAttributeOptionRepository.Insert(productAttributeOption); - } + _productAttributeOptionRepository.Insert(productAttributeOption); + } - public virtual void UpdateProductAttributeOption(ProductAttributeOption productAttributeOption) - { - Guard.NotNull(productAttributeOption, nameof(productAttributeOption)); + public virtual void UpdateProductAttributeOption(ProductAttributeOption productAttributeOption) + { + Guard.NotNull(productAttributeOption, nameof(productAttributeOption)); - _productAttributeOptionRepository.Update(productAttributeOption); - } + _productAttributeOptionRepository.Update(productAttributeOption); + } - #endregion + #endregion - #region Product attribute options sets + #region Product attribute options sets - public virtual ProductAttributeOptionsSet GetProductAttributeOptionsSetById(int id) - { - if (id == 0) - return null; + public virtual ProductAttributeOptionsSet GetProductAttributeOptionsSetById(int id) + { + if (id == 0) + return null; - return _productAttributeOptionsSetRepository.GetById(id); - } + return _productAttributeOptionsSetRepository.GetById(id); + } - public virtual IList GetProductAttributeOptionsSetsByAttributeId(int productAttributeId) - { - if (productAttributeId == 0) - return new List(); + public virtual IList GetProductAttributeOptionsSetsByAttributeId(int productAttributeId) + { + if (productAttributeId == 0) + return new List(); - var entities = _productAttributeOptionsSetRepository.Table - .Where(x => x.ProductAttributeId == productAttributeId) - .OrderBy(x => x.Name) - .ToList(); + var entities = _productAttributeOptionsSetRepository.Table + .Where(x => x.ProductAttributeId == productAttributeId) + .OrderBy(x => x.Name) + .ToList(); - return entities; - } + return entities; + } - public virtual void DeleteProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet) - { - Guard.NotNull(productAttributeOptionsSet, nameof(productAttributeOptionsSet)); + public virtual void DeleteProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet) + { + Guard.NotNull(productAttributeOptionsSet, nameof(productAttributeOptionsSet)); - _productAttributeOptionsSetRepository.Delete(productAttributeOptionsSet); - } + _productAttributeOptionsSetRepository.Delete(productAttributeOptionsSet); + } - public virtual void InsertProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet) - { - Guard.NotNull(productAttributeOptionsSet, nameof(productAttributeOptionsSet)); + public virtual void InsertProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet) + { + Guard.NotNull(productAttributeOptionsSet, nameof(productAttributeOptionsSet)); - _productAttributeOptionsSetRepository.Insert(productAttributeOptionsSet); - } + _productAttributeOptionsSetRepository.Insert(productAttributeOptionsSet); + } - public virtual void UpdateProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet) - { - Guard.NotNull(productAttributeOptionsSet, nameof(productAttributeOptionsSet)); + public virtual void UpdateProductAttributeOptionsSet(ProductAttributeOptionsSet productAttributeOptionsSet) + { + Guard.NotNull(productAttributeOptionsSet, nameof(productAttributeOptionsSet)); - _productAttributeOptionsSetRepository.Update(productAttributeOptionsSet); - } + _productAttributeOptionsSetRepository.Update(productAttributeOptionsSet); + } - #endregion + #endregion - #region Product variant attributes mappings (ProductVariantAttribute) + #region Product variant attributes mappings (ProductVariantAttribute) - public virtual void DeleteProductVariantAttribute(ProductVariantAttribute productVariantAttribute) + public virtual void DeleteProductVariantAttribute(ProductVariantAttribute productVariantAttribute) { if (productVariantAttribute == null) throw new ArgumentNullException("productVariantAttribute"); @@ -295,89 +295,89 @@ public virtual void DeleteProductVariantAttribute(ProductVariantAttribute produc _productVariantAttributeRepository.Delete(productVariantAttribute); _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } - public virtual IList GetProductVariantAttributesByProductId(int productId) + public virtual IList GetProductVariantAttributesByProductId(int productId) { - var query = from pva in _productVariantAttributeRepository.Table.Expand(x => x.ProductAttribute) - orderby pva.DisplayOrder - where pva.ProductId == productId - select pva; + var query = from pva in _productVariantAttributeRepository.Table.Expand(x => x.ProductAttribute) + orderby pva.DisplayOrder + where pva.ProductId == productId + select pva; - var productVariantAttributes = query.ToListCached("db.prodvarattrs.all-" + productId); - return productVariantAttributes; - } + var productVariantAttributes = query.ToListCached("db.prodvarattrs.all-" + productId); + return productVariantAttributes; + } - public virtual Multimap GetProductVariantAttributesByProductIds(int[] productIds, AttributeControlType? controlType) - { - Guard.NotNull(productIds, nameof(productIds)); + public virtual Multimap GetProductVariantAttributesByProductIds(int[] productIds, AttributeControlType? controlType) + { + Guard.NotNull(productIds, nameof(productIds)); if (!productIds.Any()) { return new Multimap(); } - var query = - from pva in _productVariantAttributeRepository.TableUntracked.Expand(x => x.ProductAttribute).Expand(x => x.ProductVariantAttributeValues) - where productIds.Contains(pva.ProductId) - select pva; + var query = + from pva in _productVariantAttributeRepository.TableUntracked.Expand(x => x.ProductAttribute).Expand(x => x.ProductVariantAttributeValues) + where productIds.Contains(pva.ProductId) + select pva; - if (controlType.HasValue) - { - query = query.Where(x => x.AttributeControlTypeId == ((int)controlType.Value)); - } + if (controlType.HasValue) + { + query = query.Where(x => x.AttributeControlTypeId == ((int)controlType.Value)); + } - var map = query - .OrderBy(x => x.ProductId) - .ThenBy(x => x.DisplayOrder) - .ToList() - .ToMultimap(x => x.ProductId, x => x); + var map = query + .OrderBy(x => x.ProductId) + .ThenBy(x => x.DisplayOrder) + .ToList() + .ToMultimap(x => x.ProductId, x => x); - return map; - } + return map; + } public virtual ProductVariantAttribute GetProductVariantAttributeById(int productVariantAttributeId) { if (productVariantAttributeId == 0) return null; - return _productVariantAttributeRepository.GetByIdCached(productVariantAttributeId, "db.prodvarattr.id-" + productVariantAttributeId); - } - - public virtual IList GetProductVariantAttributesByIds(IEnumerable productVariantAttributeIds, IEnumerable attributes = null) - { - if (productVariantAttributeIds != null) - { - if (attributes != null) - { - var ids = new List(); - var result = new List(); - - foreach (var id in productVariantAttributeIds) - { - var pva = attributes.FirstOrDefault(x => x.Id == id); - if (pva == null) - ids.Add(id); - else - result.Add(pva); - } - - if (ids.Count > 0) - { - var newLoadedMappings = GetSwitchedLoadedAttributeMappings(ids); - result.AddRange(newLoadedMappings); - } - - // sort by passed identifier sequence - return result.OrderBySequence(productVariantAttributeIds).ToList(); - } - - return GetSwitchedLoadedAttributeMappings(productVariantAttributeIds.ToList()); - } - - return new List(); - } + return _productVariantAttributeRepository.GetByIdCached(productVariantAttributeId, "db.prodvarattr.id-" + productVariantAttributeId); + } + + public virtual IList GetProductVariantAttributesByIds(IEnumerable productVariantAttributeIds, IEnumerable attributes = null) + { + if (productVariantAttributeIds != null) + { + if (attributes != null) + { + var ids = new List(); + var result = new List(); + + foreach (var id in productVariantAttributeIds) + { + var pva = attributes.FirstOrDefault(x => x.Id == id); + if (pva == null) + ids.Add(id); + else + result.Add(pva); + } + + if (ids.Count > 0) + { + var newLoadedMappings = GetSwitchedLoadedAttributeMappings(ids); + result.AddRange(newLoadedMappings); + } + + // sort by passed identifier sequence + return result.OrderBySequence(productVariantAttributeIds).ToList(); + } + + return GetSwitchedLoadedAttributeMappings(productVariantAttributeIds.ToList()); + } + + return new List(); + } public virtual IEnumerable GetProductVariantAttributeValuesByIds(params int[] productVariantAttributeValueIds) { @@ -386,39 +386,39 @@ public virtual IEnumerable GetProductVariantAttrib return Enumerable.Empty(); } - Array.Sort(productVariantAttributeValueIds); + Array.Sort(productVariantAttributeValueIds); - var key = PRODUCTVARIANTATTRIBUTEVALUES_BY_IDS_KEY.FormatInvariant(string.Join("-", productVariantAttributeValueIds)); - return _requestCache.Get(key, () => - { - var validTypeIds = new[] - { - (int)AttributeControlType.DropdownList, - (int)AttributeControlType.RadioList, - (int)AttributeControlType.Checkboxes, - (int)AttributeControlType.Boxes - }; - - var query = from x in _productVariantAttributeValueRepository.Table - let attr = x.ProductVariantAttribute - where productVariantAttributeValueIds.Contains(x.Id) && validTypeIds.Contains(attr.AttributeControlTypeId) - orderby x.ProductVariantAttribute.DisplayOrder, x.DisplayOrder - select x; - - query = query.Include(y => y.ProductVariantAttribute.ProductAttribute); - - return query.ToList(); - }); - } + var key = PRODUCTVARIANTATTRIBUTEVALUES_BY_IDS_KEY.FormatInvariant(string.Join("-", productVariantAttributeValueIds)); + return _requestCache.Get(key, () => + { + var validTypeIds = new[] + { + (int)AttributeControlType.DropdownList, + (int)AttributeControlType.RadioList, + (int)AttributeControlType.Checkboxes, + (int)AttributeControlType.Boxes + }; + + var query = from x in _productVariantAttributeValueRepository.Table + let attr = x.ProductVariantAttribute + where productVariantAttributeValueIds.Contains(x.Id) && validTypeIds.Contains(attr.AttributeControlTypeId) + orderby x.ProductVariantAttribute.DisplayOrder, x.DisplayOrder + select x; + + query = query.Include(y => y.ProductVariantAttribute.ProductAttribute); + + return query.ToList(); + }); + } public virtual void InsertProductVariantAttribute(ProductVariantAttribute productVariantAttribute) { - Guard.NotNull(productVariantAttribute, nameof(productVariantAttribute)); + Guard.NotNull(productVariantAttribute, nameof(productVariantAttribute)); - _productVariantAttributeRepository.Insert(productVariantAttribute); + _productVariantAttributeRepository.Insert(productVariantAttribute); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } public virtual void UpdateProductVariantAttribute(ProductVariantAttribute productVariantAttribute) @@ -426,86 +426,86 @@ public virtual void UpdateProductVariantAttribute(ProductVariantAttribute produc if (productVariantAttribute == null) throw new ArgumentNullException("productVariantAttribute"); - _productVariantAttributeRepository.Update(productVariantAttribute); + _productVariantAttributeRepository.Update(productVariantAttribute); _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } - public virtual int CopyAttributeOptions(ProductVariantAttribute productVariantAttribute, int productAttributeOptionsSetId, bool deleteExistingValues) - { - Guard.NotNull(productVariantAttribute, nameof(productVariantAttribute)); - Guard.NotZero(productVariantAttribute.Id, nameof(productVariantAttribute.Id)); - Guard.NotZero(productAttributeOptionsSetId, nameof(productAttributeOptionsSetId)); + public virtual int CopyAttributeOptions(ProductVariantAttribute productVariantAttribute, int productAttributeOptionsSetId, bool deleteExistingValues) + { + Guard.NotNull(productVariantAttribute, nameof(productVariantAttribute)); + Guard.NotZero(productVariantAttribute.Id, nameof(productVariantAttribute.Id)); + Guard.NotZero(productAttributeOptionsSetId, nameof(productAttributeOptionsSetId)); - if (deleteExistingValues) - { - var existingValues = productVariantAttribute.ProductVariantAttributeValues.ToList(); + if (deleteExistingValues) + { + var existingValues = productVariantAttribute.ProductVariantAttributeValues.ToList(); if (!existingValues.Any()) { existingValues = GetProductVariantAttributeValues(productVariantAttribute.Id).ToList(); } - existingValues.Each(x => DeleteProductVariantAttributeValue(x)); - } + existingValues.Each(x => DeleteProductVariantAttributeValue(x)); + } - var result = 0; - var attributeOptions = _productAttributeOptionRepository.TableUntracked - .Where(x => x.ProductAttributeOptionsSetId == productAttributeOptionsSetId) - .ToList(); + var result = 0; + var attributeOptions = _productAttributeOptionRepository.TableUntracked + .Where(x => x.ProductAttributeOptionsSetId == productAttributeOptionsSetId) + .ToList(); if (!attributeOptions.Any()) { return result; } - // Do not insert already existing values (identified by name field). - var existingValueNames = new HashSet(_productVariantAttributeValueRepository.TableUntracked - .Where(x => x.ProductVariantAttributeId == productVariantAttribute.Id) - .Select(x => x.Name) - .ToList()); + // Do not insert already existing values (identified by name field). + var existingValueNames = new HashSet(_productVariantAttributeValueRepository.TableUntracked + .Where(x => x.ProductVariantAttributeId == productVariantAttribute.Id) + .Select(x => x.Name) + .ToList()); - using (_localizedEntityService.BeginScope()) - { - foreach (var option in attributeOptions) - { + using (_localizedEntityService.BeginScope()) + { + foreach (var option in attributeOptions) + { if (existingValueNames.Contains(option.Name)) { continue; } - var pvav = option.Clone(); - pvav.ProductVariantAttributeId = productVariantAttribute.Id; + var pvav = option.Clone(); + pvav.ProductVariantAttributeId = productVariantAttribute.Id; - // No scope commit, we need new entity id. - _productVariantAttributeValueRepository.Insert(pvav); - ++result; + // No scope commit, we need new entity id. + _productVariantAttributeValueRepository.Insert(pvav); + ++result; - // Copy localized properties too. - var optionProperties = _localizedEntityService.GetLocalizedProperties(option.Id, "ProductAttributeOption"); + // Copy localized properties too. + var optionProperties = _localizedEntityService.GetLocalizedProperties(option.Id, "ProductAttributeOption"); - foreach (var property in optionProperties) - { - _localizedEntityService.InsertLocalizedProperty(new LocalizedProperty - { - EntityId = pvav.Id, - LocaleKeyGroup = "ProductVariantAttributeValue", - LocaleKey = property.LocaleKey, - LocaleValue = property.LocaleValue, - LanguageId = property.LanguageId - }); - } - } - } + foreach (var property in optionProperties) + { + _localizedEntityService.InsertLocalizedProperty(new LocalizedProperty + { + EntityId = pvav.Id, + LocaleKeyGroup = "ProductVariantAttributeValue", + LocaleKey = property.LocaleKey, + LocaleValue = property.LocaleValue, + LanguageId = property.LanguageId + }); + } + } + } - return result; - } + return result; + } - #endregion + #endregion - #region Product variant attribute values (ProductVariantAttributeValue) + #region Product variant attribute values (ProductVariantAttributeValue) - public virtual void DeleteProductVariantAttributeValue(ProductVariantAttributeValue productVariantAttributeValue) + public virtual void DeleteProductVariantAttributeValue(ProductVariantAttributeValue productVariantAttributeValue) { if (productVariantAttributeValue == null) throw new ArgumentNullException("productVariantAttributeValue"); @@ -513,37 +513,37 @@ public virtual void DeleteProductVariantAttributeValue(ProductVariantAttributeVa _productVariantAttributeValueRepository.Delete(productVariantAttributeValue); _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } public virtual IList GetProductVariantAttributeValues(int productVariantAttributeId) { - var query = from pvav in _productVariantAttributeValueRepository.Table - orderby pvav.DisplayOrder - where pvav.ProductVariantAttributeId == productVariantAttributeId - select pvav; + var query = from pvav in _productVariantAttributeValueRepository.Table + orderby pvav.DisplayOrder + where pvav.ProductVariantAttributeId == productVariantAttributeId + select pvav; - var productVariantAttributeValues = query.ToListCached("db.prodvarattrvalues.all-" + productVariantAttributeId); - return productVariantAttributeValues; - } + var productVariantAttributeValues = query.ToListCached("db.prodvarattrvalues.all-" + productVariantAttributeId); + return productVariantAttributeValues; + } public virtual ProductVariantAttributeValue GetProductVariantAttributeValueById(int productVariantAttributeValueId) { if (productVariantAttributeValueId == 0) return null; - return _productVariantAttributeValueRepository.GetByIdCached(productVariantAttributeValueId, "db.prodvarattrval.id-" + productVariantAttributeValueId); - } + return _productVariantAttributeValueRepository.GetByIdCached(productVariantAttributeValueId, "db.prodvarattrval.id-" + productVariantAttributeValueId); + } public virtual void InsertProductVariantAttributeValue(ProductVariantAttributeValue productVariantAttributeValue) { if (productVariantAttributeValue == null) throw new ArgumentNullException("productVariantAttributeValue"); - _productVariantAttributeValueRepository.Insert(productVariantAttributeValue); + _productVariantAttributeValueRepository.Insert(productVariantAttributeValue); _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } public virtual void UpdateProductVariantAttributeValue(ProductVariantAttributeValue productVariantAttributeValue) @@ -551,31 +551,31 @@ public virtual void UpdateProductVariantAttributeValue(ProductVariantAttributeVa if (productVariantAttributeValue == null) throw new ArgumentNullException("productVariantAttributeValue"); - _productVariantAttributeValueRepository.Update(productVariantAttributeValue); + _productVariantAttributeValueRepository.Update(productVariantAttributeValue); _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTES_PATTERN_KEY); - _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); + _requestCache.RemoveByPattern(PRODUCTVARIANTATTRIBUTEVALUES_PATTERN_KEY); } #endregion #region Product variant attribute combinations (ProductVariantAttributeCombination) - - private void CombineAll(List> toCombine, List> result, int y, List tmp) - { - var combine = toCombine[y]; - - for (int i = 0; i < combine.Count; ++i) - { - var lst = new List(tmp); - lst.Add(combine[i]); - - if (y == (toCombine.Count - 1)) - result.Add(lst); - else - CombineAll(toCombine, result, y + 1, lst); - } - } + + private void CombineAll(List> toCombine, List> result, int y, List tmp) + { + var combine = toCombine[y]; + + for (int i = 0; i < combine.Count; ++i) + { + var lst = new List(tmp); + lst.Add(combine[i]); + + if (y == (toCombine.Count - 1)) + result.Add(lst); + else + CombineAll(toCombine, result, y + 1, lst); + } + } public virtual void DeleteProductVariantAttributeCombination(ProductVariantAttributeCombination combination) { @@ -585,116 +585,116 @@ public virtual void DeleteProductVariantAttributeCombination(ProductVariantAttri _pvacRepository.Delete(combination); } - public virtual IPagedList GetAllProductVariantAttributeCombinations( - int productId, - int pageIndex, - int pageSize, - bool untracked = true) - { - if (productId == 0) - { - return new PagedList(new List(), pageIndex, pageSize); - } - - string key = string.Format(PRODUCTVARIANTATTRIBUTES_COMBINATIONS_BY_ID_KEY, productId, 0, int.MaxValue); - return _requestCache.Get(key, () => - { - var query = from pvac in (untracked ? _pvacRepository.TableUntracked : _pvacRepository.Table) - orderby pvac.Id - where pvac.ProductId == productId - select pvac; - - var combinations = new PagedList(query, pageIndex, pageSize); - return combinations; - }); - } - - public virtual IList GetAllProductVariantAttributeCombinationPictureIds(int productId) - { - var pictureIds = new List(); - - if (productId == 0) - return pictureIds; - - var query = from pvac in _pvacRepository.TableUntracked - where - pvac.ProductId == productId - && pvac.IsActive - && !String.IsNullOrEmpty(pvac.AssignedMediaFileIds) - select pvac.AssignedMediaFileIds; - - var data = query.ToList(); - if (data.Any()) - { - int id; - var ids = string.Join(",", data).SplitSafe(",").Distinct(); - - foreach (string str in ids) - { - if (int.TryParse(str, out id) && !pictureIds.Exists(i => i == id)) - pictureIds.Add(id); - } - } - - return pictureIds; - } - - public virtual Multimap GetProductVariantAttributeCombinations(int[] productIds) - { - Guard.NotNull(productIds, nameof(productIds)); + public virtual IPagedList GetAllProductVariantAttributeCombinations( + int productId, + int pageIndex, + int pageSize, + bool untracked = true) + { + if (productId == 0) + { + return new PagedList(new List(), pageIndex, pageSize); + } + + string key = string.Format(PRODUCTVARIANTATTRIBUTES_COMBINATIONS_BY_ID_KEY, productId, 0, int.MaxValue); + return _requestCache.Get(key, () => + { + var query = from pvac in (untracked ? _pvacRepository.TableUntracked : _pvacRepository.Table) + orderby pvac.Id + where pvac.ProductId == productId + select pvac; + + var combinations = new PagedList(query, pageIndex, pageSize); + return combinations; + }); + } + + public virtual IList GetAllProductVariantAttributeCombinationPictureIds(int productId) + { + var pictureIds = new List(); + + if (productId == 0) + return pictureIds; + + var query = from pvac in _pvacRepository.TableUntracked + where + pvac.ProductId == productId + && pvac.IsActive + && !String.IsNullOrEmpty(pvac.AssignedMediaFileIds) + select pvac.AssignedMediaFileIds; + + var data = query.ToList(); + if (data.Any()) + { + int id; + var ids = string.Join(",", data).SplitSafe(",").Distinct(); + + foreach (string str in ids) + { + if (int.TryParse(str, out id) && !pictureIds.Exists(i => i == id)) + pictureIds.Add(id); + } + } + + return pictureIds; + } + + public virtual Multimap GetProductVariantAttributeCombinations(int[] productIds) + { + Guard.NotNull(productIds, nameof(productIds)); if (!productIds.Any()) { return new Multimap(); } - var query = - from pvac in _pvacRepository.TableUntracked - where productIds.Contains(pvac.ProductId) - select pvac; + var query = + from pvac in _pvacRepository.TableUntracked + where productIds.Contains(pvac.ProductId) + select pvac; - var map = query - .OrderBy(x => x.ProductId) - .ToList() - .ToMultimap(x => x.ProductId, x => x); + var map = query + .OrderBy(x => x.ProductId) + .ToList() + .ToMultimap(x => x.ProductId, x => x); - return map; - } + return map; + } - public virtual decimal? GetLowestCombinationPrice(int productId) - { - if (productId == 0) - return null; + public virtual decimal? GetLowestCombinationPrice(int productId) + { + if (productId == 0) + return null; - var query = - from pvac in _pvacRepository.Table - where pvac.ProductId == productId && pvac.Price != null && pvac.IsActive - orderby pvac.Price ascending - select pvac.Price; + var query = + from pvac in _pvacRepository.Table + where pvac.ProductId == productId && pvac.Price != null && pvac.IsActive + orderby pvac.Price ascending + select pvac.Price; - var price = query.FirstOrDefault(); - return price; - } + var price = query.FirstOrDefault(); + return price; + } public virtual ProductVariantAttributeCombination GetProductVariantAttributeCombinationById(int productVariantAttributeCombinationId) { if (productVariantAttributeCombinationId == 0) return null; - + var combination = _pvacRepository.GetById(productVariantAttributeCombinationId); return combination; } - public virtual ProductVariantAttributeCombination GetProductVariantAttributeCombinationBySku(string sku) - { + public virtual ProductVariantAttributeCombination GetProductVariantAttributeCombinationBySku(string sku) + { if (sku.IsEmpty()) { return null; } - var combination = _pvacRepository.Table.FirstOrDefault(x => x.Sku == sku && !x.Product.Deleted); - return combination; - } + var combination = _pvacRepository.Table.FirstOrDefault(x => x.Sku == sku && !x.Product.Deleted); + return combination; + } public virtual ProductVariantAttributeCombination GetAttributeCombinationByGtin(string gtin) { @@ -732,180 +732,180 @@ public virtual void UpdateProductVariantAttributeCombination(ProductVariantAttri if (combination == null) throw new ArgumentNullException("combination"); - //if (combination.IsDefaultCombination) - //{ - // EnsureSingleDefaultVariant(combination); - //} - //else - //{ - // // check if it was default before modification... - // // but make it Type-Safe (resistant to code refactoring ;-)) - // Expression> expr = x => x.IsDefaultCombination; - // string propertyToCheck = expr.ExtractPropertyInfo().Name; - - // object originalValue = null; - // if (_productVariantAttributeCombinationRepository.GetModifiedProperties(combination).TryGetValue(propertyToCheck, out originalValue)) - // { - // bool wasDefault = (bool)originalValue; - // if (wasDefault) - // { - // // we can't uncheck the default variant within a combination list, - // // we would't have a default combination anymore. - // combination.IsDefaultCombination = true; - // } - // } - //} + //if (combination.IsDefaultCombination) + //{ + // EnsureSingleDefaultVariant(combination); + //} + //else + //{ + // // check if it was default before modification... + // // but make it Type-Safe (resistant to code refactoring ;-)) + // Expression> expr = x => x.IsDefaultCombination; + // string propertyToCheck = expr.ExtractPropertyInfo().Name; + + // object originalValue = null; + // if (_productVariantAttributeCombinationRepository.GetModifiedProperties(combination).TryGetValue(propertyToCheck, out originalValue)) + // { + // bool wasDefault = (bool)originalValue; + // if (wasDefault) + // { + // // we can't uncheck the default variant within a combination list, + // // we would't have a default combination anymore. + // combination.IsDefaultCombination = true; + // } + // } + //} _pvacRepository.Update(combination); } - public virtual void CreateAllProductVariantAttributeCombinations(Product product) - { - // Delete all existing combinations. - _pvacRepository.DeleteAll(x => x.ProductId == product.Id); - - var attributes = GetProductVariantAttributesByProductId(product.Id); - if (attributes == null || attributes.Count <= 0) - return; - - var mappedAttributes = attributes - .SelectMany(x => x.ProductVariantAttributeValues) - .ToDictionarySafe(x => x.Id, x => x.ProductVariantAttribute); - - var toCombine = new List>(); - var resultMatrix = new List>(); - var tmp = new List(); - - foreach (var attr in attributes) - { - var attributeValues = attr.ProductVariantAttributeValues.ToList(); - if (attributeValues.Count > 0) - toCombine.Add(attributeValues); - } - - if (toCombine.Count > 0) - { - CombineAll(toCombine, resultMatrix, 0, tmp); - - using (var scope = new DbContextScope(ctx: _pvacRepository.Context, autoCommit: false, autoDetectChanges: false, validateOnSave: false, hooksEnabled: false)) - { - ProductVariantAttributeCombination combination = null; - var idx = 0; - - foreach (var values in resultMatrix) - { - idx++; - var attributesXml = ""; - - foreach (var value in values) - { - attributesXml = mappedAttributes[value.Id].AddProductAttribute(attributesXml, value.Id.ToString()); - } - - combination = new ProductVariantAttributeCombination - { - ProductId = product.Id, - AttributesXml = attributesXml, - StockQuantity = 10000, - AllowOutOfStockOrders = true, - IsActive = true - }; - - _pvacRepository.Insert(combination); - } - - scope.Commit(); - } - } - - //foreach (var y in resultMatrix) - //{ - // var sb = new System.Text.StringBuilder(); - // foreach (var x in y) - // { - // sb.AppendFormat("{0} ", x.Name); - // } - // sb.ToString().Dump(); - //} - } - - public virtual bool VariantHasAttributeCombinations(int productId) - { - if (productId == 0) - return false; - - var query = - from c in _pvacRepository.Table - where c.ProductId == productId - select c; - - return query.Select(x => x.Id).Any(); - } + public virtual void CreateAllProductVariantAttributeCombinations(Product product) + { + // Delete all existing combinations. + _pvacRepository.DeleteAll(x => x.ProductId == product.Id); + + var attributes = GetProductVariantAttributesByProductId(product.Id); + if (attributes == null || attributes.Count <= 0) + return; + + var mappedAttributes = attributes + .SelectMany(x => x.ProductVariantAttributeValues) + .ToDictionarySafe(x => x.Id, x => x.ProductVariantAttribute); + + var toCombine = new List>(); + var resultMatrix = new List>(); + var tmp = new List(); + + foreach (var attr in attributes) + { + var attributeValues = attr.ProductVariantAttributeValues.ToList(); + if (attributeValues.Count > 0) + toCombine.Add(attributeValues); + } + + if (toCombine.Count > 0) + { + CombineAll(toCombine, resultMatrix, 0, tmp); + + using (var scope = new DbContextScope(ctx: _pvacRepository.Context, autoCommit: false, autoDetectChanges: false, validateOnSave: false, hooksEnabled: false)) + { + ProductVariantAttributeCombination combination = null; + var idx = 0; + + foreach (var values in resultMatrix) + { + idx++; + var attributesXml = ""; + + foreach (var value in values) + { + attributesXml = mappedAttributes[value.Id].AddProductAttribute(attributesXml, value.Id.ToString()); + } + + combination = new ProductVariantAttributeCombination + { + ProductId = product.Id, + AttributesXml = attributesXml, + StockQuantity = 10000, + AllowOutOfStockOrders = true, + IsActive = true + }; + + _pvacRepository.Insert(combination); + } + + scope.Commit(); + } + } + + //foreach (var y in resultMatrix) + //{ + // var sb = new System.Text.StringBuilder(); + // foreach (var x in y) + // { + // sb.AppendFormat("{0} ", x.Name); + // } + // sb.ToString().Dump(); + //} + } + + public virtual bool VariantHasAttributeCombinations(int productId) + { + if (productId == 0) + return false; + + var query = + from c in _pvacRepository.Table + where c.ProductId == productId + select c; + + return query.Select(x => x.Id).Any(); + } #endregion - #region Product bundle item attribute filter - - public virtual void InsertProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter) - { - if (attributeFilter == null) - throw new ArgumentNullException("attributeFilter"); - - if (attributeFilter.AttributeId != 0 && attributeFilter.AttributeValueId != 0) - { - _productBundleItemAttributeFilterRepository.Insert(attributeFilter); - } - } - - public virtual void UpdateProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter) - { - if (attributeFilter == null) - throw new ArgumentNullException("attributeFilter"); - - _productBundleItemAttributeFilterRepository.Update(attributeFilter); - } - - public virtual void DeleteProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter) - { - if (attributeFilter == null) - throw new ArgumentNullException("attributeFilter"); - - _productBundleItemAttributeFilterRepository.Delete(attributeFilter); - } - - public virtual void DeleteProductBundleItemAttributeFilter(ProductBundleItem bundleItem) - { - if (bundleItem != null && bundleItem.Id != 0) - { - var attributeFilterQuery = - from x in _productBundleItemAttributeFilterRepository.Table - where x.BundleItemId == bundleItem.Id - select x; - - attributeFilterQuery.ToList().Each(x => DeleteProductBundleItemAttributeFilter(x)); - } - } - - public virtual void DeleteProductBundleItemAttributeFilter(int attributeId, int attributeValueId) - { - var attributeFilterQuery = - from x in _productBundleItemAttributeFilterRepository.Table - where x.AttributeId == attributeId && x.AttributeValueId == attributeValueId - select x; - - attributeFilterQuery.ToList().Each(x => DeleteProductBundleItemAttributeFilter(x)); - } - - public virtual void DeleteProductBundleItemAttributeFilter(int attributeId) - { - var attributeFilterQuery = - from x in _productBundleItemAttributeFilterRepository.Table - where x.AttributeId == attributeId - select x; - - attributeFilterQuery.ToList().Each(x => DeleteProductBundleItemAttributeFilter(x)); - } - - #endregion - } + #region Product bundle item attribute filter + + public virtual void InsertProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter) + { + if (attributeFilter == null) + throw new ArgumentNullException("attributeFilter"); + + if (attributeFilter.AttributeId != 0 && attributeFilter.AttributeValueId != 0) + { + _productBundleItemAttributeFilterRepository.Insert(attributeFilter); + } + } + + public virtual void UpdateProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter) + { + if (attributeFilter == null) + throw new ArgumentNullException("attributeFilter"); + + _productBundleItemAttributeFilterRepository.Update(attributeFilter); + } + + public virtual void DeleteProductBundleItemAttributeFilter(ProductBundleItemAttributeFilter attributeFilter) + { + if (attributeFilter == null) + throw new ArgumentNullException("attributeFilter"); + + _productBundleItemAttributeFilterRepository.Delete(attributeFilter); + } + + public virtual void DeleteProductBundleItemAttributeFilter(ProductBundleItem bundleItem) + { + if (bundleItem != null && bundleItem.Id != 0) + { + var attributeFilterQuery = + from x in _productBundleItemAttributeFilterRepository.Table + where x.BundleItemId == bundleItem.Id + select x; + + attributeFilterQuery.ToList().Each(x => DeleteProductBundleItemAttributeFilter(x)); + } + } + + public virtual void DeleteProductBundleItemAttributeFilter(int attributeId, int attributeValueId) + { + var attributeFilterQuery = + from x in _productBundleItemAttributeFilterRepository.Table + where x.AttributeId == attributeId && x.AttributeValueId == attributeValueId + select x; + + attributeFilterQuery.ToList().Each(x => DeleteProductBundleItemAttributeFilter(x)); + } + + public virtual void DeleteProductBundleItemAttributeFilter(int attributeId) + { + var attributeFilterQuery = + from x in _productBundleItemAttributeFilterRepository.Table + where x.AttributeId == attributeId + select x; + + attributeFilterQuery.ToList().Each(x => DeleteProductBundleItemAttributeFilter(x)); + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs index f57d755022..52ffd8cd80 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs @@ -21,15 +21,15 @@ public static ProductVariantAttributeCombination MergeWithCombination(this Produ return product.MergeWithCombination(selectedAttributes, EngineContext.Current.Resolve()); } - public static ProductVariantAttributeCombination MergeWithCombination(this Product product, string selectedAttributes, IProductAttributeParser productAttributeParser) + public static ProductVariantAttributeCombination MergeWithCombination(this Product product, string selectedAttributes, IProductAttributeParser productAttributeParser) { Guard.NotNull(productAttributeParser, "productAttributeParser"); - if (selectedAttributes.IsEmpty()) - return null; + if (selectedAttributes.IsEmpty()) + return null; - // Let's find appropriate record. - var combination = productAttributeParser.FindProductVariantAttributeCombination(product.Id, selectedAttributes); + // Let's find appropriate record. + var combination = productAttributeParser.FindProductVariantAttributeCombination(product.Id, selectedAttributes); if (combination != null && combination.IsActive) { @@ -40,93 +40,93 @@ public static ProductVariantAttributeCombination MergeWithCombination(this Produ product.MergedDataValues.Clear(); } - return combination; + return combination; } - public static void MergeWithCombination(this Product product, ProductVariantAttributeCombination combination) - { - Guard.NotNull(product, "product"); - - var values = product.MergedDataValues; - - if (values != null) - values.Clear(); - - if (combination == null) - return; - - if (values == null) - product.MergedDataValues = values = new Dictionary(); - - if (ManageInventoryMethod.ManageStockByAttributes == (ManageInventoryMethod)product.ManageInventoryMethodId) - { - values.Add("StockQuantity", combination.StockQuantity); - values.Add("BackorderModeId", combination.AllowOutOfStockOrders ? (int)BackorderMode.AllowQtyBelow0 : (int)BackorderMode.NoBackorders); - } - - if (combination.Sku.HasValue()) - values.Add("Sku", combination.Sku); - if (combination.Gtin.HasValue()) - values.Add("Gtin", combination.Gtin); - if (combination.ManufacturerPartNumber.HasValue()) - values.Add("ManufacturerPartNumber", combination.ManufacturerPartNumber); - - if (combination.Price.HasValue) - values.Add("Price", combination.Price.Value); - - if (combination.DeliveryTimeId.HasValue && combination.DeliveryTimeId.Value > 0) - values.Add("DeliveryTimeId", combination.DeliveryTimeId); - - if (combination.QuantityUnitId.HasValue && combination.QuantityUnitId.Value > 0) - values.Add("QuantityUnitId", combination.QuantityUnitId); - - if (combination.Length.HasValue) - values.Add("Length", combination.Length.Value); - if (combination.Width.HasValue) - values.Add("Width", combination.Width.Value); - if (combination.Height.HasValue) - values.Add("Height", combination.Height.Value); - - if (combination.BasePriceAmount.HasValue) - values.Add("BasePriceAmount", combination.BasePriceAmount); - if (combination.BasePriceBaseAmount.HasValue) - values.Add("BasePriceBaseAmount", combination.BasePriceBaseAmount); - } - - public static IList GetAllCombinationPictureIds(this IEnumerable combinations) - { - var pictureIds = new List(); - - if (combinations != null) - { - var data = combinations - .Where(x => x.IsActive && x.AssignedMediaFileIds != null) - .Select(x => x.AssignedMediaFileIds) - .ToList(); - - if (data.Count > 0) - { - var ids = string.Join(",", data).SplitSafe(",").Distinct(); - - foreach (string str in ids) - { - if (int.TryParse(str, out var id) && !pictureIds.Exists(i => i == id)) - pictureIds.Add(id); - } - } - } - - return pictureIds; - } - - /// - /// Finds a related product item by specified identifiers - /// - /// Source - /// The first product identifier - /// The second product identifier - /// Related product - public static RelatedProduct FindRelatedProduct(this IList source, + public static void MergeWithCombination(this Product product, ProductVariantAttributeCombination combination) + { + Guard.NotNull(product, "product"); + + var values = product.MergedDataValues; + + if (values != null) + values.Clear(); + + if (combination == null) + return; + + if (values == null) + product.MergedDataValues = values = new Dictionary(); + + if (ManageInventoryMethod.ManageStockByAttributes == (ManageInventoryMethod)product.ManageInventoryMethodId) + { + values.Add("StockQuantity", combination.StockQuantity); + values.Add("BackorderModeId", combination.AllowOutOfStockOrders ? (int)BackorderMode.AllowQtyBelow0 : (int)BackorderMode.NoBackorders); + } + + if (combination.Sku.HasValue()) + values.Add("Sku", combination.Sku); + if (combination.Gtin.HasValue()) + values.Add("Gtin", combination.Gtin); + if (combination.ManufacturerPartNumber.HasValue()) + values.Add("ManufacturerPartNumber", combination.ManufacturerPartNumber); + + if (combination.Price.HasValue) + values.Add("Price", combination.Price.Value); + + if (combination.DeliveryTimeId.HasValue && combination.DeliveryTimeId.Value > 0) + values.Add("DeliveryTimeId", combination.DeliveryTimeId); + + if (combination.QuantityUnitId.HasValue && combination.QuantityUnitId.Value > 0) + values.Add("QuantityUnitId", combination.QuantityUnitId); + + if (combination.Length.HasValue) + values.Add("Length", combination.Length.Value); + if (combination.Width.HasValue) + values.Add("Width", combination.Width.Value); + if (combination.Height.HasValue) + values.Add("Height", combination.Height.Value); + + if (combination.BasePriceAmount.HasValue) + values.Add("BasePriceAmount", combination.BasePriceAmount); + if (combination.BasePriceBaseAmount.HasValue) + values.Add("BasePriceBaseAmount", combination.BasePriceBaseAmount); + } + + public static IList GetAllCombinationPictureIds(this IEnumerable combinations) + { + var pictureIds = new List(); + + if (combinations != null) + { + var data = combinations + .Where(x => x.IsActive && x.AssignedMediaFileIds != null) + .Select(x => x.AssignedMediaFileIds) + .ToList(); + + if (data.Count > 0) + { + var ids = string.Join(",", data).SplitSafe(",").Distinct(); + + foreach (string str in ids) + { + if (int.TryParse(str, out var id) && !pictureIds.Exists(i => i == id)) + pictureIds.Add(id); + } + } + } + + return pictureIds; + } + + /// + /// Finds a related product item by specified identifiers + /// + /// Source + /// The first product identifier + /// The second product identifier + /// Related product + public static RelatedProduct FindRelatedProduct(this IList source, int productId1, int productId2) { foreach (RelatedProduct relatedProduct in source) @@ -154,20 +154,20 @@ public static CrossSellProduct FindCrossSellProduct(this IList return null; } - public static bool IsAvailableByStock(this Product product) - { - Guard.NotNull(product, nameof(product)); + public static bool IsAvailableByStock(this Product product) + { + Guard.NotNull(product, nameof(product)); - if (product.ManageInventoryMethod == ManageInventoryMethod.ManageStock || product.ManageInventoryMethod == ManageInventoryMethod.ManageStockByAttributes) - { + if (product.ManageInventoryMethod == ManageInventoryMethod.ManageStock || product.ManageInventoryMethod == ManageInventoryMethod.ManageStockByAttributes) + { if (product.StockQuantity <= 0 && product.BackorderMode == BackorderMode.NoBackorders) { return false; } - } + } - return true; - } + return true; + } /// /// Formats the stock availability/quantity message @@ -177,28 +177,28 @@ public static bool IsAvailableByStock(this Product product) /// The stock message public static string FormatStockMessage(this Product product, ILocalizationService localizationService) { - Guard.NotNull(product, nameof(product)); - Guard.NotNull(localizationService, nameof(localizationService)); + Guard.NotNull(product, nameof(product)); + Guard.NotNull(localizationService, nameof(localizationService)); - string stockMessage = string.Empty; + string stockMessage = string.Empty; if ((product.ManageInventoryMethod == ManageInventoryMethod.ManageStock || product.ManageInventoryMethod == ManageInventoryMethod.ManageStockByAttributes) && product.DisplayStockAvailability) { - if (product.StockQuantity > 0) - { - if (product.DisplayStockQuantity) - stockMessage = string.Format(localizationService.GetResource("Products.Availability.InStockWithQuantity"), product.StockQuantity); - else - stockMessage = localizationService.GetResource("Products.Availability.InStock"); - } - else - { - if (product.BackorderMode == BackorderMode.NoBackorders || product.BackorderMode == BackorderMode.AllowQtyBelow0) - stockMessage = localizationService.GetResource("Products.Availability.OutOfStock"); - else if (product.BackorderMode == BackorderMode.AllowQtyBelow0AndNotifyCustomer) - stockMessage = localizationService.GetResource("Products.Availability.Backordering"); - } + if (product.StockQuantity > 0) + { + if (product.DisplayStockQuantity) + stockMessage = string.Format(localizationService.GetResource("Products.Availability.InStockWithQuantity"), product.StockQuantity); + else + stockMessage = localizationService.GetResource("Products.Availability.InStock"); + } + else + { + if (product.BackorderMode == BackorderMode.NoBackorders || product.BackorderMode == BackorderMode.AllowQtyBelow0) + stockMessage = localizationService.GetResource("Products.Availability.OutOfStock"); + else if (product.BackorderMode == BackorderMode.AllowQtyBelow0AndNotifyCustomer) + stockMessage = localizationService.GetResource("Products.Availability.Backordering"); + } } return stockMessage; @@ -206,16 +206,16 @@ public static string FormatStockMessage(this Product product, ILocalizationServi public static bool DisplayDeliveryTimeAccordingToStock(this Product product, CatalogSettings catalogSettings) { - Guard.NotNull(product, nameof(product)); + Guard.NotNull(product, nameof(product)); Guard.NotNull(catalogSettings, nameof(catalogSettings)); if (product.ManageInventoryMethod == ManageInventoryMethod.ManageStock || product.ManageInventoryMethod == ManageInventoryMethod.ManageStockByAttributes) - { - if (catalogSettings.DeliveryTimeIdForEmptyStock.HasValue && product.StockQuantity <= 0) - return true; + { + if (catalogSettings.DeliveryTimeIdForEmptyStock.HasValue && product.StockQuantity <= 0) + return true; - return (product.StockQuantity > 0); - } + return (product.StockQuantity > 0); + } return true; } @@ -246,21 +246,21 @@ public static bool DisplayDeliveryTimeAccordingToStock(this Product product, Cat /// Catalog settings /// Whether the product is labeled as NEW public static bool IsNew(this Product product, CatalogSettings catalogSettings) - { - if (catalogSettings.LabelAsNewForMaxDays.HasValue) - { - return ((DateTime.UtcNow - product.CreatedOnUtc).Days <= catalogSettings.LabelAsNewForMaxDays.Value); - } + { + if (catalogSettings.LabelAsNewForMaxDays.HasValue) + { + return ((DateTime.UtcNow - product.CreatedOnUtc).Days <= catalogSettings.LabelAsNewForMaxDays.Value); + } - return false; - } + return false; + } - public static bool ProductTagExists(this Product product, int productTagId) + public static bool ProductTagExists(this Product product, int productTagId) { - Guard.NotNull(product, nameof(product)); + Guard.NotNull(product, nameof(product)); - var result = product.ProductTags.Any(x => x.Id == productTagId); - return result; + var result = product.ProductTags.Any(x => x.Id == productTagId); + return result; } /// @@ -270,9 +270,9 @@ public static bool ProductTagExists(this Product product, int productTagId) /// Result public static int[] ParseAllowedQuatities(this Product product) { - Guard.NotNull(product, nameof(product)); + Guard.NotNull(product, nameof(product)); - var result = new List(); + var result = new List(); if (!String.IsNullOrWhiteSpace(product.AllowedQuantities)) { product @@ -291,25 +291,25 @@ public static int[] ParseAllowedQuatities(this Product product) return result.ToArray(); } - public static int[] ParseRequiredProductIds(this Product product) - { - Guard.NotNull(product, nameof(product)); + public static int[] ParseRequiredProductIds(this Product product) + { + Guard.NotNull(product, nameof(product)); - if (String.IsNullOrEmpty(product.RequiredProductIds)) - return new int[0]; + if (String.IsNullOrEmpty(product.RequiredProductIds)) + return new int[0]; - var ids = new List(); + var ids = new List(); - foreach (var idStr in product.RequiredProductIds - .Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries) - .Select(x => x.Trim())) - { - if (int.TryParse(idStr, out var id)) - ids.Add(id); - } + foreach (var idStr in product.RequiredProductIds + .Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries) + .Select(x => x.Trim())) + { + if (int.TryParse(idStr, out var id)) + ids.Add(id); + } - return ids.ToArray(); - } + return ids.ToArray(); + } /// /// Gets the base price info @@ -325,21 +325,21 @@ public static int[] ParseRequiredProductIds(this Product product) /// Price adjustment /// The base price info public static string GetBasePriceInfo(this Product product, - ILocalizationService localizationService, - IPriceFormatter priceFormatter, + ILocalizationService localizationService, + IPriceFormatter priceFormatter, ICurrencyService currencyService, - ITaxService taxService, - IPriceCalculationService priceCalculationService, - Customer customer, + ITaxService taxService, + IPriceCalculationService priceCalculationService, + Customer customer, Currency currency, - decimal priceAdjustment = decimal.Zero) + decimal priceAdjustment = decimal.Zero) { - Guard.NotNull(product, nameof(product)); - Guard.NotNull(currencyService, nameof(currencyService)); - Guard.NotNull(taxService, nameof(taxService)); - Guard.NotNull(priceCalculationService, nameof(priceCalculationService)); - Guard.NotNull(customer, nameof(customer)); - Guard.NotNull(currency, nameof(currency)); + Guard.NotNull(product, nameof(product)); + Guard.NotNull(currencyService, nameof(currencyService)); + Guard.NotNull(taxService, nameof(taxService)); + Guard.NotNull(priceCalculationService, nameof(priceCalculationService)); + Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(currency, nameof(currency)); if (product.BasePriceHasValue && product.BasePriceAmount != decimal.Zero) { @@ -347,67 +347,67 @@ public static string GetBasePriceInfo(this Product product, var price = taxService.GetProductPrice(product, decimal.Add(currentPrice, priceAdjustment), customer, currency, out var taxrate); price = currencyService.ConvertFromPrimaryStoreCurrency(price, currency); - return product.GetBasePriceInfo(price, localizationService, priceFormatter, currency); - } + return product.GetBasePriceInfo(price, localizationService, priceFormatter, currency); + } return string.Empty; } - /// - /// Gets the base price info - /// - /// Product - /// The calculated product price - /// Localization service - /// Price formatter - /// Target currency - /// The base price info - public static string GetBasePriceInfo(this Product product, - decimal productPrice, - ILocalizationService localizationService, - IPriceFormatter priceFormatter, - Currency currency) - { - Guard.NotNull(product, nameof(product)); - Guard.NotNull(localizationService, nameof(localizationService)); - Guard.NotNull(priceFormatter, nameof(priceFormatter)); - Guard.NotNull(currency, nameof(currency)); - - if (product.BasePriceHasValue && product.BasePriceAmount != decimal.Zero) - { - var value = Convert.ToDecimal((productPrice / product.BasePriceAmount) * product.BasePriceBaseAmount); - var valueFormatted = priceFormatter.FormatPrice(value, true, currency); - var amountFormatted = Math.Round(product.BasePriceAmount.Value, 2).ToString("G29"); - var infoTemplate = localizationService.GetResource("Products.BasePriceInfo"); - - var result = infoTemplate.FormatInvariant( - amountFormatted, - product.BasePriceMeasureUnit, - valueFormatted, - product.BasePriceBaseAmount - ); - - return result; - } - - return string.Empty; - } - - public static string GetProductTypeLabel(this Product product, ILocalizationService localizationService) - { - if (product != null && product.ProductType != ProductType.SimpleProduct) - { - var key = "Admin.Catalog.Products.ProductType.{0}.Label".FormatInvariant(product.ProductType.ToString()); - return localizationService.GetResource(key); - } - - return string.Empty; - } - - public static bool CanBeBundleItem(this Product product) - { - return product != null && product.ProductType == ProductType.SimpleProduct && !product.IsRecurring && !product.IsDownload; - } + /// + /// Gets the base price info + /// + /// Product + /// The calculated product price + /// Localization service + /// Price formatter + /// Target currency + /// The base price info + public static string GetBasePriceInfo(this Product product, + decimal productPrice, + ILocalizationService localizationService, + IPriceFormatter priceFormatter, + Currency currency) + { + Guard.NotNull(product, nameof(product)); + Guard.NotNull(localizationService, nameof(localizationService)); + Guard.NotNull(priceFormatter, nameof(priceFormatter)); + Guard.NotNull(currency, nameof(currency)); + + if (product.BasePriceHasValue && product.BasePriceAmount != decimal.Zero) + { + var value = Convert.ToDecimal((productPrice / product.BasePriceAmount) * product.BasePriceBaseAmount); + var valueFormatted = priceFormatter.FormatPrice(value, true, currency); + var amountFormatted = Math.Round(product.BasePriceAmount.Value, 2).ToString("G29"); + var infoTemplate = localizationService.GetResource("Products.BasePriceInfo"); + + var result = infoTemplate.FormatInvariant( + amountFormatted, + product.BasePriceMeasureUnit, + valueFormatted, + product.BasePriceBaseAmount + ); + + return result; + } + + return string.Empty; + } + + public static string GetProductTypeLabel(this Product product, ILocalizationService localizationService) + { + if (product != null && product.ProductType != ProductType.SimpleProduct) + { + var key = "Admin.Catalog.Products.ProductType.{0}.Label".FormatInvariant(product.ProductType.ToString()); + return localizationService.GetResource(key); + } + + return string.Empty; + } + + public static bool CanBeBundleItem(this Product product) + { + return product != null && product.ProductType == ProductType.SimpleProduct && !product.IsRecurring && !product.IsDownload; + } public static bool FilterOut(this ProductBundleItem bundleItem, ProductVariantAttributeValue value, out ProductBundleItemAttributeFilter filter) { @@ -422,61 +422,61 @@ public static bool FilterOut(this ProductBundleItem bundleItem, ProductVariantAt } public static string GetLocalizedName(this ProductBundleItem bundleItem) - { - if (bundleItem != null) - { - string name = bundleItem.GetLocalized(x => x.Name); - return (name.HasValue() ? name : bundleItem.Product.GetLocalized(x => x.Name)); - } - return null; - } - public static string GetLocalizedName(this ProductBundleItem bundleItem, int languageId) - { - if (bundleItem != null) - { - string name = bundleItem.GetLocalized(x => x.Name, languageId); - return (name.HasValue() ? name : bundleItem.Product.GetLocalized(x => x.Name, languageId)); - } - return null; - } - - public static ProductBundleItemOrderData ToOrderData(this ProductBundleItemData bundleItemData, decimal priceWithDiscount = decimal.Zero, - string attributesXml = null, string attributesInfo = null) - { + { + if (bundleItem != null) + { + string name = bundleItem.GetLocalized(x => x.Name); + return (name.HasValue() ? name : bundleItem.Product.GetLocalized(x => x.Name)); + } + return null; + } + public static string GetLocalizedName(this ProductBundleItem bundleItem, int languageId) + { + if (bundleItem != null) + { + string name = bundleItem.GetLocalized(x => x.Name, languageId); + return (name.HasValue() ? name : bundleItem.Product.GetLocalized(x => x.Name, languageId)); + } + return null; + } + + public static ProductBundleItemOrderData ToOrderData(this ProductBundleItemData bundleItemData, decimal priceWithDiscount = decimal.Zero, + string attributesXml = null, string attributesInfo = null) + { if (bundleItemData == null || bundleItemData.Item == null) { return null; } - var item = bundleItemData.Item; - string bundleItemName = item.GetLocalized(x => x.Name); - - var bundleData = new ProductBundleItemOrderData() - { - BundleItemId = item.Id, - ProductId = item.ProductId, - Sku = item.Product.Sku, - ProductName = bundleItemName ?? item.Product.GetLocalized(x => x.Name), - ProductSeName = item.Product.GetSeName(), - VisibleIndividually = item.Product.Visibility != ProductVisibility.Hidden, - Quantity = item.Quantity, - DisplayOrder = item.DisplayOrder, - PriceWithDiscount = priceWithDiscount, - AttributesXml = attributesXml, - AttributesInfo = attributesInfo, - PerItemShoppingCart = item.BundleProduct.BundlePerItemShoppingCart - }; - - return bundleData; - } - public static void ToOrderData(this ProductBundleItemData bundleItemData, IList bundleData, decimal priceWithDiscount = decimal.Zero, - string attributesXml = null, string attributesInfo = null) - { - var item = bundleItemData.ToOrderData(priceWithDiscount, attributesXml, attributesInfo); - - if (item != null && item.ProductId != 0 && item.BundleItemId != 0) - bundleData.Add(item); - } + var item = bundleItemData.Item; + string bundleItemName = item.GetLocalized(x => x.Name); + + var bundleData = new ProductBundleItemOrderData() + { + BundleItemId = item.Id, + ProductId = item.ProductId, + Sku = item.Product.Sku, + ProductName = bundleItemName ?? item.Product.GetLocalized(x => x.Name), + ProductSeName = item.Product.GetSeName(), + VisibleIndividually = item.Product.Visibility != ProductVisibility.Hidden, + Quantity = item.Quantity, + DisplayOrder = item.DisplayOrder, + PriceWithDiscount = priceWithDiscount, + AttributesXml = attributesXml, + AttributesInfo = attributesInfo, + PerItemShoppingCart = item.BundleProduct.BundlePerItemShoppingCart + }; + + return bundleData; + } + public static void ToOrderData(this ProductBundleItemData bundleItemData, IList bundleData, decimal priceWithDiscount = decimal.Zero, + string attributesXml = null, string attributesInfo = null) + { + var item = bundleItemData.ToOrderData(priceWithDiscount, attributesXml, attributesInfo); + + if (item != null && item.ProductId != 0 && item.BundleItemId != 0) + bundleData.Add(item); + } } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductService.cs index 84c303a035..aba3d28a20 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductService.cs @@ -18,20 +18,20 @@ namespace SmartStore.Services.Catalog { public partial class ProductService : IProductService - { - private readonly IRepository _productRepository; + { + private readonly IRepository _productRepository; private readonly IRepository _relatedProductRepository; private readonly IRepository _crossSellProductRepository; private readonly IRepository _tierPriceRepository; private readonly IRepository _productFileRepository; private readonly IRepository _productVariantAttributeCombinationRepository; - private readonly IRepository _productBundleItemRepository; - private readonly IRepository _shoppingCartItemRepository; - private readonly IProductAttributeService _productAttributeService; + private readonly IRepository _productBundleItemRepository; + private readonly IRepository _shoppingCartItemRepository; + private readonly IProductAttributeService _productAttributeService; private readonly IProductAttributeParser _productAttributeParser; private readonly IDbContext _dbContext; private readonly LocalizationSettings _localizationSettings; - private readonly ICommonServices _services; + private readonly ICommonServices _services; public ProductService( IRepository productRepository, @@ -40,13 +40,13 @@ public ProductService( IRepository tierPriceRepository, IRepository productPictureRepository, IRepository productVariantAttributeCombinationRepository, - IRepository productBundleItemRepository, - IRepository shoppingCartItemRepository, - IProductAttributeService productAttributeService, + IRepository productBundleItemRepository, + IRepository shoppingCartItemRepository, + IProductAttributeService productAttributeService, IProductAttributeParser productAttributeParser, - IDbContext dbContext, + IDbContext dbContext, LocalizationSettings localizationSettings, - ICommonServices services) + ICommonServices services) { _productRepository = productRepository; _relatedProductRepository = relatedProductRepository; @@ -54,155 +54,155 @@ public ProductService( _tierPriceRepository = tierPriceRepository; _productFileRepository = productPictureRepository; _productVariantAttributeCombinationRepository = productVariantAttributeCombinationRepository; - _productBundleItemRepository = productBundleItemRepository; - _shoppingCartItemRepository = shoppingCartItemRepository; + _productBundleItemRepository = productBundleItemRepository; + _shoppingCartItemRepository = shoppingCartItemRepository; _productAttributeService = productAttributeService; _productAttributeParser = productAttributeParser; _dbContext = dbContext; _localizationSettings = localizationSettings; - _services = services; + _services = services; } - #region Utilities - - protected virtual int EnsureMutuallyRelatedProducts(List productIds) - { - int count = 0; - - foreach (int id1 in productIds) - { - var mutualAssociations = ( - from rp in _relatedProductRepository.Table - join p in _productRepository.Table on rp.ProductId2 equals p.Id - where rp.ProductId2 == id1 && !p.Deleted - select rp).ToList(); - - foreach (int id2 in productIds) - { - if (id1 == id2) - continue; - - if (!mutualAssociations.Any(x => x.ProductId1 == id2)) - { - int maxDisplayOrder = _relatedProductRepository.TableUntracked - .Where(x => x.ProductId1 == id2) - .OrderByDescending(x => x.DisplayOrder) - .Select(x => x.DisplayOrder) - .FirstOrDefault(); - - var newRelatedProduct = new RelatedProduct - { - ProductId1 = id2, - ProductId2 = id1, - DisplayOrder = maxDisplayOrder + 1 - }; - - InsertRelatedProduct(newRelatedProduct); - ++count; - } - } - } - - return count; - } - - protected virtual int EnsureMutuallyCrossSellProducts(List productIds) - { - int count = 0; - - foreach (int id1 in productIds) - { - var mutualAssociations = ( - from rp in _crossSellProductRepository.Table - join p in _productRepository.Table on rp.ProductId2 equals p.Id - where rp.ProductId2 == id1 && !p.Deleted - select rp).ToList(); - - foreach (int id2 in productIds) - { - if (id1 == id2) - continue; - - if (!mutualAssociations.Any(x => x.ProductId1 == id2)) - { - var newCrossSellProduct = new CrossSellProduct - { - ProductId1 = id2, - ProductId2 = id1 - }; - - InsertCrossSellProduct(newCrossSellProduct); - ++count; - } - } - } - - return count; - } - - #endregion - - #region Products - - public virtual int CountAllProducts() - { - var query = _productRepository.Table; - query = query.Where(x => !x.Deleted); - - return query.Count(); - - } - - public virtual int CountAllProductVariants() - { - var query = _productVariantAttributeCombinationRepository.Table; - query = query.Where(x => x.IsActive); - - return query.Count(); - } - - public virtual void DeleteProduct(Product product) + #region Utilities + + protected virtual int EnsureMutuallyRelatedProducts(List productIds) + { + int count = 0; + + foreach (int id1 in productIds) + { + var mutualAssociations = ( + from rp in _relatedProductRepository.Table + join p in _productRepository.Table on rp.ProductId2 equals p.Id + where rp.ProductId2 == id1 && !p.Deleted + select rp).ToList(); + + foreach (int id2 in productIds) + { + if (id1 == id2) + continue; + + if (!mutualAssociations.Any(x => x.ProductId1 == id2)) + { + int maxDisplayOrder = _relatedProductRepository.TableUntracked + .Where(x => x.ProductId1 == id2) + .OrderByDescending(x => x.DisplayOrder) + .Select(x => x.DisplayOrder) + .FirstOrDefault(); + + var newRelatedProduct = new RelatedProduct + { + ProductId1 = id2, + ProductId2 = id1, + DisplayOrder = maxDisplayOrder + 1 + }; + + InsertRelatedProduct(newRelatedProduct); + ++count; + } + } + } + + return count; + } + + protected virtual int EnsureMutuallyCrossSellProducts(List productIds) + { + int count = 0; + + foreach (int id1 in productIds) + { + var mutualAssociations = ( + from rp in _crossSellProductRepository.Table + join p in _productRepository.Table on rp.ProductId2 equals p.Id + where rp.ProductId2 == id1 && !p.Deleted + select rp).ToList(); + + foreach (int id2 in productIds) + { + if (id1 == id2) + continue; + + if (!mutualAssociations.Any(x => x.ProductId1 == id2)) + { + var newCrossSellProduct = new CrossSellProduct + { + ProductId1 = id2, + ProductId2 = id1 + }; + + InsertCrossSellProduct(newCrossSellProduct); + ++count; + } + } + } + + return count; + } + + #endregion + + #region Products + + public virtual int CountAllProducts() { - Guard.NotNull(product, nameof(product)); + var query = _productRepository.Table; + query = query.Where(x => !x.Deleted); - product.Deleted = true; - product.DeliveryTimeId = null; - product.QuantityUnitId = null; - product.CountryOfOriginId = null; + return query.Count(); + + } + + public virtual int CountAllProductVariants() + { + var query = _productVariantAttributeCombinationRepository.Table; + query = query.Where(x => x.IsActive); + + return query.Count(); + } + + public virtual void DeleteProduct(Product product) + { + Guard.NotNull(product, nameof(product)); + + product.Deleted = true; + product.DeliveryTimeId = null; + product.QuantityUnitId = null; + product.CountryOfOriginId = null; UpdateProduct(product); - if (product.ProductType == ProductType.GroupedProduct) - { - var associatedProducts = _productRepository.Table - .Where(x => x.ParentGroupedProductId == product.Id) - .ToList(); + if (product.ProductType == ProductType.GroupedProduct) + { + var associatedProducts = _productRepository.Table + .Where(x => x.ParentGroupedProductId == product.Id) + .ToList(); - associatedProducts.ForEach(x => x.ParentGroupedProductId = 0); + associatedProducts.ForEach(x => x.ParentGroupedProductId = 0); - _dbContext.SaveChanges(); - } + _dbContext.SaveChanges(); + } } public virtual IList GetAllProductsDisplayedOnHomePage() { - var query = - from p in _productRepository.Table - orderby p.HomePageDisplayOrder - where p.Published && !p.Deleted && p.ShowOnHomePage - select p; + var query = + from p in _productRepository.Table + orderby p.HomePageDisplayOrder + where p.Published && !p.Deleted && p.ShowOnHomePage + select p; var products = query.ToList(); return products; } - + public virtual Product GetProductById(int productId) { if (productId == 0) return null; - return _productRepository.GetByIdCached(productId, "db.product.id-" + productId); - } + return _productRepository.GetByIdCached(productId, "db.product.id-" + productId); + } public virtual IList GetProductsByIds(int[] productIds, ProductLoadFlags flags = ProductLoadFlags.None) { @@ -215,118 +215,118 @@ public virtual IList GetProductsByIds(int[] productIds, ProductLoadFlag where productIds.Contains(p.Id) select p; - if (flags > ProductLoadFlags.None) - { - query = ApplyLoadFlags(query, flags); - } - - var products = query.ToList(); - - // Sort by passed identifier sequence. - return products.OrderBySequence(productIds).ToList(); - } - - public virtual Product GetProductBySystemName(string systemName) - { - if (systemName.IsEmpty()) - { - return null; - } - - var product = _productRepository.Table.FirstOrDefault(x => x.SystemName == systemName && x.IsSystemProduct); - return product; - } - - private IQueryable ApplyLoadFlags(IQueryable query, ProductLoadFlags flags) - { - if (flags.HasFlag(ProductLoadFlags.WithAttributeCombinations)) - { - query = query.Include(x => x.ProductVariantAttributeCombinations); - } - - if (flags.HasFlag(ProductLoadFlags.WithBundleItems)) - { - query = query.Include(x => x.ProductBundleItems.Select(y => y.Product)); - } - - if (flags.HasFlag(ProductLoadFlags.WithCategories)) - { - query = query.Include(x => x.ProductCategories.Select(y => y.Category)); - } - - if (flags.HasFlag(ProductLoadFlags.WithDiscounts)) - { - query = query.Include(x => x.AppliedDiscounts); - } - - if (flags.HasFlag(ProductLoadFlags.WithManufacturers)) - { - query = query.Include(x => x.ProductManufacturers.Select(y => y.Manufacturer)); - } - - if (flags.HasFlag(ProductLoadFlags.WithPictures)) - { - query = query.Include(x => x.ProductPictures); - } - - if (flags.HasFlag(ProductLoadFlags.WithReviews)) - { - query = query.Include(x => x.ProductReviews); - } - - if (flags.HasFlag(ProductLoadFlags.WithSpecificationAttributes)) - { - query = query.Include(x => x.ProductSpecificationAttributes.Select(y => y.SpecificationAttributeOption)); - } - - if (flags.HasFlag(ProductLoadFlags.WithTags)) - { - query = query.Include(x => x.ProductTags); - } - - if (flags.HasFlag(ProductLoadFlags.WithTierPrices)) - { - query = query.Include(x => x.TierPrices); - } - - if (flags.HasFlag(ProductLoadFlags.WithAttributes)) - { - query = query.Include(x => x.ProductVariantAttributes.Select(y => y.ProductAttribute)); - } - - if (flags.HasFlag(ProductLoadFlags.WithAttributeValues)) - { - query = query.Include(x => x.ProductVariantAttributes.Select(y => y.ProductVariantAttributeValues)); - } - - if (flags.HasFlag(ProductLoadFlags.WithDeliveryTime)) - { - query = query.Include(x => x.DeliveryTime); - } - - return query; - } + if (flags > ProductLoadFlags.None) + { + query = ApplyLoadFlags(query, flags); + } + + var products = query.ToList(); + + // Sort by passed identifier sequence. + return products.OrderBySequence(productIds).ToList(); + } + + public virtual Product GetProductBySystemName(string systemName) + { + if (systemName.IsEmpty()) + { + return null; + } + + var product = _productRepository.Table.FirstOrDefault(x => x.SystemName == systemName && x.IsSystemProduct); + return product; + } + + private IQueryable ApplyLoadFlags(IQueryable query, ProductLoadFlags flags) + { + if (flags.HasFlag(ProductLoadFlags.WithAttributeCombinations)) + { + query = query.Include(x => x.ProductVariantAttributeCombinations); + } + + if (flags.HasFlag(ProductLoadFlags.WithBundleItems)) + { + query = query.Include(x => x.ProductBundleItems.Select(y => y.Product)); + } + + if (flags.HasFlag(ProductLoadFlags.WithCategories)) + { + query = query.Include(x => x.ProductCategories.Select(y => y.Category)); + } + + if (flags.HasFlag(ProductLoadFlags.WithDiscounts)) + { + query = query.Include(x => x.AppliedDiscounts); + } + + if (flags.HasFlag(ProductLoadFlags.WithManufacturers)) + { + query = query.Include(x => x.ProductManufacturers.Select(y => y.Manufacturer)); + } + + if (flags.HasFlag(ProductLoadFlags.WithPictures)) + { + query = query.Include(x => x.ProductPictures); + } + + if (flags.HasFlag(ProductLoadFlags.WithReviews)) + { + query = query.Include(x => x.ProductReviews); + } + + if (flags.HasFlag(ProductLoadFlags.WithSpecificationAttributes)) + { + query = query.Include(x => x.ProductSpecificationAttributes.Select(y => y.SpecificationAttributeOption)); + } + + if (flags.HasFlag(ProductLoadFlags.WithTags)) + { + query = query.Include(x => x.ProductTags); + } + + if (flags.HasFlag(ProductLoadFlags.WithTierPrices)) + { + query = query.Include(x => x.TierPrices); + } + + if (flags.HasFlag(ProductLoadFlags.WithAttributes)) + { + query = query.Include(x => x.ProductVariantAttributes.Select(y => y.ProductAttribute)); + } + + if (flags.HasFlag(ProductLoadFlags.WithAttributeValues)) + { + query = query.Include(x => x.ProductVariantAttributes.Select(y => y.ProductVariantAttributeValues)); + } + + if (flags.HasFlag(ProductLoadFlags.WithDeliveryTime)) + { + query = query.Include(x => x.DeliveryTime); + } + + return query; + } public virtual void InsertProduct(Product product) { - Guard.NotNull(product, nameof(product)); + Guard.NotNull(product, nameof(product)); - _productRepository.Insert(product); + _productRepository.Insert(product); } - public virtual void UpdateProduct(Product product) + public virtual void UpdateProduct(Product product) { - Guard.NotNull(product, nameof(product)); + Guard.NotNull(product, nameof(product)); _productRepository.Update(product); } public virtual void UpdateProductReviewTotals(Product product) { - Guard.NotNull(product, nameof(product)); + Guard.NotNull(product, nameof(product)); - int approvedRatingSum = 0; - int notApprovedRatingSum = 0; + int approvedRatingSum = 0; + int notApprovedRatingSum = 0; int approvedTotalReviews = 0; int notApprovedTotalReviews = 0; var reviews = product.ProductReviews; @@ -335,7 +335,7 @@ public virtual void UpdateProductReviewTotals(Product product) if (pr.IsApproved) { approvedRatingSum += pr.Rating; - approvedTotalReviews ++; + approvedTotalReviews++; } else { @@ -353,51 +353,51 @@ public virtual void UpdateProductReviewTotals(Product product) public virtual IList GetLowStockProducts() { - // Track inventory for product - var query1 = from p in _productRepository.Table - orderby p.MinStockQuantity - where !p.Deleted && - p.ManageInventoryMethodId == (int)ManageInventoryMethod.ManageStock && - p.MinStockQuantity >= p.StockQuantity - select p; - var products1 = query1.ToList(); - - // Track inventory for product by product attributes - var query2 = from p in _productRepository.Table - from pvac in p.ProductVariantAttributeCombinations - where !p.Deleted && - p.ManageInventoryMethodId == (int)ManageInventoryMethod.ManageStockByAttributes && - pvac.StockQuantity <= 0 - select p; - - // only distinct products (group by ID) - // if we use standard Distinct() method, then all fields will be compared (low performance) - query2 = from p in query2 - group p by p.Id into pGroup - orderby pGroup.Key - select pGroup.FirstOrDefault(); - var products2 = query2.ToList(); - - var result = new List(); - result.AddRange(products1); - result.AddRange(products2); + // Track inventory for product + var query1 = from p in _productRepository.Table + orderby p.MinStockQuantity + where !p.Deleted && + p.ManageInventoryMethodId == (int)ManageInventoryMethod.ManageStock && + p.MinStockQuantity >= p.StockQuantity + select p; + var products1 = query1.ToList(); + + // Track inventory for product by product attributes + var query2 = from p in _productRepository.Table + from pvac in p.ProductVariantAttributeCombinations + where !p.Deleted && + p.ManageInventoryMethodId == (int)ManageInventoryMethod.ManageStockByAttributes && + pvac.StockQuantity <= 0 + select p; + + // only distinct products (group by ID) + // if we use standard Distinct() method, then all fields will be compared (low performance) + query2 = from p in query2 + group p by p.Id into pGroup + orderby pGroup.Key + select pGroup.FirstOrDefault(); + var products2 = query2.ToList(); + + var result = new List(); + result.AddRange(products1); + result.AddRange(products2); return result; } - public virtual Product GetProductBySku(string sku) - { - if (String.IsNullOrEmpty(sku)) - return null; + public virtual Product GetProductBySku(string sku) + { + if (String.IsNullOrEmpty(sku)) + return null; - sku = sku.Trim(); + sku = sku.Trim(); - var query = from p in _productRepository.Table - orderby p.DisplayOrder, p.Id - where !p.Deleted && p.Sku == sku - select p; - var product = query.FirstOrDefault(); - return product; - } + var query = from p in _productRepository.Table + orderby p.DisplayOrder, p.Id + where !p.Deleted && p.Sku == sku + select p; + var product = query.FirstOrDefault(); + return product; + } public virtual Product GetProductByGtin(string gtin) { @@ -414,180 +414,180 @@ orderby p.Id return product; } - public virtual Product GetProductByManufacturerPartNumber(string manufacturerPartNumber) - { - if (manufacturerPartNumber.IsEmpty()) - return null; - - manufacturerPartNumber = manufacturerPartNumber.Trim(); - - var product = _productRepository.Table - .Where(x => !x.Deleted && x.ManufacturerPartNumber == manufacturerPartNumber) - .OrderBy(x => x.Id) - .FirstOrDefault(); - - return product; - } - - public virtual Product GetProductByIdentificationNumber( - string identificationNumber, - out ProductVariantAttributeCombination attributeCombination, - bool includeHidden = false, - bool untracked = true) - { - attributeCombination = null; - - if (string.IsNullOrWhiteSpace(identificationNumber)) - { - return null; - } - - identificationNumber = identificationNumber.Trim(); - - var pq = - from x in untracked ? _productRepository.TableUntracked : _productRepository.Table - where !x.Deleted && (x.Sku == identificationNumber || x.ManufacturerPartNumber == identificationNumber || x.Gtin == identificationNumber) - select x; - - if (!includeHidden) - { - pq = pq.Where(x => x.Visibility <= ProductVisibility.SearchResults && x.Published); - } - - var product = pq.FirstOrDefault(); - if (product != null) - { - return product; - } - - var pvaq = - from x in untracked ? _productVariantAttributeCombinationRepository.TableUntracked : _productVariantAttributeCombinationRepository.Table - where !x.Product.Deleted && (x.Sku == identificationNumber || x.ManufacturerPartNumber == identificationNumber || x.Gtin == identificationNumber) - select x; - - if (!includeHidden) - { - pvaq = pvaq.Where(x => x.Product.Visibility <= ProductVisibility.SearchResults && x.Product.Published && x.IsActive); - } - - attributeCombination = pvaq.FirstOrDefault(); - - return attributeCombination?.Product; - } - - public virtual Product GetProductByName(string name) - { - if (name.IsEmpty()) - return null; - - name = name.Trim(); - - var product = _productRepository.Table - .Where(x => !x.Deleted && x.Name == name) - .OrderBy(x => x.Id) - .FirstOrDefault(); - - return product; - } - - public virtual AdjustInventoryResult AdjustInventory(OrganizedShoppingCartItem sci, bool decrease) - { - if (sci == null) - throw new ArgumentNullException("cartItem"); - - if (sci.Item.Product.ProductType == ProductType.BundledProduct && sci.Item.Product.BundlePerItemShoppingCart) - { - if (sci.ChildItems != null) - { - foreach (var child in sci.ChildItems.Where(x => x.Item.Id != sci.Item.Id)) - { - AdjustInventory(child.Item.Product, decrease, sci.Item.Quantity * child.Item.Quantity, child.Item.AttributesXml); - } - } - return new AdjustInventoryResult(); - } - else - { - return AdjustInventory(sci.Item.Product, decrease, sci.Item.Quantity, sci.Item.AttributesXml); - } - } - - public virtual AdjustInventoryResult AdjustInventory(OrderItem orderItem, bool decrease, int quantity) - { - Guard.NotNull(orderItem, nameof(orderItem)); - - if (orderItem.Product.ProductType == ProductType.BundledProduct && orderItem.Product.BundlePerItemShoppingCart) - { - if (orderItem.BundleData.HasValue()) - { - var bundleData = orderItem.GetBundleData(); - if (bundleData.Count > 0) - { - var products = GetProductsByIds(bundleData.Select(x => x.ProductId).ToArray()); - - foreach (var item in bundleData) - { - var product = products.FirstOrDefault(x => x.Id == item.ProductId); - if (product != null) - AdjustInventory(product, decrease, quantity * item.Quantity, item.AttributesXml); - } - } - } - return new AdjustInventoryResult(); - } - else - { - return AdjustInventory(orderItem.Product, decrease, quantity, orderItem.AttributesXml); - } - } - - public virtual AdjustInventoryResult AdjustInventory(Product product, bool decrease, int quantity, string attributesXml) + public virtual Product GetProductByManufacturerPartNumber(string manufacturerPartNumber) { - Guard.NotNull(product, nameof(product)); + if (manufacturerPartNumber.IsEmpty()) + return null; - var result = new AdjustInventoryResult(); + manufacturerPartNumber = manufacturerPartNumber.Trim(); - switch (product.ManageInventoryMethod) + var product = _productRepository.Table + .Where(x => !x.Deleted && x.ManufacturerPartNumber == manufacturerPartNumber) + .OrderBy(x => x.Id) + .FirstOrDefault(); + + return product; + } + + public virtual Product GetProductByIdentificationNumber( + string identificationNumber, + out ProductVariantAttributeCombination attributeCombination, + bool includeHidden = false, + bool untracked = true) + { + attributeCombination = null; + + if (string.IsNullOrWhiteSpace(identificationNumber)) + { + return null; + } + + identificationNumber = identificationNumber.Trim(); + + var pq = + from x in untracked ? _productRepository.TableUntracked : _productRepository.Table + where !x.Deleted && (x.Sku == identificationNumber || x.ManufacturerPartNumber == identificationNumber || x.Gtin == identificationNumber) + select x; + + if (!includeHidden) + { + pq = pq.Where(x => x.Visibility <= ProductVisibility.SearchResults && x.Published); + } + + var product = pq.FirstOrDefault(); + if (product != null) + { + return product; + } + + var pvaq = + from x in untracked ? _productVariantAttributeCombinationRepository.TableUntracked : _productVariantAttributeCombinationRepository.Table + where !x.Product.Deleted && (x.Sku == identificationNumber || x.ManufacturerPartNumber == identificationNumber || x.Gtin == identificationNumber) + select x; + + if (!includeHidden) + { + pvaq = pvaq.Where(x => x.Product.Visibility <= ProductVisibility.SearchResults && x.Product.Published && x.IsActive); + } + + attributeCombination = pvaq.FirstOrDefault(); + + return attributeCombination?.Product; + } + + public virtual Product GetProductByName(string name) + { + if (name.IsEmpty()) + return null; + + name = name.Trim(); + + var product = _productRepository.Table + .Where(x => !x.Deleted && x.Name == name) + .OrderBy(x => x.Id) + .FirstOrDefault(); + + return product; + } + + public virtual AdjustInventoryResult AdjustInventory(OrganizedShoppingCartItem sci, bool decrease) + { + if (sci == null) + throw new ArgumentNullException("cartItem"); + + if (sci.Item.Product.ProductType == ProductType.BundledProduct && sci.Item.Product.BundlePerItemShoppingCart) + { + if (sci.ChildItems != null) + { + foreach (var child in sci.ChildItems.Where(x => x.Item.Id != sci.Item.Id)) + { + AdjustInventory(child.Item.Product, decrease, sci.Item.Quantity * child.Item.Quantity, child.Item.AttributesXml); + } + } + return new AdjustInventoryResult(); + } + else + { + return AdjustInventory(sci.Item.Product, decrease, sci.Item.Quantity, sci.Item.AttributesXml); + } + } + + public virtual AdjustInventoryResult AdjustInventory(OrderItem orderItem, bool decrease, int quantity) + { + Guard.NotNull(orderItem, nameof(orderItem)); + + if (orderItem.Product.ProductType == ProductType.BundledProduct && orderItem.Product.BundlePerItemShoppingCart) + { + if (orderItem.BundleData.HasValue()) + { + var bundleData = orderItem.GetBundleData(); + if (bundleData.Count > 0) + { + var products = GetProductsByIds(bundleData.Select(x => x.ProductId).ToArray()); + + foreach (var item in bundleData) + { + var product = products.FirstOrDefault(x => x.Id == item.ProductId); + if (product != null) + AdjustInventory(product, decrease, quantity * item.Quantity, item.AttributesXml); + } + } + } + return new AdjustInventoryResult(); + } + else + { + return AdjustInventory(orderItem.Product, decrease, quantity, orderItem.AttributesXml); + } + } + + public virtual AdjustInventoryResult AdjustInventory(Product product, bool decrease, int quantity, string attributesXml) + { + Guard.NotNull(product, nameof(product)); + + var result = new AdjustInventoryResult(); + + switch (product.ManageInventoryMethod) { case ManageInventoryMethod.DontManageStock: { //do nothing } - break; + break; case ManageInventoryMethod.ManageStock: { - result.StockQuantityOld = product.StockQuantity; + result.StockQuantityOld = product.StockQuantity; if (decrease) - result.StockQuantityNew = product.StockQuantity - quantity; - else - result.StockQuantityNew = product.StockQuantity + quantity; + result.StockQuantityNew = product.StockQuantity - quantity; + else + result.StockQuantityNew = product.StockQuantity + quantity; - bool newPublished = product.Published; - bool newDisableBuyButton = product.DisableBuyButton; - bool newDisableWishlistButton = product.DisableWishlistButton; + bool newPublished = product.Published; + bool newDisableBuyButton = product.DisableBuyButton; + bool newDisableWishlistButton = product.DisableWishlistButton; //check if minimum quantity is reached switch (product.LowStockActivity) { case LowStockActivity.DisableBuyButton: - newDisableBuyButton = product.MinStockQuantity >= result.StockQuantityNew; - newDisableWishlistButton = product.MinStockQuantity >= result.StockQuantityNew; + newDisableBuyButton = product.MinStockQuantity >= result.StockQuantityNew; + newDisableWishlistButton = product.MinStockQuantity >= result.StockQuantityNew; break; case LowStockActivity.Unpublish: - newPublished = product.MinStockQuantity <= result.StockQuantityNew; + newPublished = product.MinStockQuantity <= result.StockQuantityNew; break; } - product.StockQuantity = result.StockQuantityNew; - product.DisableBuyButton = newDisableBuyButton; - product.DisableWishlistButton = newDisableWishlistButton; - product.Published = newPublished; + product.StockQuantity = result.StockQuantityNew; + product.DisableBuyButton = newDisableBuyButton; + product.DisableWishlistButton = newDisableWishlistButton; + product.Published = newPublished; + + UpdateProduct(product); - UpdateProduct(product); - //send email notification - if (decrease && product.NotifyAdminForQuantityBelow > result.StockQuantityNew) - _services.MessageFactory.SendQuantityBelowStoreOwnerNotification(product, _localizationSettings.DefaultAdminLanguageId); + if (decrease && product.NotifyAdminForQuantityBelow > result.StockQuantityNew) + _services.MessageFactory.SendQuantityBelowStoreOwnerNotification(product, _localizationSettings.DefaultAdminLanguageId); } break; case ManageInventoryMethod.ManageStockByAttributes: @@ -595,13 +595,13 @@ public virtual AdjustInventoryResult AdjustInventory(Product product, bool decre var combination = _productAttributeParser.FindProductVariantAttributeCombination(product.Id, attributesXml); if (combination != null) { - result.StockQuantityOld = combination.StockQuantity; + result.StockQuantityOld = combination.StockQuantity; if (decrease) - result.StockQuantityNew = combination.StockQuantity - quantity; + result.StockQuantityNew = combination.StockQuantity - quantity; else - result.StockQuantityNew = combination.StockQuantity + quantity; + result.StockQuantityNew = combination.StockQuantity + quantity; - combination.StockQuantity = result.StockQuantityNew; + combination.StockQuantity = result.StockQuantityNew; _productAttributeService.UpdateProductVariantAttributeCombination(combination); } } @@ -610,56 +610,56 @@ public virtual AdjustInventoryResult AdjustInventory(Product product, bool decre break; } - var attributeValues = _productAttributeParser.ParseProductVariantAttributeValues(attributesXml); + var attributeValues = _productAttributeParser.ParseProductVariantAttributeValues(attributesXml); - attributeValues - .Where(x => x.ValueType == ProductVariantAttributeValueType.ProductLinkage) - .ToList() - .Each(x => - { - var linkedProduct = GetProductById(x.LinkedProductId); - if (linkedProduct != null) - AdjustInventory(linkedProduct, decrease, quantity * x.Quantity, ""); - }); + attributeValues + .Where(x => x.ValueType == ProductVariantAttributeValueType.ProductLinkage) + .ToList() + .Each(x => + { + var linkedProduct = GetProductById(x.LinkedProductId); + if (linkedProduct != null) + AdjustInventory(linkedProduct, decrease, quantity * x.Quantity, ""); + }); - return result; + return result; } - - public virtual void UpdateHasTierPricesProperty(Product product) + + public virtual void UpdateHasTierPricesProperty(Product product) { - Guard.NotNull(product, nameof(product)); + Guard.NotNull(product, nameof(product)); - var prevValue = product.HasTierPrices; - product.HasTierPrices = product.TierPrices.Count > 0; - if (prevValue != product.HasTierPrices) - UpdateProduct(product); + var prevValue = product.HasTierPrices; + product.HasTierPrices = product.TierPrices.Count > 0; + if (prevValue != product.HasTierPrices) + UpdateProduct(product); } - public virtual void UpdateLowestAttributeCombinationPriceProperty(Product product) - { - Guard.NotNull(product, nameof(product)); + public virtual void UpdateLowestAttributeCombinationPriceProperty(Product product) + { + Guard.NotNull(product, nameof(product)); - var prevValue = product.LowestAttributeCombinationPrice; + var prevValue = product.LowestAttributeCombinationPrice; - product.LowestAttributeCombinationPrice = _productAttributeService.GetLowestCombinationPrice(product.Id); + product.LowestAttributeCombinationPrice = _productAttributeService.GetLowestCombinationPrice(product.Id); - if (prevValue != product.LowestAttributeCombinationPrice) - UpdateProduct(product); - } + if (prevValue != product.LowestAttributeCombinationPrice) + UpdateProduct(product); + } - public virtual void UpdateHasDiscountsApplied(Product product) + public virtual void UpdateHasDiscountsApplied(Product product) { - Guard.NotNull(product, nameof(product)); + Guard.NotNull(product, nameof(product)); - var prevValue = product.HasDiscountsApplied; - product.HasDiscountsApplied = product.AppliedDiscounts.Count > 0; - if (prevValue != product.HasDiscountsApplied) - UpdateProduct(product); + var prevValue = product.HasDiscountsApplied; + product.HasDiscountsApplied = product.AppliedDiscounts.Count > 0; + if (prevValue != product.HasDiscountsApplied) + UpdateProduct(product); } - public virtual Multimap GetProductTagsByProductIds(int[] productIds, bool includeHidden = false) - { - Guard.NotNull(productIds, nameof(productIds)); + public virtual Multimap GetProductTagsByProductIds(int[] productIds, bool includeHidden = false) + { + Guard.NotNull(productIds, nameof(productIds)); var map = new Multimap(); if (!productIds.Any()) @@ -685,16 +685,16 @@ public virtual Multimap GetProductTagsByProductIds(int[] produc }) .ToList(); - foreach (var item in items) - { + foreach (var item in items) + { foreach (var tag in item.Tags) { map.Add(item.ProductId, tag); } - } + } - return map; - } + return map; + } public virtual Multimap GetAssociatedProductsByProductIds(int[] productIds, bool showHidden = false) { @@ -720,8 +720,8 @@ public virtual Multimap GetAssociatedProductsByProductIds(int[] pr } public virtual Multimap GetAppliedDiscountsByProductIds(int[] productIds) - { - Guard.NotNull(productIds, nameof(productIds)); + { + Guard.NotNull(productIds, nameof(productIds)); var map = new Multimap(); if (!productIds.Any()) @@ -731,20 +731,20 @@ public virtual Multimap GetAppliedDiscountsByProductIds(int[] pro var query = _productRepository.Table // .TableUntracked does not seem to eager load .Expand(x => x.AppliedDiscounts.Select(y => y.RuleSets)) - .Where(x => productIds.Contains(x.Id)) - .Select(x => new - { - ProductId = x.Id, - Discounts = x.AppliedDiscounts - }); + .Where(x => productIds.Contains(x.Id)) + .Select(x => new + { + ProductId = x.Id, + Discounts = x.AppliedDiscounts + }); - foreach (var item in query.ToList()) - { - map.AddRange(item.ProductId, item.Discounts); - } + foreach (var item in query.ToList()) + { + map.AddRange(item.ProductId, item.Discounts); + } - return map; - } + return map; + } #endregion @@ -752,9 +752,9 @@ public virtual Multimap GetAppliedDiscountsByProductIds(int[] pro public virtual void DeleteRelatedProduct(RelatedProduct relatedProduct) { - Guard.NotNull(relatedProduct, nameof(relatedProduct)); + Guard.NotNull(relatedProduct, nameof(relatedProduct)); - _relatedProductRepository.Delete(relatedProduct); + _relatedProductRepository.Delete(relatedProduct); } public virtual IList GetRelatedProductsByProductId1(int productId1, bool showHidden = false) @@ -773,36 +773,36 @@ public virtual RelatedProduct GetRelatedProductById(int relatedProductId) { if (relatedProductId == 0) return null; - + var relatedProduct = _relatedProductRepository.GetById(relatedProductId); return relatedProduct; } public virtual void InsertRelatedProduct(RelatedProduct relatedProduct) { - Guard.NotNull(relatedProduct, nameof(relatedProduct)); + Guard.NotNull(relatedProduct, nameof(relatedProduct)); - _relatedProductRepository.Insert(relatedProduct); + _relatedProductRepository.Insert(relatedProduct); } public virtual void UpdateRelatedProduct(RelatedProduct relatedProduct) { - Guard.NotNull(relatedProduct, nameof(relatedProduct)); + Guard.NotNull(relatedProduct, nameof(relatedProduct)); - _relatedProductRepository.Update(relatedProduct); + _relatedProductRepository.Update(relatedProduct); } - public virtual int EnsureMutuallyRelatedProducts(int productId1) - { - var relatedProducts = GetRelatedProductsByProductId1(productId1, true); - var productIds = relatedProducts.Select(x => x.ProductId2).ToList(); + public virtual int EnsureMutuallyRelatedProducts(int productId1) + { + var relatedProducts = GetRelatedProductsByProductId1(productId1, true); + var productIds = relatedProducts.Select(x => x.ProductId2).ToList(); - if (productIds.Count > 0 && !productIds.Any(x => x == productId1)) - productIds.Add(productId1); + if (productIds.Count > 0 && !productIds.Any(x => x == productId1)) + productIds.Add(productId1); - int count = EnsureMutuallyRelatedProducts(productIds); - return count; - } + int count = EnsureMutuallyRelatedProducts(productIds); + return count; + } #endregion @@ -810,9 +810,9 @@ public virtual int EnsureMutuallyRelatedProducts(int productId1) public virtual void DeleteCrossSellProduct(CrossSellProduct crossSellProduct) { - Guard.NotNull(crossSellProduct, nameof(crossSellProduct)); + Guard.NotNull(crossSellProduct, nameof(crossSellProduct)); - _crossSellProductRepository.Delete(crossSellProduct); + _crossSellProductRepository.Delete(crossSellProduct); } public virtual IList GetCrossSellProductsByProductId1(int productId1, bool showHidden = false) @@ -827,21 +827,21 @@ orderby csp.Id return crossSellProducts; } - public virtual IList GetCrossSellProductsByProductIds(IEnumerable productIds, bool showHidden = false) - { - Guard.NotNull(productIds, nameof(productIds)); + public virtual IList GetCrossSellProductsByProductIds(IEnumerable productIds, bool showHidden = false) + { + Guard.NotNull(productIds, nameof(productIds)); - var query = from csp in _crossSellProductRepository.Table - join p in _productRepository.Table on csp.ProductId2 equals p.Id - where productIds.Contains(csp.ProductId1) && !p.Deleted && (showHidden || p.Published) - orderby csp.Id - select csp; + var query = from csp in _crossSellProductRepository.Table + join p in _productRepository.Table on csp.ProductId2 equals p.Id + where productIds.Contains(csp.ProductId1) && !p.Deleted && (showHidden || p.Published) + orderby csp.Id + select csp; - var crossSellProducts = query.ToList(); - return crossSellProducts; - } + var crossSellProducts = query.ToList(); + return crossSellProducts; + } - public virtual CrossSellProduct GetCrossSellProductById(int crossSellProductId) + public virtual CrossSellProduct GetCrossSellProductById(int crossSellProductId) { if (crossSellProductId == 0) return null; @@ -852,115 +852,115 @@ public virtual CrossSellProduct GetCrossSellProductById(int crossSellProductId) public virtual void InsertCrossSellProduct(CrossSellProduct crossSellProduct) { - Guard.NotNull(crossSellProduct, nameof(crossSellProduct)); + Guard.NotNull(crossSellProduct, nameof(crossSellProduct)); - _crossSellProductRepository.Insert(crossSellProduct); + _crossSellProductRepository.Insert(crossSellProduct); } public virtual void UpdateCrossSellProduct(CrossSellProduct crossSellProduct) { - Guard.NotNull(crossSellProduct, nameof(crossSellProduct)); + Guard.NotNull(crossSellProduct, nameof(crossSellProduct)); - _crossSellProductRepository.Update(crossSellProduct); + _crossSellProductRepository.Update(crossSellProduct); } - public virtual IList GetCrosssellProductsByShoppingCart(IList cart, int numberOfProducts) - { - var result = new List(); + public virtual IList GetCrosssellProductsByShoppingCart(IList cart, int numberOfProducts) + { + var result = new List(); - if (numberOfProducts == 0) - return result; + if (numberOfProducts == 0) + return result; - if (cart == null || cart.Count == 0) - return result; + if (cart == null || cart.Count == 0) + return result; - var cartProductIds = new HashSet(cart.Select(x => x.Item.ProductId)); - var csItems = GetCrossSellProductsByProductIds(cartProductIds); - var productIdsToLoad = new HashSet(csItems.Select(x => x.ProductId2).Except(cartProductIds)); + var cartProductIds = new HashSet(cart.Select(x => x.Item.ProductId)); + var csItems = GetCrossSellProductsByProductIds(cartProductIds); + var productIdsToLoad = new HashSet(csItems.Select(x => x.ProductId2).Except(cartProductIds)); - if (productIdsToLoad.Count > 0) - { - result.AddRange(GetProductsByIds(productIdsToLoad.Take(numberOfProducts).ToArray())); - } + if (productIdsToLoad.Count > 0) + { + result.AddRange(GetProductsByIds(productIdsToLoad.Take(numberOfProducts).ToArray())); + } - return result; - } + return result; + } - public virtual int EnsureMutuallyCrossSellProducts(int productId1) - { - var crossSellProducts = GetCrossSellProductsByProductId1(productId1, true); - var productIds = crossSellProducts.Select(x => x.ProductId2).ToList(); + public virtual int EnsureMutuallyCrossSellProducts(int productId1) + { + var crossSellProducts = GetCrossSellProductsByProductId1(productId1, true); + var productIds = crossSellProducts.Select(x => x.ProductId2).ToList(); - if (productIds.Count > 0 && !productIds.Any(x => x == productId1)) - productIds.Add(productId1); + if (productIds.Count > 0 && !productIds.Any(x => x == productId1)) + productIds.Add(productId1); - int count = EnsureMutuallyCrossSellProducts(productIds); - return count; - } + int count = EnsureMutuallyCrossSellProducts(productIds); + return count; + } #endregion - + #region Tier prices - + public virtual void DeleteTierPrice(TierPrice tierPrice) { - Guard.NotNull(tierPrice, nameof(tierPrice)); + Guard.NotNull(tierPrice, nameof(tierPrice)); - _tierPriceRepository.Delete(tierPrice); + _tierPriceRepository.Delete(tierPrice); } public virtual TierPrice GetTierPriceById(int tierPriceId) { if (tierPriceId == 0) return null; - + var tierPrice = _tierPriceRepository.GetById(tierPriceId); return tierPrice; } - public virtual Multimap GetTierPricesByProductIds(int[] productIds, Customer customer = null, int storeId = 0) - { - Guard.NotNull(productIds, nameof(productIds)); + public virtual Multimap GetTierPricesByProductIds(int[] productIds, Customer customer = null, int storeId = 0) + { + Guard.NotNull(productIds, nameof(productIds)); if (!productIds.Any()) { return new Multimap(); } - var query = _tierPriceRepository.TableUntracked - .Include(x => x.CustomerRole) - .Where(x => productIds.Contains(x.ProductId)); + var query = _tierPriceRepository.TableUntracked + .Include(x => x.CustomerRole) + .Where(x => productIds.Contains(x.ProductId)); - if (storeId != 0) - query = query.Where(x => x.StoreId == 0 || x.StoreId == storeId); + if (storeId != 0) + query = query.Where(x => x.StoreId == 0 || x.StoreId == storeId); - var list = query - .ToList() - // Sorting locally is most likely faster - .OrderBy(x => x.ProductId) - .ThenBy(x => x.Quantity) - .AsEnumerable(); + var list = query + .ToList() + // Sorting locally is most likely faster + .OrderBy(x => x.ProductId) + .ThenBy(x => x.Quantity) + .AsEnumerable(); - if (customer != null) - list = list.FilterForCustomer(customer).ToList(); + if (customer != null) + list = list.FilterForCustomer(customer).ToList(); - var map = list.ToMultimap(x => x.ProductId, x => x); + var map = list.ToMultimap(x => x.ProductId, x => x); - return map; - } + return map; + } public virtual void InsertTierPrice(TierPrice tierPrice) { - Guard.NotNull(tierPrice, nameof(tierPrice)); + Guard.NotNull(tierPrice, nameof(tierPrice)); - _tierPriceRepository.Insert(tierPrice); + _tierPriceRepository.Insert(tierPrice); } public virtual void UpdateTierPrice(TierPrice tierPrice) { - Guard.NotNull(tierPrice, nameof(tierPrice)); + Guard.NotNull(tierPrice, nameof(tierPrice)); - _tierPriceRepository.Update(tierPrice); + _tierPriceRepository.Update(tierPrice); } #endregion @@ -969,9 +969,9 @@ public virtual void UpdateTierPrice(TierPrice tierPrice) public virtual void DeleteProductPicture(ProductMediaFile productPicture) { - Guard.NotNull(productPicture, nameof(productPicture)); + Guard.NotNull(productPicture, nameof(productPicture)); - UnassignDeletedPictureFromVariantCombinations(productPicture); + UnassignDeletedPictureFromVariantCombinations(productPicture); _productFileRepository.Delete(productPicture); } @@ -981,23 +981,23 @@ private void UnassignDeletedPictureFromVariantCombinations(ProductMediaFile prod var picId = productPicture.Id; bool touched = false; - var combinations = - from c in _productVariantAttributeCombinationRepository.Table - where c.ProductId == productPicture.Product.Id && !String.IsNullOrEmpty(c.AssignedMediaFileIds) - select c; - - foreach (var c in combinations) - { - var ids = c.GetAssignedMediaIds().ToList(); - if (ids.Contains(picId)) - { - ids.Remove(picId); - //c.AssignedPictureIds = ids.Count > 0 ? String.Join(",", ids) : null; - c.SetAssignedMediaIds(ids.ToArray()); - touched = true; - // we will save after we're done. It's faster. - } - } + var combinations = + from c in _productVariantAttributeCombinationRepository.Table + where c.ProductId == productPicture.Product.Id && !String.IsNullOrEmpty(c.AssignedMediaFileIds) + select c; + + foreach (var c in combinations) + { + var ids = c.GetAssignedMediaIds().ToList(); + if (ids.Contains(picId)) + { + ids.Remove(picId); + //c.AssignedPictureIds = ids.Count > 0 ? String.Join(",", ids) : null; + c.SetAssignedMediaIds(ids.ToArray()); + touched = true; + // we will save after we're done. It's faster. + } + } // save in one shot! if (touched) @@ -1032,11 +1032,11 @@ public virtual IList GetProductPicturesByProductId(int product return productFiles; } - public virtual Multimap GetProductPicturesByProductIds( + public virtual Multimap GetProductPicturesByProductIds( int[] productIds, int? maxPicturesPerProduct = null, MediaLoadFlags flags = MediaLoadFlags.None) - { + { if (!(productIds?.Any() ?? false)) { return new Multimap(); @@ -1092,9 +1092,9 @@ public virtual ProductMediaFile GetProductPictureById(int productPictureId) public virtual void InsertProductPicture(ProductMediaFile productPicture) { - Guard.NotNull(productPicture, nameof(productPicture)); + Guard.NotNull(productPicture, nameof(productPicture)); - _productFileRepository.Insert(productPicture); + _productFileRepository.Insert(productPicture); } /// @@ -1103,120 +1103,120 @@ public virtual void InsertProductPicture(ProductMediaFile productPicture) /// Product picture public virtual void UpdateProductPicture(ProductMediaFile productPicture) { - Guard.NotNull(productPicture, nameof(productPicture)); + Guard.NotNull(productPicture, nameof(productPicture)); - _productFileRepository.Update(productPicture); + _productFileRepository.Update(productPicture); } #endregion - #region Bundled products + #region Bundled products - public virtual void InsertBundleItem(ProductBundleItem bundleItem) - { - Guard.NotNull(bundleItem, nameof(bundleItem)); + public virtual void InsertBundleItem(ProductBundleItem bundleItem) + { + Guard.NotNull(bundleItem, nameof(bundleItem)); - if (bundleItem.BundleProductId == 0) - throw new SmartException("BundleProductId of a bundle item cannot be 0."); + if (bundleItem.BundleProductId == 0) + throw new SmartException("BundleProductId of a bundle item cannot be 0."); - if (bundleItem.ProductId == 0) - throw new SmartException("ProductId of a bundle item cannot be 0."); + if (bundleItem.ProductId == 0) + throw new SmartException("ProductId of a bundle item cannot be 0."); - if (bundleItem.ProductId == bundleItem.BundleProductId) - throw new SmartException("A bundle item cannot be an element of itself."); + if (bundleItem.ProductId == bundleItem.BundleProductId) + throw new SmartException("A bundle item cannot be an element of itself."); - _productBundleItemRepository.Insert(bundleItem); - } + _productBundleItemRepository.Insert(bundleItem); + } - public virtual void UpdateBundleItem(ProductBundleItem bundleItem) - { - Guard.NotNull(bundleItem, nameof(bundleItem)); + public virtual void UpdateBundleItem(ProductBundleItem bundleItem) + { + Guard.NotNull(bundleItem, nameof(bundleItem)); - _productBundleItemRepository.Update(bundleItem); - } + _productBundleItemRepository.Update(bundleItem); + } - public virtual void DeleteBundleItem(ProductBundleItem bundleItem) - { - Guard.NotNull(bundleItem, nameof(bundleItem)); + public virtual void DeleteBundleItem(ProductBundleItem bundleItem) + { + Guard.NotNull(bundleItem, nameof(bundleItem)); - // remove bundles from shopping carts (otherwise bundle item cannot be deleted) - var parentCartItemIds = _shoppingCartItemRepository.TableUntracked - .Where(x => x.BundleItemId == bundleItem.Id && x.ParentItemId != null) - .Select(x => x.ParentItemId) - .ToList(); + // remove bundles from shopping carts (otherwise bundle item cannot be deleted) + var parentCartItemIds = _shoppingCartItemRepository.TableUntracked + .Where(x => x.BundleItemId == bundleItem.Id && x.ParentItemId != null) + .Select(x => x.ParentItemId) + .ToList(); - if (parentCartItemIds.Any()) - { - var cartItems = _shoppingCartItemRepository.Table - .Where(x => parentCartItemIds.Contains(x.Id)) - .ToList(); + if (parentCartItemIds.Any()) + { + var cartItems = _shoppingCartItemRepository.Table + .Where(x => parentCartItemIds.Contains(x.Id)) + .ToList(); - foreach (var parentItem in cartItems) - { - var childItems = _shoppingCartItemRepository.Table - .Where(x => x.ParentItemId != null && x.ParentItemId.Value == parentItem.Id && x.Id != parentItem.Id) - .ToList(); + foreach (var parentItem in cartItems) + { + var childItems = _shoppingCartItemRepository.Table + .Where(x => x.ParentItemId != null && x.ParentItemId.Value == parentItem.Id && x.Id != parentItem.Id) + .ToList(); - childItems.Each(x => _shoppingCartItemRepository.Delete(x)); + childItems.Each(x => _shoppingCartItemRepository.Delete(x)); - _shoppingCartItemRepository.Delete(parentItem); - } - } + _shoppingCartItemRepository.Delete(parentItem); + } + } - // delete bundle item - _productBundleItemRepository.Delete(bundleItem); - } + // delete bundle item + _productBundleItemRepository.Delete(bundleItem); + } - public virtual ProductBundleItem GetBundleItemById(int bundleItemId) - { - if (bundleItemId == 0) - return null; + public virtual ProductBundleItem GetBundleItemById(int bundleItemId) + { + if (bundleItemId == 0) + return null; - return _productBundleItemRepository.GetById(bundleItemId); - } + return _productBundleItemRepository.GetById(bundleItemId); + } public virtual IList GetBundleItems(int bundleProductId, bool showHidden = false) - { - var query = - from pbi in _productBundleItemRepository.Table - join p in _productRepository.Table on pbi.ProductId equals p.Id - where pbi.BundleProductId == bundleProductId && !p.Deleted && (showHidden || (pbi.Published && p.Published)) - orderby pbi.DisplayOrder - select pbi; + { + var query = + from pbi in _productBundleItemRepository.Table + join p in _productRepository.Table on pbi.ProductId equals p.Id + where pbi.BundleProductId == bundleProductId && !p.Deleted && (showHidden || (pbi.Published && p.Published)) + orderby pbi.DisplayOrder + select pbi; - query = query.Include(x => x.Product); + query = query.Include(x => x.Product); - var bundleItemData = new List(); + var bundleItemData = new List(); - query.ToList().Each(x => bundleItemData.Add(new ProductBundleItemData(x))); + query.ToList().Each(x => bundleItemData.Add(new ProductBundleItemData(x))); - return bundleItemData; - } + return bundleItemData; + } public virtual Multimap GetBundleItemsByProductIds(int[] productIds, bool showHidden = false) - { - Guard.NotNull(productIds, nameof(productIds)); + { + Guard.NotNull(productIds, nameof(productIds)); if (!productIds.Any()) { return new Multimap(); } - var query = - from pbi in _productBundleItemRepository.TableUntracked - join p in _productRepository.TableUntracked on pbi.ProductId equals p.Id - where productIds.Contains(pbi.BundleProductId) && !p.Deleted && (showHidden || (pbi.Published && p.Published)) - orderby pbi.DisplayOrder - select pbi; + var query = + from pbi in _productBundleItemRepository.TableUntracked + join p in _productRepository.TableUntracked on pbi.ProductId equals p.Id + where productIds.Contains(pbi.BundleProductId) && !p.Deleted && (showHidden || (pbi.Published && p.Published)) + orderby pbi.DisplayOrder + select pbi; var map = query .Include(x => x.Product) .Include(x => x.BundleProduct) .ToList() - .ToMultimap(x => x.BundleProductId, x => x); + .ToMultimap(x => x.BundleProductId, x => x); - return map; - } + return map; + } public virtual bool IsBundleItem(int productId) { @@ -1235,6 +1235,6 @@ join bundle in _productRepository.TableUntracked on pbi.BundleProductId equals b return result; } - #endregion - } + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductTagService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductTagService.cs index bd3cdcb10a..0a58afc7b0 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductTagService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductTagService.cs @@ -21,39 +21,39 @@ public partial class ProductTagService : ScopedServiceBase, IProductTagService /// private const string PRODUCTTAG_COUNT_KEY = "producttag:count-{0}-{1}"; - /// - /// Key pattern to clear cache - /// - private const string PRODUCTTAG_PATTERN_KEY = "producttag:*"; + /// + /// Key pattern to clear cache + /// + private const string PRODUCTTAG_PATTERN_KEY = "producttag:*"; private readonly IRepository _productTagRepository; - private readonly IRepository _storeMappingRepository; - private readonly IDataProvider _dataProvider; - private readonly IDbContext _dbContext; - private readonly CommonSettings _commonSettings; - private readonly ICacheManager _cacheManager; + private readonly IRepository _storeMappingRepository; + private readonly IDataProvider _dataProvider; + private readonly IDbContext _dbContext; + private readonly CommonSettings _commonSettings; + private readonly ICacheManager _cacheManager; public ProductTagService( - IRepository productTagRepository, - IRepository storeMappingRepository, - IDataProvider dataProvider, - IDbContext dbContext, - CommonSettings commonSettings, - ICacheManager cacheManager) + IRepository productTagRepository, + IRepository storeMappingRepository, + IDataProvider dataProvider, + IDbContext dbContext, + CommonSettings commonSettings, + ICacheManager cacheManager) { _productTagRepository = productTagRepository; - _storeMappingRepository = storeMappingRepository; - _dataProvider = dataProvider; - _dbContext = dbContext; - _commonSettings = commonSettings; - _cacheManager = cacheManager; + _storeMappingRepository = storeMappingRepository; + _dataProvider = dataProvider; + _dbContext = dbContext; + _commonSettings = commonSettings; + _cacheManager = cacheManager; - QuerySettings = DbQuerySettings.Default; - } + QuerySettings = DbQuerySettings.Default; + } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } - public virtual IList GetAllProductTags(bool includeHidden = false) + public virtual IList GetAllProductTags(bool includeHidden = false) { var query = _productTagRepository.Table; @@ -233,16 +233,16 @@ public virtual void UpdateProductTags(Product product, string[] tagNames) } public virtual int GetProductCount(int productTagId, int storeId, bool includeHidden = false) - { - var dictionary = GetProductCount(storeId, includeHidden); + { + var dictionary = GetProductCount(storeId, includeHidden); if (dictionary.TryGetValue(productTagId, out var count)) { return count; } - return 0; - } + return 0; + } protected virtual Dictionary GetProductCount(int storeId, bool includeHidden) { diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductTemplateService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductTemplateService.cs index fbf625225e..4ac7112d9b 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductTemplateService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductTemplateService.cs @@ -20,7 +20,7 @@ public partial class ProductTemplateService : IProductTemplateService private readonly IEventPublisher _eventPublisher; #endregion - + #region Ctor /// @@ -64,7 +64,7 @@ orderby pt.DisplayOrder var templates = query.ToList(); return templates; } - + /// /// Gets a product template /// @@ -101,7 +101,7 @@ public virtual void UpdateProductTemplate(ProductTemplate productTemplate) _productTemplateRepository.Update(productTemplate); } - + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs b/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs index 0c0b69aa52..fc47f54a93 100644 --- a/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs @@ -8,18 +8,18 @@ namespace SmartStore.Services.Catalog { - /// - /// Recently viewed products service - /// - public partial class RecentlyViewedProductsService : IRecentlyViewedProductsService + /// + /// Recently viewed products service + /// + public partial class RecentlyViewedProductsService : IRecentlyViewedProductsService { #region Fields private readonly ICommonServices _services; private readonly HttpContextBase _httpContext; private readonly IProductService _productService; - private readonly IAclService _aclService; - private readonly CatalogSettings _catalogSettings; + private readonly IAclService _aclService; + private readonly CatalogSettings _catalogSettings; private readonly PrivacySettings _privacySettings; #endregion @@ -35,15 +35,15 @@ public partial class RecentlyViewedProductsService : IRecentlyViewedProductsServ public RecentlyViewedProductsService( ICommonServices services, HttpContextBase httpContext, - IProductService productService, - IAclService aclService, - CatalogSettings catalogSettings, + IProductService productService, + IAclService aclService, + CatalogSettings catalogSettings, PrivacySettings privacySettings) { _services = services; _httpContext = httpContext; _productService = productService; - _aclService = aclService; + _aclService = aclService; _catalogSettings = catalogSettings; _privacySettings = privacySettings; } @@ -94,10 +94,10 @@ protected IList GetRecentlyViewedProductsIds(int number) public virtual IList GetRecentlyViewedProducts(int number) { var productIds = GetRecentlyViewedProductsIds(number); - var recentlyViewedProducts = _productService - .GetProductsByIds(productIds.ToArray()) - .Where(x => x.Published && !x.Deleted && !x.IsSystemProduct && _aclService.Authorize(x)) - .ToList(); + var recentlyViewedProducts = _productService + .GetProductsByIds(productIds.ToArray()) + .Where(x => x.Published && !x.Deleted && !x.IsSystemProduct && _aclService.Authorize(x)) + .ToList(); return recentlyViewedProducts; } @@ -117,7 +117,7 @@ public virtual void AddProductToRecentlyViewedList(int productId) var newProductIds = new List(oldProductIds); newProductIds.Remove(productId); - newProductIds.Insert(0, productId); + newProductIds.Insert(0, productId); var recentlyViewedCookie = _httpContext.Request.Cookies.Get("SmartStore.RecentlyViewedProducts") ?? new HttpCookie("SmartStore.RecentlyViewedProducts"); recentlyViewedCookie.Values.Clear(); @@ -141,7 +141,7 @@ public virtual void AddProductToRecentlyViewedList(int productId) _httpContext.Response.Cookies.Set(recentlyViewedCookie); } - + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Catalog/Rules/ProductRuleProvider.cs b/src/Libraries/SmartStore.Services/Catalog/Rules/ProductRuleProvider.cs index 59c53078e7..1db01b8256 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Rules/ProductRuleProvider.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Rules/ProductRuleProvider.cs @@ -422,7 +422,9 @@ CatalogSearchQuery createdFilter(SearchFilterContext ctx, DateTime x) if (_pluginFinder.GetPluginDescriptorBySystemName("SmartStore.MegaSearchPlus") != null) { ISearchFilter[] filters(string fieldName, int parentId, int[] valueIds) - => valueIds.Select(id => SearchFilter.ByField(fieldName, id).ExactMatch().NotAnalyzed().HasParent(parentId)).ToArray(); + { + return valueIds.Select(id => SearchFilter.ByField(fieldName, id).ExactMatch().NotAnalyzed().HasParent(parentId)).ToArray(); + } var pageIndex = -1; var variantQuery = _productAttributeRepository.Value.TableUntracked diff --git a/src/Libraries/SmartStore.Services/Catalog/SpecificationAttributeService.cs b/src/Libraries/SmartStore.Services/Catalog/SpecificationAttributeService.cs index d6ad0e1af0..1ad17f078e 100644 --- a/src/Libraries/SmartStore.Services/Catalog/SpecificationAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/SpecificationAttributeService.cs @@ -10,114 +10,114 @@ namespace SmartStore.Services.Catalog { - public partial class SpecificationAttributeService : ISpecificationAttributeService - { - private readonly IRepository _specificationAttributeRepository; - private readonly IRepository _specificationAttributeOptionRepository; - private readonly IRepository _productSpecificationAttributeRepository; - private readonly IEventPublisher _eventPublisher; - - public SpecificationAttributeService( - IRepository specificationAttributeRepository, - IRepository specificationAttributeOptionRepository, - IRepository productSpecificationAttributeRepository, - IEventPublisher eventPublisher) - { - _specificationAttributeRepository = specificationAttributeRepository; - _specificationAttributeOptionRepository = specificationAttributeOptionRepository; - _productSpecificationAttributeRepository = productSpecificationAttributeRepository; - _eventPublisher = eventPublisher; - - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - - #region Specification attribute - - public virtual SpecificationAttribute GetSpecificationAttributeById(int specificationAttributeId) - { - if (specificationAttributeId == 0) - return null; - - return _specificationAttributeRepository.GetById(specificationAttributeId); - } - - public virtual IQueryable GetSpecificationAttributes() - { - var query = - from sa in _specificationAttributeRepository.Table - orderby sa.DisplayOrder, sa.Name - select sa; - - return query; - } - - public virtual IQueryable GetSpecificationAttributesByIds(int[] ids) - { - if (ids == null || ids.Length == 0) - return null; - - var query = - from sa in _specificationAttributeRepository.Table - where ids.Contains(sa.Id) - orderby sa.DisplayOrder, sa.Name - select sa; - - return query; - } - - public virtual void DeleteSpecificationAttribute(SpecificationAttribute specificationAttribute) - { - if (specificationAttribute == null) - throw new ArgumentNullException("specificationAttribute"); - - _specificationAttributeRepository.Delete(specificationAttribute); - } - - public virtual void InsertSpecificationAttribute(SpecificationAttribute specificationAttribute) - { - if (specificationAttribute == null) - throw new ArgumentNullException("specificationAttribute"); - - _specificationAttributeRepository.Insert(specificationAttribute); - } - - public virtual void UpdateSpecificationAttribute(SpecificationAttribute specificationAttribute) - { - if (specificationAttribute == null) - throw new ArgumentNullException("specificationAttribute"); - - _specificationAttributeRepository.Update(specificationAttribute); - } - - #endregion - - #region Specification attribute option - - public virtual SpecificationAttributeOption GetSpecificationAttributeOptionById(int specificationAttributeOptionId) - { - if (specificationAttributeOptionId == 0) - return null; - - return _specificationAttributeOptionRepository.GetById(specificationAttributeOptionId); - } + public partial class SpecificationAttributeService : ISpecificationAttributeService + { + private readonly IRepository _specificationAttributeRepository; + private readonly IRepository _specificationAttributeOptionRepository; + private readonly IRepository _productSpecificationAttributeRepository; + private readonly IEventPublisher _eventPublisher; + + public SpecificationAttributeService( + IRepository specificationAttributeRepository, + IRepository specificationAttributeOptionRepository, + IRepository productSpecificationAttributeRepository, + IEventPublisher eventPublisher) + { + _specificationAttributeRepository = specificationAttributeRepository; + _specificationAttributeOptionRepository = specificationAttributeOptionRepository; + _productSpecificationAttributeRepository = productSpecificationAttributeRepository; + _eventPublisher = eventPublisher; + + T = NullLocalizer.Instance; + } + + public Localizer T { get; set; } + + #region Specification attribute + + public virtual SpecificationAttribute GetSpecificationAttributeById(int specificationAttributeId) + { + if (specificationAttributeId == 0) + return null; + + return _specificationAttributeRepository.GetById(specificationAttributeId); + } + + public virtual IQueryable GetSpecificationAttributes() + { + var query = + from sa in _specificationAttributeRepository.Table + orderby sa.DisplayOrder, sa.Name + select sa; + + return query; + } + + public virtual IQueryable GetSpecificationAttributesByIds(int[] ids) + { + if (ids == null || ids.Length == 0) + return null; + + var query = + from sa in _specificationAttributeRepository.Table + where ids.Contains(sa.Id) + orderby sa.DisplayOrder, sa.Name + select sa; + + return query; + } + + public virtual void DeleteSpecificationAttribute(SpecificationAttribute specificationAttribute) + { + if (specificationAttribute == null) + throw new ArgumentNullException("specificationAttribute"); + + _specificationAttributeRepository.Delete(specificationAttribute); + } + + public virtual void InsertSpecificationAttribute(SpecificationAttribute specificationAttribute) + { + if (specificationAttribute == null) + throw new ArgumentNullException("specificationAttribute"); + + _specificationAttributeRepository.Insert(specificationAttribute); + } + + public virtual void UpdateSpecificationAttribute(SpecificationAttribute specificationAttribute) + { + if (specificationAttribute == null) + throw new ArgumentNullException("specificationAttribute"); + + _specificationAttributeRepository.Update(specificationAttribute); + } + + #endregion + + #region Specification attribute option + + public virtual SpecificationAttributeOption GetSpecificationAttributeOptionById(int specificationAttributeOptionId) + { + if (specificationAttributeOptionId == 0) + return null; + + return _specificationAttributeOptionRepository.GetById(specificationAttributeOptionId); + } public virtual IList GetSpecificationAttributeOptionsBySpecificationAttribute(int specificationAttributeId) - { + { if (specificationAttributeId == 0) { return new List(); } - var query = from sao in _specificationAttributeOptionRepository.Table - orderby sao.DisplayOrder - where sao.SpecificationAttributeId == specificationAttributeId - select sao; + var query = from sao in _specificationAttributeOptionRepository.Table + orderby sao.DisplayOrder + where sao.SpecificationAttributeId == specificationAttributeId + select sao; - var specificationAttributeOptions = query.ToList(); - return specificationAttributeOptions; - } + var specificationAttributeOptions = query.ToList(); + return specificationAttributeOptions; + } public virtual Multimap GetSpecificationAttributeOptionsBySpecificationAttributeIds(int[] specificationAttributeIds) { @@ -133,94 +133,94 @@ public virtual Multimap GetSpecificationAttri } public virtual void DeleteSpecificationAttributeOption(SpecificationAttributeOption specificationAttributeOption) - { - if (specificationAttributeOption == null) - throw new ArgumentNullException("specificationAttributeOption"); - - _specificationAttributeOptionRepository.Delete(specificationAttributeOption); - } - - public virtual void InsertSpecificationAttributeOption(SpecificationAttributeOption specificationAttributeOption) - { - if (specificationAttributeOption == null) - throw new ArgumentNullException("specificationAttributeOption"); - - _specificationAttributeOptionRepository.Insert(specificationAttributeOption); - } - - public virtual void UpdateSpecificationAttributeOption(SpecificationAttributeOption specificationAttributeOption) - { - if (specificationAttributeOption == null) - throw new ArgumentNullException("specificationAttributeOption"); - - _specificationAttributeOptionRepository.Update(specificationAttributeOption); - } - - #endregion - - #region Product specification attribute - - public virtual void DeleteProductSpecificationAttribute(ProductSpecificationAttribute productSpecificationAttribute) - { - if (productSpecificationAttribute == null) - throw new ArgumentNullException("productSpecificationAttribute"); - - _productSpecificationAttributeRepository.Delete(productSpecificationAttribute); - } - - public virtual IList GetProductSpecificationAttributesByProductId(int productId) - { - return GetProductSpecificationAttributesByProductId(productId, null, null); - } - - public virtual IList GetProductSpecificationAttributesByProductId(int productId, bool? allowFiltering, bool? showOnProductPage) - { - if (productId == 0) - { - return new List(); - } - - if (allowFiltering.HasValue || showOnProductPage.HasValue) - { - // Note: Join or Expand of SpecificationAttribute, both provides the same SQL. - var joinedQuery = - from psa in _productSpecificationAttributeRepository.Table - join sao in _specificationAttributeOptionRepository.Table on psa.SpecificationAttributeOptionId equals sao.Id - where psa.ProductId == productId - select new - { - ProductAttribute = psa, - Attribute = sao.SpecificationAttribute - }; - - if (allowFiltering.HasValue) - { - joinedQuery = joinedQuery.Where(x => - (x.ProductAttribute.AllowFiltering == null && x.Attribute.AllowFiltering == allowFiltering.Value) || - (x.ProductAttribute.AllowFiltering != null && x.ProductAttribute.AllowFiltering == allowFiltering.Value) - ); - } - - if (showOnProductPage.HasValue) - { - joinedQuery = joinedQuery.Where(x => - (x.ProductAttribute.ShowOnProductPage == null && x.Attribute.ShowOnProductPage == showOnProductPage.Value) || - (x.ProductAttribute.ShowOnProductPage != null && x.ProductAttribute.ShowOnProductPage == showOnProductPage.Value) - ); - } - - var query = joinedQuery.Select(x => x.ProductAttribute).OrderBy(x => x.DisplayOrder); - return query.ToListCached(); - } - else - { - var query = _productSpecificationAttributeRepository.Table - .Where(x => x.ProductId == productId) - .OrderBy(x => x.DisplayOrder); - - return query.ToListCached(); - } - } + { + if (specificationAttributeOption == null) + throw new ArgumentNullException("specificationAttributeOption"); + + _specificationAttributeOptionRepository.Delete(specificationAttributeOption); + } + + public virtual void InsertSpecificationAttributeOption(SpecificationAttributeOption specificationAttributeOption) + { + if (specificationAttributeOption == null) + throw new ArgumentNullException("specificationAttributeOption"); + + _specificationAttributeOptionRepository.Insert(specificationAttributeOption); + } + + public virtual void UpdateSpecificationAttributeOption(SpecificationAttributeOption specificationAttributeOption) + { + if (specificationAttributeOption == null) + throw new ArgumentNullException("specificationAttributeOption"); + + _specificationAttributeOptionRepository.Update(specificationAttributeOption); + } + + #endregion + + #region Product specification attribute + + public virtual void DeleteProductSpecificationAttribute(ProductSpecificationAttribute productSpecificationAttribute) + { + if (productSpecificationAttribute == null) + throw new ArgumentNullException("productSpecificationAttribute"); + + _productSpecificationAttributeRepository.Delete(productSpecificationAttribute); + } + + public virtual IList GetProductSpecificationAttributesByProductId(int productId) + { + return GetProductSpecificationAttributesByProductId(productId, null, null); + } + + public virtual IList GetProductSpecificationAttributesByProductId(int productId, bool? allowFiltering, bool? showOnProductPage) + { + if (productId == 0) + { + return new List(); + } + + if (allowFiltering.HasValue || showOnProductPage.HasValue) + { + // Note: Join or Expand of SpecificationAttribute, both provides the same SQL. + var joinedQuery = + from psa in _productSpecificationAttributeRepository.Table + join sao in _specificationAttributeOptionRepository.Table on psa.SpecificationAttributeOptionId equals sao.Id + where psa.ProductId == productId + select new + { + ProductAttribute = psa, + Attribute = sao.SpecificationAttribute + }; + + if (allowFiltering.HasValue) + { + joinedQuery = joinedQuery.Where(x => + (x.ProductAttribute.AllowFiltering == null && x.Attribute.AllowFiltering == allowFiltering.Value) || + (x.ProductAttribute.AllowFiltering != null && x.ProductAttribute.AllowFiltering == allowFiltering.Value) + ); + } + + if (showOnProductPage.HasValue) + { + joinedQuery = joinedQuery.Where(x => + (x.ProductAttribute.ShowOnProductPage == null && x.Attribute.ShowOnProductPage == showOnProductPage.Value) || + (x.ProductAttribute.ShowOnProductPage != null && x.ProductAttribute.ShowOnProductPage == showOnProductPage.Value) + ); + } + + var query = joinedQuery.Select(x => x.ProductAttribute).OrderBy(x => x.DisplayOrder); + return query.ToListCached(); + } + else + { + var query = _productSpecificationAttributeRepository.Table + .Where(x => x.ProductId == productId) + .OrderBy(x => x.DisplayOrder); + + return query.ToListCached(); + } + } public virtual Multimap GetProductSpecificationAttributesByProductIds(int[] productIds) { @@ -244,30 +244,30 @@ public virtual Multimap GetProductSpecificat } public virtual ProductSpecificationAttribute GetProductSpecificationAttributeById(int productSpecificationAttributeId) - { - if (productSpecificationAttributeId == 0) - return null; + { + if (productSpecificationAttributeId == 0) + return null; - var productSpecificationAttribute = _productSpecificationAttributeRepository.GetById(productSpecificationAttributeId); - return productSpecificationAttribute; - } + var productSpecificationAttribute = _productSpecificationAttributeRepository.GetById(productSpecificationAttributeId); + return productSpecificationAttribute; + } - public virtual void InsertProductSpecificationAttribute(ProductSpecificationAttribute productSpecificationAttribute) - { - if (productSpecificationAttribute == null) - throw new ArgumentNullException("productSpecificationAttribute"); + public virtual void InsertProductSpecificationAttribute(ProductSpecificationAttribute productSpecificationAttribute) + { + if (productSpecificationAttribute == null) + throw new ArgumentNullException("productSpecificationAttribute"); - _productSpecificationAttributeRepository.Insert(productSpecificationAttribute); - } + _productSpecificationAttributeRepository.Insert(productSpecificationAttribute); + } - public virtual void UpdateProductSpecificationAttribute(ProductSpecificationAttribute productSpecificationAttribute) - { - if (productSpecificationAttribute == null) - throw new ArgumentNullException("productSpecificationAttribute"); + public virtual void UpdateProductSpecificationAttribute(ProductSpecificationAttribute productSpecificationAttribute) + { + if (productSpecificationAttribute == null) + throw new ArgumentNullException("productSpecificationAttribute"); - _productSpecificationAttributeRepository.Update(productSpecificationAttribute); - } + _productSpecificationAttributeRepository.Update(productSpecificationAttribute); + } - #endregion - } + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Catalog/TierPriceExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/TierPriceExtensions.cs index 4d9b2804c0..5e6ff6108f 100644 --- a/src/Libraries/SmartStore.Services/Catalog/TierPriceExtensions.cs +++ b/src/Libraries/SmartStore.Services/Catalog/TierPriceExtensions.cs @@ -11,19 +11,19 @@ namespace SmartStore.Services.Catalog /// public static class TierPriceExtensions { - /// - /// Filter tier prices by a store - /// - /// Tier prices - /// Store identifier - /// Filtered tier prices + /// + /// Filter tier prices by a store + /// + /// Tier prices + /// Store identifier + /// Filtered tier prices public static IEnumerable FilterByStore(this IEnumerable source, int storeId) - { - if (source == null) - throw new ArgumentNullException("source"); + { + if (source == null) + throw new ArgumentNullException("source"); return source.Where(x => x.StoreId == 0 || x.StoreId == storeId); - } + } /// /// Filter tier prices for a customer @@ -71,7 +71,7 @@ public static ICollection RemoveDuplicatedQuantities(this ICollection { if (source == null) throw new ArgumentNullException("source"); - + // Find duplicates var query = from tierPrice in source group tierPrice by tierPrice.Quantity into g @@ -83,7 +83,7 @@ where g.Count() > 1 var minTierPrice = item.TierPrices.Aggregate((tp1, tp2) => (tp1.Price < tp2.Price ? tp1 : tp2)); // Remove all other records item.TierPrices.Remove(minTierPrice); - item.TierPrices.ForEach(x=> source.Remove(x)); + item.TierPrices.ForEach(x => source.Remove(x)); } return source; diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs index cdb4b8d364..7344a6b0c6 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs @@ -16,32 +16,32 @@ namespace SmartStore.Services.Cms.Blocks { - public abstract class BlockHandlerBase : IBlockHandler where T : IBlock - { - public ICommonServices Services { get; set; } + public abstract class BlockHandlerBase : IBlockHandler where T : IBlock + { + public ICommonServices Services { get; set; } public ILogger Logger { get; set; } - public ILocalizedEntityService LocalizedEntityService { get; set; } + public ILocalizedEntityService LocalizedEntityService { get; set; } - public virtual T Create(IBlockEntity entity) - { - return Activator.CreateInstance(); - } + public virtual T Create(IBlockEntity entity) + { + return Activator.CreateInstance(); + } - public virtual T Load(IBlockEntity entity, StoryViewMode viewMode) - { - Guard.NotNull(entity, nameof(entity)); + public virtual T Load(IBlockEntity entity, StoryViewMode viewMode) + { + Guard.NotNull(entity, nameof(entity)); - var block = Create(entity); - var json = entity.Model; + var block = Create(entity); + var json = entity.Model; - if (json.IsEmpty()) - { - return block; - } + if (json.IsEmpty()) + { + return block; + } - JsonConvert.PopulateObject(json, block); + JsonConvert.PopulateObject(json, block); if (block is IBindableBlock bindableBlock) { @@ -50,32 +50,32 @@ public virtual T Load(IBlockEntity entity, StoryViewMode viewMode) } return block; - } + } - public virtual bool IsValid(T block) - { - return true; - } + public virtual bool IsValid(T block) + { + return true; + } - public virtual void Save(T block, IBlockEntity entity) - { - Guard.NotNull(entity, nameof(entity)); + public virtual void Save(T block, IBlockEntity entity) + { + Guard.NotNull(entity, nameof(entity)); - if (block == null) - { - return; - } + if (block == null) + { + return; + } - var settings = new JsonSerializerSettings - { + var settings = new JsonSerializerSettings + { ContractResolver = SmartContractResolver.Instance, TypeNameHandling = TypeNameHandling.Objects, - ReferenceLoopHandling = ReferenceLoopHandling.Ignore, - ObjectCreationHandling = ObjectCreationHandling.Replace, - NullValueHandling = NullValueHandling.Ignore - }; + ReferenceLoopHandling = ReferenceLoopHandling.Ignore, + ObjectCreationHandling = ObjectCreationHandling.Replace, + NullValueHandling = NullValueHandling.Ignore + }; - entity.Model = JsonConvert.SerializeObject(block, Formatting.None, settings); + entity.Model = JsonConvert.SerializeObject(block, Formatting.None, settings); // save BindEntintyName & BindEntintyId if (block is IBindableBlock bindableBlock) @@ -96,54 +96,54 @@ public virtual void BeforeRender(IBlockContainer container, StoryViewMode viewMo } public virtual string Clone(IBlockEntity sourceEntity, IBlockEntity clonedEntity) - { - return sourceEntity.Model; - } - - public void Render(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper) - { - RenderCore(element, templates, htmlHelper, htmlHelper.ViewContext.Writer); - } - - public IHtmlString ToHtmlString(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper) - { - using (var writer = new StringWriter(CultureInfo.CurrentCulture)) - { - RenderCore(element, templates, htmlHelper, writer); - return MvcHtmlString.Create(writer.ToString()); - } - } - - protected virtual void RenderCore(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper, TextWriter textWriter) - { - RenderByView(element, templates, htmlHelper, textWriter); - } - - protected void RenderByView(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper, TextWriter textWriter) - { - Guard.NotNull(element, nameof(element)); - Guard.NotNull(templates, nameof(templates)); - Guard.NotNull(htmlHelper, nameof(htmlHelper)); - Guard.NotNull(textWriter, nameof(textWriter)); - - var viewContext = htmlHelper.ViewContext; - - if (!element.Metadata.IsInbuilt) - { - // Change "area" token in RouteData in order to begin search in the plugin's view folder. - var originalRouteData = htmlHelper.ViewContext.RouteData; - var routeData = new RouteData(originalRouteData.Route, originalRouteData.RouteHandler); - routeData.Values.Merge(originalRouteData.Values); - routeData.DataTokens["area"] = element.Metadata.AreaName; - - viewContext = new ViewContext - { - RouteData = routeData, - RequestContext = htmlHelper.ViewContext.RequestContext - }; - } - - var viewResult = FindFirstView(element.Metadata, templates, viewContext, out var searchedLocations); + { + return sourceEntity.Model; + } + + public void Render(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper) + { + RenderCore(element, templates, htmlHelper, htmlHelper.ViewContext.Writer); + } + + public IHtmlString ToHtmlString(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper) + { + using (var writer = new StringWriter(CultureInfo.CurrentCulture)) + { + RenderCore(element, templates, htmlHelper, writer); + return MvcHtmlString.Create(writer.ToString()); + } + } + + protected virtual void RenderCore(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper, TextWriter textWriter) + { + RenderByView(element, templates, htmlHelper, textWriter); + } + + protected void RenderByView(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper, TextWriter textWriter) + { + Guard.NotNull(element, nameof(element)); + Guard.NotNull(templates, nameof(templates)); + Guard.NotNull(htmlHelper, nameof(htmlHelper)); + Guard.NotNull(textWriter, nameof(textWriter)); + + var viewContext = htmlHelper.ViewContext; + + if (!element.Metadata.IsInbuilt) + { + // Change "area" token in RouteData in order to begin search in the plugin's view folder. + var originalRouteData = htmlHelper.ViewContext.RouteData; + var routeData = new RouteData(originalRouteData.Route, originalRouteData.RouteHandler); + routeData.Values.Merge(originalRouteData.Values); + routeData.DataTokens["area"] = element.Metadata.AreaName; + + viewContext = new ViewContext + { + RouteData = routeData, + RequestContext = htmlHelper.ViewContext.RequestContext + }; + } + + var viewResult = FindFirstView(element.Metadata, templates, viewContext, out var searchedLocations); if (viewResult == null) { @@ -152,36 +152,36 @@ protected void RenderByView(IBlockContainer element, IEnumerable templat throw new FileNotFoundException(msg); } - var viewData = new ViewDataDictionary(element.Block); - viewData.TemplateInfo.HtmlFieldPrefix = "Block"; - - viewContext = new ViewContext( - htmlHelper.ViewContext, - viewResult.View, - viewData, - htmlHelper.ViewContext.TempData, - textWriter); - - viewResult.View.Render(viewContext, textWriter); - } - - private ViewEngineResult FindFirstView(IBlockMetadata blockMetadata, IEnumerable templates, ViewContext viewContext, out ICollection searchedLocations) - { - searchedLocations = new List(); - - foreach (var template in templates) - { - var viewName = string.Concat("BlockTemplates/", blockMetadata.SystemName, "/", template); - var viewResult = ViewEngines.Engines.FindPartialView(viewContext, viewName); - searchedLocations.AddRange(viewResult.SearchedLocations); - if (viewResult.View != null) - { - return viewResult; - } - } - - return null; - } + var viewData = new ViewDataDictionary(element.Block); + viewData.TemplateInfo.HtmlFieldPrefix = "Block"; + + viewContext = new ViewContext( + htmlHelper.ViewContext, + viewResult.View, + viewData, + htmlHelper.ViewContext.TempData, + textWriter); + + viewResult.View.Render(viewContext, textWriter); + } + + private ViewEngineResult FindFirstView(IBlockMetadata blockMetadata, IEnumerable templates, ViewContext viewContext, out ICollection searchedLocations) + { + searchedLocations = new List(); + + foreach (var template in templates) + { + var viewName = string.Concat("BlockTemplates/", blockMetadata.SystemName, "/", template); + var viewResult = ViewEngines.Engines.FindPartialView(viewContext, viewName); + searchedLocations.AddRange(viewResult.SearchedLocations); + if (viewResult.View != null) + { + return viewResult; + } + } + + return null; + } protected void RenderByChildAction(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper, TextWriter textWriter) { @@ -273,9 +273,10 @@ void endRender() #endregion - protected virtual RouteInfo GetRoute(IBlockContainer element, string template) - => throw new NotImplementedException(); - + protected virtual RouteInfo GetRoute(IBlockContainer element, string template) + { + throw new NotImplementedException(); + } class ActionInvokerWithResultValidator : AsyncControllerActionInvoker { diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockMetadata.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockMetadata.cs index ee65bc8ff5..3d62bf97ba 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockMetadata.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockMetadata.cs @@ -3,77 +3,77 @@ namespace SmartStore.Services.Cms.Blocks { - /// - /// Applies metadata to concrete block types which implement . - /// - [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] - public sealed class BlockAttribute : Attribute - { - public BlockAttribute(string systemName) - { - Guard.NotNull(systemName, nameof(systemName)); + /// + /// Applies metadata to concrete block types which implement . + /// + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public sealed class BlockAttribute : Attribute + { + public BlockAttribute(string systemName) + { + Guard.NotNull(systemName, nameof(systemName)); - SystemName = systemName; - } + SystemName = systemName; + } - /// - /// The block system name, e.g. 'html', 'picture' etc. - /// - public string SystemName { get; set; } + /// + /// The block system name, e.g. 'html', 'picture' etc. + /// + public string SystemName { get; set; } - /// - /// The english friendly name of the block - /// - public string FriendlyName { get; set; } + /// + /// The english friendly name of the block + /// + public string FriendlyName { get; set; } - /// - /// The icon class name of the block, e.g. 'fa fa-sitemap' - /// - public string Icon { get; set; } + /// + /// The icon class name of the block, e.g. 'fa fa-sitemap' + /// + public string Icon { get; set; } - /// - /// The order of display - /// - public int DisplayOrder { get; set; } + /// + /// The order of display + /// + public int DisplayOrder { get; set; } - public bool IsInternal { get; set; } - } + public bool IsInternal { get; set; } + } - /// - /// Represents block registration metadata - /// - public interface IBlockMetadata : IProviderMetadata - { - string AreaName { get; } - string Icon { get; } - bool IsInternal { get; } - bool IsInbuilt { get; } - Type BlockClrType { get; } - Type BlockHandlerClrType { get; } - } + /// + /// Represents block registration metadata + /// + public interface IBlockMetadata : IProviderMetadata + { + string AreaName { get; } + string Icon { get; } + bool IsInternal { get; } + bool IsInbuilt { get; } + Type BlockClrType { get; } + Type BlockHandlerClrType { get; } + } - public class BlockMetadata : IBlockMetadata, ICloneable - { - public string AreaName { get; set; } - public string SystemName { get; set; } - public string FriendlyName { get; set; } - public string Description { get; set; } - public string ResourceKeyPattern { get; set; } - public string Icon { get; set; } - public int DisplayOrder { get; set; } - public bool IsInternal { get; set; } - public bool IsInbuilt { get; set; } - public Type BlockClrType { get; set; } - public Type BlockHandlerClrType { get; set; } + public class BlockMetadata : IBlockMetadata, ICloneable + { + public string AreaName { get; set; } + public string SystemName { get; set; } + public string FriendlyName { get; set; } + public string Description { get; set; } + public string ResourceKeyPattern { get; set; } + public string Icon { get; set; } + public int DisplayOrder { get; set; } + public bool IsInternal { get; set; } + public bool IsInbuilt { get; set; } + public Type BlockClrType { get; set; } + public Type BlockHandlerClrType { get; set; } - public BlockMetadata Clone() - { - return (BlockMetadata)this.MemberwiseClone(); - } + public BlockMetadata Clone() + { + return (BlockMetadata)this.MemberwiseClone(); + } - object ICloneable.Clone() - { - return this.MemberwiseClone(); - } - } + object ICloneable.Clone() + { + return this.MemberwiseClone(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlock.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlock.cs index 3638b5e31c..94e3ffb4e3 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlock.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlock.cs @@ -3,15 +3,15 @@ namespace SmartStore.Services.Cms.Blocks { - /// - /// When implemented on types, makes the block bindable to - /// product, category and manufacturer entities. The UI will display a 'Data binding' - /// section which allows selection of an entity. - /// - /// - /// The handler for a bindable block type MUST implement . - /// - public interface IBindableBlock : IBlock + /// + /// When implemented on types, makes the block bindable to + /// product, category and manufacturer entities. The UI will display a 'Data binding' + /// section which allows selection of an entity. + /// + /// + /// The handler for a bindable block type MUST implement . + /// + public interface IBindableBlock : IBlock { /// /// The name of the bound entity, e.g. 'product'. @@ -32,22 +32,22 @@ public interface IBindableBlock : IBlock /// bool CanBind { get; } - /// - /// Returns a value to indicate whether the binding source () has been loaded from the store already. - /// - bool IsLoaded { get; } + /// + /// Returns a value to indicate whether the binding source () has been loaded from the store already. + /// + bool IsLoaded { get; } /// /// The data item of the bound entity. /// IDictionary DataItem { get; set; } - /// - /// Returns a value to indicate whether the block has been bound already. - /// A block is considered bound if the binding source dictionary has been - /// applied to the block instance's bindable properties. - /// - bool IsBound { get; set; } + /// + /// Returns a value to indicate whether the block has been bound already. + /// A block is considered bound if the binding source dictionary has been + /// applied to the block instance's bindable properties. + /// + bool IsBound { get; set; } /// /// Resets the data item of the bound entity. After calling this method, @@ -62,19 +62,10 @@ public abstract class BindableBlockBase : IBindableBlock public virtual int? BindEntityId { get; set; } [JsonIgnore] - public bool CanBind - { - get - { - return BindEntityName.HasValue() && BindEntityId.HasValue; - } - } + public bool CanBind => BindEntityName.HasValue() && BindEntityId.HasValue; [JsonIgnore] - public bool IsLoaded - { - get { return DataItem != null; } - } + public bool IsLoaded => DataItem != null; [JsonIgnore] public IDictionary DataItem { get; set; } diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs index 0658902f37..0e15cb8771 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs @@ -5,51 +5,51 @@ namespace SmartStore.Services.Cms.Blocks { - /// - /// Retrieves information about UI mapping between template tokens and form controls. - /// - /// - /// only works in conjunction with . - /// Make sure that the handled block type implements . - /// - public interface IBindableBlockHandler : IBlockHandler + /// + /// Retrieves information about UI mapping between template tokens and form controls. + /// + /// + /// only works in conjunction with . + /// Make sure that the handled block type implements . + /// + public interface IBindableBlockHandler : IBlockHandler { - /// - /// Build and returns the template mapping configuration. - /// - /// - TemplateMappingConfiguration GetMappingConfiguration(); - } + /// + /// Build and returns the template mapping configuration. + /// + /// + TemplateMappingConfiguration GetMappingConfiguration(); + } - /// - /// Contans information about UI mapping between template tokens and form controls. - /// - public class TemplateMappingConfiguration + /// + /// Contans information about UI mapping between template tokens and form controls. + /// + public class TemplateMappingConfiguration { - /// - /// A list of template tokens and their corresponding form controls. - /// - public IList Map { get; set; } + /// + /// A list of template tokens and their corresponding form controls. + /// + public IList Map { get; set; } - /// - /// The complete list of field names which can be bound to entity fields. - /// + /// + /// The complete list of field names which can be bound to entity fields. + /// public string[] BindableFields { get; set; } } - /// - /// Block data binding mapping definition for a single field. - /// + /// + /// Block data binding mapping definition for a single field. + /// public class TemplateMapping { - /// - /// Name of the bound field, e.g. 'Title', 'Description', 'Price' etc. - /// - public string FieldName { get; set; } + /// + /// Name of the bound field, e.g. 'Title', 'Description', 'Price' etc. + /// + public string FieldName { get; set; } - /// - /// The 'Liquid' template - /// + /// + /// The 'Liquid' template + /// public string Template { get; set; } } } diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlock.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlock.cs index 5f08fb785d..4560ff9cff 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlock.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlock.cs @@ -3,11 +3,11 @@ namespace SmartStore.Services.Cms.Blocks { - /// - /// Marker interface for a PageBuilder block implementation. - /// Blocks are handled by corresponding implementations. - /// - public interface IBlock - { - } + /// + /// Marker interface for a PageBuilder block implementation. + /// Blocks are handled by corresponding implementations. + /// + public interface IBlock + { + } } diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockContainer.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockContainer.cs index 9f5e50c931..a88a386a85 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockContainer.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockContainer.cs @@ -2,50 +2,50 @@ namespace SmartStore.Services.Cms.Blocks { - /// - /// Contains base data for a block instance. - /// - public interface IBlockContainer - { - /// - /// The type of the block, e.g. 'html'. - /// - string BlockType { get; } - - /// - /// The actual block instance. - /// - IBlock Block { get; } - - /// - /// The block metadata. - /// - IBlockMetadata Metadata { get; } - - /// - /// The block title / display name. - /// - string Title { get; } - - /// - /// Whether the block's text content color should be inversed so - /// that it gets readable on dark backgrounds. - /// - bool IsInversed { get; } - - /// - /// The block html id. - /// - string HtmlId { get; } - - /// - /// The block css class name(s). - /// - string CssClass { get; } - - /// - /// The block css style expression. - /// - string CssStyle { get; } - } + /// + /// Contains base data for a block instance. + /// + public interface IBlockContainer + { + /// + /// The type of the block, e.g. 'html'. + /// + string BlockType { get; } + + /// + /// The actual block instance. + /// + IBlock Block { get; } + + /// + /// The block metadata. + /// + IBlockMetadata Metadata { get; } + + /// + /// The block title / display name. + /// + string Title { get; } + + /// + /// Whether the block's text content color should be inversed so + /// that it gets readable on dark backgrounds. + /// + bool IsInversed { get; } + + /// + /// The block html id. + /// + string HtmlId { get; } + + /// + /// The block css class name(s). + /// + string CssClass { get; } + + /// + /// The block css style expression. + /// + string CssStyle { get; } + } } diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockEntity.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockEntity.cs index 100f78e138..63dfdf82b3 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockEntity.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockEntity.cs @@ -2,20 +2,20 @@ namespace SmartStore.Services.Cms.Blocks { - /// - /// Represents a block instance's storage data. - /// - public interface IBlockEntity - { - int Id { get; set; } - int StoryId { get; } - string BlockType { get; set; } - string Model { get; set; } - string TagLine { get; set; } - string Title { get; set; } - string SubTitle { get; set; } - string Body { get; set; } - string Template { get; set; } + /// + /// Represents a block instance's storage data. + /// + public interface IBlockEntity + { + int Id { get; set; } + int StoryId { get; } + string BlockType { get; set; } + string Model { get; set; } + string TagLine { get; set; } + string Title { get; set; } + string SubTitle { get; set; } + string Body { get; set; } + string Template { get; set; } string Custom1 { get; set; } string Custom2 { get; set; } string Custom3 { get; set; } diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs index af65cfc4d4..58d74e18ec 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs @@ -5,104 +5,104 @@ namespace SmartStore.Services.Cms.Blocks { - /// - /// Indicates the view mode of a PageBuilder block. - /// - public enum StoryViewMode - { - /// - /// Final rendering result in public frontend - /// - Public, - /// - /// Preview mode in backend - /// - Preview, - /// - /// Visual block editing in backend's story editor - /// - GridEdit, - /// - /// Property dialog in backend - /// - Edit - } + /// + /// Indicates the view mode of a PageBuilder block. + /// + public enum StoryViewMode + { + /// + /// Final rendering result in public frontend + /// + Public, + /// + /// Preview mode in backend + /// + Preview, + /// + /// Visual block editing in backend's story editor + /// + GridEdit, + /// + /// Property dialog in backend + /// + Edit + } - public interface IBlockHtmlParts - { - void AddCssClass(string value); - void AddHtmlAttribute(string name, object value); - } + public interface IBlockHtmlParts + { + void AddCssClass(string value); + void AddHtmlAttribute(string name, object value); + } - /// - /// Handles rendering of corresponding implementations. - /// - public interface IBlockHandler - { - /// - /// Called when the block is about to be rendered. Gives you the chance to add css classes or html attributes to the root element. - /// - /// The block instance wrapper / model. - /// The stories current view mode. - /// Allows adding classes or attributes. - void BeforeRender(IBlockContainer container, StoryViewMode viewMode, IBlockHtmlParts htmlParts); + /// + /// Handles rendering of corresponding implementations. + /// + public interface IBlockHandler + { + /// + /// Called when the block is about to be rendered. Gives you the chance to add css classes or html attributes to the root element. + /// + /// The block instance wrapper / model. + /// The stories current view mode. + /// Allows adding classes or attributes. + void BeforeRender(IBlockContainer container, StoryViewMode viewMode, IBlockHtmlParts htmlParts); - /// - /// Renders the block result. - /// - /// The block element to render. - /// A list of template names. The first valid template will be used for rendering. - /// Html helper instance. - void Render(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHeper); + /// + /// Renders the block result. + /// + /// The block element to render. + /// A list of template names. The first valid template will be used for rendering. + /// Html helper instance. + void Render(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHeper); - /// - /// Called after the entity has been saved to the database to perform operations which require an entity id (e.g. localization stuff). - /// - /// The block instance wrapper / model. - /// - /// The corresponding entity record for the block. - /// - void AfterSave(IBlockContainer container, IBlockEntity entity); + /// + /// Called after the entity has been saved to the database to perform operations which require an entity id (e.g. localization stuff). + /// + /// The block instance wrapper / model. + /// + /// The corresponding entity record for the block. + /// + void AfterSave(IBlockContainer container, IBlockEntity entity); - /// - /// Clones . In most cases it is sufficient to directly return the serialized model, but there may be cases - /// where the inner data must be cloned first, e.g. if it contains a picture reference. - /// - /// The source entity. - /// The target entity clone which is about to be saved in the data storage. - /// The serialized block clone. - string Clone(IBlockEntity sourceEntity, IBlockEntity clonedEntity); + /// + /// Clones . In most cases it is sufficient to directly return the serialized model, but there may be cases + /// where the inner data must be cloned first, e.g. if it contains a picture reference. + /// + /// The source entity. + /// The target entity clone which is about to be saved in the data storage. + /// The serialized block clone. + string Clone(IBlockEntity sourceEntity, IBlockEntity clonedEntity); - /// - /// returns the block's render result as string. - /// - /// The block element to render. - /// A list of valid template names. The first valid template will be used for rendering. - /// Html helper instance. - IHtmlString ToHtmlString(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper); - } + /// + /// returns the block's render result as string. + /// + /// The block element to render. + /// A list of valid template names. The first valid template will be used for rendering. + /// Html helper instance. + IHtmlString ToHtmlString(IBlockContainer element, IEnumerable templates, HtmlHelper htmlHelper); + } - /// - /// Handles loading, saving and rendering of corresponding implementations. - /// - public interface IBlockHandler : IBlockHandler where T : IBlock - { - /// - /// Creates the implementation instance for the passed block entity. - /// - /// The serialized entity to create a block instance for. - /// A concrete block implementation instance. - T Create(IBlockEntity entity); + /// + /// Handles loading, saving and rendering of corresponding implementations. + /// + public interface IBlockHandler : IBlockHandler where T : IBlock + { + /// + /// Creates the implementation instance for the passed block entity. + /// + /// The serialized entity to create a block instance for. + /// A concrete block implementation instance. + T Create(IBlockEntity entity); - /// - /// Creates and loads the implementation instance for the passed block entity and view mode. - /// - /// The serialized entity to load a block instance for. - /// Depending on view mode, some data may be loaded or not. - /// A concrete block implementation instance. - T Load(IBlockEntity entity, StoryViewMode viewMode); + /// + /// Creates and loads the implementation instance for the passed block entity and view mode. + /// + /// The serialized entity to load a block instance for. + /// Depending on view mode, some data may be loaded or not. + /// A concrete block implementation instance. + T Load(IBlockEntity entity, StoryViewMode viewMode); - bool IsValid(T block); + bool IsValid(T block); /// /// Serializes the passed block instance and saves the result in the property. @@ -113,5 +113,5 @@ public interface IBlockHandler : IBlockHandler where T : IBlock /// be converted to JSON and assigned to property, which then will be saved in the data storage. /// void Save(T block, IBlockEntity entity); - } + } } diff --git a/src/Libraries/SmartStore.Services/Cms/ILinkResolver.cs b/src/Libraries/SmartStore.Services/Cms/ILinkResolver.cs index 0a98489d7e..e3b14ebbae 100644 --- a/src/Libraries/SmartStore.Services/Cms/ILinkResolver.cs +++ b/src/Libraries/SmartStore.Services/Cms/ILinkResolver.cs @@ -8,18 +8,18 @@ namespace SmartStore.Services.Cms /// public partial interface ILinkResolver { - /// - /// Resolves a link expression. - /// - /// - /// Link expression, e.g. product:123, category:234, topic:2, topic:aboutus etc. - /// Supported entities are product, category, manufacturer and topic. Value of topic can - /// either be the topic id or system name. - /// - /// Customer roles to check access for. null to use current customer's roles. - /// Language identifier. 0 to use current working language. - /// Store identifier. 0 to use current store. - /// LinkResolverResult - LinkResolverResult Resolve(string linkExpression, IEnumerable roles = null, int languageId = 0, int storeId = 0); + /// + /// Resolves a link expression. + /// + /// + /// Link expression, e.g. product:123, category:234, topic:2, topic:aboutus etc. + /// Supported entities are product, category, manufacturer and topic. Value of topic can + /// either be the topic id or system name. + /// + /// Customer roles to check access for. null to use current customer's roles. + /// Language identifier. 0 to use current working language. + /// Store identifier. 0 to use current store. + /// LinkResolverResult + LinkResolverResult Resolve(string linkExpression, IEnumerable roles = null, int languageId = 0, int storeId = 0); } } diff --git a/src/Libraries/SmartStore.Services/Cms/IWidgetService.cs b/src/Libraries/SmartStore.Services/Cms/IWidgetService.cs index 8e4faf8bb5..d23e345b7b 100644 --- a/src/Libraries/SmartStore.Services/Cms/IWidgetService.cs +++ b/src/Libraries/SmartStore.Services/Cms/IWidgetService.cs @@ -15,14 +15,14 @@ public partial interface IWidgetService /// Widgets IEnumerable> LoadActiveWidgets(int storeId = 0); - + /// /// Load active widgets /// /// Widget zone - /// Load records allows only in specified store; pass 0 to load all records + /// Load records allows only in specified store; pass 0 to load all records /// Widgets - IEnumerable> LoadActiveWidgetsByWidgetZone(string widgetZone, int storeId = 0); + IEnumerable> LoadActiveWidgetsByWidgetZone(string widgetZone, int storeId = 0); /// /// Load widget by system name diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs index 852e79282c..bbd9953992 100644 --- a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs +++ b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs @@ -20,18 +20,18 @@ namespace SmartStore.Services.Cms { public partial class LinkResolver : ILinkResolver { - /// - /// {0} : Expression w/o q - /// {1} : LanguageId - /// {2} : Store - /// {3} : RolesIdent - /// - internal const string LINKRESOLVER_KEY = "linkresolver:{0}-{1}-{2}-{3}"; - - // 0: Expression - internal const string LINKRESOLVER_PATTERN_KEY = "linkresolver:{0}-*"; - - protected readonly ICommonServices _services; + /// + /// {0} : Expression w/o q + /// {1} : LanguageId + /// {2} : Store + /// {3} : RolesIdent + /// + internal const string LINKRESOLVER_KEY = "linkresolver:{0}-{1}-{2}-{3}"; + + // 0: Expression + internal const string LINKRESOLVER_PATTERN_KEY = "linkresolver:{0}-*"; + + protected readonly ICommonServices _services; protected readonly IUrlRecordService _urlRecordService; protected readonly ILocalizedEntityService _localizedEntityService; protected readonly IAclService _aclService; @@ -63,12 +63,12 @@ public LinkResolver( public virtual LinkResolverResult Resolve(string linkExpression, IEnumerable roles = null, int languageId = 0, int storeId = 0) { - if (linkExpression.IsEmpty()) - { - return new LinkResolverResult { Type = LinkType.Url, Status = LinkStatus.NotFound }; - } + if (linkExpression.IsEmpty()) + { + return new LinkResolverResult { Type = LinkType.Url, Status = LinkStatus.NotFound }; + } - if (roles == null) + if (roles == null) { roles = _services.WorkContext.CurrentCustomer.CustomerRoleMappings.Select(x => x.CustomerRole); } @@ -83,78 +83,78 @@ public virtual LinkResolverResult Resolve(string linkExpression, IEnumerable x.Active).Select(x => x.Id))); - - d = _services.Cache.Get(cacheKey, () => - { - var d2 = d.Clone(); - - switch (d2.Type) - { - case LinkType.Product: - GetEntityData(d2, storeId, languageId, x => new ResolverEntitySummary - { - Name = x.Name, - Published = x.Published, - Deleted = x.Deleted, - SubjectToAcl = x.SubjectToAcl, - LimitedToStores = x.LimitedToStores, + if (d.Type == LinkType.Url) + { + var url = d.Value.ToString(); + if (url.EmptyNull().StartsWith("~")) + { + url = VirtualPathUtility.ToAbsolute(url); + } + d.Link = d.Label = url; + } + else if (d.Type == LinkType.File) + { + d.Link = d.Label = d.Value.ToString(); + } + else + { + var cacheKey = LINKRESOLVER_KEY.FormatInvariant( + d.Expression.EmptyNull().ToLower(), + languageId, + storeId, + string.Join(",", roles.Where(x => x.Active).Select(x => x.Id))); + + d = _services.Cache.Get(cacheKey, () => + { + var d2 = d.Clone(); + + switch (d2.Type) + { + case LinkType.Product: + GetEntityData(d2, storeId, languageId, x => new ResolverEntitySummary + { + Name = x.Name, + Published = x.Published, + Deleted = x.Deleted, + SubjectToAcl = x.SubjectToAcl, + LimitedToStores = x.LimitedToStores, PictureId = x.MainPictureId - }); - break; - case LinkType.Category: - GetEntityData(d2, storeId, languageId, x => new ResolverEntitySummary - { - Name = x.Name, + }); + break; + case LinkType.Category: + GetEntityData(d2, storeId, languageId, x => new ResolverEntitySummary + { + Name = x.Name, Published = x.Published, - Deleted = x.Deleted, - SubjectToAcl = x.SubjectToAcl, - LimitedToStores = x.LimitedToStores, + Deleted = x.Deleted, + SubjectToAcl = x.SubjectToAcl, + LimitedToStores = x.LimitedToStores, PictureId = x.MediaFileId - }); - break; - case LinkType.Manufacturer: - GetEntityData(d2, storeId, languageId, x => new ResolverEntitySummary - { - Name = x.Name, + }); + break; + case LinkType.Manufacturer: + GetEntityData(d2, storeId, languageId, x => new ResolverEntitySummary + { + Name = x.Name, Published = x.Published, - Deleted = x.Deleted, - LimitedToStores = x.LimitedToStores, + Deleted = x.Deleted, + LimitedToStores = x.LimitedToStores, PictureId = x.MediaFileId - }); - break; - case LinkType.Topic: - GetEntityData(d2, storeId, languageId, x => null); - break; - default: - throw new SmartException("Unknown link builder type."); - } - - return d2; - }); - } + }); + break; + case LinkType.Topic: + GetEntityData(d2, storeId, languageId, x => null); + break; + default: + throw new SmartException("Unknown link builder type."); + } + + return d2; + }); + } var result = new LinkResolverResult { @@ -177,17 +177,17 @@ public virtual LinkResolverResult Resolve(string linkExpression, IEnumerable -1) - { - type = expression.Substring(0, colonIndex); - if (type.StartsWith("http", StringComparison.OrdinalIgnoreCase)) - { - type = null; - colonIndex = -1; - } - } - - path = expression.Substring(colonIndex + 1); - - var qmIndex = path.IndexOf('?'); - if (qmIndex > -1) - { - query = path.Substring(qmIndex + 1); - path = path.Substring(0, qmIndex); - } - - return true; - } + { + type = null; + path = null; + query = null; + + if (string.IsNullOrWhiteSpace(expression)) + { + return false; + } + + var colonIndex = expression.IndexOf(':'); + if (colonIndex > -1) + { + type = expression.Substring(0, colonIndex); + if (type.StartsWith("http", StringComparison.OrdinalIgnoreCase)) + { + type = null; + colonIndex = -1; + } + } + + path = expression.Substring(colonIndex + 1); + + var qmIndex = path.IndexOf('?'); + if (qmIndex > -1) + { + query = path.Substring(qmIndex + 1); + path = path.Substring(0, qmIndex); + } + + return true; + } protected virtual string GetLocalized(int entityId, string localeKeyGroup, string localeKey, int languageId, string defaultValue) { @@ -240,46 +240,46 @@ protected virtual string GetLocalized(int entityId, string localeKeyGroup, strin protected virtual LinkResolverData Parse(string linkExpression) { - if (TokenizeExpression(linkExpression, out var type, out var path, out var query)) - { - if (!string.IsNullOrWhiteSpace(type) && Enum.TryParse(type, true, out LinkType linkType)) - { - var result = new LinkResolverData { Type = linkType, Expression = string.Concat(type, ":", path) }; - - switch (linkType) - { - case LinkType.Product: - case LinkType.Category: - case LinkType.Manufacturer: - case LinkType.Topic: - if (int.TryParse(path, out var id)) - { - // Reduce thrown exceptions in console - result.Value = id; - } - else - { - result.Value = path; - } - - result.QueryString = query; - break; - case LinkType.Url: - result.Value = path + (query.HasValue() ? "?" + query : ""); - break; - case LinkType.File: - result.Value = path; - result.QueryString = query; - break; - default: - throw new SmartException("Unknown link builder type."); - } - - return result; - } - } - - return new LinkResolverData { Type = LinkType.Url, Value = linkExpression.EmptyNull() }; + if (TokenizeExpression(linkExpression, out var type, out var path, out var query)) + { + if (!string.IsNullOrWhiteSpace(type) && Enum.TryParse(type, true, out LinkType linkType)) + { + var result = new LinkResolverData { Type = linkType, Expression = string.Concat(type, ":", path) }; + + switch (linkType) + { + case LinkType.Product: + case LinkType.Category: + case LinkType.Manufacturer: + case LinkType.Topic: + if (int.TryParse(path, out var id)) + { + // Reduce thrown exceptions in console + result.Value = id; + } + else + { + result.Value = path; + } + + result.QueryString = query; + break; + case LinkType.Url: + result.Value = path + (query.HasValue() ? "?" + query : ""); + break; + case LinkType.File: + result.Value = path; + result.QueryString = query; + break; + default: + throw new SmartException("Unknown link builder type."); + } + + return result; + } + } + + return new LinkResolverData { Type = LinkType.Url, Value = linkExpression.EmptyNull() }; } internal void GetEntityData( @@ -351,7 +351,7 @@ internal void GetEntityData( data.Status = summary.Deleted ? LinkStatus.NotFound : summary.Published ? LinkStatus.Ok : LinkStatus.Hidden; - + if (data.Type == LinkType.Topic) { data.Label = GetLocalized(data.Id, entityName, nameof(Topic.ShortTitle), languageId, null) diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolverInvalidator.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolverInvalidator.cs index 826bd143c9..aba228ccff 100644 --- a/src/Libraries/SmartStore.Services/Cms/LinkResolverInvalidator.cs +++ b/src/Libraries/SmartStore.Services/Cms/LinkResolverInvalidator.cs @@ -12,18 +12,18 @@ namespace SmartStore.Services.Cms { - public partial class LinkResolverInvalidator : DbSaveHook - { - private readonly ICommonServices _services; + public partial class LinkResolverInvalidator : DbSaveHook + { + private readonly ICommonServices _services; - private static readonly HashSet _toxicProps = new HashSet - { - nameof(Topic.SystemName), - nameof(Topic.IsPublished), - nameof(Topic.SubjectToAcl), - nameof(Topic.LimitedToStores), - nameof(Topic.Title), - nameof(Topic.ShortTitle), + private static readonly HashSet _toxicProps = new HashSet + { + nameof(Topic.SystemName), + nameof(Topic.IsPublished), + nameof(Topic.SubjectToAcl), + nameof(Topic.LimitedToStores), + nameof(Topic.Title), + nameof(Topic.ShortTitle), nameof(Topic.Intro), nameof(Product.Name), nameof(Product.Deleted), @@ -31,68 +31,68 @@ public partial class LinkResolverInvalidator : DbSaveHook nameof(Category.Published), nameof(Category.MediaFileId), nameof(StoreMapping.StoreId), - nameof(UrlRecord.IsActive), - nameof(UrlRecord.Slug) - }; + nameof(UrlRecord.IsActive), + nameof(UrlRecord.Slug) + }; - public LinkResolverInvalidator(ICommonServices services) - { - _services = services; - } + public LinkResolverInvalidator(ICommonServices services) + { + _services = services; + } - public override void OnBeforeSave(IHookedEntity entry) - { - var cache = _services.Cache; - var e = entry.Entity; + public override void OnBeforeSave(IHookedEntity entry) + { + var cache = _services.Cache; + var e = entry.Entity; - var evict = e is Topic || e is Product || e is Category || e is Manufacturer || e is StoreMapping || e is UrlRecord; - if (!evict) - throw new NotSupportedException(); // Perf + var evict = e is Topic || e is Product || e is Category || e is Manufacturer || e is StoreMapping || e is UrlRecord; + if (!evict) + throw new NotSupportedException(); // Perf - if (evict && entry.InitialState == EntityState.Modified) - { - var modProps = entry.Entry.GetModifiedProperties(_services.DbContext); - evict = modProps.Keys.Any(x => _toxicProps.Contains(x)); - } + if (evict && entry.InitialState == EntityState.Modified) + { + var modProps = entry.Entry.GetModifiedProperties(_services.DbContext); + evict = modProps.Keys.Any(x => _toxicProps.Contains(x)); + } - if (!evict) - return; + if (!evict) + return; - int? evictTopicId = null; + int? evictTopicId = null; - if (e is Topic t) - { - cache.RemoveByPattern(BuildPatternKey("topic", t.Id)); - cache.RemoveByPattern(BuildPatternKey("topic", t.SystemName)); - } - else if (e is Category || e is Product || e is Manufacturer) - { - cache.RemoveByPattern(BuildPatternKey(e.GetEntityName().ToLowerInvariant(), e.Id)); - } - else if (e is UrlRecord ur) - { - cache.RemoveByPattern(BuildPatternKey(ur.EntityName.ToLowerInvariant(), ur.EntityId)); - evictTopicId = ur.EntityId; - } - else if (e is StoreMapping sm) - { - cache.RemoveByPattern(BuildPatternKey(sm.EntityName.ToLowerInvariant(), sm.EntityId)); - evictTopicId = sm.EntityId; - } + if (e is Topic t) + { + cache.RemoveByPattern(BuildPatternKey("topic", t.Id)); + cache.RemoveByPattern(BuildPatternKey("topic", t.SystemName)); + } + else if (e is Category || e is Product || e is Manufacturer) + { + cache.RemoveByPattern(BuildPatternKey(e.GetEntityName().ToLowerInvariant(), e.Id)); + } + else if (e is UrlRecord ur) + { + cache.RemoveByPattern(BuildPatternKey(ur.EntityName.ToLowerInvariant(), ur.EntityId)); + evictTopicId = ur.EntityId; + } + else if (e is StoreMapping sm) + { + cache.RemoveByPattern(BuildPatternKey(sm.EntityName.ToLowerInvariant(), sm.EntityId)); + evictTopicId = sm.EntityId; + } - if (evictTopicId.HasValue) - { - var systemName = _services.DbContext.Set().Where(x => x.Id == evictTopicId.Value).Select(x => x.SystemName).FirstOrDefault(); - if (systemName.HasValue()) - { - cache.RemoveByPattern(BuildPatternKey("topic", systemName)); - } - } - } + if (evictTopicId.HasValue) + { + var systemName = _services.DbContext.Set().Where(x => x.Id == evictTopicId.Value).Select(x => x.SystemName).FirstOrDefault(); + if (systemName.HasValue()) + { + cache.RemoveByPattern(BuildPatternKey("topic", systemName)); + } + } + } - private string BuildPatternKey(string entityName, object ident) - { - return LinkResolver.LINKRESOLVER_PATTERN_KEY.FormatInvariant(String.Concat(entityName, ":", ident)); - } - } + private string BuildPatternKey(string entityName, object ident) + { + return LinkResolver.LINKRESOLVER_PATTERN_KEY.FormatInvariant(String.Concat(entityName, ":", ident)); + } + } } diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs index 71002103a9..fcebcef712 100644 --- a/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs +++ b/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs @@ -15,8 +15,8 @@ public enum LinkType public enum LinkStatus { Ok, - Forbidden, - NotFound, + Forbidden, + NotFound, Hidden } @@ -24,17 +24,17 @@ public class LinkResolverResult { private string _link; - /// - /// The raw expression without query string. - /// - public string Expression { get; set; } + /// + /// The raw expression without query string. + /// + public string Expression { get; set; } - /// - /// The query string part. - /// - public string QueryString { get; set; } + /// + /// The query string part. + /// + public string QueryString { get; set; } - public LinkType Type { get; set; } + public LinkType Type { get; set; } public object Value { get; set; } public LinkStatus Status { get; set; } @@ -71,10 +71,10 @@ public string Link } public override string ToString() - { - return this.Link.EmptyNull(); - } - } + { + return this.Link.EmptyNull(); + } + } [Serializable] public partial class LinkResolverData : LinkResolverResult, ICloneable @@ -84,15 +84,15 @@ public partial class LinkResolverData : LinkResolverResult, ICloneableMenu entities. IPagedList GetAllMenus( string systemName = null, - int storeId = 0, + int storeId = 0, bool includeHidden = false, int pageIndex = 0, int pageSize = int.MaxValue); diff --git a/src/Libraries/SmartStore.Services/Cms/Menus/MenuStorage.cs b/src/Libraries/SmartStore.Services/Cms/Menus/MenuStorage.cs index 93bc1a9c84..748535a4f4 100644 --- a/src/Libraries/SmartStore.Services/Cms/Menus/MenuStorage.cs +++ b/src/Libraries/SmartStore.Services/Cms/Menus/MenuStorage.cs @@ -190,7 +190,7 @@ public virtual bool MenuExists(string systemName) return false; } - return GetMenuSystemNames(true).Contains(systemName); + return GetMenuSystemNames(true).Contains(systemName); } #region Menu items @@ -207,8 +207,8 @@ public virtual void InsertMenuItem(MenuItemRecord item) _menuItemRepository.Insert(item); - _services.Cache.RemoveByPattern(MENU_PATTERN_KEY); - } + _services.Cache.RemoveByPattern(MENU_PATTERN_KEY); + } public virtual void UpdateMenuItem(MenuItemRecord item) { @@ -222,8 +222,8 @@ public virtual void UpdateMenuItem(MenuItemRecord item) _menuItemRepository.Update(item); - _services.Cache.RemoveByPattern(MENU_PATTERN_KEY); - } + _services.Cache.RemoveByPattern(MENU_PATTERN_KEY); + } public virtual void DeleteMenuItem(MenuItemRecord item, bool deleteChilds = true) { @@ -236,21 +236,21 @@ public virtual void DeleteMenuItem(MenuItemRecord item, bool deleteChilds = true { _menuItemRepository.Delete(item); } - else - { - var ids = new HashSet { item.Id }; - GetChildIds(item.Id, ids); + else + { + var ids = new HashSet { item.Id }; + GetChildIds(item.Id, ids); - foreach (var chunk in ids.Slice(200)) - { - var items = _menuItemRepository.Table.Where(x => chunk.Contains(x.Id)).ToList(); - _menuItemRepository.DeleteRange(items); - } - } + foreach (var chunk in ids.Slice(200)) + { + var items = _menuItemRepository.Table.Where(x => chunk.Contains(x.Id)).ToList(); + _menuItemRepository.DeleteRange(items); + } + } - _services.Cache.RemoveByPattern(MENU_PATTERN_KEY); + _services.Cache.RemoveByPattern(MENU_PATTERN_KEY); - void GetChildIds(int parentId, HashSet ids) + void GetChildIds(int parentId, HashSet ids) { var childIds = _menuItemRepository.TableUntracked .Where(x => x.ParentItemId == parentId) @@ -302,22 +302,22 @@ public virtual IList GetMenuItems(string systemName, int storeId #region Utilities private ISet GetMenuSystemNames(bool ensureCreated) - { - if (ensureCreated || _services.Cache.Contains(MENU_ALLSYSTEMNAMES_CACHE_KEY)) - { - return _services.Cache.GetHashSet(MENU_ALLSYSTEMNAMES_CACHE_KEY, () => - { - return _menuRepository.TableUntracked - .Where(x => x.Published) + { + if (ensureCreated || _services.Cache.Contains(MENU_ALLSYSTEMNAMES_CACHE_KEY)) + { + return _services.Cache.GetHashSet(MENU_ALLSYSTEMNAMES_CACHE_KEY, () => + { + return _menuRepository.TableUntracked + .Where(x => x.Published) .OrderByDescending(x => x.IsSystemMenu) .ThenBy(x => x.Id) - .Select(x => x.SystemName) - .ToArray(); - }); - } + .Select(x => x.SystemName) + .ToArray(); + }); + } - return null; - } + return null; + } protected virtual IQueryable BuildMenuQuery( int id, @@ -352,7 +352,7 @@ protected virtual IQueryable BuildMenuQuery( if (storeId > 0 && !QuerySettings.IgnoreMultiStore) { - query = + query = from x in query join m in _storeMappingRepository.Table on new { x1 = x.Id, x2 = entityName } equals new { x1 = m.EntityId, x2 = m.EntityName } into sm @@ -367,7 +367,7 @@ from m in sm.DefaultIfEmpty() { var allowedRoleIds = _services.WorkContext.CurrentCustomer.GetRoleIds(); - query = + query = from x in query join a in _aclRepository.Table on new { x1 = x.Id, x2 = entityName } equals new { x1 = a.EntityId, x2 = a.EntityName } into ac @@ -380,7 +380,7 @@ from a in ac.DefaultIfEmpty() if (applied && groupBy) { - query = + query = from x in query group x by x.Id into grp orderby grp.Key diff --git a/src/Libraries/SmartStore.Services/Cms/WidgetExtensions.cs b/src/Libraries/SmartStore.Services/Cms/WidgetExtensions.cs index 9e435b04d4..d5f860f1a2 100644 --- a/src/Libraries/SmartStore.Services/Cms/WidgetExtensions.cs +++ b/src/Libraries/SmartStore.Services/Cms/WidgetExtensions.cs @@ -3,28 +3,28 @@ using SmartStore.Core.Domain.Cms; using SmartStore.Core.Plugins; -namespace SmartStore.Services.Cms +namespace SmartStore.Services.Cms { public static class WidgetExtensions { public static bool IsWidgetActive(this Provider widget, WidgetSettings widgetSettings) { - Guard.NotNull(widget, nameof(widget)); + Guard.NotNull(widget, nameof(widget)); - return widget.ToLazy().IsWidgetActive(widgetSettings); + return widget.ToLazy().IsWidgetActive(widgetSettings); } - public static bool IsWidgetActive(this Lazy widget, WidgetSettings widgetSettings) - { - Guard.NotNull(widget, nameof(widget)); - Guard.NotNull(widgetSettings, nameof(widgetSettings)); + public static bool IsWidgetActive(this Lazy widget, WidgetSettings widgetSettings) + { + Guard.NotNull(widget, nameof(widget)); + Guard.NotNull(widgetSettings, nameof(widgetSettings)); - if (widgetSettings.ActiveWidgetSystemNames == null) - { - return false; - } + if (widgetSettings.ActiveWidgetSystemNames == null) + { + return false; + } - return widgetSettings.ActiveWidgetSystemNames.Contains(widget.Metadata.SystemName, StringComparer.OrdinalIgnoreCase); - } + return widgetSettings.ActiveWidgetSystemNames.Contains(widget.Metadata.SystemName, StringComparer.OrdinalIgnoreCase); + } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Cms/WidgetService.cs b/src/Libraries/SmartStore.Services/Cms/WidgetService.cs index a3d6a8b135..6f2acd907d 100644 --- a/src/Libraries/SmartStore.Services/Cms/WidgetService.cs +++ b/src/Libraries/SmartStore.Services/Cms/WidgetService.cs @@ -17,17 +17,17 @@ public partial class WidgetService : IWidgetService #region Fields & Consts - private const string WIDGETS_ACTIVE_KEY = "SmartStore.widgets.active-{0}"; - private const string WIDGETS_ZONEMAPPED_KEY = "SmartStore.widgets.zonemapped-{0}"; + private const string WIDGETS_ACTIVE_KEY = "SmartStore.widgets.active-{0}"; + private const string WIDGETS_ZONEMAPPED_KEY = "SmartStore.widgets.zonemapped-{0}"; private readonly IPluginFinder _pluginFinder; private readonly WidgetSettings _widgetSettings; - private readonly ISettingService _settingService; - private readonly IProviderManager _providerManager; - private readonly IRequestCache _requestCache; + private readonly ISettingService _settingService; + private readonly IProviderManager _providerManager; + private readonly IRequestCache _requestCache; #endregion - + #region Ctor /// @@ -35,34 +35,34 @@ public partial class WidgetService : IWidgetService /// /// Plugin finder /// Widget settings - /// Plugin service - public WidgetService( - IPluginFinder pluginFinder, - WidgetSettings widgetSettings, - ISettingService settingService, - IProviderManager providerManager, - IRequestCache requestCache) + /// Plugin service + public WidgetService( + IPluginFinder pluginFinder, + WidgetSettings widgetSettings, + ISettingService settingService, + IProviderManager providerManager, + IRequestCache requestCache) { this._pluginFinder = pluginFinder; this._widgetSettings = widgetSettings; - this._settingService = settingService; - this._providerManager = providerManager; - this._requestCache = requestCache; + this._settingService = settingService; + this._providerManager = providerManager; + this._requestCache = requestCache; } #endregion #region Methods - /// - /// Load all widgets - /// - /// Load records allows only in specified store; pass 0 to load all records - /// Widgets - public virtual IEnumerable> LoadAllWidgets(int storeId = 0) - { - return _providerManager.GetAllProviders(storeId); - } + /// + /// Load all widgets + /// + /// Load records allows only in specified store; pass 0 to load all records + /// Widgets + public virtual IEnumerable> LoadAllWidgets(int storeId = 0) + { + return _providerManager.GetAllProviders(storeId); + } /// /// Load active widgets @@ -71,12 +71,13 @@ public virtual IEnumerable> LoadAllWidgets(int storeId = 0) /// Widgets public virtual IEnumerable> LoadActiveWidgets(int storeId = 0) { - var activeWidgets = _requestCache.Get(WIDGETS_ACTIVE_KEY.FormatInvariant(storeId), () => { - var allWigets = LoadAllWidgets(storeId); - return allWigets.Where(p => _widgetSettings.ActiveWidgetSystemNames.Contains(p.Metadata.SystemName, StringComparer.InvariantCultureIgnoreCase)).ToList(); - }); + var activeWidgets = _requestCache.Get(WIDGETS_ACTIVE_KEY.FormatInvariant(storeId), () => + { + var allWigets = LoadAllWidgets(storeId); + return allWigets.Where(p => _widgetSettings.ActiveWidgetSystemNames.Contains(p.Metadata.SystemName, StringComparer.InvariantCultureIgnoreCase)).ToList(); + }); - return activeWidgets; + return activeWidgets; } /// @@ -88,44 +89,45 @@ public virtual IEnumerable> LoadActiveWidgets(int storeId = 0) public virtual IEnumerable> LoadActiveWidgetsByWidgetZone(string widgetZone, int storeId = 0) { if (widgetZone.IsEmpty()) - return Enumerable.Empty>(); - - var mappedWidgets = _requestCache.Get(WIDGETS_ZONEMAPPED_KEY.FormatInvariant(storeId), () => { - var activeWidgets = LoadActiveWidgets(storeId); - var map = new Multimap>(); - - foreach (var widget in activeWidgets) - { - var zones = widget.Value.GetWidgetZones(); - if (zones != null && zones.Any()) - { - foreach (var zone in zones.Select(x => x.ToLower())) - { - map.Add(zone, widget); - } - } - } - - return map; - }); - - widgetZone = widgetZone.ToLower(); - if (mappedWidgets.ContainsKey(widgetZone)) - { - return mappedWidgets[widgetZone]; - } - - return Enumerable.Empty>(); + return Enumerable.Empty>(); + + var mappedWidgets = _requestCache.Get(WIDGETS_ZONEMAPPED_KEY.FormatInvariant(storeId), () => + { + var activeWidgets = LoadActiveWidgets(storeId); + var map = new Multimap>(); + + foreach (var widget in activeWidgets) + { + var zones = widget.Value.GetWidgetZones(); + if (zones != null && zones.Any()) + { + foreach (var zone in zones.Select(x => x.ToLower())) + { + map.Add(zone, widget); + } + } + } + + return map; + }); + + widgetZone = widgetZone.ToLower(); + if (mappedWidgets.ContainsKey(widgetZone)) + { + return mappedWidgets[widgetZone]; + } + + return Enumerable.Empty>(); } /// /// Load widget by system name /// - /// System name + /// System name /// Found widget - public virtual Provider LoadWidgetBySystemName(string systemName) + public virtual Provider LoadWidgetBySystemName(string systemName) { - return _providerManager.GetProvider(systemName); + return _providerManager.GetProvider(systemName); } #endregion diff --git a/src/Libraries/SmartStore.Services/Common/AddressExtensions.cs b/src/Libraries/SmartStore.Services/Common/AddressExtensions.cs index bd749898d4..4a3da77c14 100644 --- a/src/Libraries/SmartStore.Services/Common/AddressExtensions.cs +++ b/src/Libraries/SmartStore.Services/Common/AddressExtensions.cs @@ -8,135 +8,135 @@ namespace SmartStore.Services.Common { public static class AddressExtensions { - /// - /// Find first occurrence of an address - /// - /// Addresses to be searched - /// Address to find - /// First occurrence of address - public static Address FindAddress(this ICollection
source, Address address) - { - return source.FindAddress( - address.FirstName, - address.LastName, - address.PhoneNumber, - address.Email, - address.FaxNumber, - address.Company, - address.Address1, - address.Address2, - address.City, - address.StateProvinceId, - address.ZipPostalCode, - address.CountryId - ); - } + /// + /// Find first occurrence of an address + /// + /// Addresses to be searched + /// Address to find + /// First occurrence of address + public static Address FindAddress(this ICollection
source, Address address) + { + return source.FindAddress( + address.FirstName, + address.LastName, + address.PhoneNumber, + address.Email, + address.FaxNumber, + address.Company, + address.Address1, + address.Address2, + address.City, + address.StateProvinceId, + address.ZipPostalCode, + address.CountryId + ); + } - /// - /// Find an address - /// - /// Source - /// First name - /// Last name - /// Phone number - /// Email - /// Fax number - /// Company - /// Address 1 - /// Address 2 - /// City - /// State/province identifier - /// Zip postal code - /// Country identifier - /// Address - public static Address FindAddress( - this ICollection
source, - string firstName, - string lastName, - string phoneNumber, - string email, - string faxNumber, - string company, - string address1, - string address2, - string city, - int? stateProvinceId, - string zipPostalCode, - int? countryId) + /// + /// Find an address + /// + /// Source + /// First name + /// Last name + /// Phone number + /// Email + /// Fax number + /// Company + /// Address 1 + /// Address 2 + /// City + /// State/province identifier + /// Zip postal code + /// Country identifier + /// Address + public static Address FindAddress( + this ICollection
source, + string firstName, + string lastName, + string phoneNumber, + string email, + string faxNumber, + string company, + string address1, + string address2, + string city, + int? stateProvinceId, + string zipPostalCode, + int? countryId) { - Func addressMatcher = (x) => - { - return x.Email.IsCaseInsensitiveEqual(email) - && x.LastName.IsCaseInsensitiveEqual(lastName) - && x.FirstName.IsCaseInsensitiveEqual(firstName) - && x.Address1.IsCaseInsensitiveEqual(address1) - && x.Address2.IsCaseInsensitiveEqual(address2) - && x.Company.IsCaseInsensitiveEqual(company) - && x.ZipPostalCode.IsCaseInsensitiveEqual(zipPostalCode) - && x.City.IsCaseInsensitiveEqual(city) - && x.PhoneNumber.IsCaseInsensitiveEqual(phoneNumber) - && x.FaxNumber.IsCaseInsensitiveEqual(faxNumber) - && x.StateProvinceId == stateProvinceId - && x.CountryId == countryId; - }; + Func addressMatcher = (x) => + { + return x.Email.IsCaseInsensitiveEqual(email) + && x.LastName.IsCaseInsensitiveEqual(lastName) + && x.FirstName.IsCaseInsensitiveEqual(firstName) + && x.Address1.IsCaseInsensitiveEqual(address1) + && x.Address2.IsCaseInsensitiveEqual(address2) + && x.Company.IsCaseInsensitiveEqual(company) + && x.ZipPostalCode.IsCaseInsensitiveEqual(zipPostalCode) + && x.City.IsCaseInsensitiveEqual(city) + && x.PhoneNumber.IsCaseInsensitiveEqual(phoneNumber) + && x.FaxNumber.IsCaseInsensitiveEqual(faxNumber) + && x.StateProvinceId == stateProvinceId + && x.CountryId == countryId; + }; - return source.FirstOrDefault(addressMatcher); + return source.FirstOrDefault(addressMatcher); } - /// - /// Returns the full name of the address. - /// - public static string GetFullName(this Address address, bool withCompanyName = true) - { - if (address == null) - return null; + /// + /// Returns the full name of the address. + /// + public static string GetFullName(this Address address, bool withCompanyName = true) + { + if (address == null) + return null; - string result = string.Empty; - if (address.FirstName.HasValue() || address.LastName.HasValue()) - { - result = string.Format("{0} {1}", address.FirstName, address.LastName).Trim(); - } + string result = string.Empty; + if (address.FirstName.HasValue() || address.LastName.HasValue()) + { + result = string.Format("{0} {1}", address.FirstName, address.LastName).Trim(); + } - if (withCompanyName && address.Company.HasValue()) - { - result = string.Concat(result, result.HasValue() ? ", " : "", address.Company); - } + if (withCompanyName && address.Company.HasValue()) + { + result = string.Concat(result, result.HasValue() ? ", " : "", address.Company); + } - return result; - } + return result; + } - public static string GetFullSalutaion(this Address address) - { - if (address == null) - return null; + public static string GetFullSalutaion(this Address address) + { + if (address == null) + return null; - return string.Format("{0}{1}", - address.Salutation.EmptyNull(), - address.Title.HasValue() ? " " + address.Title : ""); - } + return string.Format("{0}{1}", + address.Salutation.EmptyNull(), + address.Title.HasValue() ? " " + address.Title : ""); + } - /// - /// Checks whether the postal data of two addresses are equal. - /// - public static bool IsPostalDataEqual(this Address address, Address other) - { - if (address != null && other != null) - { - if (address.FirstName.IsCaseInsensitiveEqual(other.FirstName) && - address.LastName.IsCaseInsensitiveEqual(other.LastName) && - address.Company.IsCaseInsensitiveEqual(other.Company) && - address.Address1.IsCaseInsensitiveEqual(other.Address1) && - address.Address2.IsCaseInsensitiveEqual(other.Address2) && - address.ZipPostalCode.IsCaseInsensitiveEqual(other.ZipPostalCode) && - address.City.IsCaseInsensitiveEqual(other.City) && - address.StateProvinceId == other.StateProvinceId && - address.CountryId == other.CountryId) - { - return true; - } - } + /// + /// Checks whether the postal data of two addresses are equal. + /// + public static bool IsPostalDataEqual(this Address address, Address other) + { + if (address != null && other != null) + { + if (address.FirstName.IsCaseInsensitiveEqual(other.FirstName) && + address.LastName.IsCaseInsensitiveEqual(other.LastName) && + address.Company.IsCaseInsensitiveEqual(other.Company) && + address.Address1.IsCaseInsensitiveEqual(other.Address1) && + address.Address2.IsCaseInsensitiveEqual(other.Address2) && + address.ZipPostalCode.IsCaseInsensitiveEqual(other.ZipPostalCode) && + address.City.IsCaseInsensitiveEqual(other.City) && + address.StateProvinceId == other.StateProvinceId && + address.CountryId == other.CountryId) + { + return true; + } + } - return false; - } + return false; + } } } diff --git a/src/Libraries/SmartStore.Services/Common/AddressService.cs b/src/Libraries/SmartStore.Services/Common/AddressService.cs index de52593d01..3953689090 100644 --- a/src/Libraries/SmartStore.Services/Common/AddressService.cs +++ b/src/Libraries/SmartStore.Services/Common/AddressService.cs @@ -18,42 +18,42 @@ public partial class AddressService : IAddressService private readonly IRepository
_addressRepository; private readonly ICountryService _countryService; private readonly IStateProvinceService _stateProvinceService; - private readonly ICommonServices _services; + private readonly ICommonServices _services; private readonly AddressSettings _addressSettings; - private readonly ITemplateEngine _templateEngine; - private readonly IMessageModelProvider _messageModelProvider; - - public AddressService( - IRepository
addressRepository, - ICountryService countryService, - IStateProvinceService stateProvinceService, - ICommonServices services, - AddressSettings addressSettings, - ITemplateEngine templateEngine, - IMessageModelProvider messageModelProvider) + private readonly ITemplateEngine _templateEngine; + private readonly IMessageModelProvider _messageModelProvider; + + public AddressService( + IRepository
addressRepository, + ICountryService countryService, + IStateProvinceService stateProvinceService, + ICommonServices services, + AddressSettings addressSettings, + ITemplateEngine templateEngine, + IMessageModelProvider messageModelProvider) { _addressRepository = addressRepository; _countryService = countryService; _stateProvinceService = stateProvinceService; _services = services; _addressSettings = addressSettings; - _templateEngine = templateEngine; - _messageModelProvider = messageModelProvider; + _templateEngine = templateEngine; + _messageModelProvider = messageModelProvider; } public virtual void DeleteAddress(Address address) { - Guard.NotNull(address, nameof(address)); + Guard.NotNull(address, nameof(address)); _addressRepository.Delete(address); } - public virtual void DeleteAddress(int id) - { - var address = GetAddressById(id); - if (address != null) - DeleteAddress(address); - } + public virtual void DeleteAddress(int id) + { + var address = GetAddressById(id); + if (address != null) + DeleteAddress(address); + } public virtual int GetAddressTotalByCountryId(int countryId) { @@ -86,23 +86,23 @@ public virtual Address GetAddressById(int addressId) return address; } - public virtual IList
GetAddressByIds(int[] addressIds) - { - Guard.NotNull(addressIds, nameof(addressIds)); + public virtual IList
GetAddressByIds(int[] addressIds) + { + Guard.NotNull(addressIds, nameof(addressIds)); - var query = - from x in _addressRepository.TableUntracked.Expand(x => x.Country).Expand(x => x.StateProvince) - where addressIds.Contains(x.Id) - select x; + var query = + from x in _addressRepository.TableUntracked.Expand(x => x.Country).Expand(x => x.StateProvince) + where addressIds.Contains(x.Id) + select x; - return query.ToList(); - } + return query.ToList(); + } public virtual void InsertAddress(Address address) { - Guard.NotNull(address, nameof(address)); + Guard.NotNull(address, nameof(address)); - address.CreatedOnUtc = DateTime.UtcNow; + address.CreatedOnUtc = DateTime.UtcNow; //some validation if (address.CountryId == 0) @@ -115,10 +115,10 @@ public virtual void InsertAddress(Address address) public virtual void UpdateAddress(Address address) { - Guard.NotNull(address, nameof(address)); + Guard.NotNull(address, nameof(address)); - //some validation - if (address.CountryId == 0) + //some validation + if (address.CountryId == 0) address.CountryId = null; if (address.StateProvinceId == 0) address.StateProvinceId = null; @@ -128,9 +128,9 @@ public virtual void UpdateAddress(Address address) public virtual bool IsAddressValid(Address address) { - Guard.NotNull(address, nameof(address)); + Guard.NotNull(address, nameof(address)); - if (String.IsNullOrWhiteSpace(address.FirstName)) + if (String.IsNullOrWhiteSpace(address.FirstName)) return false; if (String.IsNullOrWhiteSpace(address.LastName)) @@ -184,10 +184,10 @@ public virtual bool IsAddressValid(Address address) } } - if (_addressSettings.CityEnabled && - _addressSettings.CityRequired && - String.IsNullOrWhiteSpace(address.City)) - return false; + if (_addressSettings.CityEnabled && + _addressSettings.CityRequired && + String.IsNullOrWhiteSpace(address.City)) + return false; if (_addressSettings.PhoneEnabled && _addressSettings.PhoneRequired && @@ -202,63 +202,63 @@ public virtual bool IsAddressValid(Address address) return true; } - public virtual string FormatAddress(CompanyInformationSettings settings, bool newLineToBr = false) - { - Guard.NotNull(settings, nameof(settings)); - - var address = new Address - { - Address1 = settings.Street, - Address2 = settings.Street2, - City = settings.City, - Company = settings.CompanyName, - FirstName = settings.Firstname, - LastName = settings.Lastname, - Salutation = settings.Salutation, - Title = settings.Title, - ZipPostalCode = settings.ZipCode, - CountryId = settings.CountryId, - Country = _countryService.GetCountryById(settings.CountryId) - }; - - return FormatAddress(address, newLineToBr); - } - - public virtual string FormatAddress(Address address, bool newLineToBr = false) - { - Guard.NotNull(address, nameof(address)); - - var messageContext = new MessageContext - { - Language = _services.WorkContext.WorkingLanguage, - Store = _services.StoreContext.CurrentStore, - Model = new TemplateModel() - }; - - _messageModelProvider.AddModelPart(address, messageContext, "Address"); - var model = messageContext.Model["Address"]; - - var result = FormatAddress(model, address?.Country?.AddressFormat, messageContext.FormatProvider); - - if (newLineToBr) - { - result = HtmlUtils.ConvertPlainTextToHtml(result); - } - - return result; - } - - public virtual string FormatAddress(object address, string template = null, IFormatProvider formatProvider = null) - { - Guard.NotNull(address, nameof(address)); - - template = template.NullEmpty() ?? Address.DefaultAddressFormat; - - var result = _templateEngine - .Render(template, address, formatProvider ?? CultureInfo.CurrentCulture) - .Compact(true); - - return result; - } - } + public virtual string FormatAddress(CompanyInformationSettings settings, bool newLineToBr = false) + { + Guard.NotNull(settings, nameof(settings)); + + var address = new Address + { + Address1 = settings.Street, + Address2 = settings.Street2, + City = settings.City, + Company = settings.CompanyName, + FirstName = settings.Firstname, + LastName = settings.Lastname, + Salutation = settings.Salutation, + Title = settings.Title, + ZipPostalCode = settings.ZipCode, + CountryId = settings.CountryId, + Country = _countryService.GetCountryById(settings.CountryId) + }; + + return FormatAddress(address, newLineToBr); + } + + public virtual string FormatAddress(Address address, bool newLineToBr = false) + { + Guard.NotNull(address, nameof(address)); + + var messageContext = new MessageContext + { + Language = _services.WorkContext.WorkingLanguage, + Store = _services.StoreContext.CurrentStore, + Model = new TemplateModel() + }; + + _messageModelProvider.AddModelPart(address, messageContext, "Address"); + var model = messageContext.Model["Address"]; + + var result = FormatAddress(model, address?.Country?.AddressFormat, messageContext.FormatProvider); + + if (newLineToBr) + { + result = HtmlUtils.ConvertPlainTextToHtml(result); + } + + return result; + } + + public virtual string FormatAddress(object address, string template = null, IFormatProvider formatProvider = null) + { + Guard.NotNull(address, nameof(address)); + + template = template.NullEmpty() ?? Address.DefaultAddressFormat; + + var result = _templateEngine + .Render(template, address, formatProvider ?? CultureInfo.CurrentCulture) + .Compact(true); + + return result; + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Common/GenericAttributeExtensions.cs b/src/Libraries/SmartStore.Services/Common/GenericAttributeExtensions.cs index 6313febf45..ad5307de84 100644 --- a/src/Libraries/SmartStore.Services/Common/GenericAttributeExtensions.cs +++ b/src/Libraries/SmartStore.Services/Common/GenericAttributeExtensions.cs @@ -20,32 +20,32 @@ public static class GenericAttributeExtensions [MethodImpl(MethodImplOptions.AggressiveInlining)] public static TProp GetAttribute(this BaseEntity entity, string key, int storeId = 0) { - return GetAttribute( - entity, - key, - EngineContext.Current.Resolve(), - storeId); + return GetAttribute( + entity, + key, + EngineContext.Current.Resolve(), + storeId); } - /// - /// Gets an entity generic attribute value - /// - /// Property type - /// Entity - /// Key - /// GenericAttributeService - /// Load a value specific for a certain store; pass 0 to load a value shared for all stores - /// Attribute value - public static TProp GetAttribute(this BaseEntity entity, string key, IGenericAttributeService genericAttributeService, int storeId = 0) + /// + /// Gets an entity generic attribute value + /// + /// Property type + /// Entity + /// Key + /// GenericAttributeService + /// Load a value specific for a certain store; pass 0 to load a value shared for all stores + /// Attribute value + public static TProp GetAttribute(this BaseEntity entity, string key, IGenericAttributeService genericAttributeService, int storeId = 0) { - if (entity == null) - throw new ArgumentNullException(nameof(entity)); + if (entity == null) + throw new ArgumentNullException(nameof(entity)); - return (genericAttributeService ?? EngineContext.Current.Resolve()).GetAttribute( - entity.GetUnproxiedType().Name, - entity.Id, - key, - storeId); - } + return (genericAttributeService ?? EngineContext.Current.Resolve()).GetAttribute( + entity.GetUnproxiedType().Name, + entity.Id, + key, + storeId); + } } } diff --git a/src/Libraries/SmartStore.Services/Common/GenericAttributeService.cs b/src/Libraries/SmartStore.Services/Common/GenericAttributeService.cs index 3fb471d1d0..6fca33e692 100644 --- a/src/Libraries/SmartStore.Services/Common/GenericAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Common/GenericAttributeService.cs @@ -14,36 +14,36 @@ namespace SmartStore.Services.Common { public partial class GenericAttributeService : IGenericAttributeService { - private readonly IRepository _genericAttributeRepository; + private readonly IRepository _genericAttributeRepository; private readonly IEventPublisher _eventPublisher; - private readonly IRepository _orderRepository; - private readonly IDictionary> _valueCache; + private readonly IRepository _orderRepository; + private readonly IDictionary> _valueCache; - public GenericAttributeService( + public GenericAttributeService( IRepository genericAttributeRepository, IEventPublisher eventPublisher, - IRepository orderRepository) + IRepository orderRepository) { _genericAttributeRepository = genericAttributeRepository; _eventPublisher = eventPublisher; - _orderRepository = orderRepository; - _valueCache = new Dictionary>(); - } + _orderRepository = orderRepository; + _valueCache = new Dictionary>(); + } public virtual void DeleteAttribute(GenericAttribute attribute) { - Guard.NotNull(attribute, nameof(attribute)); + Guard.NotNull(attribute, nameof(attribute)); - int entityId = attribute.EntityId; - string keyGroup = attribute.KeyGroup; + int entityId = attribute.EntityId; + string keyGroup = attribute.KeyGroup; _genericAttributeRepository.Delete(attribute); - if (keyGroup.IsCaseInsensitiveEqual("Order") && entityId != 0) - { - var order = _orderRepository.GetById(entityId); - _eventPublisher.PublishOrderUpdated(order); - } + if (keyGroup.IsCaseInsensitiveEqual("Order") && entityId != 0) + { + var order = _orderRepository.GetById(entityId); + _eventPublisher.PublishOrderUpdated(order); + } } public virtual GenericAttribute GetAttributeById(int attributeId) @@ -57,171 +57,171 @@ public virtual GenericAttribute GetAttributeById(int attributeId) public virtual void InsertAttribute(GenericAttribute attribute) { - Guard.NotNull(attribute, nameof(attribute)); + Guard.NotNull(attribute, nameof(attribute)); - _genericAttributeRepository.Insert(attribute); + _genericAttributeRepository.Insert(attribute); - if (attribute.KeyGroup.IsCaseInsensitiveEqual("Order") && attribute.EntityId != 0) - { - var order = _orderRepository.GetById(attribute.EntityId); - _eventPublisher.PublishOrderUpdated(order); - } + if (attribute.KeyGroup.IsCaseInsensitiveEqual("Order") && attribute.EntityId != 0) + { + var order = _orderRepository.GetById(attribute.EntityId); + _eventPublisher.PublishOrderUpdated(order); + } } public virtual void UpdateAttribute(GenericAttribute attribute) { - Guard.NotNull(attribute, nameof(attribute)); + Guard.NotNull(attribute, nameof(attribute)); - _genericAttributeRepository.Update(attribute); + _genericAttributeRepository.Update(attribute); - if (attribute.KeyGroup.IsCaseInsensitiveEqual("Order") && attribute.EntityId != 0) - { - var order = _orderRepository.GetById(attribute.EntityId); - _eventPublisher.PublishOrderUpdated(order); - } + if (attribute.KeyGroup.IsCaseInsensitiveEqual("Order") && attribute.EntityId != 0) + { + var order = _orderRepository.GetById(attribute.EntityId); + _eventPublisher.PublishOrderUpdated(order); + } } - public virtual IList GetAttributesForEntity(int entityId, string entityName) + public virtual IList GetAttributesForEntity(int entityId, string entityName) { - var query = from ga in _genericAttributeRepository.Table - where ga.EntityId == entityId && ga.KeyGroup == entityName - select ga; - - return query.ToListCached("db.ga.{0}-{1}".FormatInvariant(entityId, entityName)); - } - - public virtual Multimap GetAttributesForEntity(int[] entityIds, string entityName) - { - Guard.NotNull(entityIds, nameof(entityIds)); - - var query = _genericAttributeRepository.TableUntracked - .Where(x => entityIds.Contains(x.EntityId) && x.KeyGroup == entityName); - - var map = query - .ToList() - .ToMultimap(x => x.EntityId, x => x); - - return map; - } - - public virtual TProp GetAttribute(string entityName, int entityId, string key, int storeId = 0) - { - if (entityName == null) - throw new ArgumentNullException(nameof(entityName)); - - if (key == null) - throw new ArgumentNullException(nameof(key)); - - var entityKey = entityName.ToLowerInvariant() + entityId; - if (!_valueCache.TryGetValue(entityKey, out var attrs)) - { - var list = GetAttributesForEntity(entityId, entityName); - if (list.Count > 0) - { - attrs = list.ToDictionarySafe(k => k.Key.ToLowerInvariant() + k.StoreId, v => (object)v.Value); - } - _valueCache[entityKey] = attrs; - } - - TProp result = default; - - if (attrs != null) - { - var entryKey = key.ToLowerInvariant() + storeId; - if (attrs.TryGetValue(entryKey, out var rawValue)) - { - if (rawValue.GetType() == typeof(TProp)) - { - result = (TProp)rawValue; - } - else - { - result = rawValue.Convert(); - // to skip repeated value type conversion - attrs[entryKey] = result; - } - } - } - - return result; - } - - public virtual IQueryable GetAttributes(string key, string entityName) - { - var query = - from ga in _genericAttributeRepository.Table - where ga.Key == key && ga.KeyGroup == entityName - select ga; - - return query; - } - - public virtual void SaveAttribute(BaseEntity entity, string key, TProp value, int storeId = 0) + var query = from ga in _genericAttributeRepository.Table + where ga.EntityId == entityId && ga.KeyGroup == entityName + select ga; + + return query.ToListCached("db.ga.{0}-{1}".FormatInvariant(entityId, entityName)); + } + + public virtual Multimap GetAttributesForEntity(int[] entityIds, string entityName) + { + Guard.NotNull(entityIds, nameof(entityIds)); + + var query = _genericAttributeRepository.TableUntracked + .Where(x => entityIds.Contains(x.EntityId) && x.KeyGroup == entityName); + + var map = query + .ToList() + .ToMultimap(x => x.EntityId, x => x); + + return map; + } + + public virtual TProp GetAttribute(string entityName, int entityId, string key, int storeId = 0) + { + if (entityName == null) + throw new ArgumentNullException(nameof(entityName)); + + if (key == null) + throw new ArgumentNullException(nameof(key)); + + var entityKey = entityName.ToLowerInvariant() + entityId; + if (!_valueCache.TryGetValue(entityKey, out var attrs)) + { + var list = GetAttributesForEntity(entityId, entityName); + if (list.Count > 0) + { + attrs = list.ToDictionarySafe(k => k.Key.ToLowerInvariant() + k.StoreId, v => (object)v.Value); + } + _valueCache[entityKey] = attrs; + } + + TProp result = default; + + if (attrs != null) + { + var entryKey = key.ToLowerInvariant() + storeId; + if (attrs.TryGetValue(entryKey, out var rawValue)) + { + if (rawValue.GetType() == typeof(TProp)) + { + result = (TProp)rawValue; + } + else + { + result = rawValue.Convert(); + // to skip repeated value type conversion + attrs[entryKey] = result; + } + } + } + + return result; + } + + public virtual IQueryable GetAttributes(string key, string entityName) { - Guard.NotNull(entity, nameof(entity)); + var query = + from ga in _genericAttributeRepository.Table + where ga.Key == key && ga.KeyGroup == entityName + select ga; - SaveAttribute(entity.Id, key, entity.GetUnproxiedType().Name, value, storeId); + return query; } - public virtual void SaveAttribute(int entityId, string key, string entityName, TProp value, int storeId = 0) - { - Guard.NotZero(entityId, nameof(entityId)); - - var valueStr = value.Convert(); - var props = GetAttributesForEntity(entityId, entityName); - - // should be culture invariant - var prop = props.FirstOrDefault(ga => ga.StoreId == storeId && ga.Key.Equals(key, StringComparison.InvariantCultureIgnoreCase)); - - if (prop != null) - { - if (string.IsNullOrWhiteSpace(valueStr)) - { - // delete - DeleteAttribute(prop); - CacheTryRemove(entityName, entityId, prop); - } - else - { - // update - prop.Value = valueStr; - UpdateAttribute(prop); - CacheTryAddOrUpdate(entityName, entityId, prop); - } - } - else - { - if (!string.IsNullOrWhiteSpace(valueStr)) - { - // insert - prop = new GenericAttribute - { - EntityId = entityId, - Key = key, - KeyGroup = entityName, - Value = valueStr, - StoreId = storeId - }; - - InsertAttribute(prop); - - CacheTryAddOrUpdate(entityName, entityId, prop); - } - } - } - - private void CacheTryRemove(string entityName, int entityId, GenericAttribute attr) - { - var entityKey = entityName.ToLowerInvariant() + entityId; - var entryKey = attr.Key.ToLowerInvariant() + attr.StoreId; - _valueCache.Get(entityKey).TryRemove(entryKey, out _); - } - - private void CacheTryAddOrUpdate(string entityName, int entityId, GenericAttribute attr) - { - var entityKey = entityName.ToLowerInvariant() + entityId; - var entryKey = attr.Key.ToLowerInvariant() + attr.StoreId; - _valueCache.Get(entityKey).TryAdd(entryKey, attr.Value, true); - } - } + public virtual void SaveAttribute(BaseEntity entity, string key, TProp value, int storeId = 0) + { + Guard.NotNull(entity, nameof(entity)); + + SaveAttribute(entity.Id, key, entity.GetUnproxiedType().Name, value, storeId); + } + + public virtual void SaveAttribute(int entityId, string key, string entityName, TProp value, int storeId = 0) + { + Guard.NotZero(entityId, nameof(entityId)); + + var valueStr = value.Convert(); + var props = GetAttributesForEntity(entityId, entityName); + + // should be culture invariant + var prop = props.FirstOrDefault(ga => ga.StoreId == storeId && ga.Key.Equals(key, StringComparison.InvariantCultureIgnoreCase)); + + if (prop != null) + { + if (string.IsNullOrWhiteSpace(valueStr)) + { + // delete + DeleteAttribute(prop); + CacheTryRemove(entityName, entityId, prop); + } + else + { + // update + prop.Value = valueStr; + UpdateAttribute(prop); + CacheTryAddOrUpdate(entityName, entityId, prop); + } + } + else + { + if (!string.IsNullOrWhiteSpace(valueStr)) + { + // insert + prop = new GenericAttribute + { + EntityId = entityId, + Key = key, + KeyGroup = entityName, + Value = valueStr, + StoreId = storeId + }; + + InsertAttribute(prop); + + CacheTryAddOrUpdate(entityName, entityId, prop); + } + } + } + + private void CacheTryRemove(string entityName, int entityId, GenericAttribute attr) + { + var entityKey = entityName.ToLowerInvariant() + entityId; + var entryKey = attr.Key.ToLowerInvariant() + attr.StoreId; + _valueCache.Get(entityKey).TryRemove(entryKey, out _); + } + + private void CacheTryAddOrUpdate(string entityName, int entityId, GenericAttribute attr) + { + var entityKey = entityName.ToLowerInvariant() + entityId; + var entryKey = attr.Key.ToLowerInvariant() + attr.StoreId; + _valueCache.Get(entityKey).TryAdd(entryKey, attr.Value, true); + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Common/IAddressService.cs b/src/Libraries/SmartStore.Services/Common/IAddressService.cs index 5ece5f704d..90b9bfb9de 100644 --- a/src/Libraries/SmartStore.Services/Common/IAddressService.cs +++ b/src/Libraries/SmartStore.Services/Common/IAddressService.cs @@ -16,7 +16,7 @@ public partial interface IAddressService /// Address void DeleteAddress(Address address); - void DeleteAddress(int id); + void DeleteAddress(int id); /// /// Gets total number of addresses by country identifier @@ -39,12 +39,12 @@ public partial interface IAddressService /// Address Address GetAddressById(int addressId); - /// - /// Gets addresses by address identifiers - /// - /// Address identifiers - /// Addresses - IList
GetAddressByIds(int[] addressIds); + /// + /// Gets addresses by address identifiers + /// + /// Address identifiers + /// Addresses + IList
GetAddressByIds(int[] addressIds); /// /// Inserts an address @@ -65,28 +65,28 @@ public partial interface IAddressService /// Result bool IsAddressValid(Address address); - /// - /// Formats the address according to the countries address formatting template - /// - /// Address to format - /// Whether new lines should be replaced with html BR tags - /// The formatted address - string FormatAddress(CompanyInformationSettings settings, bool newLineToBr = false); + /// + /// Formats the address according to the countries address formatting template + /// + /// Address to format + /// Whether new lines should be replaced with html BR tags + /// The formatted address + string FormatAddress(CompanyInformationSettings settings, bool newLineToBr = false); - /// - /// Formats the address according to the countries address formatting template - /// - /// Address to format - /// Whether new lines should be replaced with html BR tags - /// The formatted address - string FormatAddress(Address address, bool newLineToBr = false); + /// + /// Formats the address according to the countries address formatting template + /// + /// Address to format + /// Whether new lines should be replaced with html BR tags + /// The formatted address + string FormatAddress(Address address, bool newLineToBr = false); - /// - /// Formats the address according to the countries address formatting template - /// - /// Address to format. Usually passed by the template engine as a dictionary - /// The (liquid) formatting template. If null, the system global template will be used. - /// The formatted address - string FormatAddress(object address, string template = null, IFormatProvider formatProvider = null); - } + /// + /// Formats the address according to the countries address formatting template + /// + /// Address to format. Usually passed by the template engine as a dictionary + /// The (liquid) formatting template. If null, the system global template will be used. + /// The formatted address + string FormatAddress(object address, string template = null, IFormatProvider formatProvider = null); + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Common/IGenericAttributeService.cs b/src/Libraries/SmartStore.Services/Common/IGenericAttributeService.cs index dffd998afe..68653cfec1 100644 --- a/src/Libraries/SmartStore.Services/Common/IGenericAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Common/IGenericAttributeService.cs @@ -44,51 +44,51 @@ public partial interface IGenericAttributeService /// Generic attributes IList GetAttributesForEntity(int entityId, string entityName); - /// - /// Get attributes - /// - /// Entity identifiers - /// Key group - /// Generic attributes - Multimap GetAttributesForEntity(int[] entityIds, string entityName); + /// + /// Get attributes + /// + /// Entity identifiers + /// Key group + /// Generic attributes + Multimap GetAttributesForEntity(int[] entityIds, string entityName); - /// - /// Get attribute value - /// - /// Key group - /// Entity identifier - /// Key - /// Store identifier; pass 0 if this attribute will be available for all stores - /// Converted generic attribute value - TProp GetAttribute(string entityName, int entityId, string key, int storeId = 0); + /// + /// Get attribute value + /// + /// Key group + /// Entity identifier + /// Key + /// Store identifier; pass 0 if this attribute will be available for all stores + /// Converted generic attribute value + TProp GetAttribute(string entityName, int entityId, string key, int storeId = 0); - /// - /// Get queryable attributes - /// - /// The key - /// The key group - /// Queryable attributes - IQueryable GetAttributes(string key, string entityName); + /// + /// Get queryable attributes + /// + /// The key + /// The key group + /// Queryable attributes + IQueryable GetAttributes(string key, string entityName); - /// + /// /// Save attribute value /// /// Property type /// Entity /// Key /// Value - /// Store identifier; pass 0 if this attribute will be available for all stores - void SaveAttribute(BaseEntity entity, string key, TProp value, int storeId = 0); + /// Store identifier; pass 0 if this attribute will be available for all stores + void SaveAttribute(BaseEntity entity, string key, TProp value, int storeId = 0); - /// - /// Save attribute value - /// - /// Property type - /// Entity identifier - /// The key - /// The key group - /// Property type - /// Store identifier; pass 0 if this attribute will be available for all stores - void SaveAttribute(int entityId, string key, string keyGroup, TProp value, int storeId = 0); - } + /// + /// Save attribute value + /// + /// Property type + /// Entity identifier + /// The key + /// The key group + /// Property type + /// Store identifier; pass 0 if this attribute will be available for all stores + void SaveAttribute(int entityId, string key, string keyGroup, TProp value, int storeId = 0); + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Common/IUserAgent.cs b/src/Libraries/SmartStore.Services/Common/IUserAgent.cs index d61f9444c2..5a3c5db1cb 100644 --- a/src/Libraries/SmartStore.Services/Common/IUserAgent.cs +++ b/src/Libraries/SmartStore.Services/Common/IUserAgent.cs @@ -5,168 +5,168 @@ using System.Threading.Tasks; namespace SmartStore.Services.Common -{ - public interface IUserAgent - { - string RawValue { get; set; } - - UserAgentInfo UserAgent { get; } - DeviceInfo Device { get; } - OSInfo OS { get; } +{ + public interface IUserAgent + { + string RawValue { get; set; } - bool IsBot { get; } - bool IsMobileDevice { get; } - bool IsTablet { get; } - bool IsPdfConverter { get; } - } + UserAgentInfo UserAgent { get; } + DeviceInfo Device { get; } + OSInfo OS { get; } - public sealed class DeviceInfo - { - public DeviceInfo(string family, bool isBot) - { - this.Family = family; - this.IsBot = isBot; - } - public override string ToString() - { - return this.Family; - } - public string Family { get; private set; } - public bool IsBot { get; private set; } - } + bool IsBot { get; } + bool IsMobileDevice { get; } + bool IsTablet { get; } + bool IsPdfConverter { get; } + } - public sealed class OSInfo - { - public OSInfo(string family, string major, string minor, string patch, string patchMinor) - { - this.Family = family; - this.Major = major; - this.Minor = minor; - this.Patch = patch; - this.PatchMinor = patchMinor; - } - public override string ToString() - { - var str = VersionString.Format(Major, Minor, Patch, PatchMinor); - return (this.Family + (!string.IsNullOrEmpty(str) ? (" " + str) : null)); - } - public string Family { get; private set; } - public string Major { get; private set; } - public string Minor { get; private set; } - public string Patch { get; private set; } - public string PatchMinor { get; private set; } + public sealed class DeviceInfo + { + public DeviceInfo(string family, bool isBot) + { + this.Family = family; + this.IsBot = isBot; + } + public override string ToString() + { + return this.Family; + } + public string Family { get; private set; } + public bool IsBot { get; private set; } + } - private static string FormatVersionString(params string[] parts) - { - return string.Join(".", (from v in parts - where !string.IsNullOrEmpty(v) - select v).ToArray()); - } - } + public sealed class OSInfo + { + public OSInfo(string family, string major, string minor, string patch, string patchMinor) + { + this.Family = family; + this.Major = major; + this.Minor = minor; + this.Patch = patch; + this.PatchMinor = patchMinor; + } + public override string ToString() + { + var str = VersionString.Format(Major, Minor, Patch, PatchMinor); + return (this.Family + (!string.IsNullOrEmpty(str) ? (" " + str) : null)); + } + public string Family { get; private set; } + public string Major { get; private set; } + public string Minor { get; private set; } + public string Patch { get; private set; } + public string PatchMinor { get; private set; } - public sealed class UserAgentInfo - { - private static readonly HashSet s_Bots = new HashSet(StringComparer.InvariantCultureIgnoreCase) - { - "BingPreview" - }; + private static string FormatVersionString(params string[] parts) + { + return string.Join(".", (from v in parts + where !string.IsNullOrEmpty(v) + select v).ToArray()); + } + } - private bool? _isBot; - private bool? _supportsWebP; + public sealed class UserAgentInfo + { + private static readonly HashSet s_Bots = new HashSet(StringComparer.InvariantCultureIgnoreCase) + { + "BingPreview" + }; - public UserAgentInfo(string family, string major, string minor, string patch) - { - this.Family = family; - this.Major = major; - this.Minor = minor; - this.Patch = patch; - } - public override string ToString() - { - var str = VersionString.Format(Major, Minor, Patch); - return (this.Family + (!string.IsNullOrEmpty(str) ? (" " + str) : null)); - } - public string Family { get; private set; } - public string Major { get; private set; } - public string Minor { get; private set; } - public string Patch { get; private set; } - public bool IsBot - { - get - { - if (!_isBot.HasValue) - { - _isBot = s_Bots.Contains(Family); - } - return _isBot.Value; - } - } - public bool SupportsWebP - { - get - { - if (_supportsWebP == null) - { - if (Family == "Chrome") - { - _supportsWebP = Major.ToInt() >= 32; - } - else if (Family.StartsWith("Chrome Mobile")) - { - _supportsWebP = Major.ToInt() >= 79; - } - else if (Family == "Firefox") - { - _supportsWebP = Major.ToInt() >= 65; - } - else if (Family.StartsWith("Firefox Mobile")) - { - _supportsWebP = Major.ToInt() >= 68; - } - else if (Family == "Edge") - { - _supportsWebP = Major.ToInt() >= 18; - } - else if (Family == "Opera") - { - _supportsWebP = Major.ToInt() >= 19; - } - else if (Family == "Opera Mini") - { - _supportsWebP = true; - } - else if (Family.StartsWith("Android")) - { - _supportsWebP = Major.ToInt() >= 5 || (Major.ToInt() == 4 && Minor.ToInt() >= 2); - } - else if (Family.StartsWith("Samsung Internet")) - { - _supportsWebP = Major.ToInt() >= 4; - } - else if (Family.StartsWith("Baidu")) - { - _supportsWebP = Major.ToInt() >= 8 || (Major.ToInt() == 7 && Minor.ToInt() >= 12); - } - else - { - _supportsWebP = false; - } - } + private bool? _isBot; + private bool? _supportsWebP; - return _supportsWebP.Value; - } - } - } + public UserAgentInfo(string family, string major, string minor, string patch) + { + this.Family = family; + this.Major = major; + this.Minor = minor; + this.Patch = patch; + } + public override string ToString() + { + var str = VersionString.Format(Major, Minor, Patch); + return (this.Family + (!string.IsNullOrEmpty(str) ? (" " + str) : null)); + } + public string Family { get; private set; } + public string Major { get; private set; } + public string Minor { get; private set; } + public string Patch { get; private set; } + public bool IsBot + { + get + { + if (!_isBot.HasValue) + { + _isBot = s_Bots.Contains(Family); + } + return _isBot.Value; + } + } + public bool SupportsWebP + { + get + { + if (_supportsWebP == null) + { + if (Family == "Chrome") + { + _supportsWebP = Major.ToInt() >= 32; + } + else if (Family.StartsWith("Chrome Mobile")) + { + _supportsWebP = Major.ToInt() >= 79; + } + else if (Family == "Firefox") + { + _supportsWebP = Major.ToInt() >= 65; + } + else if (Family.StartsWith("Firefox Mobile")) + { + _supportsWebP = Major.ToInt() >= 68; + } + else if (Family == "Edge") + { + _supportsWebP = Major.ToInt() >= 18; + } + else if (Family == "Opera") + { + _supportsWebP = Major.ToInt() >= 19; + } + else if (Family == "Opera Mini") + { + _supportsWebP = true; + } + else if (Family.StartsWith("Android")) + { + _supportsWebP = Major.ToInt() >= 5 || (Major.ToInt() == 4 && Minor.ToInt() >= 2); + } + else if (Family.StartsWith("Samsung Internet")) + { + _supportsWebP = Major.ToInt() >= 4; + } + else if (Family.StartsWith("Baidu")) + { + _supportsWebP = Major.ToInt() >= 8 || (Major.ToInt() == 7 && Minor.ToInt() >= 12); + } + else + { + _supportsWebP = false; + } + } - internal static class VersionString - { - public static string Format(params string[] parts) - { - return string.Join(".", (from v in parts - where !string.IsNullOrEmpty(v) - select v).ToArray()); - } - } + return _supportsWebP.Value; + } + } + } + + internal static class VersionString + { + public static string Format(params string[] parts) + { + return string.Join(".", (from v in parts + where !string.IsNullOrEmpty(v) + select v).ToArray()); + } + } } diff --git a/src/Libraries/SmartStore.Services/Common/MaintenanceService.cs b/src/Libraries/SmartStore.Services/Common/MaintenanceService.cs index d5b3c8d746..f6a6aae462 100644 --- a/src/Libraries/SmartStore.Services/Common/MaintenanceService.cs +++ b/src/Libraries/SmartStore.Services/Common/MaintenanceService.cs @@ -44,7 +44,7 @@ public MaintenanceService(IDataProvider dataProvider, IDbContext dbContext, /// /// Entity /// Integer ident; null if cannot get the result - public virtual int? GetTableIdent() where T: BaseEntity + public virtual int? GetTableIdent() where T : BaseEntity { if (_commonSettings.UseStoredProceduresIfSupported && _dataProvider.StoredProceduresSupported) { diff --git a/src/Libraries/SmartStore.Services/Common/MobileDeviceHelper.cs b/src/Libraries/SmartStore.Services/Common/MobileDeviceHelper.cs index 0586d08a98..b37a4d13fa 100644 --- a/src/Libraries/SmartStore.Services/Common/MobileDeviceHelper.cs +++ b/src/Libraries/SmartStore.Services/Common/MobileDeviceHelper.cs @@ -5,16 +5,16 @@ namespace SmartStore.Services.Common { public partial class MobileDeviceHelper : IMobileDeviceHelper { - private readonly IUserAgent _userAgent; + private readonly IUserAgent _userAgent; public MobileDeviceHelper(IUserAgent userAgent) { - _userAgent = userAgent; + _userAgent = userAgent; } public virtual bool IsMobileDevice() { - return _userAgent.IsMobileDevice && !_userAgent.IsTablet; + return _userAgent.IsMobileDevice && !_userAgent.IsTablet; } } diff --git a/src/Libraries/SmartStore.Services/Common/TempFileCleanupTask.cs b/src/Libraries/SmartStore.Services/Common/TempFileCleanupTask.cs index e02429fba3..4ef87fa3d7 100644 --- a/src/Libraries/SmartStore.Services/Common/TempFileCleanupTask.cs +++ b/src/Libraries/SmartStore.Services/Common/TempFileCleanupTask.cs @@ -3,14 +3,14 @@ namespace SmartStore.Services.Common { - /// - /// Task to cleanup temporary files - /// - public partial class TempFileCleanupTask : ITask - { - public void Execute(TaskExecutionContext ctx) - { - FileSystemHelper.ClearTempDirectories(); - } - } + /// + /// Task to cleanup temporary files + /// + public partial class TempFileCleanupTask : ITask + { + public void Execute(TaskExecutionContext ctx) + { + FileSystemHelper.ClearTempDirectories(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs b/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs index f83db41703..9f1705d9a3 100644 --- a/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs +++ b/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs @@ -8,260 +8,260 @@ namespace SmartStore.Services.Common { - public class UAParserUserAgent : IUserAgent - { - private readonly static uap.Parser s_uap; - private static readonly Regex s_pdfConverterPattern = new Regex(@"wkhtmltopdf", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); + public class UAParserUserAgent : IUserAgent + { + private readonly static uap.Parser s_uap; + private static readonly Regex s_pdfConverterPattern = new Regex(@"wkhtmltopdf", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); - # region Mobile UAs, OS & Devices + #region Mobile UAs, OS & Devices - private static readonly HashSet s_MobileOS = new HashSet(StringComparer.InvariantCultureIgnoreCase) - { - "Android", - "iOS", - "Windows Mobile", - "Windows Phone", - "Windows CE", - "Symbian OS", - "BlackBerry OS", - "BlackBerry Tablet OS", - "Firefox OS", - "Brew MP", - "webOS", - "Bada", - "Kindle", - "Maemo" - }; + private static readonly HashSet s_MobileOS = new HashSet(StringComparer.InvariantCultureIgnoreCase) + { + "Android", + "iOS", + "Windows Mobile", + "Windows Phone", + "Windows CE", + "Symbian OS", + "BlackBerry OS", + "BlackBerry Tablet OS", + "Firefox OS", + "Brew MP", + "webOS", + "Bada", + "Kindle", + "Maemo" + }; - private static readonly HashSet s_MobileBrowsers = new HashSet(StringComparer.InvariantCultureIgnoreCase) - { - "Googlebot-Mobile", - "Baiduspider-mobile", - "Android", - "Firefox Mobile", - "Opera Mobile", - "Opera Mini", - "Mobile Safari", - "Amazon Silk", - "webOS Browser", - "MicroB", - "Ovi Browser", - "NetFront", - "NetFront NX", - "Chrome Mobile", - "Chrome Mobile iOS", - "UC Browser", - "Tizen Browser", - "Baidu Explorer", - "QQ Browser Mini", - "QQ Browser Mobile", - "IE Mobile", - "Polaris", - "ONE Browser", - "iBrowser Mini", - "Nokia Services (WAP) Browser", - "Nokia Browser", - "Nokia OSS Browser", - "BlackBerry WebKit", - "BlackBerry", "Palm", - "Palm Blazer", - "Palm Pre", - "Teleca Browser", - "SEMC-Browser", - "PlayStation Portable", - "Nokia", - "Maemo Browser", - "Obigo", - "Bolt", - "Iris", - "UP.Browser", - "Minimo", - "Bunjaloo", - "Jasmine", - "Dolfin", - "Polaris", - "Skyfire" - }; + private static readonly HashSet s_MobileBrowsers = new HashSet(StringComparer.InvariantCultureIgnoreCase) + { + "Googlebot-Mobile", + "Baiduspider-mobile", + "Android", + "Firefox Mobile", + "Opera Mobile", + "Opera Mini", + "Mobile Safari", + "Amazon Silk", + "webOS Browser", + "MicroB", + "Ovi Browser", + "NetFront", + "NetFront NX", + "Chrome Mobile", + "Chrome Mobile iOS", + "UC Browser", + "Tizen Browser", + "Baidu Explorer", + "QQ Browser Mini", + "QQ Browser Mobile", + "IE Mobile", + "Polaris", + "ONE Browser", + "iBrowser Mini", + "Nokia Services (WAP) Browser", + "Nokia Browser", + "Nokia OSS Browser", + "BlackBerry WebKit", + "BlackBerry", "Palm", + "Palm Blazer", + "Palm Pre", + "Teleca Browser", + "SEMC-Browser", + "PlayStation Portable", + "Nokia", + "Maemo Browser", + "Obigo", + "Bolt", + "Iris", + "UP.Browser", + "Minimo", + "Bunjaloo", + "Jasmine", + "Dolfin", + "Polaris", + "Skyfire" + }; - private static readonly HashSet s_MobileDevices = new HashSet(StringComparer.InvariantCultureIgnoreCase) - { - "BlackBerry", - "MI PAD", - "iPhone", - "iPad", - "iPod", - "Kindle", - "Kindle Fire", - "Nokia", - "Lumia", - "Palm", - "DoCoMo", - "HP TouchPad", - "Xoom", - "Motorola", - "Generic Feature Phone", - "Generic Smartphone" - }; + private static readonly HashSet s_MobileDevices = new HashSet(StringComparer.InvariantCultureIgnoreCase) + { + "BlackBerry", + "MI PAD", + "iPhone", + "iPad", + "iPod", + "Kindle", + "Kindle Fire", + "Nokia", + "Lumia", + "Palm", + "DoCoMo", + "HP TouchPad", + "Xoom", + "Motorola", + "Generic Feature Phone", + "Generic Smartphone" + }; - #endregion + #endregion - private readonly HttpContextBase _httpContext; + private readonly HttpContextBase _httpContext; - private string _rawValue; - private UserAgentInfo _userAgent; - private DeviceInfo _device; - private OSInfo _os; + private string _rawValue; + private UserAgentInfo _userAgent; + private DeviceInfo _device; + private OSInfo _os; - private bool? _isBot; - private bool? _isMobileDevice; - private bool? _isTablet; - private bool? _isPdfConverter; + private bool? _isBot; + private bool? _isMobileDevice; + private bool? _isTablet; + private bool? _isPdfConverter; - static UAParserUserAgent() - { - var path = CommonHelper.MapPath("~/App_Data/UAParser.regexes.yaml"); - s_uap = File.Exists(path) - ? uap.Parser.FromYaml(path) - : uap.Parser.GetDefault(); - } + static UAParserUserAgent() + { + var path = CommonHelper.MapPath("~/App_Data/UAParser.regexes.yaml"); + s_uap = File.Exists(path) + ? uap.Parser.FromYaml(path) + : uap.Parser.GetDefault(); + } - public UAParserUserAgent(HttpContextBase httpContext) - { - this._httpContext = httpContext; - } + public UAParserUserAgent(HttpContextBase httpContext) + { + this._httpContext = httpContext; + } - public string RawValue - { - get - { - if (_rawValue == null) - { - if (_httpContext.Request != null) - { - _rawValue = _httpContext.Request.UserAgent.EmptyNull(); - } - else - { - _rawValue = ""; - } - } + public string RawValue + { + get + { + if (_rawValue == null) + { + if (_httpContext.Request != null) + { + _rawValue = _httpContext.Request.UserAgent.EmptyNull(); + } + else + { + _rawValue = ""; + } + } - return _rawValue; - } - // for (unit) test purpose - set - { - _rawValue = value; - _userAgent = null; - _device = null; - _os = null; - _isBot = null; - _isMobileDevice = null; - _isTablet = null; - _isPdfConverter = null; - } - } + return _rawValue; + } + // for (unit) test purpose + set + { + _rawValue = value; + _userAgent = null; + _device = null; + _os = null; + _isBot = null; + _isMobileDevice = null; + _isTablet = null; + _isPdfConverter = null; + } + } - public virtual UserAgentInfo UserAgent - { - get - { - if (_userAgent == null) - { - var tmp = s_uap.ParseUserAgent(this.RawValue); - _userAgent = new UserAgentInfo(tmp.Family, tmp.Major, tmp.Minor, tmp.Patch); - } - return _userAgent; - } - } + public virtual UserAgentInfo UserAgent + { + get + { + if (_userAgent == null) + { + var tmp = s_uap.ParseUserAgent(this.RawValue); + _userAgent = new UserAgentInfo(tmp.Family, tmp.Major, tmp.Minor, tmp.Patch); + } + return _userAgent; + } + } - public virtual DeviceInfo Device - { - get - { - if (_device == null) - { - var tmp = s_uap.ParseDevice(this.RawValue); - _device = new DeviceInfo(tmp.Family, tmp.IsSpider()); - } - return _device; - } - } + public virtual DeviceInfo Device + { + get + { + if (_device == null) + { + var tmp = s_uap.ParseDevice(this.RawValue); + _device = new DeviceInfo(tmp.Family, tmp.IsSpider()); + } + return _device; + } + } - public virtual OSInfo OS - { - get - { - if (_os == null) - { - var tmp = s_uap.ParseOS(this.RawValue); - _os = new OSInfo(tmp.Family, tmp.Major, tmp.Minor, tmp.Patch, tmp.PatchMinor); - } - return _os; - } - } + public virtual OSInfo OS + { + get + { + if (_os == null) + { + var tmp = s_uap.ParseOS(this.RawValue); + _os = new OSInfo(tmp.Family, tmp.Major, tmp.Minor, tmp.Patch, tmp.PatchMinor); + } + return _os; + } + } - public virtual bool IsBot - { - get - { - if (!_isBot.HasValue) - { - // empty useragent > bad bot! - _isBot = this.RawValue.IsEmpty() || _httpContext.Request.Browser.Crawler || this.Device.IsBot || this.UserAgent.IsBot; - } - return _isBot.Value; - } - } + public virtual bool IsBot + { + get + { + if (!_isBot.HasValue) + { + // empty useragent > bad bot! + _isBot = this.RawValue.IsEmpty() || _httpContext.Request.Browser.Crawler || this.Device.IsBot || this.UserAgent.IsBot; + } + return _isBot.Value; + } + } - public virtual bool IsMobileDevice - { - get - { - if (!_isMobileDevice.HasValue) - { - _isMobileDevice = - s_MobileOS.Contains(this.OS.Family) || - s_MobileBrowsers.Contains(this.UserAgent.Family) || - s_MobileDevices.Contains(this.Device.Family); - } - return _isMobileDevice.Value; - } - } + public virtual bool IsMobileDevice + { + get + { + if (!_isMobileDevice.HasValue) + { + _isMobileDevice = + s_MobileOS.Contains(this.OS.Family) || + s_MobileBrowsers.Contains(this.UserAgent.Family) || + s_MobileDevices.Contains(this.Device.Family); + } + return _isMobileDevice.Value; + } + } - public virtual bool IsTablet - { - get - { - if (!_isTablet.HasValue) - { - _isTablet = - Regex.IsMatch(this.Device.Family, "iPad|Kindle Fire|Nexus 10|Xoom|Transformer|MI PAD|IdeaTab", RegexOptions.CultureInvariant) || - this.OS.Family == "BlackBerry Tablet OS"; - } - return _isTablet.Value; - } - } + public virtual bool IsTablet + { + get + { + if (!_isTablet.HasValue) + { + _isTablet = + Regex.IsMatch(this.Device.Family, "iPad|Kindle Fire|Nexus 10|Xoom|Transformer|MI PAD|IdeaTab", RegexOptions.CultureInvariant) || + this.OS.Family == "BlackBerry Tablet OS"; + } + return _isTablet.Value; + } + } - public virtual bool IsPdfConverter - { - get - { - if (!_isPdfConverter.HasValue) - { - _isPdfConverter = s_pdfConverterPattern.IsMatch(this.RawValue); - } - return _isPdfConverter.Value; - } - } - } + public virtual bool IsPdfConverter + { + get + { + if (!_isPdfConverter.HasValue) + { + _isPdfConverter = s_pdfConverterPattern.IsMatch(this.RawValue); + } + return _isPdfConverter.Value; + } + } + } - internal static class DeviceExtensions - { - internal static bool IsSpider(this UAParser.Device device) - { - return device.Family.Equals("Spider", StringComparison.InvariantCultureIgnoreCase); - } - } + internal static class DeviceExtensions + { + internal static bool IsSpider(this UAParser.Device device) + { + return device.Family.Equals("Spider", StringComparison.InvariantCultureIgnoreCase); + } + } } diff --git a/src/Libraries/SmartStore.Services/CommonServices.cs b/src/Libraries/SmartStore.Services/CommonServices.cs index d2d7228c91..2d95688a0f 100644 --- a/src/Libraries/SmartStore.Services/CommonServices.cs +++ b/src/Libraries/SmartStore.Services/CommonServices.cs @@ -16,91 +16,91 @@ namespace SmartStore.Services { public class CommonServices : ICommonServices - { - private readonly IComponentContext _container; - private readonly Lazy _env; - private readonly Lazy _cacheManager; - private readonly Lazy _requestCache; - private readonly Lazy _dbContext; - private readonly Lazy _storeContext; - private readonly Lazy _webHelper; - private readonly Lazy _workContext; - private readonly Lazy _eventPublisher; - private readonly Lazy _localization; - private readonly Lazy _customerActivity; - private readonly Lazy _mediaService; - private readonly Lazy _notifier; + { + private readonly IComponentContext _container; + private readonly Lazy _env; + private readonly Lazy _cacheManager; + private readonly Lazy _requestCache; + private readonly Lazy _dbContext; + private readonly Lazy _storeContext; + private readonly Lazy _webHelper; + private readonly Lazy _workContext; + private readonly Lazy _eventPublisher; + private readonly Lazy _localization; + private readonly Lazy _customerActivity; + private readonly Lazy _mediaService; + private readonly Lazy _notifier; private readonly Lazy _permissions; private readonly Lazy _settings; - private readonly Lazy _storeService; - private readonly Lazy _dateTimeHelper; - private readonly Lazy _displayControl; - private readonly Lazy _chronometer; - private readonly Lazy _messageFactory; + private readonly Lazy _storeService; + private readonly Lazy _dateTimeHelper; + private readonly Lazy _displayControl; + private readonly Lazy _chronometer; + private readonly Lazy _messageFactory; - public CommonServices( - IComponentContext container, - Lazy env, - Lazy cacheManager, - Lazy requestCache, - Lazy dbContext, - Lazy storeContext, - Lazy webHelper, - Lazy workContext, - Lazy eventPublisher, - Lazy localization, - Lazy customerActivity, - Lazy mediaService, - Lazy notifier, + public CommonServices( + IComponentContext container, + Lazy env, + Lazy cacheManager, + Lazy requestCache, + Lazy dbContext, + Lazy storeContext, + Lazy webHelper, + Lazy workContext, + Lazy eventPublisher, + Lazy localization, + Lazy customerActivity, + Lazy mediaService, + Lazy notifier, Lazy permissions, Lazy settings, - Lazy storeService, - Lazy dateTimeHelper, - Lazy displayControl, - Lazy chronometer, - Lazy messageFactory) - { - _container = container; - _env = env; - _cacheManager = cacheManager; - _requestCache = requestCache; - _dbContext = dbContext; - _storeContext = storeContext; - _webHelper = webHelper; - _workContext = workContext; - _eventPublisher = eventPublisher; - _localization = localization; - _customerActivity = customerActivity; - _mediaService = mediaService; - _notifier = notifier; + Lazy storeService, + Lazy dateTimeHelper, + Lazy displayControl, + Lazy chronometer, + Lazy messageFactory) + { + _container = container; + _env = env; + _cacheManager = cacheManager; + _requestCache = requestCache; + _dbContext = dbContext; + _storeContext = storeContext; + _webHelper = webHelper; + _workContext = workContext; + _eventPublisher = eventPublisher; + _localization = localization; + _customerActivity = customerActivity; + _mediaService = mediaService; + _notifier = notifier; _permissions = permissions; - _settings = settings; - _storeService = storeService; - _dateTimeHelper = dateTimeHelper; - _displayControl = displayControl; - _chronometer = chronometer; - _messageFactory = messageFactory; - } + _settings = settings; + _storeService = storeService; + _dateTimeHelper = dateTimeHelper; + _displayControl = displayControl; + _chronometer = chronometer; + _messageFactory = messageFactory; + } - public IComponentContext Container => _container; - public IApplicationEnvironment ApplicationEnvironment => _env.Value; - public ICacheManager Cache => _cacheManager.Value; - public IRequestCache RequestCache => _requestCache.Value; - public IDbContext DbContext => _dbContext.Value; - public IStoreContext StoreContext => _storeContext.Value; - public IWebHelper WebHelper => _webHelper.Value; - public IWorkContext WorkContext => _workContext.Value; - public IEventPublisher EventPublisher => _eventPublisher.Value; - public ILocalizationService Localization => _localization.Value; - public ICustomerActivityService CustomerActivity => _customerActivity.Value; - public IMediaService MediaService => _mediaService.Value; - public INotifier Notifier => _notifier.Value; + public IComponentContext Container => _container; + public IApplicationEnvironment ApplicationEnvironment => _env.Value; + public ICacheManager Cache => _cacheManager.Value; + public IRequestCache RequestCache => _requestCache.Value; + public IDbContext DbContext => _dbContext.Value; + public IStoreContext StoreContext => _storeContext.Value; + public IWebHelper WebHelper => _webHelper.Value; + public IWorkContext WorkContext => _workContext.Value; + public IEventPublisher EventPublisher => _eventPublisher.Value; + public ILocalizationService Localization => _localization.Value; + public ICustomerActivityService CustomerActivity => _customerActivity.Value; + public IMediaService MediaService => _mediaService.Value; + public INotifier Notifier => _notifier.Value; public IPermissionService Permissions => _permissions.Value; public ISettingService Settings => _settings.Value; - public IStoreService StoreService => _storeService.Value; - public IDateTimeHelper DateTimeHelper => _dateTimeHelper.Value; - public IDisplayControl DisplayControl => _displayControl.Value; - public IChronometer Chronometer => _chronometer.Value; - public IMessageFactory MessageFactory => _messageFactory.Value; - } + public IStoreService StoreService => _storeService.Value; + public IDateTimeHelper DateTimeHelper => _dateTimeHelper.Value; + public IDisplayControl DisplayControl => _displayControl.Value; + public IChronometer Chronometer => _chronometer.Value; + public IMessageFactory MessageFactory => _messageFactory.Value; + } } diff --git a/src/Libraries/SmartStore.Services/Configuration/SettingService.cs b/src/Libraries/SmartStore.Services/Configuration/SettingService.cs index 34680e47df..da2bc618a3 100644 --- a/src/Libraries/SmartStore.Services/Configuration/SettingService.cs +++ b/src/Libraries/SmartStore.Services/Configuration/SettingService.cs @@ -16,129 +16,129 @@ namespace SmartStore.Services.Configuration { - public partial class SettingService : ScopedServiceBase, ISettingService + public partial class SettingService : ScopedServiceBase, ISettingService { - private const string SETTINGS_ALL_KEY = "setting:all"; + private const string SETTINGS_ALL_KEY = "setting:all"; private readonly IRepository _settingRepository; private readonly ICacheManager _cacheManager; - public SettingService(ICacheManager cacheManager, IRepository settingRepository) + public SettingService(ICacheManager cacheManager, IRepository settingRepository) { _cacheManager = cacheManager; _settingRepository = settingRepository; } - public ILogger Logger { get; set; } = NullLogger.Instance; - - protected virtual IDictionary GetAllCachedSettings() - { - return _cacheManager.Get(SETTINGS_ALL_KEY, () => - { - var query = from s in _settingRepository.TableUntracked - orderby s.Name, s.StoreId - select s; - - var settings = query.ToList(); - var dictionary = new Dictionary(StringComparer.OrdinalIgnoreCase); - foreach (var s in settings) - { - var settingKey = CreateCacheKey(s.Name, s.StoreId); - - var cachedSetting = new CachedSetting - { - Id = s.Id, - Name = s.Name, - Value = s.Value, - StoreId = s.StoreId - }; - - dictionary[settingKey] = cachedSetting; - } - - return dictionary; - }, independent: true, allowRecursion: true); - } - - protected virtual PropertyInfo GetPropertyInfo(Expression> keySelector) - { - var member = keySelector.Body as MemberExpression; - if (member == null) - { - throw new ArgumentException($"Expression '{keySelector}' refers to a method, not a property."); - } - - var propInfo = member.Member as PropertyInfo; - if (propInfo == null) - { - throw new ArgumentException($"Expression '{keySelector}' refers to a field, not a property."); - } - - return propInfo; - } - - public virtual void InsertSetting(Setting setting, bool clearCache = true) + public ILogger Logger { get; set; } = NullLogger.Instance; + + protected virtual IDictionary GetAllCachedSettings() + { + return _cacheManager.Get(SETTINGS_ALL_KEY, () => + { + var query = from s in _settingRepository.TableUntracked + orderby s.Name, s.StoreId + select s; + + var settings = query.ToList(); + var dictionary = new Dictionary(StringComparer.OrdinalIgnoreCase); + foreach (var s in settings) + { + var settingKey = CreateCacheKey(s.Name, s.StoreId); + + var cachedSetting = new CachedSetting + { + Id = s.Id, + Name = s.Name, + Value = s.Value, + StoreId = s.StoreId + }; + + dictionary[settingKey] = cachedSetting; + } + + return dictionary; + }, independent: true, allowRecursion: true); + } + + protected virtual PropertyInfo GetPropertyInfo(Expression> keySelector) + { + var member = keySelector.Body as MemberExpression; + if (member == null) + { + throw new ArgumentException($"Expression '{keySelector}' refers to a method, not a property."); + } + + var propInfo = member.Member as PropertyInfo; + if (propInfo == null) + { + throw new ArgumentException($"Expression '{keySelector}' refers to a field, not a property."); + } + + return propInfo; + } + + public virtual void InsertSetting(Setting setting, bool clearCache = true) { - Guard.NotNull(setting, nameof(setting)); + Guard.NotNull(setting, nameof(setting)); - _settingRepository.Insert(setting); + _settingRepository.Insert(setting); - HasChanges = true; + HasChanges = true; - if (clearCache) - ClearCache(); + if (clearCache) + ClearCache(); } public virtual void UpdateSetting(Setting setting, bool clearCache = true) { - Guard.NotNull(setting, nameof(setting)); + Guard.NotNull(setting, nameof(setting)); _settingRepository.Update(setting); - HasChanges = true; + HasChanges = true; - if (clearCache) - ClearCache(); + if (clearCache) + ClearCache(); } - private ISettings LoadSettingsJson(Type settingType, int storeId = 0) - { - string key = settingType.Namespace + "." + settingType.Name; + private ISettings LoadSettingsJson(Type settingType, int storeId = 0) + { + string key = settingType.Namespace + "." + settingType.Name; - var settings = (ISettings)Activator.CreateInstance(settingType); + var settings = (ISettings)Activator.CreateInstance(settingType); - var rawSetting = GetSettingByKey(key, storeId: storeId, loadSharedValueIfNotFound: true); - if (rawSetting.HasValue()) - { - JsonConvert.PopulateObject(rawSetting, settings); - } + var rawSetting = GetSettingByKey(key, storeId: storeId, loadSharedValueIfNotFound: true); + if (rawSetting.HasValue()) + { + JsonConvert.PopulateObject(rawSetting, settings); + } - return settings; - } + return settings; + } - private void SaveSettingsJson(ISettings settings) - { - Type t = settings.GetType(); - string key = t.Namespace + "." + t.Name; - var storeId = 0; + private void SaveSettingsJson(ISettings settings) + { + Type t = settings.GetType(); + string key = t.Namespace + "." + t.Name; + var storeId = 0; - var rawSettings = JsonConvert.SerializeObject(settings); - SetSetting(key, rawSettings, storeId, true); - } + var rawSettings = JsonConvert.SerializeObject(settings); + SetSetting(key, rawSettings, storeId, true); + } - private void DeleteSettingsJson() - { - Type t = typeof(T); - string key = t.Namespace + "." + t.Name; + private void DeleteSettingsJson() + { + Type t = typeof(T); + string key = t.Namespace + "." + t.Name; - var setting = GetAllSettings() - .FirstOrDefault(x => x.Name.Equals(key, StringComparison.InvariantCultureIgnoreCase)); + var setting = GetAllSettings() + .FirstOrDefault(x => x.Name.Equals(key, StringComparison.InvariantCultureIgnoreCase)); - if (setting != null) - { - DeleteSetting(setting); - } - } + if (setting != null) + { + DeleteSetting(setting); + } + } public virtual Setting GetSettingById(int settingId) @@ -150,405 +150,406 @@ public virtual Setting GetSettingById(int settingId) return setting; } - public virtual Setting GetSettingEntityByKey(string key, int storeId = 0) - { - Guard.NotEmpty(key, nameof(key)); - - var query = _settingRepository.Table.Where(x => x.Name == key); - - if (storeId > 0) - { - query = query.Where(x => x.StoreId == storeId || x.StoreId == 0).OrderByDescending(x => x.StoreId); - } - else - { - query = query.Where(x => x.StoreId == 0); - } - - return query.FirstOrDefault(); - } - - public virtual T GetSettingByKey( - string key, - T defaultValue = default, - int storeId = 0, - bool loadSharedValueIfNotFound = false) + public virtual Setting GetSettingEntityByKey(string key, int storeId = 0) + { + Guard.NotEmpty(key, nameof(key)); + + var query = _settingRepository.Table.Where(x => x.Name == key); + + if (storeId > 0) + { + query = query.Where(x => x.StoreId == storeId || x.StoreId == 0).OrderByDescending(x => x.StoreId); + } + else + { + query = query.Where(x => x.StoreId == 0); + } + + return query.FirstOrDefault(); + } + + public virtual T GetSettingByKey( + string key, + T defaultValue = default, + int storeId = 0, + bool loadSharedValueIfNotFound = false) { - Guard.NotEmpty(key, nameof(key)); + Guard.NotEmpty(key, nameof(key)); - var settings = GetAllCachedSettings(); + var settings = GetAllCachedSettings(); - var cacheKey = CreateCacheKey(key, storeId); + var cacheKey = CreateCacheKey(key, storeId); - if (settings.TryGetValue(cacheKey, out CachedSetting cachedSetting)) - { - return cachedSetting.Value.Convert(); - } + if (settings.TryGetValue(cacheKey, out CachedSetting cachedSetting)) + { + return cachedSetting.Value.Convert(); + } - // fallback to shared (storeId = 0) if desired - if (storeId > 0 && loadSharedValueIfNotFound) - { - cacheKey = CreateCacheKey(key, 0); - if (settings.TryGetValue(cacheKey, out cachedSetting)) - { - return cachedSetting.Value.Convert(); - } - } + // fallback to shared (storeId = 0) if desired + if (storeId > 0 && loadSharedValueIfNotFound) + { + cacheKey = CreateCacheKey(key, 0); + if (settings.TryGetValue(cacheKey, out cachedSetting)) + { + return cachedSetting.Value.Convert(); + } + } return defaultValue; } - public virtual IList GetAllSettings() - { - var query = from s in _settingRepository.Table - orderby s.Name, s.StoreId - select s; - var settings = query.ToList(); - return settings; - } - - public virtual bool SettingExists( - T settings, - Expression> keySelector, - int storeId = 0) - where T : ISettings, new() - { - var propInfo = GetPropertyInfo(keySelector); - var key = string.Concat(typeof(T).Name, ".", propInfo.Name); - - string setting = GetSettingByKey(key, storeId: storeId); - return setting != null; - } + public virtual IList GetAllSettings() + { + var query = from s in _settingRepository.Table + orderby s.Name, s.StoreId + select s; + var settings = query.ToList(); + return settings; + } + + public virtual bool SettingExists( + T settings, + Expression> keySelector, + int storeId = 0) + where T : ISettings, new() + { + var propInfo = GetPropertyInfo(keySelector); + var key = string.Concat(typeof(T).Name, ".", propInfo.Name); + + string setting = GetSettingByKey(key, storeId: storeId); + return setting != null; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public T LoadSetting(int storeId = 0) where T : ISettings, new() - { - return (T)LoadSettingCore(typeof(T), storeId); - } - - public ISettings LoadSetting(Type settingType, int storeId = 0) - { - Guard.NotNull(settingType, nameof(settingType)); - Guard.HasDefaultConstructor(settingType); - - if (!typeof(ISettings).IsAssignableFrom(settingType)) - { - throw new ArgumentException($"The type to load settings for must be a subclass of the '{typeof(ISettings).FullName}' interface", nameof(settingType)); - } - - return LoadSettingCore(settingType, storeId); - } - - protected virtual ISettings LoadSettingCore(Type settingType, int storeId = 0) - { - var allSettings = GetAllCachedSettings(); - var instance = (ISettings)Activator.CreateInstance(settingType); - var prefix = settingType.Name; - - foreach (var fastProp in FastProperty.GetProperties(settingType).Values) - { - var prop = fastProp.Property; - - // Get properties we can read and write to - if (!prop.CanWrite) - continue; - - string key = prefix + "." + prop.Name; - - if (!allSettings.TryGetValue(CreateCacheKey(key, storeId), out var cachedSetting) && storeId > 0) - { - // Fallback to shared (storeId = 0) - allSettings.TryGetValue(CreateCacheKey(key, 0), out cachedSetting); - } - - string setting = cachedSetting?.Value; - - if (setting == null) - { - if (fastProp.IsSequenceType) - { - if ((fastProp.GetValue(instance) as IEnumerable) != null) - { - // Instance of IEnumerable<> was already created, most likely in the constructor of the settings concrete class. - // In this case we shouldn't let the EnumerableConverter create a new instance but keep this one. - continue; - } - } - else - { - #region Obsolete ('EnumerableConverter' can handle this case now) - //if (prop.PropertyType.IsGenericType && prop.PropertyType.GetGenericTypeDefinition() == typeof(List<>)) - //{ - // // convenience: don't return null for simple list types - // var listArg = prop.PropertyType.GetGenericArguments()[0]; - // object list = null; - - // if (listArg == typeof(int)) - // list = new List(); - // else if (listArg == typeof(decimal)) - // list = new List(); - // else if (listArg == typeof(string)) - // list = new List(); - - // if (list != null) - // { - // fastProp.SetValue(settings, list); - // } - //} - #endregion - - continue; - } - - } - - var converter = TypeConverterFactory.GetConverter(prop.PropertyType); - - if (converter == null || !converter.CanConvertFrom(typeof(string))) - continue; - - try - { - object value = converter.ConvertFrom(setting); - - // Set property - fastProp.SetValue(instance, value); - } - catch (Exception ex) - { - var msg = "Could not convert setting '{0}' to type '{1}'".FormatInvariant(key, prop.PropertyType.Name); - Logger.Error(ex, msg); - } - } - - return instance; - } - - public virtual SaveSettingResult SetSetting(string key, T value, int storeId = 0, bool clearCache = true) + { + return (T)LoadSettingCore(typeof(T), storeId); + } + + public ISettings LoadSetting(Type settingType, int storeId = 0) + { + Guard.NotNull(settingType, nameof(settingType)); + Guard.HasDefaultConstructor(settingType); + + if (!typeof(ISettings).IsAssignableFrom(settingType)) + { + throw new ArgumentException($"The type to load settings for must be a subclass of the '{typeof(ISettings).FullName}' interface", nameof(settingType)); + } + + return LoadSettingCore(settingType, storeId); + } + + protected virtual ISettings LoadSettingCore(Type settingType, int storeId = 0) + { + var allSettings = GetAllCachedSettings(); + var instance = (ISettings)Activator.CreateInstance(settingType); + var prefix = settingType.Name; + + foreach (var fastProp in FastProperty.GetProperties(settingType).Values) + { + var prop = fastProp.Property; + + // Get properties we can read and write to + if (!prop.CanWrite) + continue; + + string key = prefix + "." + prop.Name; + + if (!allSettings.TryGetValue(CreateCacheKey(key, storeId), out var cachedSetting) && storeId > 0) + { + // Fallback to shared (storeId = 0) + allSettings.TryGetValue(CreateCacheKey(key, 0), out cachedSetting); + } + + string setting = cachedSetting?.Value; + + if (setting == null) + { + if (fastProp.IsSequenceType) + { + if ((fastProp.GetValue(instance) as IEnumerable) != null) + { + // Instance of IEnumerable<> was already created, most likely in the constructor of the settings concrete class. + // In this case we shouldn't let the EnumerableConverter create a new instance but keep this one. + continue; + } + } + else + { + #region Obsolete ('EnumerableConverter' can handle this case now) + //if (prop.PropertyType.IsGenericType && prop.PropertyType.GetGenericTypeDefinition() == typeof(List<>)) + //{ + // // convenience: don't return null for simple list types + // var listArg = prop.PropertyType.GetGenericArguments()[0]; + // object list = null; + + // if (listArg == typeof(int)) + // list = new List(); + // else if (listArg == typeof(decimal)) + // list = new List(); + // else if (listArg == typeof(string)) + // list = new List(); + + // if (list != null) + // { + // fastProp.SetValue(settings, list); + // } + //} + #endregion + + continue; + } + + } + + var converter = TypeConverterFactory.GetConverter(prop.PropertyType); + + if (converter == null || !converter.CanConvertFrom(typeof(string))) + continue; + + try + { + object value = converter.ConvertFrom(setting); + + // Set property + fastProp.SetValue(instance, value); + } + catch (Exception ex) + { + var msg = "Could not convert setting '{0}' to type '{1}'".FormatInvariant(key, prop.PropertyType.Name); + Logger.Error(ex, msg); + } + } + + return instance; + } + + public virtual SaveSettingResult SetSetting(string key, T value, int storeId = 0, bool clearCache = true) { Guard.NotEmpty(key, nameof(key)); - var str = value.Convert(); - var allSettings = GetAllCachedSettings(); - var cacheKey = CreateCacheKey(key, storeId); - var insert = false; - - if (allSettings.TryGetValue(cacheKey, out CachedSetting cachedSetting)) - { - var setting = GetSettingById(cachedSetting.Id); - if (setting != null) - { - // Update - if (setting.Value != str) - { - setting.Value = str; - UpdateSetting(setting, clearCache); - return SaveSettingResult.Modified; - } - } - else - { - insert = true; - } - } - else - { - insert = true; - } - - if (insert) - { - // Insert - var setting = new Setting - { - Name = key.ToLowerInvariant(), - Value = str, - StoreId = storeId - }; - InsertSetting(setting, clearCache); - return SaveSettingResult.Inserted; - } - - return SaveSettingResult.Unchanged; + var str = value.Convert(); + var allSettings = GetAllCachedSettings(); + var cacheKey = CreateCacheKey(key, storeId); + var insert = false; + + if (allSettings.TryGetValue(cacheKey, out CachedSetting cachedSetting)) + { + var setting = GetSettingById(cachedSetting.Id); + if (setting != null) + { + // Update + if (setting.Value != str) + { + setting.Value = str; + UpdateSetting(setting, clearCache); + return SaveSettingResult.Modified; + } + } + else + { + insert = true; + } + } + else + { + insert = true; + } + + if (insert) + { + // Insert + var setting = new Setting + { + Name = key.ToLowerInvariant(), + Value = str, + StoreId = storeId + }; + InsertSetting(setting, clearCache); + return SaveSettingResult.Inserted; + } + + return SaveSettingResult.Unchanged; } - [MethodImpl(MethodImplOptions.AggressiveInlining)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool SaveSetting(T settings, int storeId = 0) where T : ISettings, new() { - Guard.NotNull(settings, nameof(settings)); + Guard.NotNull(settings, nameof(settings)); - using (BeginScope(clearCache: true)) - { - var hasChanges = false; - var modifiedProperties = new Dictionary(StringComparer.OrdinalIgnoreCase); - var settingType = typeof(T); - var prefix = settingType.Name; + using (BeginScope(clearCache: true)) + { + var hasChanges = false; + var modifiedProperties = new Dictionary(StringComparer.OrdinalIgnoreCase); + var settingType = typeof(T); + var prefix = settingType.Name; - /* We do not clear cache after each setting update. + /* We do not clear cache after each setting update. * This behavior can increase performance because cached settings will not be cleared * and loaded from database after each update */ - foreach (var prop in FastProperty.GetProperties(settingType).Values) - { - // get properties we can read and write to - if (!prop.IsPublicSettable) - continue; - - var converter = TypeConverterFactory.GetConverter(prop.Property.PropertyType); - if (converter == null || !converter.CanConvertFrom(typeof(string))) - continue; - - string key = prefix + "." + prop.Name; - // Duck typing is not supported in C#. That's why we're using dynamic type - dynamic currentValue = prop.GetValue(settings); - - if (SetSetting(key, currentValue ?? "", storeId, false) > SaveSettingResult.Unchanged) - { - hasChanges = true; - } - } - - return hasChanges; - } - } - - public virtual SaveSettingResult SaveSetting( - T settings, - Expression> keySelector, - int storeId = 0, - bool clearCache = true) where T : ISettings, new() - { - var propInfo = GetPropertyInfo(keySelector); - var key = string.Concat(typeof(T).Name, ".", propInfo.Name); - - // Duck typing is not supported in C#. That's why we're using dynamic type. - var fastProp = FastProperty.GetProperty(propInfo, PropertyCachingStrategy.EagerCached); - dynamic currentValue = fastProp.GetValue(settings); - - return SetSetting(key, currentValue ?? "", storeId, clearCache); - } - - public virtual SaveSettingResult UpdateSetting( - T settings, - Expression> keySelector, - bool overrideForStore, - int storeId = 0) where T : ISettings, new() - { - if (overrideForStore || storeId == 0) - { - return SaveSetting(settings, keySelector, storeId, false); - } - else if (storeId > 0 && DeleteSetting(settings, keySelector, storeId)) - { - return SaveSettingResult.Deleted; - } - - return SaveSettingResult.Unchanged; - } - - public virtual void DeleteSetting(Setting setting) - { - if (setting == null) - throw new ArgumentNullException("setting"); - - _settingRepository.Delete(setting); - - HasChanges = true; - - ClearCache(); - } + foreach (var prop in FastProperty.GetProperties(settingType).Values) + { + // get properties we can read and write to + if (!prop.IsPublicSettable) + continue; + + var converter = TypeConverterFactory.GetConverter(prop.Property.PropertyType); + if (converter == null || !converter.CanConvertFrom(typeof(string))) + continue; + + string key = prefix + "." + prop.Name; + // Duck typing is not supported in C#. That's why we're using dynamic type + dynamic currentValue = prop.GetValue(settings); + + if (SetSetting(key, currentValue ?? "", storeId, false) > SaveSettingResult.Unchanged) + { + hasChanges = true; + } + } + + return hasChanges; + } + } + + public virtual SaveSettingResult SaveSetting( + T settings, + Expression> keySelector, + int storeId = 0, + bool clearCache = true) where T : ISettings, new() + { + var propInfo = GetPropertyInfo(keySelector); + var key = string.Concat(typeof(T).Name, ".", propInfo.Name); + + // Duck typing is not supported in C#. That's why we're using dynamic type. + var fastProp = FastProperty.GetProperty(propInfo, PropertyCachingStrategy.EagerCached); + dynamic currentValue = fastProp.GetValue(settings); + + return SetSetting(key, currentValue ?? "", storeId, clearCache); + } + + public virtual SaveSettingResult UpdateSetting( + T settings, + Expression> keySelector, + bool overrideForStore, + int storeId = 0) where T : ISettings, new() + { + if (overrideForStore || storeId == 0) + { + return SaveSetting(settings, keySelector, storeId, false); + } + else if (storeId > 0 && DeleteSetting(settings, keySelector, storeId)) + { + return SaveSettingResult.Deleted; + } + + return SaveSettingResult.Unchanged; + } + + public virtual void DeleteSetting(Setting setting) + { + if (setting == null) + throw new ArgumentNullException("setting"); + + _settingRepository.Delete(setting); + + HasChanges = true; + + ClearCache(); + } public virtual void DeleteSetting() where T : ISettings, new() { - using (BeginScope()) - { - var settingsToDelete = new List(); - var allSettings = GetAllSettings(); - foreach (var prop in typeof(T).GetProperties()) - { - string key = typeof(T).Name + "." + prop.Name; - settingsToDelete.AddRange(allSettings.Where(x => x.Name.Equals(key, StringComparison.InvariantCultureIgnoreCase))); - } - - foreach (var setting in settingsToDelete) - { - DeleteSetting(setting); - } - } + using (BeginScope()) + { + var settingsToDelete = new List(); + var allSettings = GetAllSettings(); + foreach (var prop in typeof(T).GetProperties()) + { + string key = typeof(T).Name + "." + prop.Name; + settingsToDelete.AddRange(allSettings.Where(x => x.Name.Equals(key, StringComparison.InvariantCultureIgnoreCase))); + } + + foreach (var setting in settingsToDelete) + { + DeleteSetting(setting); + } + } + } + + public virtual bool DeleteSetting( + T settings, + Expression> keySelector, + int storeId = 0) where T : ISettings, new() + { + var propInfo = GetPropertyInfo(keySelector); + var key = string.Concat(typeof(T).Name, ".", propInfo.Name); + + return DeleteSetting(key, storeId); } - public virtual bool DeleteSetting( - T settings, - Expression> keySelector, - int storeId = 0) where T : ISettings, new() - { - var propInfo = GetPropertyInfo(keySelector); - var key = string.Concat(typeof(T).Name, ".", propInfo.Name); - - return DeleteSetting(key, storeId); - } - - public virtual bool DeleteSetting(string key, int storeId = 0) - { - if (key.HasValue()) - { - key = key.Trim().ToLowerInvariant(); - - var setting = ( - from s in _settingRepository.Table - where s.StoreId == storeId && s.Name == key - select s).FirstOrDefault(); - - if (setting != null) - { - DeleteSetting(setting); - return true; - } - } - - return false; - } - - public virtual int DeleteSettings(string rootKey) { - int result = 0; - - if (rootKey.IsEmpty()) - return 0; - - try - { - string sqlDelete = "DELETE FROM [Setting] WHERE [Name] LIKE '{0}%'".FormatWith(rootKey.EndsWith(".") ? rootKey : rootKey + "."); - result = _settingRepository.Context.ExecuteSqlCommand(sqlDelete); - - if (result > 0) - HasChanges = true; - - ClearCache(); - } - catch (Exception exc) - { - exc.Dump(); - } - - return result; - } - - protected override void OnClearCache() - { - _cacheManager.Remove(SETTINGS_ALL_KEY); - } - - protected string CreateCacheKey(string name, int storeId) - { - return name.Trim().ToLowerInvariant() + "/" + storeId.ToString(); - } + public virtual bool DeleteSetting(string key, int storeId = 0) + { + if (key.HasValue()) + { + key = key.Trim().ToLowerInvariant(); + + var setting = ( + from s in _settingRepository.Table + where s.StoreId == storeId && s.Name == key + select s).FirstOrDefault(); + + if (setting != null) + { + DeleteSetting(setting); + return true; + } + } + + return false; + } + + public virtual int DeleteSettings(string rootKey) + { + int result = 0; + + if (rootKey.IsEmpty()) + return 0; + + try + { + string sqlDelete = "DELETE FROM [Setting] WHERE [Name] LIKE '{0}%'".FormatWith(rootKey.EndsWith(".") ? rootKey : rootKey + "."); + result = _settingRepository.Context.ExecuteSqlCommand(sqlDelete); + + if (result > 0) + HasChanges = true; + + ClearCache(); + } + catch (Exception exc) + { + exc.Dump(); + } + + return result; + } + + protected override void OnClearCache() + { + _cacheManager.Remove(SETTINGS_ALL_KEY); + } + + protected string CreateCacheKey(string name, int storeId) + { + return name.Trim().ToLowerInvariant() + "/" + storeId.ToString(); + } } - [Serializable] - public class CachedSetting - { - public int Id { get; set; } - public string Name { get; set; } - public string Value { get; set; } - public int StoreId { get; set; } - } + [Serializable] + public class CachedSetting + { + public int Id { get; set; } + public string Name { get; set; } + public string Value { get; set; } + public int StoreId { get; set; } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Customers/ChangePasswordRequest.cs b/src/Libraries/SmartStore.Services/Customers/ChangePasswordRequest.cs index 54b0e26ef4..cb8e9a5306 100644 --- a/src/Libraries/SmartStore.Services/Customers/ChangePasswordRequest.cs +++ b/src/Libraries/SmartStore.Services/Customers/ChangePasswordRequest.cs @@ -10,7 +10,7 @@ public class ChangePasswordRequest public string NewPassword { get; set; } public string OldPassword { get; set; } - public ChangePasswordRequest(string email, bool validateRequest, + public ChangePasswordRequest(string email, bool validateRequest, PasswordFormat newPasswordFormat, string newPassword, string oldPassword = "") { this.Email = email; diff --git a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs index c31ce56845..d9377089a2 100644 --- a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs +++ b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs @@ -14,165 +14,166 @@ namespace SmartStore.Services.Customers { - /// - /// Class that will be serialized and stored as string in a cookie. - /// - public class ConsentCookie - { - public bool AllowAnalytics { get; set; } - public bool AllowThirdParty { get; set; } - } - - public partial class CookieManager : ICookieManager - { - private readonly ICommonServices _services; - private readonly ITypeFinder _typeFinder; - private readonly HttpContextBase _httpContext; - private readonly PrivacySettings _privacySettings; - - public const string ConsentCookieName = "CookieConsent"; - - private readonly static object _lock = new object(); - private static IList _cookiePublisherTypes = null; - - public CookieManager( - ICommonServices services, - ITypeFinder typeFinder, - HttpContextBase httpContext, - PrivacySettings privacySettings) - { - _services = services; - _typeFinder = typeFinder; - _httpContext = httpContext; - _privacySettings = privacySettings; - } - - public LocalizerEx T { get; set; } = NullLocalizer.InstanceEx; - - public ILogger Logger { get; set; } = NullLogger.Instance; - - protected virtual IEnumerable GetAllCookiePublishers() - { - if (_cookiePublisherTypes == null) - { - lock (_lock) - { - if (_cookiePublisherTypes == null) - { - _cookiePublisherTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true).ToList(); - } - } - } - - var cookiePublishers = _cookiePublisherTypes - .Select(x => EngineContext.Current.ContainerManager.ResolveUnregistered(x) as ICookiePublisher) - .ToArray(); - - return cookiePublishers; - } - - public virtual List GetAllCookieInfos(bool addSettingCookies = false) - { - var cookieInfos = new List(); - var plugins = GetAllCookiePublishers(); - - foreach(var plugin in plugins) - { - var typedInstance = plugin as ICookiePublisher; - var cookieInfo = typedInstance.GetCookieInfo(); - if (cookieInfo != null) - cookieInfos.Add(cookieInfo); - } - - // Add user defined cookies from privacy settings. - if (addSettingCookies && _privacySettings.CookieInfos.HasValue()) - { - var ciList = JsonConvert.DeserializeObject>(_privacySettings.CookieInfos); - - if (ciList != null && ciList.Count > 0) - { - foreach (var ci in ciList) - { - ci.Name = ci.GetLocalized(x => x.Name); - ci.Description = ci.GetLocalized(x => x.Description); - cookieInfos.Add(ci); - } - } - } - - return cookieInfos; - } - - public virtual bool IsCookieAllowed(ControllerContext context, CookieType cookieType) - { - // Ask whether cookie type is allowed. - var cookie = context.HttpContext.Request.Cookies[ConsentCookieName]; - if (cookie != null) - { - try - { - var cookieData = JsonConvert.DeserializeObject(cookie.Value); - if ((cookieData.AllowAnalytics && cookieType == CookieType.Analytics) || (cookieData.AllowThirdParty && cookieType == CookieType.ThirdParty)) - { - return true; - } - } - catch { - // Lets be tolerant in case of error. - return true; - } - } - - // If no cookie was set return false - return false; - } - - public virtual void SetConsentCookie(HttpResponseBase response, bool allowAnalytics = false, bool allowThirdParty = false) - { - var expiry = TimeSpan.FromDays(365); - - var cookieData = new ConsentCookie - { - AllowAnalytics = allowAnalytics, - AllowThirdParty = allowThirdParty - }; - - var secure = _services.WebHelper.IsCurrentConnectionSecured(); - var consentCookie = new HttpCookie(ConsentCookieName) - { - // Store JSON serialized object which contains current allowed types (Analytics & ThirdParty) in cookie. - Value = JsonConvert.SerializeObject(cookieData), - Expires = DateTime.UtcNow + expiry, - Secure = secure, - SameSite = secure ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax - }; - - response.Cookies.Set(consentCookie); - } - - public virtual ConsentCookie GetCookieData(ControllerContext context) - { - var httpContext = context.HttpContext; - - if (httpContext.Items.Contains(ConsentCookieName)) - { - return httpContext.Items[ConsentCookieName] as ConsentCookie; - } - - var cookie = httpContext.Request.Cookies[ConsentCookieName]; - - if (cookie != null) - { - try - { - var cookieData = JsonConvert.DeserializeObject(cookie.Value); - httpContext.Items[ConsentCookieName] = cookieData; - return cookieData; - } - catch { } - } - - return null; - } - } + /// + /// Class that will be serialized and stored as string in a cookie. + /// + public class ConsentCookie + { + public bool AllowAnalytics { get; set; } + public bool AllowThirdParty { get; set; } + } + + public partial class CookieManager : ICookieManager + { + private readonly ICommonServices _services; + private readonly ITypeFinder _typeFinder; + private readonly HttpContextBase _httpContext; + private readonly PrivacySettings _privacySettings; + + public const string ConsentCookieName = "CookieConsent"; + + private readonly static object _lock = new object(); + private static IList _cookiePublisherTypes = null; + + public CookieManager( + ICommonServices services, + ITypeFinder typeFinder, + HttpContextBase httpContext, + PrivacySettings privacySettings) + { + _services = services; + _typeFinder = typeFinder; + _httpContext = httpContext; + _privacySettings = privacySettings; + } + + public LocalizerEx T { get; set; } = NullLocalizer.InstanceEx; + + public ILogger Logger { get; set; } = NullLogger.Instance; + + protected virtual IEnumerable GetAllCookiePublishers() + { + if (_cookiePublisherTypes == null) + { + lock (_lock) + { + if (_cookiePublisherTypes == null) + { + _cookiePublisherTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true).ToList(); + } + } + } + + var cookiePublishers = _cookiePublisherTypes + .Select(x => EngineContext.Current.ContainerManager.ResolveUnregistered(x) as ICookiePublisher) + .ToArray(); + + return cookiePublishers; + } + + public virtual List GetAllCookieInfos(bool addSettingCookies = false) + { + var cookieInfos = new List(); + var plugins = GetAllCookiePublishers(); + + foreach (var plugin in plugins) + { + var typedInstance = plugin as ICookiePublisher; + var cookieInfo = typedInstance.GetCookieInfo(); + if (cookieInfo != null) + cookieInfos.Add(cookieInfo); + } + + // Add user defined cookies from privacy settings. + if (addSettingCookies && _privacySettings.CookieInfos.HasValue()) + { + var ciList = JsonConvert.DeserializeObject>(_privacySettings.CookieInfos); + + if (ciList != null && ciList.Count > 0) + { + foreach (var ci in ciList) + { + ci.Name = ci.GetLocalized(x => x.Name); + ci.Description = ci.GetLocalized(x => x.Description); + cookieInfos.Add(ci); + } + } + } + + return cookieInfos; + } + + public virtual bool IsCookieAllowed(ControllerContext context, CookieType cookieType) + { + // Ask whether cookie type is allowed. + var cookie = context.HttpContext.Request.Cookies[ConsentCookieName]; + if (cookie != null) + { + try + { + var cookieData = JsonConvert.DeserializeObject(cookie.Value); + if ((cookieData.AllowAnalytics && cookieType == CookieType.Analytics) || (cookieData.AllowThirdParty && cookieType == CookieType.ThirdParty)) + { + return true; + } + } + catch + { + // Lets be tolerant in case of error. + return true; + } + } + + // If no cookie was set return false + return false; + } + + public virtual void SetConsentCookie(HttpResponseBase response, bool allowAnalytics = false, bool allowThirdParty = false) + { + var expiry = TimeSpan.FromDays(365); + + var cookieData = new ConsentCookie + { + AllowAnalytics = allowAnalytics, + AllowThirdParty = allowThirdParty + }; + + var secure = _services.WebHelper.IsCurrentConnectionSecured(); + var consentCookie = new HttpCookie(ConsentCookieName) + { + // Store JSON serialized object which contains current allowed types (Analytics & ThirdParty) in cookie. + Value = JsonConvert.SerializeObject(cookieData), + Expires = DateTime.UtcNow + expiry, + Secure = secure, + SameSite = secure ? (SameSiteMode)_privacySettings.SameSiteMode : SameSiteMode.Lax + }; + + response.Cookies.Set(consentCookie); + } + + public virtual ConsentCookie GetCookieData(ControllerContext context) + { + var httpContext = context.HttpContext; + + if (httpContext.Items.Contains(ConsentCookieName)) + { + return httpContext.Items[ConsentCookieName] as ConsentCookie; + } + + var cookie = httpContext.Request.Cookies[ConsentCookieName]; + + if (cookie != null) + { + try + { + var cookieData = JsonConvert.DeserializeObject(cookie.Value); + httpContext.Items[ConsentCookieName] = cookieData; + return cookieData; + } + catch { } + } + + return null; + } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerContentService.cs b/src/Libraries/SmartStore.Services/Customers/CustomerContentService.cs index f8b95eace3..564247e889 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerContentService.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerContentService.cs @@ -17,7 +17,7 @@ public CustomerContentService(IRepository contentRepository) public virtual void DeleteCustomerContent(CustomerContent content) { - Guard.NotNull(content, nameof(content)); + Guard.NotNull(content, nameof(content)); _contentRepository.Delete(content); } @@ -70,21 +70,21 @@ public virtual CustomerContent GetCustomerContentById(int contentId) return null; return _contentRepository.GetById(contentId); - + } public virtual void InsertCustomerContent(CustomerContent content) { - Guard.NotNull(content, nameof(content)); + Guard.NotNull(content, nameof(content)); - _contentRepository.Insert(content); + _contentRepository.Insert(content); } public virtual void UpdateCustomerContent(CustomerContent content) { - Guard.NotNull(content, nameof(content)); + Guard.NotNull(content, nameof(content)); - _contentRepository.Update(content); + _contentRepository.Update(content); } } } diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerExtensions.cs b/src/Libraries/SmartStore.Services/Customers/CustomerExtensions.cs index 833be4ccd9..cb0880844c 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerExtensions.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerExtensions.cs @@ -17,7 +17,7 @@ namespace SmartStore.Services.Customers { - public static class CustomerExtentions + public static class CustomerExtentions { private static readonly string[] _systemColors = new string[] { "primary", "secondary", "success", "info", "warning", "danger", "light", "dark" }; @@ -30,10 +30,10 @@ public static class CustomerExtentions /// Result public static bool IsInCustomerRole(this Customer customer, string customerRoleSystemName, bool onlyActiveCustomerRoles = true) { - Guard.NotNull(customer, nameof(customer)); - Guard.NotEmpty(customerRoleSystemName, nameof(customerRoleSystemName)); + Guard.NotNull(customer, nameof(customer)); + Guard.NotEmpty(customerRoleSystemName, nameof(customerRoleSystemName)); - var result = customer.CustomerRoleMappings + var result = customer.CustomerRoleMappings .Where(rm => !onlyActiveCustomerRoles || rm.CustomerRole.Active) .Where(rm => rm.CustomerRole.SystemName == customerRoleSystemName) .FirstOrDefault() != null; @@ -48,10 +48,10 @@ public static bool IsInCustomerRole(this Customer customer, string customerRoleS /// Result public static bool IsBackgroundTaskAccount(this Customer customer) { - Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(customer, nameof(customer)); - if (!customer.IsSystemAccount || customer.SystemName.IsEmpty()) - return false; + if (!customer.IsSystemAccount || customer.SystemName.IsEmpty()) + return false; var result = customer.SystemName.Equals(SystemCustomerNames.BackgroundTask, StringComparison.InvariantCultureIgnoreCase); return result; @@ -64,30 +64,30 @@ public static bool IsBackgroundTaskAccount(this Customer customer) /// Result public static bool IsSearchEngineAccount(this Customer customer) { - Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(customer, nameof(customer)); - if (!customer.IsSystemAccount || customer.SystemName.IsEmpty()) - return false; + if (!customer.IsSystemAccount || customer.SystemName.IsEmpty()) + return false; var result = customer.SystemName.Equals(SystemCustomerNames.SearchEngine, StringComparison.InvariantCultureIgnoreCase); return result; } - /// - /// Gets a value indicating whether customer is the pdf converter - /// - /// Customer - /// Result - public static bool IsPdfConverter(this Customer customer) - { - Guard.NotNull(customer, nameof(customer)); + /// + /// Gets a value indicating whether customer is the pdf converter + /// + /// Customer + /// Result + public static bool IsPdfConverter(this Customer customer) + { + Guard.NotNull(customer, nameof(customer)); - if (!customer.IsSystemAccount || customer.SystemName.IsEmpty()) - return false; + if (!customer.IsSystemAccount || customer.SystemName.IsEmpty()) + return false; - var result = customer.SystemName.Equals(SystemCustomerNames.PdfConverter, StringComparison.InvariantCultureIgnoreCase); - return result; - } + var result = customer.SystemName.Equals(SystemCustomerNames.PdfConverter, StringComparison.InvariantCultureIgnoreCase); + return result; + } /// /// Gets a value indicating whether customer is administrator @@ -108,9 +108,10 @@ public static bool IsAdmin(this Customer customer, bool onlyActiveCustomerRoles /// A value indicating whether we should look only in active customer roles /// Result [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool IsSuperAdmin(this Customer customer, bool onlyActiveCustomerRoles = true) { - return IsInCustomerRole(customer, SystemCustomerRoleNames.SuperAdministrators, onlyActiveCustomerRoles); - } + public static bool IsSuperAdmin(this Customer customer, bool onlyActiveCustomerRoles = true) + { + return IsInCustomerRole(customer, SystemCustomerRoleNames.SuperAdministrators, onlyActiveCustomerRoles); + } /// /// Gets a value indicating whether customer is a forum moderator @@ -155,26 +156,26 @@ public static bool IsGuest(this Customer customer, bool onlyActiveCustomerRoles /// Customer full name. public static string GetFullName(this Customer customer) { - if (customer == null) - return string.Empty; - - if (customer.FullName.HasValue()) - { - return customer.FullName; - } - - string name = customer.BillingAddress?.GetFullName(); - if (name.IsEmpty()) - { - name = customer.ShippingAddress?.GetFullName(); - } - if (name.IsEmpty()) - { - name = customer.Addresses.FirstOrDefault()?.GetFullName(); - } - - return name.TrimSafe(); - } + if (customer == null) + return string.Empty; + + if (customer.FullName.HasValue()) + { + return customer.FullName; + } + + string name = customer.BillingAddress?.GetFullName(); + if (name.IsEmpty()) + { + name = customer.ShippingAddress?.GetFullName(); + } + if (name.IsEmpty()) + { + name = customer.Addresses.FirstOrDefault()?.GetFullName(); + } + + return name.TrimSafe(); + } /// /// Gets the display name of a customer (full name, user name or email). @@ -312,31 +313,31 @@ public static string FormatUserName( /// Find any email address of customer /// public static string FindEmail(this Customer customer) - { - if (customer != null) - { - return customer.Email.NullEmpty() - ?? customer.BillingAddress?.Email?.NullEmpty() - ?? customer.ShippingAddress?.Email?.NullEmpty(); - } - - return null; - } - - public static Language GetLanguage(this Customer customer) - { - if (customer == null) - return null; + { + if (customer != null) + { + return customer.Email.NullEmpty() + ?? customer.BillingAddress?.Email?.NullEmpty() + ?? customer.ShippingAddress?.Email?.NullEmpty(); + } + + return null; + } + + public static Language GetLanguage(this Customer customer) + { + if (customer == null) + return null; var language = EngineContext.Current.Resolve().GetLanguageById(customer.GetAttribute(SystemCustomerAttributeNames.LanguageId)); if (language == null || !language.Published) - { - language = EngineContext.Current.Resolve().WorkingLanguage; - } + { + language = EngineContext.Current.Resolve().WorkingLanguage; + } - return language; - } + return language; + } /// /// Returns a random system color suitable as avatar background color. @@ -365,160 +366,160 @@ public static string GetAvatarColor(this Customer customer, IGenericAttributeSer return color; } - #region Shopping cart - - public static int CountProductsInCart(this Customer customer, ShoppingCartType cartType, int? storeId = null) - { - if (customer != null) - { - var cartService = EngineContext.Current.Resolve(); - var count = cartService.CountItems(customer, cartType, storeId); - - return count; - } - - return 0; - } - - public static List GetCartItems(this Customer customer, ShoppingCartType cartType, int? storeId = null) - { - if (customer != null) - { - var cartService = EngineContext.Current.Resolve(); - var items = cartService.GetCartItems(customer, cartType, storeId); - - return items; - } - - return new List(); - } - - #endregion - - #region Gift cards - - /// - /// Gets coupon codes - /// - /// Customer - /// Coupon codes - public static string[] ParseAppliedGiftCardCouponCodes(this Customer customer) - { - var genericAttributeService = EngineContext.Current.Resolve(); - string existingGiftCartCouponCodes = customer.GetAttribute(SystemCustomerAttributeNames.GiftCardCouponCodes, - genericAttributeService); - - var couponCodes = new List(); - if (String.IsNullOrEmpty(existingGiftCartCouponCodes)) - return couponCodes.ToArray(); - - try - { - var xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(existingGiftCartCouponCodes); - - var nodeList1 = xmlDoc.SelectNodes(@"//GiftCardCouponCodes/CouponCode"); - foreach (XmlNode node1 in nodeList1) - { - if (node1.Attributes != null && node1.Attributes["Code"] != null) - { - string code = node1.Attributes["Code"].InnerText.Trim(); - couponCodes.Add(code); - } - } - } - catch (Exception exc) - { - Debug.Write(exc.ToString()); - } - return couponCodes.ToArray(); - } - - /// - /// Adds a coupon code - /// - /// Customer - /// Coupon code - /// New coupon codes document - public static void ApplyGiftCardCouponCode(this Customer customer, string couponCode) - { - var genericAttributeService = EngineContext.Current.Resolve(); - string result = string.Empty; - try - { - string existingGiftCartCouponCodes = customer.GetAttribute(SystemCustomerAttributeNames.GiftCardCouponCodes, - genericAttributeService); - - couponCode = couponCode.Trim().ToLower(); - - var xmlDoc = new XmlDocument(); - if (String.IsNullOrEmpty(existingGiftCartCouponCodes)) - { - var element1 = xmlDoc.CreateElement("GiftCardCouponCodes"); - xmlDoc.AppendChild(element1); - } - else - { - xmlDoc.LoadXml(existingGiftCartCouponCodes); - } - var rootElement = (XmlElement)xmlDoc.SelectSingleNode(@"//GiftCardCouponCodes"); - - XmlElement gcElement = null; - //find existing - var nodeList1 = xmlDoc.SelectNodes(@"//GiftCardCouponCodes/CouponCode"); - foreach (XmlNode node1 in nodeList1) - { - if (node1.Attributes != null && node1.Attributes["Code"] != null) - { - string couponCodeAttribute = node1.Attributes["Code"].InnerText.Trim(); - if (couponCodeAttribute.ToLower() == couponCode.ToLower()) - { - gcElement = (XmlElement)node1; - break; - } - } - } - - //create new one if not found - if (gcElement == null) - { - gcElement = xmlDoc.CreateElement("CouponCode"); - gcElement.SetAttribute("Code", couponCode); - rootElement.AppendChild(gcElement); - } - - result = xmlDoc.OuterXml; - } - catch (Exception exc) - { - Debug.Write(exc.ToString()); - } - - //apply new value - genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.GiftCardCouponCodes, result); - } - - /// - /// Removes a coupon code - /// - /// Customer - /// Coupon code to remove - /// New coupon codes document - public static void RemoveGiftCardCouponCode(this Customer customer, string couponCode) - { - //get applied coupon codes - var existingCouponCodes = customer.ParseAppliedGiftCardCouponCodes(); - - //clear them - var genericAttributeService = EngineContext.Current.Resolve(); - genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.GiftCardCouponCodes, null); - - //save again except removed one - foreach (string existingCouponCode in existingCouponCodes) - if (!existingCouponCode.Equals(couponCode, StringComparison.InvariantCultureIgnoreCase)) - customer.ApplyGiftCardCouponCode(existingCouponCode); - } - - #endregion - } + #region Shopping cart + + public static int CountProductsInCart(this Customer customer, ShoppingCartType cartType, int? storeId = null) + { + if (customer != null) + { + var cartService = EngineContext.Current.Resolve(); + var count = cartService.CountItems(customer, cartType, storeId); + + return count; + } + + return 0; + } + + public static List GetCartItems(this Customer customer, ShoppingCartType cartType, int? storeId = null) + { + if (customer != null) + { + var cartService = EngineContext.Current.Resolve(); + var items = cartService.GetCartItems(customer, cartType, storeId); + + return items; + } + + return new List(); + } + + #endregion + + #region Gift cards + + /// + /// Gets coupon codes + /// + /// Customer + /// Coupon codes + public static string[] ParseAppliedGiftCardCouponCodes(this Customer customer) + { + var genericAttributeService = EngineContext.Current.Resolve(); + string existingGiftCartCouponCodes = customer.GetAttribute(SystemCustomerAttributeNames.GiftCardCouponCodes, + genericAttributeService); + + var couponCodes = new List(); + if (String.IsNullOrEmpty(existingGiftCartCouponCodes)) + return couponCodes.ToArray(); + + try + { + var xmlDoc = new XmlDocument(); + xmlDoc.LoadXml(existingGiftCartCouponCodes); + + var nodeList1 = xmlDoc.SelectNodes(@"//GiftCardCouponCodes/CouponCode"); + foreach (XmlNode node1 in nodeList1) + { + if (node1.Attributes != null && node1.Attributes["Code"] != null) + { + string code = node1.Attributes["Code"].InnerText.Trim(); + couponCodes.Add(code); + } + } + } + catch (Exception exc) + { + Debug.Write(exc.ToString()); + } + return couponCodes.ToArray(); + } + + /// + /// Adds a coupon code + /// + /// Customer + /// Coupon code + /// New coupon codes document + public static void ApplyGiftCardCouponCode(this Customer customer, string couponCode) + { + var genericAttributeService = EngineContext.Current.Resolve(); + string result = string.Empty; + try + { + string existingGiftCartCouponCodes = customer.GetAttribute(SystemCustomerAttributeNames.GiftCardCouponCodes, + genericAttributeService); + + couponCode = couponCode.Trim().ToLower(); + + var xmlDoc = new XmlDocument(); + if (String.IsNullOrEmpty(existingGiftCartCouponCodes)) + { + var element1 = xmlDoc.CreateElement("GiftCardCouponCodes"); + xmlDoc.AppendChild(element1); + } + else + { + xmlDoc.LoadXml(existingGiftCartCouponCodes); + } + var rootElement = (XmlElement)xmlDoc.SelectSingleNode(@"//GiftCardCouponCodes"); + + XmlElement gcElement = null; + //find existing + var nodeList1 = xmlDoc.SelectNodes(@"//GiftCardCouponCodes/CouponCode"); + foreach (XmlNode node1 in nodeList1) + { + if (node1.Attributes != null && node1.Attributes["Code"] != null) + { + string couponCodeAttribute = node1.Attributes["Code"].InnerText.Trim(); + if (couponCodeAttribute.ToLower() == couponCode.ToLower()) + { + gcElement = (XmlElement)node1; + break; + } + } + } + + //create new one if not found + if (gcElement == null) + { + gcElement = xmlDoc.CreateElement("CouponCode"); + gcElement.SetAttribute("Code", couponCode); + rootElement.AppendChild(gcElement); + } + + result = xmlDoc.OuterXml; + } + catch (Exception exc) + { + Debug.Write(exc.ToString()); + } + + //apply new value + genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.GiftCardCouponCodes, result); + } + + /// + /// Removes a coupon code + /// + /// Customer + /// Coupon code to remove + /// New coupon codes document + public static void RemoveGiftCardCouponCode(this Customer customer, string couponCode) + { + //get applied coupon codes + var existingCouponCodes = customer.ParseAppliedGiftCardCouponCodes(); + + //clear them + var genericAttributeService = EngineContext.Current.Resolve(); + genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.GiftCardCouponCodes, null); + + //save again except removed one + foreach (string existingCouponCode in existingCouponCodes) + if (!existingCouponCode.Equals(couponCode, StringComparison.InvariantCultureIgnoreCase)) + customer.ApplyGiftCardCouponCode(existingCouponCode); + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerMessageFactoryExtensions.cs b/src/Libraries/SmartStore.Services/Customers/CustomerMessageFactoryExtensions.cs index 398e45d2a8..af006f35e5 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerMessageFactoryExtensions.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerMessageFactoryExtensions.cs @@ -5,76 +5,76 @@ namespace SmartStore.Services.Customers { - public static class CustomerMessageFactoryExtensions - { - /// - /// Sends 'New customer' notification message to a store owner - /// - public static CreateMessageResult SendCustomerRegisteredNotificationMessage(this IMessageFactory factory, Customer customer, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.CustomerRegistered, languageId, customer: customer), true); - } + public static class CustomerMessageFactoryExtensions + { + /// + /// Sends 'New customer' notification message to a store owner + /// + public static CreateMessageResult SendCustomerRegisteredNotificationMessage(this IMessageFactory factory, Customer customer, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.CustomerRegistered, languageId, customer: customer), true); + } - /// - /// Sends a welcome message to a customer - /// - public static CreateMessageResult SendCustomerWelcomeMessage(this IMessageFactory factory, Customer customer, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.CustomerWelcome, languageId, customer: customer), true); - } + /// + /// Sends a welcome message to a customer + /// + public static CreateMessageResult SendCustomerWelcomeMessage(this IMessageFactory factory, Customer customer, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.CustomerWelcome, languageId, customer: customer), true); + } - /// - /// Sends an email validation message to a customer - /// - public static CreateMessageResult SendCustomerEmailValidationMessage(this IMessageFactory factory, Customer customer, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.CustomerEmailValidation, languageId, customer: customer), true); - } + /// + /// Sends an email validation message to a customer + /// + public static CreateMessageResult SendCustomerEmailValidationMessage(this IMessageFactory factory, Customer customer, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.CustomerEmailValidation, languageId, customer: customer), true); + } - /// - /// Sends password recovery message to a customer - /// - public static CreateMessageResult SendCustomerPasswordRecoveryMessage(this IMessageFactory factory, Customer customer, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.CustomerPasswordRecovery, languageId, customer: customer), true); - } + /// + /// Sends password recovery message to a customer + /// + public static CreateMessageResult SendCustomerPasswordRecoveryMessage(this IMessageFactory factory, Customer customer, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.CustomerPasswordRecovery, languageId, customer: customer), true); + } - /// - /// Sends wishlist "email a friend" message - /// - public static CreateMessageResult SendShareWishlistMessage(this IMessageFactory factory, Customer customer, - string fromEmail, string toEmail, string personalMessage, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); + /// + /// Sends wishlist "email a friend" message + /// + public static CreateMessageResult SendShareWishlistMessage(this IMessageFactory factory, Customer customer, + string fromEmail, string toEmail, string personalMessage, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); - var model = new NamedModelPart("Wishlist") - { - ["PersonalMessage"] = personalMessage, - ["From"] = fromEmail, - ["To"] = toEmail - }; + var model = new NamedModelPart("Wishlist") + { + ["PersonalMessage"] = personalMessage, + ["From"] = fromEmail, + ["To"] = toEmail + }; - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ShareWishlist, languageId, customer: customer), true, model); - } + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ShareWishlist, languageId, customer: customer), true, model); + } - /// - /// Sends a "new VAT sumitted" notification to a store owner - /// - public static CreateMessageResult SendNewVatSubmittedStoreOwnerNotification(this IMessageFactory factory, Customer customer, string vatName, string vatAddress, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); + /// + /// Sends a "new VAT sumitted" notification to a store owner + /// + public static CreateMessageResult SendNewVatSubmittedStoreOwnerNotification(this IMessageFactory factory, Customer customer, string vatName, string vatAddress, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); - var model = new NamedModelPart("VatValidationResult") - { - ["Name"] = vatName, - ["Address"] = vatAddress - }; + var model = new NamedModelPart("VatValidationResult") + { + ["Name"] = vatName, + ["Address"] = vatAddress + }; - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewVatSubmittedStoreOwner, languageId, customer: customer), true, model); - } - } + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewVatSubmittedStoreOwner, languageId, customer: customer), true, model); + } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationRequest.cs b/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationRequest.cs index a0804fed2b..d4f93db0cf 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationRequest.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationRequest.cs @@ -12,7 +12,7 @@ public class CustomerRegistrationRequest public bool IsApproved { get; set; } public CustomerRegistrationRequest(Customer customer, string email, string username, - string password, + string password, PasswordFormat passwordFormat, bool isApproved = true) { diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationResult.cs b/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationResult.cs index fc0dad7d05..12a94af9ae 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationResult.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationResult.cs @@ -1,22 +1,19 @@ using System.Collections.Generic; -namespace SmartStore.Services.Customers +namespace SmartStore.Services.Customers { - public class CustomerRegistrationResult + public class CustomerRegistrationResult { public IList Errors { get; set; } - public CustomerRegistrationResult() + public CustomerRegistrationResult() { this.Errors = new List(); } - public bool Success - { - get { return this.Errors.Count == 0; } - } + public bool Success => this.Errors.Count == 0; - public void AddError(string error) + public void AddError(string error) { this.Errors.Add(error); } diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationService.cs b/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationService.cs index 074dab7ad3..4cfc490e35 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationService.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationService.cs @@ -9,18 +9,18 @@ namespace SmartStore.Services.Customers { - public partial class CustomerRegistrationService : ICustomerRegistrationService + public partial class CustomerRegistrationService : ICustomerRegistrationService { private readonly ICustomerService _customerService; private readonly IEncryptionService _encryptionService; private readonly INewsLetterSubscriptionService _newsLetterSubscriptionService; private readonly RewardPointsSettings _rewardPointsSettings; private readonly CustomerSettings _customerSettings; - private readonly IStoreContext _storeContext; + private readonly IStoreContext _storeContext; private readonly IEventPublisher _eventPublisher; - public CustomerRegistrationService(ICustomerService customerService, - IEncryptionService encryptionService, + public CustomerRegistrationService(ICustomerService customerService, + IEncryptionService encryptionService, INewsLetterSubscriptionService newsLetterSubscriptionService, RewardPointsSettings rewardPointsSettings, CustomerSettings customerSettings, IStoreContext storeContext, IEventPublisher eventPublisher) @@ -30,15 +30,15 @@ public CustomerRegistrationService(ICustomerService customerService, _newsLetterSubscriptionService = newsLetterSubscriptionService; _rewardPointsSettings = rewardPointsSettings; _customerSettings = customerSettings; - _storeContext = storeContext; + _storeContext = storeContext; _eventPublisher = eventPublisher; - T = NullLocalizer.Instance; - } + T = NullLocalizer.Instance; + } - public Localizer T { get; set; } + public Localizer T { get; set; } - public virtual bool ValidateCustomer(string usernameOrEmail, string password) + public virtual bool ValidateCustomer(string usernameOrEmail, string password) { Customer customer = null; @@ -95,8 +95,8 @@ public virtual bool ValidateCustomer(string usernameOrEmail, string password) public virtual CustomerRegistrationResult RegisterCustomer(CustomerRegistrationRequest request) { - Guard.NotNull(request, nameof(request)); - Guard.NotNull(request.Customer, nameof(request.Customer)); + Guard.NotNull(request, nameof(request)); + Guard.NotNull(request.Customer, nameof(request.Customer)); var result = new CustomerRegistrationResult(); @@ -124,7 +124,7 @@ public virtual CustomerRegistrationResult RegisterCustomer(CustomerRegistrationR return result; } - if (!request.Email.IsEmail()) + if (!request.Email.IsEmail()) { result.AddError(T("Common.WrongEmail")); return result; @@ -162,17 +162,17 @@ public virtual CustomerRegistrationResult RegisterCustomer(CustomerRegistrationR switch (request.PasswordFormat) { - case PasswordFormat.Clear: - request.Customer.Password = request.Password; - break; - case PasswordFormat.Encrypted: - request.Customer.Password = _encryptionService.EncryptText(request.Password); - break; - case PasswordFormat.Hashed: - string saltKey = _encryptionService.CreateSaltKey(5); - request.Customer.PasswordSalt = saltKey; - request.Customer.Password = _encryptionService.CreatePasswordHash(request.Password, saltKey, _customerSettings.HashedPasswordFormat); - break; + case PasswordFormat.Clear: + request.Customer.Password = request.Password; + break; + case PasswordFormat.Encrypted: + request.Customer.Password = _encryptionService.EncryptText(request.Password); + break; + case PasswordFormat.Hashed: + string saltKey = _encryptionService.CreateSaltKey(5); + request.Customer.PasswordSalt = saltKey; + request.Customer.Password = _encryptionService.CreatePasswordHash(request.Password, saltKey, _customerSettings.HashedPasswordFormat); + break; } request.Customer.Active = request.IsApproved; @@ -184,38 +184,38 @@ public virtual CustomerRegistrationResult RegisterCustomer(CustomerRegistrationR } if (_customerSettings.RegisterCustomerRoleId != 0) - { - var customerRole = _customerService.GetCustomerRoleById(_customerSettings.RegisterCustomerRoleId); + { + var customerRole = _customerService.GetCustomerRoleById(_customerSettings.RegisterCustomerRoleId); if (customerRole != null && customerRole.Id != registeredRole.Id) { _customerService.InsertCustomerRoleMapping(new CustomerRoleMapping { CustomerId = request.Customer.Id, CustomerRoleId = customerRole.Id }); } - } + } - // Add to 'Registered' role. + // Add to 'Registered' role. _customerService.InsertCustomerRoleMapping(new CustomerRoleMapping { CustomerId = request.Customer.Id, CustomerRoleId = registeredRole.Id }); // Remove from 'Guests' role. var mappings = request.Customer.CustomerRoleMappings.Where(x => !x.IsSystemMapping && x.CustomerRole.SystemName == SystemCustomerRoleNames.Guests).ToList(); mappings.Each(x => _customerService.DeleteCustomerRoleMapping(x)); - // Add reward points for customer registration (if enabled) - if (_rewardPointsSettings.Enabled && _rewardPointsSettings.PointsForRegistration > 0) - { - request.Customer.AddRewardPointsHistoryEntry(_rewardPointsSettings.PointsForRegistration, T("RewardPoints.Message.RegisteredAsCustomer")); - } + // Add reward points for customer registration (if enabled) + if (_rewardPointsSettings.Enabled && _rewardPointsSettings.PointsForRegistration > 0) + { + request.Customer.AddRewardPointsHistoryEntry(_rewardPointsSettings.PointsForRegistration, T("RewardPoints.Message.RegisteredAsCustomer")); + } _customerService.UpdateCustomer(request.Customer); _eventPublisher.Publish(new CustomerRegisteredEvent { Customer = request.Customer }); return result; } - + public virtual PasswordChangeResult ChangePassword(ChangePasswordRequest request) { - Guard.NotNull(request, nameof(request)); + Guard.NotNull(request, nameof(request)); - var result = new PasswordChangeResult(); + var result = new PasswordChangeResult(); if (!request.Email.HasValue()) { result.AddError(T("Account.ChangePassword.Errors.EmailIsNotProvided")); @@ -297,12 +297,12 @@ public virtual PasswordChangeResult ChangePassword(ChangePasswordRequest request public virtual void SetEmail(Customer customer, string newEmail) { - Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(customer, nameof(customer)); newEmail = newEmail.Trim(); string oldEmail = customer.Email; - if (!newEmail.IsEmail()) + if (!newEmail.IsEmail()) throw new SmartException(T("Account.EmailUsernameErrors.NewEmailIsNotValid")); if (newEmail.Length > 100) @@ -329,9 +329,9 @@ public virtual void SetEmail(Customer customer, string newEmail) public virtual void SetUsername(Customer customer, string newUsername) { - Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(customer, nameof(customer)); - if (_customerSettings.CustomerLoginType == CustomerLoginType.Email) + if (_customerSettings.CustomerLoginType == CustomerLoginType.Email) throw new SmartException("Usernames are disabled"); if (!_customerSettings.AllowUsersToChangeUsernames) diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerReportService.cs b/src/Libraries/SmartStore.Services/Customers/CustomerReportService.cs index 017fced73d..4aff7b3b81 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerReportService.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerReportService.cs @@ -49,7 +49,7 @@ public virtual IPagedList GetTopCustomersReport( var paymentStatusId = paymentStatus.HasValue ? (int)paymentStatus.Value : (int?)null; var shippingStatusId = shippingStatus.HasValue ? (int)shippingStatus.Value : (int?)null; - var query = + var query = from c in _customerRepository.TableUntracked join o in _orderRepository.TableUntracked on c.Id equals o.CustomerId where (!startTime.HasValue || startTime.Value <= o.CreatedOnUtc) && @@ -61,7 +61,7 @@ join o in _orderRepository.TableUntracked on c.Id equals o.CustomerId (!c.Deleted) select new { c, o }; - var groupedQuery = + var groupedQuery = from co in query group co by co.c.Id into g select new TopCustomerReportLine @@ -145,7 +145,7 @@ group c.CreatedOnUtc by DbFunctions.TruncateTime(c.CreatedOnUtc) into dg public virtual int GetCustomerRegistrations(DateTime? startTimeUtc, DateTime? endTimeUtc) { var registeredCustomerRole = _customerService.GetCustomerRoleBySystemName(SystemCustomerRoleNames.Registered); - if(registeredCustomerRole == null) + if (registeredCustomerRole == null) { return 0; } diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerSearchQuery.cs b/src/Libraries/SmartStore.Services/Customers/CustomerSearchQuery.cs index e0737ac075..1faec0c439 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerSearchQuery.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerSearchQuery.cs @@ -4,87 +4,87 @@ namespace SmartStore.Services.Customers { - public class CustomerSearchQuery : ICloneable - { - /// - /// Customer registration from; null to load all customers. Default: null. - /// - public DateTime? RegistrationFromUtc { get; set; } - - /// - /// Customer registration to; null to load all customers. Default: null. - /// - public DateTime? RegistrationToUtc { get; set; } - - /// - /// Customer last activity date (from)s. Default: null. - /// - public DateTime? LastActivityFromUtc { get; set; } - - /// - /// A list of customer role identifiers to filter by (at least one match); pass null or empty list in order to load all customers. Default: null. - /// - public int[] CustomerRoleIds { get; set; } - - /// - /// Affiliate identifie. Default: null. - /// - public int? AffiliateId { get; set; } - - /// - /// Email. Default: null. - /// - public string Email { get; set; } - - /// - /// UserName. Default: null. - /// - public string Username { get; set; } - - /// - /// Phone. Default: null. - /// - public string Phone { get; set; } - - /// - /// ZipPostalCode. Default: null. - /// - public string ZipPostalCode { get; set; } - - /// - /// CustomerNumber. Default: null. - /// - public string CustomerNumber { get; set; } - - /// - /// Day of birth. Default: null. - /// - public int? DayOfBirth { get; set; } - - /// - /// Month of birth. Default: null. - /// - public int? MonthOfBirth { get; set; } - - /// - /// Password format. Default: null. - /// - public PasswordFormat? PasswordFormat { get; set; } - - /// - /// Whether to only load customers with shopping cart. Default: false (meaning: no matter) - /// - public bool OnlyWithCart { get; set; } - - /// - /// What shopping cart type to filter; used when 'HasCart' param is 'true'. Default: null. - /// - public ShoppingCartType? CartType { get; set; } - - /// - /// Whether only (soft)-deleted records should be loaded. Default: false (meaning: only undeleted) - /// - public bool? Deleted { get; set; } = false; + public class CustomerSearchQuery : ICloneable + { + /// + /// Customer registration from; null to load all customers. Default: null. + /// + public DateTime? RegistrationFromUtc { get; set; } + + /// + /// Customer registration to; null to load all customers. Default: null. + /// + public DateTime? RegistrationToUtc { get; set; } + + /// + /// Customer last activity date (from)s. Default: null. + /// + public DateTime? LastActivityFromUtc { get; set; } + + /// + /// A list of customer role identifiers to filter by (at least one match); pass null or empty list in order to load all customers. Default: null. + /// + public int[] CustomerRoleIds { get; set; } + + /// + /// Affiliate identifie. Default: null. + /// + public int? AffiliateId { get; set; } + + /// + /// Email. Default: null. + /// + public string Email { get; set; } + + /// + /// UserName. Default: null. + /// + public string Username { get; set; } + + /// + /// Phone. Default: null. + /// + public string Phone { get; set; } + + /// + /// ZipPostalCode. Default: null. + /// + public string ZipPostalCode { get; set; } + + /// + /// CustomerNumber. Default: null. + /// + public string CustomerNumber { get; set; } + + /// + /// Day of birth. Default: null. + /// + public int? DayOfBirth { get; set; } + + /// + /// Month of birth. Default: null. + /// + public int? MonthOfBirth { get; set; } + + /// + /// Password format. Default: null. + /// + public PasswordFormat? PasswordFormat { get; set; } + + /// + /// Whether to only load customers with shopping cart. Default: false (meaning: no matter) + /// + public bool OnlyWithCart { get; set; } + + /// + /// What shopping cart type to filter; used when 'HasCart' param is 'true'. Default: null. + /// + public ShoppingCartType? CartType { get; set; } + + /// + /// Whether only (soft)-deleted records should be loaded. Default: false (meaning: only undeleted) + /// + public bool? Deleted { get; set; } = false; /// /// Whether only active customers should be loaded. @@ -96,29 +96,29 @@ public class CustomerSearchQuery : ICloneable /// public bool? IsSystemAccount { get; set; } = false; - /// - /// Searches in FullName (FirstName + LastName) and Company fields. Default: null. - /// - public string SearchTerm { get; set; } - - /// - /// Page index. Default: 0. - /// - public int PageIndex { get; set; } - - /// - /// Page index. Default: 50. - /// - public int PageSize { get; set; } = 50; - - public CustomerSearchQuery Clone() - { - return (CustomerSearchQuery)this.MemberwiseClone(); - } - - object ICloneable.Clone() - { - return this.MemberwiseClone(); - } - } + /// + /// Searches in FullName (FirstName + LastName) and Company fields. Default: null. + /// + public string SearchTerm { get; set; } + + /// + /// Page index. Default: 0. + /// + public int PageIndex { get; set; } + + /// + /// Page index. Default: 50. + /// + public int PageSize { get; set; } = 50; + + public CustomerSearchQuery Clone() + { + return (CustomerSearchQuery)this.MemberwiseClone(); + } + + object ICloneable.Clone() + { + return this.MemberwiseClone(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerService.cs b/src/Libraries/SmartStore.Services/Customers/CustomerService.cs index f0851519b6..462edc9932 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerService.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerService.cs @@ -29,58 +29,58 @@ public partial class CustomerService : ICustomerService private readonly IRepository _customerRoleRepository; private readonly IRepository _customerRoleMappingRepository; private readonly IRepository _gaRepository; - private readonly IRepository _rewardPointsHistoryRepository; + private readonly IRepository _rewardPointsHistoryRepository; private readonly IRepository _shoppingCartItemRepository; private readonly IGenericAttributeService _genericAttributeService; - private readonly Lazy _rewardPointsSettings; - private readonly ICommonServices _services; - private readonly HttpContextBase _httpContext; - private readonly IUserAgent _userAgent; - private readonly CustomerSettings _customerSettings; - private readonly Lazy _gdprTool; - - public CustomerService( + private readonly Lazy _rewardPointsSettings; + private readonly ICommonServices _services; + private readonly HttpContextBase _httpContext; + private readonly IUserAgent _userAgent; + private readonly CustomerSettings _customerSettings; + private readonly Lazy _gdprTool; + + public CustomerService( IRepository customerRepository, IRepository customerRoleRepository, IRepository customerRoleMappingRepository, IRepository gaRepository, - IRepository rewardPointsHistoryRepository, + IRepository rewardPointsHistoryRepository, IRepository shoppingCartItemRepository, IGenericAttributeService genericAttributeService, - Lazy rewardPointsSettings, - ICommonServices services, - HttpContextBase httpContext, - IUserAgent userAgent, - CustomerSettings customerSettings, - Lazy gdprTool) + Lazy rewardPointsSettings, + ICommonServices services, + HttpContextBase httpContext, + IUserAgent userAgent, + CustomerSettings customerSettings, + Lazy gdprTool) { _customerRepository = customerRepository; _customerRoleRepository = customerRoleRepository; _customerRoleMappingRepository = customerRoleMappingRepository; _gaRepository = gaRepository; - _rewardPointsHistoryRepository = rewardPointsHistoryRepository; + _rewardPointsHistoryRepository = rewardPointsHistoryRepository; _shoppingCartItemRepository = shoppingCartItemRepository; _genericAttributeService = genericAttributeService; - _rewardPointsSettings = rewardPointsSettings; - _services = services; - _httpContext = httpContext; - _userAgent = userAgent; - _customerSettings = customerSettings; - _gdprTool = gdprTool; - - T = NullLocalizer.Instance; - Logger = NullLogger.Instance; + _rewardPointsSettings = rewardPointsSettings; + _services = services; + _httpContext = httpContext; + _userAgent = userAgent; + _customerSettings = customerSettings; + _gdprTool = gdprTool; + + T = NullLocalizer.Instance; + Logger = NullLogger.Instance; } - public Localizer T { get; set; } + public Localizer T { get; set; } - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } #region Customers - public virtual IPagedList SearchCustomers(CustomerSearchQuery q) - { - Guard.NotNull(q, nameof(q)); + public virtual IPagedList SearchCustomers(CustomerSearchQuery q) + { + Guard.NotNull(q, nameof(q)); var isOrdered = false; IQueryable query = null; @@ -118,105 +118,105 @@ select grp query = _customerRepository.Table; } - if (q.Email.HasValue()) - { - query = query.Where(c => c.Email.Contains(q.Email)); - } - - if (q.Username.HasValue()) - { - query = query.Where(c => c.Username.Contains(q.Username)); - } - - if (q.CustomerNumber.HasValue()) - { - query = query.Where(c => c.CustomerNumber.Contains(q.CustomerNumber)); - } - - if (q.AffiliateId.GetValueOrDefault() > 0) - { - query = query.Where(c => c.AffiliateId == q.AffiliateId.Value); - } - - if (q.SearchTerm.HasValue()) - { - if (_customerSettings.CompanyEnabled) - { - query = query.Where(c => c.FullName.Contains(q.SearchTerm) || c.Company.Contains(q.SearchTerm)); - } - else - { - query = query.Where(c => c.FullName.Contains(q.SearchTerm)); - } - } - - if (q.DayOfBirth.GetValueOrDefault() > 0) - { - query = query.Where(c => c.BirthDate.Value.Day == q.DayOfBirth.Value); - } - - if (q.MonthOfBirth.GetValueOrDefault() > 0) - { - query = query.Where(c => c.BirthDate.Value.Month == q.MonthOfBirth.Value); - } - - if (q.RegistrationFromUtc.HasValue) - { - query = query.Where(c => q.RegistrationFromUtc.Value <= c.CreatedOnUtc); - } - - if (q.RegistrationToUtc.HasValue) - { - query = query.Where(c => q.RegistrationToUtc.Value >= c.CreatedOnUtc); - } - - if (q.LastActivityFromUtc.HasValue) - { - query = query.Where(c => q.LastActivityFromUtc.Value <= c.LastActivityDateUtc); - } - - if (q.CustomerRoleIds != null && q.CustomerRoleIds.Length > 0) - { - query = query.Where(c => c.CustomerRoleMappings.Select(rm => rm.CustomerRoleId).Intersect(q.CustomerRoleIds).Count() > 0); - } - - if (q.Deleted.HasValue) - { - query = query.Where(c => c.Deleted == q.Deleted.Value); - } + if (q.Email.HasValue()) + { + query = query.Where(c => c.Email.Contains(q.Email)); + } + + if (q.Username.HasValue()) + { + query = query.Where(c => c.Username.Contains(q.Username)); + } + + if (q.CustomerNumber.HasValue()) + { + query = query.Where(c => c.CustomerNumber.Contains(q.CustomerNumber)); + } + + if (q.AffiliateId.GetValueOrDefault() > 0) + { + query = query.Where(c => c.AffiliateId == q.AffiliateId.Value); + } + + if (q.SearchTerm.HasValue()) + { + if (_customerSettings.CompanyEnabled) + { + query = query.Where(c => c.FullName.Contains(q.SearchTerm) || c.Company.Contains(q.SearchTerm)); + } + else + { + query = query.Where(c => c.FullName.Contains(q.SearchTerm)); + } + } + + if (q.DayOfBirth.GetValueOrDefault() > 0) + { + query = query.Where(c => c.BirthDate.Value.Day == q.DayOfBirth.Value); + } + + if (q.MonthOfBirth.GetValueOrDefault() > 0) + { + query = query.Where(c => c.BirthDate.Value.Month == q.MonthOfBirth.Value); + } + + if (q.RegistrationFromUtc.HasValue) + { + query = query.Where(c => q.RegistrationFromUtc.Value <= c.CreatedOnUtc); + } + + if (q.RegistrationToUtc.HasValue) + { + query = query.Where(c => q.RegistrationToUtc.Value >= c.CreatedOnUtc); + } + + if (q.LastActivityFromUtc.HasValue) + { + query = query.Where(c => q.LastActivityFromUtc.Value <= c.LastActivityDateUtc); + } + + if (q.CustomerRoleIds != null && q.CustomerRoleIds.Length > 0) + { + query = query.Where(c => c.CustomerRoleMappings.Select(rm => rm.CustomerRoleId).Intersect(q.CustomerRoleIds).Count() > 0); + } + + if (q.Deleted.HasValue) + { + query = query.Where(c => c.Deleted == q.Deleted.Value); + } if (q.Active.HasValue) { query = query.Where(c => c.Active == q.Active.Value); } - if (q.IsSystemAccount.HasValue) - { - query = q.IsSystemAccount.Value == true - ? query.Where(c => !string.IsNullOrEmpty(c.SystemName)) - : query.Where(c => string.IsNullOrEmpty(c.SystemName)); - } - - if (q.PasswordFormat.HasValue) - { - int passwordFormatId = (int)q.PasswordFormat.Value; - query = query.Where(c => c.PasswordFormatId == passwordFormatId); - } - - // Search by phone - if (q.Phone.HasValue()) - { - query = query - .Join(_gaRepository.Table, x => x.Id, y => y.EntityId, (x, y) => new { Customer = x, Attribute = y }) - .Where(z => z.Attribute.KeyGroup == "Customer" && - z.Attribute.Key == SystemCustomerAttributeNames.Phone && - z.Attribute.Value.Contains(q.Phone)) - .Select(z => z.Customer); - } - - // Search by zip - if (q.ZipPostalCode.HasValue()) - { + if (q.IsSystemAccount.HasValue) + { + query = q.IsSystemAccount.Value == true + ? query.Where(c => !string.IsNullOrEmpty(c.SystemName)) + : query.Where(c => string.IsNullOrEmpty(c.SystemName)); + } + + if (q.PasswordFormat.HasValue) + { + int passwordFormatId = (int)q.PasswordFormat.Value; + query = query.Where(c => c.PasswordFormatId == passwordFormatId); + } + + // Search by phone + if (q.Phone.HasValue()) + { + query = query + .Join(_gaRepository.Table, x => x.Id, y => y.EntityId, (x, y) => new { Customer = x, Attribute = y }) + .Where(z => z.Attribute.KeyGroup == "Customer" && + z.Attribute.Key == SystemCustomerAttributeNames.Phone && + z.Attribute.Value.Contains(q.Phone)) + .Select(z => z.Customer); + } + + // Search by zip + if (q.ZipPostalCode.HasValue()) + { query = query .Join(_gaRepository.Table, x => x.Id, y => y.EntityId, (x, y) => new { Customer = x, Attribute = y }) .Where(z => z.Attribute.KeyGroup == "Customer" && @@ -230,83 +230,83 @@ select grp query = query.OrderByDescending(c => c.CreatedOnUtc); } - var customers = new PagedList(query, q.PageIndex, q.PageSize); - return customers; - } + var customers = new PagedList(query, q.PageIndex, q.PageSize); + return customers; + } - public virtual IPagedList GetAllCustomersByPasswordFormat(PasswordFormat passwordFormat) + public virtual IPagedList GetAllCustomersByPasswordFormat(PasswordFormat passwordFormat) { - var q = new CustomerSearchQuery - { - PasswordFormat = passwordFormat, - PageIndex = 0, - PageSize = 500 - }; + var q = new CustomerSearchQuery + { + PasswordFormat = passwordFormat, + PageIndex = 0, + PageSize = 500 + }; - var customers = SearchCustomers(q); - return customers; + var customers = SearchCustomers(q); + return customers; } public virtual IPagedList GetOnlineCustomers(DateTime lastActivityFromUtc, int[] customerRoleIds, int pageIndex, int pageSize) { - var q = new CustomerSearchQuery - { - LastActivityFromUtc = lastActivityFromUtc, - CustomerRoleIds = customerRoleIds, - IsSystemAccount = false, - PageIndex = pageIndex, - PageSize = pageSize - }; + var q = new CustomerSearchQuery + { + LastActivityFromUtc = lastActivityFromUtc, + CustomerRoleIds = customerRoleIds, + IsSystemAccount = false, + PageIndex = pageIndex, + PageSize = pageSize + }; var customers = SearchCustomers(q); - customers.AlterQuery(x => x.OrderByDescending(c => c.LastActivityDateUtc)); + customers.AlterQuery(x => x.OrderByDescending(c => c.LastActivityDateUtc)); return customers; } public virtual void DeleteCustomer(Customer customer) { - Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(customer, nameof(customer)); if (customer.IsSystemAccount) throw new SmartException(string.Format("System customer account ({0}) cannot not be deleted", customer.SystemName)); - // Soft delete + // Soft delete customer.Deleted = true; - // Anonymize IP addresses - var language = customer.GetLanguage(); + // Anonymize IP addresses + var language = customer.GetLanguage(); - _gdprTool.Value.AnonymizeData(customer, x => x.LastIpAddress, IdentifierDataType.IpAddress, language); + _gdprTool.Value.AnonymizeData(customer, x => x.LastIpAddress, IdentifierDataType.IpAddress, language); - foreach (var post in customer.ForumPosts) - { - _gdprTool.Value.AnonymizeData(post, x => x.IPAddress, IdentifierDataType.IpAddress, language); - } + foreach (var post in customer.ForumPosts) + { + _gdprTool.Value.AnonymizeData(post, x => x.IPAddress, IdentifierDataType.IpAddress, language); + } - // Customer Content - foreach (var item in customer.CustomerContent) - { - _gdprTool.Value.AnonymizeData(item, x => x.IpAddress, IdentifierDataType.IpAddress, language); - } + // Customer Content + foreach (var item in customer.CustomerContent) + { + _gdprTool.Value.AnonymizeData(item, x => x.IpAddress, IdentifierDataType.IpAddress, language); + } - UpdateCustomer(customer); + UpdateCustomer(customer); } public virtual Customer GetCustomerById(int customerId) { if (customerId == 0) return null; - + // var customer = _customerRepository.GetById(customerId); - var customer = IncludeRoles(_customerRepository.Table).SingleOrDefault(x => x.Id == customerId); + var customer = IncludeRoles(_customerRepository.Table).SingleOrDefault(x => x.Id == customerId); - return customer; + return customer; } - private IQueryable IncludeRoles(IQueryable query) - { + private IQueryable IncludeRoles(IQueryable query) + { return query .Expand(x => x.CustomerRoleMappings.Select(y => y.CustomerRole)); @@ -316,7 +316,7 @@ private IQueryable IncludeRoles(IQueryable query) // .Expand(x => x.ShoppingCartItems.Select(y => y.Product.AppliedDiscounts.Select(z => z.RuleSets))); } - public virtual IList GetCustomersByIds(int[] customerIds) + public virtual IList GetCustomersByIds(int[] customerIds) { if (customerIds == null || customerIds.Length == 0) return new List(); @@ -327,14 +327,14 @@ where customerIds.Contains(c.Id) var customers = query.ToList(); - // sort by passed identifier sequence - return customers.OrderBySequence(customerIds).ToList(); + // sort by passed identifier sequence + return customers.OrderBySequence(customerIds).ToList(); } - public virtual IList GetSystemAccountCustomers() - { - return _customerRepository.Table.Where(x => x.IsSystemAccount).ToList(); - } + public virtual IList GetSystemAccountCustomers() + { + return _customerRepository.Table.Where(x => x.IsSystemAccount).ToList(); + } public virtual Customer GetCustomerByGuid(Guid customerGuid) { @@ -342,7 +342,7 @@ public virtual Customer GetCustomerByGuid(Guid customerGuid) return null; var query = from c in IncludeRoles(_customerRepository.Table) - where c.CustomerGuid == customerGuid + where c.CustomerGuid == customerGuid orderby c.Id select c; @@ -356,7 +356,7 @@ public virtual Customer GetCustomerByEmail(string email) return null; var query = from c in IncludeRoles(_customerRepository.Table) - orderby c.Id + orderby c.Id where c.Email == email select c; @@ -369,13 +369,13 @@ public virtual Customer GetCustomerBySystemName(string systemName) if (string.IsNullOrWhiteSpace(systemName)) return null; - var query = from c in _customerRepository.Table - orderby c.Id - where c.SystemName == systemName - select c; + var query = from c in _customerRepository.Table + orderby c.Id + where c.SystemName == systemName + select c; - var customer = query.FirstOrDefault(); - return customer; + var customer = query.FirstOrDefault(); + return customer; } public virtual Customer GetCustomerByUsername(string username) @@ -384,7 +384,7 @@ public virtual Customer GetCustomerByUsername(string username) return null; var query = from c in IncludeRoles(_customerRepository.Table) - orderby c.Id + orderby c.Id where c.Username == username select c; @@ -394,14 +394,14 @@ orderby c.Id public virtual Customer InsertGuestCustomer(Guid? customerGuid = null) { - var customer = new Customer + var customer = new Customer { CustomerGuid = customerGuid ?? Guid.NewGuid(), Active = true, CreatedOnUtc = DateTime.UtcNow, LastActivityDateUtc = DateTime.UtcNow, }; - + // Add to 'Guests' role var guestRole = GetCustomerRoleBySystemName(SystemCustomerRoleNames.Guests); if (guestRole == null) @@ -409,76 +409,76 @@ public virtual Customer InsertGuestCustomer(Guid? customerGuid = null) throw new SmartException("'Guests' role could not be loaded"); } - using (new DbContextScope(autoCommit: true)) - { + using (new DbContextScope(autoCommit: true)) + { // Ensure that entities are saved to db in any case customer.CustomerRoleMappings.Add(new CustomerRoleMapping { CustomerId = customer.Id, CustomerRoleId = guestRole.Id }); - _customerRepository.Insert(customer); - - var clientIdent = _services.WebHelper.GetClientIdent(); - if (clientIdent.HasValue()) - { - _genericAttributeService.SaveAttribute(customer, "ClientIdent", clientIdent); - } - } - - //Logger.DebugFormat("Guest account created for anonymous visitor. Id: {0}, ClientIdent: {1}", customer.CustomerGuid, clientIdent ?? "n/a"); - - return customer; - } - - public virtual Customer FindGuestCustomerByClientIdent(string clientIdent = null, int maxAgeSeconds = 60) - { - if (_httpContext.IsFakeContext() || _userAgent.IsBot || _userAgent.IsPdfConverter) - { - return null; - } - - using (_services.Chronometer.Step("FindGuestCustomerByClientIdent")) - { - clientIdent = clientIdent.NullEmpty() ?? _services.WebHelper.GetClientIdent(); - if (clientIdent.IsEmpty()) - { - return null; - } - - var dateFrom = DateTime.UtcNow.AddSeconds(maxAgeSeconds * -1); - - IQueryable query; - if (DataSettings.Current.IsSqlServer) - { - query = from a in _gaRepository.TableUntracked - join c in _customerRepository.Table on a.EntityId equals c.Id into Customers - from c in Customers.DefaultIfEmpty() - where c.LastActivityDateUtc >= dateFrom - && c.Username == null - && c.Email == null - && a.KeyGroup == "Customer" - && a.Key == "ClientIdent" - && a.Value == clientIdent - select c; - } - else - { - query = from a in _gaRepository.TableUntracked - join c in _customerRepository.Table on a.EntityId equals c.Id into Customers - from c in Customers.DefaultIfEmpty() - where c.LastActivityDateUtc >= dateFrom - && c.Username == null - && c.Email == null - && a.KeyGroup == "Customer" - && a.Key == "ClientIdent" - && a.Value.Contains(clientIdent) // SQLCE doesn't like ntext in WHERE clauses - select c; - } - - return query.FirstOrDefault(); - } - } - - public virtual void InsertCustomer(Customer customer) - { - Guard.NotNull(customer, nameof(customer)); + _customerRepository.Insert(customer); + + var clientIdent = _services.WebHelper.GetClientIdent(); + if (clientIdent.HasValue()) + { + _genericAttributeService.SaveAttribute(customer, "ClientIdent", clientIdent); + } + } + + //Logger.DebugFormat("Guest account created for anonymous visitor. Id: {0}, ClientIdent: {1}", customer.CustomerGuid, clientIdent ?? "n/a"); + + return customer; + } + + public virtual Customer FindGuestCustomerByClientIdent(string clientIdent = null, int maxAgeSeconds = 60) + { + if (_httpContext.IsFakeContext() || _userAgent.IsBot || _userAgent.IsPdfConverter) + { + return null; + } + + using (_services.Chronometer.Step("FindGuestCustomerByClientIdent")) + { + clientIdent = clientIdent.NullEmpty() ?? _services.WebHelper.GetClientIdent(); + if (clientIdent.IsEmpty()) + { + return null; + } + + var dateFrom = DateTime.UtcNow.AddSeconds(maxAgeSeconds * -1); + + IQueryable query; + if (DataSettings.Current.IsSqlServer) + { + query = from a in _gaRepository.TableUntracked + join c in _customerRepository.Table on a.EntityId equals c.Id into Customers + from c in Customers.DefaultIfEmpty() + where c.LastActivityDateUtc >= dateFrom + && c.Username == null + && c.Email == null + && a.KeyGroup == "Customer" + && a.Key == "ClientIdent" + && a.Value == clientIdent + select c; + } + else + { + query = from a in _gaRepository.TableUntracked + join c in _customerRepository.Table on a.EntityId equals c.Id into Customers + from c in Customers.DefaultIfEmpty() + where c.LastActivityDateUtc >= dateFrom + && c.Username == null + && c.Email == null + && a.KeyGroup == "Customer" + && a.Key == "ClientIdent" + && a.Value.Contains(clientIdent) // SQLCE doesn't like ntext in WHERE clauses + select c; + } + + return query.FirstOrDefault(); + } + } + + public virtual void InsertCustomer(Customer customer) + { + Guard.NotNull(customer, nameof(customer)); /// Validate unique user. if (customer.Email.HasValue() && GetCustomerByEmail(customer.Email) != null) @@ -495,67 +495,67 @@ public virtual void InsertCustomer(Customer customer) _customerRepository.Insert(customer); } - + public virtual void UpdateCustomer(Customer customer) { - Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(customer, nameof(customer)); - _customerRepository.Update(customer); + _customerRepository.Update(customer); } - public virtual void ResetCheckoutData( - Customer customer, - int storeId, - bool clearCouponCodes = false, - bool clearCheckoutAttributes = false, - bool clearRewardPoints = false, - bool clearShippingMethod = true, + public virtual void ResetCheckoutData( + Customer customer, + int storeId, + bool clearCouponCodes = false, + bool clearCheckoutAttributes = false, + bool clearRewardPoints = false, + bool clearShippingMethod = true, bool clearPaymentMethod = true, - bool clearCreditBalance = false) + bool clearCreditBalance = false) { - Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(customer, nameof(customer)); - if (clearCouponCodes) + if (clearCouponCodes) { - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.DiscountCouponCode, null); - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.GiftCardCouponCodes, null); + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.DiscountCouponCode, null); + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.GiftCardCouponCodes, null); } if (clearCheckoutAttributes) { - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.CheckoutAttributes, null); + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.CheckoutAttributes, null); } if (clearRewardPoints) { - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.UseRewardPointsDuringCheckout, false, storeId); + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.UseRewardPointsDuringCheckout, false, storeId); } - if (clearCreditBalance) - { - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.UseCreditBalanceDuringCheckout, decimal.Zero, storeId); - } + if (clearCreditBalance) + { + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.UseCreditBalanceDuringCheckout, decimal.Zero, storeId); + } if (clearShippingMethod) { - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.SelectedShippingOption, null, storeId); - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.OfferedShippingOptions, null, storeId); + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.SelectedShippingOption, null, storeId); + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.OfferedShippingOptions, null, storeId); } if (clearPaymentMethod) { - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.SelectedPaymentMethod, null, storeId); + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.SelectedPaymentMethod, null, storeId); } UpdateCustomer(customer); } - public virtual int DeleteGuestCustomers( - DateTime? registrationFrom, - DateTime? registrationTo, - bool onlyWithoutShoppingCart) - { - var genericAttributesSql = @" + public virtual int DeleteGuestCustomers( + DateTime? registrationFrom, + DateTime? registrationTo, + bool onlyWithoutShoppingCart) + { + var genericAttributesSql = @" DELETE TOP(50000) [g] FROM [dbo].[GenericAttribute] AS [g] LEFT OUTER JOIN [dbo].[Customer] AS [c] ON c.Id = g.EntityId @@ -572,7 +572,7 @@ FROM [dbo].[GenericAttribute] AS [g] AND (NOT EXISTS (SELECT 1 AS [C1] FROM [dbo].[Forums_Topic] AS [ft1] WHERE c.Id = ft1.CustomerId )) "; - var guestCustomersSql = @" + var guestCustomersSql = @" DELETE TOP(20000) [c] FROM [dbo].[Customer] AS [c] LEFT OUTER JOIN [dbo].[Order] AS [o] ON c.Id = o.CustomerId @@ -614,44 +614,44 @@ FROM [dbo].[Customer] AS [c] guestCustomersSql = guestCustomersSql.FormatInvariant(paramClauses.ToString()); - // Delete generic attributes. - while (true) + // Delete generic attributes. + while (true) { - var numDeleted = ctx.ExecuteSqlCommand(genericAttributesSql, false, null, parameters.ToArray()); - if (numDeleted <= 0) - { - break; - } + var numDeleted = ctx.ExecuteSqlCommand(genericAttributesSql, false, null, parameters.ToArray()); + if (numDeleted <= 0) + { + break; + } - numberOfDeletedAttributes += numDeleted; - } + numberOfDeletedAttributes += numDeleted; + } - // Delete guest customers. - while (true) - { - var numDeleted = ctx.ExecuteSqlCommand(guestCustomersSql, false, null, parameters.ToArray()); - if (numDeleted <= 0) - { - break; - } + // Delete guest customers. + while (true) + { + var numDeleted = ctx.ExecuteSqlCommand(guestCustomersSql, false, null, parameters.ToArray()); + if (numDeleted <= 0) + { + break; + } - numberOfDeletedCustomers += numDeleted; - } + numberOfDeletedCustomers += numDeleted; + } Debug.WriteLine("Deleted {0} guest customers including {1} generic attributes.", numberOfDeletedCustomers, numberOfDeletedAttributes); return numberOfDeletedCustomers; - } + } #endregion - + #region Customer roles public virtual void DeleteCustomerRole(CustomerRole role) { - Guard.NotNull(role, nameof(role)); + Guard.NotNull(role, nameof(role)); - if (role.IsSystemRole) + if (role.IsSystemRole) throw new SmartException("System role could not be deleted"); var roleId = role.Id; @@ -674,37 +674,37 @@ public virtual CustomerRole GetCustomerRoleBySystemName(string systemName) if (String.IsNullOrWhiteSpace(systemName)) return null; - var query = from cr in _customerRoleRepository.Table - orderby cr.Id - where cr.SystemName == systemName - select cr; + var query = from cr in _customerRoleRepository.Table + orderby cr.Id + where cr.SystemName == systemName + select cr; - var customerRole = query.FirstOrDefaultCached(); - return customerRole; - } + var customerRole = query.FirstOrDefaultCached(); + return customerRole; + } public virtual IPagedList GetAllCustomerRoles(bool showHidden = false, int pageIndex = 0, int pageSize = int.MaxValue) { - var query = from cr in _customerRoleRepository.Table - orderby cr.Name - where (showHidden || cr.Active) - select cr; + var query = from cr in _customerRoleRepository.Table + orderby cr.Name + where (showHidden || cr.Active) + select cr; + + return new PagedList(query, pageIndex, pageSize); + } - return new PagedList(query, pageIndex, pageSize); - } - public virtual void InsertCustomerRole(CustomerRole role) { - Guard.NotNull(role, nameof(role)); + Guard.NotNull(role, nameof(role)); - _customerRoleRepository.Insert(role); + _customerRoleRepository.Insert(role); } public virtual void UpdateCustomerRole(CustomerRole role) { - Guard.NotNull(role, nameof(role)); + Guard.NotNull(role, nameof(role)); - _customerRoleRepository.Update(role); + _customerRoleRepository.Update(role); _services.Cache.RemoveByPattern(PermissionService.PERMISSION_TREE_KEY.FormatInvariant(role.Id)); } @@ -793,38 +793,38 @@ public virtual void DeleteCustomerRoleMapping(CustomerRoleMapping mapping) #region Reward points public virtual void RewardPointsForProductReview(Customer customer, Product product, bool add) - { + { var rpSettings = _rewardPointsSettings.Value; - if (rpSettings.Enabled && rpSettings.PointsForProductReview > 0) - { - string message = T(add ? "RewardPoints.Message.EarnedForProductReview" : "RewardPoints.Message.ReducedForProductReview", product.GetLocalized(x => x.Name)); + if (rpSettings.Enabled && rpSettings.PointsForProductReview > 0) + { + string message = T(add ? "RewardPoints.Message.EarnedForProductReview" : "RewardPoints.Message.ReducedForProductReview", product.GetLocalized(x => x.Name)); - customer.AddRewardPointsHistoryEntry(rpSettings.PointsForProductReview * (add ? 1 : -1), message); + customer.AddRewardPointsHistoryEntry(rpSettings.PointsForProductReview * (add ? 1 : -1), message); - UpdateCustomer(customer); - } - } + UpdateCustomer(customer); + } + } - public virtual Multimap GetRewardPointsHistoriesByCustomerIds(int[] customerIds) - { - Guard.NotNull(customerIds, nameof(customerIds)); + public virtual Multimap GetRewardPointsHistoriesByCustomerIds(int[] customerIds) + { + Guard.NotNull(customerIds, nameof(customerIds)); - var query = - from x in _rewardPointsHistoryRepository.TableUntracked - where customerIds.Contains(x.CustomerId) - select x; + var query = + from x in _rewardPointsHistoryRepository.TableUntracked + where customerIds.Contains(x.CustomerId) + select x; - var map = query - .OrderBy(x => x.CustomerId) - .ThenByDescending(x => x.CreatedOnUtc) - .ThenByDescending(x => x.Id) - .ToList() - .ToMultimap(x => x.CustomerId, x => x); + var map = query + .OrderBy(x => x.CustomerId) + .ThenByDescending(x => x.CreatedOnUtc) + .ThenByDescending(x => x.Id) + .ToList() + .ToMultimap(x => x.CustomerId, x => x); - return map; - } + return map; + } - #endregion - } + #endregion + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Customers/Events/CustomerAnonymizedEvent.cs b/src/Libraries/SmartStore.Services/Customers/Events/CustomerAnonymizedEvent.cs index b25350d730..a33f396714 100644 --- a/src/Libraries/SmartStore.Services/Customers/Events/CustomerAnonymizedEvent.cs +++ b/src/Libraries/SmartStore.Services/Customers/Events/CustomerAnonymizedEvent.cs @@ -7,34 +7,34 @@ namespace SmartStore.Services.Customers { - /// - /// TODO - /// - public class CustomerAnonymizedEvent - { - private readonly IGdprTool _gdprTool; + /// + /// TODO + /// + public class CustomerAnonymizedEvent + { + private readonly IGdprTool _gdprTool; - public CustomerAnonymizedEvent(Customer customer, IGdprTool gdprTool) - { - Guard.NotNull(customer, nameof(customer)); + public CustomerAnonymizedEvent(Customer customer, IGdprTool gdprTool) + { + Guard.NotNull(customer, nameof(customer)); - Customer = customer; - _gdprTool = gdprTool; - } + Customer = customer; + _gdprTool = gdprTool; + } - public Customer Customer { get; private set; } + public Customer Customer { get; private set; } - /// - /// TODO - /// - /// - /// - /// - /// - public void AnonymizeData(TEntity entity, Expression> expression, IdentifierDataType type, Language language = null) - where TEntity : BaseEntity - { - _gdprTool.AnonymizeData(entity, expression, type, language); - } - } + /// + /// TODO + /// + /// + /// + /// + /// + public void AnonymizeData(TEntity entity, Expression> expression, IdentifierDataType type, Language language = null) + where TEntity : BaseEntity + { + _gdprTool.AnonymizeData(entity, expression, type, language); + } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/Events/CustomerExportedEvent.cs b/src/Libraries/SmartStore.Services/Customers/Events/CustomerExportedEvent.cs index 0c143c8b2f..3c6ada03a5 100644 --- a/src/Libraries/SmartStore.Services/Customers/Events/CustomerExportedEvent.cs +++ b/src/Libraries/SmartStore.Services/Customers/Events/CustomerExportedEvent.cs @@ -4,18 +4,18 @@ namespace SmartStore.Services.Customers { - public class CustomerExportedEvent - { - public CustomerExportedEvent(Customer customer, IDictionary result) - { - Guard.NotNull(customer, nameof(customer)); - Guard.NotNull(result, nameof(result)); + public class CustomerExportedEvent + { + public CustomerExportedEvent(Customer customer, IDictionary result) + { + Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(result, nameof(result)); - Customer = customer; - Result = result; - } + Customer = customer; + Result = result; + } - public Customer Customer { get; private set; } - public IDictionary Result { get; private set; } - } + public Customer Customer { get; private set; } + public IDictionary Result { get; private set; } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/Events/CustomerLogedInEvent.cs b/src/Libraries/SmartStore.Services/Customers/Events/CustomerLogedInEvent.cs index b224692e64..d69f9cd24c 100644 --- a/src/Libraries/SmartStore.Services/Customers/Events/CustomerLogedInEvent.cs +++ b/src/Libraries/SmartStore.Services/Customers/Events/CustomerLogedInEvent.cs @@ -3,15 +3,15 @@ namespace SmartStore.Services.Customers { - /// - /// An event message, which will be published after customer has logged in - /// + /// + /// An event message, which will be published after customer has logged in + /// public class CustomerLogedInEvent - { + { public Customer Customer - { - get; - set; - } - } + { + get; + set; + } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/Events/CustomerRegisteredEvent.cs b/src/Libraries/SmartStore.Services/Customers/Events/CustomerRegisteredEvent.cs index 920c08fca6..66b6225adf 100644 --- a/src/Libraries/SmartStore.Services/Customers/Events/CustomerRegisteredEvent.cs +++ b/src/Libraries/SmartStore.Services/Customers/Events/CustomerRegisteredEvent.cs @@ -3,15 +3,15 @@ namespace SmartStore.Services.Customers { - /// - /// An event message, which will be published after customer has registered - /// + /// + /// An event message, which will be published after customer has registered + /// public class CustomerRegisteredEvent - { + { public Customer Customer - { - get; - set; - } - } + { + get; + set; + } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/GdprTool.cs b/src/Libraries/SmartStore.Services/Customers/GdprTool.cs index b6208e38aa..2b6fa43a63 100644 --- a/src/Libraries/SmartStore.Services/Customers/GdprTool.cs +++ b/src/Libraries/SmartStore.Services/Customers/GdprTool.cs @@ -29,128 +29,128 @@ namespace SmartStore.Services.Customers { - public enum IdentifierDataType - { - Text, - LongText, - Name, - UserName, - EmailAddress, - Url, - IpAddress, - PhoneNumber, - Address, - PostalCode, - DateTime - } - - public partial class GdprTool : IGdprTool - { - private readonly IMessageModelProvider _messageModelProvider; - private readonly IGenericAttributeService _genericAttributeService; - private readonly IShoppingCartService _shoppingCartService; - private readonly IForumService _forumService; - private readonly IBackInStockSubscriptionService _backInStockSubscriptionService; - private readonly ILanguageService _languageService; - private readonly ICommonServices _services; - - public static DateTime MinDate = new DateTime(1900, 1, 1); - - const string AnonymousEmail = "anonymous@example.com"; - - public GdprTool( - IMessageModelProvider messageModelProvider, - IGenericAttributeService genericAttributeService, - IShoppingCartService shoppingCartService, - IForumService forumService, - IBackInStockSubscriptionService backInStockSubscriptionService, - ILanguageService languageService, - ICommonServices services) - { - _messageModelProvider = messageModelProvider; - _genericAttributeService = genericAttributeService; - _shoppingCartService = shoppingCartService; - _forumService = forumService; - _backInStockSubscriptionService = backInStockSubscriptionService; - _languageService = languageService; - _services = services; - - T = NullLocalizer.InstanceEx; - Logger = NullLogger.Instance; - } - - public LocalizerEx T { get; set; } - - public ILogger Logger { get; set; } - - public virtual IDictionary ExportCustomer(Customer customer) - { - Guard.NotNull(customer, nameof(customer)); - - var ignoreMemberNames = new string[] - { - "WishlistUrl", "EditUrl", "PasswordRecoveryURL", - "BillingAddress.NameLine", "BillingAddress.StreetLine", "BillingAddress.CityLine", "BillingAddress.CountryLine", - "ShippingAddress.NameLine", "ShippingAddress.StreetLine", "ShippingAddress.CityLine", "ShippingAddress.CountryLine" - }; - - var model = _messageModelProvider.CreateModelPart(customer, true, ignoreMemberNames) as IDictionary; - - if (model != null) - { - // Roles - model["CustomerRoles"] = customer.CustomerRoleMappings.Select(x => x.CustomerRole.Name).ToArray(); - - // Generic attributes - var attributes = _genericAttributeService.GetAttributesForEntity(customer.Id, "Customer"); - if (attributes.Any()) - { - model["Attributes"] = _messageModelProvider.CreateModelPart(attributes, true); - } - - // Order history - var orders = customer.Orders.Where(x => !x.Deleted); - if (orders.Any()) - { - ignoreMemberNames = new string[] - { - "Disclaimer", "ConditionsOfUse", "Url", "CheckoutAttributes", - "Items.DownloadUrl", - "Items.Product.Description", "Items.Product.Url", "Items.Product.Thumbnail", "Items.Product.ThumbnailLg", - "Items.BundleItems.Product.Description", "Items.BundleItems.Product.Url", "Items.BundleItems.Product.Thumbnail", "Items.BundleItems.Product.ThumbnailLg", - "Billing.NameLine", "Billing.StreetLine", "Billing.CityLine", "Billing.CountryLine", - "Shipping.NameLine", "Shipping.StreetLine", "Shipping.CityLine", "Shipping.CountryLine" - }; - model["Orders"] = orders.Select(x => _messageModelProvider.CreateModelPart(x, true, ignoreMemberNames)).ToList(); - } - - // Return Request - var returnRequests = customer.ReturnRequests; - if (returnRequests.Any()) - { - model["ReturnRequests"] = returnRequests.Select(x => _messageModelProvider.CreateModelPart(x, true, "Url")).ToList(); - } - - // Wallet - var walletHistory = customer.WalletHistory; - if (walletHistory.Any()) - { - model["WalletHistory"] = walletHistory.Select(x => _messageModelProvider.CreateModelPart(x, true, "WalletUrl")).ToList(); - } - - // Forum topics - var forumTopics = customer.ForumTopics; - if (forumTopics.Any()) - { - model["ForumTopics"] = forumTopics.Select(x => _messageModelProvider.CreateModelPart(x, true, "Url")).ToList(); - } - - // Forum posts - var forumPosts = customer.ForumPosts; - if (forumPosts.Any()) - { - model["ForumPosts"] = forumPosts.Select(x => _messageModelProvider.CreateModelPart(x, true)).ToList(); - } + public enum IdentifierDataType + { + Text, + LongText, + Name, + UserName, + EmailAddress, + Url, + IpAddress, + PhoneNumber, + Address, + PostalCode, + DateTime + } + + public partial class GdprTool : IGdprTool + { + private readonly IMessageModelProvider _messageModelProvider; + private readonly IGenericAttributeService _genericAttributeService; + private readonly IShoppingCartService _shoppingCartService; + private readonly IForumService _forumService; + private readonly IBackInStockSubscriptionService _backInStockSubscriptionService; + private readonly ILanguageService _languageService; + private readonly ICommonServices _services; + + public static DateTime MinDate = new DateTime(1900, 1, 1); + + const string AnonymousEmail = "anonymous@example.com"; + + public GdprTool( + IMessageModelProvider messageModelProvider, + IGenericAttributeService genericAttributeService, + IShoppingCartService shoppingCartService, + IForumService forumService, + IBackInStockSubscriptionService backInStockSubscriptionService, + ILanguageService languageService, + ICommonServices services) + { + _messageModelProvider = messageModelProvider; + _genericAttributeService = genericAttributeService; + _shoppingCartService = shoppingCartService; + _forumService = forumService; + _backInStockSubscriptionService = backInStockSubscriptionService; + _languageService = languageService; + _services = services; + + T = NullLocalizer.InstanceEx; + Logger = NullLogger.Instance; + } + + public LocalizerEx T { get; set; } + + public ILogger Logger { get; set; } + + public virtual IDictionary ExportCustomer(Customer customer) + { + Guard.NotNull(customer, nameof(customer)); + + var ignoreMemberNames = new string[] + { + "WishlistUrl", "EditUrl", "PasswordRecoveryURL", + "BillingAddress.NameLine", "BillingAddress.StreetLine", "BillingAddress.CityLine", "BillingAddress.CountryLine", + "ShippingAddress.NameLine", "ShippingAddress.StreetLine", "ShippingAddress.CityLine", "ShippingAddress.CountryLine" + }; + + var model = _messageModelProvider.CreateModelPart(customer, true, ignoreMemberNames) as IDictionary; + + if (model != null) + { + // Roles + model["CustomerRoles"] = customer.CustomerRoleMappings.Select(x => x.CustomerRole.Name).ToArray(); + + // Generic attributes + var attributes = _genericAttributeService.GetAttributesForEntity(customer.Id, "Customer"); + if (attributes.Any()) + { + model["Attributes"] = _messageModelProvider.CreateModelPart(attributes, true); + } + + // Order history + var orders = customer.Orders.Where(x => !x.Deleted); + if (orders.Any()) + { + ignoreMemberNames = new string[] + { + "Disclaimer", "ConditionsOfUse", "Url", "CheckoutAttributes", + "Items.DownloadUrl", + "Items.Product.Description", "Items.Product.Url", "Items.Product.Thumbnail", "Items.Product.ThumbnailLg", + "Items.BundleItems.Product.Description", "Items.BundleItems.Product.Url", "Items.BundleItems.Product.Thumbnail", "Items.BundleItems.Product.ThumbnailLg", + "Billing.NameLine", "Billing.StreetLine", "Billing.CityLine", "Billing.CountryLine", + "Shipping.NameLine", "Shipping.StreetLine", "Shipping.CityLine", "Shipping.CountryLine" + }; + model["Orders"] = orders.Select(x => _messageModelProvider.CreateModelPart(x, true, ignoreMemberNames)).ToList(); + } + + // Return Request + var returnRequests = customer.ReturnRequests; + if (returnRequests.Any()) + { + model["ReturnRequests"] = returnRequests.Select(x => _messageModelProvider.CreateModelPart(x, true, "Url")).ToList(); + } + + // Wallet + var walletHistory = customer.WalletHistory; + if (walletHistory.Any()) + { + model["WalletHistory"] = walletHistory.Select(x => _messageModelProvider.CreateModelPart(x, true, "WalletUrl")).ToList(); + } + + // Forum topics + var forumTopics = customer.ForumTopics; + if (forumTopics.Any()) + { + model["ForumTopics"] = forumTopics.Select(x => _messageModelProvider.CreateModelPart(x, true, "Url")).ToList(); + } + + // Forum posts + var forumPosts = customer.ForumPosts; + if (forumPosts.Any()) + { + model["ForumPosts"] = forumPosts.Select(x => _messageModelProvider.CreateModelPart(x, true)).ToList(); + } // Forum post votes var forumPostVotes = customer.CustomerContent.OfType(); @@ -162,78 +162,78 @@ public virtual IDictionary ExportCustomer(Customer customer) // Product reviews var productReviews = customer.CustomerContent.OfType(); - if (productReviews.Any()) - { - model["ProductReviews"] = productReviews.Select(x => _messageModelProvider.CreateModelPart(x, true)).ToList(); - } - - // News comments - var newsComments = customer.CustomerContent.OfType(); - if (newsComments.Any()) - { - model["NewsComments"] = newsComments.Select(x => _messageModelProvider.CreateModelPart(x, true)).ToList(); - } - - // Blog comments - var blogComments = customer.CustomerContent.OfType(); - if (blogComments.Any()) - { - model["BlogComments"] = blogComments.Select(x => _messageModelProvider.CreateModelPart(x, true)).ToList(); - } - - // Product review helpfulness - var helpfulness = customer.CustomerContent.OfType(); - if (helpfulness.Any()) - { - ignoreMemberNames = new string[] { "CustomerId", "UpdatedOn" }; - model["ProductReviewHelpfulness"] = helpfulness.Select(x => _messageModelProvider.CreateModelPart(x, true, ignoreMemberNames)).ToList(); - } - - // Poll voting - var pollVotings = customer.CustomerContent.OfType(); - if (pollVotings.Any()) - { - ignoreMemberNames = new string[] { "CustomerId", "UpdatedOn" }; - model["PollVotings"] = pollVotings.Select(x => _messageModelProvider.CreateModelPart(x, true, ignoreMemberNames)).ToList(); - } - - // Forum subscriptions - var forumSubscriptions = _forumService.GetAllSubscriptions(customer.Id, 0, 0, 0, int.MaxValue); - if (forumSubscriptions.Any()) - { - model["ForumSubscriptions"] = forumSubscriptions.Select(x => _messageModelProvider.CreateModelPart(x, true, "CustomerId")).ToList(); - } - - // BackInStock subscriptions - var backInStockSubscriptions = _backInStockSubscriptionService.GetAllSubscriptionsByCustomerId(customer.Id, 0, 0, int.MaxValue); - if (backInStockSubscriptions.Any()) - { - model["BackInStockSubscriptions"] = backInStockSubscriptions.Select(x => _messageModelProvider.CreateModelPart(x, true, "CustomerId")).ToList(); - } - - // INFO: we're not going to export: - // - Private messages - // - Activity log - // It doesn't feel right and GDPR rules are not very clear about this. Let's wait and see :-) - - // Publish event to give plugin devs a chance to attach external data. - _services.EventPublisher.Publish(new CustomerExportedEvent(customer, model)); - } - - return model; - } - - public virtual void AnonymizeCustomer(Customer customer, bool pseudomyzeContent) - { - Guard.NotNull(customer, nameof(customer)); - - var language = customer.GetLanguage(); - var customerName = customer.GetFullName() ?? customer.Username ?? customer.FindEmail(); - - using (var scope = new DbContextScope(_services.DbContext, autoCommit: false)) - { - // Set to deleted - customer.Deleted = true; + if (productReviews.Any()) + { + model["ProductReviews"] = productReviews.Select(x => _messageModelProvider.CreateModelPart(x, true)).ToList(); + } + + // News comments + var newsComments = customer.CustomerContent.OfType(); + if (newsComments.Any()) + { + model["NewsComments"] = newsComments.Select(x => _messageModelProvider.CreateModelPart(x, true)).ToList(); + } + + // Blog comments + var blogComments = customer.CustomerContent.OfType(); + if (blogComments.Any()) + { + model["BlogComments"] = blogComments.Select(x => _messageModelProvider.CreateModelPart(x, true)).ToList(); + } + + // Product review helpfulness + var helpfulness = customer.CustomerContent.OfType(); + if (helpfulness.Any()) + { + ignoreMemberNames = new string[] { "CustomerId", "UpdatedOn" }; + model["ProductReviewHelpfulness"] = helpfulness.Select(x => _messageModelProvider.CreateModelPart(x, true, ignoreMemberNames)).ToList(); + } + + // Poll voting + var pollVotings = customer.CustomerContent.OfType(); + if (pollVotings.Any()) + { + ignoreMemberNames = new string[] { "CustomerId", "UpdatedOn" }; + model["PollVotings"] = pollVotings.Select(x => _messageModelProvider.CreateModelPart(x, true, ignoreMemberNames)).ToList(); + } + + // Forum subscriptions + var forumSubscriptions = _forumService.GetAllSubscriptions(customer.Id, 0, 0, 0, int.MaxValue); + if (forumSubscriptions.Any()) + { + model["ForumSubscriptions"] = forumSubscriptions.Select(x => _messageModelProvider.CreateModelPart(x, true, "CustomerId")).ToList(); + } + + // BackInStock subscriptions + var backInStockSubscriptions = _backInStockSubscriptionService.GetAllSubscriptionsByCustomerId(customer.Id, 0, 0, int.MaxValue); + if (backInStockSubscriptions.Any()) + { + model["BackInStockSubscriptions"] = backInStockSubscriptions.Select(x => _messageModelProvider.CreateModelPart(x, true, "CustomerId")).ToList(); + } + + // INFO: we're not going to export: + // - Private messages + // - Activity log + // It doesn't feel right and GDPR rules are not very clear about this. Let's wait and see :-) + + // Publish event to give plugin devs a chance to attach external data. + _services.EventPublisher.Publish(new CustomerExportedEvent(customer, model)); + } + + return model; + } + + public virtual void AnonymizeCustomer(Customer customer, bool pseudomyzeContent) + { + Guard.NotNull(customer, nameof(customer)); + + var language = customer.GetLanguage(); + var customerName = customer.GetFullName() ?? customer.Username ?? customer.FindEmail(); + + using (var scope = new DbContextScope(_services.DbContext, autoCommit: false)) + { + // Set to deleted + customer.Deleted = true; // Unassign roles var customerService = _services.Resolve(); @@ -249,231 +249,231 @@ public virtual void AnonymizeCustomer(Customer customer, bool pseudomyzeContent) { customerService.InsertCustomerRoleMapping(new CustomerRoleMapping { CustomerId = customer.Id, CustomerRoleId = guestRole.Id }); } - - // Delete shopping cart & wishlist (TBD: (mc) Really?!?) - _shoppingCartService.DeleteExpiredShoppingCartItems(DateTime.UtcNow, customer.Id); - - // Delete forum subscriptions - var forumSubscriptions = _forumService.GetAllSubscriptions(customer.Id, 0, 0, 0, int.MaxValue); - foreach (var forumSub in forumSubscriptions) - { - _forumService.DeleteSubscription(forumSub); - } - - // Delete BackInStock subscriptions - var backInStockSubscriptions = _backInStockSubscriptionService.GetAllSubscriptionsByCustomerId(customer.Id, 0, 0, int.MaxValue); - foreach (var stockSub in backInStockSubscriptions) - { - _backInStockSubscriptionService.DeleteSubscription(stockSub); - } - - // Generic attributes - var attributes = _genericAttributeService.GetAttributesForEntity(customer.Id, "Customer"); - foreach (var attr in attributes) - { - // we don't need to mask generic attrs, we just delete them. - _genericAttributeService.DeleteAttribute(attr); - } - - // Customer Data - AnonymizeData(customer, x => x.Username, IdentifierDataType.UserName, language); - AnonymizeData(customer, x => x.Email, IdentifierDataType.EmailAddress, language); - AnonymizeData(customer, x => x.LastIpAddress, IdentifierDataType.IpAddress, language); - if (pseudomyzeContent) - { - AnonymizeData(customer, x => x.AdminComment, IdentifierDataType.LongText, language); - AnonymizeData(customer, x => x.LastLoginDateUtc, IdentifierDataType.DateTime, language); - AnonymizeData(customer, x => x.LastActivityDateUtc, IdentifierDataType.DateTime, language); - } - - // Addresses - foreach (var address in customer.Addresses) - { - AnonymizeAddress(address, language); - } - - // Private messages - if (pseudomyzeContent) - { - var privateMessages = _forumService.GetAllPrivateMessages(0, customer.Id, 0, null, null, null, 0, int.MaxValue); - foreach (var msg in privateMessages) - { - AnonymizeData(msg, x => x.Subject, IdentifierDataType.Text, language); - AnonymizeData(msg, x => x.Text, IdentifierDataType.LongText, language); - } - } - - // Forum topics - if (pseudomyzeContent) - { - foreach (var topic in customer.ForumTopics) - { - AnonymizeData(topic, x => x.Subject, IdentifierDataType.Text, language); - } - } - - // Forum posts - foreach (var post in customer.ForumPosts) - { - AnonymizeData(post, x => x.IPAddress, IdentifierDataType.IpAddress, language); - if (pseudomyzeContent) - { - AnonymizeData(post, x => x.Text, IdentifierDataType.LongText, language); - } - } - - // Customer Content - foreach (var item in customer.CustomerContent) - { - AnonymizeData(item, x => x.IpAddress, IdentifierDataType.IpAddress, language); - - if (pseudomyzeContent) - { - switch (item) - { - case ProductReview c: - AnonymizeData(c, x => x.ReviewText, IdentifierDataType.LongText, language); - AnonymizeData(c, x => x.Title, IdentifierDataType.Text, language); - break; - case NewsComment c: - AnonymizeData(c, x => x.CommentText, IdentifierDataType.LongText, language); - AnonymizeData(c, x => x.CommentTitle, IdentifierDataType.Text, language); - break; - case BlogComment c: - AnonymizeData(c, x => x.CommentText, IdentifierDataType.LongText, language); - break; - } - } - } - - //// Anonymize Order IPs - //// TBD: Don't! Doesn't feel right because of fraud detection etc. - //foreach (var order in customer.Orders) - //{ - // AnonymizeData(order, x => x.CustomerIp, IdentifierDataType.IpAddress, language); - //} - - // SAVE!!! - //_services.DbContext.DetachAll(); // TEST - scope.Commit(); - - // Log - Logger.Info(T("Gdpr.Anonymize.Success", language.Id, customerName)); - } - } - - private void AnonymizeAddress(Address address, Language language) - { - AnonymizeData(address, x => x.Address1, IdentifierDataType.Address, language); - AnonymizeData(address, x => x.Address2, IdentifierDataType.Address, language); - AnonymizeData(address, x => x.City, IdentifierDataType.Address, language); - AnonymizeData(address, x => x.Company, IdentifierDataType.Address, language); - AnonymizeData(address, x => x.Email, IdentifierDataType.EmailAddress, language); - AnonymizeData(address, x => x.FaxNumber, IdentifierDataType.PhoneNumber, language); - AnonymizeData(address, x => x.FirstName, IdentifierDataType.Name, language); - AnonymizeData(address, x => x.LastName, IdentifierDataType.Name, language); - AnonymizeData(address, x => x.PhoneNumber, IdentifierDataType.PhoneNumber, language); - AnonymizeData(address, x => x.ZipPostalCode, IdentifierDataType.PostalCode, language); - } - - public virtual void AnonymizeData(TEntity entity, Expression> expression, IdentifierDataType type, Language language = null) - where TEntity : BaseEntity - { - Guard.NotNull(entity, nameof(entity)); - Guard.NotNull(expression, nameof(expression)); - - var originalValue = expression.Compile().Invoke(entity); - object maskedValue = null; - - if (originalValue is DateTime d) - { - maskedValue = MinDate; - } - else if (originalValue is string s) - { - if (s.IsEmpty()) - { - return; - } - - language = language ?? (entity as Customer)?.GetLanguage(); - - switch (type) - { - case IdentifierDataType.Address: - case IdentifierDataType.Name: - case IdentifierDataType.Text: - maskedValue = T("Gdpr.DeletedText", language.Id).Text; - break; - case IdentifierDataType.LongText: - maskedValue = T("Gdpr.DeletedLongText", language.Id).Text; - break; - case IdentifierDataType.EmailAddress: - //maskedValue = s.Hash(Encoding.ASCII, true) + "@anony.mous"; - maskedValue = HashCodeCombiner.Start() - .Add(entity.GetHashCode()) - .Add(s) - .CombinedHashString + "@anony.mous"; - break; - case IdentifierDataType.Url: - maskedValue = "https://anony.mous"; - break; - case IdentifierDataType.IpAddress: - maskedValue = AnonymizeIpAddress(s); - break; - case IdentifierDataType.UserName: - maskedValue = T("Gdpr.Anonymous", language.Id).Text.ToLower(); - break; - case IdentifierDataType.PhoneNumber: - maskedValue = "555-00000"; - break; - case IdentifierDataType.PostalCode: - maskedValue = "00000"; - break; - case IdentifierDataType.DateTime: - maskedValue = MinDate.ToString(CultureInfo.InvariantCulture); - break; - } - } - - if (maskedValue != null) - { - var pi = expression.ExtractPropertyInfo(); - pi.SetValue(entity, maskedValue); - } - } - - /// - /// Returns an anonymized IPv4 or IPv6 address. - /// - /// The IPv4 or IPv6 address to be anonymized. - /// The anonymized IP address. - protected virtual string AnonymizeIpAddress(string ipAddress) - { - try - { - var ip = IPAddress.Parse(ipAddress); - - switch (ip.AddressFamily) - { - case AddressFamily.InterNetwork: - break; - case AddressFamily.InterNetworkV6: - // Map to IPv4 first - ip = ip.MapToIPv4(); - break; - default: - // we only support IPv4 and IPv6 - return "0.0.0.0"; - } - - // Keep the first 3 bytes and append ".0" - return string.Join(".", ip.GetAddressBytes().Take(3)) + ".0"; - } - catch - { - return null; - } - } - } + + // Delete shopping cart & wishlist (TBD: (mc) Really?!?) + _shoppingCartService.DeleteExpiredShoppingCartItems(DateTime.UtcNow, customer.Id); + + // Delete forum subscriptions + var forumSubscriptions = _forumService.GetAllSubscriptions(customer.Id, 0, 0, 0, int.MaxValue); + foreach (var forumSub in forumSubscriptions) + { + _forumService.DeleteSubscription(forumSub); + } + + // Delete BackInStock subscriptions + var backInStockSubscriptions = _backInStockSubscriptionService.GetAllSubscriptionsByCustomerId(customer.Id, 0, 0, int.MaxValue); + foreach (var stockSub in backInStockSubscriptions) + { + _backInStockSubscriptionService.DeleteSubscription(stockSub); + } + + // Generic attributes + var attributes = _genericAttributeService.GetAttributesForEntity(customer.Id, "Customer"); + foreach (var attr in attributes) + { + // we don't need to mask generic attrs, we just delete them. + _genericAttributeService.DeleteAttribute(attr); + } + + // Customer Data + AnonymizeData(customer, x => x.Username, IdentifierDataType.UserName, language); + AnonymizeData(customer, x => x.Email, IdentifierDataType.EmailAddress, language); + AnonymizeData(customer, x => x.LastIpAddress, IdentifierDataType.IpAddress, language); + if (pseudomyzeContent) + { + AnonymizeData(customer, x => x.AdminComment, IdentifierDataType.LongText, language); + AnonymizeData(customer, x => x.LastLoginDateUtc, IdentifierDataType.DateTime, language); + AnonymizeData(customer, x => x.LastActivityDateUtc, IdentifierDataType.DateTime, language); + } + + // Addresses + foreach (var address in customer.Addresses) + { + AnonymizeAddress(address, language); + } + + // Private messages + if (pseudomyzeContent) + { + var privateMessages = _forumService.GetAllPrivateMessages(0, customer.Id, 0, null, null, null, 0, int.MaxValue); + foreach (var msg in privateMessages) + { + AnonymizeData(msg, x => x.Subject, IdentifierDataType.Text, language); + AnonymizeData(msg, x => x.Text, IdentifierDataType.LongText, language); + } + } + + // Forum topics + if (pseudomyzeContent) + { + foreach (var topic in customer.ForumTopics) + { + AnonymizeData(topic, x => x.Subject, IdentifierDataType.Text, language); + } + } + + // Forum posts + foreach (var post in customer.ForumPosts) + { + AnonymizeData(post, x => x.IPAddress, IdentifierDataType.IpAddress, language); + if (pseudomyzeContent) + { + AnonymizeData(post, x => x.Text, IdentifierDataType.LongText, language); + } + } + + // Customer Content + foreach (var item in customer.CustomerContent) + { + AnonymizeData(item, x => x.IpAddress, IdentifierDataType.IpAddress, language); + + if (pseudomyzeContent) + { + switch (item) + { + case ProductReview c: + AnonymizeData(c, x => x.ReviewText, IdentifierDataType.LongText, language); + AnonymizeData(c, x => x.Title, IdentifierDataType.Text, language); + break; + case NewsComment c: + AnonymizeData(c, x => x.CommentText, IdentifierDataType.LongText, language); + AnonymizeData(c, x => x.CommentTitle, IdentifierDataType.Text, language); + break; + case BlogComment c: + AnonymizeData(c, x => x.CommentText, IdentifierDataType.LongText, language); + break; + } + } + } + + //// Anonymize Order IPs + //// TBD: Don't! Doesn't feel right because of fraud detection etc. + //foreach (var order in customer.Orders) + //{ + // AnonymizeData(order, x => x.CustomerIp, IdentifierDataType.IpAddress, language); + //} + + // SAVE!!! + //_services.DbContext.DetachAll(); // TEST + scope.Commit(); + + // Log + Logger.Info(T("Gdpr.Anonymize.Success", language.Id, customerName)); + } + } + + private void AnonymizeAddress(Address address, Language language) + { + AnonymizeData(address, x => x.Address1, IdentifierDataType.Address, language); + AnonymizeData(address, x => x.Address2, IdentifierDataType.Address, language); + AnonymizeData(address, x => x.City, IdentifierDataType.Address, language); + AnonymizeData(address, x => x.Company, IdentifierDataType.Address, language); + AnonymizeData(address, x => x.Email, IdentifierDataType.EmailAddress, language); + AnonymizeData(address, x => x.FaxNumber, IdentifierDataType.PhoneNumber, language); + AnonymizeData(address, x => x.FirstName, IdentifierDataType.Name, language); + AnonymizeData(address, x => x.LastName, IdentifierDataType.Name, language); + AnonymizeData(address, x => x.PhoneNumber, IdentifierDataType.PhoneNumber, language); + AnonymizeData(address, x => x.ZipPostalCode, IdentifierDataType.PostalCode, language); + } + + public virtual void AnonymizeData(TEntity entity, Expression> expression, IdentifierDataType type, Language language = null) + where TEntity : BaseEntity + { + Guard.NotNull(entity, nameof(entity)); + Guard.NotNull(expression, nameof(expression)); + + var originalValue = expression.Compile().Invoke(entity); + object maskedValue = null; + + if (originalValue is DateTime d) + { + maskedValue = MinDate; + } + else if (originalValue is string s) + { + if (s.IsEmpty()) + { + return; + } + + language = language ?? (entity as Customer)?.GetLanguage(); + + switch (type) + { + case IdentifierDataType.Address: + case IdentifierDataType.Name: + case IdentifierDataType.Text: + maskedValue = T("Gdpr.DeletedText", language.Id).Text; + break; + case IdentifierDataType.LongText: + maskedValue = T("Gdpr.DeletedLongText", language.Id).Text; + break; + case IdentifierDataType.EmailAddress: + //maskedValue = s.Hash(Encoding.ASCII, true) + "@anony.mous"; + maskedValue = HashCodeCombiner.Start() + .Add(entity.GetHashCode()) + .Add(s) + .CombinedHashString + "@anony.mous"; + break; + case IdentifierDataType.Url: + maskedValue = "https://anony.mous"; + break; + case IdentifierDataType.IpAddress: + maskedValue = AnonymizeIpAddress(s); + break; + case IdentifierDataType.UserName: + maskedValue = T("Gdpr.Anonymous", language.Id).Text.ToLower(); + break; + case IdentifierDataType.PhoneNumber: + maskedValue = "555-00000"; + break; + case IdentifierDataType.PostalCode: + maskedValue = "00000"; + break; + case IdentifierDataType.DateTime: + maskedValue = MinDate.ToString(CultureInfo.InvariantCulture); + break; + } + } + + if (maskedValue != null) + { + var pi = expression.ExtractPropertyInfo(); + pi.SetValue(entity, maskedValue); + } + } + + /// + /// Returns an anonymized IPv4 or IPv6 address. + /// + /// The IPv4 or IPv6 address to be anonymized. + /// The anonymized IP address. + protected virtual string AnonymizeIpAddress(string ipAddress) + { + try + { + var ip = IPAddress.Parse(ipAddress); + + switch (ip.AddressFamily) + { + case AddressFamily.InterNetwork: + break; + case AddressFamily.InterNetworkV6: + // Map to IPv4 first + ip = ip.MapToIPv4(); + break; + default: + // we only support IPv4 and IPv6 + return "0.0.0.0"; + } + + // Keep the first 3 bytes and append ".0" + return string.Join(".", ip.GetAddressBytes().Take(3)) + ".0"; + } + catch + { + return null; + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs b/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs index e46b09fdcb..7a246b92a4 100644 --- a/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs +++ b/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs @@ -5,34 +5,34 @@ namespace SmartStore.Services.Customers { - public interface ICookieManager - { - /// - /// Gets CookieInfos of all plugins which are publishing cookies to be display in CookieManager dialog. - /// - /// List of CookieInfos. - List GetAllCookieInfos(bool addSettingCookies = false); - - /// - /// Gets a value which specifies whether it is allowed to set a cookie of a certain type. - /// - /// Type of the cookie. - /// Value which indicates whether cookies of a certain type are allowed to be set. - bool IsCookieAllowed(ControllerContext context, CookieType cookieType); + public interface ICookieManager + { + /// + /// Gets CookieInfos of all plugins which are publishing cookies to be display in CookieManager dialog. + /// + /// List of CookieInfos. + List GetAllCookieInfos(bool addSettingCookies = false); - /// - /// Gets the data of the cookie. - /// - /// - /// Cookie which contains data of user selection. - ConsentCookie GetCookieData(ControllerContext context); + /// + /// Gets a value which specifies whether it is allowed to set a cookie of a certain type. + /// + /// Type of the cookie. + /// Value which indicates whether cookies of a certain type are allowed to be set. + bool IsCookieAllowed(ControllerContext context, CookieType cookieType); - /// - /// Sets the cookie. - /// - /// Cookie will be set to this response. - /// Defines whether analytical cookies are allowed to be set. - /// Defines whether third party cookies are allowed to be set. - void SetConsentCookie(HttpResponseBase response, bool allowAnalytics = false, bool allowThirdParty = false); - } + /// + /// Gets the data of the cookie. + /// + /// + /// Cookie which contains data of user selection. + ConsentCookie GetCookieData(ControllerContext context); + + /// + /// Sets the cookie. + /// + /// Cookie will be set to this response. + /// Defines whether analytical cookies are allowed to be set. + /// Defines whether third party cookies are allowed to be set. + void SetConsentCookie(HttpResponseBase response, bool allowAnalytics = false, bool allowThirdParty = false); + } } diff --git a/src/Libraries/SmartStore.Services/Customers/ICustomerReportService.cs b/src/Libraries/SmartStore.Services/Customers/ICustomerReportService.cs index 4b74c5e452..6095b259dc 100644 --- a/src/Libraries/SmartStore.Services/Customers/ICustomerReportService.cs +++ b/src/Libraries/SmartStore.Services/Customers/ICustomerReportService.cs @@ -36,7 +36,7 @@ IPagedList GetTopCustomersReport( ReportSorting sorting, int pageIndex = 0, int pageSize = int.MaxValue); - + /// /// Gets a report of customers registered in the last days /// diff --git a/src/Libraries/SmartStore.Services/Customers/ICustomerService.cs b/src/Libraries/SmartStore.Services/Customers/ICustomerService.cs index eec8e0d004..91b0079fc3 100644 --- a/src/Libraries/SmartStore.Services/Customers/ICustomerService.cs +++ b/src/Libraries/SmartStore.Services/Customers/ICustomerService.cs @@ -21,28 +21,28 @@ public partial interface ICustomerService /// Customer collection IPagedList SearchCustomers(CustomerSearchQuery q); - /// - /// Gets all customers by customer format (including deleted ones) - /// - /// Password format - /// Customers - IPagedList GetAllCustomersByPasswordFormat(PasswordFormat passwordFormat); - - /// - /// Gets online customers - /// - /// Customer last activity date (from) - /// A list of customer role identifiers to filter by (at least one match); pass null or empty list in order to load all customers; - /// Page index - /// Page size - /// Customer collection - IPagedList GetOnlineCustomers(DateTime lastActivityFromUtc, int[] customerRoleIds, int pageIndex, int pageSize); - - /// - /// Delete a customer - /// - /// Customer - void DeleteCustomer(Customer customer); + /// + /// Gets all customers by customer format (including deleted ones) + /// + /// Password format + /// Customers + IPagedList GetAllCustomersByPasswordFormat(PasswordFormat passwordFormat); + + /// + /// Gets online customers + /// + /// Customer last activity date (from) + /// A list of customer role identifiers to filter by (at least one match); pass null or empty list in order to load all customers; + /// Page index + /// Page size + /// Customer collection + IPagedList GetOnlineCustomers(DateTime lastActivityFromUtc, int[] customerRoleIds, int pageIndex, int pageSize); + + /// + /// Delete a customer + /// + /// Customer + void DeleteCustomer(Customer customer); /// /// Gets a customer @@ -58,18 +58,18 @@ public partial interface ICustomerService /// Customers IList GetCustomersByIds(int[] customerIds); - /// - /// Get system account customers - /// - /// System account customers - IList GetSystemAccountCustomers(); + /// + /// Get system account customers + /// + /// System account customers + IList GetSystemAccountCustomers(); - /// - /// Gets a customer by GUID - /// - /// Customer GUID - /// A customer - Customer GetCustomerByGuid(Guid customerGuid); + /// + /// Gets a customer by GUID + /// + /// Customer GUID + /// A customer + Customer GetCustomerByGuid(Guid customerGuid); /// /// Get customer by email @@ -77,7 +77,7 @@ public partial interface ICustomerService /// Email /// Customer Customer GetCustomerByEmail(string email); - + /// /// Get customer by system name /// @@ -92,29 +92,29 @@ public partial interface ICustomerService /// Customer Customer GetCustomerByUsername(string username); - /// - /// Insert a guest customer - /// - /// The customer GUID. Pass null to create a random one. - /// Customer - Customer InsertGuestCustomer(Guid? customerGuid = null); - - /// - /// Tries to find a guest/anonymous customer record by client ident. This method should be called when an - /// anonymous visitor rejects cookies and therefore cannot be identified automatically. - /// - /// - /// The client ident string, which is a hashed combination of client IP address and user agent. - /// Call to obtain an ident string, or pass null to let this method obtain it automatically. - /// The max age of the newly created guest customer record. The shorter, the better (default is 1 min.) - /// The identified customer or null - Customer FindGuestCustomerByClientIdent(string clientIdent = null, int maxAgeSeconds = 60); - - /// - /// Insert a customer - /// - /// Customer - void InsertCustomer(Customer customer); + /// + /// Insert a guest customer + /// + /// The customer GUID. Pass null to create a random one. + /// Customer + Customer InsertGuestCustomer(Guid? customerGuid = null); + + /// + /// Tries to find a guest/anonymous customer record by client ident. This method should be called when an + /// anonymous visitor rejects cookies and therefore cannot be identified automatically. + /// + /// + /// The client ident string, which is a hashed combination of client IP address and user agent. + /// Call to obtain an ident string, or pass null to let this method obtain it automatically. + /// The max age of the newly created guest customer record. The shorter, the better (default is 1 min.) + /// The identified customer or null + Customer FindGuestCustomerByClientIdent(string clientIdent = null, int maxAgeSeconds = 60); + + /// + /// Insert a customer + /// + /// Customer + void InsertCustomer(Customer customer); /// /// Updates the customer @@ -122,22 +122,22 @@ public partial interface ICustomerService /// Customer void UpdateCustomer(Customer customer); - /// - /// Reset data required for checkout - /// - /// Customer - /// Store identifier - /// A value indicating whether to clear coupon code - /// A value indicating whether to clear selected checkout attributes - /// A value indicating whether to clear "Use reward points" flag - /// A value indicating whether to clear selected shipping method - /// A value indicating whether to clear selected payment method - /// A value indicating whether to clear credit balance. - void ResetCheckoutData(Customer customer, int storeId, + /// + /// Reset data required for checkout + /// + /// Customer + /// Store identifier + /// A value indicating whether to clear coupon code + /// A value indicating whether to clear selected checkout attributes + /// A value indicating whether to clear "Use reward points" flag + /// A value indicating whether to clear selected shipping method + /// A value indicating whether to clear selected payment method + /// A value indicating whether to clear credit balance. + void ResetCheckoutData(Customer customer, int storeId, bool clearCouponCodes = false, bool clearCheckoutAttributes = false, bool clearRewardPoints = false, bool clearShippingMethod = true, bool clearPaymentMethod = true, - bool clearCreditBalance = false); + bool clearCreditBalance = false); /// /// Delete guest customer records including generic attributes. @@ -255,13 +255,13 @@ IPagedList GetCustomerRoleMappings( /// Whether to add or remove points void RewardPointsForProductReview(Customer customer, Product product, bool add); - /// - /// Gets reward points histories - /// - /// Customer identifiers - /// Reward points histories - Multimap GetRewardPointsHistoriesByCustomerIds(int[] customerIds); + /// + /// Gets reward points histories + /// + /// Customer identifiers + /// Reward points histories + Multimap GetRewardPointsHistoriesByCustomerIds(int[] customerIds); - #endregion - } + #endregion + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Customers/IGdprTool.cs b/src/Libraries/SmartStore.Services/Customers/IGdprTool.cs index febf53638e..ca85e4f96c 100644 --- a/src/Libraries/SmartStore.Services/Customers/IGdprTool.cs +++ b/src/Libraries/SmartStore.Services/Customers/IGdprTool.cs @@ -8,33 +8,33 @@ namespace SmartStore.Services.Customers { - public interface IGdprTool - { - /// - /// Exports all data stored for a customer into a dictionary. Exported data contains all - /// personal data, addresses, order history, reviews, forum posts, private messages etc. - /// - /// The customer to export data for. - /// The exported data - /// This method fulfills the "GDPR Data Portability" requirement. - IDictionary ExportCustomer(Customer customer); + public interface IGdprTool + { + /// + /// Exports all data stored for a customer into a dictionary. Exported data contains all + /// personal data, addresses, order history, reviews, forum posts, private messages etc. + /// + /// The customer to export data for. + /// The exported data + /// This method fulfills the "GDPR Data Portability" requirement. + IDictionary ExportCustomer(Customer customer); - /// - /// Anonymizes a customer's (personal) data. - /// - /// The customer to anonymize. - /// - /// This method fulfills the "GDPR Right to be forgotten" requirement. - void AnonymizeCustomer(Customer customer, bool pseudomyzeContent); + /// + /// Anonymizes a customer's (personal) data. + /// + /// The customer to anonymize. + /// + /// This method fulfills the "GDPR Right to be forgotten" requirement. + void AnonymizeCustomer(Customer customer, bool pseudomyzeContent); - /// - /// TODO - /// - /// - /// - /// - /// - /// - void AnonymizeData(TEntity entity, Expression> expression, IdentifierDataType type, Language language = null) where TEntity : BaseEntity; - } + /// + /// TODO + /// + /// + /// + /// + /// + /// + void AnonymizeData(TEntity entity, Expression> expression, IdentifierDataType type, Language language = null) where TEntity : BaseEntity; + } } diff --git a/src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs b/src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs index a6396727ed..0e07ca0c7c 100644 --- a/src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs +++ b/src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs @@ -23,119 +23,119 @@ namespace SmartStore.Services.Customers.Importer { public class CustomerImporter : EntityImporterBase - { - private const string _attributeKeyGroup = "Customer"; + { + private const string _attributeKeyGroup = "Customer"; - private readonly IRepository _customerRepository; - private readonly IRepository _customerRoleRepository; - private readonly ICommonServices _services; + private readonly IRepository _customerRepository; + private readonly IRepository _customerRoleRepository; + private readonly ICommonServices _services; private readonly ICustomerService _customerService; private readonly IGenericAttributeService _genericAttributeService; private readonly IMediaService _mediaService; private readonly IAffiliateService _affiliateService; - private readonly ICountryService _countryService; - private readonly IStateProvinceService _stateProvinceService; - private readonly FileDownloadManager _fileDownloadManager; - private readonly CustomerSettings _customerSettings; - private readonly DateTimeSettings _dateTimeSettings; - private readonly ForumSettings _forumSettings; + private readonly ICountryService _countryService; + private readonly IStateProvinceService _stateProvinceService; + private readonly FileDownloadManager _fileDownloadManager; + private readonly CustomerSettings _customerSettings; + private readonly DateTimeSettings _dateTimeSettings; + private readonly ForumSettings _forumSettings; private readonly TaxSettings _taxSettings; private readonly PrivacySettings _privacySettings; public CustomerImporter( - IRepository customerRepository, - IRepository customerRoleRepository, - ICommonServices services, + IRepository customerRepository, + IRepository customerRoleRepository, + ICommonServices services, ICustomerService customerService, IGenericAttributeService genericAttributeService, IMediaService mediaService, IAffiliateService affiliateService, - ICountryService countryService, - IStateProvinceService stateProvinceService, - FileDownloadManager fileDownloadManager, - CustomerSettings customerSettings, - DateTimeSettings dateTimeSettings, - ForumSettings forumSettings, + ICountryService countryService, + IStateProvinceService stateProvinceService, + FileDownloadManager fileDownloadManager, + CustomerSettings customerSettings, + DateTimeSettings dateTimeSettings, + ForumSettings forumSettings, TaxSettings taxSettings, PrivacySettings privacySettings) - { - _customerRepository = customerRepository; - _customerRoleRepository = customerRoleRepository; + { + _customerRepository = customerRepository; + _customerRoleRepository = customerRoleRepository; _mediaService = mediaService; - _services = services; + _services = services; _customerService = customerService; - _genericAttributeService = genericAttributeService; - _affiliateService = affiliateService; - _countryService = countryService; - _stateProvinceService = stateProvinceService; - _fileDownloadManager = fileDownloadManager; - _customerSettings = customerSettings; - _dateTimeSettings = dateTimeSettings; - _forumSettings = forumSettings; + _genericAttributeService = genericAttributeService; + _affiliateService = affiliateService; + _countryService = countryService; + _stateProvinceService = stateProvinceService; + _fileDownloadManager = fileDownloadManager; + _customerSettings = customerSettings; + _dateTimeSettings = dateTimeSettings; + _forumSettings = forumSettings; _taxSettings = taxSettings; _privacySettings = privacySettings; - } + } - protected override void Import(ImportExecuteContext context) - { + protected override void Import(ImportExecuteContext context) + { var customer = _services.WorkContext.CurrentCustomer; var allowManagingCustomerRoles = _services.Permissions.Authorize(Permissions.Customer.EditRole, customer); var allAffiliateIds = _affiliateService.GetAllAffiliates(true) - .Select(x => x.Id) - .ToList(); - - var allCountries = new Dictionary(); - foreach (var country in _countryService.GetAllCountries(true)) - { - if (!allCountries.ContainsKey(country.TwoLetterIsoCode)) - allCountries.Add(country.TwoLetterIsoCode, country.Id); - - if (!allCountries.ContainsKey(country.ThreeLetterIsoCode)) - allCountries.Add(country.ThreeLetterIsoCode, country.Id); - } - - var allStateProvinces = _stateProvinceService.GetAllStateProvinces(true) - .ToDictionarySafe(x => new Tuple(x.CountryId, x.Abbreviation), x => x.Id); - - var allCustomerNumbers = new HashSet( - _customerRepository.Table.Where(x => !string.IsNullOrEmpty(x.CustomerNumber)).Select(x => x.CustomerNumber), - StringComparer.OrdinalIgnoreCase); - - using (var scope = new DbContextScope(ctx: _services.DbContext, hooksEnabled: false, autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false)) - { - var segmenter = context.DataSegmenter; - - Initialize(context); - AddInfoForDeprecatedFields(context); - - while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch()) - { - var batch = segmenter.GetCurrentBatch(); - - _customerRepository.Context.DetachAll(true); - - context.SetProgress(segmenter.CurrentSegmentFirstRowIndex - 1, segmenter.TotalRows); - - // =========================================================================== - // Process customers - // =========================================================================== - try - { - ProcessCustomers(context, batch, allAffiliateIds, allCustomerNumbers); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessCustomers"); - } - - // reduce batch to saved (valid) records. - // No need to perform import operations on errored records. - batch = batch.Where(x => x.Entity != null && !x.IsTransient).ToArray(); - - // update result object - context.Result.NewRecords += batch.Count(x => x.IsNew && !x.IsTransient); - context.Result.ModifiedRecords += batch.Count(x => !x.IsNew && !x.IsTransient); + .Select(x => x.Id) + .ToList(); + + var allCountries = new Dictionary(); + foreach (var country in _countryService.GetAllCountries(true)) + { + if (!allCountries.ContainsKey(country.TwoLetterIsoCode)) + allCountries.Add(country.TwoLetterIsoCode, country.Id); + + if (!allCountries.ContainsKey(country.ThreeLetterIsoCode)) + allCountries.Add(country.ThreeLetterIsoCode, country.Id); + } + + var allStateProvinces = _stateProvinceService.GetAllStateProvinces(true) + .ToDictionarySafe(x => new Tuple(x.CountryId, x.Abbreviation), x => x.Id); + + var allCustomerNumbers = new HashSet( + _customerRepository.Table.Where(x => !string.IsNullOrEmpty(x.CustomerNumber)).Select(x => x.CustomerNumber), + StringComparer.OrdinalIgnoreCase); + + using (var scope = new DbContextScope(ctx: _services.DbContext, hooksEnabled: false, autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false)) + { + var segmenter = context.DataSegmenter; + + Initialize(context); + AddInfoForDeprecatedFields(context); + + while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch()) + { + var batch = segmenter.GetCurrentBatch(); + + _customerRepository.Context.DetachAll(true); + + context.SetProgress(segmenter.CurrentSegmentFirstRowIndex - 1, segmenter.TotalRows); + + // =========================================================================== + // Process customers + // =========================================================================== + try + { + ProcessCustomers(context, batch, allAffiliateIds, allCustomerNumbers); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessCustomers"); + } + + // reduce batch to saved (valid) records. + // No need to perform import operations on errored records. + batch = batch.Where(x => x.Entity != null && !x.IsTransient).ToArray(); + + // update result object + context.Result.NewRecords += batch.Count(x => x.IsNew && !x.IsTransient); + context.Result.ModifiedRecords += batch.Count(x => !x.IsNew && !x.IsTransient); // =========================================================================== // Process customer roles @@ -157,172 +157,172 @@ protected override void Import(ImportExecuteContext context) } } - // =========================================================================== - // Process generic attributes - // =========================================================================== - try - { - ProcessGenericAttributes(context, batch, allCountries, allStateProvinces); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessGenericAttributes"); - } - - // =========================================================================== - // Process avatars - // =========================================================================== - if (_customerSettings.AllowCustomersToUploadAvatars) - { - try - { - ProcessAvatars(context, batch); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessAvatars"); - } - } - - // =========================================================================== - // Process addresses - // =========================================================================== - try - { - _services.DbContext.AutoDetectChangesEnabled = true; - ProcessAddresses(context, batch, allCountries, allStateProvinces); - } - catch (Exception ex) - { - context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessAddresses"); - } - finally - { - _services.DbContext.AutoDetectChangesEnabled = false; - } + // =========================================================================== + // Process generic attributes + // =========================================================================== + try + { + ProcessGenericAttributes(context, batch, allCountries, allStateProvinces); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessGenericAttributes"); + } + + // =========================================================================== + // Process avatars + // =========================================================================== + if (_customerSettings.AllowCustomersToUploadAvatars) + { + try + { + ProcessAvatars(context, batch); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessAvatars"); + } + } + + // =========================================================================== + // Process addresses + // =========================================================================== + try + { + _services.DbContext.AutoDetectChangesEnabled = true; + ProcessAddresses(context, batch, allCountries, allStateProvinces); + } + catch (Exception ex) + { + context.Result.AddError(ex, segmenter.CurrentSegment, "ProcessAddresses"); + } + finally + { + _services.DbContext.AutoDetectChangesEnabled = false; + } context.Services.EventPublisher.Publish(new ImportBatchExecutedEvent(context, batch)); } - } - } - - protected virtual int ProcessCustomers( - ImportExecuteContext context, - IEnumerable> batch, - List allAffiliateIds, - HashSet allCustomerNumbers) - { - _customerRepository.AutoCommitEnabled = true; - - var currentCustomer = _services.WorkContext.CurrentCustomer; + } + } + + protected virtual int ProcessCustomers( + ImportExecuteContext context, + IEnumerable> batch, + List allAffiliateIds, + HashSet allCustomerNumbers) + { + _customerRepository.AutoCommitEnabled = true; + + var currentCustomer = _services.WorkContext.CurrentCustomer; var customerQuery = _customerRepository.Table .Expand(x => x.Addresses) .Expand(x => x.CustomerRoleMappings.Select(rm => rm.CustomerRole)); - foreach (var row in batch) - { - Customer customer = null; - var id = row.GetDataValue("Id"); - var email = row.GetDataValue("Email"); + foreach (var row in batch) + { + Customer customer = null; + var id = row.GetDataValue("Id"); + var email = row.GetDataValue("Email"); var userName = row.GetDataValue("Username"); foreach (var keyName in context.KeyFieldNames) - { - switch (keyName) - { - case "Id": - if (id != 0) - { - customer = customerQuery.FirstOrDefault(x => x.Id == id); - } - break; - case "CustomerGuid": - var customerGuid = row.GetDataValue("CustomerGuid"); - if (customerGuid.HasValue()) - { - var guid = new Guid(customerGuid); - customer = customerQuery.FirstOrDefault(x => x.CustomerGuid == guid); - } - break; - case "Email": - if (email.HasValue()) - { - customer = customerQuery.FirstOrDefault(x => x.Email == email); - } - break; - case "Username": - if (userName.HasValue()) - { - customer = customerQuery.FirstOrDefault(x => x.Username == userName); - } - break; - } - - if (customer != null) - break; - } - - if (customer == null) - { - if (context.UpdateOnly) - { - ++context.Result.SkippedRecords; - continue; - } - - customer = new Customer - { - CustomerGuid = new Guid(), - AffiliateId = 0, - Active = true - }; - } - else - { - _customerRepository.Context.LoadCollection(customer, (Customer x) => x.CustomerRoleMappings); - } - - var affiliateId = row.GetDataValue("AffiliateId"); - - row.Initialize(customer, email ?? id.ToString()); - - row.SetProperty(context.Result, (x) => x.CustomerGuid); - row.SetProperty(context.Result, (x) => x.Username); - row.SetProperty(context.Result, (x) => x.Email); + { + switch (keyName) + { + case "Id": + if (id != 0) + { + customer = customerQuery.FirstOrDefault(x => x.Id == id); + } + break; + case "CustomerGuid": + var customerGuid = row.GetDataValue("CustomerGuid"); + if (customerGuid.HasValue()) + { + var guid = new Guid(customerGuid); + customer = customerQuery.FirstOrDefault(x => x.CustomerGuid == guid); + } + break; + case "Email": + if (email.HasValue()) + { + customer = customerQuery.FirstOrDefault(x => x.Email == email); + } + break; + case "Username": + if (userName.HasValue()) + { + customer = customerQuery.FirstOrDefault(x => x.Username == userName); + } + break; + } + + if (customer != null) + break; + } + + if (customer == null) + { + if (context.UpdateOnly) + { + ++context.Result.SkippedRecords; + continue; + } + + customer = new Customer + { + CustomerGuid = new Guid(), + AffiliateId = 0, + Active = true + }; + } + else + { + _customerRepository.Context.LoadCollection(customer, (Customer x) => x.CustomerRoleMappings); + } + + var affiliateId = row.GetDataValue("AffiliateId"); + + row.Initialize(customer, email ?? id.ToString()); + + row.SetProperty(context.Result, (x) => x.CustomerGuid); + row.SetProperty(context.Result, (x) => x.Username); + row.SetProperty(context.Result, (x) => x.Email); row.SetProperty(context.Result, (x) => x.Salutation); row.SetProperty(context.Result, (x) => x.FullName); row.SetProperty(context.Result, (x) => x.FirstName); - row.SetProperty(context.Result, (x) => x.LastName); + row.SetProperty(context.Result, (x) => x.LastName); if (_customerSettings.TitleEnabled) - row.SetProperty(context.Result, (x) => x.Title); + row.SetProperty(context.Result, (x) => x.Title); - if (_customerSettings.CompanyEnabled) - row.SetProperty(context.Result, (x) => x.Company); + if (_customerSettings.CompanyEnabled) + row.SetProperty(context.Result, (x) => x.Company); - if (_customerSettings.DateOfBirthEnabled) - row.SetProperty(context.Result, (x) => x.BirthDate); + if (_customerSettings.DateOfBirthEnabled) + row.SetProperty(context.Result, (x) => x.BirthDate); if (_privacySettings.StoreLastIpAddress) row.SetProperty(context.Result, (x) => x.LastIpAddress); if (email.HasValue() && currentCustomer.Email.IsCaseInsensitiveEqual(email)) - { - context.Result.AddInfo("Security. Ignored password of current customer (who started this import).", row.GetRowInfo(), "Password"); - } - else - { - row.SetProperty(context.Result, (x) => x.Password); - row.SetProperty(context.Result, (x) => x.PasswordFormatId); - row.SetProperty(context.Result, (x) => x.PasswordSalt); - } - - row.SetProperty(context.Result, (x) => x.AdminComment); - row.SetProperty(context.Result, (x) => x.IsTaxExempt); - row.SetProperty(context.Result, (x) => x.Active); - - row.SetProperty(context.Result, (x) => x.CreatedOnUtc, UtcNow); - row.SetProperty(context.Result, (x) => x.LastActivityDateUtc, UtcNow); + { + context.Result.AddInfo("Security. Ignored password of current customer (who started this import).", row.GetRowInfo(), "Password"); + } + else + { + row.SetProperty(context.Result, (x) => x.Password); + row.SetProperty(context.Result, (x) => x.PasswordFormatId); + row.SetProperty(context.Result, (x) => x.PasswordSalt); + } + + row.SetProperty(context.Result, (x) => x.AdminComment); + row.SetProperty(context.Result, (x) => x.IsTaxExempt); + row.SetProperty(context.Result, (x) => x.Active); + + row.SetProperty(context.Result, (x) => x.CreatedOnUtc, UtcNow); + row.SetProperty(context.Result, (x) => x.LastActivityDateUtc, UtcNow); if (_taxSettings.EuVatEnabled) row.SetProperty(context.Result, (x) => x.VatNumberStatusId); @@ -335,8 +335,8 @@ protected virtual int ProcessCustomers( if (affiliateId > 0 && allAffiliateIds.Contains(affiliateId)) customer.AffiliateId = affiliateId; - - string customerNumber = null; + + string customerNumber = null; if (_customerSettings.CustomerNumberMethod == CustomerNumberMethod.AutomaticallySet && row.IsTransient) { @@ -346,70 +346,70 @@ protected virtual int ProcessCustomers( { customerNumber = row.GetDataValue("CustomerNumber"); } - - if (customerNumber.HasValue() || !allCustomerNumbers.Contains(customerNumber)) - { - row.Entity.CustomerNumber = customerNumber; + + if (customerNumber.HasValue() || !allCustomerNumbers.Contains(customerNumber)) + { + row.Entity.CustomerNumber = customerNumber; if (!customerNumber.IsEmpty()) { allCustomerNumbers.Add(customerNumber); } - } - - if (row.IsTransient) - { - _customerRepository.Insert(customer); - } - else - { - _customerRepository.Update(customer); - } - } - - var num = _customerRepository.Context.SaveChanges(); - return num; - } - - protected virtual int ProcessCustomerRoles( - ImportExecuteContext context, - IEnumerable> batch) - { + } + + if (row.IsTransient) + { + _customerRepository.Insert(customer); + } + else + { + _customerRepository.Update(customer); + } + } + + var num = _customerRepository.Context.SaveChanges(); + return num; + } + + protected virtual int ProcessCustomerRoles( + ImportExecuteContext context, + IEnumerable> batch) + { Dictionary allCustomerRoles = null; - foreach (var row in batch) - { - var customer = row.Entity; + foreach (var row in batch) + { + var customer = row.Entity; var importRoleSystemNames = row.GetDataValue>("CustomerRoleSystemNames"); - var assignedRoles = customer.CustomerRoleMappings + var assignedRoles = customer.CustomerRoleMappings .Where(x => !x.IsSystemMapping) .Select(x => x.CustomerRole) .ToDictionarySafe(x => x.SystemName, StringComparer.OrdinalIgnoreCase); - // Roles to remove. - foreach (var customerRole in assignedRoles) - { - var systemName = customerRole.Key; - if (!systemName.IsCaseInsensitiveEqual(SystemCustomerRoleNames.Administrators) && - !systemName.IsCaseInsensitiveEqual(SystemCustomerRoleNames.SuperAdministrators) && - !importRoleSystemNames.Contains(systemName)) - { + // Roles to remove. + foreach (var customerRole in assignedRoles) + { + var systemName = customerRole.Key; + if (!systemName.IsCaseInsensitiveEqual(SystemCustomerRoleNames.Administrators) && + !systemName.IsCaseInsensitiveEqual(SystemCustomerRoleNames.SuperAdministrators) && + !importRoleSystemNames.Contains(systemName)) + { var mappings = customer.CustomerRoleMappings.Where(x => !x.IsSystemMapping && x.CustomerRoleId == customerRole.Value.Id).ToList(); mappings.Each(x => _customerService.DeleteCustomerRoleMapping(x)); - } - } - - // Roles to add. - foreach (var systemName in importRoleSystemNames) - { - if (systemName.IsCaseInsensitiveEqual(SystemCustomerRoleNames.Administrators) || - systemName.IsCaseInsensitiveEqual(SystemCustomerRoleNames.SuperAdministrators)) - { - context.Result.AddInfo("Security. Ignored administrator role.", row.GetRowInfo(), "CustomerRoleSystemNames"); - } - else if (!assignedRoles.ContainsKey(systemName)) - { + } + } + + // Roles to add. + foreach (var systemName in importRoleSystemNames) + { + if (systemName.IsCaseInsensitiveEqual(SystemCustomerRoleNames.Administrators) || + systemName.IsCaseInsensitiveEqual(SystemCustomerRoleNames.SuperAdministrators)) + { + context.Result.AddInfo("Security. Ignored administrator role.", row.GetRowInfo(), "CustomerRoleSystemNames"); + } + else if (!assignedRoles.ContainsKey(systemName)) + { // Add role mapping, never insert roles. // Be careful not to insert the roles several times! if (allCustomerRoles == null) @@ -424,34 +424,34 @@ protected virtual int ProcessCustomerRoles( _customerService.InsertCustomerRoleMapping(new CustomerRoleMapping { CustomerId = customer.Id, CustomerRoleId = role.Id }); } } - } - } + } + } return _services.DbContext.SaveChanges(); } - protected virtual int ProcessAddresses( - ImportExecuteContext context, - IEnumerable> batch, - Dictionary allCountries, - Dictionary, int> allStateProvinces) - { - foreach (var row in batch) - { - ImportAddress("BillingAddress.", row, context, allCountries, allStateProvinces); - ImportAddress("ShippingAddress.", row, context, allCountries, allStateProvinces); - } - - return _services.DbContext.SaveChanges(); - } - - private void ImportAddress( - string fieldPrefix, - ImportRow row, - ImportExecuteContext context, - Dictionary allCountries, - Dictionary, int> allStateProvinces) - { + protected virtual int ProcessAddresses( + ImportExecuteContext context, + IEnumerable> batch, + Dictionary allCountries, + Dictionary, int> allStateProvinces) + { + foreach (var row in batch) + { + ImportAddress("BillingAddress.", row, context, allCountries, allStateProvinces); + ImportAddress("ShippingAddress.", row, context, allCountries, allStateProvinces); + } + + return _services.DbContext.SaveChanges(); + } + + private void ImportAddress( + string fieldPrefix, + ImportRow row, + ImportExecuteContext context, + Dictionary allCountries, + Dictionary, int> allStateProvinces) + { // Last name is mandatory for an address to be imported or updated. if (!row.HasDataValue(fieldPrefix + "LastName")) { @@ -469,32 +469,32 @@ private void ImportAddress( address = row.Entity.ShippingAddress ?? new Address { CreatedOnUtc = UtcNow }; } - var childRow = new ImportRow
(row.Segmenter, row.DataRow, row.Position); - childRow.Initialize(address, row.EntityDisplayName); + var childRow = new ImportRow
(row.Segmenter, row.DataRow, row.Position); + childRow.Initialize(address, row.EntityDisplayName); childRow.SetProperty(context.Result, fieldPrefix + "Salutation", x => x.Salutation); childRow.SetProperty(context.Result, fieldPrefix + "Title", x => x.Title); childRow.SetProperty(context.Result, fieldPrefix + "FirstName", x => x.FirstName); childRow.SetProperty(context.Result, fieldPrefix + "LastName", x => x.LastName); - childRow.SetProperty(context.Result, fieldPrefix + "Email", x => x.Email); - childRow.SetProperty(context.Result, fieldPrefix + "Company", x => x.Company); - childRow.SetProperty(context.Result, fieldPrefix + "City", x => x.City); - childRow.SetProperty(context.Result, fieldPrefix + "Address1", x => x.Address1); - childRow.SetProperty(context.Result, fieldPrefix + "Address2", x => x.Address2); - childRow.SetProperty(context.Result, fieldPrefix + "ZipPostalCode", x => x.ZipPostalCode); - childRow.SetProperty(context.Result, fieldPrefix + "PhoneNumber", x => x.PhoneNumber); - childRow.SetProperty(context.Result, fieldPrefix + "FaxNumber", x => x.FaxNumber); - - childRow.SetProperty(context.Result, fieldPrefix + "CountryId", x => x.CountryId); - if (childRow.Entity.CountryId == null) - { - // Try with country code. - childRow.SetProperty(context.Result, fieldPrefix + "CountryCode", x => x.CountryId, converter: (val, ci) => CountryCodeToId(allCountries, val.ToString())); - } + childRow.SetProperty(context.Result, fieldPrefix + "Email", x => x.Email); + childRow.SetProperty(context.Result, fieldPrefix + "Company", x => x.Company); + childRow.SetProperty(context.Result, fieldPrefix + "City", x => x.City); + childRow.SetProperty(context.Result, fieldPrefix + "Address1", x => x.Address1); + childRow.SetProperty(context.Result, fieldPrefix + "Address2", x => x.Address2); + childRow.SetProperty(context.Result, fieldPrefix + "ZipPostalCode", x => x.ZipPostalCode); + childRow.SetProperty(context.Result, fieldPrefix + "PhoneNumber", x => x.PhoneNumber); + childRow.SetProperty(context.Result, fieldPrefix + "FaxNumber", x => x.FaxNumber); + + childRow.SetProperty(context.Result, fieldPrefix + "CountryId", x => x.CountryId); + if (childRow.Entity.CountryId == null) + { + // Try with country code. + childRow.SetProperty(context.Result, fieldPrefix + "CountryCode", x => x.CountryId, converter: (val, ci) => CountryCodeToId(allCountries, val.ToString())); + } var countryId = childRow.Entity.CountryId; - if (countryId.HasValue) - { + if (countryId.HasValue) + { if (row.HasDataValue(fieldPrefix + "StateProvinceId")) { childRow.SetProperty(context.Result, fieldPrefix + "StateProvinceId", x => x.StateProvinceId); @@ -506,11 +506,11 @@ private void ImportAddress( } } - if (!childRow.IsDirty) - { - // Not one single property could be set. Get out! - return; - } + if (!childRow.IsDirty) + { + // Not one single property could be set. Get out! + return; + } if (address.Id == 0) { @@ -534,29 +534,29 @@ private void ImportAddress( } _customerRepository.Update(row.Entity); - } - - protected virtual int ProcessGenericAttributes( - ImportExecuteContext context, - IEnumerable> batch, - Dictionary allCountries, - Dictionary, int> allStateProvinces) - { - foreach (var row in batch) - { + } + + protected virtual int ProcessGenericAttributes( + ImportExecuteContext context, + IEnumerable> batch, + Dictionary allCountries, + Dictionary, int> allStateProvinces) + { + foreach (var row in batch) + { if (_taxSettings.EuVatEnabled) { SaveAttribute(row, SystemCustomerAttributeNames.VatNumber); } - if (_customerSettings.StreetAddressEnabled) - SaveAttribute(row, SystemCustomerAttributeNames.StreetAddress); + if (_customerSettings.StreetAddressEnabled) + SaveAttribute(row, SystemCustomerAttributeNames.StreetAddress); - if (_customerSettings.StreetAddress2Enabled) - SaveAttribute(row, SystemCustomerAttributeNames.StreetAddress2); + if (_customerSettings.StreetAddress2Enabled) + SaveAttribute(row, SystemCustomerAttributeNames.StreetAddress2); - if (_customerSettings.CityEnabled) - SaveAttribute(row, SystemCustomerAttributeNames.City); + if (_customerSettings.CityEnabled) + SaveAttribute(row, SystemCustomerAttributeNames.City); if (_customerSettings.ZipPostalCodeEnabled) SaveAttribute(row, SystemCustomerAttributeNames.ZipPostalCode); @@ -565,55 +565,55 @@ protected virtual int ProcessGenericAttributes( SaveAttribute(row, SystemCustomerAttributeNames.CountryId); if (_customerSettings.CountryEnabled && _customerSettings.StateProvinceEnabled) - SaveAttribute(row, SystemCustomerAttributeNames.StateProvinceId); + SaveAttribute(row, SystemCustomerAttributeNames.StateProvinceId); - if (_customerSettings.PhoneEnabled) - SaveAttribute(row, SystemCustomerAttributeNames.Phone); + if (_customerSettings.PhoneEnabled) + SaveAttribute(row, SystemCustomerAttributeNames.Phone); - if (_customerSettings.FaxEnabled) - SaveAttribute(row, SystemCustomerAttributeNames.Fax); + if (_customerSettings.FaxEnabled) + SaveAttribute(row, SystemCustomerAttributeNames.Fax); - if (_forumSettings.ForumsEnabled) - SaveAttribute(row, SystemCustomerAttributeNames.ForumPostCount); + if (_forumSettings.ForumsEnabled) + SaveAttribute(row, SystemCustomerAttributeNames.ForumPostCount); - if (_forumSettings.SignaturesEnabled) - SaveAttribute(row, SystemCustomerAttributeNames.Signature); + if (_forumSettings.SignaturesEnabled) + SaveAttribute(row, SystemCustomerAttributeNames.Signature); var countryId = CountryCodeToId(allCountries, row.GetDataValue("CountryCode")); var stateId = StateAbbreviationToId(allStateProvinces, countryId, row.GetDataValue("StateAbbreviation")); if (countryId.HasValue) SaveAttribute(row, SystemCustomerAttributeNames.CountryId, countryId.Value); - + if (stateId.HasValue) - SaveAttribute(row, SystemCustomerAttributeNames.StateProvinceId, stateId.Value); - - } - - return _services.DbContext.SaveChanges(); - } - - protected virtual int ProcessAvatars( - ImportExecuteContext context, - IEnumerable> batch) - { - foreach (var row in batch) - { - var urlOrPath = row.GetDataValue("AvatarPictureUrl"); + SaveAttribute(row, SystemCustomerAttributeNames.StateProvinceId, stateId.Value); + + } + + return _services.DbContext.SaveChanges(); + } + + protected virtual int ProcessAvatars( + ImportExecuteContext context, + IEnumerable> batch) + { + foreach (var row in batch) + { + var urlOrPath = row.GetDataValue("AvatarPictureUrl"); if (urlOrPath.IsEmpty()) { continue; } - var image = CreateDownloadImage(context, urlOrPath, 1); - if (image.Url.HasValue() && !image.Success.HasValue) - { - AsyncRunner.RunSync(() => _fileDownloadManager.DownloadAsync(DownloaderContext, new FileDownloadManagerItem[] { image })); - } + var image = CreateDownloadImage(context, urlOrPath, 1); + if (image.Url.HasValue() && !image.Success.HasValue) + { + AsyncRunner.RunSync(() => _fileDownloadManager.DownloadAsync(DownloaderContext, new FileDownloadManagerItem[] { image })); + } - if ((image.Success ?? false) && File.Exists(image.Path)) - { - Succeeded(image); + if ((image.Success ?? false) && File.Exists(image.Path)) + { + Succeeded(image); using (var stream = File.OpenRead(image.Path)) { if ((stream?.Length ?? 0) > 0) @@ -644,97 +644,85 @@ protected virtual int ProcessAvatars( } } } - else - { - context.Result.AddInfo("Download of an image failed.", row.GetRowInfo(), "AvatarPictureUrl"); - } - } - - return _services.DbContext.SaveChanges(); - } - - public static string[] SupportedKeyFields - { - get - { - return new string[] { "Id", "CustomerGuid", "Email", "Username" }; - } - } - - public static string[] DefaultKeyFields - { - get - { - return new string[] { "Email", "CustomerGuid" }; - } - } - - private int? CountryCodeToId(Dictionary allCountries, string code) - { - int countryId; - if (code.HasValue() && allCountries.TryGetValue(code, out countryId) && countryId != 0) - { - return countryId; - } - - return null; - } - - private int? StateAbbreviationToId(Dictionary, int> allStateProvinces, int? countryId, string abbreviation) - { - if (countryId.HasValue && abbreviation.HasValue()) - { - var key = Tuple.Create(countryId.Value, abbreviation); - - int stateId; - if (allStateProvinces.TryGetValue(key, out stateId) && stateId != 0) - { - return stateId; - } - } - - return null; - } - - private void SaveAttribute(ImportRow row, string key) - { - SaveAttribute(row, key, row.GetDataValue(key)); - } - - private void SaveAttribute(ImportRow row, string key) - { - SaveAttribute(row, key, row.GetDataValue(key)); - } - - private void SaveAttribute(ImportRow row, string key, TPropType value) - { - if (row.IsTransient) - return; - - if (row.IsNew || value != null) - { - _genericAttributeService.SaveAttribute(row.Entity.Id, key, _attributeKeyGroup, value); - } - } - - private void AddInfoForDeprecatedFields(ImportExecuteContext context) - { - if (context.DataSegmenter.HasColumn("IsGuest")) - { - context.Result.AddInfo("Deprecated field. Use CustomerRoleSystemNames instead.", null, "IsGuest"); - } - if (context.DataSegmenter.HasColumn("IsRegistered")) - { - context.Result.AddInfo("Deprecated field. Use CustomerRoleSystemNames instead.", null, "IsRegistered"); - } - if (context.DataSegmenter.HasColumn("IsAdministrator")) - { - context.Result.AddInfo("Deprecated field. Use CustomerRoleSystemNames instead.", null, "IsAdministrator"); - } - if (context.DataSegmenter.HasColumn("IsForumModerator")) - { - context.Result.AddInfo("Deprecated field. Use CustomerRoleSystemNames instead.", null, "IsForumModerator"); - } - } - } + else + { + context.Result.AddInfo("Download of an image failed.", row.GetRowInfo(), "AvatarPictureUrl"); + } + } + + return _services.DbContext.SaveChanges(); + } + + public static string[] SupportedKeyFields => new string[] { "Id", "CustomerGuid", "Email", "Username" }; + + public static string[] DefaultKeyFields => new string[] { "Email", "CustomerGuid" }; + + private int? CountryCodeToId(Dictionary allCountries, string code) + { + int countryId; + if (code.HasValue() && allCountries.TryGetValue(code, out countryId) && countryId != 0) + { + return countryId; + } + + return null; + } + + private int? StateAbbreviationToId(Dictionary, int> allStateProvinces, int? countryId, string abbreviation) + { + if (countryId.HasValue && abbreviation.HasValue()) + { + var key = Tuple.Create(countryId.Value, abbreviation); + + int stateId; + if (allStateProvinces.TryGetValue(key, out stateId) && stateId != 0) + { + return stateId; + } + } + + return null; + } + + private void SaveAttribute(ImportRow row, string key) + { + SaveAttribute(row, key, row.GetDataValue(key)); + } + + private void SaveAttribute(ImportRow row, string key) + { + SaveAttribute(row, key, row.GetDataValue(key)); + } + + private void SaveAttribute(ImportRow row, string key, TPropType value) + { + if (row.IsTransient) + return; + + if (row.IsNew || value != null) + { + _genericAttributeService.SaveAttribute(row.Entity.Id, key, _attributeKeyGroup, value); + } + } + + private void AddInfoForDeprecatedFields(ImportExecuteContext context) + { + if (context.DataSegmenter.HasColumn("IsGuest")) + { + context.Result.AddInfo("Deprecated field. Use CustomerRoleSystemNames instead.", null, "IsGuest"); + } + if (context.DataSegmenter.HasColumn("IsRegistered")) + { + context.Result.AddInfo("Deprecated field. Use CustomerRoleSystemNames instead.", null, "IsRegistered"); + } + if (context.DataSegmenter.HasColumn("IsAdministrator")) + { + context.Result.AddInfo("Deprecated field. Use CustomerRoleSystemNames instead.", null, "IsAdministrator"); + } + if (context.DataSegmenter.HasColumn("IsForumModerator")) + { + context.Result.AddInfo("Deprecated field. Use CustomerRoleSystemNames instead.", null, "IsForumModerator"); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Customers/PasswordChangeResult.cs b/src/Libraries/SmartStore.Services/Customers/PasswordChangeResult.cs index 6270fd3a4b..0b035a39b6 100644 --- a/src/Libraries/SmartStore.Services/Customers/PasswordChangeResult.cs +++ b/src/Libraries/SmartStore.Services/Customers/PasswordChangeResult.cs @@ -1,22 +1,19 @@ using System.Collections.Generic; -namespace SmartStore.Services.Customers +namespace SmartStore.Services.Customers { public class PasswordChangeResult { public IList Errors { get; set; } - public PasswordChangeResult() + public PasswordChangeResult() { this.Errors = new List(); } - public bool Success - { - get { return (this.Errors.Count == 0); } - } + public bool Success => (this.Errors.Count == 0); - public void AddError(string error) + public void AddError(string error) { this.Errors.Add(error); } diff --git a/src/Libraries/SmartStore.Services/Customers/Rules/ITargetGroupService.cs b/src/Libraries/SmartStore.Services/Customers/Rules/ITargetGroupService.cs index ab018d0f3e..ac24dc9358 100644 --- a/src/Libraries/SmartStore.Services/Customers/Rules/ITargetGroupService.cs +++ b/src/Libraries/SmartStore.Services/Customers/Rules/ITargetGroupService.cs @@ -15,8 +15,8 @@ public interface ITargetGroupService : IRuleProvider FilterExpressionGroup CreateExpressionGroup(int ruleSetId); IPagedList ProcessFilter( - FilterExpression filter, - int pageIndex = 0, + FilterExpression filter, + int pageIndex = 0, int pageSize = int.MaxValue); IPagedList ProcessFilter( diff --git a/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupFilterDescriptor.cs b/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupFilterDescriptor.cs index 9cc07202c9..266db9b3d1 100644 --- a/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupFilterDescriptor.cs +++ b/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupFilterDescriptor.cs @@ -15,7 +15,7 @@ public class TargetGroupFilterDescriptor : FilterDescriptor private readonly IRuleFactory _ruleFactory; private readonly WeakReference _ruleVisitor; - public TargetGroupFilterDescriptor(IRuleFactory ruleFactory, IRuleVisitor ruleVisitor) + public TargetGroupFilterDescriptor(IRuleFactory ruleFactory, IRuleVisitor ruleVisitor) : base(x => true) { _ruleFactory = ruleFactory; @@ -25,7 +25,7 @@ public TargetGroupFilterDescriptor(IRuleFactory ruleFactory, IRuleVisitor ruleVi public override Expression GetExpression(RuleOperator op, Expression valueExpression, bool liftToNull) { var ruleSetId = ((ConstantExpression)valueExpression).Value.Convert(); - + // Get other expression group _ruleVisitor.TryGetTarget(out var visitor); var otherGroup = _ruleFactory.CreateExpressionGroup(ruleSetId, visitor) as FilterExpressionGroup; diff --git a/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupService.cs b/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupService.cs index f68aa036d2..2b54efadc3 100644 --- a/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupService.cs +++ b/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupService.cs @@ -24,7 +24,7 @@ public class TargetGroupService : RuleProviderBase, ITargetGroupService private readonly ICommonServices _services; public TargetGroupService( - IRuleFactory ruleFactory, + IRuleFactory ruleFactory, IRepository rsCustomer, ICommonServices services) : base(RuleScope.Customer) { @@ -65,21 +65,21 @@ public override IRuleExpressionGroup VisitRuleSet(RuleSetEntity ruleSet) } public IPagedList ProcessFilter( - FilterExpression filter, - int pageIndex = 0, + FilterExpression filter, + int pageIndex = 0, int pageSize = int.MaxValue) { Guard.NotNull(filter, nameof(filter)); return ProcessFilter( new[] { filter }, - LogicalRuleOperator.And, - pageIndex, + LogicalRuleOperator.And, + pageIndex, pageSize); } public IPagedList ProcessFilter( - int[] ruleSetIds, + int[] ruleSetIds, LogicalRuleOperator logicalOperator, int pageIndex = 0, int pageSize = int.MaxValue) diff --git a/src/Libraries/SmartStore.Services/Customers/Tasks/DeleteGuestsTask.cs b/src/Libraries/SmartStore.Services/Customers/Tasks/DeleteGuestsTask.cs index efa8917372..881138aaa0 100644 --- a/src/Libraries/SmartStore.Services/Customers/Tasks/DeleteGuestsTask.cs +++ b/src/Libraries/SmartStore.Services/Customers/Tasks/DeleteGuestsTask.cs @@ -28,5 +28,5 @@ public void Execute(TaskExecutionContext ctx) _customerService.DeleteGuestCustomers(null, registrationTo, true); } - } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvConfiguration.cs b/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvConfiguration.cs index 1680cf2d55..7ac7deff8f 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvConfiguration.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvConfiguration.cs @@ -4,293 +4,275 @@ namespace SmartStore.Services.DataExchange.Csv { - /// - /// Specifies the action to take when a parsing error has occured. - /// - public enum ParseErrorAction - { - /// - /// Raises the event. - /// - RaiseEvent = 0, - - /// - /// Tries to advance to next line. - /// - AdvanceToNextLine = 1, - - /// - /// Throws an exception. - /// - ThrowException = 2, - } - - /// - /// Specifies the action to take when a field is missing. - /// - public enum MissingFieldAction - { - /// - /// Treat as a parsing error. - /// - ParseError = 0, - - /// - /// Replaces by an empty value. - /// - ReplaceByEmpty = 1, - - /// - /// Replaces by a null value (). - /// - ReplaceByNull = 2, - } - - public class CsvConfiguration - { - private char _delimiter; - private char _escape; - private char _quote; - private string _quoteString; - private char[] _quotableChars; - - public CsvConfiguration() - { - _escape = '"'; - _delimiter = ';'; - _quote = '"'; - _quoteString = new String(new char[] { _escape, _quote }); - - Comment = '#'; - HasHeaders = true; - SkipEmptyLines = true; - SupportsMultiline = true; - DefaultHeaderName = "Column"; - - BuildQuotableChars(); + /// + /// Specifies the action to take when a parsing error has occured. + /// + public enum ParseErrorAction + { + /// + /// Raises the event. + /// + RaiseEvent = 0, + + /// + /// Tries to advance to next line. + /// + AdvanceToNextLine = 1, + + /// + /// Throws an exception. + /// + ThrowException = 2, + } + + /// + /// Specifies the action to take when a field is missing. + /// + public enum MissingFieldAction + { + /// + /// Treat as a parsing error. + /// + ParseError = 0, + + /// + /// Replaces by an empty value. + /// + ReplaceByEmpty = 1, + + /// + /// Replaces by a null value (). + /// + ReplaceByNull = 2, + } + + public class CsvConfiguration + { + private char _delimiter; + private char _escape; + private char _quote; + private string _quoteString; + private char[] _quotableChars; + + public CsvConfiguration() + { + _escape = '"'; + _delimiter = ';'; + _quote = '"'; + _quoteString = new String(new char[] { _escape, _quote }); + + Comment = '#'; + HasHeaders = true; + SkipEmptyLines = true; + SupportsMultiline = true; + DefaultHeaderName = "Column"; + + BuildQuotableChars(); } - private void BuildQuotableChars() - { - _quotableChars = new char[] { '\r', '\n', _delimiter, _quote }; + private void BuildQuotableChars() + { + _quotableChars = new char[] { '\r', '\n', _delimiter, _quote }; } - internal char[] QuotableChars - { - get { return _quotableChars; } - } - - /// - /// Gets an Excel friendly configuration where the result can be directly edited by Excel - /// - public static CsvConfiguration ExcelFriendlyConfiguration - { - get - { - return new CsvConfiguration - { - Delimiter = ';', - Quote = '"', - Escape = '"', - SupportsMultiline = false - }; - } - } - - /// - /// Gets an array with preset characters - /// - public static char[] PresetCharacters - { - get { return new char[] { '\n', '\r', '\0' }; } - } - - /// - /// Gets the comment character indicating that a line is commented out (default: #). - /// - /// The comment character indicating that a line is commented out. - public char Comment - { - get; - set; - } - - /// - /// Gets the escape character letting insert quotation characters inside a quoted field (default: "). - /// - /// The escape character letting insert quotation characters inside a quoted field. - public char Escape - { - get { return _escape; } - set - { - if (value == _escape) - return; - - if (PresetCharacters.Contains(value)) - { - throw new SmartException("'{0}' is not a valid escape char.".FormatInvariant(value)); - } - if (value == _delimiter) - { - throw new SmartException("Escape and delimiter chars cannot be equal in CSV files."); - } - - _escape = value; - _quoteString = new String(new char[] { _escape, _quote }); - } - } - - /// - /// Gets the delimiter character separating each field (default: ;). - /// - /// The delimiter character separating each field. - public char Delimiter - { - get { return _delimiter; } - set - { - if (value == _delimiter) - return; - - if (PresetCharacters.Contains(value)) - { - throw new SmartException("'{0}' is not a valid delimiter char.".FormatInvariant(value)); - } - if (value == _quote) - { - throw new SmartException("Quote and delimiter chars cannot be equal in CSV files."); - } - - _delimiter = value; - BuildQuotableChars(); - - } - } - - /// - /// Gets the quotation character wrapping every field (default: "). - /// - /// The quotation character wrapping every field. - public char Quote - { - get { return _quote; } - set - { - if (value == _quote) - return; - - if (PresetCharacters.Contains(value)) - { - throw new SmartException("'{0}' is not a valid quote char.".FormatInvariant(value)); - } - if (value == _delimiter) - { - throw new SmartException("Quote and delimiter chars cannot be equal in CSV files."); - } - - _quote = value; - _quoteString = new String(new char[] { _escape, _quote }); - BuildQuotableChars(); - } - } - - /// - /// Gets the concatenation of escape and quote char - /// - [JsonIgnore] - public string QuoteString - { - get - { - return _quoteString; - } - } - - public bool QuoteAllFields - { - get; - set; - } - - /// - /// Indicates if field names are located on the first non commented line (default: true). - /// - /// if field names are located on the first non commented line, otherwise, . - public bool HasHeaders - { - get; - set; - } - - /// - /// Indicates if spaces at the start and end of a field are trimmed (default: false). - /// - /// if spaces at the start and end of a field are trimmed, otherwise, . - public bool TrimValues - { - get; - set; - } - - /// - /// Contains the value which denotes a DbNull-value. - /// - public string NullValue - { - get; - set; - } - - /// - /// Gets or sets the default action to take when a parsing error has occured. - /// - /// The default action to take when a parsing error has occured. - public ParseErrorAction DefaultParseErrorAction - { - get; - set; - } - - /// - /// Gets or sets the action to take when a field is missing. - /// - /// The action to take when a field is missing. - public MissingFieldAction MissingFieldAction - { - get; - set; - } - - /// - /// Gets or sets a value indicating if the reader supports multiline fields (default: true). - /// - /// A value indicating if the reader supports multiline field. - public bool SupportsMultiline - { - get; - set; - } - - /// - /// Gets or sets a value indicating if the reader will skip empty lines (default: true). - /// - /// A value indicating if the reader will skip empty lines. - public bool SkipEmptyLines - { - get; - set; - } - - /// - /// Gets or sets the default header name when it is an empty string or only whitespaces (default: Column). - /// The header index will be appended to the specified name. - /// - /// The default header name when it is an empty string or only whitespaces. - public string DefaultHeaderName - { - get; - set; - } - } + internal char[] QuotableChars => _quotableChars; + + /// + /// Gets an Excel friendly configuration where the result can be directly edited by Excel + /// + public static CsvConfiguration ExcelFriendlyConfiguration => new CsvConfiguration + { + Delimiter = ';', + Quote = '"', + Escape = '"', + SupportsMultiline = false + }; + + /// + /// Gets an array with preset characters + /// + public static char[] PresetCharacters => new char[] { '\n', '\r', '\0' }; + + /// + /// Gets the comment character indicating that a line is commented out (default: #). + /// + /// The comment character indicating that a line is commented out. + public char Comment + { + get; + set; + } + + /// + /// Gets the escape character letting insert quotation characters inside a quoted field (default: "). + /// + /// The escape character letting insert quotation characters inside a quoted field. + public char Escape + { + get => _escape; + set + { + if (value == _escape) + return; + + if (PresetCharacters.Contains(value)) + { + throw new SmartException("'{0}' is not a valid escape char.".FormatInvariant(value)); + } + if (value == _delimiter) + { + throw new SmartException("Escape and delimiter chars cannot be equal in CSV files."); + } + + _escape = value; + _quoteString = new String(new char[] { _escape, _quote }); + } + } + + /// + /// Gets the delimiter character separating each field (default: ;). + /// + /// The delimiter character separating each field. + public char Delimiter + { + get => _delimiter; + set + { + if (value == _delimiter) + return; + + if (PresetCharacters.Contains(value)) + { + throw new SmartException("'{0}' is not a valid delimiter char.".FormatInvariant(value)); + } + if (value == _quote) + { + throw new SmartException("Quote and delimiter chars cannot be equal in CSV files."); + } + + _delimiter = value; + BuildQuotableChars(); + + } + } + + /// + /// Gets the quotation character wrapping every field (default: "). + /// + /// The quotation character wrapping every field. + public char Quote + { + get => _quote; + set + { + if (value == _quote) + return; + + if (PresetCharacters.Contains(value)) + { + throw new SmartException("'{0}' is not a valid quote char.".FormatInvariant(value)); + } + if (value == _delimiter) + { + throw new SmartException("Quote and delimiter chars cannot be equal in CSV files."); + } + + _quote = value; + _quoteString = new String(new char[] { _escape, _quote }); + BuildQuotableChars(); + } + } + + /// + /// Gets the concatenation of escape and quote char + /// + [JsonIgnore] + public string QuoteString => _quoteString; + + public bool QuoteAllFields + { + get; + set; + } + + /// + /// Indicates if field names are located on the first non commented line (default: true). + /// + /// if field names are located on the first non commented line, otherwise, . + public bool HasHeaders + { + get; + set; + } + + /// + /// Indicates if spaces at the start and end of a field are trimmed (default: false). + /// + /// if spaces at the start and end of a field are trimmed, otherwise, . + public bool TrimValues + { + get; + set; + } + + /// + /// Contains the value which denotes a DbNull-value. + /// + public string NullValue + { + get; + set; + } + + /// + /// Gets or sets the default action to take when a parsing error has occured. + /// + /// The default action to take when a parsing error has occured. + public ParseErrorAction DefaultParseErrorAction + { + get; + set; + } + + /// + /// Gets or sets the action to take when a field is missing. + /// + /// The action to take when a field is missing. + public MissingFieldAction MissingFieldAction + { + get; + set; + } + + /// + /// Gets or sets a value indicating if the reader supports multiline fields (default: true). + /// + /// A value indicating if the reader supports multiline field. + public bool SupportsMultiline + { + get; + set; + } + + /// + /// Gets or sets a value indicating if the reader will skip empty lines (default: true). + /// + /// A value indicating if the reader will skip empty lines. + public bool SkipEmptyLines + { + get; + set; + } + + /// + /// Gets or sets the default header name when it is an empty string or only whitespaces (default: Column). + /// The header index will be appended to the specified name. + /// + /// The default header name when it is an empty string or only whitespaces. + public string DefaultHeaderName + { + get; + set; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvConfigurationConverter.cs b/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvConfigurationConverter.cs index 9ae40e871b..1d99e78f11 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvConfigurationConverter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvConfigurationConverter.cs @@ -5,61 +5,61 @@ namespace SmartStore.Services.DataExchange.Csv { - public class CsvConfigurationConverter : DefaultTypeConverter - { - public CsvConfigurationConverter() - : base(typeof(object)) - { - } + public class CsvConfigurationConverter : DefaultTypeConverter + { + public CsvConfigurationConverter() + : base(typeof(object)) + { + } - public override bool CanConvertFrom(Type type) - { - return type == typeof(string); - } + public override bool CanConvertFrom(Type type) + { + return type == typeof(string); + } - public override bool CanConvertTo(Type type) - { - return type == typeof(string); - } + public override bool CanConvertTo(Type type) + { + return type == typeof(string); + } - public override object ConvertFrom(CultureInfo culture, object value) - { - if (value is string) - { - return JsonConvert.DeserializeObject((string)value); - } + public override object ConvertFrom(CultureInfo culture, object value) + { + if (value is string) + { + return JsonConvert.DeserializeObject((string)value); + } - return base.ConvertFrom(culture, value); - } + return base.ConvertFrom(culture, value); + } - public T ConvertFrom(string value) - { - if (value.HasValue()) - return (T)ConvertFrom(CultureInfo.InvariantCulture, value); + public T ConvertFrom(string value) + { + if (value.HasValue()) + return (T)ConvertFrom(CultureInfo.InvariantCulture, value); - return default(T); - } + return default(T); + } - public override object ConvertTo(CultureInfo culture, string format, object value, Type to) - { - if (to == typeof(string)) - { - if (value is CsvConfiguration) - { - return JsonConvert.SerializeObject(value); - } - else - { - return string.Empty; - } - } + public override object ConvertTo(CultureInfo culture, string format, object value, Type to) + { + if (to == typeof(string)) + { + if (value is CsvConfiguration) + { + return JsonConvert.SerializeObject(value); + } + else + { + return string.Empty; + } + } - return base.ConvertTo(culture, format, value, to); - } + return base.ConvertTo(culture, format, value, to); + } - public string ConvertTo(object value) - { - return (string)ConvertTo(CultureInfo.InvariantCulture, null, value, typeof(string)); - } - } + public string ConvertTo(object value) + { + return (string)ConvertTo(CultureInfo.InvariantCulture, null, value, typeof(string)); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvDataReader.cs b/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvDataReader.cs index 0a172ff592..664fb186fe 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvDataReader.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvDataReader.cs @@ -15,374 +15,314 @@ namespace SmartStore.Services.DataExchange.Csv { - /// - /// Represents a reader that provides fast, non-cached, forward-only access to CSV data. - /// - public class CsvDataReader : DisposableObject, IDataReader, IEnumerable - { - private readonly CsvReader _csv; - private readonly IDataReader _reader; - - /// - /// Initializes a new instance of the CsvDataReader class. - /// - /// A pointing to the CSV file. - public CsvDataReader(TextReader reader) - : this(reader, new CsvConfiguration()) - { - } - - /// - /// Initializes a new instance of the CsvDataReader class. - /// - /// A pointing to the CSV file. - public CsvDataReader(TextReader reader, CsvConfiguration configuration) - { - Guard.NotNull(reader, nameof(reader)); - Guard.NotNull(configuration, nameof(configuration)); - - this.Configuration = configuration; - - _csv = new CsvReader( - reader, - configuration.HasHeaders, - configuration.Delimiter, - configuration.Quote, - configuration.Escape, - configuration.Comment, - configuration.TrimValues ? ValueTrimmingOptions.All : ValueTrimmingOptions.None, - 4096, - configuration.NullValue) - { - SupportsMultiline = configuration.SupportsMultiline, - SkipEmptyLines = configuration.SkipEmptyLines, - DefaultHeaderName = configuration.DefaultHeaderName, - DefaultParseErrorAction = (LumenWorks.Framework.IO.Csv.ParseErrorAction)((int)configuration.DefaultParseErrorAction), - MissingFieldAction = (LumenWorks.Framework.IO.Csv.MissingFieldAction)((int)configuration.MissingFieldAction) - }; - - _reader = _csv; - } - - public CsvConfiguration Configuration - { - get; - private set; - } - - #region Public wrapper members - - /// - /// Gets the field headers. - /// - /// The field headers or an empty array if headers are not supported. - /// - /// The instance has been disposed of. - /// - public string[] GetFieldHeaders() - { - return _csv.GetFieldHeaders(); - } - - public bool EndOfStream - { - get - { - return _csv.EndOfStream; - } - } - - /// - /// Gets the current row index in the CSV file (0-based). - /// - /// The current row index in the CSV file. - public long CurrentRowIndex - { - get - { - return _csv.CurrentRecordIndex; - } - } - - public void CopyCurrentRowTo(string[] array) - { - _csv.CopyCurrentRecordTo(array); - } - - /// - /// Gets the current row's raw CSV data. - /// - /// The current raw CSV data. - public string GetRawData() - { - return _csv.GetCurrentRawData(); - } - - /// - /// Gets the field with the specified name. must be . - /// - /// - /// The field with the specified name. - /// - /// - /// is or an empty string. - /// - /// - /// The CSV does not have headers ( property is ). - /// - /// - /// not found. - /// - /// - /// The CSV appears to be corrupt at the current position. - /// - /// - /// The instance has been disposed of. - /// - public string this[string field] - { - get - { - return _csv[field]; - } - } - - /// - /// Gets the field at the specified index. - /// - /// The field at the specified index. - /// - /// must be included in [0, [. - /// - /// - /// No record read yet. Call ReadLine() first. - /// - /// - /// The CSV appears to be corrupt at the current position. - /// - /// - /// The instance has been disposed of. - /// - public virtual string this[int index] - { - get - { - return _csv[index]; - } - } - - #endregion - - #region IDataReader (implicit) - - public int FieldCount - { - get - { - return _reader.FieldCount; - } - } - - public bool Read() - { - return _csv.ReadNextRecord(); - } - - public int GetOrdinal(string name) - { - return _reader.GetOrdinal(name); - } - - #endregion - - #region IDataReader (explicit) - - object IDataRecord.this[string name] - { - get - { - return _reader[name]; - } - } - - object IDataRecord.this[int i] - { - get - { - return _reader[i]; - } - } - - int IDataReader.Depth - { - get - { - return _reader.Depth; - } - } - - bool IDataReader.IsClosed - { - get - { - return _reader.IsClosed; - } - } - - int IDataReader.RecordsAffected - { - get - { - return _reader.RecordsAffected; - } - } - - void IDataReader.Close() - { - _reader.Close(); - } - - bool IDataRecord.GetBoolean(int i) - { - return _reader.GetBoolean(i); - } - - byte IDataRecord.GetByte(int i) - { - return _reader.GetByte(i); - } - - long IDataRecord.GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length) - { - return _reader.GetBytes(i, fieldOffset, buffer, bufferoffset, length); - } - - char IDataRecord.GetChar(int i) - { - return _reader.GetChar(i); - } - - long IDataRecord.GetChars(int i, long fieldOffset, char[] buffer, int bufferoffset, int length) - { - return _reader.GetChars(i, fieldOffset, buffer, bufferoffset, length); - } - - IDataReader IDataRecord.GetData(int i) - { - return _reader.GetData(i); - } - - string IDataRecord.GetDataTypeName(int i) - { - return _reader.GetDataTypeName(i); - } - - DateTime IDataRecord.GetDateTime(int i) - { - return _reader.GetDateTime(i); - } - - decimal IDataRecord.GetDecimal(int i) - { - return _reader.GetDecimal(i); - } - - double IDataRecord.GetDouble(int i) - { - return _reader.GetDouble(i); - } - - Type IDataRecord.GetFieldType(int i) - { - return _reader.GetFieldType(i); - } - - float IDataRecord.GetFloat(int i) - { - return _reader.GetFloat(i); - } - - Guid IDataRecord.GetGuid(int i) - { - return _reader.GetGuid(i); - } - - short IDataRecord.GetInt16(int i) - { - return _reader.GetInt16(i); - } - - int IDataRecord.GetInt32(int i) - { - return _reader.GetInt32(i); - } - - long IDataRecord.GetInt64(int i) - { - return _reader.GetInt64(i); - } - - string IDataRecord.GetName(int i) - { - return _reader.GetName(i); - } - - DataTable IDataReader.GetSchemaTable() - { - return _reader.GetSchemaTable(); - } - - string IDataRecord.GetString(int i) - { - return _reader.GetString(i); - } - - object IDataRecord.GetValue(int i) - { - return _reader.GetGuid(i); - } - - int IDataRecord.GetValues(object[] values) - { - return _reader.GetValues(values); - } - - bool IDataRecord.IsDBNull(int i) - { - return _reader.IsDBNull(i); - } - - bool IDataReader.NextResult() - { - return _reader.NextResult(); - } - - #endregion - - #region IEnumerable - - IEnumerator IEnumerable.GetEnumerator() - { - return _csv.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return _csv.GetEnumerator(); - } - - #endregion - - #region Disposable - - protected override void OnDispose(bool disposing) - { - if (disposing) - { - _csv.Dispose(); - } - } - - #endregion - } + /// + /// Represents a reader that provides fast, non-cached, forward-only access to CSV data. + /// + public class CsvDataReader : DisposableObject, IDataReader, IEnumerable + { + private readonly CsvReader _csv; + private readonly IDataReader _reader; + + /// + /// Initializes a new instance of the CsvDataReader class. + /// + /// A pointing to the CSV file. + public CsvDataReader(TextReader reader) + : this(reader, new CsvConfiguration()) + { + } + + /// + /// Initializes a new instance of the CsvDataReader class. + /// + /// A pointing to the CSV file. + public CsvDataReader(TextReader reader, CsvConfiguration configuration) + { + Guard.NotNull(reader, nameof(reader)); + Guard.NotNull(configuration, nameof(configuration)); + + this.Configuration = configuration; + + _csv = new CsvReader( + reader, + configuration.HasHeaders, + configuration.Delimiter, + configuration.Quote, + configuration.Escape, + configuration.Comment, + configuration.TrimValues ? ValueTrimmingOptions.All : ValueTrimmingOptions.None, + 4096, + configuration.NullValue) + { + SupportsMultiline = configuration.SupportsMultiline, + SkipEmptyLines = configuration.SkipEmptyLines, + DefaultHeaderName = configuration.DefaultHeaderName, + DefaultParseErrorAction = (LumenWorks.Framework.IO.Csv.ParseErrorAction)((int)configuration.DefaultParseErrorAction), + MissingFieldAction = (LumenWorks.Framework.IO.Csv.MissingFieldAction)((int)configuration.MissingFieldAction) + }; + + _reader = _csv; + } + + public CsvConfiguration Configuration + { + get; + private set; + } + + #region Public wrapper members + + /// + /// Gets the field headers. + /// + /// The field headers or an empty array if headers are not supported. + /// + /// The instance has been disposed of. + /// + public string[] GetFieldHeaders() + { + return _csv.GetFieldHeaders(); + } + + public bool EndOfStream => _csv.EndOfStream; + + /// + /// Gets the current row index in the CSV file (0-based). + /// + /// The current row index in the CSV file. + public long CurrentRowIndex => _csv.CurrentRecordIndex; + + public void CopyCurrentRowTo(string[] array) + { + _csv.CopyCurrentRecordTo(array); + } + + /// + /// Gets the current row's raw CSV data. + /// + /// The current raw CSV data. + public string GetRawData() + { + return _csv.GetCurrentRawData(); + } + + /// + /// Gets the field with the specified name. must be . + /// + /// + /// The field with the specified name. + /// + /// + /// is or an empty string. + /// + /// + /// The CSV does not have headers ( property is ). + /// + /// + /// not found. + /// + /// + /// The CSV appears to be corrupt at the current position. + /// + /// + /// The instance has been disposed of. + /// + public string this[string field] => _csv[field]; + + /// + /// Gets the field at the specified index. + /// + /// The field at the specified index. + /// + /// must be included in [0, [. + /// + /// + /// No record read yet. Call ReadLine() first. + /// + /// + /// The CSV appears to be corrupt at the current position. + /// + /// + /// The instance has been disposed of. + /// + public virtual string this[int index] => _csv[index]; + + #endregion + + #region IDataReader (implicit) + + public int FieldCount => _reader.FieldCount; + + public bool Read() + { + return _csv.ReadNextRecord(); + } + + public int GetOrdinal(string name) + { + return _reader.GetOrdinal(name); + } + + #endregion + + #region IDataReader (explicit) + + object IDataRecord.this[string name] => _reader[name]; + + object IDataRecord.this[int i] => _reader[i]; + + int IDataReader.Depth => _reader.Depth; + + bool IDataReader.IsClosed => _reader.IsClosed; + + int IDataReader.RecordsAffected => _reader.RecordsAffected; + + void IDataReader.Close() + { + _reader.Close(); + } + + bool IDataRecord.GetBoolean(int i) + { + return _reader.GetBoolean(i); + } + + byte IDataRecord.GetByte(int i) + { + return _reader.GetByte(i); + } + + long IDataRecord.GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length) + { + return _reader.GetBytes(i, fieldOffset, buffer, bufferoffset, length); + } + + char IDataRecord.GetChar(int i) + { + return _reader.GetChar(i); + } + + long IDataRecord.GetChars(int i, long fieldOffset, char[] buffer, int bufferoffset, int length) + { + return _reader.GetChars(i, fieldOffset, buffer, bufferoffset, length); + } + + IDataReader IDataRecord.GetData(int i) + { + return _reader.GetData(i); + } + + string IDataRecord.GetDataTypeName(int i) + { + return _reader.GetDataTypeName(i); + } + + DateTime IDataRecord.GetDateTime(int i) + { + return _reader.GetDateTime(i); + } + + decimal IDataRecord.GetDecimal(int i) + { + return _reader.GetDecimal(i); + } + + double IDataRecord.GetDouble(int i) + { + return _reader.GetDouble(i); + } + + Type IDataRecord.GetFieldType(int i) + { + return _reader.GetFieldType(i); + } + + float IDataRecord.GetFloat(int i) + { + return _reader.GetFloat(i); + } + + Guid IDataRecord.GetGuid(int i) + { + return _reader.GetGuid(i); + } + + short IDataRecord.GetInt16(int i) + { + return _reader.GetInt16(i); + } + + int IDataRecord.GetInt32(int i) + { + return _reader.GetInt32(i); + } + + long IDataRecord.GetInt64(int i) + { + return _reader.GetInt64(i); + } + + string IDataRecord.GetName(int i) + { + return _reader.GetName(i); + } + + DataTable IDataReader.GetSchemaTable() + { + return _reader.GetSchemaTable(); + } + + string IDataRecord.GetString(int i) + { + return _reader.GetString(i); + } + + object IDataRecord.GetValue(int i) + { + return _reader.GetGuid(i); + } + + int IDataRecord.GetValues(object[] values) + { + return _reader.GetValues(values); + } + + bool IDataRecord.IsDBNull(int i) + { + return _reader.IsDBNull(i); + } + + bool IDataReader.NextResult() + { + return _reader.NextResult(); + } + + #endregion + + #region IEnumerable + + IEnumerator IEnumerable.GetEnumerator() + { + return _csv.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return _csv.GetEnumerator(); + } + + #endregion + + #region Disposable + + protected override void OnDispose(bool disposing) + { + if (disposing) + { + _csv.Dispose(); + } + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvWriter.cs b/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvWriter.cs index f2f360556b..d4cdc66359 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvWriter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Csv/CsvWriter.cs @@ -14,181 +14,181 @@ namespace SmartStore.Services.DataExchange.Csv { - /// - /// SImple utility class used to write CSV files. - /// - public class CsvWriter : DisposableObject - { - private TextWriter _writer; - private readonly IList _currentRow = new List(); - private int? _fieldCount; - - public CsvWriter(TextWriter writer) - : this(writer, new CsvConfiguration()) - { - } - - public CsvWriter(TextWriter writer, CsvConfiguration configuration) - { - Guard.NotNull(writer, nameof(writer)); - Guard.NotNull(configuration, nameof(configuration)); - - _writer = writer; + /// + /// SImple utility class used to write CSV files. + /// + public class CsvWriter : DisposableObject + { + private TextWriter _writer; + private readonly IList _currentRow = new List(); + private int? _fieldCount; + + public CsvWriter(TextWriter writer) + : this(writer, new CsvConfiguration()) + { + } + + public CsvWriter(TextWriter writer, CsvConfiguration configuration) + { + Guard.NotNull(writer, nameof(writer)); + Guard.NotNull(configuration, nameof(configuration)); + + _writer = writer; this.Configuration = configuration; - } - - public CsvConfiguration Configuration - { - get; - private set; - } - - /// - /// Writes a sequence of fields to the CSV file. The fields - /// may get quotes added to it. - /// When all fields are written for a row, - /// must be called - /// to complete writing of the current row. - /// - /// The fields to write. - public virtual void WriteFields(IEnumerable fields) - { - Guard.NotNull(fields, nameof(fields)); - fields.Each(x => WriteField(x)); - } - - /// - /// Writes a sequence of fields to the CSV file. This will - /// ignore any need to quote and ignore the - /// - /// and just quote based on the shouldQuote - /// parameter. - /// When all fields are written for a row, - /// must be called - /// to complete writing of the current row. - /// - /// The fields to write. - /// True to quote the fields, otherwise false. - public virtual void WriteFields(IEnumerable fields, bool shouldQuote) - { - Guard.NotNull(fields, nameof(fields)); - fields.Each(x => WriteField(x, shouldQuote)); - } - - /// - /// Writes the field to the CSV file. The field - /// may get quotes added to it. - /// When all fields are written for a row, - /// must be called - /// to complete writing of the current row. - /// - /// The field to write. - public virtual void WriteField(string field) - { - var shouldQuote = Configuration.QuoteAllFields; - - if (!string.IsNullOrEmpty(field)) - { - if (Configuration.TrimValues) - { - field = field.Trim(); - } - - if (!Configuration.SupportsMultiline) - { - field = field.Replace('\r', ' ').Replace('\n', ' '); - } - - if (shouldQuote - || field[0] == ' ' - || field[field.Length - 1] == ' ' - || field.IndexOfAny(Configuration.QuotableChars) > -1) - { - shouldQuote = true; - } - } - - WriteField(field, shouldQuote); - } - - /// - /// Writes the field to the CSV file. This will - /// ignore any need to quote and ignore the - /// - /// and just quote based on the shouldQuote - /// parameter. - /// When all fields are written for a row, - /// must be called - /// to complete writing of the current row. - /// - /// The field to write. - /// True to quote the field, otherwise false. - public virtual void WriteField(string field, bool shouldQuote) - { - // All quotes must be escaped. - if (shouldQuote && !string.IsNullOrEmpty(field)) - { - field = field.Replace(Configuration.Quote.ToString(), Configuration.QuoteString); - } - - if (shouldQuote) - { - field = Configuration.Quote + (field ?? string.Empty) + Configuration.Quote; - } - - _currentRow.Add(field ?? string.Empty); - } - - /// - /// Ends writing of the current row - /// and starts a new row. - /// - public virtual void NextRow() - { - WriteRow(_currentRow.ToArray()); - _currentRow.Clear(); - } - - public string CurrentRawValue() - { - var row = string.Join(Configuration.Delimiter.ToString(), _currentRow); - return row; - } - - private void WriteRow(string[] fields) - { - CheckDisposed(); - - if (fields.Length == 0) - { - throw new SmartException("Cannot write an empty row to the CSV file."); - } - - if (!_fieldCount.HasValue) - { - _fieldCount = fields.Length; - } - - if (_fieldCount.Value != fields.Length) - { - throw new SmartException("The field count of the current row does not match the previous row's field count."); - } - - var row = string.Join(Configuration.Delimiter.ToString(), fields); - _writer.WriteLine(row); - } - - protected override void OnDispose(bool disposing) - { - if (disposing) - { - if (_writer != null) - { - _writer.Dispose(); - _writer = null; - } - } - } - - } + } + + public CsvConfiguration Configuration + { + get; + private set; + } + + /// + /// Writes a sequence of fields to the CSV file. The fields + /// may get quotes added to it. + /// When all fields are written for a row, + /// must be called + /// to complete writing of the current row. + /// + /// The fields to write. + public virtual void WriteFields(IEnumerable fields) + { + Guard.NotNull(fields, nameof(fields)); + fields.Each(x => WriteField(x)); + } + + /// + /// Writes a sequence of fields to the CSV file. This will + /// ignore any need to quote and ignore the + /// + /// and just quote based on the shouldQuote + /// parameter. + /// When all fields are written for a row, + /// must be called + /// to complete writing of the current row. + /// + /// The fields to write. + /// True to quote the fields, otherwise false. + public virtual void WriteFields(IEnumerable fields, bool shouldQuote) + { + Guard.NotNull(fields, nameof(fields)); + fields.Each(x => WriteField(x, shouldQuote)); + } + + /// + /// Writes the field to the CSV file. The field + /// may get quotes added to it. + /// When all fields are written for a row, + /// must be called + /// to complete writing of the current row. + /// + /// The field to write. + public virtual void WriteField(string field) + { + var shouldQuote = Configuration.QuoteAllFields; + + if (!string.IsNullOrEmpty(field)) + { + if (Configuration.TrimValues) + { + field = field.Trim(); + } + + if (!Configuration.SupportsMultiline) + { + field = field.Replace('\r', ' ').Replace('\n', ' '); + } + + if (shouldQuote + || field[0] == ' ' + || field[field.Length - 1] == ' ' + || field.IndexOfAny(Configuration.QuotableChars) > -1) + { + shouldQuote = true; + } + } + + WriteField(field, shouldQuote); + } + + /// + /// Writes the field to the CSV file. This will + /// ignore any need to quote and ignore the + /// + /// and just quote based on the shouldQuote + /// parameter. + /// When all fields are written for a row, + /// must be called + /// to complete writing of the current row. + /// + /// The field to write. + /// True to quote the field, otherwise false. + public virtual void WriteField(string field, bool shouldQuote) + { + // All quotes must be escaped. + if (shouldQuote && !string.IsNullOrEmpty(field)) + { + field = field.Replace(Configuration.Quote.ToString(), Configuration.QuoteString); + } + + if (shouldQuote) + { + field = Configuration.Quote + (field ?? string.Empty) + Configuration.Quote; + } + + _currentRow.Add(field ?? string.Empty); + } + + /// + /// Ends writing of the current row + /// and starts a new row. + /// + public virtual void NextRow() + { + WriteRow(_currentRow.ToArray()); + _currentRow.Clear(); + } + + public string CurrentRawValue() + { + var row = string.Join(Configuration.Delimiter.ToString(), _currentRow); + return row; + } + + private void WriteRow(string[] fields) + { + CheckDisposed(); + + if (fields.Length == 0) + { + throw new SmartException("Cannot write an empty row to the CSV file."); + } + + if (!_fieldCount.HasValue) + { + _fieldCount = fields.Length; + } + + if (_fieldCount.Value != fields.Length) + { + throw new SmartException("The field count of the current row does not match the previous row's field count."); + } + + var row = string.Join(Configuration.Delimiter.ToString(), fields); + _writer.WriteLine(row); + } + + protected override void OnDispose(bool disposing) + { + if (disposing) + { + if (_writer != null) + { + _writer.Dispose(); + _writer = null; + } + } + } + + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs b/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs index 709c6deff9..9031e7792d 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs @@ -10,368 +10,347 @@ namespace SmartStore.Services.DataExchange.Excel { - public class ExcelDataReader : DisposableObject, IDataReader - { - private ExcelPackage _package; - private ExcelWorksheet _sheet; - private int _totalRows; - private int _totalColumns; - - private bool _initialized; - private string[] _columns; - private Dictionary _columnIndexes; - private int _currentRowIndex; - private bool _eof; - - private readonly object _lock = new object(); - - public ExcelDataReader(Stream source, bool hasHeaders) - { - Guard.NotNull(source, nameof(source)); - - _package = new ExcelPackage(source); - - // get the first worksheet in the workbook - _sheet = _package.Workbook.Worksheets.FirstOrDefault(); - if (_sheet == null) - { - throw Error.InvalidOperation("The excel package does not contain any worksheet."); - } - - if (_sheet.Dimension == null) - { - throw Error.InvalidOperation("The excel worksheet does not contain any data."); - } - - HasHeaders = hasHeaders; - DefaultHeaderName = "Column"; - - _totalColumns = _sheet.Dimension.End.Column; - _totalRows = _sheet.Dimension.End.Row - (hasHeaders ? 1 : 0); - - _currentRowIndex = -1; - } - - #region Configuration - - public bool HasHeaders - { - get; - private set; - } - - public string DefaultHeaderName - { - get; - set; - } - - #endregion - - #region public members - - public bool MoveToStart() - { - return MoveTo(0); - } - - public bool MoveToEnd() - { - return MoveTo(_totalRows - 1); - } - - public bool MoveTo(int row) - { - EnsureInitialize(); - ValidateDataReader(validateInitialized: false); - - if (row < 0 || row >= _totalRows) - return false; - - _currentRowIndex = row; - _eof = false; - - return true; - } - - public bool EndOfStream - { - get { return _eof; } - } - - public int TotalRows - { - get - { - EnsureInitialize(); - return _totalRows; - } - } - - public IReadOnlyCollection GetColumnHeaders() - { - EnsureInitialize(); - return _columns.AsReadOnly(); - } - - public int CurrentRowIndex - { - get - { - return _currentRowIndex; - } - } - - public string GetFormatted(int i) - { - ValidateDataReader(); - return _sheet.Cells[ExcelRowIndex(_currentRowIndex), i + 1].Text; - } - - public int GetColumnIndex(string name) - { - Guard.NotEmpty(name, nameof(name)); - - EnsureInitialize(); - - int index; - - if (_columnIndexes != null && _columnIndexes.TryGetValue(name, out index)) - return index; - else - return -1; - } - - #endregion - - #region IDataReader - - bool IDataReader.NextResult() - { - ValidateDataReader(validateInitialized: false); - return false; - } - - public bool Read() - { - ValidateDataReader(validateInitialized: false); - return ReadNextRow(false); - } - - int IDataReader.Depth - { - get - { - ValidateDataReader(validateInitialized: false); - return 0; - } - } - - bool IDataReader.IsClosed - { - get - { - return _eof; - } - } - - int IDataReader.RecordsAffected - { - get - { - return -1; - } - } - - void IDataReader.Close() - { - Dispose(); - } - - - public int FieldCount - { - get - { - EnsureInitialize(); - return _totalColumns; - } - } - - public object this[string name] - { - get - { - int index = GetColumnIndex(name); - - if (index < 0) - Error.Argument("name", "'{0}' column header not found.".FormatInvariant(name)); - - return this[index]; - } - } - - public object this[int i] - { - get - { - ValidateDataReader(); - // Excel indexes start from 1 - return _sheet.GetValue(ExcelRowIndex(_currentRowIndex), i + 1); - } - } - - public bool GetBoolean(int i) - { - object value = this[i]; - - int result; - if (Int32.TryParse(value.ToString(), out result)) - return (result != 0); - else - return Boolean.Parse(value.ToString()); - } - - public byte GetByte(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length) - { - ValidateDataReader(); - return CopyFieldToArray(i, fieldOffset, buffer, bufferoffset, length); - } - - public char GetChar(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public long GetChars(int i, long fieldOffset, char[] buffer, int bufferoffset, int length) - { - ValidateDataReader(); - return CopyFieldToArray(i, fieldOffset, buffer, bufferoffset, length); - } - - IDataReader IDataRecord.GetData(int i) - { - ValidateDataReader(); - - if (i == 0) - return this; - else - return null; - } - - string IDataRecord.GetDataTypeName(int i) - { - return this[i].GetType().FullName; - } - - public DateTime GetDateTime(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public decimal GetDecimal(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public double GetDouble(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public Type GetFieldType(int i) - { - return this[i].GetType(); - } - - public float GetFloat(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public Guid GetGuid(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public short GetInt16(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public int GetInt32(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public long GetInt64(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public string GetName(int i) - { - EnsureInitialize(); - ValidateDataReader(validateInitialized: false); - - if (i < 0 || i >= _columns.Length) - { - throw new ArgumentOutOfRangeException("i", i, - "Column index must be included within [0, {0}], but specified column index was: '{1}'.".FormatInvariant(_columns.Length, i)); - } - - return _columns[i]; - } - - public int GetOrdinal(string name) - { - return GetColumnIndex(name); - } - - DataTable IDataReader.GetSchemaTable() - { - EnsureInitialize(); - ValidateDataReader(validateInitialized: false); - - var schema = new DataTable("SchemaTable") - { - Locale = CultureInfo.InvariantCulture, - MinimumCapacity = _columns.Length - }; + public class ExcelDataReader : DisposableObject, IDataReader + { + private ExcelPackage _package; + private ExcelWorksheet _sheet; + private int _totalRows; + private int _totalColumns; + + private bool _initialized; + private string[] _columns; + private Dictionary _columnIndexes; + private int _currentRowIndex; + private bool _eof; + + private readonly object _lock = new object(); + + public ExcelDataReader(Stream source, bool hasHeaders) + { + Guard.NotNull(source, nameof(source)); + + _package = new ExcelPackage(source); + + // get the first worksheet in the workbook + _sheet = _package.Workbook.Worksheets.FirstOrDefault(); + if (_sheet == null) + { + throw Error.InvalidOperation("The excel package does not contain any worksheet."); + } + + if (_sheet.Dimension == null) + { + throw Error.InvalidOperation("The excel worksheet does not contain any data."); + } + + HasHeaders = hasHeaders; + DefaultHeaderName = "Column"; + + _totalColumns = _sheet.Dimension.End.Column; + _totalRows = _sheet.Dimension.End.Row - (hasHeaders ? 1 : 0); + + _currentRowIndex = -1; + } + + #region Configuration + + public bool HasHeaders + { + get; + private set; + } + + public string DefaultHeaderName + { + get; + set; + } + + #endregion - schema.Columns.Add(SchemaTableColumn.AllowDBNull, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.BaseColumnName, typeof(string)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.BaseSchemaName, typeof(string)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.BaseTableName, typeof(string)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.ColumnName, typeof(string)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.ColumnOrdinal, typeof(int)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.ColumnSize, typeof(int)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.DataType, typeof(object)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.IsAliased, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.IsExpression, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.IsKey, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.IsLong, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.IsUnique, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.NumericPrecision, typeof(short)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.NumericScale, typeof(short)).ReadOnly = true; - schema.Columns.Add(SchemaTableColumn.ProviderType, typeof(int)).ReadOnly = true; - - schema.Columns.Add(SchemaTableOptionalColumn.BaseCatalogName, typeof(string)).ReadOnly = true; - schema.Columns.Add(SchemaTableOptionalColumn.BaseServerName, typeof(string)).ReadOnly = true; - schema.Columns.Add(SchemaTableOptionalColumn.IsAutoIncrement, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableOptionalColumn.IsHidden, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableOptionalColumn.IsReadOnly, typeof(bool)).ReadOnly = true; - schema.Columns.Add(SchemaTableOptionalColumn.IsRowVersion, typeof(bool)).ReadOnly = true; - - // null marks columns that will change for each row - object[] schemaRow = - { - true, // 00- AllowDBNull + #region public members + + public bool MoveToStart() + { + return MoveTo(0); + } + + public bool MoveToEnd() + { + return MoveTo(_totalRows - 1); + } + + public bool MoveTo(int row) + { + EnsureInitialize(); + ValidateDataReader(validateInitialized: false); + + if (row < 0 || row >= _totalRows) + return false; + + _currentRowIndex = row; + _eof = false; + + return true; + } + + public bool EndOfStream => _eof; + + public int TotalRows + { + get + { + EnsureInitialize(); + return _totalRows; + } + } + + public IReadOnlyCollection GetColumnHeaders() + { + EnsureInitialize(); + return _columns.AsReadOnly(); + } + + public int CurrentRowIndex => _currentRowIndex; + + public string GetFormatted(int i) + { + ValidateDataReader(); + return _sheet.Cells[ExcelRowIndex(_currentRowIndex), i + 1].Text; + } + + public int GetColumnIndex(string name) + { + Guard.NotEmpty(name, nameof(name)); + + EnsureInitialize(); + + int index; + + if (_columnIndexes != null && _columnIndexes.TryGetValue(name, out index)) + return index; + else + return -1; + } + + #endregion + + #region IDataReader + + bool IDataReader.NextResult() + { + ValidateDataReader(validateInitialized: false); + return false; + } + + public bool Read() + { + ValidateDataReader(validateInitialized: false); + return ReadNextRow(false); + } + + int IDataReader.Depth + { + get + { + ValidateDataReader(validateInitialized: false); + return 0; + } + } + + bool IDataReader.IsClosed => _eof; + + int IDataReader.RecordsAffected => -1; + + void IDataReader.Close() + { + Dispose(); + } + + + public int FieldCount + { + get + { + EnsureInitialize(); + return _totalColumns; + } + } + + public object this[string name] + { + get + { + int index = GetColumnIndex(name); + + if (index < 0) + Error.Argument("name", "'{0}' column header not found.".FormatInvariant(name)); + + return this[index]; + } + } + + public object this[int i] + { + get + { + ValidateDataReader(); + // Excel indexes start from 1 + return _sheet.GetValue(ExcelRowIndex(_currentRowIndex), i + 1); + } + } + + public bool GetBoolean(int i) + { + object value = this[i]; + + int result; + if (Int32.TryParse(value.ToString(), out result)) + return (result != 0); + else + return Boolean.Parse(value.ToString()); + } + + public byte GetByte(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length) + { + ValidateDataReader(); + return CopyFieldToArray(i, fieldOffset, buffer, bufferoffset, length); + } + + public char GetChar(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public long GetChars(int i, long fieldOffset, char[] buffer, int bufferoffset, int length) + { + ValidateDataReader(); + return CopyFieldToArray(i, fieldOffset, buffer, bufferoffset, length); + } + + IDataReader IDataRecord.GetData(int i) + { + ValidateDataReader(); + + if (i == 0) + return this; + else + return null; + } + + string IDataRecord.GetDataTypeName(int i) + { + return this[i].GetType().FullName; + } + + public DateTime GetDateTime(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public decimal GetDecimal(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public double GetDouble(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public Type GetFieldType(int i) + { + return this[i].GetType(); + } + + public float GetFloat(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public Guid GetGuid(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public short GetInt16(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public int GetInt32(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public long GetInt64(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public string GetName(int i) + { + EnsureInitialize(); + ValidateDataReader(validateInitialized: false); + + if (i < 0 || i >= _columns.Length) + { + throw new ArgumentOutOfRangeException("i", i, + "Column index must be included within [0, {0}], but specified column index was: '{1}'.".FormatInvariant(_columns.Length, i)); + } + + return _columns[i]; + } + + public int GetOrdinal(string name) + { + return GetColumnIndex(name); + } + + DataTable IDataReader.GetSchemaTable() + { + EnsureInitialize(); + ValidateDataReader(validateInitialized: false); + + var schema = new DataTable("SchemaTable") + { + Locale = CultureInfo.InvariantCulture, + MinimumCapacity = _columns.Length + }; + + schema.Columns.Add(SchemaTableColumn.AllowDBNull, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.BaseColumnName, typeof(string)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.BaseSchemaName, typeof(string)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.BaseTableName, typeof(string)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.ColumnName, typeof(string)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.ColumnOrdinal, typeof(int)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.ColumnSize, typeof(int)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.DataType, typeof(object)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.IsAliased, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.IsExpression, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.IsKey, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.IsLong, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.IsUnique, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.NumericPrecision, typeof(short)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.NumericScale, typeof(short)).ReadOnly = true; + schema.Columns.Add(SchemaTableColumn.ProviderType, typeof(int)).ReadOnly = true; + + schema.Columns.Add(SchemaTableOptionalColumn.BaseCatalogName, typeof(string)).ReadOnly = true; + schema.Columns.Add(SchemaTableOptionalColumn.BaseServerName, typeof(string)).ReadOnly = true; + schema.Columns.Add(SchemaTableOptionalColumn.IsAutoIncrement, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableOptionalColumn.IsHidden, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableOptionalColumn.IsReadOnly, typeof(bool)).ReadOnly = true; + schema.Columns.Add(SchemaTableOptionalColumn.IsRowVersion, typeof(bool)).ReadOnly = true; + + // null marks columns that will change for each row + object[] schemaRow = + { + true, // 00- AllowDBNull null, // 01- BaseColumnName string.Empty, // 02- BaseSchemaName string.Empty, // 03- BaseTableName @@ -395,218 +374,218 @@ DataTable IDataReader.GetSchemaTable() false // 21- IsRowVersion }; - int r = ExcelRowIndex(0); - - for (int i = 0; i < _columns.Length; i++) - { - schemaRow[1] = _columns[i]; // Base column name - schemaRow[4] = _columns[i]; // Column name - schemaRow[5] = i; // Column ordinal - - // get data type from 1st row only - var firstValue = _sheet.Cells[r, i + 1].Value; - schemaRow[7] = firstValue != null ? firstValue.GetType() : typeof(string); - - schema.Rows.Add(schemaRow); - } - - return schema; - } - - public string GetString(int i) - { - return this[i].Convert(CultureInfo.CurrentCulture); - } - - public object GetValue(int i) - { - ValidateDataReader(); - return ((IDataRecord)this).IsDBNull(i) ? DBNull.Value : this[i]; - } - - int IDataRecord.GetValues(object[] values) - { - var record = (IDataRecord)this; - - for (int i = 0; i < _totalColumns; i++) - { - values[i] = record.GetValue(i); - } - - return _totalColumns; - } - - bool IDataRecord.IsDBNull(int i) - { - return this[i] == null; - } - - #endregion - - #region Helper - - /// - /// Reads the next record. - /// - /// - /// Indicates if the reader will proceed to the next record after having read headers. - /// if it stops after having read headers; otherwise, . - /// - /// if a record has been successfully reads; otherwise, . - /// - /// The instance has been disposed of. - /// - protected virtual bool ReadNextRow(bool onlyReadHeaders) - { - if (_eof) - return false; - - CheckDisposed(); - - if (!_initialized) - { - _columns = new string[_totalColumns]; - _columnIndexes = new Dictionary(_totalColumns, StringComparer.OrdinalIgnoreCase); - - for (int i = 1; i <= _totalColumns; i++) - { - // Excel indexes start from 1 - string name = null; - if (HasHeaders) - { - name = _sheet.GetValue(1, i).NullEmpty(); - } - - name = name ?? (DefaultHeaderName ?? "Column") + i; - - _columns[i - 1] = name; - _columnIndexes[name] = i - 1; - } - - if (_columns.Select(x => x.ToLower()).Distinct().ToArray().Length != _columns.Length) - { - _columns = null; - _columnIndexes = null; - throw Error.InvalidOperation("The first row cannot contain duplicate column names."); - } - - _initialized = true; - - if (!onlyReadHeaders) - { - return ReadNextRow(false); - } - } - else - { - _currentRowIndex++; - if (_currentRowIndex >= _totalRows) - { - _eof = true; - return false; - } - } - - return true; - } - - private int ExcelRowIndex(int i) - { - // Excel indexes start from 1 - return i + (HasHeaders ? 2 : 1); - } - - /// - /// Ensures that the reader is initialized. - /// - private void EnsureInitialize() - { - if (!_initialized) - { - ReadNextRow(true); - } - - Debug.Assert(_columns != null); - Debug.Assert(_columns.Length > 0 || (_columns.Length == 0 && _columnIndexes == null)); - } - - private void ValidateDataReader(bool validateInitialized = true, bool validateNotClosed = true) - { - if (validateInitialized && (!_initialized || _currentRowIndex < 0)) - throw new InvalidOperationException("No current record. Call Read() to initialize the reader."); - - if (validateNotClosed && IsDisposed) - throw new InvalidOperationException("This operation is invalid when the reader is closed."); - } - - private long CopyFieldToArray(int column, long columnOffset, Array destinationArray, int destinationOffset, int length) - { - EnsureInitialize(); - - if (column < 0 || column >= _totalColumns) - { - throw new ArgumentOutOfRangeException("column", column, - "Column index must be included within [0, {0}], but specified column index was: '{1}'.".FormatInvariant(_totalColumns, column)); - } - - if (columnOffset < 0 || columnOffset >= int.MaxValue) - throw new ArgumentOutOfRangeException("fieldOffset"); - - // Array.Copy(...) will do the remaining argument checks - - if (length == 0) - return 0; - - string value = this[column].ToString(); - - if (value == null) - value = string.Empty; - - if (destinationArray.GetType() == typeof(char[])) - Array.Copy(value.ToCharArray((int)columnOffset, length), 0, destinationArray, destinationOffset, length); - else - { - char[] chars = value.ToCharArray((int)columnOffset, length); - byte[] source = new byte[chars.Length]; - ; - - for (int i = 0; i < chars.Length; i++) - source[i] = Convert.ToByte(chars[i]); - - Array.Copy(source, 0, destinationArray, destinationOffset, length); - } - - return length; - } - - #endregion - - #region IDisposable Support - - protected override void OnDispose(bool disposing) - { - if (disposing) - { - try - { - _sheet = null; - if (_package != null) - { - lock (_lock) - { - if (_package != null) - { - _package.Dispose(); - _package = null; - _eof = true; - } - } - } - } - catch { } - } - } - - #endregion - } + int r = ExcelRowIndex(0); + + for (int i = 0; i < _columns.Length; i++) + { + schemaRow[1] = _columns[i]; // Base column name + schemaRow[4] = _columns[i]; // Column name + schemaRow[5] = i; // Column ordinal + + // get data type from 1st row only + var firstValue = _sheet.Cells[r, i + 1].Value; + schemaRow[7] = firstValue != null ? firstValue.GetType() : typeof(string); + + schema.Rows.Add(schemaRow); + } + + return schema; + } + + public string GetString(int i) + { + return this[i].Convert(CultureInfo.CurrentCulture); + } + + public object GetValue(int i) + { + ValidateDataReader(); + return ((IDataRecord)this).IsDBNull(i) ? DBNull.Value : this[i]; + } + + int IDataRecord.GetValues(object[] values) + { + var record = (IDataRecord)this; + + for (int i = 0; i < _totalColumns; i++) + { + values[i] = record.GetValue(i); + } + + return _totalColumns; + } + + bool IDataRecord.IsDBNull(int i) + { + return this[i] == null; + } + + #endregion + + #region Helper + + /// + /// Reads the next record. + /// + /// + /// Indicates if the reader will proceed to the next record after having read headers. + /// if it stops after having read headers; otherwise, . + /// + /// if a record has been successfully reads; otherwise, . + /// + /// The instance has been disposed of. + /// + protected virtual bool ReadNextRow(bool onlyReadHeaders) + { + if (_eof) + return false; + + CheckDisposed(); + + if (!_initialized) + { + _columns = new string[_totalColumns]; + _columnIndexes = new Dictionary(_totalColumns, StringComparer.OrdinalIgnoreCase); + + for (int i = 1; i <= _totalColumns; i++) + { + // Excel indexes start from 1 + string name = null; + if (HasHeaders) + { + name = _sheet.GetValue(1, i).NullEmpty(); + } + + name = name ?? (DefaultHeaderName ?? "Column") + i; + + _columns[i - 1] = name; + _columnIndexes[name] = i - 1; + } + + if (_columns.Select(x => x.ToLower()).Distinct().ToArray().Length != _columns.Length) + { + _columns = null; + _columnIndexes = null; + throw Error.InvalidOperation("The first row cannot contain duplicate column names."); + } + + _initialized = true; + + if (!onlyReadHeaders) + { + return ReadNextRow(false); + } + } + else + { + _currentRowIndex++; + if (_currentRowIndex >= _totalRows) + { + _eof = true; + return false; + } + } + + return true; + } + + private int ExcelRowIndex(int i) + { + // Excel indexes start from 1 + return i + (HasHeaders ? 2 : 1); + } + + /// + /// Ensures that the reader is initialized. + /// + private void EnsureInitialize() + { + if (!_initialized) + { + ReadNextRow(true); + } + + Debug.Assert(_columns != null); + Debug.Assert(_columns.Length > 0 || (_columns.Length == 0 && _columnIndexes == null)); + } + + private void ValidateDataReader(bool validateInitialized = true, bool validateNotClosed = true) + { + if (validateInitialized && (!_initialized || _currentRowIndex < 0)) + throw new InvalidOperationException("No current record. Call Read() to initialize the reader."); + + if (validateNotClosed && IsDisposed) + throw new InvalidOperationException("This operation is invalid when the reader is closed."); + } + + private long CopyFieldToArray(int column, long columnOffset, Array destinationArray, int destinationOffset, int length) + { + EnsureInitialize(); + + if (column < 0 || column >= _totalColumns) + { + throw new ArgumentOutOfRangeException("column", column, + "Column index must be included within [0, {0}], but specified column index was: '{1}'.".FormatInvariant(_totalColumns, column)); + } + + if (columnOffset < 0 || columnOffset >= int.MaxValue) + throw new ArgumentOutOfRangeException("fieldOffset"); + + // Array.Copy(...) will do the remaining argument checks + + if (length == 0) + return 0; + + string value = this[column].ToString(); + + if (value == null) + value = string.Empty; + + if (destinationArray.GetType() == typeof(char[])) + Array.Copy(value.ToCharArray((int)columnOffset, length), 0, destinationArray, destinationOffset, length); + else + { + char[] chars = value.ToCharArray((int)columnOffset, length); + byte[] source = new byte[chars.Length]; + ; + + for (int i = 0; i < chars.Length; i++) + source[i] = Convert.ToByte(chars[i]); + + Array.Copy(source, 0, destinationArray, destinationOffset, length); + } + + return length; + } + + #endregion + + #region IDisposable Support + + protected override void OnDispose(bool disposing) + { + if (disposing) + { + try + { + _sheet = null; + if (_package != null) + { + lock (_lock) + { + if (_package != null) + { + _package.Dispose(); + _package = null; + _eof = true; + } + } + } + } + catch { } + } + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportResult.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportResult.cs index 57c85801ab..80d2c7b437 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportResult.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportResult.cs @@ -6,62 +6,59 @@ namespace SmartStore.Services.DataExchange.Export { [Serializable] - public class DataExportResult - { - public DataExportResult() - { - Files = new List(); - } + public class DataExportResult + { + public DataExportResult() + { + Files = new List(); + } - /// - /// Whether the export succeeded - /// - public bool Succeeded - { - get { return LastError.IsEmpty(); } - } + /// + /// Whether the export succeeded + /// + public bool Succeeded => LastError.IsEmpty(); - /// - /// Last error - /// - [XmlIgnore] - public string LastError { get; set; } + /// + /// Last error + /// + [XmlIgnore] + public string LastError { get; set; } - /// - /// Files created by last export - /// - public List Files { get; set; } + /// + /// Files created by last export + /// + public List Files { get; set; } - /// - /// The path of the folder with the export files - /// - [XmlIgnore] - public string FileFolder { get; set; } + /// + /// The path of the folder with the export files + /// + [XmlIgnore] + public string FileFolder { get; set; } - [Serializable] - public class ExportFileInfo - { - /// - /// Store identifier, can be 0. - /// - public int StoreId { get; set; } + [Serializable] + public class ExportFileInfo + { + /// + /// Store identifier, can be 0. + /// + public int StoreId { get; set; } - /// - /// Name of file. - /// - public string FileName { get; set; } + /// + /// Name of file. + /// + public string FileName { get; set; } - /// - /// Short optional text that describes the content of the file. - /// - public string Label { get; set; } + /// + /// Short optional text that describes the content of the file. + /// + public string Label { get; set; } /// /// The related entity type. /// public RelatedEntityType? RelatedType { get; set; } } - } + } public class DataExportPreviewResult diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportTask.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportTask.cs index 0d935149e8..08225564bd 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportTask.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportTask.cs @@ -4,55 +4,55 @@ namespace SmartStore.Services.DataExchange.Export { - // Note, namespace persisted in ScheduleTask.Type! - public partial class DataExportTask : ITask - { - private readonly IDataExporter _exporter; - private readonly IExportProfileService _exportProfileService; - - public DataExportTask( - IDataExporter exporter, - IExportProfileService exportProfileService) - { - _exporter = exporter; - _exportProfileService = exportProfileService; + // Note, namespace persisted in ScheduleTask.Type! + public partial class DataExportTask : ITask + { + private readonly IDataExporter _exporter; + private readonly IExportProfileService _exportProfileService; + + public DataExportTask( + IDataExporter exporter, + IExportProfileService exportProfileService) + { + _exporter = exporter; + _exportProfileService = exportProfileService; } - public Localizer T { get; set; } - - public void Execute(TaskExecutionContext ctx) - { - var profileId = ctx.ScheduleTaskHistory.ScheduleTask.Alias.ToInt(); - var profile = _exportProfileService.GetExportProfileById(profileId); - - // Load provider. - var provider = _exportProfileService.LoadProvider(profile.ProviderSystemName); - if (provider == null) - throw new SmartException(T("Admin.Common.ProviderNotLoaded", profile.ProviderSystemName.NaIfEmpty())); - - // Build export request. - var request = new DataExportRequest(profile, provider); - - request.ProgressValueSetter = delegate (int val, int max, string msg) - { - ctx.SetProgress(val, max, msg, true); - }; - - if (ctx.Parameters.ContainsKey("SelectedIds")) - { - request.EntitiesToExport = ctx.Parameters["SelectedIds"] - .SplitSafe(",") - .Select(x => x.ToInt()) - .ToList(); - } - - if (ctx.Parameters.ContainsKey("ActionOrigin")) - { - request.ActionOrigin = ctx.Parameters["ActionOrigin"]; - } - - // Process! - _exporter.Export(request, ctx.CancellationToken); - } - } + public Localizer T { get; set; } + + public void Execute(TaskExecutionContext ctx) + { + var profileId = ctx.ScheduleTaskHistory.ScheduleTask.Alias.ToInt(); + var profile = _exportProfileService.GetExportProfileById(profileId); + + // Load provider. + var provider = _exportProfileService.LoadProvider(profile.ProviderSystemName); + if (provider == null) + throw new SmartException(T("Admin.Common.ProviderNotLoaded", profile.ProviderSystemName.NaIfEmpty())); + + // Build export request. + var request = new DataExportRequest(profile, provider); + + request.ProgressValueSetter = delegate (int val, int max, string msg) + { + ctx.SetProgress(val, max, msg, true); + }; + + if (ctx.Parameters.ContainsKey("SelectedIds")) + { + request.EntitiesToExport = ctx.Parameters["SelectedIds"] + .SplitSafe(",") + .Select(x => x.ToInt()) + .ToList(); + } + + if (ctx.Parameters.ContainsKey("ActionOrigin")) + { + request.ActionOrigin = ctx.Parameters["ActionOrigin"]; + } + + // Process! + _exporter.Export(request, ctx.CancellationToken); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs index c9ef0bd850..57d852324c 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs @@ -49,154 +49,154 @@ namespace SmartStore.Services.DataExchange.Export { public partial class DataExporter : IDataExporter - { - #region Dependencies - - private readonly ICommonServices _services; - private readonly IDbContext _dbContext; - private readonly HttpContextBase _httpContext; - private readonly Lazy _priceFormatter; - private readonly Lazy _exportProfileService; + { + #region Dependencies + + private readonly ICommonServices _services; + private readonly IDbContext _dbContext; + private readonly HttpContextBase _httpContext; + private readonly Lazy _priceFormatter; + private readonly Lazy _exportProfileService; private readonly Lazy _localizedEntityService; - private readonly Lazy _languageService; + private readonly Lazy _languageService; private readonly Lazy _urlRecordService; private readonly Lazy _mediaService; - private readonly Lazy _priceCalculationService; - private readonly Lazy _currencyService; - private readonly Lazy _taxService; - private readonly Lazy _categoryService; - private readonly Lazy _productAttributeParser; - private readonly Lazy _productAttributeService; + private readonly Lazy _priceCalculationService; + private readonly Lazy _currencyService; + private readonly Lazy _taxService; + private readonly Lazy _categoryService; + private readonly Lazy _productAttributeParser; + private readonly Lazy _productAttributeService; private readonly Lazy _specificationAttributeService; private readonly Lazy _productTemplateService; - private readonly Lazy _categoryTemplateService; - private readonly Lazy _productService; - private readonly Lazy _orderService; - private readonly Lazy _manufacturerService; - private readonly ICustomerService _customerService; - private readonly Lazy _addressService; - private readonly Lazy _countryService; + private readonly Lazy _categoryTemplateService; + private readonly Lazy _productService; + private readonly Lazy _orderService; + private readonly Lazy _manufacturerService; + private readonly ICustomerService _customerService; + private readonly Lazy _addressService; + private readonly Lazy _countryService; private readonly Lazy _shipmentService; - private readonly Lazy _genericAttributeService; - private readonly Lazy _emailAccountService; - private readonly Lazy _queuedEmailService; - private readonly Lazy _emailSender; - private readonly Lazy _deliveryTimeService; - private readonly Lazy _quantityUnitService; - private readonly Lazy _catalogSearchService; + private readonly Lazy _genericAttributeService; + private readonly Lazy _emailAccountService; + private readonly Lazy _queuedEmailService; + private readonly Lazy _emailSender; + private readonly Lazy _deliveryTimeService; + private readonly Lazy _quantityUnitService; + private readonly Lazy _catalogSearchService; private readonly Lazy _downloadService; private readonly Lazy _productUrlHelper; - private readonly Lazy>_customerRepository; - private readonly Lazy> _subscriptionRepository; - private readonly Lazy> _orderRepository; - private readonly Lazy> _shoppingCartItemRepository; - - private readonly Lazy _mediaSettings; - private readonly Lazy _contactDataSettings; - private readonly Lazy _customerSettings; - private readonly Lazy _catalogSettings; - private readonly Lazy _localizationSettings; - private readonly Lazy _taxSettings; + private readonly Lazy> _customerRepository; + private readonly Lazy> _subscriptionRepository; + private readonly Lazy> _orderRepository; + private readonly Lazy> _shoppingCartItemRepository; + + private readonly Lazy _mediaSettings; + private readonly Lazy _contactDataSettings; + private readonly Lazy _customerSettings; + private readonly Lazy _catalogSettings; + private readonly Lazy _localizationSettings; + private readonly Lazy _taxSettings; private readonly Lazy _seoSettings; public DataExporter( - ICommonServices services, - IDbContext dbContext, - HttpContextBase httpContext, - Lazy priceFormatter, - Lazy exportProfileService, + ICommonServices services, + IDbContext dbContext, + HttpContextBase httpContext, + Lazy priceFormatter, + Lazy exportProfileService, Lazy localizedEntityService, - Lazy languageService, - Lazy urlRecordService, + Lazy languageService, + Lazy urlRecordService, Lazy mediaService, Lazy priceCalculationService, - Lazy currencyService, - Lazy taxService, - Lazy categoryService, - Lazy productAttributeParser, - Lazy productAttributeService, + Lazy currencyService, + Lazy taxService, + Lazy categoryService, + Lazy productAttributeParser, + Lazy productAttributeService, Lazy specificationAttributeService, Lazy productTemplateService, - Lazy categoryTemplateService, - Lazy productService, - Lazy orderService, - Lazy manufacturerService, - ICustomerService customerService, - Lazy addressService, - Lazy countryService, - Lazy shipmentService, - Lazy genericAttributeService, - Lazy emailAccountService, - Lazy queuedEmailService, + Lazy categoryTemplateService, + Lazy productService, + Lazy orderService, + Lazy manufacturerService, + ICustomerService customerService, + Lazy addressService, + Lazy countryService, + Lazy shipmentService, + Lazy genericAttributeService, + Lazy emailAccountService, + Lazy queuedEmailService, Lazy emailSender, - Lazy deliveryTimeService, - Lazy quantityUnitService, - Lazy catalogSearchService, + Lazy deliveryTimeService, + Lazy quantityUnitService, + Lazy catalogSearchService, Lazy downloadService, Lazy productUrlHelper, - Lazy> customerRepository, - Lazy> subscriptionRepository, - Lazy> orderRepository, - Lazy> shoppingCartItemRepository, - Lazy mediaSettings, - Lazy contactDataSettings, - Lazy customerSettings, - Lazy catalogSettings, - Lazy localizationSettings, - Lazy taxSettings, + Lazy> customerRepository, + Lazy> subscriptionRepository, + Lazy> orderRepository, + Lazy> shoppingCartItemRepository, + Lazy mediaSettings, + Lazy contactDataSettings, + Lazy customerSettings, + Lazy catalogSettings, + Lazy localizationSettings, + Lazy taxSettings, Lazy seoSettings) - { - _services = services; - _dbContext = dbContext; - _httpContext = httpContext; - _priceFormatter = priceFormatter; - _exportProfileService = exportProfileService; - _localizedEntityService = localizedEntityService; - _languageService = languageService; - _urlRecordService = urlRecordService; + { + _services = services; + _dbContext = dbContext; + _httpContext = httpContext; + _priceFormatter = priceFormatter; + _exportProfileService = exportProfileService; + _localizedEntityService = localizedEntityService; + _languageService = languageService; + _urlRecordService = urlRecordService; _mediaService = mediaService; - _priceCalculationService = priceCalculationService; - _currencyService = currencyService; - _taxService = taxService; - _categoryService = categoryService; - _productAttributeParser = productAttributeParser; - _productAttributeService = productAttributeService; + _priceCalculationService = priceCalculationService; + _currencyService = currencyService; + _taxService = taxService; + _categoryService = categoryService; + _productAttributeParser = productAttributeParser; + _productAttributeService = productAttributeService; _specificationAttributeService = specificationAttributeService; - _productTemplateService = productTemplateService; - _categoryTemplateService = categoryTemplateService; - _productService = productService; - _orderService = orderService; - _manufacturerService = manufacturerService; - _customerService = customerService; - _addressService = addressService; - _countryService = countryService; - _shipmentService = shipmentService; - _genericAttributeService = genericAttributeService; - _emailAccountService = emailAccountService; - _queuedEmailService = queuedEmailService; - _emailSender = emailSender; - _deliveryTimeService = deliveryTimeService; - _quantityUnitService = quantityUnitService; - _catalogSearchService = catalogSearchService; + _productTemplateService = productTemplateService; + _categoryTemplateService = categoryTemplateService; + _productService = productService; + _orderService = orderService; + _manufacturerService = manufacturerService; + _customerService = customerService; + _addressService = addressService; + _countryService = countryService; + _shipmentService = shipmentService; + _genericAttributeService = genericAttributeService; + _emailAccountService = emailAccountService; + _queuedEmailService = queuedEmailService; + _emailSender = emailSender; + _deliveryTimeService = deliveryTimeService; + _quantityUnitService = quantityUnitService; + _catalogSearchService = catalogSearchService; _downloadService = downloadService; - _productUrlHelper = productUrlHelper; - - _customerRepository = customerRepository; - _subscriptionRepository = subscriptionRepository; - _orderRepository = orderRepository; - _shoppingCartItemRepository = shoppingCartItemRepository; - - _mediaSettings = mediaSettings; - _contactDataSettings = contactDataSettings; - _customerSettings = customerSettings; - _catalogSettings = catalogSettings; - _localizationSettings = localizationSettings; - _taxSettings = taxSettings; + _productUrlHelper = productUrlHelper; + + _customerRepository = customerRepository; + _subscriptionRepository = subscriptionRepository; + _orderRepository = orderRepository; + _shoppingCartItemRepository = shoppingCartItemRepository; + + _mediaSettings = mediaSettings; + _contactDataSettings = contactDataSettings; + _customerSettings = customerSettings; + _catalogSettings = catalogSettings; + _localizationSettings = localizationSettings; + _taxSettings = taxSettings; _seoSettings = seoSettings; - } + } - public Localizer T { get; set; } = NullLocalizer.Instance; + public Localizer T { get; set; } = NullLocalizer.Instance; #endregion @@ -225,11 +225,11 @@ private UrlRecordCollection CreateUrlRecordCollection(string entityName, IEnumer } private void SetProgress(DataExporterContext ctx, int loadedRecords) - { - try - { - if (!ctx.IsPreview && loadedRecords > 0) - { + { + try + { + if (!ctx.IsPreview && loadedRecords > 0) + { var totalRecords = ctx.StatsPerStore.Sum(x => x.Value.TotalRecords); if (ctx.Request.Profile.Limit > 0 && totalRecords > ctx.Request.Profile.Limit) @@ -237,51 +237,51 @@ private void SetProgress(DataExporterContext ctx, int loadedRecords) totalRecords = ctx.Request.Profile.Limit; } - ctx.RecordCount = Math.Min(ctx.RecordCount + loadedRecords, totalRecords); - var msg = ctx.ProgressInfo.FormatInvariant(ctx.RecordCount.ToString("N0"), totalRecords.ToString("N0")); - ctx.Request.ProgressValueSetter.Invoke(ctx.RecordCount, totalRecords, msg); - } - } - catch { } - } - - private void SetProgress(DataExporterContext ctx, string message) - { - try - { - if (!ctx.IsPreview && message.HasValue()) - { - ctx.Request.ProgressValueSetter.Invoke(0, 0, message); - } - } - catch { } - } - - private bool HasPermission(DataExporterContext ctx) - { - if (ctx.Request.HasPermission) - { - return true; - } - - var customer = _services.WorkContext.CurrentCustomer; - - if (customer.SystemName == SystemCustomerNames.BackgroundTask) - { - return true; - } + ctx.RecordCount = Math.Min(ctx.RecordCount + loadedRecords, totalRecords); + var msg = ctx.ProgressInfo.FormatInvariant(ctx.RecordCount.ToString("N0"), totalRecords.ToString("N0")); + ctx.Request.ProgressValueSetter.Invoke(ctx.RecordCount, totalRecords, msg); + } + } + catch { } + } + + private void SetProgress(DataExporterContext ctx, string message) + { + try + { + if (!ctx.IsPreview && message.HasValue()) + { + ctx.Request.ProgressValueSetter.Invoke(0, 0, message); + } + } + catch { } + } + + private bool HasPermission(DataExporterContext ctx) + { + if (ctx.Request.HasPermission) + { + return true; + } + + var customer = _services.WorkContext.CurrentCustomer; + + if (customer.SystemName == SystemCustomerNames.BackgroundTask) + { + return true; + } return _services.Permissions.Authorize(Permissions.Configuration.Export.Execute); - } + } private void DetachAllEntitiesAndClear(DataExporterContext ctx) - { + { try - { + { ctx.AssociatedProductContext?.Clear(); if (ctx.ProductExportContext != null) - { + { _dbContext.DetachEntities(x => { return x is Product || x is Discount || x is ProductVariantAttributeCombination || x is ProductVariantAttribute || x is ProductVariantAttributeValue || x is ProductAttribute || @@ -291,81 +291,81 @@ x is ProductMediaFile || x is ProductTag || x is ProductSpecificationAttribute | }); ctx.ProductExportContext.Clear(); - } - - if (ctx.OrderExportContext != null) - { - _dbContext.DetachEntities(x => - { - return x is Order || x is Address || x is GenericAttribute || x is Customer || - x is OrderItem || x is RewardPointsHistory || x is Shipment || x is ProductVariantAttributeCombination; - }); - - ctx.OrderExportContext.Clear(); - } - - if (ctx.CategoryExportContext != null) - { - _dbContext.DetachEntities(x => - { - return x is Category || x is MediaFile || x is ProductCategory; - }); - - ctx.CategoryExportContext.Clear(); - } - - if (ctx.ManufacturerExportContext != null) - { - _dbContext.DetachEntities(x => - { - return x is Manufacturer || x is MediaFile || x is ProductManufacturer; - }); - - ctx.ManufacturerExportContext.Clear(); - } - - if (ctx.CustomerExportContext != null) - { - _dbContext.DetachEntities(x => - { - return x is Customer || x is GenericAttribute || x is CustomerContent; - }); - - ctx.CustomerExportContext.Clear(); - } - - if (ctx.Request.Provider.Value.EntityType == ExportEntityType.ShoppingCartItem) - { - _dbContext.DetachEntities(x => - { - return x is ShoppingCartItem || x is Customer || x is Product || x is ProductVariantAttributeCombination; - }); - } + } + + if (ctx.OrderExportContext != null) + { + _dbContext.DetachEntities(x => + { + return x is Order || x is Address || x is GenericAttribute || x is Customer || + x is OrderItem || x is RewardPointsHistory || x is Shipment || x is ProductVariantAttributeCombination; + }); + + ctx.OrderExportContext.Clear(); + } + + if (ctx.CategoryExportContext != null) + { + _dbContext.DetachEntities(x => + { + return x is Category || x is MediaFile || x is ProductCategory; + }); + + ctx.CategoryExportContext.Clear(); + } + + if (ctx.ManufacturerExportContext != null) + { + _dbContext.DetachEntities(x => + { + return x is Manufacturer || x is MediaFile || x is ProductManufacturer; + }); + + ctx.ManufacturerExportContext.Clear(); + } + + if (ctx.CustomerExportContext != null) + { + _dbContext.DetachEntities(x => + { + return x is Customer || x is GenericAttribute || x is CustomerContent; + }); + + ctx.CustomerExportContext.Clear(); + } + + if (ctx.Request.Provider.Value.EntityType == ExportEntityType.ShoppingCartItem) + { + _dbContext.DetachEntities(x => + { + return x is ShoppingCartItem || x is Customer || x is Product || x is ProductVariantAttributeCombination; + }); + } } catch (Exception ex) - { - ctx.Log.Warn(ex, "Detaching entities failed."); - } + { + ctx.Log.Warn(ex, "Detaching entities failed."); + } //((DbContext)_dbContext).DumpAttachedEntities(); } - private IExportDataSegmenterProvider CreateSegmenter(DataExporterContext ctx) - { + private IExportDataSegmenterProvider CreateSegmenter(DataExporterContext ctx) + { var stats = ctx.StatsPerStore[ctx.Store.Id]; var offset = Math.Max(ctx.Request.Profile.Offset, 0); - var limit = Math.Max(ctx.Request.Profile.Limit, 0); - var recordsPerSegment = ctx.IsPreview ? 0 : Math.Max(ctx.Request.Profile.BatchSize, 0); + var limit = Math.Max(ctx.Request.Profile.Limit, 0); + var recordsPerSegment = ctx.IsPreview ? 0 : Math.Max(ctx.Request.Profile.BatchSize, 0); var totalRecords = offset + stats.TotalRecords; switch (ctx.Request.Provider.Value.EntityType) - { - case ExportEntityType.Product: - ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter - ( - () => GetProducts(ctx), - entities => - { + { + case ExportEntityType.Product: + ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter + ( + () => GetProducts(ctx), + entities => + { // Load data behind navigation properties for current queue in one go. ctx.ProductExportContext = CreateProductExportContext(entities, ctx.ContextCustomer, ctx.Store.Id); ctx.AssociatedProductContext = null; @@ -407,25 +407,25 @@ private IExportDataSegmenterProvider CreateSegmenter(DataExporterContext ctx) ctx.TranslationsPerPage[nameof(ProductAttribute)] = CreateTranslationCollection(nameof(ProductAttribute), pa); ctx.TranslationsPerPage[nameof(ProductVariantAttributeValue)] = CreateTranslationCollection(nameof(ProductVariantAttributeValue), pvav); }, - entity => Convert(ctx, entity), - offset, PageSize, limit, recordsPerSegment, totalRecords - ); - break; - - case ExportEntityType.Order: - ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter - ( - () => GetOrders(ctx), - entities => - { - ctx.OrderExportContext = new OrderExportContext(entities, - x => _customerService.GetCustomersByIds(x), - x => _genericAttributeService.Value.GetAttributesForEntity(x, "Customer"), - x => _customerService.GetRewardPointsHistoriesByCustomerIds(x), - x => _addressService.Value.GetAddressByIds(x), - x => _orderService.Value.GetOrderItemsByOrderIds(x), - x => _shipmentService.Value.GetShipmentsByOrderIds(x) - ); + entity => Convert(ctx, entity), + offset, PageSize, limit, recordsPerSegment, totalRecords + ); + break; + + case ExportEntityType.Order: + ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter + ( + () => GetOrders(ctx), + entities => + { + ctx.OrderExportContext = new OrderExportContext(entities, + x => _customerService.GetCustomersByIds(x), + x => _genericAttributeService.Value.GetAttributesForEntity(x, "Customer"), + x => _customerService.GetRewardPointsHistoriesByCustomerIds(x), + x => _addressService.Value.GetAddressByIds(x), + x => _orderService.Value.GetOrderItemsByOrderIds(x), + x => _shipmentService.Value.GetShipmentsByOrderIds(x) + ); ctx.OrderExportContext.OrderItems.LoadAll(); @@ -435,72 +435,72 @@ private IExportDataSegmenterProvider CreateSegmenter(DataExporterContext ctx) ctx.TranslationsPerPage[nameof(Product)] = CreateTranslationCollection(nameof(Product), products); ctx.UrlRecordsPerPage[nameof(Product)] = CreateUrlRecordCollection(nameof(Product), products); }, - entity => Convert(ctx, entity), - offset, PageSize, limit, recordsPerSegment, totalRecords - ); - break; - - case ExportEntityType.Manufacturer: - ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter - ( - () => GetManufacturers(ctx), - entities => - { - ctx.ManufacturerExportContext = new ManufacturerExportContext(entities, - x => _manufacturerService.Value.GetProductManufacturersByManufacturerIds(x, true), + entity => Convert(ctx, entity), + offset, PageSize, limit, recordsPerSegment, totalRecords + ); + break; + + case ExportEntityType.Manufacturer: + ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter + ( + () => GetManufacturers(ctx), + entities => + { + ctx.ManufacturerExportContext = new ManufacturerExportContext(entities, + x => _manufacturerService.Value.GetProductManufacturersByManufacturerIds(x, true), x => _mediaService.Value.GetFilesByIds(x) ); - }, - entity => Convert(ctx, entity), - offset, PageSize, limit, recordsPerSegment, totalRecords - ); - break; - - case ExportEntityType.Category: - ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter - ( - () => GetCategories(ctx), - entities => - { - ctx.CategoryExportContext = new CategoryExportContext(entities, - x => _categoryService.Value.GetProductCategoriesByCategoryIds(x), + }, + entity => Convert(ctx, entity), + offset, PageSize, limit, recordsPerSegment, totalRecords + ); + break; + + case ExportEntityType.Category: + ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter + ( + () => GetCategories(ctx), + entities => + { + ctx.CategoryExportContext = new CategoryExportContext(entities, + x => _categoryService.Value.GetProductCategoriesByCategoryIds(x), x => _mediaService.Value.GetFilesByIds(x) - ); - }, - entity => Convert(ctx, entity), - offset, PageSize, limit, recordsPerSegment, totalRecords - ); - break; - - case ExportEntityType.Customer: - ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter - ( - () => GetCustomers(ctx), - entities => - { - ctx.CustomerExportContext = new CustomerExportContext(entities, - x => _genericAttributeService.Value.GetAttributesForEntity(x, "Customer") - ); - }, - entity => Convert(ctx, entity), - offset, PageSize, limit, recordsPerSegment, totalRecords - ); - break; - - case ExportEntityType.NewsLetterSubscription: - ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter - ( - () => GetNewsLetterSubscriptions(ctx), - null, - entity => Convert(ctx, entity), - offset, PageSize, limit, recordsPerSegment, totalRecords - ); - break; - - case ExportEntityType.ShoppingCartItem: - ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter - ( - () => GetShoppingCartItems(ctx), + ); + }, + entity => Convert(ctx, entity), + offset, PageSize, limit, recordsPerSegment, totalRecords + ); + break; + + case ExportEntityType.Customer: + ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter + ( + () => GetCustomers(ctx), + entities => + { + ctx.CustomerExportContext = new CustomerExportContext(entities, + x => _genericAttributeService.Value.GetAttributesForEntity(x, "Customer") + ); + }, + entity => Convert(ctx, entity), + offset, PageSize, limit, recordsPerSegment, totalRecords + ); + break; + + case ExportEntityType.NewsLetterSubscription: + ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter + ( + () => GetNewsLetterSubscriptions(ctx), + null, + entity => Convert(ctx, entity), + offset, PageSize, limit, recordsPerSegment, totalRecords + ); + break; + + case ExportEntityType.ShoppingCartItem: + ctx.ExecuteContext.DataSegmenter = new ExportDataSegmenter + ( + () => GetShoppingCartItems(ctx), entities => { var products = entities.Select(x => x.Product); @@ -508,17 +508,17 @@ private IExportDataSegmenterProvider CreateSegmenter(DataExporterContext ctx) ctx.UrlRecordsPerPage[nameof(Product)] = CreateUrlRecordCollection(nameof(Product), products); }, entity => Convert(ctx, entity), - offset, PageSize, limit, recordsPerSegment, totalRecords - ); - break; + offset, PageSize, limit, recordsPerSegment, totalRecords + ); + break; - default: - ctx.ExecuteContext.DataSegmenter = null; - break; - } + default: + ctx.ExecuteContext.DataSegmenter = null; + break; + } - return ctx.ExecuteContext.DataSegmenter as IExportDataSegmenterProvider; - } + return ctx.ExecuteContext.DataSegmenter as IExportDataSegmenterProvider; + } private Stream CreateStream(string path) { @@ -580,15 +580,15 @@ private IEnumerable GetDataUnitsForRelatedEntities(DataExporterC return result; } - private bool CallProvider(DataExporterContext ctx, string method, string path) - { - if (method != "Execute" && method != "OnExecuted") - { - throw new SmartException($"Unknown export method {method.NaIfEmpty()}."); - } + private bool CallProvider(DataExporterContext ctx, string method, string path) + { + if (method != "Execute" && method != "OnExecuted") + { + throw new SmartException($"Unknown export method {method.NaIfEmpty()}."); + } - try - { + try + { using (ctx.ExecuteContext.DataStream = new ExportFileStream(CreateStream(ctx.IsFileBasedExport ? path : null))) { if (method == "Execute") @@ -602,13 +602,13 @@ private bool CallProvider(DataExporterContext ctx, string method, string path) } } catch (Exception ex) - { + { ctx.ExecuteContext.Abort = DataExchangeAbortion.Hard; - ctx.Log.ErrorFormat(ex, $"The provider failed at the {method.NaIfEmpty()} method."); - ctx.Result.LastError = ex.ToAllMessages(true); - } - finally - { + ctx.Log.ErrorFormat(ex, $"The provider failed at the {method.NaIfEmpty()} method."); + ctx.Result.LastError = ex.ToAllMessages(true); + } + finally + { ctx.ExecuteContext.DataStream?.Dispose(); ctx.ExecuteContext.DataStream = null; @@ -653,260 +653,260 @@ private bool CallProvider(DataExporterContext ctx, string method, string path) ctx.Log.Info(unitFileInfos.ToString()); } - } - - return ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard; - } - - private bool Deploy(DataExporterContext ctx, string zipPath) - { - var allSucceeded = true; - var deployments = ctx.Request.Profile.Deployments.OrderBy(x => x.DeploymentTypeId).Where(x => x.Enabled); - - if (deployments.Count() == 0) - return false; - - var context = new ExportDeploymentContext - { - T = T, - Log = ctx.Log, - FolderContent = ctx.FolderContent, - ZipPath = zipPath, - CreateZipArchive = ctx.Request.Profile.CreateZipArchive - }; - - foreach (var deployment in deployments) - { - IFilePublisher publisher = null; - - context.Result = new DataDeploymentResult - { - LastExecutionUtc = DateTime.UtcNow - }; - - try - { - switch (deployment.DeploymentType) - { - case ExportDeploymentType.Email: - publisher = new EmailFilePublisher(_emailAccountService.Value, _queuedEmailService.Value); - break; - case ExportDeploymentType.FileSystem: - publisher = new FileSystemFilePublisher(); - break; - case ExportDeploymentType.Ftp: - publisher = new FtpFilePublisher(); - break; - case ExportDeploymentType.Http: - publisher = new HttpFilePublisher(); - break; - case ExportDeploymentType.PublicFolder: - publisher = new PublicFolderPublisher(); - break; - } - - if (publisher != null) - { - publisher.Publish(context, deployment); - - if (!context.Result.Succeeded) - allSucceeded = false; - } - } - catch (Exception ex) - { - allSucceeded = false; - - if (context.Result != null) - { - context.Result.LastError = ex.ToAllMessages(true); - } - - ctx.Log.Error(ex, $"Deployment \"{deployment.Name}\" of type {deployment.DeploymentType.ToString()} failed."); - } - - deployment.ResultInfo = XmlHelper.Serialize(context.Result); - - _exportProfileService.Value.UpdateExportDeployment(deployment); - } - - return allSucceeded; - } - - private void SendCompletionEmail(DataExporterContext ctx, string zipPath) - { - var emailAccount = _emailAccountService.Value.GetEmailAccountById(ctx.Request.Profile.EmailAccountId); - if (emailAccount == null) - { - return; - } - - var downloadUrl = "{0}Admin/Export/DownloadExportFile/{1}?name=".FormatInvariant(_services.WebHelper.GetStoreLocation(ctx.Store.SslEnabled), ctx.Request.Profile.Id); - var languageId = ctx.Projection.LanguageId ?? 0; - var smtpContext = new SmtpContext(emailAccount); - var message = new EmailMessage(); - - var storeInfo = "{0} ({1})".FormatInvariant(ctx.Store.Name, ctx.Store.Url); - var intro =_services.Localization.GetResource("Admin.DataExchange.Export.CompletedEmail.Body", languageId).FormatInvariant(storeInfo); - var body = new StringBuilder(intro); - - if (ctx.Result.LastError.HasValue()) - { - body.AppendFormat("

{0}

", ctx.Result.LastError); - } - - if (ctx.IsFileBasedExport && File.Exists(zipPath)) - { - var fileName = Path.GetFileName(zipPath); - body.AppendFormat("

{2}

", downloadUrl, HttpUtility.UrlEncode(fileName), fileName); - } - - if (ctx.IsFileBasedExport && ctx.Result.Files.Any()) - { - body.Append("

"); - foreach (var file in ctx.Result.Files) - { - body.AppendFormat("

", downloadUrl, HttpUtility.UrlEncode(file.FileName), file.FileName); - } - body.Append("

"); - } - - message.From = new EmailAddress(emailAccount.Email, emailAccount.DisplayName); - - if (ctx.Request.Profile.CompletedEmailAddresses.HasValue()) - message.To.AddRange(ctx.Request.Profile.CompletedEmailAddresses.SplitSafe(",").Where(x => x.IsEmail()).Select(x => new EmailAddress(x))); - - if (message.To.Count == 0 && _contactDataSettings.Value.CompanyEmailAddress.HasValue()) - message.To.Add(new EmailAddress(_contactDataSettings.Value.CompanyEmailAddress)); - - if (message.To.Count == 0) - message.To.Add(new EmailAddress(emailAccount.Email, emailAccount.DisplayName)); - - message.Subject = _services.Localization.GetResource("Admin.DataExchange.Export.CompletedEmail.Subject", languageId) - .FormatInvariant(ctx.Request.Profile.Name); - - message.Body = body.ToString(); - - _emailSender.Value.SendEmail(smtpContext, message); - - //_queuedEmailService.Value.InsertQueuedEmail(new QueuedEmail - //{ - // From = emailAccount.Email, - // FromName = emailAccount.DisplayName, - // To = message.To.First().Address, - // Subject = message.Subject, - // Body = message.Body, - // CreatedOnUtc = DateTime.UtcNow, - // EmailAccountId = emailAccount.Id, - // SendManually = true - //}); - //_dbContext.SaveChanges(); - } - - #endregion - - #region Getting data - - public virtual ProductExportContext CreateProductExportContext( - IEnumerable products = null, - Customer customer = null, - int? storeId = null, - int? maxPicturesPerProduct = null, - bool includeHidden = true) - { - if (customer == null) - customer = _services.WorkContext.CurrentCustomer; - - if (!storeId.HasValue) - storeId = _services.StoreContext.CurrentStore.Id; - - var context = new ProductExportContext(products, - x => _productAttributeService.Value.GetProductVariantAttributesByProductIds(x, null), - x => _productAttributeService.Value.GetProductVariantAttributeCombinations(x), - x => _specificationAttributeService.Value.GetProductSpecificationAttributesByProductIds(x), - x => _productService.Value.GetTierPricesByProductIds(x, customer, storeId.GetValueOrDefault()), - x => _categoryService.Value.GetProductCategoriesByProductIds(x, null, includeHidden), - x => _manufacturerService.Value.GetProductManufacturersByProductIds(x, includeHidden), - x => _productService.Value.GetAppliedDiscountsByProductIds(x), - x => _productService.Value.GetBundleItemsByProductIds(x, includeHidden), + } + + return ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard; + } + + private bool Deploy(DataExporterContext ctx, string zipPath) + { + var allSucceeded = true; + var deployments = ctx.Request.Profile.Deployments.OrderBy(x => x.DeploymentTypeId).Where(x => x.Enabled); + + if (deployments.Count() == 0) + return false; + + var context = new ExportDeploymentContext + { + T = T, + Log = ctx.Log, + FolderContent = ctx.FolderContent, + ZipPath = zipPath, + CreateZipArchive = ctx.Request.Profile.CreateZipArchive + }; + + foreach (var deployment in deployments) + { + IFilePublisher publisher = null; + + context.Result = new DataDeploymentResult + { + LastExecutionUtc = DateTime.UtcNow + }; + + try + { + switch (deployment.DeploymentType) + { + case ExportDeploymentType.Email: + publisher = new EmailFilePublisher(_emailAccountService.Value, _queuedEmailService.Value); + break; + case ExportDeploymentType.FileSystem: + publisher = new FileSystemFilePublisher(); + break; + case ExportDeploymentType.Ftp: + publisher = new FtpFilePublisher(); + break; + case ExportDeploymentType.Http: + publisher = new HttpFilePublisher(); + break; + case ExportDeploymentType.PublicFolder: + publisher = new PublicFolderPublisher(); + break; + } + + if (publisher != null) + { + publisher.Publish(context, deployment); + + if (!context.Result.Succeeded) + allSucceeded = false; + } + } + catch (Exception ex) + { + allSucceeded = false; + + if (context.Result != null) + { + context.Result.LastError = ex.ToAllMessages(true); + } + + ctx.Log.Error(ex, $"Deployment \"{deployment.Name}\" of type {deployment.DeploymentType.ToString()} failed."); + } + + deployment.ResultInfo = XmlHelper.Serialize(context.Result); + + _exportProfileService.Value.UpdateExportDeployment(deployment); + } + + return allSucceeded; + } + + private void SendCompletionEmail(DataExporterContext ctx, string zipPath) + { + var emailAccount = _emailAccountService.Value.GetEmailAccountById(ctx.Request.Profile.EmailAccountId); + if (emailAccount == null) + { + return; + } + + var downloadUrl = "{0}Admin/Export/DownloadExportFile/{1}?name=".FormatInvariant(_services.WebHelper.GetStoreLocation(ctx.Store.SslEnabled), ctx.Request.Profile.Id); + var languageId = ctx.Projection.LanguageId ?? 0; + var smtpContext = new SmtpContext(emailAccount); + var message = new EmailMessage(); + + var storeInfo = "{0} ({1})".FormatInvariant(ctx.Store.Name, ctx.Store.Url); + var intro = _services.Localization.GetResource("Admin.DataExchange.Export.CompletedEmail.Body", languageId).FormatInvariant(storeInfo); + var body = new StringBuilder(intro); + + if (ctx.Result.LastError.HasValue()) + { + body.AppendFormat("

{0}

", ctx.Result.LastError); + } + + if (ctx.IsFileBasedExport && File.Exists(zipPath)) + { + var fileName = Path.GetFileName(zipPath); + body.AppendFormat("

{2}

", downloadUrl, HttpUtility.UrlEncode(fileName), fileName); + } + + if (ctx.IsFileBasedExport && ctx.Result.Files.Any()) + { + body.Append("

"); + foreach (var file in ctx.Result.Files) + { + body.AppendFormat("

", downloadUrl, HttpUtility.UrlEncode(file.FileName), file.FileName); + } + body.Append("

"); + } + + message.From = new EmailAddress(emailAccount.Email, emailAccount.DisplayName); + + if (ctx.Request.Profile.CompletedEmailAddresses.HasValue()) + message.To.AddRange(ctx.Request.Profile.CompletedEmailAddresses.SplitSafe(",").Where(x => x.IsEmail()).Select(x => new EmailAddress(x))); + + if (message.To.Count == 0 && _contactDataSettings.Value.CompanyEmailAddress.HasValue()) + message.To.Add(new EmailAddress(_contactDataSettings.Value.CompanyEmailAddress)); + + if (message.To.Count == 0) + message.To.Add(new EmailAddress(emailAccount.Email, emailAccount.DisplayName)); + + message.Subject = _services.Localization.GetResource("Admin.DataExchange.Export.CompletedEmail.Subject", languageId) + .FormatInvariant(ctx.Request.Profile.Name); + + message.Body = body.ToString(); + + _emailSender.Value.SendEmail(smtpContext, message); + + //_queuedEmailService.Value.InsertQueuedEmail(new QueuedEmail + //{ + // From = emailAccount.Email, + // FromName = emailAccount.DisplayName, + // To = message.To.First().Address, + // Subject = message.Subject, + // Body = message.Body, + // CreatedOnUtc = DateTime.UtcNow, + // EmailAccountId = emailAccount.Id, + // SendManually = true + //}); + //_dbContext.SaveChanges(); + } + + #endregion + + #region Getting data + + public virtual ProductExportContext CreateProductExportContext( + IEnumerable products = null, + Customer customer = null, + int? storeId = null, + int? maxPicturesPerProduct = null, + bool includeHidden = true) + { + if (customer == null) + customer = _services.WorkContext.CurrentCustomer; + + if (!storeId.HasValue) + storeId = _services.StoreContext.CurrentStore.Id; + + var context = new ProductExportContext(products, + x => _productAttributeService.Value.GetProductVariantAttributesByProductIds(x, null), + x => _productAttributeService.Value.GetProductVariantAttributeCombinations(x), + x => _specificationAttributeService.Value.GetProductSpecificationAttributesByProductIds(x), + x => _productService.Value.GetTierPricesByProductIds(x, customer, storeId.GetValueOrDefault()), + x => _categoryService.Value.GetProductCategoriesByProductIds(x, null, includeHidden), + x => _manufacturerService.Value.GetProductManufacturersByProductIds(x, includeHidden), + x => _productService.Value.GetAppliedDiscountsByProductIds(x), + x => _productService.Value.GetBundleItemsByProductIds(x, includeHidden), x => _productService.Value.GetAssociatedProductsByProductIds(x, includeHidden), - x => _productService.Value.GetProductPicturesByProductIds(x, maxPicturesPerProduct), - x => _productService.Value.GetProductTagsByProductIds(x, includeHidden), + x => _productService.Value.GetProductPicturesByProductIds(x, maxPicturesPerProduct), + x => _productService.Value.GetProductTagsByProductIds(x, includeHidden), x => _downloadService.Value.GetDownloadsByEntityIds(x, nameof(Product)) - ); + ); - return context; - } + return context; + } private IQueryable GetProductQuery(DataExporterContext ctx, int? skip, int take) - { - IQueryable query = null; - - // Skip used for preview (ordinary paging) or initial query (offset option). - var skipValue = skip.GetValueOrDefault(); - if (skipValue == 0 && ctx.LastId == 0) - { - // Initial query. Apply offset. - skipValue = Math.Max(ctx.Request.Profile.Offset, 0); - } - - if (ctx.Request.ProductQuery == null) - { - var f = ctx.Filter; - var createdFrom = f.CreatedFrom.HasValue ? (DateTime?)_services.DateTimeHelper.ConvertToUtcTime(f.CreatedFrom.Value, _services.DateTimeHelper.CurrentTimeZone) : null; - var createdTo = f.CreatedTo.HasValue ? (DateTime?)_services.DateTimeHelper.ConvertToUtcTime(f.CreatedTo.Value, _services.DateTimeHelper.CurrentTimeZone) : null; - - var searchQuery = new CatalogSearchQuery() - .WithCurrency(ctx.ContextCurrency) - .WithLanguage(ctx.ContextLanguage) + { + IQueryable query = null; + + // Skip used for preview (ordinary paging) or initial query (offset option). + var skipValue = skip.GetValueOrDefault(); + if (skipValue == 0 && ctx.LastId == 0) + { + // Initial query. Apply offset. + skipValue = Math.Max(ctx.Request.Profile.Offset, 0); + } + + if (ctx.Request.ProductQuery == null) + { + var f = ctx.Filter; + var createdFrom = f.CreatedFrom.HasValue ? (DateTime?)_services.DateTimeHelper.ConvertToUtcTime(f.CreatedFrom.Value, _services.DateTimeHelper.CurrentTimeZone) : null; + var createdTo = f.CreatedTo.HasValue ? (DateTime?)_services.DateTimeHelper.ConvertToUtcTime(f.CreatedTo.Value, _services.DateTimeHelper.CurrentTimeZone) : null; + + var searchQuery = new CatalogSearchQuery() + .WithCurrency(ctx.ContextCurrency) + .WithLanguage(ctx.ContextLanguage) .HasStoreId(ctx.Request.Profile.PerStore ? ctx.Store.Id : f.StoreId) - .PriceBetween(f.PriceMinimum, f.PriceMaximum) - .WithStockQuantity(f.AvailabilityMinimum, f.AvailabilityMaximum) - .CreatedBetween(createdFrom, createdTo); + .PriceBetween(f.PriceMinimum, f.PriceMaximum) + .WithStockQuantity(f.AvailabilityMinimum, f.AvailabilityMaximum) + .CreatedBetween(createdFrom, createdTo); if (f.Visibility.HasValue) searchQuery = searchQuery.WithVisibility(f.Visibility.Value); - if (f.IsPublished.HasValue) - searchQuery = searchQuery.PublishedOnly(f.IsPublished.Value); + if (f.IsPublished.HasValue) + searchQuery = searchQuery.PublishedOnly(f.IsPublished.Value); - if (f.ProductType.HasValue) - searchQuery = searchQuery.IsProductType(f.ProductType.Value); + if (f.ProductType.HasValue) + searchQuery = searchQuery.IsProductType(f.ProductType.Value); - if (f.ProductTagId.HasValue) - searchQuery = searchQuery.WithProductTagIds(f.ProductTagId.Value); + if (f.ProductTagId.HasValue) + searchQuery = searchQuery.WithProductTagIds(f.ProductTagId.Value); - if (f.WithoutManufacturers.HasValue) - searchQuery = searchQuery.HasAnyManufacturer(!f.WithoutManufacturers.Value); - else if (f.ManufacturerId.HasValue) - searchQuery = searchQuery.WithManufacturerIds(f.FeaturedProducts, f.ManufacturerId.Value); + if (f.WithoutManufacturers.HasValue) + searchQuery = searchQuery.HasAnyManufacturer(!f.WithoutManufacturers.Value); + else if (f.ManufacturerId.HasValue) + searchQuery = searchQuery.WithManufacturerIds(f.FeaturedProducts, f.ManufacturerId.Value); - if (f.WithoutCategories.HasValue) - searchQuery = searchQuery.HasAnyCategory(!f.WithoutCategories.Value); - else if (f.CategoryIds != null && f.CategoryIds.Length > 0) - searchQuery = searchQuery.WithCategoryIds(f.FeaturedProducts, f.CategoryIds); + if (f.WithoutCategories.HasValue) + searchQuery = searchQuery.HasAnyCategory(!f.WithoutCategories.Value); + else if (f.CategoryIds != null && f.CategoryIds.Length > 0) + searchQuery = searchQuery.WithCategoryIds(f.FeaturedProducts, f.CategoryIds); - if (ctx.Request.EntitiesToExport.Count > 0) - searchQuery = searchQuery.WithProductIds(ctx.Request.EntitiesToExport.ToArray()); - else - searchQuery = searchQuery.WithProductId(f.IdMinimum, f.IdMaximum); + if (ctx.Request.EntitiesToExport.Count > 0) + searchQuery = searchQuery.WithProductIds(ctx.Request.EntitiesToExport.ToArray()); + else + searchQuery = searchQuery.WithProductId(f.IdMinimum, f.IdMaximum); - query = _catalogSearchService.Value.PrepareQuery(searchQuery); - } - else - { - query = ctx.Request.ProductQuery; - } + query = _catalogSearchService.Value.PrepareQuery(searchQuery); + } + else + { + query = ctx.Request.ProductQuery; + } query = query.OrderBy(x => x.Id); - if (skipValue > 0) + if (skipValue > 0) { query = query.Skip(() => skipValue); } else if (ctx.LastId > 0) { - // Fast, ID based paging. + // Fast, ID based paging. query = query.Where(x => x.Id > ctx.LastId); } @@ -915,11 +915,11 @@ private IQueryable GetProductQuery(DataExporterContext ctx, int? skip, query = query.Take(() => take); } - return query; - } + return query; + } - private List GetProducts(DataExporterContext ctx) - { + private List GetProducts(DataExporterContext ctx) + { DetachAllEntitiesAndClear(ctx); var stats = ctx.StatsPerStore[ctx.Store.Id]; @@ -944,20 +944,20 @@ private List GetProducts(DataExporterContext ctx) associatedProducts = _productService.Value.GetAssociatedProductsByProductIds(groupedProductIds, true); } - foreach (var product in products) - { - if (product.ProductType == ProductType.SimpleProduct || product.ProductType == ProductType.BundledProduct) - { + foreach (var product in products) + { + if (product.ProductType == ProductType.SimpleProduct || product.ProductType == ProductType.BundledProduct) + { // We use ctx.EntityIdsPerSegment to avoid exporting products multiple times per segment\file (cause of associated products). if (ctx.EntityIdsPerSegment.Add(product.Id)) { result.Add(product); } - } - else if (product.ProductType == ProductType.GroupedProduct) - { - if (ctx.Projection.NoGroupedProducts) - { + } + else if (product.ProductType == ProductType.GroupedProduct) + { + if (ctx.Projection.NoGroupedProducts) + { if (associatedProducts.ContainsKey(product.Id)) { foreach (var associatedProduct in associatedProducts[product.Id]) @@ -977,42 +977,42 @@ private List GetProducts(DataExporterContext ctx) } } } - } - else - { - if (ctx.EntityIdsPerSegment.Add(product.Id)) - { - result.Add(product); - } - } - } - } + } + else + { + if (ctx.EntityIdsPerSegment.Add(product.Id)) + { + result.Add(product); + } + } + } + } ctx.LastId = products.Last().Id; SetProgress(ctx, products.Count); return result; - } - - private IQueryable GetOrderQuery(DataExporterContext ctx, int? skip, int take) - { - var skipValue = skip.GetValueOrDefault(); - if (skipValue == 0 && ctx.LastId == 0) - { - skipValue = Math.Max(ctx.Request.Profile.Offset, 0); - } - - var query = _orderService.Value.GetOrders( - ctx.Request.Profile.PerStore ? ctx.Store.Id : ctx.Filter.StoreId, - ctx.Projection.CustomerId ?? 0, - ctx.Filter.CreatedFrom.HasValue ? (DateTime?)_services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedFrom.Value, _services.DateTimeHelper.CurrentTimeZone) : null, - ctx.Filter.CreatedTo.HasValue ? (DateTime?)_services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedTo.Value, _services.DateTimeHelper.CurrentTimeZone) : null, - ctx.Filter.OrderStatusIds, - ctx.Filter.PaymentStatusIds, - ctx.Filter.ShippingStatusIds, - null, - null, - null); + } + + private IQueryable GetOrderQuery(DataExporterContext ctx, int? skip, int take) + { + var skipValue = skip.GetValueOrDefault(); + if (skipValue == 0 && ctx.LastId == 0) + { + skipValue = Math.Max(ctx.Request.Profile.Offset, 0); + } + + var query = _orderService.Value.GetOrders( + ctx.Request.Profile.PerStore ? ctx.Store.Id : ctx.Filter.StoreId, + ctx.Projection.CustomerId ?? 0, + ctx.Filter.CreatedFrom.HasValue ? (DateTime?)_services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedFrom.Value, _services.DateTimeHelper.CurrentTimeZone) : null, + ctx.Filter.CreatedTo.HasValue ? (DateTime?)_services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedTo.Value, _services.DateTimeHelper.CurrentTimeZone) : null, + ctx.Filter.OrderStatusIds, + ctx.Filter.PaymentStatusIds, + ctx.Filter.ShippingStatusIds, + null, + null, + null); if (ctx.Request.EntitiesToExport.Any()) { @@ -1021,7 +1021,7 @@ private IQueryable GetOrderQuery(DataExporterContext ctx, int? skip, int query = query.OrderBy(x => x.Id); - if (skipValue > 0) + if (skipValue > 0) { query = query.Skip(() => skipValue); } @@ -1035,11 +1035,11 @@ private IQueryable GetOrderQuery(DataExporterContext ctx, int? skip, int query = query.Take(() => take); } - return query; - } + return query; + } - private List GetOrders(DataExporterContext ctx) - { + private List GetOrders(DataExporterContext ctx) + { DetachAllEntitiesAndClear(ctx); var stats = ctx.StatsPerStore[ctx.Store.Id]; @@ -1055,28 +1055,28 @@ private List GetOrders(DataExporterContext ctx) return null; } - if (ctx.Projection.OrderStatusChange != ExportOrderStatusChange.None) - { - ctx.SetLoadedEntityIds(orders.Select(x => x.Id)); - } + if (ctx.Projection.OrderStatusChange != ExportOrderStatusChange.None) + { + ctx.SetLoadedEntityIds(orders.Select(x => x.Id)); + } ctx.LastId = orders.Last().Id; SetProgress(ctx, orders.Count); return orders; - } + } - private IQueryable GetManufacturerQuery(DataExporterContext ctx, int? skip, int take) - { - var storeId = ctx.Request.Profile.PerStore ? ctx.Store.Id : 0; + private IQueryable GetManufacturerQuery(DataExporterContext ctx, int? skip, int take) + { + var storeId = ctx.Request.Profile.PerStore ? ctx.Store.Id : 0; - var skipValue = skip.GetValueOrDefault(); - if (skipValue == 0 && ctx.LastId == 0) - { - skipValue = Math.Max(ctx.Request.Profile.Offset, 0); - } + var skipValue = skip.GetValueOrDefault(); + if (skipValue == 0 && ctx.LastId == 0) + { + skipValue = Math.Max(ctx.Request.Profile.Offset, 0); + } - var query = _manufacturerService.Value.GetManufacturers(true, storeId); + var query = _manufacturerService.Value.GetManufacturers(true, storeId); if (ctx.Request.EntitiesToExport.Any()) { @@ -1085,7 +1085,7 @@ private IQueryable GetManufacturerQuery(DataExporterContext ctx, i query = query.OrderBy(x => x.Id); - if (skipValue > 0) + if (skipValue > 0) { query = query.Skip(() => skipValue); } @@ -1099,11 +1099,11 @@ private IQueryable GetManufacturerQuery(DataExporterContext ctx, i query = query.Take(() => take); } - return query; - } + return query; + } - private List GetManufacturers(DataExporterContext ctx) - { + private List GetManufacturers(DataExporterContext ctx) + { DetachAllEntitiesAndClear(ctx); var stats = ctx.StatsPerStore[ctx.Store.Id]; @@ -1123,19 +1123,19 @@ private List GetManufacturers(DataExporterContext ctx) SetProgress(ctx, manus.Count); return manus; - } + } - private IQueryable GetCategoryQuery(DataExporterContext ctx, int? skip, int take) - { - var storeId = ctx.Request.Profile.PerStore ? ctx.Store.Id : 0; + private IQueryable GetCategoryQuery(DataExporterContext ctx, int? skip, int take) + { + var storeId = ctx.Request.Profile.PerStore ? ctx.Store.Id : 0; - var skipValue = skip.GetValueOrDefault(); - if (skipValue == 0 && ctx.LastId == 0) - { - skipValue = Math.Max(ctx.Request.Profile.Offset, 0); - } + var skipValue = skip.GetValueOrDefault(); + if (skipValue == 0 && ctx.LastId == 0) + { + skipValue = Math.Max(ctx.Request.Profile.Offset, 0); + } - var query = _categoryService.Value.BuildCategoriesQuery(null, true, null, storeId); + var query = _categoryService.Value.BuildCategoriesQuery(null, true, null, storeId); if (ctx.Request.EntitiesToExport.Any()) { @@ -1144,7 +1144,7 @@ private IQueryable GetCategoryQuery(DataExporterContext ctx, int? skip query = query.OrderBy(x => x.Id); - if (skipValue > 0) + if (skipValue > 0) { query = query.Skip(() => skipValue); } @@ -1158,11 +1158,11 @@ private IQueryable GetCategoryQuery(DataExporterContext ctx, int? skip query = query.Take(() => take); } - return query; - } + return query; + } - private List GetCategories(DataExporterContext ctx) - { + private List GetCategories(DataExporterContext ctx) + { DetachAllEntitiesAndClear(ctx); var stats = ctx.StatsPerStore[ctx.Store.Id]; @@ -1182,23 +1182,23 @@ private List GetCategories(DataExporterContext ctx) SetProgress(ctx, categories.Count); return categories; - } - - private IQueryable GetCustomerQuery(DataExporterContext ctx, int? skip, int take) - { - var skipValue = skip.GetValueOrDefault(); - if (skipValue == 0 && ctx.LastId == 0) - { - skipValue = Math.Max(ctx.Request.Profile.Offset, 0); - } - - var query = _customerRepository.Value.TableUntracked - .Expand(x => x.BillingAddress) - .Expand(x => x.ShippingAddress) - .Expand(x => x.Addresses.Select(y => y.Country)) - .Expand(x => x.Addresses.Select(y => y.StateProvince)) - .Expand(x => x.CustomerRoleMappings.Select(rm => rm.CustomerRole)) - .Where(x => !x.Deleted); + } + + private IQueryable GetCustomerQuery(DataExporterContext ctx, int? skip, int take) + { + var skipValue = skip.GetValueOrDefault(); + if (skipValue == 0 && ctx.LastId == 0) + { + skipValue = Math.Max(ctx.Request.Profile.Offset, 0); + } + + var query = _customerRepository.Value.TableUntracked + .Expand(x => x.BillingAddress) + .Expand(x => x.ShippingAddress) + .Expand(x => x.Addresses.Select(y => y.Country)) + .Expand(x => x.Addresses.Select(y => y.StateProvince)) + .Expand(x => x.CustomerRoleMappings.Select(rm => rm.CustomerRole)) + .Where(x => !x.Deleted); if (ctx.Filter.IsActiveCustomer.HasValue) { @@ -1225,45 +1225,45 @@ private IQueryable GetCustomerQuery(DataExporterContext ctx, int? skip query = query.Where(x => x.ShippingAddress != null && ctx.Filter.ShippingCountryIds.Contains(x.ShippingAddress.Id)); } - if (ctx.Filter.LastActivityFrom.HasValue) - { - var activityFrom = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.LastActivityFrom.Value, _services.DateTimeHelper.CurrentTimeZone); - query = query.Where(x => activityFrom <= x.LastActivityDateUtc); - } - - if (ctx.Filter.LastActivityTo.HasValue) - { - var activityTo = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.LastActivityTo.Value, _services.DateTimeHelper.CurrentTimeZone); - query = query.Where(x => activityTo >= x.LastActivityDateUtc); - } - - if (ctx.Filter.HasSpentAtLeastAmount.HasValue) - { - query = query - .Join(_orderRepository.Value.Table, x => x.Id, y => y.CustomerId, (x, y) => new { Customer = x, Order = y }) - .GroupBy(x => x.Customer.Id) - .Select(x => new - { - Customer = x.FirstOrDefault().Customer, - OrderTotal = x.Sum(y => y.Order.OrderTotal) - }) - .Where(x => x.OrderTotal >= ctx.Filter.HasSpentAtLeastAmount.Value) - .Select(x => x.Customer); - } - - if (ctx.Filter.HasPlacedAtLeastOrders.HasValue) - { - query = query - .Join(_orderRepository.Value.Table, x => x.Id, y => y.CustomerId, (x, y) => new { Customer = x, Order = y }) - .GroupBy(x => x.Customer.Id) - .Select(x => new - { - Customer = x.FirstOrDefault().Customer, - OrderCount = x.Count() - }) - .Where(x => x.OrderCount >= ctx.Filter.HasPlacedAtLeastOrders.Value) - .Select(x => x.Customer); - } + if (ctx.Filter.LastActivityFrom.HasValue) + { + var activityFrom = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.LastActivityFrom.Value, _services.DateTimeHelper.CurrentTimeZone); + query = query.Where(x => activityFrom <= x.LastActivityDateUtc); + } + + if (ctx.Filter.LastActivityTo.HasValue) + { + var activityTo = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.LastActivityTo.Value, _services.DateTimeHelper.CurrentTimeZone); + query = query.Where(x => activityTo >= x.LastActivityDateUtc); + } + + if (ctx.Filter.HasSpentAtLeastAmount.HasValue) + { + query = query + .Join(_orderRepository.Value.Table, x => x.Id, y => y.CustomerId, (x, y) => new { Customer = x, Order = y }) + .GroupBy(x => x.Customer.Id) + .Select(x => new + { + Customer = x.FirstOrDefault().Customer, + OrderTotal = x.Sum(y => y.Order.OrderTotal) + }) + .Where(x => x.OrderTotal >= ctx.Filter.HasSpentAtLeastAmount.Value) + .Select(x => x.Customer); + } + + if (ctx.Filter.HasPlacedAtLeastOrders.HasValue) + { + query = query + .Join(_orderRepository.Value.Table, x => x.Id, y => y.CustomerId, (x, y) => new { Customer = x, Order = y }) + .GroupBy(x => x.Customer.Id) + .Select(x => new + { + Customer = x.FirstOrDefault().Customer, + OrderCount = x.Count() + }) + .Where(x => x.OrderCount >= ctx.Filter.HasPlacedAtLeastOrders.Value) + .Select(x => x.Customer); + } if (ctx.Request.EntitiesToExport.Any()) { @@ -1272,7 +1272,7 @@ private IQueryable GetCustomerQuery(DataExporterContext ctx, int? skip query = query.OrderBy(x => x.Id); - if (skipValue > 0) + if (skipValue > 0) { query = query.Skip(() => skipValue); } @@ -1286,11 +1286,11 @@ private IQueryable GetCustomerQuery(DataExporterContext ctx, int? skip query = query.Take(() => take); } - return query; - } + return query; + } - private List GetCustomers(DataExporterContext ctx) - { + private List GetCustomers(DataExporterContext ctx) + { DetachAllEntitiesAndClear(ctx); var stats = ctx.StatsPerStore[ctx.Store.Id]; @@ -1310,19 +1310,19 @@ private List GetCustomers(DataExporterContext ctx) SetProgress(ctx, customers.Count); return customers; - } + } - private IQueryable GetNewsLetterSubscriptionQuery(DataExporterContext ctx, int? skip, int take) - { - var storeId = ctx.Request.Profile.PerStore ? ctx.Store.Id : ctx.Filter.StoreId; + private IQueryable GetNewsLetterSubscriptionQuery(DataExporterContext ctx, int? skip, int take) + { + var storeId = ctx.Request.Profile.PerStore ? ctx.Store.Id : ctx.Filter.StoreId; - var skipValue = skip.GetValueOrDefault(); - if (skipValue == 0 && ctx.LastId == 0) - { - skipValue = Math.Max(ctx.Request.Profile.Offset, 0); - } + var skipValue = skip.GetValueOrDefault(); + if (skipValue == 0 && ctx.LastId == 0) + { + skipValue = Math.Max(ctx.Request.Profile.Offset, 0); + } - var query = _subscriptionRepository.Value.TableUntracked; + var query = _subscriptionRepository.Value.TableUntracked; if (storeId > 0) { @@ -1350,16 +1350,16 @@ private IQueryable GetNewsLetterSubscriptionQuery(DataEx } if (ctx.Filter.CreatedFrom.HasValue) - { - var createdFrom = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedFrom.Value, _services.DateTimeHelper.CurrentTimeZone); - query = query.Where(x => createdFrom <= x.CreatedOnUtc); - } + { + var createdFrom = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedFrom.Value, _services.DateTimeHelper.CurrentTimeZone); + query = query.Where(x => createdFrom <= x.CreatedOnUtc); + } - if (ctx.Filter.CreatedTo.HasValue) - { - var createdTo = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedTo.Value, _services.DateTimeHelper.CurrentTimeZone); - query = query.Where(x => createdTo >= x.CreatedOnUtc); - } + if (ctx.Filter.CreatedTo.HasValue) + { + var createdTo = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedTo.Value, _services.DateTimeHelper.CurrentTimeZone); + query = query.Where(x => createdTo >= x.CreatedOnUtc); + } if (ctx.Request.EntitiesToExport.Any()) { @@ -1368,7 +1368,7 @@ private IQueryable GetNewsLetterSubscriptionQuery(DataEx query = query.OrderBy(x => x.Id); - if (skipValue > 0) + if (skipValue > 0) { query = query.Skip(() => skipValue); } @@ -1382,11 +1382,11 @@ private IQueryable GetNewsLetterSubscriptionQuery(DataEx query = query.Take(() => take); } - return query; - } + return query; + } - private List GetNewsLetterSubscriptions(DataExporterContext ctx) - { + private List GetNewsLetterSubscriptions(DataExporterContext ctx) + { DetachAllEntitiesAndClear(ctx); var stats = ctx.StatsPerStore[ctx.Store.Id]; @@ -1406,41 +1406,41 @@ private List GetNewsLetterSubscriptions(DataExporterCont SetProgress(ctx, subscriptions.Count); return subscriptions; - } + } - private IQueryable GetShoppingCartItemQuery(DataExporterContext ctx, int? skip, int take) - { - var storeId = ctx.Request.Profile.PerStore ? ctx.Store.Id : ctx.Filter.StoreId; + private IQueryable GetShoppingCartItemQuery(DataExporterContext ctx, int? skip, int take) + { + var storeId = ctx.Request.Profile.PerStore ? ctx.Store.Id : ctx.Filter.StoreId; - var skipValue = skip.GetValueOrDefault(); - if (skipValue == 0 && ctx.LastId == 0) - { - skipValue = Math.Max(ctx.Request.Profile.Offset, 0); - } + var skipValue = skip.GetValueOrDefault(); + if (skipValue == 0 && ctx.LastId == 0) + { + skipValue = Math.Max(ctx.Request.Profile.Offset, 0); + } - var query = _shoppingCartItemRepository.Value.TableUntracked - .Expand(x => x.Customer) - .Expand(x => x.Customer.CustomerRoleMappings.Select(rm => rm.CustomerRole)) - .Expand(x => x.Product) - .Where(x => !x.Customer.Deleted); + var query = _shoppingCartItemRepository.Value.TableUntracked + .Expand(x => x.Customer) + .Expand(x => x.Customer.CustomerRoleMappings.Select(rm => rm.CustomerRole)) + .Expand(x => x.Product) + .Where(x => !x.Customer.Deleted); if (storeId > 0) { query = query.Where(x => x.StoreId == storeId); } - if (ctx.Request.ActionOrigin.IsCaseInsensitiveEqual("CurrentCarts")) - { - query = query.Where(x => x.ShoppingCartTypeId == (int)ShoppingCartType.ShoppingCart); - } - else if (ctx.Request.ActionOrigin.IsCaseInsensitiveEqual("CurrentWishlists")) - { - query = query.Where(x => x.ShoppingCartTypeId == (int)ShoppingCartType.Wishlist); - } - else if (ctx.Filter.ShoppingCartTypeId.HasValue) - { - query = query.Where(x => x.ShoppingCartTypeId == ctx.Filter.ShoppingCartTypeId.Value); - } + if (ctx.Request.ActionOrigin.IsCaseInsensitiveEqual("CurrentCarts")) + { + query = query.Where(x => x.ShoppingCartTypeId == (int)ShoppingCartType.ShoppingCart); + } + else if (ctx.Request.ActionOrigin.IsCaseInsensitiveEqual("CurrentWishlists")) + { + query = query.Where(x => x.ShoppingCartTypeId == (int)ShoppingCartType.Wishlist); + } + else if (ctx.Filter.ShoppingCartTypeId.HasValue) + { + query = query.Where(x => x.ShoppingCartTypeId == ctx.Filter.ShoppingCartTypeId.Value); + } if (ctx.Filter.IsActiveCustomer.HasValue) { @@ -1457,38 +1457,38 @@ private IQueryable GetShoppingCartItemQuery(DataExporterContex query = query.Where(x => x.Customer.CustomerRoleMappings.Select(y => y.CustomerRoleId).Intersect(ctx.Filter.CustomerRoleIds).Any()); } - if (ctx.Filter.LastActivityFrom.HasValue) - { - var activityFrom = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.LastActivityFrom.Value, _services.DateTimeHelper.CurrentTimeZone); - query = query.Where(x => activityFrom <= x.Customer.LastActivityDateUtc); - } - - if (ctx.Filter.LastActivityTo.HasValue) - { - var activityTo = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.LastActivityTo.Value, _services.DateTimeHelper.CurrentTimeZone); - query = query.Where(x => activityTo >= x.Customer.LastActivityDateUtc); - } - - if (ctx.Filter.CreatedFrom.HasValue) - { - var createdFrom = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedFrom.Value, _services.DateTimeHelper.CurrentTimeZone); - query = query.Where(x => createdFrom <= x.CreatedOnUtc); - } - - if (ctx.Filter.CreatedTo.HasValue) - { - var createdTo = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedTo.Value, _services.DateTimeHelper.CurrentTimeZone); - query = query.Where(x => createdTo >= x.CreatedOnUtc); - } - - if (ctx.Projection.NoBundleProducts) - { - query = query.Where(x => x.Product.ProductTypeId != (int)ProductType.BundledProduct); - } - else - { - query = query.Where(x => x.BundleItemId == null); - } + if (ctx.Filter.LastActivityFrom.HasValue) + { + var activityFrom = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.LastActivityFrom.Value, _services.DateTimeHelper.CurrentTimeZone); + query = query.Where(x => activityFrom <= x.Customer.LastActivityDateUtc); + } + + if (ctx.Filter.LastActivityTo.HasValue) + { + var activityTo = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.LastActivityTo.Value, _services.DateTimeHelper.CurrentTimeZone); + query = query.Where(x => activityTo >= x.Customer.LastActivityDateUtc); + } + + if (ctx.Filter.CreatedFrom.HasValue) + { + var createdFrom = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedFrom.Value, _services.DateTimeHelper.CurrentTimeZone); + query = query.Where(x => createdFrom <= x.CreatedOnUtc); + } + + if (ctx.Filter.CreatedTo.HasValue) + { + var createdTo = _services.DateTimeHelper.ConvertToUtcTime(ctx.Filter.CreatedTo.Value, _services.DateTimeHelper.CurrentTimeZone); + query = query.Where(x => createdTo >= x.CreatedOnUtc); + } + + if (ctx.Projection.NoBundleProducts) + { + query = query.Where(x => x.Product.ProductTypeId != (int)ProductType.BundledProduct); + } + else + { + query = query.Where(x => x.BundleItemId == null); + } if (ctx.Request.EntitiesToExport.Any()) { @@ -1497,7 +1497,7 @@ private IQueryable GetShoppingCartItemQuery(DataExporterContex query = query.OrderBy(x => x.Id); - if (skipValue > 0) + if (skipValue > 0) { query = query.Skip(() => skipValue); } @@ -1511,11 +1511,11 @@ private IQueryable GetShoppingCartItemQuery(DataExporterContex query = query.Take(take); } - return query; - } + return query; + } - private List GetShoppingCartItems(DataExporterContext ctx) - { + private List GetShoppingCartItems(DataExporterContext ctx) + { DetachAllEntitiesAndClear(ctx); var stats = ctx.StatsPerStore[ctx.Store.Id]; @@ -1535,20 +1535,20 @@ private List GetShoppingCartItems(DataExporterContext ctx) SetProgress(ctx, cartItems.Count); return cartItems; - } + } - #endregion + #endregion - private List Init(DataExporterContext ctx) - { - List result = null; + private List Init(DataExporterContext ctx) + { + List result = null; - ctx.ContextCurrency = _currencyService.Value.GetCurrencyById(ctx.Projection.CurrencyId ?? 0) ?? _services.WorkContext.WorkingCurrency; - ctx.ContextCustomer = _customerService.GetCustomerById(ctx.Projection.CustomerId ?? 0) ?? _services.WorkContext.CurrentCustomer; - ctx.ContextLanguage = _languageService.Value.GetLanguageById(ctx.Projection.LanguageId ?? 0) ?? _services.WorkContext.WorkingLanguage; + ctx.ContextCurrency = _currencyService.Value.GetCurrencyById(ctx.Projection.CurrencyId ?? 0) ?? _services.WorkContext.WorkingCurrency; + ctx.ContextCustomer = _customerService.GetCustomerById(ctx.Projection.CustomerId ?? 0) ?? _services.WorkContext.CurrentCustomer; + ctx.ContextLanguage = _languageService.Value.GetLanguageById(ctx.Projection.LanguageId ?? 0) ?? _services.WorkContext.WorkingLanguage; - ctx.Stores = _services.StoreService.GetAllStores().ToDictionary(x => x.Id, x => x); - ctx.Languages = _languageService.Value.GetAllLanguages(true).ToDictionary(x => x.Id, x => x); + ctx.Stores = _services.StoreService.GetAllStores().ToDictionary(x => x.Id, x => x); + ctx.Languages = _languageService.Value.GetAllLanguages(true).ToDictionary(x => x.Id, x => x); if (ctx.IsPreview) { @@ -1557,7 +1557,7 @@ private List Init(DataExporterContext ctx) ctx.Translations[name] = new LocalizedPropertyCollection(name, null, Enumerable.Empty()); } - foreach (var name in new string[] { nameof(Product), nameof(ProductTag), nameof(ProductBundleItem), nameof(SpecificationAttribute), nameof(SpecificationAttributeOption), + foreach (var name in new string[] { nameof(Product), nameof(ProductTag), nameof(ProductBundleItem), nameof(SpecificationAttribute), nameof(SpecificationAttributeOption), nameof(ProductAttribute), nameof(ProductVariantAttributeValue) }) { ctx.TranslationsPerPage[name] = new LocalizedPropertyCollection(name, null, Enumerable.Empty()); @@ -1583,21 +1583,21 @@ private List Init(DataExporterContext ctx) } if (!ctx.IsPreview && ctx.Request.Profile.PerStore) - { - result = new List(ctx.Stores.Values.Where(x => x.Id == ctx.Filter.StoreId || ctx.Filter.StoreId == 0)); - } - else - { - int? storeId = ctx.Filter.StoreId == 0 ? ctx.Projection.StoreId : ctx.Filter.StoreId; - ctx.Store = ctx.Stores.Values.FirstOrDefault(x => x.Id == (storeId ?? _services.StoreContext.CurrentStore.Id)); - - result = new List { ctx.Store }; - } - - // Get record stats for each store. - foreach (var store in result) - { - ctx.Store = store; + { + result = new List(ctx.Stores.Values.Where(x => x.Id == ctx.Filter.StoreId || ctx.Filter.StoreId == 0)); + } + else + { + int? storeId = ctx.Filter.StoreId == 0 ? ctx.Projection.StoreId : ctx.Filter.StoreId; + ctx.Store = ctx.Stores.Values.FirstOrDefault(x => x.Id == (storeId ?? _services.StoreContext.CurrentStore.Id)); + + result = new List { ctx.Store }; + } + + // Get record stats for each store. + foreach (var store in result) + { + ctx.Store = store; IQueryable query = null; @@ -1633,17 +1633,17 @@ private List Init(DataExporterContext ctx) if (!ctx.IsPreview) { - stats.MaxId = query.Max(x => (int?)x.Id) ?? 0; + stats.MaxId = query.Max(x => (int?)x.Id) ?? 0; } ctx.StatsPerStore[store.Id] = stats; - } + } return result; - } + } - private void ExportCoreInner(DataExporterContext ctx, Store store) - { + private void ExportCoreInner(DataExporterContext ctx, Store store) + { var context = ctx.ExecuteContext; var profile = ctx.Request.Profile; var provider = ctx.Request.Provider; @@ -1653,13 +1653,13 @@ private void ExportCoreInner(DataExporterContext ctx, Store store) return; } - { - var logHead = new StringBuilder(); - logHead.AppendLine(); - logHead.AppendLine(new string('-', 40)); - logHead.AppendLine("Smartstore: v." + SmartStoreVersion.CurrentFullVersion); - logHead.Append("Export profile: " + profile.Name); - logHead.AppendLine(profile.Id == 0 ? " (volatile)" : $" (Id {profile.Id})"); + { + var logHead = new StringBuilder(); + logHead.AppendLine(); + logHead.AppendLine(new string('-', 40)); + logHead.AppendLine("Smartstore: v." + SmartStoreVersion.CurrentFullVersion); + logHead.Append("Export profile: " + profile.Name); + logHead.AppendLine(profile.Id == 0 ? " (volatile)" : $" (Id {profile.Id})"); if (provider.Metadata.FriendlyName.HasValue()) { @@ -1670,23 +1670,23 @@ private void ExportCoreInner(DataExporterContext ctx, Store store) logHead.AppendLine("Export provider: " + profile.ProviderSystemName); } - var plugin = provider.Metadata.PluginDescriptor; - logHead.Append("Plugin: "); - logHead.AppendLine(plugin == null ? "".NaIfEmpty() : $"{plugin.FriendlyName} ({plugin.SystemName}) v.{plugin.Version.ToString()}"); - logHead.AppendLine("Entity: " + provider.Value.EntityType.ToString()); + var plugin = provider.Metadata.PluginDescriptor; + logHead.Append("Plugin: "); + logHead.AppendLine(plugin == null ? "".NaIfEmpty() : $"{plugin.FriendlyName} ({plugin.SystemName}) v.{plugin.Version.ToString()}"); + logHead.AppendLine("Entity: " + provider.Value.EntityType.ToString()); - try - { - var uri = new Uri(store.Url); - logHead.AppendLine($"Store: {uri.DnsSafeHost.NaIfEmpty()} (Id {store.Id})"); - } - catch { } + try + { + var uri = new Uri(store.Url); + logHead.AppendLine($"Store: {uri.DnsSafeHost.NaIfEmpty()} (Id {store.Id})"); + } + catch { } - var customer = _services.WorkContext.CurrentCustomer; - logHead.Append("Executed by: " + (customer.Email.HasValue() ? customer.Email : customer.SystemName)); + var customer = _services.WorkContext.CurrentCustomer; + logHead.Append("Executed by: " + (customer.Email.HasValue() ? customer.Email : customer.SystemName)); - ctx.Log.Info(logHead.ToString()); - } + ctx.Log.Info(logHead.ToString()); + } var dataExchangeSettings = _services.Settings.LoadSetting(store.Id); var publicDeployment = profile.Deployments.FirstOrDefault(x => x.DeploymentType == ExportDeploymentType.PublicFolder); @@ -1694,55 +1694,55 @@ private void ExportCoreInner(DataExporterContext ctx, Store store) ctx.Store = store; context.FileIndex = 0; context.Store = ToDynamic(ctx, ctx.Store); - context.MaxFileNameLength = dataExchangeSettings.MaxFileNameLength; - context.HasPublicDeployment = publicDeployment != null; - context.PublicFolderPath = publicDeployment.GetDeploymentFolder(true); - context.PublicFolderUrl = publicDeployment.GetPublicFolderUrl(_services, ctx.Store); + context.MaxFileNameLength = dataExchangeSettings.MaxFileNameLength; + context.HasPublicDeployment = publicDeployment != null; + context.PublicFolderPath = publicDeployment.GetDeploymentFolder(true); + context.PublicFolderUrl = publicDeployment.GetPublicFolderUrl(_services, ctx.Store); var fileExtension = provider.Value.FileExtension.HasValue() ? provider.Value.FileExtension.ToLower().EnsureStartsWith(".") : ""; - using (var segmenter = CreateSegmenter(ctx)) - { - if (segmenter == null) - { - throw new SmartException($"Unsupported entity type '{provider.Value.EntityType.ToString()}'."); - } + using (var segmenter = CreateSegmenter(ctx)) + { + if (segmenter == null) + { + throw new SmartException($"Unsupported entity type '{provider.Value.EntityType.ToString()}'."); + } - if (segmenter.TotalRecords <= 0) - { - ctx.Log.Info("There are no records to export."); - } + if (segmenter.TotalRecords <= 0) + { + ctx.Log.Info("There are no records to export."); + } - while (context.Abort == DataExchangeAbortion.None && segmenter.HasData) - { - segmenter.RecordPerSegmentCount = 0; - context.RecordsSucceeded = 0; + while (context.Abort == DataExchangeAbortion.None && segmenter.HasData) + { + segmenter.RecordPerSegmentCount = 0; + context.RecordsSucceeded = 0; - string path = null; + string path = null; - if (ctx.IsFileBasedExport) - { + if (ctx.IsFileBasedExport) + { context.FileIndex = context.FileIndex + 1; context.FileName = profile.ResolveFileNamePattern(ctx.Store, context.FileIndex, context.MaxFileNameLength) + fileExtension; - path = Path.Combine(context.Folder, context.FileName); + path = Path.Combine(context.Folder, context.FileName); if (profile.ExportRelatedData && ctx.Supports(ExportFeatures.UsesRelatedDataUnits)) { context.ExtraDataUnits.AddRange(GetDataUnitsForRelatedEntities(ctx)); } - } - - if (CallProvider(ctx, "Execute", path)) - { - if (ctx.IsFileBasedExport && File.Exists(path)) - { - ctx.Result.Files.Add(new DataExportResult.ExportFileInfo - { - StoreId = ctx.Store.Id, - FileName = context.FileName + } + + if (CallProvider(ctx, "Execute", path)) + { + if (ctx.IsFileBasedExport && File.Exists(path)) + { + ctx.Result.Files.Add(new DataExportResult.ExportFileInfo + { + StoreId = ctx.Store.Id, + FileName = context.FileName }); } - } + } ctx.EntityIdsPerSegment.Clear(); @@ -1754,14 +1754,14 @@ private void ExportCoreInner(DataExporterContext ctx, Store store) { ctx.Log.Warn("Export aborted. A cancellation has been requested."); } - } + } if (context.Abort != DataExchangeAbortion.Hard) - { + { var calledExecuted = false; - context.ExtraDataUnits.ForEach(x => - { + context.ExtraDataUnits.ForEach(x => + { context.DataStreamId = x.Id; var success = true; @@ -1795,45 +1795,45 @@ private void ExportCoreInner(DataExporterContext ctx, Store store) context.ExtraDataUnits.Clear(); } - } + } - private void ExportCoreOuter(DataExporterContext ctx) - { + private void ExportCoreOuter(DataExporterContext ctx) + { var profile = ctx.Request.Profile; - var logPath = profile.GetExportLogPath(); - var zipPath = profile.GetExportZipPath(); + var logPath = profile.GetExportLogPath(); + var zipPath = profile.GetExportZipPath(); FileSystemHelper.DeleteFile(logPath); - FileSystemHelper.DeleteFile(zipPath); - FileSystemHelper.ClearDirectory(ctx.FolderContent, false); - - using (var logger = new TraceLogger(logPath)) - { - try - { - ctx.Log = logger; - ctx.ExecuteContext.Log = logger; - ctx.ProgressInfo = T("Admin.DataExchange.Export.ProgressInfo"); - - if (!ctx.Request.Provider.IsValid()) - throw new SmartException("Export aborted because the export provider is not valid."); - - if (!HasPermission(ctx)) - throw new SmartException("You do not have permission to perform the selected export."); - - foreach (var item in ctx.Request.CustomData) - { - ctx.ExecuteContext.CustomProperties.Add(item.Key, item.Value); - } - - if (profile.ProviderConfigData.HasValue()) - { - var configInfo = ctx.Request.Provider.Value.ConfigurationInfo; - if (configInfo != null) - { - ctx.ExecuteContext.ConfigurationData = XmlHelper.Deserialize(profile.ProviderConfigData, configInfo.ModelType); - } - } + FileSystemHelper.DeleteFile(zipPath); + FileSystemHelper.ClearDirectory(ctx.FolderContent, false); + + using (var logger = new TraceLogger(logPath)) + { + try + { + ctx.Log = logger; + ctx.ExecuteContext.Log = logger; + ctx.ProgressInfo = T("Admin.DataExchange.Export.ProgressInfo"); + + if (!ctx.Request.Provider.IsValid()) + throw new SmartException("Export aborted because the export provider is not valid."); + + if (!HasPermission(ctx)) + throw new SmartException("You do not have permission to perform the selected export."); + + foreach (var item in ctx.Request.CustomData) + { + ctx.ExecuteContext.CustomProperties.Add(item.Key, item.Value); + } + + if (profile.ProviderConfigData.HasValue()) + { + var configInfo = ctx.Request.Provider.Value.ConfigurationInfo; + if (configInfo != null) + { + ctx.ExecuteContext.ConfigurationData = XmlHelper.Deserialize(profile.ProviderConfigData, configInfo.ModelType); + } + } // lazyLoading: false, proxyCreation: false impossible due to price calculation. using (var scope = new DbContextScope(_dbContext, autoDetectChanges: false, proxyCreation: true, validateOnSave: false, forceNoTracking: true)) @@ -1870,70 +1870,70 @@ private void ExportCoreOuter(DataExporterContext ctx) stores.ForEach(x => ExportCoreInner(ctx, x)); } - if (!ctx.IsPreview && ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard) - { - if (ctx.IsFileBasedExport) - { - if (profile.CreateZipArchive) - { - ZipFile.CreateFromDirectory(ctx.FolderContent, zipPath, CompressionLevel.Fastest, false); - } - - if (profile.Deployments.Any(x => x.Enabled)) - { - SetProgress(ctx, T("Common.Publishing")); - - var allDeploymentsSucceeded = Deploy(ctx, zipPath); - - if (allDeploymentsSucceeded && profile.Cleanup) - { - logger.Info("Cleaning up export folder"); - - FileSystemHelper.ClearDirectory(ctx.FolderContent, false); - } - } - } - - if (profile.EmailAccountId != 0 && !ctx.Supports(ExportFeatures.CanOmitCompletionMail)) - { - SendCompletionEmail(ctx, zipPath); - } - } - } - catch (Exception ex) - { - logger.ErrorsAll(ex); - ctx.Result.LastError = ex.ToAllMessages(true); - } - finally - { - try - { - if (!ctx.IsPreview && profile.Id != 0) - { + if (!ctx.IsPreview && ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard) + { + if (ctx.IsFileBasedExport) + { + if (profile.CreateZipArchive) + { + ZipFile.CreateFromDirectory(ctx.FolderContent, zipPath, CompressionLevel.Fastest, false); + } + + if (profile.Deployments.Any(x => x.Enabled)) + { + SetProgress(ctx, T("Common.Publishing")); + + var allDeploymentsSucceeded = Deploy(ctx, zipPath); + + if (allDeploymentsSucceeded && profile.Cleanup) + { + logger.Info("Cleaning up export folder"); + + FileSystemHelper.ClearDirectory(ctx.FolderContent, false); + } + } + } + + if (profile.EmailAccountId != 0 && !ctx.Supports(ExportFeatures.CanOmitCompletionMail)) + { + SendCompletionEmail(ctx, zipPath); + } + } + } + catch (Exception ex) + { + logger.ErrorsAll(ex); + ctx.Result.LastError = ex.ToAllMessages(true); + } + finally + { + try + { + if (!ctx.IsPreview && profile.Id != 0) + { ctx.Result.Files = ctx.Result.Files.OrderBy(x => x.RelatedType).ToList(); - profile.ResultInfo = XmlHelper.Serialize(ctx.Result); + profile.ResultInfo = XmlHelper.Serialize(ctx.Result); - _exportProfileService.Value.UpdateExportProfile(profile); - } - } - catch (Exception ex) - { - logger.ErrorsAll(ex); - } + _exportProfileService.Value.UpdateExportProfile(profile); + } + } + catch (Exception ex) + { + logger.ErrorsAll(ex); + } - DetachAllEntitiesAndClear(ctx); + DetachAllEntitiesAndClear(ctx); try - { - ctx.NewsletterSubscriptions.Clear(); - ctx.ProductTemplates.Clear(); - ctx.CategoryTemplates.Clear(); - ctx.Countries.Clear(); - ctx.Languages.Clear(); - ctx.QuantityUnits.Clear(); - ctx.DeliveryTimes.Clear(); - ctx.Stores.Clear(); + { + ctx.NewsletterSubscriptions.Clear(); + ctx.ProductTemplates.Clear(); + ctx.CategoryTemplates.Clear(); + ctx.Countries.Clear(); + ctx.Languages.Clear(); + ctx.QuantityUnits.Clear(); + ctx.DeliveryTimes.Clear(); + ctx.Stores.Clear(); ctx.Translations.Clear(); ctx.UrlRecords.Clear(); @@ -1943,29 +1943,29 @@ private void ExportCoreOuter(DataExporterContext ctx) ctx.Request.CustomData.Clear(); ctx.ExecuteContext.CustomProperties.Clear(); - ctx.ExecuteContext.Log = null; - ctx.Log = null; - } - catch (Exception ex) - { - logger.ErrorsAll(ex); - } - } - } + ctx.ExecuteContext.Log = null; + ctx.Log = null; + } + catch (Exception ex) + { + logger.ErrorsAll(ex); + } + } + } if (ctx.IsPreview || ctx.ExecuteContext.Abort == DataExchangeAbortion.Hard) { return; } - // Post process order entities. - if (ctx.EntityIdsLoaded.Any() && ctx.Request.Provider.Value.EntityType == ExportEntityType.Order && ctx.Projection.OrderStatusChange != ExportOrderStatusChange.None) - { - using (var logger = new TraceLogger(logPath)) - { - try - { - int? orderStatusId = null; + // Post process order entities. + if (ctx.EntityIdsLoaded.Any() && ctx.Request.Provider.Value.EntityType == ExportEntityType.Order && ctx.Projection.OrderStatusChange != ExportOrderStatusChange.None) + { + using (var logger = new TraceLogger(logPath)) + { + try + { + int? orderStatusId = null; if (ctx.Projection.OrderStatusChange == ExportOrderStatusChange.Processing) { @@ -1976,38 +1976,38 @@ private void ExportCoreOuter(DataExporterContext ctx) orderStatusId = (int)OrderStatus.Complete; } - using (var scope = new DbContextScope(_dbContext, false, null, false, false, false, false)) - { - foreach (var chunk in ctx.EntityIdsLoaded.Slice(128)) - { - var entities = _orderRepository.Value.Table.Where(x => chunk.Contains(x.Id)).ToList(); + using (var scope = new DbContextScope(_dbContext, false, null, false, false, false, false)) + { + foreach (var chunk in ctx.EntityIdsLoaded.Slice(128)) + { + var entities = _orderRepository.Value.Table.Where(x => chunk.Contains(x.Id)).ToList(); - entities.ForEach(x => x.OrderStatusId = (orderStatusId ?? x.OrderStatusId)); + entities.ForEach(x => x.OrderStatusId = (orderStatusId ?? x.OrderStatusId)); - _dbContext.SaveChanges(); - } - } + _dbContext.SaveChanges(); + } + } - logger.Info($"Updated order status for {ctx.EntityIdsLoaded.Count()} order(s)."); - } - catch (Exception ex) - { - logger.ErrorsAll(ex); + logger.Info($"Updated order status for {ctx.EntityIdsLoaded.Count()} order(s)."); + } + catch (Exception ex) + { + logger.ErrorsAll(ex); ctx.Result.LastError = ex.ToAllMessages(true); - } - } - } - } + } + } + } + } - /// - /// The name of the public export folder - /// - public static string PublicFolder => "Exchange"; + /// + /// The name of the public export folder + /// + public static string PublicFolder => "Exchange"; - public static int PageSize => 100; + public static int PageSize => 100; - public DataExportResult Export(DataExportRequest request, CancellationToken cancellationToken) - { + public DataExportResult Export(DataExportRequest request, CancellationToken cancellationToken) + { var ctx = new DataExporterContext(request, cancellationToken); if (!(request?.Profile?.Enabled ?? false)) @@ -2027,73 +2027,73 @@ public DataExportResult Export(DataExportRequest request, CancellationToken canc ExportCoreOuter(ctx); } - cancellationToken.ThrowIfCancellationRequested(); - return ctx.Result; - } + cancellationToken.ThrowIfCancellationRequested(); + return ctx.Result; + } - public DataExportPreviewResult Preview(DataExportRequest request, int pageIndex) - { + public DataExportPreviewResult Preview(DataExportRequest request, int pageIndex) + { var result = new DataExportPreviewResult(); var cancellation = new CancellationTokenSource(TimeSpan.FromMinutes(5.0)); - var ctx = new DataExporterContext(request, cancellation.Token, true); + var ctx = new DataExporterContext(request, cancellation.Token, true); - var unused = Init(ctx); - var skip = Math.Max(ctx.Request.Profile.Offset, 0) + (pageIndex * PageSize); + var unused = Init(ctx); + var skip = Math.Max(ctx.Request.Profile.Offset, 0) + (pageIndex * PageSize); - if (!HasPermission(ctx)) - { - throw new SmartException(T("Admin.AccessDenied")); - } + if (!HasPermission(ctx)) + { + throw new SmartException(T("Admin.AccessDenied")); + } result.TotalRecords = ctx.StatsPerStore.First().Value.TotalRecords; switch (request.Provider.Value.EntityType) - { - case ExportEntityType.Product: - { - var items = GetProductQuery(ctx, skip, PageSize).ToList(); - items.Each(x => result.Data.Add(ToDynamic(ctx, x))); - } - break; - case ExportEntityType.Order: - { - var items = GetOrderQuery(ctx, skip, PageSize).ToList(); - items.Each(x => result.Data.Add(ToDynamic(ctx, x))); - } - break; - case ExportEntityType.Category: - { - var items = GetCategoryQuery(ctx, skip, PageSize).ToList(); - items.Each(x => result.Data.Add(ToDynamic(ctx, x))); - } - break; - case ExportEntityType.Manufacturer: - { - var items = GetManufacturerQuery(ctx, skip, PageSize).ToList(); - items.Each(x => result.Data.Add(ToDynamic(ctx, x))); - } - break; - case ExportEntityType.Customer: - { - var items = GetCustomerQuery(ctx, skip, PageSize).ToList(); - items.Each(x => result.Data.Add(ToDynamic(ctx, x))); - } - break; - case ExportEntityType.NewsLetterSubscription: - { - var items = GetNewsLetterSubscriptionQuery(ctx, skip, PageSize).ToList(); - items.Each(x => result.Data.Add(ToDynamic(ctx, x))); - } - break; - case ExportEntityType.ShoppingCartItem: - { - var items = GetShoppingCartItemQuery(ctx, skip, PageSize).ToList(); - items.Each(x => result.Data.Add(ToDynamic(ctx, x))); - } - break; - } + { + case ExportEntityType.Product: + { + var items = GetProductQuery(ctx, skip, PageSize).ToList(); + items.Each(x => result.Data.Add(ToDynamic(ctx, x))); + } + break; + case ExportEntityType.Order: + { + var items = GetOrderQuery(ctx, skip, PageSize).ToList(); + items.Each(x => result.Data.Add(ToDynamic(ctx, x))); + } + break; + case ExportEntityType.Category: + { + var items = GetCategoryQuery(ctx, skip, PageSize).ToList(); + items.Each(x => result.Data.Add(ToDynamic(ctx, x))); + } + break; + case ExportEntityType.Manufacturer: + { + var items = GetManufacturerQuery(ctx, skip, PageSize).ToList(); + items.Each(x => result.Data.Add(ToDynamic(ctx, x))); + } + break; + case ExportEntityType.Customer: + { + var items = GetCustomerQuery(ctx, skip, PageSize).ToList(); + items.Each(x => result.Data.Add(ToDynamic(ctx, x))); + } + break; + case ExportEntityType.NewsLetterSubscription: + { + var items = GetNewsLetterSubscriptionQuery(ctx, skip, PageSize).ToList(); + items.Each(x => result.Data.Add(ToDynamic(ctx, x))); + } + break; + case ExportEntityType.ShoppingCartItem: + { + var items = GetShoppingCartItemQuery(ctx, skip, PageSize).ToList(); + items.Each(x => result.Data.Add(ToDynamic(ctx, x))); + } + break; + } return result; - } - } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs index 7fff7a46e5..9b901f138f 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs @@ -2,22 +2,19 @@ namespace SmartStore.Services.DataExchange.Export.Deployment { - [Serializable] - public class DataDeploymentResult - { - /// - /// Whether the deployment succeeded - /// - public bool Succeeded - { - get { return LastError.IsEmpty(); } - } + [Serializable] + public class DataDeploymentResult + { + /// + /// Whether the deployment succeeded + /// + public bool Succeeded => LastError.IsEmpty(); - public string LastError { get; set; } + public string LastError { get; set; } - /// - /// Last execution date - /// - public DateTime LastExecutionUtc { get; set; } - } + /// + /// Last execution date + /// + public DateTime LastExecutionUtc { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs index 3415948ae2..ccb036af4d 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs @@ -11,56 +11,56 @@ namespace SmartStore.Services.DataExchange.Export.Deployment { - public class EmailFilePublisher : IFilePublisher - { - private IEmailAccountService _emailAccountService; - private IQueuedEmailService _queuedEmailService; + public class EmailFilePublisher : IFilePublisher + { + private IEmailAccountService _emailAccountService; + private IQueuedEmailService _queuedEmailService; - public EmailFilePublisher( - IEmailAccountService emailAccountService, - IQueuedEmailService queuedEmailService) - { - _emailAccountService = emailAccountService; - _queuedEmailService = queuedEmailService; - } + public EmailFilePublisher( + IEmailAccountService emailAccountService, + IQueuedEmailService queuedEmailService) + { + _emailAccountService = emailAccountService; + _queuedEmailService = queuedEmailService; + } - public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) - { - var emailAccount = _emailAccountService.GetEmailAccountById(deployment.EmailAccountId); - var smtpContext = new SmtpContext(emailAccount); - var count = 0; + public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) + { + var emailAccount = _emailAccountService.GetEmailAccountById(deployment.EmailAccountId); + var smtpContext = new SmtpContext(emailAccount); + var count = 0; - foreach (var email in deployment.EmailAddresses.SplitSafe(",").Where(x => x.IsEmail())) - { - var queuedEmail = new QueuedEmail - { - From = emailAccount.ToEmailAddress(), - SendManually = false, - To = email, - Subject = deployment.EmailSubject.NaIfEmpty(), - Body = deployment.EmailSubject.NaIfEmpty(), - CreatedOnUtc = DateTime.UtcNow, - EmailAccountId = deployment.EmailAccountId - }; + foreach (var email in deployment.EmailAddresses.SplitSafe(",").Where(x => x.IsEmail())) + { + var queuedEmail = new QueuedEmail + { + From = emailAccount.ToEmailAddress(), + SendManually = false, + To = email, + Subject = deployment.EmailSubject.NaIfEmpty(), + Body = deployment.EmailSubject.NaIfEmpty(), + CreatedOnUtc = DateTime.UtcNow, + EmailAccountId = deployment.EmailAccountId + }; - foreach (var path in context.GetDeploymentFiles()) - { - var name = Path.GetFileName(path); + foreach (var path in context.GetDeploymentFiles()) + { + var name = Path.GetFileName(path); - queuedEmail.Attachments.Add(new QueuedEmailAttachment - { - StorageLocation = EmailAttachmentStorageLocation.Blob, - MediaStorage = new MediaStorage { Data = File.ReadAllBytes(path) }, - Name = name, - MimeType = MimeTypes.MapNameToMimeType(name) - }); - } + queuedEmail.Attachments.Add(new QueuedEmailAttachment + { + StorageLocation = EmailAttachmentStorageLocation.Blob, + MediaStorage = new MediaStorage { Data = File.ReadAllBytes(path) }, + Name = name, + MimeType = MimeTypes.MapNameToMimeType(name) + }); + } - _queuedEmailService.InsertQueuedEmail(queuedEmail); - ++count; - } + _queuedEmailService.InsertQueuedEmail(queuedEmail); + ++count; + } - context.Log.Info("{0} email(s) created and queued for deployment.".FormatInvariant(count)); - } - } + context.Log.Info("{0} email(s) created and queued for deployment.".FormatInvariant(count)); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs index 346cf02176..04363d9663 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs @@ -5,21 +5,21 @@ namespace SmartStore.Services.DataExchange.Export.Deployment { - public class FileSystemFilePublisher : IFilePublisher - { - public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) - { - var targetFolder = deployment.GetDeploymentFolder(true); + public class FileSystemFilePublisher : IFilePublisher + { + public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) + { + var targetFolder = deployment.GetDeploymentFolder(true); - if (targetFolder.IsEmpty()) - return; + if (targetFolder.IsEmpty()) + return; - if (!FileSystemHelper.CopyDirectory(new DirectoryInfo(context.FolderContent), new DirectoryInfo(targetFolder))) - { - context.Result.LastError = context.T("Admin.DataExchange.Export.Deployment.CopyFileFailed"); - } + if (!FileSystemHelper.CopyDirectory(new DirectoryInfo(context.FolderContent), new DirectoryInfo(targetFolder))) + { + context.Result.LastError = context.T("Admin.DataExchange.Export.Deployment.CopyFileFailed"); + } - context.Log.Info($"Copied export data files to {targetFolder}."); - } - } + context.Log.Info($"Copied export data files to {targetFolder}."); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs index 64bf43b067..bd6a2e8ad8 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs @@ -6,170 +6,170 @@ namespace SmartStore.Services.DataExchange.Export.Deployment { - public class FtpFilePublisher : IFilePublisher - { - private ExportDeploymentContext _context; - private ExportDeployment _deployment; - private int _succeededFiles; - private string _ftpRootUrl; - - private string GetRelativePath(string path) - { - var relativePath = path.Substring(_context.FolderContent.Length).Replace("\\", "/"); - if (relativePath.StartsWith("/")) - { - return relativePath.Substring(1); - } - - return relativePath; - } - - private FtpWebRequest CreateRequest(string url, bool keepAlive = true, long? contentLength = null) - { - var request = (FtpWebRequest)WebRequest.Create(url); - request.Method = WebRequestMethods.Ftp.UploadFile; - request.KeepAlive = keepAlive; - request.UseBinary = true; - request.Proxy = null; - request.UsePassive = _deployment.PassiveMode; - request.EnableSsl = _deployment.UseSsl; - - if (_deployment.Username.HasValue()) - { - request.Credentials = new NetworkCredential(_deployment.Username, _deployment.Password); - } - - if (contentLength.HasValue) - { - request.ContentLength = contentLength.Value; - } - - return request; - } - - private bool UploadFile(string path, string fileUrl, bool keepAlive = true) - { - var succeeded = false; - var bytesRead = 0; - var buffLength = 32768; - byte[] buff = new byte[buffLength]; - - var request = CreateRequest(fileUrl, keepAlive, (new FileInfo(path)).Length); - request.Method = WebRequestMethods.Ftp.UploadFile; - - var requestStream = request.GetRequestStream(); - using (var stream = new FileStream(path, FileMode.Open)) - { - while ((bytesRead = stream.Read(buff, 0, buffLength)) != 0) - { - requestStream.Write(buff, 0, bytesRead); - } - } - - requestStream.Close(); - - using (var response = (FtpWebResponse)request.GetResponse()) - { - var statusCode = (int)response.StatusCode; - succeeded = statusCode >= 200 && statusCode <= 299; - - if (succeeded) - { - ++_succeededFiles; - } - else - { - _context.Result.LastError = _context.T("Admin.Common.FtpStatus", statusCode, response.StatusCode.ToString()); - _context.Log.Error("The FTP transfer failed. FTP status {0} ({1}). File {3}".FormatInvariant(statusCode, response.StatusCode.ToString(), path)); - } - } - - return succeeded; - } - - private bool DirectoryExists(string directoryUrl) - { - var result = false; - - try - { - var request = CreateRequest(directoryUrl.EnsureEndsWith("/")); - request.Method = WebRequestMethods.Ftp.ListDirectory; - - using (request.GetResponse()) - { - result = true; - } - } - catch (WebException) - { - result = false; - } - - return result; - } - - private bool FtpCopyDirectory(DirectoryInfo source) - { - var files = source.GetFiles(); - var len = files.Length; - - for (var i = 0; i < len; ++i) - { - var path = files[i].FullName; - var relativePath = GetRelativePath(path); - - UploadFile(path, _ftpRootUrl + relativePath, i != (len - 1)); - } - - foreach (var sourceSubDir in source.GetDirectories()) - { - var relativePath = GetRelativePath(sourceSubDir.FullName); - - if (!DirectoryExists(_ftpRootUrl + relativePath)) - { - var request = CreateRequest(_ftpRootUrl + relativePath, true); - request.Method = WebRequestMethods.Ftp.MakeDirectory; - using (var response = (FtpWebResponse)request.GetResponse()) - { - response.Close(); - } - } - - FtpCopyDirectory(sourceSubDir); - } - - return true; - } - - public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) - { - _context = context; - _deployment = deployment; - _succeededFiles = 0; - _ftpRootUrl = deployment.Url; - - if (!_ftpRootUrl.StartsWith("ftp://", StringComparison.InvariantCultureIgnoreCase)) - { - _ftpRootUrl = "ftp://" + _ftpRootUrl; - } - - _ftpRootUrl = _ftpRootUrl.EnsureEndsWith("/"); - - if (context.CreateZipArchive) - { - if (File.Exists(context.ZipPath)) - { - var fileUrl = _ftpRootUrl + Path.GetFileName(context.ZipPath); - UploadFile(context.ZipPath, fileUrl, false); - } - } - else - { - FtpCopyDirectory(new DirectoryInfo(context.FolderContent)); - } - - context.Log.Info("{0} file(s) successfully uploaded via FTP.".FormatInvariant(_succeededFiles)); - } - } + public class FtpFilePublisher : IFilePublisher + { + private ExportDeploymentContext _context; + private ExportDeployment _deployment; + private int _succeededFiles; + private string _ftpRootUrl; + + private string GetRelativePath(string path) + { + var relativePath = path.Substring(_context.FolderContent.Length).Replace("\\", "/"); + if (relativePath.StartsWith("/")) + { + return relativePath.Substring(1); + } + + return relativePath; + } + + private FtpWebRequest CreateRequest(string url, bool keepAlive = true, long? contentLength = null) + { + var request = (FtpWebRequest)WebRequest.Create(url); + request.Method = WebRequestMethods.Ftp.UploadFile; + request.KeepAlive = keepAlive; + request.UseBinary = true; + request.Proxy = null; + request.UsePassive = _deployment.PassiveMode; + request.EnableSsl = _deployment.UseSsl; + + if (_deployment.Username.HasValue()) + { + request.Credentials = new NetworkCredential(_deployment.Username, _deployment.Password); + } + + if (contentLength.HasValue) + { + request.ContentLength = contentLength.Value; + } + + return request; + } + + private bool UploadFile(string path, string fileUrl, bool keepAlive = true) + { + var succeeded = false; + var bytesRead = 0; + var buffLength = 32768; + byte[] buff = new byte[buffLength]; + + var request = CreateRequest(fileUrl, keepAlive, (new FileInfo(path)).Length); + request.Method = WebRequestMethods.Ftp.UploadFile; + + var requestStream = request.GetRequestStream(); + using (var stream = new FileStream(path, FileMode.Open)) + { + while ((bytesRead = stream.Read(buff, 0, buffLength)) != 0) + { + requestStream.Write(buff, 0, bytesRead); + } + } + + requestStream.Close(); + + using (var response = (FtpWebResponse)request.GetResponse()) + { + var statusCode = (int)response.StatusCode; + succeeded = statusCode >= 200 && statusCode <= 299; + + if (succeeded) + { + ++_succeededFiles; + } + else + { + _context.Result.LastError = _context.T("Admin.Common.FtpStatus", statusCode, response.StatusCode.ToString()); + _context.Log.Error("The FTP transfer failed. FTP status {0} ({1}). File {3}".FormatInvariant(statusCode, response.StatusCode.ToString(), path)); + } + } + + return succeeded; + } + + private bool DirectoryExists(string directoryUrl) + { + var result = false; + + try + { + var request = CreateRequest(directoryUrl.EnsureEndsWith("/")); + request.Method = WebRequestMethods.Ftp.ListDirectory; + + using (request.GetResponse()) + { + result = true; + } + } + catch (WebException) + { + result = false; + } + + return result; + } + + private bool FtpCopyDirectory(DirectoryInfo source) + { + var files = source.GetFiles(); + var len = files.Length; + + for (var i = 0; i < len; ++i) + { + var path = files[i].FullName; + var relativePath = GetRelativePath(path); + + UploadFile(path, _ftpRootUrl + relativePath, i != (len - 1)); + } + + foreach (var sourceSubDir in source.GetDirectories()) + { + var relativePath = GetRelativePath(sourceSubDir.FullName); + + if (!DirectoryExists(_ftpRootUrl + relativePath)) + { + var request = CreateRequest(_ftpRootUrl + relativePath, true); + request.Method = WebRequestMethods.Ftp.MakeDirectory; + using (var response = (FtpWebResponse)request.GetResponse()) + { + response.Close(); + } + } + + FtpCopyDirectory(sourceSubDir); + } + + return true; + } + + public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) + { + _context = context; + _deployment = deployment; + _succeededFiles = 0; + _ftpRootUrl = deployment.Url; + + if (!_ftpRootUrl.StartsWith("ftp://", StringComparison.InvariantCultureIgnoreCase)) + { + _ftpRootUrl = "ftp://" + _ftpRootUrl; + } + + _ftpRootUrl = _ftpRootUrl.EnsureEndsWith("/"); + + if (context.CreateZipArchive) + { + if (File.Exists(context.ZipPath)) + { + var fileUrl = _ftpRootUrl + Path.GetFileName(context.ZipPath); + UploadFile(context.ZipPath, fileUrl, false); + } + } + else + { + FtpCopyDirectory(new DirectoryInfo(context.FolderContent)); + } + + context.Log.Info("{0} file(s) successfully uploaded via FTP.".FormatInvariant(_succeededFiles)); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs index 9bcdf2f5fd..a484b85a50 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs @@ -8,70 +8,70 @@ namespace SmartStore.Services.DataExchange.Export.Deployment { - public class HttpFilePublisher : IFilePublisher - { - public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) - { - var succeededFiles = 0; - var url = deployment.Url; + public class HttpFilePublisher : IFilePublisher + { + public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) + { + var succeededFiles = 0; + var url = deployment.Url; - if (!url.StartsWith("http://", StringComparison.InvariantCultureIgnoreCase) && !url.StartsWith("https://", StringComparison.InvariantCultureIgnoreCase)) - url = "http://" + url; + if (!url.StartsWith("http://", StringComparison.InvariantCultureIgnoreCase) && !url.StartsWith("https://", StringComparison.InvariantCultureIgnoreCase)) + url = "http://" + url; - if (deployment.HttpTransmissionType == ExportHttpTransmissionType.MultipartFormDataPost) - { - var countFiles = 0; - ICredentials credentials = null; + if (deployment.HttpTransmissionType == ExportHttpTransmissionType.MultipartFormDataPost) + { + var countFiles = 0; + ICredentials credentials = null; - if (deployment.Username.HasValue()) - credentials = new NetworkCredential(deployment.Username, deployment.Password); + if (deployment.Username.HasValue()) + credentials = new NetworkCredential(deployment.Username, deployment.Password); - using (var handler = new HttpClientHandler { Credentials = credentials }) - using (var client = new HttpClient(handler)) - using (var formData = new MultipartFormDataContent()) - { - foreach (var path in context.GetDeploymentFiles()) - { - byte[] fileData = File.ReadAllBytes(path); - formData.Add(new ByteArrayContent(fileData), "file {0}".FormatInvariant(++countFiles), Path.GetFileName(path)); - } + using (var handler = new HttpClientHandler { Credentials = credentials }) + using (var client = new HttpClient(handler)) + using (var formData = new MultipartFormDataContent()) + { + foreach (var path in context.GetDeploymentFiles()) + { + byte[] fileData = File.ReadAllBytes(path); + formData.Add(new ByteArrayContent(fileData), "file {0}".FormatInvariant(++countFiles), Path.GetFileName(path)); + } - var response = client.PostAsync(url, formData).Result; + var response = client.PostAsync(url, formData).Result; - if (response.IsSuccessStatusCode) - { - succeededFiles = countFiles; - } - else if (response.Content != null) - { - context.Result.LastError = context.T("Admin.Common.HttpStatus", (int)response.StatusCode, response.StatusCode.ToString()); + if (response.IsSuccessStatusCode) + { + succeededFiles = countFiles; + } + else if (response.Content != null) + { + context.Result.LastError = context.T("Admin.Common.HttpStatus", (int)response.StatusCode, response.StatusCode.ToString()); - var content = response.Content.ReadAsStringAsync().Result; + var content = response.Content.ReadAsStringAsync().Result; - var msg = "Multipart form data upload failed. HTTP status {0} ({1}). Response: {2}".FormatInvariant( - (int)response.StatusCode, response.StatusCode.ToString(), content.NaIfEmpty().Truncate(2000, "...")); + var msg = "Multipart form data upload failed. HTTP status {0} ({1}). Response: {2}".FormatInvariant( + (int)response.StatusCode, response.StatusCode.ToString(), content.NaIfEmpty().Truncate(2000, "...")); - context.Log.Error(msg); - } - } - } - else - { - using (var webClient = new WebClient()) - { - if (deployment.Username.HasValue()) - webClient.Credentials = new NetworkCredential(deployment.Username, deployment.Password); + context.Log.Error(msg); + } + } + } + else + { + using (var webClient = new WebClient()) + { + if (deployment.Username.HasValue()) + webClient.Credentials = new NetworkCredential(deployment.Username, deployment.Password); - foreach (var path in context.GetDeploymentFiles()) - { - webClient.UploadFile(url, path); + foreach (var path in context.GetDeploymentFiles()) + { + webClient.UploadFile(url, path); - ++succeededFiles; - } - } - } + ++succeededFiles; + } + } + } - context.Log.Info("{0} file(s) successfully uploaded via HTTP ({1}).".FormatInvariant(succeededFiles, deployment.HttpTransmissionType.ToString())); - } - } + context.Log.Info("{0} file(s) successfully uploaded via HTTP ({1}).".FormatInvariant(succeededFiles, deployment.HttpTransmissionType.ToString())); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs index 1ae3301ec4..16bfa4d000 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs @@ -6,37 +6,37 @@ namespace SmartStore.Services.DataExchange.Export.Deployment { - public interface IFilePublisher - { - void Publish(ExportDeploymentContext context, ExportDeployment deployment); + public interface IFilePublisher + { + void Publish(ExportDeploymentContext context, ExportDeployment deployment); } - public class ExportDeploymentContext - { - public Localizer T { get; set; } - public ILogger Log { get; set; } + public class ExportDeploymentContext + { + public Localizer T { get; set; } + public ILogger Log { get; set; } - public string FolderContent { get; set; } + public string FolderContent { get; set; } - public string ZipPath { get; set; } - public bool CreateZipArchive { get; set; } + public string ZipPath { get; set; } + public bool CreateZipArchive { get; set; } - public DataDeploymentResult Result { get; set; } + public DataDeploymentResult Result { get; set; } - public IEnumerable GetDeploymentFiles() - { - if (!CreateZipArchive) - { - return System.IO.Directory.EnumerateFiles(FolderContent, "*", SearchOption.AllDirectories); - } + public IEnumerable GetDeploymentFiles() + { + if (!CreateZipArchive) + { + return System.IO.Directory.EnumerateFiles(FolderContent, "*", SearchOption.AllDirectories); + } - if (File.Exists(ZipPath)) - { - return new string[] { ZipPath }; - } + if (File.Exists(ZipPath)) + { + return new string[] { ZipPath }; + } - return new string[0]; - } - } + return new string[0]; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs index 7e9d67beb3..f5143a2033 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs @@ -5,40 +5,40 @@ namespace SmartStore.Services.DataExchange.Export.Deployment { - public class PublicFolderPublisher : IFilePublisher - { - public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) - { - var destinationFolder = deployment.GetDeploymentFolder(true); + public class PublicFolderPublisher : IFilePublisher + { + public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment) + { + var destinationFolder = deployment.GetDeploymentFolder(true); - if (destinationFolder.IsEmpty()) - return; + if (destinationFolder.IsEmpty()) + return; - if (!System.IO.Directory.Exists(destinationFolder)) - { - System.IO.Directory.CreateDirectory(destinationFolder); - } + if (!System.IO.Directory.Exists(destinationFolder)) + { + System.IO.Directory.CreateDirectory(destinationFolder); + } - if (context.CreateZipArchive) - { - if (File.Exists(context.ZipPath)) - { - var destinationFile = Path.Combine(destinationFolder, Path.GetFileName(context.ZipPath)); + if (context.CreateZipArchive) + { + if (File.Exists(context.ZipPath)) + { + var destinationFile = Path.Combine(destinationFolder, Path.GetFileName(context.ZipPath)); - File.Copy(context.ZipPath, destinationFile, true); + File.Copy(context.ZipPath, destinationFile, true); - context.Log.Info($"Copied zipped export data to {destinationFile}."); - } - } - else - { - if (!FileSystemHelper.CopyDirectory(new DirectoryInfo(context.FolderContent), new DirectoryInfo(destinationFolder))) - { - context.Result.LastError = context.T("Admin.DataExchange.Export.Deployment.CopyFileFailed"); - } + context.Log.Info($"Copied zipped export data to {destinationFile}."); + } + } + else + { + if (!FileSystemHelper.CopyDirectory(new DirectoryInfo(context.FolderContent), new DirectoryInfo(destinationFolder))) + { + context.Result.LastError = context.T("Admin.DataExchange.Export.Deployment.CopyFileFailed"); + } - context.Log.Info($"Copied export data files to {destinationFolder}."); - } - } - } + context.Log.Info($"Copied export data files to {destinationFolder}."); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs index 14818fe024..14cc1d7b56 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs @@ -39,54 +39,54 @@ namespace SmartStore.Services.DataExchange.Export { public partial class DataExporter - { - private readonly string[] _orderCustomerAttributes = new string[] - { - SystemCustomerAttributeNames.VatNumber, + { + private readonly string[] _orderCustomerAttributes = new string[] + { + SystemCustomerAttributeNames.VatNumber, SystemCustomerAttributeNames.ImpersonatedCustomerId - }; - - private void PrepareProductDescription(DataExporterContext ctx, dynamic dynObject, Product product) - { - try - { - var languageId = ctx.LanguageId; - string description = ""; - - // Description merging. - if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.None) - { - // Export empty description. - } - else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ShortDescriptionOrNameIfEmpty) - { - description = dynObject.FullDescription; - - if (description.IsEmpty()) - description = dynObject.ShortDescription; - if (description.IsEmpty()) - description = dynObject.Name; - } - else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ShortDescription) - { - description = dynObject.ShortDescription; - } - else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.Description) - { - description = dynObject.FullDescription; - } - else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.NameAndShortDescription) - { - description = ((string)dynObject.Name).Grow((string)dynObject.ShortDescription, " "); - } - else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.NameAndDescription) - { - description = ((string)dynObject.Name).Grow((string)dynObject.FullDescription, " "); - } - else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndShortDescription || - ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndDescription) - { - var productManus = ctx.ProductExportContext.ProductManufacturers.GetOrLoad(product.Id); + }; + + private void PrepareProductDescription(DataExporterContext ctx, dynamic dynObject, Product product) + { + try + { + var languageId = ctx.LanguageId; + string description = ""; + + // Description merging. + if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.None) + { + // Export empty description. + } + else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ShortDescriptionOrNameIfEmpty) + { + description = dynObject.FullDescription; + + if (description.IsEmpty()) + description = dynObject.ShortDescription; + if (description.IsEmpty()) + description = dynObject.Name; + } + else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ShortDescription) + { + description = dynObject.ShortDescription; + } + else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.Description) + { + description = dynObject.FullDescription; + } + else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.NameAndShortDescription) + { + description = ((string)dynObject.Name).Grow((string)dynObject.ShortDescription, " "); + } + else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.NameAndDescription) + { + description = ((string)dynObject.Name).Grow((string)dynObject.FullDescription, " "); + } + else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndShortDescription || + ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndDescription) + { + var productManus = ctx.ProductExportContext.ProductManufacturers.GetOrLoad(product.Id); if (productManus != null && productManus.Any()) { @@ -95,90 +95,90 @@ private void PrepareProductDescription(DataExporterContext ctx, dynamic dynObjec description = translations.GetValue(languageId, manufacturer.Id, nameof(manufacturer.Name)) ?? manufacturer.Name; } - description = description.Grow((string)dynObject.Name, " "); + description = description.Grow((string)dynObject.Name, " "); description = ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndShortDescription ? description.Grow((string)dynObject.ShortDescription, " ") : description.Grow((string)dynObject.FullDescription, " "); - } - - // Append text. - if (ctx.Projection.AppendDescriptionText.HasValue() && ((string)dynObject.ShortDescription).IsEmpty() && ((string)dynObject.FullDescription).IsEmpty()) - { - string[] appendText = ctx.Projection.AppendDescriptionText.SplitSafe(","); - if (appendText.Length > 0) - { - var rnd = CommonHelper.GenerateRandomInteger(0, appendText.Length - 1); - description = description.Grow(appendText.SafeGet(rnd), " "); - } - } - - // Remove critical characters. - if (description.HasValue() && ctx.Projection.RemoveCriticalCharacters) - { + } + + // Append text. + if (ctx.Projection.AppendDescriptionText.HasValue() && ((string)dynObject.ShortDescription).IsEmpty() && ((string)dynObject.FullDescription).IsEmpty()) + { + string[] appendText = ctx.Projection.AppendDescriptionText.SplitSafe(","); + if (appendText.Length > 0) + { + var rnd = CommonHelper.GenerateRandomInteger(0, appendText.Length - 1); + description = description.Grow(appendText.SafeGet(rnd), " "); + } + } + + // Remove critical characters. + if (description.HasValue() && ctx.Projection.RemoveCriticalCharacters) + { foreach (var str in ctx.Projection.CriticalCharacters.SplitSafe(",")) { description = description.Replace(str, ""); } - } - - // Convert to plain text. - if (description.HasValue() && ctx.Projection.DescriptionToPlainText) - { - //Regex reg = new Regex("<[^>]+>", RegexOptions.IgnoreCase); - //description = HttpUtility.HtmlDecode(reg.Replace(description, "")); - - description = HtmlUtils.ConvertHtmlToPlainText(description); - description = HtmlUtils.StripTags(HttpUtility.HtmlDecode(description)); - } - - dynObject.FullDescription = description.TrimSafe(); - } - catch { } - } - - private decimal? ConvertPrice(DataExporterContext ctx, Product product, decimal? price) - { - if (price.HasValue) - { - if (ctx.Projection.ConvertNetToGrossPrices) - { - decimal taxRate; - price = _taxService.Value.GetProductPrice(product, product.TaxCategoryId, price.Value, true, ctx.ContextCustomer, ctx.ContextCurrency, - _taxSettings.Value.PricesIncludeTax, out taxRate); - } - - if (price != decimal.Zero) - { - price = _currencyService.Value.ConvertFromPrimaryStoreCurrency(price.Value, ctx.ContextCurrency, ctx.Store); - } - } - - return price; - } - - private decimal CalculatePrice( - DataExporterContext ctx, - Product product, - ProductVariantAttributeCombination combination, - ICollection attributeValues) - { - var price = product.Price; - var productContext = ctx.ProductExportContext as PriceCalculationContext; + } + + // Convert to plain text. + if (description.HasValue() && ctx.Projection.DescriptionToPlainText) + { + //Regex reg = new Regex("<[^>]+>", RegexOptions.IgnoreCase); + //description = HttpUtility.HtmlDecode(reg.Replace(description, "")); + + description = HtmlUtils.ConvertHtmlToPlainText(description); + description = HtmlUtils.StripTags(HttpUtility.HtmlDecode(description)); + } + + dynObject.FullDescription = description.TrimSafe(); + } + catch { } + } + + private decimal? ConvertPrice(DataExporterContext ctx, Product product, decimal? price) + { + if (price.HasValue) + { + if (ctx.Projection.ConvertNetToGrossPrices) + { + decimal taxRate; + price = _taxService.Value.GetProductPrice(product, product.TaxCategoryId, price.Value, true, ctx.ContextCustomer, ctx.ContextCurrency, + _taxSettings.Value.PricesIncludeTax, out taxRate); + } + + if (price != decimal.Zero) + { + price = _currencyService.Value.ConvertFromPrimaryStoreCurrency(price.Value, ctx.ContextCurrency, ctx.Store); + } + } + + return price; + } + + private decimal CalculatePrice( + DataExporterContext ctx, + Product product, + ProductVariantAttributeCombination combination, + ICollection attributeValues) + { + var price = product.Price; + var productContext = ctx.ProductExportContext as PriceCalculationContext; var associatedProductContext = ctx.AssociatedProductContext as PriceCalculationContext; if (combination != null) - { - // price for attribute combination - var attributesTotalPriceBase = decimal.Zero; + { + // price for attribute combination + var attributesTotalPriceBase = decimal.Zero; - if (attributeValues != null) - { - attributeValues.Each(x => attributesTotalPriceBase += _priceCalculationService.Value.GetProductVariantAttributeValuePriceAdjustment(x, product, ctx.ContextCustomer, productContext)); - } + if (attributeValues != null) + { + attributeValues.Each(x => attributesTotalPriceBase += _priceCalculationService.Value.GetProductVariantAttributeValuePriceAdjustment(x, product, ctx.ContextCustomer, productContext)); + } - price = _priceCalculationService.Value.GetFinalPrice(product, null, ctx.ContextCustomer, attributesTotalPriceBase, true, 1, null, productContext); - } - else if (ctx.Projection.PriceType.HasValue) + price = _priceCalculationService.Value.GetFinalPrice(product, null, ctx.ContextCustomer, attributesTotalPriceBase, true, 1, null, productContext); + } + else if (ctx.Projection.PriceType.HasValue) { var priceType = ctx.Projection.PriceType.Value; @@ -218,10 +218,10 @@ private decimal CalculatePrice( price = _priceCalculationService.Value.GetLowestPrice(product, ctx.ContextCustomer, productContext, out _); } } - } + } - return ConvertPrice(ctx, product, price) ?? price; - } + return ConvertPrice(ctx, product, price) ?? price; + } private List GetLocalized( DataExporterContext ctx, @@ -286,205 +286,205 @@ private List GetLocalized( } private dynamic ToDynamic(DataExporterContext ctx, ExportProfile profile) - { - if (profile == null) - return null; + { + if (profile == null) + return null; - dynamic result = new DynamicEntity(profile); - return result; - } + dynamic result = new DynamicEntity(profile); + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Currency currency) - { + private dynamic ToDynamic(DataExporterContext ctx, Currency currency) + { if (currency == null) { return null; } - dynamic result = new DynamicEntity(currency); + dynamic result = new DynamicEntity(currency); var translations = ctx.Translations[nameof(Currency)]; result.Name = translations.GetValue(ctx.LanguageId, currency.Id, nameof(currency.Name)) ?? currency.Name; result._Localized = GetLocalized(ctx, translations, null, currency, x => x.Name); - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Language language) - { + private dynamic ToDynamic(DataExporterContext ctx, Language language) + { if (language == null) { return null; } - dynamic result = new DynamicEntity(language); - return result; - } + dynamic result = new DynamicEntity(language); + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Country country) - { + private dynamic ToDynamic(DataExporterContext ctx, Country country) + { if (country == null) { return null; } - dynamic result = new DynamicEntity(country); + dynamic result = new DynamicEntity(country); var translations = ctx.Translations[nameof(Country)]; result.Name = translations.GetValue(ctx.LanguageId, country.Id, nameof(country.Name)) ?? country.Name; - result._Localized = GetLocalized(ctx, translations, null, country, x => x.Name); + result._Localized = GetLocalized(ctx, translations, null, country, x => x.Name); - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Address address) - { + private dynamic ToDynamic(DataExporterContext ctx, Address address) + { if (address == null) { return null; } - dynamic result = new DynamicEntity(address); + dynamic result = new DynamicEntity(address); result.Country = ToDynamic(ctx, address.Country); - if (address.StateProvinceId.GetValueOrDefault() > 0) - { - dynamic sp = new DynamicEntity(address.StateProvince); + if (address.StateProvinceId.GetValueOrDefault() > 0) + { + dynamic sp = new DynamicEntity(address.StateProvince); var translations = ctx.Translations[nameof(StateProvince)]; sp.Name = translations.GetValue(ctx.LanguageId, address.StateProvince.Id, nameof(StateProvince)) ?? address.StateProvince.Name; - sp._Localized = GetLocalized(ctx, translations, null, address.StateProvince, x => x.Name); + sp._Localized = GetLocalized(ctx, translations, null, address.StateProvince, x => x.Name); - result.StateProvince = sp; - } - else - { - result.StateProvince = null; - } + result.StateProvince = sp; + } + else + { + result.StateProvince = null; + } - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, RewardPointsHistory points) - { + private dynamic ToDynamic(DataExporterContext ctx, RewardPointsHistory points) + { if (points == null) { return null; } - dynamic result = new DynamicEntity(points); - return result; - } + dynamic result = new DynamicEntity(points); + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Customer customer) - { + private dynamic ToDynamic(DataExporterContext ctx, Customer customer) + { if (customer == null) { return null; } - dynamic result = new DynamicEntity(customer); + dynamic result = new DynamicEntity(customer); - result.BillingAddress = null; - result.ShippingAddress = null; - result.Addresses = null; + result.BillingAddress = null; + result.ShippingAddress = null; + result.Addresses = null; - result.RewardPointsHistory = null; - result._RewardPointsBalance = 0; + result.RewardPointsHistory = null; + result._RewardPointsBalance = 0; - result._GenericAttributes = null; - result._HasNewsletterSubscription = false; + result._GenericAttributes = null; + result._HasNewsletterSubscription = false; - result._FullName = null; - result._AvatarPictureUrl = null; + result._FullName = null; + result._AvatarPictureUrl = null; - result.CustomerRoles = customer.CustomerRoleMappings - .Select(x => - { - dynamic dyn = new DynamicEntity(x.CustomerRole); - return dyn; - }) - .ToList(); + result.CustomerRoles = customer.CustomerRoleMappings + .Select(x => + { + dynamic dyn = new DynamicEntity(x.CustomerRole); + return dyn; + }) + .ToList(); - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Store store) - { + private dynamic ToDynamic(DataExporterContext ctx, Store store) + { if (store == null) { return null; } - dynamic result = new DynamicEntity(store); + dynamic result = new DynamicEntity(store); - result.PrimaryStoreCurrency = ToDynamic(ctx, store.PrimaryStoreCurrency); - result.PrimaryExchangeRateCurrency = ToDynamic(ctx, store.PrimaryExchangeRateCurrency); + result.PrimaryStoreCurrency = ToDynamic(ctx, store.PrimaryStoreCurrency); + result.PrimaryExchangeRateCurrency = ToDynamic(ctx, store.PrimaryExchangeRateCurrency); - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, DeliveryTime deliveryTime) - { + private dynamic ToDynamic(DataExporterContext ctx, DeliveryTime deliveryTime) + { if (deliveryTime == null) { return null; } - dynamic result = new DynamicEntity(deliveryTime); + dynamic result = new DynamicEntity(deliveryTime); var translations = ctx.Translations[nameof(DeliveryTime)]; result.Name = translations.GetValue(ctx.LanguageId, deliveryTime.Id, nameof(deliveryTime.Name)) ?? deliveryTime.Name; - result._Localized = GetLocalized(ctx, translations, null, deliveryTime, x => x.Name); + result._Localized = GetLocalized(ctx, translations, null, deliveryTime, x => x.Name); - return result; - } + return result; + } - private void ToDeliveryTime(DataExporterContext ctx, dynamic parent, int? deliveryTimeId) - { - if (ctx.DeliveryTimes != null) - { + private void ToDeliveryTime(DataExporterContext ctx, dynamic parent, int? deliveryTimeId) + { + if (ctx.DeliveryTimes != null) + { parent.DeliveryTime = deliveryTimeId.HasValue && ctx.DeliveryTimes.ContainsKey(deliveryTimeId.Value) ? ToDynamic(ctx, ctx.DeliveryTimes[deliveryTimeId.Value]) : null; - } - } + } + } - private dynamic ToDynamic(DataExporterContext ctx, QuantityUnit quantityUnit) - { + private dynamic ToDynamic(DataExporterContext ctx, QuantityUnit quantityUnit) + { if (quantityUnit == null) { return null; } - dynamic result = new DynamicEntity(quantityUnit); + dynamic result = new DynamicEntity(quantityUnit); var translations = ctx.Translations[nameof(QuantityUnit)]; result.Name = translations.GetValue(ctx.LanguageId, quantityUnit.Id, nameof(quantityUnit.Name)) ?? quantityUnit.Name; result.NamePlural = translations.GetValue(ctx.LanguageId, quantityUnit.Id, nameof(quantityUnit.NamePlural)) ?? quantityUnit.NamePlural; result.Description = translations.GetValue(ctx.LanguageId, quantityUnit.Id, nameof(quantityUnit.Description)) ?? quantityUnit.Description; - result._Localized = GetLocalized(ctx, translations, null, quantityUnit, - x => x.Name, + result._Localized = GetLocalized(ctx, translations, null, quantityUnit, + x => x.Name, x => x.NamePlural, - x => x.Description); + x => x.Description); - return result; - } + return result; + } - private void ToQuantityUnit(DataExporterContext ctx, dynamic parent, int? quantityUnitId) - { - if (ctx.QuantityUnits != null) - { + private void ToQuantityUnit(DataExporterContext ctx, dynamic parent, int? quantityUnitId) + { + if (ctx.QuantityUnits != null) + { parent.QuantityUnit = quantityUnitId.HasValue && ctx.QuantityUnits.ContainsKey(quantityUnitId.Value) ? ToDynamic(ctx, ctx.QuantityUnits[quantityUnitId.Value]) : null; - } - } + } + } - private dynamic ToDynamic(DataExporterContext ctx, MediaFile file, int thumbPictureSize, int detailsPictureSize) - { + private dynamic ToDynamic(DataExporterContext ctx, MediaFile file, int thumbPictureSize, int detailsPictureSize) + { return ToDynamic(ctx, _mediaService.Value.ConvertMediaFile(file), thumbPictureSize, detailsPictureSize); } @@ -517,7 +517,7 @@ private dynamic ToDynamic(DataExporterContext ctx, MediaFileInfo file, int thumb } private dynamic ToDynamic(DataExporterContext ctx, ProductVariantAttribute pva) - { + { if (pva == null) { return null; @@ -527,56 +527,56 @@ private dynamic ToDynamic(DataExporterContext ctx, ProductVariantAttribute pva) var attribute = pva.ProductAttribute; dynamic result = new DynamicEntity(pva); - dynamic dynAttribute = new DynamicEntity(attribute); + dynamic dynAttribute = new DynamicEntity(attribute); var paTranslations = ctx.TranslationsPerPage[nameof(ProductAttribute)]; var pvavTranslations = ctx.TranslationsPerPage[nameof(ProductVariantAttributeValue)]; dynAttribute.Name = paTranslations.GetValue(languageId, attribute.Id, nameof(attribute.Name)) ?? attribute.Name; - dynAttribute.Description = paTranslations.GetValue(languageId, attribute.Id, nameof(attribute.Description)) ?? attribute.Description; + dynAttribute.Description = paTranslations.GetValue(languageId, attribute.Id, nameof(attribute.Description)) ?? attribute.Description; - dynAttribute.Values = pva.ProductVariantAttributeValues - .OrderBy(x => x.DisplayOrder) - .Select(x => - { - dynamic dyn = new DynamicEntity(x); + dynAttribute.Values = pva.ProductVariantAttributeValues + .OrderBy(x => x.DisplayOrder) + .Select(x => + { + dynamic dyn = new DynamicEntity(x); dyn.Name = pvavTranslations.GetValue(languageId, x.Id, nameof(x.Name)) ?? x.Name; - dyn._Localized = GetLocalized(ctx, pvavTranslations, null, x, y => y.Name); + dyn._Localized = GetLocalized(ctx, pvavTranslations, null, x, y => y.Name); - return dyn; - }) - .ToList(); + return dyn; + }) + .ToList(); - dynAttribute._Localized = GetLocalized(ctx, paTranslations, null, attribute, - x => x.Name, - x => x.Description); + dynAttribute._Localized = GetLocalized(ctx, paTranslations, null, attribute, + x => x.Name, + x => x.Description); - result.Attribute = dynAttribute; + result.Attribute = dynAttribute; - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, ProductVariantAttributeCombination pvac) - { - if (pvac == null) - return null; + private dynamic ToDynamic(DataExporterContext ctx, ProductVariantAttributeCombination pvac) + { + if (pvac == null) + return null; - dynamic result = new DynamicEntity(pvac); + dynamic result = new DynamicEntity(pvac); - ToDeliveryTime(ctx, result, pvac.DeliveryTimeId); - ToQuantityUnit(ctx, result, pvac.QuantityUnitId); + ToDeliveryTime(ctx, result, pvac.DeliveryTimeId); + ToQuantityUnit(ctx, result, pvac.QuantityUnitId); - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Manufacturer manufacturer) - { + private dynamic ToDynamic(DataExporterContext ctx, Manufacturer manufacturer) + { if (manufacturer == null) { return null; } - dynamic result = new DynamicEntity(manufacturer); + dynamic result = new DynamicEntity(manufacturer); var translations = ctx.Translations[nameof(Manufacturer)]; var urlRecords = ctx.UrlRecords[nameof(Manufacturer)]; @@ -584,105 +584,105 @@ private dynamic ToDynamic(DataExporterContext ctx, Manufacturer manufacturer) result.Name = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.Name)) ?? manufacturer.Name; if (!ctx.IsPreview) - { - result.SeName = ctx.UrlRecords[nameof(Manufacturer)].GetSlug(ctx.LanguageId, manufacturer.Id); + { + result.SeName = ctx.UrlRecords[nameof(Manufacturer)].GetSlug(ctx.LanguageId, manufacturer.Id); result.Description = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.Description)) ?? manufacturer.Description; result.BottomDescription = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.BottomDescription)) ?? manufacturer.BottomDescription; result.MetaKeywords = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaKeywords)) ?? manufacturer.MetaKeywords; - result.MetaDescription = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaDescription)) ?? manufacturer.MetaDescription; - result.MetaTitle = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaTitle)) ?? manufacturer.MetaTitle; + result.MetaDescription = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaDescription)) ?? manufacturer.MetaDescription; + result.MetaTitle = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaTitle)) ?? manufacturer.MetaTitle; - result._Localized = GetLocalized(ctx, translations, urlRecords, manufacturer, - x => x.Name, - x => x.Description, + result._Localized = GetLocalized(ctx, translations, urlRecords, manufacturer, + x => x.Name, + x => x.Description, x => x.BottomDescription, x => x.MetaKeywords, - x => x.MetaDescription, - x => x.MetaTitle); - } + x => x.MetaDescription, + x => x.MetaTitle); + } - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Category category) - { + private dynamic ToDynamic(DataExporterContext ctx, Category category) + { if (category == null) { return null; } - dynamic result = new DynamicEntity(category); + dynamic result = new DynamicEntity(category); var translations = ctx.Translations[nameof(Category)]; var urlRecords = ctx.UrlRecords[nameof(Category)]; result.Picture = null; - result.Name = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.Name)) ?? category.Name; + result.Name = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.Name)) ?? category.Name; result.FullName = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.FullName)) ?? category.FullName; - if (!ctx.IsPreview) - { + if (!ctx.IsPreview) + { result.SeName = ctx.UrlRecords[nameof(Category)].GetSlug(ctx.LanguageId, category.Id); result.Description = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.Description)) ?? category.Description; - result.BottomDescription = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.BottomDescription)) ?? category.BottomDescription; - result.MetaKeywords = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.MetaKeywords)) ?? category.MetaKeywords; - result.MetaDescription = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.MetaDescription)) ?? category.MetaDescription; - result.MetaTitle = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.MetaTitle)) ?? category.MetaTitle; - - result._CategoryTemplateViewPath = ctx.CategoryTemplates.ContainsKey(category.CategoryTemplateId) - ? ctx.CategoryTemplates[category.CategoryTemplateId] - : ""; - - result._Localized = GetLocalized(ctx, translations, urlRecords, category, - x => x.Name, - x => x.FullName, - x => x.Description, - x => x.BottomDescription, - x => x.MetaKeywords, - x => x.MetaDescription, - x => x.MetaTitle); - } - - return result; - } - - private dynamic ToDynamic(DataExporterContext ctx, Product product, string seName = null) - { + result.BottomDescription = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.BottomDescription)) ?? category.BottomDescription; + result.MetaKeywords = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.MetaKeywords)) ?? category.MetaKeywords; + result.MetaDescription = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.MetaDescription)) ?? category.MetaDescription; + result.MetaTitle = translations.GetValue(ctx.LanguageId, category.Id, nameof(category.MetaTitle)) ?? category.MetaTitle; + + result._CategoryTemplateViewPath = ctx.CategoryTemplates.ContainsKey(category.CategoryTemplateId) + ? ctx.CategoryTemplates[category.CategoryTemplateId] + : ""; + + result._Localized = GetLocalized(ctx, translations, urlRecords, category, + x => x.Name, + x => x.FullName, + x => x.Description, + x => x.BottomDescription, + x => x.MetaKeywords, + x => x.MetaDescription, + x => x.MetaTitle); + } + + return result; + } + + private dynamic ToDynamic(DataExporterContext ctx, Product product, string seName = null) + { if (product == null) { return null; } - dynamic result = new DynamicEntity(product); + dynamic result = new DynamicEntity(product); var translations = ctx.TranslationsPerPage[nameof(Product)]; var urlRecords = ctx.UrlRecordsPerPage[nameof(Product)]; var localizedName = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.Name)) ?? product.Name; result.AppliedDiscounts = null; result.Downloads = null; - result.TierPrices = null; - result.ProductAttributes = null; - result.ProductAttributeCombinations = null; - result.ProductPictures = null; - result.ProductCategories = null; - result.ProductManufacturers = null; - result.ProductTags = null; - result.ProductSpecificationAttributes = null; - result.ProductBundleItems = null; + result.TierPrices = null; + result.ProductAttributes = null; + result.ProductAttributeCombinations = null; + result.ProductPictures = null; + result.ProductCategories = null; + result.ProductManufacturers = null; + result.ProductTags = null; + result.ProductSpecificationAttributes = null; + result.ProductBundleItems = null; result.Name = localizedName; - if (!ctx.IsPreview) - { - result.SeName = seName ?? ctx.UrlRecordsPerPage[nameof(Product)].GetSlug(ctx.LanguageId, product.Id); + if (!ctx.IsPreview) + { + result.SeName = seName ?? ctx.UrlRecordsPerPage[nameof(Product)].GetSlug(ctx.LanguageId, product.Id); result.ShortDescription = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.ShortDescription)) ?? product.ShortDescription; - result.FullDescription = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.FullDescription)) ?? product.FullDescription; - result.MetaKeywords = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.MetaKeywords)) ?? product.MetaKeywords; - result.MetaDescription = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.MetaDescription)) ?? product.MetaDescription; - result.MetaTitle = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.MetaTitle)) ?? product.MetaTitle; - result.BundleTitleText = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.BundleTitleText)) ?? product.BundleTitleText; + result.FullDescription = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.FullDescription)) ?? product.FullDescription; + result.MetaKeywords = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.MetaKeywords)) ?? product.MetaKeywords; + result.MetaDescription = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.MetaDescription)) ?? product.MetaDescription; + result.MetaTitle = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.MetaTitle)) ?? product.MetaTitle; + result.BundleTitleText = translations.GetValue(ctx.LanguageId, product.Id, nameof(product.BundleTitleText)) ?? product.BundleTitleText; - result._ProductTemplateViewPath = ctx.ProductTemplates.ContainsKey(product.ProductTemplateId) - ? ctx.ProductTemplates[product.ProductTemplateId] - : string.Empty; + result._ProductTemplateViewPath = ctx.ProductTemplates.ContainsKey(product.ProductTemplateId) + ? ctx.ProductTemplates[product.ProductTemplateId] + : string.Empty; // A standard, language independent base price formatting: / var basePriceInfo = string.Empty; @@ -704,39 +704,39 @@ private dynamic ToDynamic(DataExporterContext ctx, Product product, string seNam result._BasePriceInfo = basePriceInfo; ToDeliveryTime(ctx, result, product.DeliveryTimeId); - ToQuantityUnit(ctx, result, product.QuantityUnitId); - - result.CountryOfOrigin = product.CountryOfOriginId.HasValue - ? ToDynamic(ctx, product.CountryOfOrigin) - : null; - - result._Localized = GetLocalized(ctx, translations, urlRecords, product, - x => x.Name, - x => x.ShortDescription, - x => x.FullDescription, - x => x.MetaKeywords, - x => x.MetaDescription, - x => x.MetaTitle, - x => x.BundleTitleText); - } - - return result; - } - - private dynamic ToDynamic(DataExporterContext ctx, Product product, bool isParent, DynamicProductContext productContext) - { - product.MergeWithCombination(productContext.Combination); - - var numberOfPictures = ctx.Projection.NumberOfMediaFiles ?? int.MaxValue; - var productDetailsPictureSize = ctx.Projection.PictureSize > 0 ? ctx.Projection.PictureSize : _mediaSettings.Value.ProductDetailsPictureSize; + ToQuantityUnit(ctx, result, product.QuantityUnitId); + + result.CountryOfOrigin = product.CountryOfOriginId.HasValue + ? ToDynamic(ctx, product.CountryOfOrigin) + : null; + + result._Localized = GetLocalized(ctx, translations, urlRecords, product, + x => x.Name, + x => x.ShortDescription, + x => x.FullDescription, + x => x.MetaKeywords, + x => x.MetaDescription, + x => x.MetaTitle, + x => x.BundleTitleText); + } + + return result; + } + + private dynamic ToDynamic(DataExporterContext ctx, Product product, bool isParent, DynamicProductContext productContext) + { + product.MergeWithCombination(productContext.Combination); + + var numberOfPictures = ctx.Projection.NumberOfMediaFiles ?? int.MaxValue; + var productDetailsPictureSize = ctx.Projection.PictureSize > 0 ? ctx.Projection.PictureSize : _mediaSettings.Value.ProductDetailsPictureSize; var imageQuery = ctx.Projection.PictureSize > 0 ? new ProcessImageQuery { MaxWidth = ctx.Projection.PictureSize } : null; IEnumerable productPictures = ctx.ProductExportContext.ProductPictures.GetOrLoad(product.Id); - var productManufacturers = ctx.ProductExportContext.ProductManufacturers.GetOrLoad(product.Id); - var productCategories = ctx.ProductExportContext.ProductCategories.GetOrLoad(product.Id); - var productAttributes = ctx.ProductExportContext.Attributes.GetOrLoad(product.Id); - var productTags = ctx.ProductExportContext.ProductTags.GetOrLoad(product.Id); - var specificationAttributes = ctx.ProductExportContext.SpecificationAttributes.GetOrLoad(product.Id); + var productManufacturers = ctx.ProductExportContext.ProductManufacturers.GetOrLoad(product.Id); + var productCategories = ctx.ProductExportContext.ProductCategories.GetOrLoad(product.Id); + var productAttributes = ctx.ProductExportContext.Attributes.GetOrLoad(product.Id); + var productTags = ctx.ProductExportContext.ProductTags.GetOrLoad(product.Id); + var specificationAttributes = ctx.ProductExportContext.SpecificationAttributes.GetOrLoad(product.Id); Multimap variantAttributes = null; ICollection variantAttributeValues = null; string attributesXml = null; @@ -752,10 +752,10 @@ private dynamic ToDynamic(DataExporterContext ctx, Product product, bool isParen if (productContext.Combination != null) { var mediaIds = productContext.Combination.GetAssignedMediaIds(); - if (mediaIds.Any()) - { - productPictures = productPictures.Where(x => mediaIds.Contains(x.MediaFileId)); - } + if (mediaIds.Any()) + { + productPictures = productPictures.Where(x => mediaIds.Contains(x.MediaFileId)); + } attributesXml = productContext.Combination.AttributesXml; variantAttributes = _productAttributeParser.Value.DeserializeProductVariantAttributes(attributesXml); @@ -799,136 +799,136 @@ private dynamic ToDynamic(DataExporterContext ctx, Product product, bool isParen else { dynObject._DetailUrl = productContext.AbsoluteProductUrl; - } - - dynObject.Price = CalculatePrice(ctx, product, productContext.Combination, variantAttributeValues); - - // Category path - { - var categoryPath = string.Empty; - var pc = productCategories.OrderBy(x => x.DisplayOrder).FirstOrDefault(); - - if (pc != null) - { - var node = _categoryService.Value.GetCategoryTree(pc.CategoryId, true, ctx.Store.Id); - if (node != null) - { - categoryPath = _categoryService.Value.GetCategoryPath(node, ctx.Projection.LanguageId, null, " > "); - } - } - - dynObject._CategoryPath = categoryPath; - } - - if (ctx.Countries != null) - { - dynObject.CountryOfOrigin = product.CountryOfOriginId.HasValue && ctx.Countries.ContainsKey(product.CountryOfOriginId.Value) - ? ToDynamic(ctx, ctx.Countries[product.CountryOfOriginId.Value]) - : null; - } - - dynObject.ProductPictures = productPictures - .OrderBy(x => x.DisplayOrder) - .Select(x => - { - dynamic dyn = new DynamicEntity(x); - - dyn.Picture = ToDynamic(ctx, x.MediaFile, _mediaSettings.Value.ProductThumbPictureSize, productDetailsPictureSize); + } + + dynObject.Price = CalculatePrice(ctx, product, productContext.Combination, variantAttributeValues); + + // Category path + { + var categoryPath = string.Empty; + var pc = productCategories.OrderBy(x => x.DisplayOrder).FirstOrDefault(); + + if (pc != null) + { + var node = _categoryService.Value.GetCategoryTree(pc.CategoryId, true, ctx.Store.Id); + if (node != null) + { + categoryPath = _categoryService.Value.GetCategoryPath(node, ctx.Projection.LanguageId, null, " > "); + } + } + + dynObject._CategoryPath = categoryPath; + } + + if (ctx.Countries != null) + { + dynObject.CountryOfOrigin = product.CountryOfOriginId.HasValue && ctx.Countries.ContainsKey(product.CountryOfOriginId.Value) + ? ToDynamic(ctx, ctx.Countries[product.CountryOfOriginId.Value]) + : null; + } + + dynObject.ProductPictures = productPictures + .OrderBy(x => x.DisplayOrder) + .Select(x => + { + dynamic dyn = new DynamicEntity(x); + + dyn.Picture = ToDynamic(ctx, x.MediaFile, _mediaSettings.Value.ProductThumbPictureSize, productDetailsPictureSize); return dyn; - }) - .ToList(); + }) + .ToList(); - dynObject.ProductManufacturers = productManufacturers - .OrderBy(x => x.DisplayOrder) - .Select(x => - { - dynamic dyn = new DynamicEntity(x); + dynObject.ProductManufacturers = productManufacturers + .OrderBy(x => x.DisplayOrder) + .Select(x => + { + dynamic dyn = new DynamicEntity(x); - dyn.Manufacturer = ToDynamic(ctx, x.Manufacturer); + dyn.Manufacturer = ToDynamic(ctx, x.Manufacturer); - dyn.Manufacturer.Picture = x.Manufacturer != null && x.Manufacturer.MediaFileId.HasValue - ? ToDynamic(ctx, x.Manufacturer.MediaFile, _mediaSettings.Value.ManufacturerThumbPictureSize, _mediaSettings.Value.ManufacturerThumbPictureSize) - : null; + dyn.Manufacturer.Picture = x.Manufacturer != null && x.Manufacturer.MediaFileId.HasValue + ? ToDynamic(ctx, x.Manufacturer.MediaFile, _mediaSettings.Value.ManufacturerThumbPictureSize, _mediaSettings.Value.ManufacturerThumbPictureSize) + : null; - return dyn; - }) - .ToList(); + return dyn; + }) + .ToList(); - dynObject.ProductCategories = productCategories - .OrderBy(x => x.DisplayOrder) - .Select(x => - { - dynamic dyn = new DynamicEntity(x); + dynObject.ProductCategories = productCategories + .OrderBy(x => x.DisplayOrder) + .Select(x => + { + dynamic dyn = new DynamicEntity(x); - dyn.Category = ToDynamic(ctx, x.Category); + dyn.Category = ToDynamic(ctx, x.Category); - if (x.Category != null && x.Category.MediaFileId.HasValue) - dyn.Category.Picture = ToDynamic(ctx, x.Category.MediaFile, _mediaSettings.Value.CategoryThumbPictureSize, _mediaSettings.Value.CategoryThumbPictureSize); + if (x.Category != null && x.Category.MediaFileId.HasValue) + dyn.Category.Picture = ToDynamic(ctx, x.Category.MediaFile, _mediaSettings.Value.CategoryThumbPictureSize, _mediaSettings.Value.CategoryThumbPictureSize); - if (dynObject._CategoryName == null) - dynObject._CategoryName = (string)dyn.Category.Name; + if (dynObject._CategoryName == null) + dynObject._CategoryName = (string)dyn.Category.Name; - return dyn; - }) - .ToList(); + return dyn; + }) + .ToList(); - dynObject.ProductAttributes = productAttributes - .OrderBy(x => x.DisplayOrder) - .Select(x => ToDynamic(ctx, x)) - .ToList(); + dynObject.ProductAttributes = productAttributes + .OrderBy(x => x.DisplayOrder) + .Select(x => ToDynamic(ctx, x)) + .ToList(); - // Do not export combinations if a combination is exported as a product. - if (productContext.Combinations != null && productContext.Combination == null) - { - dynObject.ProductAttributeCombinations = productContext.Combinations + // Do not export combinations if a combination is exported as a product. + if (productContext.Combinations != null && productContext.Combination == null) + { + dynObject.ProductAttributeCombinations = productContext.Combinations .Select(x => - { - dynamic dyn = ToDynamic(ctx, x); - var assignedPictures = new List(); - - foreach (int pictureId in x.GetAssignedMediaIds().Take(numberOfPictures)) - { - var assignedPicture = productPictures.FirstOrDefault(y => y.MediaFileId == pictureId); - if (assignedPicture != null && assignedPicture.MediaFile != null) - { - assignedPictures.Add(ToDynamic(ctx, assignedPicture.MediaFile, _mediaSettings.Value.ProductThumbPictureSize, productDetailsPictureSize)); - } - } - - dyn.Pictures = assignedPictures; - - return dyn; - }) - .ToList(); - } - else - { - dynObject.ProductAttributeCombinations = Enumerable.Empty(); - } - - if (product.HasTierPrices) - { - var tierPrices = ctx.ProductExportContext.TierPrices.GetOrLoad(product.Id) - .RemoveDuplicatedQuantities(); - - dynObject.TierPrices = tierPrices - .Select(x => - { - dynamic dyn = new DynamicEntity(x); - return dyn; - }) - .ToList(); - } - - if (product.HasDiscountsApplied) - { - var appliedDiscounts = ctx.ProductExportContext.AppliedDiscounts.GetOrLoad(product.Id); - - dynObject.AppliedDiscounts = appliedDiscounts - .Select(x => ToDynamic(ctx, x)) - .ToList(); - } + { + dynamic dyn = ToDynamic(ctx, x); + var assignedPictures = new List(); + + foreach (int pictureId in x.GetAssignedMediaIds().Take(numberOfPictures)) + { + var assignedPicture = productPictures.FirstOrDefault(y => y.MediaFileId == pictureId); + if (assignedPicture != null && assignedPicture.MediaFile != null) + { + assignedPictures.Add(ToDynamic(ctx, assignedPicture.MediaFile, _mediaSettings.Value.ProductThumbPictureSize, productDetailsPictureSize)); + } + } + + dyn.Pictures = assignedPictures; + + return dyn; + }) + .ToList(); + } + else + { + dynObject.ProductAttributeCombinations = Enumerable.Empty(); + } + + if (product.HasTierPrices) + { + var tierPrices = ctx.ProductExportContext.TierPrices.GetOrLoad(product.Id) + .RemoveDuplicatedQuantities(); + + dynObject.TierPrices = tierPrices + .Select(x => + { + dynamic dyn = new DynamicEntity(x); + return dyn; + }) + .ToList(); + } + + if (product.HasDiscountsApplied) + { + var appliedDiscounts = ctx.ProductExportContext.AppliedDiscounts.GetOrLoad(product.Id); + + dynObject.AppliedDiscounts = appliedDiscounts + .Select(x => ToDynamic(ctx, x)) + .ToList(); + } if (product.IsDownload) { @@ -940,56 +940,56 @@ private dynamic ToDynamic(DataExporterContext ctx, Product product, bool isParen } dynObject.ProductTags = productTags - .Select(x => - { - dynamic dyn = new DynamicEntity(x); + .Select(x => + { + dynamic dyn = new DynamicEntity(x); var translations = ctx.TranslationsPerPage[nameof(ProductTag)]; var localizedName = translations.GetValue(ctx.LanguageId, x.Id, nameof(x.Name)) ?? x.Name; dyn.Name = localizedName; - dyn.SeName = SeoExtensions.GetSeName(localizedName, _seoSettings.Value); - dyn._Localized = GetLocalized(ctx, translations, null, x, y => y.Name); + dyn.SeName = SeoExtensions.GetSeName(localizedName, _seoSettings.Value); + dyn._Localized = GetLocalized(ctx, translations, null, x, y => y.Name); - return dyn; - }) - .ToList(); + return dyn; + }) + .ToList(); - dynObject.ProductSpecificationAttributes = specificationAttributes - .Select(x => ToDynamic(ctx, x)) - .ToList(); + dynObject.ProductSpecificationAttributes = specificationAttributes + .Select(x => ToDynamic(ctx, x)) + .ToList(); - if (product.ProductType == ProductType.BundledProduct) - { - var bundleItems = ctx.ProductExportContext.ProductBundleItems.GetOrLoad(product.Id); + if (product.ProductType == ProductType.BundledProduct) + { + var bundleItems = ctx.ProductExportContext.ProductBundleItems.GetOrLoad(product.Id); - dynObject.ProductBundleItems = bundleItems - .Select(x => - { - dynamic dyn = new DynamicEntity(x); + dynObject.ProductBundleItems = bundleItems + .Select(x => + { + dynamic dyn = new DynamicEntity(x); var translations = ctx.TranslationsPerPage[nameof(ProductBundleItem)]; dyn.Name = translations.GetValue(ctx.LanguageId, x.Id, nameof(x.Name)) ?? x.Name; dyn.ShortDescription = translations.GetValue(ctx.LanguageId, x.Id, nameof(x.ShortDescription)) ?? x.ShortDescription; - dyn._Localized = GetLocalized(ctx, translations, null, x, y => y.Name, y => y.ShortDescription); + dyn._Localized = GetLocalized(ctx, translations, null, x, y => y.Name, y => y.ShortDescription); - return dyn; - }) - .ToList(); - } + return dyn; + }) + .ToList(); + } - #endregion + #endregion - #region More data based on export features + #region More data based on export features - if (ctx.Supports(ExportFeatures.CanProjectDescription)) - { - PrepareProductDescription(ctx, dynObject, product); - } + if (ctx.Supports(ExportFeatures.CanProjectDescription)) + { + PrepareProductDescription(ctx, dynObject, product); + } - if (ctx.Supports(ExportFeatures.OffersBrandFallback)) - { - string brand = null; - var productManus = ctx.ProductExportContext.ProductManufacturers.GetOrLoad(product.Id); + if (ctx.Supports(ExportFeatures.OffersBrandFallback)) + { + string brand = null; + var productManus = ctx.ProductExportContext.ProductManufacturers.GetOrLoad(product.Id); if (productManus != null && productManus.Any()) { @@ -1002,187 +1002,187 @@ private dynamic ToDynamic(DataExporterContext ctx, Product product, bool isParen brand = ctx.Projection.Brand; } - dynObject._Brand = brand; - } - - if (ctx.Supports(ExportFeatures.CanIncludeMainPicture)) - { - if (productPictures != null && productPictures.Any()) - { + dynObject._Brand = brand; + } + + if (ctx.Supports(ExportFeatures.CanIncludeMainPicture)) + { + if (productPictures != null && productPictures.Any()) + { var file = _mediaService.Value.ConvertMediaFile(productPictures.Select(x => x.MediaFile).First()); dynObject._MainPictureUrl = _mediaService.Value.GetUrl(file, imageQuery, _services.StoreService.GetHost(ctx.Store)); dynObject._MainPictureRelativeUrl = _mediaService.Value.GetUrl(file, imageQuery); - } - else if (!_catalogSettings.Value.HideProductDefaultPictures) - { + } + else if (!_catalogSettings.Value.HideProductDefaultPictures) + { // Get fallback image URL. dynObject._MainPictureUrl = _mediaService.Value.GetUrl(null, imageQuery, _services.StoreService.GetHost(ctx.Store)); dynObject._MainPictureRelativeUrl = _mediaService.Value.GetUrl(null, imageQuery); } - else - { - dynObject._MainPictureUrl = null; - dynObject._MainPictureRelativeUrl = null; - } - } - - if (ctx.Supports(ExportFeatures.UsesSkuAsMpnFallback) && product.ManufacturerPartNumber.IsEmpty()) - { - dynObject.ManufacturerPartNumber = product.Sku; - } - - if (ctx.Supports(ExportFeatures.OffersShippingTimeFallback)) - { - dynamic deliveryTime = dynObject.DeliveryTime; - dynObject._ShippingTime = deliveryTime == null ? ctx.Projection.ShippingTime : deliveryTime.Name; - } - - if (ctx.Supports(ExportFeatures.OffersShippingCostsFallback)) - { - dynObject._FreeShippingThreshold = ctx.Projection.FreeShippingThreshold; - - if (product.IsFreeShipping || (ctx.Projection.FreeShippingThreshold.HasValue && (decimal)dynObject.Price >= ctx.Projection.FreeShippingThreshold.Value)) - dynObject._ShippingCosts = decimal.Zero; - else - dynObject._ShippingCosts = ctx.Projection.ShippingCosts; - } - - if (ctx.Supports(ExportFeatures.UsesOldPrice)) - { - if (product.OldPrice != decimal.Zero && product.OldPrice != (decimal)dynObject.Price && !(product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing)) - { - if (ctx.Projection.ConvertNetToGrossPrices) - { - decimal taxRate; - dynObject._OldPrice = _taxService.Value.GetProductPrice(product, product.TaxCategoryId, product.OldPrice, true, ctx.ContextCustomer, - ctx.ContextCurrency, _taxSettings.Value.PricesIncludeTax, out taxRate); - } - else - { - dynObject._OldPrice = product.OldPrice; - } - } - else - { - dynObject._OldPrice = null; - } - } - - if (ctx.Supports(ExportFeatures.UsesSpecialPrice)) - { - dynObject._SpecialPrice = null; // special price which is valid now - dynObject._FutureSpecialPrice = null; // special price which is valid now and in future - dynObject._RegularPrice = null; // price as if a special price would not exist - - if (!(product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing)) - { - if (product.SpecialPrice.HasValue && product.SpecialPriceEndDateTimeUtc.HasValue) - { - var endDate = DateTime.SpecifyKind(product.SpecialPriceEndDateTimeUtc.Value, DateTimeKind.Utc); - if (endDate > DateTime.UtcNow) - { - dynObject._FutureSpecialPrice = ConvertPrice(ctx, product, product.SpecialPrice.Value); - } - } - - var specialPrice = _priceCalculationService.Value.GetSpecialPrice(product); - - dynObject._SpecialPrice = ConvertPrice(ctx, product, specialPrice); - - if (specialPrice.HasValue || dynObject._FutureSpecialPrice != null) - { - decimal tmpSpecialPrice = product.SpecialPrice.Value; - product.SpecialPrice = null; - - dynObject._RegularPrice = CalculatePrice(ctx, product, productContext.Combination, variantAttributeValues); - - product.SpecialPrice = tmpSpecialPrice; - } - } - } - - #endregion - - return dynObject; - } - - private dynamic ToDynamic(DataExporterContext ctx, Order order) - { + else + { + dynObject._MainPictureUrl = null; + dynObject._MainPictureRelativeUrl = null; + } + } + + if (ctx.Supports(ExportFeatures.UsesSkuAsMpnFallback) && product.ManufacturerPartNumber.IsEmpty()) + { + dynObject.ManufacturerPartNumber = product.Sku; + } + + if (ctx.Supports(ExportFeatures.OffersShippingTimeFallback)) + { + dynamic deliveryTime = dynObject.DeliveryTime; + dynObject._ShippingTime = deliveryTime == null ? ctx.Projection.ShippingTime : deliveryTime.Name; + } + + if (ctx.Supports(ExportFeatures.OffersShippingCostsFallback)) + { + dynObject._FreeShippingThreshold = ctx.Projection.FreeShippingThreshold; + + if (product.IsFreeShipping || (ctx.Projection.FreeShippingThreshold.HasValue && (decimal)dynObject.Price >= ctx.Projection.FreeShippingThreshold.Value)) + dynObject._ShippingCosts = decimal.Zero; + else + dynObject._ShippingCosts = ctx.Projection.ShippingCosts; + } + + if (ctx.Supports(ExportFeatures.UsesOldPrice)) + { + if (product.OldPrice != decimal.Zero && product.OldPrice != (decimal)dynObject.Price && !(product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing)) + { + if (ctx.Projection.ConvertNetToGrossPrices) + { + decimal taxRate; + dynObject._OldPrice = _taxService.Value.GetProductPrice(product, product.TaxCategoryId, product.OldPrice, true, ctx.ContextCustomer, + ctx.ContextCurrency, _taxSettings.Value.PricesIncludeTax, out taxRate); + } + else + { + dynObject._OldPrice = product.OldPrice; + } + } + else + { + dynObject._OldPrice = null; + } + } + + if (ctx.Supports(ExportFeatures.UsesSpecialPrice)) + { + dynObject._SpecialPrice = null; // special price which is valid now + dynObject._FutureSpecialPrice = null; // special price which is valid now and in future + dynObject._RegularPrice = null; // price as if a special price would not exist + + if (!(product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing)) + { + if (product.SpecialPrice.HasValue && product.SpecialPriceEndDateTimeUtc.HasValue) + { + var endDate = DateTime.SpecifyKind(product.SpecialPriceEndDateTimeUtc.Value, DateTimeKind.Utc); + if (endDate > DateTime.UtcNow) + { + dynObject._FutureSpecialPrice = ConvertPrice(ctx, product, product.SpecialPrice.Value); + } + } + + var specialPrice = _priceCalculationService.Value.GetSpecialPrice(product); + + dynObject._SpecialPrice = ConvertPrice(ctx, product, specialPrice); + + if (specialPrice.HasValue || dynObject._FutureSpecialPrice != null) + { + decimal tmpSpecialPrice = product.SpecialPrice.Value; + product.SpecialPrice = null; + + dynObject._RegularPrice = CalculatePrice(ctx, product, productContext.Combination, variantAttributeValues); + + product.SpecialPrice = tmpSpecialPrice; + } + } + } + + #endregion + + return dynObject; + } + + private dynamic ToDynamic(DataExporterContext ctx, Order order) + { if (order == null) { return null; } - dynamic result = new DynamicEntity(order); + dynamic result = new DynamicEntity(order); - result.OrderNumber = order.GetOrderNumber(); - result.OrderStatus = order.OrderStatus.GetLocalizedEnum(_services.Localization, ctx.LanguageId); - result.PaymentStatus = order.PaymentStatus.GetLocalizedEnum(_services.Localization, ctx.LanguageId); - result.ShippingStatus = order.ShippingStatus.GetLocalizedEnum(_services.Localization, ctx.LanguageId); + result.OrderNumber = order.GetOrderNumber(); + result.OrderStatus = order.OrderStatus.GetLocalizedEnum(_services.Localization, ctx.LanguageId); + result.PaymentStatus = order.PaymentStatus.GetLocalizedEnum(_services.Localization, ctx.LanguageId); + result.ShippingStatus = order.ShippingStatus.GetLocalizedEnum(_services.Localization, ctx.LanguageId); - result.Customer = null; - result.BillingAddress = null; - result.ShippingAddress = null; - result.Shipments = null; + result.Customer = null; + result.BillingAddress = null; + result.ShippingAddress = null; + result.Shipments = null; - result.Store = ctx.Stores.ContainsKey(order.StoreId) - ? ToDynamic(ctx, ctx.Stores[order.StoreId]) - : null; + result.Store = ctx.Stores.ContainsKey(order.StoreId) + ? ToDynamic(ctx, ctx.Stores[order.StoreId]) + : null; - if (!ctx.IsPreview) - { - result.RedeemedRewardPointsEntry = ToDynamic(ctx, order.RedeemedRewardPointsEntry); - } + if (!ctx.IsPreview) + { + result.RedeemedRewardPointsEntry = ToDynamic(ctx, order.RedeemedRewardPointsEntry); + } - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, OrderItem orderItem) - { + private dynamic ToDynamic(DataExporterContext ctx, OrderItem orderItem) + { if (orderItem == null) { return null; } - dynamic result = new DynamicEntity(orderItem); + dynamic result = new DynamicEntity(orderItem); - orderItem.Product.MergeWithCombination(orderItem.AttributesXml, _productAttributeParser.Value); - result.Product = ToDynamic(ctx, orderItem.Product); + orderItem.Product.MergeWithCombination(orderItem.AttributesXml, _productAttributeParser.Value); + result.Product = ToDynamic(ctx, orderItem.Product); - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Shipment shipment) - { + private dynamic ToDynamic(DataExporterContext ctx, Shipment shipment) + { if (shipment == null) { return null; } - dynamic result = new DynamicEntity(shipment); + dynamic result = new DynamicEntity(shipment); - result.ShipmentItems = shipment.ShipmentItems - .Select(x => - { - dynamic exp = new DynamicEntity(x); - return exp; - }) - .ToList(); + result.ShipmentItems = shipment.ShipmentItems + .Select(x => + { + dynamic exp = new DynamicEntity(x); + return exp; + }) + .ToList(); - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, Discount discount) - { + private dynamic ToDynamic(DataExporterContext ctx, Discount discount) + { if (discount == null) { return null; } - dynamic result = new DynamicEntity(discount); - return result; - } + dynamic result = new DynamicEntity(discount); + return result; + } private dynamic ToDynamic(DataExporterContext ctx, Download download) { @@ -1196,7 +1196,7 @@ private dynamic ToDynamic(DataExporterContext ctx, Download download) } private dynamic ToDynamic(DataExporterContext ctx, ProductSpecificationAttribute psa) - { + { if (psa == null) { return null; @@ -1206,81 +1206,81 @@ private dynamic ToDynamic(DataExporterContext ctx, ProductSpecificationAttribute var attribute = option.SpecificationAttribute; dynamic result = new DynamicEntity(psa); - dynamic dynAttribute = new DynamicEntity(attribute); + dynamic dynAttribute = new DynamicEntity(attribute); var saTranslations = ctx.TranslationsPerPage[nameof(SpecificationAttribute)]; var saoTranslations = ctx.TranslationsPerPage[nameof(SpecificationAttributeOption)]; dynAttribute.Name = saTranslations.GetValue(ctx.LanguageId, attribute.Id, nameof(attribute.Name)) ?? attribute.Name; - dynAttribute._Localized = GetLocalized(ctx, saTranslations, null, attribute, x => x.Name); + dynAttribute._Localized = GetLocalized(ctx, saTranslations, null, attribute, x => x.Name); - dynAttribute.Alias = saTranslations.GetValue(ctx.LanguageId, attribute.Id, nameof(attribute.Alias)) ?? attribute.Alias; - dynAttribute._Localized = GetLocalized(ctx, saTranslations, null, attribute, x => x.Alias); + dynAttribute.Alias = saTranslations.GetValue(ctx.LanguageId, attribute.Id, nameof(attribute.Alias)) ?? attribute.Alias; + dynAttribute._Localized = GetLocalized(ctx, saTranslations, null, attribute, x => x.Alias); dynamic dynOption = new DynamicEntity(option); dynOption.Name = saoTranslations.GetValue(ctx.LanguageId, option.Id, nameof(option.Name)) ?? option.Name; - dynOption._Localized = GetLocalized(ctx, saoTranslations, null, option, x => x.Name); + dynOption._Localized = GetLocalized(ctx, saoTranslations, null, option, x => x.Name); - dynOption.Alias = saoTranslations.GetValue(ctx.LanguageId, option.Id, nameof(option.Alias)) ?? option.Alias; - dynOption._Localized = GetLocalized(ctx, saoTranslations, null, option, x => x.Alias); + dynOption.Alias = saoTranslations.GetValue(ctx.LanguageId, option.Id, nameof(option.Alias)) ?? option.Alias; + dynOption._Localized = GetLocalized(ctx, saoTranslations, null, option, x => x.Alias); - dynOption.SpecificationAttribute = dynAttribute; - result.SpecificationAttributeOption = dynOption; + dynOption.SpecificationAttribute = dynAttribute; + result.SpecificationAttributeOption = dynOption; - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, GenericAttribute genericAttribute) - { + private dynamic ToDynamic(DataExporterContext ctx, GenericAttribute genericAttribute) + { if (genericAttribute == null) { return null; } - dynamic result = new DynamicEntity(genericAttribute); - return result; - } + dynamic result = new DynamicEntity(genericAttribute); + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, NewsLetterSubscription subscription) - { + private dynamic ToDynamic(DataExporterContext ctx, NewsLetterSubscription subscription) + { if (subscription == null) { return null; } - dynamic result = new DynamicEntity(subscription); + dynamic result = new DynamicEntity(subscription); - result.Store = ctx.Stores.ContainsKey(subscription.StoreId) - ? ToDynamic(ctx, ctx.Stores[subscription.StoreId]) - : null; + result.Store = ctx.Stores.ContainsKey(subscription.StoreId) + ? ToDynamic(ctx, ctx.Stores[subscription.StoreId]) + : null; - return result; - } + return result; + } - private dynamic ToDynamic(DataExporterContext ctx, ShoppingCartItem shoppingCartItem) - { + private dynamic ToDynamic(DataExporterContext ctx, ShoppingCartItem shoppingCartItem) + { if (shoppingCartItem == null) { return null; } - dynamic result = new DynamicEntity(shoppingCartItem); + dynamic result = new DynamicEntity(shoppingCartItem); - shoppingCartItem.Product.MergeWithCombination(shoppingCartItem.AttributesXml, _productAttributeParser.Value); + shoppingCartItem.Product.MergeWithCombination(shoppingCartItem.AttributesXml, _productAttributeParser.Value); - result.Store = ctx.Stores.ContainsKey(shoppingCartItem.StoreId) - ? ToDynamic(ctx, ctx.Stores[shoppingCartItem.StoreId]) - : null; + result.Store = ctx.Stores.ContainsKey(shoppingCartItem.StoreId) + ? ToDynamic(ctx, ctx.Stores[shoppingCartItem.StoreId]) + : null; - result.Customer = ToDynamic(ctx, shoppingCartItem.Customer); - result.Product = ToDynamic(ctx, shoppingCartItem.Product); + result.Customer = ToDynamic(ctx, shoppingCartItem.Customer); + result.Product = ToDynamic(ctx, shoppingCartItem.Product); - return result; - } + return result; + } - private List Convert(DataExporterContext ctx, Product product) - { + private List Convert(DataExporterContext ctx, Product product) + { var result = new List(); var productContext = new DynamicProductContext(); @@ -1295,220 +1295,220 @@ private List Convert(DataExporterContext ctx, Product product) ctx.ContextLanguage); if (ctx.Projection.AttributeCombinationAsProduct && productContext.Combinations.Where(x => x.IsActive).Any()) - { - if (ctx.Supports(ExportFeatures.UsesAttributeCombinationParent)) - { - var dynObject = ToDynamic(ctx, product, true, productContext); - result.Add(dynObject); - } - - var dbContext = _dbContext as DbContext; - - foreach (var combination in productContext.Combinations.Where(x => x.IsActive)) - { - product = _dbContext.Attach(product); - var entry = dbContext.Entry(product); - - // The returned object is not the entity and is not being tracked by the context. - // It also does not have any relationships set to other objects. - // CurrentValues only includes database (thus primitive) values. - var productClone = entry.CurrentValues.ToObject() as Product; - _dbContext.DetachEntity(product); + { + if (ctx.Supports(ExportFeatures.UsesAttributeCombinationParent)) + { + var dynObject = ToDynamic(ctx, product, true, productContext); + result.Add(dynObject); + } + + var dbContext = _dbContext as DbContext; + + foreach (var combination in productContext.Combinations.Where(x => x.IsActive)) + { + product = _dbContext.Attach(product); + var entry = dbContext.Entry(product); + + // The returned object is not the entity and is not being tracked by the context. + // It also does not have any relationships set to other objects. + // CurrentValues only includes database (thus primitive) values. + var productClone = entry.CurrentValues.ToObject() as Product; + _dbContext.DetachEntity(product); productContext.Combination = combination; - var dynObject = ToDynamic(ctx, productClone, false, productContext); - result.Add(dynObject); - } - } - else - { - var dynObject = ToDynamic(ctx, product, false, productContext); - result.Add(dynObject); - } - - if (result.Any()) - { - _services.EventPublisher.Publish(new RowExportingEvent - { - Row = result.First(), - EntityType = ExportEntityType.Product, - ExportRequest = ctx.Request, - ExecuteContext = ctx.ExecuteContext - }); - } - - return result; - } - - private List Convert(DataExporterContext ctx, Order order) - { - var result = new List(); - - ctx.OrderExportContext.Addresses.Collect(order.ShippingAddressId.HasValue ? order.ShippingAddressId.Value : 0); - ctx.OrderExportContext.Addresses.GetOrLoad(order.BillingAddressId); - - var customers = ctx.OrderExportContext.Customers.GetOrLoad(order.CustomerId); - var genericAttributes = ctx.OrderExportContext.CustomerGenericAttributes.GetOrLoad(order.CustomerId); - var rewardPointsHistories = ctx.OrderExportContext.RewardPointsHistories.GetOrLoad(order.CustomerId); - var orderItems = ctx.OrderExportContext.OrderItems.GetOrLoad(order.Id); - var shipments = ctx.OrderExportContext.Shipments.GetOrLoad(order.Id); - - dynamic dynObject = ToDynamic(ctx, order); - - dynObject.Customer = ToDynamic(ctx, customers.FirstOrDefault(x => x.Id == order.CustomerId)); - - // We do not export all customer generic attributes because otherwise the export file gets too large. - dynObject.Customer._GenericAttributes = genericAttributes - .Where(x => x.Value.HasValue() && _orderCustomerAttributes.Contains(x.Key)) - .Select(x => ToDynamic(ctx, x)) - .ToList(); - - dynObject.Customer.RewardPointsHistory = rewardPointsHistories - .Select(x => ToDynamic(ctx, x)) - .ToList(); - - if (rewardPointsHistories.Count > 0) - { - dynObject.Customer._RewardPointsBalance = rewardPointsHistories - .OrderByDescending(x => x.CreatedOnUtc) - .ThenByDescending(x => x.Id) - .FirstOrDefault() - .PointsBalance; - } - - if (ctx.OrderExportContext.Addresses.ContainsKey(order.BillingAddressId)) - { - dynObject.BillingAddress = ToDynamic(ctx, ctx.OrderExportContext.Addresses[order.BillingAddressId].FirstOrDefault()); - } - - if (order.ShippingAddressId.HasValue && ctx.OrderExportContext.Addresses.ContainsKey(order.ShippingAddressId.Value)) - { - dynObject.ShippingAddress = ToDynamic(ctx, ctx.OrderExportContext.Addresses[order.ShippingAddressId.Value].FirstOrDefault()); - } - - dynObject.OrderItems = orderItems - .Select(x => ToDynamic(ctx, x)) - .ToList(); - - dynObject.Shipments = shipments - .Select(x => ToDynamic(ctx, x)) - .ToList(); - - result.Add(dynObject); - - _services.EventPublisher.Publish(new RowExportingEvent - { - Row = dynObject, - EntityType = ExportEntityType.Order, - ExportRequest = ctx.Request, - ExecuteContext = ctx.ExecuteContext - }); - - return result; - } - - private List Convert(DataExporterContext ctx, Manufacturer manufacturer) - { - var result = new List(); - var productManufacturers = ctx.ManufacturerExportContext.ProductManufacturers.GetOrLoad(manufacturer.Id); - - dynamic dynObject = ToDynamic(ctx, manufacturer); - - if (manufacturer.MediaFileId.HasValue) - { - var numberOfFiles = ctx.Projection.NumberOfMediaFiles ?? int.MaxValue; - var files = ctx.ManufacturerExportContext.Files.GetOrLoad(manufacturer.MediaFileId.Value).Take(numberOfFiles); + var dynObject = ToDynamic(ctx, productClone, false, productContext); + result.Add(dynObject); + } + } + else + { + var dynObject = ToDynamic(ctx, product, false, productContext); + result.Add(dynObject); + } + + if (result.Any()) + { + _services.EventPublisher.Publish(new RowExportingEvent + { + Row = result.First(), + EntityType = ExportEntityType.Product, + ExportRequest = ctx.Request, + ExecuteContext = ctx.ExecuteContext + }); + } + + return result; + } + + private List Convert(DataExporterContext ctx, Order order) + { + var result = new List(); + + ctx.OrderExportContext.Addresses.Collect(order.ShippingAddressId.HasValue ? order.ShippingAddressId.Value : 0); + ctx.OrderExportContext.Addresses.GetOrLoad(order.BillingAddressId); + + var customers = ctx.OrderExportContext.Customers.GetOrLoad(order.CustomerId); + var genericAttributes = ctx.OrderExportContext.CustomerGenericAttributes.GetOrLoad(order.CustomerId); + var rewardPointsHistories = ctx.OrderExportContext.RewardPointsHistories.GetOrLoad(order.CustomerId); + var orderItems = ctx.OrderExportContext.OrderItems.GetOrLoad(order.Id); + var shipments = ctx.OrderExportContext.Shipments.GetOrLoad(order.Id); + + dynamic dynObject = ToDynamic(ctx, order); + + dynObject.Customer = ToDynamic(ctx, customers.FirstOrDefault(x => x.Id == order.CustomerId)); + + // We do not export all customer generic attributes because otherwise the export file gets too large. + dynObject.Customer._GenericAttributes = genericAttributes + .Where(x => x.Value.HasValue() && _orderCustomerAttributes.Contains(x.Key)) + .Select(x => ToDynamic(ctx, x)) + .ToList(); + + dynObject.Customer.RewardPointsHistory = rewardPointsHistories + .Select(x => ToDynamic(ctx, x)) + .ToList(); + + if (rewardPointsHistories.Count > 0) + { + dynObject.Customer._RewardPointsBalance = rewardPointsHistories + .OrderByDescending(x => x.CreatedOnUtc) + .ThenByDescending(x => x.Id) + .FirstOrDefault() + .PointsBalance; + } + + if (ctx.OrderExportContext.Addresses.ContainsKey(order.BillingAddressId)) + { + dynObject.BillingAddress = ToDynamic(ctx, ctx.OrderExportContext.Addresses[order.BillingAddressId].FirstOrDefault()); + } + + if (order.ShippingAddressId.HasValue && ctx.OrderExportContext.Addresses.ContainsKey(order.ShippingAddressId.Value)) + { + dynObject.ShippingAddress = ToDynamic(ctx, ctx.OrderExportContext.Addresses[order.ShippingAddressId.Value].FirstOrDefault()); + } + + dynObject.OrderItems = orderItems + .Select(x => ToDynamic(ctx, x)) + .ToList(); + + dynObject.Shipments = shipments + .Select(x => ToDynamic(ctx, x)) + .ToList(); + + result.Add(dynObject); + + _services.EventPublisher.Publish(new RowExportingEvent + { + Row = dynObject, + EntityType = ExportEntityType.Order, + ExportRequest = ctx.Request, + ExecuteContext = ctx.ExecuteContext + }); + + return result; + } + + private List Convert(DataExporterContext ctx, Manufacturer manufacturer) + { + var result = new List(); + var productManufacturers = ctx.ManufacturerExportContext.ProductManufacturers.GetOrLoad(manufacturer.Id); + + dynamic dynObject = ToDynamic(ctx, manufacturer); + + if (manufacturer.MediaFileId.HasValue) + { + var numberOfFiles = ctx.Projection.NumberOfMediaFiles ?? int.MaxValue; + var files = ctx.ManufacturerExportContext.Files.GetOrLoad(manufacturer.MediaFileId.Value).Take(numberOfFiles); if (files.Any()) { dynObject.Picture = ToDynamic(ctx, files.First(), _mediaSettings.Value.ManufacturerThumbPictureSize, _mediaSettings.Value.ManufacturerThumbPictureSize); } - } - - dynObject.ProductManufacturers = productManufacturers - .OrderBy(x => x.DisplayOrder) - .Select(x => - { - dynamic dyn = new DynamicEntity(x); - return dyn; - }) - .ToList(); - - result.Add(dynObject); - - _services.EventPublisher.Publish(new RowExportingEvent - { - Row = dynObject, - EntityType = ExportEntityType.Manufacturer, - ExportRequest = ctx.Request, - ExecuteContext = ctx.ExecuteContext - }); - - return result; - } - - private List Convert(DataExporterContext ctx, Category category) - { - var result = new List(); - var productCategories = ctx.CategoryExportContext.ProductCategories.GetOrLoad(category.Id); - - dynamic dynObject = ToDynamic(ctx, category); - - if (category.MediaFileId.HasValue) - { - var numberOfFiles = ctx.Projection.NumberOfMediaFiles ?? int.MaxValue; - var files = ctx.CategoryExportContext.Files.GetOrLoad(category.MediaFileId.Value).Take(numberOfFiles); + } + + dynObject.ProductManufacturers = productManufacturers + .OrderBy(x => x.DisplayOrder) + .Select(x => + { + dynamic dyn = new DynamicEntity(x); + return dyn; + }) + .ToList(); + + result.Add(dynObject); + + _services.EventPublisher.Publish(new RowExportingEvent + { + Row = dynObject, + EntityType = ExportEntityType.Manufacturer, + ExportRequest = ctx.Request, + ExecuteContext = ctx.ExecuteContext + }); + + return result; + } + + private List Convert(DataExporterContext ctx, Category category) + { + var result = new List(); + var productCategories = ctx.CategoryExportContext.ProductCategories.GetOrLoad(category.Id); + + dynamic dynObject = ToDynamic(ctx, category); + + if (category.MediaFileId.HasValue) + { + var numberOfFiles = ctx.Projection.NumberOfMediaFiles ?? int.MaxValue; + var files = ctx.CategoryExportContext.Files.GetOrLoad(category.MediaFileId.Value).Take(numberOfFiles); if (files.Any()) { dynObject.Picture = ToDynamic(ctx, files.First(), _mediaSettings.Value.CategoryThumbPictureSize, _mediaSettings.Value.CategoryThumbPictureSize); } - } + } - dynObject.ProductCategories = productCategories - .OrderBy(x => x.DisplayOrder) - .Select(x => - { - dynamic dyn = new DynamicEntity(x); - return dyn; - }) - .ToList(); + dynObject.ProductCategories = productCategories + .OrderBy(x => x.DisplayOrder) + .Select(x => + { + dynamic dyn = new DynamicEntity(x); + return dyn; + }) + .ToList(); - result.Add(dynObject); + result.Add(dynObject); - _services.EventPublisher.Publish(new RowExportingEvent - { - Row = dynObject, - EntityType = ExportEntityType.Category, - ExportRequest = ctx.Request, - ExecuteContext = ctx.ExecuteContext - }); + _services.EventPublisher.Publish(new RowExportingEvent + { + Row = dynObject, + EntityType = ExportEntityType.Category, + ExportRequest = ctx.Request, + ExecuteContext = ctx.ExecuteContext + }); - return result; - } + return result; + } - private List Convert(DataExporterContext ctx, Customer customer) - { - var result = new List(); + private List Convert(DataExporterContext ctx, Customer customer) + { + var result = new List(); - var genericAttributes = ctx.CustomerExportContext.GenericAttributes.GetOrLoad(customer.Id); + var genericAttributes = ctx.CustomerExportContext.GenericAttributes.GetOrLoad(customer.Id); - dynamic dynObject = ToDynamic(ctx, customer); + dynamic dynObject = ToDynamic(ctx, customer); - dynObject.BillingAddress = ToDynamic(ctx, customer.BillingAddress); - dynObject.ShippingAddress = ToDynamic(ctx, customer.ShippingAddress); + dynObject.BillingAddress = ToDynamic(ctx, customer.BillingAddress); + dynObject.ShippingAddress = ToDynamic(ctx, customer.ShippingAddress); - dynObject.Addresses = customer.Addresses - .Select(x => ToDynamic(ctx, x)) - .ToList(); + dynObject.Addresses = customer.Addresses + .Select(x => ToDynamic(ctx, x)) + .ToList(); - dynObject._GenericAttributes = genericAttributes - .Select(x => ToDynamic(ctx, x)) - .ToList(); + dynObject._GenericAttributes = genericAttributes + .Select(x => ToDynamic(ctx, x)) + .ToList(); - dynObject._HasNewsletterSubscription = ctx.NewsletterSubscriptions.Contains(customer.Email, StringComparer.CurrentCultureIgnoreCase); - dynObject._FullName = customer.GetFullName(); + dynObject._HasNewsletterSubscription = ctx.NewsletterSubscriptions.Contains(customer.Email, StringComparer.CurrentCultureIgnoreCase); + dynObject._FullName = customer.GetFullName(); dynObject._AvatarPictureUrl = null; if (_customerSettings.Value.AllowCustomersToUploadAvatars) @@ -1522,54 +1522,54 @@ private List Convert(DataExporterContext ctx, Customer customer) } } - result.Add(dynObject); - - _services.EventPublisher.Publish(new RowExportingEvent - { - Row = dynObject, - EntityType = ExportEntityType.Customer, - ExportRequest = ctx.Request, - ExecuteContext = ctx.ExecuteContext - }); - - return result; - } - - private List Convert(DataExporterContext ctx, NewsLetterSubscription subscription) - { - var result = new List(); - dynamic dynObject = ToDynamic(ctx, subscription); - result.Add(dynObject); - - _services.EventPublisher.Publish(new RowExportingEvent - { - Row = dynObject, - EntityType = ExportEntityType.NewsLetterSubscription, - ExportRequest = ctx.Request, - ExecuteContext = ctx.ExecuteContext - }); - - return result; - } - - private List Convert(DataExporterContext ctx, ShoppingCartItem shoppingCartItem) - { - var result = new List(); - dynamic dynObject = ToDynamic(ctx, shoppingCartItem); - - result.Add(dynObject); - - _services.EventPublisher.Publish(new RowExportingEvent - { - Row = dynObject, - EntityType = ExportEntityType.ShoppingCartItem, - ExportRequest = ctx.Request, - ExecuteContext = ctx.ExecuteContext - }); - - return result; - } - } + result.Add(dynObject); + + _services.EventPublisher.Publish(new RowExportingEvent + { + Row = dynObject, + EntityType = ExportEntityType.Customer, + ExportRequest = ctx.Request, + ExecuteContext = ctx.ExecuteContext + }); + + return result; + } + + private List Convert(DataExporterContext ctx, NewsLetterSubscription subscription) + { + var result = new List(); + dynamic dynObject = ToDynamic(ctx, subscription); + result.Add(dynObject); + + _services.EventPublisher.Publish(new RowExportingEvent + { + Row = dynObject, + EntityType = ExportEntityType.NewsLetterSubscription, + ExportRequest = ctx.Request, + ExecuteContext = ctx.ExecuteContext + }); + + return result; + } + + private List Convert(DataExporterContext ctx, ShoppingCartItem shoppingCartItem) + { + var result = new List(); + dynamic dynObject = ToDynamic(ctx, shoppingCartItem); + + result.Add(dynObject); + + _services.EventPublisher.Publish(new RowExportingEvent + { + Row = dynObject, + EntityType = ExportEntityType.ShoppingCartItem, + ExportRequest = ctx.Request, + ExecuteContext = ctx.ExecuteContext + }); + + return result; + } + } internal class DynamicProductContext diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs index 0b96526e00..38db26a02b 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs @@ -2,34 +2,34 @@ namespace SmartStore.Services.DataExchange.Export.Events { - // TODO: Another event message must be implemented, say 'ColumnsBuildingEvent' - // The consumer of this event (most likely a plugin) could push a list of specific column headers - // into the global export definition. + // TODO: Another event message must be implemented, say 'ColumnsBuildingEvent' + // The consumer of this event (most likely a plugin) could push a list of specific column headers + // into the global export definition. - public class RowExportingEvent - { - public dynamic Row - { - get; - internal set; - } + public class RowExportingEvent + { + public dynamic Row + { + get; + internal set; + } - public ExportEntityType EntityType - { - get; - internal set; - } + public ExportEntityType EntityType + { + get; + internal set; + } - public DataExportRequest ExportRequest - { - get; - internal set; - } + public DataExportRequest ExportRequest + { + get; + internal set; + } - public ExportExecuteContext ExecuteContext - { - get; - internal set; - } - } + public ExportExecuteContext ExecuteContext + { + get; + internal set; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportConfigurationInfo.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportConfigurationInfo.cs index 2cfb17796d..f9406c82ff 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportConfigurationInfo.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportConfigurationInfo.cs @@ -2,24 +2,24 @@ namespace SmartStore.Services.DataExchange.Export { - /// - /// Serves information about export provider specific configuration - /// - public class ExportConfigurationInfo - { - /// - /// The partial view name for the configuration - /// - public string PartialViewName { get; set; } + /// + /// Serves information about export provider specific configuration + /// + public class ExportConfigurationInfo + { + /// + /// The partial view name for the configuration + /// + public string PartialViewName { get; set; } - /// - /// Type of the view model - /// - public Type ModelType { get; set; } + /// + /// Type of the view model + /// + public Type ModelType { get; set; } - /// - /// Callback to initialize the view model. Can be null. - /// - public Action Initialize { get; set; } - } + /// + /// Callback to initialize the view model. Can be null. + /// + public Action Initialize { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportDataSegmenter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportDataSegmenter.cs index fbab47fabd..6fe190a54e 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportDataSegmenter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportDataSegmenter.cs @@ -4,80 +4,80 @@ namespace SmartStore.Services.DataExchange.Export { - public interface IExportDataSegmenterConsumer - { - /// - /// Total number of records - /// - int TotalRecords { get; } - - /// - /// Gets current data segment - /// - IReadOnlyCollection CurrentSegment { get; } - - /// - /// Reads the next segment - /// - /// - bool ReadNextSegment(); - } - - internal interface IExportDataSegmenterProvider : IExportDataSegmenterConsumer, IDisposable - { - /// - /// Whether there is data available - /// - bool HasData { get; } - - /// - /// Record per segment counter - /// - int RecordPerSegmentCount { get; set; } - } - - public class ExportDataSegmenter : IExportDataSegmenterProvider where T : BaseEntity - { - private readonly Func> _load; - private readonly Action> _loaded; - private readonly Func> _convert; - - private readonly int _offset; - private readonly int _take; - private readonly int _limit; - private readonly int _recordsPerSegment; - private readonly int _totalRecords; + public interface IExportDataSegmenterConsumer + { + /// + /// Total number of records + /// + int TotalRecords { get; } + + /// + /// Gets current data segment + /// + IReadOnlyCollection CurrentSegment { get; } + + /// + /// Reads the next segment + /// + /// + bool ReadNextSegment(); + } + + internal interface IExportDataSegmenterProvider : IExportDataSegmenterConsumer, IDisposable + { + /// + /// Whether there is data available + /// + bool HasData { get; } + + /// + /// Record per segment counter + /// + int RecordPerSegmentCount { get; set; } + } + + public class ExportDataSegmenter : IExportDataSegmenterProvider where T : BaseEntity + { + private readonly Func> _load; + private readonly Action> _loaded; + private readonly Func> _convert; + + private readonly int _offset; + private readonly int _take; + private readonly int _limit; + private readonly int _recordsPerSegment; + private readonly int _totalRecords; private Queue _data; private bool _endOfData; - public ExportDataSegmenter( - Func> load, - Action> loaded, - Func> convert, - int offset, - int take, - int limit, - int recordsPerSegment, - int totalRecords) - { - _load = load; - _loaded = loaded; - _convert = convert; - _offset = offset; - _take = take; - _limit = limit; - _recordsPerSegment = recordsPerSegment; - _totalRecords = totalRecords; - } - - /// - /// Total number of records. - /// - public int TotalRecords - { - get - { + public ExportDataSegmenter( + Func> load, + Action> loaded, + Func> convert, + int offset, + int take, + int limit, + int recordsPerSegment, + int totalRecords) + { + _load = load; + _loaded = loaded; + _convert = convert; + _offset = offset; + _take = take; + _limit = limit; + _recordsPerSegment = recordsPerSegment; + _totalRecords = totalRecords; + } + + /// + /// Total number of records. + /// + public int TotalRecords + { + get + { var total = Math.Max(_totalRecords - _offset, 0); if (_limit > 0 && _limit < total) @@ -85,9 +85,9 @@ public int TotalRecords return _limit; } - return total; - } - } + return total; + } + } /// /// Number of processed records. @@ -99,13 +99,13 @@ public int TotalRecords /// public int RecordPerSegmentCount { get; set; } - /// - /// Whether there is data available. - /// - public bool HasData - { - get - { + /// + /// Whether there is data available. + /// + public bool HasData + { + get + { if (_limit > 0 && RecordCount >= _limit) { return false; @@ -121,23 +121,23 @@ public bool HasData return false; } - return RecordCount < TotalRecords; - } - } + return RecordCount < TotalRecords; + } + } - /// - /// Gets current data segment. - /// - public IReadOnlyCollection CurrentSegment - { - get - { - T entity; - var records = new List(); + /// + /// Gets current data segment. + /// + public IReadOnlyCollection CurrentSegment + { + get + { + T entity; + var records = new List(); - while (_data.Count > 0 && (entity = _data.Dequeue()) != null) - { - _convert(entity).Each(x => records.Add(x)); + while (_data.Count > 0 && (entity = _data.Dequeue()) != null) + { + _convert(entity).Each(x => records.Add(x)); if (++RecordCount >= _limit && _limit > 0) { @@ -148,18 +148,18 @@ public IReadOnlyCollection CurrentSegment { return records; } - } + } - return records; - } - } + return records; + } + } /// /// Read next segment. /// /// true next segment available. false no more data. public bool ReadNextSegment() - { + { if (_limit > 0 && RecordCount >= _limit) { return false; @@ -200,22 +200,22 @@ public bool ReadNextSegment() _data = new Queue(newData); } - // Give provider the opportunity to make something with entity ids. - _loaded?.Invoke(_data.AsReadOnly()); + // Give provider the opportunity to make something with entity ids. + _loaded?.Invoke(_data.AsReadOnly()); - return _data.Count > 0; - } + return _data.Count > 0; + } + + /// + /// Dispose and reset segmenter instance. + /// + public void Dispose() + { + RecordCount = 0; + RecordPerSegmentCount = 0; - /// - /// Dispose and reset segmenter instance. - /// - public void Dispose() - { - RecordCount = 0; - RecordPerSegmentCount = 0; - _endOfData = false; _data?.Clear(); } - } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs index f28ec5b11f..7b18db60da 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs @@ -10,18 +10,18 @@ namespace SmartStore.Services.DataExchange.Export { public class ExportExecuteContext - { - private DataExportResult _result; - private CancellationToken _cancellation; - private DataExchangeAbortion _providerAbort; - - internal ExportExecuteContext(DataExportResult result, CancellationToken cancellation, string folder) - { - _result = result; - _cancellation = cancellation; - Folder = folder; - ExtraDataUnits = new List(); - CustomProperties = new Dictionary(); + { + private DataExportResult _result; + private CancellationToken _cancellation; + private DataExchangeAbortion _providerAbort; + + internal ExportExecuteContext(DataExportResult result, CancellationToken cancellation, string folder) + { + _result = result; + _cancellation = cancellation; + Folder = folder; + ExtraDataUnits = new List(); + CustomProperties = new Dictionary(); } /// @@ -29,93 +29,87 @@ internal ExportExecuteContext(DataExportResult result, CancellationToken cancell /// public int ProfileId { get; internal set; } - /// - /// The export profile - /// - public dynamic Profile { get; internal set; } - - /// - /// Provides the data to be exported - /// - public IExportDataSegmenterConsumer DataSegmenter { get; set; } - - /// - /// The store context to be used for the export - /// - public dynamic Store { get; internal set; } - - /// - /// The customer context to be used for the export - /// - public dynamic Customer { get; internal set; } - - /// - /// The currency context to be used for the export - /// - public dynamic Currency { get; internal set; } - - /// - /// The language context to be used for the export - /// - public dynamic Language { get; internal set; } - - /// - /// Filter settings - /// - public ExportFilter Filter { get; internal set; } - - /// - /// Projection settings - /// - public ExportProjection Projection { get; internal set; } - - /// - /// To log information into the export log file - /// - public ILogger Log { get; internal set; } - - /// - /// Indicates whether and how to abort the export - /// - public DataExchangeAbortion Abort - { - get - { - if (_cancellation.IsCancellationRequested || IsMaxFailures) - return DataExchangeAbortion.Hard; - - return _providerAbort; - } - set - { - _providerAbort = value; - } - } - - public bool IsMaxFailures - { - get { return RecordsFailed > 11; } - } - - /// - /// Identifier of current data stream. Can be null. - /// - public string DataStreamId { get; set; } - - /// - /// Stream used to write data to - /// - public Stream DataStream { get; internal set; } - - /// - /// List with extra data units/streams required by provider - /// - public List ExtraDataUnits { get; private set; } - - /// - /// The maximum allowed file name length - /// - public int MaxFileNameLength { get; internal set; } + /// + /// The export profile + /// + public dynamic Profile { get; internal set; } + + /// + /// Provides the data to be exported + /// + public IExportDataSegmenterConsumer DataSegmenter { get; set; } + + /// + /// The store context to be used for the export + /// + public dynamic Store { get; internal set; } + + /// + /// The customer context to be used for the export + /// + public dynamic Customer { get; internal set; } + + /// + /// The currency context to be used for the export + /// + public dynamic Currency { get; internal set; } + + /// + /// The language context to be used for the export + /// + public dynamic Language { get; internal set; } + + /// + /// Filter settings + /// + public ExportFilter Filter { get; internal set; } + + /// + /// Projection settings + /// + public ExportProjection Projection { get; internal set; } + + /// + /// To log information into the export log file + /// + public ILogger Log { get; internal set; } + + /// + /// Indicates whether and how to abort the export + /// + public DataExchangeAbortion Abort + { + get + { + if (_cancellation.IsCancellationRequested || IsMaxFailures) + return DataExchangeAbortion.Hard; + + return _providerAbort; + } + set => _providerAbort = value; + } + + public bool IsMaxFailures => RecordsFailed > 11; + + /// + /// Identifier of current data stream. Can be null. + /// + public string DataStreamId { get; set; } + + /// + /// Stream used to write data to + /// + public Stream DataStream { get; internal set; } + + /// + /// List with extra data units/streams required by provider + /// + public List ExtraDataUnits { get; private set; } + + /// + /// The maximum allowed file name length + /// + public int MaxFileNameLength { get; internal set; } /// /// Index of current export file. @@ -127,60 +121,60 @@ public bool IsMaxFailures /// public string FileName { get; internal set; } - /// - /// The path of the export content folder - /// - public string Folder { get; private set; } - - /// - /// Whether the profile has a public deployment into "Exchange" folder - /// - public bool HasPublicDeployment { get; internal set; } - - /// - /// The local path to the public export folder "Exchange". null if the profile has no public deployment. - /// - public string PublicFolderPath { get; internal set; } - - /// - /// The URL of the public export folder "Exchange". null if the profile has no public deployment. - /// - public string PublicFolderUrl { get; internal set; } - - /// - /// Provider specific configuration data - /// - public object ConfigurationData { get; internal set; } - - /// - /// Use this dictionary for any custom data required along the export - /// - public Dictionary CustomProperties { get; set; } - - /// - /// Number of successful processed records - /// - public int RecordsSucceeded { get; set; } - - /// - /// Number of failed records - /// - public int RecordsFailed { get; set; } - - /// - /// Processes an exception that occurred while exporting a record - /// + /// + /// The path of the export content folder + /// + public string Folder { get; private set; } + + /// + /// Whether the profile has a public deployment into "Exchange" folder + /// + public bool HasPublicDeployment { get; internal set; } + + /// + /// The local path to the public export folder "Exchange". null if the profile has no public deployment. + /// + public string PublicFolderPath { get; internal set; } + + /// + /// The URL of the public export folder "Exchange". null if the profile has no public deployment. + /// + public string PublicFolderUrl { get; internal set; } + + /// + /// Provider specific configuration data + /// + public object ConfigurationData { get; internal set; } + + /// + /// Use this dictionary for any custom data required along the export + /// + public Dictionary CustomProperties { get; set; } + + /// + /// Number of successful processed records + /// + public int RecordsSucceeded { get; set; } + + /// + /// Number of failed records + /// + public int RecordsFailed { get; set; } + + /// + /// Processes an exception that occurred while exporting a record + /// /// Identifier of the current entity - /// Exception - public void RecordException(Exception exception, int entityId) - { - ++RecordsFailed; + /// Exception + public void RecordException(Exception exception, int entityId) + { + ++RecordsFailed; - Log.ErrorFormat("Error while processing record with id {0}. {1}".FormatInvariant(entityId, exception.ToString())); + Log.ErrorFormat("Error while processing record with id {0}. {1}".FormatInvariant(entityId, exception.ToString())); - if (IsMaxFailures) - _result.LastError = exception.ToString(); - } + if (IsMaxFailures) + _result.LastError = exception.ToString(); + } /// /// Processes an out-of-memory exception and hard aborts the export @@ -202,34 +196,34 @@ public void RecordOutOfMemoryException(OutOfMemoryException exception, int entit public ProgressValueSetter ProgressValueSetter { get; internal set; } - /// - /// Allows to set a progress message - /// - /// Output message - public void SetProgress(string message) - { - if (ProgressValueSetter != null && message.HasValue()) - { - try - { - ProgressValueSetter.Invoke(0, 0, message); - } - catch { } - } - } - } - - public class ExportDataUnit - { + /// + /// Allows to set a progress message + /// + /// Output message + public void SetProgress(string message) + { + if (ProgressValueSetter != null && message.HasValue()) + { + try + { + ProgressValueSetter.Invoke(0, 0, message); + } + catch { } + } + } + } + + public class ExportDataUnit + { /// /// Your Id to identify this stream within a list of streams /// public string Id { get; set; } - /// - /// Stream used to write data to - /// - public Stream DataStream { get; internal set; } + /// + /// Stream used to write data to + /// + public Stream DataStream { get; internal set; } /// /// The related entity type. @@ -241,15 +235,15 @@ public class ExportDataUnit /// public string FileName { get; set; } - /// - /// Short optional text that describes the content of the file - /// - public string Label { get; set; } + /// + /// Short optional text that describes the content of the file + /// + public string Label { get; set; } - /// - /// Whether to display the file in the profile file dialog - /// - public bool DisplayInFileDialog { get; set; } + /// + /// Whether to display the file in the profile file dialog + /// + public bool DisplayInFileDialog { get; set; } /// /// Number of successful processed records. diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs index 4c9fd6fdb1..6fc708c721 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs @@ -16,39 +16,39 @@ namespace SmartStore.Services.DataExchange.Export { public static class ExportExtensions - { - /// - /// Returns a value indicating whether the export provider is valid - /// - /// Export provider - /// true provider is valid, false provider is invalid. - public static bool IsValid(this Provider provider) - { - return provider != null && provider.Value != null; - } - - /// - /// Gets the localized friendly name or the system name as fallback - /// - /// Export provider - /// Localization service - /// Provider name - public static string GetName(this Provider provider, ILocalizationService localizationService) - { - var systemName = provider.Metadata.SystemName; - var resourceName = provider.Metadata.ResourceKeyPattern.FormatInvariant(systemName, "FriendlyName"); - var name = localizationService.GetResource(resourceName, 0, false, systemName, true); - - return (name.IsEmpty() ? systemName : name); - } - - /// - /// Get temporary folder for an export profile - /// - /// Export profile - /// Folder path - public static string GetExportFolder(this ExportProfile profile, bool content = false, bool create = false) - { + { + /// + /// Returns a value indicating whether the export provider is valid + /// + /// Export provider + /// true provider is valid, false provider is invalid. + public static bool IsValid(this Provider provider) + { + return provider != null && provider.Value != null; + } + + /// + /// Gets the localized friendly name or the system name as fallback + /// + /// Export provider + /// Localization service + /// Provider name + public static string GetName(this Provider provider, ILocalizationService localizationService) + { + var systemName = provider.Metadata.SystemName; + var resourceName = provider.Metadata.ResourceKeyPattern.FormatInvariant(systemName, "FriendlyName"); + var name = localizationService.GetResource(resourceName, 0, false, systemName, true); + + return (name.IsEmpty() ? systemName : name); + } + + /// + /// Get temporary folder for an export profile + /// + /// Export profile + /// Folder path + public static string GetExportFolder(this ExportProfile profile, bool content = false, bool create = false) + { Guard.IsTrue(profile.FolderName.EmptyNull().Length > 2, nameof(profile.FolderName), "The export folder name must be at least 3 characters long."); var path = CommonHelper.MapPath(string.Concat(profile.FolderName, content ? "/Content" : "")); @@ -67,76 +67,76 @@ public static string GetExportFolder(this ExportProfile profile, bool content = /// Export profile /// Log file path public static string GetExportLogPath(this ExportProfile profile) - { - return Path.Combine(profile.GetExportFolder(), "log.txt"); - } - - /// - /// Gets the ZIP path for a profile - /// - /// Export profile - /// ZIP file path - public static string GetExportZipPath(this ExportProfile profile) - { - var name = (new DirectoryInfo(profile.FolderName)).Name; - if (name.IsEmpty()) - name = "ExportData"; - - return Path.Combine(profile.GetExportFolder(), name.ToValidFileName() + ".zip"); - } - - /// - /// Gets existing export files for an export profile - /// - /// Export profile - /// Export provider - /// List of file names - public static IEnumerable GetExportFiles(this ExportProfile profile, Provider provider) - { - var exportFolder = profile.GetExportFolder(true); - - if (System.IO.Directory.Exists(exportFolder) && provider.Value.FileExtension.HasValue()) - { - var filter = "*.{0}".FormatInvariant(provider.Value.FileExtension.ToLower()); - - return System.IO.Directory.EnumerateFiles(exportFolder, filter, SearchOption.AllDirectories).OrderBy(x => x); - } - - return Enumerable.Empty(); - } - - /// - /// Get number of existing export files - /// - /// Export profile - /// Export provider - /// Number of export files - public static int GetExportFileCount(this ExportProfile profile, Provider provider) - { - var result = profile.GetExportFiles(provider).Count(); - - if (File.Exists(profile.GetExportZipPath())) - ++result; - - return result; - } - - /// - /// Resolves the file name pattern for an export profile - /// - /// Export profile - /// Store - /// One based file index - /// The maximum length of the file name - /// Resolved file name pattern - public static string ResolveFileNamePattern(this ExportProfile profile, Store store, int fileIndex, int maxFileNameLength) - { - var sb = new StringBuilder(profile.FileNamePattern); - - sb.Replace("%Profile.Id%", profile.Id.ToString()); - sb.Replace("%Profile.FolderName%", profile.FolderName); - sb.Replace("%Store.Id%", store.Id.ToString()); - sb.Replace("%File.Index%", fileIndex.ToString("D4")); + { + return Path.Combine(profile.GetExportFolder(), "log.txt"); + } + + /// + /// Gets the ZIP path for a profile + /// + /// Export profile + /// ZIP file path + public static string GetExportZipPath(this ExportProfile profile) + { + var name = (new DirectoryInfo(profile.FolderName)).Name; + if (name.IsEmpty()) + name = "ExportData"; + + return Path.Combine(profile.GetExportFolder(), name.ToValidFileName() + ".zip"); + } + + /// + /// Gets existing export files for an export profile + /// + /// Export profile + /// Export provider + /// List of file names + public static IEnumerable GetExportFiles(this ExportProfile profile, Provider provider) + { + var exportFolder = profile.GetExportFolder(true); + + if (System.IO.Directory.Exists(exportFolder) && provider.Value.FileExtension.HasValue()) + { + var filter = "*.{0}".FormatInvariant(provider.Value.FileExtension.ToLower()); + + return System.IO.Directory.EnumerateFiles(exportFolder, filter, SearchOption.AllDirectories).OrderBy(x => x); + } + + return Enumerable.Empty(); + } + + /// + /// Get number of existing export files + /// + /// Export profile + /// Export provider + /// Number of export files + public static int GetExportFileCount(this ExportProfile profile, Provider provider) + { + var result = profile.GetExportFiles(provider).Count(); + + if (File.Exists(profile.GetExportZipPath())) + ++result; + + return result; + } + + /// + /// Resolves the file name pattern for an export profile + /// + /// Export profile + /// Store + /// One based file index + /// The maximum length of the file name + /// Resolved file name pattern + public static string ResolveFileNamePattern(this ExportProfile profile, Store store, int fileIndex, int maxFileNameLength) + { + var sb = new StringBuilder(profile.FileNamePattern); + + sb.Replace("%Profile.Id%", profile.Id.ToString()); + sb.Replace("%Profile.FolderName%", profile.FolderName); + sb.Replace("%Store.Id%", store.Id.ToString()); + sb.Replace("%File.Index%", fileIndex.ToString("D4")); if (profile.FileNamePattern.Contains("%Profile.SeoName%")) { @@ -155,113 +155,113 @@ public static string ResolveFileNamePattern(this ExportProfile profile, Store st sb.Replace("%Timestamp%", DateTime.UtcNow.ToString("s", CultureInfo.InvariantCulture)); } - var result = sb.ToString() - .ToValidFileName("") - .Truncate(maxFileNameLength); - - return result; - } - - /// - /// Get path of the deployment folder - /// - /// Export deployment - /// Deployment folder path - public static string GetDeploymentFolder(this ExportDeployment deployment, bool create = false) - { - if (deployment == null) - return null; - - string path = null; - - if (deployment.DeploymentType == ExportDeploymentType.PublicFolder) - { - if (deployment.SubFolder.HasValue()) - path = Path.Combine(HttpRuntime.AppDomainAppPath, DataExporter.PublicFolder, deployment.SubFolder); - else - path = Path.Combine(HttpRuntime.AppDomainAppPath, DataExporter.PublicFolder); - } - else if (deployment.DeploymentType == ExportDeploymentType.FileSystem) - { - if (deployment.FileSystemPath.IsEmpty()) - return null; - - if (Path.IsPathRooted(deployment.FileSystemPath)) - { - path = deployment.FileSystemPath; - } - else - { - path = PathHelper.NormalizeAppRelativePath(deployment.FileSystemPath); - path = CommonHelper.MapPath(path); - } - } - - if (create && !System.IO.Directory.Exists(path)) - System.IO.Directory.CreateDirectory(path); - - return path; - } - - /// - /// Get url of the public folder and take filtering and projection into consideration - /// - /// Export deployment - /// Common services - /// Store entity - /// Absolute URL of the public folder (always ends with /) or null - public static string GetPublicFolderUrl(this ExportDeployment deployment, ICommonServices services, Store store = null) - { - if (deployment != null && deployment.DeploymentType == ExportDeploymentType.PublicFolder) - { - if (store == null) - { - var filter = XmlHelper.Deserialize(deployment.Profile.Filtering); - var storeId = filter.StoreId; - - if (storeId == 0) - { - var projection = XmlHelper.Deserialize(deployment.Profile.Projection); - storeId = (projection.StoreId ?? 0); - } - - store = (storeId == 0 ? services.StoreContext.CurrentStore : services.StoreService.GetStoreById(storeId)); - } - - var url = string.Concat( - store.Url.EnsureEndsWith("/"), - DataExporter.PublicFolder.EnsureEndsWith("/"), - deployment.SubFolder.HasValue() ? deployment.SubFolder.EnsureEndsWith("/") : "" - ); - - return url; - } - - return null; - } - - /// - /// Get icon class for a deployment type - /// - /// Deployment type - /// Icon class - public static string GetIconClass(this ExportDeploymentType type) - { - switch (type) - { - case ExportDeploymentType.FileSystem: - return "far fa-folder-open"; - case ExportDeploymentType.Email: - return "far fa-envelope"; - case ExportDeploymentType.Http: - return "fa fa-globe"; - case ExportDeploymentType.Ftp: - return "far fa-copy"; - case ExportDeploymentType.PublicFolder: - return "fa fa-unlock"; - default: - return "fa fa-question"; - } - } - } + var result = sb.ToString() + .ToValidFileName("") + .Truncate(maxFileNameLength); + + return result; + } + + /// + /// Get path of the deployment folder + /// + /// Export deployment + /// Deployment folder path + public static string GetDeploymentFolder(this ExportDeployment deployment, bool create = false) + { + if (deployment == null) + return null; + + string path = null; + + if (deployment.DeploymentType == ExportDeploymentType.PublicFolder) + { + if (deployment.SubFolder.HasValue()) + path = Path.Combine(HttpRuntime.AppDomainAppPath, DataExporter.PublicFolder, deployment.SubFolder); + else + path = Path.Combine(HttpRuntime.AppDomainAppPath, DataExporter.PublicFolder); + } + else if (deployment.DeploymentType == ExportDeploymentType.FileSystem) + { + if (deployment.FileSystemPath.IsEmpty()) + return null; + + if (Path.IsPathRooted(deployment.FileSystemPath)) + { + path = deployment.FileSystemPath; + } + else + { + path = PathHelper.NormalizeAppRelativePath(deployment.FileSystemPath); + path = CommonHelper.MapPath(path); + } + } + + if (create && !System.IO.Directory.Exists(path)) + System.IO.Directory.CreateDirectory(path); + + return path; + } + + /// + /// Get url of the public folder and take filtering and projection into consideration + /// + /// Export deployment + /// Common services + /// Store entity + /// Absolute URL of the public folder (always ends with /) or null + public static string GetPublicFolderUrl(this ExportDeployment deployment, ICommonServices services, Store store = null) + { + if (deployment != null && deployment.DeploymentType == ExportDeploymentType.PublicFolder) + { + if (store == null) + { + var filter = XmlHelper.Deserialize(deployment.Profile.Filtering); + var storeId = filter.StoreId; + + if (storeId == 0) + { + var projection = XmlHelper.Deserialize(deployment.Profile.Projection); + storeId = (projection.StoreId ?? 0); + } + + store = (storeId == 0 ? services.StoreContext.CurrentStore : services.StoreService.GetStoreById(storeId)); + } + + var url = string.Concat( + store.Url.EnsureEndsWith("/"), + DataExporter.PublicFolder.EnsureEndsWith("/"), + deployment.SubFolder.HasValue() ? deployment.SubFolder.EnsureEndsWith("/") : "" + ); + + return url; + } + + return null; + } + + /// + /// Get icon class for a deployment type + /// + /// Deployment type + /// Icon class + public static string GetIconClass(this ExportDeploymentType type) + { + switch (type) + { + case ExportDeploymentType.FileSystem: + return "far fa-folder-open"; + case ExportDeploymentType.Email: + return "far fa-envelope"; + case ExportDeploymentType.Http: + return "fa fa-globe"; + case ExportDeploymentType.Ftp: + return "far fa-copy"; + case ExportDeploymentType.PublicFolder: + return "fa fa-unlock"; + default: + return "fa fa-question"; + } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportFeaturesAttribute.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportFeaturesAttribute.cs index eee6f1554e..3595e44867 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportFeaturesAttribute.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportFeaturesAttribute.cs @@ -3,13 +3,13 @@ namespace SmartStore.Services.DataExchange.Export { - /// - /// Declares data processing types supported by an export provider. - /// Projection type controls whether to display corresponding projection fields while editing an export profile. - /// - [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] - public sealed class ExportFeaturesAttribute : Attribute - { - public ExportFeatures Features { get; set; } - } + /// + /// Declares data processing types supported by an export provider. + /// Projection type controls whether to display corresponding projection fields while editing an export profile. + /// + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public sealed class ExportFeaturesAttribute : Attribute + { + public ExportFeatures Features { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs index e3a4f541b6..d5c2c24001 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs @@ -16,232 +16,232 @@ namespace SmartStore.Services.DataExchange.Export { - public partial class ExportProfileService : IExportProfileService - { - private const string _defaultFileNamePattern = "%Store.Id%-%Profile.Id%-%File.Index%-%Profile.SeoName%"; - - private readonly IRepository _exportProfileRepository; - private readonly IRepository _exportDeploymentRepository; - private readonly IEventPublisher _eventPublisher; - private readonly IScheduleTaskService _scheduleTaskService; - private readonly IProviderManager _providerManager; - private readonly DataExchangeSettings _dataExchangeSettings; - private readonly ILocalizationService _localizationService; - - public ExportProfileService( - IRepository exportProfileRepository, - IRepository exportDeploymentRepository, - IEventPublisher eventPublisher, - IScheduleTaskService scheduleTaskService, - IProviderManager providerManager, - DataExchangeSettings dataExchangeSettings, - ILocalizationService localizationService) - { - _exportProfileRepository = exportProfileRepository; - _exportDeploymentRepository = exportDeploymentRepository; - _eventPublisher = eventPublisher; - _scheduleTaskService = scheduleTaskService; - _providerManager = providerManager; - _dataExchangeSettings = dataExchangeSettings; - _localizationService = localizationService; - } - - public virtual ExportProfile InsertExportProfile( - string providerSystemName, - string name, - string fileExtension, - ExportFeatures features, - bool isSystemProfile = false, - string profileSystemName = null, - int cloneFromProfileId = 0) - { - Guard.NotEmpty(providerSystemName, nameof(providerSystemName)); - - if (name.IsEmpty()) - { - name = providerSystemName; - } - - if (!isSystemProfile) - { - var profileCount = _exportProfileRepository.Table.Count(x => x.ProviderSystemName == providerSystemName); - - name = string.Concat(_localizationService.GetResource("Common.My"), " ", name, " ", profileCount + 1); - } - - var cloneProfile = GetExportProfileById(cloneFromProfileId); - - ScheduleTask task = null; - ExportProfile profile = null; - - if (cloneProfile == null) - { - task = new ScheduleTask - { - CronExpression = "0 */6 * * *", // Every six hours. - Type = typeof(DataExportTask).AssemblyQualifiedNameWithoutVersion(), - Enabled = false, - StopOnError = false, - IsHidden = true - }; - } - else - { - task = cloneProfile.ScheduleTask.Clone(); - } - - task.Name = string.Concat(name, " Task"); - - _scheduleTaskService.InsertTask(task); - - if (cloneProfile == null) - { - profile = new ExportProfile - { - FileNamePattern = _defaultFileNamePattern - }; - - if (isSystemProfile) - { - profile.Enabled = true; - profile.PerStore = false; - profile.CreateZipArchive = false; - profile.Cleanup = false; - } - else - { - // What we do here is to preset typical settings for feed creation - // but on the other hand they may be untypical for generic data export\exchange. - var projection = new ExportProjection - { - RemoveCriticalCharacters = true, - CriticalCharacters = "¼,½,¾", - PriceType = PriceDisplayType.PreSelectedPrice, - NoGroupedProducts = features.HasFlag(ExportFeatures.CanOmitGroupedProducts) ? true : false, - OnlyIndividuallyVisibleAssociated = true, - DescriptionMerging = ExportDescriptionMerging.Description - }; - - var filter = new ExportFilter - { - IsPublished = true, - ShoppingCartTypeId = (int)ShoppingCartType.ShoppingCart - }; - - profile.Projection = XmlHelper.Serialize(projection); - profile.Filtering = XmlHelper.Serialize(filter); - } - } - else - { - profile = cloneProfile.Clone(); - } - - profile.IsSystemProfile = isSystemProfile; - profile.Name = name; - profile.ProviderSystemName = providerSystemName; - profile.SchedulingTaskId = task.Id; - - var cleanedSystemName = providerSystemName - .Replace("Exports.", "") - .Replace("Feeds.", "") - .Replace("/", "") - .Replace("-", ""); - - var folderName = SeoHelper.GetSeName(cleanedSystemName, true, false, false) - .ToValidPath() - .Truncate(_dataExchangeSettings.MaxFileNameLength); - - var path = DataSettings.Current.TenantPath + "/ExportProfiles"; - profile.FolderName = path + "/" + FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath(path), folderName); - - profile.SystemName = profileSystemName.IsEmpty() && isSystemProfile - ? cleanedSystemName - : profileSystemName; - - _exportProfileRepository.Insert(profile); - - - task.Alias = profile.Id.ToString(); - _scheduleTaskService.UpdateTask(task); - - if (fileExtension.HasValue() && !isSystemProfile) - { - if (cloneProfile == null) - { - if (features.HasFlag(ExportFeatures.CreatesInitialPublicDeployment)) - { - var subFolder = FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath("~/" + DataExporter.PublicFolder), folderName); - - profile.Deployments.Add(new ExportDeployment - { - ProfileId = profile.Id, - Enabled = true, - DeploymentType = ExportDeploymentType.PublicFolder, - Name = profile.Name, - SubFolder = subFolder - }); - - UpdateExportProfile(profile); - } - } - else - { - foreach (var deployment in cloneProfile.Deployments) - { - profile.Deployments.Add(deployment.Clone()); - } - - UpdateExportProfile(profile); - } - } - - return profile; - } - - public virtual ExportProfile InsertExportProfile( - Provider provider, - bool isSystemProfile = false, - string profileSystemName = null, - int cloneFromProfileId = 0) - { - Guard.NotNull(provider, nameof(provider)); - - var profile = InsertExportProfile( - provider.Metadata.SystemName, - provider.GetName(_localizationService), - provider.Value.FileExtension, - provider.Metadata.ExportFeatures, - isSystemProfile, - profileSystemName, - cloneFromProfileId); - - return profile; - } - - public virtual void UpdateExportProfile(ExportProfile profile) - { - Guard.NotNull(profile, nameof(profile)); - - profile.FolderName = PathHelper.NormalizeAppRelativePath(profile.FolderName); + public partial class ExportProfileService : IExportProfileService + { + private const string _defaultFileNamePattern = "%Store.Id%-%Profile.Id%-%File.Index%-%Profile.SeoName%"; + + private readonly IRepository _exportProfileRepository; + private readonly IRepository _exportDeploymentRepository; + private readonly IEventPublisher _eventPublisher; + private readonly IScheduleTaskService _scheduleTaskService; + private readonly IProviderManager _providerManager; + private readonly DataExchangeSettings _dataExchangeSettings; + private readonly ILocalizationService _localizationService; + + public ExportProfileService( + IRepository exportProfileRepository, + IRepository exportDeploymentRepository, + IEventPublisher eventPublisher, + IScheduleTaskService scheduleTaskService, + IProviderManager providerManager, + DataExchangeSettings dataExchangeSettings, + ILocalizationService localizationService) + { + _exportProfileRepository = exportProfileRepository; + _exportDeploymentRepository = exportDeploymentRepository; + _eventPublisher = eventPublisher; + _scheduleTaskService = scheduleTaskService; + _providerManager = providerManager; + _dataExchangeSettings = dataExchangeSettings; + _localizationService = localizationService; + } + + public virtual ExportProfile InsertExportProfile( + string providerSystemName, + string name, + string fileExtension, + ExportFeatures features, + bool isSystemProfile = false, + string profileSystemName = null, + int cloneFromProfileId = 0) + { + Guard.NotEmpty(providerSystemName, nameof(providerSystemName)); + + if (name.IsEmpty()) + { + name = providerSystemName; + } + + if (!isSystemProfile) + { + var profileCount = _exportProfileRepository.Table.Count(x => x.ProviderSystemName == providerSystemName); + + name = string.Concat(_localizationService.GetResource("Common.My"), " ", name, " ", profileCount + 1); + } + + var cloneProfile = GetExportProfileById(cloneFromProfileId); + + ScheduleTask task = null; + ExportProfile profile = null; + + if (cloneProfile == null) + { + task = new ScheduleTask + { + CronExpression = "0 */6 * * *", // Every six hours. + Type = typeof(DataExportTask).AssemblyQualifiedNameWithoutVersion(), + Enabled = false, + StopOnError = false, + IsHidden = true + }; + } + else + { + task = cloneProfile.ScheduleTask.Clone(); + } + + task.Name = string.Concat(name, " Task"); + + _scheduleTaskService.InsertTask(task); + + if (cloneProfile == null) + { + profile = new ExportProfile + { + FileNamePattern = _defaultFileNamePattern + }; + + if (isSystemProfile) + { + profile.Enabled = true; + profile.PerStore = false; + profile.CreateZipArchive = false; + profile.Cleanup = false; + } + else + { + // What we do here is to preset typical settings for feed creation + // but on the other hand they may be untypical for generic data export\exchange. + var projection = new ExportProjection + { + RemoveCriticalCharacters = true, + CriticalCharacters = "¼,½,¾", + PriceType = PriceDisplayType.PreSelectedPrice, + NoGroupedProducts = features.HasFlag(ExportFeatures.CanOmitGroupedProducts) ? true : false, + OnlyIndividuallyVisibleAssociated = true, + DescriptionMerging = ExportDescriptionMerging.Description + }; + + var filter = new ExportFilter + { + IsPublished = true, + ShoppingCartTypeId = (int)ShoppingCartType.ShoppingCart + }; + + profile.Projection = XmlHelper.Serialize(projection); + profile.Filtering = XmlHelper.Serialize(filter); + } + } + else + { + profile = cloneProfile.Clone(); + } + + profile.IsSystemProfile = isSystemProfile; + profile.Name = name; + profile.ProviderSystemName = providerSystemName; + profile.SchedulingTaskId = task.Id; + + var cleanedSystemName = providerSystemName + .Replace("Exports.", "") + .Replace("Feeds.", "") + .Replace("/", "") + .Replace("-", ""); + + var folderName = SeoHelper.GetSeName(cleanedSystemName, true, false, false) + .ToValidPath() + .Truncate(_dataExchangeSettings.MaxFileNameLength); + + var path = DataSettings.Current.TenantPath + "/ExportProfiles"; + profile.FolderName = path + "/" + FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath(path), folderName); + + profile.SystemName = profileSystemName.IsEmpty() && isSystemProfile + ? cleanedSystemName + : profileSystemName; + + _exportProfileRepository.Insert(profile); + + + task.Alias = profile.Id.ToString(); + _scheduleTaskService.UpdateTask(task); + + if (fileExtension.HasValue() && !isSystemProfile) + { + if (cloneProfile == null) + { + if (features.HasFlag(ExportFeatures.CreatesInitialPublicDeployment)) + { + var subFolder = FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath("~/" + DataExporter.PublicFolder), folderName); + + profile.Deployments.Add(new ExportDeployment + { + ProfileId = profile.Id, + Enabled = true, + DeploymentType = ExportDeploymentType.PublicFolder, + Name = profile.Name, + SubFolder = subFolder + }); + + UpdateExportProfile(profile); + } + } + else + { + foreach (var deployment in cloneProfile.Deployments) + { + profile.Deployments.Add(deployment.Clone()); + } + + UpdateExportProfile(profile); + } + } + + return profile; + } + + public virtual ExportProfile InsertExportProfile( + Provider provider, + bool isSystemProfile = false, + string profileSystemName = null, + int cloneFromProfileId = 0) + { + Guard.NotNull(provider, nameof(provider)); + + var profile = InsertExportProfile( + provider.Metadata.SystemName, + provider.GetName(_localizationService), + provider.Value.FileExtension, + provider.Metadata.ExportFeatures, + isSystemProfile, + profileSystemName, + cloneFromProfileId); + + return profile; + } + + public virtual void UpdateExportProfile(ExportProfile profile) + { + Guard.NotNull(profile, nameof(profile)); + + profile.FolderName = PathHelper.NormalizeAppRelativePath(profile.FolderName); if (!PathHelper.IsSafeAppRootPath(profile.FolderName)) { throw new SmartException(_localizationService.GetResource("Admin.DataExchange.Export.FolderName.Validate")); } - _exportProfileRepository.Update(profile); - } + _exportProfileRepository.Update(profile); + } - public virtual void DeleteExportProfile(ExportProfile profile, bool force = false) - { - Guard.NotNull(profile, nameof(profile)); + public virtual void DeleteExportProfile(ExportProfile profile, bool force = false) + { + Guard.NotNull(profile, nameof(profile)); - if (!force && profile.IsSystemProfile) - throw new SmartException(_localizationService.GetResource("Admin.DataExchange.Export.CannotDeleteSystemProfile")); + if (!force && profile.IsSystemProfile) + throw new SmartException(_localizationService.GetResource("Admin.DataExchange.Export.CannotDeleteSystemProfile")); - int scheduleTaskId = profile.SchedulingTaskId; - var folder = profile.GetExportFolder(); + int scheduleTaskId = profile.SchedulingTaskId; + var folder = profile.GetExportFolder(); var deployments = profile.Deployments.Where(x => !x.IsTransientRecord()).ToList(); if (deployments.Any()) @@ -252,123 +252,123 @@ public virtual void DeleteExportProfile(ExportProfile profile, bool force = fals _exportProfileRepository.Delete(profile); - var scheduleTask = _scheduleTaskService.GetTaskById(scheduleTaskId); - _scheduleTaskService.DeleteTask(scheduleTask); + var scheduleTask = _scheduleTaskService.GetTaskById(scheduleTaskId); + _scheduleTaskService.DeleteTask(scheduleTask); + + if (System.IO.Directory.Exists(folder)) + { + FileSystemHelper.ClearDirectory(folder, true); + } + } + + public virtual IQueryable GetExportProfiles(bool? enabled = null) + { + var query = _exportProfileRepository.Table + .Expand(x => x.ScheduleTask) + .Expand(x => x.Deployments); + + if (enabled.HasValue) + { + query = query.Where(x => x.Enabled == enabled.Value); + } + + query = query + .OrderBy(x => x.IsSystemProfile) + .ThenBy(x => x.Name); + + return query; + } + + public virtual ExportProfile GetExportProfileById(int id) + { + if (id == 0) + return null; + + var profile = _exportProfileRepository.Table + .Expand(x => x.ScheduleTask) + .Expand(x => x.Deployments) + .FirstOrDefault(x => x.Id == id); + + return profile; + } + + public virtual ExportProfile GetSystemExportProfile(string providerSystemName) + { + if (providerSystemName.IsEmpty()) + return null; + + var query = GetExportProfiles(true); + + var profile = query + .Where(x => x.IsSystemProfile && x.ProviderSystemName == providerSystemName) + .FirstOrDefault(); + + return profile; + } + + public virtual IList GetExportProfilesBySystemName(string providerSystemName) + { + if (providerSystemName.IsEmpty()) + return new List(); + + var profiles = _exportProfileRepository.Table + .Expand(x => x.ScheduleTask) + .Expand(x => x.Deployments) + .Where(x => x.ProviderSystemName == providerSystemName) + .ToList(); + + return profiles; + } + + + public virtual IEnumerable> LoadAllExportProviders(int storeId = 0, bool showHidden = true) + { + var allProviders = _providerManager.GetAllProviders(storeId) + .Where(x => x.IsValid() && (showHidden || !x.Metadata.IsHidden)) + //.OrderBy(x => x.Metadata.SystemName) + .OrderBy(x => x.Metadata.FriendlyName); + + return allProviders; + } + + public virtual Provider LoadProvider(string systemName, int storeId = 0) + { + var provider = _providerManager.GetProvider(systemName, storeId); + + return (provider.IsValid() ? provider : null); + } + + public virtual ExportDeployment GetExportDeploymentById(int id) + { + if (id == 0) + return null; + + var deployment = _exportDeploymentRepository.Table + .Expand(x => x.Profile) + .FirstOrDefault(x => x.Id == id); + + return deployment; + } + + public virtual void UpdateExportDeployment(ExportDeployment deployment) + { + if (deployment == null) + throw new ArgumentNullException("deployment"); + + if (deployment.DeploymentType == ExportDeploymentType.FileSystem && deployment.FileSystemPath == "~/") + { + throw new SmartException("Invalid deployment path."); + } + + _exportDeploymentRepository.Update(deployment); + } - if (System.IO.Directory.Exists(folder)) - { - FileSystemHelper.ClearDirectory(folder, true); - } - } + public virtual void DeleteExportDeployment(ExportDeployment deployment) + { + if (deployment == null) + throw new ArgumentNullException("deployment"); - public virtual IQueryable GetExportProfiles(bool? enabled = null) - { - var query = _exportProfileRepository.Table - .Expand(x => x.ScheduleTask) - .Expand(x => x.Deployments); - - if (enabled.HasValue) - { - query = query.Where(x => x.Enabled == enabled.Value); - } - - query = query - .OrderBy(x => x.IsSystemProfile) - .ThenBy(x => x.Name); - - return query; - } - - public virtual ExportProfile GetExportProfileById(int id) - { - if (id == 0) - return null; - - var profile = _exportProfileRepository.Table - .Expand(x => x.ScheduleTask) - .Expand(x => x.Deployments) - .FirstOrDefault(x => x.Id == id); - - return profile; - } - - public virtual ExportProfile GetSystemExportProfile(string providerSystemName) - { - if (providerSystemName.IsEmpty()) - return null; - - var query = GetExportProfiles(true); - - var profile = query - .Where(x => x.IsSystemProfile && x.ProviderSystemName == providerSystemName) - .FirstOrDefault(); - - return profile; - } - - public virtual IList GetExportProfilesBySystemName(string providerSystemName) - { - if (providerSystemName.IsEmpty()) - return new List(); - - var profiles = _exportProfileRepository.Table - .Expand(x => x.ScheduleTask) - .Expand(x => x.Deployments) - .Where(x => x.ProviderSystemName == providerSystemName) - .ToList(); - - return profiles; - } - - - public virtual IEnumerable> LoadAllExportProviders(int storeId = 0, bool showHidden = true) - { - var allProviders = _providerManager.GetAllProviders(storeId) - .Where(x => x.IsValid() && (showHidden || !x.Metadata.IsHidden)) - //.OrderBy(x => x.Metadata.SystemName) - .OrderBy(x => x.Metadata.FriendlyName); - - return allProviders; - } - - public virtual Provider LoadProvider(string systemName, int storeId = 0) - { - var provider = _providerManager.GetProvider(systemName, storeId); - - return (provider.IsValid() ? provider : null); - } - - public virtual ExportDeployment GetExportDeploymentById(int id) - { - if (id == 0) - return null; - - var deployment = _exportDeploymentRepository.Table - .Expand(x => x.Profile) - .FirstOrDefault(x => x.Id == id); - - return deployment; - } - - public virtual void UpdateExportDeployment(ExportDeployment deployment) - { - if (deployment == null) - throw new ArgumentNullException("deployment"); - - if (deployment.DeploymentType == ExportDeploymentType.FileSystem && deployment.FileSystemPath == "~/") - { - throw new SmartException("Invalid deployment path."); - } - - _exportDeploymentRepository.Update(deployment); - } - - public virtual void DeleteExportDeployment(ExportDeployment deployment) - { - if (deployment == null) - throw new ArgumentNullException("deployment"); - - _exportDeploymentRepository.Delete(deployment); - } - } + _exportDeploymentRepository.Delete(deployment); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs index c77638f60b..6bed98e1d8 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs @@ -2,49 +2,40 @@ namespace SmartStore.Services.DataExchange.Export { - public abstract class ExportProviderBase : IExportProvider - { - /// - /// The exported entity type - /// - public virtual ExportEntityType EntityType - { - get { return ExportEntityType.Product; } - } + public abstract class ExportProviderBase : IExportProvider + { + /// + /// The exported entity type + /// + public virtual ExportEntityType EntityType => ExportEntityType.Product; - /// - /// File extension of the export files (without dot). Return null for a non file based, on-the-fly export. - /// - public virtual string FileExtension - { - get { return null; } - } + /// + /// File extension of the export files (without dot). Return null for a non file based, on-the-fly export. + /// + public virtual string FileExtension => null; - /// - /// Get provider specific configuration information. Return null when no provider specific configuration is required. - /// - public virtual ExportConfigurationInfo ConfigurationInfo - { - get { return null; } - } + /// + /// Get provider specific configuration information. Return null when no provider specific configuration is required. + /// + public virtual ExportConfigurationInfo ConfigurationInfo => null; - public void Execute(ExportExecuteContext context) - { - Export(context); - } + public void Execute(ExportExecuteContext context) + { + Export(context); + } - /// - /// Export data to a file - /// - /// Export execution context - protected abstract void Export(ExportExecuteContext context); + /// + /// Export data to a file + /// + /// Export execution context + protected abstract void Export(ExportExecuteContext context); - /// - /// Called once per store when export execution ended - /// - /// Export execution context - public virtual void OnExecuted(ExportExecuteContext context) - { - } - } + /// + /// Called once per store when export execution ended + /// + /// Export execution context + public virtual void OnExecuted(ExportExecuteContext context) + { + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs index 2ca13aef97..500d4ee6c5 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs @@ -13,193 +13,187 @@ namespace SmartStore.Services.DataExchange.Export { - public class ExportXmlHelper : IDisposable - { - protected XmlWriter _writer; - protected CultureInfo _culture; - protected bool _doNotDispose; - - public ExportXmlHelper(XmlWriter writer, bool doNotDispose = false, CultureInfo culture = null) - { - _writer = writer; - _doNotDispose = doNotDispose; - _culture = culture == null ? CultureInfo.InvariantCulture : culture; - } - public ExportXmlHelper(Stream stream, XmlWriterSettings settings = null, CultureInfo culture = null) - { - if (settings == null) - { - settings = DefaultSettings; - } - - _writer = XmlWriter.Create(stream, settings); - _culture = culture == null ? CultureInfo.InvariantCulture : culture; - } - - public static XmlWriterSettings DefaultSettings - { - get - { - return new XmlWriterSettings - { - Encoding = Encoding.UTF8, - CheckCharacters = false, - Indent = false, - NewLineHandling = NewLineHandling.None - }; - } - } - - public ExportXmlExclude Exclude { get; set; } - - public XmlWriter Writer => _writer; - - public void Dispose() - { - if (_writer != null && !_doNotDispose) - { - _writer.Dispose(); - } - } - - public void WriteLocalized(dynamic parentNode) - { - if (parentNode == null || parentNode._Localized == null) - return; - - _writer.WriteStartElement("Localized"); - foreach (dynamic item in parentNode._Localized) - { - _writer.WriteStartElement((string)item.LocaleKey); - _writer.WriteAttributeString("culture", (string)item.Culture); - _writer.WriteString(((string)item.LocaleValue).RemoveInvalidXmlChars()); - _writer.WriteEndElement(); // item.LocaleKey - } - _writer.WriteEndElement(); // Localized - } - - public void WriteGenericAttributes(dynamic parentNode) - { - if (parentNode == null || parentNode._GenericAttributes == null) - return; - - _writer.WriteStartElement("GenericAttributes"); - foreach (dynamic genericAttribute in parentNode._GenericAttributes) - { - GenericAttribute entity = genericAttribute.Entity; - - _writer.WriteStartElement("GenericAttribute"); - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("EntityId", entity.EntityId.ToString()); - _writer.Write("KeyGroup", entity.KeyGroup); - _writer.Write("Key", entity.Key); - _writer.Write("Value", (string)genericAttribute.Value); - _writer.Write("StoreId", entity.StoreId.ToString()); - _writer.WriteEndElement(); // GenericAttribute - } - _writer.WriteEndElement(); // GenericAttributes - } - - public void WriteAddress(dynamic address, string node) - { - if (address == null) - return; - - Address entity = address.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("Salutation", entity.Salutation); - _writer.Write("Title", entity.Title); - _writer.Write("FirstName", entity.FirstName); - _writer.Write("LastName", entity.LastName); - _writer.Write("Email", entity.Email); - _writer.Write("Company", entity.Company); - _writer.Write("CountryId", entity.CountryId.HasValue ? entity.CountryId.Value.ToString() : ""); - _writer.Write("StateProvinceId", entity.StateProvinceId.HasValue ? entity.StateProvinceId.Value.ToString() : ""); - _writer.Write("City", entity.City); - _writer.Write("Address1", entity.Address1); - _writer.Write("Address2", entity.Address2); - _writer.Write("ZipPostalCode", entity.ZipPostalCode); - _writer.Write("PhoneNumber", entity.PhoneNumber); - _writer.Write("FaxNumber", entity.FaxNumber); - _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); - - if (address.Country != null) - { - dynamic country = address.Country; - Country entityCountry = address.Country.Entity; - - _writer.WriteStartElement("Country"); - _writer.Write("Id", entityCountry.Id.ToString()); - _writer.Write("Name", (string)country.Name); - _writer.Write("AllowsBilling", entityCountry.AllowsBilling.ToString()); - _writer.Write("AllowsShipping", entityCountry.AllowsShipping.ToString()); - _writer.Write("TwoLetterIsoCode", entityCountry.TwoLetterIsoCode); - _writer.Write("ThreeLetterIsoCode", entityCountry.ThreeLetterIsoCode); - _writer.Write("NumericIsoCode", entityCountry.NumericIsoCode.ToString()); - _writer.Write("SubjectToVat", entityCountry.SubjectToVat.ToString()); - _writer.Write("Published", entityCountry.Published.ToString()); - _writer.Write("DisplayOrder", entityCountry.DisplayOrder.ToString()); - _writer.Write("LimitedToStores", entityCountry.LimitedToStores.ToString()); - - WriteLocalized(country); - - _writer.WriteEndElement(); // Country - } - - if (address.StateProvince != null) - { - dynamic stateProvince = address.StateProvince; - StateProvince entityStateProvince = address.StateProvince.Entity; - - _writer.WriteStartElement("StateProvince"); - _writer.Write("Id", entityStateProvince.Id.ToString()); - _writer.Write("CountryId", entityStateProvince.CountryId.ToString()); - _writer.Write("Name", (string)stateProvince.Name); - _writer.Write("Abbreviation", (string)stateProvince.Abbreviation); - _writer.Write("Published", entityStateProvince.Published.ToString()); - _writer.Write("DisplayOrder", entityStateProvince.DisplayOrder.ToString()); - - WriteLocalized(stateProvince); - - _writer.WriteEndElement(); // StateProvince - } - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteCurrency(dynamic currency, string node) - { - if (currency == null) - return; - - Currency entity = currency.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("Name", (string)currency.Name); - _writer.Write("CurrencyCode", entity.CurrencyCode); - _writer.Write("Rate", entity.Rate.ToString(_culture)); - _writer.Write("DisplayLocale", entity.DisplayLocale); - _writer.Write("CustomFormatting", entity.CustomFormatting); - _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); - _writer.Write("Published", entity.Published.ToString()); - _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); - _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); - _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); - _writer.Write("DomainEndings", entity.DomainEndings); + public class ExportXmlHelper : IDisposable + { + protected XmlWriter _writer; + protected CultureInfo _culture; + protected bool _doNotDispose; + + public ExportXmlHelper(XmlWriter writer, bool doNotDispose = false, CultureInfo culture = null) + { + _writer = writer; + _doNotDispose = doNotDispose; + _culture = culture == null ? CultureInfo.InvariantCulture : culture; + } + public ExportXmlHelper(Stream stream, XmlWriterSettings settings = null, CultureInfo culture = null) + { + if (settings == null) + { + settings = DefaultSettings; + } + + _writer = XmlWriter.Create(stream, settings); + _culture = culture == null ? CultureInfo.InvariantCulture : culture; + } + + public static XmlWriterSettings DefaultSettings => new XmlWriterSettings + { + Encoding = Encoding.UTF8, + CheckCharacters = false, + Indent = false, + NewLineHandling = NewLineHandling.None + }; + + public ExportXmlExclude Exclude { get; set; } + + public XmlWriter Writer => _writer; + + public void Dispose() + { + if (_writer != null && !_doNotDispose) + { + _writer.Dispose(); + } + } + + public void WriteLocalized(dynamic parentNode) + { + if (parentNode == null || parentNode._Localized == null) + return; + + _writer.WriteStartElement("Localized"); + foreach (dynamic item in parentNode._Localized) + { + _writer.WriteStartElement((string)item.LocaleKey); + _writer.WriteAttributeString("culture", (string)item.Culture); + _writer.WriteString(((string)item.LocaleValue).RemoveInvalidXmlChars()); + _writer.WriteEndElement(); // item.LocaleKey + } + _writer.WriteEndElement(); // Localized + } + + public void WriteGenericAttributes(dynamic parentNode) + { + if (parentNode == null || parentNode._GenericAttributes == null) + return; + + _writer.WriteStartElement("GenericAttributes"); + foreach (dynamic genericAttribute in parentNode._GenericAttributes) + { + GenericAttribute entity = genericAttribute.Entity; + + _writer.WriteStartElement("GenericAttribute"); + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("EntityId", entity.EntityId.ToString()); + _writer.Write("KeyGroup", entity.KeyGroup); + _writer.Write("Key", entity.Key); + _writer.Write("Value", (string)genericAttribute.Value); + _writer.Write("StoreId", entity.StoreId.ToString()); + _writer.WriteEndElement(); // GenericAttribute + } + _writer.WriteEndElement(); // GenericAttributes + } + + public void WriteAddress(dynamic address, string node) + { + if (address == null) + return; + + Address entity = address.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("Salutation", entity.Salutation); + _writer.Write("Title", entity.Title); + _writer.Write("FirstName", entity.FirstName); + _writer.Write("LastName", entity.LastName); + _writer.Write("Email", entity.Email); + _writer.Write("Company", entity.Company); + _writer.Write("CountryId", entity.CountryId.HasValue ? entity.CountryId.Value.ToString() : ""); + _writer.Write("StateProvinceId", entity.StateProvinceId.HasValue ? entity.StateProvinceId.Value.ToString() : ""); + _writer.Write("City", entity.City); + _writer.Write("Address1", entity.Address1); + _writer.Write("Address2", entity.Address2); + _writer.Write("ZipPostalCode", entity.ZipPostalCode); + _writer.Write("PhoneNumber", entity.PhoneNumber); + _writer.Write("FaxNumber", entity.FaxNumber); + _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); + + if (address.Country != null) + { + dynamic country = address.Country; + Country entityCountry = address.Country.Entity; + + _writer.WriteStartElement("Country"); + _writer.Write("Id", entityCountry.Id.ToString()); + _writer.Write("Name", (string)country.Name); + _writer.Write("AllowsBilling", entityCountry.AllowsBilling.ToString()); + _writer.Write("AllowsShipping", entityCountry.AllowsShipping.ToString()); + _writer.Write("TwoLetterIsoCode", entityCountry.TwoLetterIsoCode); + _writer.Write("ThreeLetterIsoCode", entityCountry.ThreeLetterIsoCode); + _writer.Write("NumericIsoCode", entityCountry.NumericIsoCode.ToString()); + _writer.Write("SubjectToVat", entityCountry.SubjectToVat.ToString()); + _writer.Write("Published", entityCountry.Published.ToString()); + _writer.Write("DisplayOrder", entityCountry.DisplayOrder.ToString()); + _writer.Write("LimitedToStores", entityCountry.LimitedToStores.ToString()); + + WriteLocalized(country); + + _writer.WriteEndElement(); // Country + } + + if (address.StateProvince != null) + { + dynamic stateProvince = address.StateProvince; + StateProvince entityStateProvince = address.StateProvince.Entity; + + _writer.WriteStartElement("StateProvince"); + _writer.Write("Id", entityStateProvince.Id.ToString()); + _writer.Write("CountryId", entityStateProvince.CountryId.ToString()); + _writer.Write("Name", (string)stateProvince.Name); + _writer.Write("Abbreviation", (string)stateProvince.Abbreviation); + _writer.Write("Published", entityStateProvince.Published.ToString()); + _writer.Write("DisplayOrder", entityStateProvince.DisplayOrder.ToString()); + + WriteLocalized(stateProvince); + + _writer.WriteEndElement(); // StateProvince + } + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteCurrency(dynamic currency, string node) + { + if (currency == null) + return; + + Currency entity = currency.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("Name", (string)currency.Name); + _writer.Write("CurrencyCode", entity.CurrencyCode); + _writer.Write("Rate", entity.Rate.ToString(_culture)); + _writer.Write("DisplayLocale", entity.DisplayLocale); + _writer.Write("CustomFormatting", entity.CustomFormatting); + _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); + _writer.Write("Published", entity.Published.ToString()); + _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); + _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); + _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); + _writer.Write("DomainEndings", entity.DomainEndings); _writer.Write("RoundOrderItemsEnabled", entity.RoundOrderItemsEnabled.ToString()); _writer.Write("RoundNumDecimals", entity.RoundNumDecimals.ToString()); _writer.Write("RoundOrderTotalEnabled", entity.RoundOrderTotalEnabled.ToString()); @@ -208,413 +202,413 @@ public void WriteCurrency(dynamic currency, string node) WriteLocalized(currency); - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteCountry(dynamic country, string node) - { - if (country == null) - return; - - Country entity = country.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("Name", entity.Name); - _writer.Write("AllowsBilling", entity.AllowsBilling.ToString()); - _writer.Write("AllowsShipping", entity.AllowsShipping.ToString()); - _writer.Write("TwoLetterIsoCode", entity.TwoLetterIsoCode); - _writer.Write("ThreeLetterIsoCode", entity.ThreeLetterIsoCode); - _writer.Write("NumericIsoCode", entity.NumericIsoCode.ToString()); - _writer.Write("SubjectToVat", entity.SubjectToVat.ToString()); - _writer.Write("Published", entity.Published.ToString()); - _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); - _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); - - WriteLocalized(country); - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteRewardPointsHistory(dynamic rewardPoints, string node) - { - if (rewardPoints == null) - return; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - foreach (dynamic rewardPoint in rewardPoints) - { - RewardPointsHistory entity = rewardPoint.Entity; - - _writer.WriteStartElement("RewardPointsHistory"); - _writer.Write("Id", entity.ToString()); - _writer.Write("CustomerId", entity.ToString()); - _writer.Write("Points", entity.Points.ToString()); - _writer.Write("PointsBalance", entity.PointsBalance.ToString()); - _writer.Write("UsedAmount", entity.UsedAmount.ToString(_culture)); - _writer.Write("Message", (string)rewardPoint.Message); - _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); - _writer.WriteEndElement(); // RewardPointsHistory - } - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteDeliveryTime(dynamic deliveryTime, string node) - { - if (deliveryTime == null) - return; - - DeliveryTime entity = deliveryTime.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("Name", (string)deliveryTime.Name); - _writer.Write("DisplayLocale", entity.DisplayLocale); - _writer.Write("ColorHexValue", entity.ColorHexValue); - _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); - _writer.Write("IsDefault", entity.IsDefault.ToString()); - _writer.Write("MinDays", entity.MinDays.HasValue ? entity.MinDays.Value.ToString() : ""); - _writer.Write("MaxDays", entity.MaxDays.HasValue ? entity.MaxDays.Value.ToString() : ""); - - WriteLocalized(deliveryTime); - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteQuantityUnit(dynamic quantityUnit, string node) - { - if (quantityUnit == null) - return; - - QuantityUnit entity = quantityUnit.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("Name", (string)quantityUnit.Name); + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteCountry(dynamic country, string node) + { + if (country == null) + return; + + Country entity = country.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("Name", entity.Name); + _writer.Write("AllowsBilling", entity.AllowsBilling.ToString()); + _writer.Write("AllowsShipping", entity.AllowsShipping.ToString()); + _writer.Write("TwoLetterIsoCode", entity.TwoLetterIsoCode); + _writer.Write("ThreeLetterIsoCode", entity.ThreeLetterIsoCode); + _writer.Write("NumericIsoCode", entity.NumericIsoCode.ToString()); + _writer.Write("SubjectToVat", entity.SubjectToVat.ToString()); + _writer.Write("Published", entity.Published.ToString()); + _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); + _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); + + WriteLocalized(country); + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteRewardPointsHistory(dynamic rewardPoints, string node) + { + if (rewardPoints == null) + return; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + foreach (dynamic rewardPoint in rewardPoints) + { + RewardPointsHistory entity = rewardPoint.Entity; + + _writer.WriteStartElement("RewardPointsHistory"); + _writer.Write("Id", entity.ToString()); + _writer.Write("CustomerId", entity.ToString()); + _writer.Write("Points", entity.Points.ToString()); + _writer.Write("PointsBalance", entity.PointsBalance.ToString()); + _writer.Write("UsedAmount", entity.UsedAmount.ToString(_culture)); + _writer.Write("Message", (string)rewardPoint.Message); + _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); + _writer.WriteEndElement(); // RewardPointsHistory + } + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteDeliveryTime(dynamic deliveryTime, string node) + { + if (deliveryTime == null) + return; + + DeliveryTime entity = deliveryTime.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("Name", (string)deliveryTime.Name); + _writer.Write("DisplayLocale", entity.DisplayLocale); + _writer.Write("ColorHexValue", entity.ColorHexValue); + _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); + _writer.Write("IsDefault", entity.IsDefault.ToString()); + _writer.Write("MinDays", entity.MinDays.HasValue ? entity.MinDays.Value.ToString() : ""); + _writer.Write("MaxDays", entity.MaxDays.HasValue ? entity.MaxDays.Value.ToString() : ""); + + WriteLocalized(deliveryTime); + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteQuantityUnit(dynamic quantityUnit, string node) + { + if (quantityUnit == null) + return; + + QuantityUnit entity = quantityUnit.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("Name", (string)quantityUnit.Name); _writer.Write("NamePlural", (string)quantityUnit.NamePlural); _writer.Write("Description", (string)quantityUnit.Description); - _writer.Write("DisplayLocale", entity.DisplayLocale); - _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); - _writer.Write("IsDefault", entity.IsDefault.ToString()); - - WriteLocalized(quantityUnit); - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WritePicture(dynamic picture, string node) - { - if (picture == null) - return; - - MediaFile entity = picture.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - var seoName = (string)picture.Name; - seoName = Path.GetFileNameWithoutExtension(seoName.EmptyNull()); - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("SeoFilename", seoName); - _writer.Write("MimeType", (string)picture.MimeType); - _writer.Write("ThumbImageUrl", (string)picture._ThumbImageUrl); - _writer.Write("ImageUrl", (string)picture._ImageUrl); - _writer.Write("FullSizeImageUrl", (string)picture._FullSizeImageUrl); - _writer.Write("FileName", (string)picture._FileName); - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteCategory(dynamic category, string node) - { - if (category == null) - return; - - Category entity = category.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - - if (!Exclude.HasFlag(ExportXmlExclude.Category)) - { - _writer.Write("Name", (string)category.Name); - _writer.Write("FullName", (string)category.FullName); - _writer.Write("Description", (string)category.Description); - _writer.Write("BottomDescription", (string)category.BottomDescription); - _writer.Write("CategoryTemplateId", entity.CategoryTemplateId.ToString()); - _writer.Write("CategoryTemplateViewPath", (string)category._CategoryTemplateViewPath); - _writer.Write("MetaKeywords", (string)category.MetaKeywords); - _writer.Write("MetaDescription", (string)category.MetaDescription); - _writer.Write("MetaTitle", (string)category.MetaTitle); - _writer.Write("SeName", (string)category.SeName); - _writer.Write("ParentCategoryId", entity.ParentCategoryId.ToString()); - _writer.Write("PictureId", entity.MediaFileId.ToString()); - _writer.Write("PageSize", entity.PageSize.ToString()); - _writer.Write("AllowCustomersToSelectPageSize", entity.AllowCustomersToSelectPageSize.ToString()); - _writer.Write("PageSizeOptions", entity.PageSizeOptions); - _writer.Write("ShowOnHomePage", entity.ShowOnHomePage.ToString()); - _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString()); - _writer.Write("Published", entity.Published.ToString()); - _writer.Write("Deleted", entity.Deleted.ToString()); - _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); - _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); - _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); - _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString()); - _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); - _writer.Write("Alias", (string)category.Alias); - _writer.Write("DefaultViewMode", entity.DefaultViewMode); - - WritePicture(category.Picture, "Picture"); - - WriteLocalized(category); - } - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteManufacturer(dynamic manufacturer, string node) - { - if (manufacturer == null) - return; - - Manufacturer entity = manufacturer.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("Name", (string)manufacturer.Name); - _writer.Write("SeName", (string)manufacturer.SeName); - _writer.Write("Description", (string)manufacturer.Description); + _writer.Write("DisplayLocale", entity.DisplayLocale); + _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); + _writer.Write("IsDefault", entity.IsDefault.ToString()); + + WriteLocalized(quantityUnit); + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WritePicture(dynamic picture, string node) + { + if (picture == null) + return; + + MediaFile entity = picture.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + var seoName = (string)picture.Name; + seoName = Path.GetFileNameWithoutExtension(seoName.EmptyNull()); + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("SeoFilename", seoName); + _writer.Write("MimeType", (string)picture.MimeType); + _writer.Write("ThumbImageUrl", (string)picture._ThumbImageUrl); + _writer.Write("ImageUrl", (string)picture._ImageUrl); + _writer.Write("FullSizeImageUrl", (string)picture._FullSizeImageUrl); + _writer.Write("FileName", (string)picture._FileName); + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteCategory(dynamic category, string node) + { + if (category == null) + return; + + Category entity = category.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + + if (!Exclude.HasFlag(ExportXmlExclude.Category)) + { + _writer.Write("Name", (string)category.Name); + _writer.Write("FullName", (string)category.FullName); + _writer.Write("Description", (string)category.Description); + _writer.Write("BottomDescription", (string)category.BottomDescription); + _writer.Write("CategoryTemplateId", entity.CategoryTemplateId.ToString()); + _writer.Write("CategoryTemplateViewPath", (string)category._CategoryTemplateViewPath); + _writer.Write("MetaKeywords", (string)category.MetaKeywords); + _writer.Write("MetaDescription", (string)category.MetaDescription); + _writer.Write("MetaTitle", (string)category.MetaTitle); + _writer.Write("SeName", (string)category.SeName); + _writer.Write("ParentCategoryId", entity.ParentCategoryId.ToString()); + _writer.Write("PictureId", entity.MediaFileId.ToString()); + _writer.Write("PageSize", entity.PageSize.ToString()); + _writer.Write("AllowCustomersToSelectPageSize", entity.AllowCustomersToSelectPageSize.ToString()); + _writer.Write("PageSizeOptions", entity.PageSizeOptions); + _writer.Write("ShowOnHomePage", entity.ShowOnHomePage.ToString()); + _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString()); + _writer.Write("Published", entity.Published.ToString()); + _writer.Write("Deleted", entity.Deleted.ToString()); + _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); + _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); + _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); + _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString()); + _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); + _writer.Write("Alias", (string)category.Alias); + _writer.Write("DefaultViewMode", entity.DefaultViewMode); + + WritePicture(category.Picture, "Picture"); + + WriteLocalized(category); + } + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteManufacturer(dynamic manufacturer, string node) + { + if (manufacturer == null) + return; + + Manufacturer entity = manufacturer.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("Name", (string)manufacturer.Name); + _writer.Write("SeName", (string)manufacturer.SeName); + _writer.Write("Description", (string)manufacturer.Description); _writer.Write("BottomDescription", (string)manufacturer.BottomDescription); _writer.Write("ManufacturerTemplateId", entity.ManufacturerTemplateId.ToString()); - _writer.Write("MetaKeywords", (string)manufacturer.MetaKeywords); - _writer.Write("MetaDescription", (string)manufacturer.MetaDescription); - _writer.Write("MetaTitle", (string)manufacturer.MetaTitle); - _writer.Write("PictureId", entity.MediaFileId.ToString()); - _writer.Write("PageSize", entity.PageSize.ToString()); - _writer.Write("AllowCustomersToSelectPageSize", entity.AllowCustomersToSelectPageSize.ToString()); - _writer.Write("PageSizeOptions", entity.PageSizeOptions); - _writer.Write("Published", entity.Published.ToString()); - _writer.Write("Deleted", entity.Deleted.ToString()); - _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); - _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); - _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); - _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString()); + _writer.Write("MetaKeywords", (string)manufacturer.MetaKeywords); + _writer.Write("MetaDescription", (string)manufacturer.MetaDescription); + _writer.Write("MetaTitle", (string)manufacturer.MetaTitle); + _writer.Write("PictureId", entity.MediaFileId.ToString()); + _writer.Write("PageSize", entity.PageSize.ToString()); + _writer.Write("AllowCustomersToSelectPageSize", entity.AllowCustomersToSelectPageSize.ToString()); + _writer.Write("PageSizeOptions", entity.PageSizeOptions); + _writer.Write("Published", entity.Published.ToString()); + _writer.Write("Deleted", entity.Deleted.ToString()); + _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); + _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); + _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); + _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString()); _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString()); _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); WritePicture(manufacturer.Picture, "Picture"); - WriteLocalized(manufacturer); - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteProduct(dynamic product, string node) - { - if (product == null) - return; - - Product entity = product.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - decimal? basePriceAmount = product.BasePriceAmount; - int? basePriceBaseAmount = product.BasePriceBaseAmount; - decimal? lowestAttributeCombinationPrice = product.LowestAttributeCombinationPrice; - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("Name", (string)product.Name); - _writer.Write("SeName", (string)product.SeName); - _writer.Write("ShortDescription", (string)product.ShortDescription); - _writer.Write("FullDescription", (string)product.FullDescription); - _writer.Write("AdminComment", (string)product.AdminComment); - _writer.Write("ProductTemplateId", entity.ProductTemplateId.ToString()); - _writer.Write("ProductTemplateViewPath", (string)product._ProductTemplateViewPath); - _writer.Write("ShowOnHomePage", entity.ShowOnHomePage.ToString()); - _writer.Write("HomePageDisplayOrder", entity.HomePageDisplayOrder.ToString()); - _writer.Write("MetaKeywords", (string)product.MetaKeywords); - _writer.Write("MetaDescription", (string)product.MetaDescription); - _writer.Write("MetaTitle", (string)product.MetaTitle); - _writer.Write("AllowCustomerReviews", entity.AllowCustomerReviews.ToString()); - _writer.Write("ApprovedRatingSum", entity.ApprovedRatingSum.ToString()); - _writer.Write("NotApprovedRatingSum", entity.NotApprovedRatingSum.ToString()); - _writer.Write("ApprovedTotalReviews", entity.ApprovedTotalReviews.ToString()); - _writer.Write("NotApprovedTotalReviews", entity.NotApprovedTotalReviews.ToString()); - _writer.Write("Published", entity.Published.ToString()); - _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); - _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); - _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString()); - _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); - _writer.Write("ProductTypeId", entity.ProductTypeId.ToString()); - _writer.Write("ParentGroupedProductId", entity.ParentGroupedProductId.ToString()); - _writer.Write("Sku", (string)product.Sku); - _writer.Write("ManufacturerPartNumber", (string)product.ManufacturerPartNumber); - _writer.Write("Gtin", (string)product.Gtin); - _writer.Write("IsGiftCard", entity.IsGiftCard.ToString()); - _writer.Write("GiftCardTypeId", entity.GiftCardTypeId.ToString()); - _writer.Write("RequireOtherProducts", entity.RequireOtherProducts.ToString()); - _writer.Write("RequiredProductIds", entity.RequiredProductIds); - _writer.Write("AutomaticallyAddRequiredProducts", entity.AutomaticallyAddRequiredProducts.ToString()); - _writer.Write("IsDownload", entity.IsDownload.ToString()); - _writer.Write("UnlimitedDownloads", entity.UnlimitedDownloads.ToString()); - _writer.Write("MaxNumberOfDownloads", entity.MaxNumberOfDownloads.ToString()); - _writer.Write("DownloadExpirationDays", entity.DownloadExpirationDays.HasValue ? entity.DownloadExpirationDays.Value.ToString() : ""); - _writer.Write("DownloadActivationTypeId", entity.DownloadActivationTypeId.ToString()); - _writer.Write("HasSampleDownload", entity.HasSampleDownload.ToString()); - _writer.Write("SampleDownloadId", entity.SampleDownloadId.HasValue ? entity.SampleDownloadId.Value.ToString() : ""); - _writer.Write("HasUserAgreement", entity.HasUserAgreement.ToString()); - _writer.Write("UserAgreementText", entity.UserAgreementText); - _writer.Write("IsRecurring", entity.IsRecurring.ToString()); - _writer.Write("RecurringCycleLength", entity.RecurringCycleLength.ToString()); - _writer.Write("RecurringCyclePeriodId", entity.RecurringCyclePeriodId.ToString()); - _writer.Write("RecurringTotalCycles", entity.RecurringTotalCycles.ToString()); - _writer.Write("IsShipEnabled", entity.IsShipEnabled.ToString()); - _writer.Write("IsFreeShipping", entity.IsFreeShipping.ToString()); - _writer.Write("AdditionalShippingCharge", entity.AdditionalShippingCharge.ToString(_culture)); - _writer.Write("IsTaxExempt", entity.IsTaxExempt.ToString()); - _writer.Write("TaxCategoryId", entity.TaxCategoryId.ToString()); - _writer.Write("ManageInventoryMethodId", entity.ManageInventoryMethodId.ToString()); - _writer.Write("StockQuantity", entity.StockQuantity.ToString()); - _writer.Write("DisplayStockAvailability", entity.DisplayStockAvailability.ToString()); - _writer.Write("DisplayStockQuantity", entity.DisplayStockQuantity.ToString()); - _writer.Write("MinStockQuantity", entity.MinStockQuantity.ToString()); - _writer.Write("LowStockActivityId", entity.LowStockActivityId.ToString()); - _writer.Write("NotifyAdminForQuantityBelow", entity.NotifyAdminForQuantityBelow.ToString()); - _writer.Write("BackorderModeId", entity.BackorderModeId.ToString()); - _writer.Write("AllowBackInStockSubscriptions", entity.AllowBackInStockSubscriptions.ToString()); - _writer.Write("OrderMinimumQuantity", entity.OrderMinimumQuantity.ToString()); - _writer.Write("OrderMaximumQuantity", entity.OrderMaximumQuantity.ToString()); - _writer.Write("QuantityStep", entity.QuantityStep.ToString()); - _writer.Write("QuantiyControlType", ((int)entity.QuantiyControlType).ToString()); - _writer.Write("HideQuantityControl", entity.HideQuantityControl.ToString()); + WriteLocalized(manufacturer); + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteProduct(dynamic product, string node) + { + if (product == null) + return; + + Product entity = product.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + decimal? basePriceAmount = product.BasePriceAmount; + int? basePriceBaseAmount = product.BasePriceBaseAmount; + decimal? lowestAttributeCombinationPrice = product.LowestAttributeCombinationPrice; + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("Name", (string)product.Name); + _writer.Write("SeName", (string)product.SeName); + _writer.Write("ShortDescription", (string)product.ShortDescription); + _writer.Write("FullDescription", (string)product.FullDescription); + _writer.Write("AdminComment", (string)product.AdminComment); + _writer.Write("ProductTemplateId", entity.ProductTemplateId.ToString()); + _writer.Write("ProductTemplateViewPath", (string)product._ProductTemplateViewPath); + _writer.Write("ShowOnHomePage", entity.ShowOnHomePage.ToString()); + _writer.Write("HomePageDisplayOrder", entity.HomePageDisplayOrder.ToString()); + _writer.Write("MetaKeywords", (string)product.MetaKeywords); + _writer.Write("MetaDescription", (string)product.MetaDescription); + _writer.Write("MetaTitle", (string)product.MetaTitle); + _writer.Write("AllowCustomerReviews", entity.AllowCustomerReviews.ToString()); + _writer.Write("ApprovedRatingSum", entity.ApprovedRatingSum.ToString()); + _writer.Write("NotApprovedRatingSum", entity.NotApprovedRatingSum.ToString()); + _writer.Write("ApprovedTotalReviews", entity.ApprovedTotalReviews.ToString()); + _writer.Write("NotApprovedTotalReviews", entity.NotApprovedTotalReviews.ToString()); + _writer.Write("Published", entity.Published.ToString()); + _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); + _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); + _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString()); + _writer.Write("LimitedToStores", entity.LimitedToStores.ToString()); + _writer.Write("ProductTypeId", entity.ProductTypeId.ToString()); + _writer.Write("ParentGroupedProductId", entity.ParentGroupedProductId.ToString()); + _writer.Write("Sku", (string)product.Sku); + _writer.Write("ManufacturerPartNumber", (string)product.ManufacturerPartNumber); + _writer.Write("Gtin", (string)product.Gtin); + _writer.Write("IsGiftCard", entity.IsGiftCard.ToString()); + _writer.Write("GiftCardTypeId", entity.GiftCardTypeId.ToString()); + _writer.Write("RequireOtherProducts", entity.RequireOtherProducts.ToString()); + _writer.Write("RequiredProductIds", entity.RequiredProductIds); + _writer.Write("AutomaticallyAddRequiredProducts", entity.AutomaticallyAddRequiredProducts.ToString()); + _writer.Write("IsDownload", entity.IsDownload.ToString()); + _writer.Write("UnlimitedDownloads", entity.UnlimitedDownloads.ToString()); + _writer.Write("MaxNumberOfDownloads", entity.MaxNumberOfDownloads.ToString()); + _writer.Write("DownloadExpirationDays", entity.DownloadExpirationDays.HasValue ? entity.DownloadExpirationDays.Value.ToString() : ""); + _writer.Write("DownloadActivationTypeId", entity.DownloadActivationTypeId.ToString()); + _writer.Write("HasSampleDownload", entity.HasSampleDownload.ToString()); + _writer.Write("SampleDownloadId", entity.SampleDownloadId.HasValue ? entity.SampleDownloadId.Value.ToString() : ""); + _writer.Write("HasUserAgreement", entity.HasUserAgreement.ToString()); + _writer.Write("UserAgreementText", entity.UserAgreementText); + _writer.Write("IsRecurring", entity.IsRecurring.ToString()); + _writer.Write("RecurringCycleLength", entity.RecurringCycleLength.ToString()); + _writer.Write("RecurringCyclePeriodId", entity.RecurringCyclePeriodId.ToString()); + _writer.Write("RecurringTotalCycles", entity.RecurringTotalCycles.ToString()); + _writer.Write("IsShipEnabled", entity.IsShipEnabled.ToString()); + _writer.Write("IsFreeShipping", entity.IsFreeShipping.ToString()); + _writer.Write("AdditionalShippingCharge", entity.AdditionalShippingCharge.ToString(_culture)); + _writer.Write("IsTaxExempt", entity.IsTaxExempt.ToString()); + _writer.Write("TaxCategoryId", entity.TaxCategoryId.ToString()); + _writer.Write("ManageInventoryMethodId", entity.ManageInventoryMethodId.ToString()); + _writer.Write("StockQuantity", entity.StockQuantity.ToString()); + _writer.Write("DisplayStockAvailability", entity.DisplayStockAvailability.ToString()); + _writer.Write("DisplayStockQuantity", entity.DisplayStockQuantity.ToString()); + _writer.Write("MinStockQuantity", entity.MinStockQuantity.ToString()); + _writer.Write("LowStockActivityId", entity.LowStockActivityId.ToString()); + _writer.Write("NotifyAdminForQuantityBelow", entity.NotifyAdminForQuantityBelow.ToString()); + _writer.Write("BackorderModeId", entity.BackorderModeId.ToString()); + _writer.Write("AllowBackInStockSubscriptions", entity.AllowBackInStockSubscriptions.ToString()); + _writer.Write("OrderMinimumQuantity", entity.OrderMinimumQuantity.ToString()); + _writer.Write("OrderMaximumQuantity", entity.OrderMaximumQuantity.ToString()); + _writer.Write("QuantityStep", entity.QuantityStep.ToString()); + _writer.Write("QuantiyControlType", ((int)entity.QuantiyControlType).ToString()); + _writer.Write("HideQuantityControl", entity.HideQuantityControl.ToString()); _writer.Write("AllowedQuantities", entity.AllowedQuantities); - _writer.Write("DisableBuyButton", entity.DisableBuyButton.ToString()); - _writer.Write("DisableWishlistButton", entity.DisableWishlistButton.ToString()); - _writer.Write("AvailableForPreOrder", entity.AvailableForPreOrder.ToString()); - _writer.Write("CallForPrice", entity.CallForPrice.ToString()); - _writer.Write("Price", entity.Price.ToString(_culture)); - _writer.Write("OldPrice", entity.OldPrice.ToString(_culture)); - _writer.Write("ProductCost", entity.ProductCost.ToString(_culture)); - _writer.Write("SpecialPrice", entity.SpecialPrice.HasValue ? entity.SpecialPrice.Value.ToString(_culture) : ""); - _writer.Write("SpecialPriceStartDateTimeUtc", entity.SpecialPriceStartDateTimeUtc.HasValue ? entity.SpecialPriceStartDateTimeUtc.Value.ToString(_culture) : ""); - _writer.Write("SpecialPriceEndDateTimeUtc", entity.SpecialPriceEndDateTimeUtc.HasValue ? entity.SpecialPriceEndDateTimeUtc.Value.ToString(_culture) : ""); - _writer.Write("CustomerEntersPrice", entity.CustomerEntersPrice.ToString()); - _writer.Write("MinimumCustomerEnteredPrice", entity.MinimumCustomerEnteredPrice.ToString(_culture)); - _writer.Write("MaximumCustomerEnteredPrice", entity.MaximumCustomerEnteredPrice.ToString(_culture)); - _writer.Write("HasTierPrices", entity.HasTierPrices.ToString()); - _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString()); - _writer.Write("MainPictureId", entity.MainPictureId.HasValue ? entity.MainPictureId.Value.ToString() : ""); - _writer.Write("Weight", ((decimal)product.Weight).ToString(_culture)); - _writer.Write("Length", ((decimal)product.Length).ToString(_culture)); - _writer.Write("Width", ((decimal)product.Width).ToString(_culture)); - _writer.Write("Height", ((decimal)product.Height).ToString(_culture)); - _writer.Write("AvailableStartDateTimeUtc", entity.AvailableStartDateTimeUtc.HasValue ? entity.AvailableStartDateTimeUtc.Value.ToString(_culture) : ""); - _writer.Write("AvailableEndDateTimeUtc", entity.AvailableEndDateTimeUtc.HasValue ? entity.AvailableEndDateTimeUtc.Value.ToString(_culture) : ""); - _writer.Write("BasePriceEnabled", ((bool)product.BasePriceEnabled).ToString()); - _writer.Write("BasePriceMeasureUnit", (string)product.BasePriceMeasureUnit); - _writer.Write("BasePriceAmount", basePriceAmount.HasValue ? basePriceAmount.Value.ToString(_culture) : ""); - _writer.Write("BasePriceBaseAmount", basePriceBaseAmount.HasValue ? basePriceBaseAmount.Value.ToString() : ""); - _writer.Write("BasePriceHasValue", ((bool)product.BasePriceHasValue).ToString()); - _writer.Write("BasePriceInfo", (string)product._BasePriceInfo); + _writer.Write("DisableBuyButton", entity.DisableBuyButton.ToString()); + _writer.Write("DisableWishlistButton", entity.DisableWishlistButton.ToString()); + _writer.Write("AvailableForPreOrder", entity.AvailableForPreOrder.ToString()); + _writer.Write("CallForPrice", entity.CallForPrice.ToString()); + _writer.Write("Price", entity.Price.ToString(_culture)); + _writer.Write("OldPrice", entity.OldPrice.ToString(_culture)); + _writer.Write("ProductCost", entity.ProductCost.ToString(_culture)); + _writer.Write("SpecialPrice", entity.SpecialPrice.HasValue ? entity.SpecialPrice.Value.ToString(_culture) : ""); + _writer.Write("SpecialPriceStartDateTimeUtc", entity.SpecialPriceStartDateTimeUtc.HasValue ? entity.SpecialPriceStartDateTimeUtc.Value.ToString(_culture) : ""); + _writer.Write("SpecialPriceEndDateTimeUtc", entity.SpecialPriceEndDateTimeUtc.HasValue ? entity.SpecialPriceEndDateTimeUtc.Value.ToString(_culture) : ""); + _writer.Write("CustomerEntersPrice", entity.CustomerEntersPrice.ToString()); + _writer.Write("MinimumCustomerEnteredPrice", entity.MinimumCustomerEnteredPrice.ToString(_culture)); + _writer.Write("MaximumCustomerEnteredPrice", entity.MaximumCustomerEnteredPrice.ToString(_culture)); + _writer.Write("HasTierPrices", entity.HasTierPrices.ToString()); + _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString()); + _writer.Write("MainPictureId", entity.MainPictureId.HasValue ? entity.MainPictureId.Value.ToString() : ""); + _writer.Write("Weight", ((decimal)product.Weight).ToString(_culture)); + _writer.Write("Length", ((decimal)product.Length).ToString(_culture)); + _writer.Write("Width", ((decimal)product.Width).ToString(_culture)); + _writer.Write("Height", ((decimal)product.Height).ToString(_culture)); + _writer.Write("AvailableStartDateTimeUtc", entity.AvailableStartDateTimeUtc.HasValue ? entity.AvailableStartDateTimeUtc.Value.ToString(_culture) : ""); + _writer.Write("AvailableEndDateTimeUtc", entity.AvailableEndDateTimeUtc.HasValue ? entity.AvailableEndDateTimeUtc.Value.ToString(_culture) : ""); + _writer.Write("BasePriceEnabled", ((bool)product.BasePriceEnabled).ToString()); + _writer.Write("BasePriceMeasureUnit", (string)product.BasePriceMeasureUnit); + _writer.Write("BasePriceAmount", basePriceAmount.HasValue ? basePriceAmount.Value.ToString(_culture) : ""); + _writer.Write("BasePriceBaseAmount", basePriceBaseAmount.HasValue ? basePriceBaseAmount.Value.ToString() : ""); + _writer.Write("BasePriceHasValue", ((bool)product.BasePriceHasValue).ToString()); + _writer.Write("BasePriceInfo", (string)product._BasePriceInfo); _writer.Write("Visibility", ((int)entity.Visibility).ToString()); _writer.Write("Condition", ((int)entity.Condition).ToString()); - _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); - _writer.Write("IsSystemProduct", entity.IsSystemProduct.ToString()); - _writer.Write("BundleTitleText", entity.BundleTitleText); - _writer.Write("BundlePerItemPricing", entity.BundlePerItemPricing.ToString()); - _writer.Write("BundlePerItemShipping", entity.BundlePerItemShipping.ToString()); - _writer.Write("BundlePerItemShoppingCart", entity.BundlePerItemShoppingCart.ToString()); - _writer.Write("LowestAttributeCombinationPrice", lowestAttributeCombinationPrice.HasValue ? lowestAttributeCombinationPrice.Value.ToString(_culture) : ""); - _writer.Write("IsEsd", entity.IsEsd.ToString()); - _writer.Write("CustomsTariffNumber", entity.CustomsTariffNumber); - - WriteLocalized(product); - - WriteDeliveryTime(product.DeliveryTime, "DeliveryTime"); - - WriteQuantityUnit(product.QuantityUnit, "QuantityUnit"); - - WriteCountry(product.CountryOfOrigin, "CountryOfOrigin"); - - if (product.AppliedDiscounts != null) - { - _writer.WriteStartElement("AppliedDiscounts"); - foreach (dynamic discount in product.AppliedDiscounts) - { - Discount entityDiscount = discount.Entity; - - _writer.WriteStartElement("AppliedDiscount"); - _writer.Write("Id", entityDiscount.Id.ToString()); - _writer.Write("Name", (string)discount.Name); - _writer.Write("DiscountTypeId", entityDiscount.DiscountTypeId.ToString()); - _writer.Write("UsePercentage", entityDiscount.UsePercentage.ToString()); - _writer.Write("DiscountPercentage", entityDiscount.DiscountPercentage.ToString(_culture)); - _writer.Write("DiscountAmount", entityDiscount.DiscountAmount.ToString(_culture)); - _writer.Write("StartDateUtc", entityDiscount.StartDateUtc.HasValue ? entityDiscount.StartDateUtc.Value.ToString(_culture) : ""); - _writer.Write("EndDateUtc", entityDiscount.EndDateUtc.HasValue ? entityDiscount.EndDateUtc.Value.ToString(_culture) : ""); - _writer.Write("RequiresCouponCode", entityDiscount.RequiresCouponCode.ToString()); - _writer.Write("CouponCode", entityDiscount.CouponCode); - _writer.Write("DiscountLimitationId", entityDiscount.DiscountLimitationId.ToString()); - _writer.Write("LimitationTimes", entityDiscount.LimitationTimes.ToString()); - _writer.WriteEndElement(); // AppliedDiscount - } - _writer.WriteEndElement(); // AppliedDiscounts - } + _writer.Write("DisplayOrder", entity.DisplayOrder.ToString()); + _writer.Write("IsSystemProduct", entity.IsSystemProduct.ToString()); + _writer.Write("BundleTitleText", entity.BundleTitleText); + _writer.Write("BundlePerItemPricing", entity.BundlePerItemPricing.ToString()); + _writer.Write("BundlePerItemShipping", entity.BundlePerItemShipping.ToString()); + _writer.Write("BundlePerItemShoppingCart", entity.BundlePerItemShoppingCart.ToString()); + _writer.Write("LowestAttributeCombinationPrice", lowestAttributeCombinationPrice.HasValue ? lowestAttributeCombinationPrice.Value.ToString(_culture) : ""); + _writer.Write("IsEsd", entity.IsEsd.ToString()); + _writer.Write("CustomsTariffNumber", entity.CustomsTariffNumber); + + WriteLocalized(product); + + WriteDeliveryTime(product.DeliveryTime, "DeliveryTime"); + + WriteQuantityUnit(product.QuantityUnit, "QuantityUnit"); + + WriteCountry(product.CountryOfOrigin, "CountryOfOrigin"); + + if (product.AppliedDiscounts != null) + { + _writer.WriteStartElement("AppliedDiscounts"); + foreach (dynamic discount in product.AppliedDiscounts) + { + Discount entityDiscount = discount.Entity; + + _writer.WriteStartElement("AppliedDiscount"); + _writer.Write("Id", entityDiscount.Id.ToString()); + _writer.Write("Name", (string)discount.Name); + _writer.Write("DiscountTypeId", entityDiscount.DiscountTypeId.ToString()); + _writer.Write("UsePercentage", entityDiscount.UsePercentage.ToString()); + _writer.Write("DiscountPercentage", entityDiscount.DiscountPercentage.ToString(_culture)); + _writer.Write("DiscountAmount", entityDiscount.DiscountAmount.ToString(_culture)); + _writer.Write("StartDateUtc", entityDiscount.StartDateUtc.HasValue ? entityDiscount.StartDateUtc.Value.ToString(_culture) : ""); + _writer.Write("EndDateUtc", entityDiscount.EndDateUtc.HasValue ? entityDiscount.EndDateUtc.Value.ToString(_culture) : ""); + _writer.Write("RequiresCouponCode", entityDiscount.RequiresCouponCode.ToString()); + _writer.Write("CouponCode", entityDiscount.CouponCode); + _writer.Write("DiscountLimitationId", entityDiscount.DiscountLimitationId.ToString()); + _writer.Write("LimitationTimes", entityDiscount.LimitationTimes.ToString()); + _writer.WriteEndElement(); // AppliedDiscount + } + _writer.WriteEndElement(); // AppliedDiscounts + } if (product.Downloads != null) { @@ -622,7 +616,7 @@ public void WriteProduct(dynamic product, string node) foreach (dynamic download in product.Downloads) { Download downloadEntity = download.Entity; - var mediaFile = downloadEntity.MediaFile; + var mediaFile = downloadEntity.MediaFile; _writer.WriteStartElement("Download"); _writer.Write("Id", downloadEntity.Id.ToString()); @@ -635,79 +629,79 @@ public void WriteProduct(dynamic product, string node) _writer.Write("EntityName", downloadEntity.EntityName); _writer.Write("FileVersion", downloadEntity.FileVersion); _writer.Write("Changelog", downloadEntity.Changelog); - if (!downloadEntity.UseDownloadUrl && mediaFile != null) - { - _writer.Write("ContentType", mediaFile.MimeType); - _writer.Write("Filename", mediaFile.Name); - _writer.Write("Extension", mediaFile.Extension); - _writer.Write("MediaStorageId", mediaFile.MediaStorageId.HasValue ? mediaFile.MediaStorageId.Value.ToString() : ""); - } - - _writer.WriteEndElement(); // Download + if (!downloadEntity.UseDownloadUrl && mediaFile != null) + { + _writer.Write("ContentType", mediaFile.MimeType); + _writer.Write("Filename", mediaFile.Name); + _writer.Write("Extension", mediaFile.Extension); + _writer.Write("MediaStorageId", mediaFile.MediaStorageId.HasValue ? mediaFile.MediaStorageId.Value.ToString() : ""); + } + + _writer.WriteEndElement(); // Download } _writer.WriteEndElement(); // Downloads } - if (product.TierPrices != null) - { - _writer.WriteStartElement("TierPrices"); - foreach (dynamic tierPrice in product.TierPrices) - { - TierPrice entityTierPrice = tierPrice.Entity; - - _writer.WriteStartElement("TierPrice"); - _writer.Write("Id", entityTierPrice.Id.ToString()); - _writer.Write("ProductId", entityTierPrice.ProductId.ToString()); - _writer.Write("StoreId", entityTierPrice.StoreId.ToString()); - _writer.Write("CustomerRoleId", entityTierPrice.CustomerRoleId.HasValue ? entityTierPrice.CustomerRoleId.Value.ToString() : ""); - _writer.Write("Quantity", entityTierPrice.Quantity.ToString()); - _writer.Write("Price", entityTierPrice.Price.ToString(_culture)); + if (product.TierPrices != null) + { + _writer.WriteStartElement("TierPrices"); + foreach (dynamic tierPrice in product.TierPrices) + { + TierPrice entityTierPrice = tierPrice.Entity; + + _writer.WriteStartElement("TierPrice"); + _writer.Write("Id", entityTierPrice.Id.ToString()); + _writer.Write("ProductId", entityTierPrice.ProductId.ToString()); + _writer.Write("StoreId", entityTierPrice.StoreId.ToString()); + _writer.Write("CustomerRoleId", entityTierPrice.CustomerRoleId.HasValue ? entityTierPrice.CustomerRoleId.Value.ToString() : ""); + _writer.Write("Quantity", entityTierPrice.Quantity.ToString()); + _writer.Write("Price", entityTierPrice.Price.ToString(_culture)); _writer.Write("CalculationMethod", ((int)entityTierPrice.CalculationMethod).ToString()); - _writer.WriteEndElement(); // TierPrice - } - _writer.WriteEndElement(); // TierPrices - } - - if (product.ProductTags != null) - { - _writer.WriteStartElement("ProductTags"); - foreach (dynamic tag in product.ProductTags) - { + _writer.WriteEndElement(); // TierPrice + } + _writer.WriteEndElement(); // TierPrices + } + + if (product.ProductTags != null) + { + _writer.WriteStartElement("ProductTags"); + foreach (dynamic tag in product.ProductTags) + { ProductTag entityTag = tag.Entity; - _writer.WriteStartElement("ProductTag"); - _writer.Write("Id", ((int)tag.Id).ToString()); - _writer.Write("Name", (string)tag.Name); - _writer.Write("SeName", (string)tag.SeName); + _writer.WriteStartElement("ProductTag"); + _writer.Write("Id", ((int)tag.Id).ToString()); + _writer.Write("Name", (string)tag.Name); + _writer.Write("SeName", (string)tag.SeName); _writer.Write("Published", entityTag.Published.ToString()); WriteLocalized(tag); - _writer.WriteEndElement(); // ProductTag - } - _writer.WriteEndElement(); // ProductTags - } - - if (product.ProductAttributes != null) - { - _writer.WriteStartElement("ProductAttributes"); - foreach (dynamic pva in product.ProductAttributes) - { - ProductVariantAttribute entityPva = pva.Entity; + _writer.WriteEndElement(); // ProductTag + } + _writer.WriteEndElement(); // ProductTags + } + + if (product.ProductAttributes != null) + { + _writer.WriteStartElement("ProductAttributes"); + foreach (dynamic pva in product.ProductAttributes) + { + ProductVariantAttribute entityPva = pva.Entity; ProductAttribute entityPa = pva.Attribute.Entity; _writer.WriteStartElement("ProductAttribute"); - _writer.Write("Id", entityPva.Id.ToString()); - _writer.Write("TextPrompt", (string)pva.TextPrompt); - _writer.Write("IsRequired", entityPva.IsRequired.ToString()); - _writer.Write("AttributeControlTypeId", entityPva.AttributeControlTypeId.ToString()); - _writer.Write("DisplayOrder", entityPva.DisplayOrder.ToString()); - - _writer.WriteStartElement("Attribute"); - _writer.Write("Id", entityPa.Id.ToString()); - _writer.Write("Alias", entityPa.Alias); - _writer.Write("Name", entityPa.Name); - _writer.Write("Description", entityPa.Description); + _writer.Write("Id", entityPva.Id.ToString()); + _writer.Write("TextPrompt", (string)pva.TextPrompt); + _writer.Write("IsRequired", entityPva.IsRequired.ToString()); + _writer.Write("AttributeControlTypeId", entityPva.AttributeControlTypeId.ToString()); + _writer.Write("DisplayOrder", entityPva.DisplayOrder.ToString()); + + _writer.WriteStartElement("Attribute"); + _writer.Write("Id", entityPa.Id.ToString()); + _writer.Write("Alias", entityPa.Alias); + _writer.Write("Name", entityPa.Name); + _writer.Write("Description", entityPa.Description); _writer.Write("AllowFiltering", entityPa.AllowFiltering.ToString()); _writer.Write("DisplayOrder", entityPa.DisplayOrder.ToString()); _writer.Write("FacetTemplateHint", ((int)entityPa.FacetTemplateHint).ToString()); @@ -715,250 +709,250 @@ public void WriteProduct(dynamic product, string node) WriteLocalized(pva.Attribute); - _writer.WriteEndElement(); // Attribute - - _writer.WriteStartElement("AttributeValues"); - foreach (dynamic value in pva.Attribute.Values) - { - ProductVariantAttributeValue entityPvav = value.Entity; - - _writer.WriteStartElement("AttributeValue"); - _writer.Write("Id", entityPvav.Id.ToString()); - _writer.Write("Alias", (string)value.Alias); - _writer.Write("Name", (string)value.Name); - _writer.Write("Color", (string)value.Color); - _writer.Write("PriceAdjustment", ((decimal)value.PriceAdjustment).ToString(_culture)); - _writer.Write("WeightAdjustment", ((decimal)value.WeightAdjustment).ToString(_culture)); - _writer.Write("IsPreSelected", entityPvav.IsPreSelected.ToString()); - _writer.Write("DisplayOrder", entityPvav.DisplayOrder.ToString()); - _writer.Write("ValueTypeId", entityPvav.ValueTypeId.ToString()); - _writer.Write("LinkedProductId", entityPvav.LinkedProductId.ToString()); - _writer.Write("Quantity", entityPvav.Quantity.ToString()); - - WriteLocalized(value); - - _writer.WriteEndElement(); // AttributeValue - } - _writer.WriteEndElement(); // AttributeValues - - _writer.WriteEndElement(); // ProductAttribute - } - _writer.WriteEndElement(); // ProductAttributes - } - - if (product.ProductAttributeCombinations != null) - { - _writer.WriteStartElement("ProductAttributeCombinations"); - foreach (dynamic combination in product.ProductAttributeCombinations) - { - ProductVariantAttributeCombination entityPvac = combination.Entity; - - _writer.WriteStartElement("ProductAttributeCombination"); - _writer.Write("Id", entityPvac.Id.ToString()); - _writer.Write("StockQuantity", entityPvac.StockQuantity.ToString()); - _writer.Write("AllowOutOfStockOrders", entityPvac.AllowOutOfStockOrders.ToString()); - _writer.Write("AttributesXml", entityPvac.AttributesXml); - _writer.Write("Sku", entityPvac.Sku); - _writer.Write("Gtin", entityPvac.Gtin); - _writer.Write("ManufacturerPartNumber", entityPvac.ManufacturerPartNumber); - _writer.Write("Price", entityPvac.Price.HasValue ? entityPvac.Price.Value.ToString(_culture) : ""); - _writer.Write("Length", entityPvac.Length.HasValue ? entityPvac.Length.Value.ToString(_culture) : ""); - _writer.Write("Width", entityPvac.Width.HasValue ? entityPvac.Width.Value.ToString(_culture) : ""); - _writer.Write("Height", entityPvac.Height.HasValue ? entityPvac.Height.Value.ToString(_culture) : ""); - _writer.Write("BasePriceAmount", entityPvac.BasePriceAmount.HasValue ? entityPvac.BasePriceAmount.Value.ToString(_culture) : ""); - _writer.Write("BasePriceBaseAmount", entityPvac.BasePriceBaseAmount.HasValue ? entityPvac.BasePriceBaseAmount.Value.ToString() : ""); - _writer.Write("AssignedPictureIds", entityPvac.AssignedMediaFileIds); - _writer.Write("IsActive", entityPvac.IsActive.ToString()); - - WriteDeliveryTime(combination.DeliveryTime, "DeliveryTime"); - - WriteQuantityUnit(combination.QuantityUnit, "QuantityUnit"); - - _writer.WriteStartElement("Pictures"); - foreach (dynamic assignedPicture in combination.Pictures) - { - WritePicture(assignedPicture, "Picture"); - } - _writer.WriteEndElement(); // Pictures - - _writer.WriteEndElement(); // ProductAttributeCombination - } - _writer.WriteEndElement(); // ProductAttributeCombinations - } - - if (product.ProductPictures != null) - { - _writer.WriteStartElement("ProductPictures"); - foreach (dynamic productPicture in product.ProductPictures) - { - ProductMediaFile entityProductPicture = productPicture.Entity; - - _writer.WriteStartElement("ProductPicture"); - _writer.Write("Id", entityProductPicture.Id.ToString()); - _writer.Write("DisplayOrder", entityProductPicture.DisplayOrder.ToString()); - - WritePicture(productPicture.Picture, "Picture"); - - _writer.WriteEndElement(); // ProductPicture - } - _writer.WriteEndElement(); // ProductPictures - } - - if (product.ProductCategories != null) - { - _writer.WriteStartElement("ProductCategories"); - foreach (dynamic productCategory in product.ProductCategories) - { - ProductCategory entityProductCategory = productCategory.Entity; - - _writer.WriteStartElement("ProductCategory"); - _writer.Write("Id", entityProductCategory.Id.ToString()); - _writer.Write("DisplayOrder", entityProductCategory.DisplayOrder.ToString()); - _writer.Write("IsFeaturedProduct", entityProductCategory.IsFeaturedProduct.ToString()); - - WriteCategory(productCategory.Category, "Category"); - - _writer.WriteEndElement(); // ProductCategory - } - _writer.WriteEndElement(); // ProductCategories - } - - if (product.ProductManufacturers != null) - { - _writer.WriteStartElement("ProductManufacturers"); - foreach (dynamic productManu in product.ProductManufacturers) - { - ProductManufacturer entityProductManu = productManu.Entity; - - _writer.WriteStartElement("ProductManufacturer"); - - _writer.Write("Id", entityProductManu.Id.ToString()); - _writer.Write("DisplayOrder", entityProductManu.DisplayOrder.ToString()); - _writer.Write("IsFeaturedProduct", entityProductManu.IsFeaturedProduct.ToString()); - - WriteManufacturer(productManu.Manufacturer, "Manufacturer"); - - _writer.WriteEndElement(); // ProductManufacturer - } - _writer.WriteEndElement(); // ProductManufacturers - } - - if (product.ProductSpecificationAttributes != null) - { - _writer.WriteStartElement("ProductSpecificationAttributes"); - foreach (dynamic psa in product.ProductSpecificationAttributes) - { - ProductSpecificationAttribute entityPsa = psa.Entity; - - _writer.WriteStartElement("ProductSpecificationAttribute"); - - _writer.Write("Id", entityPsa.Id.ToString()); - _writer.Write("ProductId", entityPsa.ProductId.ToString()); - _writer.Write("SpecificationAttributeOptionId", entityPsa.SpecificationAttributeOptionId.ToString()); - _writer.Write("AllowFiltering", entityPsa.AllowFiltering.ToString()); - _writer.Write("ShowOnProductPage", entityPsa.ShowOnProductPage.ToString()); - _writer.Write("DisplayOrder", entityPsa.DisplayOrder.ToString()); - - dynamic option = psa.SpecificationAttributeOption; - SpecificationAttributeOption entitySao = option.Entity; - SpecificationAttribute entitySa = option.SpecificationAttribute.Entity; - - _writer.WriteStartElement("SpecificationAttributeOption"); - _writer.Write("Id", entitySao.Id.ToString()); - _writer.Write("SpecificationAttributeId", entitySao.SpecificationAttributeId.ToString()); - _writer.Write("DisplayOrder", entitySao.DisplayOrder.ToString()); + _writer.WriteEndElement(); // Attribute + + _writer.WriteStartElement("AttributeValues"); + foreach (dynamic value in pva.Attribute.Values) + { + ProductVariantAttributeValue entityPvav = value.Entity; + + _writer.WriteStartElement("AttributeValue"); + _writer.Write("Id", entityPvav.Id.ToString()); + _writer.Write("Alias", (string)value.Alias); + _writer.Write("Name", (string)value.Name); + _writer.Write("Color", (string)value.Color); + _writer.Write("PriceAdjustment", ((decimal)value.PriceAdjustment).ToString(_culture)); + _writer.Write("WeightAdjustment", ((decimal)value.WeightAdjustment).ToString(_culture)); + _writer.Write("IsPreSelected", entityPvav.IsPreSelected.ToString()); + _writer.Write("DisplayOrder", entityPvav.DisplayOrder.ToString()); + _writer.Write("ValueTypeId", entityPvav.ValueTypeId.ToString()); + _writer.Write("LinkedProductId", entityPvav.LinkedProductId.ToString()); + _writer.Write("Quantity", entityPvav.Quantity.ToString()); + + WriteLocalized(value); + + _writer.WriteEndElement(); // AttributeValue + } + _writer.WriteEndElement(); // AttributeValues + + _writer.WriteEndElement(); // ProductAttribute + } + _writer.WriteEndElement(); // ProductAttributes + } + + if (product.ProductAttributeCombinations != null) + { + _writer.WriteStartElement("ProductAttributeCombinations"); + foreach (dynamic combination in product.ProductAttributeCombinations) + { + ProductVariantAttributeCombination entityPvac = combination.Entity; + + _writer.WriteStartElement("ProductAttributeCombination"); + _writer.Write("Id", entityPvac.Id.ToString()); + _writer.Write("StockQuantity", entityPvac.StockQuantity.ToString()); + _writer.Write("AllowOutOfStockOrders", entityPvac.AllowOutOfStockOrders.ToString()); + _writer.Write("AttributesXml", entityPvac.AttributesXml); + _writer.Write("Sku", entityPvac.Sku); + _writer.Write("Gtin", entityPvac.Gtin); + _writer.Write("ManufacturerPartNumber", entityPvac.ManufacturerPartNumber); + _writer.Write("Price", entityPvac.Price.HasValue ? entityPvac.Price.Value.ToString(_culture) : ""); + _writer.Write("Length", entityPvac.Length.HasValue ? entityPvac.Length.Value.ToString(_culture) : ""); + _writer.Write("Width", entityPvac.Width.HasValue ? entityPvac.Width.Value.ToString(_culture) : ""); + _writer.Write("Height", entityPvac.Height.HasValue ? entityPvac.Height.Value.ToString(_culture) : ""); + _writer.Write("BasePriceAmount", entityPvac.BasePriceAmount.HasValue ? entityPvac.BasePriceAmount.Value.ToString(_culture) : ""); + _writer.Write("BasePriceBaseAmount", entityPvac.BasePriceBaseAmount.HasValue ? entityPvac.BasePriceBaseAmount.Value.ToString() : ""); + _writer.Write("AssignedPictureIds", entityPvac.AssignedMediaFileIds); + _writer.Write("IsActive", entityPvac.IsActive.ToString()); + + WriteDeliveryTime(combination.DeliveryTime, "DeliveryTime"); + + WriteQuantityUnit(combination.QuantityUnit, "QuantityUnit"); + + _writer.WriteStartElement("Pictures"); + foreach (dynamic assignedPicture in combination.Pictures) + { + WritePicture(assignedPicture, "Picture"); + } + _writer.WriteEndElement(); // Pictures + + _writer.WriteEndElement(); // ProductAttributeCombination + } + _writer.WriteEndElement(); // ProductAttributeCombinations + } + + if (product.ProductPictures != null) + { + _writer.WriteStartElement("ProductPictures"); + foreach (dynamic productPicture in product.ProductPictures) + { + ProductMediaFile entityProductPicture = productPicture.Entity; + + _writer.WriteStartElement("ProductPicture"); + _writer.Write("Id", entityProductPicture.Id.ToString()); + _writer.Write("DisplayOrder", entityProductPicture.DisplayOrder.ToString()); + + WritePicture(productPicture.Picture, "Picture"); + + _writer.WriteEndElement(); // ProductPicture + } + _writer.WriteEndElement(); // ProductPictures + } + + if (product.ProductCategories != null) + { + _writer.WriteStartElement("ProductCategories"); + foreach (dynamic productCategory in product.ProductCategories) + { + ProductCategory entityProductCategory = productCategory.Entity; + + _writer.WriteStartElement("ProductCategory"); + _writer.Write("Id", entityProductCategory.Id.ToString()); + _writer.Write("DisplayOrder", entityProductCategory.DisplayOrder.ToString()); + _writer.Write("IsFeaturedProduct", entityProductCategory.IsFeaturedProduct.ToString()); + + WriteCategory(productCategory.Category, "Category"); + + _writer.WriteEndElement(); // ProductCategory + } + _writer.WriteEndElement(); // ProductCategories + } + + if (product.ProductManufacturers != null) + { + _writer.WriteStartElement("ProductManufacturers"); + foreach (dynamic productManu in product.ProductManufacturers) + { + ProductManufacturer entityProductManu = productManu.Entity; + + _writer.WriteStartElement("ProductManufacturer"); + + _writer.Write("Id", entityProductManu.Id.ToString()); + _writer.Write("DisplayOrder", entityProductManu.DisplayOrder.ToString()); + _writer.Write("IsFeaturedProduct", entityProductManu.IsFeaturedProduct.ToString()); + + WriteManufacturer(productManu.Manufacturer, "Manufacturer"); + + _writer.WriteEndElement(); // ProductManufacturer + } + _writer.WriteEndElement(); // ProductManufacturers + } + + if (product.ProductSpecificationAttributes != null) + { + _writer.WriteStartElement("ProductSpecificationAttributes"); + foreach (dynamic psa in product.ProductSpecificationAttributes) + { + ProductSpecificationAttribute entityPsa = psa.Entity; + + _writer.WriteStartElement("ProductSpecificationAttribute"); + + _writer.Write("Id", entityPsa.Id.ToString()); + _writer.Write("ProductId", entityPsa.ProductId.ToString()); + _writer.Write("SpecificationAttributeOptionId", entityPsa.SpecificationAttributeOptionId.ToString()); + _writer.Write("AllowFiltering", entityPsa.AllowFiltering.ToString()); + _writer.Write("ShowOnProductPage", entityPsa.ShowOnProductPage.ToString()); + _writer.Write("DisplayOrder", entityPsa.DisplayOrder.ToString()); + + dynamic option = psa.SpecificationAttributeOption; + SpecificationAttributeOption entitySao = option.Entity; + SpecificationAttribute entitySa = option.SpecificationAttribute.Entity; + + _writer.WriteStartElement("SpecificationAttributeOption"); + _writer.Write("Id", entitySao.Id.ToString()); + _writer.Write("SpecificationAttributeId", entitySao.SpecificationAttributeId.ToString()); + _writer.Write("DisplayOrder", entitySao.DisplayOrder.ToString()); _writer.Write("NumberValue", ((decimal)option.NumberValue).ToString(_culture)); _writer.Write("Color", (string)option.Color); _writer.Write("Name", (string)option.Name); - _writer.Write("Alias", (string)option.Alias); - - WriteLocalized(option); - - _writer.WriteStartElement("SpecificationAttribute"); - _writer.Write("Id", entitySa.Id.ToString()); - _writer.Write("Name", (string)option.SpecificationAttribute.Name); - _writer.Write("Alias", (string)option.SpecificationAttribute.Alias); - _writer.Write("DisplayOrder", entitySa.DisplayOrder.ToString()); - _writer.Write("AllowFiltering", entitySa.AllowFiltering.ToString()); - _writer.Write("ShowOnProductPage", entitySa.ShowOnProductPage.ToString()); - _writer.Write("FacetSorting", ((int)entitySa.FacetSorting).ToString()); - _writer.Write("FacetTemplateHint", ((int)entitySa.FacetTemplateHint).ToString()); + _writer.Write("Alias", (string)option.Alias); + + WriteLocalized(option); + + _writer.WriteStartElement("SpecificationAttribute"); + _writer.Write("Id", entitySa.Id.ToString()); + _writer.Write("Name", (string)option.SpecificationAttribute.Name); + _writer.Write("Alias", (string)option.SpecificationAttribute.Alias); + _writer.Write("DisplayOrder", entitySa.DisplayOrder.ToString()); + _writer.Write("AllowFiltering", entitySa.AllowFiltering.ToString()); + _writer.Write("ShowOnProductPage", entitySa.ShowOnProductPage.ToString()); + _writer.Write("FacetSorting", ((int)entitySa.FacetSorting).ToString()); + _writer.Write("FacetTemplateHint", ((int)entitySa.FacetTemplateHint).ToString()); _writer.Write("IndexOptionNames", entitySa.IndexOptionNames.ToString()); - WriteLocalized(option.SpecificationAttribute); - - _writer.WriteEndElement(); // SpecificationAttribute - _writer.WriteEndElement(); // SpecificationAttributeOption - - _writer.WriteEndElement(); // ProductSpecificationAttribute - } - _writer.WriteEndElement(); // ProductSpecificationAttributes - } - - if (product.ProductBundleItems != null) - { - _writer.WriteStartElement("ProductBundleItems"); - foreach (dynamic bundleItem in product.ProductBundleItems) - { - ProductBundleItem entityPbi = bundleItem.Entity; - - _writer.WriteStartElement("ProductBundleItem"); - _writer.Write("Id", entityPbi.Id.ToString()); - _writer.Write("ProductId", entityPbi.ProductId.ToString()); - _writer.Write("BundleProductId", entityPbi.BundleProductId.ToString()); - _writer.Write("Quantity", entityPbi.Quantity.ToString()); - _writer.Write("Discount", entityPbi.Discount.HasValue ? entityPbi.Discount.Value.ToString(_culture) : ""); - _writer.Write("DiscountPercentage", entityPbi.DiscountPercentage.ToString()); - _writer.Write("Name", (string)bundleItem.Name); - _writer.Write("ShortDescription", (string)bundleItem.ShortDescription); - _writer.Write("FilterAttributes", entityPbi.FilterAttributes.ToString()); - _writer.Write("HideThumbnail", entityPbi.HideThumbnail.ToString()); - _writer.Write("Visible", entityPbi.Visible.ToString()); - _writer.Write("Published", entityPbi.Published.ToString()); - _writer.Write("DisplayOrder", ((int)bundleItem.DisplayOrder).ToString()); - _writer.Write("CreatedOnUtc", entityPbi.CreatedOnUtc.ToString(_culture)); - _writer.Write("UpdatedOnUtc", entityPbi.UpdatedOnUtc.ToString(_culture)); - - WriteLocalized(bundleItem); - - _writer.WriteEndElement(); // ProductBundleItem - } - _writer.WriteEndElement(); // ProductBundleItems - } - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteCustomer(dynamic customer, string node) - { - if (customer == null) - return; - - Customer entity = customer.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("CustomerGuid", entity.CustomerGuid.ToString()); - _writer.Write("Username", entity.Username); - _writer.Write("Email", entity.Email); - _writer.Write("AdminComment", entity.AdminComment); - _writer.Write("IsTaxExempt", entity.IsTaxExempt.ToString()); - _writer.Write("AffiliateId", entity.AffiliateId.ToString()); - _writer.Write("Active", entity.Active.ToString()); - _writer.Write("Deleted", entity.Deleted.ToString()); - _writer.Write("IsSystemAccount", entity.IsSystemAccount.ToString()); - _writer.Write("SystemName", entity.SystemName); - _writer.Write("LastIpAddress", entity.LastIpAddress); - _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); - _writer.Write("LastLoginDateUtc", entity.LastLoginDateUtc.HasValue ? entity.LastLoginDateUtc.Value.ToString(_culture) : ""); - _writer.Write("LastActivityDateUtc", entity.LastActivityDateUtc.ToString(_culture)); + WriteLocalized(option.SpecificationAttribute); + + _writer.WriteEndElement(); // SpecificationAttribute + _writer.WriteEndElement(); // SpecificationAttributeOption + + _writer.WriteEndElement(); // ProductSpecificationAttribute + } + _writer.WriteEndElement(); // ProductSpecificationAttributes + } + + if (product.ProductBundleItems != null) + { + _writer.WriteStartElement("ProductBundleItems"); + foreach (dynamic bundleItem in product.ProductBundleItems) + { + ProductBundleItem entityPbi = bundleItem.Entity; + + _writer.WriteStartElement("ProductBundleItem"); + _writer.Write("Id", entityPbi.Id.ToString()); + _writer.Write("ProductId", entityPbi.ProductId.ToString()); + _writer.Write("BundleProductId", entityPbi.BundleProductId.ToString()); + _writer.Write("Quantity", entityPbi.Quantity.ToString()); + _writer.Write("Discount", entityPbi.Discount.HasValue ? entityPbi.Discount.Value.ToString(_culture) : ""); + _writer.Write("DiscountPercentage", entityPbi.DiscountPercentage.ToString()); + _writer.Write("Name", (string)bundleItem.Name); + _writer.Write("ShortDescription", (string)bundleItem.ShortDescription); + _writer.Write("FilterAttributes", entityPbi.FilterAttributes.ToString()); + _writer.Write("HideThumbnail", entityPbi.HideThumbnail.ToString()); + _writer.Write("Visible", entityPbi.Visible.ToString()); + _writer.Write("Published", entityPbi.Published.ToString()); + _writer.Write("DisplayOrder", ((int)bundleItem.DisplayOrder).ToString()); + _writer.Write("CreatedOnUtc", entityPbi.CreatedOnUtc.ToString(_culture)); + _writer.Write("UpdatedOnUtc", entityPbi.UpdatedOnUtc.ToString(_culture)); + + WriteLocalized(bundleItem); + + _writer.WriteEndElement(); // ProductBundleItem + } + _writer.WriteEndElement(); // ProductBundleItems + } + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteCustomer(dynamic customer, string node) + { + if (customer == null) + return; + + Customer entity = customer.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("CustomerGuid", entity.CustomerGuid.ToString()); + _writer.Write("Username", entity.Username); + _writer.Write("Email", entity.Email); + _writer.Write("AdminComment", entity.AdminComment); + _writer.Write("IsTaxExempt", entity.IsTaxExempt.ToString()); + _writer.Write("AffiliateId", entity.AffiliateId.ToString()); + _writer.Write("Active", entity.Active.ToString()); + _writer.Write("Deleted", entity.Deleted.ToString()); + _writer.Write("IsSystemAccount", entity.IsSystemAccount.ToString()); + _writer.Write("SystemName", entity.SystemName); + _writer.Write("LastIpAddress", entity.LastIpAddress); + _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); + _writer.Write("LastLoginDateUtc", entity.LastLoginDateUtc.HasValue ? entity.LastLoginDateUtc.Value.ToString(_culture) : ""); + _writer.Write("LastActivityDateUtc", entity.LastActivityDateUtc.ToString(_culture)); _writer.Write("Salutation", entity.Salutation); _writer.Write("Title", entity.Title); _writer.Write("FirstName", entity.FirstName); @@ -969,92 +963,92 @@ public void WriteCustomer(dynamic customer, string node) _writer.Write("BirthDate", entity.BirthDate.HasValue ? entity.BirthDate.Value.ToString(_culture) : ""); _writer.Write("RewardPointsBalance", ((int)customer._RewardPointsBalance).ToString()); - if (customer.CustomerRoles != null) - { - _writer.WriteStartElement("CustomerRoles"); - foreach (dynamic role in customer.CustomerRoles) - { - CustomerRole entityRole = role.Entity; - - _writer.WriteStartElement("CustomerRole"); - _writer.Write("Id", entityRole.Id.ToString()); - _writer.Write("Name", (string)role.Name); - _writer.Write("FreeShipping", entityRole.FreeShipping.ToString()); - _writer.Write("TaxExempt", entityRole.TaxExempt.ToString()); - _writer.Write("TaxDisplayType", entityRole.TaxDisplayType.HasValue ? entityRole.TaxDisplayType.Value.ToString() : ""); - _writer.Write("Active", entityRole.Active.ToString()); - _writer.Write("IsSystemRole", entityRole.IsSystemRole.ToString()); - _writer.Write("SystemName", entityRole.SystemName); - _writer.WriteEndElement(); // CustomerRole - } - _writer.WriteEndElement(); // CustomerRoles - } - - WriteRewardPointsHistory(customer.RewardPointsHistory, "RewardPointsHistories"); - WriteAddress(customer.BillingAddress, "BillingAddress"); - WriteAddress(customer.ShippingAddress, "ShippingAddress"); - - if (customer.Addresses != null) - { - _writer.WriteStartElement("Addresses"); - foreach (dynamic address in customer.Addresses) - { - WriteAddress(address, "Address"); - } - _writer.WriteEndElement(); // Addresses - } - - WriteGenericAttributes(customer); - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - - public void WriteShoppingCartItem(dynamic shoppingCartItem, string node) - { - if (shoppingCartItem == null) - return; - - ShoppingCartItem entity = shoppingCartItem.Entity; - - if (node.HasValue()) - { - _writer.WriteStartElement(node); - } - - _writer.Write("Id", entity.Id.ToString()); - _writer.Write("StoreId", entity.StoreId.ToString()); - _writer.Write("ParentItemId", entity.ParentItemId.HasValue ? entity.ParentItemId.Value.ToString() : ""); - _writer.Write("BundleItemId", entity.BundleItemId.HasValue ? entity.BundleItemId.Value.ToString() : ""); - _writer.Write("ShoppingCartTypeId", entity.ShoppingCartTypeId.ToString()); - _writer.Write("CustomerId", entity.CustomerId.ToString()); - _writer.Write("ProductId", entity.ProductId.ToString()); - _writer.Write("AttributesXml", entity.AttributesXml, null, true); - _writer.Write("CustomerEnteredPrice", entity.CustomerEnteredPrice.ToString(_culture)); - _writer.Write("Quantity", entity.Quantity.ToString()); - _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); - _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); - - WriteCustomer(shoppingCartItem.Customer, "Customer"); - WriteProduct(shoppingCartItem.Product, "Product"); - - if (node.HasValue()) - { - _writer.WriteEndElement(); - } - } - } - - - /// - /// Allows to exclude XML nodes from export - /// - [Flags] - public enum ExportXmlExclude - { - None = 0, - Category = 1 - } + if (customer.CustomerRoles != null) + { + _writer.WriteStartElement("CustomerRoles"); + foreach (dynamic role in customer.CustomerRoles) + { + CustomerRole entityRole = role.Entity; + + _writer.WriteStartElement("CustomerRole"); + _writer.Write("Id", entityRole.Id.ToString()); + _writer.Write("Name", (string)role.Name); + _writer.Write("FreeShipping", entityRole.FreeShipping.ToString()); + _writer.Write("TaxExempt", entityRole.TaxExempt.ToString()); + _writer.Write("TaxDisplayType", entityRole.TaxDisplayType.HasValue ? entityRole.TaxDisplayType.Value.ToString() : ""); + _writer.Write("Active", entityRole.Active.ToString()); + _writer.Write("IsSystemRole", entityRole.IsSystemRole.ToString()); + _writer.Write("SystemName", entityRole.SystemName); + _writer.WriteEndElement(); // CustomerRole + } + _writer.WriteEndElement(); // CustomerRoles + } + + WriteRewardPointsHistory(customer.RewardPointsHistory, "RewardPointsHistories"); + WriteAddress(customer.BillingAddress, "BillingAddress"); + WriteAddress(customer.ShippingAddress, "ShippingAddress"); + + if (customer.Addresses != null) + { + _writer.WriteStartElement("Addresses"); + foreach (dynamic address in customer.Addresses) + { + WriteAddress(address, "Address"); + } + _writer.WriteEndElement(); // Addresses + } + + WriteGenericAttributes(customer); + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + + public void WriteShoppingCartItem(dynamic shoppingCartItem, string node) + { + if (shoppingCartItem == null) + return; + + ShoppingCartItem entity = shoppingCartItem.Entity; + + if (node.HasValue()) + { + _writer.WriteStartElement(node); + } + + _writer.Write("Id", entity.Id.ToString()); + _writer.Write("StoreId", entity.StoreId.ToString()); + _writer.Write("ParentItemId", entity.ParentItemId.HasValue ? entity.ParentItemId.Value.ToString() : ""); + _writer.Write("BundleItemId", entity.BundleItemId.HasValue ? entity.BundleItemId.Value.ToString() : ""); + _writer.Write("ShoppingCartTypeId", entity.ShoppingCartTypeId.ToString()); + _writer.Write("CustomerId", entity.CustomerId.ToString()); + _writer.Write("ProductId", entity.ProductId.ToString()); + _writer.Write("AttributesXml", entity.AttributesXml, null, true); + _writer.Write("CustomerEnteredPrice", entity.CustomerEnteredPrice.ToString(_culture)); + _writer.Write("Quantity", entity.Quantity.ToString()); + _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture)); + _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture)); + + WriteCustomer(shoppingCartItem.Customer, "Customer"); + WriteProduct(shoppingCartItem.Product, "Product"); + + if (node.HasValue()) + { + _writer.WriteEndElement(); + } + } + } + + + /// + /// Allows to exclude XML nodes from export + /// + [Flags] + public enum ExportXmlExclude + { + None = 0, + Category = 1 + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs index 19ff8e74b1..428048be79 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs @@ -10,67 +10,67 @@ namespace SmartStore.Services.DataExchange.Export { - public interface IDataExporter - { - DataExportResult Export(DataExportRequest request, CancellationToken cancellationToken); + public interface IDataExporter + { + DataExportResult Export(DataExportRequest request, CancellationToken cancellationToken); DataExportPreviewResult Preview(DataExportRequest request, int pageIndex); - /// - /// Creates a product export context for fast retrieval (eager loading) of product navigation properties. - /// - /// Products. null to lazy load data if required. - /// Customer, null to use current customer. - /// Store identifier, null to use current store. - /// Pictures per product, null to load all pictures per product. - /// A value indicating whether to include hidden records. - /// Product export context - ProductExportContext CreateProductExportContext( - IEnumerable products = null, - Customer customer = null, - int? storeId = null, - int? maxPicturesPerProduct = null, - bool includeHidden = true); - } + /// + /// Creates a product export context for fast retrieval (eager loading) of product navigation properties. + /// + /// Products. null to lazy load data if required. + /// Customer, null to use current customer. + /// Store identifier, null to use current store. + /// Pictures per product, null to load all pictures per product. + /// A value indicating whether to include hidden records. + /// Product export context + ProductExportContext CreateProductExportContext( + IEnumerable products = null, + Customer customer = null, + int? storeId = null, + int? maxPicturesPerProduct = null, + bool includeHidden = true); + } - public class DataExportRequest - { - private readonly static ProgressValueSetter _voidProgressValueSetter = DataExportRequest.SetProgress; + public class DataExportRequest + { + private readonly static ProgressValueSetter _voidProgressValueSetter = DataExportRequest.SetProgress; - public DataExportRequest(ExportProfile profile, Provider provider) - { - Guard.NotNull(profile, nameof(profile)); - Guard.NotNull(provider, nameof(provider)); + public DataExportRequest(ExportProfile profile, Provider provider) + { + Guard.NotNull(profile, nameof(profile)); + Guard.NotNull(provider, nameof(provider)); - Profile = profile; - Provider = provider; - ProgressValueSetter = _voidProgressValueSetter; + Profile = profile; + Provider = provider; + ProgressValueSetter = _voidProgressValueSetter; - EntitiesToExport = new List(); - CustomData = new Dictionary(StringComparer.OrdinalIgnoreCase); - } + EntitiesToExport = new List(); + CustomData = new Dictionary(StringComparer.OrdinalIgnoreCase); + } - public ExportProfile Profile { get; private set; } + public ExportProfile Profile { get; private set; } - public Provider Provider { get; private set; } + public Provider Provider { get; private set; } - public ProgressValueSetter ProgressValueSetter { get; set; } + public ProgressValueSetter ProgressValueSetter { get; set; } - public bool HasPermission { get; set; } + public bool HasPermission { get; set; } - public IList EntitiesToExport { get; set; } + public IList EntitiesToExport { get; set; } - public string ActionOrigin { get; set; } + public string ActionOrigin { get; set; } - public IDictionary CustomData { get; private set; } + public IDictionary CustomData { get; private set; } - public IQueryable ProductQuery { get; set; } + public IQueryable ProductQuery { get; set; } - private static void SetProgress(int val, int max, string msg) - { - // do nothing - } - } + private static void SetProgress(int val, int max, string msg) + { + // do nothing + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs index b0b0c8a6bd..f5c0ab977c 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs @@ -6,117 +6,117 @@ namespace SmartStore.Services.DataExchange.Export { - public interface IExportProfileService - { - /// - /// Inserts an export profile - /// - /// Provider system name - /// The name of the profile - /// File extension supported by provider - /// Features supportde by provider - /// Whether the new profile is a system profile - /// Profile system name - /// Identifier of a profile the settings should be copied from - /// New export profile - ExportProfile InsertExportProfile( - string providerSystemName, - string name, - string fileExtension, - ExportFeatures features, - bool isSystemProfile = false, - string profileSystemName = null, - int cloneFromProfileId = 0); + public interface IExportProfileService + { + /// + /// Inserts an export profile + /// + /// Provider system name + /// The name of the profile + /// File extension supported by provider + /// Features supportde by provider + /// Whether the new profile is a system profile + /// Profile system name + /// Identifier of a profile the settings should be copied from + /// New export profile + ExportProfile InsertExportProfile( + string providerSystemName, + string name, + string fileExtension, + ExportFeatures features, + bool isSystemProfile = false, + string profileSystemName = null, + int cloneFromProfileId = 0); - /// - /// Inserts an export profile - /// - /// Export provider - /// Whether the new profile is a system profile - /// Profile system name - /// Identifier of a profile the settings should be copied from - /// New export profile - ExportProfile InsertExportProfile( - Provider provider, - bool isSystemProfile = false, - string profileSystemName = null, - int cloneFromProfileId = 0); + /// + /// Inserts an export profile + /// + /// Export provider + /// Whether the new profile is a system profile + /// Profile system name + /// Identifier of a profile the settings should be copied from + /// New export profile + ExportProfile InsertExportProfile( + Provider provider, + bool isSystemProfile = false, + string profileSystemName = null, + int cloneFromProfileId = 0); - /// - /// Updates an export profile - /// - /// Export profile - void UpdateExportProfile(ExportProfile profile); + /// + /// Updates an export profile + /// + /// Export profile + void UpdateExportProfile(ExportProfile profile); - /// - /// Deletes an export profile - /// - /// Export profile - /// Whether to delete system profiles - void DeleteExportProfile(ExportProfile profile, bool force = false); + /// + /// Deletes an export profile + /// + /// Export profile + /// Whether to delete system profiles + void DeleteExportProfile(ExportProfile profile, bool force = false); - /// - /// Get queryable export profiles - /// - /// Whether to filter enabled or disabled profiles - /// Export profiles - IQueryable GetExportProfiles(bool? enabled = null); + /// + /// Get queryable export profiles + /// + /// Whether to filter enabled or disabled profiles + /// Export profiles + IQueryable GetExportProfiles(bool? enabled = null); - /// - /// Gets an export profile by identifier - /// - /// Export profile identifier - /// Export profile - ExportProfile GetExportProfileById(int id); + /// + /// Gets an export profile by identifier + /// + /// Export profile identifier + /// Export profile + ExportProfile GetExportProfileById(int id); - /// - /// Gets system export profile by provider system name - /// - /// Provider system name - /// - ExportProfile GetSystemExportProfile(string providerSystemName); + /// + /// Gets system export profile by provider system name + /// + /// Provider system name + /// + ExportProfile GetSystemExportProfile(string providerSystemName); - /// - /// Gets export profiles by provider system name - /// - /// Provider system name - /// List of export profiles - IList GetExportProfilesBySystemName(string providerSystemName); + /// + /// Gets export profiles by provider system name + /// + /// Provider system name + /// List of export profiles + IList GetExportProfilesBySystemName(string providerSystemName); - /// - /// Load all export providers - /// - /// Store identifier - /// Whether to load hidden providers - /// Export providers - IEnumerable> LoadAllExportProviders(int storeId = 0, bool showHidden = true); + /// + /// Load all export providers + /// + /// Store identifier + /// Whether to load hidden providers + /// Export providers + IEnumerable> LoadAllExportProviders(int storeId = 0, bool showHidden = true); - /// - /// Load export provider by system name - /// - /// Provider system name - /// Store identifier - /// Export provider - Provider LoadProvider(string systemName, int storeId = 0); + /// + /// Load export provider by system name + /// + /// Provider system name + /// Store identifier + /// Export provider + Provider LoadProvider(string systemName, int storeId = 0); - /// - /// Get export deployment by identifier - /// - /// Export deployment identifier - /// Export deployment - ExportDeployment GetExportDeploymentById(int id); + /// + /// Get export deployment by identifier + /// + /// Export deployment identifier + /// Export deployment + ExportDeployment GetExportDeploymentById(int id); - /// - /// Update an export deployment - /// - /// Export deployment - void UpdateExportDeployment(ExportDeployment deployment); + /// + /// Update an export deployment + /// + /// Export deployment + void UpdateExportDeployment(ExportDeployment deployment); - /// - /// Deleted an export deployment - /// - /// Export deployment - void DeleteExportDeployment(ExportDeployment deployment); - } + /// + /// Deleted an export deployment + /// + /// Export deployment + void DeleteExportDeployment(ExportDeployment deployment); + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs index 60be2e11a9..f73c64a3ea 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs @@ -3,33 +3,33 @@ namespace SmartStore.Services.DataExchange.Export { - public partial interface IExportProvider : IProvider, IUserEditable - { - /// - /// The exported entity type - /// - ExportEntityType EntityType { get; } + public partial interface IExportProvider : IProvider, IUserEditable + { + /// + /// The exported entity type + /// + ExportEntityType EntityType { get; } - /// - /// File extension of the export files (without dot). Return null for a non file based, on-the-fly export. - /// - string FileExtension { get; } + /// + /// File extension of the export files (without dot). Return null for a non file based, on-the-fly export. + /// + string FileExtension { get; } - /// - /// Get provider specific configuration information. Return null when no provider specific configuration is required. - /// - ExportConfigurationInfo ConfigurationInfo { get; } + /// + /// Get provider specific configuration information. Return null when no provider specific configuration is required. + /// + ExportConfigurationInfo ConfigurationInfo { get; } - /// - /// Export data to a file - /// - /// Export execution context - void Execute(ExportExecuteContext context); + /// + /// Export data to a file + /// + /// Export execution context + void Execute(ExportExecuteContext context); - /// - /// Called once per store when export execution ended - /// - /// Export execution context - void OnExecuted(ExportExecuteContext context); - } + /// + /// Called once per store when export execution ended + /// + /// Export execution context + void OnExecuted(ExportExecuteContext context); + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CategoryExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CategoryExportContext.cs index 2ef0903f5c..db7aa9e92f 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CategoryExportContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CategoryExportContext.cs @@ -8,70 +8,70 @@ namespace SmartStore.Services.DataExchange.Export.Internal { internal class CategoryExportContext - { - protected List _categoryIds; - protected List _fileIds; + { + protected List _categoryIds; + protected List _fileIds; - private Func> _funcProductCategories; - private Func> _funcFiles; + private Func> _funcProductCategories; + private Func> _funcFiles; - private LazyMultimap _productCategories; - private LazyMultimap _files; + private LazyMultimap _productCategories; + private LazyMultimap _files; - public CategoryExportContext( - IEnumerable categories, - Func> productCategories, - Func> files) - { - if (categories == null) - { - _categoryIds = new List(); - _fileIds = new List(); - } - else - { - _categoryIds = new List(categories.Select(x => x.Id)); - _fileIds = categories.Select(x => x.MediaFileId ?? 0) + public CategoryExportContext( + IEnumerable categories, + Func> productCategories, + Func> files) + { + if (categories == null) + { + _categoryIds = new List(); + _fileIds = new List(); + } + else + { + _categoryIds = new List(categories.Select(x => x.Id)); + _fileIds = categories.Select(x => x.MediaFileId ?? 0) .Where(x => x != 0) .Distinct() .ToList(); - } + } - _funcProductCategories = productCategories; - _funcFiles = files; - } + _funcProductCategories = productCategories; + _funcFiles = files; + } - public void Clear() - { - _productCategories?.Clear(); - _files?.Clear(); + public void Clear() + { + _productCategories?.Clear(); + _files?.Clear(); - _categoryIds?.Clear(); - _fileIds?.Clear(); - } + _categoryIds?.Clear(); + _fileIds?.Clear(); + } - public LazyMultimap ProductCategories - { - get - { - if (_productCategories == null) - { - _productCategories = new LazyMultimap(keys => _funcProductCategories(keys), _categoryIds); - } - return _productCategories; - } - } + public LazyMultimap ProductCategories + { + get + { + if (_productCategories == null) + { + _productCategories = new LazyMultimap(keys => _funcProductCategories(keys), _categoryIds); + } + return _productCategories; + } + } - public LazyMultimap Files - { - get - { - if (_files == null) - { - _files = new LazyMultimap(keys => _funcFiles(keys).ToMultimap(x => x.Id, x => x), _fileIds); - } - return _files; - } - } - } + public LazyMultimap Files + { + get + { + if (_files == null) + { + _files = new LazyMultimap(keys => _funcFiles(keys).ToMultimap(x => x.Id, x => x), _fileIds); + } + return _files; + } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CustomerExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CustomerExportContext.cs index 918cb3e110..bf2dc56700 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CustomerExportContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CustomerExportContext.cs @@ -7,48 +7,48 @@ namespace SmartStore.Services.DataExchange.Export.Internal { - public class CustomerExportContext - { - protected List _customerIds; - - private Func> _funcGenericAttributes; - - private LazyMultimap _genericAttributes; - - public CustomerExportContext( - IEnumerable customers, - Func> genericAttributes) - { - if (customers == null) - { - _customerIds = new List(); - } - else - { - _customerIds = new List(customers.Select(x => x.Id)); - } - - _funcGenericAttributes = genericAttributes; - } - - public void Clear() - { - if (_genericAttributes != null) - _genericAttributes.Clear(); - - _customerIds.Clear(); - } - - public LazyMultimap GenericAttributes - { - get - { - if (_genericAttributes == null) - { - _genericAttributes = new LazyMultimap(keys => _funcGenericAttributes(keys), _customerIds); - } - return _genericAttributes; - } - } - } + public class CustomerExportContext + { + protected List _customerIds; + + private Func> _funcGenericAttributes; + + private LazyMultimap _genericAttributes; + + public CustomerExportContext( + IEnumerable customers, + Func> genericAttributes) + { + if (customers == null) + { + _customerIds = new List(); + } + else + { + _customerIds = new List(customers.Select(x => x.Id)); + } + + _funcGenericAttributes = genericAttributes; + } + + public void Clear() + { + if (_genericAttributes != null) + _genericAttributes.Clear(); + + _customerIds.Clear(); + } + + public LazyMultimap GenericAttributes + { + get + { + if (_genericAttributes == null) + { + _genericAttributes = new LazyMultimap(keys => _funcGenericAttributes(keys), _customerIds); + } + return _genericAttributes; + } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs index d23df57ae4..be7aa0d58b 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs @@ -13,74 +13,74 @@ namespace SmartStore.Services.DataExchange.Export.Internal { internal class DataExporterContext - { - public DataExporterContext( - DataExportRequest request, - CancellationToken cancellationToken, - bool isPreview = false) - { - Request = request; - CancellationToken = cancellationToken; - Filter = XmlHelper.Deserialize(request.Profile.Filtering); - Projection = XmlHelper.Deserialize(request.Profile.Projection); - IsPreview = isPreview; - - if (request.Profile.Projection.IsEmpty()) - { - Projection.DescriptionMergingId = (int)ExportDescriptionMerging.Description; - } - - FolderContent = request.Profile.GetExportFolder(true, true); - - DeliveryTimes = new Dictionary(); - QuantityUnits = new Dictionary(); - Stores = new Dictionary(); - Languages = new Dictionary(); - Countries = new Dictionary(); - ProductTemplates = new Dictionary(); - CategoryTemplates = new Dictionary(); - NewsletterSubscriptions = new HashSet(); + { + public DataExporterContext( + DataExportRequest request, + CancellationToken cancellationToken, + bool isPreview = false) + { + Request = request; + CancellationToken = cancellationToken; + Filter = XmlHelper.Deserialize(request.Profile.Filtering); + Projection = XmlHelper.Deserialize(request.Profile.Projection); + IsPreview = isPreview; + + if (request.Profile.Projection.IsEmpty()) + { + Projection.DescriptionMergingId = (int)ExportDescriptionMerging.Description; + } + + FolderContent = request.Profile.GetExportFolder(true, true); + + DeliveryTimes = new Dictionary(); + QuantityUnits = new Dictionary(); + Stores = new Dictionary(); + Languages = new Dictionary(); + Countries = new Dictionary(); + ProductTemplates = new Dictionary(); + CategoryTemplates = new Dictionary(); + NewsletterSubscriptions = new HashSet(); Translations = new Dictionary(); TranslationsPerPage = new Dictionary(); UrlRecords = new Dictionary(); UrlRecordsPerPage = new Dictionary(); StatsPerStore = new Dictionary(); - EntityIdsLoaded = new List(); - EntityIdsPerSegment = new HashSet(); - - Result = new DataExportResult - { - FileFolder = IsFileBasedExport ? FolderContent : null - }; - - ExecuteContext = new ExportExecuteContext(Result, CancellationToken, FolderContent); - ExecuteContext.Filter = Filter; - ExecuteContext.Projection = Projection; - ExecuteContext.ProfileId = request.Profile.Id; - - if (!IsPreview) - { - ExecuteContext.ProgressValueSetter = Request.ProgressValueSetter; - } - } - - /// - /// All entity identifiers per export. - /// - public List EntityIdsLoaded { get; set; } - public void SetLoadedEntityIds(IEnumerable ids) - { - EntityIdsLoaded = EntityIdsLoaded - .Union(ids) - .Distinct() - .ToList(); - } - - /// - /// All entity identifiers per segment (to avoid exporting products multiple times). - /// - public HashSet EntityIdsPerSegment { get; set; } + EntityIdsLoaded = new List(); + EntityIdsPerSegment = new HashSet(); + + Result = new DataExportResult + { + FileFolder = IsFileBasedExport ? FolderContent : null + }; + + ExecuteContext = new ExportExecuteContext(Result, CancellationToken, FolderContent); + ExecuteContext.Filter = Filter; + ExecuteContext.Projection = Projection; + ExecuteContext.ProfileId = request.Profile.Id; + + if (!IsPreview) + { + ExecuteContext.ProgressValueSetter = Request.ProgressValueSetter; + } + } + + /// + /// All entity identifiers per export. + /// + public List EntityIdsLoaded { get; set; } + public void SetLoadedEntityIds(IEnumerable ids) + { + EntityIdsLoaded = EntityIdsLoaded + .Union(ids) + .Distinct() + .ToList(); + } + + /// + /// All entity identifiers per segment (to avoid exporting products multiple times). + /// + public HashSet EntityIdsPerSegment { get; set; } public int LastId { get; set; } public string ProgressInfo { get; set; } @@ -88,40 +88,37 @@ public void SetLoadedEntityIds(IEnumerable ids) public Dictionary StatsPerStore { get; set; } public DataExportRequest Request { get; private set; } - public CancellationToken CancellationToken { get; private set; } - public bool IsPreview { get; private set; } - - public bool Supports(ExportFeatures feature) - { - return !IsPreview && Request.Provider.Metadata.ExportFeatures.HasFlag(feature); - } - - public ExportFilter Filter { get; private set; } - public ExportProjection Projection { get; private set; } - public Currency ContextCurrency { get; set; } - public Customer ContextCustomer { get; set; } - public Language ContextLanguage { get; set; } + public CancellationToken CancellationToken { get; private set; } + public bool IsPreview { get; private set; } + + public bool Supports(ExportFeatures feature) + { + return !IsPreview && Request.Provider.Metadata.ExportFeatures.HasFlag(feature); + } + + public ExportFilter Filter { get; private set; } + public ExportProjection Projection { get; private set; } + public Currency ContextCurrency { get; set; } + public Customer ContextCustomer { get; set; } + public Language ContextLanguage { get; set; } public int LanguageId => Projection.LanguageId ?? 0; public TraceLogger Log { get; set; } - public Store Store { get; set; } + public Store Store { get; set; } - public string FolderContent { get; private set; } + public string FolderContent { get; private set; } - public bool IsFileBasedExport - { - get { return Request.Provider == null || Request.Provider.Value == null || Request.Provider.Value.FileExtension.HasValue(); } - } + public bool IsFileBasedExport => Request.Provider == null || Request.Provider.Value == null || Request.Provider.Value.FileExtension.HasValue(); - // Data loaded once per export. - public Dictionary DeliveryTimes { get; set; } - public Dictionary QuantityUnits { get; set; } - public Dictionary Stores { get; set; } - public Dictionary Languages { get; set; } - public Dictionary Countries { get; set; } - public Dictionary ProductTemplates { get; set; } - public Dictionary CategoryTemplates { get; set; } - public HashSet NewsletterSubscriptions { get; set; } + // Data loaded once per export. + public Dictionary DeliveryTimes { get; set; } + public Dictionary QuantityUnits { get; set; } + public Dictionary Stores { get; set; } + public Dictionary Languages { get; set; } + public Dictionary Countries { get; set; } + public Dictionary ProductTemplates { get; set; } + public Dictionary CategoryTemplates { get; set; } + public HashSet NewsletterSubscriptions { get; set; } /// /// All translations for global scopes (like Category, Manufacturer etc.) @@ -133,9 +130,9 @@ public bool IsFileBasedExport public ProductExportContext ProductExportContext { get; set; } public ProductExportContext AssociatedProductContext { get; set; } public OrderExportContext OrderExportContext { get; set; } - public ManufacturerExportContext ManufacturerExportContext { get; set; } - public CategoryExportContext CategoryExportContext { get; set; } - public CustomerExportContext CustomerExportContext { get; set; } + public ManufacturerExportContext ManufacturerExportContext { get; set; } + public CategoryExportContext CategoryExportContext { get; set; } + public CustomerExportContext CustomerExportContext { get; set; } /// /// All per page translations (like ProductVariantAttributeValue etc.) @@ -144,8 +141,8 @@ public bool IsFileBasedExport public Dictionary UrlRecordsPerPage { get; set; } public ExportExecuteContext ExecuteContext { get; set; } - public DataExportResult Result { get; set; } - } + public DataExportResult Result { get; set; } + } internal class RecordStats { diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DynamicEntity.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DynamicEntity.cs index 874d43e7e3..db0b6ed93c 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DynamicEntity.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DynamicEntity.cs @@ -3,37 +3,37 @@ namespace SmartStore.Services.DataExchange.Export.Internal { - internal class DynamicEntity : HybridExpando - { - public DynamicEntity(DynamicEntity dynamicEntity) - : this(dynamicEntity.WrappedObject) - { - MergeRange(dynamicEntity); - } + internal class DynamicEntity : HybridExpando + { + public DynamicEntity(DynamicEntity dynamicEntity) + : this(dynamicEntity.WrappedObject) + { + MergeRange(dynamicEntity); + } - public DynamicEntity(object entity) - : base(entity) - { - base.Properties["Entity"] = entity; - } + public DynamicEntity(object entity) + : base(entity) + { + base.Properties["Entity"] = entity; + } - public void Merge(string name, object value) - { - Properties[name] = value; - } + public void Merge(string name, object value) + { + Properties[name] = value; + } - public void MergeRange(IDictionary other) - { - foreach (var kvp in other) - { - Properties[kvp.Key] = kvp.Value; - } - } + public void MergeRange(IDictionary other) + { + foreach (var kvp in other) + { + Properties[kvp.Key] = kvp.Value; + } + } - protected override bool TrySetMemberCore(string name, object value) - { - Properties[name] = value; - return true; - } - } + protected override bool TrySetMemberCore(string name, object value) + { + Properties[name] = value; + return true; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ManufacturerExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ManufacturerExportContext.cs index 484f2fc6f3..9cddbe30cd 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ManufacturerExportContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ManufacturerExportContext.cs @@ -8,71 +8,71 @@ namespace SmartStore.Services.DataExchange.Export.Internal { internal class ManufacturerExportContext - { - protected List _manufacturerIds; - protected List _fileIds; + { + protected List _manufacturerIds; + protected List _fileIds; - private Func> _funcProductManufacturers; - private Func> _funcFiles; + private Func> _funcProductManufacturers; + private Func> _funcFiles; - private LazyMultimap _productManufacturers; - private LazyMultimap _files; + private LazyMultimap _productManufacturers; + private LazyMultimap _files; - public ManufacturerExportContext( - IEnumerable manufacturers, - Func> productManufacturers, - Func> files) - { - if (manufacturers == null) - { - _manufacturerIds = new List(); - _fileIds = new List(); - } - else - { - _manufacturerIds = new List(manufacturers.Select(x => x.Id)); + public ManufacturerExportContext( + IEnumerable manufacturers, + Func> productManufacturers, + Func> files) + { + if (manufacturers == null) + { + _manufacturerIds = new List(); + _fileIds = new List(); + } + else + { + _manufacturerIds = new List(manufacturers.Select(x => x.Id)); _fileIds = manufacturers .Select(x => x.MediaFileId ?? 0) .Where(x => x != 0) .Distinct() .ToList(); - } + } - _funcProductManufacturers = productManufacturers; - _funcFiles = files; - } + _funcProductManufacturers = productManufacturers; + _funcFiles = files; + } - public void Clear() - { - _productManufacturers?.Clear(); - _files?.Clear(); + public void Clear() + { + _productManufacturers?.Clear(); + _files?.Clear(); - _manufacturerIds?.Clear(); - _fileIds?.Clear(); - } + _manufacturerIds?.Clear(); + _fileIds?.Clear(); + } - public LazyMultimap ProductManufacturers - { - get - { - if (_productManufacturers == null) - { - _productManufacturers = new LazyMultimap(keys => _funcProductManufacturers(keys), _manufacturerIds); - } - return _productManufacturers; - } - } + public LazyMultimap ProductManufacturers + { + get + { + if (_productManufacturers == null) + { + _productManufacturers = new LazyMultimap(keys => _funcProductManufacturers(keys), _manufacturerIds); + } + return _productManufacturers; + } + } - public LazyMultimap Files - { - get - { - if (_files == null) - { - _files = new LazyMultimap(keys => _funcFiles(keys).ToMultimap(x => x.Id, x => x), _fileIds); - } - return _files; - } - } - } + public LazyMultimap Files + { + get + { + if (_files == null) + { + _files = new LazyMultimap(keys => _funcFiles(keys).ToMultimap(x => x.Id, x => x), _fileIds); + } + return _files; + } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/OrderExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/OrderExportContext.cs index 02f56914fb..f3eb5075b1 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/OrderExportContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/OrderExportContext.cs @@ -9,150 +9,150 @@ namespace SmartStore.Services.DataExchange.Export.Internal { - internal class OrderExportContext - { - protected List _orderIds; - protected List _customerIds; - protected List _addressIds; + internal class OrderExportContext + { + protected List _orderIds; + protected List _customerIds; + protected List _addressIds; - private Func> _funcCustomers; - private Func> _funcCustomerGenericAttributes; - private Func> _funcRewardPointsHistories; - private Func> _funcAddresses; - private Func> _funcOrderItems; - private Func> _funcShipments; + private Func> _funcCustomers; + private Func> _funcCustomerGenericAttributes; + private Func> _funcRewardPointsHistories; + private Func> _funcAddresses; + private Func> _funcOrderItems; + private Func> _funcShipments; - private LazyMultimap _customers; - private LazyMultimap _customerGenericAttributes; - private LazyMultimap _rewardPointsHistories; - private LazyMultimap
_addresses; - private LazyMultimap _orderItems; - private LazyMultimap _shipments; + private LazyMultimap _customers; + private LazyMultimap _customerGenericAttributes; + private LazyMultimap _rewardPointsHistories; + private LazyMultimap
_addresses; + private LazyMultimap _orderItems; + private LazyMultimap _shipments; - public OrderExportContext(IEnumerable orders, - Func> customers, - Func> customerGenericAttributes, - Func> rewardPointsHistory, - Func> addresses, - Func> orderItems, - Func> shipments) - { - if (orders == null) - { - _orderIds = new List(); - _customerIds = new List(); - _addressIds = new List(); - } - else - { - _orderIds = new List(orders.Select(x => x.Id)); - _customerIds = new List(orders.Select(x => x.CustomerId)); + public OrderExportContext(IEnumerable orders, + Func> customers, + Func> customerGenericAttributes, + Func> rewardPointsHistory, + Func> addresses, + Func> orderItems, + Func> shipments) + { + if (orders == null) + { + _orderIds = new List(); + _customerIds = new List(); + _addressIds = new List(); + } + else + { + _orderIds = new List(orders.Select(x => x.Id)); + _customerIds = new List(orders.Select(x => x.CustomerId)); - _addressIds = orders.Select(x => x.BillingAddressId) - .Union(orders.Select(x => x.ShippingAddressId ?? 0)) - .Where(x => x != 0) - .Distinct() - .ToList(); - } + _addressIds = orders.Select(x => x.BillingAddressId) + .Union(orders.Select(x => x.ShippingAddressId ?? 0)) + .Where(x => x != 0) + .Distinct() + .ToList(); + } - _funcCustomers = customers; - _funcCustomerGenericAttributes = customerGenericAttributes; - _funcRewardPointsHistories = rewardPointsHistory; - _funcAddresses = addresses; - _funcOrderItems = orderItems; - _funcShipments = shipments; - } + _funcCustomers = customers; + _funcCustomerGenericAttributes = customerGenericAttributes; + _funcRewardPointsHistories = rewardPointsHistory; + _funcAddresses = addresses; + _funcOrderItems = orderItems; + _funcShipments = shipments; + } - public void Clear() - { - if (_customers != null) - _customers.Clear(); - if (_customerGenericAttributes != null) - _customerGenericAttributes.Clear(); - if (_rewardPointsHistories != null) - _rewardPointsHistories.Clear(); - if (_addresses != null) - _addresses.Clear(); - if (_orderItems != null) - _orderItems.Clear(); - if (_shipments != null) - _shipments.Clear(); + public void Clear() + { + if (_customers != null) + _customers.Clear(); + if (_customerGenericAttributes != null) + _customerGenericAttributes.Clear(); + if (_rewardPointsHistories != null) + _rewardPointsHistories.Clear(); + if (_addresses != null) + _addresses.Clear(); + if (_orderItems != null) + _orderItems.Clear(); + if (_shipments != null) + _shipments.Clear(); - _orderIds.Clear(); - _customerIds.Clear(); - _addressIds.Clear(); - } + _orderIds.Clear(); + _customerIds.Clear(); + _addressIds.Clear(); + } - public LazyMultimap Customers - { - get - { - if (_customers == null) - { - _customers = new LazyMultimap(keys => _funcCustomers(keys).ToMultimap(x => x.Id, x => x), _customerIds); - } - return _customers; - } - } + public LazyMultimap Customers + { + get + { + if (_customers == null) + { + _customers = new LazyMultimap(keys => _funcCustomers(keys).ToMultimap(x => x.Id, x => x), _customerIds); + } + return _customers; + } + } - public LazyMultimap CustomerGenericAttributes - { - get - { - if (_customerGenericAttributes == null) - { - _customerGenericAttributes = new LazyMultimap(keys => _funcCustomerGenericAttributes(keys), _customerIds); - } - return _customerGenericAttributes; - } - } + public LazyMultimap CustomerGenericAttributes + { + get + { + if (_customerGenericAttributes == null) + { + _customerGenericAttributes = new LazyMultimap(keys => _funcCustomerGenericAttributes(keys), _customerIds); + } + return _customerGenericAttributes; + } + } - public LazyMultimap RewardPointsHistories - { - get - { - if (_rewardPointsHistories == null) - { - _rewardPointsHistories = new LazyMultimap(keys => _funcRewardPointsHistories(keys), _customerIds); - } - return _rewardPointsHistories; - } - } + public LazyMultimap RewardPointsHistories + { + get + { + if (_rewardPointsHistories == null) + { + _rewardPointsHistories = new LazyMultimap(keys => _funcRewardPointsHistories(keys), _customerIds); + } + return _rewardPointsHistories; + } + } - public LazyMultimap
Addresses - { - get - { - if (_addresses == null) - { - _addresses = new LazyMultimap
(keys => _funcAddresses(keys).ToMultimap(x => x.Id, x => x), _addressIds); - } - return _addresses; - } - } + public LazyMultimap
Addresses + { + get + { + if (_addresses == null) + { + _addresses = new LazyMultimap
(keys => _funcAddresses(keys).ToMultimap(x => x.Id, x => x), _addressIds); + } + return _addresses; + } + } - public LazyMultimap OrderItems - { - get - { - if (_orderItems == null) - { - _orderItems = new LazyMultimap(keys => _funcOrderItems(keys), _orderIds); - } - return _orderItems; - } - } + public LazyMultimap OrderItems + { + get + { + if (_orderItems == null) + { + _orderItems = new LazyMultimap(keys => _funcOrderItems(keys), _orderIds); + } + return _orderItems; + } + } - public LazyMultimap Shipments - { - get - { - if (_shipments == null) - { - _shipments = new LazyMultimap(keys => _funcShipments(keys), _orderIds); - } - return _shipments; - } - } - } + public LazyMultimap Shipments + { + get + { + if (_shipments == null) + { + _shipments = new LazyMultimap(keys => _funcShipments(keys), _orderIds); + } + return _shipments; + } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ProductExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ProductExportContext.cs index b3019975a0..bf8562da11 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ProductExportContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ProductExportContext.cs @@ -12,92 +12,92 @@ namespace SmartStore.Services.DataExchange.Export /// Cargo data to reduce database round trips during work with product batches (export, list model creation etc.) ///
public class ProductExportContext : PriceCalculationContext - { - private Func> _funcProductPictures; - private Func> _funcProductTags; - private Func> _funcSpecificationAttributes; + { + private Func> _funcProductPictures; + private Func> _funcProductTags; + private Func> _funcSpecificationAttributes; private Func> _funcDownloads; private LazyMultimap _productPictures; - private LazyMultimap _productTags; - private LazyMultimap _specificationAttributes; + private LazyMultimap _productTags; + private LazyMultimap _specificationAttributes; private LazyMultimap _downloads; public ProductExportContext( - IEnumerable products, - Func> attributes, - Func> attributeCombinations, - Func> specificationAttributes, - Func> tierPrices, - Func> productCategories, - Func> productManufacturers, - Func> appliedDiscounts, - Func> productBundleItems, + IEnumerable products, + Func> attributes, + Func> attributeCombinations, + Func> specificationAttributes, + Func> tierPrices, + Func> productCategories, + Func> productManufacturers, + Func> appliedDiscounts, + Func> productBundleItems, Func> associatedProducts, - Func> productPictures, - Func> productTags, + Func> productPictures, + Func> productTags, Func> downloads) - : base(products, - attributes, - attributeCombinations, - tierPrices, - productCategories, - productManufacturers, - appliedDiscounts, - productBundleItems, + : base(products, + attributes, + attributeCombinations, + tierPrices, + productCategories, + productManufacturers, + appliedDiscounts, + productBundleItems, associatedProducts) - { - _funcProductPictures = productPictures; - _funcProductTags = productTags; - _funcSpecificationAttributes = specificationAttributes; + { + _funcProductPictures = productPictures; + _funcProductTags = productTags; + _funcSpecificationAttributes = specificationAttributes; _funcDownloads = downloads; - } + } - public new void Clear() - { + public new void Clear() + { _productPictures?.Clear(); _productTags?.Clear(); _specificationAttributes?.Clear(); _downloads?.Clear(); - base.Clear(); - } + base.Clear(); + } - public LazyMultimap ProductPictures - { - get - { - if (_productPictures == null) - { - _productPictures = new LazyMultimap(keys => _funcProductPictures(keys), _productIds); - } - return _productPictures; - } - } + public LazyMultimap ProductPictures + { + get + { + if (_productPictures == null) + { + _productPictures = new LazyMultimap(keys => _funcProductPictures(keys), _productIds); + } + return _productPictures; + } + } - public LazyMultimap ProductTags - { - get - { - if (_productTags == null) - { - _productTags = new LazyMultimap(keys => _funcProductTags(keys), _productIds); - } - return _productTags; - } - } + public LazyMultimap ProductTags + { + get + { + if (_productTags == null) + { + _productTags = new LazyMultimap(keys => _funcProductTags(keys), _productIds); + } + return _productTags; + } + } - public LazyMultimap SpecificationAttributes - { - get - { - if (_specificationAttributes == null) - { - _specificationAttributes = new LazyMultimap(keys => _funcSpecificationAttributes(keys), _productIds); - } - return _specificationAttributes; - } - } + public LazyMultimap SpecificationAttributes + { + get + { + if (_specificationAttributes == null) + { + _specificationAttributes = new LazyMultimap(keys => _funcSpecificationAttributes(keys), _productIds); + } + return _specificationAttributes; + } + } public LazyMultimap Downloads { @@ -110,5 +110,5 @@ public LazyMultimap Downloads return _downloads; } } - } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/ISyncMappingService.cs b/src/Libraries/SmartStore.Services/DataExchange/ISyncMappingService.cs index 9bdbc6d790..8828902596 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/ISyncMappingService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/ISyncMappingService.cs @@ -5,169 +5,169 @@ namespace SmartStore.Services.DataExchange { - public partial interface ISyncMappingService - { - /// - /// Inserts a sync mapping entity - /// - /// Sync mapping - void InsertSyncMapping(SyncMapping mapping); - - /// - /// Inserts a range of sync mapping entities - /// - /// A sequence of sync mappings - void InsertSyncMappings(IEnumerable mappings); - - /// - /// Gets all sync mappings - /// - /// The context (external application) name. Leave null to load all records regardless of context. - /// The entity name. Leave null to load all records regardless of entity name. - /// Array of entity identifiers - /// SyncMappings - IList GetAllSyncMappings(string contextName = null, string entityName = null, int[] entityIds = null); - - /// - /// Gets a sync mapping record by (target) entity id, name and context name. - /// - /// Entity nd - /// Entity name - /// Context name - /// SyncMapping - SyncMapping GetSyncMappingByEntity(int entityId, string entityName, string contextName); - - /// - /// Gets a sync mapping record by (external) source key, entity name and context name. - /// - /// Source key - /// Entity name - /// Context name - /// SyncMappings - SyncMapping GetSyncMappingBySource(string sourceKey, string entityName, string contextName); - - /// - /// Deletes a sync mapping entity - /// - /// Sync mapping - void DeleteSyncMapping(SyncMapping mapping); - - /// - /// Deletes a range of sync mapping entities - /// - /// Sync mappings - void DeleteSyncMappings(IEnumerable mappings); - - /// - /// Deletes all sync mapping entities referencing the specified entity - /// - /// The entity - void DeleteSyncMappingsFor(T entity) where T : BaseEntity; - - /// - /// Deletes a range of sync mapping entities - /// - /// The context (external application) name. - /// The entity name. Leave null to delete all context specific mappings regardless of entity name. - /// SyncMappings - void DeleteSyncMappings(string contextName, string entityName = null); - - /// - /// Updates a sync mapping entity - /// - /// Sync mapping - void UpdateSyncMapping(SyncMapping mapping); - } - - - public static class ISyncMappingServiceExtensions - { - - public static SyncMapping InsertSyncMapping(this ISyncMappingService svc, T entity, string contextName, string sourceKey) where T : BaseEntity - { - Guard.NotNull(entity, nameof(entity)); - Guard.NotEmpty(contextName, nameof(contextName)); - Guard.NotEmpty(sourceKey, nameof(sourceKey)); - - if (entity is SyncMapping) - { - throw Error.InvalidOperation("Cannot insert a sync mapping record for a SyncMapping entity"); - } - - if (entity.IsTransientRecord()) - { - throw Error.InvalidOperation("Cannot insert a sync mapping record for a transient (unsaved) entity"); - } - - var mapping = new SyncMapping - { - ContextName = contextName, - EntityId = entity.Id, - EntityName = entity.GetEntityName(), - SourceKey = sourceKey - }; - - return mapping; - } - - public static SyncMapping GetSyncMappingByEntity(this ISyncMappingService svc, T entity, string contextName) where T : BaseEntity - { - Guard.NotNull(entity, nameof(entity)); - Guard.NotEmpty(contextName, nameof(contextName)); - - if (entity is SyncMapping) - { - throw Error.InvalidOperation("Cannot get a sync mapping record for a SyncMapping entity"); - } - - if (entity.IsTransientRecord()) - { - throw Error.InvalidOperation("Cannot get a sync mapping record for a transient (unsaved) entity"); - } - - return svc.GetSyncMappingByEntity(entity.Id, entity.GetEntityName(), contextName); - } - - /// - /// Inserts a range of sync mapping entities by specifying two equal sized sequences for entity ids and source keys. - /// - /// Context name for all mappings - /// Entity name for all mappings - /// A sequence of entity ids - /// A sequence of source keys - /// List of persisted sync mappings - /// Both sequences must contain at least one element and must be of equal size. - public static IList InsertSyncMappings(this ISyncMappingService svc, string contextName, string entityName, IEnumerable entityIds, IEnumerable sourceKeys) - { - Guard.NotEmpty(contextName, nameof(contextName)); - Guard.NotEmpty(entityName, nameof(entityName)); - Guard.NotNull(entityIds, nameof(entityIds)); - Guard.NotNull(sourceKeys, nameof(sourceKeys)); - - if (!entityIds.Any() || !sourceKeys.Any() || entityIds.Count() != sourceKeys.Count()) - { - throw Error.InvalidOperation("Both sequences must contain at least one element and must be of equal size."); - } - - var mappings = new List(); - var arrIds = entityIds.ToArray(); - var arrKeys = sourceKeys.ToArray(); - - for (int i = 0; i < arrIds.Length; i++) - { - mappings.Add(new SyncMapping - { - ContextName = contextName, - EntityName = entityName, - EntityId = arrIds[i], - SourceKey = arrKeys[i] - }); - } - - svc.InsertSyncMappings(mappings); - - return mappings; - } - - } + public partial interface ISyncMappingService + { + /// + /// Inserts a sync mapping entity + /// + /// Sync mapping + void InsertSyncMapping(SyncMapping mapping); + + /// + /// Inserts a range of sync mapping entities + /// + /// A sequence of sync mappings + void InsertSyncMappings(IEnumerable mappings); + + /// + /// Gets all sync mappings + /// + /// The context (external application) name. Leave null to load all records regardless of context. + /// The entity name. Leave null to load all records regardless of entity name. + /// Array of entity identifiers + /// SyncMappings + IList GetAllSyncMappings(string contextName = null, string entityName = null, int[] entityIds = null); + + /// + /// Gets a sync mapping record by (target) entity id, name and context name. + /// + /// Entity nd + /// Entity name + /// Context name + /// SyncMapping + SyncMapping GetSyncMappingByEntity(int entityId, string entityName, string contextName); + + /// + /// Gets a sync mapping record by (external) source key, entity name and context name. + /// + /// Source key + /// Entity name + /// Context name + /// SyncMappings + SyncMapping GetSyncMappingBySource(string sourceKey, string entityName, string contextName); + + /// + /// Deletes a sync mapping entity + /// + /// Sync mapping + void DeleteSyncMapping(SyncMapping mapping); + + /// + /// Deletes a range of sync mapping entities + /// + /// Sync mappings + void DeleteSyncMappings(IEnumerable mappings); + + /// + /// Deletes all sync mapping entities referencing the specified entity + /// + /// The entity + void DeleteSyncMappingsFor(T entity) where T : BaseEntity; + + /// + /// Deletes a range of sync mapping entities + /// + /// The context (external application) name. + /// The entity name. Leave null to delete all context specific mappings regardless of entity name. + /// SyncMappings + void DeleteSyncMappings(string contextName, string entityName = null); + + /// + /// Updates a sync mapping entity + /// + /// Sync mapping + void UpdateSyncMapping(SyncMapping mapping); + } + + + public static class ISyncMappingServiceExtensions + { + + public static SyncMapping InsertSyncMapping(this ISyncMappingService svc, T entity, string contextName, string sourceKey) where T : BaseEntity + { + Guard.NotNull(entity, nameof(entity)); + Guard.NotEmpty(contextName, nameof(contextName)); + Guard.NotEmpty(sourceKey, nameof(sourceKey)); + + if (entity is SyncMapping) + { + throw Error.InvalidOperation("Cannot insert a sync mapping record for a SyncMapping entity"); + } + + if (entity.IsTransientRecord()) + { + throw Error.InvalidOperation("Cannot insert a sync mapping record for a transient (unsaved) entity"); + } + + var mapping = new SyncMapping + { + ContextName = contextName, + EntityId = entity.Id, + EntityName = entity.GetEntityName(), + SourceKey = sourceKey + }; + + return mapping; + } + + public static SyncMapping GetSyncMappingByEntity(this ISyncMappingService svc, T entity, string contextName) where T : BaseEntity + { + Guard.NotNull(entity, nameof(entity)); + Guard.NotEmpty(contextName, nameof(contextName)); + + if (entity is SyncMapping) + { + throw Error.InvalidOperation("Cannot get a sync mapping record for a SyncMapping entity"); + } + + if (entity.IsTransientRecord()) + { + throw Error.InvalidOperation("Cannot get a sync mapping record for a transient (unsaved) entity"); + } + + return svc.GetSyncMappingByEntity(entity.Id, entity.GetEntityName(), contextName); + } + + /// + /// Inserts a range of sync mapping entities by specifying two equal sized sequences for entity ids and source keys. + /// + /// Context name for all mappings + /// Entity name for all mappings + /// A sequence of entity ids + /// A sequence of source keys + /// List of persisted sync mappings + /// Both sequences must contain at least one element and must be of equal size. + public static IList InsertSyncMappings(this ISyncMappingService svc, string contextName, string entityName, IEnumerable entityIds, IEnumerable sourceKeys) + { + Guard.NotEmpty(contextName, nameof(contextName)); + Guard.NotEmpty(entityName, nameof(entityName)); + Guard.NotNull(entityIds, nameof(entityIds)); + Guard.NotNull(sourceKeys, nameof(sourceKeys)); + + if (!entityIds.Any() || !sourceKeys.Any() || entityIds.Count() != sourceKeys.Count()) + { + throw Error.InvalidOperation("Both sequences must contain at least one element and must be of equal size."); + } + + var mappings = new List(); + var arrIds = entityIds.ToArray(); + var arrKeys = sourceKeys.ToArray(); + + for (int i = 0; i < arrIds.Length; i++) + { + mappings.Add(new SyncMapping + { + ContextName = contextName, + EntityName = entityName, + EntityId = arrIds[i], + SourceKey = arrKeys[i] + }); + } + + svc.InsertSyncMappings(mappings); + + return mappings; + } + + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs index ec1ae4335b..637f14377f 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs @@ -4,144 +4,141 @@ namespace SmartStore.Services.DataExchange.Import { - public class ColumnMap - { - // maps source column to property - private readonly Dictionary _map = new Dictionary(StringComparer.OrdinalIgnoreCase); - - private static bool IsIndexed(string name) - { - return (name.EmptyNull().EndsWith("]") && name.EmptyNull().Contains("[")); - } - - private static string CreateSourceName(string name, string index) - { - if (index.HasValue()) - { - name += String.Concat("[", index, "]"); - } - - return name; - } - - public IReadOnlyDictionary Mappings - { - get { return _map; } - } - - public static bool ParseSourceName(string sourceName, out string nameWithoutIndex, out string index) - { - nameWithoutIndex = sourceName; - index = null; - - var result = true; - - if (sourceName.HasValue() && IsIndexed(sourceName)) - { - var x1 = sourceName.IndexOf('['); - var x2 = sourceName.IndexOf(']', x1); - - if (x1 != -1 && x2 != -1 && x2 > x1) - { - nameWithoutIndex = sourceName.Substring(0, x1); - index = sourceName.Substring(x1 + 1, x2 - x1 - 1); - } - else - { - result = false; - } - } - - return result; - } - - public void AddMapping(string sourceName, string mappedName, string defaultValue = null) - { - AddMapping(sourceName, null, mappedName, defaultValue); + public class ColumnMap + { + // maps source column to property + private readonly Dictionary _map = new Dictionary(StringComparer.OrdinalIgnoreCase); + + private static bool IsIndexed(string name) + { + return (name.EmptyNull().EndsWith("]") && name.EmptyNull().Contains("[")); } - public void AddMapping(string sourceName, string index, string mappedName, string defaultValue = null) - { - Guard.NotEmpty(sourceName, nameof(sourceName)); - Guard.NotEmpty(mappedName, nameof(mappedName)); - - var key = CreateSourceName(sourceName, index); - - _map[key] = new ColumnMappingItem - { - SoureName = key, - MappedName = mappedName, - Default = defaultValue - }; - } - - /// - /// Gets a mapped column value - /// - /// The name of the column to get a mapped value for. - /// The column index, e.g. a language code (de, en etc.) - /// The mapped column value OR - if the name is unmapped - a value with the passed [] - public ColumnMappingItem GetMapping(string sourceName, string index) - { - return GetMapping(CreateSourceName(sourceName, index)); - } - - /// - /// Gets a mapped column value - /// - /// The name of the column to get a mapped value for. - /// The mapped column value OR - if the name is unmapped - the value of the passed - public ColumnMappingItem GetMapping(string sourceName) - { - ColumnMappingItem result; - - if (_map.TryGetValue(sourceName, out result)) - { - return result; - } - - return new ColumnMappingItem { SoureName = sourceName, MappedName = sourceName }; - } - } - - - [JsonObject(MemberSerialization.OptIn)] - public class ColumnMappingItem - { - private bool? _ignored; - - /// - /// The source name - /// - [JsonIgnore] - public string SoureName { get; set; } - - /// - /// The mapped name - /// - [JsonProperty] - public string MappedName { get; set; } - - /// - /// An optional default value - /// - [JsonProperty] - public string Default { get; set; } - - /// - /// Indicates whether to explicitly ignore this property - /// - public bool IgnoreProperty - { - get - { - if (_ignored == null) - { - _ignored = Default != null && Default == "[IGNOREPROPERTY]"; - } - - return _ignored.Value; - } - } - } + private static string CreateSourceName(string name, string index) + { + if (index.HasValue()) + { + name += String.Concat("[", index, "]"); + } + + return name; + } + + public IReadOnlyDictionary Mappings => _map; + + public static bool ParseSourceName(string sourceName, out string nameWithoutIndex, out string index) + { + nameWithoutIndex = sourceName; + index = null; + + var result = true; + + if (sourceName.HasValue() && IsIndexed(sourceName)) + { + var x1 = sourceName.IndexOf('['); + var x2 = sourceName.IndexOf(']', x1); + + if (x1 != -1 && x2 != -1 && x2 > x1) + { + nameWithoutIndex = sourceName.Substring(0, x1); + index = sourceName.Substring(x1 + 1, x2 - x1 - 1); + } + else + { + result = false; + } + } + + return result; + } + + public void AddMapping(string sourceName, string mappedName, string defaultValue = null) + { + AddMapping(sourceName, null, mappedName, defaultValue); + } + + public void AddMapping(string sourceName, string index, string mappedName, string defaultValue = null) + { + Guard.NotEmpty(sourceName, nameof(sourceName)); + Guard.NotEmpty(mappedName, nameof(mappedName)); + + var key = CreateSourceName(sourceName, index); + + _map[key] = new ColumnMappingItem + { + SoureName = key, + MappedName = mappedName, + Default = defaultValue + }; + } + + /// + /// Gets a mapped column value + /// + /// The name of the column to get a mapped value for. + /// The column index, e.g. a language code (de, en etc.) + /// The mapped column value OR - if the name is unmapped - a value with the passed [] + public ColumnMappingItem GetMapping(string sourceName, string index) + { + return GetMapping(CreateSourceName(sourceName, index)); + } + + /// + /// Gets a mapped column value + /// + /// The name of the column to get a mapped value for. + /// The mapped column value OR - if the name is unmapped - the value of the passed + public ColumnMappingItem GetMapping(string sourceName) + { + ColumnMappingItem result; + + if (_map.TryGetValue(sourceName, out result)) + { + return result; + } + + return new ColumnMappingItem { SoureName = sourceName, MappedName = sourceName }; + } + } + + + [JsonObject(MemberSerialization.OptIn)] + public class ColumnMappingItem + { + private bool? _ignored; + + /// + /// The source name + /// + [JsonIgnore] + public string SoureName { get; set; } + + /// + /// The mapped name + /// + [JsonProperty] + public string MappedName { get; set; } + + /// + /// An optional default value + /// + [JsonProperty] + public string Default { get; set; } + + /// + /// Indicates whether to explicitly ignore this property + /// + public bool IgnoreProperty + { + get + { + if (_ignored == null) + { + _ignored = Default != null && Default == "[IGNOREPROPERTY]"; + } + + return _ignored.Value; + } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs index 46c7cfb6ac..4cd4cb5684 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs @@ -6,69 +6,69 @@ namespace SmartStore.Services.DataExchange.Import { - public class ColumnMapConverter : DefaultTypeConverter - { - public ColumnMapConverter() - : base(typeof(object)) - { - } + public class ColumnMapConverter : DefaultTypeConverter + { + public ColumnMapConverter() + : base(typeof(object)) + { + } - public override bool CanConvertFrom(Type type) - { - return type == typeof(string); - } + public override bool CanConvertFrom(Type type) + { + return type == typeof(string); + } - public override bool CanConvertTo(Type type) - { - return type == typeof(string); - } + public override bool CanConvertTo(Type type) + { + return type == typeof(string); + } - public override object ConvertFrom(CultureInfo culture, object value) - { - if (value is string) - { - var dict = JsonConvert.DeserializeObject>((string)value); - var map = new ColumnMap(); + public override object ConvertFrom(CultureInfo culture, object value) + { + if (value is string) + { + var dict = JsonConvert.DeserializeObject>((string)value); + var map = new ColumnMap(); - foreach (var kvp in dict) - { - map.AddMapping(kvp.Key, null, kvp.Value.MappedName, kvp.Value.Default); - } + foreach (var kvp in dict) + { + map.AddMapping(kvp.Key, null, kvp.Value.MappedName, kvp.Value.Default); + } - return map; + return map; } - return base.ConvertFrom(culture, value); - } + return base.ConvertFrom(culture, value); + } - public T ConvertFrom(string value) - { - if (value.HasValue()) - return (T)ConvertFrom(CultureInfo.InvariantCulture, value); + public T ConvertFrom(string value) + { + if (value.HasValue()) + return (T)ConvertFrom(CultureInfo.InvariantCulture, value); - return default(T); - } + return default(T); + } - public override object ConvertTo(CultureInfo culture, string format, object value, Type to) - { - if (to == typeof(string)) - { - if (value is ColumnMap) - { - return JsonConvert.SerializeObject(((ColumnMap)value).Mappings); - } - else - { - return string.Empty; - } - } + public override object ConvertTo(CultureInfo culture, string format, object value, Type to) + { + if (to == typeof(string)) + { + if (value is ColumnMap) + { + return JsonConvert.SerializeObject(((ColumnMap)value).Mappings); + } + else + { + return string.Empty; + } + } - return base.ConvertTo(culture, format, value, to); - } + return base.ConvertTo(culture, format, value, to); + } - public string ConvertTo(object value) - { - return (string)ConvertTo(CultureInfo.InvariantCulture, null, value, typeof(string)); - } - } + public string ConvertTo(object value) + { + return (string)ConvertTo(CultureInfo.InvariantCulture, null, value, typeof(string)); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImportTask.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImportTask.cs index 541850340f..0f813ba6ab 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImportTask.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImportTask.cs @@ -2,33 +2,33 @@ namespace SmartStore.Services.DataExchange.Import { - // note: namespace persisted in ScheduleTask.Type - public partial class DataImportTask : ITask - { - private readonly IDataImporter _importer; - private readonly IImportProfileService _importProfileService; + // note: namespace persisted in ScheduleTask.Type + public partial class DataImportTask : ITask + { + private readonly IDataImporter _importer; + private readonly IImportProfileService _importProfileService; - public DataImportTask( - IDataImporter importer, - IImportProfileService importProfileService) - { - _importer = importer; - _importProfileService = importProfileService; - } + public DataImportTask( + IDataImporter importer, + IImportProfileService importProfileService) + { + _importer = importer; + _importProfileService = importProfileService; + } - public void Execute(TaskExecutionContext ctx) - { - var profileId = ctx.ScheduleTaskHistory.ScheduleTask.Alias.ToInt(); - var profile = _importProfileService.GetImportProfileById(profileId); + public void Execute(TaskExecutionContext ctx) + { + var profileId = ctx.ScheduleTaskHistory.ScheduleTask.Alias.ToInt(); + var profile = _importProfileService.GetImportProfileById(profileId); - var request = new DataImportRequest(profile); + var request = new DataImportRequest(profile); - request.ProgressValueSetter = delegate (int val, int max, string msg) - { - ctx.SetProgress(val, max, msg, true); - }; + request.ProgressValueSetter = delegate (int val, int max, string msg) + { + ctx.SetProgress(val, max, msg, true); + }; - _importer.Import(request, ctx.CancellationToken); - } - } + _importer.Import(request, ctx.CancellationToken); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs index 970ca89cc0..8939212ee5 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs @@ -24,57 +24,57 @@ namespace SmartStore.Services.DataExchange.Import { public partial class DataImporter : IDataImporter - { - private readonly ICommonServices _services; - private readonly IImportProfileService _importProfileService; - private readonly ILanguageService _languageService; - private readonly Func _importerFactory; - private readonly Lazy _emailAccountService; - private readonly Lazy _emailSender; - private readonly Lazy _contactDataSettings; - private readonly Lazy _dataExchangeSettings; - private readonly IDbCache _dbCache; - private readonly IUrlRecordService _urlRecordService; - private readonly ILocalizedEntityService _localizedEntityService; - - public DataImporter( - ICommonServices services, - IImportProfileService importProfileService, - ILanguageService languageService, - Func importerFactory, - Lazy emailAccountService, - Lazy emailSender, - Lazy contactDataSettings, - Lazy dataExchangeSettings, - IDbCache dbCache, - IUrlRecordService urlRecordService, - ILocalizedEntityService localizedEntityService) - { - _services = services; - _importProfileService = importProfileService; - _languageService = languageService; - _importerFactory = importerFactory; - _emailAccountService = emailAccountService; - _emailSender = emailSender; - _contactDataSettings = contactDataSettings; - _dataExchangeSettings = dataExchangeSettings; - _dbCache = dbCache; - _urlRecordService = urlRecordService; - _localizedEntityService = localizedEntityService; - - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - - private bool HasPermission(DataImporterContext ctx) - { + { + private readonly ICommonServices _services; + private readonly IImportProfileService _importProfileService; + private readonly ILanguageService _languageService; + private readonly Func _importerFactory; + private readonly Lazy _emailAccountService; + private readonly Lazy _emailSender; + private readonly Lazy _contactDataSettings; + private readonly Lazy _dataExchangeSettings; + private readonly IDbCache _dbCache; + private readonly IUrlRecordService _urlRecordService; + private readonly ILocalizedEntityService _localizedEntityService; + + public DataImporter( + ICommonServices services, + IImportProfileService importProfileService, + ILanguageService languageService, + Func importerFactory, + Lazy emailAccountService, + Lazy emailSender, + Lazy contactDataSettings, + Lazy dataExchangeSettings, + IDbCache dbCache, + IUrlRecordService urlRecordService, + ILocalizedEntityService localizedEntityService) + { + _services = services; + _importProfileService = importProfileService; + _languageService = languageService; + _importerFactory = importerFactory; + _emailAccountService = emailAccountService; + _emailSender = emailSender; + _contactDataSettings = contactDataSettings; + _dataExchangeSettings = dataExchangeSettings; + _dbCache = dbCache; + _urlRecordService = urlRecordService; + _localizedEntityService = localizedEntityService; + + T = NullLocalizer.Instance; + } + + public Localizer T { get; set; } + + private bool HasPermission(DataImporterContext ctx) + { if (ctx.Request.HasPermission) { return true; } - var customer = _services.WorkContext.CurrentCustomer; + var customer = _services.WorkContext.CurrentCustomer; if (customer.SystemName == SystemCustomerNames.BackgroundTask) { @@ -84,8 +84,8 @@ private bool HasPermission(DataImporterContext ctx) return _services.Permissions.Authorize(Permissions.Configuration.Import.Execute); } - private void LogResults(DataImporterContext ctx) - { + private void LogResults(DataImporterContext ctx) + { var sb = new StringBuilder(); foreach (var item in ctx.Results) @@ -124,74 +124,74 @@ private void LogResults(DataImporterContext ctx) } } } - } + } - private void SendCompletionEmail(DataImporterContext ctx) - { - var emailAccount = _emailAccountService.Value.GetDefaultEmailAccount(); - var smtpContext = new SmtpContext(emailAccount); - var message = new EmailMessage(); + private void SendCompletionEmail(DataImporterContext ctx) + { + var emailAccount = _emailAccountService.Value.GetDefaultEmailAccount(); + var smtpContext = new SmtpContext(emailAccount); + var message = new EmailMessage(); - var store = _services.StoreContext.CurrentStore; - var storeInfo = "{0} ({1})".FormatInvariant(store.Name, store.Url); - var intro = _services.Localization.GetResource("Admin.DataExchange.Import.CompletedEmail.Body").FormatInvariant(storeInfo); - var body = new StringBuilder(intro); - var result = ctx.ExecuteContext.Result; + var store = _services.StoreContext.CurrentStore; + var storeInfo = "{0} ({1})".FormatInvariant(store.Name, store.Url); + var intro = _services.Localization.GetResource("Admin.DataExchange.Import.CompletedEmail.Body").FormatInvariant(storeInfo); + var body = new StringBuilder(intro); + var result = ctx.ExecuteContext.Result; - if (result.LastError.HasValue()) - { - body.AppendFormat("

{0}

", result.LastError); - } + if (result.LastError.HasValue()) + { + body.AppendFormat("

{0}

", result.LastError); + } - body.Append("

"); + body.Append("

"); - body.AppendFormat("

{0}: {1} · {2}: {3}
", - T("Admin.Common.TotalRows"), result.TotalRecords, - T("Admin.Common.Skipped"), result.SkippedRecords); + body.AppendFormat("
{0}: {1} · {2}: {3}
", + T("Admin.Common.TotalRows"), result.TotalRecords, + T("Admin.Common.Skipped"), result.SkippedRecords); - body.AppendFormat("
{0}: {1} · {2}: {3}
", - T("Admin.Common.NewRecords"), result.NewRecords, - T("Admin.Common.Updated"), result.ModifiedRecords); + body.AppendFormat("
{0}: {1} · {2}: {3}
", + T("Admin.Common.NewRecords"), result.NewRecords, + T("Admin.Common.Updated"), result.ModifiedRecords); - body.AppendFormat("
{0}: {1} · {2}: {3}
", - T("Admin.Common.Errors"), result.Errors, - T("Admin.Common.Warnings"), result.Warnings); + body.AppendFormat("
{0}: {1} · {2}: {3}
", + T("Admin.Common.Errors"), result.Errors, + T("Admin.Common.Warnings"), result.Warnings); - body.Append("

"); + body.Append("

"); - message.From = new EmailAddress(emailAccount.Email, emailAccount.DisplayName); + message.From = new EmailAddress(emailAccount.Email, emailAccount.DisplayName); - if (_contactDataSettings.Value.WebmasterEmailAddress.HasValue()) - message.To.Add(new EmailAddress(_contactDataSettings.Value.WebmasterEmailAddress)); + if (_contactDataSettings.Value.WebmasterEmailAddress.HasValue()) + message.To.Add(new EmailAddress(_contactDataSettings.Value.WebmasterEmailAddress)); - if (message.To.Count == 0 && _contactDataSettings.Value.CompanyEmailAddress.HasValue()) - message.To.Add(new EmailAddress(_contactDataSettings.Value.CompanyEmailAddress)); + if (message.To.Count == 0 && _contactDataSettings.Value.CompanyEmailAddress.HasValue()) + message.To.Add(new EmailAddress(_contactDataSettings.Value.CompanyEmailAddress)); - if (message.To.Count == 0) - message.To.Add(new EmailAddress(emailAccount.Email, emailAccount.DisplayName)); + if (message.To.Count == 0) + message.To.Add(new EmailAddress(emailAccount.Email, emailAccount.DisplayName)); - message.Subject = T("Admin.DataExchange.Import.CompletedEmail.Subject").Text.FormatInvariant(ctx.Request.Profile.Name); + message.Subject = T("Admin.DataExchange.Import.CompletedEmail.Subject").Text.FormatInvariant(ctx.Request.Profile.Name); - message.Body = body.ToString(); + message.Body = body.ToString(); - _emailSender.Value.SendEmail(smtpContext, message); + _emailSender.Value.SendEmail(smtpContext, message); - //Core.Infrastructure.EngineContext.Current.Resolve().InsertQueuedEmail(new QueuedEmail - //{ - // From = emailAccount.Email, - // FromName = emailAccount.DisplayName, - // To = message.To.First().Address, - // Subject = message.Subject, - // Body = message.Body, - // CreatedOnUtc = DateTime.UtcNow, - // EmailAccountId = emailAccount.Id, - // SendManually = true - //}); - //_services.DbContext.SaveChanges(); - } + //Core.Infrastructure.EngineContext.Current.Resolve().InsertQueuedEmail(new QueuedEmail + //{ + // From = emailAccount.Email, + // FromName = emailAccount.DisplayName, + // To = message.To.First().Address, + // Subject = message.Subject, + // Body = message.Body, + // CreatedOnUtc = DateTime.UtcNow, + // EmailAccountId = emailAccount.Id, + // SendManually = true + //}); + //_services.DbContext.SaveChanges(); + } - private void ImportCoreInner(DataImporterContext ctx, ImportFile file) - { + private void ImportCoreInner(DataImporterContext ctx, ImportFile file) + { var context = ctx.ExecuteContext; var profile = ctx.Request.Profile; @@ -200,24 +200,24 @@ private void ImportCoreInner(DataImporterContext ctx, ImportFile file) return; } - if (!File.Exists(file.Path)) - { - throw new SmartException($"File does not exist {file.Path}."); - } + if (!File.Exists(file.Path)) + { + throw new SmartException($"File does not exist {file.Path}."); + } - using (var stream = new FileStream(file.Path, FileMode.Open, FileAccess.Read, FileShare.Read)) - { + using (var stream = new FileStream(file.Path, FileMode.Open, FileAccess.Read, FileShare.Read)) + { var csvConfiguration = file.IsCsv ? (new CsvConfigurationConverter().ConvertFrom(profile.FileTypeConfiguration) ?? CsvConfiguration.ExcelFriendlyConfiguration) : CsvConfiguration.ExcelFriendlyConfiguration; context.DataTable = LightweightDataTable.FromFile( file.Name, - stream, - stream.Length, + stream, + stream.Length, csvConfiguration, - profile.Skip, - profile.Take > 0 ? profile.Take : int.MaxValue); + profile.Skip, + profile.Take > 0 ? profile.Take : int.MaxValue); context.ColumnMap = file.RelatedType.HasValue ? new ColumnMap() : ctx.ColumnMap; context.File = file; @@ -244,22 +244,22 @@ private void ImportCoreInner(DataImporterContext ctx, ImportFile file) context.Result.AddWarning("Import aborted. A cancellation has been requested."); } } - } - } + } + } - private void ImportCoreOuter(DataImporterContext ctx) - { + private void ImportCoreOuter(DataImporterContext ctx) + { var customer = _services.WorkContext.CurrentCustomer; var profile = ctx.Request.Profile; var logPath = profile.GetImportLogPath(); - FileSystemHelper.DeleteFile(logPath); + FileSystemHelper.DeleteFile(logPath); - using (var logger = new TraceLogger(logPath)) - { + using (var logger = new TraceLogger(logPath)) + { var scopes = new List(); try - { + { var files = profile.GetImportFiles(profile.ImportRelatedData); var groupedFiles = files.GroupBy(x => x.RelatedType); @@ -270,22 +270,22 @@ private void ImportCoreOuter(DataImporterContext ctx) throw new SmartException("You do not have permission to perform the selected import."); _dbCache.Enabled = false; - _services.MediaService.ImagePostProcessingEnabled = false; - scopes.Add(_localizedEntityService.BeginScope()); - scopes.Add(_urlRecordService.BeginScope()); + _services.MediaService.ImagePostProcessingEnabled = false; + scopes.Add(_localizedEntityService.BeginScope()); + scopes.Add(_urlRecordService.BeginScope()); - ctx.Log = logger; + ctx.Log = logger; ctx.Importer = _importerFactory(profile.EntityType); ctx.ExecuteContext.Request = ctx.Request; - ctx.ExecuteContext.DataExchangeSettings = _dataExchangeSettings.Value; - ctx.ExecuteContext.Services = _services; - ctx.ExecuteContext.Log = logger; - ctx.ExecuteContext.Languages = _languageService.GetAllLanguages(true); - ctx.ExecuteContext.UpdateOnly = profile.UpdateOnly; - ctx.ExecuteContext.KeyFieldNames = profile.KeyFieldNames.SplitSafe(","); - ctx.ExecuteContext.ImportFolder = profile.GetImportFolder(); - ctx.ExecuteContext.ExtraData = XmlHelper.Deserialize(profile.ExtraData); + ctx.ExecuteContext.DataExchangeSettings = _dataExchangeSettings.Value; + ctx.ExecuteContext.Services = _services; + ctx.ExecuteContext.Log = logger; + ctx.ExecuteContext.Languages = _languageService.GetAllLanguages(true); + ctx.ExecuteContext.UpdateOnly = profile.UpdateOnly; + ctx.ExecuteContext.KeyFieldNames = profile.KeyFieldNames.SplitSafe(","); + ctx.ExecuteContext.ImportFolder = profile.GetImportFolder(); + ctx.ExecuteContext.ExtraData = XmlHelper.Deserialize(profile.ExtraData); var sb = new StringBuilder(); sb.AppendLine(); @@ -310,87 +310,87 @@ private void ImportCoreOuter(DataImporterContext ctx) fileGroup.Each(x => ImportCoreInner(ctx, x)); } } - catch (Exception ex) - { + catch (Exception ex) + { logger.ErrorsAll(ex); - } - finally - { - try - { - _dbCache.Enabled = true; - _services.MediaService.ImagePostProcessingEnabled = true; - scopes.Each(x => x.Dispose()); - - _services.EventPublisher.Publish(new ImportExecutedEvent(ctx.ExecuteContext)); - } - catch (Exception ex) - { + } + finally + { + try + { + _dbCache.Enabled = true; + _services.MediaService.ImagePostProcessingEnabled = true; + scopes.Each(x => x.Dispose()); + + _services.EventPublisher.Publish(new ImportExecutedEvent(ctx.ExecuteContext)); + } + catch (Exception ex) + { logger.ErrorsAll(ex); } - try - { - // Database context sharing problem: if there are entities in modified state left by the provider due to SaveChanges failure, - // then all subsequent SaveChanges would fail too (e.g. IImportProfileService.UpdateImportProfile, IScheduledTaskService.UpdateTask...). - // so whatever it is, detach\dispose all what the tracker still has tracked. + try + { + // Database context sharing problem: if there are entities in modified state left by the provider due to SaveChanges failure, + // then all subsequent SaveChanges would fail too (e.g. IImportProfileService.UpdateImportProfile, IScheduledTaskService.UpdateTask...). + // so whatever it is, detach\dispose all what the tracker still has tracked. + + _services.DbContext.DetachAll(false); + } + catch (Exception ex) + { + logger.ErrorsAll(ex); + } - _services.DbContext.DetachAll(false); - } - catch (Exception ex) - { + try + { + SendCompletionEmail(ctx); + } + catch (Exception ex) + { logger.ErrorsAll(ex); } - try - { - SendCompletionEmail(ctx); - } - catch (Exception ex) - { + try + { + LogResults(ctx); + } + catch (Exception ex) + { logger.ErrorsAll(ex); } - try - { - LogResults(ctx); - } - catch (Exception ex) - { - logger.ErrorsAll(ex); - } - - try - { + try + { if (ctx.Results.TryGetValue(string.Empty, out var result)) { profile.ResultInfo = XmlHelper.Serialize(result.Clone()); _importProfileService.UpdateImportProfile(profile); } - } - catch (Exception ex) - { - logger.ErrorsAll(ex); - } - - try - { - ctx.Request.CustomData.Clear(); + } + catch (Exception ex) + { + logger.ErrorsAll(ex); + } + + try + { + ctx.Request.CustomData.Clear(); ctx.Results.Clear(); ctx.Log = null; - } - catch (Exception ex) - { - logger.ErrorsAll(ex); - } - } - } - } - - public void Import(DataImportRequest request, CancellationToken cancellationToken) - { - Guard.NotNull(request, nameof(request)); - Guard.NotNull(cancellationToken, nameof(cancellationToken)); + } + catch (Exception ex) + { + logger.ErrorsAll(ex); + } + } + } + } + + public void Import(DataImportRequest request, CancellationToken cancellationToken) + { + Guard.NotNull(request, nameof(request)); + Guard.NotNull(cancellationToken, nameof(cancellationToken)); if (request.Profile != null && request.Profile.Enabled) { @@ -399,6 +399,6 @@ public void Import(DataImportRequest request, CancellationToken cancellationToke } cancellationToken.ThrowIfCancellationRequested(); - } - } + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/IDataTable.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/IDataTable.cs index f35c328fb6..251afcbe6c 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/IDataTable.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/IDataTable.cs @@ -3,71 +3,71 @@ namespace SmartStore.Services.DataExchange.Import { - public interface IDataColumn - { - string Name { get; } - Type Type { get; } - } + public interface IDataColumn + { + string Name { get; } + Type Type { get; } + } - public interface IDataRow - { - object[] Values { get; } - object this[int index] { get; set; } - object this[string name] { get; set; } + public interface IDataRow + { + object[] Values { get; } + object this[int index] { get; set; } + object this[string name] { get; set; } - IDataTable Table { get; } - } + IDataTable Table { get; } + } - public interface IDataTable - { - bool HasColumn(string name); - int GetColumnIndex(string name); + public interface IDataTable + { + bool HasColumn(string name); + int GetColumnIndex(string name); IList Columns { get; } - IList Rows { get; } - } + IList Rows { get; } + } - public static class IDataRowExtensions - { - public static object GetValue(this IDataRow row, int index) - { - return row[index]; - } + public static class IDataRowExtensions + { + public static object GetValue(this IDataRow row, int index) + { + return row[index]; + } - public static object GetValue(this IDataRow row, string name) - { - return row[name]; - } + public static object GetValue(this IDataRow row, string name) + { + return row[name]; + } - public static void SetValue(this IDataRow row, int index, object value) - { - row[index] = value; - } + public static void SetValue(this IDataRow row, int index, object value) + { + row[index] = value; + } - public static void SetValue(this IDataRow row, string name, object value) - { - row[name] = value; - } + public static void SetValue(this IDataRow row, string name, object value) + { + row[name] = value; + } - public static bool TryGetValue(this IDataRow row, string name, out object value) - { - value = null; + public static bool TryGetValue(this IDataRow row, string name, out object value) + { + value = null; - var index = row.Table.GetColumnIndex(name); - if (index < 0) - return false; + var index = row.Table.GetColumnIndex(name); + if (index < 0) + return false; - value = row[index]; - return true; - } + value = row[index]; + return true; + } - public static bool TrySetValue(this IDataRow row, string name, object value) - { - var index = row.Table.GetColumnIndex(name); - if (index < 0) - return false; + public static bool TrySetValue(this IDataRow row, string name, object value) + { + var index = row.Table.GetColumnIndex(name); + if (index < 0) + return false; - row[index] = value; - return true; - } - } + row[index] = value; + return true; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs index f1a33eb808..628dc0894c 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs @@ -12,395 +12,377 @@ namespace SmartStore.Services.DataExchange.Import { - public class LightweightDataTable : IDataTable - { - private readonly IList _columns; - private readonly IList _rows; - private readonly IDictionary _columnIndexes; - private readonly IDictionary _alternativeColumnIndexes; - - public LightweightDataTable(IList columns, IList data) - { - Guard.NotNull(columns, nameof(columns)); - Guard.NotNull(data, nameof(data)); - - if (columns.Select(x => x.Name.ToLower()).Distinct().ToArray().Length != columns.Count) - { - throw Error.Argument("columns", "The columns collection cannot contain duplicate column names."); - } - - _columns = new ReadOnlyCollection(columns); - - TrimData(data); - - var rows = data.Select(x => new LightweightDataRow(this, x)).Cast().ToList(); - _rows = new ReadOnlyCollection(rows); - - _columnIndexes = new Dictionary(StringComparer.OrdinalIgnoreCase); - _alternativeColumnIndexes = new Dictionary(StringComparer.OrdinalIgnoreCase); - - for (var i = 0; i < columns.Count; i++) - { - var name = columns[i].Name; - var alternativeName = GetAlternativeColumnNameFor(name); - - _columnIndexes[name] = i; - - if (!alternativeName.IsCaseInsensitiveEqual(name)) - _alternativeColumnIndexes[alternativeName] = i; - } - } - - private static void TrimData(IList data) - { - // When a user deletes content instead of whole rows from an excel sheet, - // our data table contains completely empty rows at the end. - // Here we get rid of them as they are absolutely useless. - for (int i = data.Count - 1; i >= 0; i--) - { - var allColumnsEmpty = data[i].All(x => x == null || x == DBNull.Value); - if (allColumnsEmpty) - { - data.RemoveAt(i); - //i--; - } - else - { - // get out here on the first occurence of a NON-empty row - break; - } - } - } - - public bool HasColumn(string name) - { - if (name.HasValue()) - { - return (_columnIndexes.ContainsKey(name) || _alternativeColumnIndexes.ContainsKey(name)); - } - - return false; - } - - public int GetColumnIndex(string name) - { - int index; - - if (name.HasValue()) - { - if (_columnIndexes.TryGetValue(name, out index)) - return index; - - if (_alternativeColumnIndexes.TryGetValue(name, out index)) - return index; - } - - return -1; - } - - public IList Columns - { - get - { - return _columns; - } - } - - public IList Rows - { - get - { - return _rows; - } - } - - public static string GetAlternativeColumnNameFor(string name) - { - if (name.IsEmpty()) - return name; - - return name - .Replace(" ", "") - .Replace("-", "") - .Replace("_", ""); - } - - public static IDataTable FromPostedFile( - HttpPostedFileBase file, - int skip = 0, - int take = int.MaxValue) - { - Guard.NotNull(file, nameof(file)); - - return FromFile(file.FileName, file.InputStream, file.ContentLength, new CsvConfiguration(), skip, take); - } - - public static IDataTable FromPostedFile( - HttpPostedFileBase file, - CsvConfiguration configuration, - int skip = 0, - int take = int.MaxValue) - { - Guard.NotNull(file, nameof(file)); - - return FromFile(file.FileName, file.InputStream, file.ContentLength, configuration, skip, take); - } - - public static IDataTable FromFile( - string fileName, - Stream stream, - long contentLength, - CsvConfiguration configuration, - int skip = 0, - int take = int.MaxValue) - { - Guard.NotEmpty(fileName, nameof(fileName)); - Guard.NotNull(stream, nameof(stream)); - Guard.NotNull(configuration, nameof(configuration)); - - if (contentLength == 0) - { - throw Error.Argument("fileName", "The posted file '{0}' does not contain any data.".FormatInvariant(fileName)); - } - - IDataReader dataReader = null; - - try - { - var fileExt = System.IO.Path.GetExtension(fileName).ToLowerInvariant(); - - switch (fileExt) - { - case ".xlsx": - dataReader = new ExcelDataReader(stream, true); // TODO: let the user specify if excel file has headers - break; - default: - dataReader = new CsvDataReader(new StreamReader(stream), configuration); - break; - } - - var table = LightweightDataTable.FromDataReader(dataReader, skip, take); - - if (table.Columns.Count == 0 || table.Rows.Count == 0) - { - throw Error.InvalidOperation("The posted file '{0}' does not contain any columns or data rows.".FormatInvariant(fileName)); - } - - return table; - } - catch (Exception ex) - { - throw ex; - } - finally - { - if (dataReader != null) - { - if (!dataReader.IsClosed) - { - dataReader.Dispose(); - } - dataReader = null; - } - } - } - - public static IDataTable FromDataReader( - IDataReader reader, - int skip = 0, - int take = int.MaxValue) - { - Guard.NotNull(reader, nameof(reader)); - - if (reader.IsClosed) - throw new ArgumentException("This operation is invalid when the reader is closed.", "reader"); - - var columns = new List(reader.FieldCount); - var data = new List(); - - var schema = reader.GetSchemaTable(); - - var nameCol = schema.Columns[SchemaTableColumn.ColumnName]; - var typeCol = schema.Columns[SchemaTableColumn.DataType]; - - foreach (DataRow schemaRow in schema.Rows) - { - var column = new LightweightDataColumn((string)schemaRow[nameCol], (Type)schemaRow[typeCol]); - columns.Add(column); - } - - var fieldCount = reader.FieldCount; - - take = Math.Min(take, int.MaxValue - skip); - - int i = -1; - while (reader.Read()) - { - i++; - - if (skip > i) - continue; - - if (i >= skip + take) - break; - - var values = new object[fieldCount]; - reader.GetValues(values); - data.Add(values); - } - - var table = new LightweightDataTable(columns, data); - - return table; - } - } - - internal class LightweightDataRow : DynamicObject, IDataRow - { - private readonly IDataTable _table; - private readonly object[] _values; - - public LightweightDataRow(IDataTable table, object[] values) - { - Guard.NotNull(values, nameof(values)); - - if (table.Columns.Count != values.Length) - { - throw new ArgumentOutOfRangeException( - "values", - "The number of row values must match the number of columns. Expected: {0}, actual: {1}".FormatInvariant(table.Columns.Count, values.Length)); - } - - _table = table; - _values = values; - } - - public IDataTable Table - { - get { return _table; } - } - - public object[] Values - { - get { return _values; } - } - - public object this[string name] - { - get - { - var index = _table.GetColumnIndex(name); - if (index < 0) - throw new KeyNotFoundException(); - - return _values[index]; - } - set - { - var index = _table.GetColumnIndex(name); - if (index < 0) - throw new KeyNotFoundException(); - - _values[index] = value; - } - } - - public object this[int index] - { - get - { - ValidateColumnIndex(index); - return _values[index]; - } - set - { - ValidateColumnIndex(index); - _values[index] = value; - } - } - - private void ValidateColumnIndex(int index) - { - if (index < 0 || index >= _table.Columns.Count) - { - throw new ArgumentOutOfRangeException("index", index, - "Column index must be included within [0, {0}], but specified column index was: '{1}'.".FormatInvariant(_table.Columns.Count, index)); - } - } - - public override IEnumerable GetDynamicMemberNames() - { - return _table.Columns.Select(x => x.Name); - } - - - public override bool TryGetMember(GetMemberBinder binder, out object result) - { - result = null; - - if (this.TryGetValue(binder.Name, out result)) - { - return true; - } - - return false; - } - - public override bool TrySetMember(SetMemberBinder binder, object value) - { - return this.TrySetValue(binder.Name, value); - } - - public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result) - { - result = null; - - try - { - result = _values[(int)indexes[0]]; - return true; - } - catch - { - return false; - } - } - - public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value) - { - try - { - _values[(int)indexes[0]] = value; - return true; - } - catch - { - return false; - } - } - } - - internal class LightweightDataColumn : IDataColumn - { - public LightweightDataColumn(string name, Type type) - { - Guard.NotEmpty(name, nameof(name)); - Guard.NotNull(type, nameof(type)); - - this.Name = name; - this.Type = type; - } - - public string Name - { - get; - private set; - } - - public Type Type - { - get; - private set; - } - } + public class LightweightDataTable : IDataTable + { + private readonly IList _columns; + private readonly IList _rows; + private readonly IDictionary _columnIndexes; + private readonly IDictionary _alternativeColumnIndexes; + + public LightweightDataTable(IList columns, IList data) + { + Guard.NotNull(columns, nameof(columns)); + Guard.NotNull(data, nameof(data)); + + if (columns.Select(x => x.Name.ToLower()).Distinct().ToArray().Length != columns.Count) + { + throw Error.Argument("columns", "The columns collection cannot contain duplicate column names."); + } + + _columns = new ReadOnlyCollection(columns); + + TrimData(data); + + var rows = data.Select(x => new LightweightDataRow(this, x)).Cast().ToList(); + _rows = new ReadOnlyCollection(rows); + + _columnIndexes = new Dictionary(StringComparer.OrdinalIgnoreCase); + _alternativeColumnIndexes = new Dictionary(StringComparer.OrdinalIgnoreCase); + + for (var i = 0; i < columns.Count; i++) + { + var name = columns[i].Name; + var alternativeName = GetAlternativeColumnNameFor(name); + + _columnIndexes[name] = i; + + if (!alternativeName.IsCaseInsensitiveEqual(name)) + _alternativeColumnIndexes[alternativeName] = i; + } + } + + private static void TrimData(IList data) + { + // When a user deletes content instead of whole rows from an excel sheet, + // our data table contains completely empty rows at the end. + // Here we get rid of them as they are absolutely useless. + for (int i = data.Count - 1; i >= 0; i--) + { + var allColumnsEmpty = data[i].All(x => x == null || x == DBNull.Value); + if (allColumnsEmpty) + { + data.RemoveAt(i); + //i--; + } + else + { + // get out here on the first occurence of a NON-empty row + break; + } + } + } + + public bool HasColumn(string name) + { + if (name.HasValue()) + { + return (_columnIndexes.ContainsKey(name) || _alternativeColumnIndexes.ContainsKey(name)); + } + + return false; + } + + public int GetColumnIndex(string name) + { + int index; + + if (name.HasValue()) + { + if (_columnIndexes.TryGetValue(name, out index)) + return index; + + if (_alternativeColumnIndexes.TryGetValue(name, out index)) + return index; + } + + return -1; + } + + public IList Columns => _columns; + + public IList Rows => _rows; + + public static string GetAlternativeColumnNameFor(string name) + { + if (name.IsEmpty()) + return name; + + return name + .Replace(" ", "") + .Replace("-", "") + .Replace("_", ""); + } + + public static IDataTable FromPostedFile( + HttpPostedFileBase file, + int skip = 0, + int take = int.MaxValue) + { + Guard.NotNull(file, nameof(file)); + + return FromFile(file.FileName, file.InputStream, file.ContentLength, new CsvConfiguration(), skip, take); + } + + public static IDataTable FromPostedFile( + HttpPostedFileBase file, + CsvConfiguration configuration, + int skip = 0, + int take = int.MaxValue) + { + Guard.NotNull(file, nameof(file)); + + return FromFile(file.FileName, file.InputStream, file.ContentLength, configuration, skip, take); + } + + public static IDataTable FromFile( + string fileName, + Stream stream, + long contentLength, + CsvConfiguration configuration, + int skip = 0, + int take = int.MaxValue) + { + Guard.NotEmpty(fileName, nameof(fileName)); + Guard.NotNull(stream, nameof(stream)); + Guard.NotNull(configuration, nameof(configuration)); + + if (contentLength == 0) + { + throw Error.Argument("fileName", "The posted file '{0}' does not contain any data.".FormatInvariant(fileName)); + } + + IDataReader dataReader = null; + + try + { + var fileExt = System.IO.Path.GetExtension(fileName).ToLowerInvariant(); + + switch (fileExt) + { + case ".xlsx": + dataReader = new ExcelDataReader(stream, true); // TODO: let the user specify if excel file has headers + break; + default: + dataReader = new CsvDataReader(new StreamReader(stream), configuration); + break; + } + + var table = LightweightDataTable.FromDataReader(dataReader, skip, take); + + if (table.Columns.Count == 0 || table.Rows.Count == 0) + { + throw Error.InvalidOperation("The posted file '{0}' does not contain any columns or data rows.".FormatInvariant(fileName)); + } + + return table; + } + catch (Exception ex) + { + throw ex; + } + finally + { + if (dataReader != null) + { + if (!dataReader.IsClosed) + { + dataReader.Dispose(); + } + dataReader = null; + } + } + } + + public static IDataTable FromDataReader( + IDataReader reader, + int skip = 0, + int take = int.MaxValue) + { + Guard.NotNull(reader, nameof(reader)); + + if (reader.IsClosed) + throw new ArgumentException("This operation is invalid when the reader is closed.", "reader"); + + var columns = new List(reader.FieldCount); + var data = new List(); + + var schema = reader.GetSchemaTable(); + + var nameCol = schema.Columns[SchemaTableColumn.ColumnName]; + var typeCol = schema.Columns[SchemaTableColumn.DataType]; + + foreach (DataRow schemaRow in schema.Rows) + { + var column = new LightweightDataColumn((string)schemaRow[nameCol], (Type)schemaRow[typeCol]); + columns.Add(column); + } + + var fieldCount = reader.FieldCount; + + take = Math.Min(take, int.MaxValue - skip); + + int i = -1; + while (reader.Read()) + { + i++; + + if (skip > i) + continue; + + if (i >= skip + take) + break; + + var values = new object[fieldCount]; + reader.GetValues(values); + data.Add(values); + } + + var table = new LightweightDataTable(columns, data); + + return table; + } + } + + internal class LightweightDataRow : DynamicObject, IDataRow + { + private readonly IDataTable _table; + private readonly object[] _values; + + public LightweightDataRow(IDataTable table, object[] values) + { + Guard.NotNull(values, nameof(values)); + + if (table.Columns.Count != values.Length) + { + throw new ArgumentOutOfRangeException( + "values", + "The number of row values must match the number of columns. Expected: {0}, actual: {1}".FormatInvariant(table.Columns.Count, values.Length)); + } + + _table = table; + _values = values; + } + + public IDataTable Table => _table; + + public object[] Values => _values; + + public object this[string name] + { + get + { + var index = _table.GetColumnIndex(name); + if (index < 0) + throw new KeyNotFoundException(); + + return _values[index]; + } + set + { + var index = _table.GetColumnIndex(name); + if (index < 0) + throw new KeyNotFoundException(); + + _values[index] = value; + } + } + + public object this[int index] + { + get + { + ValidateColumnIndex(index); + return _values[index]; + } + set + { + ValidateColumnIndex(index); + _values[index] = value; + } + } + + private void ValidateColumnIndex(int index) + { + if (index < 0 || index >= _table.Columns.Count) + { + throw new ArgumentOutOfRangeException("index", index, + "Column index must be included within [0, {0}], but specified column index was: '{1}'.".FormatInvariant(_table.Columns.Count, index)); + } + } + + public override IEnumerable GetDynamicMemberNames() + { + return _table.Columns.Select(x => x.Name); + } + + + public override bool TryGetMember(GetMemberBinder binder, out object result) + { + result = null; + + if (this.TryGetValue(binder.Name, out result)) + { + return true; + } + + return false; + } + + public override bool TrySetMember(SetMemberBinder binder, object value) + { + return this.TrySetValue(binder.Name, value); + } + + public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result) + { + result = null; + + try + { + result = _values[(int)indexes[0]]; + return true; + } + catch + { + return false; + } + } + + public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value) + { + try + { + _values[(int)indexes[0]] = value; + return true; + } + catch + { + return false; + } + } + } + + internal class LightweightDataColumn : IDataColumn + { + public LightweightDataColumn(string name, Type type) + { + Guard.NotEmpty(name, nameof(name)); + Guard.NotNull(type, nameof(type)); + + this.Name = name; + this.Type = type; + } + + public string Name + { + get; + private set; + } + + public Type Type + { + get; + private set; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs index ad35777b91..ecdbc349e4 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs @@ -19,56 +19,56 @@ namespace SmartStore.Services.DataExchange.Import { public abstract class EntityImporterBase : IEntityImporter - { - private const string IMAGE_DOWNLOAD_FOLDER = @"Content\DownloadedImages"; + { + private const string IMAGE_DOWNLOAD_FOLDER = @"Content\DownloadedImages"; - public DateTime UtcNow - { - get; - private set; - } + public DateTime UtcNow + { + get; + private set; + } /// /// URL > file name. To avoid downloading image several times. /// public Dictionary DownloadedItems - { - get; - private set; - } - - public string ImageDownloadFolder - { - get; - private set; - } - - public string ImageFolder - { - get; - private set; - } - - public FileDownloadManagerContext DownloaderContext - { - get; - private set; - } - - public void Execute(ImportExecuteContext context) - { - Import(context); - } - - protected abstract void Import(ImportExecuteContext context); - - protected void Initialize(ImportExecuteContext context) - { - UtcNow = DateTime.UtcNow; - DownloadedItems = new Dictionary(); - ImageDownloadFolder = Path.Combine(context.ImportFolder, IMAGE_DOWNLOAD_FOLDER); - - var settings = context.DataExchangeSettings; + { + get; + private set; + } + + public string ImageDownloadFolder + { + get; + private set; + } + + public string ImageFolder + { + get; + private set; + } + + public FileDownloadManagerContext DownloaderContext + { + get; + private set; + } + + public void Execute(ImportExecuteContext context) + { + Import(context); + } + + protected abstract void Import(ImportExecuteContext context); + + protected void Initialize(ImportExecuteContext context) + { + UtcNow = DateTime.UtcNow; + DownloadedItems = new Dictionary(); + ImageDownloadFolder = Path.Combine(context.ImportFolder, IMAGE_DOWNLOAD_FOLDER); + + var settings = context.DataExchangeSettings; ImageFolder = settings.ImageImportFolder.HasValue() ? Path.Combine(context.ImportFolder, settings.ImageImportFolder) @@ -79,18 +79,18 @@ protected void Initialize(ImportExecuteContext context) System.IO.Directory.CreateDirectory(ImageDownloadFolder); } - DownloaderContext = new FileDownloadManagerContext - { - Timeout = TimeSpan.FromMinutes(settings.ImageDownloadTimeout), - Logger = context.Log, - CancellationToken = context.CancellationToken - }; + DownloaderContext = new FileDownloadManagerContext + { + Timeout = TimeSpan.FromMinutes(settings.ImageDownloadTimeout), + Logger = context.Log, + CancellationToken = context.CancellationToken + }; - context.Result.TotalRecords = context.DataSegmenter.TotalRows; - } + context.Result.TotalRecords = context.DataSegmenter.TotalRows; + } - public FileDownloadManagerItem CreateDownloadImage(ImportExecuteContext context, string urlOrPath, int displayOrder) - { + public FileDownloadManagerItem CreateDownloadImage(ImportExecuteContext context, string urlOrPath, int displayOrder) + { var item = new FileDownloadManagerItem { Id = displayOrder, @@ -139,99 +139,99 @@ public FileDownloadManagerItem CreateDownloadImage(ImportExecuteContext context, return item; } - public void Succeeded(FileDownloadManagerItem item) - { - if ((item.Success ?? false) && item.Url.HasValue() && !DownloadedItems.ContainsKey(item.Url)) - { + public void Succeeded(FileDownloadManagerItem item) + { + if ((item.Success ?? false) && item.Url.HasValue() && !DownloadedItems.ContainsKey(item.Url)) + { DownloadedItems.Add(item.Url, Path.GetFileName(item.Path)); - } - } - - protected virtual int ProcessLocalizations( - ImportExecuteContext context, - IEnumerable> batch, - IDictionary>> localizableProperties) where TEntity : BaseEntity, ILocalizedEntity - { - Guard.NotNull(context, nameof(context)); - Guard.NotNull(batch, nameof(batch)); - Guard.NotNull(localizableProperties, nameof(localizableProperties)); - - // Perf: determine whether our localizable properties actually have - // counterparts in the source BEFORE import batch begins. This way we spare ourself - // to query over and over for values. - var localizedProps = (from kvp in localizableProperties - where context.DataSegmenter.GetColumnIndexes(kvp.Key).Length > 0 - select kvp.Key).ToArray(); - - if (localizedProps.Length == 0) - { - return 0; - } - - var localizedEntityService = context.Services.Resolve(); - - bool shouldSave = false; - - foreach (var row in batch) - { - foreach (var prop in localizedProps) - { - var lambda = localizableProperties[prop]; - foreach (var lang in context.Languages) - { - var code = lang.UniqueSeoCode; - string value; - - if (row.TryGetDataValue(prop /* ColumnName */, code, out value)) - { - localizedEntityService.SaveLocalizedValue(row.Entity, lambda, value, lang.Id); - shouldSave = true; - } - } - } - } - - if (shouldSave) - { - // commit whole batch at once - return context.Services.DbContext.SaveChanges(); - } - - return 0; - } - - protected virtual int ProcessStoreMappings( - ImportExecuteContext context, - IEnumerable> batch) where TEntity : BaseEntity, IStoreMappingSupported - { - var storeMappingService = context.Services.Resolve(); - var storeMappingRepository = context.Services.Resolve>(); - - storeMappingRepository.AutoCommitEnabled = false; - - foreach (var row in batch) - { - var storeIds = row.GetDataValue>("StoreIds"); - if (!storeIds.IsNullOrEmpty()) - { - storeMappingService.SaveStoreMappings(row.Entity, storeIds.ToArray()); - } - } - - // commit whole batch at once - return context.Services.DbContext.SaveChanges(); - } - - protected virtual int ProcessSlugs( - ImportExecuteContext context, - IEnumerable> batch, - string entityName) where TEntity : BaseEntity, ISlugSupported - { - var slugMap = new Dictionary(); - UrlRecord urlRecord = null; - - var urlRecordService = context.Services.Resolve(); - var seoSettings = context.Services.Resolve(); + } + } + + protected virtual int ProcessLocalizations( + ImportExecuteContext context, + IEnumerable> batch, + IDictionary>> localizableProperties) where TEntity : BaseEntity, ILocalizedEntity + { + Guard.NotNull(context, nameof(context)); + Guard.NotNull(batch, nameof(batch)); + Guard.NotNull(localizableProperties, nameof(localizableProperties)); + + // Perf: determine whether our localizable properties actually have + // counterparts in the source BEFORE import batch begins. This way we spare ourself + // to query over and over for values. + var localizedProps = (from kvp in localizableProperties + where context.DataSegmenter.GetColumnIndexes(kvp.Key).Length > 0 + select kvp.Key).ToArray(); + + if (localizedProps.Length == 0) + { + return 0; + } + + var localizedEntityService = context.Services.Resolve(); + + bool shouldSave = false; + + foreach (var row in batch) + { + foreach (var prop in localizedProps) + { + var lambda = localizableProperties[prop]; + foreach (var lang in context.Languages) + { + var code = lang.UniqueSeoCode; + string value; + + if (row.TryGetDataValue(prop /* ColumnName */, code, out value)) + { + localizedEntityService.SaveLocalizedValue(row.Entity, lambda, value, lang.Id); + shouldSave = true; + } + } + } + } + + if (shouldSave) + { + // commit whole batch at once + return context.Services.DbContext.SaveChanges(); + } + + return 0; + } + + protected virtual int ProcessStoreMappings( + ImportExecuteContext context, + IEnumerable> batch) where TEntity : BaseEntity, IStoreMappingSupported + { + var storeMappingService = context.Services.Resolve(); + var storeMappingRepository = context.Services.Resolve>(); + + storeMappingRepository.AutoCommitEnabled = false; + + foreach (var row in batch) + { + var storeIds = row.GetDataValue>("StoreIds"); + if (!storeIds.IsNullOrEmpty()) + { + storeMappingService.SaveStoreMappings(row.Entity, storeIds.ToArray()); + } + } + + // commit whole batch at once + return context.Services.DbContext.SaveChanges(); + } + + protected virtual int ProcessSlugs( + ImportExecuteContext context, + IEnumerable> batch, + string entityName) where TEntity : BaseEntity, ISlugSupported + { + var slugMap = new Dictionary(); + UrlRecord urlRecord = null; + + var urlRecordService = context.Services.Resolve(); + var seoSettings = context.Services.Resolve(); UrlRecord slugLookup(string s) { @@ -239,65 +239,65 @@ UrlRecord slugLookup(string s) } foreach (var row in batch) - { - try - { + { + try + { string localizedName = null; if (row.TryGetDataValue("SeName", out string seName) || row.IsNew || row.NameChanged) - { - seName = row.Entity.ValidateSeName(seName, row.EntityDisplayName, true, urlRecordService, seoSettings, extraSlugLookup: slugLookup); - - if (row.IsNew) - { - // Don't bother validating SeName for new entities. - urlRecord = new UrlRecord - { - EntityId = row.Entity.Id, - EntityName = entityName, - Slug = seName, - LanguageId = 0, - IsActive = true, - }; + { + seName = row.Entity.ValidateSeName(seName, row.EntityDisplayName, true, urlRecordService, seoSettings, extraSlugLookup: slugLookup); + + if (row.IsNew) + { + // Don't bother validating SeName for new entities. + urlRecord = new UrlRecord + { + EntityId = row.Entity.Id, + EntityName = entityName, + Slug = seName, + LanguageId = 0, + IsActive = true, + }; urlRecordService.InsertUrlRecord(urlRecord); - } - else - { - urlRecord = urlRecordService.SaveSlug(row.Entity, seName, 0); - } - - if (urlRecord != null) - { - // A new record was inserted to the store: keep track of it for this batch. - slugMap[seName] = urlRecord; - } - } - - // Process localized SeNames. - foreach (var lang in context.Languages) - { - var hasSeName = row.TryGetDataValue("SeName", lang.UniqueSeoCode, out seName); - var hasLocalizedName = row.TryGetDataValue("Name", lang.UniqueSeoCode, out localizedName); - - if (hasSeName || hasLocalizedName) - { - seName = row.Entity.ValidateSeName(seName, localizedName, false, urlRecordService, seoSettings, lang.Id, slugLookup); - urlRecord = urlRecordService.SaveSlug(row.Entity, seName, lang.Id); - if (urlRecord != null) - { - slugMap[seName] = urlRecord; - } - } - } - } - catch (Exception ex) - { - context.Result.AddWarning(ex.Message, row.GetRowInfo(), "SeName"); - } - } - - // Commit whole batch at once. - return context.Services.DbContext.SaveChanges(); - } - } + } + else + { + urlRecord = urlRecordService.SaveSlug(row.Entity, seName, 0); + } + + if (urlRecord != null) + { + // A new record was inserted to the store: keep track of it for this batch. + slugMap[seName] = urlRecord; + } + } + + // Process localized SeNames. + foreach (var lang in context.Languages) + { + var hasSeName = row.TryGetDataValue("SeName", lang.UniqueSeoCode, out seName); + var hasLocalizedName = row.TryGetDataValue("Name", lang.UniqueSeoCode, out localizedName); + + if (hasSeName || hasLocalizedName) + { + seName = row.Entity.ValidateSeName(seName, localizedName, false, urlRecordService, seoSettings, lang.Id, slugLookup); + urlRecord = urlRecordService.SaveSlug(row.Entity, seName, lang.Id); + if (urlRecord != null) + { + slugMap[seName] = urlRecord; + } + } + } + } + catch (Exception ex) + { + context.Result.AddWarning(ex.Message, row.GetRowInfo(), "SeName"); + } + } + + // Commit whole batch at once. + return context.Services.DbContext.SaveChanges(); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/Events/ImportExecutedEvent.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/Events/ImportExecutedEvent.cs index c59979e207..073a74ba18 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/Events/ImportExecutedEvent.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/Events/ImportExecutedEvent.cs @@ -2,19 +2,19 @@ namespace SmartStore.Services.DataExchange.Import.Events { - public class ImportExecutedEvent - { - public ImportExecutedEvent(ImportExecuteContext context) - { - Guard.NotNull(context, nameof(context)); + public class ImportExecutedEvent + { + public ImportExecutedEvent(ImportExecuteContext context) + { + Guard.NotNull(context, nameof(context)); - Context = context; - } + Context = context; + } - public ImportExecuteContext Context - { - get; - private set; - } - } + public ImportExecuteContext Context + { + get; + private set; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/Events/ImportExecutingEvent.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/Events/ImportExecutingEvent.cs index 3c0160b306..537606f9c2 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/Events/ImportExecutingEvent.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/Events/ImportExecutingEvent.cs @@ -2,19 +2,19 @@ namespace SmartStore.Services.DataExchange.Import.Events { - public class ImportExecutingEvent - { - public ImportExecutingEvent(ImportExecuteContext context) - { - Guard.NotNull(context, nameof(context)); + public class ImportExecutingEvent + { + public ImportExecutingEvent(ImportExecuteContext context) + { + Guard.NotNull(context, nameof(context)); - Context = context; - } + Context = context; + } - public ImportExecuteContext Context - { - get; - private set; - } - } + public ImportExecuteContext Context + { + get; + private set; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs index 9eee0876b3..dfd6d6cd5c 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs @@ -6,41 +6,41 @@ namespace SmartStore.Services.DataExchange.Import { - public interface IDataImporter - { - void Import(DataImportRequest request, CancellationToken cancellationToken); - } + public interface IDataImporter + { + void Import(DataImportRequest request, CancellationToken cancellationToken); + } - public class DataImportRequest - { - private readonly static ProgressValueSetter _voidProgressValueSetter = DataImportRequest.SetProgress; + public class DataImportRequest + { + private readonly static ProgressValueSetter _voidProgressValueSetter = DataImportRequest.SetProgress; - public DataImportRequest(ImportProfile profile) - { - Guard.NotNull(profile, nameof(profile)); + public DataImportRequest(ImportProfile profile) + { + Guard.NotNull(profile, nameof(profile)); - Profile = profile; - ProgressValueSetter = _voidProgressValueSetter; + Profile = profile; + ProgressValueSetter = _voidProgressValueSetter; - EntitiesToImport = new List(); - CustomData = new Dictionary(StringComparer.OrdinalIgnoreCase); - } + EntitiesToImport = new List(); + CustomData = new Dictionary(StringComparer.OrdinalIgnoreCase); + } - public ImportProfile Profile { get; private set; } + public ImportProfile Profile { get; private set; } - public ProgressValueSetter ProgressValueSetter { get; set; } + public ProgressValueSetter ProgressValueSetter { get; set; } - public bool HasPermission { get; set; } + public bool HasPermission { get; set; } - public IList EntitiesToImport { get; set; } + public IList EntitiesToImport { get; set; } - public IDictionary CustomData { get; private set; } + public IDictionary CustomData { get; private set; } - private static void SetProgress(int val, int max, string msg) - { - // do nothing - } - } + private static void SetProgress(int val, int max, string msg) + { + // do nothing + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs index bc64b63531..f4b69ac913 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs @@ -1,7 +1,7 @@ namespace SmartStore.Services.DataExchange.Import { - public partial interface IEntityImporter - { - void Execute(ImportExecuteContext context); - } + public partial interface IEntityImporter + { + void Execute(ImportExecuteContext context); + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/IImportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/IImportProfileService.cs index 6f7b7d4f8e..4da8a9e535 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/IImportProfileService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/IImportProfileService.cs @@ -5,62 +5,62 @@ namespace SmartStore.Services.DataExchange.Import { - public interface IImportProfileService - { - /// - /// Gets a new profile name - /// - /// Entity type - /// Suggestion for a new profile name - string GetNewProfileName(ImportEntityType entityType); + public interface IImportProfileService + { + /// + /// Gets a new profile name + /// + /// Entity type + /// Suggestion for a new profile name + string GetNewProfileName(ImportEntityType entityType); - /// - /// Inserts an import profile - /// - /// Name of the import file - /// Profile name - /// Entity type - /// Inserted import profile - ImportProfile InsertImportProfile(string fileName, string name, ImportEntityType entityType); + /// + /// Inserts an import profile + /// + /// Name of the import file + /// Profile name + /// Entity type + /// Inserted import profile + ImportProfile InsertImportProfile(string fileName, string name, ImportEntityType entityType); - /// - /// Updates an import profile - /// - /// Import profile - void UpdateImportProfile(ImportProfile profile); + /// + /// Updates an import profile + /// + /// Import profile + void UpdateImportProfile(ImportProfile profile); - /// - /// Deletes an import profile - /// - /// Import profile - void DeleteImportProfile(ImportProfile profile); + /// + /// Deletes an import profile + /// + /// Import profile + void DeleteImportProfile(ImportProfile profile); - /// - /// Get queryable import profiles - /// - /// Whether to filter enabled or disabled profiles - /// Import profiles - IQueryable GetImportProfiles(bool? enabled = null); + /// + /// Get queryable import profiles + /// + /// Whether to filter enabled or disabled profiles + /// Import profiles + IQueryable GetImportProfiles(bool? enabled = null); - /// - /// Gets an import profile by identifier - /// - /// Import profile identifier - /// Import profile - ImportProfile GetImportProfileById(int id); + /// + /// Gets an import profile by identifier + /// + /// Import profile identifier + /// Import profile + ImportProfile GetImportProfileById(int id); - /// - /// Gets an import profile by name - /// - /// Name of the import profile - /// Import profile - ImportProfile GetImportProfileByName(string name); + /// + /// Gets an import profile by name + /// + /// Name of the import profile + /// Import profile + ImportProfile GetImportProfileByName(string name); - /// - /// Get all importable entity properties and their localized values - /// - /// Import entity type - /// Importable entity properties - Dictionary GetImportableEntityProperties(ImportEntityType entityType); - } + /// + /// Get all importable entity properties and their localized values + /// + /// Import entity type + /// Importable entity properties + Dictionary GetImportableEntityProperties(ImportEntityType entityType); + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportDataSegmenter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportDataSegmenter.cs index 656c68cefb..ba2df75006 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportDataSegmenter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportDataSegmenter.cs @@ -8,111 +8,81 @@ namespace SmartStore.Services.DataExchange.Import { - public class ImportDataSegmenter - { - private const int BATCHSIZE = 100; - - private readonly IDataTable _table; - private object[] _currentBatch; - private readonly IPageable _pageable; - private bool _bof; - private CultureInfo _culture; - private ColumnMap _columnMap; - - private readonly IDictionary _columnIndexes = new Dictionary(StringComparer.OrdinalIgnoreCase); - - public ImportDataSegmenter(IDataTable table, ColumnMap map) - { - Guard.NotNull(table, nameof(table)); - Guard.NotNull(map, nameof(map)); - - _table = table; - _columnMap = map; - - _bof = true; - _pageable = new PagedList(0, BATCHSIZE, table.Rows.Count); - _culture = CultureInfo.InvariantCulture; + public class ImportDataSegmenter + { + private const int BATCHSIZE = 100; + + private readonly IDataTable _table; + private object[] _currentBatch; + private readonly IPageable _pageable; + private bool _bof; + private CultureInfo _culture; + private ColumnMap _columnMap; + + private readonly IDictionary _columnIndexes = new Dictionary(StringComparer.OrdinalIgnoreCase); + + public ImportDataSegmenter(IDataTable table, ColumnMap map) + { + Guard.NotNull(table, nameof(table)); + Guard.NotNull(map, nameof(map)); + + _table = table; + _columnMap = map; + + _bof = true; + _pageable = new PagedList(0, BATCHSIZE, table.Rows.Count); + _culture = CultureInfo.InvariantCulture; } - public CultureInfo Culture - { - get - { - return _culture; - } - set - { - _culture = value ?? CultureInfo.InvariantCulture; - } - } - - public ColumnMap ColumnMap - { - get - { - return _columnMap; - } - set - { - _columnMap = value ?? new ColumnMap(); - } - } - - public int TotalRows - { - get { return _table.Rows.Count; } - } - - public int TotalColumns - { - get { return _table.Columns.Count; } - } - - public int CurrentSegment - { - get { return _bof ? 0 : _pageable.PageNumber; } - } - - public int CurrentSegmentFirstRowIndex - { - get { return _pageable.FirstItemIndex; } - } - - public int TotalSegments - { - get { return _pageable.TotalPages; } - } - - public int BatchSize - { - get { return BATCHSIZE; } - } - - /// - /// Determines whether a specific column exists in the underlying data table. - /// - /// The name of the column to find - /// - /// If true and a column with the passed does not exist, - /// this method tests for the existence of any indexed column with the same name. - /// - /// true if the column exists, false otherwise - /// - /// This method takes mapped column names into account. - /// - public bool HasColumn(string name, bool withAnyIndex = false) - { - var result = HasColumn(name, null); - - if (!result && withAnyIndex) - { - // Column does not exist, but withAnyIndex is true: - // Test for existence of any indexed column. - result = GetColumnIndexes(name).Length > 0; - } - - return result; - } + public CultureInfo Culture + { + get => _culture; + set => _culture = value ?? CultureInfo.InvariantCulture; + } + + public ColumnMap ColumnMap + { + get => _columnMap; + set => _columnMap = value ?? new ColumnMap(); + } + + public int TotalRows => _table.Rows.Count; + + public int TotalColumns => _table.Columns.Count; + + public int CurrentSegment => _bof ? 0 : _pageable.PageNumber; + + public int CurrentSegmentFirstRowIndex => _pageable.FirstItemIndex; + + public int TotalSegments => _pageable.TotalPages; + + public int BatchSize => BATCHSIZE; + + /// + /// Determines whether a specific column exists in the underlying data table. + /// + /// The name of the column to find + /// + /// If true and a column with the passed does not exist, + /// this method tests for the existence of any indexed column with the same name. + /// + /// true if the column exists, false otherwise + /// + /// This method takes mapped column names into account. + /// + public bool HasColumn(string name, bool withAnyIndex = false) + { + var result = HasColumn(name, null); + + if (!result && withAnyIndex) + { + // Column does not exist, but withAnyIndex is true: + // Test for existence of any indexed column. + result = GetColumnIndexes(name).Length > 0; + } + + return result; + } /// /// Determines whether the column name[index] exists in the underlying data table. @@ -125,9 +95,9 @@ public bool HasColumn(string name, bool withAnyIndex = false) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool HasColumn(string name, string index) - { - return _table.HasColumn(_columnMap.GetMapping(name, index).MappedName); - } + { + return _table.HasColumn(_columnMap.GetMapping(name, index).MappedName); + } /// /// Indicates whether to ignore the property that is mapped to columnName @@ -136,9 +106,9 @@ public bool HasColumn(string name, string index) /// true ignore, false do not ignore [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool IsIgnored(string columnName) - { - return IsIgnored(columnName, null); - } + { + return IsIgnored(columnName, null); + } /// /// Indicates whether to ignore the property that is mapped to columnName @@ -148,100 +118,100 @@ public bool IsIgnored(string columnName) /// true ignore, false do not ignore [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool IsIgnored(string columnName, string index) - { - var mapping = _columnMap.GetMapping(columnName, index); - - return mapping.IgnoreProperty; - } - - /// - /// Returns an array of exisiting index names for a column - /// - /// The name of the columns without index qualification - /// An array of index names - /// - /// If following columns exist in source: Attr[Color], Attr[Size] - /// This method returns: string[] { "Color", "Size" } - /// - public string[] GetColumnIndexes(string name) - { - string[] indexes; - - if (!_columnIndexes.TryGetValue(name, out indexes)) - { - var startsWith = name + "["; - - var columns1 = _columnMap.Mappings - .Where(x => x.Key.StartsWith(startsWith, StringComparison.OrdinalIgnoreCase)) - .Select(x => x.Key); - - var columns2 = _table.Columns - .Where(x => x.Name.StartsWith(startsWith, StringComparison.OrdinalIgnoreCase)) - .Select(x => x.Name); - - indexes = columns1.Concat(columns2) - .Distinct(StringComparer.OrdinalIgnoreCase) - .Select(x => x.Substring(x.IndexOf("[", StringComparison.OrdinalIgnoreCase) + 1).TrimEnd(']')) - .ToArray(); - - _columnIndexes[name] = indexes; - } - - return indexes; - } - - public void Reset() - { - if (_pageable.PageIndex != 0 && _currentBatch != null) - { - _currentBatch = null; - } - _bof = true; - _pageable.PageIndex = 0; - } - - public bool ReadNextBatch() - { - if (_currentBatch != null) - { - _currentBatch = null; - } - - if (_bof) - { - _bof = false; - return _pageable.TotalCount > 0; - } - - if (_pageable.HasNextPage) - { - _pageable.PageIndex++; - return true; - } - - Reset(); - return false; - } - - public IEnumerable> GetCurrentBatch() where T : BaseEntity - { - if (_currentBatch == null) - { - int start = _pageable.FirstItemIndex - 1; - int end = _pageable.LastItemIndex - 1; - - _currentBatch = new ImportRow[(end - start) + 1]; - - // Determine values per row - int i = 0; - for (int r = start; r <= end; r++) - { - _currentBatch[i] = new ImportRow(this, _table.Rows[r], r); - i++; - } - } - - return _currentBatch.Cast>(); - } - } + { + var mapping = _columnMap.GetMapping(columnName, index); + + return mapping.IgnoreProperty; + } + + /// + /// Returns an array of exisiting index names for a column + /// + /// The name of the columns without index qualification + /// An array of index names + /// + /// If following columns exist in source: Attr[Color], Attr[Size] + /// This method returns: string[] { "Color", "Size" } + /// + public string[] GetColumnIndexes(string name) + { + string[] indexes; + + if (!_columnIndexes.TryGetValue(name, out indexes)) + { + var startsWith = name + "["; + + var columns1 = _columnMap.Mappings + .Where(x => x.Key.StartsWith(startsWith, StringComparison.OrdinalIgnoreCase)) + .Select(x => x.Key); + + var columns2 = _table.Columns + .Where(x => x.Name.StartsWith(startsWith, StringComparison.OrdinalIgnoreCase)) + .Select(x => x.Name); + + indexes = columns1.Concat(columns2) + .Distinct(StringComparer.OrdinalIgnoreCase) + .Select(x => x.Substring(x.IndexOf("[", StringComparison.OrdinalIgnoreCase) + 1).TrimEnd(']')) + .ToArray(); + + _columnIndexes[name] = indexes; + } + + return indexes; + } + + public void Reset() + { + if (_pageable.PageIndex != 0 && _currentBatch != null) + { + _currentBatch = null; + } + _bof = true; + _pageable.PageIndex = 0; + } + + public bool ReadNextBatch() + { + if (_currentBatch != null) + { + _currentBatch = null; + } + + if (_bof) + { + _bof = false; + return _pageable.TotalCount > 0; + } + + if (_pageable.HasNextPage) + { + _pageable.PageIndex++; + return true; + } + + Reset(); + return false; + } + + public IEnumerable> GetCurrentBatch() where T : BaseEntity + { + if (_currentBatch == null) + { + int start = _pageable.FirstItemIndex - 1; + int end = _pageable.LastItemIndex - 1; + + _currentBatch = new ImportRow[(end - start) + 1]; + + // Determine values per row + int i = 0; + for (int r = start; r <= end; r++) + { + _currentBatch[i] = new ImportRow(this, _table.Rows[r], r); + i++; + } + } + + return _currentBatch.Cast>(); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExecuteContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExecuteContext.cs index d5b3ec8692..7bad8db37f 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExecuteContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExecuteContext.cs @@ -7,65 +7,62 @@ namespace SmartStore.Services.DataExchange.Import { public class ImportExecuteContext - { - private DataExchangeAbortion _abortion; - private ProgressValueSetter _progressValueSetter; - private string _progressInfo; - - private IDataTable _dataTable; - private ImportDataSegmenter _segmenter; - - public ImportExecuteContext( - CancellationToken cancellation, - ProgressValueSetter progressValueSetter, - string progressInfo) - { - _progressValueSetter = progressValueSetter; - _progressInfo = progressInfo; - - CancellationToken = cancellation; - CustomProperties = new Dictionary(); - } - - public DataImportRequest Request - { - get; - internal set; - } - - /// - /// Import settings - /// - public DataExchangeSettings DataExchangeSettings - { - get; - internal set; - } - - /// - /// The data source (CSV, Excel etc.) - /// - public IDataTable DataTable - { - get - { - return _dataTable; - } - internal set - { - _dataTable = value; - _segmenter = null; - } - } - - /// - /// Mapping information between database and data source - /// - public ColumnMap ColumnMap - { - get; - internal set; - } + { + private DataExchangeAbortion _abortion; + private ProgressValueSetter _progressValueSetter; + private string _progressInfo; + + private IDataTable _dataTable; + private ImportDataSegmenter _segmenter; + + public ImportExecuteContext( + CancellationToken cancellation, + ProgressValueSetter progressValueSetter, + string progressInfo) + { + _progressValueSetter = progressValueSetter; + _progressInfo = progressInfo; + + CancellationToken = cancellation; + CustomProperties = new Dictionary(); + } + + public DataImportRequest Request + { + get; + internal set; + } + + /// + /// Import settings + /// + public DataExchangeSettings DataExchangeSettings + { + get; + internal set; + } + + /// + /// The data source (CSV, Excel etc.) + /// + public IDataTable DataTable + { + get => _dataTable; + internal set + { + _dataTable = value; + _segmenter = null; + } + } + + /// + /// Mapping information between database and data source + /// + public ColumnMap ColumnMap + { + get; + internal set; + } /// /// Infos about the import file. @@ -80,148 +77,139 @@ public ImportFile File /// Whether to only update existing records /// public bool UpdateOnly - { - get; - internal set; - } - - /// - /// Name of key fields to identify existing records for updating - /// - public string[] KeyFieldNames - { - get; - internal set; - } - - /// - /// All active languages - /// - public IList Languages - { - get; - internal set; - } - - /// - /// To log information into the import log file - /// - public ILogger Log - { - get; - internal set; - } - - /// - /// Common Services - /// - public ICommonServices Services - { - get; - internal set; - } - - /// - /// Cancellation token - /// - public CancellationToken CancellationToken - { - get; - private set; - } - - /// - /// The import folder - /// - public string ImportFolder - { - get; - internal set; - } - - /// - /// Use this dictionary for any custom data required along the import - /// - public Dictionary CustomProperties - { - get; - set; - } - - /// - /// Result of the import - /// - public ImportResult Result - { - get; - set; - } - - /// - /// Extra import configuration data - /// - public ImportExtraData ExtraData - { - get; - internal set; - } - - /// - /// Indicates whether and how to abort the import - /// - public DataExchangeAbortion Abort - { - get - { - if (CancellationToken.IsCancellationRequested || IsMaxFailures) - return DataExchangeAbortion.Hard; - - return _abortion; - } - set - { - _abortion = value; - } - } - - public bool IsMaxFailures - { - get - { - return Result.Errors > 11; - } - } - - public ImportDataSegmenter DataSegmenter - { - get - { - if (_segmenter == null) - { - if (this.DataTable == null || this.ColumnMap == null) - { - throw new SmartException("A DataTable and a ColumnMap must be specified before accessing the DataSegmenter property."); - } - _segmenter = new ImportDataSegmenter(DataTable, ColumnMap); - } - - return _segmenter; - } - } - - /// - /// Allows to set a progress message - /// - /// Progress value - /// /// Progress maximum - public void SetProgress(int value, int maximum) - { - try - { - _progressValueSetter?.Invoke(value, maximum, _progressInfo.FormatInvariant(value, maximum)); - } - catch { } - } + { + get; + internal set; + } + + /// + /// Name of key fields to identify existing records for updating + /// + public string[] KeyFieldNames + { + get; + internal set; + } + + /// + /// All active languages + /// + public IList Languages + { + get; + internal set; + } + + /// + /// To log information into the import log file + /// + public ILogger Log + { + get; + internal set; + } + + /// + /// Common Services + /// + public ICommonServices Services + { + get; + internal set; + } + + /// + /// Cancellation token + /// + public CancellationToken CancellationToken + { + get; + private set; + } + + /// + /// The import folder + /// + public string ImportFolder + { + get; + internal set; + } + + /// + /// Use this dictionary for any custom data required along the import + /// + public Dictionary CustomProperties + { + get; + set; + } + + /// + /// Result of the import + /// + public ImportResult Result + { + get; + set; + } + + /// + /// Extra import configuration data + /// + public ImportExtraData ExtraData + { + get; + internal set; + } + + /// + /// Indicates whether and how to abort the import + /// + public DataExchangeAbortion Abort + { + get + { + if (CancellationToken.IsCancellationRequested || IsMaxFailures) + return DataExchangeAbortion.Hard; + + return _abortion; + } + set => _abortion = value; + } + + public bool IsMaxFailures => Result.Errors > 11; + + public ImportDataSegmenter DataSegmenter + { + get + { + if (_segmenter == null) + { + if (this.DataTable == null || this.ColumnMap == null) + { + throw new SmartException("A DataTable and a ColumnMap must be specified before accessing the DataSegmenter property."); + } + _segmenter = new ImportDataSegmenter(DataTable, ColumnMap); + } + + return _segmenter; + } + } + + /// + /// Allows to set a progress message + /// + /// Progress value + /// /// Progress maximum + public void SetProgress(int value, int maximum) + { + try + { + _progressValueSetter?.Invoke(value, maximum, _progressInfo.FormatInvariant(value, maximum)); + } + catch { } + } /// /// Allows to set a message @@ -236,5 +224,5 @@ public void SetProgress(string message) } catch { } } - } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtensions.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtensions.cs index 9b7918fa18..9d7bd8f02b 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtensions.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtensions.cs @@ -8,36 +8,36 @@ namespace SmartStore.Services.DataExchange.Import { public static class ImportExtensions - { - /// - /// Get folder for import files - /// - /// Import profile - /// Folder path - public static string GetImportFolder( - this ImportProfile profile, - bool content = false, - bool create = false, - bool absolutePath = true) - { - var path = string.Concat( - DataSettings.Current.TenantPath, - "/ImportProfiles/", - profile.FolderName, - content ? "/Content" : ""); + { + /// + /// Get folder for import files + /// + /// Import profile + /// Folder path + public static string GetImportFolder( + this ImportProfile profile, + bool content = false, + bool create = false, + bool absolutePath = true) + { + var path = string.Concat( + DataSettings.Current.TenantPath, + "/ImportProfiles/", + profile.FolderName, + content ? "/Content" : ""); - if (absolutePath) - { - path = CommonHelper.MapPath(path); + if (absolutePath) + { + path = CommonHelper.MapPath(path); - if (create && !System.IO.Directory.Exists(path)) - { - System.IO.Directory.CreateDirectory(path); - } - } + if (create && !System.IO.Directory.Exists(path)) + { + System.IO.Directory.CreateDirectory(path); + } + } - return path; - } + return path; + } /// /// Gets import files for an import profile. @@ -78,8 +78,8 @@ public static List GetImportFiles(this ImportProfile profile, bool i /// Import profile /// Log file path public static string GetImportLogPath(this ImportProfile profile) - { - return Path.Combine(profile.GetImportFolder(), "log.txt"); - } - } + { + return Path.Combine(profile.GetImportFolder(), "log.txt"); + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtraData.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtraData.cs index ecbe710677..24fd3984c0 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtraData.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtraData.cs @@ -2,12 +2,12 @@ namespace SmartStore.Services.DataExchange.Import { - [Serializable] - public class ImportExtraData - { - /// - /// Number of images per object to be imported - /// - public int? NumberOfPictures { get; set; } - } + [Serializable] + public class ImportExtraData + { + /// + /// Number of images per object to be imported + /// + public int? NumberOfPictures { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportFile.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportFile.cs index 6b0af36ef2..ac09239070 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportFile.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportFile.cs @@ -43,13 +43,7 @@ public ImportFile(string path) /// /// Indicates whether the file has an CSV file extension. /// - internal bool IsCsv - { - get - { - return (new string[] { ".csv", ".txt", ".tab" }).Contains(Extension, StringComparer.OrdinalIgnoreCase); - } - } + internal bool IsCsv => (new string[] { ".csv", ".txt", ".tab" }).Contains(Extension, StringComparer.OrdinalIgnoreCase); /// /// Related entity type. diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportMessage.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportMessage.cs index b21728d75b..47f3c16a08 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportMessage.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportMessage.cs @@ -2,89 +2,83 @@ namespace SmartStore.Services.DataExchange.Import { - - public class ImportMessage - { - public ImportMessage(string message, ImportMessageType messageType = ImportMessageType.Info) - { - Guard.NotEmpty(message, nameof(message)); - - this.Message = message; - this.MessageType = messageType; - } - - public ImportRowInfo AffectedItem - { - get; - set; - } - - public string AffectedField - { - get; - set; - } - - public ImportMessageType MessageType - { - get; - set; - } - - public string Message - { - get; - set; - } - - public string FullMessage - { - get; - set; - } - - public override string ToString() - { - var result = Message.NaIfEmpty(); - - string appendix = null; - - if (AffectedItem != null) - appendix = appendix.Grow("Pos: " + (AffectedItem.Position + 1).ToString(), ", "); - - if (AffectedField.HasValue()) - appendix = appendix.Grow("Field: " + AffectedField, ", "); - - if (appendix.HasValue()) - result = "{0} [{1}]".FormatInvariant(result, appendix); - - return result; - } - } - - public class ImportRowInfo : Tuple - { - public ImportRowInfo(int position, string entityName) - : base(position, entityName) - { - } - - public int Position - { - get { return base.Item1; } - } - - public string EntityName - { - get { return base.Item2; } - } - } - - public enum ImportMessageType - { - Info = 0, - Warning = 5, - Error = 10 - } + + public class ImportMessage + { + public ImportMessage(string message, ImportMessageType messageType = ImportMessageType.Info) + { + Guard.NotEmpty(message, nameof(message)); + + this.Message = message; + this.MessageType = messageType; + } + + public ImportRowInfo AffectedItem + { + get; + set; + } + + public string AffectedField + { + get; + set; + } + + public ImportMessageType MessageType + { + get; + set; + } + + public string Message + { + get; + set; + } + + public string FullMessage + { + get; + set; + } + + public override string ToString() + { + var result = Message.NaIfEmpty(); + + string appendix = null; + + if (AffectedItem != null) + appendix = appendix.Grow("Pos: " + (AffectedItem.Position + 1).ToString(), ", "); + + if (AffectedField.HasValue()) + appendix = appendix.Grow("Field: " + AffectedField, ", "); + + if (appendix.HasValue()) + result = "{0} [{1}]".FormatInvariant(result, appendix); + + return result; + } + } + + public class ImportRowInfo : Tuple + { + public ImportRowInfo(int position, string entityName) + : base(position, entityName) + { + } + + public int Position => base.Item1; + + public string EntityName => base.Item2; + } + + public enum ImportMessageType + { + Info = 0, + Warning = 5, + Error = 10 + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs index f83b4a9281..ab3fb9563b 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs @@ -20,40 +20,40 @@ namespace SmartStore.Services.DataExchange.Import { public partial class ImportProfileService : IImportProfileService - { - private static object _lock = new object(); - private static Dictionary> _entityProperties = null; - - private readonly IRepository _importProfileRepository; - private readonly IScheduleTaskService _scheduleTaskService; - private readonly ILocalizationService _localizationService; - private readonly ILanguageService _languageService; - private readonly DataExchangeSettings _dataExchangeSettings; - - public ImportProfileService( - IRepository importProfileRepository, - IScheduleTaskService scheduleTaskService, - ILocalizationService localizationService, - ILanguageService languageService, - DataExchangeSettings dataExchangeSettings) - { - _importProfileRepository = importProfileRepository; - _scheduleTaskService = scheduleTaskService; - _localizationService = localizationService; - _languageService = languageService; - _dataExchangeSettings = dataExchangeSettings; - } - - private string GetLocalizedPropertyName(ImportEntityType type, string property) - { + { + private static object _lock = new object(); + private static Dictionary> _entityProperties = null; + + private readonly IRepository _importProfileRepository; + private readonly IScheduleTaskService _scheduleTaskService; + private readonly ILocalizationService _localizationService; + private readonly ILanguageService _languageService; + private readonly DataExchangeSettings _dataExchangeSettings; + + public ImportProfileService( + IRepository importProfileRepository, + IScheduleTaskService scheduleTaskService, + ILocalizationService localizationService, + ILanguageService languageService, + DataExchangeSettings dataExchangeSettings) + { + _importProfileRepository = importProfileRepository; + _scheduleTaskService = scheduleTaskService; + _localizationService = localizationService; + _languageService = languageService; + _dataExchangeSettings = dataExchangeSettings; + } + + private string GetLocalizedPropertyName(ImportEntityType type, string property) + { // TODO: find a better solution for this. if (property.IsEmpty()) { return string.Empty; } - string key = null; - string prefixKey = null; + string key = null; + string prefixKey = null; if (property.StartsWith("BillingAddress.")) { @@ -64,40 +64,40 @@ private string GetLocalizedPropertyName(ImportEntityType type, string property) prefixKey = "Admin.Orders.Fields.ShippingAddress"; } - #region Get resource key + #region Get resource key - switch (property) - { - case "Id": - key = "Admin.Common.Entity.Fields.Id"; - break; - case "DisplayOrder": + switch (property) + { + case "Id": + key = "Admin.Common.Entity.Fields.Id"; + break; + case "DisplayOrder": case "HomePageDisplayOrder": key = "Common.DisplayOrder"; - break; - case "Deleted": - key = "Admin.Common.Deleted"; - break; + break; + case "Deleted": + key = "Admin.Common.Deleted"; + break; case "WorkingLanguageId": key = "Common.Language"; break; - case "CreatedOnUtc": - case "BillingAddress.CreatedOnUtc": - case "ShippingAddress.CreatedOnUtc": - key = "Common.CreatedOn"; - break; + case "CreatedOnUtc": + case "BillingAddress.CreatedOnUtc": + case "ShippingAddress.CreatedOnUtc": + key = "Common.CreatedOn"; + break; case "UpdatedOnUtc": - key = "Common.UpdatedOn"; - break; - case "HasDiscountsApplied": - key = "Admin.Catalog.Products.Fields.HasDiscountsApplied"; - break; - case "DefaultViewMode": - key = "Admin.Configuration.Settings.Catalog.DefaultViewMode"; - break; - case "StoreId": - key = "Admin.Common.Store"; - break; + key = "Common.UpdatedOn"; + break; + case "HasDiscountsApplied": + key = "Admin.Catalog.Products.Fields.HasDiscountsApplied"; + break; + case "DefaultViewMode": + key = "Admin.Configuration.Settings.Catalog.DefaultViewMode"; + break; + case "StoreId": + key = "Admin.Common.Store"; + break; case "LimitedToStores": key = "Admin.Common.Store.LimitedTo"; break; @@ -105,14 +105,14 @@ private string GetLocalizedPropertyName(ImportEntityType type, string property) key = "Admin.Common.CustomerRole.LimitedTo"; break; case "ParentGroupedProductId": - key = "Admin.Catalog.Products.Fields.AssociatedToProductName"; - break; - case "PasswordFormatId": - key = "Admin.Configuration.Settings.CustomerUser.DefaultPasswordFormat"; - break; - case "LastIpAddress": - key = "Admin.Customers.Customers.Fields.IPAddress"; - break; + key = "Admin.Catalog.Products.Fields.AssociatedToProductName"; + break; + case "PasswordFormatId": + key = "Admin.Configuration.Settings.CustomerUser.DefaultPasswordFormat"; + break; + case "LastIpAddress": + key = "Admin.Customers.Customers.Fields.IPAddress"; + break; case "CustomerNumber": key = "Account.Fields.CustomerNumber"; break; @@ -126,26 +126,26 @@ private string GetLocalizedPropertyName(ImportEntityType type, string property) key = "Admin.Catalog.Products.Fields.Visibility"; break; default: - switch (type) - { - case ImportEntityType.Product: - key = "Admin.Catalog.Products.Fields." + property; - break; - case ImportEntityType.Category: - key = "Admin.Catalog.Categories.Fields." + property; - break; - case ImportEntityType.Customer: - if (property.StartsWith("BillingAddress.") || property.StartsWith("ShippingAddress.")) - key = "Address.Fields." + property.Substring(property.IndexOf('.') + 1); - else - key = "Admin.Customers.Customers.Fields." + property; - break; - case ImportEntityType.NewsLetterSubscription: - key = "Admin.Promotions.NewsLetterSubscriptions.Fields." + property; - break; - } - break; - } + switch (type) + { + case ImportEntityType.Product: + key = "Admin.Catalog.Products.Fields." + property; + break; + case ImportEntityType.Category: + key = "Admin.Catalog.Categories.Fields." + property; + break; + case ImportEntityType.Customer: + if (property.StartsWith("BillingAddress.") || property.StartsWith("ShippingAddress.")) + key = "Address.Fields." + property.Substring(property.IndexOf('.') + 1); + else + key = "Admin.Customers.Customers.Fields." + property; + break; + case ImportEntityType.NewsLetterSubscription: + key = "Admin.Promotions.NewsLetterSubscriptions.Fields." + property; + break; + } + break; + } #endregion @@ -154,10 +154,10 @@ private string GetLocalizedPropertyName(ImportEntityType type, string property) return string.Empty; } - var result = _localizationService.GetResource(key, 0, false, "", true); + var result = _localizationService.GetResource(key, 0, false, "", true); - if (result.IsEmpty()) - { + if (result.IsEmpty()) + { if (key.EndsWith("Id")) { result = _localizationService.GetResource(key.Substring(0, key.Length - 2), 0, false, "", true); @@ -166,232 +166,232 @@ private string GetLocalizedPropertyName(ImportEntityType type, string property) { result = _localizationService.GetResource(key.Substring(0, key.Length - 3), 0, false, "", true); } - } + } - if (result.IsEmpty()) - { - Debug.WriteLine("Missing string resource mapping for {0} - {1}".FormatInvariant(type.ToString(), property)); - result = property.SplitPascalCase(); - } + if (result.IsEmpty()) + { + Debug.WriteLine("Missing string resource mapping for {0} - {1}".FormatInvariant(type.ToString(), property)); + result = property.SplitPascalCase(); + } - if (prefixKey.HasValue()) - { - result = string.Concat(_localizationService.GetResource(prefixKey, 0, false, "", true), " - ", result); - } + if (prefixKey.HasValue()) + { + result = string.Concat(_localizationService.GetResource(prefixKey, 0, false, "", true), " - ", result); + } - return result; - } + return result; + } - public string GetNewProfileName(ImportEntityType entityType) - { - var defaultNames = _localizationService.GetResource("Admin.DataExchange.Import.DefaultProfileNames").SplitSafe(";"); + public string GetNewProfileName(ImportEntityType entityType) + { + var defaultNames = _localizationService.GetResource("Admin.DataExchange.Import.DefaultProfileNames").SplitSafe(";"); - var result = defaultNames.SafeGet((int)entityType); + var result = defaultNames.SafeGet((int)entityType); - if (result.IsEmpty()) - result = entityType.ToString(); + if (result.IsEmpty()) + result = entityType.ToString(); - var profileCount = _importProfileRepository.Table.Count(x => x.EntityTypeId == (int)entityType); + var profileCount = _importProfileRepository.Table.Count(x => x.EntityTypeId == (int)entityType); - result = string.Concat(result, " ", profileCount + 1); + result = string.Concat(result, " ", profileCount + 1); - return result; - } + return result; + } - public virtual ImportProfile InsertImportProfile(string fileName, string name, ImportEntityType entityType) - { - Guard.NotEmpty(fileName, nameof(fileName)); - - if (name.IsEmpty()) - name = GetNewProfileName(entityType); + public virtual ImportProfile InsertImportProfile(string fileName, string name, ImportEntityType entityType) + { + Guard.NotEmpty(fileName, nameof(fileName)); - var task = new ScheduleTask - { - CronExpression = "0 */24 * * *", - Type = typeof(DataImportTask).AssemblyQualifiedNameWithoutVersion(), - Enabled = false, - StopOnError = false, - IsHidden = true - }; - - task.Name = string.Concat(name, " Task"); + if (name.IsEmpty()) + name = GetNewProfileName(entityType); - _scheduleTaskService.InsertTask(task); - - var profile = new ImportProfile - { - Name = name, - EntityType = entityType, - Enabled = true, - SchedulingTaskId = task.Id - }; - - if (Path.GetExtension(fileName).IsCaseInsensitiveEqual(".xlsx")) - profile.FileType = ImportFileType.XLSX; - else - profile.FileType = ImportFileType.CSV; + var task = new ScheduleTask + { + CronExpression = "0 */24 * * *", + Type = typeof(DataImportTask).AssemblyQualifiedNameWithoutVersion(), + Enabled = false, + StopOnError = false, + IsHidden = true + }; - string[] keyFieldNames = null; + task.Name = string.Concat(name, " Task"); - switch (entityType) - { - case ImportEntityType.Product: - keyFieldNames = ProductImporter.DefaultKeyFields; - break; - case ImportEntityType.Category: - keyFieldNames = CategoryImporter.DefaultKeyFields; - break; - case ImportEntityType.Customer: - keyFieldNames = CustomerImporter.DefaultKeyFields; - break; - case ImportEntityType.NewsLetterSubscription: - keyFieldNames = NewsLetterSubscriptionImporter.DefaultKeyFields; - break; - } - - profile.KeyFieldNames = string.Join(",", keyFieldNames); - - profile.FolderName = SeoHelper.GetSeName(name, true, false, false) - .ToValidPath() - .Truncate(_dataExchangeSettings.MaxFileNameLength); - - var path = DataSettings.Current.TenantPath + "/ImportProfiles"; - profile.FolderName = FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath(path), profile.FolderName); - - _importProfileRepository.Insert(profile); - - task.Alias = profile.Id.ToString(); - _scheduleTaskService.UpdateTask(task); - - return profile; - } - - public virtual void UpdateImportProfile(ImportProfile profile) - { - if (profile == null) - throw new ArgumentNullException("profile"); - - _importProfileRepository.Update(profile); - } + _scheduleTaskService.InsertTask(task); - public virtual void DeleteImportProfile(ImportProfile profile) - { - if (profile == null) - throw new ArgumentNullException("profile"); + var profile = new ImportProfile + { + Name = name, + EntityType = entityType, + Enabled = true, + SchedulingTaskId = task.Id + }; + + if (Path.GetExtension(fileName).IsCaseInsensitiveEqual(".xlsx")) + profile.FileType = ImportFileType.XLSX; + else + profile.FileType = ImportFileType.CSV; + + string[] keyFieldNames = null; + + switch (entityType) + { + case ImportEntityType.Product: + keyFieldNames = ProductImporter.DefaultKeyFields; + break; + case ImportEntityType.Category: + keyFieldNames = CategoryImporter.DefaultKeyFields; + break; + case ImportEntityType.Customer: + keyFieldNames = CustomerImporter.DefaultKeyFields; + break; + case ImportEntityType.NewsLetterSubscription: + keyFieldNames = NewsLetterSubscriptionImporter.DefaultKeyFields; + break; + } - var scheduleTaskId = profile.SchedulingTaskId; - var folder = profile.GetImportFolder(); + profile.KeyFieldNames = string.Join(",", keyFieldNames); - _importProfileRepository.Delete(profile); - - var scheduleTask = _scheduleTaskService.GetTaskById(scheduleTaskId); - _scheduleTaskService.DeleteTask(scheduleTask); - - if (System.IO.Directory.Exists(folder)) - { - FileSystemHelper.ClearDirectory(folder, true); - } - } - - public virtual IQueryable GetImportProfiles(bool? enabled = null) - { - var query = _importProfileRepository.Table - .Expand(x => x.ScheduleTask); - - if (enabled.HasValue) - { - query = query.Where(x => x.Enabled == enabled.Value); - } - - query = query - .OrderBy(x => x.EntityTypeId) - .ThenBy(x => x.Name); - - return query; - } - - public virtual ImportProfile GetImportProfileById(int id) - { - if (id == 0) - return null; - - var profile = _importProfileRepository.Table - .Expand(x => x.ScheduleTask) - .FirstOrDefault(x => x.Id == id); - - return profile; - } - - public virtual ImportProfile GetImportProfileByName(string name) - { - if (name.IsEmpty()) - return null; - - var profile = _importProfileRepository.Table - .Expand(x => x.ScheduleTask) - .FirstOrDefault(x => x.Name == name); - - return profile; - } - - public virtual Dictionary GetImportableEntityProperties(ImportEntityType entityType) - { - if (_entityProperties == null) - { - lock (_lock) - { - if (_entityProperties == null) - { - _entityProperties = new Dictionary>(); + profile.FolderName = SeoHelper.GetSeName(name, true, false, false) + .ToValidPath() + .Truncate(_dataExchangeSettings.MaxFileNameLength); - var context = ((IObjectContextAdapter)_importProfileRepository.Context).ObjectContext; - var container = context.MetadataWorkspace.GetEntityContainer(context.DefaultContainerName, DataSpace.CSpace); + var path = DataSettings.Current.TenantPath + "/ImportProfiles"; + profile.FolderName = FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath(path), profile.FolderName); + + _importProfileRepository.Insert(profile); + + task.Alias = profile.Id.ToString(); + _scheduleTaskService.UpdateTask(task); + + return profile; + } + + public virtual void UpdateImportProfile(ImportProfile profile) + { + if (profile == null) + throw new ArgumentNullException("profile"); + + _importProfileRepository.Update(profile); + } + + public virtual void DeleteImportProfile(ImportProfile profile) + { + if (profile == null) + throw new ArgumentNullException("profile"); + + var scheduleTaskId = profile.SchedulingTaskId; + var folder = profile.GetImportFolder(); + + _importProfileRepository.Delete(profile); + + var scheduleTask = _scheduleTaskService.GetTaskById(scheduleTaskId); + _scheduleTaskService.DeleteTask(scheduleTask); + + if (System.IO.Directory.Exists(folder)) + { + FileSystemHelper.ClearDirectory(folder, true); + } + } + + public virtual IQueryable GetImportProfiles(bool? enabled = null) + { + var query = _importProfileRepository.Table + .Expand(x => x.ScheduleTask); + + if (enabled.HasValue) + { + query = query.Where(x => x.Enabled == enabled.Value); + } + + query = query + .OrderBy(x => x.EntityTypeId) + .ThenBy(x => x.Name); + + return query; + } + + public virtual ImportProfile GetImportProfileById(int id) + { + if (id == 0) + return null; + + var profile = _importProfileRepository.Table + .Expand(x => x.ScheduleTask) + .FirstOrDefault(x => x.Id == id); + + return profile; + } + + public virtual ImportProfile GetImportProfileByName(string name) + { + if (name.IsEmpty()) + return null; + + var profile = _importProfileRepository.Table + .Expand(x => x.ScheduleTask) + .FirstOrDefault(x => x.Name == name); + + return profile; + } + + public virtual Dictionary GetImportableEntityProperties(ImportEntityType entityType) + { + if (_entityProperties == null) + { + lock (_lock) + { + if (_entityProperties == null) + { + _entityProperties = new Dictionary>(); + + var context = ((IObjectContextAdapter)_importProfileRepository.Context).ObjectContext; + var container = context.MetadataWorkspace.GetEntityContainer(context.DefaultContainerName, DataSpace.CSpace); var allLanguages = _languageService.GetAllLanguages(true); - var allLanguageNames = allLanguages.ToDictionarySafe(x => x.UniqueSeoCode, x => LocalizationHelper.GetLanguageNativeName(x.LanguageCulture) ?? x.Name); - - var localizableProperties = new Dictionary - { - { ImportEntityType.Product, new string[] { "Name", "ShortDescription", "FullDescription", "MetaKeywords", "MetaDescription", "MetaTitle", "SeName" } }, - { ImportEntityType.Category, new string[] { "Name", "FullName", "Description", "BottomDescription", "MetaKeywords", "MetaDescription", "MetaTitle", "SeName" } }, - { ImportEntityType.Customer, new string[] { } }, - { ImportEntityType.NewsLetterSubscription, new string[] { } } - }; - - var addressSet = container.GetEntitySetByName("Addresses", true); - - var addressProperties = addressSet.ElementType.Members - .Where(x => !x.Name.IsCaseInsensitiveEqual("Id") && x.BuiltInTypeKind.HasFlag(BuiltInTypeKind.EdmProperty)) - .Select(x => x.Name) - .ToList(); - - - foreach (ImportEntityType type in Enum.GetValues(typeof(ImportEntityType))) - { - EntitySet entitySet = null; - - try - { - if (type == ImportEntityType.Category) - entitySet = container.GetEntitySetByName("Categories", true); - else - entitySet = container.GetEntitySetByName(type.ToString() + "s", true); - } - catch (Exception) - { - throw new SmartException("There is no entity set for ImportEntityType {0}. Note, the enum value must equal the entity name.".FormatInvariant(type.ToString())); - } - - var dic = entitySet.ElementType.Members - .Where(x => !x.Name.IsCaseInsensitiveEqual("Id") && x.BuiltInTypeKind.HasFlag(BuiltInTypeKind.EdmProperty)) - .Select(x => x.Name) - .ToDictionarySafe(x => x, x => "", StringComparer.OrdinalIgnoreCase); - - // lack of abstractness? - if ((type == ImportEntityType.Product || type == ImportEntityType.Category) && !dic.ContainsKey("SeName")) - { - dic["SeName"] = ""; - } + var allLanguageNames = allLanguages.ToDictionarySafe(x => x.UniqueSeoCode, x => LocalizationHelper.GetLanguageNativeName(x.LanguageCulture) ?? x.Name); + + var localizableProperties = new Dictionary + { + { ImportEntityType.Product, new string[] { "Name", "ShortDescription", "FullDescription", "MetaKeywords", "MetaDescription", "MetaTitle", "SeName" } }, + { ImportEntityType.Category, new string[] { "Name", "FullName", "Description", "BottomDescription", "MetaKeywords", "MetaDescription", "MetaTitle", "SeName" } }, + { ImportEntityType.Customer, new string[] { } }, + { ImportEntityType.NewsLetterSubscription, new string[] { } } + }; + + var addressSet = container.GetEntitySetByName("Addresses", true); + + var addressProperties = addressSet.ElementType.Members + .Where(x => !x.Name.IsCaseInsensitiveEqual("Id") && x.BuiltInTypeKind.HasFlag(BuiltInTypeKind.EdmProperty)) + .Select(x => x.Name) + .ToList(); + + + foreach (ImportEntityType type in Enum.GetValues(typeof(ImportEntityType))) + { + EntitySet entitySet = null; + + try + { + if (type == ImportEntityType.Category) + entitySet = container.GetEntitySetByName("Categories", true); + else + entitySet = container.GetEntitySetByName(type.ToString() + "s", true); + } + catch (Exception) + { + throw new SmartException("There is no entity set for ImportEntityType {0}. Note, the enum value must equal the entity name.".FormatInvariant(type.ToString())); + } + + var dic = entitySet.ElementType.Members + .Where(x => !x.Name.IsCaseInsensitiveEqual("Id") && x.BuiltInTypeKind.HasFlag(BuiltInTypeKind.EdmProperty)) + .Select(x => x.Name) + .ToDictionarySafe(x => x, x => "", StringComparer.OrdinalIgnoreCase); + + // lack of abstractness? + if ((type == ImportEntityType.Product || type == ImportEntityType.Category) && !dic.ContainsKey("SeName")) + { + dic["SeName"] = ""; + } if (type == ImportEntityType.Product) { @@ -400,38 +400,38 @@ public virtual Dictionary GetImportableEntityProperties(ImportEn // shipping and billing address if (type == ImportEntityType.Customer) - { - foreach (var property in addressProperties) - { + { + foreach (var property in addressProperties) + { dic["BillingAddress." + property] = ""; dic["ShippingAddress." + property] = ""; - } - } + } + } - // add localized property names - foreach (var key in dic.Keys.ToList()) - { - var localizedValue = GetLocalizedPropertyName(type, key); + // add localized property names + foreach (var key in dic.Keys.ToList()) + { + var localizedValue = GetLocalizedPropertyName(type, key); - dic[key] = localizedValue.NaIfEmpty(); + dic[key] = localizedValue.NaIfEmpty(); - if (localizableProperties[type].Contains(key)) - { - foreach (var language in allLanguages) - { + if (localizableProperties[type].Contains(key)) + { + foreach (var language in allLanguages) + { dic["{0}[{1}]".FormatInvariant(key, language.UniqueSeoCode.EmptyNull().ToLower())] = "{0} {1}".FormatInvariant(localizedValue.NaIfEmpty(), allLanguageNames[language.UniqueSeoCode]); - } - } - } - - _entityProperties[type] = dic; - } - } - } - } - - return _entityProperties.ContainsKey(entityType) ? _entityProperties[entityType] : null; - } - } + } + } + } + + _entityProperties[type] = dic; + } + } + } + } + + return _entityProperties.ContainsKey(entityType) ? _entityProperties[entityType] : null; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportResult.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportResult.cs index a0de84eae2..8f45413f35 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportResult.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportResult.cs @@ -5,177 +5,162 @@ namespace SmartStore.Services.DataExchange.Import { - public class ImportResult : ICloneable - { - public ImportResult() - { - this.Messages = new List(); - Clear(); - } - - public DateTime StartDateUtc - { - get; - set; - } - - public DateTime EndDateUtc - { - get; - set; - } - - public int TotalRecords - { - get; - set; - } - - public int SkippedRecords - { - get; - set; - } - - public int NewRecords - { - get; - set; - } - - public int ModifiedRecords - { - get; - set; - } - - public int AffectedRecords - { - get { return NewRecords + ModifiedRecords; } - } - - public bool Cancelled - { - get; - set; - } - - public void Clear() - { - Messages.Clear(); - StartDateUtc = EndDateUtc = DateTime.UtcNow; - TotalRecords = 0; - SkippedRecords = 0; - NewRecords = 0; - ModifiedRecords = 0; - Cancelled = false; - } - - public ImportMessage AddInfo(string message, ImportRowInfo affectedRow = null, string affectedField = null) - { - return this.AddMessage(message, ImportMessageType.Info, affectedRow, affectedField); - } - - public ImportMessage AddWarning(string message, ImportRowInfo affectedRow = null, string affectedField = null) - { - return this.AddMessage(message, ImportMessageType.Warning, affectedRow, affectedField); - } - - public ImportMessage AddError(string message, ImportRowInfo affectedRow = null, string affectedField = null) - { - return this.AddMessage(message, ImportMessageType.Error, affectedRow, affectedField); - } - - public ImportMessage AddError(Exception exception, int? affectedBatch = null, string stage = null) - { - var prefix = new List(); - if (affectedBatch.HasValue) - { - prefix.Add("Batch: " + affectedBatch.Value); - } - if (stage.HasValue()) - { - prefix.Add("Stage: " + stage); - } - - string msg = string.Empty; - if (prefix.Any()) - { - msg = "[{0}] ".FormatCurrent(String.Join(", ", prefix)); - } - - msg += exception.ToAllMessages(); - - return this.AddMessage(msg, ImportMessageType.Error, fullMessage: exception.StackTrace); - } - - public ImportMessage AddError(Exception exception, string message) - { - return AddMessage( - message ?? exception.ToAllMessages(), - ImportMessageType.Error, - null, - null, - exception.StackTrace); - } - - public ImportMessage AddMessage(string message, ImportMessageType severity, ImportRowInfo affectedRow = null, string affectedField = null, string fullMessage = null) - { - var msg = new ImportMessage(message, severity); - - msg.AffectedItem = affectedRow; - msg.AffectedField = affectedField; - msg.FullMessage = fullMessage; - - this.Messages.Add(msg); - return msg; - } - - public IList Messages - { - get; - private set; - } - - public bool HasWarnings - { - get { return this.Messages.Any(x => x.MessageType == ImportMessageType.Warning); } - } - - public int Warnings - { - get { return Messages.Count(x => x.MessageType == ImportMessageType.Warning); } - } - - public bool HasErrors - { - get { return this.Messages.Any(x => x.MessageType == ImportMessageType.Error); } - } - - public int Errors - { - get { return Messages.Count(x => x.MessageType == ImportMessageType.Error); } - } - - public string LastError - { - get - { - var lastError = Messages.LastOrDefault(x => x.MessageType == ImportMessageType.Error); - if (lastError != null) - return lastError.Message; - - return null; - } - } - - object ICloneable.Clone() - { - return this.MemberwiseClone(); - } - - public SerializableImportResult Clone() - { + public class ImportResult : ICloneable + { + public ImportResult() + { + this.Messages = new List(); + Clear(); + } + + public DateTime StartDateUtc + { + get; + set; + } + + public DateTime EndDateUtc + { + get; + set; + } + + public int TotalRecords + { + get; + set; + } + + public int SkippedRecords + { + get; + set; + } + + public int NewRecords + { + get; + set; + } + + public int ModifiedRecords + { + get; + set; + } + + public int AffectedRecords => NewRecords + ModifiedRecords; + + public bool Cancelled + { + get; + set; + } + + public void Clear() + { + Messages.Clear(); + StartDateUtc = EndDateUtc = DateTime.UtcNow; + TotalRecords = 0; + SkippedRecords = 0; + NewRecords = 0; + ModifiedRecords = 0; + Cancelled = false; + } + + public ImportMessage AddInfo(string message, ImportRowInfo affectedRow = null, string affectedField = null) + { + return this.AddMessage(message, ImportMessageType.Info, affectedRow, affectedField); + } + + public ImportMessage AddWarning(string message, ImportRowInfo affectedRow = null, string affectedField = null) + { + return this.AddMessage(message, ImportMessageType.Warning, affectedRow, affectedField); + } + + public ImportMessage AddError(string message, ImportRowInfo affectedRow = null, string affectedField = null) + { + return this.AddMessage(message, ImportMessageType.Error, affectedRow, affectedField); + } + + public ImportMessage AddError(Exception exception, int? affectedBatch = null, string stage = null) + { + var prefix = new List(); + if (affectedBatch.HasValue) + { + prefix.Add("Batch: " + affectedBatch.Value); + } + if (stage.HasValue()) + { + prefix.Add("Stage: " + stage); + } + + string msg = string.Empty; + if (prefix.Any()) + { + msg = "[{0}] ".FormatCurrent(String.Join(", ", prefix)); + } + + msg += exception.ToAllMessages(); + + return this.AddMessage(msg, ImportMessageType.Error, fullMessage: exception.StackTrace); + } + + public ImportMessage AddError(Exception exception, string message) + { + return AddMessage( + message ?? exception.ToAllMessages(), + ImportMessageType.Error, + null, + null, + exception.StackTrace); + } + + public ImportMessage AddMessage(string message, ImportMessageType severity, ImportRowInfo affectedRow = null, string affectedField = null, string fullMessage = null) + { + var msg = new ImportMessage(message, severity); + + msg.AffectedItem = affectedRow; + msg.AffectedField = affectedField; + msg.FullMessage = fullMessage; + + this.Messages.Add(msg); + return msg; + } + + public IList Messages + { + get; + private set; + } + + public bool HasWarnings => this.Messages.Any(x => x.MessageType == ImportMessageType.Warning); + + public int Warnings => Messages.Count(x => x.MessageType == ImportMessageType.Warning); + + public bool HasErrors => this.Messages.Any(x => x.MessageType == ImportMessageType.Error); + + public int Errors => Messages.Count(x => x.MessageType == ImportMessageType.Error); + + public string LastError + { + get + { + var lastError = Messages.LastOrDefault(x => x.MessageType == ImportMessageType.Error); + if (lastError != null) + return lastError.Message; + + return null; + } + } + + object ICloneable.Clone() + { + return this.MemberwiseClone(); + } + + public SerializableImportResult Clone() + { var result = new SerializableImportResult(); result.StartDateUtc = StartDateUtc; result.EndDateUtc = EndDateUtc; @@ -191,22 +176,22 @@ public SerializableImportResult Clone() return result; } - } - - - [Serializable] - public partial class SerializableImportResult - { - public DateTime StartDateUtc { get; set; } - public DateTime EndDateUtc { get; set; } - public int TotalRecords { get; set; } - public int SkippedRecords { get; set; } - public int NewRecords { get; set; } - public int ModifiedRecords { get; set; } - public int AffectedRecords { get; set; } - public bool Cancelled { get; set; } - public int Warnings { get; set; } - public int Errors { get; set; } - public string LastError { get; set; } - } + } + + + [Serializable] + public partial class SerializableImportResult + { + public DateTime StartDateUtc { get; set; } + public DateTime EndDateUtc { get; set; } + public int TotalRecords { get; set; } + public int SkippedRecords { get; set; } + public int NewRecords { get; set; } + public int ModifiedRecords { get; set; } + public int AffectedRecords { get; set; } + public bool Cancelled { get; set; } + public int Warnings { get; set; } + public int Errors { get; set; } + public string LastError { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportRow.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportRow.cs index fc84dba90a..c228c6d73b 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportRow.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportRow.cs @@ -7,327 +7,303 @@ namespace SmartStore.Services.DataExchange.Import { - public class ImportRow where T : BaseEntity - { - private const string ExplicitNull = "[NULL]"; - private const string ExplicitIgnore = "[IGNORE]"; - - private bool _initialized = false; - private T _entity; - private string _entityDisplayName; - private readonly int _position; - private bool _isNew; - private bool _isDirty; - private ImportRowInfo _rowInfo; - - private readonly ImportDataSegmenter _segmenter; - private readonly IDataRow _row; - - public ImportRow(ImportDataSegmenter parent, IDataRow row, int position) - { - _segmenter = parent; - _row = row; - _position = position; - } - - public void Initialize(T entity, string entityDisplayName) - { - _entity = entity; - _entityDisplayName = entityDisplayName; - _isNew = _entity.Id == 0; - - _initialized = true; - } - - private void CheckInitialized() - { - if (_initialized) - { - throw Error.InvalidOperation("A row must be initialized before interacting with the entity or the data store"); - } - } - - private TProp GetDefaultValue(ColumnMappingItem mapping, TProp defaultValue, ImportResult result = null) - { - if (mapping != null && mapping.Default.HasValue()) - { - try - { - return mapping.Default.Convert(_segmenter.Culture); - } - catch (Exception exception) - { - if (result != null) - { - var msg = "Failed to convert default value '{0}'. Please specify a convertable default value. Column: {1}"; - result.AddWarning(msg.FormatInvariant(mapping.Default, exception.Message), this.GetRowInfo(), mapping.SoureName); - } - } - } - - return defaultValue; - } - - public bool IsTransient - { - get { return _entity.Id == 0; } - } - - public bool IsNew - { - get { return _isNew; } - } - - public bool IsDirty - { - get { return _isDirty; } - } - - public ImportDataSegmenter Segmenter - { - get { return _segmenter; } - } - - public T Entity - { - get { return _entity; } - } - - public IDataRow DataRow - { - get { return _row; } - } - - public string EntityDisplayName - { - get { return _entityDisplayName; } - } - - public bool NameChanged - { - get; - set; - } - - public int Position - { - get { return _position; } - } - - /// - /// Determines whether a specific column exists in the underlying data table - /// and contains a non-null, convertible value. - /// - /// The name of the column - /// - /// If true and a column with the passed does not exist, - /// this method seeks for any indexed column with the same name. - /// - /// true if the column exists and contains a value, false otherwise - /// - /// This method takes mapped column names into account. - /// - public bool HasDataValue(string columnName, bool withAnyIndex = false) - { - var result = HasDataValue(columnName, null); - - if (!result && withAnyIndex) - { - // Column does not have a value, but withAnyIndex is true: - // Test for values in any indexed column. - var indexes = _segmenter.GetColumnIndexes(columnName); - foreach (var idx in indexes) - { - result = HasDataValue(columnName, idx); - if (result) - break; - } - } - - return result; - } - - /// - /// Determines whether the column name[index] exists in the underlying data table - /// and contains a non-null, convertible value. - /// - /// The name of the column - /// The index of the column - /// true if the column exists and contains a value, false otherwise - /// - /// This method takes mapped column names into account. - /// - public bool HasDataValue(string columnName, string index) - { - var mapping = _segmenter.ColumnMap.GetMapping(columnName, index); - return (_row.TryGetValue(mapping.MappedName, out var value) && value != null && value != DBNull.Value); - } + public class ImportRow where T : BaseEntity + { + private const string ExplicitNull = "[NULL]"; + private const string ExplicitIgnore = "[IGNORE]"; + + private bool _initialized = false; + private T _entity; + private string _entityDisplayName; + private readonly int _position; + private bool _isNew; + private bool _isDirty; + private ImportRowInfo _rowInfo; + + private readonly ImportDataSegmenter _segmenter; + private readonly IDataRow _row; + + public ImportRow(ImportDataSegmenter parent, IDataRow row, int position) + { + _segmenter = parent; + _row = row; + _position = position; + } + + public void Initialize(T entity, string entityDisplayName) + { + _entity = entity; + _entityDisplayName = entityDisplayName; + _isNew = _entity.Id == 0; + + _initialized = true; + } + + private void CheckInitialized() + { + if (_initialized) + { + throw Error.InvalidOperation("A row must be initialized before interacting with the entity or the data store"); + } + } + + private TProp GetDefaultValue(ColumnMappingItem mapping, TProp defaultValue, ImportResult result = null) + { + if (mapping != null && mapping.Default.HasValue()) + { + try + { + return mapping.Default.Convert(_segmenter.Culture); + } + catch (Exception exception) + { + if (result != null) + { + var msg = "Failed to convert default value '{0}'. Please specify a convertable default value. Column: {1}"; + result.AddWarning(msg.FormatInvariant(mapping.Default, exception.Message), this.GetRowInfo(), mapping.SoureName); + } + } + } + + return defaultValue; + } + + public bool IsTransient => _entity.Id == 0; + + public bool IsNew => _isNew; + + public bool IsDirty => _isDirty; + + public ImportDataSegmenter Segmenter => _segmenter; + + public T Entity => _entity; + + public IDataRow DataRow => _row; + + public string EntityDisplayName => _entityDisplayName; + + public bool NameChanged + { + get; + set; + } + + public int Position => _position; + + /// + /// Determines whether a specific column exists in the underlying data table + /// and contains a non-null, convertible value. + /// + /// The name of the column + /// + /// If true and a column with the passed does not exist, + /// this method seeks for any indexed column with the same name. + /// + /// true if the column exists and contains a value, false otherwise + /// + /// This method takes mapped column names into account. + /// + public bool HasDataValue(string columnName, bool withAnyIndex = false) + { + var result = HasDataValue(columnName, null); + + if (!result && withAnyIndex) + { + // Column does not have a value, but withAnyIndex is true: + // Test for values in any indexed column. + var indexes = _segmenter.GetColumnIndexes(columnName); + foreach (var idx in indexes) + { + result = HasDataValue(columnName, idx); + if (result) + break; + } + } + + return result; + } + + /// + /// Determines whether the column name[index] exists in the underlying data table + /// and contains a non-null, convertible value. + /// + /// The name of the column + /// The index of the column + /// true if the column exists and contains a value, false otherwise + /// + /// This method takes mapped column names into account. + /// + public bool HasDataValue(string columnName, string index) + { + var mapping = _segmenter.ColumnMap.GetMapping(columnName, index); + return (_row.TryGetValue(mapping.MappedName, out var value) && value != null && value != DBNull.Value); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public TProp GetDataValue(string columnName, bool force = false) - { - TryGetDataValue(columnName, null, out var value, force); - return value; - } + { + TryGetDataValue(columnName, null, out var value, force); + return value; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public TProp GetDataValue(string columnName, string index, bool force = false) - { - TryGetDataValue(columnName, index, out var value, force); - return value; - } + { + TryGetDataValue(columnName, index, out var value, force); + return value; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool TryGetDataValue(string columnName, out TProp value, bool force = false) - { - return TryGetDataValue(columnName, null, out value, force); - } - - public bool TryGetDataValue(string columnName, string index, out TProp value, bool force = false) - { - var mapping = _segmenter.ColumnMap.GetMapping(columnName, index); - - if (!force && mapping.IgnoreProperty) - { - value = default(TProp); - return false; - } - - object rawValue; - if (_row.TryGetValue(mapping.MappedName, out rawValue) && rawValue != null && rawValue != DBNull.Value && !rawValue.ToString().IsCaseInsensitiveEqual(ExplicitIgnore)) - { - value = rawValue.ToString().IsCaseInsensitiveEqual(ExplicitNull) - ? default(TProp) - : rawValue.Convert(_segmenter.Culture); - return true; - } - - if (IsNew) - { - // only transient/new entities should fallback to possible defaults. - value = GetDefaultValue(mapping, default(TProp)); - return true; - } - - value = default(TProp); - return false; - } + { + return TryGetDataValue(columnName, null, out value, force); + } + + public bool TryGetDataValue(string columnName, string index, out TProp value, bool force = false) + { + var mapping = _segmenter.ColumnMap.GetMapping(columnName, index); + + if (!force && mapping.IgnoreProperty) + { + value = default(TProp); + return false; + } + + object rawValue; + if (_row.TryGetValue(mapping.MappedName, out rawValue) && rawValue != null && rawValue != DBNull.Value && !rawValue.ToString().IsCaseInsensitiveEqual(ExplicitIgnore)) + { + value = rawValue.ToString().IsCaseInsensitiveEqual(ExplicitNull) + ? default(TProp) + : rawValue.Convert(_segmenter.Culture); + return true; + } + + if (IsNew) + { + // only transient/new entities should fallback to possible defaults. + value = GetDefaultValue(mapping, default(TProp)); + return true; + } + + value = default(TProp); + return false; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool SetProperty( - ImportResult result, - Expression> prop, - TProp defaultValue = default(TProp), - Func converter = null) - { - return SetProperty( - result, - null, // columnName - prop, - defaultValue, - converter); - } - - public bool SetProperty( - ImportResult result, - string columnName, - Expression> prop, - TProp defaultValue = default(TProp), - Func converter = null) - { - // TBD: (MC) do not check or validate for perf reason? - //CheckInitialized(); - - var isPropertySet = false; - var pi = prop.ExtractPropertyInfo(); - var propName = pi.Name; - var target = _entity; - - columnName = columnName ?? propName; - - try - { - object value; - var mapping = _segmenter.ColumnMap.GetMapping(columnName); - - if (mapping.IgnoreProperty) - { - // explicitly ignore this property - } - else if (_row.TryGetValue(mapping.MappedName, out value) && value != null && value != DBNull.Value && !value.ToString().IsCaseInsensitiveEqual(ExplicitIgnore)) - { - // source contains field value. Set it. - TProp converted; - if (converter != null) - { - converted = converter(value, _segmenter.Culture); - } - else if (value.ToString().IsCaseInsensitiveEqual(ExplicitNull)) - { - // prop is "explicitly" set to null. Don't fallback to any default! - converted = default(TProp); - } - else - { - converted = value.Convert(_segmenter.Culture); - } - - var fastProp = FastProperty.GetProperty(target.GetUnproxiedType(), propName, PropertyCachingStrategy.EagerCached); - fastProp.SetValue(target, converted); - isPropertySet = true; - } - else - { - // source field value does not exist or is null/empty - if (IsNew) - { - // if entity is new and source field value is null, determine default value in this particular order: - // 2.) Default value in field mapping table - // 3.) passed default value argument - defaultValue = GetDefaultValue(mapping, defaultValue, result); - - // source does not contain field data or is empty... - if (defaultValue != null) - { - // ...but the entity is new. In this case set the default value if given. - var fastProp = FastProperty.GetProperty(target.GetUnproxiedType(), propName, PropertyCachingStrategy.EagerCached); - fastProp.SetValue(target, defaultValue); - isPropertySet = true; - } - } - } - } - catch (Exception exception) - { - result.AddWarning("Conversion failed: " + exception.Message, this.GetRowInfo(), propName); - } - - if (isPropertySet && !_isDirty) - { - _isDirty = true; - } - - return isPropertySet; - } - - public ImportRowInfo GetRowInfo() - { - if (_rowInfo == null) - { - _rowInfo = new ImportRowInfo(this.Position, this.EntityDisplayName); - } - - return _rowInfo; - } - - public override string ToString() - { - var str = "Pos: {0} - Name: {1}, IsNew: {2}, IsTransient: {3}".FormatCurrent( - Position, - EntityDisplayName.EmptyNull(), - _initialized ? IsNew.ToString() : "-", - _initialized ? IsTransient.ToString() : "-"); - return str; - } - } + ImportResult result, + Expression> prop, + TProp defaultValue = default(TProp), + Func converter = null) + { + return SetProperty( + result, + null, // columnName + prop, + defaultValue, + converter); + } + + public bool SetProperty( + ImportResult result, + string columnName, + Expression> prop, + TProp defaultValue = default(TProp), + Func converter = null) + { + // TBD: (MC) do not check or validate for perf reason? + //CheckInitialized(); + + var isPropertySet = false; + var pi = prop.ExtractPropertyInfo(); + var propName = pi.Name; + var target = _entity; + + columnName = columnName ?? propName; + + try + { + object value; + var mapping = _segmenter.ColumnMap.GetMapping(columnName); + + if (mapping.IgnoreProperty) + { + // explicitly ignore this property + } + else if (_row.TryGetValue(mapping.MappedName, out value) && value != null && value != DBNull.Value && !value.ToString().IsCaseInsensitiveEqual(ExplicitIgnore)) + { + // source contains field value. Set it. + TProp converted; + if (converter != null) + { + converted = converter(value, _segmenter.Culture); + } + else if (value.ToString().IsCaseInsensitiveEqual(ExplicitNull)) + { + // prop is "explicitly" set to null. Don't fallback to any default! + converted = default(TProp); + } + else + { + converted = value.Convert(_segmenter.Culture); + } + + var fastProp = FastProperty.GetProperty(target.GetUnproxiedType(), propName, PropertyCachingStrategy.EagerCached); + fastProp.SetValue(target, converted); + isPropertySet = true; + } + else + { + // source field value does not exist or is null/empty + if (IsNew) + { + // if entity is new and source field value is null, determine default value in this particular order: + // 2.) Default value in field mapping table + // 3.) passed default value argument + defaultValue = GetDefaultValue(mapping, defaultValue, result); + + // source does not contain field data or is empty... + if (defaultValue != null) + { + // ...but the entity is new. In this case set the default value if given. + var fastProp = FastProperty.GetProperty(target.GetUnproxiedType(), propName, PropertyCachingStrategy.EagerCached); + fastProp.SetValue(target, defaultValue); + isPropertySet = true; + } + } + } + } + catch (Exception exception) + { + result.AddWarning("Conversion failed: " + exception.Message, this.GetRowInfo(), propName); + } + + if (isPropertySet && !_isDirty) + { + _isDirty = true; + } + + return isPropertySet; + } + + public ImportRowInfo GetRowInfo() + { + if (_rowInfo == null) + { + _rowInfo = new ImportRowInfo(this.Position, this.EntityDisplayName); + } + + return _rowInfo; + } + + public override string ToString() + { + var str = "Pos: {0} - Name: {1}, IsNew: {2}, IsTransient: {3}".FormatCurrent( + Position, + EntityDisplayName.EmptyNull(), + _initialized ? IsNew.ToString() : "-", + _initialized ? IsTransient.ToString() : "-"); + return str; + } + } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/Internal/DataImporterContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/Internal/DataImporterContext.cs index f9f36594cc..3bb371dc5b 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/Internal/DataImporterContext.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/Internal/DataImporterContext.cs @@ -4,17 +4,17 @@ namespace SmartStore.Services.DataExchange.Import.Internal { - internal class DataImporterContext - { - public DataImporterContext( - DataImportRequest request, - CancellationToken cancellationToken, - string progressInfo) - { - Request = request; - CancellationToken = cancellationToken; + internal class DataImporterContext + { + public DataImporterContext( + DataImportRequest request, + CancellationToken cancellationToken, + string progressInfo) + { + Request = request; + CancellationToken = cancellationToken; - ExecuteContext = new ImportExecuteContext(CancellationToken, Request.ProgressValueSetter, progressInfo) + ExecuteContext = new ImportExecuteContext(CancellationToken, Request.ProgressValueSetter, progressInfo) { Request = request }; @@ -23,12 +23,12 @@ public DataImporterContext( Results = new Dictionary(); } - public DataImportRequest Request { get; private set; } - public CancellationToken CancellationToken { get; private set; } + public DataImportRequest Request { get; private set; } + public CancellationToken CancellationToken { get; private set; } - public TraceLogger Log { get; set; } - public ImportExecuteContext ExecuteContext { get; set; } - public IEntityImporter Importer { get; set; } + public TraceLogger Log { get; set; } + public ImportExecuteContext ExecuteContext { get; set; } + public IEntityImporter Importer { get; set; } public ColumnMap ColumnMap { get; private set; } public Dictionary Results { get; private set; } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/SyncMappingService.cs b/src/Libraries/SmartStore.Services/DataExchange/SyncMappingService.cs index 8b455a6955..bd3add028f 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/SyncMappingService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/SyncMappingService.cs @@ -8,137 +8,137 @@ namespace SmartStore.Services.DataExchange { - public partial class SyncMappingService : ISyncMappingService - { - private readonly IRepository _syncMappingsRepository; - - public SyncMappingService(IRepository syncMappingsRepository) - { - this._syncMappingsRepository = syncMappingsRepository; - } - - public void InsertSyncMapping(SyncMapping mapping) - { - Guard.NotNull(mapping, nameof(mapping)); - - _syncMappingsRepository.Insert(mapping); - } - - public void InsertSyncMappings(IEnumerable mappings) - { - Guard.NotNull(mappings, nameof(mappings)); - - _syncMappingsRepository.InsertRange(mappings); - } - - public IList GetAllSyncMappings(string contextName = null, string entityName = null, int[] entityIds = null) - { - var query = _syncMappingsRepository.Table; - - if (entityName.HasValue()) - { - query = query.Where(x => x.EntityName == entityName); - } - - if (contextName.HasValue()) - { - query = query.Where(x => x.ContextName == contextName); - } - - if (entityIds != null && entityIds.Any()) - { - query = query.Where(x => entityIds.Contains(x.EntityId)); - } - - return query.ToList(); - } - - public SyncMapping GetSyncMappingByEntity(int entityId, string entityName, string contextName) - { - Guard.IsPositive(entityId, nameof(entityId)); - Guard.NotEmpty(entityName, nameof(entityName)); - Guard.NotEmpty(contextName, nameof(contextName)); - - var query = from x in _syncMappingsRepository.Table - where - x.EntityId == entityId - && x.EntityName == entityName - && x.ContextName == contextName - select x; - - return query.FirstOrDefault(); - } - - public SyncMapping GetSyncMappingBySource(string sourceKey, string entityName, string contextName) - { - Guard.NotEmpty(sourceKey, nameof(sourceKey)); - Guard.NotEmpty(entityName, nameof(entityName)); - Guard.NotEmpty(contextName, nameof(contextName)); - - var query = from x in _syncMappingsRepository.Table - where - x.SourceKey == sourceKey - && x.EntityName == entityName - && x.ContextName == contextName - select x; - - return query.FirstOrDefault(); - } - - public void DeleteSyncMapping(SyncMapping mapping) - { - Guard.NotNull(mapping, nameof(mapping)); - - _syncMappingsRepository.Delete(mapping); - } - - public void DeleteSyncMappings(IEnumerable mappings) - { - Guard.NotNull(mappings, nameof(mappings)); - - _syncMappingsRepository.DeleteRange(mappings); - } - - public void DeleteSyncMappingsFor(T entity) where T : BaseEntity - { - Guard.NotNull(entity, nameof(entity)); - - if (entity is SyncMapping) - { - throw Error.InvalidOperation("Cannot delete a sync mapping record for a SyncMapping entity"); - } - - if (entity.IsTransientRecord()) - { - return; - } - - _syncMappingsRepository.DeleteAll(x => x.EntityId == entity.Id && x.EntityName == entity.GetEntityName()); - } - - public void DeleteSyncMappings(string contextName, string entityName = null) - { - Guard.NotEmpty(contextName, nameof(contextName)); - - if (entityName.HasValue()) - { - _syncMappingsRepository.DeleteAll(x => x.ContextName == contextName && x.EntityName == entityName); - } - else - { - _syncMappingsRepository.DeleteAll(x => x.ContextName == contextName); - } - } - - - public void UpdateSyncMapping(SyncMapping mapping) - { - Guard.NotNull(mapping, nameof(mapping)); - - mapping.SyncedOnUtc = DateTime.UtcNow; - _syncMappingsRepository.Update(mapping); - } - - } + public partial class SyncMappingService : ISyncMappingService + { + private readonly IRepository _syncMappingsRepository; + + public SyncMappingService(IRepository syncMappingsRepository) + { + this._syncMappingsRepository = syncMappingsRepository; + } + + public void InsertSyncMapping(SyncMapping mapping) + { + Guard.NotNull(mapping, nameof(mapping)); + + _syncMappingsRepository.Insert(mapping); + } + + public void InsertSyncMappings(IEnumerable mappings) + { + Guard.NotNull(mappings, nameof(mappings)); + + _syncMappingsRepository.InsertRange(mappings); + } + + public IList GetAllSyncMappings(string contextName = null, string entityName = null, int[] entityIds = null) + { + var query = _syncMappingsRepository.Table; + + if (entityName.HasValue()) + { + query = query.Where(x => x.EntityName == entityName); + } + + if (contextName.HasValue()) + { + query = query.Where(x => x.ContextName == contextName); + } + + if (entityIds != null && entityIds.Any()) + { + query = query.Where(x => entityIds.Contains(x.EntityId)); + } + + return query.ToList(); + } + + public SyncMapping GetSyncMappingByEntity(int entityId, string entityName, string contextName) + { + Guard.IsPositive(entityId, nameof(entityId)); + Guard.NotEmpty(entityName, nameof(entityName)); + Guard.NotEmpty(contextName, nameof(contextName)); + + var query = from x in _syncMappingsRepository.Table + where + x.EntityId == entityId + && x.EntityName == entityName + && x.ContextName == contextName + select x; + + return query.FirstOrDefault(); + } + + public SyncMapping GetSyncMappingBySource(string sourceKey, string entityName, string contextName) + { + Guard.NotEmpty(sourceKey, nameof(sourceKey)); + Guard.NotEmpty(entityName, nameof(entityName)); + Guard.NotEmpty(contextName, nameof(contextName)); + + var query = from x in _syncMappingsRepository.Table + where + x.SourceKey == sourceKey + && x.EntityName == entityName + && x.ContextName == contextName + select x; + + return query.FirstOrDefault(); + } + + public void DeleteSyncMapping(SyncMapping mapping) + { + Guard.NotNull(mapping, nameof(mapping)); + + _syncMappingsRepository.Delete(mapping); + } + + public void DeleteSyncMappings(IEnumerable mappings) + { + Guard.NotNull(mappings, nameof(mappings)); + + _syncMappingsRepository.DeleteRange(mappings); + } + + public void DeleteSyncMappingsFor(T entity) where T : BaseEntity + { + Guard.NotNull(entity, nameof(entity)); + + if (entity is SyncMapping) + { + throw Error.InvalidOperation("Cannot delete a sync mapping record for a SyncMapping entity"); + } + + if (entity.IsTransientRecord()) + { + return; + } + + _syncMappingsRepository.DeleteAll(x => x.EntityId == entity.Id && x.EntityName == entity.GetEntityName()); + } + + public void DeleteSyncMappings(string contextName, string entityName = null) + { + Guard.NotEmpty(contextName, nameof(contextName)); + + if (entityName.HasValue()) + { + _syncMappingsRepository.DeleteAll(x => x.ContextName == contextName && x.EntityName == entityName); + } + else + { + _syncMappingsRepository.DeleteAll(x => x.ContextName == contextName); + } + } + + + public void UpdateSyncMapping(SyncMapping mapping) + { + Guard.NotNull(mapping, nameof(mapping)); + + mapping.SyncedOnUtc = DateTime.UtcNow; + _syncMappingsRepository.Update(mapping); + } + + } } diff --git a/src/Libraries/SmartStore.Services/Directory/CountryService.cs b/src/Libraries/SmartStore.Services/Directory/CountryService.cs index 13f6b21646..6e05e0e600 100644 --- a/src/Libraries/SmartStore.Services/Directory/CountryService.cs +++ b/src/Libraries/SmartStore.Services/Directory/CountryService.cs @@ -14,28 +14,28 @@ public partial class CountryService : ICountryService private const string COUNTRIES_SHIPPING_KEY = "SmartStore.country.shipping-{0}"; private const string COUNTRIES_PATTERN_KEY = "SmartStore.country.*"; - private readonly ICommonServices _services; - private readonly IRepository _countryRepository; - private readonly IRepository _storeMappingRepository; + private readonly ICommonServices _services; + private readonly IRepository _countryRepository; + private readonly IRepository _storeMappingRepository; - public CountryService( - ICommonServices services, + public CountryService( + ICommonServices services, IRepository countryRepository, - IRepository storeMappingRepository) + IRepository storeMappingRepository) { _countryRepository = countryRepository; - _services = services; - _storeMappingRepository = storeMappingRepository; + _services = services; + _storeMappingRepository = storeMappingRepository; } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } public virtual void DeleteCountry(Country country) { - Guard.NotNull(country, nameof(country)); + Guard.NotNull(country, nameof(country)); + + _countryRepository.Delete(country); - _countryRepository.Delete(country); - _services.RequestCache.RemoveByPattern(COUNTRIES_PATTERN_KEY); } @@ -44,30 +44,30 @@ public virtual IList GetAllCountries(bool showHidden = false) string key = string.Format(COUNTRIES_ALL_KEY, showHidden); return _services.RequestCache.Get(key, () => { - var query = _countryRepository.Table; + var query = _countryRepository.Table; - if (!showHidden) - query = query.Where(c => c.Published); + if (!showHidden) + query = query.Where(c => c.Published); - query = query.OrderBy(c => c.DisplayOrder).ThenBy(c => c.Name); + query = query.OrderBy(c => c.DisplayOrder).ThenBy(c => c.Name); - if (!showHidden && !QuerySettings.IgnoreMultiStore) - { - var currentStoreId = _services.StoreContext.CurrentStore.Id; - query = from c in query - join sc in _storeMappingRepository.Table - on new { c1 = c.Id, c2 = "Country" } equals new { c1 = sc.EntityId, c2 = sc.EntityName } into c_sm - from sc in c_sm.DefaultIfEmpty() - where !c.LimitedToStores || currentStoreId == sc.StoreId - select c; + if (!showHidden && !QuerySettings.IgnoreMultiStore) + { + var currentStoreId = _services.StoreContext.CurrentStore.Id; + query = from c in query + join sc in _storeMappingRepository.Table + on new { c1 = c.Id, c2 = "Country" } equals new { c1 = sc.EntityId, c2 = sc.EntityName } into c_sm + from sc in c_sm.DefaultIfEmpty() + where !c.LimitedToStores || currentStoreId == sc.StoreId + select c; - query = from c in query - group c by c.Id into cGroup - orderby cGroup.Key - select cGroup.FirstOrDefault(); + query = from c in query + group c by c.Id into cGroup + orderby cGroup.Key + select cGroup.FirstOrDefault(); - query = query.OrderBy(c => c.DisplayOrder).ThenBy(c => c.Name); - } + query = query.OrderBy(c => c.DisplayOrder).ThenBy(c => c.Name); + } var countries = query.ToList(); return countries; @@ -79,9 +79,9 @@ public virtual IList GetAllCountriesForBilling(bool showHidden = false) string key = string.Format(COUNTRIES_BILLING_KEY, showHidden); return _services.RequestCache.Get(key, () => { - var allCountries = GetAllCountries(showHidden); + var allCountries = GetAllCountries(showHidden); - var countries = allCountries.Where(x => x.AllowsBilling).ToList(); + var countries = allCountries.Where(x => x.AllowsBilling).ToList(); return countries; }); } @@ -90,8 +90,8 @@ public virtual IList GetAllCountriesForShipping(bool showHidden = false { string key = string.Format(COUNTRIES_SHIPPING_KEY, showHidden); return _services.RequestCache.Get(key, () => - { - var allCountries = GetAllCountries(showHidden); + { + var allCountries = GetAllCountries(showHidden); var countries = allCountries.Where(x => x.AllowsShipping).ToList(); return countries; @@ -106,22 +106,22 @@ public virtual Country GetCountryById(int countryId) return _countryRepository.GetById(countryId); } - public virtual Country GetCountryByTwoOrThreeLetterIsoCode(string letterIsoCode) - { - if (letterIsoCode.HasValue()) - { - if (letterIsoCode.Length == 2) - return GetCountryByTwoLetterIsoCode(letterIsoCode); - else if (letterIsoCode.Length == 3) - return GetCountryByThreeLetterIsoCode(letterIsoCode); - } - return null; - } + public virtual Country GetCountryByTwoOrThreeLetterIsoCode(string letterIsoCode) + { + if (letterIsoCode.HasValue()) + { + if (letterIsoCode.Length == 2) + return GetCountryByTwoLetterIsoCode(letterIsoCode); + else if (letterIsoCode.Length == 3) + return GetCountryByThreeLetterIsoCode(letterIsoCode); + } + return null; + } public virtual Country GetCountryByTwoLetterIsoCode(string twoLetterIsoCode) { - if (twoLetterIsoCode.IsEmpty()) - return null; + if (twoLetterIsoCode.IsEmpty()) + return null; var query = from c in _countryRepository.Table where c.TwoLetterIsoCode == twoLetterIsoCode @@ -133,8 +133,8 @@ public virtual Country GetCountryByTwoLetterIsoCode(string twoLetterIsoCode) public virtual Country GetCountryByThreeLetterIsoCode(string threeLetterIsoCode) { - if (threeLetterIsoCode.IsEmpty()) - return null; + if (threeLetterIsoCode.IsEmpty()) + return null; var query = from c in _countryRepository.Table where c.ThreeLetterIsoCode == threeLetterIsoCode @@ -146,20 +146,20 @@ public virtual Country GetCountryByThreeLetterIsoCode(string threeLetterIsoCode) public virtual void InsertCountry(Country country) { - Guard.NotNull(country, nameof(country)); + Guard.NotNull(country, nameof(country)); - _countryRepository.Insert(country); + _countryRepository.Insert(country); - _services.RequestCache.RemoveByPattern(COUNTRIES_PATTERN_KEY); + _services.RequestCache.RemoveByPattern(COUNTRIES_PATTERN_KEY); } public virtual void UpdateCountry(Country country) { - Guard.NotNull(country, nameof(country)); + Guard.NotNull(country, nameof(country)); _countryRepository.Update(country); - _services.RequestCache.RemoveByPattern(COUNTRIES_PATTERN_KEY); + _services.RequestCache.RemoveByPattern(COUNTRIES_PATTERN_KEY); } - } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Directory/CurrencyExtensions.cs b/src/Libraries/SmartStore.Services/Directory/CurrencyExtensions.cs index 03a9dfc7ee..a347e8f800 100644 --- a/src/Libraries/SmartStore.Services/Directory/CurrencyExtensions.cs +++ b/src/Libraries/SmartStore.Services/Directory/CurrencyExtensions.cs @@ -5,23 +5,23 @@ namespace SmartStore.Services.Directory { - public static class CurrencyExtensions - { - public static bool HasDomainEnding(this Currency currency, string domain) - { + public static class CurrencyExtensions + { + public static bool HasDomainEnding(this Currency currency, string domain) + { if (currency == null || domain.IsEmpty() || currency.DomainEndings.IsEmpty()) return false; - var endings = currency.DomainEndings.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries); + var endings = currency.DomainEndings.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries); return endings.Any(x => domain.EndsWith(x, StringComparison.InvariantCultureIgnoreCase)); - } + } - public static Currency GetByDomainEnding(this IEnumerable currencies, string domain) - { + public static Currency GetByDomainEnding(this IEnumerable currencies, string domain) + { if (currencies == null || domain.IsEmpty()) return null; return currencies.FirstOrDefault(x => x.Published && x.HasDomainEnding(domain)); - } - } + } + } } diff --git a/src/Libraries/SmartStore.Services/Directory/CurrencyService.cs b/src/Libraries/SmartStore.Services/Directory/CurrencyService.cs index d417801b19..09243d5246 100644 --- a/src/Libraries/SmartStore.Services/Directory/CurrencyService.cs +++ b/src/Libraries/SmartStore.Services/Directory/CurrencyService.cs @@ -15,45 +15,45 @@ namespace SmartStore.Services.Directory public partial class CurrencyService : ICurrencyService { private readonly IRepository _currencyRepository; - private readonly IStoreMappingService _storeMappingService; + private readonly IStoreMappingService _storeMappingService; private readonly CurrencySettings _currencySettings; private readonly IPluginFinder _pluginFinder; private readonly IEventPublisher _eventPublisher; - private readonly IProviderManager _providerManager; - private readonly IStoreContext _storeContext; + private readonly IProviderManager _providerManager; + private readonly IStoreContext _storeContext; public CurrencyService( IRepository currencyRepository, - IStoreMappingService storeMappingService, + IStoreMappingService storeMappingService, CurrencySettings currencySettings, IPluginFinder pluginFinder, IEventPublisher eventPublisher, - IProviderManager providerManager, - IStoreContext storeContext) + IProviderManager providerManager, + IStoreContext storeContext) { _currencyRepository = currencyRepository; - _storeMappingService = storeMappingService; + _storeMappingService = storeMappingService; _currencySettings = currencySettings; _pluginFinder = pluginFinder; _eventPublisher = eventPublisher; - _providerManager = providerManager; - _storeContext = storeContext; + _providerManager = providerManager; + _storeContext = storeContext; } public virtual IList GetCurrencyLiveRates(string exchangeRateCurrencyCode) { var exchangeRateProvider = LoadActiveExchangeRateProvider(); - if (exchangeRateProvider != null) - { - return exchangeRateProvider.Value.GetCurrencyLiveRates(exchangeRateCurrencyCode); - } - return new List(); + if (exchangeRateProvider != null) + { + return exchangeRateProvider.Value.GetCurrencyLiveRates(exchangeRateCurrencyCode); + } + return new List(); } public virtual void DeleteCurrency(Currency currency) { - Guard.NotNull(currency, nameof(currency)); - + Guard.NotNull(currency, nameof(currency)); + _currencyRepository.Delete(currency); } @@ -62,49 +62,49 @@ public virtual Currency GetCurrencyById(int currencyId) if (currencyId == 0) return null; - return _currencyRepository.GetByIdCached(currencyId, "db.cur.id-" + currencyId); - } + return _currencyRepository.GetByIdCached(currencyId, "db.cur.id-" + currencyId); + } public virtual Currency GetCurrencyByCode(string currencyCode) { - Guard.NotNull(currencyCode, nameof(currencyCode)); + Guard.NotNull(currencyCode, nameof(currencyCode)); - return GetAllCurrencies(true).FirstOrDefault(c => c.CurrencyCode.ToLower() == currencyCode.ToLower()); + return GetAllCurrencies(true).FirstOrDefault(c => c.CurrencyCode.ToLower() == currencyCode.ToLower()); } - public virtual IList GetAllCurrencies(bool showHidden = false, int storeId = 0) + public virtual IList GetAllCurrencies(bool showHidden = false, int storeId = 0) { - var query = _currencyRepository.Table; + var query = _currencyRepository.Table; - if (!showHidden) - query = query.Where(c => c.Published); + if (!showHidden) + query = query.Where(c => c.Published); - query = query.OrderBy(c => c.DisplayOrder); + query = query.OrderBy(c => c.DisplayOrder); - var currencies = query.ToListCached(); + var currencies = query.ToListCached(); - // store mapping - if (storeId > 0) - { - currencies = currencies - .Where(c => _storeMappingService.Authorize(c, storeId)) - .ToList(); - } - return currencies; + // store mapping + if (storeId > 0) + { + currencies = currencies + .Where(c => _storeMappingService.Authorize(c, storeId)) + .ToList(); + } + return currencies; } public virtual void InsertCurrency(Currency currency) { - Guard.NotNull(currency, nameof(currency)); + Guard.NotNull(currency, nameof(currency)); - _currencyRepository.Insert(currency); + _currencyRepository.Insert(currency); } public virtual void UpdateCurrency(Currency currency) { - Guard.NotNull(currency, nameof(currency)); + Guard.NotNull(currency, nameof(currency)); - _currencyRepository.Update(currency); + _currencyRepository.Update(currency); } public virtual decimal ConvertCurrency(decimal amount, decimal exchangeRate) @@ -115,7 +115,7 @@ public virtual decimal ConvertCurrency(decimal amount, decimal exchangeRate) return decimal.Zero; } - public virtual decimal ConvertCurrency(decimal amount, Currency sourceCurrency, Currency targetCurrency, Store store = null) + public virtual decimal ConvertCurrency(decimal amount, Currency sourceCurrency, Currency targetCurrency, Store store = null) { decimal result = amount; if (sourceCurrency.Id == targetCurrency.Id) @@ -130,10 +130,10 @@ public virtual decimal ConvertCurrency(decimal amount, Currency sourceCurrency, return result; } - public virtual decimal ConvertToPrimaryExchangeRateCurrency(decimal amount, Currency sourceCurrency, Store store = null) + public virtual decimal ConvertToPrimaryExchangeRateCurrency(decimal amount, Currency sourceCurrency, Store store = null) { decimal result = amount; - var primaryExchangeRateCurrency = (store == null ? _storeContext.CurrentStore.PrimaryExchangeRateCurrency : store.PrimaryExchangeRateCurrency); + var primaryExchangeRateCurrency = (store == null ? _storeContext.CurrentStore.PrimaryExchangeRateCurrency : store.PrimaryExchangeRateCurrency); if (result != decimal.Zero && sourceCurrency.Id != primaryExchangeRateCurrency.Id) { @@ -145,7 +145,7 @@ public virtual decimal ConvertToPrimaryExchangeRateCurrency(decimal amount, Curr return result; } - public virtual decimal ConvertFromPrimaryExchangeRateCurrency(decimal amount, Currency targetCurrency, Store store = null) + public virtual decimal ConvertFromPrimaryExchangeRateCurrency(decimal amount, Currency targetCurrency, Store store = null) { decimal result = amount; var primaryExchangeRateCurrency = (store == null ? _storeContext.CurrentStore.PrimaryExchangeRateCurrency : store.PrimaryExchangeRateCurrency); @@ -163,7 +163,7 @@ public virtual decimal ConvertFromPrimaryExchangeRateCurrency(decimal amount, Cu public virtual decimal ConvertToPrimaryStoreCurrency(decimal amount, Currency sourceCurrency, Store store = null) { decimal result = amount; - var primaryStoreCurrency = (store == null ? _storeContext.CurrentStore.PrimaryStoreCurrency : store.PrimaryStoreCurrency); + var primaryStoreCurrency = (store == null ? _storeContext.CurrentStore.PrimaryStoreCurrency : store.PrimaryStoreCurrency); if (result != decimal.Zero && sourceCurrency.Id != primaryStoreCurrency.Id) { @@ -175,27 +175,27 @@ public virtual decimal ConvertToPrimaryStoreCurrency(decimal amount, Currency so return result; } - public virtual decimal ConvertFromPrimaryStoreCurrency(decimal amount, Currency targetCurrency, Store store = null) + public virtual decimal ConvertFromPrimaryStoreCurrency(decimal amount, Currency targetCurrency, Store store = null) { decimal result = amount; - var primaryStoreCurrency = (store == null ? _storeContext.CurrentStore.PrimaryStoreCurrency : store.PrimaryStoreCurrency); + var primaryStoreCurrency = (store == null ? _storeContext.CurrentStore.PrimaryStoreCurrency : store.PrimaryStoreCurrency); result = ConvertCurrency(amount, primaryStoreCurrency, targetCurrency, store); return result; } public virtual Provider LoadActiveExchangeRateProvider() { - return LoadExchangeRateProviderBySystemName(_currencySettings.ActiveExchangeRateProviderSystemName) ?? LoadAllExchangeRateProviders().FirstOrDefault(); + return LoadExchangeRateProviderBySystemName(_currencySettings.ActiveExchangeRateProviderSystemName) ?? LoadAllExchangeRateProviders().FirstOrDefault(); } public virtual Provider LoadExchangeRateProviderBySystemName(string systemName) { - return _providerManager.GetProvider(systemName); + return _providerManager.GetProvider(systemName); } public virtual IEnumerable> LoadAllExchangeRateProviders() { - return _providerManager.GetAllProviders(); + return _providerManager.GetAllProviders(); } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs index 2a3ea06dc7..b5f04c317f 100644 --- a/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs +++ b/src/Libraries/SmartStore.Services/Directory/DeliveryTimeService.cs @@ -40,11 +40,11 @@ public DeliveryTimeService( _attributeCombinationRepository = attributeCombinationRepository; _dateTimeHelper = dateTimeHelper; _workContext = workContext; - _catalogSettings = catalogSettings; + _catalogSettings = catalogSettings; _shippingSettings = shippingSettings; - } + } - public Localizer T { get; set; } = NullLocalizer.Instance; + public Localizer T { get; set; } = NullLocalizer.Instance; public virtual void DeleteDeliveryTime(DeliveryTime deliveryTime) { @@ -99,10 +99,10 @@ public virtual bool IsAssociated(int deliveryTimeId) if (deliveryTimeId == 0) return false; - var query = - from p in _productRepository.Table - where p.DeliveryTimeId == deliveryTimeId || p.ProductVariantAttributeCombinations.Any(c => c.DeliveryTimeId == deliveryTimeId) - select p.Id; + var query = + from p in _productRepository.Table + where p.DeliveryTimeId == deliveryTimeId || p.ProductVariantAttributeCombinations.Any(c => c.DeliveryTimeId == deliveryTimeId) + select p.Id; return query.Count() > 0; } @@ -120,22 +120,22 @@ public virtual DeliveryTime GetDeliveryTimeById(int deliveryTimeId) return null; } } - - return _deliveryTimeRepository.GetByIdCached(deliveryTimeId, "deliverytime-{0}".FormatInvariant(deliveryTimeId)); + + return _deliveryTimeRepository.GetByIdCached(deliveryTimeId, "deliverytime-{0}".FormatInvariant(deliveryTimeId)); } public virtual DeliveryTime GetDeliveryTime(Product product) - { + { var deliveryTimeId = product.GetDeliveryTimeIdAccordingToStock(_catalogSettings); return GetDeliveryTimeById(deliveryTimeId ?? 0); - } + } public virtual IList GetAllDeliveryTimes() { - var query = _deliveryTimeRepository.Table.OrderBy(c => c.DisplayOrder); - var deliveryTimes = query.ToListCached("db.delivtimes.all"); - return deliveryTimes; - } + var query = _deliveryTimeRepository.Table.OrderBy(c => c.DisplayOrder); + var deliveryTimes = query.ToListCached("db.delivtimes.all"); + return deliveryTimes; + } public virtual void InsertDeliveryTime(DeliveryTime deliveryTime) { @@ -157,13 +157,13 @@ public virtual void SetToDefault(DeliveryTime deliveryTime) var deliveryTimes = GetAllDeliveryTimes(); - foreach(var time in deliveryTimes) + foreach (var time in deliveryTimes) { time.IsDefault = time.Equals(deliveryTime) ? true : false; _deliveryTimeRepository.Update(time); } } - + public virtual DeliveryTime GetDefaultDeliveryTime() { return _deliveryTimeRepository.Table.Where(x => x.IsDefault == true).FirstOrDefault(); diff --git a/src/Libraries/SmartStore.Services/Directory/EcbExchangeRateProvider.cs b/src/Libraries/SmartStore.Services/Directory/EcbExchangeRateProvider.cs index 2e941fadff..6fab09e930 100644 --- a/src/Libraries/SmartStore.Services/Directory/EcbExchangeRateProvider.cs +++ b/src/Libraries/SmartStore.Services/Directory/EcbExchangeRateProvider.cs @@ -9,27 +9,27 @@ namespace SmartStore.Services.Directory { - [SystemName("CurrencyExchange.ECB")] - [FriendlyName("ECB currency exchange rate provider")] - [DisplayOrder(0)] - public class EcbExchangeRateProvider : IExchangeRateProvider + [SystemName("CurrencyExchange.ECB")] + [FriendlyName("ECB currency exchange rate provider")] + [DisplayOrder(0)] + public class EcbExchangeRateProvider : IExchangeRateProvider { - /// - /// Gets live currency exchange rates - /// - /// Exchange rate currency code - /// Currency exchange rates - public IList GetCurrencyLiveRates(string exchangeRateCurrencyCode) + /// + /// Gets live currency exchange rates + /// + /// Exchange rate currency code + /// Currency exchange rates + public IList GetCurrencyLiveRates(string exchangeRateCurrencyCode) { - if (exchangeRateCurrencyCode.IsEmpty()) - return new List(); + if (exchangeRateCurrencyCode.IsEmpty()) + return new List(); - var result = new Dictionary(); - var targetCurrency = exchangeRateCurrencyCode.ToUpper(); - var updateDate = DateTime.UtcNow; + var result = new Dictionary(); + var targetCurrency = exchangeRateCurrencyCode.ToUpper(); + var updateDate = DateTime.UtcNow; - // old url still works too: http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml - var request = WebRequest.Create("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml") as HttpWebRequest; + // old url still works too: http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml + var request = WebRequest.Create("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml") as HttpWebRequest; using (var response = request.GetResponse()) { @@ -41,72 +41,72 @@ public IList GetCurrencyLiveRates(string exchangeRateCurrencyCode) nsmgr.AddNamespace("gesmes", "http://www.gesmes.org/xml/2002-08-01"); var node = document.SelectSingleNode("gesmes:Envelope/ns:Cube/ns:Cube", nsmgr); - var ecbDate = DateTime.ParseExact(node.Attributes["time"].Value, "yyyy-MM-dd", null); + var ecbDate = DateTime.ParseExact(node.Attributes["time"].Value, "yyyy-MM-dd", null); - // see https://www.ecb.europa.eu/stats/exchange/eurofxref/html/index.en.html - updateDate = new DateTime(ecbDate.Year, ecbDate.Month, ecbDate.Day, 16, 0, 0); + // see https://www.ecb.europa.eu/stats/exchange/eurofxref/html/index.en.html + updateDate = new DateTime(ecbDate.Year, ecbDate.Month, ecbDate.Day, 16, 0, 0); - var provider = new NumberFormatInfo(); + var provider = new NumberFormatInfo(); provider.NumberDecimalSeparator = "."; provider.NumberGroupSeparator = ""; foreach (XmlNode childNode in node.ChildNodes) { - // parse ECB rate - var rate = new ExchangeRate - { - CurrencyCode = childNode.Attributes["currency"].Value.EmptyNull().ToUpper(), - Rate = decimal.Parse(childNode.Attributes["rate"].Value, provider), - UpdatedOn = updateDate - }; - - // add it to result dictionary - if (!result.ContainsKey(rate.CurrencyCode) && rate.Rate != decimal.Zero) - { - result.Add(rate.CurrencyCode, rate); - } + // parse ECB rate + var rate = new ExchangeRate + { + CurrencyCode = childNode.Attributes["currency"].Value.EmptyNull().ToUpper(), + Rate = decimal.Parse(childNode.Attributes["rate"].Value, provider), + UpdatedOn = updateDate + }; + + // add it to result dictionary + if (!result.ContainsKey(rate.CurrencyCode) && rate.Rate != decimal.Zero) + { + result.Add(rate.CurrencyCode, rate); + } } } - // if target currency is EUR then we are ready because ECB always returns EUR rates - if (targetCurrency != "EUR") - { - // cross calculation not possible if ECB list does not contain target currency - if (!result.ContainsKey(targetCurrency)) - return new List(); - - // get clone of EUR rates - var euroRates = result.ToDictionary(x => x.Key, x => x.Value.Rate); - - // cross calculate rates for target currency - result.Each(x => - { - if (x.Value.CurrencyCode == "EUR") - { - x.Value.Rate = 1.0M / euroRates[targetCurrency]; - } - else - { - x.Value.Rate = euroRates[x.Value.CurrencyCode] / euroRates[targetCurrency]; - } - }); - - // remove target currency form result because its rate is always 1.0 - result.Remove(targetCurrency); - - // add EUR rate - if (!result.ContainsKey("EUR")) - { - result.Add("EUR", new ExchangeRate - { - CurrencyCode = "EUR", - Rate = 1.0M / euroRates[targetCurrency], - UpdatedOn = updateDate - }); - } - } - - return result.Select(x => x.Value).ToList(); + // if target currency is EUR then we are ready because ECB always returns EUR rates + if (targetCurrency != "EUR") + { + // cross calculation not possible if ECB list does not contain target currency + if (!result.ContainsKey(targetCurrency)) + return new List(); + + // get clone of EUR rates + var euroRates = result.ToDictionary(x => x.Key, x => x.Value.Rate); + + // cross calculate rates for target currency + result.Each(x => + { + if (x.Value.CurrencyCode == "EUR") + { + x.Value.Rate = 1.0M / euroRates[targetCurrency]; + } + else + { + x.Value.Rate = euroRates[x.Value.CurrencyCode] / euroRates[targetCurrency]; + } + }); + + // remove target currency form result because its rate is always 1.0 + result.Remove(targetCurrency); + + // add EUR rate + if (!result.ContainsKey("EUR")) + { + result.Add("EUR", new ExchangeRate + { + CurrencyCode = "EUR", + Rate = 1.0M / euroRates[targetCurrency], + UpdatedOn = updateDate + }); + } + } + + return result.Select(x => x.Value).ToList(); } } } diff --git a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs index 45f7d35241..c2dfaeac4e 100644 --- a/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs +++ b/src/Libraries/SmartStore.Services/Directory/GeoCountryLookup.cs @@ -17,7 +17,7 @@ public GeoCountryLookup() { // Old database not usable anymore due to US (Florida?) legal issues from 01 Jan 2020 on. //_reader = new DatabaseReader(CommonHelper.MapPath("~/App_Data/GeoLite2/GeoLite2-Country.mmdb")); - + _reader = new DatabaseReader(CommonHelper.MapPath("~/App_Data/Geo/dbip-country-lite.mmdb")); } diff --git a/src/Libraries/SmartStore.Services/Directory/ICountryService.cs b/src/Libraries/SmartStore.Services/Directory/ICountryService.cs index 001d2d55fd..fb62e956d6 100644 --- a/src/Libraries/SmartStore.Services/Directory/ICountryService.cs +++ b/src/Libraries/SmartStore.Services/Directory/ICountryService.cs @@ -43,12 +43,12 @@ public partial interface ICountryService /// Country Country GetCountryById(int countryId); - /// - /// Gets a country by two or three letter ISO code - /// - /// Country two or three letter ISO code - /// Country - Country GetCountryByTwoOrThreeLetterIsoCode(string letterIsoCode); + /// + /// Gets a country by two or three letter ISO code + /// + /// Country two or three letter ISO code + /// Country + Country GetCountryByTwoOrThreeLetterIsoCode(string letterIsoCode); /// /// Gets a country by two letter ISO code @@ -75,5 +75,5 @@ public partial interface ICountryService /// /// Country void UpdateCountry(Country country); - } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Directory/ICurrencyService.cs b/src/Libraries/SmartStore.Services/Directory/ICurrencyService.cs index 14be063172..68c2bbbf3e 100644 --- a/src/Libraries/SmartStore.Services/Directory/ICurrencyService.cs +++ b/src/Libraries/SmartStore.Services/Directory/ICurrencyService.cs @@ -112,14 +112,14 @@ public partial interface ICurrencyService /// Store to get the primary store currency from /// Converted value decimal ConvertFromPrimaryStoreCurrency(decimal amount, Currency targetCurrency, Store store = null); - - + + /// /// Load active exchange rate provider /// /// Active exchange rate provider - Provider LoadActiveExchangeRateProvider(); + Provider LoadActiveExchangeRateProvider(); /// /// Load exchange rate provider by system name diff --git a/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs b/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs index 8776ce9a7f..6634ab8ffb 100644 --- a/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs +++ b/src/Libraries/SmartStore.Services/Directory/IDeliveryTimeService.cs @@ -15,7 +15,7 @@ public partial interface IDeliveryTimeService /// at least one dependant entity /// bool IsAssociated(int deliveryTimeId); - + /// /// Deletes delivery time /// @@ -29,12 +29,12 @@ public partial interface IDeliveryTimeService /// DeliveryTime DeliveryTime GetDeliveryTimeById(int deliveryTimeId); - /// - /// Gets the delivery time for a product - /// - /// The product - /// Delivery time - DeliveryTime GetDeliveryTime(Product product); + /// + /// Gets the delivery time for a product + /// + /// The product + /// Delivery time + DeliveryTime GetDeliveryTime(Product product); /// /// Gets all delivery times diff --git a/src/Libraries/SmartStore.Services/Directory/IMeasureService.cs b/src/Libraries/SmartStore.Services/Directory/IMeasureService.cs index 5c57d3e851..1a56905e7b 100644 --- a/src/Libraries/SmartStore.Services/Directory/IMeasureService.cs +++ b/src/Libraries/SmartStore.Services/Directory/IMeasureService.cs @@ -74,7 +74,7 @@ decimal ConvertToPrimaryMeasureDimension(decimal quantity, /// Converted value decimal ConvertFromPrimaryMeasureDimension(decimal quantity, MeasureDimension targetMeasureDimension); - + /// /// Deletes measure weight diff --git a/src/Libraries/SmartStore.Services/Directory/IQuantityUnitService.cs b/src/Libraries/SmartStore.Services/Directory/IQuantityUnitService.cs index b198394f2e..49c41a7119 100644 --- a/src/Libraries/SmartStore.Services/Directory/IQuantityUnitService.cs +++ b/src/Libraries/SmartStore.Services/Directory/IQuantityUnitService.cs @@ -14,7 +14,7 @@ public partial interface IQuantityUnitService /// at least one dependant entity /// bool IsAssociated(int quantityUnitId); - + /// /// Deletes measure unit /// @@ -28,10 +28,10 @@ public partial interface IQuantityUnitService /// QuantityUnit QuantityUnit GetQuantityUnitById(int? quantityUnitId); - /// + /// /// Gets the measure unit for a product - /// - /// The product + /// + /// The product /// measure unit QuantityUnit GetQuantityUnit(Product product); diff --git a/src/Libraries/SmartStore.Services/Directory/IStateProvinceService.cs b/src/Libraries/SmartStore.Services/Directory/IStateProvinceService.cs index e62ff53527..3c62eaa12c 100644 --- a/src/Libraries/SmartStore.Services/Directory/IStateProvinceService.cs +++ b/src/Libraries/SmartStore.Services/Directory/IStateProvinceService.cs @@ -15,19 +15,19 @@ public partial interface IStateProvinceService /// The state/province void DeleteStateProvince(StateProvince stateProvince); - /// - /// Get all states/provinces - /// - /// A value indicating whether to show hidden records - /// - IQueryable GetAllStateProvinces(bool showHidden = false); + /// + /// Get all states/provinces + /// + /// A value indicating whether to show hidden records + /// + IQueryable GetAllStateProvinces(bool showHidden = false); - /// - /// Gets a state/province - /// - /// The state/province identifier - /// State/province - StateProvince GetStateProvinceById(int stateProvinceId); + /// + /// Gets a state/province + /// + /// The state/province identifier + /// State/province + StateProvince GetStateProvinceById(int stateProvinceId); /// /// Gets a state/province @@ -35,7 +35,7 @@ public partial interface IStateProvinceService /// The state/province abbreviation /// State/province StateProvince GetStateProvinceByAbbreviation(string abbreviation); - + /// /// Gets a state/province collection by country identifier /// diff --git a/src/Libraries/SmartStore.Services/Directory/MeasureService.cs b/src/Libraries/SmartStore.Services/Directory/MeasureService.cs index 1ff51e67a9..ecc3af578d 100644 --- a/src/Libraries/SmartStore.Services/Directory/MeasureService.cs +++ b/src/Libraries/SmartStore.Services/Directory/MeasureService.cs @@ -26,7 +26,7 @@ public MeasureService( _measureDimensionRepository = measureDimensionRepository; _measureWeightRepository = measureWeightRepository; _measureSettings = measureSettings; - _eventPublisher = eventPublisher; + _eventPublisher = eventPublisher; } #region Dimensions @@ -38,14 +38,14 @@ public virtual void DeleteMeasureDimension(MeasureDimension measureDimension) _measureDimensionRepository.Delete(measureDimension); } - + public virtual MeasureDimension GetMeasureDimensionById(int measureDimensionId) { if (measureDimensionId == 0) return null; - return _measureDimensionRepository.GetByIdCached(measureDimensionId, "db.dimension.id-" + measureDimensionId); - } + return _measureDimensionRepository.GetByIdCached(measureDimensionId, "db.dimension.id-" + measureDimensionId); + } public virtual MeasureDimension GetMeasureDimensionBySystemKeyword(string systemKeyword) { @@ -61,12 +61,12 @@ public virtual MeasureDimension GetMeasureDimensionBySystemKeyword(string system public virtual IList GetAllMeasureDimensions() { - var query = from md in _measureDimensionRepository.Table - orderby md.DisplayOrder - select md; - var measureDimensions = query.ToListCached("db.dimension.all"); - return measureDimensions; - } + var query = from md in _measureDimensionRepository.Table + orderby md.DisplayOrder + select md; + var measureDimensions = query.ToListCached("db.dimension.all"); + return measureDimensions; + } public virtual void InsertMeasureDimension(MeasureDimension measure) { @@ -84,7 +84,7 @@ public virtual void UpdateMeasureDimension(MeasureDimension measure) _measureDimensionRepository.Update(measure); } - public virtual decimal ConvertDimension(decimal quantity, + public virtual decimal ConvertDimension(decimal quantity, MeasureDimension sourceMeasureDimension, MeasureDimension targetMeasureDimension, bool round = true) { decimal result = quantity; @@ -145,8 +145,8 @@ public virtual MeasureWeight GetMeasureWeightById(int measureWeightId) if (measureWeightId == 0) return null; - return _measureWeightRepository.GetByIdCached(measureWeightId, "db.weight.id-" + measureWeightId); - } + return _measureWeightRepository.GetByIdCached(measureWeightId, "db.weight.id-" + measureWeightId); + } public virtual MeasureWeight GetMeasureWeightBySystemKeyword(string systemKeyword) { @@ -162,13 +162,13 @@ public virtual MeasureWeight GetMeasureWeightBySystemKeyword(string systemKeywor public virtual IList GetAllMeasureWeights() { - var query = from mw in _measureWeightRepository.Table - orderby mw.DisplayOrder - select mw; + var query = from mw in _measureWeightRepository.Table + orderby mw.DisplayOrder + select mw; - var measureWeights = query.ToListCached("db.weight.all"); - return measureWeights; - } + var measureWeights = query.ToListCached("db.weight.all"); + return measureWeights; + } public virtual void InsertMeasureWeight(MeasureWeight measure) { diff --git a/src/Libraries/SmartStore.Services/Directory/QuantityUnitService.cs b/src/Libraries/SmartStore.Services/Directory/QuantityUnitService.cs index 1048718152..a3bb181539 100644 --- a/src/Libraries/SmartStore.Services/Directory/QuantityUnitService.cs +++ b/src/Libraries/SmartStore.Services/Directory/QuantityUnitService.cs @@ -15,20 +15,20 @@ public partial class QuantityUnitService : IQuantityUnitService private readonly IRepository _quantityUnitRepository; private readonly IRepository _productRepository; private readonly IEventPublisher _eventPublisher; - private readonly CatalogSettings _catalogSettings; - + private readonly CatalogSettings _catalogSettings; + public QuantityUnitService( IRepository quantityUnitRepository, IRepository productRepository, IRepository attributeCombinationRepository, ICustomerService customerService, IEventPublisher eventPublisher, - CatalogSettings catalogSettings) + CatalogSettings catalogSettings) { this._quantityUnitRepository = quantityUnitRepository; this._eventPublisher = eventPublisher; this._productRepository = productRepository; - this._catalogSettings = catalogSettings; + this._catalogSettings = catalogSettings; } public virtual void DeleteQuantityUnit(QuantityUnit quantityUnit) @@ -47,19 +47,19 @@ public virtual bool IsAssociated(int quantityUnitId) if (quantityUnitId == 0) return false; - var query = - from p in _productRepository.Table + var query = + from p in _productRepository.Table where p.QuantityUnitId == quantityUnitId || p.ProductVariantAttributeCombinations.Any(c => c.QuantityUnitId == quantityUnitId) - select p.Id; + select p.Id; return query.Count() > 0; } public virtual QuantityUnit GetQuantityUnitById(int? quantityUnitId) { - if (quantityUnitId == null || quantityUnitId == 0) + if (quantityUnitId == null || quantityUnitId == 0) { - if(_catalogSettings.ShowDefaultQuantityUnit) + if (_catalogSettings.ShowDefaultQuantityUnit) { return GetAllQuantityUnits().Where(x => x.IsDefault == true).FirstOrDefault(); } @@ -68,25 +68,25 @@ public virtual QuantityUnit GetQuantityUnitById(int? quantityUnitId) return null; } } - + return _quantityUnitRepository.GetById(quantityUnitId); } public virtual QuantityUnit GetQuantityUnit(Product product) - { - if (product == null) - return null; + { + if (product == null) + return null; return GetQuantityUnitById(product.QuantityUnitId ?? 0); - } + } public virtual IList GetAllQuantityUnits() { - var query = _quantityUnitRepository.Table.OrderBy(c => c.DisplayOrder); + var query = _quantityUnitRepository.Table.OrderBy(c => c.DisplayOrder); - var quantityUnits = query.ToListCached("db.qtyunit.all"); - return quantityUnits; - } + var quantityUnits = query.ToListCached("db.qtyunit.all"); + return quantityUnits; + } public virtual void InsertQuantityUnit(QuantityUnit quantityUnit) { @@ -101,7 +101,8 @@ public virtual void UpdateQuantityUnit(QuantityUnit quantityUnit) if (quantityUnit == null) throw new ArgumentNullException("quantityUnit"); - if (quantityUnit.IsDefault == true) { + if (quantityUnit.IsDefault == true) + { var temp = new List(); temp.Add(quantityUnit); @@ -109,8 +110,8 @@ public virtual void UpdateQuantityUnit(QuantityUnit quantityUnit) var query = GetAllQuantityUnits() .Where(x => x.IsDefault == true) .Except(temp); - - foreach(var qu in query) + + foreach (var qu in query) { qu.IsDefault = false; _quantityUnitRepository.Update(qu); diff --git a/src/Libraries/SmartStore.Services/Directory/StateProvinceService.cs b/src/Libraries/SmartStore.Services/Directory/StateProvinceService.cs index 925bfdc04f..14e99909ed 100644 --- a/src/Libraries/SmartStore.Services/Directory/StateProvinceService.cs +++ b/src/Libraries/SmartStore.Services/Directory/StateProvinceService.cs @@ -8,7 +8,7 @@ namespace SmartStore.Services.Directory { - public partial class StateProvinceService : IStateProvinceService + public partial class StateProvinceService : IStateProvinceService { private readonly IRepository _stateProvinceRepository; private readonly IEventPublisher _eventPublisher; @@ -25,21 +25,21 @@ public virtual void DeleteStateProvince(StateProvince stateProvince) { if (stateProvince == null) throw new ArgumentNullException("stateProvince"); - + _stateProvinceRepository.Delete(stateProvince); } - public virtual IQueryable GetAllStateProvinces(bool showHidden = false) - { - var query = _stateProvinceRepository.Table; + public virtual IQueryable GetAllStateProvinces(bool showHidden = false) + { + var query = _stateProvinceRepository.Table; - if (!showHidden) - query = query.Where(x => x.Published); + if (!showHidden) + query = query.Where(x => x.Published); - return query; - } + return query; + } - public virtual StateProvince GetStateProvinceById(int stateProvinceId) + public virtual StateProvince GetStateProvinceById(int stateProvinceId) { if (stateProvinceId == 0) return null; @@ -55,7 +55,7 @@ public virtual StateProvince GetStateProvinceByAbbreviation(string abbreviation) var stateProvince = query.FirstOrDefault(); return stateProvince; } - + public virtual IList GetStateProvincesByCountryId(int countryId, bool showHidden = false) { if (countryId == 0) @@ -63,15 +63,15 @@ public virtual IList GetStateProvincesByCountryId(int countryId, return new List(); } - var query = from sp in _stateProvinceRepository.Table - orderby sp.DisplayOrder - where sp.CountryId == countryId && - (showHidden || sp.Published) - select sp; + var query = from sp in _stateProvinceRepository.Table + orderby sp.DisplayOrder + where sp.CountryId == countryId && + (showHidden || sp.Published) + select sp; - var stateProvinces = query.ToListCached("db.regions.{0}.{1}".FormatInvariant(countryId, showHidden)); - return stateProvinces; - } + var stateProvinces = query.ToListCached("db.regions.{0}.{1}".FormatInvariant(countryId, showHidden)); + return stateProvinces; + } public virtual void InsertStateProvince(StateProvince stateProvince) { diff --git a/src/Libraries/SmartStore.Services/Directory/UpdateExchangeRateTask.cs b/src/Libraries/SmartStore.Services/Directory/UpdateExchangeRateTask.cs index b96dce8613..6fc51c7256 100644 --- a/src/Libraries/SmartStore.Services/Directory/UpdateExchangeRateTask.cs +++ b/src/Libraries/SmartStore.Services/Directory/UpdateExchangeRateTask.cs @@ -11,16 +11,16 @@ public partial class UpdateExchangeRateTask : ITask { private readonly ICurrencyService _currencyService; private readonly CurrencySettings _currencySettings; - private readonly ICommonServices _services; + private readonly ICommonServices _services; public UpdateExchangeRateTask( - ICurrencyService currencyService, - CurrencySettings currencySettings, - ICommonServices services) + ICurrencyService currencyService, + CurrencySettings currencySettings, + ICommonServices services) { this._currencyService = currencyService; this._currencySettings = currencySettings; - this._services = services; + this._services = services; } /// @@ -45,17 +45,17 @@ public void Execute(TaskExecutionContext ctx) var currency = _currencyService.GetCurrencyByCode(exchageRate.CurrencyCode); if (currency != null) { - if (currency.Rate != exchageRate.Rate) - { - currency.Rate = exchageRate.Rate; - _currencyService.UpdateCurrency(currency); - } + if (currency.Rate != exchageRate.Rate) + { + currency.Rate = exchageRate.Rate; + _currencyService.UpdateCurrency(currency); + } } } // save new update time value _currencySettings.LastUpdateTime = DateTime.UtcNow.ToBinary(); - _services.Settings.SaveSetting(_currencySettings); + _services.Settings.SaveSetting(_currencySettings); } } } diff --git a/src/Libraries/SmartStore.Services/Discounts/DiscountExtentions.cs b/src/Libraries/SmartStore.Services/Discounts/DiscountExtentions.cs index df737a6d23..e6c7a85c9d 100644 --- a/src/Libraries/SmartStore.Services/Discounts/DiscountExtentions.cs +++ b/src/Libraries/SmartStore.Services/Discounts/DiscountExtentions.cs @@ -3,7 +3,7 @@ namespace SmartStore.Services.Discounts { - public static class DiscountExtentions + public static class DiscountExtentions { /// /// Gets the discount amount for the specified value @@ -13,29 +13,29 @@ public static class DiscountExtentions /// The discount amount public static decimal GetDiscountAmount(this Discount discount, decimal amount) { - Guard.NotNull(discount, nameof(discount)); + Guard.NotNull(discount, nameof(discount)); var result = decimal.Zero; - if (discount.UsePercentage) - { - result = (decimal)((((float)amount) * ((float)discount.DiscountPercentage)) / 100f); - } - else - { - result = discount.DiscountAmount; - } + if (discount.UsePercentage) + { + result = (decimal)((((float)amount) * ((float)discount.DiscountPercentage)) / 100f); + } + else + { + result = discount.DiscountAmount; + } return result; } - /// - /// Get the discount that achieves the highest discount amount other than zero. - /// - /// List of discounts - /// Amount without discount (for percentage discounts) - /// Discount that achieves the highest discount amount other than zero. - public static Discount GetPreferredDiscount(this ICollection discounts, decimal amount) + /// + /// Get the discount that achieves the highest discount amount other than zero. + /// + /// List of discounts + /// Amount without discount (for percentage discounts) + /// Discount that achieves the highest discount amount other than zero. + public static Discount GetPreferredDiscount(this ICollection discounts, decimal amount) { Discount preferredDiscount = null; decimal? maximumDiscountValue = null; @@ -43,14 +43,14 @@ public static Discount GetPreferredDiscount(this ICollection discounts foreach (var discount in discounts) { var currentDiscountValue = discount.GetDiscountAmount(amount); - if (currentDiscountValue != decimal.Zero) - { - if (!maximumDiscountValue.HasValue || currentDiscountValue > maximumDiscountValue) - { - maximumDiscountValue = currentDiscountValue; - preferredDiscount = discount; - } - } + if (currentDiscountValue != decimal.Zero) + { + if (!maximumDiscountValue.HasValue || currentDiscountValue > maximumDiscountValue) + { + maximumDiscountValue = currentDiscountValue; + preferredDiscount = discount; + } + } } return preferredDiscount; diff --git a/src/Libraries/SmartStore.Services/Discounts/DiscountService.cs b/src/Libraries/SmartStore.Services/Discounts/DiscountService.cs index 8e2ff2b59f..7a30a49f39 100644 --- a/src/Libraries/SmartStore.Services/Discounts/DiscountService.cs +++ b/src/Libraries/SmartStore.Services/Discounts/DiscountService.cs @@ -22,8 +22,8 @@ public partial class DiscountService : IDiscountService private readonly IRepository _discountRepository; private readonly IRepository _discountUsageHistoryRepository; private readonly IRequestCache _requestCache; - private readonly IStoreContext _storeContext; - private readonly IGenericAttributeService _genericAttributeService; + private readonly IStoreContext _storeContext; + private readonly IGenericAttributeService _genericAttributeService; private readonly ICartRuleProvider _cartRuleProvider; private readonly IDictionary _discountValidityCache; @@ -31,28 +31,28 @@ public DiscountService( IRequestCache requestCache, IRepository discountRepository, IRepository discountUsageHistoryRepository, - IStoreContext storeContext, - IGenericAttributeService genericAttributeService, + IStoreContext storeContext, + IGenericAttributeService genericAttributeService, ICartRuleProvider cartRuleProvider) { _requestCache = requestCache; _discountRepository = discountRepository; _discountUsageHistoryRepository = discountUsageHistoryRepository; - _storeContext = storeContext; - _genericAttributeService = genericAttributeService; + _storeContext = storeContext; + _genericAttributeService = genericAttributeService; _cartRuleProvider = cartRuleProvider; - _discountValidityCache = new Dictionary(); - } - - /// - /// Checks discount limitation for customer - /// - /// Discount - /// Customer - /// Value indicating whether discount can be used - protected virtual bool CheckDiscountLimitations(Discount discount, Customer customer) + _discountValidityCache = new Dictionary(); + } + + /// + /// Checks discount limitation for customer + /// + /// Discount + /// Customer + /// Value indicating whether discount can be used + protected virtual bool CheckDiscountLimitations(Discount discount, Customer customer) { - Guard.NotNull(discount, nameof(discount)); + Guard.NotNull(discount, nameof(discount)); switch (discount.DiscountLimitation) { @@ -87,9 +87,9 @@ protected virtual bool CheckDiscountLimitations(Discount discount, Customer cust public virtual void DeleteDiscount(Discount discount) { - Guard.NotNull(discount, nameof(discount)); + Guard.NotNull(discount, nameof(discount)); - _discountRepository.Delete(discount); + _discountRepository.Delete(discount); _requestCache.RemoveByPattern(DISCOUNTS_PATTERN_KEY); } @@ -135,15 +135,15 @@ public virtual IEnumerable GetAllDiscounts(DiscountType? discountType, var discounts = query.ToList(); - var map = new Multimap(); - discounts.Each(x => map.Add(x.DiscountTypeId, x)); + var map = new Multimap(); + discounts.Each(x => map.Add(x.DiscountTypeId, x)); - return map; + return map; }); if (discountTypeId > 0) { - return result[discountTypeId.Value]; + return result[discountTypeId.Value]; } return result.SelectMany(x => x.Value); @@ -151,7 +151,7 @@ public virtual IEnumerable GetAllDiscounts(DiscountType? discountType, public virtual void InsertDiscount(Discount discount) { - Guard.NotNull(discount, nameof(discount)); + Guard.NotNull(discount, nameof(discount)); _discountRepository.Insert(discount); @@ -160,7 +160,7 @@ public virtual void InsertDiscount(Discount discount) public virtual void UpdateDiscount(Discount discount) { - Guard.NotNull(discount, nameof(discount)); + Guard.NotNull(discount, nameof(discount)); _discountRepository.Update(discount); _requestCache.RemoveByPattern(DISCOUNTS_PATTERN_KEY); @@ -175,30 +175,30 @@ public virtual Discount GetDiscountByCouponCode(string couponCode, bool showHidd return discount; } - public virtual bool IsDiscountValid(Discount discount, Customer customer) + public virtual bool IsDiscountValid(Discount discount, Customer customer) { - var couponCodeToValidate = ""; + var couponCodeToValidate = ""; if (customer != null) - { - couponCodeToValidate = customer.GetAttribute(SystemCustomerAttributeNames.DiscountCouponCode, _genericAttributeService); - } + { + couponCodeToValidate = customer.GetAttribute(SystemCustomerAttributeNames.DiscountCouponCode, _genericAttributeService); + } var valid = IsDiscountValid(discount, customer, couponCodeToValidate); - return valid; + return valid; } public virtual bool IsDiscountValid(Discount discount, Customer customer, string couponCodeToValidate) { - Guard.NotNull(discount, nameof(discount)); + Guard.NotNull(discount, nameof(discount)); - var cacheKey = new DiscountKey(discount, customer, couponCodeToValidate); - if (_discountValidityCache.TryGetValue(cacheKey, out var result)) - { - return result; - } + var cacheKey = new DiscountKey(discount, customer, couponCodeToValidate); + if (_discountValidityCache.TryGetValue(cacheKey, out var result)) + { + return result; + } - // Check coupon code. - if (discount.RequiresCouponCode) + // Check coupon code. + if (discount.RequiresCouponCode) { if (discount.CouponCode.IsEmpty()) return Cached(false); @@ -227,13 +227,13 @@ public virtual bool IsDiscountValid(Discount discount, Customer customer, string if (!CheckDiscountLimitations(discount, customer)) return Cached(false); - // Better not to apply discounts if there are gift cards in the cart cause the customer could "earn" money through that. - if (discount.DiscountType == DiscountType.AssignedToOrderTotal || discount.DiscountType == DiscountType.AssignedToOrderSubTotal) - { - var cart = customer.GetCartItems(ShoppingCartType.ShoppingCart, _storeContext.CurrentStore.Id); - if (cart.Any(x => x.Item?.Product != null && x.Item.Product.IsGiftCard)) - return Cached(false); - } + // Better not to apply discounts if there are gift cards in the cart cause the customer could "earn" money through that. + if (discount.DiscountType == DiscountType.AssignedToOrderTotal || discount.DiscountType == DiscountType.AssignedToOrderSubTotal) + { + var cart = customer.GetCartItems(ShoppingCartType.ShoppingCart, _storeContext.CurrentStore.Id); + if (cart.Any(x => x.Item?.Product != null && x.Item.Product.IsGiftCard)) + return Cached(false); + } // Rule sets. if (!_cartRuleProvider.RuleMatches(discount)) @@ -243,11 +243,11 @@ public virtual bool IsDiscountValid(Discount discount, Customer customer, string return Cached(true); - bool Cached(bool value) - { - _discountValidityCache[cacheKey] = value; - return value; - } + bool Cached(bool value) + { + _discountValidityCache[cacheKey] = value; + return value; + } } public virtual DiscountUsageHistory GetDiscountUsageHistoryById(int discountUsageHistoryId) @@ -275,34 +275,34 @@ public virtual IPagedList GetAllDiscountUsageHistory(int? public virtual void InsertDiscountUsageHistory(DiscountUsageHistory discountUsageHistory) { - Guard.NotNull(discountUsageHistory, nameof(discountUsageHistory)); + Guard.NotNull(discountUsageHistory, nameof(discountUsageHistory)); - _discountUsageHistoryRepository.Insert(discountUsageHistory); + _discountUsageHistoryRepository.Insert(discountUsageHistory); _requestCache.RemoveByPattern(DISCOUNTS_PATTERN_KEY); } public virtual void UpdateDiscountUsageHistory(DiscountUsageHistory discountUsageHistory) { - Guard.NotNull(discountUsageHistory, nameof(discountUsageHistory)); + Guard.NotNull(discountUsageHistory, nameof(discountUsageHistory)); - _discountUsageHistoryRepository.Update(discountUsageHistory); + _discountUsageHistoryRepository.Update(discountUsageHistory); _requestCache.RemoveByPattern(DISCOUNTS_PATTERN_KEY); } public virtual void DeleteDiscountUsageHistory(DiscountUsageHistory discountUsageHistory) { - Guard.NotNull(discountUsageHistory, nameof(discountUsageHistory)); + Guard.NotNull(discountUsageHistory, nameof(discountUsageHistory)); - _discountUsageHistoryRepository.Delete(discountUsageHistory); + _discountUsageHistoryRepository.Delete(discountUsageHistory); _requestCache.RemoveByPattern(DISCOUNTS_PATTERN_KEY); } - class DiscountKey : Tuple - { - public DiscountKey(Discount discount, Customer customer, string customerCouponCode) - : base(discount, customer, customerCouponCode) - { - } - } + class DiscountKey : Tuple + { + public DiscountKey(Discount discount, Customer customer, string customerCouponCode) + : base(discount, customer, customerCouponCode) + { + } + } } } diff --git a/src/Libraries/SmartStore.Services/Discounts/IDiscountService.cs b/src/Libraries/SmartStore.Services/Discounts/IDiscountService.cs index 1e5111c762..159328a87e 100644 --- a/src/Libraries/SmartStore.Services/Discounts/IDiscountService.cs +++ b/src/Libraries/SmartStore.Services/Discounts/IDiscountService.cs @@ -23,13 +23,13 @@ public partial interface IDiscountService /// Discount Discount GetDiscountById(int discountId); - /// - /// Gets all discounts - /// - /// Discount type; null to load all discount - /// A value indicating whether to show hidden records - /// Discount collection - IEnumerable GetAllDiscounts(DiscountType? discountType, string couponCode = "", bool showHidden = false); + /// + /// Gets all discounts + /// + /// Discount type; null to load all discount + /// A value indicating whether to show hidden records + /// Discount collection + IEnumerable GetAllDiscounts(DiscountType? discountType, string couponCode = "", bool showHidden = false); /// /// Inserts a discount @@ -74,7 +74,7 @@ public partial interface IDiscountService /// Discount usage history record identifier /// Discount usage history DiscountUsageHistory GetDiscountUsageHistoryById(int discountUsageHistoryId); - + /// /// Gets all discount usage history records /// @@ -83,7 +83,7 @@ public partial interface IDiscountService /// Page index /// Page size /// Discount usage history records - IPagedList GetAllDiscountUsageHistory(int? discountId, + IPagedList GetAllDiscountUsageHistory(int? discountId, int? customerId, int pageIndex, int pageSize); /// @@ -91,7 +91,7 @@ IPagedList GetAllDiscountUsageHistory(int? discountId, /// /// Discount usage history record void InsertDiscountUsageHistory(DiscountUsageHistory discountUsageHistory); - + /// /// Update discount usage history record /// diff --git a/src/Libraries/SmartStore.Services/Events/ConsumerRegistry.cs b/src/Libraries/SmartStore.Services/Events/ConsumerRegistry.cs index 70d26c52e2..7c03c1b4e1 100644 --- a/src/Libraries/SmartStore.Services/Events/ConsumerRegistry.cs +++ b/src/Libraries/SmartStore.Services/Events/ConsumerRegistry.cs @@ -8,118 +8,118 @@ namespace SmartStore.Services.Events { - public class ConsumerRegistry : IConsumerRegistry - { - private readonly Multimap _descriptorMap = new Multimap(); - - public ConsumerRegistry(IEnumerable> consumers) - { - foreach (var consumer in consumers) - { - var metadata = consumer.Metadata; - - if (!metadata.IsActive) - continue; - - var methods = FindMethods(metadata); - var messageTypes = new Dictionary(); - - foreach (var method in methods) - { - var descriptor = new ConsumerDescriptor(metadata) - { - IsAsync = method.ReturnType == typeof(Task), - FireForget = method.HasAttribute(false) - }; - - //if (descriptor.IsAsync && descriptor.FireForget) - //{ - // throw new NotSupportedException($"An asynchronous message consumer method cannot be called as fire & forget. Method: '{method}'."); - //} - - if (method.ReturnType != typeof(Task) && method.ReturnType != typeof(void)) - { - throw new NotSupportedException($"A message consumer method's return type must either be 'void' or '${typeof(Task).FullName}'. Method: '{method}'."); - } - - if (method.Name.EndsWith("Async") && !descriptor.IsAsync) - { - throw new NotSupportedException($"A synchronous message consumer method name should not end with 'Async'. Method: '{method}'."); - } - - var parameters = method.GetParameters(); - if (parameters.Length == 0) - { - throw new NotSupportedException($"A message consumer method must have at least one parameter identifying the message to consume. Method: '{method}'."); - } - - if (parameters.Any(x => x.ParameterType.IsByRef || x.IsOut || x.IsOptional)) - { - throw new NotSupportedException($"'out', 'ref' and optional parameters are not allowed in consumer methods. Method: '{method}'."); - } - - var p = parameters[0]; - var messageType = p.ParameterType; - - if (messageType.IsGenericType && messageType.GetGenericTypeDefinition() == typeof(ConsumeContext<>)) - { - messageType = messageType.GetGenericArguments()[0]; - descriptor.WithEnvelope = true; - } - - if (messageTypes.TryGetValue(messageType, out var method2)) - { - // We won't allow methods with different signatures, but same message type: there can only be one! - throw new AmbigousConsumerException(method2, method); - } - - messageTypes.Add(messageType, method); - - if (messageType.IsPublic && (messageType.IsClass || messageType.IsInterface)) - { - // The method signature is valid: add to dictionary. - descriptor.MessageParameter = p; - descriptor.Parameters = parameters.Skip(1).ToArray(); - descriptor.MessageType = messageType; - descriptor.Method = method; - - _descriptorMap.Add(messageType, descriptor); - } - else - { - // TODO: message - throw new NotSupportedException(); - } - } - } - } - - private IEnumerable FindMethods(EventConsumerMetadata metadata) - { - var methods = metadata.ContainerType.GetMethods(BindingFlags.Public | BindingFlags.Instance); - - var validNames = new HashSet(new[] { "Handle", "HandleEvent", "Consume", "HandleAsync", "HandleEventAsync", "ConsumeAsync" }); - - foreach (var method in methods) - { - if (validNames.Contains(method.Name)) - { - yield return method; - } - } - } - - public virtual IEnumerable GetConsumers(object message) - { - Guard.NotNull(message, nameof(message)); - - var type = message.GetType(); - if (_descriptorMap.ContainsKey(type)) - { - return _descriptorMap[type]; - } - - return Enumerable.Empty(); - } - } + public class ConsumerRegistry : IConsumerRegistry + { + private readonly Multimap _descriptorMap = new Multimap(); + + public ConsumerRegistry(IEnumerable> consumers) + { + foreach (var consumer in consumers) + { + var metadata = consumer.Metadata; + + if (!metadata.IsActive) + continue; + + var methods = FindMethods(metadata); + var messageTypes = new Dictionary(); + + foreach (var method in methods) + { + var descriptor = new ConsumerDescriptor(metadata) + { + IsAsync = method.ReturnType == typeof(Task), + FireForget = method.HasAttribute(false) + }; + + //if (descriptor.IsAsync && descriptor.FireForget) + //{ + // throw new NotSupportedException($"An asynchronous message consumer method cannot be called as fire & forget. Method: '{method}'."); + //} + + if (method.ReturnType != typeof(Task) && method.ReturnType != typeof(void)) + { + throw new NotSupportedException($"A message consumer method's return type must either be 'void' or '${typeof(Task).FullName}'. Method: '{method}'."); + } + + if (method.Name.EndsWith("Async") && !descriptor.IsAsync) + { + throw new NotSupportedException($"A synchronous message consumer method name should not end with 'Async'. Method: '{method}'."); + } + + var parameters = method.GetParameters(); + if (parameters.Length == 0) + { + throw new NotSupportedException($"A message consumer method must have at least one parameter identifying the message to consume. Method: '{method}'."); + } + + if (parameters.Any(x => x.ParameterType.IsByRef || x.IsOut || x.IsOptional)) + { + throw new NotSupportedException($"'out', 'ref' and optional parameters are not allowed in consumer methods. Method: '{method}'."); + } + + var p = parameters[0]; + var messageType = p.ParameterType; + + if (messageType.IsGenericType && messageType.GetGenericTypeDefinition() == typeof(ConsumeContext<>)) + { + messageType = messageType.GetGenericArguments()[0]; + descriptor.WithEnvelope = true; + } + + if (messageTypes.TryGetValue(messageType, out var method2)) + { + // We won't allow methods with different signatures, but same message type: there can only be one! + throw new AmbigousConsumerException(method2, method); + } + + messageTypes.Add(messageType, method); + + if (messageType.IsPublic && (messageType.IsClass || messageType.IsInterface)) + { + // The method signature is valid: add to dictionary. + descriptor.MessageParameter = p; + descriptor.Parameters = parameters.Skip(1).ToArray(); + descriptor.MessageType = messageType; + descriptor.Method = method; + + _descriptorMap.Add(messageType, descriptor); + } + else + { + // TODO: message + throw new NotSupportedException(); + } + } + } + } + + private IEnumerable FindMethods(EventConsumerMetadata metadata) + { + var methods = metadata.ContainerType.GetMethods(BindingFlags.Public | BindingFlags.Instance); + + var validNames = new HashSet(new[] { "Handle", "HandleEvent", "Consume", "HandleAsync", "HandleEventAsync", "ConsumeAsync" }); + + foreach (var method in methods) + { + if (validNames.Contains(method.Name)) + { + yield return method; + } + } + } + + public virtual IEnumerable GetConsumers(object message) + { + Guard.NotNull(message, nameof(message)); + + var type = message.GetType(); + if (_descriptorMap.ContainsKey(type)) + { + return _descriptorMap[type]; + } + + return Enumerable.Empty(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Events/ConsumerResolver.cs b/src/Libraries/SmartStore.Services/Events/ConsumerResolver.cs index 6bbe95148b..cecb542b00 100644 --- a/src/Libraries/SmartStore.Services/Events/ConsumerResolver.cs +++ b/src/Libraries/SmartStore.Services/Events/ConsumerResolver.cs @@ -12,59 +12,59 @@ namespace SmartStore.Services.Events { - public class ConsumerResolver : IConsumerResolver - { - private readonly Work _container; + public class ConsumerResolver : IConsumerResolver + { + private readonly Work _container; - public ConsumerResolver(Work container) - { - _container = container; - } + public ConsumerResolver(Work container) + { + _container = container; + } - public virtual IConsumer Resolve(ConsumerDescriptor descriptor) - { - if (descriptor.PluginDescriptor == null || IsActiveForStore(descriptor.PluginDescriptor)) - { - return _container.Value.ResolveKeyed(descriptor.ContainerType); - } + public virtual IConsumer Resolve(ConsumerDescriptor descriptor) + { + if (descriptor.PluginDescriptor == null || IsActiveForStore(descriptor.PluginDescriptor)) + { + return _container.Value.ResolveKeyed(descriptor.ContainerType); + } - return null; - } + return null; + } - public virtual object ResolveParameter(ParameterInfo p, IComponentContext c = null) - { - return (c ?? _container.Value).Resolve(p.ParameterType); - } + public virtual object ResolveParameter(ParameterInfo p, IComponentContext c = null) + { + return (c ?? _container.Value).Resolve(p.ParameterType); + } - private bool IsActiveForStore(PluginDescriptor plugin) - { - int storeId = 0; - if (EngineContext.Current.IsFullyInitialized) - { - storeId = _container.Value.Resolve().CurrentStore.Id; - } + private bool IsActiveForStore(PluginDescriptor plugin) + { + int storeId = 0; + if (EngineContext.Current.IsFullyInitialized) + { + storeId = _container.Value.Resolve().CurrentStore.Id; + } - if (storeId == 0) - { - return true; - } + if (storeId == 0) + { + return true; + } - var settingService = _container.Value.Resolve(); + var settingService = _container.Value.Resolve(); - var limitedToStoresSetting = settingService.GetSettingByKey(plugin.GetSettingKey("LimitedToStores")); - if (limitedToStoresSetting.IsEmpty()) - { - return true; - } + var limitedToStoresSetting = settingService.GetSettingByKey(plugin.GetSettingKey("LimitedToStores")); + if (limitedToStoresSetting.IsEmpty()) + { + return true; + } - var limitedToStores = limitedToStoresSetting.ToIntArray(); - if (limitedToStores.Length > 0) - { - var flag = limitedToStores.Contains(storeId); - return flag; - } + var limitedToStores = limitedToStoresSetting.ToIntArray(); + if (limitedToStores.Length > 0) + { + var flag = limitedToStores.Contains(storeId); + return flag; + } - return true; - } - } + return true; + } + } } diff --git a/src/Libraries/SmartStore.Services/Events/DefaultMessageBus.cs b/src/Libraries/SmartStore.Services/Events/DefaultMessageBus.cs index f4c72f778b..564d7ddef1 100644 --- a/src/Libraries/SmartStore.Services/Events/DefaultMessageBus.cs +++ b/src/Libraries/SmartStore.Services/Events/DefaultMessageBus.cs @@ -7,29 +7,29 @@ namespace SmartStore.Services.Events { - public class DefaultMessageBus : IMessageBus - { - private readonly IMessageBroker _messageBroker; + public class DefaultMessageBus : IMessageBus + { + private readonly IMessageBroker _messageBroker; - public DefaultMessageBus(IEnumerable messageBrokers) - { - _messageBroker = messageBrokers.FirstOrDefault(); - } + public DefaultMessageBus(IEnumerable messageBrokers) + { + _messageBroker = messageBrokers.FirstOrDefault(); + } - public void Subscribe(string channel, Action handler) - { - if (_messageBroker == null) - return; + public void Subscribe(string channel, Action handler) + { + if (_messageBroker == null) + return; - _messageBroker.Subscribe(channel, handler); - } + _messageBroker.Subscribe(channel, handler); + } - public void Publish(string channel, string message) - { - if (_messageBroker == null) - return; + public void Publish(string channel, string message) + { + if (_messageBroker == null) + return; - _messageBroker.Publish(channel, message); - } - } + _messageBroker.Publish(channel, message); + } + } } diff --git a/src/Libraries/SmartStore.Services/Events/EventPublisher.cs b/src/Libraries/SmartStore.Services/Events/EventPublisher.cs index e6529d9469..e949e6b94b 100644 --- a/src/Libraries/SmartStore.Services/Events/EventPublisher.cs +++ b/src/Libraries/SmartStore.Services/Events/EventPublisher.cs @@ -9,43 +9,43 @@ namespace SmartStore.Services.Events { - public class EventPublisher : IEventPublisher - { - private readonly IConsumerRegistry _registry; - private readonly IConsumerResolver _resolver; - private readonly IConsumerInvoker _invoker; - - public EventPublisher(IConsumerRegistry registry, IConsumerResolver resolver, IConsumerInvoker invoker) - { - _registry = registry; - _resolver = resolver; - _invoker = invoker; - - Logger = NullLogger.Instance; - } - - public ILogger Logger { get; set; } - - public void Publish(T message) where T : class - { - var descriptors = _registry.GetConsumers(message); - - if (!descriptors.Any()) - { - return; - } - - var envelopeType = typeof(ConsumeContext<>).MakeGenericType(typeof(T)); - var envelope = (ConsumeContext)FastActivator.CreateInstance(envelopeType, message); - - foreach (var descriptor in descriptors) - { - var consumer = _resolver.Resolve(descriptor); - if (consumer != null) - { - _invoker.Invoke(descriptor, consumer, envelope); - } - } - } - } + public class EventPublisher : IEventPublisher + { + private readonly IConsumerRegistry _registry; + private readonly IConsumerResolver _resolver; + private readonly IConsumerInvoker _invoker; + + public EventPublisher(IConsumerRegistry registry, IConsumerResolver resolver, IConsumerInvoker invoker) + { + _registry = registry; + _resolver = resolver; + _invoker = invoker; + + Logger = NullLogger.Instance; + } + + public ILogger Logger { get; set; } + + public void Publish(T message) where T : class + { + var descriptors = _registry.GetConsumers(message); + + if (!descriptors.Any()) + { + return; + } + + var envelopeType = typeof(ConsumeContext<>).MakeGenericType(typeof(T)); + var envelope = (ConsumeContext)FastActivator.CreateInstance(envelopeType, message); + + foreach (var descriptor in descriptors) + { + var consumer = _resolver.Resolve(descriptor); + if (consumer != null) + { + _invoker.Invoke(descriptor, consumer, envelope); + } + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Events/IMessageBroker.cs b/src/Libraries/SmartStore.Services/Events/IMessageBroker.cs index ce54a1965b..dcaf55717f 100644 --- a/src/Libraries/SmartStore.Services/Events/IMessageBroker.cs +++ b/src/Libraries/SmartStore.Services/Events/IMessageBroker.cs @@ -2,9 +2,9 @@ namespace SmartStore.Services.Events { - public interface IMessageBroker - { - void Subscribe(string channel, Action handler); - void Publish(string channel, string message); - } + public interface IMessageBroker + { + void Subscribe(string channel, Action handler); + void Publish(string channel, string message); + } } diff --git a/src/Libraries/SmartStore.Services/Events/IMessageBus.cs b/src/Libraries/SmartStore.Services/Events/IMessageBus.cs index d7245ba7e2..f2d764e4d6 100644 --- a/src/Libraries/SmartStore.Services/Events/IMessageBus.cs +++ b/src/Libraries/SmartStore.Services/Events/IMessageBus.cs @@ -2,9 +2,9 @@ namespace SmartStore.Services.Events { - public interface IMessageBus - { - void Subscribe(string channel, Action handler); - void Publish(string channel, string message); - } + public interface IMessageBus + { + void Subscribe(string channel, Action handler); + void Publish(string channel, string message); + } } diff --git a/src/Libraries/SmartStore.Services/Forums/ForumExtensions.cs b/src/Libraries/SmartStore.Services/Forums/ForumExtensions.cs index 54a67d93b6..1b4de19af4 100644 --- a/src/Libraries/SmartStore.Services/Forums/ForumExtensions.cs +++ b/src/Libraries/SmartStore.Services/Forums/ForumExtensions.cs @@ -23,12 +23,12 @@ public static string FormatPostText(this ForumPost post) return string.Empty; } - text = HtmlUtils.ConvertPlainTextToHtml(text.HtmlEncode()); + text = HtmlUtils.ConvertPlainTextToHtml(text.HtmlEncode()); - if (EngineContext.Current.Resolve().ForumEditor == EditorType.BBCodeEditor) - { - text = BBCodeHelper.ToHtml(text); - } + if (EngineContext.Current.Resolve().ForumEditor == EditorType.BBCodeEditor) + { + text = BBCodeHelper.ToHtml(text); + } return text; } @@ -74,8 +74,8 @@ public static string FormatForumSignatureText(this string text) return string.Empty; } - return HtmlUtils.ConvertPlainTextToHtml(text.HtmlEncode()); - } + return HtmlUtils.ConvertPlainTextToHtml(text.HtmlEncode()); + } /// /// Formats the private message text @@ -92,10 +92,10 @@ public static string FormatPrivateMessageText(this PrivateMessage message) return string.Empty; } - text = HtmlUtils.ConvertPlainTextToHtml(text.HtmlEncode()); + text = HtmlUtils.ConvertPlainTextToHtml(text.HtmlEncode()); return BBCodeHelper.ToHtml(text); } - + /// /// Get forum last topic /// diff --git a/src/Libraries/SmartStore.Services/Forums/ForumMessageFactoryExtensions.cs b/src/Libraries/SmartStore.Services/Forums/ForumMessageFactoryExtensions.cs index 0e8a1140be..ea779210d8 100644 --- a/src/Libraries/SmartStore.Services/Forums/ForumMessageFactoryExtensions.cs +++ b/src/Libraries/SmartStore.Services/Forums/ForumMessageFactoryExtensions.cs @@ -6,45 +6,45 @@ namespace SmartStore.Services.Forums { - public static class ForumMessageFactoryExtensions - { - /// - /// Sends a forum subscription message to a customer - /// - public static CreateMessageResult SendNewForumTopicMessage(this IMessageFactory factory, Customer customer, ForumTopic forumTopic, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - Guard.NotNull(forumTopic, nameof(forumTopic)); + public static class ForumMessageFactoryExtensions + { + /// + /// Sends a forum subscription message to a customer + /// + public static CreateMessageResult SendNewForumTopicMessage(this IMessageFactory factory, Customer customer, ForumTopic forumTopic, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(forumTopic, nameof(forumTopic)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewForumTopic, languageId, customer: customer), true, forumTopic, forumTopic.Forum); - } + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewForumTopic, languageId, customer: customer), true, forumTopic, forumTopic.Forum); + } - /// - /// Sends a forum subscription message to a customer - /// - /// Friendly forum topic page to use for URL generation (1-based) - public static CreateMessageResult SendNewForumPostMessage(this IMessageFactory factory, Customer customer, ForumPost forumPost, int topicPageIndex, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - Guard.NotNull(forumPost, nameof(forumPost)); + /// + /// Sends a forum subscription message to a customer + /// + /// Friendly forum topic page to use for URL generation (1-based) + public static CreateMessageResult SendNewForumPostMessage(this IMessageFactory factory, Customer customer, ForumPost forumPost, int topicPageIndex, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(forumPost, nameof(forumPost)); - var bag = new ModelPart - { - ["TopicPageIndex"] = topicPageIndex - }; + var bag = new ModelPart + { + ["TopicPageIndex"] = topicPageIndex + }; - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewForumPost, languageId, customer: customer), true, bag, forumPost, forumPost.ForumTopic, forumPost.ForumTopic.Forum); - } + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewForumPost, languageId, customer: customer), true, bag, forumPost, forumPost.ForumTopic, forumPost.ForumTopic.Forum); + } - /// - /// Sends a private message notification - /// - public static CreateMessageResult SendPrivateMessageNotification(this IMessageFactory factory, Customer customer, PrivateMessage privateMessage, int languageId = 0) - { - Guard.NotNull(customer, nameof(customer)); - Guard.NotNull(privateMessage, nameof(privateMessage)); + /// + /// Sends a private message notification + /// + public static CreateMessageResult SendPrivateMessageNotification(this IMessageFactory factory, Customer customer, PrivateMessage privateMessage, int languageId = 0) + { + Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(privateMessage, nameof(privateMessage)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewPrivateMessage, languageId, privateMessage.StoreId, customer), true, privateMessage); - } - } + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewPrivateMessage, languageId, privateMessage.StoreId, customer), true, privateMessage); + } + } } diff --git a/src/Libraries/SmartStore.Services/Forums/ForumService.cs b/src/Libraries/SmartStore.Services/Forums/ForumService.cs index 76c9da28a0..6430f209ce 100644 --- a/src/Libraries/SmartStore.Services/Forums/ForumService.cs +++ b/src/Libraries/SmartStore.Services/Forums/ForumService.cs @@ -273,12 +273,12 @@ public virtual void DeleteForum(Forum forum) } // Delete forum subscriptions (topics). - var queryTopicIds = + var queryTopicIds = from ft in _forumTopicRepository.Table where ft.ForumId == forum.Id select ft.Id; - var queryFs1 = + var queryFs1 = from fs in _forumSubscriptionRepository.Table where queryTopicIds.Contains(fs.TopicId) select fs; @@ -289,7 +289,7 @@ where queryTopicIds.Contains(fs.TopicId) } // Delete forum subscriptions (forum). - var queryFs2 = + var queryFs2 = from fs in _forumSubscriptionRepository.Table where fs.ForumId == forum.Id select fs; @@ -715,17 +715,17 @@ public virtual PrivateMessage GetPrivateMessageById(int messageId) return privateMessage; } - public virtual IPagedList GetAllPrivateMessages( - int storeId, - int fromCustomerId, - int toCustomerId, - bool? isRead, - bool? isDeletedByAuthor, - bool? isDeletedByRecipient, - int pageIndex, - int pageSize) + public virtual IPagedList GetAllPrivateMessages( + int storeId, + int fromCustomerId, + int toCustomerId, + bool? isRead, + bool? isDeletedByAuthor, + bool? isDeletedByRecipient, + int pageIndex, + int pageSize) { - var query = _forumPrivateMessageRepository.Table; + var query = _forumPrivateMessageRepository.Table; if (storeId > 0) { @@ -752,9 +752,9 @@ public virtual IPagedList GetAllPrivateMessages( query = query.Where(pm => isDeletedByRecipient.Value == pm.IsDeletedByRecipient); } - query = query.OrderByDescending(pm => pm.CreatedOnUtc); + query = query.OrderByDescending(pm => pm.CreatedOnUtc); - var privateMessages = new PagedList(query, pageIndex, pageSize); + var privateMessages = new PagedList(query, pageIndex, pageSize); return privateMessages; } @@ -770,11 +770,11 @@ public virtual void InsertPrivateMessage(PrivateMessage message) throw new SmartException("Recipient could not be loaded"); } - _genericAttributeService.SaveAttribute(customerTo, SystemCustomerAttributeNames.NotifiedAboutNewPrivateMessages, false, message.StoreId); + _genericAttributeService.SaveAttribute(customerTo, SystemCustomerAttributeNames.NotifiedAboutNewPrivateMessages, false, message.StoreId); if (_forumSettings.NotifyAboutPrivateMessages) { - _services.MessageFactory.SendPrivateMessageNotification(customerTo, message, _services.WorkContext.WorkingLanguage.Id); + _services.MessageFactory.SendPrivateMessageNotification(customerTo, message, _services.WorkContext.WorkingLanguage.Id); } } @@ -797,7 +797,7 @@ public virtual void DeletePrivateMessage(PrivateMessage message) if (message != null) { _forumPrivateMessageRepository.Delete(message); - } + } } #endregion @@ -817,21 +817,21 @@ public virtual ForumSubscription GetSubscriptionById(int subscriptionId) public virtual IPagedList GetAllSubscriptions(int customerId, int forumId, int topicId, int pageIndex, int pageSize) { - var fsQuery = - from fs in _forumSubscriptionRepository.Table - join c in _customerRepository.Table on fs.CustomerId equals c.Id - where - (customerId == 0 || fs.CustomerId == customerId) && - (forumId == 0 || fs.ForumId == forumId) && - (topicId == 0 || fs.TopicId == topicId) && - (c.Active && !c.Deleted) - select fs.SubscriptionGuid; - - var query = - from fs in _forumSubscriptionRepository.Table - where fsQuery.Contains(fs.SubscriptionGuid) - orderby fs.CreatedOnUtc descending, fs.SubscriptionGuid descending - select fs; + var fsQuery = + from fs in _forumSubscriptionRepository.Table + join c in _customerRepository.Table on fs.CustomerId equals c.Id + where + (customerId == 0 || fs.CustomerId == customerId) && + (forumId == 0 || fs.ForumId == forumId) && + (topicId == 0 || fs.TopicId == topicId) && + (c.Active && !c.Deleted) + select fs.SubscriptionGuid; + + var query = + from fs in _forumSubscriptionRepository.Table + where fsQuery.Contains(fs.SubscriptionGuid) + orderby fs.CreatedOnUtc descending, fs.SubscriptionGuid descending + select fs; var forumSubscriptions = new PagedList(query, pageIndex, pageSize); return forumSubscriptions; @@ -1019,7 +1019,7 @@ class ForumXmlSitemapResult : XmlSitemapProvider public ForumXmlSitemapResult( XmlSitemapBuildContext context, - IForumService forumService, + IForumService forumService, UrlHelper urlHelper, IUrlRecordService urlRecordService) { @@ -1085,7 +1085,7 @@ public override IEnumerable Enlist() // Enlist topics var pager = new FastPager(_topicsQuery.AsNoTracking(), _context.MaximumNodeCount); - while (pager.ReadNextPage(x => new { x.Id, x.UpdatedOnUtc, x.Subject }, x => x.Id, out var topics)) + while (pager.ReadNextPage(x => new { x.Id, x.UpdatedOnUtc, x.Subject }, x => x.Id, out var topics)) { if (_context.CancellationToken.IsCancellationRequested) { diff --git a/src/Libraries/SmartStore.Services/Helpers/DateTimeHelper.cs b/src/Libraries/SmartStore.Services/Helpers/DateTimeHelper.cs index 78f34b444d..37a1b86fd3 100644 --- a/src/Libraries/SmartStore.Services/Helpers/DateTimeHelper.cs +++ b/src/Libraries/SmartStore.Services/Helpers/DateTimeHelper.cs @@ -19,8 +19,8 @@ public partial class DateTimeHelper : IDateTimeHelper private TimeZoneInfo _cachedUserTimeZone; public DateTimeHelper( - IWorkContext workContext, - ISettingService settingService, + IWorkContext workContext, + ISettingService settingService, DateTimeSettings dateTimeSettings, ICustomerService customerService) { @@ -52,7 +52,7 @@ public virtual DateTime ConvertToUserTime(DateTime dt) public virtual DateTime ConvertToUserTime(DateTime dt, DateTimeKind sourceDateTimeKind) { return TimeZoneInfo.ConvertTime( - DateTime.SpecifyKind(dt, sourceDateTimeKind), + DateTime.SpecifyKind(dt, sourceDateTimeKind), this.CurrentTimeZone); } @@ -95,21 +95,21 @@ public virtual DateTime ConvertToUtcTime(DateTime dt, TimeZoneInfo sourceTimeZon public virtual TimeZoneInfo GetCustomerTimeZone(Customer customer) { - if (_cachedUserTimeZone != null) - return _cachedUserTimeZone; + if (_cachedUserTimeZone != null) + return _cachedUserTimeZone; - // registered user - TimeZoneInfo timeZone = null; + // registered user + TimeZoneInfo timeZone = null; if (_dateTimeSettings.AllowCustomersToSetTimeZone) { string timeZoneId = string.Empty; if (customer != null) - timeZoneId = customer.TimeZoneId; + timeZoneId = customer.TimeZoneId; try { - if (timeZoneId.HasValue()) - timeZone = FindTimeZoneById(timeZoneId); + if (timeZoneId.HasValue()) + timeZone = FindTimeZoneById(timeZoneId); } catch (Exception ex) { @@ -121,9 +121,9 @@ public virtual TimeZoneInfo GetCustomerTimeZone(Customer customer) if (timeZone == null) timeZone = this.DefaultStoreTimeZone; - _cachedUserTimeZone = timeZone; + _cachedUserTimeZone = timeZone; - return timeZone; + return timeZone; } public virtual TimeZoneInfo DefaultStoreTimeZone @@ -134,7 +134,7 @@ public virtual TimeZoneInfo DefaultStoreTimeZone try { if (_dateTimeSettings.DefaultStoreTimeZoneId.HasValue()) - timeZoneInfo = FindTimeZoneById(_dateTimeSettings.DefaultStoreTimeZoneId); + timeZoneInfo = FindTimeZoneById(_dateTimeSettings.DefaultStoreTimeZoneId); } catch (Exception ex) { @@ -156,17 +156,14 @@ public virtual TimeZoneInfo DefaultStoreTimeZone _dateTimeSettings.DefaultStoreTimeZoneId = defaultTimeZoneId; _settingService.SaveSetting(_dateTimeSettings); - _cachedUserTimeZone = null; + _cachedUserTimeZone = null; - } + } } public virtual TimeZoneInfo CurrentTimeZone { - get - { - return GetCustomerTimeZone(_workContext.CurrentCustomer); - } + get => GetCustomerTimeZone(_workContext.CurrentCustomer); set { if (!_dateTimeSettings.AllowCustomersToSetTimeZone) @@ -181,8 +178,8 @@ public virtual TimeZoneInfo CurrentTimeZone _workContext.CurrentCustomer.TimeZoneId = timeZoneId; _customerService.UpdateCustomer(_workContext.CurrentCustomer); - _cachedUserTimeZone = null; - } + _cachedUserTimeZone = null; + } } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Hooks/AclEntityHook.cs b/src/Libraries/SmartStore.Services/Hooks/AclEntityHook.cs index 9f760b8536..9ebb286f0b 100644 --- a/src/Libraries/SmartStore.Services/Hooks/AclEntityHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/AclEntityHook.cs @@ -8,36 +8,36 @@ namespace SmartStore.Services.Common { - public class AclEntityHook : DbSaveHook - { - private readonly Lazy _aclService; - private readonly HashSet _toDelete = new HashSet(); + public class AclEntityHook : DbSaveHook + { + private readonly Lazy _aclService; + private readonly HashSet _toDelete = new HashSet(); - public AclEntityHook(Lazy aclService) - { - _aclService = aclService; - } + public AclEntityHook(Lazy aclService) + { + _aclService = aclService; + } - protected override void OnDeleted(IAclSupported entity, IHookedEntity entry) - { - var entityType = entry.EntityType; + protected override void OnDeleted(IAclSupported entity, IHookedEntity entry) + { + var entityType = entry.EntityType; - var records = _aclService.Value.GetAclRecordsFor(entityType.Name, entry.Entity.Id); - _toDelete.AddRange(records); - } + var records = _aclService.Value.GetAclRecordsFor(entityType.Name, entry.Entity.Id); + _toDelete.AddRange(records); + } - public override void OnAfterSaveCompleted() - { - if (_toDelete.Count == 0) - return; + public override void OnAfterSaveCompleted() + { + if (_toDelete.Count == 0) + return; - using (var scope = new DbContextScope(autoCommit: false)) - { - _toDelete.Each(x => _aclService.Value.DeleteAclRecord(x)); - scope.Commit(); - } + using (var scope = new DbContextScope(autoCommit: false)) + { + _toDelete.Each(x => _aclService.Value.DeleteAclRecord(x)); + scope.Commit(); + } - _toDelete.Clear(); - } - } + _toDelete.Clear(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/AuditableHook.cs b/src/Libraries/SmartStore.Services/Hooks/AuditableHook.cs index cee9a54f4f..8d5a068e62 100644 --- a/src/Libraries/SmartStore.Services/Hooks/AuditableHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/AuditableHook.cs @@ -5,23 +5,23 @@ namespace SmartStore.Services.Hooks { - [Important] - public class AuditableHook : DbSaveHook - { - protected override void OnInserting(IAuditable entity, IHookedEntity entry) - { - var now = DateTime.UtcNow; + [Important] + public class AuditableHook : DbSaveHook + { + protected override void OnInserting(IAuditable entity, IHookedEntity entry) + { + var now = DateTime.UtcNow; - if (entity.CreatedOnUtc == DateTime.MinValue) - entity.CreatedOnUtc = now; + if (entity.CreatedOnUtc == DateTime.MinValue) + entity.CreatedOnUtc = now; - if (entity.UpdatedOnUtc == DateTime.MinValue) - entity.UpdatedOnUtc = now; - } + if (entity.UpdatedOnUtc == DateTime.MinValue) + entity.UpdatedOnUtc = now; + } - protected override void OnUpdating(IAuditable entity, IHookedEntity entry) - { - entity.UpdatedOnUtc = DateTime.UtcNow; - } - } + protected override void OnUpdating(IAuditable entity, IHookedEntity entry) + { + entity.UpdatedOnUtc = DateTime.UtcNow; + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/FixProductMainPictureHook.cs b/src/Libraries/SmartStore.Services/Hooks/FixProductMainPictureHook.cs index e5ecbf91b9..8651c5e009 100644 --- a/src/Libraries/SmartStore.Services/Hooks/FixProductMainPictureHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/FixProductMainPictureHook.cs @@ -7,48 +7,48 @@ namespace SmartStore.Services.Common { - public class FixProductMainPictureHook : DbSaveHook - { - private readonly IRepository _rsProduct; - private readonly HashSet _products = new HashSet(); - - public FixProductMainPictureHook(IRepository rsProduct) - { - _rsProduct = rsProduct; - } - - protected override void OnDeleting(ProductMediaFile entity, IHookedEntity entry) - { - Fix(entity); - } - - protected override void OnInserting(ProductMediaFile entity, IHookedEntity entry) - { - Fix(entity); - } - - protected override void OnUpdating(ProductMediaFile entity, IHookedEntity entry) - { - Fix(entity); - } - - private void Fix(ProductMediaFile entity) - { - var product = entity.Product ?? _rsProduct.GetById(entity.ProductId); - if (product != null) - { - _products.Add(product); - } - } - - public override void OnBeforeSaveCompleted() - { - foreach (var product in _products) - { - DataMigrator.FixProductMainPictureId(_rsProduct.Context, product); - } - - _products.Clear(); - } - } + public class FixProductMainPictureHook : DbSaveHook + { + private readonly IRepository _rsProduct; + private readonly HashSet _products = new HashSet(); + + public FixProductMainPictureHook(IRepository rsProduct) + { + _rsProduct = rsProduct; + } + + protected override void OnDeleting(ProductMediaFile entity, IHookedEntity entry) + { + Fix(entity); + } + + protected override void OnInserting(ProductMediaFile entity, IHookedEntity entry) + { + Fix(entity); + } + + protected override void OnUpdating(ProductMediaFile entity, IHookedEntity entry) + { + Fix(entity); + } + + private void Fix(ProductMediaFile entity) + { + var product = entity.Product ?? _rsProduct.GetById(entity.ProductId); + if (product != null) + { + _products.Add(product); + } + } + + public override void OnBeforeSaveCompleted() + { + foreach (var product in _products) + { + DataMigrator.FixProductMainPictureId(_rsProduct.Context, product); + } + + _products.Clear(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityHook.cs b/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityHook.cs index d63262c6d8..8622f4a66b 100644 --- a/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityHook.cs @@ -8,38 +8,38 @@ namespace SmartStore.Services.Hooks { - public class LocalizedEntityHook : DbSaveHook - { - private readonly Lazy _localizedEntityService; - private readonly HashSet _toDelete = new HashSet(); + public class LocalizedEntityHook : DbSaveHook + { + private readonly Lazy _localizedEntityService; + private readonly HashSet _toDelete = new HashSet(); - public LocalizedEntityHook(Lazy localizedEntityService) - { - _localizedEntityService = localizedEntityService; - } + public LocalizedEntityHook(Lazy localizedEntityService) + { + _localizedEntityService = localizedEntityService; + } - protected override void OnDeleted(ILocalizedEntity entity, IHookedEntity entry) - { - var entityType = entry.EntityType; - var localizedEntities = _localizedEntityService.Value.GetLocalizedProperties(entry.Entity.Id, entityType.Name); - _toDelete.AddRange(localizedEntities); - } + protected override void OnDeleted(ILocalizedEntity entity, IHookedEntity entry) + { + var entityType = entry.EntityType; + var localizedEntities = _localizedEntityService.Value.GetLocalizedProperties(entry.Entity.Id, entityType.Name); + _toDelete.AddRange(localizedEntities); + } - public override void OnAfterSaveCompleted() - { - if (_toDelete.Count == 0) - return; + public override void OnAfterSaveCompleted() + { + if (_toDelete.Count == 0) + return; - using (var scope = new DbContextScope(autoCommit: false)) - { - using (_localizedEntityService.Value.BeginScope()) - { - _toDelete.Each(x => _localizedEntityService.Value.DeleteLocalizedProperty(x)); - } + using (var scope = new DbContextScope(autoCommit: false)) + { + using (_localizedEntityService.Value.BeginScope()) + { + _toDelete.Each(x => _localizedEntityService.Value.DeleteLocalizedProperty(x)); + } - scope.Commit(); - _toDelete.Clear(); - } - } - } + scope.Commit(); + _toDelete.Clear(); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityRelationHook.cs b/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityRelationHook.cs index 6667f53bc4..b20ace7997 100644 --- a/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityRelationHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/LocalizedEntityRelationHook.cs @@ -11,85 +11,85 @@ namespace SmartStore.Services.Hooks { - /// - /// Deletes localized properties of entities that were deleted by referential integrity. - /// Otherwise these localized properties would remain in the database. - /// - public class LocalizedEntityRelationHook : DbSaveHook - { - private readonly Lazy> _productAttributeRepository; - private readonly Lazy _localizedEntityService; - private readonly Lazy _productAttributeService; - private readonly Lazy _specificationAttributeService; + /// + /// Deletes localized properties of entities that were deleted by referential integrity. + /// Otherwise these localized properties would remain in the database. + /// + public class LocalizedEntityRelationHook : DbSaveHook + { + private readonly Lazy> _productAttributeRepository; + private readonly Lazy _localizedEntityService; + private readonly Lazy _productAttributeService; + private readonly Lazy _specificationAttributeService; - private readonly HashSet _toDelete = new HashSet(); + private readonly HashSet _toDelete = new HashSet(); - private static readonly HashSet _candidateTypes = new HashSet(new Type[] - { - typeof(SpecificationAttribute), - typeof(ProductVariantAttribute), - typeof(ProductAttribute), - typeof(ProductAttributeOptionsSet) - }); + private static readonly HashSet _candidateTypes = new HashSet(new Type[] + { + typeof(SpecificationAttribute), + typeof(ProductVariantAttribute), + typeof(ProductAttribute), + typeof(ProductAttributeOptionsSet) + }); - public LocalizedEntityRelationHook( - Lazy> productAttributeRepository, - Lazy localizedEntityService, - Lazy productAttributeService, - Lazy specificationAttributeService) - { - _productAttributeRepository = productAttributeRepository; - _localizedEntityService = localizedEntityService; - _productAttributeService = productAttributeService; - _specificationAttributeService = specificationAttributeService; - } + public LocalizedEntityRelationHook( + Lazy> productAttributeRepository, + Lazy localizedEntityService, + Lazy productAttributeService, + Lazy specificationAttributeService) + { + _productAttributeRepository = productAttributeRepository; + _localizedEntityService = localizedEntityService; + _productAttributeService = productAttributeService; + _specificationAttributeService = specificationAttributeService; + } - protected override void OnDeleting(BaseEntity entity, IHookedEntity entry) - { - var type = entry.EntityType; + protected override void OnDeleting(BaseEntity entity, IHookedEntity entry) + { + var type = entry.EntityType; - if (!_candidateTypes.Contains(type)) - throw new NotSupportedException(); + if (!_candidateTypes.Contains(type)) + throw new NotSupportedException(); - if (type == typeof(SpecificationAttribute)) - { - var attribute = (SpecificationAttribute)entry.Entity; - var attributeOptions = attribute.SpecificationAttributeOptions.ToList(); - if (!attributeOptions.Any()) - attributeOptions = _specificationAttributeService.Value.GetSpecificationAttributeOptionsBySpecificationAttribute(attribute.Id).ToList(); + if (type == typeof(SpecificationAttribute)) + { + var attribute = (SpecificationAttribute)entry.Entity; + var attributeOptions = attribute.SpecificationAttributeOptions.ToList(); + if (!attributeOptions.Any()) + attributeOptions = _specificationAttributeService.Value.GetSpecificationAttributeOptionsBySpecificationAttribute(attribute.Id).ToList(); - attributeOptions.ForEach(x => _toDelete.AddRange(_localizedEntityService.Value.GetLocalizedProperties(x.Id, "SpecificationAttributeOption"))); - } - else if (type == typeof(ProductVariantAttribute)) - { - var attribute = (ProductVariantAttribute)entry.Entity; - var attributeOptions = attribute.ProductVariantAttributeValues.ToList(); - if (!attributeOptions.Any()) - attributeOptions = _productAttributeService.Value.GetProductVariantAttributeValues(attribute.Id).ToList(); + attributeOptions.ForEach(x => _toDelete.AddRange(_localizedEntityService.Value.GetLocalizedProperties(x.Id, "SpecificationAttributeOption"))); + } + else if (type == typeof(ProductVariantAttribute)) + { + var attribute = (ProductVariantAttribute)entry.Entity; + var attributeOptions = attribute.ProductVariantAttributeValues.ToList(); + if (!attributeOptions.Any()) + attributeOptions = _productAttributeService.Value.GetProductVariantAttributeValues(attribute.Id).ToList(); - attributeOptions.ForEach(x => _toDelete.AddRange(_localizedEntityService.Value.GetLocalizedProperties(x.Id, "ProductVariantAttributeValue"))); - } - else if (type == typeof(ProductAttribute)) - { - var optionIds = ( - from a in _productAttributeRepository.Value.TableUntracked - from os in a.ProductAttributeOptionsSets - from ao in os.ProductAttributeOptions - where a.Id == entry.Entity.Id - select ao.Id).ToList(); + attributeOptions.ForEach(x => _toDelete.AddRange(_localizedEntityService.Value.GetLocalizedProperties(x.Id, "ProductVariantAttributeValue"))); + } + else if (type == typeof(ProductAttribute)) + { + var optionIds = ( + from a in _productAttributeRepository.Value.TableUntracked + from os in a.ProductAttributeOptionsSets + from ao in os.ProductAttributeOptions + where a.Id == entry.Entity.Id + select ao.Id).ToList(); - optionIds.ForEach(x => _toDelete.AddRange(_localizedEntityService.Value.GetLocalizedProperties(x, "ProductAttributeOption"))); - } - else if (type == typeof(ProductAttributeOptionsSet)) - { - var set = (ProductAttributeOptionsSet)entry.Entity; - var attributeOptions = set.ProductAttributeOptions.ToList(); - if (!attributeOptions.Any()) - attributeOptions = _productAttributeService.Value.GetProductAttributeOptionsByOptionsSetId(set.Id).ToList(); + optionIds.ForEach(x => _toDelete.AddRange(_localizedEntityService.Value.GetLocalizedProperties(x, "ProductAttributeOption"))); + } + else if (type == typeof(ProductAttributeOptionsSet)) + { + var set = (ProductAttributeOptionsSet)entry.Entity; + var attributeOptions = set.ProductAttributeOptions.ToList(); + if (!attributeOptions.Any()) + attributeOptions = _productAttributeService.Value.GetProductAttributeOptionsByOptionsSetId(set.Id).ToList(); - attributeOptions.ForEach(x => _toDelete.AddRange(_localizedEntityService.Value.GetLocalizedProperties(x.Id, "ProductAttributeOption"))); - } - } + attributeOptions.ForEach(x => _toDelete.AddRange(_localizedEntityService.Value.GetLocalizedProperties(x.Id, "ProductAttributeOption"))); + } + } public override void OnAfterSave(IHookedEntity entry) { @@ -97,20 +97,20 @@ public override void OnAfterSave(IHookedEntity entry) } public override void OnAfterSaveCompleted() - { - if (_toDelete.Count == 0) - return; + { + if (_toDelete.Count == 0) + return; - using (var scope = new DbContextScope(autoCommit: false)) - { - using (_localizedEntityService.Value.BeginScope()) - { - _toDelete.Each(x => _localizedEntityService.Value.DeleteLocalizedProperty(x)); - } + using (var scope = new DbContextScope(autoCommit: false)) + { + using (_localizedEntityService.Value.BeginScope()) + { + _toDelete.Each(x => _localizedEntityService.Value.DeleteLocalizedProperty(x)); + } - scope.Commit(); - _toDelete.Clear(); - } - } - } + scope.Commit(); + _toDelete.Clear(); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/ProductVariantAttributeHook.cs b/src/Libraries/SmartStore.Services/Hooks/ProductVariantAttributeHook.cs index 3a31edcde0..95e22e27ed 100644 --- a/src/Libraries/SmartStore.Services/Hooks/ProductVariantAttributeHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/ProductVariantAttributeHook.cs @@ -7,33 +7,33 @@ namespace SmartStore.Services.Hooks { - public class ProductVariantAttributeHook : DbSaveHook - { - private readonly Lazy _productAttributeService; - private readonly HashSet _toDelete = new HashSet(); + public class ProductVariantAttributeHook : DbSaveHook + { + private readonly Lazy _productAttributeService; + private readonly HashSet _toDelete = new HashSet(); - public ProductVariantAttributeHook(Lazy productAttributeService) - { - _productAttributeService = productAttributeService; - } + public ProductVariantAttributeHook(Lazy productAttributeService) + { + _productAttributeService = productAttributeService; + } - protected override void OnDeleted(ProductVariantAttribute entity, IHookedEntity entry) - { - _toDelete.Add(entity.Id); - } + protected override void OnDeleted(ProductVariantAttribute entity, IHookedEntity entry) + { + _toDelete.Add(entity.Id); + } - public override void OnAfterSaveCompleted() - { - if (_toDelete.Count == 0) - return; + public override void OnAfterSaveCompleted() + { + if (_toDelete.Count == 0) + return; - using (var scope = new DbContextScope(autoCommit: false)) - { - _toDelete.Each(x => _productAttributeService.Value.DeleteProductBundleItemAttributeFilter(x)); - scope.Commit(); - } + using (var scope = new DbContextScope(autoCommit: false)) + { + _toDelete.Each(x => _productAttributeService.Value.DeleteProductBundleItemAttributeFilter(x)); + scope.Commit(); + } - _toDelete.Clear(); - } - } + _toDelete.Clear(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/ProductVariantAttributeValueHook.cs b/src/Libraries/SmartStore.Services/Hooks/ProductVariantAttributeValueHook.cs index a1d4d15db5..6d04b04640 100644 --- a/src/Libraries/SmartStore.Services/Hooks/ProductVariantAttributeValueHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/ProductVariantAttributeValueHook.cs @@ -7,33 +7,33 @@ namespace SmartStore.Services.Hooks { - public class ProductVariantAttributeValueHook : DbSaveHook - { - private readonly Lazy _productAttributeService; - private readonly HashSet _toDelete = new HashSet(); + public class ProductVariantAttributeValueHook : DbSaveHook + { + private readonly Lazy _productAttributeService; + private readonly HashSet _toDelete = new HashSet(); - public ProductVariantAttributeValueHook(Lazy productAttributeService) - { - _productAttributeService = productAttributeService; - } + public ProductVariantAttributeValueHook(Lazy productAttributeService) + { + _productAttributeService = productAttributeService; + } - protected override void OnDeleted(ProductVariantAttributeValue entity, IHookedEntity entry) - { - _toDelete.Add(entity); - } + protected override void OnDeleted(ProductVariantAttributeValue entity, IHookedEntity entry) + { + _toDelete.Add(entity); + } - public override void OnAfterSaveCompleted() - { - if (_toDelete.Count == 0) - return; + public override void OnAfterSaveCompleted() + { + if (_toDelete.Count == 0) + return; - using (var scope = new DbContextScope(autoCommit: false)) - { - _toDelete.Each(x => _productAttributeService.Value.DeleteProductBundleItemAttributeFilter(x.ProductVariantAttributeId, x.Id)); - scope.Commit(); - } + using (var scope = new DbContextScope(autoCommit: false)) + { + _toDelete.Each(x => _productAttributeService.Value.DeleteProductBundleItemAttributeFilter(x.ProductVariantAttributeId, x.Id)); + scope.Commit(); + } - _toDelete.Clear(); - } - } + _toDelete.Clear(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/SearchQueryAliasHook.cs b/src/Libraries/SmartStore.Services/Hooks/SearchQueryAliasHook.cs index 3efd100e04..143352aea0 100644 --- a/src/Libraries/SmartStore.Services/Hooks/SearchQueryAliasHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/SearchQueryAliasHook.cs @@ -15,421 +15,421 @@ namespace SmartStore.Services.Hooks { - public class SearchQueryAliasHook : DbSaveHook - { - private readonly IComponentContext _ctx; - private readonly Lazy _catalogSearchQueryAliasMapper; - private readonly Lazy> _localizedPropertyRepository; - - private string _errorMessage; - - private static readonly HashSet _candidateTypes = new HashSet(new Type[] - { - typeof(LocalizedProperty), - typeof(SpecificationAttribute), - typeof(SpecificationAttributeOption), - typeof(ProductSpecificationAttribute), - typeof(ProductAttribute), - typeof(ProductAttributeOption), - typeof(ProductVariantAttribute), - typeof(ProductVariantAttributeValue) - }); - - public SearchQueryAliasHook( - IComponentContext ctx, - Lazy catalogSearchQueryAliasMapper, - Lazy> localizedPropertyRepository) - { - _ctx = ctx; - _catalogSearchQueryAliasMapper = catalogSearchQueryAliasMapper; - _localizedPropertyRepository = localizedPropertyRepository; - - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - - #region Utilities - - private bool IsPropertyModified(IHookedEntity entry, string propertyName) - { - var result = false; - - if (entry.State != EntityState.Detached) - { - var prop = entry.Entry.Property(propertyName); - if (prop != null) - { - switch (entry.State) - { - case EntityState.Added: - // OriginalValues cannot be used for entities in the Added state. - result = prop.CurrentValue != null; - break; - case EntityState.Deleted: - // CurrentValues cannot be used for entities in the Deleted state. - result = prop.OriginalValue != null; - break; - default: - result = - (prop.CurrentValue != null && !prop.CurrentValue.Equals(prop.OriginalValue)) || - (prop.OriginalValue != null && !prop.OriginalValue.Equals(prop.CurrentValue)); - break; - } - } - } - - return result; - } - - private void RevertChanges(IHookedEntity entry, string errorMessage) - { - // throw exception in OnBeforeSaveCompleted - _errorMessage = errorMessage; - - // revert changes - if (entry.State == EntityState.Modified) - { - entry.State = EntityState.Unchanged; - } - else if (entry.State == EntityState.Added) - { - entry.State = EntityState.Detached; - } - } - - private bool HasAliasDuplicate( - IHookedEntity entry, - BaseEntity baseEntity, - Func, TEntity, bool> hasDuplicate = null) - where TEntity : BaseEntity - { - if (entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Modified) - { - var entity = baseEntity as ISearchAlias; - if (entity != null) - { - entity.Alias = SeoExtensions.GetSeName(entity.Alias); - if (entity.Alias.HasValue()) - { - var repository = _ctx.Resolve>(); - var allEntities = repository.TableUntracked as IQueryable; - - //if (allEntities != null && allEntities.Any(x => x.Id != entity.Id && x.Alias == entity.Alias)) - if (allEntities != null) - { - var duplicateExists = hasDuplicate == null - ? allEntities.Any(x => x.Id != entity.Id && x.Alias == entity.Alias) - : hasDuplicate(repository.TableUntracked, (TEntity)entity); - - if (duplicateExists) - { - RevertChanges(entry, string.Concat(T("Common.Error.AliasAlreadyExists", entity.Alias), " ", T("Common.Error.ChooseDifferentValue"))); - return true; - } - } - } - } - } - - return false; - } - - private bool HasAliasDuplicate(IHookedEntity entry, BaseEntity baseEntity) where T1 : BaseEntity where T2 : BaseEntity - { - if (entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Modified) - { - var entity = baseEntity as ISearchAlias; - if (entity != null) - { - entity.Alias = SeoExtensions.GetSeName(entity.Alias); - if (entity.Alias.HasValue()) - { - var entities1 = _ctx.Resolve>().TableUntracked as IQueryable; - var entities2 = _ctx.Resolve>().TableUntracked as IQueryable; - - var duplicate1 = entities1.FirstOrDefault(x => x.Alias == entity.Alias); - var duplicate2 = entities2.FirstOrDefault(x => x.Alias == entity.Alias); - - if (duplicate1 != null || duplicate2 != null) - { - var type = entry.EntityType; - - if (duplicate1 != null && duplicate1.Id == entity.Id && type == typeof(T1)) - return false; - if (duplicate2 != null && duplicate2.Id == entity.Id && type == typeof(T2)) - return false; - - RevertChanges(entry, string.Concat(T("Common.Error.AliasAlreadyExists", entity.Alias), " ", T("Common.Error.ChooseDifferentValue"))); - return true; - } - } - } - } - - return false; - } - - private bool HasAliasDuplicate(LocalizedProperty property) - { - var existingProperties = _localizedPropertyRepository.Value.Table.Where(x => - x.Id != property.Id && - x.LocaleKey == "Alias" && - x.LocaleKeyGroup == property.LocaleKeyGroup && - x.LanguageId == property.LanguageId && - x.LocaleValue == property.LocaleValue).ToList(); - - if (existingProperties.Count == 0) - { - // Check cases where alias has to be globally unique. - string otherKeyGroup = null; - - if (property.LocaleKeyGroup.IsCaseInsensitiveEqual("SpecificationAttribute")) - otherKeyGroup = "ProductAttribute"; - else if (property.LocaleKeyGroup.IsCaseInsensitiveEqual("ProductAttribute")) - otherKeyGroup = "SpecificationAttribute"; - - if (otherKeyGroup.HasValue()) - { - existingProperties = _localizedPropertyRepository.Value.Table.Where(x => - x.LocaleKey == "Alias" && - x.LocaleKeyGroup == otherKeyGroup && - x.LanguageId == property.LanguageId && - x.LocaleValue == property.LocaleValue).ToList(); - } - - if (existingProperties.Count == 0) - return false; - } - - var toDelete = new List(); - - foreach (var prop in existingProperties) - { - // Check if the related entity exists. The user would not be able to solve an invalidated alias when the related entity does not exist anymore. - var relatedEntityExists = true; - - if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("SpecificationAttribute")) - { - relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; - } - else if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("SpecificationAttributeOption")) - { - relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; - } - else if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("ProductAttribute")) - { - relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; - } - else if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("ProductAttributeOption")) - { - relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; - } - //else if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("ProductVariantAttributeValue")) - //{ - // relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; - //} - - if (relatedEntityExists) - { - // We cannot delete any localized property because we are going to throw duplicate alias exception in OnBeforeSaveCompleted. - return true; - } - else - { - // Delete accidentally dead localized properties. - toDelete.Add(prop); - } - } - - if (toDelete.Any()) - { - try - { - _localizedPropertyRepository.Value.DeleteRange(toDelete); - } - catch (Exception exception) - { - exception.Dump(); - } - } - - return false; - } - - private bool HasEntityDuplicate( - IHookedEntity entry, - BaseEntity baseEntity, - Func getName, - Expression> getDuplicate) where TEntity : BaseEntity - { - if (entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Modified) - { - var repository = _ctx.Resolve>(); - var allEntities = repository.TableUntracked as IQueryable; - - var existingEntity = allEntities.FirstOrDefault(getDuplicate); - if (existingEntity != null && existingEntity.Id != baseEntity.Id) - { - RevertChanges(entry, string.Concat(T("Common.Error.OptionAlreadyExists", getName(existingEntity).NaIfEmpty()), " ", T("Common.Error.ChooseDifferentValue"))); - return true; - } - } - - return false; - } - - #endregion - - protected override void OnDeleting(BaseEntity entity, IHookedEntity entry) - { - HookObject(entity, entry); - } - - protected override void OnInserting(BaseEntity entity, IHookedEntity entry) - { - HookObject(entity, entry); - } - - protected override void OnUpdating(BaseEntity entity, IHookedEntity entry) - { - HookObject(entity, entry); - } - - public override void OnBeforeSaveCompleted() - { - if (_errorMessage.HasValue()) - { - var message = string.Copy(_errorMessage); - _errorMessage = null; - - throw new SmartException(message); - } - } - - private void HookObject(BaseEntity baseEntity, IHookedEntity entry) - { - var type = entry.EntityType; - - if (!_candidateTypes.Contains(type)) - throw new NotSupportedException(); - - if (type == typeof(SpecificationAttribute)) - { - if (HasAliasDuplicate(entry, baseEntity)) - return; - - if (IsPropertyModified(entry, "Alias")) - _catalogSearchQueryAliasMapper.Value.ClearAttributeCache(); - } - else if (type == typeof(SpecificationAttributeOption)) - { - var entity = (SpecificationAttributeOption)baseEntity; - - if (HasEntityDuplicate(entry, baseEntity, x => x.Name, - x => x.SpecificationAttributeId == entity.SpecificationAttributeId && x.Name == entity.Name)) - return; - - if (HasAliasDuplicate(entry, baseEntity)) - return; - - if (IsPropertyModified(entry, "Alias")) - _catalogSearchQueryAliasMapper.Value.ClearAttributeCache(); - } - else if (type == typeof(ProductSpecificationAttribute)) - { - var entity = (ProductSpecificationAttribute)baseEntity; - - if (HasEntityDuplicate(entry, baseEntity, x => x.SpecificationAttributeOption?.Name, - x => x.ProductId == entity.ProductId && x.SpecificationAttributeOptionId == entity.SpecificationAttributeOptionId)) - return; - } - else if (type == typeof(ProductAttribute)) - { - if (HasAliasDuplicate(entry, baseEntity)) - return; - - if (IsPropertyModified(entry, "Alias")) - _catalogSearchQueryAliasMapper.Value.ClearVariantCache(); - } - else if (type == typeof(ProductAttributeOption)) - { - var entity = (ProductAttributeOption)baseEntity; - - if (HasEntityDuplicate(entry, baseEntity, x => x.Name, - x => x.ProductAttributeOptionsSetId == entity.ProductAttributeOptionsSetId && x.Name == entity.Name)) - return; - - // ClearVariantCache() not necessary - if (HasAliasDuplicate(entry, baseEntity)) - return; - } - else if (type == typeof(ProductVariantAttribute)) - { - var entity = (ProductVariantAttribute)baseEntity; - - if (HasEntityDuplicate(entry, baseEntity, x => x.ProductAttribute?.Name, - x => x.ProductId == entity.ProductId && x.ProductAttributeId == entity.ProductAttributeId)) - return; - } - else if (type == typeof(ProductVariantAttributeValue)) - { - var entity = (ProductVariantAttributeValue)baseEntity; - - if (HasEntityDuplicate(entry, baseEntity, x => x.Name, - x => x.ProductVariantAttributeId == entity.ProductVariantAttributeId && x.Name == entity.Name)) - return; - - if (HasAliasDuplicate(entry, baseEntity, - (all, e) => all.Any(x => x.Id != e.Id && x.ProductVariantAttributeId == e.ProductVariantAttributeId && x.Alias == e.Alias))) - return; - - if (IsPropertyModified(entry, "Alias")) - _catalogSearchQueryAliasMapper.Value.ClearVariantCache(); - } - else if (type == typeof(LocalizedProperty)) - { - // note: not fired when SpecificationAttribute or SpecificationAttributeOption deleted. - // not necessary anyway because cache cleared by above code. - var prop = (LocalizedProperty)baseEntity; - var keyGroup = prop.LocaleKeyGroup; - - if (!prop.LocaleKey.IsCaseInsensitiveEqual("Alias")) - return; - - // validating ProductVariantAttributeValue goes too far here. - if (!keyGroup.IsCaseInsensitiveEqual("SpecificationAttribute") && - !keyGroup.IsCaseInsensitiveEqual("SpecificationAttributeOption") && - !keyGroup.IsCaseInsensitiveEqual("ProductAttribute") && - !keyGroup.IsCaseInsensitiveEqual("ProductAttributeOption")) - { - return; - } - - // check alias duplicate - if (entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Modified) - { - prop.LocaleValue = SeoExtensions.GetSeName(prop.LocaleValue); - if (prop.LocaleValue.HasValue() && HasAliasDuplicate(prop)) - { - RevertChanges(entry, string.Concat(T("Common.Error.AliasAlreadyExists", prop.LocaleValue), " ", T("Common.Error.ChooseDifferentValue"))); - return; - } - } - - if (IsPropertyModified(entry, "LocaleValue")) - { - if (keyGroup.IsCaseInsensitiveEqual("SpecificationAttribute") || keyGroup.IsCaseInsensitiveEqual("SpecificationAttributeOption")) - { - _catalogSearchQueryAliasMapper.Value.ClearAttributeCache(); - } - else if (keyGroup.IsCaseInsensitiveEqual("ProductAttribute") || keyGroup.IsCaseInsensitiveEqual("ProductVariantAttributeValue")) - { - // not necessary for ProductAttributeOption - _catalogSearchQueryAliasMapper.Value.ClearVariantCache(); - } - } - } - } - } + public class SearchQueryAliasHook : DbSaveHook + { + private readonly IComponentContext _ctx; + private readonly Lazy _catalogSearchQueryAliasMapper; + private readonly Lazy> _localizedPropertyRepository; + + private string _errorMessage; + + private static readonly HashSet _candidateTypes = new HashSet(new Type[] + { + typeof(LocalizedProperty), + typeof(SpecificationAttribute), + typeof(SpecificationAttributeOption), + typeof(ProductSpecificationAttribute), + typeof(ProductAttribute), + typeof(ProductAttributeOption), + typeof(ProductVariantAttribute), + typeof(ProductVariantAttributeValue) + }); + + public SearchQueryAliasHook( + IComponentContext ctx, + Lazy catalogSearchQueryAliasMapper, + Lazy> localizedPropertyRepository) + { + _ctx = ctx; + _catalogSearchQueryAliasMapper = catalogSearchQueryAliasMapper; + _localizedPropertyRepository = localizedPropertyRepository; + + T = NullLocalizer.Instance; + } + + public Localizer T { get; set; } + + #region Utilities + + private bool IsPropertyModified(IHookedEntity entry, string propertyName) + { + var result = false; + + if (entry.State != EntityState.Detached) + { + var prop = entry.Entry.Property(propertyName); + if (prop != null) + { + switch (entry.State) + { + case EntityState.Added: + // OriginalValues cannot be used for entities in the Added state. + result = prop.CurrentValue != null; + break; + case EntityState.Deleted: + // CurrentValues cannot be used for entities in the Deleted state. + result = prop.OriginalValue != null; + break; + default: + result = + (prop.CurrentValue != null && !prop.CurrentValue.Equals(prop.OriginalValue)) || + (prop.OriginalValue != null && !prop.OriginalValue.Equals(prop.CurrentValue)); + break; + } + } + } + + return result; + } + + private void RevertChanges(IHookedEntity entry, string errorMessage) + { + // throw exception in OnBeforeSaveCompleted + _errorMessage = errorMessage; + + // revert changes + if (entry.State == EntityState.Modified) + { + entry.State = EntityState.Unchanged; + } + else if (entry.State == EntityState.Added) + { + entry.State = EntityState.Detached; + } + } + + private bool HasAliasDuplicate( + IHookedEntity entry, + BaseEntity baseEntity, + Func, TEntity, bool> hasDuplicate = null) + where TEntity : BaseEntity + { + if (entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Modified) + { + var entity = baseEntity as ISearchAlias; + if (entity != null) + { + entity.Alias = SeoExtensions.GetSeName(entity.Alias); + if (entity.Alias.HasValue()) + { + var repository = _ctx.Resolve>(); + var allEntities = repository.TableUntracked as IQueryable; + + //if (allEntities != null && allEntities.Any(x => x.Id != entity.Id && x.Alias == entity.Alias)) + if (allEntities != null) + { + var duplicateExists = hasDuplicate == null + ? allEntities.Any(x => x.Id != entity.Id && x.Alias == entity.Alias) + : hasDuplicate(repository.TableUntracked, (TEntity)entity); + + if (duplicateExists) + { + RevertChanges(entry, string.Concat(T("Common.Error.AliasAlreadyExists", entity.Alias), " ", T("Common.Error.ChooseDifferentValue"))); + return true; + } + } + } + } + } + + return false; + } + + private bool HasAliasDuplicate(IHookedEntity entry, BaseEntity baseEntity) where T1 : BaseEntity where T2 : BaseEntity + { + if (entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Modified) + { + var entity = baseEntity as ISearchAlias; + if (entity != null) + { + entity.Alias = SeoExtensions.GetSeName(entity.Alias); + if (entity.Alias.HasValue()) + { + var entities1 = _ctx.Resolve>().TableUntracked as IQueryable; + var entities2 = _ctx.Resolve>().TableUntracked as IQueryable; + + var duplicate1 = entities1.FirstOrDefault(x => x.Alias == entity.Alias); + var duplicate2 = entities2.FirstOrDefault(x => x.Alias == entity.Alias); + + if (duplicate1 != null || duplicate2 != null) + { + var type = entry.EntityType; + + if (duplicate1 != null && duplicate1.Id == entity.Id && type == typeof(T1)) + return false; + if (duplicate2 != null && duplicate2.Id == entity.Id && type == typeof(T2)) + return false; + + RevertChanges(entry, string.Concat(T("Common.Error.AliasAlreadyExists", entity.Alias), " ", T("Common.Error.ChooseDifferentValue"))); + return true; + } + } + } + } + + return false; + } + + private bool HasAliasDuplicate(LocalizedProperty property) + { + var existingProperties = _localizedPropertyRepository.Value.Table.Where(x => + x.Id != property.Id && + x.LocaleKey == "Alias" && + x.LocaleKeyGroup == property.LocaleKeyGroup && + x.LanguageId == property.LanguageId && + x.LocaleValue == property.LocaleValue).ToList(); + + if (existingProperties.Count == 0) + { + // Check cases where alias has to be globally unique. + string otherKeyGroup = null; + + if (property.LocaleKeyGroup.IsCaseInsensitiveEqual("SpecificationAttribute")) + otherKeyGroup = "ProductAttribute"; + else if (property.LocaleKeyGroup.IsCaseInsensitiveEqual("ProductAttribute")) + otherKeyGroup = "SpecificationAttribute"; + + if (otherKeyGroup.HasValue()) + { + existingProperties = _localizedPropertyRepository.Value.Table.Where(x => + x.LocaleKey == "Alias" && + x.LocaleKeyGroup == otherKeyGroup && + x.LanguageId == property.LanguageId && + x.LocaleValue == property.LocaleValue).ToList(); + } + + if (existingProperties.Count == 0) + return false; + } + + var toDelete = new List(); + + foreach (var prop in existingProperties) + { + // Check if the related entity exists. The user would not be able to solve an invalidated alias when the related entity does not exist anymore. + var relatedEntityExists = true; + + if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("SpecificationAttribute")) + { + relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; + } + else if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("SpecificationAttributeOption")) + { + relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; + } + else if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("ProductAttribute")) + { + relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; + } + else if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("ProductAttributeOption")) + { + relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; + } + //else if (prop.LocaleKeyGroup.IsCaseInsensitiveEqual("ProductVariantAttributeValue")) + //{ + // relatedEntityExists = _ctx.Resolve>().GetById(prop.EntityId) != null; + //} + + if (relatedEntityExists) + { + // We cannot delete any localized property because we are going to throw duplicate alias exception in OnBeforeSaveCompleted. + return true; + } + else + { + // Delete accidentally dead localized properties. + toDelete.Add(prop); + } + } + + if (toDelete.Any()) + { + try + { + _localizedPropertyRepository.Value.DeleteRange(toDelete); + } + catch (Exception exception) + { + exception.Dump(); + } + } + + return false; + } + + private bool HasEntityDuplicate( + IHookedEntity entry, + BaseEntity baseEntity, + Func getName, + Expression> getDuplicate) where TEntity : BaseEntity + { + if (entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Modified) + { + var repository = _ctx.Resolve>(); + var allEntities = repository.TableUntracked as IQueryable; + + var existingEntity = allEntities.FirstOrDefault(getDuplicate); + if (existingEntity != null && existingEntity.Id != baseEntity.Id) + { + RevertChanges(entry, string.Concat(T("Common.Error.OptionAlreadyExists", getName(existingEntity).NaIfEmpty()), " ", T("Common.Error.ChooseDifferentValue"))); + return true; + } + } + + return false; + } + + #endregion + + protected override void OnDeleting(BaseEntity entity, IHookedEntity entry) + { + HookObject(entity, entry); + } + + protected override void OnInserting(BaseEntity entity, IHookedEntity entry) + { + HookObject(entity, entry); + } + + protected override void OnUpdating(BaseEntity entity, IHookedEntity entry) + { + HookObject(entity, entry); + } + + public override void OnBeforeSaveCompleted() + { + if (_errorMessage.HasValue()) + { + var message = string.Copy(_errorMessage); + _errorMessage = null; + + throw new SmartException(message); + } + } + + private void HookObject(BaseEntity baseEntity, IHookedEntity entry) + { + var type = entry.EntityType; + + if (!_candidateTypes.Contains(type)) + throw new NotSupportedException(); + + if (type == typeof(SpecificationAttribute)) + { + if (HasAliasDuplicate(entry, baseEntity)) + return; + + if (IsPropertyModified(entry, "Alias")) + _catalogSearchQueryAliasMapper.Value.ClearAttributeCache(); + } + else if (type == typeof(SpecificationAttributeOption)) + { + var entity = (SpecificationAttributeOption)baseEntity; + + if (HasEntityDuplicate(entry, baseEntity, x => x.Name, + x => x.SpecificationAttributeId == entity.SpecificationAttributeId && x.Name == entity.Name)) + return; + + if (HasAliasDuplicate(entry, baseEntity)) + return; + + if (IsPropertyModified(entry, "Alias")) + _catalogSearchQueryAliasMapper.Value.ClearAttributeCache(); + } + else if (type == typeof(ProductSpecificationAttribute)) + { + var entity = (ProductSpecificationAttribute)baseEntity; + + if (HasEntityDuplicate(entry, baseEntity, x => x.SpecificationAttributeOption?.Name, + x => x.ProductId == entity.ProductId && x.SpecificationAttributeOptionId == entity.SpecificationAttributeOptionId)) + return; + } + else if (type == typeof(ProductAttribute)) + { + if (HasAliasDuplicate(entry, baseEntity)) + return; + + if (IsPropertyModified(entry, "Alias")) + _catalogSearchQueryAliasMapper.Value.ClearVariantCache(); + } + else if (type == typeof(ProductAttributeOption)) + { + var entity = (ProductAttributeOption)baseEntity; + + if (HasEntityDuplicate(entry, baseEntity, x => x.Name, + x => x.ProductAttributeOptionsSetId == entity.ProductAttributeOptionsSetId && x.Name == entity.Name)) + return; + + // ClearVariantCache() not necessary + if (HasAliasDuplicate(entry, baseEntity)) + return; + } + else if (type == typeof(ProductVariantAttribute)) + { + var entity = (ProductVariantAttribute)baseEntity; + + if (HasEntityDuplicate(entry, baseEntity, x => x.ProductAttribute?.Name, + x => x.ProductId == entity.ProductId && x.ProductAttributeId == entity.ProductAttributeId)) + return; + } + else if (type == typeof(ProductVariantAttributeValue)) + { + var entity = (ProductVariantAttributeValue)baseEntity; + + if (HasEntityDuplicate(entry, baseEntity, x => x.Name, + x => x.ProductVariantAttributeId == entity.ProductVariantAttributeId && x.Name == entity.Name)) + return; + + if (HasAliasDuplicate(entry, baseEntity, + (all, e) => all.Any(x => x.Id != e.Id && x.ProductVariantAttributeId == e.ProductVariantAttributeId && x.Alias == e.Alias))) + return; + + if (IsPropertyModified(entry, "Alias")) + _catalogSearchQueryAliasMapper.Value.ClearVariantCache(); + } + else if (type == typeof(LocalizedProperty)) + { + // note: not fired when SpecificationAttribute or SpecificationAttributeOption deleted. + // not necessary anyway because cache cleared by above code. + var prop = (LocalizedProperty)baseEntity; + var keyGroup = prop.LocaleKeyGroup; + + if (!prop.LocaleKey.IsCaseInsensitiveEqual("Alias")) + return; + + // validating ProductVariantAttributeValue goes too far here. + if (!keyGroup.IsCaseInsensitiveEqual("SpecificationAttribute") && + !keyGroup.IsCaseInsensitiveEqual("SpecificationAttributeOption") && + !keyGroup.IsCaseInsensitiveEqual("ProductAttribute") && + !keyGroup.IsCaseInsensitiveEqual("ProductAttributeOption")) + { + return; + } + + // check alias duplicate + if (entry.InitialState == EntityState.Added || entry.InitialState == EntityState.Modified) + { + prop.LocaleValue = SeoExtensions.GetSeName(prop.LocaleValue); + if (prop.LocaleValue.HasValue() && HasAliasDuplicate(prop)) + { + RevertChanges(entry, string.Concat(T("Common.Error.AliasAlreadyExists", prop.LocaleValue), " ", T("Common.Error.ChooseDifferentValue"))); + return; + } + } + + if (IsPropertyModified(entry, "LocaleValue")) + { + if (keyGroup.IsCaseInsensitiveEqual("SpecificationAttribute") || keyGroup.IsCaseInsensitiveEqual("SpecificationAttributeOption")) + { + _catalogSearchQueryAliasMapper.Value.ClearAttributeCache(); + } + else if (keyGroup.IsCaseInsensitiveEqual("ProductAttribute") || keyGroup.IsCaseInsensitiveEqual("ProductVariantAttributeValue")) + { + // not necessary for ProductAttributeOption + _catalogSearchQueryAliasMapper.Value.ClearVariantCache(); + } + } + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/SettingSaveHook.cs b/src/Libraries/SmartStore.Services/Hooks/SettingSaveHook.cs index 9d1e7fcb8c..8099c8c115 100644 --- a/src/Libraries/SmartStore.Services/Hooks/SettingSaveHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/SettingSaveHook.cs @@ -5,20 +5,20 @@ namespace SmartStore.Services.Hooks { - public class SettingSaveHook : DbSaveHook - { - private readonly ICustomerActivityService _customerActivityService; - private readonly ILocalizationService _localizationService; + public class SettingSaveHook : DbSaveHook + { + private readonly ICustomerActivityService _customerActivityService; + private readonly ILocalizationService _localizationService; - public SettingSaveHook(ICustomerActivityService customerActivityService, ILocalizationService localizationService) - { - _customerActivityService = customerActivityService; - _localizationService = localizationService; - } + public SettingSaveHook(ICustomerActivityService customerActivityService, ILocalizationService localizationService) + { + _customerActivityService = customerActivityService; + _localizationService = localizationService; + } - protected override void OnUpdated(Setting entity, IHookedEntity entry) - { - _customerActivityService.InsertActivity("EditSettings", _localizationService.GetResource("ActivityLog.EditSettings"), entity.Name, entity.Value); - } - } + protected override void OnUpdated(Setting entity, IHookedEntity entry) + { + _customerActivityService.InsertActivity("EditSettings", _localizationService.GetResource("ActivityLog.EditSettings"), entity.Name, entity.Value); + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/SlugSupportedHook.cs b/src/Libraries/SmartStore.Services/Hooks/SlugSupportedHook.cs index 430bd301d0..d8591ba072 100644 --- a/src/Libraries/SmartStore.Services/Hooks/SlugSupportedHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/SlugSupportedHook.cs @@ -8,38 +8,38 @@ namespace SmartStore.Services.Common { - public class SlugSupportedHook : DbSaveHook - { - private readonly Lazy _urlRecordService; - private readonly HashSet _toDelete = new HashSet(); + public class SlugSupportedHook : DbSaveHook + { + private readonly Lazy _urlRecordService; + private readonly HashSet _toDelete = new HashSet(); - public SlugSupportedHook(Lazy urlRecordService) - { - _urlRecordService = urlRecordService; - } + public SlugSupportedHook(Lazy urlRecordService) + { + _urlRecordService = urlRecordService; + } - protected override void OnDeleted(ISlugSupported entity, IHookedEntity entry) - { - var entityType = entry.EntityType; - var records = _urlRecordService.Value.GetUrlRecordsFor(entityType.Name, entry.Entity.Id); - _toDelete.AddRange(records); - } + protected override void OnDeleted(ISlugSupported entity, IHookedEntity entry) + { + var entityType = entry.EntityType; + var records = _urlRecordService.Value.GetUrlRecordsFor(entityType.Name, entry.Entity.Id); + _toDelete.AddRange(records); + } - public override void OnAfterSaveCompleted() - { - if (_toDelete.Count == 0) - return; + public override void OnAfterSaveCompleted() + { + if (_toDelete.Count == 0) + return; - using (var scope = new DbContextScope(autoCommit: false)) - { - using (_urlRecordService.Value.BeginScope()) - { - _toDelete.Each(x => _urlRecordService.Value.DeleteUrlRecord(x)); - } + using (var scope = new DbContextScope(autoCommit: false)) + { + using (_urlRecordService.Value.BeginScope()) + { + _toDelete.Each(x => _urlRecordService.Value.DeleteUrlRecord(x)); + } - scope.Commit(); - _toDelete.Clear(); - } - } - } + scope.Commit(); + _toDelete.Clear(); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/SoftDeletableHook.cs b/src/Libraries/SmartStore.Services/Hooks/SoftDeletableHook.cs index 42c9195047..0bd7d36ded 100644 --- a/src/Libraries/SmartStore.Services/Hooks/SoftDeletableHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/SoftDeletableHook.cs @@ -17,23 +17,23 @@ namespace SmartStore.Services.Hooks { - public class SoftDeletablePreUpdateHook : DbSaveHook - { - private readonly IComponentContext _ctx; + public class SoftDeletablePreUpdateHook : DbSaveHook + { + private readonly IComponentContext _ctx; - public SoftDeletablePreUpdateHook(IComponentContext ctx) - { - _ctx = ctx; - } + public SoftDeletablePreUpdateHook(IComponentContext ctx) + { + _ctx = ctx; + } protected override void OnUpdating(ISoftDeletable entity, IHookedEntity entry) - { - var baseEntity = entry.Entity; + { + var baseEntity = entry.Entity; - var prop = entry.Entry.Property(nameof(ISoftDeletable.Deleted)); - var deletedModified = !prop.CurrentValue.Equals(prop.OriginalValue); - if (!deletedModified) - return; + var prop = entry.Entry.Property(nameof(ISoftDeletable.Deleted)); + var deletedModified = !prop.CurrentValue.Equals(prop.OriginalValue); + if (!deletedModified) + return; var entityType = entry.EntityType; @@ -78,31 +78,31 @@ protected override void OnUpdating(ISoftDeletable entity, IHookedEntity entry) product.MainPictureId = null; var productService = _ctx.Resolve(); - var mediaTracker = _ctx.Resolve(); - var tracks = new List(); + var mediaTracker = _ctx.Resolve(); + var tracks = new List(); - foreach (var pm in product.ProductPictures.ToList()) + foreach (var pm in product.ProductPictures.ToList()) { productService.DeleteProductPicture(pm); - tracks.Add(new MediaTrack - { - EntityId = pm.Id, - EntityName = nameof(ProductMediaFile), - MediaFileId = pm.MediaFileId, - Property = nameof(pm.MediaFileId), - Operation = MediaTrackOperation.Untrack - }); - } + tracks.Add(new MediaTrack + { + EntityId = pm.Id, + EntityName = nameof(ProductMediaFile), + MediaFileId = pm.MediaFileId, + Property = nameof(pm.MediaFileId), + Operation = MediaTrackOperation.Untrack + }); + } - // We have to untrack manually, because the tracker hook will not run in the scope of another hook. - mediaTracker.TrackMany(SystemAlbumProvider.Catalog, tracks); - } + // We have to untrack manually, because the tracker hook will not run in the scope of another hook. + mediaTracker.TrackMany(SystemAlbumProvider.Catalog, tracks); + } // Although nested hooks do not run, the following stuff will still trigger the tracker hook, // because this hook runs before the tracker hook. - if (baseEntity is Category category) + if (baseEntity is Category category) { category.MediaFileId = null; } @@ -112,5 +112,5 @@ protected override void OnUpdating(ISoftDeletable entity, IHookedEntity entry) manufacturer.MediaFileId = null; } } - } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/StoreMappingEntityHook.cs b/src/Libraries/SmartStore.Services/Hooks/StoreMappingEntityHook.cs index f23c9b9f87..7bb0e65992 100644 --- a/src/Libraries/SmartStore.Services/Hooks/StoreMappingEntityHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/StoreMappingEntityHook.cs @@ -9,39 +9,39 @@ namespace SmartStore.Services.Common { - public class StoreMappingEntityHook : DbSaveHook - { - private readonly Lazy _storeMappingService; - private readonly HashSet _toDelete = new HashSet(); - - public StoreMappingEntityHook(Lazy storeMappingService) - { - _storeMappingService = storeMappingService; - } - - protected override void OnDeleted(IStoreMappingSupported entity, IHookedEntity entry) - { - var entityType = entry.EntityType; - - var records = _storeMappingService.Value - .GetStoreMappingsFor(entityType.Name, entry.Entity.Id) - .ToList(); - - _toDelete.AddRange(records); - } - - public override void OnAfterSaveCompleted() - { - if (_toDelete.Count == 0) - return; - - using (var scope = new DbContextScope(autoCommit: false)) - { - _toDelete.Each(x => _storeMappingService.Value.DeleteStoreMapping(x)); - scope.Commit(); - } - - _toDelete.Clear(); - } - } + public class StoreMappingEntityHook : DbSaveHook + { + private readonly Lazy _storeMappingService; + private readonly HashSet _toDelete = new HashSet(); + + public StoreMappingEntityHook(Lazy storeMappingService) + { + _storeMappingService = storeMappingService; + } + + protected override void OnDeleted(IStoreMappingSupported entity, IHookedEntity entry) + { + var entityType = entry.EntityType; + + var records = _storeMappingService.Value + .GetStoreMappingsFor(entityType.Name, entry.Entity.Id) + .ToList(); + + _toDelete.AddRange(records); + } + + public override void OnAfterSaveCompleted() + { + if (_toDelete.Count == 0) + return; + + using (var scope = new DbContextScope(autoCommit: false)) + { + _toDelete.Each(x => _storeMappingService.Value.DeleteStoreMapping(x)); + scope.Commit(); + } + + _toDelete.Clear(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/StoreSaveHook.cs b/src/Libraries/SmartStore.Services/Hooks/StoreSaveHook.cs index 16ad944332..dafd38a099 100644 --- a/src/Libraries/SmartStore.Services/Hooks/StoreSaveHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/StoreSaveHook.cs @@ -8,43 +8,43 @@ namespace SmartStore.Services.Hooks { public class StoreSaveHook : DbSaveHook - { - private readonly ITaskScheduler _taskScheduler; - private readonly IStoreService _storeService; - private readonly HttpContextBase _httpContext; + { + private readonly ITaskScheduler _taskScheduler; + private readonly IStoreService _storeService; + private readonly HttpContextBase _httpContext; - public StoreSaveHook(ITaskScheduler taskScheduler, IStoreService storeService, HttpContextBase httpContext) - { - _taskScheduler = taskScheduler; - _storeService = storeService; - _httpContext = httpContext; - } + public StoreSaveHook(ITaskScheduler taskScheduler, IStoreService storeService, HttpContextBase httpContext) + { + _taskScheduler = taskScheduler; + _storeService = storeService; + _httpContext = httpContext; + } - protected override void OnUpdating(Store entity, IHookedEntity entry) - { - } + protected override void OnUpdating(Store entity, IHookedEntity entry) + { + } - protected override void OnInserted(Store entity, IHookedEntity entry) - { - TryChangeSchedulerBaseUrl(); - } + protected override void OnInserted(Store entity, IHookedEntity entry) + { + TryChangeSchedulerBaseUrl(); + } - protected override void OnUpdated(Store entity, IHookedEntity entry) - { - TryChangeSchedulerBaseUrl(); - } + protected override void OnUpdated(Store entity, IHookedEntity entry) + { + TryChangeSchedulerBaseUrl(); + } - protected override void OnDeleted(Store entity, IHookedEntity entry) - { - TryChangeSchedulerBaseUrl(); - } + protected override void OnDeleted(Store entity, IHookedEntity entry) + { + TryChangeSchedulerBaseUrl(); + } - private void TryChangeSchedulerBaseUrl() - { - if (CommonHelper.GetAppSetting("sm:TaskSchedulerBaseUrl").IsWebUrl() == false) - { - _taskScheduler.SetBaseUrl(_storeService, _httpContext); - } - } - } + private void TryChangeSchedulerBaseUrl() + { + if (CommonHelper.GetAppSetting("sm:TaskSchedulerBaseUrl").IsWebUrl() == false) + { + _taskScheduler.SetBaseUrl(_storeService, _httpContext); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Hooks/UpdateCustomerFullNameHook.cs b/src/Libraries/SmartStore.Services/Hooks/UpdateCustomerFullNameHook.cs index 3604142ffa..d47e38523e 100644 --- a/src/Libraries/SmartStore.Services/Hooks/UpdateCustomerFullNameHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/UpdateCustomerFullNameHook.cs @@ -8,36 +8,36 @@ namespace SmartStore.Services.Hooks { [Important] - public class UpdateCustomerFullNameHook : DbSaveHook - { - private static readonly HashSet _candidateProps = new HashSet(new string[] - { - nameof(Customer.Title), - nameof(Customer.Salutation), - nameof(Customer.FirstName), - nameof(Customer.LastName) - }); + public class UpdateCustomerFullNameHook : DbSaveHook + { + private static readonly HashSet _candidateProps = new HashSet(new string[] + { + nameof(Customer.Title), + nameof(Customer.Salutation), + nameof(Customer.FirstName), + nameof(Customer.LastName) + }); - private readonly IComponentContext _ctx; + private readonly IComponentContext _ctx; - public UpdateCustomerFullNameHook(IComponentContext ctx) - { - _ctx = ctx; - } + public UpdateCustomerFullNameHook(IComponentContext ctx) + { + _ctx = ctx; + } - protected override void OnUpdating(Customer entity, IHookedEntity entry) - { - UpdateFullName(entity, entry); - } + protected override void OnUpdating(Customer entity, IHookedEntity entry) + { + UpdateFullName(entity, entry); + } - protected override void OnInserting(Customer entity, IHookedEntity entry) - { - UpdateFullName(entity, entry); - } + protected override void OnInserting(Customer entity, IHookedEntity entry) + { + UpdateFullName(entity, entry); + } - private void UpdateFullName(Customer entity, IHookedEntity entry) - { - var shouldUpdate = entity.IsTransientRecord(); + private void UpdateFullName(Customer entity, IHookedEntity entry) + { + var shouldUpdate = entity.IsTransientRecord(); if (!shouldUpdate) { @@ -45,23 +45,23 @@ private void UpdateFullName(Customer entity, IHookedEntity entry) } if (!shouldUpdate) - { - var modProps = _ctx.Resolve().GetModifiedProperties(entity); - shouldUpdate = _candidateProps.Any(x => modProps.ContainsKey(x)); - } + { + var modProps = _ctx.Resolve().GetModifiedProperties(entity); + shouldUpdate = _candidateProps.Any(x => modProps.ContainsKey(x)); + } if (shouldUpdate) - { - var parts = new[] - { - entity.Salutation, - entity.Title, - entity.FirstName, - entity.LastName - }; + { + var parts = new[] + { + entity.Salutation, + entity.Title, + entity.FirstName, + entity.LastName + }; - entity.FullName = string.Join(" ", parts.Where(x => x.HasValue())).NullEmpty(); - } - } - } + entity.FullName = string.Join(" ", parts.Where(x => x.HasValue())).NullEmpty(); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/ICommonServices.cs b/src/Libraries/SmartStore.Services/ICommonServices.cs index a68e73ca06..8b9e8b0baa 100644 --- a/src/Libraries/SmartStore.Services/ICommonServices.cs +++ b/src/Libraries/SmartStore.Services/ICommonServices.cs @@ -16,59 +16,59 @@ namespace SmartStore.Services { public interface ICommonServices - { - IComponentContext Container { get; } - IApplicationEnvironment ApplicationEnvironment { get; } - ICacheManager Cache { get; } - IRequestCache RequestCache { get; } - IDisplayControl DisplayControl { get; } - IDbContext DbContext { get; } - IStoreContext StoreContext { get; } - IWebHelper WebHelper { get; } - IWorkContext WorkContext { get; } - IEventPublisher EventPublisher { get; } - ILocalizationService Localization { get; } - ICustomerActivityService CustomerActivity { get; } - IMediaService MediaService { get; } - INotifier Notifier { get; } + { + IComponentContext Container { get; } + IApplicationEnvironment ApplicationEnvironment { get; } + ICacheManager Cache { get; } + IRequestCache RequestCache { get; } + IDisplayControl DisplayControl { get; } + IDbContext DbContext { get; } + IStoreContext StoreContext { get; } + IWebHelper WebHelper { get; } + IWorkContext WorkContext { get; } + IEventPublisher EventPublisher { get; } + ILocalizationService Localization { get; } + ICustomerActivityService CustomerActivity { get; } + IMediaService MediaService { get; } + INotifier Notifier { get; } IPermissionService Permissions { get; } ISettingService Settings { get; } - IStoreService StoreService { get; } - IDateTimeHelper DateTimeHelper { get; } - IChronometer Chronometer { get; } - IMessageFactory MessageFactory { get; } - } + IStoreService StoreService { get; } + IDateTimeHelper DateTimeHelper { get; } + IChronometer Chronometer { get; } + IMessageFactory MessageFactory { get; } + } - public static class ICommonServicesExtensions - { - public static TService Resolve(this ICommonServices services) - { - return services.Container.Resolve(); - } + public static class ICommonServicesExtensions + { + public static TService Resolve(this ICommonServices services) + { + return services.Container.Resolve(); + } - public static TService Resolve(this ICommonServices services, object serviceKey) - { - return services.Container.ResolveKeyed(serviceKey); - } + public static TService Resolve(this ICommonServices services, object serviceKey) + { + return services.Container.ResolveKeyed(serviceKey); + } - public static TService ResolveNamed(this ICommonServices services, string serviceName) - { - return services.Container.ResolveNamed(serviceName); - } + public static TService ResolveNamed(this ICommonServices services, string serviceName) + { + return services.Container.ResolveNamed(serviceName); + } - public static object Resolve(this ICommonServices services, Type serviceType) - { - return services.Resolve(null, serviceType); - } + public static object Resolve(this ICommonServices services, Type serviceType) + { + return services.Resolve(null, serviceType); + } - public static object Resolve(this ICommonServices services, object serviceKey, Type serviceType) - { - return services.Container.ResolveKeyed(serviceKey, serviceType); - } + public static object Resolve(this ICommonServices services, object serviceKey, Type serviceType) + { + return services.Container.ResolveKeyed(serviceKey, serviceType); + } - public static object ResolveNamed(this ICommonServices services, string serviceName, Type serviceType) - { - return services.Container.ResolveNamed(serviceName, serviceType); - } - } + public static object ResolveNamed(this ICommonServices services, string serviceName, Type serviceType) + { + return services.Container.ResolveNamed(serviceName, serviceType); + } + } } diff --git a/src/Libraries/SmartStore.Services/IScopedService.cs b/src/Libraries/SmartStore.Services/IScopedService.cs index 3c081b953f..9494016f64 100644 --- a/src/Libraries/SmartStore.Services/IScopedService.cs +++ b/src/Libraries/SmartStore.Services/IScopedService.cs @@ -2,23 +2,23 @@ namespace SmartStore.Services { - public interface IScopedService - { - /// - /// Creates a long running unit of work in which cache eviction is suppressed - /// - /// Specifies whether the cache should be evicted completely on batch disposal - /// A disposable unit of work - IDisposable BeginScope(bool clearCache = true); + public interface IScopedService + { + /// + /// Creates a long running unit of work in which cache eviction is suppressed + /// + /// Specifies whether the cache should be evicted completely on batch disposal + /// A disposable unit of work + IDisposable BeginScope(bool clearCache = true); - /// - /// Gets a value indicating whether data has changed during a request, making cache eviction necessary. - /// - /// - /// Cache eviction sets this member to false - /// - bool HasChanges { get; } + /// + /// Gets a value indicating whether data has changed during a request, making cache eviction necessary. + /// + /// + /// Cache eviction sets this member to false + /// + bool HasChanges { get; } - void ClearCache(); - } + void ClearCache(); + } } diff --git a/src/Libraries/SmartStore.Services/Localization/ILanguageService.cs b/src/Libraries/SmartStore.Services/Localization/ILanguageService.cs index a717f199ca..a0e7e7009e 100644 --- a/src/Libraries/SmartStore.Services/Localization/ILanguageService.cs +++ b/src/Libraries/SmartStore.Services/Localization/ILanguageService.cs @@ -62,34 +62,34 @@ public partial interface ILanguageService /// Language void UpdateLanguage(Language language); - /// - /// Determines whether a language is active/published - /// - /// The SEO code of the language to check - /// The store id - /// true when the language is published, false otherwise - bool IsPublishedLanguage(string seoCode, int storeId = 0); + /// + /// Determines whether a language is active/published + /// + /// The SEO code of the language to check + /// The store id + /// true when the language is published, false otherwise + bool IsPublishedLanguage(string seoCode, int storeId = 0); - /// - /// Determines whether a language is active/published - /// - /// The id of the language to check - /// The store id - /// true when the language is published, false otherwise - bool IsPublishedLanguage(int languageId, int storeId = 0); + /// + /// Determines whether a language is active/published + /// + /// The id of the language to check + /// The store id + /// true when the language is published, false otherwise + bool IsPublishedLanguage(int languageId, int storeId = 0); - /// - /// Gets the seo code of the default (first) active language - /// - /// The store id - /// The seo code - string GetDefaultLanguageSeoCode(int storeId = 0); + /// + /// Gets the seo code of the default (first) active language + /// + /// The store id + /// The seo code + string GetDefaultLanguageSeoCode(int storeId = 0); - /// - /// Gets the id of the default (first) active language - /// - /// The store id - /// The language id - int GetDefaultLanguageId(int storeId = 0); + /// + /// Gets the id of the default (first) active language + /// + /// The store id + /// The language id + int GetDefaultLanguageId(int storeId = 0); } } diff --git a/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs b/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs index 29d07d0d7c..00ac0273ee 100644 --- a/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs +++ b/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs @@ -10,10 +10,10 @@ namespace SmartStore.Services.Localization { - /// - /// Localization manager interface - /// - public partial interface ILocalizationService + /// + /// Localization manager interface + /// + public partial interface ILocalizationService { /// /// Deletes a locale string resource @@ -21,12 +21,12 @@ public partial interface ILocalizationService /// Locale string resource void DeleteLocaleStringResource(LocaleStringResource localeStringResource); - /// - /// Deletes all string resources with its key beginning with rootKey. - /// - /// e.g. Plugins.Import.Biz - /// Number of deleted string resources - int DeleteLocaleStringResources(string key, bool keyIsRootKey = true); + /// + /// Deletes all string resources with its key beginning with rootKey. + /// + /// e.g. Plugins.Import.Biz + /// Number of deleted string resources + int DeleteLocaleStringResources(string key, bool keyIsRootKey = true); /// /// Gets a locale string resource @@ -58,19 +58,19 @@ public partial interface ILocalizationService /// Locale string resources IQueryable All(int languageId); - /// - /// Gets all locale string resources by language identifier starting with a prefix - /// - /// Pattern - /// Language identifier - /// Locale string resources matching language id and starting with - IList GetResourcesByPattern(string pattern, int languageId); + /// + /// Gets all locale string resources by language identifier starting with a prefix + /// + /// Pattern + /// Language identifier + /// Locale string resources matching language id and starting with + IList GetResourcesByPattern(string pattern, int languageId); - /// - /// Inserts a locale string resource - /// - /// Locale string resource - void InsertLocaleStringResource(LocaleStringResource localeStringResource); + /// + /// Inserts a locale string resource + /// + /// Locale string resource + void InsertLocaleStringResource(LocaleStringResource localeStringResource); /// /// Updates the locale string resource @@ -128,10 +128,10 @@ int ImportResourcesFromXml(Language language, /// Specifies whether user touched resources should also be updated /// Import only files for particular languages void ImportPluginResourcesFromXml( - PluginDescriptor pluginDescriptor, - IList targetList = null, - bool updateTouchedResources = true, - IList filterLanguages = null); + PluginDescriptor pluginDescriptor, + IList targetList = null, + bool updateTouchedResources = true, + IList filterLanguages = null); /// /// Flattens all nested LocaleResource child nodes into a new document diff --git a/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs b/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs index 13e75001e2..002cf70623 100644 --- a/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs +++ b/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs @@ -11,7 +11,7 @@ namespace SmartStore.Services.Localization /// Localized entity service interface /// public partial interface ILocalizedEntityService : IScopedService - { + { /// /// Deletes a localized property /// @@ -43,44 +43,44 @@ public partial interface ILocalizedEntityService : IScopedService /// Localized properties IList GetLocalizedProperties(int entityId, string localeKeyGroup); - /// - /// Prefetches a collection of localized properties for a range of entities in one go - /// and caches them for the duration of the current request. - /// - /// Locale key group (scope) - /// - /// The entity ids to prefetch translations for. Can be null, - /// in which case all translations for the requested scope are loaded. - /// - /// Whether represents a range of ids (perf). - /// Whether is already sorted (perf). - /// Localized property collection - /// - /// Be careful not to load large amounts of data at once (e.g. for "Product" scope with large range). - /// - void PrefetchLocalizedProperties(string localeKeyGroup, int languageId, int[] entityIds, bool isRange = false, bool isSorted = false); + /// + /// Prefetches a collection of localized properties for a range of entities in one go + /// and caches them for the duration of the current request. + /// + /// Locale key group (scope) + /// + /// The entity ids to prefetch translations for. Can be null, + /// in which case all translations for the requested scope are loaded. + /// + /// Whether represents a range of ids (perf). + /// Whether is already sorted (perf). + /// Localized property collection + /// + /// Be careful not to load large amounts of data at once (e.g. for "Product" scope with large range). + /// + void PrefetchLocalizedProperties(string localeKeyGroup, int languageId, int[] entityIds, bool isRange = false, bool isSorted = false); - /// - /// Gets a collection of localized properties for a range of entities in one go. - /// - /// Locale key group (scope) - /// - /// The entity ids to load translations for. Can be null, - /// in which case all translations for the requested scope are loaded. - /// - /// Whether represents a range of ids (perf). - /// Whether is already sorted (perf). - /// Localized property collection - /// - /// Be careful not to load large amounts of data at once (e.g. for "Product" scope with large range). - /// - LocalizedPropertyCollection GetLocalizedPropertyCollection(string localeKeyGroup, int[] entityIds, bool isRange = false, bool isSorted = false); + /// + /// Gets a collection of localized properties for a range of entities in one go. + /// + /// Locale key group (scope) + /// + /// The entity ids to load translations for. Can be null, + /// in which case all translations for the requested scope are loaded. + /// + /// Whether represents a range of ids (perf). + /// Whether is already sorted (perf). + /// Localized property collection + /// + /// Be careful not to load large amounts of data at once (e.g. for "Product" scope with large range). + /// + LocalizedPropertyCollection GetLocalizedPropertyCollection(string localeKeyGroup, int[] entityIds, bool isRange = false, bool isSorted = false); - /// - /// Inserts a localized property - /// - /// Localized property - void InsertLocalizedProperty(LocalizedProperty localizedProperty); + /// + /// Inserts a localized property + /// + /// Localized property + void InsertLocalizedProperty(LocalizedProperty localizedProperty); /// /// Updates the localized property @@ -97,7 +97,7 @@ public partial interface ILocalizedEntityService : IScopedService /// Locale value /// Language ID void SaveLocalizedValue( - T entity, + T entity, Expression> keySelector, string value, int languageId) where T : BaseEntity, ILocalizedEntity; @@ -113,7 +113,7 @@ void SaveLocalizedValue( /// Locale value /// Language ID void SaveLocalizedValue( - T entity, + T entity, Expression> keySelector, TPropType value, int languageId) where T : BaseEntity, ILocalizedEntity; diff --git a/src/Libraries/SmartStore.Services/Localization/LanguageService.cs b/src/Libraries/SmartStore.Services/Localization/LanguageService.cs index 4ac2289f38..d5cc8aa12c 100644 --- a/src/Libraries/SmartStore.Services/Localization/LanguageService.cs +++ b/src/Libraries/SmartStore.Services/Localization/LanguageService.cs @@ -19,40 +19,40 @@ public partial class LanguageService : ILanguageService private const string LANGUAGES_PATTERN_KEY = "SmartStore.language.*"; private readonly IRepository _languageRepository; - private readonly IStoreMappingService _storeMappingService; - private readonly IStoreService _storeService; - private readonly IStoreContext _storeContext; + private readonly IStoreMappingService _storeMappingService; + private readonly IStoreService _storeService; + private readonly IStoreContext _storeContext; private readonly IRequestCache _requestCache; - private readonly ICacheManager _cache; - private readonly ISettingService _settingService; + private readonly ICacheManager _cache; + private readonly ISettingService _settingService; private readonly LocalizationSettings _localizationSettings; private readonly IEventPublisher _eventPublisher; public LanguageService( - IRequestCache requestCache, - ICacheManager cache, - IRepository languageRepository, + IRequestCache requestCache, + ICacheManager cache, + IRepository languageRepository, ISettingService settingService, LocalizationSettings localizationSettings, IEventPublisher eventPublisher, - IStoreMappingService storeMappingService, - IStoreService storeService, - IStoreContext storeContext) + IStoreMappingService storeMappingService, + IStoreService storeService, + IStoreContext storeContext) { _requestCache = requestCache; - _cache = cache; + _cache = cache; _languageRepository = languageRepository; _settingService = settingService; _localizationSettings = localizationSettings; _eventPublisher = eventPublisher; - _storeMappingService = storeMappingService; - _storeService = storeService; - _storeContext = storeContext; + _storeMappingService = storeMappingService; + _storeService = storeService; + _storeContext = storeContext; } public virtual void DeleteLanguage(Language language) { - Guard.NotNull(language, nameof(language)); + Guard.NotNull(language, nameof(language)); // Update default admin area language (if required) if (_localizationSettings.DefaultAdminLanguageId == language.Id) @@ -67,35 +67,35 @@ public virtual void DeleteLanguage(Language language) } } } - + _languageRepository.Delete(language); // cache - _requestCache.RemoveByPattern(LANGUAGES_PATTERN_KEY); + _requestCache.RemoveByPattern(LANGUAGES_PATTERN_KEY); } - public virtual IList GetAllLanguages(bool showHidden = false, int storeId = 0) + public virtual IList GetAllLanguages(bool showHidden = false, int storeId = 0) { - var query = _languageRepository.Table; + var query = _languageRepository.Table; - if (!showHidden) - { - query = query.Where(x => x.Published); - } + if (!showHidden) + { + query = query.Where(x => x.Published); + } - query = query.OrderBy(x => x.DisplayOrder); + query = query.OrderBy(x => x.DisplayOrder); - var languages = query.ToListCached("db.lang.all.{0}".FormatInvariant(showHidden)); + var languages = query.ToListCached("db.lang.all.{0}".FormatInvariant(showHidden)); - // store mapping - if (storeId > 0) - { - languages = languages - .Where(l => _storeMappingService.Authorize(l, storeId)) - .ToList(); - } + // store mapping + if (storeId > 0) + { + languages = languages + .Where(l => _storeMappingService.Authorize(l, storeId)) + .ToList(); + } - return languages; + return languages; } public virtual int GetLanguagesCount(bool showHidden = false) @@ -115,28 +115,28 @@ public virtual Language GetLanguageById(int languageId) if (languageId == 0) return null; - return _languageRepository.GetByIdCached(languageId, "db.lang.id-" + languageId); - } + return _languageRepository.GetByIdCached(languageId, "db.lang.id-" + languageId); + } public virtual Language GetLanguageByCulture(string culture) { if (!culture.HasValue()) return null; - return _languageRepository.Table - .Where(x => culture.Equals(x.LanguageCulture, StringComparison.InvariantCultureIgnoreCase)) - .FirstOrDefaultCached("db.lang.culture-" + culture); - } + return _languageRepository.Table + .Where(x => culture.Equals(x.LanguageCulture, StringComparison.InvariantCultureIgnoreCase)) + .FirstOrDefaultCached("db.lang.culture-" + culture); + } public virtual Language GetLanguageBySeoCode(string seoCode) { if (!seoCode.HasValue()) return null; - return _languageRepository.Table - .Where(x => seoCode.Equals(x.UniqueSeoCode, StringComparison.InvariantCultureIgnoreCase)) - .FirstOrDefaultCached("db.lang.seo-" + seoCode); - } + return _languageRepository.Table + .Where(x => seoCode.Equals(x.UniqueSeoCode, StringComparison.InvariantCultureIgnoreCase)) + .FirstOrDefaultCached("db.lang.seo-" + seoCode); + } public virtual void InsertLanguage(Language language) { @@ -153,7 +153,7 @@ public virtual void UpdateLanguage(Language language) { if (language == null) throw new ArgumentNullException("language"); - + //update language _languageRepository.Update(language); @@ -161,109 +161,109 @@ public virtual void UpdateLanguage(Language language) _requestCache.RemoveByPattern(LANGUAGES_PATTERN_KEY); } - public virtual bool IsPublishedLanguage(string seoCode, int storeId = 0) - { - if (storeId <= 0) - storeId = _storeContext.CurrentStore.Id; - - var map = this.GetStoreLanguageMap(); - if (map.ContainsKey(storeId)) - { - return map[storeId].Any(x => x.UniqueSeoCode == seoCode); - } - - return false; - } - - public virtual bool IsPublishedLanguage(int languageId, int storeId = 0) - { - if (languageId <= 0) - return false; - - if (storeId <= 0) - storeId = _storeContext.CurrentStore.Id; - - var map = this.GetStoreLanguageMap(); - if (map.ContainsKey(storeId)) - { - return map[storeId].Any(x => x.Id == languageId); - } - - return false; - } - - public virtual string GetDefaultLanguageSeoCode(int storeId = 0) - { - if (storeId <= 0) - storeId = _storeContext.CurrentStore.Id; - - var map = this.GetStoreLanguageMap(); - if (map.ContainsKey(storeId)) - { - return map[storeId].FirstOrDefault().UniqueSeoCode; - } - - return null; - } - - public virtual int GetDefaultLanguageId(int storeId = 0) - { - if (storeId <= 0) - storeId = _storeContext.CurrentStore.Id; - - var map = this.GetStoreLanguageMap(); - if (map.ContainsKey(storeId)) - { - return map[storeId].FirstOrDefault().Id; - } - - return 0; - } - - /// - /// Gets a map of active/published store languages - /// - /// A map of store languages where key is the store id and values are tuples of language ids and seo codes - protected virtual Multimap GetStoreLanguageMap() - { - var result = _cache.Get(ServiceCacheBuster.STORE_LANGUAGE_MAP_KEY, () => - { - var map = new Multimap(); - - var allStores = _storeService.GetAllStores(); - foreach (var store in allStores) - { - var languages = GetAllLanguages(false, store.Id); - if (!languages.Any()) - { - // language-less stores aren't allowed but could exist accidentally. Correct this. - var firstStoreLang = GetAllLanguages(true, store.Id).FirstOrDefault(); - if (firstStoreLang == null) - { - // absolute fallback - firstStoreLang = GetAllLanguages(true).FirstOrDefault(); - } - map.Add(store.Id, new MinifiedLanguage { Id = firstStoreLang.Id, UniqueSeoCode = firstStoreLang.UniqueSeoCode }); - } - else - { - foreach (var lang in languages) - { - map.Add(store.Id, new MinifiedLanguage { Id = lang.Id, UniqueSeoCode = lang.UniqueSeoCode }); - } - } - } - - return map; - }, TimeSpan.FromDays(1)); - - return result; - } - - public class MinifiedLanguage - { - public int Id { get; set; } - public string UniqueSeoCode { get; set; } - } + public virtual bool IsPublishedLanguage(string seoCode, int storeId = 0) + { + if (storeId <= 0) + storeId = _storeContext.CurrentStore.Id; + + var map = this.GetStoreLanguageMap(); + if (map.ContainsKey(storeId)) + { + return map[storeId].Any(x => x.UniqueSeoCode == seoCode); + } + + return false; + } + + public virtual bool IsPublishedLanguage(int languageId, int storeId = 0) + { + if (languageId <= 0) + return false; + + if (storeId <= 0) + storeId = _storeContext.CurrentStore.Id; + + var map = this.GetStoreLanguageMap(); + if (map.ContainsKey(storeId)) + { + return map[storeId].Any(x => x.Id == languageId); + } + + return false; + } + + public virtual string GetDefaultLanguageSeoCode(int storeId = 0) + { + if (storeId <= 0) + storeId = _storeContext.CurrentStore.Id; + + var map = this.GetStoreLanguageMap(); + if (map.ContainsKey(storeId)) + { + return map[storeId].FirstOrDefault().UniqueSeoCode; + } + + return null; + } + + public virtual int GetDefaultLanguageId(int storeId = 0) + { + if (storeId <= 0) + storeId = _storeContext.CurrentStore.Id; + + var map = this.GetStoreLanguageMap(); + if (map.ContainsKey(storeId)) + { + return map[storeId].FirstOrDefault().Id; + } + + return 0; + } + + /// + /// Gets a map of active/published store languages + /// + /// A map of store languages where key is the store id and values are tuples of language ids and seo codes + protected virtual Multimap GetStoreLanguageMap() + { + var result = _cache.Get(ServiceCacheBuster.STORE_LANGUAGE_MAP_KEY, () => + { + var map = new Multimap(); + + var allStores = _storeService.GetAllStores(); + foreach (var store in allStores) + { + var languages = GetAllLanguages(false, store.Id); + if (!languages.Any()) + { + // language-less stores aren't allowed but could exist accidentally. Correct this. + var firstStoreLang = GetAllLanguages(true, store.Id).FirstOrDefault(); + if (firstStoreLang == null) + { + // absolute fallback + firstStoreLang = GetAllLanguages(true).FirstOrDefault(); + } + map.Add(store.Id, new MinifiedLanguage { Id = firstStoreLang.Id, UniqueSeoCode = firstStoreLang.UniqueSeoCode }); + } + else + { + foreach (var lang in languages) + { + map.Add(store.Id, new MinifiedLanguage { Id = lang.Id, UniqueSeoCode = lang.UniqueSeoCode }); + } + } + } + + return map; + }, TimeSpan.FromDays(1)); + + return result; + } + + public class MinifiedLanguage + { + public int Id { get; set; } + public string UniqueSeoCode { get; set; } + } } } diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizationExtensions.cs b/src/Libraries/SmartStore.Services/Localization/LocalizationExtensions.cs index 706fad2245..5ac3b73523 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizationExtensions.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizationExtensions.cs @@ -13,7 +13,7 @@ namespace SmartStore.Services.Localization { - public static class LocalizationExtensions + public static class LocalizationExtensions { #region GetLocalized BaseEntity @@ -50,12 +50,12 @@ public static LocalizedValue GetLocalized(this T entity, ExpressionA value indicating whether to ensure that we have at least two published languages; otherwise, load only default value /// When true, additionally checks whether the localized value contains empty HTML only and falls back to the default value if so. /// Localized property - public static LocalizedValue GetLocalized(this T entity, - Expression> keySelector, - int languageId, - bool returnDefaultValue = true, + public static LocalizedValue GetLocalized(this T entity, + Expression> keySelector, + int languageId, + bool returnDefaultValue = true, bool ensureTwoPublishedLanguages = true, - bool detectEmptyHtml = false) + bool detectEmptyHtml = false) where T : BaseEntity, ILocalizedEntity { var invoker = keySelector.CompileFast(); @@ -163,7 +163,7 @@ public static LocalizedValue GetLocalized(this T entity, invoker.Property.Name, (Func)invoker, languageId, - returnDefaultValue, + returnDefaultValue, ensureTwoPublishedLanguages, detectEmptyHtml); } @@ -212,16 +212,16 @@ public static LocalizedValue GetLocalized(this T entity, /// Key selector /// Localized property public static LocalizedValue GetLocalized(this ICategoryNode node, Expression> keySelector) - { + { var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( - node, + node, node.Id, - "Category", + "Category", invoker.Property.Name, (Func)invoker, - EngineContext.Current.Resolve().WorkingLanguage); - } + EngineContext.Current.Resolve().WorkingLanguage); + } /// /// Get localized property of an instance @@ -234,12 +234,12 @@ public static LocalizedValue GetLocalized(this ICategoryNode node, Expre { var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( - node, + node, node.Id, - nameof(Category), + nameof(Category), invoker.Property.Name, (Func)invoker, - languageId); + languageId); } /// @@ -253,12 +253,12 @@ public static LocalizedValue GetLocalized(this ICategoryNode node, Expre { var invoker = keySelector.CompileFast(); return EngineContext.Current.Resolve().GetLocalizedValue( - node, + node, node.Id, nameof(Category), invoker.Property.Name, (Func)invoker, - language); + language); } #endregion @@ -271,7 +271,7 @@ public static LocalizedValue GetLocalized(this ICategoryNode node, Expre /// The settings instance /// Key selector /// Localized property - public static LocalizedValue GetLocalizedSetting(this TSetting settings, + public static LocalizedValue GetLocalizedSetting(this TSetting settings, Expression> keySelector, bool returnDefaultValue = true, bool ensureTwoPublishedLanguages = true, @@ -298,8 +298,8 @@ public static LocalizedValue GetLocalizedSetting(this TSetting /// Key selector /// Language identifier /// Localized property - public static LocalizedValue GetLocalizedSetting(this TSetting settings, - Expression> keySelector, + public static LocalizedValue GetLocalizedSetting(this TSetting settings, + Expression> keySelector, int languageId, bool returnDefaultValue = true, bool ensureTwoPublishedLanguages = true, @@ -326,8 +326,8 @@ public static LocalizedValue GetLocalizedSetting(this TSetting /// Key selector /// Language /// Localized property - public static LocalizedValue GetLocalizedSetting(this TSetting settings, - Expression> keySelector, + public static LocalizedValue GetLocalizedSetting(this TSetting settings, + Expression> keySelector, Language language, bool returnDefaultValue = true, bool ensureTwoPublishedLanguages = true, @@ -365,7 +365,7 @@ public static string GetLocalizedEnum(this T enumValue, ILocalizationService { Guard.NotNull(workContext, nameof(workContext)); - return GetLocalizedEnum(enumValue, localizationService, workContext.WorkingLanguage.Id, hint); + return GetLocalizedEnum(enumValue, localizationService, workContext.WorkingLanguage.Id, hint); } /// @@ -387,8 +387,8 @@ public static string GetLocalizedEnum(this T enumValue, ILocalizationService throw new ArgumentException("T must be an enumerated type."); } - var resourceName = string.Format("Enums.{0}.{1}", - typeof(T).ToString(), + var resourceName = string.Format("Enums.{0}.{1}", + typeof(T).ToString(), enumValue.ToString()); if (hint) @@ -430,9 +430,9 @@ public static void DeletePluginLocaleResource(this BasePlugin plugin, string res /// Localization service /// Language service /// Resource name - public static void DeletePluginLocaleResource(this BasePlugin plugin, - ILocalizationService localizationService, - ILanguageService languageService, + public static void DeletePluginLocaleResource(this BasePlugin plugin, + ILocalizationService localizationService, + ILanguageService languageService, string resourceName) { // actually plugin instance is not required @@ -464,8 +464,8 @@ public static void AddOrUpdatePluginLocaleResource(this BasePlugin plugin, { var localizationService = EngineContext.Current.Resolve(); var languageService = EngineContext.Current.Resolve(); - AddOrUpdatePluginLocaleResource(plugin, localizationService, - languageService, resourceName, resourceValue); + AddOrUpdatePluginLocaleResource(plugin, localizationService, + languageService, resourceName, resourceValue); } /// @@ -476,11 +476,11 @@ public static void AddOrUpdatePluginLocaleResource(this BasePlugin plugin, /// Language service /// Resource name /// Resource value - public static void AddOrUpdatePluginLocaleResource(this BasePlugin plugin, - ILocalizationService localizationService, - ILanguageService languageService, - string resourceName, - string resourceValue) + public static void AddOrUpdatePluginLocaleResource(this BasePlugin plugin, + ILocalizationService localizationService, + ILanguageService languageService, + string resourceName, + string resourceValue) { // Actually plugin instance is not required if (plugin == null) @@ -489,7 +489,7 @@ public static void AddOrUpdatePluginLocaleResource(this BasePlugin plugin, throw new ArgumentNullException("localizationService"); if (languageService == null) throw new ArgumentNullException("languageService"); - + foreach (var lang in languageService.GetAllLanguages(true)) { var lsr = localizationService.GetLocaleStringResourceByName(resourceName, lang.Id, false); @@ -526,63 +526,63 @@ public static void AddPluginLocaleResource(this BasePlugin plugin, ILocalization } } - /// - /// Get localized property value of a plugin - /// - /// Plugin - /// Plugin - /// Localization service - /// Name of the property - /// Language identifier - /// A value indicating whether to return default value (if localized is not found) - /// Localized value - public static string GetLocalizedValue(this T plugin, ILocalizationService localizationService, string propertyName, int languageId = 0, bool returnDefaultValue = true) - where T : IPlugin - { - if (plugin == null) - throw new ArgumentNullException(nameof(plugin)); - - if (plugin.PluginDescriptor == null) - throw new ArgumentNullException("PluginDescriptor cannot be loaded"); - - return plugin.PluginDescriptor.GetLocalizedValue(localizationService, propertyName, languageId, returnDefaultValue); - } - - /// - /// Get localized property value of a plugin - /// - /// Plugin descriptor - /// Localization service - /// Name of the property - /// Language identifier - /// A value indicating whether to return default value (if localized is not found) - /// Localized value - public static string GetLocalizedValue(this PluginDescriptor descriptor, ILocalizationService localizationService, string propertyName, int languageId = 0, bool returnDefaultValue = true) - { - if (localizationService == null) - throw new ArgumentNullException(nameof(localizationService)); - - if (descriptor == null) - throw new ArgumentNullException(nameof(descriptor)); - - if (propertyName == null) - throw new ArgumentNullException(nameof(propertyName)); - - string systemName = descriptor.SystemName; - string resourceName = string.Format("Plugins.{0}.{1}", propertyName, systemName); - string result = localizationService.GetResource(resourceName, languageId, false, "", true); - - if (String.IsNullOrEmpty(result) && returnDefaultValue) - { - var fastProp = FastProperty.GetProperty(descriptor.GetType(), propertyName); - if (fastProp != null) - { - result = fastProp.GetValue(descriptor) as string; - } - } - - return result; - } + /// + /// Get localized property value of a plugin + /// + /// Plugin + /// Plugin + /// Localization service + /// Name of the property + /// Language identifier + /// A value indicating whether to return default value (if localized is not found) + /// Localized value + public static string GetLocalizedValue(this T plugin, ILocalizationService localizationService, string propertyName, int languageId = 0, bool returnDefaultValue = true) + where T : IPlugin + { + if (plugin == null) + throw new ArgumentNullException(nameof(plugin)); + + if (plugin.PluginDescriptor == null) + throw new ArgumentNullException("PluginDescriptor cannot be loaded"); + + return plugin.PluginDescriptor.GetLocalizedValue(localizationService, propertyName, languageId, returnDefaultValue); + } + + /// + /// Get localized property value of a plugin + /// + /// Plugin descriptor + /// Localization service + /// Name of the property + /// Language identifier + /// A value indicating whether to return default value (if localized is not found) + /// Localized value + public static string GetLocalizedValue(this PluginDescriptor descriptor, ILocalizationService localizationService, string propertyName, int languageId = 0, bool returnDefaultValue = true) + { + if (localizationService == null) + throw new ArgumentNullException(nameof(localizationService)); + + if (descriptor == null) + throw new ArgumentNullException(nameof(descriptor)); + + if (propertyName == null) + throw new ArgumentNullException(nameof(propertyName)); + + string systemName = descriptor.SystemName; + string resourceName = string.Format("Plugins.{0}.{1}", propertyName, systemName); + string result = localizationService.GetResource(resourceName, languageId, false, "", true); + + if (String.IsNullOrEmpty(result) && returnDefaultValue) + { + var fastProp = FastProperty.GetProperty(descriptor.GetType(), propertyName); + if (fastProp != null) + { + result = fastProp.GetValue(descriptor) as string; + } + } + + return result; + } /// /// Save localized plugin descriptor value @@ -594,7 +594,7 @@ public static string GetLocalizedValue(this PluginDescriptor descriptor, ILocali /// Name of the property /// Localized value public static void SaveLocalizedValue(this T plugin, ILocalizationService localizationService, int languageId, - string propertyName, string value) where T : IPlugin + string propertyName, string value) where T : IPlugin { if (plugin == null) throw new ArgumentNullException("plugin"); @@ -602,7 +602,7 @@ public static void SaveLocalizedValue(this T plugin, ILocalizationService loc if (plugin.PluginDescriptor == null) throw new ArgumentNullException("PluginDescriptor cannot be loaded"); - plugin.PluginDescriptor.SaveLocalizedValue(localizationService, languageId, propertyName, value); + plugin.PluginDescriptor.SaveLocalizedValue(localizationService, languageId, propertyName, value); } /// @@ -614,7 +614,7 @@ public static void SaveLocalizedValue(this T plugin, ILocalizationService loc /// Name of the property /// Localized value public static void SaveLocalizedValue(this PluginDescriptor descriptor, ILocalizationService localizationService, int languageId, - string propertyName, string value) + string propertyName, string value) { if (localizationService == null) throw new ArgumentNullException(nameof(localizationService)); @@ -625,8 +625,8 @@ public static void SaveLocalizedValue(this PluginDescriptor descriptor, ILocaliz if (descriptor == null) throw new ArgumentNullException(nameof(descriptor)); - if (propertyName == null) - throw new ArgumentNullException(nameof(propertyName)); + if (propertyName == null) + throw new ArgumentNullException(nameof(propertyName)); string systemName = descriptor.SystemName; string resourceName = string.Format("Plugins.{0}.{1}", propertyName, systemName); @@ -667,8 +667,8 @@ public static void SaveLocalizedValue(this PluginDescriptor descriptor, ILocaliz /// /// Language /// XML - public static void ImportResourcesFromXml(this ILocalizationService service, - Language language, + public static void ImportResourcesFromXml(this ILocalizationService service, + Language language, string xml, string rootKey = null, bool sourceIsPlugin = false, diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizationService.cs b/src/Libraries/SmartStore.Services/Localization/LocalizationService.cs index b83ccf27de..abe7e3a8a9 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizationService.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizationService.cs @@ -21,29 +21,29 @@ namespace SmartStore.Services.Localization { - public partial class LocalizationService : ILocalizationService + public partial class LocalizationService : ILocalizationService { - /// - /// 0 = language id - /// - const string LOCALESTRINGRESOURCES_SEGMENT_KEY = "localization:{0}"; - const string LOCALESTRINGRESOURCES_SEGMENT_PATTERN = "localization:*"; + /// + /// 0 = language id + /// + const string LOCALESTRINGRESOURCES_SEGMENT_KEY = "localization:{0}"; + const string LOCALESTRINGRESOURCES_SEGMENT_PATTERN = "localization:*"; - private readonly IRepository _lsrRepo; + private readonly IRepository _lsrRepo; private readonly IWorkContext _workContext; private readonly ILogger _logger; private readonly ILanguageService _languageService; private readonly ICacheManager _cacheManager; private readonly IDbContext _dbContext; - private int _notFoundLogCount = 0; - private int? _defaultLanguageId; + private int _notFoundLogCount = 0; + private int? _defaultLanguageId; public LocalizationService( - ICacheManager cacheManager, - ILogger logger, - IWorkContext workContext, - IRepository lsrRepository, + ICacheManager cacheManager, + ILogger logger, + IWorkContext workContext, + IRepository lsrRepository, ILanguageService languageService) { _cacheManager = cacheManager; @@ -51,40 +51,41 @@ public LocalizationService( _workContext = workContext; _lsrRepo = lsrRepository; _languageService = languageService; - _dbContext = lsrRepository.Context; + _dbContext = lsrRepository.Context; } public virtual void DeleteLocaleStringResource(LocaleStringResource resource) { - Guard.NotNull(resource, nameof(resource)); + Guard.NotNull(resource, nameof(resource)); // cache - ClearCacheSegment(resource.LanguageId); - + ClearCacheSegment(resource.LanguageId); + // db _lsrRepo.Delete(resource); } - public virtual int DeleteLocaleStringResources(string key, bool keyIsRootKey = true) { - int result = 0; + public virtual int DeleteLocaleStringResources(string key, bool keyIsRootKey = true) + { + int result = 0; - if (key.HasValue()) + if (key.HasValue()) { - try + try { - var sqlDelete = "Delete From LocaleStringResource Where ResourceName Like '{0}%'".FormatWith(key.EndsWith(".") || !keyIsRootKey ? key : key + "."); - result = _dbContext.ExecuteSqlCommand(sqlDelete); + var sqlDelete = "Delete From LocaleStringResource Where ResourceName Like '{0}%'".FormatWith(key.EndsWith(".") || !keyIsRootKey ? key : key + "."); + result = _dbContext.ExecuteSqlCommand(sqlDelete); - ClearCacheSegment(null); - } - catch (Exception exc) + ClearCacheSegment(null); + } + catch (Exception exc) { - exc.Dump(); - } - } + exc.Dump(); + } + } - return result; - } + return result; + } public virtual LocaleStringResource GetLocaleStringResourceById(int localeStringResourceId) { @@ -124,145 +125,145 @@ orderby lsr.ResourceName where lsr.LanguageId == languageId select lsr; - return query; + return query; } - public virtual IList GetResourcesByPattern(string pattern, int languageId) - { - Guard.NotEmpty(pattern, nameof(pattern)); + public virtual IList GetResourcesByPattern(string pattern, int languageId) + { + Guard.NotEmpty(pattern, nameof(pattern)); - var query = from l in _lsrRepo.Table - where l.ResourceName.StartsWith(pattern) && l.LanguageId == languageId - select l; + var query = from l in _lsrRepo.Table + where l.ResourceName.StartsWith(pattern) && l.LanguageId == languageId + select l; - var resources = query.ToList(); - return resources; - } + var resources = query.ToList(); + return resources; + } - public virtual void InsertLocaleStringResource(LocaleStringResource resource) + public virtual void InsertLocaleStringResource(LocaleStringResource resource) { - Guard.NotNull(resource, nameof(resource)); + Guard.NotNull(resource, nameof(resource)); _lsrRepo.Insert(resource); - // cache - ClearCacheSegment(resource.LanguageId); + // cache + ClearCacheSegment(resource.LanguageId); } public virtual void UpdateLocaleStringResource(LocaleStringResource resource) { - Guard.NotNull(resource, nameof(resource)); + Guard.NotNull(resource, nameof(resource)); // cache - ClearCacheSegment(resource.LanguageId); + ClearCacheSegment(resource.LanguageId); + + _lsrRepo.Update(resource); + } + + protected virtual IDictionary GetCacheSegment(int languageId) + { + var cacheKey = BuildCacheSegmentKey(languageId); + + return _cacheManager.Get(cacheKey, () => + { + var resources = _lsrRepo.TableUntracked + .Where(x => x.LanguageId == languageId) + .Select(x => new { x.ResourceName, x.ResourceValue }) + //.OrderBy(x => x.ResourceName) + .ToList(); + + var dict = new Dictionary(resources.Count); + + foreach (var res in resources) + { + dict[res.ResourceName.ToLowerInvariant()] = res.ResourceValue; + } - _lsrRepo.Update(resource); + return dict; + }); } - protected virtual IDictionary GetCacheSegment(int languageId) - { - var cacheKey = BuildCacheSegmentKey(languageId); - - return _cacheManager.Get(cacheKey, () => - { - var resources = _lsrRepo.TableUntracked - .Where(x => x.LanguageId == languageId) - .Select(x => new { x.ResourceName, x.ResourceValue }) - //.OrderBy(x => x.ResourceName) - .ToList(); - - var dict = new Dictionary(resources.Count); - - foreach (var res in resources) - { - dict[res.ResourceName.ToLowerInvariant()] = res.ResourceValue; - } - - return dict; - }); - } - - /// - /// Clears the cached resource segment from the cache - /// - /// Language Id. If null, segments for all cached languages will be invalidated - protected virtual void ClearCacheSegment(int? languageId = null) - { - if (languageId.HasValue && languageId.Value > 0) - { - _cacheManager.Remove(BuildCacheSegmentKey(languageId.Value)); - } - else - { - _cacheManager.RemoveByPattern(LOCALESTRINGRESOURCES_SEGMENT_PATTERN); - } - } + /// + /// Clears the cached resource segment from the cache + /// + /// Language Id. If null, segments for all cached languages will be invalidated + protected virtual void ClearCacheSegment(int? languageId = null) + { + if (languageId.HasValue && languageId.Value > 0) + { + _cacheManager.Remove(BuildCacheSegmentKey(languageId.Value)); + } + else + { + _cacheManager.RemoveByPattern(LOCALESTRINGRESOURCES_SEGMENT_PATTERN); + } + } public virtual string GetResource( - string resourceKey, - int languageId = 0, - bool logIfNotFound = true, - string defaultValue = "", - bool returnEmptyIfNotFound = false) + string resourceKey, + int languageId = 0, + bool logIfNotFound = true, + string defaultValue = "", + bool returnEmptyIfNotFound = false) { if (languageId <= 0) { if (_workContext.WorkingLanguage == null) - { - return defaultValue; - } - + { + return defaultValue; + } + languageId = _workContext.WorkingLanguage.Id; } - - string result = string.Empty; + + string result = string.Empty; resourceKey = resourceKey.EmptyNull().Trim().ToLowerInvariant(); - var cachedSegment = GetCacheSegment(languageId); + var cachedSegment = GetCacheSegment(languageId); if (!cachedSegment.TryGetValue(resourceKey, out result)) { - if (logIfNotFound) - { - if (_notFoundLogCount < 50) - { - _logger.Warn(string.Format("Resource string ({0}) does not exist. Language ID = {1}", resourceKey, languageId)); - } - else if (_notFoundLogCount == 50) - { - _logger.Warn("Too many language resources do not exist (> 50). Stopped logging missing resources to prevent performance drop."); - } - - _notFoundLogCount++; - } - + if (logIfNotFound) + { + if (_notFoundLogCount < 50) + { + _logger.Warn(string.Format("Resource string ({0}) does not exist. Language ID = {1}", resourceKey, languageId)); + } + else if (_notFoundLogCount == 50) + { + _logger.Warn("Too many language resources do not exist (> 50). Stopped logging missing resources to prevent performance drop."); + } + + _notFoundLogCount++; + } + if (!String.IsNullOrEmpty(defaultValue)) { result = defaultValue; } else { - // try fallback to default language - if (!_defaultLanguageId.HasValue) - { - _defaultLanguageId = _languageService.GetDefaultLanguageId(); - } - - var defaultLangId = _defaultLanguageId.Value; - if (defaultLangId > 0 && defaultLangId != languageId) - { - var fallbackResult = GetResource(resourceKey, defaultLangId, false, resourceKey); - if (fallbackResult != resourceKey) - { - result = fallbackResult; - } - } - - if (!returnEmptyIfNotFound && result.IsEmpty()) - { - result = resourceKey; - } + // try fallback to default language + if (!_defaultLanguageId.HasValue) + { + _defaultLanguageId = _languageService.GetDefaultLanguageId(); + } + + var defaultLangId = _defaultLanguageId.Value; + if (defaultLangId > 0 && defaultLangId != languageId) + { + var fallbackResult = GetResource(resourceKey, defaultLangId, false, resourceKey); + if (fallbackResult != resourceKey) + { + result = fallbackResult; + } + } + + if (!returnEmptyIfNotFound && result.IsEmpty()) + { + result = resourceKey; + } } } @@ -271,7 +272,7 @@ public virtual string GetResource( public virtual string ExportResourcesToXml(Language language) { - Guard.NotNull(language, nameof(language)); + Guard.NotNull(language, nameof(language)); var sb = new StringBuilder(); var stringWriter = new StringWriter(sb); @@ -280,20 +281,20 @@ public virtual string ExportResourcesToXml(Language language) xmlWriter.WriteStartElement("Language"); xmlWriter.WriteAttributeString("Name", language.Name); - using (var scope = new DbContextScope(forceNoTracking: true)) - { - var resources = All(language.Id).ToList(); - foreach (var resource in resources) - { - if (resource.IsFromPlugin.GetValueOrDefault() == false) - { - xmlWriter.WriteStartElement("LocaleResource"); - xmlWriter.WriteAttributeString("Name", resource.ResourceName); - xmlWriter.WriteElementString("Value", null, resource.ResourceValue); - xmlWriter.WriteEndElement(); - } - } - } + using (var scope = new DbContextScope(forceNoTracking: true)) + { + var resources = All(language.Id).ToList(); + foreach (var resource in resources) + { + if (resource.IsFromPlugin.GetValueOrDefault() == false) + { + xmlWriter.WriteStartElement("LocaleResource"); + xmlWriter.WriteAttributeString("Name", resource.ResourceName); + xmlWriter.WriteElementString("Value", null, resource.ResourceValue); + xmlWriter.WriteEndElement(); + } + } + } xmlWriter.WriteEndElement(); xmlWriter.WriteEndDocument(); @@ -301,283 +302,283 @@ public virtual string ExportResourcesToXml(Language language) return stringWriter.ToString(); } - public DirectoryHasher CreatePluginResourcesHasher(PluginDescriptor pluginDescriptor) + public DirectoryHasher CreatePluginResourcesHasher(PluginDescriptor pluginDescriptor) + { + return new DirectoryHasher(Path.Combine(pluginDescriptor.PhysicalPath, "Localization"), "resources.*.xml"); + } + + public virtual void ImportPluginResourcesFromXml( + PluginDescriptor pluginDescriptor, + IList targetList = null, + bool updateTouchedResources = true, + IList filterLanguages = null) { - return new DirectoryHasher(Path.Combine(pluginDescriptor.PhysicalPath, "Localization"), "resources.*.xml"); - } - - public virtual void ImportPluginResourcesFromXml( - PluginDescriptor pluginDescriptor, - IList targetList = null, - bool updateTouchedResources = true, - IList filterLanguages = null) - { - var directory = new DirectoryInfo(Path.Combine(pluginDescriptor.PhysicalPath, "Localization")); - - if (!directory.Exists) - return; - - if (targetList == null && updateTouchedResources) - { - DeleteLocaleStringResources(pluginDescriptor.ResourceRootKey); - } - - var unprocessedLanguages = new List(); - - var defaultLanguageId = _languageService.GetDefaultLanguageId(); - var languages = filterLanguages ?? _languageService.GetAllLanguages(true); - - string code = null; - foreach (var language in languages) - { - code = ImportPluginResourcesForLanguage( - language, - null, - directory, - pluginDescriptor.ResourceRootKey, - targetList, - updateTouchedResources, - false); - - if (code == null) - { - unprocessedLanguages.Add(language); - } - } - - if (filterLanguages == null && unprocessedLanguages.Count > 0) - { - // There were unprocessed languages (no corresponding resource file could be found). - // In order for GetResource() to be able to gracefully fallback to the default language's resources, - // we need to import resources for the current default language.... - var processedLanguages = languages.Except(unprocessedLanguages).ToList(); - if (!processedLanguages.Any(x => x.Id == defaultLanguageId)) - { - // ...but only if no resource file could be mapped to the default language before, - // namely because in this case the following operation would be redundant. - var defaultLanguage = _languageService.GetLanguageById(_languageService.GetDefaultLanguageId()); - if (defaultLanguage != null) - { - ImportPluginResourcesForLanguage( - defaultLanguage, - "en-us", - directory, - pluginDescriptor.ResourceRootKey, - targetList, - updateTouchedResources, - true); - } - } - } - - try + var directory = new DirectoryInfo(Path.Combine(pluginDescriptor.PhysicalPath, "Localization")); + + if (!directory.Exists) + return; + + if (targetList == null && updateTouchedResources) { - var hasher = CreatePluginResourcesHasher(pluginDescriptor); - hasher.Persist(); - } - catch { } - } - - private string ImportPluginResourcesForLanguage( - Language language, - string fileCode, - DirectoryInfo directory, - string resourceRootKey, - IList targetList, - bool updateTouchedResources, - bool canFallBackToAnyResourceFile) - { - var fileNamePattern = "resources.{0}.xml"; - - var codeCandidates = GetResourceFileCodeCandidates( - fileCode ?? language.LanguageCulture, - directory, - canFallBackToAnyResourceFile); - - string path = null; - string code = null; - - foreach (var candidate in codeCandidates) - { - var pathCandidate = Path.Combine(directory.FullName, fileNamePattern.FormatInvariant(candidate)); - if (File.Exists(pathCandidate)) - { - code = candidate; - path = pathCandidate; - break; - } - } - - if (code != null) - { - var doc = new XmlDocument(); - - doc.Load(path); - doc = FlattenResourceFile(doc); - - if (targetList == null) - { - ImportResourcesFromXml(language, doc, resourceRootKey, true, updateTouchedResources: updateTouchedResources); - } - else - { - var nodes = doc.SelectNodes(@"//Language/LocaleResource"); - foreach (XmlNode node in nodes) - { - var valueNode = node.SelectSingleNode("Value"); - var res = new LocaleStringResource - { - ResourceName = node.Attributes["Name"].InnerText.Trim(), - ResourceValue = (valueNode == null ? "" : valueNode.InnerText), - LanguageId = language.Id, - IsFromPlugin = true - }; - - if (res.ResourceName.HasValue()) - { - targetList.Add(res); - } - } - } - } - - return code; - } - - private IEnumerable GetResourceFileCodeCandidates(string code, DirectoryInfo directory, bool canFallBackToAnyResourceFile) - { - // exact match (de-DE) - yield return code; - - // neutral culture (de) - var ci = CultureInfo.GetCultureInfo(code); - if (ci.Parent != null && !ci.IsNeutralCulture) - { - code = ci.Parent.Name; - yield return code; - } - - var rgFileName = new Regex("^resources.(.+?).xml$", RegexOptions.Compiled | RegexOptions.IgnoreCase); - - // any other region with same language (de-*) - foreach (var fi in directory.EnumerateFiles("resources.{0}-*.xml".FormatInvariant(code), SearchOption.TopDirectoryOnly)) - { - code = rgFileName.Match(fi.Name).Groups[1].Value; - if (LocalizationHelper.IsValidCultureCode(code)) - { - yield return code; - yield break; - } - } - - if (canFallBackToAnyResourceFile) - { - foreach (var fi in directory.EnumerateFiles("resources.*.xml", SearchOption.TopDirectoryOnly)) - { - code = rgFileName.Match(fi.Name).Groups[1].Value; - if (LocalizationHelper.IsValidCultureCode(code)) - { - yield return code; - yield break; - } - } - } - } - - public virtual int ImportResourcesFromXml( - Language language, - XmlDocument xmlDocument, - string rootKey = null, - bool sourceIsPlugin = false, + DeleteLocaleStringResources(pluginDescriptor.ResourceRootKey); + } + + var unprocessedLanguages = new List(); + + var defaultLanguageId = _languageService.GetDefaultLanguageId(); + var languages = filterLanguages ?? _languageService.GetAllLanguages(true); + + string code = null; + foreach (var language in languages) + { + code = ImportPluginResourcesForLanguage( + language, + null, + directory, + pluginDescriptor.ResourceRootKey, + targetList, + updateTouchedResources, + false); + + if (code == null) + { + unprocessedLanguages.Add(language); + } + } + + if (filterLanguages == null && unprocessedLanguages.Count > 0) + { + // There were unprocessed languages (no corresponding resource file could be found). + // In order for GetResource() to be able to gracefully fallback to the default language's resources, + // we need to import resources for the current default language.... + var processedLanguages = languages.Except(unprocessedLanguages).ToList(); + if (!processedLanguages.Any(x => x.Id == defaultLanguageId)) + { + // ...but only if no resource file could be mapped to the default language before, + // namely because in this case the following operation would be redundant. + var defaultLanguage = _languageService.GetLanguageById(_languageService.GetDefaultLanguageId()); + if (defaultLanguage != null) + { + ImportPluginResourcesForLanguage( + defaultLanguage, + "en-us", + directory, + pluginDescriptor.ResourceRootKey, + targetList, + updateTouchedResources, + true); + } + } + } + + try + { + var hasher = CreatePluginResourcesHasher(pluginDescriptor); + hasher.Persist(); + } + catch { } + } + + private string ImportPluginResourcesForLanguage( + Language language, + string fileCode, + DirectoryInfo directory, + string resourceRootKey, + IList targetList, + bool updateTouchedResources, + bool canFallBackToAnyResourceFile) + { + var fileNamePattern = "resources.{0}.xml"; + + var codeCandidates = GetResourceFileCodeCandidates( + fileCode ?? language.LanguageCulture, + directory, + canFallBackToAnyResourceFile); + + string path = null; + string code = null; + + foreach (var candidate in codeCandidates) + { + var pathCandidate = Path.Combine(directory.FullName, fileNamePattern.FormatInvariant(candidate)); + if (File.Exists(pathCandidate)) + { + code = candidate; + path = pathCandidate; + break; + } + } + + if (code != null) + { + var doc = new XmlDocument(); + + doc.Load(path); + doc = FlattenResourceFile(doc); + + if (targetList == null) + { + ImportResourcesFromXml(language, doc, resourceRootKey, true, updateTouchedResources: updateTouchedResources); + } + else + { + var nodes = doc.SelectNodes(@"//Language/LocaleResource"); + foreach (XmlNode node in nodes) + { + var valueNode = node.SelectSingleNode("Value"); + var res = new LocaleStringResource + { + ResourceName = node.Attributes["Name"].InnerText.Trim(), + ResourceValue = (valueNode == null ? "" : valueNode.InnerText), + LanguageId = language.Id, + IsFromPlugin = true + }; + + if (res.ResourceName.HasValue()) + { + targetList.Add(res); + } + } + } + } + + return code; + } + + private IEnumerable GetResourceFileCodeCandidates(string code, DirectoryInfo directory, bool canFallBackToAnyResourceFile) + { + // exact match (de-DE) + yield return code; + + // neutral culture (de) + var ci = CultureInfo.GetCultureInfo(code); + if (ci.Parent != null && !ci.IsNeutralCulture) + { + code = ci.Parent.Name; + yield return code; + } + + var rgFileName = new Regex("^resources.(.+?).xml$", RegexOptions.Compiled | RegexOptions.IgnoreCase); + + // any other region with same language (de-*) + foreach (var fi in directory.EnumerateFiles("resources.{0}-*.xml".FormatInvariant(code), SearchOption.TopDirectoryOnly)) + { + code = rgFileName.Match(fi.Name).Groups[1].Value; + if (LocalizationHelper.IsValidCultureCode(code)) + { + yield return code; + yield break; + } + } + + if (canFallBackToAnyResourceFile) + { + foreach (var fi in directory.EnumerateFiles("resources.*.xml", SearchOption.TopDirectoryOnly)) + { + code = rgFileName.Match(fi.Name).Groups[1].Value; + if (LocalizationHelper.IsValidCultureCode(code)) + { + yield return code; + yield break; + } + } + } + } + + public virtual int ImportResourcesFromXml( + Language language, + XmlDocument xmlDocument, + string rootKey = null, + bool sourceIsPlugin = false, ImportModeFlags mode = ImportModeFlags.Insert | ImportModeFlags.Update, bool updateTouchedResources = false) - { - using (var scope = new DbContextScope(autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false, forceNoTracking: true, hooksEnabled: false)) - { - var toAdd = new List(); - var toUpdate = new List(); - var nodes = xmlDocument.SelectNodes(@"//Language/LocaleResource"); - - var resources = language.LocaleStringResources.ToDictionarySafe(x => x.ResourceName, StringComparer.OrdinalIgnoreCase); - - LocaleStringResource resource; - - foreach (var xel in nodes.Cast()) - { - string name = xel.GetAttribute("Name").TrimSafe(); - string value = ""; - var valueNode = xel.SelectSingleNode("Value"); - if (valueNode != null) - value = valueNode.InnerText; - - if (String.IsNullOrEmpty(name)) - continue; - - if (rootKey.HasValue()) - { - if (!xel.GetAttributeText("AppendRootKey").IsCaseInsensitiveEqual("false")) - name = "{0}.{1}".FormatWith(rootKey, name); - } - - resource = null; - - // do not use "Insert"/"Update" methods because they clear cache - // let's bulk insert - //var resource = language.LocaleStringResources.Where(x => x.ResourceName.Equals(name, StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault(); - if (resources.TryGetValue(name, out resource)) - { - if (mode.HasFlag(ImportModeFlags.Update)) - { - if (updateTouchedResources || !resource.IsTouched.GetValueOrDefault()) - { - if (value != resource.ResourceValue) - { - resource.ResourceValue = value; - resource.IsTouched = null; - toUpdate.Add(resource); - } - } - } - } - else - { - if (mode.HasFlag(ImportModeFlags.Insert)) - { - toAdd.Add( - new LocaleStringResource - { - LanguageId = language.Id, - ResourceName = name, - ResourceValue = value, - IsFromPlugin = sourceIsPlugin - }); - } - } - } - - //_lsrRepository.AutoCommitEnabled = true; - - if (toAdd.Any() || toUpdate.Any()) - { - var segmentKeys = new HashSet(); - - _lsrRepo.InsertRange(toAdd); - toAdd.Clear(); - - _lsrRepo.UpdateRange(toUpdate); - toUpdate.Clear(); - - int num = _lsrRepo.Context.SaveChanges(); - - // clear cache - ClearCacheSegment(language.Id); - - return num; - } - - return 0; - } - } + { + using (var scope = new DbContextScope(autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false, forceNoTracking: true, hooksEnabled: false)) + { + var toAdd = new List(); + var toUpdate = new List(); + var nodes = xmlDocument.SelectNodes(@"//Language/LocaleResource"); + + var resources = language.LocaleStringResources.ToDictionarySafe(x => x.ResourceName, StringComparer.OrdinalIgnoreCase); + + LocaleStringResource resource; + + foreach (var xel in nodes.Cast()) + { + string name = xel.GetAttribute("Name").TrimSafe(); + string value = ""; + var valueNode = xel.SelectSingleNode("Value"); + if (valueNode != null) + value = valueNode.InnerText; + + if (String.IsNullOrEmpty(name)) + continue; + + if (rootKey.HasValue()) + { + if (!xel.GetAttributeText("AppendRootKey").IsCaseInsensitiveEqual("false")) + name = "{0}.{1}".FormatWith(rootKey, name); + } + + resource = null; + + // do not use "Insert"/"Update" methods because they clear cache + // let's bulk insert + //var resource = language.LocaleStringResources.Where(x => x.ResourceName.Equals(name, StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault(); + if (resources.TryGetValue(name, out resource)) + { + if (mode.HasFlag(ImportModeFlags.Update)) + { + if (updateTouchedResources || !resource.IsTouched.GetValueOrDefault()) + { + if (value != resource.ResourceValue) + { + resource.ResourceValue = value; + resource.IsTouched = null; + toUpdate.Add(resource); + } + } + } + } + else + { + if (mode.HasFlag(ImportModeFlags.Insert)) + { + toAdd.Add( + new LocaleStringResource + { + LanguageId = language.Id, + ResourceName = name, + ResourceValue = value, + IsFromPlugin = sourceIsPlugin + }); + } + } + } + + //_lsrRepository.AutoCommitEnabled = true; + + if (toAdd.Any() || toUpdate.Any()) + { + var segmentKeys = new HashSet(); + + _lsrRepo.InsertRange(toAdd); + toAdd.Clear(); + + _lsrRepo.UpdateRange(toUpdate); + toUpdate.Clear(); + + int num = _lsrRepo.Context.SaveChanges(); + + // clear cache + ClearCacheSegment(language.Id); + + return num; + } + + return 0; + } + } public virtual XmlDocument FlattenResourceFile(XmlDocument source) { @@ -641,19 +642,19 @@ private void RecursivelyWriteResource(LocaleStringResourceParent resource, XmlWr writer.WriteString(resource.NameWithNamespace); writer.WriteEndAttribute(); - if (resource.AppendRootKey.HasValue) - { - writer.WriteStartAttribute("AppendRootKey", ""); - writer.WriteString(resource.AppendRootKey.Value ? "true" : "false"); - writer.WriteEndAttribute(); - parentAppendRootKey = resource.AppendRootKey; - } - else if (parentAppendRootKey.HasValue) - { - writer.WriteStartAttribute("AppendRootKey", ""); - writer.WriteString(parentAppendRootKey.Value ? "true" : "false"); - writer.WriteEndAttribute(); - } + if (resource.AppendRootKey.HasValue) + { + writer.WriteStartAttribute("AppendRootKey", ""); + writer.WriteString(resource.AppendRootKey.Value ? "true" : "false"); + writer.WriteEndAttribute(); + parentAppendRootKey = resource.AppendRootKey; + } + else if (parentAppendRootKey.HasValue) + { + writer.WriteStartAttribute("AppendRootKey", ""); + writer.WriteString(parentAppendRootKey.Value ? "true" : "false"); + writer.WriteEndAttribute(); + } writer.WriteStartElement("Value", ""); writer.WriteString(resource.ResourceValue); @@ -664,7 +665,7 @@ private void RecursivelyWriteResource(LocaleStringResourceParent resource, XmlWr foreach (var child in resource.ChildLocaleStringResources) { - RecursivelyWriteResource(child, writer, resource.AppendRootKey ?? parentAppendRootKey); + RecursivelyWriteResource(child, writer, resource.AppendRootKey ?? parentAppendRootKey); } } @@ -679,10 +680,10 @@ private void RecursivelySortChildrenResource(LocaleStringResourceParent resource } } - private string BuildCacheSegmentKey(int languageId) - { - return String.Format(LOCALESTRINGRESOURCES_SEGMENT_KEY, languageId); - } + private string BuildCacheSegmentKey(int languageId) + { + return String.Format(LOCALESTRINGRESOURCES_SEGMENT_KEY, languageId); + } private class LocaleStringResourceParent : LocaleStringResource { @@ -703,11 +704,11 @@ public LocaleStringResourceParent(XmlNode localStringResource, string nameSpace } ResourceName = resName; - var appendRootKeyAttribute = localStringResource.Attributes["AppendRootKey"]; - if (appendRootKeyAttribute != null) - { - AppendRootKey = appendRootKeyAttribute.Value.ToBool(true); - } + var appendRootKeyAttribute = localStringResource.Attributes["AppendRootKey"]; + if (appendRootKeyAttribute != null) + { + AppendRootKey = appendRootKeyAttribute.Value.ToBool(true); + } if (resValueNode == null || string.IsNullOrEmpty(resValueNode.InnerText.Trim())) { @@ -731,7 +732,7 @@ public LocaleStringResourceParent(XmlNode localStringResource, string nameSpace public bool IsPersistable { get; set; } - public bool? AppendRootKey { get; set; } + public bool? AppendRootKey { get; set; } public string NameWithNamespace { diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityHelper.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityHelper.cs index 9c6b90aa54..e0603aefd5 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityHelper.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityHelper.cs @@ -19,7 +19,7 @@ public class LocalizedEntityHelper private readonly Language _defaultLanguage; public LocalizedEntityHelper( - ILanguageService languageService, + ILanguageService languageService, ILocalizedEntityService localizedEntityService, IUrlRecordService urlRecordService, IWorkContext workContext) diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs index 87e35e2839..d462fea9e7 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs @@ -14,165 +14,165 @@ namespace SmartStore.Services.Localization { - /// - /// Provides information about localizable entities - /// - public partial class LocalizedEntityService : ScopedServiceBase, ILocalizedEntityService + /// + /// Provides information about localizable entities + /// + public partial class LocalizedEntityService : ScopedServiceBase, ILocalizedEntityService { - /// - /// 0 = segment (keygroup.key.idrange), 1 = language id - /// - const string LOCALIZEDPROPERTY_SEGMENT_KEY = "localizedproperty:{0}-lang-{1}"; - const string LOCALIZEDPROPERTY_SEGMENT_PATTERN = "localizedproperty:{0}*"; - const string LOCALIZEDPROPERTY_ALLSEGMENTS_PATTERN = "localizedproperty:*"; - - private readonly IRepository _localizedPropertyRepository; + /// + /// 0 = segment (keygroup.key.idrange), 1 = language id + /// + const string LOCALIZEDPROPERTY_SEGMENT_KEY = "localizedproperty:{0}-lang-{1}"; + const string LOCALIZEDPROPERTY_SEGMENT_PATTERN = "localizedproperty:{0}*"; + const string LOCALIZEDPROPERTY_ALLSEGMENTS_PATTERN = "localizedproperty:*"; + + private readonly IRepository _localizedPropertyRepository; private readonly ICacheManager _cacheManager; - private readonly PerformanceSettings _performanceSettings; + private readonly PerformanceSettings _performanceSettings; - private readonly IDictionary _prefetchedCollections; - private static int _lastCacheSegmentSize = -1; + private readonly IDictionary _prefetchedCollections; + private static int _lastCacheSegmentSize = -1; public LocalizedEntityService( - ICacheManager cacheManager, - IRepository localizedPropertyRepository, - PerformanceSettings performanceSettings) + ICacheManager cacheManager, + IRepository localizedPropertyRepository, + PerformanceSettings performanceSettings) { _cacheManager = cacheManager; _localizedPropertyRepository = localizedPropertyRepository; - _performanceSettings = performanceSettings; - - _prefetchedCollections = new Dictionary(StringComparer.OrdinalIgnoreCase); - - ValidateCacheState(); - } - - private void ValidateCacheState() - { - // Ensure that after a segment size change the cache segments are invalidated. - var size = _performanceSettings.CacheSegmentSize; - var changed = _lastCacheSegmentSize == -1; - - if (size <= 0) - { - _performanceSettings.CacheSegmentSize = size = 1; - } - - if (_lastCacheSegmentSize > 0 && _lastCacheSegmentSize != size) - { - OnClearCache(); - changed = true; - } - - if (changed) - { - Interlocked.Exchange(ref _lastCacheSegmentSize, size); - } - } - - protected override void OnClearCache() - { - _cacheManager.RemoveByPattern(LOCALIZEDPROPERTY_ALLSEGMENTS_PATTERN); - } - - protected virtual IDictionary GetCacheSegment(string localeKeyGroup, string localeKey, int entityId, int languageId) - { - Guard.NotEmpty(localeKeyGroup, nameof(localeKeyGroup)); - Guard.NotEmpty(localeKey, nameof(localeKey)); - - var segmentKey = GetSegmentKeyPart(localeKeyGroup, localeKey, entityId, out var minEntityId, out var maxEntityId); - var cacheKey = BuildCacheSegmentKey(segmentKey, languageId); - - // TODO: (MC) skip caching product.fulldescription (?), OR - // ...additionally segment by entity id ranges. - - return _cacheManager.Get(cacheKey, () => - { - var properties = _localizedPropertyRepository.TableUntracked - .Where(x => x.EntityId >= minEntityId && x.EntityId <= maxEntityId && x.LocaleKey == localeKey && x.LocaleKeyGroup == localeKeyGroup && x.LanguageId == languageId) - .ToList(); - - var dict = new Dictionary(properties.Count); - - foreach (var prop in properties) - { - dict[prop.EntityId] = prop.LocaleValue.EmptyNull(); - } - - return dict; - }); - } - - /// - /// Clears the cached segment from the cache - /// - protected virtual void ClearCacheSegment(string localeKeyGroup, string localeKey, int entityId, int? languageId = null) - { - try - { - if (IsInScope) - return; - - var segmentKey = GetSegmentKeyPart(localeKeyGroup, localeKey, entityId); - - if (languageId.HasValue && languageId.Value > 0) - { - _cacheManager.Remove(BuildCacheSegmentKey(segmentKey, languageId.Value)); - } - else - { - _cacheManager.RemoveByPattern(LOCALIZEDPROPERTY_SEGMENT_PATTERN.FormatInvariant(segmentKey)); - } - } - catch { } - } - - public virtual string GetLocalizedValue(int languageId, int entityId, string localeKeyGroup, string localeKey) - { - if (_prefetchedCollections.TryGetValue(localeKeyGroup, out var collection)) - { - var cachedItem = collection.Find(languageId, entityId, localeKey); - if (cachedItem != null) - { - return cachedItem.LocaleValue; - } - } - - if (IsInScope) - { - return GetLocalizedValueUncached(languageId, entityId, localeKeyGroup, localeKey); - } - - if (languageId <= 0) - return string.Empty; - - var props = GetCacheSegment(localeKeyGroup, localeKey, entityId, languageId); - - if (!props.TryGetValue(entityId, out var val)) - { - return string.Empty; - } - - return val; - } - - protected string GetLocalizedValueUncached(int languageId, int entityId, string localeKeyGroup, string localeKey) - { - if (languageId <= 0) - return string.Empty; - - var query = from lp in _localizedPropertyRepository.TableUntracked - where - lp.EntityId == entityId && - lp.LocaleKey == localeKey && - lp.LocaleKeyGroup == localeKeyGroup && - lp.LanguageId == languageId - select lp.LocaleValue; - - return query.FirstOrDefault().EmptyNull(); - } - - public virtual IList GetLocalizedProperties(int entityId, string localeKeyGroup) + _performanceSettings = performanceSettings; + + _prefetchedCollections = new Dictionary(StringComparer.OrdinalIgnoreCase); + + ValidateCacheState(); + } + + private void ValidateCacheState() + { + // Ensure that after a segment size change the cache segments are invalidated. + var size = _performanceSettings.CacheSegmentSize; + var changed = _lastCacheSegmentSize == -1; + + if (size <= 0) + { + _performanceSettings.CacheSegmentSize = size = 1; + } + + if (_lastCacheSegmentSize > 0 && _lastCacheSegmentSize != size) + { + OnClearCache(); + changed = true; + } + + if (changed) + { + Interlocked.Exchange(ref _lastCacheSegmentSize, size); + } + } + + protected override void OnClearCache() + { + _cacheManager.RemoveByPattern(LOCALIZEDPROPERTY_ALLSEGMENTS_PATTERN); + } + + protected virtual IDictionary GetCacheSegment(string localeKeyGroup, string localeKey, int entityId, int languageId) + { + Guard.NotEmpty(localeKeyGroup, nameof(localeKeyGroup)); + Guard.NotEmpty(localeKey, nameof(localeKey)); + + var segmentKey = GetSegmentKeyPart(localeKeyGroup, localeKey, entityId, out var minEntityId, out var maxEntityId); + var cacheKey = BuildCacheSegmentKey(segmentKey, languageId); + + // TODO: (MC) skip caching product.fulldescription (?), OR + // ...additionally segment by entity id ranges. + + return _cacheManager.Get(cacheKey, () => + { + var properties = _localizedPropertyRepository.TableUntracked + .Where(x => x.EntityId >= minEntityId && x.EntityId <= maxEntityId && x.LocaleKey == localeKey && x.LocaleKeyGroup == localeKeyGroup && x.LanguageId == languageId) + .ToList(); + + var dict = new Dictionary(properties.Count); + + foreach (var prop in properties) + { + dict[prop.EntityId] = prop.LocaleValue.EmptyNull(); + } + + return dict; + }); + } + + /// + /// Clears the cached segment from the cache + /// + protected virtual void ClearCacheSegment(string localeKeyGroup, string localeKey, int entityId, int? languageId = null) + { + try + { + if (IsInScope) + return; + + var segmentKey = GetSegmentKeyPart(localeKeyGroup, localeKey, entityId); + + if (languageId.HasValue && languageId.Value > 0) + { + _cacheManager.Remove(BuildCacheSegmentKey(segmentKey, languageId.Value)); + } + else + { + _cacheManager.RemoveByPattern(LOCALIZEDPROPERTY_SEGMENT_PATTERN.FormatInvariant(segmentKey)); + } + } + catch { } + } + + public virtual string GetLocalizedValue(int languageId, int entityId, string localeKeyGroup, string localeKey) + { + if (_prefetchedCollections.TryGetValue(localeKeyGroup, out var collection)) + { + var cachedItem = collection.Find(languageId, entityId, localeKey); + if (cachedItem != null) + { + return cachedItem.LocaleValue; + } + } + + if (IsInScope) + { + return GetLocalizedValueUncached(languageId, entityId, localeKeyGroup, localeKey); + } + + if (languageId <= 0) + return string.Empty; + + var props = GetCacheSegment(localeKeyGroup, localeKey, entityId, languageId); + + if (!props.TryGetValue(entityId, out var val)) + { + return string.Empty; + } + + return val; + } + + protected string GetLocalizedValueUncached(int languageId, int entityId, string localeKeyGroup, string localeKey) + { + if (languageId <= 0) + return string.Empty; + + var query = from lp in _localizedPropertyRepository.TableUntracked + where + lp.EntityId == entityId && + lp.LocaleKey == localeKey && + lp.LocaleKeyGroup == localeKeyGroup && + lp.LanguageId == languageId + select lp.LocaleValue; + + return query.FirstOrDefault().EmptyNull(); + } + + public virtual IList GetLocalizedProperties(int entityId, string localeKeyGroup) { if (localeKeyGroup.IsEmpty()) return new List(); @@ -186,241 +186,241 @@ orderby x.Id return props; } - public virtual void PrefetchLocalizedProperties(string localeKeyGroup, int languageId, int[] entityIds, bool isRange = false, bool isSorted = false) - { - if (languageId == 0) - return; - - var collection = GetLocalizedPropertyCollectionInternal(localeKeyGroup, languageId, entityIds, isRange, isSorted); - - if (_prefetchedCollections.TryGetValue(localeKeyGroup, out var existing)) - { - collection.MergeWith(existing); - } - else - { - _prefetchedCollections[localeKeyGroup] = collection; - } - } - - public virtual LocalizedPropertyCollection GetLocalizedPropertyCollection(string localeKeyGroup, int[] entityIds, bool isRange = false, bool isSorted = false) - { - return GetLocalizedPropertyCollectionInternal(localeKeyGroup, 0, entityIds, isRange, isSorted); - } - - public virtual LocalizedPropertyCollection GetLocalizedPropertyCollectionInternal(string localeKeyGroup, int languageId, int[] entityIds, bool isRange = false, bool isSorted = false) - { - Guard.NotEmpty(localeKeyGroup, nameof(localeKeyGroup)); - - using (new DbContextScope(proxyCreation: false, lazyLoading: false)) - { - var query = from x in _localizedPropertyRepository.TableUntracked - where x.LocaleKeyGroup == localeKeyGroup - select x; - - var requestedSet = entityIds; - - if (entityIds != null && entityIds.Length > 0) - { - if (isRange) - { - if (!isSorted) - { - Array.Sort(entityIds); - } - - var min = entityIds[0]; - var max = entityIds[entityIds.Length - 1]; - - if (entityIds.Length == 2 && max > min + 1) - { - // Only min & max were passed, create the range sequence. - requestedSet = Enumerable.Range(min, max - min + 1).ToArray(); - } - - query = query.Where(x => x.EntityId >= min && x.EntityId <= max); - } - else - { - requestedSet = entityIds; - query = query.Where(x => entityIds.Contains(x.EntityId)); - } - } - - if (languageId > 0) - { - query = query.Where(x => x.LanguageId == languageId); - } - - return new LocalizedPropertyCollection(localeKeyGroup, requestedSet, query.ToList()); - } - } - - protected virtual LocalizedProperty GetLocalizedProperty(int languageId, int entityId, string localeKeyGroup, string localeKey) - { - var query = from lp in _localizedPropertyRepository.Table - where - lp.EntityId == entityId && - lp.LocaleKey == localeKey && - lp.LocaleKeyGroup == localeKeyGroup && - lp.LanguageId == languageId - select lp; - - return query.FirstOrDefault(); - } - - public virtual void InsertLocalizedProperty(LocalizedProperty property) + public virtual void PrefetchLocalizedProperties(string localeKeyGroup, int languageId, int[] entityIds, bool isRange = false, bool isSorted = false) { - Guard.NotNull(property, nameof(property)); + if (languageId == 0) + return; + + var collection = GetLocalizedPropertyCollectionInternal(localeKeyGroup, languageId, entityIds, isRange, isSorted); + + if (_prefetchedCollections.TryGetValue(localeKeyGroup, out var existing)) + { + collection.MergeWith(existing); + } + else + { + _prefetchedCollections[localeKeyGroup] = collection; + } + } - // db - _localizedPropertyRepository.Insert(property); - HasChanges = true; + public virtual LocalizedPropertyCollection GetLocalizedPropertyCollection(string localeKeyGroup, int[] entityIds, bool isRange = false, bool isSorted = false) + { + return GetLocalizedPropertyCollectionInternal(localeKeyGroup, 0, entityIds, isRange, isSorted); + } - // cache - ClearCacheSegment(property.LocaleKeyGroup, property.LocaleKey, property.EntityId, property.LanguageId); + public virtual LocalizedPropertyCollection GetLocalizedPropertyCollectionInternal(string localeKeyGroup, int languageId, int[] entityIds, bool isRange = false, bool isSorted = false) + { + Guard.NotEmpty(localeKeyGroup, nameof(localeKeyGroup)); + + using (new DbContextScope(proxyCreation: false, lazyLoading: false)) + { + var query = from x in _localizedPropertyRepository.TableUntracked + where x.LocaleKeyGroup == localeKeyGroup + select x; + + var requestedSet = entityIds; + + if (entityIds != null && entityIds.Length > 0) + { + if (isRange) + { + if (!isSorted) + { + Array.Sort(entityIds); + } + + var min = entityIds[0]; + var max = entityIds[entityIds.Length - 1]; + + if (entityIds.Length == 2 && max > min + 1) + { + // Only min & max were passed, create the range sequence. + requestedSet = Enumerable.Range(min, max - min + 1).ToArray(); + } + + query = query.Where(x => x.EntityId >= min && x.EntityId <= max); + } + else + { + requestedSet = entityIds; + query = query.Where(x => entityIds.Contains(x.EntityId)); + } + } + + if (languageId > 0) + { + query = query.Where(x => x.LanguageId == languageId); + } + + return new LocalizedPropertyCollection(localeKeyGroup, requestedSet, query.ToList()); + } + } + + protected virtual LocalizedProperty GetLocalizedProperty(int languageId, int entityId, string localeKeyGroup, string localeKey) + { + var query = from lp in _localizedPropertyRepository.Table + where + lp.EntityId == entityId && + lp.LocaleKey == localeKey && + lp.LocaleKeyGroup == localeKeyGroup && + lp.LanguageId == languageId + select lp; + + return query.FirstOrDefault(); + } + + public virtual void InsertLocalizedProperty(LocalizedProperty property) + { + Guard.NotNull(property, nameof(property)); + + // db + _localizedPropertyRepository.Insert(property); + HasChanges = true; + + // cache + ClearCacheSegment(property.LocaleKeyGroup, property.LocaleKey, property.EntityId, property.LanguageId); } public virtual void UpdateLocalizedProperty(LocalizedProperty property) { - Guard.NotNull(property, nameof(property)); + Guard.NotNull(property, nameof(property)); - // db - _localizedPropertyRepository.Update(property); - HasChanges = true; + // db + _localizedPropertyRepository.Update(property); + HasChanges = true; - // cache - ClearCacheSegment(property.LocaleKeyGroup, property.LocaleKey, property.EntityId, property.LanguageId); - } + // cache + ClearCacheSegment(property.LocaleKeyGroup, property.LocaleKey, property.EntityId, property.LanguageId); + } - public virtual void DeleteLocalizedProperty(LocalizedProperty property) - { - Guard.NotNull(property, nameof(property)); + public virtual void DeleteLocalizedProperty(LocalizedProperty property) + { + Guard.NotNull(property, nameof(property)); - // cache - ClearCacheSegment(property.LocaleKeyGroup, property.LocaleKey, property.EntityId, property.LanguageId); + // cache + ClearCacheSegment(property.LocaleKeyGroup, property.LocaleKey, property.EntityId, property.LanguageId); - // db - _localizedPropertyRepository.Delete(property); - HasChanges = true; - } + // db + _localizedPropertyRepository.Delete(property); + HasChanges = true; + } - public virtual LocalizedProperty GetLocalizedPropertyById(int localizedPropertyId) - { - if (localizedPropertyId == 0) - return null; + public virtual LocalizedProperty GetLocalizedPropertyById(int localizedPropertyId) + { + if (localizedPropertyId == 0) + return null; - var localizedProperty = _localizedPropertyRepository.GetById(localizedPropertyId); - return localizedProperty; - } + var localizedProperty = _localizedPropertyRepository.GetById(localizedPropertyId); + return localizedProperty; + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public virtual void SaveLocalizedValue( - T entity, + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public virtual void SaveLocalizedValue( + T entity, Expression> keySelector, string value, int languageId) where T : BaseEntity, ILocalizedEntity { - SaveLocalizedValue(entity, entity.Id, entity.GetEntityName(), keySelector, value, languageId); - } + SaveLocalizedValue(entity, entity.Id, entity.GetEntityName(), keySelector, value, languageId); + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public virtual void SaveLocalizedValue( - T entity, + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public virtual void SaveLocalizedValue( + T entity, Expression> keySelector, TPropType value, int languageId) where T : BaseEntity, ILocalizedEntity { - SaveLocalizedValue(entity, entity.Id, entity.GetEntityName(), keySelector, value, languageId); + SaveLocalizedValue(entity, entity.Id, entity.GetEntityName(), keySelector, value, languageId); } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public virtual void SaveLocalizedSetting( - TSetting settings, - Expression> keySelector, - TPropType value, - int languageId) where TSetting : class, ISettings - { - SaveLocalizedValue(settings, 0, typeof(TSetting).Name, keySelector, value, languageId); - } - - protected virtual void SaveLocalizedValue( - T obj, - int id, - string keyGroup, - Expression> keySelector, - TPropType value, - int languageId) where T : class - { - Guard.NotNull(obj, nameof(obj)); - Guard.NotEmpty(keyGroup, nameof(keyGroup)); - Guard.NotZero(languageId, nameof(languageId)); - - var member = keySelector.Body as MemberExpression; - if (member == null) - { - throw new ArgumentException($"Expression '{keySelector}' refers to a method, not a property."); - } - - var propInfo = member.Member as PropertyInfo; - if (propInfo == null) - { - throw new ArgumentException($"Expression '{keySelector}' refers to a field, not a property."); - } - - var key = propInfo.Name; - var valueStr = value.Convert(); - var prop = GetLocalizedProperty(languageId, id, keyGroup, key); - - if (prop != null) - { - if (valueStr.IsEmpty()) - { - // Delete - DeleteLocalizedProperty(prop); - } - else - { - // Update - if (prop.LocaleValue != valueStr) - { - prop.LocaleValue = valueStr; - UpdateLocalizedProperty(prop); - } - } - } - else - { - if (valueStr.HasValue()) - { - // insert - prop = new LocalizedProperty - { - EntityId = id, - LanguageId = languageId, - LocaleKey = key, - LocaleKeyGroup = keyGroup, - LocaleValue = valueStr - }; - InsertLocalizedProperty(prop); - } - } - } - - private string BuildCacheSegmentKey(string segment, int languageId) - { - return String.Format(LOCALIZEDPROPERTY_SEGMENT_KEY, segment, languageId); - } - - private string GetSegmentKeyPart(string localeKeyGroup, string localeKey, int entityId) - { - return GetSegmentKeyPart(localeKeyGroup, localeKey, entityId, out var minId, out var maxId); - } - - private string GetSegmentKeyPart(string localeKeyGroup, string localeKey, int entityId, out int minId, out int maxId) - { - maxId = entityId.GetRange(_performanceSettings.CacheSegmentSize, out minId); - return (localeKeyGroup + "." + localeKey + "." + maxId.ToString()).ToLowerInvariant(); - } - } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public virtual void SaveLocalizedSetting( + TSetting settings, + Expression> keySelector, + TPropType value, + int languageId) where TSetting : class, ISettings + { + SaveLocalizedValue(settings, 0, typeof(TSetting).Name, keySelector, value, languageId); + } + + protected virtual void SaveLocalizedValue( + T obj, + int id, + string keyGroup, + Expression> keySelector, + TPropType value, + int languageId) where T : class + { + Guard.NotNull(obj, nameof(obj)); + Guard.NotEmpty(keyGroup, nameof(keyGroup)); + Guard.NotZero(languageId, nameof(languageId)); + + var member = keySelector.Body as MemberExpression; + if (member == null) + { + throw new ArgumentException($"Expression '{keySelector}' refers to a method, not a property."); + } + + var propInfo = member.Member as PropertyInfo; + if (propInfo == null) + { + throw new ArgumentException($"Expression '{keySelector}' refers to a field, not a property."); + } + + var key = propInfo.Name; + var valueStr = value.Convert(); + var prop = GetLocalizedProperty(languageId, id, keyGroup, key); + + if (prop != null) + { + if (valueStr.IsEmpty()) + { + // Delete + DeleteLocalizedProperty(prop); + } + else + { + // Update + if (prop.LocaleValue != valueStr) + { + prop.LocaleValue = valueStr; + UpdateLocalizedProperty(prop); + } + } + } + else + { + if (valueStr.HasValue()) + { + // insert + prop = new LocalizedProperty + { + EntityId = id, + LanguageId = languageId, + LocaleKey = key, + LocaleKeyGroup = keyGroup, + LocaleValue = valueStr + }; + InsertLocalizedProperty(prop); + } + } + } + + private string BuildCacheSegmentKey(string segment, int languageId) + { + return String.Format(LOCALIZEDPROPERTY_SEGMENT_KEY, segment, languageId); + } + + private string GetSegmentKeyPart(string localeKeyGroup, string localeKey, int entityId) + { + return GetSegmentKeyPart(localeKeyGroup, localeKey, entityId, out var minId, out var maxId); + } + + private string GetSegmentKeyPart(string localeKeyGroup, string localeKey, int entityId, out int minId, out int maxId) + { + maxId = entityId.GetRange(_performanceSettings.CacheSegmentSize, out minId); + return (localeKeyGroup + "." + localeKey + "." + maxId.ToString()).ToLowerInvariant(); + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedUrlHelper.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedUrlHelper.cs index ff9a57690a..ceffa079a2 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizedUrlHelper.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizedUrlHelper.cs @@ -3,9 +3,9 @@ namespace SmartStore.Services.Localization { - public class LocalizedUrlHelper + public class LocalizedUrlHelper { - public LocalizedUrlHelper(HttpRequestBase httpRequest, bool rawUrl = false) + public LocalizedUrlHelper(HttpRequestBase httpRequest, bool rawUrl = false) : this(httpRequest.ApplicationPath, rawUrl ? httpRequest.RawUrl : httpRequest.AppRelativeCurrentExecutionFilePath, rawUrl) { Guard.NotNull(httpRequest, nameof(httpRequest)); @@ -55,7 +55,7 @@ public bool IsLocalizedUrl(out string seoCode) firstPart = firstPart.Substring(0, firstSlash); } - if (LocalizationHelper.IsValidCultureCode(firstPart)) + if (LocalizationHelper.IsValidCultureCode(firstPart)) { seoCode = firstPart; return true; diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs index 625f53f986..c383f2c992 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs @@ -8,154 +8,139 @@ namespace SmartStore.Services.Localization { - public class LocalizedValue - { - // Regex for all types of brackets which need to be "swapped": ({[]}) - private readonly static Regex _rgBrackets = new Regex(@"\(|\{|\[|\]|\}|\)", RegexOptions.Compiled | RegexOptions.CultureInvariant); - - /// - /// Fixes the flow of brackets within a text if the current page language has RTL flow. - /// - /// The test to fix. - /// Current language - /// - public static string FixBrackets(string str, Language currentLanguage) - { - if (!currentLanguage.Rtl || str.IsEmpty()) - { - return str; - } - - var controlChar = "‎"; - return _rgBrackets.Replace(str, m => - { - return controlChar + m.Value + controlChar; - }); - } - } - - [Serializable] - public class LocalizedValue : IHtmlString, IEquatable>, IComparable, IComparable> - { - private T _value; - private readonly Language _requestLanguage; - private readonly Language _currentLanguage; - - public LocalizedValue(T value, Language requestLanguage, Language currentLanguage) - { - _value = value; - _requestLanguage = requestLanguage; - _currentLanguage = currentLanguage; - } - - public T Value - { - get { return _value; } - } - - [JsonIgnore] - public Language RequestLanguage - { - get { return _requestLanguage; } - } - - [JsonIgnore] - public Language CurrentLanguage - { - get { return _currentLanguage; } - } - - public bool IsFallback - { - get { return _requestLanguage != _currentLanguage; } - } - - public bool BidiOverride - { - get { return _requestLanguage != _currentLanguage && _requestLanguage.Rtl != _currentLanguage.Rtl; } - } - - public void ChangeValue(T value) - { - _value = value; - } - - public static implicit operator T(LocalizedValue obj) - { - if (obj == null) - { - return default; - } - - return obj.Value; - } - - public string ToHtmlString() - { - return this.ToString(); - } - - public override string ToString() - { - if (_value == null) - { - return null; - } - - if (typeof(T) == typeof(string)) - { - return _value as string; - } - - return _value.Convert(CultureInfo.GetCultureInfo(_currentLanguage.LanguageCulture)); - } - - public override int GetHashCode() - { - var hashCode = 0; - if (_value != null) - hashCode ^= _value.GetHashCode(); - return hashCode; - } - - public override bool Equals(object other) - { - return this.Equals(other as LocalizedValue); - } - - public bool Equals(LocalizedValue other) - { - if (ReferenceEquals(null, other)) - return false; - if (ReferenceEquals(this, other)) - return true; - - return object.Equals(_value, other._value); - } - - public int CompareTo(object other) - { - return CompareTo(other as LocalizedValue); - } - - public int CompareTo(LocalizedValue other) - { - if (other == null) - { - return 1; - } - - if (Value is IComparable val1) - { - return val1.CompareTo(other.Value); - } - - if (Value is IComparable val2) - { - return val2.CompareTo(other.Value); - } - - return 0; - } - } + public class LocalizedValue + { + // Regex for all types of brackets which need to be "swapped": ({[]}) + private readonly static Regex _rgBrackets = new Regex(@"\(|\{|\[|\]|\}|\)", RegexOptions.Compiled | RegexOptions.CultureInvariant); + + /// + /// Fixes the flow of brackets within a text if the current page language has RTL flow. + /// + /// The test to fix. + /// Current language + /// + public static string FixBrackets(string str, Language currentLanguage) + { + if (!currentLanguage.Rtl || str.IsEmpty()) + { + return str; + } + + var controlChar = "‎"; + return _rgBrackets.Replace(str, m => + { + return controlChar + m.Value + controlChar; + }); + } + } + + [Serializable] + public class LocalizedValue : IHtmlString, IEquatable>, IComparable, IComparable> + { + private T _value; + private readonly Language _requestLanguage; + private readonly Language _currentLanguage; + + public LocalizedValue(T value, Language requestLanguage, Language currentLanguage) + { + _value = value; + _requestLanguage = requestLanguage; + _currentLanguage = currentLanguage; + } + + public T Value => _value; + + [JsonIgnore] + public Language RequestLanguage => _requestLanguage; + + [JsonIgnore] + public Language CurrentLanguage => _currentLanguage; + + public bool IsFallback => _requestLanguage != _currentLanguage; + + public bool BidiOverride => _requestLanguage != _currentLanguage && _requestLanguage.Rtl != _currentLanguage.Rtl; + + public void ChangeValue(T value) + { + _value = value; + } + + public static implicit operator T(LocalizedValue obj) + { + if (obj == null) + { + return default; + } + + return obj.Value; + } + + public string ToHtmlString() + { + return this.ToString(); + } + + public override string ToString() + { + if (_value == null) + { + return null; + } + + if (typeof(T) == typeof(string)) + { + return _value as string; + } + + return _value.Convert(CultureInfo.GetCultureInfo(_currentLanguage.LanguageCulture)); + } + + public override int GetHashCode() + { + var hashCode = 0; + if (_value != null) + hashCode ^= _value.GetHashCode(); + return hashCode; + } + + public override bool Equals(object other) + { + return this.Equals(other as LocalizedValue); + } + + public bool Equals(LocalizedValue other) + { + if (ReferenceEquals(null, other)) + return false; + if (ReferenceEquals(this, other)) + return true; + + return object.Equals(_value, other._value); + } + + public int CompareTo(object other) + { + return CompareTo(other as LocalizedValue); + } + + public int CompareTo(LocalizedValue other) + { + if (other == null) + { + return 1; + } + + if (Value is IComparable val1) + { + return val1.CompareTo(other.Value); + } + + if (Value is IComparable val2) + { + return val2.CompareTo(other.Value); + } + + return 0; + } + } } diff --git a/src/Libraries/SmartStore.Services/Logging/CustomerActivityService.cs b/src/Libraries/SmartStore.Services/Logging/CustomerActivityService.cs index 6c45b687c9..447d5e1fc1 100644 --- a/src/Libraries/SmartStore.Services/Logging/CustomerActivityService.cs +++ b/src/Libraries/SmartStore.Services/Logging/CustomerActivityService.cs @@ -10,38 +10,38 @@ namespace SmartStore.Services.Logging { - /// - /// Customer activity service - /// - public class CustomerActivityService : ICustomerActivityService + /// + /// Customer activity service + /// + public class CustomerActivityService : ICustomerActivityService { - #region Fields + #region Fields - private const int _deleteNumberOfEntries = 1000; + private const int _deleteNumberOfEntries = 1000; - private readonly IRepository _activityLogRepository; + private readonly IRepository _activityLogRepository; private readonly IRepository _activityLogTypeRepository; - private readonly IRepository _customerRepository; - private readonly IWorkContext _workContext; + private readonly IRepository _customerRepository; + private readonly IWorkContext _workContext; private readonly IDbContext _dbContext; private readonly static object s_lock = new object(); private readonly static ConcurrentDictionary s_logTypes = new ConcurrentDictionary(); - #endregion + #endregion - #region Ctor + #region Ctor - public CustomerActivityService( + public CustomerActivityService( IRepository activityLogRepository, IRepository activityLogTypeRepository, - IRepository customerRepository, - IWorkContext workContext, + IRepository customerRepository, + IWorkContext workContext, IDbContext dbContext) { this._activityLogRepository = activityLogRepository; this._activityLogTypeRepository = activityLogTypeRepository; - this._customerRepository = customerRepository; + this._customerRepository = customerRepository; this._workContext = workContext; this._dbContext = dbContext; } @@ -111,7 +111,8 @@ private void EnsureLogTypesAreLoaded() var query = from alt in _activityLogTypeRepository.Table orderby alt.Name select alt; - query.Each(x => { + query.Each(x => + { s_logTypes[x.SystemKeyword] = x; }); } @@ -176,9 +177,9 @@ public virtual ActivityLog InsertActivity(string systemKeyword, string comment, if (activityType == null || !activityType.Enabled) return null; - comment = comment.EmptyNull(); + comment = comment.EmptyNull(); comment = string.Format(comment, commentParams); - comment = comment.Truncate(4000); + comment = comment.Truncate(4000); var activity = new ActivityLog(); activity.ActivityLogTypeId = activityType.Id; @@ -203,45 +204,45 @@ public virtual void DeleteActivity(ActivityLog activityLog) _activityLogRepository.Delete(activityLog); } - /// - /// Gets all activity log items - /// - /// Log item creation from; null to load all customers - /// Log item creation to; null to load all customers - /// Customer identifier; null to load all customers - /// Activity log type identifier - /// Page index - /// Page size - /// Customer email - /// Customer system name - /// Activity log collection - public virtual IPagedList GetAllActivities( - DateTime? createdOnFrom, + /// + /// Gets all activity log items + /// + /// Log item creation from; null to load all customers + /// Log item creation to; null to load all customers + /// Customer identifier; null to load all customers + /// Activity log type identifier + /// Page index + /// Page size + /// Customer email + /// Customer system name + /// Activity log collection + public virtual IPagedList GetAllActivities( + DateTime? createdOnFrom, DateTime? createdOnTo, - int? customerId, - int activityLogTypeId, + int? customerId, + int activityLogTypeId, int pageIndex, - int pageSize, - string email = null, - bool? customerSystemAccount = null) + int pageSize, + string email = null, + bool? customerSystemAccount = null) { var query = _activityLogRepository.Table; - if (email.HasValue() || customerSystemAccount.HasValue) - { - var queryCustomers = _customerRepository.Table; + if (email.HasValue() || customerSystemAccount.HasValue) + { + var queryCustomers = _customerRepository.Table; - if (email.HasValue()) - queryCustomers = queryCustomers.Where(x => x.Email.Contains(email)); + if (email.HasValue()) + queryCustomers = queryCustomers.Where(x => x.Email.Contains(email)); - if (customerSystemAccount.HasValue) - queryCustomers = queryCustomers.Where(x => x.IsSystemAccount == customerSystemAccount.Value); + if (customerSystemAccount.HasValue) + queryCustomers = queryCustomers.Where(x => x.IsSystemAccount == customerSystemAccount.Value); - query = - from al in _activityLogRepository.Table - join c in queryCustomers on al.CustomerId equals c.Id - select al; - } + query = + from al in _activityLogRepository.Table + join c in queryCustomers on al.CustomerId equals c.Id + select al; + } if (createdOnFrom.HasValue) query = query.Where(al => createdOnFrom.Value <= al.CreatedOnUtc); @@ -279,54 +280,54 @@ public virtual ActivityLog GetActivityById(int activityLogId) return activityLog; } - public virtual IList GetActivityByIds(int[] activityLogIds) - { - if (activityLogIds == null || activityLogIds.Length == 0) - return new List(); + public virtual IList GetActivityByIds(int[] activityLogIds) + { + if (activityLogIds == null || activityLogIds.Length == 0) + return new List(); - var query = _activityLogRepository.Table - .Where(x => activityLogIds.Contains(x.Id)) - .OrderByDescending(x => x.CreatedOnUtc); + var query = _activityLogRepository.Table + .Where(x => activityLogIds.Contains(x.Id)) + .OrderByDescending(x => x.CreatedOnUtc); - return query.ToList(); - } + return query.ToList(); + } - /// - /// Clears activity log - /// - public virtual void ClearAllActivities() + /// + /// Clears activity log + /// + public virtual void ClearAllActivities() { - try - { - _dbContext.ExecuteSqlCommand("TRUNCATE TABLE [ActivityLog]"); - } - catch - { - try - { - for (int i = 0; i < 100000; ++i) - { - if (_dbContext.ExecuteSqlCommand("Delete Top ({0}) From [ActivityLog]", false, null, _deleteNumberOfEntries) < _deleteNumberOfEntries) - break; - } - } - catch { } - - try - { - _dbContext.ExecuteSqlCommand("DBCC CHECKIDENT('ActivityLog', RESEED, 0)"); - } - catch - { - try - { - _dbContext.ExecuteSqlCommand("Alter Table [ActivityLog] Alter Column [Id] Identity(1,1)"); - } - catch { } - } - } - } - - #endregion + try + { + _dbContext.ExecuteSqlCommand("TRUNCATE TABLE [ActivityLog]"); + } + catch + { + try + { + for (int i = 0; i < 100000; ++i) + { + if (_dbContext.ExecuteSqlCommand("Delete Top ({0}) From [ActivityLog]", false, null, _deleteNumberOfEntries) < _deleteNumberOfEntries) + break; + } + } + catch { } + + try + { + _dbContext.ExecuteSqlCommand("DBCC CHECKIDENT('ActivityLog', RESEED, 0)"); + } + catch + { + try + { + _dbContext.ExecuteSqlCommand("Alter Table [ActivityLog] Alter Column [Id] Identity(1,1)"); + } + catch { } + } + } + } + + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Logging/DbLogService.cs b/src/Libraries/SmartStore.Services/Logging/DbLogService.cs index d725fadef6..4efc4187b9 100644 --- a/src/Libraries/SmartStore.Services/Logging/DbLogService.cs +++ b/src/Libraries/SmartStore.Services/Logging/DbLogService.cs @@ -8,141 +8,141 @@ namespace SmartStore.Services.Logging { - public partial class DbLogService : ILogService - { - private const int _deleteNumberOfEntries = 1000; - - private readonly IRepository _logRepository; - private readonly IDbContext _dbContext; - private readonly ILoggerFactory _loggerFactory; - - public DbLogService(IRepository logRepository, ILoggerFactory loggerFactory) - { - _logRepository = logRepository; - _dbContext = logRepository.Context; - _loggerFactory = loggerFactory; - } - - public virtual void DeleteLog(Log log) - { - Guard.NotNull(log, nameof(log)); - - _logRepository.Delete(log); - } - - public virtual void ClearLog() - { - try - { - _dbContext.ExecuteSqlCommand("TRUNCATE TABLE [Log]"); - } - catch - { - try - { - for (int i = 0; i < 100000; ++i) - { - if (_dbContext.ExecuteSqlCommand("Delete Top ({0}) From [Log]", false, null, _deleteNumberOfEntries) < _deleteNumberOfEntries) - break; - } - } - catch { } - - try - { - _dbContext.ExecuteSqlCommand("DBCC CHECKIDENT('Log', RESEED, 0)"); - } - catch - { - try - { - _dbContext.ExecuteSqlCommand("Alter Table [Log] Alter Column [Id] Identity(1,1)"); - } - catch { } - } - } - - _dbContext.ShrinkDatabase(); - } - - public virtual void ClearLog(DateTime toUtc, LogLevel logLevel) - { - try - { - string sqlDelete = "Delete Top ({0}) From [Log] Where LogLevelId < {1} And CreatedOnUtc <= {2}"; - - for (int i = 0; i < 100000; ++i) - { - if (_dbContext.ExecuteSqlCommand(sqlDelete, false, null, _deleteNumberOfEntries, (int)logLevel, toUtc) < _deleteNumberOfEntries) - break; - } - - _dbContext.ShrinkDatabase(); - } - catch { } - } - - public virtual IPagedList GetAllLogs( - DateTime? fromUtc, - DateTime? toUtc, - string logger, - string message, - LogLevel? logLevel, - int pageIndex, - int pageSize) - { - // force flush to get most recent entries - _loggerFactory.FlushAll(); - - var query = _logRepository.Table; - - if (fromUtc.HasValue) - query = query.Where(l => fromUtc.Value <= l.CreatedOnUtc); - - if (toUtc.HasValue) - query = query.Where(l => toUtc.Value >= l.CreatedOnUtc); - - if (logger.HasValue()) - query = query.Where(l => l.Logger.Contains(logger)); - - if (logLevel.HasValue) - { - int logLevelId = (int)logLevel.Value; - query = query.Where(l => logLevelId == l.LogLevelId); - } - - if (message.HasValue()) - query = query.Where(l => l.ShortMessage.Contains(message) || l.FullMessage.Contains(message)); - - query = query.OrderByDescending(l => l.CreatedOnUtc); - - //query = _logRepository.Expand(query, x => x.Customer); - - var log = new PagedList(query, pageIndex, pageSize); - return log; - } - - public virtual Log GetLogById(int logId) - { - if (logId == 0) - return null; - - var log = _logRepository.GetById(logId); - return log; - } - - public virtual IList GetLogByIds(int[] logIds) - { - if (logIds == null || logIds.Length == 0) - return new List(); - - var query = from l in _logRepository.Table - where logIds.Contains(l.Id) - select l; - var logItems = query.ToList(); - - // sort by passed identifier sequence - return logItems.OrderBySequence(logIds).ToList(); - } - } + public partial class DbLogService : ILogService + { + private const int _deleteNumberOfEntries = 1000; + + private readonly IRepository _logRepository; + private readonly IDbContext _dbContext; + private readonly ILoggerFactory _loggerFactory; + + public DbLogService(IRepository logRepository, ILoggerFactory loggerFactory) + { + _logRepository = logRepository; + _dbContext = logRepository.Context; + _loggerFactory = loggerFactory; + } + + public virtual void DeleteLog(Log log) + { + Guard.NotNull(log, nameof(log)); + + _logRepository.Delete(log); + } + + public virtual void ClearLog() + { + try + { + _dbContext.ExecuteSqlCommand("TRUNCATE TABLE [Log]"); + } + catch + { + try + { + for (int i = 0; i < 100000; ++i) + { + if (_dbContext.ExecuteSqlCommand("Delete Top ({0}) From [Log]", false, null, _deleteNumberOfEntries) < _deleteNumberOfEntries) + break; + } + } + catch { } + + try + { + _dbContext.ExecuteSqlCommand("DBCC CHECKIDENT('Log', RESEED, 0)"); + } + catch + { + try + { + _dbContext.ExecuteSqlCommand("Alter Table [Log] Alter Column [Id] Identity(1,1)"); + } + catch { } + } + } + + _dbContext.ShrinkDatabase(); + } + + public virtual void ClearLog(DateTime toUtc, LogLevel logLevel) + { + try + { + string sqlDelete = "Delete Top ({0}) From [Log] Where LogLevelId < {1} And CreatedOnUtc <= {2}"; + + for (int i = 0; i < 100000; ++i) + { + if (_dbContext.ExecuteSqlCommand(sqlDelete, false, null, _deleteNumberOfEntries, (int)logLevel, toUtc) < _deleteNumberOfEntries) + break; + } + + _dbContext.ShrinkDatabase(); + } + catch { } + } + + public virtual IPagedList GetAllLogs( + DateTime? fromUtc, + DateTime? toUtc, + string logger, + string message, + LogLevel? logLevel, + int pageIndex, + int pageSize) + { + // force flush to get most recent entries + _loggerFactory.FlushAll(); + + var query = _logRepository.Table; + + if (fromUtc.HasValue) + query = query.Where(l => fromUtc.Value <= l.CreatedOnUtc); + + if (toUtc.HasValue) + query = query.Where(l => toUtc.Value >= l.CreatedOnUtc); + + if (logger.HasValue()) + query = query.Where(l => l.Logger.Contains(logger)); + + if (logLevel.HasValue) + { + int logLevelId = (int)logLevel.Value; + query = query.Where(l => logLevelId == l.LogLevelId); + } + + if (message.HasValue()) + query = query.Where(l => l.ShortMessage.Contains(message) || l.FullMessage.Contains(message)); + + query = query.OrderByDescending(l => l.CreatedOnUtc); + + //query = _logRepository.Expand(query, x => x.Customer); + + var log = new PagedList(query, pageIndex, pageSize); + return log; + } + + public virtual Log GetLogById(int logId) + { + if (logId == 0) + return null; + + var log = _logRepository.GetById(logId); + return log; + } + + public virtual IList GetLogByIds(int[] logIds) + { + if (logIds == null || logIds.Length == 0) + return new List(); + + var query = from l in _logRepository.Table + where logIds.Contains(l.Id) + select l; + var logItems = query.ToList(); + + // sort by passed identifier sequence + return logItems.OrderBySequence(logIds).ToList(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Logging/DeleteLogsTask.cs b/src/Libraries/SmartStore.Services/Logging/DeleteLogsTask.cs index 1fbf6dbd76..135c819c1f 100644 --- a/src/Libraries/SmartStore.Services/Logging/DeleteLogsTask.cs +++ b/src/Libraries/SmartStore.Services/Logging/DeleteLogsTask.cs @@ -21,11 +21,11 @@ public DeleteLogsTask( _commonSettings = commonSettings; } - public void Execute(TaskExecutionContext ctx) + public void Execute(TaskExecutionContext ctx) { var toUtc = DateTime.UtcNow.AddDays(-_commonSettings.MaxLogAgeInDays); - _logService.ClearLog(toUtc, LogLevel.Error); + _logService.ClearLog(toUtc, LogLevel.Error); } } } diff --git a/src/Libraries/SmartStore.Services/Logging/ILogService.cs b/src/Libraries/SmartStore.Services/Logging/ILogService.cs index 926f87aea0..e2e4131346 100644 --- a/src/Libraries/SmartStore.Services/Logging/ILogService.cs +++ b/src/Libraries/SmartStore.Services/Logging/ILogService.cs @@ -9,52 +9,52 @@ namespace SmartStore.Services.Logging { - public interface ILogService - { - /// - /// Deletes a log item - /// - /// Log item - void DeleteLog(Log log); + public interface ILogService + { + /// + /// Deletes a log item + /// + /// Log item + void DeleteLog(Log log); - /// - /// Clears a log - /// - void ClearLog(); - void ClearLog(DateTime toUtc, LogLevel logLevel); + /// + /// Clears a log + /// + void ClearLog(); + void ClearLog(DateTime toUtc, LogLevel logLevel); - /// - /// Gets all log items - /// - /// Log item creation from; null to load all records - /// Log item creation to; null to load all records - /// Message - /// Logger name - /// Log level; null to load all records - /// Page index - /// Page size - /// Log item collection - IPagedList GetAllLogs( - DateTime? fromUtc, - DateTime? toUtc, - string logger, - string message, - LogLevel? logLevel, - int pageIndex, - int pageSize); + /// + /// Gets all log items + /// + /// Log item creation from; null to load all records + /// Log item creation to; null to load all records + /// Message + /// Logger name + /// Log level; null to load all records + /// Page index + /// Page size + /// Log item collection + IPagedList GetAllLogs( + DateTime? fromUtc, + DateTime? toUtc, + string logger, + string message, + LogLevel? logLevel, + int pageIndex, + int pageSize); - /// - /// Gets a log item - /// - /// Log item identifier - /// Log item - Log GetLogById(int logId); + /// + /// Gets a log item + /// + /// Log item identifier + /// Log item + Log GetLogById(int logId); - /// - /// Get log items by identifiers - /// - /// Log item identifiers - /// Log items - IList GetLogByIds(int[] logIds); - } + /// + /// Get log items by identifiers + /// + /// Log item identifiers + /// Log items + IList GetLogByIds(int[] logIds); + } } diff --git a/src/Libraries/SmartStore.Services/Media/Album/AlbumRegistry.cs b/src/Libraries/SmartStore.Services/Media/Album/AlbumRegistry.cs index 86b612754c..00b553a95a 100644 --- a/src/Libraries/SmartStore.Services/Media/Album/AlbumRegistry.cs +++ b/src/Libraries/SmartStore.Services/Media/Album/AlbumRegistry.cs @@ -14,7 +14,7 @@ public class AlbumRegistry : IAlbumRegistry private readonly IDbContext _dbContext; private readonly ICacheManager _cache; private readonly IEnumerable> _albumProviders; - + public AlbumRegistry( IDbContext dbContext, ICacheManager cache, @@ -105,7 +105,7 @@ protected virtual IEnumerable LoadAllAlbums() public virtual AlbumInfo GetAlbumByName(string name) { Guard.NotEmpty(name, nameof(name)); - + return GetAlbumDictionary().Get(name); } diff --git a/src/Libraries/SmartStore.Services/Media/Album/FolderService.cs b/src/Libraries/SmartStore.Services/Media/Album/FolderService.cs index e7db253c69..260e3c0282 100644 --- a/src/Libraries/SmartStore.Services/Media/Album/FolderService.cs +++ b/src/Libraries/SmartStore.Services/Media/Album/FolderService.cs @@ -35,13 +35,13 @@ public TreeNode GetRootNode() { var cacheKey = FolderTreeKey; - var root = _cache.Get(cacheKey, () => + var root = _cache.Get(cacheKey, () => { var query = from x in _folderRepo.TableUntracked orderby x.ParentId, x.Name select x; - var unsortedNodes = query.ToList().Select(x => + var unsortedNodes = query.ToList().Select(x => { var item = new MediaFolderNode { @@ -129,7 +129,7 @@ public TreeNode GetNodeById(int id) { if (id <= 0) return null; - + return GetRootNode().SelectNodeById(id); } diff --git a/src/Libraries/SmartStore.Services/Media/Album/MediaFolderInfo.cs b/src/Libraries/SmartStore.Services/Media/Album/MediaFolderInfo.cs index 4408dde50c..1f51f35926 100644 --- a/src/Libraries/SmartStore.Services/Media/Album/MediaFolderInfo.cs +++ b/src/Libraries/SmartStore.Services/Media/Album/MediaFolderInfo.cs @@ -19,7 +19,10 @@ public MediaFolderInfo(TreeNode node) [JsonProperty("filesCount")] public int FilesCount => Node.Value.FilesCount; - public static implicit operator TreeNode(MediaFolderInfo folderInfo) => folderInfo.Node; + public static implicit operator TreeNode(MediaFolderInfo folderInfo) + { + return folderInfo.Node; + } [JsonProperty("id")] public int Id => Node.Value.Id; diff --git a/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs b/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs index 4ba8a1dad8..e809483acc 100644 --- a/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs @@ -19,7 +19,7 @@ namespace SmartStore.Services.Media public partial class SystemAlbumProvider : IAlbumProvider, IMediaTrackDetector { private readonly IDbContext _dbContext; - + public SystemAlbumProvider(IDbContext dbContext) { _dbContext = dbContext; diff --git a/src/Libraries/SmartStore.Services/Media/DownloadService.cs b/src/Libraries/SmartStore.Services/Media/DownloadService.cs index 082643ba6f..f719dcdecb 100644 --- a/src/Libraries/SmartStore.Services/Media/DownloadService.cs +++ b/src/Libraries/SmartStore.Services/Media/DownloadService.cs @@ -18,66 +18,66 @@ public partial class DownloadService : IDownloadService private readonly IRepository _downloadRepository; private readonly IMediaService _mediaService; - public DownloadService(IRepository downloadRepository, IMediaService mediaService) + public DownloadService(IRepository downloadRepository, IMediaService mediaService) { _downloadRepository = downloadRepository; _mediaService = mediaService; - } + } - public virtual Download GetDownloadById(int downloadId) + public virtual Download GetDownloadById(int downloadId) { if (downloadId == 0) return null; - + var download = _downloadRepository.Table.Expand(x => x.MediaFile).FirstOrDefault(x => x.Id == downloadId); return download; } - public virtual IList GetDownloadsByIds(int[] downloadIds) - { - if (downloadIds == null || downloadIds.Length == 0) - return new List(); + public virtual IList GetDownloadsByIds(int[] downloadIds) + { + if (downloadIds == null || downloadIds.Length == 0) + return new List(); - var query = from dl in _downloadRepository.Table.Expand(x => x.MediaFile) + var query = from dl in _downloadRepository.Table.Expand(x => x.MediaFile) where downloadIds.Contains(dl.Id) - select dl; - - var downloads = query.ToList(); - - // sort by passed identifier sequence - return downloads.OrderBySequence(downloadIds).ToList(); - } - - public virtual IList GetDownloadsFor(TEntity entity) where TEntity : BaseEntity - { - Guard.NotNull(entity, nameof(entity)); - - return GetDownloadsFor(entity.Id, entity.GetUnproxiedType().Name); - } - - public virtual IList GetDownloadsFor(int entityId, string entityName) - { - if (entityId > 0) - { - var downloads = (from x in _downloadRepository.Table.Expand(x => x.MediaFile) + select dl; + + var downloads = query.ToList(); + + // sort by passed identifier sequence + return downloads.OrderBySequence(downloadIds).ToList(); + } + + public virtual IList GetDownloadsFor(TEntity entity) where TEntity : BaseEntity + { + Guard.NotNull(entity, nameof(entity)); + + return GetDownloadsFor(entity.Id, entity.GetUnproxiedType().Name); + } + + public virtual IList GetDownloadsFor(int entityId, string entityName) + { + if (entityId > 0) + { + var downloads = (from x in _downloadRepository.Table.Expand(x => x.MediaFile) where x.EntityId == entityId && x.EntityName == entityName - select x).ToList(); + select x).ToList(); - if (downloads.Any()) - { - var idsOrderedByVersion = downloads + if (downloads.Any()) + { + var idsOrderedByVersion = downloads .Select(x => new { x.Id, Version = new SemanticVersion(x.FileVersion.HasValue() ? x.FileVersion : "1.0.0.0") }) .OrderByDescending(x => x.Version) - .Select(x => x.Id); + .Select(x => x.Id); - downloads = new List(downloads.OrderBySequence(idsOrderedByVersion)); + downloads = new List(downloads.OrderBySequence(idsOrderedByVersion)); - return downloads; - } - } + return downloads; + } + } - return new List(); - } + return new List(); + } public virtual Download GetDownloadByVersion(int entityId, string entityName, string fileVersion) { @@ -86,7 +86,7 @@ public virtual Download GetDownloadByVersion(int entityId, string entityName, st var download = (from x in _downloadRepository.Table.Expand(x => x.MediaFile) where x.EntityId == entityId && x.EntityName.Equals(entityName) && x.FileVersion.Equals(fileVersion) select x).FirstOrDefault(); - + return download; } @@ -100,7 +100,7 @@ public virtual Multimap GetDownloadsByEntityIds(int[] entityIds, var query = _downloadRepository.TableUntracked.Expand(x => x.MediaFile) .Where(x => entityIds.Contains(x.EntityId) && x.EntityName == entityName) - .OrderBy(x => x.FileVersion); + .OrderBy(x => x.FileVersion); var map = query .ToList() @@ -126,14 +126,14 @@ public virtual Download GetDownloadByGuid(Guid downloadGuid) public virtual void DeleteDownload(Download download) { - Guard.NotNull(download, nameof(download)); + Guard.NotNull(download, nameof(download)); - _downloadRepository.Delete(download); + _downloadRepository.Delete(download); } public virtual void InsertDownload(Download download) { - Guard.NotNull(download, nameof(download)); + Guard.NotNull(download, nameof(download)); _downloadRepository.Insert(download); } @@ -152,9 +152,9 @@ public virtual MediaFileInfo InsertDownload(Download download, Stream stream, st return file; } - public virtual void UpdateDownload(Download download) + public virtual void UpdateDownload(Download download) { - Guard.NotNull(download, nameof(download)); + Guard.NotNull(download, nameof(download)); download.UpdatedOnUtc = DateTime.UtcNow; @@ -236,10 +236,10 @@ public virtual bool IsLicenseDownloadAllowed(OrderItem orderItem) orderItem.LicenseDownloadId > 0; } - public virtual byte[] LoadDownloadBinary(Download download) - { - Guard.NotNull(download, nameof(download)); - return _mediaService.StorageProvider.Load(download.MediaFile); - } + public virtual byte[] LoadDownloadBinary(Download download) + { + Guard.NotNull(download, nameof(download)); + return _mediaService.StorageProvider.Load(download.MediaFile); + } } } diff --git a/src/Libraries/SmartStore.Services/Media/Events.cs b/src/Libraries/SmartStore.Services/Media/Events.cs index 2de2d48734..583f34a90a 100644 --- a/src/Libraries/SmartStore.Services/Media/Events.cs +++ b/src/Libraries/SmartStore.Services/Media/Events.cs @@ -6,88 +6,88 @@ namespace SmartStore.Services.Media { - /// - /// Published for every uploaded image which does NOT exceed maximum - /// allowed size. This gives subscribers the chance to still process the image, - /// e.g. to achive better compression before saving image data to storage. - /// This event does NOT get published when the uploaded image is about to be processed anyway. - /// - /// - /// A subscriber should NOT resize the image. But if you do - and you shouldn't :-) - , don't forget to set . - /// - public class ImageUploadedEvent - { - public ImageUploadedEvent(ProcessImageQuery query, Size size) - { - Query = query; - Size = size; - } + /// + /// Published for every uploaded image which does NOT exceed maximum + /// allowed size. This gives subscribers the chance to still process the image, + /// e.g. to achive better compression before saving image data to storage. + /// This event does NOT get published when the uploaded image is about to be processed anyway. + /// + /// + /// A subscriber should NOT resize the image. But if you do - and you shouldn't :-) - , don't forget to set . + /// + public class ImageUploadedEvent + { + public ImageUploadedEvent(ProcessImageQuery query, Size size) + { + Query = query; + Size = size; + } - /// - /// Contains the source (as byte[], STream or path string), max size, format and default image quality instructions. - /// - public ProcessImageQuery Query { get; private set; } + /// + /// Contains the source (as byte[], STream or path string), max size, format and default image quality instructions. + /// + public ProcessImageQuery Query { get; private set; } - /// - /// The original size of the uploaded image. May be empty. - /// - public Size Size { get; private set; } + /// + /// The original size of the uploaded image. May be empty. + /// + public Size Size { get; private set; } - /// - /// The processing result. If null, the original data - /// from Query.Source will be put to storage. - /// - public IImage ResultImage { get; set; } - } + /// + /// The processing result. If null, the original data + /// from Query.Source will be put to storage. + /// + public IImage ResultImage { get; set; } + } - /// - /// Published after image query has been created and initialized - /// by the media middleware controller with data from HttpContent.Request.QueryString. - /// This event implies that a thumbnail is about to be created. - /// - public class ImageQueryCreatedEvent - { - public ImageQueryCreatedEvent(ProcessImageQuery query, HttpContextBase httpContext, string mimeType, string extension) - { - Query = query; - HttpContext = httpContext; - MimeType = mimeType; - Extension = extension; - } + /// + /// Published after image query has been created and initialized + /// by the media middleware controller with data from HttpContent.Request.QueryString. + /// This event implies that a thumbnail is about to be created. + /// + public class ImageQueryCreatedEvent + { + public ImageQueryCreatedEvent(ProcessImageQuery query, HttpContextBase httpContext, string mimeType, string extension) + { + Query = query; + HttpContext = httpContext; + MimeType = mimeType; + Extension = extension; + } - public ProcessImageQuery Query { get; private set; } - public HttpContextBase HttpContext { get; private set; } - public string MimeType { get; private set; } - public string Extension { get; private set; } - } + public ProcessImageQuery Query { get; private set; } + public HttpContextBase HttpContext { get; private set; } + public string MimeType { get; private set; } + public string Extension { get; private set; } + } - /// - /// Published before processing begins, but after the source has been loaded. - /// - public class ImageProcessingEvent - { - public ImageProcessingEvent(ProcessImageQuery query, IImage image) - { - Query = query; - Image = image; - } + /// + /// Published before processing begins, but after the source has been loaded. + /// + public class ImageProcessingEvent + { + public ImageProcessingEvent(ProcessImageQuery query, IImage image) + { + Query = query; + Image = image; + } - public ProcessImageQuery Query { get; private set; } - public IImage Image { get; private set; } - } + public ProcessImageQuery Query { get; private set; } + public IImage Image { get; private set; } + } - /// - /// Published after processing finishes. - /// - public class ImageProcessedEvent - { - public ImageProcessedEvent(ProcessImageQuery query, ProcessImageResult result) - { - Query = query; - Result = result; - } + /// + /// Published after processing finishes. + /// + public class ImageProcessedEvent + { + public ImageProcessedEvent(ProcessImageQuery query, ProcessImageResult result) + { + Query = query; + Result = result; + } - public ProcessImageQuery Query { get; private set; } - public ProcessImageResult Result { get; private set; } - } + public ProcessImageQuery Query { get; private set; } + public ProcessImageResult Result { get; private set; } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs b/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs index 2ba35ccb5c..5ebe5f6073 100644 --- a/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs +++ b/src/Libraries/SmartStore.Services/Media/Extensions/IMediaServiceExtensions.cs @@ -30,10 +30,10 @@ public static string GetUrl(this IMediaService service, int? fileId, ProcessImag public static string GetUrl(this IMediaService service, int? fileId, int thumbnailSize, string host = null, bool doFallback = true) { - ProcessImageQuery query = thumbnailSize > 0 - ? new ProcessImageQuery { MaxSize = thumbnailSize } + ProcessImageQuery query = thumbnailSize > 0 + ? new ProcessImageQuery { MaxSize = thumbnailSize } : null; - + return service.GetUrl(service.GetFileById(fileId ?? 0, MediaLoadFlags.AsNoTracking), query, host, doFallback); } diff --git a/src/Libraries/SmartStore.Services/Media/Extensions/IMediaTrackerExtensions.cs b/src/Libraries/SmartStore.Services/Media/Extensions/IMediaTrackerExtensions.cs index 57bb9e8117..6f14b61f58 100644 --- a/src/Libraries/SmartStore.Services/Media/Extensions/IMediaTrackerExtensions.cs +++ b/src/Libraries/SmartStore.Services/Media/Extensions/IMediaTrackerExtensions.cs @@ -9,94 +9,94 @@ namespace SmartStore.Services.Media { public static class IMediaTrackerExtensions { - public static void Track(this IMediaTracker tracker, T entity, Expression> path) where T : BaseEntity, new() - { - Guard.NotNull(path, nameof(path)); + public static void Track(this IMediaTracker tracker, T entity, Expression> path) where T : BaseEntity, new() + { + Guard.NotNull(path, nameof(path)); - var getter = path.CompileFast(); - var mediaFileId = getter.Invoke(entity); - if (mediaFileId > 0) - tracker.Track(entity, mediaFileId, path.ExtractPropertyInfo().Name); - } + var getter = path.CompileFast(); + var mediaFileId = getter.Invoke(entity); + if (mediaFileId > 0) + tracker.Track(entity, mediaFileId, path.ExtractPropertyInfo().Name); + } - public static void Track(this IMediaTracker tracker, T entity, Expression> path) where T : BaseEntity, new() - { - Guard.NotNull(path, nameof(path)); + public static void Track(this IMediaTracker tracker, T entity, Expression> path) where T : BaseEntity, new() + { + Guard.NotNull(path, nameof(path)); - var getter = path.CompileFast(); - var mediaFileId = getter.Invoke(entity); - if (mediaFileId > 0) - tracker.Track(entity, mediaFileId.Value, path.ExtractPropertyInfo().Name); - } + var getter = path.CompileFast(); + var mediaFileId = getter.Invoke(entity); + if (mediaFileId > 0) + tracker.Track(entity, mediaFileId.Value, path.ExtractPropertyInfo().Name); + } - public static void Untrack(this IMediaTracker tracker, T entity, Expression> path) where T : BaseEntity, new() - { - Guard.NotNull(path, nameof(path)); + public static void Untrack(this IMediaTracker tracker, T entity, Expression> path) where T : BaseEntity, new() + { + Guard.NotNull(path, nameof(path)); - var getter = path.CompileFast(); - var mediaFileId = getter.Invoke(entity); - if (mediaFileId > 0) - tracker.Untrack(entity, mediaFileId, path.ExtractPropertyInfo().Name); - } + var getter = path.CompileFast(); + var mediaFileId = getter.Invoke(entity); + if (mediaFileId > 0) + tracker.Untrack(entity, mediaFileId, path.ExtractPropertyInfo().Name); + } - public static void Untrack(this IMediaTracker tracker, T entity, Expression> path) where T : BaseEntity, new() - { - Guard.NotNull(path, nameof(path)); + public static void Untrack(this IMediaTracker tracker, T entity, Expression> path) where T : BaseEntity, new() + { + Guard.NotNull(path, nameof(path)); - var getter = path.CompileFast(); - var mediaFileId = getter.Invoke(entity); - if (mediaFileId > 0) - tracker.Untrack(entity, mediaFileId.Value, path.ExtractPropertyInfo().Name); - } + var getter = path.CompileFast(); + var mediaFileId = getter.Invoke(entity); + if (mediaFileId > 0) + tracker.Untrack(entity, mediaFileId.Value, path.ExtractPropertyInfo().Name); + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void Track(this IMediaTracker tracker, MediaTrack track) - { - if (track == null) - return; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void Track(this IMediaTracker tracker, MediaTrack track) + { + if (track == null) + return; - tracker.TrackMany(new[] { track }); - } + tracker.TrackMany(new[] { track }); + } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void UpdateTracks(this IMediaTracker tracker, BaseEntity entity, int? prevMediaFileId, int? currentMediaFileId, string propertyName) + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void UpdateTracks(this IMediaTracker tracker, BaseEntity entity, int? prevMediaFileId, int? currentMediaFileId, string propertyName) { - UpdateTracks(tracker, entity.Id, entity.GetEntityName(), prevMediaFileId, currentMediaFileId, propertyName); - } + UpdateTracks(tracker, entity.Id, entity.GetEntityName(), prevMediaFileId, currentMediaFileId, propertyName); + } - public static void UpdateTracks(this IMediaTracker tracker, int entityId, string entityName, int? prevMediaFileId, int? currentMediaFileId, string propertyName) - { - var tracks = new List(2); - bool isModified = prevMediaFileId != currentMediaFileId; + public static void UpdateTracks(this IMediaTracker tracker, int entityId, string entityName, int? prevMediaFileId, int? currentMediaFileId, string propertyName) + { + var tracks = new List(2); + bool isModified = prevMediaFileId != currentMediaFileId; - if (prevMediaFileId > 0 && isModified) - { - tracks.Add(new MediaTrack - { - EntityId = entityId, - EntityName = entityName, - MediaFileId = prevMediaFileId.Value, - Property = propertyName, - Operation = MediaTrackOperation.Untrack - }); - } + if (prevMediaFileId > 0 && isModified) + { + tracks.Add(new MediaTrack + { + EntityId = entityId, + EntityName = entityName, + MediaFileId = prevMediaFileId.Value, + Property = propertyName, + Operation = MediaTrackOperation.Untrack + }); + } - if (currentMediaFileId > 0 && isModified) - { - tracks.Add(new MediaTrack - { - EntityId = entityId, - EntityName = entityName, - MediaFileId = currentMediaFileId.Value, - Property = propertyName, - Operation = MediaTrackOperation.Track - }); - } + if (currentMediaFileId > 0 && isModified) + { + tracks.Add(new MediaTrack + { + EntityId = entityId, + EntityName = entityName, + MediaFileId = currentMediaFileId.Value, + Property = propertyName, + Operation = MediaTrackOperation.Track + }); + } - if (tracks.Count > 0) - { - tracker.TrackMany(tracks); - } - } - } + if (tracks.Count > 0) + { + tracker.TrackMany(tracks); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Extensions/MediaFileExtensions.cs b/src/Libraries/SmartStore.Services/Media/Extensions/MediaFileExtensions.cs index faa5a6a984..4b54a3295b 100644 --- a/src/Libraries/SmartStore.Services/Media/Extensions/MediaFileExtensions.cs +++ b/src/Libraries/SmartStore.Services/Media/Extensions/MediaFileExtensions.cs @@ -7,64 +7,64 @@ namespace SmartStore.Services.Media { - public static class MediaFileExtensions - { - /// - /// Applies Blob to file - /// - /// The file binary (can be null) - public static void ApplyBlob(this MediaFile file, byte[] blob) - { - Guard.NotNull(file, nameof(file)); + public static class MediaFileExtensions + { + /// + /// Applies Blob to file + /// + /// The file binary (can be null) + public static void ApplyBlob(this MediaFile file, byte[] blob) + { + Guard.NotNull(file, nameof(file)); - if (blob == null || blob.LongLength == 0) - { - file.MediaStorageId = null; - file.MediaStorage = null; - } - else - { - if (file.MediaStorage != null) - { - file.MediaStorage.Data = blob; - } - else - { - file.MediaStorage = new MediaStorage { Data = blob }; - } - } - } + if (blob == null || blob.LongLength == 0) + { + file.MediaStorageId = null; + file.MediaStorage = null; + } + else + { + if (file.MediaStorage != null) + { + file.MediaStorage.Data = blob; + } + else + { + file.MediaStorage = new MediaStorage { Data = blob }; + } + } + } - /// - /// Refreshes file metadata like size, dimensions etc. - /// - /// The file stream (can be null) - public static void RefreshMetadata(this MediaFile file, Stream stream) - { - Guard.NotNull(file, nameof(file)); + /// + /// Refreshes file metadata like size, dimensions etc. + /// + /// The file stream (can be null) + public static void RefreshMetadata(this MediaFile file, Stream stream) + { + Guard.NotNull(file, nameof(file)); - file.Size = stream != null ? (int)stream.Length : 0; - file.Width = null; - file.Height = null; - file.PixelSize = null; + file.Size = stream != null ? (int)stream.Length : 0; + file.Width = null; + file.Height = null; + file.PixelSize = null; - if (stream != null && file.MediaType == MediaType.Image) - { - try - { - var size = ImageHeader.GetDimensions(stream, file.MimeType); - file.Width = size.Width; - file.Height = size.Height; - file.PixelSize = size.Width * size.Height; - } - catch - { - // Don't attempt again - file.Width = 0; - file.Height = 0; - file.PixelSize = 0; - } - } - } - } + if (stream != null && file.MediaType == MediaType.Image) + { + try + { + var size = ImageHeader.GetDimensions(stream, file.MimeType); + file.Width = size.Width; + file.Height = size.Height; + file.PixelSize = size.Width * size.Height; + } + catch + { + // Don't attempt again + file.Width = 0; + file.Height = 0; + file.PixelSize = 0; + } + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs index 384e449d56..471adb27d1 100644 --- a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs +++ b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandler.cs @@ -12,7 +12,7 @@ namespace SmartStore.Services.Media public class ImageHandler : ImageHandlerBase { private readonly IImageProcessor _imageProcessor; - + public ImageHandler(IImageProcessor imageProcessor, IImageCache imageCache, MediaExceptionFactory exceptionFactory) : base(imageCache, exceptionFactory) { diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandlerBase.cs b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandlerBase.cs index bf04b744f8..cf00df9baa 100644 --- a/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandlerBase.cs +++ b/src/Libraries/SmartStore.Services/Media/Handlers/ImageHandlerBase.cs @@ -76,7 +76,7 @@ public async Task ExecuteAsync(MediaHandlerContext context) if (inputStream == null) { context.Exception = ExceptionFactory.ExtractThumbnail(sourceFile.Path, T("Admin.Media.Exception.NullInputStream")); - context.Executed = true; + context.Executed = true; return; } diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs index c9c94250fe..0ae5408366 100644 --- a/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs +++ b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs @@ -16,18 +16,18 @@ namespace SmartStore.Services.Media { public class MediaHandlerContext { - private Lazy _lazySourceFile; - private IFile _sourceFile; + private Lazy _lazySourceFile; + private IFile _sourceFile; - public MediaHandlerContext() - { - _lazySourceFile = new Lazy(() => GetSourceFile(), false); - } + public MediaHandlerContext() + { + _lazySourceFile = new Lazy(() => GetSourceFile(), false); + } - public IMediaService MediaService { get; set; } - public IPermissionService PermissionService { get; set; } - public Customer CurrentCustomer { get; set; } - public HttpContextBase HttpContext { get; set; } + public IMediaService MediaService { get; set; } + public IPermissionService PermissionService { get; set; } + public Customer CurrentCustomer { get; set; } + public HttpContextBase HttpContext { get; set; } public int MediaFileId { get; set; } public string RawPath { get; set; } @@ -35,53 +35,53 @@ public MediaHandlerContext() public MediaPathData PathData { get; set; } public ProcessImageQuery ImageQuery { get; set; } - public IFile SourceFile - { - get => _sourceFile ?? _lazySourceFile.Value; - set => _sourceFile = value; - } + public IFile SourceFile + { + get => _sourceFile ?? _lazySourceFile.Value; + set => _sourceFile = value; + } - public bool Executed { get; set; } - public Exception Exception { get; set; } - public IFile ResultFile { get; set; } - public IImage ResultImage { get; set; } + public bool Executed { get; set; } + public Exception Exception { get; set; } + public IFile ResultFile { get; set; } + public IImage ResultImage { get; set; } - private IFile GetSourceFile() + private IFile GetSourceFile() { - if (MediaFileId == 0) - { - // This is most likely a request for a default placeholder image - var fallbackImagePath = Path.Combine(MediaUrlGenerator.FallbackImagesRootPath, RawPath).Replace('\\', '/'); - var fi = new FileInfo(CommonHelper.MapPath("~/" + fallbackImagePath, false)); - if (!fi.Exists) - return null; + if (MediaFileId == 0) + { + // This is most likely a request for a default placeholder image + var fallbackImagePath = Path.Combine(MediaUrlGenerator.FallbackImagesRootPath, RawPath).Replace('\\', '/'); + var fi = new FileInfo(CommonHelper.MapPath("~/" + fallbackImagePath, false)); + if (!fi.Exists) + return null; - return new LocalFileSystem.LocalFile(fallbackImagePath, fi); - } - else - { - // Get file from DB - var mediaFile = MediaService.GetFileById(MediaFileId, MediaLoadFlags.AsNoTracking); + return new LocalFileSystem.LocalFile(fallbackImagePath, fi); + } + else + { + // Get file from DB + var mediaFile = MediaService.GetFileById(MediaFileId, MediaLoadFlags.AsNoTracking); - // File must exist - if (mediaFile == null) - return null; + // File must exist + if (mediaFile == null) + return null; - // Serve deleted or hidden files only with sufficient permission - if ((mediaFile.Deleted || mediaFile.Hidden) && !PermissionService.Authorize(Permissions.Media.Update, CurrentCustomer)) - return null; + // Serve deleted or hidden files only with sufficient permission + if ((mediaFile.Deleted || mediaFile.Hidden) && !PermissionService.Authorize(Permissions.Media.Update, CurrentCustomer)) + return null; - //// File's mime must match requested mime - //if (!mediaFile.MimeType.IsCaseInsensitiveEqual(prevMime ?? pathData.MimeType)) - // return null; + //// File's mime must match requested mime + //if (!mediaFile.MimeType.IsCaseInsensitiveEqual(prevMime ?? pathData.MimeType)) + // return null; - // File path must match requested path and file title - // TODO: (mm) (mc) what about MIME and EXT? - if (mediaFile.FolderId != PathData.Folder?.Id || !mediaFile.Title.IsCaseInsensitiveEqual(PathData.FileTitle)) - return null; + // File path must match requested path and file title + // TODO: (mm) (mc) what about MIME and EXT? + if (mediaFile.FolderId != PathData.Folder?.Id || !mediaFile.Title.IsCaseInsensitiveEqual(PathData.FileTitle)) + return null; - return mediaFile; - } - } + return mediaFile; + } + } } } diff --git a/src/Libraries/SmartStore.Services/Media/IDownloadService.cs b/src/Libraries/SmartStore.Services/Media/IDownloadService.cs index f3c4e49cf5..39ba2223d2 100644 --- a/src/Libraries/SmartStore.Services/Media/IDownloadService.cs +++ b/src/Libraries/SmartStore.Services/Media/IDownloadService.cs @@ -17,27 +17,27 @@ public partial interface IDownloadService /// Download Download GetDownloadById(int downloadId); - /// - /// Gets downloads by identifiers - /// - /// Download identifiers - /// List of download entities - IList GetDownloadsByIds(int[] downloadIds); + /// + /// Gets downloads by identifiers + /// + /// Download identifiers + /// List of download entities + IList GetDownloadsByIds(int[] downloadIds); - /// - /// Gets downloads assigned to an entity - /// - /// Entity to get download for - /// List of download entities sorted by FileVersion - IList GetDownloadsFor(TEntity entity) where TEntity : BaseEntity; + /// + /// Gets downloads assigned to an entity + /// + /// Entity to get download for + /// List of download entities sorted by FileVersion + IList GetDownloadsFor(TEntity entity) where TEntity : BaseEntity; - /// - /// Gets downloads by entity identifier - /// - /// Entity identifier - /// Entity name - /// List of download entities - IList GetDownloadsFor(int entityId, string entityName); + /// + /// Gets downloads by entity identifier + /// + /// Entity identifier + /// Entity name + /// List of download entities + IList GetDownloadsFor(int entityId, string entityName); /// /// Gets downloads by entity identifier & fileversion @@ -84,11 +84,11 @@ public partial interface IDownloadService /// The inserted object instance. MediaFileInfo InsertDownload(Download download, Stream stream, string fileName); - /// - /// Updates the download. - /// - /// Download. - void UpdateDownload(Download download); + /// + /// Updates the download. + /// + /// Download. + void UpdateDownload(Download download); /// /// Gets a value indicating whether download is allowed @@ -104,11 +104,11 @@ public partial interface IDownloadService /// True if license download is allowed; otherwise, false. bool IsLicenseDownloadAllowed(OrderItem orderItem); - /// - /// Load binary data of a download - /// - /// Download - /// Binary data - byte[] LoadDownloadBinary(Download download); - } + /// + /// Load binary data of a download + /// + /// Download + /// Binary data + byte[] LoadDownloadBinary(Download download); + } } diff --git a/src/Libraries/SmartStore.Services/Media/IMediaService.cs b/src/Libraries/SmartStore.Services/Media/IMediaService.cs index 8954e6c053..99d6da5618 100644 --- a/src/Libraries/SmartStore.Services/Media/IMediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/IMediaService.cs @@ -20,7 +20,7 @@ public enum MediaLoadFlags WithTags = 1 << 1, WithTracks = 1 << 2, WithFolder = 1 << 3, - AsNoTracking = 1 << 4, + AsNoTracking = 1 << 4, Full = WithBlob | WithTags | WithTracks | WithFolder, FullNoTracking = Full | AsNoTracking } diff --git a/src/Libraries/SmartStore.Services/Media/IMediaUrlGenerator.cs b/src/Libraries/SmartStore.Services/Media/IMediaUrlGenerator.cs index 1566c6b1fe..d90b168755 100644 --- a/src/Libraries/SmartStore.Services/Media/IMediaUrlGenerator.cs +++ b/src/Libraries/SmartStore.Services/Media/IMediaUrlGenerator.cs @@ -27,8 +27,8 @@ public interface IMediaUrlGenerator /// /// The passed file's public URL. string GenerateUrl( - MediaFileInfo file, - ProcessImageQuery imageQuery, + MediaFileInfo file, + ProcessImageQuery imageQuery, string host = null, bool doFallback = true); } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/CachedImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/CachedImage.cs index 4d4681113f..421c730b4c 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/CachedImage.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/CachedImage.cs @@ -13,89 +13,71 @@ namespace SmartStore.Services.Media.Imaging /// public class CachedImage { - private bool? _exists; - private string _mimeType; - private Size? _size; + private bool? _exists; + private string _mimeType; + private Size? _size; - public CachedImage(IFile file) - { - Guard.NotNull(file, nameof(file)); + public CachedImage(IFile file) + { + Guard.NotNull(file, nameof(file)); - File = file; - } + File = file; + } - /// - /// The abstracted file object - /// - public IFile File { get; internal set; } + /// + /// The abstracted file object + /// + public IFile File { get; internal set; } - /// - /// true when the image exists in the cache, false otherwise. - /// - public bool Exists - { - get - { - return _exists ?? (_exists = File.Exists).Value; - } - // For internal use - set - { - _exists = value; - } - } + /// + /// true when the image exists in the cache, false otherwise. + /// + public bool Exists + { + get => _exists ?? (_exists = File.Exists).Value; + // For internal use + set => _exists = value; + } /// /// The name of the file (without path) /// - public string FileName - { - get { return System.IO.Path.GetFileName(this.Path); } - } + public string FileName => System.IO.Path.GetFileName(this.Path); - public long FileSize - { - get { return !Exists ? 0 : File.Size; } - } + public long FileSize => !Exists ? 0 : File.Size; - /// - /// The file extension (without 'dot') - /// - public string Extension { get; set; } + /// + /// The file extension (without 'dot') + /// + public string Extension { get; set; } - /// - /// The filemime type - /// - public string MimeType - { - get => _mimeType ?? (_mimeType = MimeTypes.MapNameToMimeType(FileName)); - } + /// + /// The filemime type + /// + public string MimeType => _mimeType ?? (_mimeType = MimeTypes.MapNameToMimeType(FileName)); - /// - /// The image width and height. - /// - public Size Size - { - get => _size ?? (_size = File.Dimensions).Value; - internal set => _size = value; - } + /// + /// The image width and height. + /// + public Size Size + { + get => _size ?? (_size = File.Dimensions).Value; + internal set => _size = value; + } - /// - /// The path relative to the cache root folder - /// - public string Path { get; set; } + /// + /// The path relative to the cache root folder + /// + public string Path { get; set; } - /// - /// The last modified date or null if the file does not exist - /// - public DateTime? LastModifiedUtc - { - get { return Exists ? File.LastUpdated : (DateTime?)null; } - } + /// + /// The last modified date or null if the file does not exist + /// + public DateTime? LastModifiedUtc => Exists ? File.LastUpdated : (DateTime?)null; - /// - /// Checks whether the file is remote (outside the application's physical root) - /// - public bool IsRemote { get; set; } + /// + /// Checks whether the file is remote (outside the application's physical root) + /// + public bool IsRemote { get; set; } } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs index 076d30d278..2d4ed37c15 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/DefaultImageProcessor.cs @@ -11,197 +11,194 @@ namespace SmartStore.Services.Media.Imaging { public class DefaultImageProcessor : IImageProcessor { - private static long _totalProcessingTime; - - private readonly IEventPublisher _eventPublisher; - - public DefaultImageProcessor(IImageFactory imageFactory, IEventPublisher eventPublisher) - { - Factory = imageFactory; - _eventPublisher = eventPublisher; - } - - public ILogger Logger { get; set; } = NullLogger.Instance; - - public IImageFactory Factory { get; } - - public ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) - { - Guard.NotNull(query, nameof(query)); - - ValidateQuery(query); - - var watch = new Stopwatch(); - long len; - IProcessableImage image = null; - - try - { - watch.Start(); - - var source = query.Source; - - // Load source - if (source is byte[] b) - { - using var memStream = new MemoryStream(b); - image = Factory.LoadImage(memStream); - len = b.LongLength; - } - else if (source is Stream s) - { - image = Factory.LoadImage(s); - len = s.Length; - } - else if (source is string str) - { - str = NormalizePath(str); - image = Factory.LoadImage(str); - len = (new FileInfo(str)).Length; - } - else if (source is IFile file) - { - using (var fs = file.OpenRead()) - { - image = Factory.LoadImage(fs); - len = file.Size; - } - } - else - { - throw new ProcessImageException("Invalid source type '{0}' in query.".FormatInvariant(query.Source.GetType().FullName), query); - } - - var sourceFormat = image.Format; - - // Pre-process event - _eventPublisher.Publish(new ImageProcessingEvent(query, image)); - - var result = new ProcessImageResult - { - Query = query, - SourceFormat = image.Format, - Image = image, - DisposeImage = disposeOutput - }; - - // Core processing - ProcessImageCore(query, image, out var fxApplied); - - result.HasAppliedVisualEffects = fxApplied; - - // Post-process event - _eventPublisher.Publish(new ImageProcessedEvent(query, result)); - - result.ProcessTimeMs = watch.ElapsedMilliseconds; - - return result; - } - catch (Exception ex) - { - throw new ProcessImageException(query, ex); - } - finally - { - if (query.DisposeSource && query.Source is IDisposable source) - { - source.Dispose(); - } - - watch.Stop(); - _totalProcessingTime += watch.ElapsedMilliseconds; - } - } - - /// - /// Processes the loaded image. Inheritors should NOT save the image, this is done by the caller. - /// - /// Query - /// Image instance - /// - /// Should be true if any effect has been applied that potentially changes the image visually (like background color, contrast, sharpness etc.). - /// Resize and compression quality does NOT count as FX. - /// - protected virtual void ProcessImageCore(ProcessImageQuery query, IProcessableImage image, out bool fxApplied) - { - bool fxAppliedInternal = false; - - // Resize - var size = query.MaxWidth != null || query.MaxHeight != null - ? new Size(query.MaxWidth ?? 0, query.MaxHeight ?? 0) - : Size.Empty; - - image.Transform(transformer => - { - if (!size.IsEmpty) - { - transformer.Resize(new ResizeOptions - { - Size = size, - ResizeMode = ProcessImageQuery.ConvertScaleMode(query.ScaleMode), - AnchorPosition = ProcessImageQuery.ConvertAnchorPosition(query.AnchorPosition) - }); ; - } - - if (query.BackgroundColor.HasValue()) - { - transformer.BackgroundColor(ColorTranslator.FromHtml(query.BackgroundColor)); - fxAppliedInternal = true; - } - - // Format - if (query.Format != null) - { - var format = query.Format as IImageFormat; - - if (format == null && query.Format is string) - { - var requestedFormat = ((string)query.Format).ToLowerInvariant(); - format = Factory.GetImageFormat(requestedFormat); - } - - if (format != null) - { - transformer.Format(format); - } - } - - // QUality - if (query.Quality.HasValue) - { - transformer.Quality(query.Quality.Value); - } - }); + private static long _totalProcessingTime; + + private readonly IEventPublisher _eventPublisher; + + public DefaultImageProcessor(IImageFactory imageFactory, IEventPublisher eventPublisher) + { + Factory = imageFactory; + _eventPublisher = eventPublisher; + } + + public ILogger Logger { get; set; } = NullLogger.Instance; + + public IImageFactory Factory { get; } + + public ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true) + { + Guard.NotNull(query, nameof(query)); + + ValidateQuery(query); + + var watch = new Stopwatch(); + long len; + IProcessableImage image = null; + + try + { + watch.Start(); + + var source = query.Source; + + // Load source + if (source is byte[] b) + { + using var memStream = new MemoryStream(b); + image = Factory.LoadImage(memStream); + len = b.LongLength; + } + else if (source is Stream s) + { + image = Factory.LoadImage(s); + len = s.Length; + } + else if (source is string str) + { + str = NormalizePath(str); + image = Factory.LoadImage(str); + len = (new FileInfo(str)).Length; + } + else if (source is IFile file) + { + using (var fs = file.OpenRead()) + { + image = Factory.LoadImage(fs); + len = file.Size; + } + } + else + { + throw new ProcessImageException("Invalid source type '{0}' in query.".FormatInvariant(query.Source.GetType().FullName), query); + } + + var sourceFormat = image.Format; + + // Pre-process event + _eventPublisher.Publish(new ImageProcessingEvent(query, image)); + + var result = new ProcessImageResult + { + Query = query, + SourceFormat = image.Format, + Image = image, + DisposeImage = disposeOutput + }; + + // Core processing + ProcessImageCore(query, image, out var fxApplied); + + result.HasAppliedVisualEffects = fxApplied; + + // Post-process event + _eventPublisher.Publish(new ImageProcessedEvent(query, result)); + + result.ProcessTimeMs = watch.ElapsedMilliseconds; + + return result; + } + catch (Exception ex) + { + throw new ProcessImageException(query, ex); + } + finally + { + if (query.DisposeSource && query.Source is IDisposable source) + { + source.Dispose(); + } + + watch.Stop(); + _totalProcessingTime += watch.ElapsedMilliseconds; + } + } + + /// + /// Processes the loaded image. Inheritors should NOT save the image, this is done by the caller. + /// + /// Query + /// Image instance + /// + /// Should be true if any effect has been applied that potentially changes the image visually (like background color, contrast, sharpness etc.). + /// Resize and compression quality does NOT count as FX. + /// + protected virtual void ProcessImageCore(ProcessImageQuery query, IProcessableImage image, out bool fxApplied) + { + bool fxAppliedInternal = false; + + // Resize + var size = query.MaxWidth != null || query.MaxHeight != null + ? new Size(query.MaxWidth ?? 0, query.MaxHeight ?? 0) + : Size.Empty; + + image.Transform(transformer => + { + if (!size.IsEmpty) + { + transformer.Resize(new ResizeOptions + { + Size = size, + ResizeMode = ProcessImageQuery.ConvertScaleMode(query.ScaleMode), + AnchorPosition = ProcessImageQuery.ConvertAnchorPosition(query.AnchorPosition) + }); ; + } + + if (query.BackgroundColor.HasValue()) + { + transformer.BackgroundColor(ColorTranslator.FromHtml(query.BackgroundColor)); + fxAppliedInternal = true; + } + + // Format + if (query.Format != null) + { + var format = query.Format as IImageFormat; + + if (format == null && query.Format is string) + { + var requestedFormat = ((string)query.Format).ToLowerInvariant(); + format = Factory.GetImageFormat(requestedFormat); + } + + if (format != null) + { + transformer.Format(format); + } + } + + // QUality + if (query.Quality.HasValue) + { + transformer.Quality(query.Quality.Value); + } + }); fxApplied = fxAppliedInternal; - } - - protected virtual string NormalizePath(string path) - { - if (path.IsWebUrl()) - { - throw new NotSupportedException($"Remote images cannot be processed: Path: {path}"); - } - - if (!PathHelper.IsAbsolutePhysicalPath(path)) - { - path = CommonHelper.MapPath(path); - } - - return path; - } - - private void ValidateQuery(ProcessImageQuery query) - { - if (query.Source == null) - { - throw new ArgumentException("During image processing 'ProcessImageQuery.Source' must not be null.", nameof(query)); - } - } - - public long TotalProcessingTimeMs - { - get { return _totalProcessingTime; } - } - } + } + + protected virtual string NormalizePath(string path) + { + if (path.IsWebUrl()) + { + throw new NotSupportedException($"Remote images cannot be processed: Path: {path}"); + } + + if (!PathHelper.IsAbsolutePhysicalPath(path)) + { + path = CommonHelper.MapPath(path); + } + + return path; + } + + private void ValidateQuery(ProcessImageQuery query) + { + if (query.Source == null) + { + throw new ArgumentException("During image processing 'ProcessImageQuery.Source' must not be null.", nameof(query)); + } + } + + public long TotalProcessingTimeMs => _totalProcessingTime; + } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs index b2b064ff9d..794fa000fb 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImage.cs @@ -19,7 +19,7 @@ public interface IProcessableImage : IImage /// IImage Transform(Action transformer); } - + /// /// Represents an image. /// diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs index f2e675fa70..0e37de0865 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageCache.cs @@ -10,58 +10,58 @@ namespace SmartStore.Services.Media.Imaging /// public interface IImageCache { - /// - /// Adds an image to the cache. - /// - /// An instance of the object which is returned by the Get() method. - /// The image object. - void Put(CachedImage cachedImage, IImage image); + /// + /// Adds an image to the cache. + /// + /// An instance of the object which is returned by the Get() method. + /// The image object. + void Put(CachedImage cachedImage, IImage image); - /// - /// Adds an image to the cache. - /// - /// An instance of the object which is returned by the Get() method. - /// The file input stream. - void Put(CachedImage cachedImage, Stream stream); + /// + /// Adds an image to the cache. + /// + /// An instance of the object which is returned by the Get() method. + /// The file input stream. + void Put(CachedImage cachedImage, Stream stream); - /// - /// Asynchronously adds an image to the cache. - /// - /// An instance of the object which is returned by the Get() method. - /// The file input stream. - Task PutAsync(CachedImage cachedImage, Stream stream); + /// + /// Asynchronously adds an image to the cache. + /// + /// An instance of the object which is returned by the Get() method. + /// The file input stream. + Task PutAsync(CachedImage cachedImage, Stream stream); - /// - /// Gets an instance of the object which contains information about a cached image. - /// - /// The id of the file to resolve a thumbnail for. - /// The path data. - /// The image processing query. - /// An instance of the object - /// If the requested thumbnail does not exist in the cache, the value of the Exists property will be false. - CachedImage Get(int? mediaFileId, MediaPathData pathData, ProcessImageQuery query = null); + /// + /// Gets an instance of the object which contains information about a cached image. + /// + /// The id of the file to resolve a thumbnail for. + /// The path data. + /// The image processing query. + /// An instance of the object + /// If the requested thumbnail does not exist in the cache, the value of the Exists property will be false. + CachedImage Get(int? mediaFileId, MediaPathData pathData, ProcessImageQuery query = null); - /// - /// Deletes all cached images for the given - /// - /// The for which to delete cached images - void Delete(MediaFile picture); + /// + /// Deletes all cached images for the given + /// + /// The for which to delete cached images + void Delete(MediaFile picture); - /// - /// Deletes all cached images (nukes all files in the cache folder) - /// - void Clear(); + /// + /// Deletes all cached images (nukes all files in the cache folder) + /// + void Clear(); - /// - /// Refreshes the file info. - /// - void RefreshInfo(CachedImage cachedImage); + /// + /// Refreshes the file info. + /// + void RefreshInfo(CachedImage cachedImage); - /// - /// Calculates statistics about the image cache data. - /// - /// The total count of files in the cache. - /// The total size of files in the cache (in bytes) - void CacheStatistics(out long fileCount, out long totalSize); - } + /// + /// Calculates statistics about the image cache data. + /// + /// The total count of files in the cache. + /// The total size of files in the cache (in bytes) + void CacheStatistics(out long fileCount, out long totalSize); + } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs b/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs index 041f87d7ce..91f0e94c6e 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/IImageProcessor.cs @@ -12,7 +12,7 @@ public interface IImageProcessor /// The image factory adapter used to load and process images. /// IImageFactory Factory { get; } - + /// /// Processes an image /// @@ -21,9 +21,9 @@ public interface IImageProcessor /// The resizing result encapsulated in type ProcessImageResult ProcessImage(ProcessImageQuery query, bool disposeOutput = true); - /// - /// Gets the cumulative total processing time since app start in miliseconds - /// - long TotalProcessingTimeMs { get; } - } + /// + /// Gets the cumulative total processing time since app start in miliseconds + /// + long TotalProcessingTimeMs { get; } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs index dcf6ef77a6..a841a21bcb 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ImageCache.cs @@ -8,214 +8,214 @@ namespace SmartStore.Services.Media.Imaging { - public class ImageCache : IImageCache + public class ImageCache : IImageCache { - public const string IdFormatString = "0000000"; - internal const int MaxDirLength = 4; + public const string IdFormatString = "0000000"; + internal const int MaxDirLength = 4; - private readonly MediaSettings _mediaSettings; - private readonly IMediaFileSystem _fileSystem; - private readonly string _thumbsRootDir; + private readonly MediaSettings _mediaSettings; + private readonly IMediaFileSystem _fileSystem; + private readonly string _thumbsRootDir; - public ImageCache( - MediaSettings mediaSettings, - IMediaFileSystem fileSystem, - MediaHelper mediaHelper) + public ImageCache( + MediaSettings mediaSettings, + IMediaFileSystem fileSystem, + MediaHelper mediaHelper) { _mediaSettings = mediaSettings; - _fileSystem = fileSystem; - - _thumbsRootDir = "Thumbs/"; - } - - public ILogger Logger { get; set; } = NullLogger.Instance; - - public void Put(CachedImage cachedImage, IImage image) - { - var path = BuildPath(cachedImage.Path); - using var stream = _fileSystem.GetFile(path).OpenWrite(); - - if (PreparePut(cachedImage, stream)) - { - image.Save(stream); - image.Dispose(); - PostPut(cachedImage, path); - } - } - - public void Put(CachedImage cachedImage, Stream stream) - { - if (PreparePut(cachedImage, stream)) - { - var path = BuildPath(cachedImage.Path); - _fileSystem.SaveStream(path, stream); - PostPut(cachedImage, path); - } - } - - public async Task PutAsync(CachedImage cachedImage, Stream stream) - { - if (PreparePut(cachedImage, stream)) - { - var path = BuildPath(cachedImage.Path); - await _fileSystem.SaveStreamAsync(path, stream); - PostPut(cachedImage, path); - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void PostPut(CachedImage cachedImage, string path) + _fileSystem = fileSystem; + + _thumbsRootDir = "Thumbs/"; + } + + public ILogger Logger { get; set; } = NullLogger.Instance; + + public void Put(CachedImage cachedImage, IImage image) + { + var path = BuildPath(cachedImage.Path); + using var stream = _fileSystem.GetFile(path).OpenWrite(); + + if (PreparePut(cachedImage, stream)) + { + image.Save(stream); + image.Dispose(); + PostPut(cachedImage, path); + } + } + + public void Put(CachedImage cachedImage, Stream stream) + { + if (PreparePut(cachedImage, stream)) + { + var path = BuildPath(cachedImage.Path); + _fileSystem.SaveStream(path, stream); + PostPut(cachedImage, path); + } + } + + public async Task PutAsync(CachedImage cachedImage, Stream stream) + { + if (PreparePut(cachedImage, stream)) + { + var path = BuildPath(cachedImage.Path); + await _fileSystem.SaveStreamAsync(path, stream); + PostPut(cachedImage, path); + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private void PostPut(CachedImage cachedImage, string path) { - cachedImage.Exists = true; - cachedImage.File = _fileSystem.GetFile(path); - } - - private bool PreparePut(CachedImage cachedImage, Stream stream) - { - Guard.NotNull(cachedImage, nameof(cachedImage)); - - if (stream == null) - { - return false; - } - - // create folder if needed - string imageDir = System.IO.Path.GetDirectoryName(cachedImage.Path); - if (imageDir.HasValue()) - { - _fileSystem.CreateFolder(BuildPath(imageDir)); - } - - return true; - } - - public virtual CachedImage Get(int? mediaFileId, MediaPathData data, ProcessImageQuery query = null) - { - Guard.NotNull(data, nameof(data)); - - var resultExtension = query?.GetResultExtension(); - if (resultExtension != null) - { - data.Extension = resultExtension; - } - - var imagePath = GetCachedImagePath(mediaFileId, data, query); - var file = _fileSystem.GetFile(BuildPath(imagePath)); - - var result = new CachedImage(file) - { - Path = imagePath, - Extension = data.Extension, - IsRemote = _fileSystem.IsCloudStorage - }; - - return result; - } - - public virtual void RefreshInfo(CachedImage cachedImage) - { - Guard.NotNull(cachedImage, nameof(cachedImage)); - - var file = _fileSystem.GetFile(cachedImage.File.Path); - cachedImage.File = file; - cachedImage.Exists = file.Exists; - } - - public virtual void Delete(MediaFile picture) + cachedImage.Exists = true; + cachedImage.File = _fileSystem.GetFile(path); + } + + private bool PreparePut(CachedImage cachedImage, Stream stream) + { + Guard.NotNull(cachedImage, nameof(cachedImage)); + + if (stream == null) + { + return false; + } + + // create folder if needed + string imageDir = System.IO.Path.GetDirectoryName(cachedImage.Path); + if (imageDir.HasValue()) + { + _fileSystem.CreateFolder(BuildPath(imageDir)); + } + + return true; + } + + public virtual CachedImage Get(int? mediaFileId, MediaPathData data, ProcessImageQuery query = null) + { + Guard.NotNull(data, nameof(data)); + + var resultExtension = query?.GetResultExtension(); + if (resultExtension != null) + { + data.Extension = resultExtension; + } + + var imagePath = GetCachedImagePath(mediaFileId, data, query); + var file = _fileSystem.GetFile(BuildPath(imagePath)); + + var result = new CachedImage(file) + { + Path = imagePath, + Extension = data.Extension, + IsRemote = _fileSystem.IsCloudStorage + }; + + return result; + } + + public virtual void RefreshInfo(CachedImage cachedImage) + { + Guard.NotNull(cachedImage, nameof(cachedImage)); + + var file = _fileSystem.GetFile(cachedImage.File.Path); + cachedImage.File = file; + cachedImage.Exists = file.Exists; + } + + public virtual void Delete(MediaFile picture) { var filter = string.Format("{0}*.*", picture.Id.ToString(IdFormatString)); - var files = _fileSystem.SearchFiles(_thumbsRootDir, filter); - foreach (var file in files) - { - _fileSystem.DeleteFile(file); - } - } + var files = _fileSystem.SearchFiles(_thumbsRootDir, filter); + foreach (var file in files) + { + _fileSystem.DeleteFile(file); + } + } - public virtual void Clear() + public virtual void Clear() { - for (int i = 0; i < 10; i++) + for (int i = 0; i < 10; i++) { - - try + + try { - _fileSystem.DeleteFolder(_thumbsRootDir); - _fileSystem.CreateFolder(_thumbsRootDir); - } + _fileSystem.DeleteFolder(_thumbsRootDir); + _fileSystem.CreateFolder(_thumbsRootDir); + } catch (Exception ex) { - Logger.Error(ex); + Logger.Error(ex); } } } public void CacheStatistics(out long fileCount, out long totalSize) { - fileCount = 0; - totalSize = 0; + fileCount = 0; + totalSize = 0; - if (!_fileSystem.FolderExists(_thumbsRootDir)) - { - return; - } + if (!_fileSystem.FolderExists(_thumbsRootDir)) + { + return; + } - fileCount = _fileSystem.SearchFiles(_thumbsRootDir, "*.*").Count(); - totalSize = _fileSystem.ListFolders(_thumbsRootDir).Sum(x => x.Size); + fileCount = _fileSystem.SearchFiles(_thumbsRootDir, "*.*").Count(); + totalSize = _fileSystem.ListFolders(_thumbsRootDir).Sum(x => x.Size); } - #region Utils - - protected string GetCachedImagePath(int? mediaFileId, MediaPathData data, ProcessImageQuery query = null) - { - string result = ""; - - // xxxxxxx - if (mediaFileId.GetValueOrDefault() > 0) - { - result = mediaFileId.Value.ToString(IdFormatString); - } - - //// INFO: (mm) don't include folder id in pathes for now. It results in more complex image cache invalidation code. - //// xxxxxxx-f - //if (data.Folder != null) - //{ - // result = result.Grow(data.Folder.Id.ToString(CultureInfo.InvariantCulture), "-"); - //} - - // xxxxxxx-f-abc - result = result.Grow(data.FileTitle, "-"); - - if (result.IsEmpty()) - { - // files without name? No way! - return null; - } - - if (query != null && query.NeedsProcessing()) - { - // xxxxxxx-f-abc-w100-h100 - result += query.CreateHash(); - } - - if (_mediaSettings.MultipleThumbDirectories && result.Length > MaxDirLength) - { - // Get the first four letters of the file name - // 0001/xxxxxxx-f-abc-w100-h100 - var subDirectoryName = result.Substring(0, MaxDirLength); - result = subDirectoryName + "/" + result; - } - - // 0001/xxxxxxx-f-abc-w100-h100.png - return result.Grow(data.Extension, "."); - } - - private string BuildPath(string imagePath) - { - if (imagePath.IsEmpty()) - return null; - - return _thumbsRootDir + imagePath; - } + #region Utils + + protected string GetCachedImagePath(int? mediaFileId, MediaPathData data, ProcessImageQuery query = null) + { + string result = ""; + + // xxxxxxx + if (mediaFileId.GetValueOrDefault() > 0) + { + result = mediaFileId.Value.ToString(IdFormatString); + } + + //// INFO: (mm) don't include folder id in pathes for now. It results in more complex image cache invalidation code. + //// xxxxxxx-f + //if (data.Folder != null) + //{ + // result = result.Grow(data.Folder.Id.ToString(CultureInfo.InvariantCulture), "-"); + //} + + // xxxxxxx-f-abc + result = result.Grow(data.FileTitle, "-"); + + if (result.IsEmpty()) + { + // files without name? No way! + return null; + } + + if (query != null && query.NeedsProcessing()) + { + // xxxxxxx-f-abc-w100-h100 + result += query.CreateHash(); + } + + if (_mediaSettings.MultipleThumbDirectories && result.Length > MaxDirLength) + { + // Get the first four letters of the file name + // 0001/xxxxxxx-f-abc-w100-h100 + var subDirectoryName = result.Substring(0, MaxDirLength); + result = subDirectoryName + "/" + result; + } + + // 0001/xxxxxxx-f-abc-w100-h100.png + return result.Grow(data.Extension, "."); + } + + private string BuildPath(string imagePath) + { + if (imagePath.IsEmpty()) + return null; + + return _thumbsRootDir + imagePath; + } #endregion } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ImageWrapper.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ImageWrapper.cs index 180c4fd45a..88ee824ee1 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ImageWrapper.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ImageWrapper.cs @@ -7,7 +7,7 @@ namespace SmartStore.Services.Media.Imaging public class ImageWrapper : DisposableObject, IImage { private readonly bool _disposeStream; - + public ImageWrapper(Stream stream, Size size, IImageFormat format, BitDepth bitDepth = BitDepth.Bit24, bool disposeStream = true) { Guard.NotNull(stream, nameof(stream)); @@ -58,7 +58,7 @@ public IImage Save(string path) public IImage Save(Stream stream) { Guard.NotNull(stream, nameof(stream)); - + if (stream.CanSeek) { stream.SetLength(0); diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs index 4eef7f194d..ed3257e879 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImage.cs @@ -6,9 +6,9 @@ namespace SmartStore.Services.Media.Imaging.Impl { public class IPImage : DisposableObject, IProcessableImage - { + { private readonly ImageFactory _image; - + public IPImage(ImageFactory image) { _image = image; @@ -21,7 +21,7 @@ public IPImage(ImageFactory image) public Size Size => _image.Image.Size; /// - public BitDepth BitDepth + public BitDepth BitDepth { get => (BitDepth)Convert.ToInt32(_image.CurrentBitDepth); set => _image.BitDepth(Convert.ToInt64(value)); @@ -40,10 +40,7 @@ public IImageFormat Format #endregion - public ImageFactory ImageFactory - { - get => _image; - } + public ImageFactory ImageFactory => _image; /// public Size SourceSize { get; } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFactory.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFactory.cs index f8a4c23c30..f1fdc2633d 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFactory.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFactory.cs @@ -15,46 +15,46 @@ static IPImageFactory() ImageProcessorBootstrapper.Instance.AddImageFormats(new WebPFormat { Quality = 100 }); } - public bool IsSupportedImage(string extension) - { - return GetInternalImageFormat(extension) != null; - } - - public IImageFormat GetImageFormat(string extension) - { - var internalFormat = GetInternalImageFormat(extension); - if (internalFormat != null) - { - return new IPImageFormat(internalFormat); - } - - return null; - } - - private ISupportedImageFormat GetInternalImageFormat(string extension) - { - if (extension.IsEmpty()) - { - return null; - } - - if (extension[0] == '.' && extension.Length > 1) - { - extension = extension.Substring(1); - } - - return ImageProcessorBootstrapper.Instance.SupportedImageFormats - .FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase)); - } - - public IProcessableImage LoadImage(string path, bool preserveExif = false) - { - return new IPImage(new ImageFactory(preserveExif, fixGamma: false).Load(path)); - } - - public IProcessableImage LoadImage(Stream stream, bool preserveExif = false) - { - return new IPImage(new ImageFactory(preserveExif, fixGamma: false).Load(stream)); - } - } + public bool IsSupportedImage(string extension) + { + return GetInternalImageFormat(extension) != null; + } + + public IImageFormat GetImageFormat(string extension) + { + var internalFormat = GetInternalImageFormat(extension); + if (internalFormat != null) + { + return new IPImageFormat(internalFormat); + } + + return null; + } + + private ISupportedImageFormat GetInternalImageFormat(string extension) + { + if (extension.IsEmpty()) + { + return null; + } + + if (extension[0] == '.' && extension.Length > 1) + { + extension = extension.Substring(1); + } + + return ImageProcessorBootstrapper.Instance.SupportedImageFormats + .FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase)); + } + + public IProcessableImage LoadImage(string path, bool preserveExif = false) + { + return new IPImage(new ImageFactory(preserveExif, fixGamma: false).Load(path)); + } + + public IProcessableImage LoadImage(Stream stream, bool preserveExif = false) + { + return new IPImage(new ImageFactory(preserveExif, fixGamma: false).Load(stream)); + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs index 49bee15de5..8f84be635b 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageFormat.cs @@ -6,17 +6,14 @@ namespace SmartStore.Services.Media.Imaging.Impl internal class IPImageFormat : IImageFormat { private readonly ISupportedImageFormat _format; - + public IPImageFormat(ISupportedImageFormat format) { Guard.NotNull(format, nameof(format)); _format = format; } - public ISupportedImageFormat WrappedFormat - { - get => _format; - } + public ISupportedImageFormat WrappedFormat => _format; public string Name => _format.DefaultExtension; diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs index 03df89e9f6..fbd2708d1f 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/Impl/IPImageTransformer.cs @@ -26,7 +26,7 @@ public IImageTransformer Resize(Size size) public IImageTransformer Resize(ResizeOptions options) { Guard.NotNull(options, nameof(options)); - + var layer = new ResizeLayer( size: options.Size, resizeMode: (ImageProcessor.Imaging.ResizeMode)options.ResizeMode, diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageException.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageException.cs index 023cac8db7..a51f9fefbd 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageException.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageException.cs @@ -2,46 +2,46 @@ namespace SmartStore.Services.Media.Imaging { - public sealed class ProcessImageException : Exception - { - public ProcessImageException() - : this((string)null, null) - { - } - - public ProcessImageException(ProcessImageQuery query) - : this(query, null) - { - } - - public ProcessImageException(string message, ProcessImageQuery query) - : base(message) - { - Query = query; - } - - public ProcessImageException(ProcessImageQuery query, Exception innerException) - : base(CreateMessage(query, innerException), innerException) - { - Query = query; - } - - private static string CreateMessage(ProcessImageQuery query, Exception innerException) - { - var fileName = query?.FileName; - - var msg = fileName.HasValue() - ? "Error while processing image '{0}'".FormatCurrent(fileName.NaIfEmpty()) - : "Error while processing image"; - - if (innerException != null) - { - msg += " (" + innerException.Message + ")"; - } - - return msg; - } - - public ProcessImageQuery Query { get; private set; } - } + public sealed class ProcessImageException : Exception + { + public ProcessImageException() + : this((string)null, null) + { + } + + public ProcessImageException(ProcessImageQuery query) + : this(query, null) + { + } + + public ProcessImageException(string message, ProcessImageQuery query) + : base(message) + { + Query = query; + } + + public ProcessImageException(ProcessImageQuery query, Exception innerException) + : base(CreateMessage(query, innerException), innerException) + { + Query = query; + } + + private static string CreateMessage(ProcessImageQuery query, Exception innerException) + { + var fileName = query?.FileName; + + var msg = fileName.HasValue() + ? "Error while processing image '{0}'".FormatCurrent(fileName.NaIfEmpty()) + : "Error while processing image"; + + if (innerException != null) + { + msg += " (" + innerException.Message + ")"; + } + + return msg; + } + + public ProcessImageQuery Query { get; private set; } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs index 3ca9333981..9e1c7d02d3 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs @@ -9,172 +9,172 @@ namespace SmartStore.Services.Media.Imaging { - public class ProcessImageQuery : QueryString - { - private readonly static HashSet _supportedTokens = new HashSet { "w", "h", "q", "m", "size" }; - - public ProcessImageQuery() - : this(null, new NameValueCollection()) - { - } - - public ProcessImageQuery(byte[] source) - : this(source, new NameValueCollection()) - { - } - - public ProcessImageQuery(Stream source) - : this(source, new NameValueCollection()) - { - } - - public ProcessImageQuery(Image source) - : this(source, new NameValueCollection()) - { - } - - public ProcessImageQuery(string source) - : this(source, new NameValueCollection()) - { - } - - public ProcessImageQuery(object source, NameValueCollection query) - : base(SanitizeCollection(query)) - { - Guard.NotNull(query, nameof(query)); - - Source = source; - DisposeSource = true; - Notify = true; - } - - public ProcessImageQuery(ProcessImageQuery query) - : base(SanitizeCollection(query)) - { - Guard.NotNull(query, nameof(query)); - - Source = query.Source; - Format = query.Format; - DisposeSource = query.DisposeSource; - } - - private static NameValueCollection SanitizeCollection(NameValueCollection query) - { - // We just need the supported flags - var sanitizable = query.AllKeys.Any(x => !_supportedTokens.Contains(x)); - if (sanitizable) - { - var copy = new NameValueCollection(query); - foreach (var key in copy.AllKeys) - { - if (!_supportedTokens.Contains(key)) - { - copy.Remove(key); - } - } - - return copy; - } - - return query; - } - - /// - /// The source image's physical path, app-relative virtual path, or a Stream, byte array, Image or IFile instance. - /// - public object Source { get; set; } - - public string FileName { get; set; } - - /// - /// Whether to dispose the source stream after processing completes - /// - public bool DisposeSource { get; set; } - - /// - /// Whether to execute an applicable post processor which - /// can reduce the resulting file size drastically, but also - /// can slow down processing time. - /// - public bool ExecutePostProcessor { get; set; } = true; - - public int? MaxWidth - { - get { return Get("w") ?? Get("size"); } - set { Set("w", value); } - } - - public int? MaxHeight - { - get { return Get("h") ?? Get("size"); } - set { Set("h", value); } - } - - public int? MaxSize - { - get { return Get("size"); } - set { Set("size", value); } - } - - public int? Quality - { - get { return Get("q"); } - set { Set("q", value); } - } - - /// - /// max (default) | boxpad | crop | min | pad | stretch - /// - public string ScaleMode - { - get { return Get("m"); } - set { Set("m", value); } - } - - /// - /// center (default) | top | bottom | left | right | top-left | top-right | bottom-left | bottom-right - /// - public string AnchorPosition - { - get { return Get("pos"); } - set { Set("pos", value); } - } - - public string BackgroundColor - { - get { return Get("bg"); } - set { Set("bg", value); } - } - - /// - /// Gets or sets the output file format either as a string ("png", "jpg", "gif" and "svg"), - /// or as a format object instance. - /// When format is not specified, the original format of the source image is used (unless it is not a web safe format - jpeg is the fallback in that scenario). - /// - public object Format { get; set; } - - public bool IsValidationMode { get; set; } - - public bool Notify { get; set; } - - private T Get(string name) - { - return base[name].Convert(); - } - - private void Set(string name, T val) - { - if (val == null) - base.Remove(name); - else - base.Add(name, val.Convert(), true); - } - - - public bool NeedsProcessing(bool ignoreQualityFlag = false) - { - if (base.Count == 0) - return false; + public class ProcessImageQuery : QueryString + { + private readonly static HashSet _supportedTokens = new HashSet { "w", "h", "q", "m", "size" }; + + public ProcessImageQuery() + : this(null, new NameValueCollection()) + { + } + + public ProcessImageQuery(byte[] source) + : this(source, new NameValueCollection()) + { + } + + public ProcessImageQuery(Stream source) + : this(source, new NameValueCollection()) + { + } + + public ProcessImageQuery(Image source) + : this(source, new NameValueCollection()) + { + } + + public ProcessImageQuery(string source) + : this(source, new NameValueCollection()) + { + } + + public ProcessImageQuery(object source, NameValueCollection query) + : base(SanitizeCollection(query)) + { + Guard.NotNull(query, nameof(query)); + + Source = source; + DisposeSource = true; + Notify = true; + } + + public ProcessImageQuery(ProcessImageQuery query) + : base(SanitizeCollection(query)) + { + Guard.NotNull(query, nameof(query)); + + Source = query.Source; + Format = query.Format; + DisposeSource = query.DisposeSource; + } + + private static NameValueCollection SanitizeCollection(NameValueCollection query) + { + // We just need the supported flags + var sanitizable = query.AllKeys.Any(x => !_supportedTokens.Contains(x)); + if (sanitizable) + { + var copy = new NameValueCollection(query); + foreach (var key in copy.AllKeys) + { + if (!_supportedTokens.Contains(key)) + { + copy.Remove(key); + } + } + + return copy; + } + + return query; + } + + /// + /// The source image's physical path, app-relative virtual path, or a Stream, byte array, Image or IFile instance. + /// + public object Source { get; set; } + + public string FileName { get; set; } + + /// + /// Whether to dispose the source stream after processing completes + /// + public bool DisposeSource { get; set; } + + /// + /// Whether to execute an applicable post processor which + /// can reduce the resulting file size drastically, but also + /// can slow down processing time. + /// + public bool ExecutePostProcessor { get; set; } = true; + + public int? MaxWidth + { + get => Get("w") ?? Get("size"); + set => Set("w", value); + } + + public int? MaxHeight + { + get => Get("h") ?? Get("size"); + set => Set("h", value); + } + + public int? MaxSize + { + get => Get("size"); + set => Set("size", value); + } + + public int? Quality + { + get => Get("q"); + set => Set("q", value); + } + + /// + /// max (default) | boxpad | crop | min | pad | stretch + /// + public string ScaleMode + { + get => Get("m"); + set => Set("m", value); + } + + /// + /// center (default) | top | bottom | left | right | top-left | top-right | bottom-left | bottom-right + /// + public string AnchorPosition + { + get => Get("pos"); + set => Set("pos", value); + } + + public string BackgroundColor + { + get => Get("bg"); + set => Set("bg", value); + } + + /// + /// Gets or sets the output file format either as a string ("png", "jpg", "gif" and "svg"), + /// or as a format object instance. + /// When format is not specified, the original format of the source image is used (unless it is not a web safe format - jpeg is the fallback in that scenario). + /// + public object Format { get; set; } + + public bool IsValidationMode { get; set; } + + public bool Notify { get; set; } + + private T Get(string name) + { + return base[name].Convert(); + } + + private void Set(string name, T val) + { + if (val == null) + base.Remove(name); + else + base.Add(name, val.Convert(), true); + } + + + public bool NeedsProcessing(bool ignoreQualityFlag = false) + { + if (base.Count == 0) + return false; if (object.Equals(Format, "svg")) { @@ -182,101 +182,101 @@ public bool NeedsProcessing(bool ignoreQualityFlag = false) return false; } - if (ignoreQualityFlag && base.Count == 1 && base["q"] != null) - { - // Return false if ignoreQualityFlag is true and "q" is the only flag. - return false; - } + if (ignoreQualityFlag && base.Count == 1 && base["q"] != null) + { + // Return false if ignoreQualityFlag is true and "q" is the only flag. + return false; + } - if (base.Count == 1 && Quality >= 90) - { - // If "q" is the only flag and its value is >= 90, we don't need to process - return false; - } + if (base.Count == 1 && Quality >= 90) + { + // If "q" is the only flag and its value is >= 90, we don't need to process + return false; + } - return true; - } + return true; + } - public string CreateHash() - { - var hash = string.Empty; + public string CreateHash() + { + var hash = string.Empty; - foreach (var key in base.AllKeys) - { - if (key == "m" && base["m"] == "max") - continue; // Mode 'max' is default and can be omitted + foreach (var key in base.AllKeys) + { + if (key == "m" && base["m"] == "max") + continue; // Mode 'max' is default and can be omitted hash += "-" + key + base[key]; } - return hash; - } - - public string GetResultExtension() - { - if (Format == null) - { - return null; - } - else if (Format is ISupportedImageFormat) - { - return ((ISupportedImageFormat)Format).DefaultExtension; - } - else if (Format is string) - { - return (string)Format; - } - - return null; - } - - #region Static Helpers - - public static ResizeMode ConvertScaleMode(string mode) - { - switch (mode.EmptyNull().ToLower()) - { - case "boxpad": - return ResizeMode.BoxPad; - case "crop": - return ResizeMode.Crop; - case "min": - return ResizeMode.Min; - case "pad": - return ResizeMode.Pad; - case "stretch": - return ResizeMode.Stretch; - default: - return ResizeMode.Max; - } - } - - public static AnchorPosition ConvertAnchorPosition(string anchor) - { - switch (anchor.EmptyNull().ToLower()) - { - case "top": - return SmartStore.Services.Media.Imaging.AnchorPosition.Top; - case "bottom": - return SmartStore.Services.Media.Imaging.AnchorPosition.Bottom; - case "left": - return SmartStore.Services.Media.Imaging.AnchorPosition.Left; - case "right": - return SmartStore.Services.Media.Imaging.AnchorPosition.Right; - case "top-left": - return SmartStore.Services.Media.Imaging.AnchorPosition.TopLeft; - case "top-right": - return SmartStore.Services.Media.Imaging.AnchorPosition.TopRight; - case "bottom-left": - return SmartStore.Services.Media.Imaging.AnchorPosition.BottomLeft; - case "bottom-right": - return SmartStore.Services.Media.Imaging.AnchorPosition.BottomRight; - default: - return SmartStore.Services.Media.Imaging.AnchorPosition.Center; - } - } - - #endregion - } + return hash; + } + + public string GetResultExtension() + { + if (Format == null) + { + return null; + } + else if (Format is ISupportedImageFormat) + { + return ((ISupportedImageFormat)Format).DefaultExtension; + } + else if (Format is string) + { + return (string)Format; + } + + return null; + } + + #region Static Helpers + + public static ResizeMode ConvertScaleMode(string mode) + { + switch (mode.EmptyNull().ToLower()) + { + case "boxpad": + return ResizeMode.BoxPad; + case "crop": + return ResizeMode.Crop; + case "min": + return ResizeMode.Min; + case "pad": + return ResizeMode.Pad; + case "stretch": + return ResizeMode.Stretch; + default: + return ResizeMode.Max; + } + } + + public static AnchorPosition ConvertAnchorPosition(string anchor) + { + switch (anchor.EmptyNull().ToLower()) + { + case "top": + return SmartStore.Services.Media.Imaging.AnchorPosition.Top; + case "bottom": + return SmartStore.Services.Media.Imaging.AnchorPosition.Bottom; + case "left": + return SmartStore.Services.Media.Imaging.AnchorPosition.Left; + case "right": + return SmartStore.Services.Media.Imaging.AnchorPosition.Right; + case "top-left": + return SmartStore.Services.Media.Imaging.AnchorPosition.TopLeft; + case "top-right": + return SmartStore.Services.Media.Imaging.AnchorPosition.TopRight; + case "bottom-left": + return SmartStore.Services.Media.Imaging.AnchorPosition.BottomLeft; + case "bottom-right": + return SmartStore.Services.Media.Imaging.AnchorPosition.BottomRight; + default: + return SmartStore.Services.Media.Imaging.AnchorPosition.Center; + } + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs index 02f7a54a5d..6313e9d198 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageResult.cs @@ -3,29 +3,29 @@ namespace SmartStore.Services.Media.Imaging { - public class ProcessImageResult : DisposableObject - { - public ProcessImageQuery Query { get; set; } + public class ProcessImageResult : DisposableObject + { + public ProcessImageQuery Query { get; set; } - public IImageFormat SourceFormat { get; set; } - public IImage Image { get; set; } - internal bool DisposeImage { get; set; } + public IImageFormat SourceFormat { get; set; } + public IImage Image { get; set; } + internal bool DisposeImage { get; set; } - /// - /// Is true if any effect has been applied that changed the image visually (like background color, contrast, sharpness etc.). - /// Resize and compression quality does NOT count as FX. - /// - public bool HasAppliedVisualEffects { get; set; } + /// + /// Is true if any effect has been applied that changed the image visually (like background color, contrast, sharpness etc.). + /// Resize and compression quality does NOT count as FX. + /// + public bool HasAppliedVisualEffects { get; set; } - public long ProcessTimeMs { get; set; } + public long ProcessTimeMs { get; set; } - protected override void OnDispose(bool disposing) - { - if (disposing && DisposeImage && Image != null) - { - Image.Dispose(); - Image = null; - } - } - } + protected override void OnDispose(bool disposing) + { + if (disposing && DisposeImage && Image != null) + { + Image.Dispose(); + Image = null; + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/UnsupportedImageFormat.cs b/src/Libraries/SmartStore.Services/Media/Imaging/UnsupportedImageFormat.cs index 24574a78f1..13b5cdd1ed 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/UnsupportedImageFormat.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/UnsupportedImageFormat.cs @@ -24,14 +24,8 @@ public UnsupportedImageFormat(string mimeType, string extension) public string DefaultExtension { get; } public string DefaultMimeType { get; } - public IEnumerable FileExtensions - { - get => new string[] { DefaultExtension }; - } + public IEnumerable FileExtensions => new string[] { DefaultExtension }; - public IEnumerable MimeTypes - { - get => new string[] { DefaultMimeType }; - } + public IEnumerable MimeTypes => new string[] { DefaultMimeType }; } } diff --git a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs index 204f5c12e0..b69a3bb069 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaFileInfo.cs @@ -46,8 +46,8 @@ object ICloneable.Clone() [MethodImpl(MethodImplOptions.AggressiveInlining)] public MediaFileInfo Clone() { - var clone = new MediaFileInfo(File, _storageProvider, _urlGenerator, Directory) - { + var clone = new MediaFileInfo(File, _storageProvider, _urlGenerator, Directory) + { ThumbSize = this.ThumbSize, _alt = this._alt, _title = this._title @@ -99,25 +99,20 @@ public string TitleAttribute set => _title = value; } - public static explicit operator MediaFile(MediaFileInfo fileInfo) => fileInfo.File; + public static explicit operator MediaFile(MediaFileInfo fileInfo) + { + return fileInfo.File; + } #region Url private readonly IDictionary<(int size, string host), string> _cachedUrls = new Dictionary<(int, string), string>(); [JsonProperty("url")] - internal string Url - { - // For serialization in MediaManager - get => GetUrl(0, string.Empty); - } + internal string Url => GetUrl(0, string.Empty); [JsonProperty("thumbUrl")] - internal string ThumbUrl - { - // For serialization in MediaManager - get => GetUrl(ThumbSize, string.Empty); - } + internal string ThumbUrl => GetUrl(ThumbSize, string.Empty); [JsonIgnore] internal int ThumbSize diff --git a/src/Libraries/SmartStore.Services/Media/MediaFileSystem.cs b/src/Libraries/SmartStore.Services/Media/MediaFileSystem.cs index 915eb4fc90..26599c17d8 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaFileSystem.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaFileSystem.cs @@ -5,52 +5,52 @@ namespace SmartStore.Services.Media { - public interface IMediaFileSystem : IFileSystem - { - } - - public class MediaFileSystem : LocalFileSystem, IMediaFileSystem - { - private static string _mediaPublicPath; - - public MediaFileSystem() - : base(GetMediaBasePath(), "~/" + GetMediaPublicPath()) - { - if (DataSettings.DatabaseIsInstalled()) - { - this.CreateFolder("Storage"); - this.CreateFolder("Thumbs"); - this.CreateFolder("QueuedEmailAttachment"); - } - } - - public static string GetMediaBasePath() - { - var path = CommonHelper.GetAppSetting("sm:MediaStoragePath")?.Trim().NullEmpty(); - if (path == null) - { - path = "/App_Data/Tenants/" + DataSettings.Current.TenantName + "/Media"; - } - - return path; - } - - public static string GetMediaPublicPath() - { - if (_mediaPublicPath == null) - { - var path = CommonHelper.GetAppSetting("sm:MediaPublicPath")?.Trim().NullEmpty() ?? "media"; - - if (path.IsWebUrl()) - { - throw new NotSupportedException("Fully qualified URLs are not supported for the 'sm:MediaPublicPath' setting."); - } - - _mediaPublicPath = path.TrimStart('~', '/').Replace('\\', '/').ToLower().EnsureEndsWith("/"); - } - - - return _mediaPublicPath; - } - } + public interface IMediaFileSystem : IFileSystem + { + } + + public class MediaFileSystem : LocalFileSystem, IMediaFileSystem + { + private static string _mediaPublicPath; + + public MediaFileSystem() + : base(GetMediaBasePath(), "~/" + GetMediaPublicPath()) + { + if (DataSettings.DatabaseIsInstalled()) + { + this.CreateFolder("Storage"); + this.CreateFolder("Thumbs"); + this.CreateFolder("QueuedEmailAttachment"); + } + } + + public static string GetMediaBasePath() + { + var path = CommonHelper.GetAppSetting("sm:MediaStoragePath")?.Trim().NullEmpty(); + if (path == null) + { + path = "/App_Data/Tenants/" + DataSettings.Current.TenantName + "/Media"; + } + + return path; + } + + public static string GetMediaPublicPath() + { + if (_mediaPublicPath == null) + { + var path = CommonHelper.GetAppSetting("sm:MediaPublicPath")?.Trim().NullEmpty() ?? "media"; + + if (path.IsWebUrl()) + { + throw new NotSupportedException("Fully qualified URLs are not supported for the 'sm:MediaPublicPath' setting."); + } + + _mediaPublicPath = path.TrimStart('~', '/').Replace('\\', '/').ToLower().EnsureEndsWith("/"); + } + + + return _mediaPublicPath; + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/MediaHelper.cs b/src/Libraries/SmartStore.Services/Media/MediaHelper.cs index e066771337..5e5cf6d157 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaHelper.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaHelper.cs @@ -12,131 +12,131 @@ namespace SmartStore.Services.Media { public partial class MediaHelper - { - #region Static + { + #region Static - private readonly static char[] _invalidFileNameChars = Path.GetInvalidFileNameChars().Concat(new[] { '&' }).ToArray(); - private readonly static char[] _invalidFolderNameChars = Path.GetInvalidPathChars().Concat(new[] { '&', '/', '\\' }).ToArray(); + private readonly static char[] _invalidFileNameChars = Path.GetInvalidFileNameChars().Concat(new[] { '&' }).ToArray(); + private readonly static char[] _invalidFolderNameChars = Path.GetInvalidPathChars().Concat(new[] { '&', '/', '\\' }).ToArray(); - public static string NormalizeFileName(string fileName) + public static string NormalizeFileName(string fileName) + { + return string.Join("-", fileName.ToSafe().Split(_invalidFileNameChars)); + } + + public static string NormalizeFolderName(string folderName) + { + return string.Join("-", folderName.ToSafe().Split(_invalidFolderNameChars)); + } + + #endregion + + private readonly IFolderService _folderService; + + public MediaHelper(IFolderService folderService) + { + _folderService = folderService; + } + + public bool TokenizePath(string path, bool normalizeFileName, out MediaPathData data) + { + data = null; + + if (path.IsEmpty()) + { + return false; + } + + var dir = Path.GetDirectoryName(path); + if (dir.HasValue()) + { + var node = _folderService.GetNodeByPath(dir); + if (node != null) + { + data = new MediaPathData(node, path.Substring(dir.Length + 1), normalizeFileName); + return true; + } + } + + return false; + } + + public bool CheckUniqueFileName(string title, string ext, string destFileName, out string uniqueName) + { + return CheckUniqueFileName(title, ext, new HashSet(new[] { destFileName }, StringComparer.CurrentCultureIgnoreCase), out uniqueName); + } + + public bool CheckUniqueFileName(string title, string ext, HashSet destFileNames, out string uniqueName) + { + uniqueName = null; + + if (destFileNames.Count == 0) + { + return false; + } + + int i = 1; + while (true) + { + var test = string.Concat(title, "-", i, ".", ext.TrimStart('.')); + if (!destFileNames.Contains(test)) + { + // Found our gap + uniqueName = test; + return true; + } + + i++; + } + } + + #region Legacy (remove later) + + // TODO: (mm) (mc) remove this stuff + + public static void UpdateDownloadTransientStateFor(TEntity entity, Expression> downloadIdProp, bool save = false) where TEntity : BaseEntity + { + Guard.NotNull(entity, nameof(entity)); + Guard.NotNull(downloadIdProp, nameof(downloadIdProp)); + + var propName = downloadIdProp.ExtractMemberInfo().Name; + int currentDownloadId = downloadIdProp.CompileFast(PropertyCachingStrategy.EagerCached).Invoke(entity); + var rs = EngineContext.Current.Resolve>(); + + UpdateTransientStateForEntityInternal(entity, propName, currentDownloadId, rs, null, save); + } + + public static void UpdateDownloadTransientStateFor(TEntity entity, Expression> downloadIdProp, bool save = false) where TEntity : BaseEntity + { + Guard.NotNull(entity, nameof(entity)); + Guard.NotNull(downloadIdProp, nameof(downloadIdProp)); + + var propName = downloadIdProp.ExtractMemberInfo().Name; + int currentDownloadId = downloadIdProp.CompileFast(PropertyCachingStrategy.EagerCached).Invoke(entity).GetValueOrDefault(); + var rs = EngineContext.Current.Resolve>(); + + UpdateTransientStateForEntityInternal(entity, propName, currentDownloadId, rs, null, save); + } + + //public static void UpdateDownloadTransientState(int? prevDownloadId, int? currentDownloadId, bool save = false) + //{ + // var rs = EngineContext.Current.Resolve>(); + // UpdateTransientStateCore(prevDownloadId.GetValueOrDefault(), currentDownloadId.GetValueOrDefault(), rs, null, save); + //} + + //public static void UpdateDownloadTransientState(int prevDownloadId, int currentDownloadId, bool save = false) + //{ + // var rs = EngineContext.Current.Resolve>(); + // UpdateTransientStateCore(prevDownloadId, currentDownloadId, rs, null, save); + //} + + internal static void UpdateTransientStateForEntityInternal( + TEntity entity, + string propName, + int currentMediaId, + IRepository rs, + Action deleteAction, + bool save) where TEntity : BaseEntity where TMedia : BaseEntity { - return string.Join("-", fileName.ToSafe().Split(_invalidFileNameChars)); - } - - public static string NormalizeFolderName(string folderName) - { - return string.Join("-", folderName.ToSafe().Split(_invalidFolderNameChars)); - } - - #endregion - - private readonly IFolderService _folderService; - - public MediaHelper(IFolderService folderService) - { - _folderService = folderService; - } - - public bool TokenizePath(string path, bool normalizeFileName, out MediaPathData data) - { - data = null; - - if (path.IsEmpty()) - { - return false; - } - - var dir = Path.GetDirectoryName(path); - if (dir.HasValue()) - { - var node = _folderService.GetNodeByPath(dir); - if (node != null) - { - data = new MediaPathData(node, path.Substring(dir.Length + 1), normalizeFileName); - return true; - } - } - - return false; - } - - public bool CheckUniqueFileName(string title, string ext, string destFileName, out string uniqueName) - { - return CheckUniqueFileName(title, ext, new HashSet(new[] { destFileName }, StringComparer.CurrentCultureIgnoreCase), out uniqueName); - } - - public bool CheckUniqueFileName(string title, string ext, HashSet destFileNames, out string uniqueName) - { - uniqueName = null; - - if (destFileNames.Count == 0) - { - return false; - } - - int i = 1; - while (true) - { - var test = string.Concat(title, "-", i, ".", ext.TrimStart('.')); - if (!destFileNames.Contains(test)) - { - // Found our gap - uniqueName = test; - return true; - } - - i++; - } - } - - #region Legacy (remove later) - - // TODO: (mm) (mc) remove this stuff - - public static void UpdateDownloadTransientStateFor(TEntity entity, Expression> downloadIdProp, bool save = false) where TEntity : BaseEntity - { - Guard.NotNull(entity, nameof(entity)); - Guard.NotNull(downloadIdProp, nameof(downloadIdProp)); - - var propName = downloadIdProp.ExtractMemberInfo().Name; - int currentDownloadId = downloadIdProp.CompileFast(PropertyCachingStrategy.EagerCached).Invoke(entity); - var rs = EngineContext.Current.Resolve>(); - - UpdateTransientStateForEntityInternal(entity, propName, currentDownloadId, rs, null, save); - } - - public static void UpdateDownloadTransientStateFor(TEntity entity, Expression> downloadIdProp, bool save = false) where TEntity : BaseEntity - { - Guard.NotNull(entity, nameof(entity)); - Guard.NotNull(downloadIdProp, nameof(downloadIdProp)); - - var propName = downloadIdProp.ExtractMemberInfo().Name; - int currentDownloadId = downloadIdProp.CompileFast(PropertyCachingStrategy.EagerCached).Invoke(entity).GetValueOrDefault(); - var rs = EngineContext.Current.Resolve>(); - - UpdateTransientStateForEntityInternal(entity, propName, currentDownloadId, rs, null, save); - } - - //public static void UpdateDownloadTransientState(int? prevDownloadId, int? currentDownloadId, bool save = false) - //{ - // var rs = EngineContext.Current.Resolve>(); - // UpdateTransientStateCore(prevDownloadId.GetValueOrDefault(), currentDownloadId.GetValueOrDefault(), rs, null, save); - //} - - //public static void UpdateDownloadTransientState(int prevDownloadId, int currentDownloadId, bool save = false) - //{ - // var rs = EngineContext.Current.Resolve>(); - // UpdateTransientStateCore(prevDownloadId, currentDownloadId, rs, null, save); - //} - - internal static void UpdateTransientStateForEntityInternal( - TEntity entity, - string propName, - int currentMediaId, - IRepository rs, - Action deleteAction, - bool save) where TEntity : BaseEntity where TMedia : BaseEntity - { object obj = null; int prevMediaId = 0; if (rs.Context.TryGetModifiedProperty(entity, propName, out obj)) @@ -147,67 +147,67 @@ internal static void UpdateTransientStateForEntityInternal( UpdateTransientStateCore(prevMediaId, currentMediaId, rs, deleteAction, save); } - internal static void UpdateTransientStateCore( - int prevMediaId, - int currentMediaId, - IRepository rs, - Action deleteAction, - bool save) - where TMedia : BaseEntity - { - var autoCommit = rs.AutoCommitEnabled; - rs.AutoCommitEnabled = false; - - try - { - TMedia media = null; - bool shouldSave = false; - - bool isModified = prevMediaId != currentMediaId; - - if (currentMediaId > 0 && isModified) - { - // new entity with a media or media replaced - media = rs.GetById(currentMediaId); - if (media != null) - { - var transient = media as ITransient; - if (transient != null) - { - transient.IsTransient = false; - shouldSave = true; - } - } - } - - if (prevMediaId > 0 && isModified) - { - // ID changed, so delete old record - media = rs.GetById(prevMediaId); - if (media != null) - { - if (deleteAction == null) - { - rs.Delete(media); - } - else - { - deleteAction(media); - } - shouldSave = true; - } - } - - if (save && shouldSave) - { - rs.Context.SaveChanges(); - } - } - finally - { - rs.AutoCommitEnabled = autoCommit; - } - } + internal static void UpdateTransientStateCore( + int prevMediaId, + int currentMediaId, + IRepository rs, + Action deleteAction, + bool save) + where TMedia : BaseEntity + { + var autoCommit = rs.AutoCommitEnabled; + rs.AutoCommitEnabled = false; + + try + { + TMedia media = null; + bool shouldSave = false; + + bool isModified = prevMediaId != currentMediaId; + + if (currentMediaId > 0 && isModified) + { + // new entity with a media or media replaced + media = rs.GetById(currentMediaId); + if (media != null) + { + var transient = media as ITransient; + if (transient != null) + { + transient.IsTransient = false; + shouldSave = true; + } + } + } + + if (prevMediaId > 0 && isModified) + { + // ID changed, so delete old record + media = rs.GetById(prevMediaId); + if (media != null) + { + if (deleteAction == null) + { + rs.Delete(media); + } + else + { + deleteAction(media); + } + shouldSave = true; + } + } + + if (save && shouldSave) + { + rs.Context.SaveChanges(); + } + } + finally + { + rs.AutoCommitEnabled = autoCommit; + } + } #endregion } diff --git a/src/Libraries/SmartStore.Services/Media/MediaPathData.cs b/src/Libraries/SmartStore.Services/Media/MediaPathData.cs index 23c3d91b95..f6016760ee 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaPathData.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaPathData.cs @@ -5,101 +5,74 @@ namespace SmartStore.Services.Media { - public class MediaPathData - { - private string _name; - private string _title; - private string _ext; - private string _mime; + public class MediaPathData + { + private string _name; + private string _title; + private string _ext; + private string _mime; - public MediaPathData(TreeNode node, string fileName, bool normalizeFileName = false) - { - Guard.NotNull(node, nameof(node)); - Guard.NotEmpty(fileName, nameof(fileName)); + public MediaPathData(TreeNode node, string fileName, bool normalizeFileName = false) + { + Guard.NotNull(node, nameof(node)); + Guard.NotEmpty(fileName, nameof(fileName)); - Node = node; - _name = normalizeFileName - ? MediaHelper.NormalizeFileName(fileName) - : fileName; - } + Node = node; + _name = normalizeFileName + ? MediaHelper.NormalizeFileName(fileName) + : fileName; + } - public MediaPathData(string path, bool normalizeFileName = false) - { - Guard.NotEmpty(path, nameof(path)); + public MediaPathData(string path, bool normalizeFileName = false) + { + Guard.NotEmpty(path, nameof(path)); - _name = normalizeFileName - ? MediaHelper.NormalizeFileName(Path.GetFileName(path)) - : Path.GetFileName(path); - } + _name = normalizeFileName + ? MediaHelper.NormalizeFileName(Path.GetFileName(path)) + : Path.GetFileName(path); + } - public MediaPathData(MediaPathData pathData) - { - Node = pathData.Node; - _name = pathData.FileName; - _title = pathData._title; - _ext = pathData._ext; - _mime = pathData._mime; - } + public MediaPathData(MediaPathData pathData) + { + Node = pathData.Node; + _name = pathData.FileName; + _title = pathData._title; + _ext = pathData._ext; + _mime = pathData._mime; + } - public TreeNode Node { get; } - public MediaFolderNode Folder - { - get => Node.Value; - } + public TreeNode Node { get; } + public MediaFolderNode Folder => Node.Value; - public string FileName - { - get - { - return _name; - } - set - { - Guard.NotEmpty(value, nameof(value)); + public string FileName + { + get => _name; + set + { + Guard.NotEmpty(value, nameof(value)); - _name = value; - _title = null; - _ext = null; - _mime = null; - } - } + _name = value; + _title = null; + _ext = null; + _mime = null; + } + } - public string FullPath - { - get => Folder.Path + "/" + _name; - } + public string FullPath => Folder.Path + "/" + _name; - public string FileTitle - { - get - { - return _title ?? (_title = Path.GetFileNameWithoutExtension(_name)); - } - } + public string FileTitle => _title ?? (_title = Path.GetFileNameWithoutExtension(_name)); - public string Extension - { - get - { - return _ext ?? (_ext = Path.GetExtension(_name).EmptyNull().TrimStart('.')); - } - set - { - _ext = value?.TrimStart('.'); - } - } + public string Extension + { + get => _ext ?? (_ext = Path.GetExtension(_name).EmptyNull().TrimStart('.')); + set => _ext = value?.TrimStart('.'); + } - public string MimeType - { - get - { - return _mime ?? (_mime = MimeTypes.MapNameToMimeType(_name)); - } - set - { - _mime = value; - } - } - } + public string MimeType + { + get => _mime ?? (_mime = MimeTypes.MapNameToMimeType(_name)); + set => _mime = value; + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs b/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs index a821418cb9..4cc3e95f51 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs @@ -175,7 +175,7 @@ public FolderOperationResult CopyFolder(string path, string destinationPath, Dup { destinationPath += "/" + node.Value.Name; var dupeFiles = new List(); - + // >>>> Do the heavy stuff var folder = InternalCopyFolder(node, destinationPath, dupeEntryHandling, dupeFiles); @@ -348,7 +348,7 @@ private void InternalDeleteFolder( TreeNode root, FolderDeleteResult result, FileHandling strategy) - { + { // (perf) We gonna check file tracks, so we should preload all tracks. _fileRepo.Context.LoadCollection(folder, (MediaFolder x) => x.Files, false, q => q.Include(f => f.Tracks)); @@ -359,8 +359,8 @@ private void InternalDeleteFolder( // First delete files if (folder.Files.Any()) { - var albumId = strategy == FileHandling.MoveToRoot - ? _folderService.FindAlbum(folder.Id).Value.Id + var albumId = strategy == FileHandling.MoveToRoot + ? _folderService.FindAlbum(folder.Id).Value.Id : (int?)null; foreach (var batch in files.Slice(500)) @@ -373,7 +373,7 @@ private void InternalDeleteFolder( trackedFiles.Add(file); continue; } - + if (strategy == FileHandling.Delete) { try @@ -388,7 +388,7 @@ private void InternalDeleteFolder( catch (IOException) { lockedFiles.Add(file); - } + } } else if (strategy == FileHandling.SoftDelete) { diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs index 2d5201c84e..259e68e7bb 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -73,10 +73,7 @@ public MediaService( public Localizer T { get; set; } = NullLocalizer.Instance; public ILogger Logger { get; set; } = NullLogger.Instance; - public IMediaStorageProvider StorageProvider - { - get => _storageProvider; - } + public IMediaStorageProvider StorageProvider => _storageProvider; public bool ImagePostProcessingEnabled { get; set; } = true; @@ -85,7 +82,7 @@ public IMediaStorageProvider StorageProvider public int CountFiles(MediaSearchQuery query) { Guard.NotNull(query, nameof(query)); - + var q = _searcher.PrepareQuery(query, MediaLoadFlags.None); var count = q.Count(); return count; @@ -114,15 +111,15 @@ public FileCountResult CountFilesGrouped(MediaFilesFilter filter) // Determine counts var result = (from f in q - group f by 1 into g - select new FileCountResult - { - Total = g.Count(), - Trash = g.Count(x => x.Deleted), - Unassigned = g.Count(x => !x.Deleted && x.FolderId == null), - Transient = g.Count(x => !x.Deleted && x.IsTransient == true), - Orphan = g.Count(x => !x.Deleted && x.FolderId > 0 && !untrackableFolderIds.Contains(x.FolderId.Value) && !x.Tracks.Any()) - }).FirstOrDefault() ?? new FileCountResult(); + group f by 1 into g + select new FileCountResult + { + Total = g.Count(), + Trash = g.Count(x => x.Deleted), + Unassigned = g.Count(x => !x.Deleted && x.FolderId == null), + Transient = g.Count(x => !x.Deleted && x.IsTransient == true), + Orphan = g.Count(x => !x.Deleted && x.FolderId > 0 && !untrackableFolderIds.Contains(x.FolderId.Value) && !x.Tracks.Any()) + }).FirstOrDefault() ?? new FileCountResult(); if (result.Total == 0) { @@ -132,9 +129,9 @@ group f by 1 into g // Determine file count for each folder var byFolders = from f in q - where f.FolderId > 0 && !f.Deleted - group f by f.FolderId.Value into grp - select grp; + where f.FolderId > 0 && !f.Deleted + group f by f.FolderId.Value into grp + select grp; result.Folders = byFolders .Select(grp => new { FolderId = grp.Key, Count = grp.Count() }) @@ -189,7 +186,7 @@ public bool FileExists(string path) { return _fileRepo.Table.Any(x => x.FolderId == tokens.Folder.Id && x.Name == tokens.FileName); } - + return false; } @@ -413,13 +410,13 @@ public async Task SaveFileAsync(string path, Stream stream, bool } catch (Exception ex) { - if (isNewFile) + if (isNewFile) { // New file's metadata should be removed on storage save failure immediately DeleteFile(file, true, true); await scope.CommitAsync(); } - + Logger.Error(ex); } } @@ -490,10 +487,10 @@ protected MediaPathData CreatePathData(string path) } protected MediaStorageItem ProcessFile( - ref MediaFile file, - MediaPathData pathData, - Stream inStream, - bool isTransient = true, + ref MediaFile file, + MediaPathData pathData, + Stream inStream, + bool isTransient = true, DuplicateFileHandling dupeFileHandling = DuplicateFileHandling.ThrowError) { if (file != null) @@ -584,7 +581,7 @@ protected bool ProcessImage(MediaFile file, Stream inStream, out IImage outImage { outImage = new ImageWrapper(inStream, originalSize, format); return true; - } + } var maxSize = _mediaSettings.MaximumImageSize; @@ -641,7 +638,7 @@ public FileOperationResult CopyFile(MediaFileInfo mediaFile, string destinationF true /* copyData */, (DuplicateEntryHandling)((int)dupeFileHandling), () => dupe, - p => CheckUniqueFileName(p), + p => CheckUniqueFileName(p), out var isDupe); return new FileOperationResult @@ -807,10 +804,10 @@ public MediaFileInfo MoveFile(MediaFile file, string destinationFileName, Duplic } private bool ValidateMoveOperation( - MediaFile file, + MediaFile file, string destinationFileName, DuplicateFileHandling dupeFileHandling, - out bool nameChanged, + out bool nameChanged, out MediaPathData destPathData) { Guard.NotNull(file, nameof(file)); @@ -994,7 +991,7 @@ private MediaPathData CreateDestinationPathData(MediaFile file, string destinati { // ...but file name includes path chars, which is not allowed throw new ArgumentException( - T("Admin.Media.Exception.InvalidPath", Path.GetDirectoryName(destinationFileName)), + T("Admin.Media.Exception.InvalidPath", Path.GetDirectoryName(destinationFileName)), nameof(destinationFileName)); } @@ -1023,7 +1020,7 @@ private void ValidateAlbums(string operation, int folderId1, int folderId2) if (!_folderService.AreInSameAlbum(folderId1, folderId2)) { throw _exceptionFactory.NotSameAlbum( - _folderService.GetNodeById(folderId1).Value.Path, + _folderService.GetNodeById(folderId1).Value.Path, _folderService.GetNodeById(folderId2).Value.Path); } } diff --git a/src/Libraries/SmartStore.Services/Media/MediaServiceFileSystemAdapter.cs b/src/Libraries/SmartStore.Services/Media/MediaServiceFileSystemAdapter.cs index acfc0c892e..6e3b61f2b3 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaServiceFileSystemAdapter.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaServiceFileSystemAdapter.cs @@ -22,7 +22,7 @@ public partial class MediaServiceFileSystemAdapter : IMediaFileSystem private readonly string _mediaRootPath; public MediaServiceFileSystemAdapter( - IMediaService mediaService, + IMediaService mediaService, IFolderService folderService, MediaHelper mediaHelper, MediaExceptionFactory exceptionFactory) @@ -42,10 +42,7 @@ protected string Fix(string path) #region IFileSystem - public bool IsCloudStorage - { - get => _storageProvider.IsCloudStorage; - } + public bool IsCloudStorage => _storageProvider.IsCloudStorage; public string Root => string.Empty; @@ -73,13 +70,13 @@ public string GetStoragePath(string url) // Is a folder path, no need to strip off public URL stuff. return url; } - + // Strip off root, e.g. "media/" var path = url.Substring(_mediaRootPath.Length); // Strip off media id from path, e.g. "123/" var firstSlashIndex = path.IndexOf('/'); - + return path.Substring(firstSlashIndex); } @@ -146,7 +143,7 @@ public IEnumerable SearchFiles(string path, string pattern, bool deep = { throw _exceptionFactory.FolderNotFound(path); } - + var query = new MediaSearchQuery { FolderId = node.Value.Id, @@ -201,15 +198,15 @@ public IFile GetFile(string path) var file = _mediaService.GetFileByPath(path); if (file == null) { - var mediaFile = new MediaFile - { + var mediaFile = new MediaFile + { Name = Path.GetFileName(path), Extension = Path.GetExtension(path).TrimStart('.'), MimeType = MimeTypes.MapNameToMimeType(path), FolderId = _folderService.GetNodeByPath(Fix(Path.GetDirectoryName(path)))?.Value.Id }; _mediaService.ConvertMediaFile(mediaFile); - + file = _mediaService.ConvertMediaFile(mediaFile); } @@ -254,7 +251,7 @@ public void CopyFile(string path, string newPath, bool overwrite = false) } _mediaService.CopyFile( - sourceFile, + sourceFile, newPath, overwrite ? DuplicateFileHandling.Overwrite : DuplicateFileHandling.ThrowError); } @@ -280,8 +277,8 @@ public void RenameFolder(string path, string newPath) public void CopyFolder(string path, string destinationPath, bool overwrite = true) { - var dupeEntryHandling = overwrite - ? DuplicateEntryHandling.Overwrite + var dupeEntryHandling = overwrite + ? DuplicateEntryHandling.Overwrite : DuplicateEntryHandling.ThrowError; _mediaService.CopyFolder(path, destinationPath, dupeEntryHandling); diff --git a/src/Libraries/SmartStore.Services/Media/MediaTypes/IMediaTypeResolver.cs b/src/Libraries/SmartStore.Services/Media/MediaTypes/IMediaTypeResolver.cs index 3515ffd734..eab1084e47 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaTypes/IMediaTypeResolver.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaTypes/IMediaTypeResolver.cs @@ -38,7 +38,7 @@ public interface IMediaTypeResolver IReadOnlyDictionary GetExtensionMediaTypeMap(); } - public static class IMediaTypeResolverExtensions + public static class IMediaTypeResolverExtensions { public static MediaType Resolve(this IMediaTypeResolver resolver, MediaFile file) { diff --git a/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaType.cs b/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaType.cs index 9e6c903938..d79d5a67af 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaType.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaType.cs @@ -15,7 +15,7 @@ public class MediaType : IEquatable ["text"] = new[] { "txt", "xml", "csv", "htm", "html", "json", "css", "js" }, ["bin"] = new string[0] }; - + private readonly static IDictionary _map = new Dictionary(StringComparer.OrdinalIgnoreCase); public readonly static MediaType Image = new MediaType("image", _defaultExtensionsMap["image"]); @@ -28,7 +28,7 @@ public class MediaType : IEquatable protected MediaType(string name, params string[] defaultExtensions) { Guard.NotEmpty(name, nameof(name)); - + Name = name; DefaultExtensions = defaultExtensions.OrderBy(x => x).ToArray(); @@ -39,19 +39,22 @@ protected MediaType(string name, params string[] defaultExtensions) public string[] DefaultExtensions { get; private set; } - public static IEnumerable AllExtensions + public static IEnumerable AllExtensions => _defaultExtensionsMap.SelectMany(x => x.Value); + + public override string ToString() { - get - { - return _defaultExtensionsMap.SelectMany(x => x.Value); - } + return Name; } - public override string ToString() => Name; - - public static implicit operator string(MediaType obj) => obj?.Name; + public static implicit operator string(MediaType obj) + { + return obj?.Name; + } - public static implicit operator MediaType(string obj) => GetMediaType(obj); + public static implicit operator MediaType(string obj) + { + return GetMediaType(obj); + } internal static MediaType GetMediaType(string name) { diff --git a/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaTypeResolver.cs b/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaTypeResolver.cs index b08c3d4c91..04cfe4640a 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaTypeResolver.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaTypes/MediaTypeResolver.cs @@ -13,7 +13,7 @@ namespace SmartStore.Services.Media public partial class MediaTypeResolver : DbSaveHook, IMediaTypeResolver { const string MapCacheKey = "media:exttypemap"; - + private readonly ICacheManager _cache; private readonly Lazy _mediaSettings; @@ -26,7 +26,7 @@ public partial class MediaTypeResolver : DbSaveHook, IMediaTypeResolver TypeHelper.NameOf(x => x.TextTypes, true), TypeHelper.NameOf(x => x.BinTypes, true) }; - + public MediaTypeResolver(ICacheManager cache, Lazy mediaSettings) { _cache = cache; @@ -94,7 +94,7 @@ public IEnumerable ParseTypeFilter(string[] typeFilter) public IReadOnlyDictionary GetExtensionMediaTypeMap() { - return _cache.Get(MapCacheKey, () => + return _cache.Get(MapCacheKey, () => { var mediaSettings = _mediaSettings.Value; var map = new Dictionary(); diff --git a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs index 921bbf740d..21f31b28c4 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs @@ -10,115 +10,112 @@ namespace SmartStore.Services.Media { public partial class MediaUrlGenerator : IMediaUrlGenerator { - private readonly HttpContextBase _httpContext; + private readonly HttpContextBase _httpContext; private readonly string _host; private readonly string _appPath; - private readonly string _fallbackImageFileName; + private readonly string _fallbackImageFileName; - private static readonly string _processedImagesRootPath; - private static readonly string _fallbackImagesRootPath; + private static readonly string _processedImagesRootPath; + private static readonly string _fallbackImagesRootPath; - static MediaUrlGenerator() + static MediaUrlGenerator() { - _processedImagesRootPath = MediaFileSystem.GetMediaPublicPath(); + _processedImagesRootPath = MediaFileSystem.GetMediaPublicPath(); _fallbackImagesRootPath = "content/images/"; } public MediaUrlGenerator( - ISettingService settingService, - MediaSettings mediaSettings, - IStoreContext storeContext, - HttpContextBase httpContext) + ISettingService settingService, + MediaSettings mediaSettings, + IStoreContext storeContext, + HttpContextBase httpContext) { - _httpContext = httpContext; - - string appPath = "/"; - - if (HostingEnvironment.IsHosted) - { - appPath = HostingEnvironment.ApplicationVirtualPath.EmptyNull(); - - var cdn = storeContext.CurrentStore.ContentDeliveryNetwork; - if (cdn.HasValue() && !_httpContext.IsDebuggingEnabled && !_httpContext.Request.IsLocal) - { - _host = cdn; - } - else if (mediaSettings.AutoGenerateAbsoluteUrls) - { - var uri = httpContext.Request.Url; - _host = "//{0}{1}".FormatInvariant(uri.Authority, appPath); - } - else - { - _host = appPath; - } - } - - _host = _host.EmptyNull().EnsureEndsWith("/"); - _appPath = appPath.EnsureEndsWith("/"); - _fallbackImageFileName = settingService.GetSettingByKey("Media.DefaultImageName", "default-image.png"); - } - - public static string FallbackImagesRootPath - { - get { return _fallbackImagesRootPath; } - } - - public virtual string GenerateUrl( + _httpContext = httpContext; + + string appPath = "/"; + + if (HostingEnvironment.IsHosted) + { + appPath = HostingEnvironment.ApplicationVirtualPath.EmptyNull(); + + var cdn = storeContext.CurrentStore.ContentDeliveryNetwork; + if (cdn.HasValue() && !_httpContext.IsDebuggingEnabled && !_httpContext.Request.IsLocal) + { + _host = cdn; + } + else if (mediaSettings.AutoGenerateAbsoluteUrls) + { + var uri = httpContext.Request.Url; + _host = "//{0}{1}".FormatInvariant(uri.Authority, appPath); + } + else + { + _host = appPath; + } + } + + _host = _host.EmptyNull().EnsureEndsWith("/"); + _appPath = appPath.EnsureEndsWith("/"); + _fallbackImageFileName = settingService.GetSettingByKey("Media.DefaultImageName", "default-image.png"); + } + + public static string FallbackImagesRootPath => _fallbackImagesRootPath; + + public virtual string GenerateUrl( MediaFileInfo file, ProcessImageQuery imageQuery, string host = null, bool doFallback = true) - { + { string path; // Build virtual path with pattern "media/{id}/{album}/{dir}/{NameWithExt}" if (file?.Path != null) { - path = _processedImagesRootPath + file.Id.ToString(CultureInfo.InvariantCulture) + "/" + file.Path; - } + path = _processedImagesRootPath + file.Id.ToString(CultureInfo.InvariantCulture) + "/" + file.Path; + } else if (doFallback) { - path = _processedImagesRootPath + "0/" + _fallbackImageFileName; - } - else - { - return null; - } - - if (host == null) - { - host = _host; - } - else if (host == string.Empty) - { - host = _appPath; - } - else - { - host = host.EnsureEndsWith("/"); - } - - var url = host; - - // Strip leading "/", the host/apppath has this already - if (path[0] == '/') - { - path = path.Substring(1); - } - - // Append media path - url += path; - - // Append query - var query = imageQuery?.ToString(false); - if (query != null && query.Length > 0) - { - url += query; - } - - return url; - } - } + path = _processedImagesRootPath + "0/" + _fallbackImageFileName; + } + else + { + return null; + } + + if (host == null) + { + host = _host; + } + else if (host == string.Empty) + { + host = _appPath; + } + else + { + host = host.EnsureEndsWith("/"); + } + + var url = host; + + // Strip leading "/", the host/apppath has this already + if (path[0] == '/') + { + path = path.Substring(1); + } + + // Append media path + url += path; + + // Append query + var query = imageQuery?.ToString(false); + if (query != null && query.Length > 0) + { + url += query; + } + + return url; + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs b/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs index 1e9368ea1a..5ad929d277 100644 --- a/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs +++ b/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator.cs @@ -29,10 +29,10 @@ public class FileMin public string UniqueName { get; set; } public int UniqueIndex { get; set; } } - + internal static bool Executed; internal const string MigrationName = "MediaManager"; - + private readonly ICommonServices _services; private readonly IProviderManager _providerManager; private readonly IMediaTypeResolver _mediaTypeResolver; @@ -45,7 +45,7 @@ public class FileMin private readonly bool _isFsProvider; public MediaMigrator( - ICommonServices services, + ICommonServices services, IProviderManager providerManager, Func mediaStorageProvider, IMediaTypeResolver mediaTypeResolver, @@ -141,10 +141,10 @@ public void MigrateDownloads(SmartObjectContext ctx) var messagesFolderId = _albumRegistry.GetAlbumByName(SystemAlbumProvider.Messages)?.Id; var newFiles = new List(); - using (var scope = new DbContextScope(ctx, - validateOnSave: false, - hooksEnabled: false, - autoCommit: false, + using (var scope = new DbContextScope(ctx, + validateOnSave: false, + hooksEnabled: false, + autoCommit: false, autoDetectChanges: false)) { var messageTemplates = ctx.Set() @@ -246,11 +246,11 @@ public void MigrateDownloads(SmartObjectContext ctx) private void ReRefMessageTemplateAttachments( SmartObjectContext ctx, - Dictionary messageTemplatesDict, + Dictionary messageTemplatesDict, Dictionary downloads) { bool hasChanges = false; - + foreach (var kvp in messageTemplatesDict) { var downloadId = kvp.Key; @@ -283,7 +283,7 @@ private void ReRefMessageTemplateAttachments( private void MoveDownloadFiles( Dictionary newFilesDict, - Dictionary downloadsDict, + Dictionary downloadsDict, Dictionary downloadStubs) { if (_mediaFileSystem.FolderExists("Downloads")) @@ -296,7 +296,7 @@ private void MoveDownloadFiles( var stub = downloadStubs.Get(d.Id); if (stub == null || d.MediaFileId == null) continue; - + var file = newFilesDict.Get(d.MediaFileId.Value); if (file != null) { @@ -307,7 +307,7 @@ private void MoveDownloadFiles( if (!_mediaFileSystem.FileExists(newPath)) { _mediaFileSystem.CopyFile(downloadFile.Path, newPath); - } + } } catch { } } @@ -361,7 +361,7 @@ public void MigrateMediaFiles(SmartObjectContext ctx) if (name == prevName) { // Make file name unique - fixedName = name + "-" + ++fileIndex; + fixedName = name + "-" + ++fileIndex; } else { @@ -395,13 +395,13 @@ public void MigrateMediaFiles(SmartObjectContext ctx) public void MigrateMediaFiles_Old(SmartObjectContext ctx) { var query = ctx.Set(); - //.Where(x => x.Version == 0) - //.Include(x => x.MediaStorage); + //.Where(x => x.Version == 0) + //.Include(x => x.MediaStorage); var pager = new FastPager(query, 1000); - using (var scope = new DbContextScope(ctx, - hooksEnabled: false, + using (var scope = new DbContextScope(ctx, + hooksEnabled: false, autoCommit: false, proxyCreation: false, validateOnSave: false, @@ -413,7 +413,7 @@ public void MigrateMediaFiles_Old(SmartObjectContext ctx) { if (file.Version > 0) continue; - + if (file.Extension.IsEmpty()) { file.Extension = MimeTypes.MapMimeTypeToExtension(file.MimeType); @@ -597,7 +597,7 @@ public void DetectTracks() { //if (albumName == SystemAlbumProvider.Downloads || albumName == SystemAlbumProvider.Messages) // continue; // Download and MessageTemplate tracks already added in MigrateDownload() - + _mediaTracker.DetectAllTracks(albumName, true); } } @@ -627,7 +627,7 @@ private string GetStoragePath(MediaFile file, bool createFolder = true) if (createFolder) { _mediaFileSystem.CreateFolder(subfolder); - } + } return _mediaFileSystem.Combine(subfolder, fileName); } diff --git a/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator3.cs b/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator3.cs index 0deeed940d..6163b4acf1 100644 --- a/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator3.cs +++ b/src/Libraries/SmartStore.Services/Media/Migration/MediaMigrator3.cs @@ -66,7 +66,7 @@ public void Migrate() if (toDelete.Any()) { setFolders.RemoveRange(toDelete); - } + } _db.SaveChanges(); diff --git a/src/Libraries/SmartStore.Services/Media/Migration/SeedingDbMigrationConsumer.cs b/src/Libraries/SmartStore.Services/Media/Migration/SeedingDbMigrationConsumer.cs index f8e27165aa..27c922ed2d 100644 --- a/src/Libraries/SmartStore.Services/Media/Migration/SeedingDbMigrationConsumer.cs +++ b/src/Libraries/SmartStore.Services/Media/Migration/SeedingDbMigrationConsumer.cs @@ -19,7 +19,7 @@ public void Handle(SeedingDbMigrationEvent message, IComponentContext componentC else if (message.MigrationName == MediaMigrator3.MigrationName) { componentContext.Resolve().Migrate(); - } + } } } } diff --git a/src/Libraries/SmartStore.Services/Media/Search/MediaSearchResult.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearchResult.cs index 9b6f7f4634..09483acfe0 100644 --- a/src/Libraries/SmartStore.Services/Media/Search/MediaSearchResult.cs +++ b/src/Libraries/SmartStore.Services/Media/Search/MediaSearchResult.cs @@ -9,7 +9,7 @@ namespace SmartStore.Services.Media public partial class MediaSearchResult : PagedListBase, IEnumerable { private readonly IList _files; - + public MediaSearchResult(IPagedList pageable, Func converter) : base(pageable) { _files = pageable.Select(converter).ToList(); diff --git a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs index c04b45786e..ba0c18c8e4 100644 --- a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs +++ b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs @@ -18,7 +18,7 @@ public class MediaSearcher : IMediaSearcher private readonly Work _folderService; public MediaSearcher( - IRepository fileRepo, + IRepository fileRepo, Work folderService) { _fileRepo = fileRepo; @@ -164,7 +164,7 @@ public virtual IQueryable ApplyFilterQuery(MediaFilesFilter filter, I { var predicates = new List>>(5); - foreach (var dim in filter.Dimensions.OrderBy(x => x).Distinct()) + foreach (var dim in filter.Dimensions.OrderBy(x => x).Distinct()) { if (dim == ImageDimension.VerySmall) predicates.Add(x => x.PixelSize > 0 && x.PixelSize <= 50000); diff --git a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs index 0e922f9104..0fd3e2f053 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs @@ -13,85 +13,82 @@ namespace SmartStore.Services.Media.Storage { - [SystemName("MediaStorage.SmartStoreDatabase")] - [FriendlyName("Database")] - [DisplayOrder(0)] - public class DatabaseMediaStorageProvider : IMediaStorageProvider, ISupportsMediaMoving - { - class MediaStorageBlobStream : SqlBlobStream - { - public MediaStorageBlobStream( - IDbConnectionFactory connectionFactory, - string connectionString, - int mediaStorageId) - : base(connectionFactory, connectionString, "MediaStorage", "Data", "Id", mediaStorageId) - { - } - } - - private readonly IDbContext _dbContext; - private readonly IRepository _mediaStorageRepo; - private readonly IRepository _mediaFileRepo; - private readonly Lazy _dataProvider; - - private readonly bool _isSqlServer; - - public DatabaseMediaStorageProvider( - IDbContext dbContext, - IRepository mediaStorageRepo, - IRepository mediaFileRepo, - Lazy dataProvider) - { - _dbContext = dbContext; - _mediaStorageRepo = mediaStorageRepo; - _mediaFileRepo = mediaFileRepo; - _dataProvider = dataProvider; - _isSqlServer = DataSettings.Current.IsSqlServer; - } - - public static string SystemName - { - get { return "MediaStorage.SmartStoreDatabase"; } - } - - private Stream CreateBlobStream(int mediaStorageId) - { - return new MediaStorageBlobStream(_dataProvider.Value.GetConnectionFactory(), DataSettings.Current.DataConnectionString, mediaStorageId); - } - - public bool IsCloudStorage { get; } = false; - - public string GetPublicUrl(MediaFile mediaFile) - { - return null; - } - - public long GetSize(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - var id = mediaFile.MediaStorageId ?? 0; - if (id == 0) - { - return 0; - } - - if (_isSqlServer) - { - using (var stream = CreateBlobStream(id)) - { - return stream.Length; - } - } - else - { - return mediaFile.MediaStorage?.Data?.LongLength ?? 0; - } - } - - public Stream OpenRead(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); + [SystemName("MediaStorage.SmartStoreDatabase")] + [FriendlyName("Database")] + [DisplayOrder(0)] + public class DatabaseMediaStorageProvider : IMediaStorageProvider, ISupportsMediaMoving + { + class MediaStorageBlobStream : SqlBlobStream + { + public MediaStorageBlobStream( + IDbConnectionFactory connectionFactory, + string connectionString, + int mediaStorageId) + : base(connectionFactory, connectionString, "MediaStorage", "Data", "Id", mediaStorageId) + { + } + } + + private readonly IDbContext _dbContext; + private readonly IRepository _mediaStorageRepo; + private readonly IRepository _mediaFileRepo; + private readonly Lazy _dataProvider; + + private readonly bool _isSqlServer; + + public DatabaseMediaStorageProvider( + IDbContext dbContext, + IRepository mediaStorageRepo, + IRepository mediaFileRepo, + Lazy dataProvider) + { + _dbContext = dbContext; + _mediaStorageRepo = mediaStorageRepo; + _mediaFileRepo = mediaFileRepo; + _dataProvider = dataProvider; + _isSqlServer = DataSettings.Current.IsSqlServer; + } + + public static string SystemName => "MediaStorage.SmartStoreDatabase"; + + private Stream CreateBlobStream(int mediaStorageId) + { + return new MediaStorageBlobStream(_dataProvider.Value.GetConnectionFactory(), DataSettings.Current.DataConnectionString, mediaStorageId); + } + + public bool IsCloudStorage { get; } = false; + + public string GetPublicUrl(MediaFile mediaFile) + { + return null; + } + + public long GetSize(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + var id = mediaFile.MediaStorageId ?? 0; + if (id == 0) + { + return 0; + } + + if (_isSqlServer) + { + using (var stream = CreateBlobStream(id)) + { + return stream.Length; + } + } + else + { + return mediaFile.MediaStorage?.Data?.LongLength ?? 0; + } + } + + public Stream OpenRead(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); if (_isSqlServer) { @@ -105,203 +102,203 @@ public Stream OpenRead(MediaFile mediaFile) else { return mediaFile.MediaStorage?.Data?.ToStream(); - } - } - - public byte[] Load(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - if (mediaFile.MediaStorageId == null) - { - return new byte[0]; - } - - using (var stream = CreateBlobStream(mediaFile.MediaStorageId.Value)) - { - return stream.ToByteArray(); - } - } - - public async Task LoadAsync(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - if (mediaFile.MediaStorageId == null) - { - return new byte[0]; - } - - using (var stream = CreateBlobStream(mediaFile.MediaStorageId.Value)) - { - return await stream.ToByteArrayAsync(); - } - } - - public void Save(MediaFile mediaFile, MediaStorageItem item) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - if (item == null) + } + } + + public byte[] Load(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + if (mediaFile.MediaStorageId == null) { - mediaFile.ApplyBlob(null); + return new byte[0]; } - else + + using (var stream = CreateBlobStream(mediaFile.MediaStorageId.Value)) { - SaveInternal(mediaFile, item); + return stream.ToByteArray(); } + } + + public async Task LoadAsync(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); - _mediaFileRepo.Update(mediaFile); - } - - private void SaveInternal(MediaFile mediaFile, MediaStorageItem item) - { - using (item) - { - if (_isSqlServer) - { - SaveFast(mediaFile, item); - } - else - { - var buffer = item.SourceStream.ToByteArray(); - mediaFile.ApplyBlob(buffer); - mediaFile.Size = buffer.Length; - } - } - - _mediaFileRepo.Update(mediaFile); - } - - public async Task SaveAsync(MediaFile mediaFile, MediaStorageItem item) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - if (item == null) - { - mediaFile.ApplyBlob(null); - } - else - { - await SaveInternalAsync(mediaFile, item); - } - - _mediaFileRepo.Update(mediaFile); - } - - private async Task SaveInternalAsync(MediaFile mediaFile, MediaStorageItem item) - { - using (item) - { - if (_isSqlServer) - { - SaveFast(mediaFile, item); - } - else - { - var buffer = await item.SourceStream.ToByteArrayAsync(); - mediaFile.ApplyBlob(buffer); - mediaFile.Size = buffer.Length; - } - } - - _mediaFileRepo.Update(mediaFile); - } - - private int SaveFast(MediaFile mediaFile, MediaStorageItem item) - { - var sourceStream = item.SourceStream; - mediaFile.Size = (int)sourceStream.Length; - - if (mediaFile.MediaStorageId == null) + if (mediaFile.MediaStorageId == null) { - // Insert new blob - var sql = "INSERT INTO [MediaStorage] (Data) Values(@p0)"; - mediaFile.MediaStorageId = ((DbContext)_dbContext).InsertInto(sql, sourceStream); - return mediaFile.MediaStorageId.Value; - } - else + return new byte[0]; + } + + using (var stream = CreateBlobStream(mediaFile.MediaStorageId.Value)) { - // Update existing blob - var sql = "UPDATE [MediaStorage] SET [Data] = @p0 WHERE Id = @p1"; - _dbContext.ExecuteSqlCommand(sql, false, null, sourceStream, mediaFile.MediaStorageId.Value); - return mediaFile.MediaStorageId.Value; + return await stream.ToByteArrayAsync(); } - } - - public void Remove(params MediaFile[] mediaFiles) - { - using (var scope = new DbContextScope(ctx: _mediaFileRepo.Context, autoCommit: false)) - { - foreach (var media in mediaFiles) - { - media.ApplyBlob(null); - } - - scope.Commit(); - } - } - - public void ChangeExtension(MediaFile mediaFile, string extension) - { - // Do nothing - } - - public void MoveTo(ISupportsMediaMoving target, MediaMoverContext context, MediaFile mediaFile) - { - Guard.NotNull(target, nameof(target)); - Guard.NotNull(context, nameof(context)); - Guard.NotNull(mediaFile, nameof(mediaFile)); - - if (mediaFile.MediaStorageId != null) - { - // Let target store data (into a file for example) - target.Receive(context, mediaFile, OpenRead(mediaFile)); - - // Remove picture binary from DB - try - { - _mediaStorageRepo.Delete(mediaFile.MediaStorageId.Value); - //mediaFile.MediaStorageId = null; - //mediaFile.MediaStorage = null; - - _mediaFileRepo.Update(mediaFile); - } - catch { } - - context.ShrinkDatabase = true; - } - } - - public void Receive(MediaMoverContext context, MediaFile mediaFile, Stream stream) - { - Guard.NotNull(context, nameof(context)); - Guard.NotNull(mediaFile, nameof(mediaFile)); - - // Store data for later bulk commit - if (stream != null && stream.Length > 0) - { - // Requires AutoDetectChanges set to true or remove explicit entity detaching - Save(mediaFile, MediaStorageItem.FromStream(stream)); - } - } - - public async Task ReceiveAsync(MediaMoverContext context, MediaFile mediaFile, Stream stream) - { - Guard.NotNull(context, nameof(context)); - Guard.NotNull(mediaFile, nameof(mediaFile)); - - // Store data for later bulk commit - if (stream != null && stream.Length > 0) - { - // Requires AutoDetectChanges set to true or remove explicit entity detaching - await SaveAsync(mediaFile, MediaStorageItem.FromStream(stream)); - } - } - - public void OnCompleted(MediaMoverContext context, bool succeeded) - { - // nothing to do - } - } + } + + public void Save(MediaFile mediaFile, MediaStorageItem item) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + if (item == null) + { + mediaFile.ApplyBlob(null); + } + else + { + SaveInternal(mediaFile, item); + } + + _mediaFileRepo.Update(mediaFile); + } + + private void SaveInternal(MediaFile mediaFile, MediaStorageItem item) + { + using (item) + { + if (_isSqlServer) + { + SaveFast(mediaFile, item); + } + else + { + var buffer = item.SourceStream.ToByteArray(); + mediaFile.ApplyBlob(buffer); + mediaFile.Size = buffer.Length; + } + } + + _mediaFileRepo.Update(mediaFile); + } + + public async Task SaveAsync(MediaFile mediaFile, MediaStorageItem item) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + if (item == null) + { + mediaFile.ApplyBlob(null); + } + else + { + await SaveInternalAsync(mediaFile, item); + } + + _mediaFileRepo.Update(mediaFile); + } + + private async Task SaveInternalAsync(MediaFile mediaFile, MediaStorageItem item) + { + using (item) + { + if (_isSqlServer) + { + SaveFast(mediaFile, item); + } + else + { + var buffer = await item.SourceStream.ToByteArrayAsync(); + mediaFile.ApplyBlob(buffer); + mediaFile.Size = buffer.Length; + } + } + + _mediaFileRepo.Update(mediaFile); + } + + private int SaveFast(MediaFile mediaFile, MediaStorageItem item) + { + var sourceStream = item.SourceStream; + mediaFile.Size = (int)sourceStream.Length; + + if (mediaFile.MediaStorageId == null) + { + // Insert new blob + var sql = "INSERT INTO [MediaStorage] (Data) Values(@p0)"; + mediaFile.MediaStorageId = ((DbContext)_dbContext).InsertInto(sql, sourceStream); + return mediaFile.MediaStorageId.Value; + } + else + { + // Update existing blob + var sql = "UPDATE [MediaStorage] SET [Data] = @p0 WHERE Id = @p1"; + _dbContext.ExecuteSqlCommand(sql, false, null, sourceStream, mediaFile.MediaStorageId.Value); + return mediaFile.MediaStorageId.Value; + } + } + + public void Remove(params MediaFile[] mediaFiles) + { + using (var scope = new DbContextScope(ctx: _mediaFileRepo.Context, autoCommit: false)) + { + foreach (var media in mediaFiles) + { + media.ApplyBlob(null); + } + + scope.Commit(); + } + } + + public void ChangeExtension(MediaFile mediaFile, string extension) + { + // Do nothing + } + + public void MoveTo(ISupportsMediaMoving target, MediaMoverContext context, MediaFile mediaFile) + { + Guard.NotNull(target, nameof(target)); + Guard.NotNull(context, nameof(context)); + Guard.NotNull(mediaFile, nameof(mediaFile)); + + if (mediaFile.MediaStorageId != null) + { + // Let target store data (into a file for example) + target.Receive(context, mediaFile, OpenRead(mediaFile)); + + // Remove picture binary from DB + try + { + _mediaStorageRepo.Delete(mediaFile.MediaStorageId.Value); + //mediaFile.MediaStorageId = null; + //mediaFile.MediaStorage = null; + + _mediaFileRepo.Update(mediaFile); + } + catch { } + + context.ShrinkDatabase = true; + } + } + + public void Receive(MediaMoverContext context, MediaFile mediaFile, Stream stream) + { + Guard.NotNull(context, nameof(context)); + Guard.NotNull(mediaFile, nameof(mediaFile)); + + // Store data for later bulk commit + if (stream != null && stream.Length > 0) + { + // Requires AutoDetectChanges set to true or remove explicit entity detaching + Save(mediaFile, MediaStorageItem.FromStream(stream)); + } + } + + public async Task ReceiveAsync(MediaMoverContext context, MediaFile mediaFile, Stream stream) + { + Guard.NotNull(context, nameof(context)); + Guard.NotNull(mediaFile, nameof(mediaFile)); + + // Store data for later bulk commit + if (stream != null && stream.Length > 0) + { + // Requires AutoDetectChanges set to true or remove explicit entity detaching + await SaveAsync(mediaFile, MediaStorageItem.FromStream(stream)); + } + } + + public void OnCompleted(MediaMoverContext context, bool succeeded) + { + // nothing to do + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/FileSystemMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/FileSystemMediaStorageProvider.cs index 96ad3e42f8..481408d04c 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/FileSystemMediaStorageProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/FileSystemMediaStorageProvider.cs @@ -12,214 +12,208 @@ namespace SmartStore.Services.Media.Storage { - [SystemName("MediaStorage.SmartStoreFileSystem")] - [FriendlyName("File system")] - [DisplayOrder(1)] - public class FileSystemMediaStorageProvider : IMediaStorageProvider, ISupportsMediaMoving - { - const string MediaRootPath = "Storage"; - - private readonly IMediaFileSystem _fileSystem; - private readonly IDictionary _pathCache = new Dictionary(); - - public FileSystemMediaStorageProvider(IMediaFileSystem fileSystem) - { - _fileSystem = fileSystem; - } - - public static string SystemName - { - get { return "MediaStorage.SmartStoreFileSystem"; } - } - - public bool IsCloudStorage - { - get => _fileSystem.IsCloudStorage; - } - - public string GetPublicUrl(MediaFile mediaFile) - { - return _fileSystem.GetPublicUrl(GetPath(mediaFile), true); - } - - protected string GetPath(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - if (_pathCache.TryGetValue(mediaFile.Id, out var path)) - { - return path; - } - - var ext = mediaFile.Extension.NullEmpty() ?? MimeTypes.MapMimeTypeToExtension(mediaFile.MimeType); - - var fileName = mediaFile.Id.ToString(ImageCache.IdFormatString).Grow(ext, "."); - var subfolder = fileName.Substring(0, ImageCache.MaxDirLength); - - path = _fileSystem.Combine(subfolder, fileName); - path = _fileSystem.Combine(MediaRootPath, path); - - _pathCache[mediaFile.Id] = path; - - return path; - } - - public long GetSize(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - if (mediaFile.Size > 0) - { - return mediaFile.Size; - } - - var file = _fileSystem.GetFile(GetPath(mediaFile)); - if (file.Exists) - { - // Hopefully a future commit will save this - mediaFile.Size = (int)file.Size; - } - - return mediaFile.Size; - } - - public Stream OpenRead(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - var file = _fileSystem.GetFile(GetPath(mediaFile)); - return file.Exists ? file.OpenRead() : null; - } - - public byte[] Load(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - var filePath = GetPath(mediaFile); - return _fileSystem.ReadAllBytes(filePath) ?? new byte[0]; - } - - public async Task LoadAsync(MediaFile mediaFile) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - var filePath = GetPath(mediaFile); - return (await _fileSystem.ReadAllBytesAsync(filePath)) ?? new byte[0]; - } - - public void Save(MediaFile mediaFile, MediaStorageItem item) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - // TODO: (?) if the new file extension differs from the old one then the old file never gets deleted - - var filePath = GetPath(mediaFile); - - if (item != null) - { - // Create folder if it does not exist yet - var dir = Path.GetDirectoryName(filePath); - if (!_fileSystem.FolderExists(dir)) - { - _fileSystem.CreateFolder(dir); - } - - using (item) + [SystemName("MediaStorage.SmartStoreFileSystem")] + [FriendlyName("File system")] + [DisplayOrder(1)] + public class FileSystemMediaStorageProvider : IMediaStorageProvider, ISupportsMediaMoving + { + const string MediaRootPath = "Storage"; + + private readonly IMediaFileSystem _fileSystem; + private readonly IDictionary _pathCache = new Dictionary(); + + public FileSystemMediaStorageProvider(IMediaFileSystem fileSystem) + { + _fileSystem = fileSystem; + } + + public static string SystemName => "MediaStorage.SmartStoreFileSystem"; + + public bool IsCloudStorage => _fileSystem.IsCloudStorage; + + public string GetPublicUrl(MediaFile mediaFile) + { + return _fileSystem.GetPublicUrl(GetPath(mediaFile), true); + } + + protected string GetPath(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + if (_pathCache.TryGetValue(mediaFile.Id, out var path)) + { + return path; + } + + var ext = mediaFile.Extension.NullEmpty() ?? MimeTypes.MapMimeTypeToExtension(mediaFile.MimeType); + + var fileName = mediaFile.Id.ToString(ImageCache.IdFormatString).Grow(ext, "."); + var subfolder = fileName.Substring(0, ImageCache.MaxDirLength); + + path = _fileSystem.Combine(subfolder, fileName); + path = _fileSystem.Combine(MediaRootPath, path); + + _pathCache[mediaFile.Id] = path; + + return path; + } + + public long GetSize(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + if (mediaFile.Size > 0) + { + return mediaFile.Size; + } + + var file = _fileSystem.GetFile(GetPath(mediaFile)); + if (file.Exists) + { + // Hopefully a future commit will save this + mediaFile.Size = (int)file.Size; + } + + return mediaFile.Size; + } + + public Stream OpenRead(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + var file = _fileSystem.GetFile(GetPath(mediaFile)); + return file.Exists ? file.OpenRead() : null; + } + + public byte[] Load(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + var filePath = GetPath(mediaFile); + return _fileSystem.ReadAllBytes(filePath) ?? new byte[0]; + } + + public async Task LoadAsync(MediaFile mediaFile) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + var filePath = GetPath(mediaFile); + return (await _fileSystem.ReadAllBytesAsync(filePath)) ?? new byte[0]; + } + + public void Save(MediaFile mediaFile, MediaStorageItem item) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + // TODO: (?) if the new file extension differs from the old one then the old file never gets deleted + + var filePath = GetPath(mediaFile); + + if (item != null) + { + // Create folder if it does not exist yet + var dir = Path.GetDirectoryName(filePath); + if (!_fileSystem.FolderExists(dir)) + { + _fileSystem.CreateFolder(dir); + } + + using (item) + { + using var outStream = _fileSystem.GetFile(filePath).OpenWrite(); + item.SaveTo(outStream, mediaFile); + } + } + else if (_fileSystem.FileExists(filePath)) + { + // Remove media storage if any + _fileSystem.DeleteFile(filePath); + } + } + + public async Task SaveAsync(MediaFile mediaFile, MediaStorageItem item) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + + // TODO: (?) if the new file extension differs from the old one then the old file never gets deleted + + var filePath = GetPath(mediaFile); + + if (item != null) + { + // Create folder if it does not exist yet + var dir = Path.GetDirectoryName(filePath); + if (!_fileSystem.FolderExists(dir)) { - using var outStream = _fileSystem.GetFile(filePath).OpenWrite(); - item.SaveTo(outStream, mediaFile); - } - } - else if (_fileSystem.FileExists(filePath)) - { - // Remove media storage if any - _fileSystem.DeleteFile(filePath); - } - } - - public async Task SaveAsync(MediaFile mediaFile, MediaStorageItem item) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - - // TODO: (?) if the new file extension differs from the old one then the old file never gets deleted - - var filePath = GetPath(mediaFile); - - if (item != null) - { - // Create folder if it does not exist yet - var dir = Path.GetDirectoryName(filePath); - if (!_fileSystem.FolderExists(dir)) - { - _fileSystem.CreateFolder(dir); - } - - using (item) + _fileSystem.CreateFolder(dir); + } + + using (item) + { + using var outStream = _fileSystem.GetFile(filePath).OpenWrite(); + await item.SaveToAsync(outStream, mediaFile); + } + } + else if (_fileSystem.FileExists(filePath)) + { + // Remove media storage if any + _fileSystem.DeleteFile(filePath); + } + } + + public void Remove(params MediaFile[] mediaFiles) + { + foreach (var media in mediaFiles) + { + _fileSystem.DeleteFile(GetPath(media)); + } + } + + public void ChangeExtension(MediaFile mediaFile, string extension) + { + Guard.NotNull(mediaFile, nameof(mediaFile)); + Guard.NotEmpty(extension, nameof(extension)); + + var sourcePath = GetPath(mediaFile); + var newPath = Path.ChangeExtension(sourcePath, extension); + + _fileSystem.RenameFile(sourcePath, newPath); + } + + public void MoveTo(ISupportsMediaMoving target, MediaMoverContext context, MediaFile mediaFile) + { + Guard.NotNull(target, nameof(target)); + Guard.NotNull(context, nameof(context)); + Guard.NotNull(mediaFile, nameof(mediaFile)); + + var filePath = GetPath(mediaFile); + + try + { + // Let target store data (into database for example) + target.Receive(context, mediaFile, OpenRead(mediaFile)); + + // Remember file path: we must be able to rollback IO operations on transaction failure + context.AffectedFiles.Add(filePath); + } + catch (Exception exception) + { + Debug.WriteLine(exception.Message); + } + } + + public void Receive(MediaMoverContext context, MediaFile mediaFile, Stream stream) + { + Guard.NotNull(context, nameof(context)); + Guard.NotNull(mediaFile, nameof(mediaFile)); + + // store data into file + if (stream != null && stream.Length > 0) + { + var filePath = GetPath(mediaFile); + + if (!_fileSystem.FileExists(filePath)) { - using var outStream = _fileSystem.GetFile(filePath).OpenWrite(); - await item.SaveToAsync(outStream, mediaFile); - } - } - else if (_fileSystem.FileExists(filePath)) - { - // Remove media storage if any - _fileSystem.DeleteFile(filePath); - } - } - - public void Remove(params MediaFile[] mediaFiles) - { - foreach (var media in mediaFiles) - { - _fileSystem.DeleteFile(GetPath(media)); - } - } - - public void ChangeExtension(MediaFile mediaFile, string extension) - { - Guard.NotNull(mediaFile, nameof(mediaFile)); - Guard.NotEmpty(extension, nameof(extension)); - - var sourcePath = GetPath(mediaFile); - var newPath = Path.ChangeExtension(sourcePath, extension); - - _fileSystem.RenameFile(sourcePath, newPath); - } - - public void MoveTo(ISupportsMediaMoving target, MediaMoverContext context, MediaFile mediaFile) - { - Guard.NotNull(target, nameof(target)); - Guard.NotNull(context, nameof(context)); - Guard.NotNull(mediaFile, nameof(mediaFile)); - - var filePath = GetPath(mediaFile); - - try - { - // Let target store data (into database for example) - target.Receive(context, mediaFile, OpenRead(mediaFile)); - - // Remember file path: we must be able to rollback IO operations on transaction failure - context.AffectedFiles.Add(filePath); - } - catch (Exception exception) - { - Debug.WriteLine(exception.Message); - } - } - - public void Receive(MediaMoverContext context, MediaFile mediaFile, Stream stream) - { - Guard.NotNull(context, nameof(context)); - Guard.NotNull(mediaFile, nameof(mediaFile)); - - // store data into file - if (stream != null && stream.Length > 0) - { - var filePath = GetPath(mediaFile); - - if (!_fileSystem.FileExists(filePath)) - { // TBD: (mc) We only save the file if it doesn't exist yet. // This should save time and bandwidth in the case where the target // is a cloud based file system (like Azure BLOB). @@ -234,27 +228,27 @@ public void Receive(MediaMoverContext context, MediaFile mediaFile, Stream strea } using (stream) - { - _fileSystem.SaveStream(filePath, stream); - } - - context.AffectedFiles.Add(filePath); - } - } - } - - public async Task ReceiveAsync(MediaMoverContext context, MediaFile mediaFile, Stream stream) - { - Guard.NotNull(context, nameof(context)); - Guard.NotNull(mediaFile, nameof(mediaFile)); - - // store data into file - if (stream != null && stream.Length > 0) - { - var filePath = GetPath(mediaFile); - - if (!_fileSystem.FileExists(filePath)) - { + { + _fileSystem.SaveStream(filePath, stream); + } + + context.AffectedFiles.Add(filePath); + } + } + } + + public async Task ReceiveAsync(MediaMoverContext context, MediaFile mediaFile, Stream stream) + { + Guard.NotNull(context, nameof(context)); + Guard.NotNull(mediaFile, nameof(mediaFile)); + + // store data into file + if (stream != null && stream.Length > 0) + { + var filePath = GetPath(mediaFile); + + if (!_fileSystem.FileExists(filePath)) + { // TBD: (mc) We only save the file if it doesn't exist yet. // This should save time and bandwidth in the case where the target // is a cloud based file system (like Azure BLOB). @@ -269,36 +263,36 @@ public async Task ReceiveAsync(MediaMoverContext context, MediaFile mediaFile, S } using (stream) - { - await _fileSystem.SaveStreamAsync(filePath, stream); - } - - context.AffectedFiles.Add(filePath); - } - } - } - - public void OnCompleted(MediaMoverContext context, bool succeeded) - { - if (context.AffectedFiles.Any()) - { - var toFileSystem = context.TargetSystemName.IsCaseInsensitiveEqual(SystemName); - - if ((!toFileSystem && succeeded) || (toFileSystem && !succeeded)) - { - // FS > DB sucessful OR DB > FS failed: delete all physical files - // run a background task for the deletion of files (fire & forget) - - Task.Factory.StartNew(state => - { - var files = state as string[]; - foreach (var file in files) - { - _fileSystem.DeleteFile(file); - } - }, context.AffectedFiles.ToArray()).ConfigureAwait(false); - } - } - } - } + { + await _fileSystem.SaveStreamAsync(filePath, stream); + } + + context.AffectedFiles.Add(filePath); + } + } + } + + public void OnCompleted(MediaMoverContext context, bool succeeded) + { + if (context.AffectedFiles.Any()) + { + var toFileSystem = context.TargetSystemName.IsCaseInsensitiveEqual(SystemName); + + if ((!toFileSystem && succeeded) || (toFileSystem && !succeeded)) + { + // FS > DB sucessful OR DB > FS failed: delete all physical files + // run a background task for the deletion of files (fire & forget) + + Task.Factory.StartNew(state => + { + var files = state as string[]; + foreach (var file in files) + { + _fileSystem.DeleteFile(file); + } + }, context.AffectedFiles.ToArray()).ConfigureAwait(false); + } + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/IMediaMover.cs b/src/Libraries/SmartStore.Services/Media/Storage/IMediaMover.cs index 3283aefe32..4bea7cd4e2 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/IMediaMover.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/IMediaMover.cs @@ -2,14 +2,14 @@ namespace SmartStore.Services.Media.Storage { - public interface IMediaMover - { - /// - /// Moves media items from one storage provider to another - /// - /// The source media storage provider - /// The target media storage provider - /// true success, failure - bool Move(Provider sourceProvider, Provider targetProvider); - } + public interface IMediaMover + { + /// + /// Moves media items from one storage provider to another + /// + /// The source media storage provider + /// The target media storage provider + /// true success, failure + bool Move(Provider sourceProvider, Provider targetProvider); + } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/IMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/IMediaStorageProvider.cs index 72424f2a1b..eeb715cf05 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/IMediaStorageProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/IMediaStorageProvider.cs @@ -5,70 +5,70 @@ namespace SmartStore.Services.Media.Storage { - public interface IMediaStorageProvider : IProvider - { - /// - /// Gets a value indicating whether the provider saves data in a remote cloud storage (e.g. Azure) - /// - bool IsCloudStorage { get; } + public interface IMediaStorageProvider : IProvider + { + /// + /// Gets a value indicating whether the provider saves data in a remote cloud storage (e.g. Azure) + /// + bool IsCloudStorage { get; } - /// - /// Retrieves the public URL for a given file within the storage provider. - /// Returns null if the file is stored as a database BLOB. - /// - /// Media file item - /// The public URL. - string GetPublicUrl(MediaFile mediaFile); + /// + /// Retrieves the public URL for a given file within the storage provider. + /// Returns null if the file is stored as a database BLOB. + /// + /// Media file item + /// The public URL. + string GetPublicUrl(MediaFile mediaFile); - /// - /// Gets the size of the media item in bytes. - /// - /// Media file item - long GetSize(MediaFile mediaFile); + /// + /// Gets the size of the media item in bytes. + /// + /// Media file item + long GetSize(MediaFile mediaFile); - /// - /// Opens the media item for reading - /// - /// Media file item - Stream OpenRead(MediaFile mediaFile); + /// + /// Opens the media item for reading + /// + /// Media file item + Stream OpenRead(MediaFile mediaFile); - /// - /// Loads media item data - /// - /// Media storage item - byte[] Load(MediaFile mediaFile); + /// + /// Loads media item data + /// + /// Media storage item + byte[] Load(MediaFile mediaFile); - /// - /// Asynchronously loads media item data - /// - /// Media file item - Task LoadAsync(MediaFile mediaFile); + /// + /// Asynchronously loads media item data + /// + /// Media file item + Task LoadAsync(MediaFile mediaFile); - /// - /// Saves media item data - /// - /// Media file item - /// The source item - void Save(MediaFile mediaFile, MediaStorageItem item); + /// + /// Saves media item data + /// + /// Media file item + /// The source item + void Save(MediaFile mediaFile, MediaStorageItem item); - /// - /// Asynchronously saves media item data - /// - /// Media file item - /// The source item - Task SaveAsync(MediaFile mediaFile, MediaStorageItem item); + /// + /// Asynchronously saves media item data + /// + /// Media file item + /// The source item + Task SaveAsync(MediaFile mediaFile, MediaStorageItem item); - /// - /// Remove media storage item(s) - /// - /// Media file items - void Remove(params MediaFile[] mediaFiles); + /// + /// Remove media storage item(s) + /// + /// Media file items + void Remove(params MediaFile[] mediaFiles); - /// - /// Changes the extension of the stored file if the provider supports - /// - /// Media file item - /// The nex file extension - void ChangeExtension(MediaFile mediaFile, string extension); - } + /// + /// Changes the extension of the stored file if the provider supports + /// + /// Media file item + /// The nex file extension + void ChangeExtension(MediaFile mediaFile, string extension); + } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/ISupportsMediaMoving.cs b/src/Libraries/SmartStore.Services/Media/Storage/ISupportsMediaMoving.cs index 484685c1d1..7a658c1f2a 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/ISupportsMediaMoving.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/ISupportsMediaMoving.cs @@ -4,37 +4,37 @@ namespace SmartStore.Services.Media.Storage { - public interface ISupportsMediaMoving - { - /// - /// Moves a media item to the target provider - /// - /// Target provider - /// Media storage mover context - /// Media file item - void MoveTo(ISupportsMediaMoving target, MediaMoverContext context, MediaFile mediaFile); + public interface ISupportsMediaMoving + { + /// + /// Moves a media item to the target provider + /// + /// Target provider + /// Media storage mover context + /// Media file item + void MoveTo(ISupportsMediaMoving target, MediaMoverContext context, MediaFile mediaFile); - /// - /// Data received by the source provider to be stored by the target provider - /// - /// Media storage mover context - /// Media file item - /// Source stream - void Receive(MediaMoverContext context, MediaFile mediaFile, Stream stream); + /// + /// Data received by the source provider to be stored by the target provider + /// + /// Media storage mover context + /// Media file item + /// Source stream + void Receive(MediaMoverContext context, MediaFile mediaFile, Stream stream); - /// - /// Data received by the source provider to be stored by the target provider (async) - /// - /// Media storage mover context - /// Media file item - /// Source stream - Task ReceiveAsync(MediaMoverContext context, MediaFile mediaFile, Stream stream); + /// + /// Data received by the source provider to be stored by the target provider (async) + /// + /// Media storage mover context + /// Media file item + /// Source stream + Task ReceiveAsync(MediaMoverContext context, MediaFile mediaFile, Stream stream); - /// - /// Called when batch media moving completes - /// - /// Media storage mover context - /// Whether media moving succeeded - void OnCompleted(MediaMoverContext context, bool succeeded); - } + /// + /// Called when batch media moving completes + /// + /// Media storage mover context + /// Whether media moving succeeded + void OnCompleted(MediaMoverContext context, bool succeeded); + } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs index 215f817a8d..bd5b52efcf 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs @@ -13,112 +13,112 @@ namespace SmartStore.Services.Media.Storage { - public class MediaMover : IMediaMover - { - private const int PAGE_SIZE = 50; - - private readonly IRepository _mediaFileRepo; - private readonly ICommonServices _services; - private readonly ILogger _logger; - - public MediaMover(IRepository mediaFileRepo, ICommonServices services, ILogger logger) - { - _mediaFileRepo = mediaFileRepo; - _services = services; - _logger = logger; - } - - public Localizer T { get; set; } = NullLocalizer.Instance; - - public virtual bool Move(Provider sourceProvider, Provider targetProvider) - { - Guard.NotNull(sourceProvider, nameof(sourceProvider)); - Guard.NotNull(targetProvider, nameof(targetProvider)); - - var success = false; - var utcNow = DateTime.UtcNow; - var context = new MediaMoverContext(sourceProvider.Metadata.SystemName, targetProvider.Metadata.SystemName); - - var source = sourceProvider.Value as ISupportsMediaMoving; - var target = targetProvider.Value as ISupportsMediaMoving; - - // Source and target must support media storage moving - if (source == null) - { - throw new ArgumentException(T("Admin.Media.StorageMovingNotSupported", sourceProvider.Metadata.SystemName)); - } - - if (target == null) - { - throw new ArgumentException(T("Admin.Media.StorageMovingNotSupported", targetProvider.Metadata.SystemName)); - } - - // Source and target provider must not be equal - if (sourceProvider.Metadata.SystemName.IsCaseInsensitiveEqual(targetProvider.Metadata.SystemName)) - { - throw new ArgumentException(T("Admin.Media.CannotMoveToSameProvider")); - } - - // We are about to process data in chunks but want to commit ALL at once after ALL chunks have been processed successfully. - // AutoDetectChanges true required for newly inserted binary data. - using (var scope = new DbContextScope(ctx: _services.DbContext, - autoDetectChanges: true, - proxyCreation: false, - validateOnSave: false, - autoCommit: false)) - { - using (var transaction = scope.DbContext.BeginTransaction()) - { - try - { - var pager = new FastPager(_mediaFileRepo.Table, PAGE_SIZE); - while (pager.ReadNextPage(out var files)) + public class MediaMover : IMediaMover + { + private const int PAGE_SIZE = 50; + + private readonly IRepository _mediaFileRepo; + private readonly ICommonServices _services; + private readonly ILogger _logger; + + public MediaMover(IRepository mediaFileRepo, ICommonServices services, ILogger logger) + { + _mediaFileRepo = mediaFileRepo; + _services = services; + _logger = logger; + } + + public Localizer T { get; set; } = NullLocalizer.Instance; + + public virtual bool Move(Provider sourceProvider, Provider targetProvider) + { + Guard.NotNull(sourceProvider, nameof(sourceProvider)); + Guard.NotNull(targetProvider, nameof(targetProvider)); + + var success = false; + var utcNow = DateTime.UtcNow; + var context = new MediaMoverContext(sourceProvider.Metadata.SystemName, targetProvider.Metadata.SystemName); + + var source = sourceProvider.Value as ISupportsMediaMoving; + var target = targetProvider.Value as ISupportsMediaMoving; + + // Source and target must support media storage moving + if (source == null) + { + throw new ArgumentException(T("Admin.Media.StorageMovingNotSupported", sourceProvider.Metadata.SystemName)); + } + + if (target == null) + { + throw new ArgumentException(T("Admin.Media.StorageMovingNotSupported", targetProvider.Metadata.SystemName)); + } + + // Source and target provider must not be equal + if (sourceProvider.Metadata.SystemName.IsCaseInsensitiveEqual(targetProvider.Metadata.SystemName)) + { + throw new ArgumentException(T("Admin.Media.CannotMoveToSameProvider")); + } + + // We are about to process data in chunks but want to commit ALL at once after ALL chunks have been processed successfully. + // AutoDetectChanges true required for newly inserted binary data. + using (var scope = new DbContextScope(ctx: _services.DbContext, + autoDetectChanges: true, + proxyCreation: false, + validateOnSave: false, + autoCommit: false)) + { + using (var transaction = scope.DbContext.BeginTransaction()) + { + try + { + var pager = new FastPager(_mediaFileRepo.Table, PAGE_SIZE); + while (pager.ReadNextPage(out var files)) { - foreach (var file in files) + foreach (var file in files) { - // Move item from source to target - source.MoveTo(target, context, file); + // Move item from source to target + source.MoveTo(target, context, file); - file.UpdatedOnUtc = utcNow; - ++context.MovedItems; - } + file.UpdatedOnUtc = utcNow; + ++context.MovedItems; + } - scope.DbContext.SaveChanges(); + scope.DbContext.SaveChanges(); - // Detach all entities from previous page to save memory - scope.DbContext.DetachEntities(files, deep: true); - } + // Detach all entities from previous page to save memory + scope.DbContext.DetachEntities(files, deep: true); + } transaction.Commit(); - success = true; - } - catch (Exception exception) - { - success = false; - transaction.Rollback(); - - _services.Notifier.Error(exception); - _logger.Error(exception); - } - } - } - - - if (success) - { - _services.Settings.SetSetting("Media.Storage.Provider", targetProvider.Metadata.SystemName); - } - - // inform both provider about ending - source.OnCompleted(context, success); - target.OnCompleted(context, success); - - if (success && context.ShrinkDatabase) - { - _services.DbContext.ShrinkDatabase(); - } - - return success; - } - } + success = true; + } + catch (Exception exception) + { + success = false; + transaction.Rollback(); + + _services.Notifier.Error(exception); + _logger.Error(exception); + } + } + } + + + if (success) + { + _services.Settings.SetSetting("Media.Storage.Provider", targetProvider.Metadata.SystemName); + } + + // inform both provider about ending + source.OnCompleted(context, success); + target.OnCompleted(context, success); + + if (success && context.ShrinkDatabase) + { + _services.DbContext.ShrinkDatabase(); + } + + return success; + } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/MediaMoverContext.cs b/src/Libraries/SmartStore.Services/Media/Storage/MediaMoverContext.cs index f0d8fc8068..46465ef509 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/MediaMoverContext.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaMoverContext.cs @@ -2,44 +2,44 @@ namespace SmartStore.Services.Media.Storage { - public class MediaMoverContext - { - internal MediaMoverContext(string sourceSystemName, string targetSystemName) - { - SourceSystemName = sourceSystemName; - TargetSystemName = targetSystemName; - AffectedFiles = new List(); - CustomProperties = new Dictionary(); - } + public class MediaMoverContext + { + internal MediaMoverContext(string sourceSystemName, string targetSystemName) + { + SourceSystemName = sourceSystemName; + TargetSystemName = targetSystemName; + AffectedFiles = new List(); + CustomProperties = new Dictionary(); + } - /// - /// The system name of the source provider - /// - public string SourceSystemName { get; private set; } + /// + /// The system name of the source provider + /// + public string SourceSystemName { get; private set; } - /// - /// The system name of the target provider - /// - public string TargetSystemName { get; private set; } + /// + /// The system name of the target provider + /// + public string TargetSystemName { get; private set; } - /// - /// Current number of moved media items - /// - public int MovedItems { get; internal set; } + /// + /// Current number of moved media items + /// + public int MovedItems { get; internal set; } - /// - /// Paths of affected media files - /// - public List AffectedFiles { get; private set; } + /// + /// Paths of affected media files + /// + public List AffectedFiles { get; private set; } - /// - /// Whether to shrink database after succesful moving - /// - public bool ShrinkDatabase { get; set; } + /// + /// Whether to shrink database after succesful moving + /// + public bool ShrinkDatabase { get; set; } - /// - /// Use this dictionary for any custom data required along the move operation - /// - public Dictionary CustomProperties { get; set; } - } + /// + /// Use this dictionary for any custom data required along the move operation + /// + public Dictionary CustomProperties { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Media/Storage/MediaStorageItem.cs b/src/Libraries/SmartStore.Services/Media/Storage/MediaStorageItem.cs index d748b4beb9..8a8951add8 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/MediaStorageItem.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaStorageItem.cs @@ -10,7 +10,7 @@ namespace SmartStore.Services.Media.Storage public abstract class MediaStorageItem : IDisposable { private Stream _sourceStream; - + public Stream SourceStream { get @@ -24,7 +24,7 @@ public Stream SourceStream { _sourceStream.Position = 0; } - + return _sourceStream; } } @@ -66,7 +66,7 @@ public static MediaStorageItem FromFile(IFile file) public class ImageStorageItem : MediaStorageItem { private readonly IImage _image; - + public ImageStorageItem(IImage image) { _image = image; @@ -113,7 +113,7 @@ public override void SaveTo(Stream stream, MediaFile mediaFile) { stream.SetLength(0); } - + SourceStream.CopyTo(stream); if (stream.CanSeek) diff --git a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs index ab0bcae555..fae7b431e9 100644 --- a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs +++ b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs @@ -85,9 +85,9 @@ public IDisposable BeginScope(bool makeFilesTransientWhenOrphaned) } protected void TrackSetting( - TSetting settings, + TSetting settings, string propertyName, - int? prevMediaFileId, + int? prevMediaFileId, int? currentMediaFileId) where TSetting : ISettings, new() { Guard.NotNull(settings, nameof(settings)); @@ -199,13 +199,13 @@ protected virtual void TrackManyCore(IEnumerable tracks, string albu var ctx = _dbContext; - using (var scope = new DbContextScope(ctx, - validateOnSave: false, - hooksEnabled: false, + using (var scope = new DbContextScope(ctx, + validateOnSave: false, + hooksEnabled: false, autoDetectChanges: false)) { // Get the album (necessary later to set FolderId)... - MediaFolderNode albumNode = albumName.HasValue() + MediaFolderNode albumNode = albumName.HasValue() ? _folderService.GetNodeByPath(albumName)?.Value : null; @@ -268,7 +268,7 @@ protected virtual void TrackManyCore(IEnumerable tracks, string albu { file.Tracks.Remove(track); _dbContext.ChangeState(dbTrack, System.Data.Entity.EntityState.Deleted); - } + } } if (file.Tracks.Count > 0) @@ -298,7 +298,7 @@ protected virtual void TrackManyCore(IEnumerable tracks, string albu public int DeleteAllTracks(string albumName) { Guard.NotEmpty(albumName, nameof(albumName)); - + string sql = "DELETE FROM [MediaTrack] WHERE [Album] = '{0}'".FormatCurrent(albumName); return _dbContext.ExecuteSqlCommand(sql); } diff --git a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTrackerHook.cs b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTrackerHook.cs index c6be2e0662..82f77370f1 100644 --- a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTrackerHook.cs +++ b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTrackerHook.cs @@ -11,7 +11,7 @@ namespace SmartStore.Services.Media { [Important] public sealed class MediaTrackerHook : DbSaveHook - { + { // Track items for the current (SaveChanges) unit. private readonly HashSet _actionsUnit = new HashSet(); @@ -56,7 +56,7 @@ private void HookObject(IHookedEntity entry, bool beforeSave) { if (Silent) return; - + var type = entry.EntityType; if (!_mediaTracker.Value.TryGetTrackedPropertiesFor(type, out var properties)) @@ -110,13 +110,13 @@ private void TryAddTrack(string album, BaseEntity entity, string prop, object va if ((int)value > 0) { (actions ?? _actionsUnit).Add(new MediaTrack - { + { Album = album, - EntityId = entity.Id, - EntityName = entity.GetEntityName(), + EntityId = entity.Id, + EntityName = entity.GetEntityName(), Property = prop, - MediaFileId = (int)value, - Operation = operation + MediaFileId = (int)value, + Operation = operation }); } } diff --git a/src/Libraries/SmartStore.Services/Media/Tracking/TrackedMediaPropertyTable.cs b/src/Libraries/SmartStore.Services/Media/Tracking/TrackedMediaPropertyTable.cs index 23a21336e4..c85cf70d0e 100644 --- a/src/Libraries/SmartStore.Services/Media/Tracking/TrackedMediaPropertyTable.cs +++ b/src/Libraries/SmartStore.Services/Media/Tracking/TrackedMediaPropertyTable.cs @@ -13,7 +13,7 @@ namespace SmartStore.Services.Media public class TrackedMediaPropertyTable { private readonly IList _propertyList = new List(); - + protected internal TrackedMediaPropertyTable(string album) { Album = album; diff --git a/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs b/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs index 8e2b0bc6c1..0c1c48f8ab 100644 --- a/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs +++ b/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs @@ -16,42 +16,42 @@ public partial class TransientMediaClearTask : AsyncTask { private readonly IMediaService _mediaService; private readonly IDownloadService _downloadService; - private readonly IRepository _fileRepository; - private readonly IRepository _downloadRepository; + private readonly IRepository _fileRepository; + private readonly IRepository _downloadRepository; - public TransientMediaClearTask( + public TransientMediaClearTask( IMediaService mediaService, IDownloadService downloadService, - IRepository fileRepository, - IRepository downloadRepository) + IRepository fileRepository, + IRepository downloadRepository) { _mediaService = mediaService; _downloadService = downloadService; - _fileRepository = fileRepository; - _downloadRepository = downloadRepository; + _fileRepository = fileRepository; + _downloadRepository = downloadRepository; } - public override async Task ExecuteAsync(TaskExecutionContext ctx) + public override async Task ExecuteAsync(TaskExecutionContext ctx) { - // Delete all media records which are in transient state since at least 3 hours. - var olderThan = DateTime.UtcNow.AddHours(-3); - var fileAutoCommit = _fileRepository.AutoCommitEnabled; + // Delete all media records which are in transient state since at least 3 hours. + var olderThan = DateTime.UtcNow.AddHours(-3); + var fileAutoCommit = _fileRepository.AutoCommitEnabled; var downloadAutoCommit = _downloadRepository.AutoCommitEnabled; - + _fileRepository.AutoCommitEnabled = false; _downloadRepository.AutoCommitEnabled = false; - try - { - using (var scope = new DbContextScope(autoDetectChanges: false, validateOnSave: false, hooksEnabled: false)) - { - var files = await _fileRepository.Table.Where(x => x.IsTransient && x.UpdatedOnUtc < olderThan).ToListAsync(); - foreach (var file in files) - { + try + { + using (var scope = new DbContextScope(autoDetectChanges: false, validateOnSave: false, hooksEnabled: false)) + { + var files = await _fileRepository.Table.Where(x => x.IsTransient && x.UpdatedOnUtc < olderThan).ToListAsync(); + foreach (var file in files) + { _mediaService.DeleteFile(file, true); - } + } - await _fileRepository.Context.SaveChangesAsync(); + await _fileRepository.Context.SaveChangesAsync(); var downloads = await _downloadRepository.Table.Where(x => x.IsTransient && x.UpdatedOnUtc < olderThan).ToListAsync(); foreach (var download in downloads) @@ -72,10 +72,10 @@ public override async Task ExecuteAsync(TaskExecutionContext ctx) } } finally - { - _fileRepository.AutoCommitEnabled = fileAutoCommit; + { + _fileRepository.AutoCommitEnabled = fileAutoCommit; _downloadRepository.AutoCommitEnabled = downloadAutoCommit; - } + } } } } diff --git a/src/Libraries/SmartStore.Services/Messages/CampaignService.cs b/src/Libraries/SmartStore.Services/Messages/CampaignService.cs index f3aa08846d..58a4e4360a 100644 --- a/src/Libraries/SmartStore.Services/Messages/CampaignService.cs +++ b/src/Libraries/SmartStore.Services/Messages/CampaignService.cs @@ -11,50 +11,50 @@ namespace SmartStore.Services.Messages { public partial class CampaignService : ICampaignService { - private readonly ICommonServices _services; - private readonly IRepository _campaignRepository; - private readonly IMessageTemplateService _messageTemplateService; + private readonly ICommonServices _services; + private readonly IRepository _campaignRepository; + private readonly IMessageTemplateService _messageTemplateService; private readonly INewsLetterSubscriptionService _newsLetterSubscriptionService; private readonly IStoreMappingService _storeMappingService; private readonly IAclService _aclService; public CampaignService( - ICommonServices services, - IRepository campaignRepository, - IMessageTemplateService messageTemplateService, + ICommonServices services, + IRepository campaignRepository, + IMessageTemplateService messageTemplateService, INewsLetterSubscriptionService newsLetterSubscriptionService, IStoreMappingService storeMappingService, IAclService aclService) { - _services = services; - _campaignRepository = campaignRepository; - _messageTemplateService = messageTemplateService; + _services = services; + _campaignRepository = campaignRepository; + _messageTemplateService = messageTemplateService; _newsLetterSubscriptionService = newsLetterSubscriptionService; _storeMappingService = storeMappingService; _aclService = aclService; } - public Localizer T { get; set; } = NullLocalizer.Instance; + public Localizer T { get; set; } = NullLocalizer.Instance; public virtual void InsertCampaign(Campaign campaign) { - Guard.NotNull(campaign, nameof(campaign)); + Guard.NotNull(campaign, nameof(campaign)); _campaignRepository.Insert(campaign); } public virtual void UpdateCampaign(Campaign campaign) { - Guard.NotNull(campaign, nameof(campaign)); + Guard.NotNull(campaign, nameof(campaign)); - _campaignRepository.Update(campaign); + _campaignRepository.Update(campaign); } public virtual void DeleteCampaign(Campaign campaign) { - Guard.NotNull(campaign, nameof(campaign)); + Guard.NotNull(campaign, nameof(campaign)); - _campaignRepository.Delete(campaign); + _campaignRepository.Delete(campaign); } public virtual Campaign GetCampaignById(int campaignId) @@ -159,28 +159,28 @@ public virtual CreateMessageResult SendCampaign(Campaign campaign, NewsletterSub } public virtual CreateMessageResult Preview(Campaign campaign) - { - Guard.NotNull(campaign, nameof(campaign)); - - var messageContext = new MessageContext - { - MessageTemplate = GetCampaignTemplate(), - TestMode = true - }; - - var subscription =_services.MessageFactory.GetTestModels(messageContext).OfType().FirstOrDefault(); - - var message = _services.MessageFactory.CreateMessage(messageContext, false /* do NOT queue */, subscription, campaign); - return message; - } - - private MessageTemplate GetCampaignTemplate() - { - var messageTemplate = _messageTemplateService.GetMessageTemplateByName(MessageTemplateNames.SystemCampaign, _services.StoreContext.CurrentStore.Id); - if (messageTemplate == null) - throw new SmartException(T("Common.Error.NoMessageTemplate", MessageTemplateNames.SystemCampaign)); - - return messageTemplate; - } - } + { + Guard.NotNull(campaign, nameof(campaign)); + + var messageContext = new MessageContext + { + MessageTemplate = GetCampaignTemplate(), + TestMode = true + }; + + var subscription = _services.MessageFactory.GetTestModels(messageContext).OfType().FirstOrDefault(); + + var message = _services.MessageFactory.CreateMessage(messageContext, false /* do NOT queue */, subscription, campaign); + return message; + } + + private MessageTemplate GetCampaignTemplate() + { + var messageTemplate = _messageTemplateService.GetMessageTemplateByName(MessageTemplateNames.SystemCampaign, _services.StoreContext.CurrentStore.Id); + if (messageTemplate == null) + throw new SmartException(T("Common.Error.NoMessageTemplate", MessageTemplateNames.SystemCampaign)); + + return messageTemplate; + } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs b/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs index b1fffacea2..d3875f252d 100644 --- a/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs +++ b/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs @@ -13,82 +13,82 @@ namespace SmartStore.Services.Messages { - public class CreateAttachmentsConsumer : IConsumer - { - private readonly PdfSettings _pdfSettings; - private readonly HttpRequestBase _httpRequest; - private readonly Lazy _fileDownloadManager; + public class CreateAttachmentsConsumer : IConsumer + { + private readonly PdfSettings _pdfSettings; + private readonly HttpRequestBase _httpRequest; + private readonly Lazy _fileDownloadManager; - public CreateAttachmentsConsumer( - PdfSettings pdfSettings, - HttpRequestBase httpRequest, - Lazy fileDownloadManager) - { - this._pdfSettings = pdfSettings; - this._httpRequest = httpRequest; - this._fileDownloadManager = fileDownloadManager; + public CreateAttachmentsConsumer( + PdfSettings pdfSettings, + HttpRequestBase httpRequest, + Lazy fileDownloadManager) + { + this._pdfSettings = pdfSettings; + this._httpRequest = httpRequest; + this._fileDownloadManager = fileDownloadManager; - Logger = NullLogger.Instance; - T = NullLocalizer.Instance; - } + Logger = NullLogger.Instance; + T = NullLocalizer.Instance; + } - public ILogger Logger { get; set; } - public Localizer T { get; set; } + public ILogger Logger { get; set; } + public Localizer T { get; set; } - public void HandleEvent(MessageQueuingEvent message) - { - var qe = message.QueuedEmail; - var ctx = message.MessageContext; - var model = message.MessageModel; + public void HandleEvent(MessageQueuingEvent message) + { + var qe = message.QueuedEmail; + var ctx = message.MessageContext; + var model = message.MessageModel; - var handledTemplates = new Dictionary(StringComparer.OrdinalIgnoreCase) - { - { "OrderPlaced.CustomerNotification", _pdfSettings.AttachOrderPdfToOrderPlacedEmail }, - { "OrderCompleted.CustomerNotification", _pdfSettings.AttachOrderPdfToOrderCompletedEmail } - }; - - if (handledTemplates.TryGetValue(ctx.MessageTemplate.Name, out var shouldHandle) && shouldHandle) - { - if (model.Get("Order") is IDictionary order && order.Get("ID") is int orderId) - { - try - { - var qea = CreatePdfInvoiceAttachment(orderId); - qe.Attachments.Add(qea); - } - catch (Exception ex) - { - Logger.Error(ex, T("Admin.System.QueuedEmails.ErrorCreatingAttachment")); - } - } - } - } + var handledTemplates = new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "OrderPlaced.CustomerNotification", _pdfSettings.AttachOrderPdfToOrderPlacedEmail }, + { "OrderCompleted.CustomerNotification", _pdfSettings.AttachOrderPdfToOrderCompletedEmail } + }; - private QueuedEmailAttachment CreatePdfInvoiceAttachment(int orderId) - { - var urlHelper = new UrlHelper(_httpRequest.RequestContext); - var path = urlHelper.Action("Print", "Order", new { id = orderId, pdf = true, area = "" }); + if (handledTemplates.TryGetValue(ctx.MessageTemplate.Name, out var shouldHandle) && shouldHandle) + { + if (model.Get("Order") is IDictionary order && order.Get("ID") is int orderId) + { + try + { + var qea = CreatePdfInvoiceAttachment(orderId); + qe.Attachments.Add(qea); + } + catch (Exception ex) + { + Logger.Error(ex, T("Admin.System.QueuedEmails.ErrorCreatingAttachment")); + } + } + } + } - var fileResponse = _fileDownloadManager.Value.DownloadFile(path, true, 5000); + private QueuedEmailAttachment CreatePdfInvoiceAttachment(int orderId) + { + var urlHelper = new UrlHelper(_httpRequest.RequestContext); + var path = urlHelper.Action("Print", "Order", new { id = orderId, pdf = true, area = "" }); - if (fileResponse == null) - { - throw new InvalidOperationException(T("Admin.System.QueuedEmails.ErrorEmptyAttachmentResult", path)); - } + var fileResponse = _fileDownloadManager.Value.DownloadFile(path, true, 5000); - if (!fileResponse.ContentType.IsCaseInsensitiveEqual("application/pdf")) - { - throw new InvalidOperationException(T("Admin.System.QueuedEmails.ErrorNoPdfAttachment")); - } + if (fileResponse == null) + { + throw new InvalidOperationException(T("Admin.System.QueuedEmails.ErrorEmptyAttachmentResult", path)); + } - return new QueuedEmailAttachment - { - StorageLocation = EmailAttachmentStorageLocation.Blob, - MediaStorage = new MediaStorage { Data = fileResponse.Data }, - MimeType = fileResponse.ContentType, - Name = fileResponse.FileName - }; - } + if (!fileResponse.ContentType.IsCaseInsensitiveEqual("application/pdf")) + { + throw new InvalidOperationException(T("Admin.System.QueuedEmails.ErrorNoPdfAttachment")); + } - } + return new QueuedEmailAttachment + { + StorageLocation = EmailAttachmentStorageLocation.Blob, + MediaStorage = new MediaStorage { Data = fileResponse.Data }, + MimeType = fileResponse.ContentType, + Name = fileResponse.FileName + }; + } + + } } diff --git a/src/Libraries/SmartStore.Services/Messages/EmailAccountService.cs b/src/Libraries/SmartStore.Services/Messages/EmailAccountService.cs index 8fafb3b117..3d8978db89 100644 --- a/src/Libraries/SmartStore.Services/Messages/EmailAccountService.cs +++ b/src/Libraries/SmartStore.Services/Messages/EmailAccountService.cs @@ -10,16 +10,16 @@ namespace SmartStore.Services.Messages { public partial class EmailAccountService : IEmailAccountService { - private readonly IRepository _emailAccountRepository; + private readonly IRepository _emailAccountRepository; private readonly EmailAccountSettings _emailAccountSettings; private readonly IEventPublisher _eventPublisher; - private EmailAccount _defaultEmailAccount; + private EmailAccount _defaultEmailAccount; public EmailAccountService( - IRepository emailAccountRepository, - EmailAccountSettings emailAccountSettings, - IEventPublisher eventPublisher) + IRepository emailAccountRepository, + EmailAccountSettings emailAccountSettings, + IEventPublisher eventPublisher) { this._emailAccountRepository = emailAccountRepository; this._emailAccountSettings = emailAccountSettings; @@ -31,11 +31,11 @@ public virtual void InsertEmailAccount(EmailAccount emailAccount) if (emailAccount == null) throw new ArgumentNullException("emailAccount"); - emailAccount.Email = emailAccount.Email.EmptyNull(); - emailAccount.DisplayName = emailAccount.DisplayName.EmptyNull(); - emailAccount.Host = emailAccount.Host.EmptyNull(); - emailAccount.Username = emailAccount.Username.EmptyNull(); - emailAccount.Password = emailAccount.Password.EmptyNull(); + emailAccount.Email = emailAccount.Email.EmptyNull(); + emailAccount.DisplayName = emailAccount.DisplayName.EmptyNull(); + emailAccount.Host = emailAccount.Host.EmptyNull(); + emailAccount.Username = emailAccount.Username.EmptyNull(); + emailAccount.Password = emailAccount.Password.EmptyNull(); emailAccount.Email = emailAccount.Email.Trim(); emailAccount.DisplayName = emailAccount.DisplayName.Trim(); @@ -43,15 +43,15 @@ public virtual void InsertEmailAccount(EmailAccount emailAccount) emailAccount.Username = emailAccount.Username.Trim(); emailAccount.Password = emailAccount.Password.Trim(); - emailAccount.Email = emailAccount.Email.Truncate(255); - emailAccount.DisplayName = emailAccount.DisplayName.Truncate(255); - emailAccount.Host = emailAccount.Host.Truncate(255); - emailAccount.Username = emailAccount.Username.Truncate(255); - emailAccount.Password = emailAccount.Password.Truncate(255); + emailAccount.Email = emailAccount.Email.Truncate(255); + emailAccount.DisplayName = emailAccount.DisplayName.Truncate(255); + emailAccount.Host = emailAccount.Host.Truncate(255); + emailAccount.Username = emailAccount.Username.Truncate(255); + emailAccount.Password = emailAccount.Password.Truncate(255); _emailAccountRepository.Insert(emailAccount); - _defaultEmailAccount = null; + _defaultEmailAccount = null; } public virtual void UpdateEmailAccount(EmailAccount emailAccount) @@ -59,11 +59,11 @@ public virtual void UpdateEmailAccount(EmailAccount emailAccount) if (emailAccount == null) throw new ArgumentNullException("emailAccount"); - emailAccount.Email = emailAccount.Email.EmptyNull(); - emailAccount.DisplayName = emailAccount.DisplayName.EmptyNull(); - emailAccount.Host = emailAccount.Host.EmptyNull(); - emailAccount.Username = emailAccount.Username.EmptyNull(); - emailAccount.Password = emailAccount.Password.EmptyNull(); + emailAccount.Email = emailAccount.Email.EmptyNull(); + emailAccount.DisplayName = emailAccount.DisplayName.EmptyNull(); + emailAccount.Host = emailAccount.Host.EmptyNull(); + emailAccount.Username = emailAccount.Username.EmptyNull(); + emailAccount.Password = emailAccount.Password.EmptyNull(); emailAccount.Email = emailAccount.Email.Trim(); emailAccount.DisplayName = emailAccount.DisplayName.Trim(); @@ -71,15 +71,15 @@ public virtual void UpdateEmailAccount(EmailAccount emailAccount) emailAccount.Username = emailAccount.Username.Trim(); emailAccount.Password = emailAccount.Password.Trim(); - emailAccount.Email = emailAccount.Email.Truncate(255); - emailAccount.DisplayName = emailAccount.DisplayName.Truncate(255); - emailAccount.Host = emailAccount.Host.Truncate(255); - emailAccount.Username = emailAccount.Username.Truncate(255); - emailAccount.Password = emailAccount.Password.Truncate(255); + emailAccount.Email = emailAccount.Email.Truncate(255); + emailAccount.DisplayName = emailAccount.DisplayName.Truncate(255); + emailAccount.Host = emailAccount.Host.Truncate(255); + emailAccount.Username = emailAccount.Username.Truncate(255); + emailAccount.Password = emailAccount.Password.Truncate(255); _emailAccountRepository.Update(emailAccount); - _defaultEmailAccount = null; + _defaultEmailAccount = null; } public virtual void DeleteEmailAccount(EmailAccount emailAccount) @@ -92,7 +92,7 @@ public virtual void DeleteEmailAccount(EmailAccount emailAccount) _emailAccountRepository.Delete(emailAccount); - _defaultEmailAccount = null; + _defaultEmailAccount = null; } public virtual EmailAccount GetEmailAccountById(int emailAccountId) @@ -100,22 +100,22 @@ public virtual EmailAccount GetEmailAccountById(int emailAccountId) if (emailAccountId == 0) return null; - return _emailAccountRepository.GetByIdCached(emailAccountId, "db.emailaccount.id-" + emailAccountId); - } - - public virtual EmailAccount GetDefaultEmailAccount() - { - if (_defaultEmailAccount == null) - { - _defaultEmailAccount = GetEmailAccountById(_emailAccountSettings.DefaultEmailAccountId); - if (_defaultEmailAccount == null) - { - _defaultEmailAccount = GetAllEmailAccounts().FirstOrDefault(); - } - } - - return _defaultEmailAccount; - } + return _emailAccountRepository.GetByIdCached(emailAccountId, "db.emailaccount.id-" + emailAccountId); + } + + public virtual EmailAccount GetDefaultEmailAccount() + { + if (_defaultEmailAccount == null) + { + _defaultEmailAccount = GetEmailAccountById(_emailAccountSettings.DefaultEmailAccountId); + if (_defaultEmailAccount == null) + { + _defaultEmailAccount = GetAllEmailAccounts().FirstOrDefault(); + } + } + + return _defaultEmailAccount; + } public virtual IList GetAllEmailAccounts() { diff --git a/src/Libraries/SmartStore.Services/Messages/Events.cs b/src/Libraries/SmartStore.Services/Messages/Events.cs index 02bbf52c66..50084a7461 100644 --- a/src/Libraries/SmartStore.Services/Messages/Events.cs +++ b/src/Libraries/SmartStore.Services/Messages/Events.cs @@ -3,85 +3,85 @@ namespace SmartStore.Services.Messages { - /// - /// Published after the creation of a single message model part has been completed. - /// - /// Type of source entity - public class MessageModelPartCreatedEvent where T : class - { - public MessageModelPartCreatedEvent(T source, dynamic part) - { - Source = source; - Part = part; - } + /// + /// Published after the creation of a single message model part has been completed. + /// + /// Type of source entity + public class MessageModelPartCreatedEvent where T : class + { + public MessageModelPartCreatedEvent(T source, dynamic part) + { + Source = source; + Part = part; + } - /// - /// The source object for which the model part has been created, e.g. a Product entity. - /// - public T Source { get; private set; } + /// + /// The source object for which the model part has been created, e.g. a Product entity. + /// + public T Source { get; private set; } - /// - /// The resulting model part. - /// - public dynamic Part { get; private set; } - } + /// + /// The resulting model part. + /// + public dynamic Part { get; private set; } + } - /// - /// Published when a system mapper is missing for a particular model type (e.g. a custom entity in a plugin). - /// Implementors should subscribe to this event in order to provide a corresponding dynamic model part. - /// The result model should be assigned to the property. If this property - /// is still null, the source is used as model part instead. - /// - public class MessageModelPartMappingEvent - { - public MessageModelPartMappingEvent(object source) - { - Source = source; - } + /// + /// Published when a system mapper is missing for a particular model type (e.g. a custom entity in a plugin). + /// Implementors should subscribe to this event in order to provide a corresponding dynamic model part. + /// The result model should be assigned to the property. If this property + /// is still null, the source is used as model part instead. + /// + public class MessageModelPartMappingEvent + { + public MessageModelPartMappingEvent(object source) + { + Source = source; + } - /// - /// The source object for which a model part should be created. - /// - public object Source { get; private set; } + /// + /// The source object for which a model part should be created. + /// + public object Source { get; private set; } - /// - /// The resulting model part. - /// - public dynamic Result { get; set; } + /// + /// The resulting model part. + /// + public dynamic Result { get; set; } - /// - /// The name of the model part. If null the source's type name is used. - /// - public string ModelPartName { get; set; } - } + /// + /// The name of the model part. If null the source's type name is used. + /// + public string ModelPartName { get; set; } + } - /// - /// Published after the message model has been completely created. - /// - public class MessageModelCreatedEvent - { - public MessageModelCreatedEvent(MessageContext messageContext, TemplateModel model) - { - MessageContext = messageContext; - Model = model; - } + /// + /// Published after the message model has been completely created. + /// + public class MessageModelCreatedEvent + { + public MessageModelCreatedEvent(MessageContext messageContext, TemplateModel model) + { + MessageContext = messageContext; + Model = model; + } - public MessageContext MessageContext{ get; private set; } + public MessageContext MessageContext { get; private set; } - /// - /// The result message model. - /// - public TemplateModel Model { get; private set; } - } + /// + /// The result message model. + /// + public TemplateModel Model { get; private set; } + } - /// - /// An event message which gets published just before a new instance - /// of is persisted to the database - /// - public class MessageQueuingEvent - { - public QueuedEmail QueuedEmail { get; set; } - public MessageContext MessageContext { get; set; } - public TemplateModel MessageModel { get; set; } - } + /// + /// An event message which gets published just before a new instance + /// of is persisted to the database + /// + public class MessageQueuingEvent + { + public QueuedEmail QueuedEmail { get; set; } + public MessageContext MessageContext { get; set; } + public TemplateModel MessageModel { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/ICampaignService.cs b/src/Libraries/SmartStore.Services/Messages/ICampaignService.cs index d85ea70b89..6b51ea7a3a 100644 --- a/src/Libraries/SmartStore.Services/Messages/ICampaignService.cs +++ b/src/Libraries/SmartStore.Services/Messages/ICampaignService.cs @@ -35,7 +35,7 @@ public partial interface ICampaignService /// /// Campaign collection IList GetAllCampaigns(); - + /// /// Sends a campaign to all newsletter subscribers. /// @@ -57,5 +57,5 @@ public partial interface ICampaignService /// The campaign to preview /// The preview result CreateMessageResult Preview(Campaign campaign); - } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/IEmailAccountService.cs b/src/Libraries/SmartStore.Services/Messages/IEmailAccountService.cs index 6b3df6f6eb..ccc2eb4e31 100644 --- a/src/Libraries/SmartStore.Services/Messages/IEmailAccountService.cs +++ b/src/Libraries/SmartStore.Services/Messages/IEmailAccountService.cs @@ -30,11 +30,11 @@ public partial interface IEmailAccountService /// Email account EmailAccount GetEmailAccountById(int emailAccountId); - /// - /// Gets the default email account - /// - /// Emil account - EmailAccount GetDefaultEmailAccount(); + /// + /// Gets the default email account + /// + /// Emil account + EmailAccount GetDefaultEmailAccount(); /// /// Gets all email accounts diff --git a/src/Libraries/SmartStore.Services/Messages/IMessageFactory.cs b/src/Libraries/SmartStore.Services/Messages/IMessageFactory.cs index 525e50d09c..9e1c60c210 100644 --- a/src/Libraries/SmartStore.Services/Messages/IMessageFactory.cs +++ b/src/Libraries/SmartStore.Services/Messages/IMessageFactory.cs @@ -6,104 +6,104 @@ namespace SmartStore.Services.Messages { - /// - /// Contains the result data of a call - /// - public class CreateMessageResult - { - /// - /// The queued email instance which can be saved to the database - /// - public QueuedEmail Email { get; set; } + /// + /// Contains the result data of a call + /// + public class CreateMessageResult + { + /// + /// The queued email instance which can be saved to the database + /// + public QueuedEmail Email { get; set; } - /// - /// The final model which contains all global and template specific model parts. - /// - public TemplateModel Model { get; set; } + /// + /// The final model which contains all global and template specific model parts. + /// + public TemplateModel Model { get; set; } - /// - /// The message context used to create the message. - /// - public MessageContext MessageContext { get; set; } - } + /// + /// The message context used to create the message. + /// + public MessageContext MessageContext { get; set; } + } - /// - /// Creates and optionally queues email messages - /// - public interface IMessageFactory - { - /// - /// Creates an email message - /// - /// Contains all data required for creating a message - /// If true, the created email message will automatically be queued for sending (saved in database as a ) - /// - /// All model objects that are necessary to render the template (in no particular order). - /// The passed object instances will be converted to special types which the underlying can handle. - /// is responsible for the conversion. See also . - /// - /// Contains the message creation result. - CreateMessageResult CreateMessage(MessageContext messageContext, bool queue, params object[] modelParts); + /// + /// Creates and optionally queues email messages + /// + public interface IMessageFactory + { + /// + /// Creates an email message + /// + /// Contains all data required for creating a message + /// If true, the created email message will automatically be queued for sending (saved in database as a ) + /// + /// All model objects that are necessary to render the template (in no particular order). + /// The passed object instances will be converted to special types which the underlying can handle. + /// is responsible for the conversion. See also . + /// + /// Contains the message creation result. + CreateMessageResult CreateMessage(MessageContext messageContext, bool queue, params object[] modelParts); - /// - /// Queues a message created by - /// - /// The message context used to create the message. - /// The instance of to queue, e.g. obtained from - void QueueMessage(MessageContext messageContext, QueuedEmail queuedEmail); + /// + /// Queues a message created by + /// + /// The message context used to create the message. + /// The instance of to queue, e.g. obtained from + void QueueMessage(MessageContext messageContext, QueuedEmail queuedEmail); - /// - /// Gets an array of suitable test model parts during preview mode. The message template defines - /// which model part types are required (a comma-separated type list in ). - /// The framework tries to load a random entity for each defined type from the database. If the table does not contain any records, - /// gets called internally to obtain a test model wrapper with sample data. - /// - /// The message context used to create the message. - /// An array of model parts which can be passed to - object[] GetTestModels(MessageContext messageContext); - } + /// + /// Gets an array of suitable test model parts during preview mode. The message template defines + /// which model part types are required (a comma-separated type list in ). + /// The framework tries to load a random entity for each defined type from the database. If the table does not contain any records, + /// gets called internally to obtain a test model wrapper with sample data. + /// + /// The message context used to create the message. + /// An array of model parts which can be passed to + object[] GetTestModels(MessageContext messageContext); + } - public static class IMessageFactoryExtensions - { - /// - /// Sends the "ContactUs" message to the store owner - /// - public static CreateMessageResult SendContactUsMessage(this IMessageFactory factory, Customer customer, - string senderEmail, string senderName, string subject, string message, EmailAddress senderEmailAddress, int languageId = 0) - { - var model = new NamedModelPart("Message") - { - ["Subject"] = subject.NullEmpty(), - ["Message"] = message.NullEmpty(), - ["SenderEmail"] = senderEmail.NullEmpty(), - ["SenderName"] = senderName.HasValue() ? senderName.NullEmpty() : senderEmail.NullEmpty() - }; + public static class IMessageFactoryExtensions + { + /// + /// Sends the "ContactUs" message to the store owner + /// + public static CreateMessageResult SendContactUsMessage(this IMessageFactory factory, Customer customer, + string senderEmail, string senderName, string subject, string message, EmailAddress senderEmailAddress, int languageId = 0) + { + var model = new NamedModelPart("Message") + { + ["Subject"] = subject.NullEmpty(), + ["Message"] = message.NullEmpty(), + ["SenderEmail"] = senderEmail.NullEmpty(), + ["SenderName"] = senderName.HasValue() ? senderName.NullEmpty() : senderEmail.NullEmpty() + }; - var messageContext = MessageContext.Create(MessageTemplateNames.SystemContactUs, languageId, customer: customer); - if (senderEmailAddress != null) - { - messageContext.SenderEmailAddress = senderEmailAddress; - } + var messageContext = MessageContext.Create(MessageTemplateNames.SystemContactUs, languageId, customer: customer); + if (senderEmailAddress != null) + { + messageContext.SenderEmailAddress = senderEmailAddress; + } - return factory.CreateMessage(messageContext, true, model); - } + return factory.CreateMessage(messageContext, true, model); + } - /// - /// Sends a newsletter subscription activation message - /// - public static CreateMessageResult SendNewsLetterSubscriptionActivationMessage(this IMessageFactory factory, NewsLetterSubscription subscription, int languageId = 0) - { - Guard.NotNull(subscription, nameof(subscription)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewsLetterSubscriptionActivation, languageId), true, subscription); - } + /// + /// Sends a newsletter subscription activation message + /// + public static CreateMessageResult SendNewsLetterSubscriptionActivationMessage(this IMessageFactory factory, NewsLetterSubscription subscription, int languageId = 0) + { + Guard.NotNull(subscription, nameof(subscription)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewsLetterSubscriptionActivation, languageId), true, subscription); + } - /// - /// Sends a newsletter subscription deactivation message - /// - public static CreateMessageResult SendNewsLetterSubscriptionDeactivationMessage(this IMessageFactory factory, NewsLetterSubscription subscription, int languageId = 0) - { - Guard.NotNull(subscription, nameof(subscription)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewsLetterSubscriptionDeactivation, languageId), true, subscription); - } - } + /// + /// Sends a newsletter subscription deactivation message + /// + public static CreateMessageResult SendNewsLetterSubscriptionDeactivationMessage(this IMessageFactory factory, NewsLetterSubscription subscription, int languageId = 0) + { + Guard.NotNull(subscription, nameof(subscription)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewsLetterSubscriptionDeactivation, languageId), true, subscription); + } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/IMessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/IMessageModelProvider.cs index 6819624dea..18d9b01c80 100644 --- a/src/Libraries/SmartStore.Services/Messages/IMessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/IMessageModelProvider.cs @@ -13,108 +13,108 @@ namespace SmartStore.Services.Messages { - /// - /// Responsible for building the message template model - /// - public interface IMessageModelProvider - { - /// - /// Creates and adds all global model parts to the template model (): - /// - /// - /// Context (contains meta infos like template name, language etc.) - /// Customer (obtained from property) - /// Store (obtained from property) - /// Email (the ) - /// Theme (some theming variables, mostly colors) - /// - /// - /// - /// Contains all data required for building a model part and creating a message - void AddGlobalModelParts(MessageContext messageContext); + /// + /// Responsible for building the message template model + /// + public interface IMessageModelProvider + { + /// + /// Creates and adds all global model parts to the template model (): + /// + /// + /// Context (contains meta infos like template name, language etc.) + /// Customer (obtained from property) + /// Store (obtained from property) + /// Email (the ) + /// Theme (some theming variables, mostly colors) + /// + /// + /// + /// Contains all data required for building a model part and creating a message + void AddGlobalModelParts(MessageContext messageContext); - /// - /// Adds a template specific model part to the template model. - /// The passed object instance () will be converted to a special type which the underlying can handle. - /// - /// Supported types are: , , , , , - /// , , , , , - /// , , , , , - /// , - /// - /// - /// Furthermore, any object implementing or can also be passed as model part. - /// The first merges all entries within the passed object with the special Bag entry, the latter creates a whole - /// new entry using the name provided by its property. - /// - /// - /// If an unsupported object is passed, the framework will publish the event, giving - /// a subscriber the chance to provide a converted model object and a part name. - /// - /// - /// The model part instance to convert and add to the final model. - /// Contains all data required for building a model part and creating a message - /// - /// The name to use for the model part in the final model. If null, the framework tries to infer the name. - /// See also - /// - void AddModelPart(object part, MessageContext messageContext, string name = null); + /// + /// Adds a template specific model part to the template model. + /// The passed object instance () will be converted to a special type which the underlying can handle. + /// + /// Supported types are: , , , , , + /// , , , , , + /// , , , , , + /// , + /// + /// + /// Furthermore, any object implementing or can also be passed as model part. + /// The first merges all entries within the passed object with the special Bag entry, the latter creates a whole + /// new entry using the name provided by its property. + /// + /// + /// If an unsupported object is passed, the framework will publish the event, giving + /// a subscriber the chance to provide a converted model object and a part name. + /// + /// + /// The model part instance to convert and add to the final model. + /// Contains all data required for building a model part and creating a message + /// + /// The name to use for the model part in the final model. If null, the framework tries to infer the name. + /// See also + /// + void AddModelPart(object part, MessageContext messageContext, string name = null); - /// - /// Creates a serializable model object for the passed entity/object. - /// - /// Supported types are: , , , , , - /// , , , , , - /// , , , , , - /// , - /// - /// - /// Furthermore, any object implementing or can also be passed as model part. - /// The first merges all entries within the passed object with the special Bag entry, the latter creates a whole - /// new entry using the name provided by its property. - /// - /// - /// If an unsupported object is passed, null is returned - /// - /// - /// The model part instance to convert. - /// Whether members/properties with null values should be excluded from the result model. - /// Optional list of member/property names to exclude from the result model. - object CreateModelPart(object part, bool ignoreNullMembers, params string[] ignoreMemberNames); + /// + /// Creates a serializable model object for the passed entity/object. + /// + /// Supported types are: , , , , , + /// , , , , , + /// , , , , , + /// , + /// + /// + /// Furthermore, any object implementing or can also be passed as model part. + /// The first merges all entries within the passed object with the special Bag entry, the latter creates a whole + /// new entry using the name provided by its property. + /// + /// + /// If an unsupported object is passed, null is returned + /// + /// + /// The model part instance to convert. + /// Whether members/properties with null values should be excluded from the result model. + /// Optional list of member/property names to exclude from the result model. + object CreateModelPart(object part, bool ignoreNullMembers, params string[] ignoreMemberNames); - /// - /// Tries to infer the model part name by type: - /// - /// When is a plain object: type name - /// When is : ModelPartName property - /// - /// - /// The model part instance to resolve a name for. - /// The inferred name or null - string ResolveModelName(object model); + /// + /// Tries to infer the model part name by type: + /// + /// When is a plain object: type name + /// When is : ModelPartName property + /// + /// + /// The model part instance to resolve a name for. + /// The inferred name or null + string ResolveModelName(object model); - /// - /// Build a model metadata tree for a final template model. Model trees are used - /// on the client to provide autocomplete information. - /// - /// The final template model to build a model tree for. - /// A hierarchy of instances. - TreeNode BuildModelTree(TemplateModel model); + /// + /// Build a model metadata tree for a final template model. Model trees are used + /// on the client to provide autocomplete information. + /// + /// The final template model to build a model tree for. + /// A hierarchy of instances. + TreeNode BuildModelTree(TemplateModel model); - /// - /// Gets the last known model metadata tree for a particular template. - /// See also - /// - /// Name of the template to get metadata for. - /// A hierarchy of instances. - TreeNode GetLastModelTree(string messageTemplateName); + /// + /// Gets the last known model metadata tree for a particular template. + /// See also + /// + /// Name of the template to get metadata for. + /// A hierarchy of instances. + TreeNode GetLastModelTree(string messageTemplateName); - /// - /// Gets the last known model metadata tree for a particular template. - /// See also - /// - /// The template to get metadata for. - /// A hierarchy of instances. - TreeNode GetLastModelTree(MessageTemplate template); - } + /// + /// Gets the last known model metadata tree for a particular template. + /// See also + /// + /// The template to get metadata for. + /// A hierarchy of instances. + TreeNode GetLastModelTree(MessageTemplate template); + } } diff --git a/src/Libraries/SmartStore.Services/Messages/IMessageTemplateService.cs b/src/Libraries/SmartStore.Services/Messages/IMessageTemplateService.cs index 445671bc92..ecfa00d4f9 100644 --- a/src/Libraries/SmartStore.Services/Messages/IMessageTemplateService.cs +++ b/src/Libraries/SmartStore.Services/Messages/IMessageTemplateService.cs @@ -8,11 +8,11 @@ namespace SmartStore.Services.Messages /// public partial interface IMessageTemplateService { - /// - /// Delete a message template - /// - /// Message template - void DeleteMessageTemplate(MessageTemplate messageTemplate); + /// + /// Delete a message template + /// + /// Message template + void DeleteMessageTemplate(MessageTemplate messageTemplate); /// /// Inserts a message template @@ -48,11 +48,11 @@ public partial interface IMessageTemplateService /// Message template list IList GetAllMessageTemplates(int storeId); - /// - /// Create a copy of message template with all depended data - /// - /// Message template - /// Message template copy - MessageTemplate CopyMessageTemplate(MessageTemplate messageTemplate); + /// + /// Create a copy of message template with all depended data + /// + /// Message template + /// Message template copy + MessageTemplate CopyMessageTemplate(MessageTemplate messageTemplate); } } diff --git a/src/Libraries/SmartStore.Services/Messages/IModelPart.cs b/src/Libraries/SmartStore.Services/Messages/IModelPart.cs index 16ed798135..dd93f45a7f 100644 --- a/src/Libraries/SmartStore.Services/Messages/IModelPart.cs +++ b/src/Libraries/SmartStore.Services/Messages/IModelPart.cs @@ -4,41 +4,41 @@ namespace SmartStore.Services.Messages { - /// - /// Used to transfer miscellaneous data to the template engine - /// which is merged with the generic "Bag" part. - /// - public interface IModelPart : IDictionary - { - } - - public interface INamedModelPart : IDictionary - { - string ModelPartName { get; } - } - - - #region Impl - - public class ModelPart : HybridExpando, IModelPart - { - } - - public class NamedModelPart : HybridExpando, INamedModelPart - { - public NamedModelPart(string modelPartName) - : base(true) - { - Guard.NotEmpty(modelPartName, nameof(modelPartName)); - ModelPartName = modelPartName; - } - - public string ModelPartName - { - get; - private set; - } - } - - #endregion + /// + /// Used to transfer miscellaneous data to the template engine + /// which is merged with the generic "Bag" part. + /// + public interface IModelPart : IDictionary + { + } + + public interface INamedModelPart : IDictionary + { + string ModelPartName { get; } + } + + + #region Impl + + public class ModelPart : HybridExpando, IModelPart + { + } + + public class NamedModelPart : HybridExpando, INamedModelPart + { + public NamedModelPart(string modelPartName) + : base(true) + { + Guard.NotEmpty(modelPartName, nameof(modelPartName)); + ModelPartName = modelPartName; + } + + public string ModelPartName + { + get; + private set; + } + } + + #endregion } diff --git a/src/Libraries/SmartStore.Services/Messages/INewsLetterSubscriptionService.cs b/src/Libraries/SmartStore.Services/Messages/INewsLetterSubscriptionService.cs index a996ceea69..2dfd4fb106 100644 --- a/src/Libraries/SmartStore.Services/Messages/INewsLetterSubscriptionService.cs +++ b/src/Libraries/SmartStore.Services/Messages/INewsLetterSubscriptionService.cs @@ -4,8 +4,8 @@ namespace SmartStore.Services.Messages { - public partial interface INewsLetterSubscriptionService - { + public partial interface INewsLetterSubscriptionService + { /// /// Inserts a newsletter subscription /// @@ -27,21 +27,21 @@ public partial interface INewsLetterSubscriptionService /// if set to true [publish subscription events]. void DeleteNewsLetterSubscription(NewsLetterSubscription newsLetterSubscription, bool publishSubscriptionEvents = true); - /// - /// Adds or deletes a newsletter subscription - /// - /// true add subscription, false delete - /// Email address - /// Store identifier - /// true added subscription, false removed subscription, null did nothing - bool? AddNewsLetterSubscriptionFor(bool add, string email, int storeId); + /// + /// Adds or deletes a newsletter subscription + /// + /// true add subscription, false delete + /// Email address + /// Store identifier + /// true added subscription, false removed subscription, null did nothing + bool? AddNewsLetterSubscriptionFor(bool add, string email, int storeId); - /// - /// Gets a newsletter subscription by newsletter subscription identifier - /// - /// The newsletter subscription identifier - /// NewsLetter subscription - NewsLetterSubscription GetNewsLetterSubscriptionById(int newsLetterSubscriptionId); + /// + /// Gets a newsletter subscription by newsletter subscription identifier + /// + /// The newsletter subscription identifier + /// NewsLetter subscription + NewsLetterSubscription GetNewsLetterSubscriptionById(int newsLetterSubscriptionId); /// /// Gets a newsletter subscription by newsletter subscription GUID diff --git a/src/Libraries/SmartStore.Services/Messages/IQueuedEmailService.cs b/src/Libraries/SmartStore.Services/Messages/IQueuedEmailService.cs index 82a6de9bac..4a86533945 100644 --- a/src/Libraries/SmartStore.Services/Messages/IQueuedEmailService.cs +++ b/src/Libraries/SmartStore.Services/Messages/IQueuedEmailService.cs @@ -5,7 +5,7 @@ namespace SmartStore.Services.Messages { - public partial interface IQueuedEmailService + public partial interface IQueuedEmailService { /// /// Inserts a queued email @@ -25,11 +25,11 @@ public partial interface IQueuedEmailService /// Queued email void DeleteQueuedEmail(QueuedEmail queuedEmail); - /// - /// Deletes all queued emails - /// - /// The count of deleted entries - int DeleteAllQueuedEmails(); + /// + /// Deletes all queued emails + /// + /// The count of deleted entries + int DeleteAllQueuedEmails(); /// /// Gets a queued email by identifier @@ -52,31 +52,31 @@ public partial interface IQueuedEmailService /// Email item collection IPagedList SearchEmails(SearchEmailsQuery query); - /// - /// Sends a queued email asynchronously. - /// - /// Queued email - /// Whether the operation succeeded - Task SendEmailAsync(QueuedEmail queuedEmail); + /// + /// Sends a queued email asynchronously. + /// + /// Queued email + /// Whether the operation succeeded + Task SendEmailAsync(QueuedEmail queuedEmail); - /// - /// Gets a queued email attachment by identifier - /// - /// Queued email attachment identifier - /// Queued email attachment - QueuedEmailAttachment GetQueuedEmailAttachmentById(int id); + /// + /// Gets a queued email attachment by identifier + /// + /// Queued email attachment identifier + /// Queued email attachment + QueuedEmailAttachment GetQueuedEmailAttachmentById(int id); - /// - /// Deleted a queued email attachment - /// - /// Queued email attachment - void DeleteQueuedEmailAttachment(QueuedEmailAttachment attachment); + /// + /// Deleted a queued email attachment + /// + /// Queued email attachment + void DeleteQueuedEmailAttachment(QueuedEmailAttachment attachment); - /// - /// Load binary data of a queued email attachment - /// - /// Queued email attachment - /// Binary data if attachment.StorageLocation is EmailAttachmentStorageLocation.Blob, otherwise null - byte[] LoadQueuedEmailAttachmentBinary(QueuedEmailAttachment attachment); - } + /// + /// Load binary data of a queued email attachment + /// + /// Queued email attachment + /// Binary data if attachment.StorageLocation is EmailAttachmentStorageLocation.Blob, otherwise null + byte[] LoadQueuedEmailAttachmentBinary(QueuedEmailAttachment attachment); + } } diff --git a/src/Libraries/SmartStore.Services/Messages/Importer/NewsLetterSubscriptionImporter.cs b/src/Libraries/SmartStore.Services/Messages/Importer/NewsLetterSubscriptionImporter.cs index 93ba2c8044..d8cc243209 100644 --- a/src/Libraries/SmartStore.Services/Messages/Importer/NewsLetterSubscriptionImporter.cs +++ b/src/Libraries/SmartStore.Services/Messages/Importer/NewsLetterSubscriptionImporter.cs @@ -8,146 +8,134 @@ namespace SmartStore.Services.Messages.Importer { - public class NewsLetterSubscriptionImporter : IEntityImporter - { - private readonly IRepository _subscriptionRepository; - - public NewsLetterSubscriptionImporter(IRepository subscriptionRepository) - { - _subscriptionRepository = subscriptionRepository; - } - - public static string[] SupportedKeyFields - { - get - { - return new string[] { "Email" }; - } - } - - public static string[] DefaultKeyFields - { - get - { - return new string[] { "Email" }; - } - } - - public void Execute(ImportExecuteContext context) - { - var utcNow = DateTime.UtcNow; - var currentStoreId = context.Services.StoreContext.CurrentStore.Id; - - using (var scope = new DbContextScope(ctx: context.Services.DbContext, hooksEnabled: false, autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false)) - { - var segmenter = context.DataSegmenter; - - context.Result.TotalRecords = segmenter.TotalRows; - - while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch()) - { - var batch = segmenter.GetCurrentBatch(); - - // Perf: detach all entities - _subscriptionRepository.Context.DetachEntities(false); - - context.SetProgress(segmenter.CurrentSegmentFirstRowIndex - 1, segmenter.TotalRows); - - foreach (var row in batch) - { - try - { - var active = true; - var email = row.GetDataValue("Email"); - var storeId = row.GetDataValue("StoreId"); - - if (storeId == 0) - { - storeId = currentStoreId; - } - - if (row.HasDataValue("Active") && row.TryGetDataValue("Active", out active)) - { - } - else - { - active = true; // default - } - - if (email.IsEmpty()) - { - context.Result.AddWarning("Skipped empty email address", row.GetRowInfo(), "Email"); - continue; - } - - if (email.Length > 255) - { - context.Result.AddWarning("Skipped email address '{0}'. It exceeds the maximum allowed length of 255".FormatInvariant(email), row.GetRowInfo(), "Email"); - continue; - } - - if (!email.IsEmail()) - { - context.Result.AddWarning("Skipped invalid email address '{0}'".FormatInvariant(email), row.GetRowInfo(), "Email"); - continue; - } - - NewsLetterSubscription subscription = null; - - foreach (var keyName in context.KeyFieldNames) - { - switch (keyName) - { - case "Email": - subscription = _subscriptionRepository.Table - .OrderBy(x => x.Id) - .FirstOrDefault(x => x.Email == email && x.StoreId == storeId); - break; - } - - if (subscription != null) - break; - } - - if (subscription == null) - { - if (context.UpdateOnly) - { - ++context.Result.SkippedRecords; - continue; - } - - subscription = new NewsLetterSubscription - { - Active = active, - CreatedOnUtc = utcNow, - Email = email, - NewsLetterSubscriptionGuid = Guid.NewGuid(), - StoreId = storeId - }; - - _subscriptionRepository.Insert(subscription); - context.Result.NewRecords++; - } - else - { - subscription.Active = active; - - _subscriptionRepository.Update(subscription); - context.Result.ModifiedRecords++; - } - } - catch (Exception exception) - { - context.Result.AddError(exception.ToAllMessages(), row.GetRowInfo()); - } - } // for - - _subscriptionRepository.Context.SaveChanges(); + public class NewsLetterSubscriptionImporter : IEntityImporter + { + private readonly IRepository _subscriptionRepository; + + public NewsLetterSubscriptionImporter(IRepository subscriptionRepository) + { + _subscriptionRepository = subscriptionRepository; + } + + public static string[] SupportedKeyFields => new string[] { "Email" }; + + public static string[] DefaultKeyFields => new string[] { "Email" }; + + public void Execute(ImportExecuteContext context) + { + var utcNow = DateTime.UtcNow; + var currentStoreId = context.Services.StoreContext.CurrentStore.Id; + + using (var scope = new DbContextScope(ctx: context.Services.DbContext, hooksEnabled: false, autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false)) + { + var segmenter = context.DataSegmenter; + + context.Result.TotalRecords = segmenter.TotalRows; + + while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch()) + { + var batch = segmenter.GetCurrentBatch(); + + // Perf: detach all entities + _subscriptionRepository.Context.DetachEntities(false); + + context.SetProgress(segmenter.CurrentSegmentFirstRowIndex - 1, segmenter.TotalRows); + + foreach (var row in batch) + { + try + { + var active = true; + var email = row.GetDataValue("Email"); + var storeId = row.GetDataValue("StoreId"); + + if (storeId == 0) + { + storeId = currentStoreId; + } + + if (row.HasDataValue("Active") && row.TryGetDataValue("Active", out active)) + { + } + else + { + active = true; // default + } + + if (email.IsEmpty()) + { + context.Result.AddWarning("Skipped empty email address", row.GetRowInfo(), "Email"); + continue; + } + + if (email.Length > 255) + { + context.Result.AddWarning("Skipped email address '{0}'. It exceeds the maximum allowed length of 255".FormatInvariant(email), row.GetRowInfo(), "Email"); + continue; + } + + if (!email.IsEmail()) + { + context.Result.AddWarning("Skipped invalid email address '{0}'".FormatInvariant(email), row.GetRowInfo(), "Email"); + continue; + } + + NewsLetterSubscription subscription = null; + + foreach (var keyName in context.KeyFieldNames) + { + switch (keyName) + { + case "Email": + subscription = _subscriptionRepository.Table + .OrderBy(x => x.Id) + .FirstOrDefault(x => x.Email == email && x.StoreId == storeId); + break; + } + + if (subscription != null) + break; + } + + if (subscription == null) + { + if (context.UpdateOnly) + { + ++context.Result.SkippedRecords; + continue; + } + + subscription = new NewsLetterSubscription + { + Active = active, + CreatedOnUtc = utcNow, + Email = email, + NewsLetterSubscriptionGuid = Guid.NewGuid(), + StoreId = storeId + }; + + _subscriptionRepository.Insert(subscription); + context.Result.NewRecords++; + } + else + { + subscription.Active = active; + + _subscriptionRepository.Update(subscription); + context.Result.ModifiedRecords++; + } + } + catch (Exception exception) + { + context.Result.AddError(exception.ToAllMessages(), row.GetRowInfo()); + } + } // for + + _subscriptionRepository.Context.SaveChanges(); context.Services.EventPublisher.Publish(new ImportBatchExecutedEvent(context, batch)); } // while - } - } - } + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/MessageContext.cs b/src/Libraries/SmartStore.Services/Messages/MessageContext.cs index eb5cb752bb..20e93cf778 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageContext.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageContext.cs @@ -14,88 +14,85 @@ namespace SmartStore.Services.Messages /// for the creation of message templates. /// public class MessageContext - { - private IFormatProvider _formatProvider; + { + private IFormatProvider _formatProvider; - /// - /// The source message template. Required if is empty. - /// - public MessageTemplate MessageTemplate { get; set; } + /// + /// The source message template. Required if is empty. + /// + public MessageTemplate MessageTemplate { get; set; } - /// - /// The source message template name. Required if is null. - /// - public string MessageTemplateName { get; set; } + /// + /// The source message template name. Required if is null. + /// + public string MessageTemplateName { get; set; } - /// - /// If null, the email account specifies the sender. - /// - public EmailAddress SenderEmailAddress { get; set; } + /// + /// If null, the email account specifies the sender. + /// + public EmailAddress SenderEmailAddress { get; set; } - /// - /// If null, obtained from WorkContext.CurrentCustomer. - /// - public Customer Customer { get; set; } + /// + /// If null, obtained from WorkContext.CurrentCustomer. + /// + public Customer Customer { get; set; } - /// - /// If null, obtained from WorkContext.WorkingLanguage. - /// - public int? LanguageId { get; set; } + /// + /// If null, obtained from WorkContext.WorkingLanguage. + /// + public int? LanguageId { get; set; } - /// - /// If null, obtained from StoreContext.CurrentStore. - /// - public int? StoreId { get; set; } + /// + /// If null, obtained from StoreContext.CurrentStore. + /// + public int? StoreId { get; set; } - public Language Language { get; set; } - public Store Store { get; set; } - public EmailAccount EmailAccount { get; internal set; } + public Language Language { get; set; } + public Store Store { get; set; } + public EmailAccount EmailAccount { get; internal set; } - public bool TestMode { get; set; } + public bool TestMode { get; set; } - /// - /// If null, obtained from . - /// - public Uri BaseUri { get; set; } + /// + /// If null, obtained from . + /// + public Uri BaseUri { get; set; } - /// - /// The final template model containing all global and template specific model parts. - /// - public TemplateModel Model { get; set; } + /// + /// The final template model containing all global and template specific model parts. + /// + public TemplateModel Model { get; set; } - /// - /// If null, inferred from . - /// - public IFormatProvider FormatProvider - { - get - { - if (_formatProvider == null) - { - var culture = this.Language?.LanguageCulture; - if (culture != null && LocalizationHelper.IsValidCultureCode(culture)) - { - _formatProvider = CultureInfo.GetCultureInfo(culture); - } - } + /// + /// If null, inferred from . + /// + public IFormatProvider FormatProvider + { + get + { + if (_formatProvider == null) + { + var culture = this.Language?.LanguageCulture; + if (culture != null && LocalizationHelper.IsValidCultureCode(culture)) + { + _formatProvider = CultureInfo.GetCultureInfo(culture); + } + } - return _formatProvider ?? CultureInfo.CurrentCulture; - } - set - { - _formatProvider = value; - } - } + return _formatProvider ?? CultureInfo.CurrentCulture; + } + set => _formatProvider = value; + } - public static MessageContext Create(string messageTemplateName, int languageId, int? storeId = null, Customer customer = null) - { - return new MessageContext - { - MessageTemplateName = messageTemplateName, - LanguageId = languageId, - StoreId = storeId, - Customer = customer - }; - } - } + public static MessageContext Create(string messageTemplateName, int languageId, int? storeId = null, Customer customer = null) + { + return new MessageContext + { + MessageTemplateName = messageTemplateName, + LanguageId = languageId, + StoreId = storeId, + Customer = customer + }; + } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs index 32bd9e1d92..8871fecbf7 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs @@ -25,617 +25,617 @@ namespace SmartStore.Services.Messages { public partial class MessageFactory : IMessageFactory - { - const string LoremIpsum = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."; - - private readonly ICommonServices _services; - private readonly ITemplateEngine _templateEngine; - private readonly ITemplateManager _templateManager; - private readonly IMessageModelProvider _modelProvider; - private readonly IMessageTemplateService _messageTemplateService; - private readonly IQueuedEmailService _queuedEmailService; - private readonly ILanguageService _languageService; - private readonly IEmailAccountService _emailAccountService; - private readonly EmailAccountSettings _emailAccountSettings; - private readonly IMediaService _mediaService; - - public MessageFactory( - ICommonServices services, - ITemplateEngine templateEngine, - ITemplateManager templateManager, - IMessageModelProvider modelProvider, - IMessageTemplateService messageTemplateService, - IQueuedEmailService queuedEmailService, - ILanguageService languageService, - IEmailAccountService emailAccountService, - EmailAccountSettings emailAccountSettings, + { + const string LoremIpsum = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."; + + private readonly ICommonServices _services; + private readonly ITemplateEngine _templateEngine; + private readonly ITemplateManager _templateManager; + private readonly IMessageModelProvider _modelProvider; + private readonly IMessageTemplateService _messageTemplateService; + private readonly IQueuedEmailService _queuedEmailService; + private readonly ILanguageService _languageService; + private readonly IEmailAccountService _emailAccountService; + private readonly EmailAccountSettings _emailAccountSettings; + private readonly IMediaService _mediaService; + + public MessageFactory( + ICommonServices services, + ITemplateEngine templateEngine, + ITemplateManager templateManager, + IMessageModelProvider modelProvider, + IMessageTemplateService messageTemplateService, + IQueuedEmailService queuedEmailService, + ILanguageService languageService, + IEmailAccountService emailAccountService, + EmailAccountSettings emailAccountSettings, IMediaService mediaService) - { - _services = services; - _templateEngine = templateEngine; - _templateManager = templateManager; - _modelProvider = modelProvider; - _messageTemplateService = messageTemplateService; - _queuedEmailService = queuedEmailService; - _languageService = languageService; - _emailAccountService = emailAccountService; - _emailAccountSettings = emailAccountSettings; - _mediaService = mediaService; - } - - public Localizer T { get; set; } = NullLocalizer.Instance; - public ILogger Logger { get; set; } = NullLogger.Instance; - - public virtual CreateMessageResult CreateMessage(MessageContext messageContext, bool queue, params object[] modelParts) - { - Guard.NotNull(messageContext, nameof(messageContext)); - - modelParts = modelParts ?? new object[0]; - - // Handle TestMode - if (messageContext.TestMode && modelParts.Length == 0) - { - modelParts = GetTestModels(messageContext); - } - - ValidateMessageContext(messageContext, ref modelParts); - - // Create and assign model - var model = messageContext.Model = new TemplateModel(); - - // Do not create message if the template does not exist, is not authorized or not active. - if (messageContext.MessageTemplate == null) - { - return new CreateMessageResult { Model = model, MessageContext = messageContext }; - } - - // Add all global template model parts - _modelProvider.AddGlobalModelParts(messageContext); - - // Add specific template models for passed parts - foreach (var part in modelParts) - { - if (model != null) - { - _modelProvider.AddModelPart(part, messageContext); - } - } - - // Give implementors the chance to customize the final template model - _services.EventPublisher.Publish(new MessageModelCreatedEvent(messageContext, model)); - - var messageTemplate = messageContext.MessageTemplate; - var languageId = messageContext.Language.Id; - - // Render templates - var to = RenderEmailAddress(messageTemplate.To, messageContext); - var replyTo = RenderEmailAddress(messageTemplate.ReplyTo, messageContext, false); - var bcc = RenderTemplate(messageTemplate.GetLocalized((x) => x.BccEmailAddresses, languageId), messageContext, false); - - var subject = RenderTemplate(messageTemplate.GetLocalized((x) => x.Subject, languageId), messageContext); - ((dynamic)model).Email.Subject = subject; - - var body = RenderBodyTemplate(messageContext); - - // CSS inliner - body = InlineCss(body, model); - - // Model tree - var modelTree = _modelProvider.BuildModelTree(model); - var modelTreeJson = JsonConvert.SerializeObject(modelTree, Formatting.None); - if (modelTreeJson != messageTemplate.LastModelTree) - { - messageContext.MessageTemplate.LastModelTree = modelTreeJson; - if (!messageTemplate.IsTransientRecord()) - { - _messageTemplateService.UpdateMessageTemplate(messageContext.MessageTemplate); - } - } - - // Create queued email from template - var qe = new QueuedEmail - { - Priority = 5, - From = messageContext.SenderEmailAddress ?? messageContext.EmailAccount.ToEmailAddress(), - To = to.ToString(), - Bcc = bcc, - ReplyTo = replyTo?.ToString(), - Subject = subject, - Body = body, - CreatedOnUtc = DateTime.UtcNow, - EmailAccountId = messageContext.EmailAccount.Id, - SendManually = messageTemplate.SendManually - }; - - // Create and add attachments (if any) - CreateAttachments(qe, messageContext); - - if (queue) - { - // Put to queue - QueueMessage(messageContext, qe); - } - - return new CreateMessageResult { Email = qe, Model = model, MessageContext = messageContext }; - } - - public virtual void QueueMessage(MessageContext messageContext, QueuedEmail queuedEmail) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(queuedEmail, nameof(queuedEmail)); - - // Publish event so that integrators can add attachments, alter the email etc. - _services.EventPublisher.Publish(new MessageQueuingEvent - { - QueuedEmail = queuedEmail, - MessageContext = messageContext, - MessageModel = messageContext.Model - }); - - _queuedEmailService.InsertQueuedEmail(queuedEmail); - } - - private EmailAddress RenderEmailAddress(string email, MessageContext ctx, bool required = true) - { - string parsed = null; - - try - { - parsed = RenderTemplate(email, ctx, required); - - if (required || parsed.HasValue()) - { - return parsed.Convert(); - } - else - { - return null; - } - } - catch (Exception ex) - { - if (ctx.TestMode) - { - return new EmailAddress("john@doe.com", "John Doe"); - } - - var ex2 = new SmartException($"Failed to parse email address for variable '{email}'. Value was '{parsed.EmptyNull()}': {ex.Message}", ex); - _services.Notifier.Error(ex2.Message); - throw ex2; - } - } - - private string RenderTemplate(string template, MessageContext ctx, bool required = true) - { - if (!required && template.IsEmpty()) - { - return null; - } - - return _templateEngine.Render(template, ctx.Model, ctx.FormatProvider); - } - - private string RenderBodyTemplate(MessageContext ctx) - { - var key = BuildTemplateKey(ctx); - var source = ctx.MessageTemplate.GetLocalized((x) => x.Body, ctx.Language); - var fromCache = true; - var template = _templateManager.GetOrAdd(key, GetBodyTemplate); - - if (fromCache && template.Source != source) - { - // The template was resolved from template cache, but it has expired - // because the source text has changed. - template = _templateEngine.Compile(source); - _templateManager.Put(key, template); - } - - return template.Render(ctx.Model, ctx.FormatProvider); - - string GetBodyTemplate() - { - fromCache = false; - return source; - } - } - - private string BuildTemplateKey(MessageContext messageContext) - { - var prefix = messageContext.MessageTemplate.IsTransientRecord() ? "TransientTemplate/" : "MessageTemplate/"; - return prefix + messageContext.MessageTemplate.Name + "/" + messageContext.Language.Id + "/Body"; - } - - private string InlineCss(string html, dynamic model) - { - Uri baseUri = null; - - try - { - // 'Store' is a global model part, so we pretty can be sure it exists - baseUri = new Uri((string)model.Store.Url); - } - catch { } - - var pm = new PreMailer.Net.PreMailer(html, baseUri); - var result = pm.MoveCssInline(true, "#ignore"); - return result.Html; - } - - protected virtual void CreateAttachments(QueuedEmail queuedEmail, MessageContext messageContext) - { - var messageTemplate = messageContext.MessageTemplate; - var languageId = messageContext.Language.Id; - - // Create attachments if any. - var fileIds = (new int?[] - { - messageTemplate.GetLocalized(x => x.Attachment1FileId, languageId), - messageTemplate.GetLocalized(x => x.Attachment2FileId, languageId), - messageTemplate.GetLocalized(x => x.Attachment3FileId, languageId) - }) - .Where(x => x.HasValue) - .Select(x => x.Value) + { + _services = services; + _templateEngine = templateEngine; + _templateManager = templateManager; + _modelProvider = modelProvider; + _messageTemplateService = messageTemplateService; + _queuedEmailService = queuedEmailService; + _languageService = languageService; + _emailAccountService = emailAccountService; + _emailAccountSettings = emailAccountSettings; + _mediaService = mediaService; + } + + public Localizer T { get; set; } = NullLocalizer.Instance; + public ILogger Logger { get; set; } = NullLogger.Instance; + + public virtual CreateMessageResult CreateMessage(MessageContext messageContext, bool queue, params object[] modelParts) + { + Guard.NotNull(messageContext, nameof(messageContext)); + + modelParts = modelParts ?? new object[0]; + + // Handle TestMode + if (messageContext.TestMode && modelParts.Length == 0) + { + modelParts = GetTestModels(messageContext); + } + + ValidateMessageContext(messageContext, ref modelParts); + + // Create and assign model + var model = messageContext.Model = new TemplateModel(); + + // Do not create message if the template does not exist, is not authorized or not active. + if (messageContext.MessageTemplate == null) + { + return new CreateMessageResult { Model = model, MessageContext = messageContext }; + } + + // Add all global template model parts + _modelProvider.AddGlobalModelParts(messageContext); + + // Add specific template models for passed parts + foreach (var part in modelParts) + { + if (model != null) + { + _modelProvider.AddModelPart(part, messageContext); + } + } + + // Give implementors the chance to customize the final template model + _services.EventPublisher.Publish(new MessageModelCreatedEvent(messageContext, model)); + + var messageTemplate = messageContext.MessageTemplate; + var languageId = messageContext.Language.Id; + + // Render templates + var to = RenderEmailAddress(messageTemplate.To, messageContext); + var replyTo = RenderEmailAddress(messageTemplate.ReplyTo, messageContext, false); + var bcc = RenderTemplate(messageTemplate.GetLocalized((x) => x.BccEmailAddresses, languageId), messageContext, false); + + var subject = RenderTemplate(messageTemplate.GetLocalized((x) => x.Subject, languageId), messageContext); + ((dynamic)model).Email.Subject = subject; + + var body = RenderBodyTemplate(messageContext); + + // CSS inliner + body = InlineCss(body, model); + + // Model tree + var modelTree = _modelProvider.BuildModelTree(model); + var modelTreeJson = JsonConvert.SerializeObject(modelTree, Formatting.None); + if (modelTreeJson != messageTemplate.LastModelTree) + { + messageContext.MessageTemplate.LastModelTree = modelTreeJson; + if (!messageTemplate.IsTransientRecord()) + { + _messageTemplateService.UpdateMessageTemplate(messageContext.MessageTemplate); + } + } + + // Create queued email from template + var qe = new QueuedEmail + { + Priority = 5, + From = messageContext.SenderEmailAddress ?? messageContext.EmailAccount.ToEmailAddress(), + To = to.ToString(), + Bcc = bcc, + ReplyTo = replyTo?.ToString(), + Subject = subject, + Body = body, + CreatedOnUtc = DateTime.UtcNow, + EmailAccountId = messageContext.EmailAccount.Id, + SendManually = messageTemplate.SendManually + }; + + // Create and add attachments (if any) + CreateAttachments(qe, messageContext); + + if (queue) + { + // Put to queue + QueueMessage(messageContext, qe); + } + + return new CreateMessageResult { Email = qe, Model = model, MessageContext = messageContext }; + } + + public virtual void QueueMessage(MessageContext messageContext, QueuedEmail queuedEmail) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(queuedEmail, nameof(queuedEmail)); + + // Publish event so that integrators can add attachments, alter the email etc. + _services.EventPublisher.Publish(new MessageQueuingEvent + { + QueuedEmail = queuedEmail, + MessageContext = messageContext, + MessageModel = messageContext.Model + }); + + _queuedEmailService.InsertQueuedEmail(queuedEmail); + } + + private EmailAddress RenderEmailAddress(string email, MessageContext ctx, bool required = true) + { + string parsed = null; + + try + { + parsed = RenderTemplate(email, ctx, required); + + if (required || parsed.HasValue()) + { + return parsed.Convert(); + } + else + { + return null; + } + } + catch (Exception ex) + { + if (ctx.TestMode) + { + return new EmailAddress("john@doe.com", "John Doe"); + } + + var ex2 = new SmartException($"Failed to parse email address for variable '{email}'. Value was '{parsed.EmptyNull()}': {ex.Message}", ex); + _services.Notifier.Error(ex2.Message); + throw ex2; + } + } + + private string RenderTemplate(string template, MessageContext ctx, bool required = true) + { + if (!required && template.IsEmpty()) + { + return null; + } + + return _templateEngine.Render(template, ctx.Model, ctx.FormatProvider); + } + + private string RenderBodyTemplate(MessageContext ctx) + { + var key = BuildTemplateKey(ctx); + var source = ctx.MessageTemplate.GetLocalized((x) => x.Body, ctx.Language); + var fromCache = true; + var template = _templateManager.GetOrAdd(key, GetBodyTemplate); + + if (fromCache && template.Source != source) + { + // The template was resolved from template cache, but it has expired + // because the source text has changed. + template = _templateEngine.Compile(source); + _templateManager.Put(key, template); + } + + return template.Render(ctx.Model, ctx.FormatProvider); + + string GetBodyTemplate() + { + fromCache = false; + return source; + } + } + + private string BuildTemplateKey(MessageContext messageContext) + { + var prefix = messageContext.MessageTemplate.IsTransientRecord() ? "TransientTemplate/" : "MessageTemplate/"; + return prefix + messageContext.MessageTemplate.Name + "/" + messageContext.Language.Id + "/Body"; + } + + private string InlineCss(string html, dynamic model) + { + Uri baseUri = null; + + try + { + // 'Store' is a global model part, so we pretty can be sure it exists + baseUri = new Uri((string)model.Store.Url); + } + catch { } + + var pm = new PreMailer.Net.PreMailer(html, baseUri); + var result = pm.MoveCssInline(true, "#ignore"); + return result.Html; + } + + protected virtual void CreateAttachments(QueuedEmail queuedEmail, MessageContext messageContext) + { + var messageTemplate = messageContext.MessageTemplate; + var languageId = messageContext.Language.Id; + + // Create attachments if any. + var fileIds = (new int?[] + { + messageTemplate.GetLocalized(x => x.Attachment1FileId, languageId), + messageTemplate.GetLocalized(x => x.Attachment2FileId, languageId), + messageTemplate.GetLocalized(x => x.Attachment3FileId, languageId) + }) + .Where(x => x.HasValue) + .Select(x => x.Value) .Distinct() - .ToArray(); + .ToArray(); - if (fileIds.Any()) - { + if (fileIds.Any()) + { var files = _mediaService.GetFilesByIds(fileIds); - foreach (var file in files) - { - queuedEmail.Attachments.Add(new QueuedEmailAttachment - { - StorageLocation = EmailAttachmentStorageLocation.FileReference, - MediaFileId = file.Id, - Name = file.Name, - MimeType = file.MimeType - }); - } - } - } - - - private void ValidateMessageContext(MessageContext ctx, ref object[] modelParts) - { - var t = ctx.MessageTemplate; - if (t != null) - { - if (t.To.IsEmpty() || t.Subject.IsEmpty() || t.Name.IsEmpty()) - { - throw new InvalidOperationException("Message template validation failed, because at least one of the following properties has not been set: Name, To, Subject."); - } - } - - if (ctx.StoreId.GetValueOrDefault() == 0) - { - ctx.Store = _services.StoreContext.CurrentStore; - ctx.StoreId = ctx.Store.Id; - } - else - { - ctx.Store = _services.StoreService.GetStoreById(ctx.StoreId.Value); - } - - if (ctx.BaseUri == null) - { - ctx.BaseUri = new Uri(_services.StoreService.GetHost(ctx.Store)); - } - - if (ctx.LanguageId.GetValueOrDefault() == 0) - { - ctx.Language = _services.WorkContext.WorkingLanguage; - ctx.LanguageId = ctx.Language.Id; - } - else - { - ctx.Language = _languageService.GetLanguageById(ctx.LanguageId.Value); - } - - EnsureLanguageIsActive(ctx); - - var parts = modelParts?.AsEnumerable() ?? Enumerable.Empty(); - - if (ctx.Customer == null) - { - // Try to move Customer from parts to MessageContext - var customer = parts.OfType().FirstOrDefault(); - if (customer != null) - { - // Exclude the found customer from parts list - parts = parts.Where(x => !object.ReferenceEquals(x, customer)); - } - - ctx.Customer = customer ?? _services.WorkContext.CurrentCustomer; - } - - if (ctx.Customer.IsSystemAccount) - { - throw new ArgumentException("Cannot create messages for system customer accounts.", nameof(ctx)); - } - - if (ctx.MessageTemplate == null) - { - if (ctx.MessageTemplateName.IsEmpty()) - { - throw new ArgumentException("'MessageTemplateName' must not be empty if 'MessageTemplate' is null.", nameof(ctx)); - } - - ctx.MessageTemplate = _messageTemplateService.GetMessageTemplateByName(ctx.MessageTemplateName, ctx.Store.Id); - - if (ctx.MessageTemplate != null && !ctx.TestMode && !ctx.MessageTemplate.IsActive) - { - ctx.MessageTemplate = null; - } - } - - if (ctx.EmailAccount == null && ctx.MessageTemplate != null) - { - ctx.EmailAccount = GetEmailAccountOfMessageTemplate(ctx.MessageTemplate, ctx.Language.Id); - } - - // Sort parts: "IModelPart" instances must come first - var bagParts = parts.OfType(); - if (bagParts.Any()) - { - parts = bagParts.Concat(parts.Except(bagParts)); - } - - modelParts = parts.Where(x => x != null).ToArray(); - } - - protected EmailAccount GetEmailAccountOfMessageTemplate(MessageTemplate messageTemplate, int languageId) - { - // Note that the email account to be used can be specified separately for each language, that's why we use GetLocalized here. - var accountId = messageTemplate.GetLocalized(x => x.EmailAccountId, languageId); - var account = _emailAccountService.GetEmailAccountById(accountId); - - if (account == null) - { - account = _emailAccountService.GetDefaultEmailAccount(); - } - - if (account == null) - { - throw new SmartException(T("Common.Error.NoEmailAccount")); - } - - return account; - } - - private void EnsureLanguageIsActive(MessageContext ctx) - { - var language = ctx.Language; - - if (language == null || !language.Published) - { - // Load any language from the specified store - language = _languageService.GetLanguageById(_languageService.GetDefaultLanguageId(ctx.StoreId.Value)); - } - - if (language == null || !language.Published) - { - // Load any language - language = _languageService.GetAllLanguages().FirstOrDefault(); - } - - ctx.Language = language ?? throw new SmartException(T("Common.Error.NoActiveLanguage")); - } - - #region TestModels - - public virtual object[] GetTestModels(MessageContext messageContext) - { - var templateName = (messageContext.MessageTemplate?.Name ?? messageContext.MessageTemplateName); - - var factories = new Dictionary>(StringComparer.OrdinalIgnoreCase) - { - { "BlogComment", () => GetRandomEntity(x => true) }, - { "Product", () => GetRandomEntity(x => !x.Deleted && !x.IsSystemProduct && x.Visibility != ProductVisibility.Hidden && x.Published) }, - { "Customer", () => GetRandomEntity(x => !x.Deleted && !x.IsSystemAccount && !string.IsNullOrEmpty(x.Email)) }, - { "Order", () => GetRandomEntity(x => !x.Deleted) }, - { "Shipment", () => GetRandomEntity(x => !x.Order.Deleted) }, - { "OrderNote", () => GetRandomEntity(x => !x.Order.Deleted) }, - { "RecurringPayment", () => GetRandomEntity(x => !x.Deleted) }, - { "NewsLetterSubscription", () => GetRandomEntity(x => true) }, - { "Campaign", () => GetRandomEntity(x => true) }, - { "ReturnRequest", () => GetRandomEntity(x => true) }, - { "OrderItem", () => GetRandomEntity(x => !x.Order.Deleted) }, - { "ForumTopic", () => GetRandomEntity(x => true) }, - { "ForumPost", () => GetRandomEntity(x => true) }, - { "PrivateMessage", () => GetRandomEntity(x => true) }, - { "GiftCard", () => GetRandomEntity(x => true) }, - { "ProductReview", () => GetRandomEntity(x => !x.Product.Deleted && !x.Product.IsSystemProduct && x.Product.Visibility != ProductVisibility.Hidden && x.Product.Published) }, - { "NewsComment", () => GetRandomEntity(x => x.NewsItem.Published) }, - { "WalletHistory", () => GetRandomEntity(x => true) } - }; - - var modelNames = messageContext.MessageTemplate.ModelTypes - .SplitSafe(",") - .Select(x => x.Trim()) - .Distinct() - .ToArray(); - - var models = new Dictionary(); - var result = new List(); - - foreach (var modelName in modelNames) - { - var model = GetModelFromExpression(modelName, models, factories); - if (model != null) - { - result.Add(model); - } - } - - // Some models are special - var isTransientTemplate = messageContext.MessageTemplate != null && messageContext.MessageTemplate.IsTransientRecord(); - - if (!isTransientTemplate) - { - switch (templateName) - { - case MessageTemplateNames.SystemContactUs: - result.Add(new NamedModelPart("Message") - { - ["Subject"] = "Test subject", - ["Message"] = LoremIpsum, - ["SenderEmail"] = "jane@doe.com", - ["SenderName"] = "Jane Doe" - }); - break; - case MessageTemplateNames.ProductQuestion: - result.Add(new NamedModelPart("Message") - { - ["Message"] = LoremIpsum, - ["SenderEmail"] = "jane@doe.com", - ["SenderName"] = "Jane Doe", - ["SenderPhone"] = "123456789" - }); - break; - case MessageTemplateNames.ShareProduct: - result.Add(new NamedModelPart("Message") - { - ["Body"] = LoremIpsum, - ["From"] = "jane@doe.com", - ["To"] = "john@doe.com", - }); - break; - case MessageTemplateNames.ShareWishlist: - result.Add(new NamedModelPart("Wishlist") - { - ["PersonalMessage"] = LoremIpsum, - ["From"] = "jane@doe.com", - ["To"] = "john@doe.com", - }); - break; - case MessageTemplateNames.NewVatSubmittedStoreOwner: - result.Add(new NamedModelPart("VatValidationResult") - { - ["Name"] = "VatName", - ["Address"] = "VatAddress" - }); - break; - } - } - - return result.ToArray(); - } - - private object GetModelFromExpression(string expression, IDictionary models, IDictionary> factories) - { - object currentModel = null; - int dotIndex = 0; - int len = expression.Length; - bool bof = true; - string token = null; - - for (var i = 0; i < len; i++) - { - if (expression[i] == '.') - { - bof = false; - token = expression.Substring(0, i); - } - else if (i == len - 1) - { - // End reached - token = expression; - } - else - { - continue; - } - - if (!models.TryGetValue(token, out currentModel)) - { - if (bof) - { - // It's a simple dot-less expression where the token - // is actually the model name - currentModel = factories.Get(token)?.Invoke(); - } - else - { - // Sub-token, e.g. "Order.Customer" - // Get "Customer" part, this is our property name, NOT the model name - var propName = token.Substring(dotIndex + 1); - // Get parent model "Order" - var parentModel = models.Get(token.Substring(0, dotIndex)); - if (parentModel == null) - break; - - if (parentModel is ITestModel) - { - // When the parent model is a test model, we need to create a random instance - // instead of using the property value (which is null/void in this case) - currentModel = factories.Get(propName)?.Invoke(); - } - else - { - // Get "Customer" property of Order - var fastProp = FastProperty.GetProperty(parentModel.GetType(), propName, PropertyCachingStrategy.Uncached); - if (fastProp != null) - { - // Get "Customer" value - var propValue = fastProp.GetValue(parentModel); - if (propValue != null) - { - currentModel = propValue; - //// Resolve logical model name... - //var modelName = _modelProvider.ResolveModelName(propValue); - //if (modelName != null) - //{ - // // ...and create the value - // currentModel = factories.Get(modelName)?.Invoke(); - //} - } - } - } - } - - if (currentModel == null) - break; - - // Put it in dict as e.g. "Order.Customer" - models[token] = currentModel; - } - - if (!bof) - { - dotIndex = i; - } - } - - return currentModel; - } - - private object GetRandomEntity(Expression> predicate) where T : BaseEntity, new() - { - var dbSet = _services.DbContext.Set(); - - var query = dbSet.Where(predicate); - - // Determine how many entities match the given predicate - var count = query.Count(); - - object result; - - if (count > 0) - { - // Fetch a random one - var skip = CommonHelper.GenerateRandomInteger(0, count); - result = query.OrderBy(x => x.Id).Skip(() => skip).FirstOrDefault(); - } - else - { - // No entity macthes the predicate. Provide a fallback test entity - var entity = Activator.CreateInstance(); - result = _templateEngine.CreateTestModelFor(entity, entity.GetUnproxiedType().Name); - } - - return result; - } - - #endregion - } + foreach (var file in files) + { + queuedEmail.Attachments.Add(new QueuedEmailAttachment + { + StorageLocation = EmailAttachmentStorageLocation.FileReference, + MediaFileId = file.Id, + Name = file.Name, + MimeType = file.MimeType + }); + } + } + } + + + private void ValidateMessageContext(MessageContext ctx, ref object[] modelParts) + { + var t = ctx.MessageTemplate; + if (t != null) + { + if (t.To.IsEmpty() || t.Subject.IsEmpty() || t.Name.IsEmpty()) + { + throw new InvalidOperationException("Message template validation failed, because at least one of the following properties has not been set: Name, To, Subject."); + } + } + + if (ctx.StoreId.GetValueOrDefault() == 0) + { + ctx.Store = _services.StoreContext.CurrentStore; + ctx.StoreId = ctx.Store.Id; + } + else + { + ctx.Store = _services.StoreService.GetStoreById(ctx.StoreId.Value); + } + + if (ctx.BaseUri == null) + { + ctx.BaseUri = new Uri(_services.StoreService.GetHost(ctx.Store)); + } + + if (ctx.LanguageId.GetValueOrDefault() == 0) + { + ctx.Language = _services.WorkContext.WorkingLanguage; + ctx.LanguageId = ctx.Language.Id; + } + else + { + ctx.Language = _languageService.GetLanguageById(ctx.LanguageId.Value); + } + + EnsureLanguageIsActive(ctx); + + var parts = modelParts?.AsEnumerable() ?? Enumerable.Empty(); + + if (ctx.Customer == null) + { + // Try to move Customer from parts to MessageContext + var customer = parts.OfType().FirstOrDefault(); + if (customer != null) + { + // Exclude the found customer from parts list + parts = parts.Where(x => !object.ReferenceEquals(x, customer)); + } + + ctx.Customer = customer ?? _services.WorkContext.CurrentCustomer; + } + + if (ctx.Customer.IsSystemAccount) + { + throw new ArgumentException("Cannot create messages for system customer accounts.", nameof(ctx)); + } + + if (ctx.MessageTemplate == null) + { + if (ctx.MessageTemplateName.IsEmpty()) + { + throw new ArgumentException("'MessageTemplateName' must not be empty if 'MessageTemplate' is null.", nameof(ctx)); + } + + ctx.MessageTemplate = _messageTemplateService.GetMessageTemplateByName(ctx.MessageTemplateName, ctx.Store.Id); + + if (ctx.MessageTemplate != null && !ctx.TestMode && !ctx.MessageTemplate.IsActive) + { + ctx.MessageTemplate = null; + } + } + + if (ctx.EmailAccount == null && ctx.MessageTemplate != null) + { + ctx.EmailAccount = GetEmailAccountOfMessageTemplate(ctx.MessageTemplate, ctx.Language.Id); + } + + // Sort parts: "IModelPart" instances must come first + var bagParts = parts.OfType(); + if (bagParts.Any()) + { + parts = bagParts.Concat(parts.Except(bagParts)); + } + + modelParts = parts.Where(x => x != null).ToArray(); + } + + protected EmailAccount GetEmailAccountOfMessageTemplate(MessageTemplate messageTemplate, int languageId) + { + // Note that the email account to be used can be specified separately for each language, that's why we use GetLocalized here. + var accountId = messageTemplate.GetLocalized(x => x.EmailAccountId, languageId); + var account = _emailAccountService.GetEmailAccountById(accountId); + + if (account == null) + { + account = _emailAccountService.GetDefaultEmailAccount(); + } + + if (account == null) + { + throw new SmartException(T("Common.Error.NoEmailAccount")); + } + + return account; + } + + private void EnsureLanguageIsActive(MessageContext ctx) + { + var language = ctx.Language; + + if (language == null || !language.Published) + { + // Load any language from the specified store + language = _languageService.GetLanguageById(_languageService.GetDefaultLanguageId(ctx.StoreId.Value)); + } + + if (language == null || !language.Published) + { + // Load any language + language = _languageService.GetAllLanguages().FirstOrDefault(); + } + + ctx.Language = language ?? throw new SmartException(T("Common.Error.NoActiveLanguage")); + } + + #region TestModels + + public virtual object[] GetTestModels(MessageContext messageContext) + { + var templateName = (messageContext.MessageTemplate?.Name ?? messageContext.MessageTemplateName); + + var factories = new Dictionary>(StringComparer.OrdinalIgnoreCase) + { + { "BlogComment", () => GetRandomEntity(x => true) }, + { "Product", () => GetRandomEntity(x => !x.Deleted && !x.IsSystemProduct && x.Visibility != ProductVisibility.Hidden && x.Published) }, + { "Customer", () => GetRandomEntity(x => !x.Deleted && !x.IsSystemAccount && !string.IsNullOrEmpty(x.Email)) }, + { "Order", () => GetRandomEntity(x => !x.Deleted) }, + { "Shipment", () => GetRandomEntity(x => !x.Order.Deleted) }, + { "OrderNote", () => GetRandomEntity(x => !x.Order.Deleted) }, + { "RecurringPayment", () => GetRandomEntity(x => !x.Deleted) }, + { "NewsLetterSubscription", () => GetRandomEntity(x => true) }, + { "Campaign", () => GetRandomEntity(x => true) }, + { "ReturnRequest", () => GetRandomEntity(x => true) }, + { "OrderItem", () => GetRandomEntity(x => !x.Order.Deleted) }, + { "ForumTopic", () => GetRandomEntity(x => true) }, + { "ForumPost", () => GetRandomEntity(x => true) }, + { "PrivateMessage", () => GetRandomEntity(x => true) }, + { "GiftCard", () => GetRandomEntity(x => true) }, + { "ProductReview", () => GetRandomEntity(x => !x.Product.Deleted && !x.Product.IsSystemProduct && x.Product.Visibility != ProductVisibility.Hidden && x.Product.Published) }, + { "NewsComment", () => GetRandomEntity(x => x.NewsItem.Published) }, + { "WalletHistory", () => GetRandomEntity(x => true) } + }; + + var modelNames = messageContext.MessageTemplate.ModelTypes + .SplitSafe(",") + .Select(x => x.Trim()) + .Distinct() + .ToArray(); + + var models = new Dictionary(); + var result = new List(); + + foreach (var modelName in modelNames) + { + var model = GetModelFromExpression(modelName, models, factories); + if (model != null) + { + result.Add(model); + } + } + + // Some models are special + var isTransientTemplate = messageContext.MessageTemplate != null && messageContext.MessageTemplate.IsTransientRecord(); + + if (!isTransientTemplate) + { + switch (templateName) + { + case MessageTemplateNames.SystemContactUs: + result.Add(new NamedModelPart("Message") + { + ["Subject"] = "Test subject", + ["Message"] = LoremIpsum, + ["SenderEmail"] = "jane@doe.com", + ["SenderName"] = "Jane Doe" + }); + break; + case MessageTemplateNames.ProductQuestion: + result.Add(new NamedModelPart("Message") + { + ["Message"] = LoremIpsum, + ["SenderEmail"] = "jane@doe.com", + ["SenderName"] = "Jane Doe", + ["SenderPhone"] = "123456789" + }); + break; + case MessageTemplateNames.ShareProduct: + result.Add(new NamedModelPart("Message") + { + ["Body"] = LoremIpsum, + ["From"] = "jane@doe.com", + ["To"] = "john@doe.com", + }); + break; + case MessageTemplateNames.ShareWishlist: + result.Add(new NamedModelPart("Wishlist") + { + ["PersonalMessage"] = LoremIpsum, + ["From"] = "jane@doe.com", + ["To"] = "john@doe.com", + }); + break; + case MessageTemplateNames.NewVatSubmittedStoreOwner: + result.Add(new NamedModelPart("VatValidationResult") + { + ["Name"] = "VatName", + ["Address"] = "VatAddress" + }); + break; + } + } + + return result.ToArray(); + } + + private object GetModelFromExpression(string expression, IDictionary models, IDictionary> factories) + { + object currentModel = null; + int dotIndex = 0; + int len = expression.Length; + bool bof = true; + string token = null; + + for (var i = 0; i < len; i++) + { + if (expression[i] == '.') + { + bof = false; + token = expression.Substring(0, i); + } + else if (i == len - 1) + { + // End reached + token = expression; + } + else + { + continue; + } + + if (!models.TryGetValue(token, out currentModel)) + { + if (bof) + { + // It's a simple dot-less expression where the token + // is actually the model name + currentModel = factories.Get(token)?.Invoke(); + } + else + { + // Sub-token, e.g. "Order.Customer" + // Get "Customer" part, this is our property name, NOT the model name + var propName = token.Substring(dotIndex + 1); + // Get parent model "Order" + var parentModel = models.Get(token.Substring(0, dotIndex)); + if (parentModel == null) + break; + + if (parentModel is ITestModel) + { + // When the parent model is a test model, we need to create a random instance + // instead of using the property value (which is null/void in this case) + currentModel = factories.Get(propName)?.Invoke(); + } + else + { + // Get "Customer" property of Order + var fastProp = FastProperty.GetProperty(parentModel.GetType(), propName, PropertyCachingStrategy.Uncached); + if (fastProp != null) + { + // Get "Customer" value + var propValue = fastProp.GetValue(parentModel); + if (propValue != null) + { + currentModel = propValue; + //// Resolve logical model name... + //var modelName = _modelProvider.ResolveModelName(propValue); + //if (modelName != null) + //{ + // // ...and create the value + // currentModel = factories.Get(modelName)?.Invoke(); + //} + } + } + } + } + + if (currentModel == null) + break; + + // Put it in dict as e.g. "Order.Customer" + models[token] = currentModel; + } + + if (!bof) + { + dotIndex = i; + } + } + + return currentModel; + } + + private object GetRandomEntity(Expression> predicate) where T : BaseEntity, new() + { + var dbSet = _services.DbContext.Set(); + + var query = dbSet.Where(predicate); + + // Determine how many entities match the given predicate + var count = query.Count(); + + object result; + + if (count > 0) + { + // Fetch a random one + var skip = CommonHelper.GenerateRandomInteger(0, count); + result = query.OrderBy(x => x.Id).Skip(() => skip).FirstOrDefault(); + } + else + { + // No entity macthes the predicate. Provide a fallback test entity + var entity = Activator.CreateInstance(); + result = _templateEngine.CreateTestModelFor(entity, entity.GetUnproxiedType().Name); + } + + return result; + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs index 7ce9a9634f..469a57cd4b 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs @@ -22,287 +22,287 @@ namespace SmartStore.Services.Messages { public partial class MessageModelProvider - { - protected virtual object CreateModelPart(Order part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var allow = new HashSet - { - nameof(part.Id), - nameof(part.OrderNumber), - nameof(part.OrderGuid), - nameof(part.StoreId), - nameof(part.OrderStatus), - nameof(part.PaymentStatus), - nameof(part.ShippingStatus), - nameof(part.CustomerTaxDisplayType), - nameof(part.TaxRatesDictionary), - nameof(part.VatNumber), - nameof(part.AffiliateId), - nameof(part.CustomerIp), - nameof(part.CardType), - nameof(part.CardName), - nameof(part.MaskedCreditCardNumber), - nameof(part.DirectDebitAccountHolder), - nameof(part.DirectDebitBankCode), // TODO: (mc) Liquid > Bank data (?) + { + protected virtual object CreateModelPart(Order part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var allow = new HashSet + { + nameof(part.Id), + nameof(part.OrderNumber), + nameof(part.OrderGuid), + nameof(part.StoreId), + nameof(part.OrderStatus), + nameof(part.PaymentStatus), + nameof(part.ShippingStatus), + nameof(part.CustomerTaxDisplayType), + nameof(part.TaxRatesDictionary), + nameof(part.VatNumber), + nameof(part.AffiliateId), + nameof(part.CustomerIp), + nameof(part.CardType), + nameof(part.CardName), + nameof(part.MaskedCreditCardNumber), + nameof(part.DirectDebitAccountHolder), + nameof(part.DirectDebitBankCode), // TODO: (mc) Liquid > Bank data (?) nameof(part.PurchaseOrderNumber), - nameof(part.ShippingMethod), - nameof(part.PaymentMethodSystemName), - nameof(part.ShippingRateComputationMethodSystemName) + nameof(part.ShippingMethod), + nameof(part.PaymentMethodSystemName), + nameof(part.ShippingRateComputationMethodSystemName) // TODO: (mc) Liquid > More whitelisting? }; - var m = new HybridExpando(part, allow, MemberOptMethod.Allow); - var d = m as dynamic; - - d.ID = part.Id; - d.Billing = CreateModelPart(part.BillingAddress, messageContext); - if (part.ShippingAddress != null) - { - d.Shipping = part.ShippingAddress.IsPostalDataEqual(part.BillingAddress) == true ? null : CreateModelPart(part.ShippingAddress, messageContext); - } - d.CustomerEmail = part.BillingAddress.Email.NullEmpty(); - d.CustomerComment = part.CustomerOrderComment.NullEmpty(); - d.Disclaimer = GetTopic("Disclaimer", messageContext); - d.ConditionsOfUse = GetTopic("ConditionsOfUse", messageContext); - d.Status = part.OrderStatus.GetLocalizedEnum(_services.Localization, messageContext.Language.Id); - d.CreatedOn = ToUserDate(part.CreatedOnUtc, messageContext); - d.PaidOn = ToUserDate(part.PaidDateUtc, messageContext); - - // Payment method - var paymentMethodName = part.PaymentMethodSystemName; - var paymentMethod = _services.Resolve().GetProvider(part.PaymentMethodSystemName); - if (paymentMethod != null) - { - paymentMethodName = GetLocalizedValue(messageContext, paymentMethod.Metadata, nameof(paymentMethod.Metadata.FriendlyName), x => x.FriendlyName); - } - d.PaymentMethod = paymentMethodName.NullEmpty(); - - d.Url = part.Customer != null && !part.Customer.IsGuest() - ? BuildActionUrl("Details", "Order", new { id = part.Id, area = "" }, messageContext) - : null; - - // Overrides - m.Properties["OrderNumber"] = part.GetOrderNumber().NullEmpty(); - m.Properties["AcceptThirdPartyEmailHandOver"] = GetBoolResource(part.AcceptThirdPartyEmailHandOver, messageContext); - - // Items, Totals & Co. - d.Items = part.OrderItems.Where(x => x.Product != null).Select(x => CreateModelPart(x, messageContext)).ToList(); - d.Totals = CreateOrderTotalsPart(part, messageContext); - - // Checkout Attributes - if (part.CheckoutAttributeDescription.HasValue()) - { - d.CheckoutAttributes = HtmlUtils.ConvertPlainTextToTable(HtmlUtils.ConvertHtmlToPlainText(part.CheckoutAttributeDescription)).NullEmpty(); - } - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateOrderTotalsPart(Order order, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(order, nameof(order)); - - var language = messageContext.Language; - var currencyService = _services.Resolve(); - var paymentService = _services.Resolve(); - var priceFormatter = _services.Resolve(); - var taxSettings = _services.Settings.LoadSetting(messageContext.Store.Id); - - var taxRates = new SortedDictionary(); - Money cusTaxTotal = null; - Money cusDiscount = null; - Money cusRounding = null; - Money cusTotal = null; - - var subTotals = GetSubTotals(order, messageContext); - - // Shipping - bool dislayShipping = order.ShippingStatus != ShippingStatus.ShippingNotRequired; - - // Payment method fee - bool displayPaymentMethodFee = true; - if (order.PaymentMethodAdditionalFeeExclTax == decimal.Zero) - { - displayPaymentMethodFee = false; - } - - // Tax - bool displayTax = true; - bool displayTaxRates = true; - if (taxSettings.HideTaxInOrderSummary && order.CustomerTaxDisplayType == TaxDisplayType.IncludingTax) - { - displayTax = false; - displayTaxRates = false; - } - else - { - if (order.OrderTax == 0 && taxSettings.HideZeroTax) - { - displayTax = false; - displayTaxRates = false; - } - else - { - taxRates = new SortedDictionary(); - foreach (var tr in order.TaxRatesDictionary) - { - taxRates.Add(tr.Key, currencyService.ConvertCurrency(tr.Value, order.CurrencyRate)); - } - - displayTaxRates = taxSettings.DisplayTaxRates && taxRates.Count > 0; - displayTax = !displayTaxRates; - - cusTaxTotal = FormatPrice(order.OrderTax, order, messageContext); - } - } - - // Discount - bool dislayDiscount = false; - if (order.OrderDiscount > decimal.Zero) - { - cusDiscount = FormatPrice(-order.OrderDiscount, order, messageContext); - dislayDiscount = true; - } - - // Total - var roundingAmount = decimal.Zero; - var orderTotal = order.GetOrderTotalInCustomerCurrency(currencyService, paymentService, out roundingAmount); - cusTotal = FormatPrice(orderTotal, order.CustomerCurrencyCode, messageContext); - - // Rounding - if (roundingAmount != decimal.Zero) - { - cusRounding = FormatPrice(roundingAmount, order.CustomerCurrencyCode, messageContext); - } - - // Model - dynamic m = new ExpandoObject(); - - m.SubTotal = subTotals.SubTotal; - m.SubTotalDiscount = subTotals.DisplaySubTotalDiscount ? subTotals.SubTotalDiscount : null; - m.Shipping = dislayShipping ? subTotals.ShippingTotal : null; - m.Payment = displayPaymentMethodFee ? subTotals.PaymentFee : null; - m.Tax = displayTax ? cusTaxTotal : null; - m.Discount = dislayDiscount ? cusDiscount : null; - m.RoundingDiff = cusRounding; - m.Total = cusTotal; - m.IsGross = order.CustomerTaxDisplayType == TaxDisplayType.IncludingTax; - - // TaxRates - m.TaxRates = !displayTaxRates ? (object[])null : taxRates.Select(x => - { - return new - { - Rate = T("Order.TaxRateLine", language.Id, priceFormatter.FormatTaxRate(x.Key)).Text, - Value = FormatPrice(x.Value, order, messageContext) - }; - }).ToArray(); - - - // Gift Cards - m.GiftCardUsage = order.GiftCardUsageHistory.Count == 0 ? (object[])null : order.GiftCardUsageHistory.Select(x => - { - return new - { - GiftCard = T("Order.GiftCardInfo", language.Id, x.GiftCard.GiftCardCouponCode).Text, - UsedAmount = FormatPrice(-x.UsedValue, order, messageContext), - RemainingAmount = FormatPrice(x.GiftCard.GetGiftCardRemainingAmount(), order, messageContext) - }; - }).ToArray(); - - // Reward Points - m.RedeemedRewardPoints = order.RedeemedRewardPointsEntry == null ? null : new - { - Title = T("Order.RewardPoints", language.Id, -order.RedeemedRewardPointsEntry.Points).Text, - Amount = FormatPrice(-order.RedeemedRewardPointsEntry.UsedAmount, order, messageContext) - }; + var m = new HybridExpando(part, allow, MemberOptMethod.Allow); + var d = m as dynamic; + + d.ID = part.Id; + d.Billing = CreateModelPart(part.BillingAddress, messageContext); + if (part.ShippingAddress != null) + { + d.Shipping = part.ShippingAddress.IsPostalDataEqual(part.BillingAddress) == true ? null : CreateModelPart(part.ShippingAddress, messageContext); + } + d.CustomerEmail = part.BillingAddress.Email.NullEmpty(); + d.CustomerComment = part.CustomerOrderComment.NullEmpty(); + d.Disclaimer = GetTopic("Disclaimer", messageContext); + d.ConditionsOfUse = GetTopic("ConditionsOfUse", messageContext); + d.Status = part.OrderStatus.GetLocalizedEnum(_services.Localization, messageContext.Language.Id); + d.CreatedOn = ToUserDate(part.CreatedOnUtc, messageContext); + d.PaidOn = ToUserDate(part.PaidDateUtc, messageContext); + + // Payment method + var paymentMethodName = part.PaymentMethodSystemName; + var paymentMethod = _services.Resolve().GetProvider(part.PaymentMethodSystemName); + if (paymentMethod != null) + { + paymentMethodName = GetLocalizedValue(messageContext, paymentMethod.Metadata, nameof(paymentMethod.Metadata.FriendlyName), x => x.FriendlyName); + } + d.PaymentMethod = paymentMethodName.NullEmpty(); + + d.Url = part.Customer != null && !part.Customer.IsGuest() + ? BuildActionUrl("Details", "Order", new { id = part.Id, area = "" }, messageContext) + : null; + + // Overrides + m.Properties["OrderNumber"] = part.GetOrderNumber().NullEmpty(); + m.Properties["AcceptThirdPartyEmailHandOver"] = GetBoolResource(part.AcceptThirdPartyEmailHandOver, messageContext); + + // Items, Totals & Co. + d.Items = part.OrderItems.Where(x => x.Product != null).Select(x => CreateModelPart(x, messageContext)).ToList(); + d.Totals = CreateOrderTotalsPart(part, messageContext); + + // Checkout Attributes + if (part.CheckoutAttributeDescription.HasValue()) + { + d.CheckoutAttributes = HtmlUtils.ConvertPlainTextToTable(HtmlUtils.ConvertHtmlToPlainText(part.CheckoutAttributeDescription)).NullEmpty(); + } + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateOrderTotalsPart(Order order, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(order, nameof(order)); + + var language = messageContext.Language; + var currencyService = _services.Resolve(); + var paymentService = _services.Resolve(); + var priceFormatter = _services.Resolve(); + var taxSettings = _services.Settings.LoadSetting(messageContext.Store.Id); + + var taxRates = new SortedDictionary(); + Money cusTaxTotal = null; + Money cusDiscount = null; + Money cusRounding = null; + Money cusTotal = null; + + var subTotals = GetSubTotals(order, messageContext); + + // Shipping + bool dislayShipping = order.ShippingStatus != ShippingStatus.ShippingNotRequired; + + // Payment method fee + bool displayPaymentMethodFee = true; + if (order.PaymentMethodAdditionalFeeExclTax == decimal.Zero) + { + displayPaymentMethodFee = false; + } + + // Tax + bool displayTax = true; + bool displayTaxRates = true; + if (taxSettings.HideTaxInOrderSummary && order.CustomerTaxDisplayType == TaxDisplayType.IncludingTax) + { + displayTax = false; + displayTaxRates = false; + } + else + { + if (order.OrderTax == 0 && taxSettings.HideZeroTax) + { + displayTax = false; + displayTaxRates = false; + } + else + { + taxRates = new SortedDictionary(); + foreach (var tr in order.TaxRatesDictionary) + { + taxRates.Add(tr.Key, currencyService.ConvertCurrency(tr.Value, order.CurrencyRate)); + } + + displayTaxRates = taxSettings.DisplayTaxRates && taxRates.Count > 0; + displayTax = !displayTaxRates; + + cusTaxTotal = FormatPrice(order.OrderTax, order, messageContext); + } + } + + // Discount + bool dislayDiscount = false; + if (order.OrderDiscount > decimal.Zero) + { + cusDiscount = FormatPrice(-order.OrderDiscount, order, messageContext); + dislayDiscount = true; + } + + // Total + var roundingAmount = decimal.Zero; + var orderTotal = order.GetOrderTotalInCustomerCurrency(currencyService, paymentService, out roundingAmount); + cusTotal = FormatPrice(orderTotal, order.CustomerCurrencyCode, messageContext); + + // Rounding + if (roundingAmount != decimal.Zero) + { + cusRounding = FormatPrice(roundingAmount, order.CustomerCurrencyCode, messageContext); + } + + // Model + dynamic m = new ExpandoObject(); + + m.SubTotal = subTotals.SubTotal; + m.SubTotalDiscount = subTotals.DisplaySubTotalDiscount ? subTotals.SubTotalDiscount : null; + m.Shipping = dislayShipping ? subTotals.ShippingTotal : null; + m.Payment = displayPaymentMethodFee ? subTotals.PaymentFee : null; + m.Tax = displayTax ? cusTaxTotal : null; + m.Discount = dislayDiscount ? cusDiscount : null; + m.RoundingDiff = cusRounding; + m.Total = cusTotal; + m.IsGross = order.CustomerTaxDisplayType == TaxDisplayType.IncludingTax; + + // TaxRates + m.TaxRates = !displayTaxRates ? (object[])null : taxRates.Select(x => + { + return new + { + Rate = T("Order.TaxRateLine", language.Id, priceFormatter.FormatTaxRate(x.Key)).Text, + Value = FormatPrice(x.Value, order, messageContext) + }; + }).ToArray(); + + + // Gift Cards + m.GiftCardUsage = order.GiftCardUsageHistory.Count == 0 ? (object[])null : order.GiftCardUsageHistory.Select(x => + { + return new + { + GiftCard = T("Order.GiftCardInfo", language.Id, x.GiftCard.GiftCardCouponCode).Text, + UsedAmount = FormatPrice(-x.UsedValue, order, messageContext), + RemainingAmount = FormatPrice(x.GiftCard.GetGiftCardRemainingAmount(), order, messageContext) + }; + }).ToArray(); + + // Reward Points + m.RedeemedRewardPoints = order.RedeemedRewardPointsEntry == null ? null : new + { + Title = T("Order.RewardPoints", language.Id, -order.RedeemedRewardPointsEntry.Points).Text, + Amount = FormatPrice(-order.RedeemedRewardPointsEntry.UsedAmount, order, messageContext) + }; - return m; - } + return m; + } - private (Money SubTotal, Money SubTotalDiscount, Money ShippingTotal, Money PaymentFee, bool DisplaySubTotalDiscount) GetSubTotals(Order order, MessageContext messageContext) - { - var isNet = order.CustomerTaxDisplayType == TaxDisplayType.ExcludingTax; + private (Money SubTotal, Money SubTotalDiscount, Money ShippingTotal, Money PaymentFee, bool DisplaySubTotalDiscount) GetSubTotals(Order order, MessageContext messageContext) + { + var isNet = order.CustomerTaxDisplayType == TaxDisplayType.ExcludingTax; - var subTotal = isNet ? order.OrderSubtotalExclTax : order.OrderSubtotalInclTax; - var subTotalDiscount = isNet ? order.OrderSubTotalDiscountExclTax : order.OrderSubTotalDiscountInclTax; - var shipping = isNet ? order.OrderShippingExclTax : order.OrderShippingInclTax; - var payment = isNet ? order.PaymentMethodAdditionalFeeExclTax : order.PaymentMethodAdditionalFeeInclTax; + var subTotal = isNet ? order.OrderSubtotalExclTax : order.OrderSubtotalInclTax; + var subTotalDiscount = isNet ? order.OrderSubTotalDiscountExclTax : order.OrderSubTotalDiscountInclTax; + var shipping = isNet ? order.OrderShippingExclTax : order.OrderShippingInclTax; + var payment = isNet ? order.PaymentMethodAdditionalFeeExclTax : order.PaymentMethodAdditionalFeeInclTax; - // Subtotal - var cusSubTotal = FormatPrice(subTotal, order, messageContext); + // Subtotal + var cusSubTotal = FormatPrice(subTotal, order, messageContext); - // Shipping - var cusShipTotal = FormatPrice(shipping, order, messageContext); + // Shipping + var cusShipTotal = FormatPrice(shipping, order, messageContext); - // Payment method additional fee - var cusPaymentMethodFee = FormatPrice(payment, order, messageContext); + // Payment method additional fee + var cusPaymentMethodFee = FormatPrice(payment, order, messageContext); - // Discount (applied to order subtotal) - Money cusSubTotalDiscount = null; - bool dislaySubTotalDiscount = false; - if (subTotalDiscount > decimal.Zero) - { - cusSubTotalDiscount = FormatPrice(-subTotalDiscount, order, messageContext); - dislaySubTotalDiscount = true; - } + // Discount (applied to order subtotal) + Money cusSubTotalDiscount = null; + bool dislaySubTotalDiscount = false; + if (subTotalDiscount > decimal.Zero) + { + cusSubTotalDiscount = FormatPrice(-subTotalDiscount, order, messageContext); + dislaySubTotalDiscount = true; + } - return (cusSubTotal, cusSubTotalDiscount, cusShipTotal, cusPaymentMethodFee, dislaySubTotalDiscount); - } + return (cusSubTotal, cusSubTotalDiscount, cusShipTotal, cusPaymentMethodFee, dislaySubTotalDiscount); + } - protected virtual object CreateModelPart(OrderItem part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); + protected virtual object CreateModelPart(OrderItem part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); - var productAttributeParser = _services.Resolve(); - var downloadService = _services.Resolve(); + var productAttributeParser = _services.Resolve(); + var downloadService = _services.Resolve(); var deliveryTimeService = _services.Resolve(); var order = part.Order; - var isNet = order.CustomerTaxDisplayType == TaxDisplayType.ExcludingTax; - var product = part.Product; - product.MergeWithCombination(part.AttributesXml, productAttributeParser); - - // Bundle items. - object bundleItems = null; - if (product.ProductType == ProductType.BundledProduct && part.BundleData.HasValue()) - { - var bundleData = part.GetBundleData(); - if (bundleData.Any()) - { - var productService = _services.Resolve(); - var products = productService.GetProductsByIds(bundleData.Select(x => x.ProductId).ToArray()); - var productsDic = products.ToDictionarySafe(x => x.Id, x => x); - - bundleItems = bundleData - .OrderBy(x => x.DisplayOrder) - .Select(x => - { - productsDic.TryGetValue(x.ProductId, out Product bundleItemProduct); - return CreateModelPart(x, part, bundleItemProduct, messageContext); - }) - .ToList(); - } - } - - var m = new Dictionary - { - { "DownloadUrl", !downloadService.IsDownloadAllowed(part) ? null : BuildActionUrl("GetDownload", "Download", new { id = part.OrderItemGuid, area = "" }, messageContext) }, - { "AttributeDescription", part.AttributeDescription.NullEmpty() }, - { "Weight", part.ItemWeight }, - { "TaxRate", part.TaxRate }, - { "Qty", part.Quantity }, - { "UnitPrice", FormatPrice(isNet ? part.UnitPriceExclTax : part.UnitPriceInclTax, part.Order, messageContext) }, - { "LineTotal", FormatPrice(isNet ? part.PriceExclTax : part.PriceInclTax, part.Order, messageContext) }, - { "Product", CreateModelPart(product, messageContext, part.AttributesXml) }, - { "BundleItems", bundleItems }, - { "IsGross", !isNet }, + var isNet = order.CustomerTaxDisplayType == TaxDisplayType.ExcludingTax; + var product = part.Product; + product.MergeWithCombination(part.AttributesXml, productAttributeParser); + + // Bundle items. + object bundleItems = null; + if (product.ProductType == ProductType.BundledProduct && part.BundleData.HasValue()) + { + var bundleData = part.GetBundleData(); + if (bundleData.Any()) + { + var productService = _services.Resolve(); + var products = productService.GetProductsByIds(bundleData.Select(x => x.ProductId).ToArray()); + var productsDic = products.ToDictionarySafe(x => x.Id, x => x); + + bundleItems = bundleData + .OrderBy(x => x.DisplayOrder) + .Select(x => + { + productsDic.TryGetValue(x.ProductId, out Product bundleItemProduct); + return CreateModelPart(x, part, bundleItemProduct, messageContext); + }) + .ToList(); + } + } + + var m = new Dictionary + { + { "DownloadUrl", !downloadService.IsDownloadAllowed(part) ? null : BuildActionUrl("GetDownload", "Download", new { id = part.OrderItemGuid, area = "" }, messageContext) }, + { "AttributeDescription", part.AttributeDescription.NullEmpty() }, + { "Weight", part.ItemWeight }, + { "TaxRate", part.TaxRate }, + { "Qty", part.Quantity }, + { "UnitPrice", FormatPrice(isNet ? part.UnitPriceExclTax : part.UnitPriceInclTax, part.Order, messageContext) }, + { "LineTotal", FormatPrice(isNet ? part.PriceExclTax : part.PriceInclTax, part.Order, messageContext) }, + { "Product", CreateModelPart(product, messageContext, part.AttributesXml) }, + { "BundleItems", bundleItems }, + { "IsGross", !isNet }, { "DisplayDeliveryTime", part.DisplayDeliveryTime }, }; @@ -318,88 +318,88 @@ protected virtual object CreateModelPart(OrderItem part, MessageContext messageC } } - PublishModelPartCreatedEvent(part, m); + PublishModelPartCreatedEvent(part, m); - return m; - } + return m; + } - protected virtual object CreateModelPart(ProductBundleItemOrderData part, OrderItem orderItem, Product product, MessageContext messageContext) - { - Guard.NotNull(part, nameof(part)); - Guard.NotNull(orderItem, nameof(orderItem)); - Guard.NotNull(product, nameof(product)); - Guard.NotNull(messageContext, nameof(messageContext)); + protected virtual object CreateModelPart(ProductBundleItemOrderData part, OrderItem orderItem, Product product, MessageContext messageContext) + { + Guard.NotNull(part, nameof(part)); + Guard.NotNull(orderItem, nameof(orderItem)); + Guard.NotNull(product, nameof(product)); + Guard.NotNull(messageContext, nameof(messageContext)); - var priceWithDiscount = FormatPrice(part.PriceWithDiscount, orderItem.Order, messageContext); + var priceWithDiscount = FormatPrice(part.PriceWithDiscount, orderItem.Order, messageContext); - var m = new Dictionary - { - { "AttributeDescription", part.AttributesInfo.NullEmpty() }, - { "Quantity", part.Quantity > 1 && part.PerItemShoppingCart ? part.Quantity.ToString() : null }, - { "PerItemShoppingCart", part.PerItemShoppingCart }, - { "PriceWithDiscount", priceWithDiscount }, - { "Product", CreateModelPart(product, messageContext, part.AttributesXml) } - }; + var m = new Dictionary + { + { "AttributeDescription", part.AttributesInfo.NullEmpty() }, + { "Quantity", part.Quantity > 1 && part.PerItemShoppingCart ? part.Quantity.ToString() : null }, + { "PerItemShoppingCart", part.PerItemShoppingCart }, + { "PriceWithDiscount", priceWithDiscount }, + { "Product", CreateModelPart(product, messageContext, part.AttributesXml) } + }; - PublishModelPartCreatedEvent(part, m); + PublishModelPartCreatedEvent(part, m); - return m; - } + return m; + } - protected virtual object CreateModelPart(OrderNote part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); + protected virtual object CreateModelPart(OrderNote part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); - var m = new Dictionary - { - { "Id", part.Id }, - { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) }, - { "Text", part.FormatOrderNoteText().NullEmpty() } - }; + var m = new Dictionary + { + { "Id", part.Id }, + { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) }, + { "Text", part.FormatOrderNoteText().NullEmpty() } + }; - PublishModelPartCreatedEvent(part, m); + PublishModelPartCreatedEvent(part, m); - return m; - } + return m; + } - protected virtual object CreateModelPart(ShoppingCartItem part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); + protected virtual object CreateModelPart(ShoppingCartItem part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); - var m = new Dictionary - { - { "Id", part.Id }, - { "Quantity", part.Quantity }, - { "Product", CreateModelPart(part.Product, messageContext, part.AttributesXml) }, - }; + var m = new Dictionary + { + { "Id", part.Id }, + { "Quantity", part.Quantity }, + { "Product", CreateModelPart(part.Product, messageContext, part.AttributesXml) }, + }; - PublishModelPartCreatedEvent(part, m); + PublishModelPartCreatedEvent(part, m); - return m; - } + return m; + } - protected virtual object CreateModelPart(Shipment part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); + protected virtual object CreateModelPart(Shipment part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); - var itemParts = new List(); - var orderService = _services.Resolve(); - var orderItems = orderService.GetOrderItemsByOrderIds(new int[] { part.OrderId })[part.OrderId]; - var orderItemsDic = orderItems.ToDictionarySafe(x => x.Id); + var itemParts = new List(); + var orderService = _services.Resolve(); + var orderItems = orderService.GetOrderItemsByOrderIds(new int[] { part.OrderId })[part.OrderId]; + var orderItemsDic = orderItems.ToDictionarySafe(x => x.Id); - foreach (var shipmentItem in part.ShipmentItems) - { - if (orderItemsDic.TryGetValue(shipmentItem.OrderItemId, out var orderItem) && orderItem.Product != null) - { - var itemPart = CreateModelPart(orderItem, messageContext) as Dictionary; - itemPart["Qty"] = shipmentItem.Quantity; + foreach (var shipmentItem in part.ShipmentItems) + { + if (orderItemsDic.TryGetValue(shipmentItem.OrderItemId, out var orderItem) && orderItem.Product != null) + { + var itemPart = CreateModelPart(orderItem, messageContext) as Dictionary; + itemPart["Qty"] = shipmentItem.Quantity; - itemParts.Add(itemPart); - } - } + itemParts.Add(itemPart); + } + } var trackingUrl = part.TrackingUrl; @@ -421,68 +421,68 @@ protected virtual object CreateModelPart(Shipment part, MessageContext messageCo } } - var m = new Dictionary - { - { "Id", part.Id }, - { "TrackingNumber", part.TrackingNumber.NullEmpty() }, + var m = new Dictionary + { + { "Id", part.Id }, + { "TrackingNumber", part.TrackingNumber.NullEmpty() }, { "TrackingUrl", trackingUrl.NullEmpty() }, { "TotalWeight", part.TotalWeight }, - { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) }, - { "DeliveredOn", ToUserDate(part.DeliveryDateUtc, messageContext) }, - { "ShippedOn", ToUserDate(part.ShippedDateUtc, messageContext) }, - { "Url", BuildActionUrl("ShipmentDetails", "Order", new { id = part.Id, area = "" }, messageContext)}, - { "Items", itemParts }, - }; + { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) }, + { "DeliveredOn", ToUserDate(part.DeliveryDateUtc, messageContext) }, + { "ShippedOn", ToUserDate(part.ShippedDateUtc, messageContext) }, + { "Url", BuildActionUrl("ShipmentDetails", "Order", new { id = part.Id, area = "" }, messageContext)}, + { "Items", itemParts }, + }; - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(RecurringPayment part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "Id", part.Id }, - { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) }, - { "StartedOn", ToUserDate(part.StartDateUtc, messageContext) }, - { "NextOn", ToUserDate(part.NextPaymentDate, messageContext) }, - { "CycleLength", part.CycleLength }, - { "CyclePeriod", part.CyclePeriod.GetLocalizedEnum(_services.Localization, messageContext.Language.Id) }, - { "CyclesRemaining", part.CyclesRemaining }, - { "TotalCycles", part.TotalCycles }, - { "Url", BuildActionUrl("Edit", "RecurringPayment", new { id = part.Id, area = "admin" }, messageContext) } - }; + PublishModelPartCreatedEvent(part, m); - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(ReturnRequest part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "Id", part.Id }, - { "Reason", part.ReasonForReturn.NullEmpty() }, - { "Status", part.ReturnRequestStatus.GetLocalizedEnum(_services.Localization, messageContext.Language.Id) }, - { "RequestedAction", part.RequestedAction.NullEmpty() }, - { "CustomerComments", HtmlUtils.StripTags(part.CustomerComments).NullEmpty() }, - { "StaffNotes", HtmlUtils.StripTags(part.StaffNotes).NullEmpty() }, - { "Quantity", part.Quantity }, - { "RefundToWallet", part.RefundToWallet }, - { "Url", BuildActionUrl("Edit", "ReturnRequest", new { id = part.Id, area = "admin" }, messageContext) } - }; + return m; + } + + protected virtual object CreateModelPart(RecurringPayment part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "Id", part.Id }, + { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) }, + { "StartedOn", ToUserDate(part.StartDateUtc, messageContext) }, + { "NextOn", ToUserDate(part.NextPaymentDate, messageContext) }, + { "CycleLength", part.CycleLength }, + { "CyclePeriod", part.CyclePeriod.GetLocalizedEnum(_services.Localization, messageContext.Language.Id) }, + { "CyclesRemaining", part.CyclesRemaining }, + { "TotalCycles", part.TotalCycles }, + { "Url", BuildActionUrl("Edit", "RecurringPayment", new { id = part.Id, area = "admin" }, messageContext) } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(ReturnRequest part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "Id", part.Id }, + { "Reason", part.ReasonForReturn.NullEmpty() }, + { "Status", part.ReturnRequestStatus.GetLocalizedEnum(_services.Localization, messageContext.Language.Id) }, + { "RequestedAction", part.RequestedAction.NullEmpty() }, + { "CustomerComments", HtmlUtils.StripTags(part.CustomerComments).NullEmpty() }, + { "StaffNotes", HtmlUtils.StripTags(part.StaffNotes).NullEmpty() }, + { "Quantity", part.Quantity }, + { "RefundToWallet", part.RefundToWallet }, + { "Url", BuildActionUrl("Edit", "ReturnRequest", new { id = part.Id, area = "admin" }, messageContext) } + }; - PublishModelPartCreatedEvent(part, m); + PublishModelPartCreatedEvent(part, m); - return m; - } - } + return m; + } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs index 96f817e99b..26d3ef994d 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs @@ -20,130 +20,130 @@ namespace SmartStore.Services.Messages { public partial class MessageModelProvider - { - private void ApplyCustomerContentPart(IDictionary model, CustomerContent content, MessageContext ctx) - { - model["CustomerId"] = content.CustomerId; - model["IpAddress"] = content.IpAddress; - model["CreatedOn"] = ToUserDate(content.CreatedOnUtc, ctx); - model["UpdatedOn"] = ToUserDate(content.UpdatedOnUtc, ctx); - } - - private string BuildUrl(string url, MessageContext ctx) - { - return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + url.EnsureStartsWith("/"); - } - - private string BuildRouteUrl(object routeValues, MessageContext ctx) - { - return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.RouteUrl(routeValues); - } - - private string BuildRouteUrl(string routeName, object routeValues, MessageContext ctx) - { - return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.RouteUrl(routeName, routeValues); - } - - private string BuildActionUrl(string action, string controller, object routeValues, MessageContext ctx) - { - return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.Action(action, controller, routeValues); - } - - private void PublishModelPartCreatedEvent(T source, dynamic part) where T : class - { - _services.EventPublisher.Publish(new MessageModelPartCreatedEvent(source, part)); - } - - private string GetLocalizedValue(MessageContext messageContext, ProviderMetadata metadata, string propertyName, Func fallback) - { - // TODO: (mc) this actually belongs to PluginMediator, but we simply cannot add a dependency to framework from here. Refactor later! - - Guard.NotNull(metadata, nameof(metadata)); - - string systemName = metadata.SystemName; - var resourceName = metadata.ResourceKeyPattern.FormatInvariant(metadata.SystemName, propertyName); - string result = _services.Localization.GetResource(resourceName, messageContext.Language.Id, false, "", true); - - if (result.IsEmpty()) - result = fallback(metadata); - - return result; - } - - private object GetTopic(string topicSystemName, MessageContext ctx) - { - var topicService = _services.Resolve(); - - // Load by store - var topic = topicService.GetTopicBySystemName(topicSystemName, ctx.StoreId ?? 0, false); - - string body = topic?.GetLocalized(x => x.Body, ctx.Language); - if (body.HasValue()) - { - body = HtmlUtils.RelativizeFontSizes(body); - } - - return new - { - Title = topic?.GetLocalized(x => x.Title, ctx.Language).Value.NullEmpty(), - Body = body.NullEmpty() - }; - } - - private string GetDisplayNameForCustomer(Customer customer) - { - return customer.GetFullName().NullEmpty() ?? customer.Username ?? customer.FindEmail(); - } - - private string GetBoolResource(bool value, MessageContext ctx) - { - return _services.Localization.GetResource(value ? "Common.Yes" : "Common.No", ctx.Language.Id); - } - - private DateTime? ToUserDate(DateTime? utcDate, MessageContext messageContext) - { - if (utcDate == null) - return null; - - return _services.DateTimeHelper.ConvertToUserTime( - utcDate.Value, - TimeZoneInfo.Utc, - _services.DateTimeHelper.GetCustomerTimeZone(messageContext.Customer)); - } - - private Money FormatPrice(decimal price, Order order, MessageContext messageContext) - { - return FormatPrice(price, order.CustomerCurrencyCode, messageContext, order.CurrencyRate); - } - - private Money FormatPrice(decimal price, MessageContext messageContext, decimal exchangeRate = 1) - { - return FormatPrice(price, (Currency)null, messageContext, exchangeRate); - } - - private Money FormatPrice(decimal price, string currencyCode, MessageContext messageContext, decimal exchangeRate = 1) - { - return FormatPrice( - price, - _services.Resolve().GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }, - messageContext, - exchangeRate); - } - - private Money FormatPrice(decimal price, Currency currency, MessageContext messageContext, decimal exchangeRate = 1) - { - if (exchangeRate != 1) - { - price = _services.Resolve().ConvertCurrency(price, exchangeRate); - } - - if (currency == null) - { - currency = _services.Resolve().WorkingCurrency; - } - - return new Money(price, currency); - } + { + private void ApplyCustomerContentPart(IDictionary model, CustomerContent content, MessageContext ctx) + { + model["CustomerId"] = content.CustomerId; + model["IpAddress"] = content.IpAddress; + model["CreatedOn"] = ToUserDate(content.CreatedOnUtc, ctx); + model["UpdatedOn"] = ToUserDate(content.UpdatedOnUtc, ctx); + } + + private string BuildUrl(string url, MessageContext ctx) + { + return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + url.EnsureStartsWith("/"); + } + + private string BuildRouteUrl(object routeValues, MessageContext ctx) + { + return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.RouteUrl(routeValues); + } + + private string BuildRouteUrl(string routeName, object routeValues, MessageContext ctx) + { + return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.RouteUrl(routeName, routeValues); + } + + private string BuildActionUrl(string action, string controller, object routeValues, MessageContext ctx) + { + return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.Action(action, controller, routeValues); + } + + private void PublishModelPartCreatedEvent(T source, dynamic part) where T : class + { + _services.EventPublisher.Publish(new MessageModelPartCreatedEvent(source, part)); + } + + private string GetLocalizedValue(MessageContext messageContext, ProviderMetadata metadata, string propertyName, Func fallback) + { + // TODO: (mc) this actually belongs to PluginMediator, but we simply cannot add a dependency to framework from here. Refactor later! + + Guard.NotNull(metadata, nameof(metadata)); + + string systemName = metadata.SystemName; + var resourceName = metadata.ResourceKeyPattern.FormatInvariant(metadata.SystemName, propertyName); + string result = _services.Localization.GetResource(resourceName, messageContext.Language.Id, false, "", true); + + if (result.IsEmpty()) + result = fallback(metadata); + + return result; + } + + private object GetTopic(string topicSystemName, MessageContext ctx) + { + var topicService = _services.Resolve(); + + // Load by store + var topic = topicService.GetTopicBySystemName(topicSystemName, ctx.StoreId ?? 0, false); + + string body = topic?.GetLocalized(x => x.Body, ctx.Language); + if (body.HasValue()) + { + body = HtmlUtils.RelativizeFontSizes(body); + } + + return new + { + Title = topic?.GetLocalized(x => x.Title, ctx.Language).Value.NullEmpty(), + Body = body.NullEmpty() + }; + } + + private string GetDisplayNameForCustomer(Customer customer) + { + return customer.GetFullName().NullEmpty() ?? customer.Username ?? customer.FindEmail(); + } + + private string GetBoolResource(bool value, MessageContext ctx) + { + return _services.Localization.GetResource(value ? "Common.Yes" : "Common.No", ctx.Language.Id); + } + + private DateTime? ToUserDate(DateTime? utcDate, MessageContext messageContext) + { + if (utcDate == null) + return null; + + return _services.DateTimeHelper.ConvertToUserTime( + utcDate.Value, + TimeZoneInfo.Utc, + _services.DateTimeHelper.GetCustomerTimeZone(messageContext.Customer)); + } + + private Money FormatPrice(decimal price, Order order, MessageContext messageContext) + { + return FormatPrice(price, order.CustomerCurrencyCode, messageContext, order.CurrencyRate); + } + + private Money FormatPrice(decimal price, MessageContext messageContext, decimal exchangeRate = 1) + { + return FormatPrice(price, (Currency)null, messageContext, exchangeRate); + } + + private Money FormatPrice(decimal price, string currencyCode, MessageContext messageContext, decimal exchangeRate = 1) + { + return FormatPrice( + price, + _services.Resolve().GetCurrencyByCode(currencyCode) ?? new Currency { CurrencyCode = currencyCode }, + messageContext, + exchangeRate); + } + + private Money FormatPrice(decimal price, Currency currency, MessageContext messageContext, decimal exchangeRate = 1) + { + if (exchangeRate != 1) + { + price = _services.Resolve().ConvertCurrency(price, exchangeRate); + } + + if (currency == null) + { + currency = _services.Resolve().WorkingCurrency; + } + + return new Money(price, currency); + } private MediaFileInfo GetMediaFileFor(Product product, string attributesXml) @@ -185,8 +185,8 @@ private MediaFileInfo GetMediaFileFor(Product product, string attributesXml) } private object[] Concat(params object[] values) - { - return values.Where(x => CommonHelper.IsTruthy(x)).ToArray(); - } - } + { + return values.Where(x => CommonHelper.IsTruthy(x)).ToArray(); + } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index 6fb4ec1b4c..857d32a675 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -41,458 +41,458 @@ namespace SmartStore.Services.Messages { public enum ModelTreeMemberKind - { - Primitive, - Complex, - Collection, - Root - } - - public class ModelTreeMember - { - public string Name { get; set; } - public ModelTreeMemberKind Kind { get; set; } - } - - public partial class MessageModelProvider : IMessageModelProvider - { - private readonly ICommonServices _services; - private readonly ITemplateEngine _templateEngine; - private readonly IMessageTemplateService _messageTemplateService; - private readonly IEmailAccountService _emailAccountService; - private readonly UrlHelper _urlHelper; - - public MessageModelProvider( - ICommonServices services, - ITemplateEngine templateEngine, - IMessageTemplateService messageTemplateService, - IEmailAccountService emailAccountService, - UrlHelper urlHelper) - { - _services = services; - _templateEngine = templateEngine; - _messageTemplateService = messageTemplateService; - _emailAccountService = emailAccountService; - _urlHelper = urlHelper; - - T = NullLocalizer.InstanceEx; - Logger = NullLogger.Instance; - } - - public LocalizerEx T { get; set; } - public ILogger Logger { get; set; } - - public virtual void AddGlobalModelParts(MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - - var model = messageContext.Model; - - model["Context"] = new Dictionary - { - { "TemplateName", messageContext.MessageTemplate.Name }, - { "LanguageId", messageContext.Language.Id }, - { "LanguageCulture", messageContext.Language.LanguageCulture }, - { "LanguageRtl", messageContext.Language.Rtl }, - { "BaseUrl", messageContext.BaseUri.ToString() } - }; - - dynamic email = new ExpandoObject(); - email.Email = messageContext.EmailAccount.Email; - email.SenderName = messageContext.EmailAccount.DisplayName; - email.DisplayName = messageContext.EmailAccount.DisplayName; // Alias - model["Email"] = email; - - model["Theme"] = CreateThemeModelPart(messageContext); - model["Customer"] = CreateModelPart(messageContext.Customer, messageContext); - model["Store"] = CreateModelPart(messageContext.Store, messageContext); - } - - public object CreateModelPart(object part, bool ignoreNullMembers, params string[] ignoreMemberNames) - { - Guard.NotNull(part, nameof(part)); - - var store = _services.StoreContext.CurrentStore; - var messageContext = new MessageContext - { - Language = _services.WorkContext.WorkingLanguage, - Store = store, - BaseUri = new Uri(_services.StoreService.GetHost(store)), - Model = new TemplateModel() - }; - - if (part is Customer x) - { - // This case is not handled in AddModelPart core method. - messageContext.Customer = x; - messageContext.Model["Part"] = CreateModelPart(x, messageContext); - } - else - { - messageContext.Customer = _services.WorkContext.CurrentCustomer; - AddModelPart(part, messageContext, "Part"); - } - - object result = null; - - if (messageContext.Model.Any()) - { - result = messageContext.Model.FirstOrDefault().Value; - - if (result is IDictionary dict) - { - SanitizeModelDictionary(dict, ignoreNullMembers, ignoreMemberNames); - } - } - - return result; - } - - private void SanitizeModelDictionary(IDictionary dict, bool ignoreNullMembers, params string[] ignoreMemberNames) - { - if (ignoreNullMembers || ignoreMemberNames.Length > 0) - { - foreach (var key in dict.Keys.ToArray()) - { - var expando = dict as HybridExpando; - var value = dict[key]; - - if ((ignoreNullMembers && value == null) || ignoreMemberNames.Contains(key)) - { - if (expando != null) - expando.Override(key, null); // INFO: we cannot remove entries from HybridExpando - else - dict.Remove(key); - continue; - } - - if (value != null && value.GetType().IsSequenceType()) - { - var ignoreMemberNames2 = ignoreMemberNames - .Where(x => x.StartsWith(key + ".", StringComparison.OrdinalIgnoreCase)) - .Select(x => x.Substring(key.Length + 1)) - .ToArray(); - - if (value is IDictionary dict2) - { - SanitizeModelDictionary(dict2, ignoreNullMembers, ignoreMemberNames2); - } - else - { - var list = ((IEnumerable)value).OfType>(); - foreach (var dict3 in list) - { - SanitizeModelDictionary(dict3, ignoreNullMembers, ignoreMemberNames2); - } - } - } - } - } - } - - public virtual void AddModelPart(object part, MessageContext messageContext, string name = null) - { - Guard.NotNull(part, nameof(part)); - Guard.NotNull(messageContext, nameof(messageContext)); - - var model = messageContext.Model; - - name = name.NullEmpty() ?? ResolveModelName(part); - - object modelPart = null; - - switch (part) - { - case INamedModelPart x: - modelPart = x; - break; - case IModelPart x: - MergeModelBag(x, model, messageContext); - break; - case Order x: - modelPart = CreateModelPart(x, messageContext); - break; - case Product x: - modelPart = CreateModelPart(x, messageContext); - break; - case Customer x: - modelPart = CreateModelPart(x, messageContext); - break; - case Address x: - modelPart = CreateModelPart(x, messageContext); - break; - case Shipment x: - modelPart = CreateModelPart(x, messageContext); - break; - case OrderNote x: - modelPart = CreateModelPart(x, messageContext); - break; - case RecurringPayment x: - modelPart = CreateModelPart(x, messageContext); - break; - case ReturnRequest x: - modelPart = CreateModelPart(x, messageContext); - break; - case GiftCard x: - modelPart = CreateModelPart(x, messageContext); - break; - case NewsLetterSubscription x: - modelPart = CreateModelPart(x, messageContext); - break; - case Campaign x: - modelPart = CreateModelPart(x, messageContext); - break; - case ProductReview x: - modelPart = CreateModelPart(x, messageContext); - break; - case BlogComment x: - modelPart = CreateModelPart(x, messageContext); - break; - case NewsComment x: - modelPart = CreateModelPart(x, messageContext); - break; - case ForumTopic x: - modelPart = CreateModelPart(x, messageContext); - break; - case ForumPost x: - modelPart = CreateModelPart(x, messageContext); - break; + { + Primitive, + Complex, + Collection, + Root + } + + public class ModelTreeMember + { + public string Name { get; set; } + public ModelTreeMemberKind Kind { get; set; } + } + + public partial class MessageModelProvider : IMessageModelProvider + { + private readonly ICommonServices _services; + private readonly ITemplateEngine _templateEngine; + private readonly IMessageTemplateService _messageTemplateService; + private readonly IEmailAccountService _emailAccountService; + private readonly UrlHelper _urlHelper; + + public MessageModelProvider( + ICommonServices services, + ITemplateEngine templateEngine, + IMessageTemplateService messageTemplateService, + IEmailAccountService emailAccountService, + UrlHelper urlHelper) + { + _services = services; + _templateEngine = templateEngine; + _messageTemplateService = messageTemplateService; + _emailAccountService = emailAccountService; + _urlHelper = urlHelper; + + T = NullLocalizer.InstanceEx; + Logger = NullLogger.Instance; + } + + public LocalizerEx T { get; set; } + public ILogger Logger { get; set; } + + public virtual void AddGlobalModelParts(MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + + var model = messageContext.Model; + + model["Context"] = new Dictionary + { + { "TemplateName", messageContext.MessageTemplate.Name }, + { "LanguageId", messageContext.Language.Id }, + { "LanguageCulture", messageContext.Language.LanguageCulture }, + { "LanguageRtl", messageContext.Language.Rtl }, + { "BaseUrl", messageContext.BaseUri.ToString() } + }; + + dynamic email = new ExpandoObject(); + email.Email = messageContext.EmailAccount.Email; + email.SenderName = messageContext.EmailAccount.DisplayName; + email.DisplayName = messageContext.EmailAccount.DisplayName; // Alias + model["Email"] = email; + + model["Theme"] = CreateThemeModelPart(messageContext); + model["Customer"] = CreateModelPart(messageContext.Customer, messageContext); + model["Store"] = CreateModelPart(messageContext.Store, messageContext); + } + + public object CreateModelPart(object part, bool ignoreNullMembers, params string[] ignoreMemberNames) + { + Guard.NotNull(part, nameof(part)); + + var store = _services.StoreContext.CurrentStore; + var messageContext = new MessageContext + { + Language = _services.WorkContext.WorkingLanguage, + Store = store, + BaseUri = new Uri(_services.StoreService.GetHost(store)), + Model = new TemplateModel() + }; + + if (part is Customer x) + { + // This case is not handled in AddModelPart core method. + messageContext.Customer = x; + messageContext.Model["Part"] = CreateModelPart(x, messageContext); + } + else + { + messageContext.Customer = _services.WorkContext.CurrentCustomer; + AddModelPart(part, messageContext, "Part"); + } + + object result = null; + + if (messageContext.Model.Any()) + { + result = messageContext.Model.FirstOrDefault().Value; + + if (result is IDictionary dict) + { + SanitizeModelDictionary(dict, ignoreNullMembers, ignoreMemberNames); + } + } + + return result; + } + + private void SanitizeModelDictionary(IDictionary dict, bool ignoreNullMembers, params string[] ignoreMemberNames) + { + if (ignoreNullMembers || ignoreMemberNames.Length > 0) + { + foreach (var key in dict.Keys.ToArray()) + { + var expando = dict as HybridExpando; + var value = dict[key]; + + if ((ignoreNullMembers && value == null) || ignoreMemberNames.Contains(key)) + { + if (expando != null) + expando.Override(key, null); // INFO: we cannot remove entries from HybridExpando + else + dict.Remove(key); + continue; + } + + if (value != null && value.GetType().IsSequenceType()) + { + var ignoreMemberNames2 = ignoreMemberNames + .Where(x => x.StartsWith(key + ".", StringComparison.OrdinalIgnoreCase)) + .Select(x => x.Substring(key.Length + 1)) + .ToArray(); + + if (value is IDictionary dict2) + { + SanitizeModelDictionary(dict2, ignoreNullMembers, ignoreMemberNames2); + } + else + { + var list = ((IEnumerable)value).OfType>(); + foreach (var dict3 in list) + { + SanitizeModelDictionary(dict3, ignoreNullMembers, ignoreMemberNames2); + } + } + } + } + } + } + + public virtual void AddModelPart(object part, MessageContext messageContext, string name = null) + { + Guard.NotNull(part, nameof(part)); + Guard.NotNull(messageContext, nameof(messageContext)); + + var model = messageContext.Model; + + name = name.NullEmpty() ?? ResolveModelName(part); + + object modelPart = null; + + switch (part) + { + case INamedModelPart x: + modelPart = x; + break; + case IModelPart x: + MergeModelBag(x, model, messageContext); + break; + case Order x: + modelPart = CreateModelPart(x, messageContext); + break; + case Product x: + modelPart = CreateModelPart(x, messageContext); + break; + case Customer x: + modelPart = CreateModelPart(x, messageContext); + break; + case Address x: + modelPart = CreateModelPart(x, messageContext); + break; + case Shipment x: + modelPart = CreateModelPart(x, messageContext); + break; + case OrderNote x: + modelPart = CreateModelPart(x, messageContext); + break; + case RecurringPayment x: + modelPart = CreateModelPart(x, messageContext); + break; + case ReturnRequest x: + modelPart = CreateModelPart(x, messageContext); + break; + case GiftCard x: + modelPart = CreateModelPart(x, messageContext); + break; + case NewsLetterSubscription x: + modelPart = CreateModelPart(x, messageContext); + break; + case Campaign x: + modelPart = CreateModelPart(x, messageContext); + break; + case ProductReview x: + modelPart = CreateModelPart(x, messageContext); + break; + case BlogComment x: + modelPart = CreateModelPart(x, messageContext); + break; + case NewsComment x: + modelPart = CreateModelPart(x, messageContext); + break; + case ForumTopic x: + modelPart = CreateModelPart(x, messageContext); + break; + case ForumPost x: + modelPart = CreateModelPart(x, messageContext); + break; case ForumPostVote x: modelPart = CreateModelPart(x, messageContext); break; - case Forum x: - modelPart = CreateModelPart(x, messageContext); - break; - case PrivateMessage x: - modelPart = CreateModelPart(x, messageContext); - break; - case IEnumerable x: - modelPart = CreateModelPart(x, messageContext); - break; - case PollVotingRecord x: - modelPart = CreateModelPart(x, messageContext); - break; - case ProductReviewHelpfulness x: - modelPart = CreateModelPart(x, messageContext); - break; - case ForumSubscription x: - modelPart = CreateModelPart(x, messageContext); - break; - case BackInStockSubscription x: - modelPart = CreateModelPart(x, messageContext); - break; - default: - var partType = part.GetType(); - modelPart = part; - - if (partType.IsPlainObjectType() && !partType.IsAnonymous()) - { - var evt = new MessageModelPartMappingEvent(part); - _services.EventPublisher.Publish(evt); - - if (evt.Result != null && !object.ReferenceEquals(evt.Result, part)) - { - modelPart = evt.Result; - name = evt.ModelPartName.NullEmpty() ?? ResolveModelName(evt.Result) ?? name; - } - else - { - modelPart = part; - } - - modelPart = evt.Result ?? part; - name = evt.ModelPartName.NullEmpty() ?? name; - } - - break; - } - - if (modelPart != null) - { - if (name.IsEmpty()) - { - throw new SmartException($"Could not resolve a model key for part '{modelPart.GetType().Name}'. Use an instance of 'NamedModelPart' class to pass model with name."); - } - - if (model.TryGetValue(name, out var existing)) - { - // A model part with the same name exists in model already... - if (existing is IDictionary x) - { - // but it's a dictionary which we can easily merge with - x.Merge(FastProperty.ObjectToDictionary(modelPart), true); - } - else - { - // Wrap in HybridExpando and merge - var he = new HybridExpando(existing, true); - he.Merge(FastProperty.ObjectToDictionary(modelPart), true); - model[name] = he; - } - } - else - { - // Put part to model as new property - model[name] = modelPart; - } - } - } - - public string ResolveModelName(object model) - { - Guard.NotNull(model, nameof(model)); - - string name = null; - var type = model.GetType(); - - try - { - if (model is BaseEntity be) - { - name = be.GetUnproxiedType().Name; - } - else if (model is ITestModel te) - { - name = te.ModelName; - } - else if (model is INamedModelPart mp) - { - name = mp.ModelPartName; - } - else if (type.IsPlainObjectType()) - { - name = type.Name; - } - } - catch { } - - return name; - } - - #region Global model part handlers - - protected virtual object CreateThemeModelPart(MessageContext messageContext) - { - var m = new Dictionary - { - { "FontFamily", "-apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif" }, - { "BodyBg", "#f2f4f6" }, - { "BodyColor", "#555" }, - { "TitleColor", "#2f3133" }, - { "ContentBg", "#fff" }, - { "ShadeColor", "#e2e2e2" }, - { "LinkColor", "#0066c0" }, - { "BrandPrimary", "#3f51b5" }, - { "BrandSuccess", "#4caf50" }, - { "BrandWarning", "#ff9800" }, - { "BrandDanger", "#f44336" }, - { "MutedColor", "#a5a5a5" }, - }; - - return m; - } - - protected virtual object CreateCompanyModelPart(MessageContext messageContext) - { - var settings = _services.Settings.LoadSetting(messageContext.Store.Id); - dynamic m = new HybridExpando(settings, true); - - m.NameLine = Concat(settings.Salutation, settings.Title, settings.Firstname, settings.Lastname); - m.StreetLine = Concat(settings.Street, settings.Street2); - m.CityLine = Concat(settings.ZipCode, settings.City); - m.CountryLine = Concat(settings.CountryName, settings.Region); - - PublishModelPartCreatedEvent(settings, m); - return m; - } - - protected virtual object CreateBankModelPart(MessageContext messageContext) - { - var settings = _services.Settings.LoadSetting(messageContext.Store.Id); - var m = new HybridExpando(settings, true); - PublishModelPartCreatedEvent(settings, m); - return m; - } - - protected virtual object CreateContactModelPart(MessageContext messageContext) - { - var settings = _services.Settings.LoadSetting(messageContext.Store.Id); - var contact = new HybridExpando(settings, true) as dynamic; - - // Aliases - contact.Phone = new - { - Company = settings.CompanyTelephoneNumber.NullEmpty(), - Hotline = settings.HotlineTelephoneNumber.NullEmpty(), - Mobile = settings.MobileTelephoneNumber.NullEmpty(), - Fax = settings.CompanyFaxNumber.NullEmpty() - }; - - contact.Email = new - { - Company = settings.CompanyEmailAddress.NullEmpty(), - Webmaster = settings.WebmasterEmailAddress.NullEmpty(), - Support = settings.SupportEmailAddress.NullEmpty(), - Contact = settings.ContactEmailAddress.NullEmpty() - }; - - PublishModelPartCreatedEvent(settings, contact); - - return contact; - } - - #endregion - - #region Generic model part handlers - - protected virtual void MergeModelBag(IModelPart part, IDictionary model, MessageContext messageContext) - { - if (!(model.Get("Bag") is IDictionary bag)) - { - model["Bag"] = bag = new Dictionary(); - } - - var source = part as IDictionary; - bag.Merge(source); - } - - #endregion - - #region Entity specific model part handlers - - protected virtual object CreateModelPart(Store part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var host = messageContext.BaseUri.ToString(); + case Forum x: + modelPart = CreateModelPart(x, messageContext); + break; + case PrivateMessage x: + modelPart = CreateModelPart(x, messageContext); + break; + case IEnumerable x: + modelPart = CreateModelPart(x, messageContext); + break; + case PollVotingRecord x: + modelPart = CreateModelPart(x, messageContext); + break; + case ProductReviewHelpfulness x: + modelPart = CreateModelPart(x, messageContext); + break; + case ForumSubscription x: + modelPart = CreateModelPart(x, messageContext); + break; + case BackInStockSubscription x: + modelPart = CreateModelPart(x, messageContext); + break; + default: + var partType = part.GetType(); + modelPart = part; + + if (partType.IsPlainObjectType() && !partType.IsAnonymous()) + { + var evt = new MessageModelPartMappingEvent(part); + _services.EventPublisher.Publish(evt); + + if (evt.Result != null && !object.ReferenceEquals(evt.Result, part)) + { + modelPart = evt.Result; + name = evt.ModelPartName.NullEmpty() ?? ResolveModelName(evt.Result) ?? name; + } + else + { + modelPart = part; + } + + modelPart = evt.Result ?? part; + name = evt.ModelPartName.NullEmpty() ?? name; + } + + break; + } + + if (modelPart != null) + { + if (name.IsEmpty()) + { + throw new SmartException($"Could not resolve a model key for part '{modelPart.GetType().Name}'. Use an instance of 'NamedModelPart' class to pass model with name."); + } + + if (model.TryGetValue(name, out var existing)) + { + // A model part with the same name exists in model already... + if (existing is IDictionary x) + { + // but it's a dictionary which we can easily merge with + x.Merge(FastProperty.ObjectToDictionary(modelPart), true); + } + else + { + // Wrap in HybridExpando and merge + var he = new HybridExpando(existing, true); + he.Merge(FastProperty.ObjectToDictionary(modelPart), true); + model[name] = he; + } + } + else + { + // Put part to model as new property + model[name] = modelPart; + } + } + } + + public string ResolveModelName(object model) + { + Guard.NotNull(model, nameof(model)); + + string name = null; + var type = model.GetType(); + + try + { + if (model is BaseEntity be) + { + name = be.GetUnproxiedType().Name; + } + else if (model is ITestModel te) + { + name = te.ModelName; + } + else if (model is INamedModelPart mp) + { + name = mp.ModelPartName; + } + else if (type.IsPlainObjectType()) + { + name = type.Name; + } + } + catch { } + + return name; + } + + #region Global model part handlers + + protected virtual object CreateThemeModelPart(MessageContext messageContext) + { + var m = new Dictionary + { + { "FontFamily", "-apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif" }, + { "BodyBg", "#f2f4f6" }, + { "BodyColor", "#555" }, + { "TitleColor", "#2f3133" }, + { "ContentBg", "#fff" }, + { "ShadeColor", "#e2e2e2" }, + { "LinkColor", "#0066c0" }, + { "BrandPrimary", "#3f51b5" }, + { "BrandSuccess", "#4caf50" }, + { "BrandWarning", "#ff9800" }, + { "BrandDanger", "#f44336" }, + { "MutedColor", "#a5a5a5" }, + }; + + return m; + } + + protected virtual object CreateCompanyModelPart(MessageContext messageContext) + { + var settings = _services.Settings.LoadSetting(messageContext.Store.Id); + dynamic m = new HybridExpando(settings, true); + + m.NameLine = Concat(settings.Salutation, settings.Title, settings.Firstname, settings.Lastname); + m.StreetLine = Concat(settings.Street, settings.Street2); + m.CityLine = Concat(settings.ZipCode, settings.City); + m.CountryLine = Concat(settings.CountryName, settings.Region); + + PublishModelPartCreatedEvent(settings, m); + return m; + } + + protected virtual object CreateBankModelPart(MessageContext messageContext) + { + var settings = _services.Settings.LoadSetting(messageContext.Store.Id); + var m = new HybridExpando(settings, true); + PublishModelPartCreatedEvent(settings, m); + return m; + } + + protected virtual object CreateContactModelPart(MessageContext messageContext) + { + var settings = _services.Settings.LoadSetting(messageContext.Store.Id); + var contact = new HybridExpando(settings, true) as dynamic; + + // Aliases + contact.Phone = new + { + Company = settings.CompanyTelephoneNumber.NullEmpty(), + Hotline = settings.HotlineTelephoneNumber.NullEmpty(), + Mobile = settings.MobileTelephoneNumber.NullEmpty(), + Fax = settings.CompanyFaxNumber.NullEmpty() + }; + + contact.Email = new + { + Company = settings.CompanyEmailAddress.NullEmpty(), + Webmaster = settings.WebmasterEmailAddress.NullEmpty(), + Support = settings.SupportEmailAddress.NullEmpty(), + Contact = settings.ContactEmailAddress.NullEmpty() + }; + + PublishModelPartCreatedEvent(settings, contact); + + return contact; + } + + #endregion + + #region Generic model part handlers + + protected virtual void MergeModelBag(IModelPart part, IDictionary model, MessageContext messageContext) + { + if (!(model.Get("Bag") is IDictionary bag)) + { + model["Bag"] = bag = new Dictionary(); + } + + var source = part as IDictionary; + bag.Merge(source); + } + + #endregion + + #region Entity specific model part handlers + + protected virtual object CreateModelPart(Store part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var host = messageContext.BaseUri.ToString(); var logoFile = _services.MediaService.GetFileById(messageContext.Store.LogoMediaFileId, MediaLoadFlags.AsNoTracking); - // Issue: https://github.com/smartstore/SmartStoreNET/issues/1321 + // Issue: https://github.com/smartstore/SmartStoreNET/issues/1321 - var m = new Dictionary - { - { "Email", messageContext.EmailAccount.Email }, - { "EmailName", messageContext.EmailAccount.DisplayName }, - { "Name", part.Name }, - { "Url", host }, - { "Cdn", part.ContentDeliveryNetwork }, - { "PrimaryStoreCurrency", part.PrimaryStoreCurrency?.CurrencyCode }, - { "PrimaryExchangeRateCurrency", part.PrimaryExchangeRateCurrency?.CurrencyCode }, - { "Logo", CreateModelPart(logoFile, messageContext, host, null, new Size(400, 75)) }, - { "Company", CreateCompanyModelPart(messageContext) }, - { "Contact", CreateContactModelPart(messageContext) }, - { "Bank", CreateBankModelPart(messageContext) }, - { "Copyright", T("Content.CopyrightNotice", messageContext.Language.Id, DateTime.Now.Year.ToString(), part.Name).Text } - }; + var m = new Dictionary + { + { "Email", messageContext.EmailAccount.Email }, + { "EmailName", messageContext.EmailAccount.DisplayName }, + { "Name", part.Name }, + { "Url", host }, + { "Cdn", part.ContentDeliveryNetwork }, + { "PrimaryStoreCurrency", part.PrimaryStoreCurrency?.CurrencyCode }, + { "PrimaryExchangeRateCurrency", part.PrimaryExchangeRateCurrency?.CurrencyCode }, + { "Logo", CreateModelPart(logoFile, messageContext, host, null, new Size(400, 75)) }, + { "Company", CreateCompanyModelPart(messageContext) }, + { "Contact", CreateContactModelPart(messageContext) }, + { "Bank", CreateBankModelPart(messageContext) }, + { "Copyright", T("Content.CopyrightNotice", messageContext.Language.Id, DateTime.Now.Year.ToString(), part.Name).Text } + }; - var he = new HybridExpando(true); - he.Merge(m, true); + var he = new HybridExpando(true); + he.Merge(m, true); - PublishModelPartCreatedEvent(part, he); + PublishModelPartCreatedEvent(part, he); - return he; - } + return he; + } protected virtual object CreateModelPart( MediaFileInfo part, @@ -536,363 +536,363 @@ protected virtual object CreateModelPart( } protected virtual object CreateModelPart(Product part, MessageContext messageContext, string attributesXml = null) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var mediaSettings = _services.Resolve(); - var shoppingCartSettings = _services.Resolve(); - var catalogSettings = _services.Resolve(); - var deliveryTimeService = _services.Resolve(); - var quantityUnitService = _services.Resolve(); - var productUrlHelper = _services.Resolve(); - - var currency = _services.WorkContext.WorkingCurrency; - var additionalShippingCharge = new Money( - _services.Resolve().ConvertFromPrimaryStoreCurrency(part.AdditionalShippingCharge, currency), - currency, - true); - var url = BuildUrl(productUrlHelper.GetProductUrl(part.Id, part.GetSeName(messageContext.Language.Id), attributesXml), messageContext); + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var mediaSettings = _services.Resolve(); + var shoppingCartSettings = _services.Resolve(); + var catalogSettings = _services.Resolve(); + var deliveryTimeService = _services.Resolve(); + var quantityUnitService = _services.Resolve(); + var productUrlHelper = _services.Resolve(); + + var currency = _services.WorkContext.WorkingCurrency; + var additionalShippingCharge = new Money( + _services.Resolve().ConvertFromPrimaryStoreCurrency(part.AdditionalShippingCharge, currency), + currency, + true); + var url = BuildUrl(productUrlHelper.GetProductUrl(part.Id, part.GetSeName(messageContext.Language.Id), attributesXml), messageContext); var file = GetMediaFileFor(part, attributesXml); var name = part.GetLocalized(x => x.Name, messageContext.Language.Id).Value; - var alt = T("Media.Product.ImageAlternateTextFormat", messageContext.Language.Id, name).Text; - - var m = new Dictionary - { - { "Id", part.Id }, - { "Sku", catalogSettings.ShowProductSku ? part.Sku : null }, - { "Name", name }, - { "Description", part.GetLocalized(x => x.ShortDescription, messageContext.Language).Value.NullEmpty() }, - { "StockQuantity", part.StockQuantity }, - { "AdditionalShippingCharge", additionalShippingCharge }, - { "Url", url }, - { "Thumbnail", CreateModelPart(file, messageContext, url, mediaSettings.MessageProductThumbPictureSize, new Size(50, 50), alt) }, - { "ThumbnailLg", CreateModelPart(file, messageContext, url, mediaSettings.ProductThumbPictureSize, new Size(120, 120), alt) }, - { "DeliveryTime", null }, - { "QtyUnit", null } - }; - - if (shoppingCartSettings.ShowDeliveryTimes && part.IsShipEnabled) - { - if (deliveryTimeService.GetDeliveryTimeById(part.DeliveryTimeId ?? 0) is DeliveryTime dt) - { - m["DeliveryTime"] = new Dictionary - { - { "Color", dt.ColorHexValue }, - { "Name", dt.GetLocalized(x => x.Name, messageContext.Language).Value }, - }; - } - } - - if (quantityUnitService.GetQuantityUnitById(part.QuantityUnitId) is QuantityUnit qu) - { - m["QtyUnit"] = qu.GetLocalized(x => x.Name, messageContext.Language).Value; - } - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(Customer part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var email = part.FindEmail(); - var pwdRecoveryToken = part.GetAttribute(SystemCustomerAttributeNames.PasswordRecoveryToken).NullEmpty(); - var accountActivationToken = part.GetAttribute(SystemCustomerAttributeNames.AccountActivationToken).NullEmpty(); + var alt = T("Media.Product.ImageAlternateTextFormat", messageContext.Language.Id, name).Text; + + var m = new Dictionary + { + { "Id", part.Id }, + { "Sku", catalogSettings.ShowProductSku ? part.Sku : null }, + { "Name", name }, + { "Description", part.GetLocalized(x => x.ShortDescription, messageContext.Language).Value.NullEmpty() }, + { "StockQuantity", part.StockQuantity }, + { "AdditionalShippingCharge", additionalShippingCharge }, + { "Url", url }, + { "Thumbnail", CreateModelPart(file, messageContext, url, mediaSettings.MessageProductThumbPictureSize, new Size(50, 50), alt) }, + { "ThumbnailLg", CreateModelPart(file, messageContext, url, mediaSettings.ProductThumbPictureSize, new Size(120, 120), alt) }, + { "DeliveryTime", null }, + { "QtyUnit", null } + }; + + if (shoppingCartSettings.ShowDeliveryTimes && part.IsShipEnabled) + { + if (deliveryTimeService.GetDeliveryTimeById(part.DeliveryTimeId ?? 0) is DeliveryTime dt) + { + m["DeliveryTime"] = new Dictionary + { + { "Color", dt.ColorHexValue }, + { "Name", dt.GetLocalized(x => x.Name, messageContext.Language).Value }, + }; + } + } + + if (quantityUnitService.GetQuantityUnitById(part.QuantityUnitId) is QuantityUnit qu) + { + m["QtyUnit"] = qu.GetLocalized(x => x.Name, messageContext.Language).Value; + } + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(Customer part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var email = part.FindEmail(); + var pwdRecoveryToken = part.GetAttribute(SystemCustomerAttributeNames.PasswordRecoveryToken).NullEmpty(); + var accountActivationToken = part.GetAttribute(SystemCustomerAttributeNames.AccountActivationToken).NullEmpty(); var customerVatStatus = (VatNumberStatus)part.VatNumberStatusId; int rewardPointsBalance = part.GetRewardPointsBalance(); - decimal rewardPointsAmountBase = _services.Resolve().ConvertRewardPointsToAmount(rewardPointsBalance); - decimal rewardPointsAmount = _services.Resolve().ConvertFromPrimaryStoreCurrency(rewardPointsAmountBase, _services.WorkContext.WorkingCurrency); + decimal rewardPointsAmountBase = _services.Resolve().ConvertRewardPointsToAmount(rewardPointsBalance); + decimal rewardPointsAmount = _services.Resolve().ConvertFromPrimaryStoreCurrency(rewardPointsAmountBase, _services.WorkContext.WorkingCurrency); + + var m = new Dictionary + { + ["Id"] = part.Id, + ["CustomerGuid"] = part.CustomerGuid, + ["Username"] = part.Username, + ["Email"] = email, + ["IsTaxExempt"] = part.IsTaxExempt, + ["LastIpAddress"] = part.LastIpAddress, + ["CreatedOn"] = ToUserDate(part.CreatedOnUtc, messageContext), + ["LastLoginOn"] = ToUserDate(part.LastLoginDateUtc, messageContext), + ["LastActivityOn"] = ToUserDate(part.LastActivityDateUtc, messageContext), + + ["FullName"] = GetDisplayNameForCustomer(part).NullEmpty(), + ["VatNumber"] = part.GetAttribute(SystemCustomerAttributeNames.VatNumber).NullEmpty(), + ["VatNumberStatus"] = customerVatStatus.GetLocalizedEnum(_services.Localization, messageContext.Language.Id).NullEmpty(), + ["CustomerNumber"] = part.CustomerNumber.NullEmpty(), + ["IsRegistered"] = part.IsRegistered(), + + // URLs + ["WishlistUrl"] = BuildRouteUrl("Wishlist", new { customerGuid = part.CustomerGuid }, messageContext), + ["EditUrl"] = BuildActionUrl("Edit", "Customer", new { id = part.Id, area = "admin" }, messageContext), + ["PasswordRecoveryURL"] = pwdRecoveryToken == null ? null : BuildActionUrl("passwordrecoveryconfirm", "customer", + new { token = part.GetAttribute(SystemCustomerAttributeNames.PasswordRecoveryToken), email, area = "" }, + messageContext), + ["AccountActivationURL"] = accountActivationToken == null ? null : BuildActionUrl("activation", "customer", + new { token = part.GetAttribute(SystemCustomerAttributeNames.AccountActivationToken), email, area = "" }, + messageContext), + + // Addresses + ["BillingAddress"] = CreateModelPart(part.BillingAddress ?? new Address(), messageContext), + ["ShippingAddress"] = part.ShippingAddress == null ? null : CreateModelPart(part.ShippingAddress, messageContext), + + // Reward Points + ["RewardPointsAmount"] = rewardPointsAmount, + ["RewardPointsBalance"] = FormatPrice(rewardPointsAmount, messageContext), + ["RewardPointsHistory"] = part.RewardPointsHistory.Count == 0 ? null : part.RewardPointsHistory.Select(x => CreateModelPart(x, messageContext)).ToList(), + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(GiftCard part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "Id", part.Id }, + { "SenderName", part.SenderName.NullEmpty() }, + { "SenderEmail", part.SenderEmail.NullEmpty() }, + { "RecipientName", part.RecipientName.NullEmpty() }, + { "RecipientEmail", part.RecipientEmail.NullEmpty() }, + { "Amount", FormatPrice(part.Amount, messageContext) }, + { "CouponCode", part.GiftCardCouponCode.NullEmpty() } + }; + + // Message + var message = (string)null; + if (part.Message.HasValue()) + { + message = HtmlUtils.StripTags(part.Message); + } + m["Message"] = message; + + // RemainingAmount + Money remainingAmount = null; + var order = part?.PurchasedWithOrderItem?.Order; + if (order != null) + { + remainingAmount = FormatPrice(part.GetGiftCardRemainingAmount(), order, messageContext); + } + m["RemainingAmount"] = remainingAmount; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(NewsLetterSubscription part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var gid = part.NewsLetterSubscriptionGuid; + + var m = new Dictionary + { + { "Id", part.Id }, + { "Email", part.Email.NullEmpty() }, + { "ActivationUrl", gid == Guid.Empty ? null : BuildRouteUrl("NewsletterActivation", new { token = part.NewsLetterSubscriptionGuid, active = true }, messageContext) }, + { "DeactivationUrl", gid == Guid.Empty ? null : BuildRouteUrl("NewsletterActivation", new { token = part.NewsLetterSubscriptionGuid, active = false }, messageContext) } + }; + + var customer = messageContext.Customer; + if (customer != null && customer.Email.IsCaseInsensitiveEqual(part.Email.EmptyNull())) + { + // Set FullName only if a customer account exists for the subscriber's email address. + m["FullName"] = customer.GetFullName(); + } + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(Campaign part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var protocol = messageContext.BaseUri.Scheme; + var host = messageContext.BaseUri.Authority + messageContext.BaseUri.AbsolutePath; + var body = HtmlUtils.RelativizeFontSizes(part.Body.EmptyNull()); + + // We must render the body separately + body = _templateEngine.Render(body, messageContext.Model, messageContext.FormatProvider); + + var m = new Dictionary + { + { "Id", part.Id }, + { "Subject", part.Subject.NullEmpty() }, + { "Body", WebHelper.MakeAllUrlsAbsolute(body, protocol, host).NullEmpty() }, + { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(ProductReview part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "Title", part.Title.NullEmpty() }, + { "Text", HtmlUtils.StripTags(part.ReviewText).NullEmpty() }, + { "Rating", part.Rating } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(ProductReviewHelpfulness part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "ProductReviewId", part.ProductReviewId }, + { "ReviewTitle", part.ProductReview.Title }, + { "WasHelpful", part.WasHelpful } + }; + + ApplyCustomerContentPart(m, part, messageContext); + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(PollVotingRecord part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "PollAnswerId", part.PollAnswerId }, + { "PollAnswerName", part.PollAnswer.Name }, + { "PollId", part.PollAnswer.PollId } + }; + + ApplyCustomerContentPart(m, part, messageContext); + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(PrivateMessage part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "Subject", part.Subject.NullEmpty() }, + { "Text", part.FormatPrivateMessageText().NullEmpty() }, + { "FromEmail", part.FromCustomer?.FindEmail().NullEmpty() }, + { "ToEmail", part.ToCustomer?.FindEmail().NullEmpty() }, + { "FromName", part.FromCustomer?.GetFullName().NullEmpty() }, + { "ToName", part.ToCustomer?.GetFullName().NullEmpty() }, + { "Url", BuildActionUrl("View", "PrivateMessages", new { id = part.Id, area = "" }, messageContext) } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(BlogComment part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); var m = new Dictionary - { - ["Id"] = part.Id, - ["CustomerGuid"] = part.CustomerGuid, - ["Username"] = part.Username, - ["Email"] = email, - ["IsTaxExempt"] = part.IsTaxExempt, - ["LastIpAddress"] = part.LastIpAddress, - ["CreatedOn"] = ToUserDate(part.CreatedOnUtc, messageContext), - ["LastLoginOn"] = ToUserDate(part.LastLoginDateUtc, messageContext), - ["LastActivityOn"] = ToUserDate(part.LastActivityDateUtc, messageContext), - - ["FullName"] = GetDisplayNameForCustomer(part).NullEmpty(), - ["VatNumber"] = part.GetAttribute(SystemCustomerAttributeNames.VatNumber).NullEmpty(), - ["VatNumberStatus"] = customerVatStatus.GetLocalizedEnum(_services.Localization, messageContext.Language.Id).NullEmpty(), - ["CustomerNumber"] = part.CustomerNumber.NullEmpty(), - ["IsRegistered"] = part.IsRegistered(), - - // URLs - ["WishlistUrl"] = BuildRouteUrl("Wishlist", new { customerGuid = part.CustomerGuid }, messageContext), - ["EditUrl"] = BuildActionUrl("Edit", "Customer", new { id = part.Id, area = "admin" }, messageContext), - ["PasswordRecoveryURL"] = pwdRecoveryToken == null ? null : BuildActionUrl("passwordrecoveryconfirm", "customer", - new { token = part.GetAttribute(SystemCustomerAttributeNames.PasswordRecoveryToken), email, area = "" }, - messageContext), - ["AccountActivationURL"] = accountActivationToken == null ? null : BuildActionUrl("activation", "customer", - new { token = part.GetAttribute(SystemCustomerAttributeNames.AccountActivationToken), email, area = "" }, - messageContext), - - // Addresses - ["BillingAddress"] = CreateModelPart(part.BillingAddress ?? new Address(), messageContext), - ["ShippingAddress"] = part.ShippingAddress == null ? null : CreateModelPart(part.ShippingAddress, messageContext), - - // Reward Points - ["RewardPointsAmount"] = rewardPointsAmount, - ["RewardPointsBalance"] = FormatPrice(rewardPointsAmount, messageContext), - ["RewardPointsHistory"] = part.RewardPointsHistory.Count == 0 ? null : part.RewardPointsHistory.Select(x => CreateModelPart(x, messageContext)).ToList(), - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(GiftCard part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "Id", part.Id }, - { "SenderName", part.SenderName.NullEmpty() }, - { "SenderEmail", part.SenderEmail.NullEmpty() }, - { "RecipientName", part.RecipientName.NullEmpty() }, - { "RecipientEmail", part.RecipientEmail.NullEmpty() }, - { "Amount", FormatPrice(part.Amount, messageContext) }, - { "CouponCode", part.GiftCardCouponCode.NullEmpty() } - }; - - // Message - var message = (string)null; - if (part.Message.HasValue()) - { - message = HtmlUtils.StripTags(part.Message); - } - m["Message"] = message; - - // RemainingAmount - Money remainingAmount = null; - var order = part?.PurchasedWithOrderItem?.Order; - if (order != null) - { - remainingAmount = FormatPrice(part.GetGiftCardRemainingAmount(), order, messageContext); - } - m["RemainingAmount"] = remainingAmount; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(NewsLetterSubscription part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var gid = part.NewsLetterSubscriptionGuid; - - var m = new Dictionary - { - { "Id", part.Id }, - { "Email", part.Email.NullEmpty() }, - { "ActivationUrl", gid == Guid.Empty ? null : BuildRouteUrl("NewsletterActivation", new { token = part.NewsLetterSubscriptionGuid, active = true }, messageContext) }, - { "DeactivationUrl", gid == Guid.Empty ? null : BuildRouteUrl("NewsletterActivation", new { token = part.NewsLetterSubscriptionGuid, active = false }, messageContext) } - }; - - var customer = messageContext.Customer; - if (customer != null && customer.Email.IsCaseInsensitiveEqual(part.Email.EmptyNull())) - { - // Set FullName only if a customer account exists for the subscriber's email address. - m["FullName"] = customer.GetFullName(); - } - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(Campaign part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var protocol = messageContext.BaseUri.Scheme; - var host = messageContext.BaseUri.Authority + messageContext.BaseUri.AbsolutePath; - var body = HtmlUtils.RelativizeFontSizes(part.Body.EmptyNull()); - - // We must render the body separately - body = _templateEngine.Render(body, messageContext.Model, messageContext.FormatProvider); - - var m = new Dictionary - { - { "Id", part.Id }, - { "Subject", part.Subject.NullEmpty() }, - { "Body", WebHelper.MakeAllUrlsAbsolute(body, protocol, host).NullEmpty() }, - { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) } - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(ProductReview part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "Title", part.Title.NullEmpty() }, - { "Text", HtmlUtils.StripTags(part.ReviewText).NullEmpty() }, - { "Rating", part.Rating } - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(ProductReviewHelpfulness part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "ProductReviewId", part.ProductReviewId }, - { "ReviewTitle", part.ProductReview.Title }, - { "WasHelpful", part.WasHelpful } - }; - - ApplyCustomerContentPart(m, part, messageContext); - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(PollVotingRecord part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "PollAnswerId", part.PollAnswerId }, - { "PollAnswerName", part.PollAnswer.Name }, - { "PollId", part.PollAnswer.PollId } - }; - - ApplyCustomerContentPart(m, part, messageContext); - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(PrivateMessage part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "Subject", part.Subject.NullEmpty() }, - { "Text", part.FormatPrivateMessageText().NullEmpty() }, - { "FromEmail", part.FromCustomer?.FindEmail().NullEmpty() }, - { "ToEmail", part.ToCustomer?.FindEmail().NullEmpty() }, - { "FromName", part.FromCustomer?.GetFullName().NullEmpty() }, - { "ToName", part.ToCustomer?.GetFullName().NullEmpty() }, - { "Url", BuildActionUrl("View", "PrivateMessages", new { id = part.Id, area = "" }, messageContext) } - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(BlogComment part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "PostTitle", part.BlogPost.Title.NullEmpty() }, - { "PostUrl", BuildRouteUrl("BlogPost", new { SeName = part.BlogPost.GetSeName(part.BlogPost.LanguageId, ensureTwoPublishedLanguages: false) }, messageContext) }, - { "Text", part.CommentText.NullEmpty() } - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(NewsComment part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "NewsTitle", part.NewsItem.Title.NullEmpty() }, - { "Title", part.CommentTitle.NullEmpty() }, - { "Text", HtmlUtils.StripTags(part.CommentText).NullEmpty() }, - { "NewsUrl", BuildRouteUrl("NewsItem", new { SeName = part.NewsItem.GetSeName(messageContext.Language.Id) }, messageContext) } - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } + { + { "PostTitle", part.BlogPost.Title.NullEmpty() }, + { "PostUrl", BuildRouteUrl("BlogPost", new { SeName = part.BlogPost.GetSeName(part.BlogPost.LanguageId, ensureTwoPublishedLanguages: false) }, messageContext) }, + { "Text", part.CommentText.NullEmpty() } + }; - protected virtual object CreateModelPart(ForumTopic part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var pageIndex = messageContext.Model.GetFromBag("TopicPageIndex"); - - var url = pageIndex > 0 ? - BuildRouteUrl("TopicSlugPaged", new { id = part.Id, slug = part.GetSeName(), page = pageIndex }, messageContext) : - BuildRouteUrl("TopicSlug", new { id = part.Id, slug = part.GetSeName() }, messageContext); - - var m = new Dictionary - { - { "Subject", part.Subject.NullEmpty() }, - { "NumReplies", part.NumReplies }, - { "NumPosts", part.NumPosts }, - { "NumViews", part.Views }, - { "Body", part.GetFirstPost(_services.Resolve())?.FormatPostText().NullEmpty() }, - { "Url", url }, - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(ForumPost part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "Author", part.Customer.FormatUserName().NullEmpty() }, - { "Body", part.FormatPostText().NullEmpty() } - }; + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(NewsComment part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "NewsTitle", part.NewsItem.Title.NullEmpty() }, + { "Title", part.CommentTitle.NullEmpty() }, + { "Text", HtmlUtils.StripTags(part.CommentText).NullEmpty() }, + { "NewsUrl", BuildRouteUrl("NewsItem", new { SeName = part.NewsItem.GetSeName(messageContext.Language.Id) }, messageContext) } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(ForumTopic part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); - PublishModelPartCreatedEvent(part, m); - - return m; - } + var pageIndex = messageContext.Model.GetFromBag("TopicPageIndex"); + + var url = pageIndex > 0 ? + BuildRouteUrl("TopicSlugPaged", new { id = part.Id, slug = part.GetSeName(), page = pageIndex }, messageContext) : + BuildRouteUrl("TopicSlug", new { id = part.Id, slug = part.GetSeName() }, messageContext); + + var m = new Dictionary + { + { "Subject", part.Subject.NullEmpty() }, + { "NumReplies", part.NumReplies }, + { "NumPosts", part.NumPosts }, + { "NumViews", part.Views }, + { "Body", part.GetFirstPost(_services.Resolve())?.FormatPostText().NullEmpty() }, + { "Url", url }, + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(ForumPost part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "Author", part.Customer.FormatUserName().NullEmpty() }, + { "Body", part.FormatPostText().NullEmpty() } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } protected virtual object CreateModelPart(ForumPostVote part, MessageContext messageContext) { @@ -915,271 +915,271 @@ protected virtual object CreateModelPart(ForumPostVote part, MessageContext mess } protected virtual object CreateModelPart(Forum part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "Name", part.GetLocalized(x => x.Name, messageContext.Language).Value.NullEmpty() }, - { "GroupName", part.ForumGroup?.GetLocalized(x => x.Name, messageContext.Language)?.Value.NullEmpty() }, - { "NumPosts", part.NumPosts }, - { "NumTopics", part.NumTopics }, - { "Url", BuildRouteUrl("ForumSlug", new { id = part.Id, slug = part.GetSeName(messageContext.Language.Id) }, messageContext) }, - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(Address part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var settings = _services.Resolve(); - var languageId = messageContext.Language?.Id ?? messageContext.LanguageId; - - var salutation = part.Salutation.NullEmpty(); - var title = part.Title.NullEmpty(); - var company = settings.CompanyEnabled ? part.Company : null; - var firstName = part.FirstName.NullEmpty(); - var lastName = part.LastName.NullEmpty(); - var street1 = settings.StreetAddressEnabled ? part.Address1 : null; - var street2 = settings.StreetAddress2Enabled ? part.Address2 : null; - var zip = settings.ZipPostalCodeEnabled ? part.ZipPostalCode : null; - var city = settings.CityEnabled ? part.City : null; - var country = settings.CountryEnabled ? part.Country?.GetLocalized(x => x.Name, languageId ?? 0)?.Value.NullEmpty() : null; - var state = settings.StateProvinceEnabled ? part.StateProvince?.GetLocalized(x => x.Name, languageId ?? 0)?.Value.NullEmpty() : null; - - var m = new Dictionary - { - { "Title", title }, - { "Salutation", salutation }, - { "FullSalutation", part.GetFullSalutaion().NullEmpty() }, - { "FullName", part.GetFullName(false).NullEmpty() }, - { "Company", company }, - { "FirstName", firstName }, - { "LastName", lastName }, - { "Street1", street1 }, - { "Street2", street2 }, - { "Country", country }, - { "CountryId", part.Country?.Id }, - { "CountryAbbrev2", settings.CountryEnabled ? part.Country?.TwoLetterIsoCode.NullEmpty() : null }, - { "CountryAbbrev3", settings.CountryEnabled ? part.Country?.ThreeLetterIsoCode.NullEmpty() : null }, - { "State", state }, - { "StateAbbrev", settings.StateProvinceEnabled ? part.StateProvince?.Abbreviation.NullEmpty() : null }, - { "City", city }, - { "ZipCode", zip }, - { "Email", part.Email.NullEmpty() }, - { "Phone", settings.PhoneEnabled ? part.PhoneNumber : null }, - { "Fax", settings.FaxEnabled ? part.FaxNumber : null } - }; - - m["NameLine"] = Concat(salutation, title, firstName, lastName); - m["StreetLine"] = Concat(street1, street2); - m["CityLine"] = Concat(zip, city); - m["CountryLine"] = Concat(country, state); - - PublishModelPartCreatedEvent
(part, m); - - return m; - } - - protected virtual object CreateModelPart(RewardPointsHistory part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "Id", part.Id }, - { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) }, - { "Message", part.Message.NullEmpty() }, - { "Points", part.Points }, - { "PointsBalance", part.PointsBalance }, - { "UsedAmount", part.UsedAmount } - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(IEnumerable part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary(); - - foreach (var attr in part) - { - m[attr.Key] = attr.Value; - } - - PublishModelPartCreatedEvent>(part, m); - - return m; - } - - protected virtual object CreateModelPart(ForumSubscription part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "SubscriptionGuid", part.SubscriptionGuid }, - { "CustomerId", part.CustomerId }, - { "ForumId", part.ForumId }, - { "TopicId", part.TopicId }, - { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) } - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - protected virtual object CreateModelPart(BackInStockSubscription part, MessageContext messageContext) - { - Guard.NotNull(messageContext, nameof(messageContext)); - Guard.NotNull(part, nameof(part)); - - var m = new Dictionary - { - { "StoreId", part.StoreId }, - { "CustomerId", part.CustomerId }, - { "ProductId", part.ProductId }, - { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) } - }; - - PublishModelPartCreatedEvent(part, m); - - return m; - } - - #endregion - - #region Model Tree - - public TreeNode GetLastModelTree(string messageTemplateName) - { - Guard.NotEmpty(messageTemplateName, nameof(messageTemplateName)); - - var template = _messageTemplateService.GetMessageTemplateByName(messageTemplateName, _services.StoreContext.CurrentStore.Id); - - if (template != null) - { - return GetLastModelTree(template); - } - - return null; - } - - public TreeNode GetLastModelTree(MessageTemplate template) - { - Guard.NotNull(template, nameof(template)); - - if (template.LastModelTree.IsEmpty()) - { - return null; - } - - return Newtonsoft.Json.JsonConvert.DeserializeObject>(template.LastModelTree); - } - - public TreeNode BuildModelTree(TemplateModel model) - { - Guard.NotNull(model, nameof(model)); - - var root = new TreeNode(new ModelTreeMember { Name = "Model", Kind = ModelTreeMemberKind.Root }); - - foreach (var kvp in model) - { - root.Append(BuildModelTreePart(kvp.Key, kvp.Value)); - } - - return root; - } - - private TreeNode BuildModelTreePart(string modelName, object instance) - { - var t = instance?.GetType(); - TreeNode node = null; - - if (t == null || t.IsPredefinedType()) - { - node = new TreeNode(new ModelTreeMember { Name = modelName, Kind = ModelTreeMemberKind.Primitive }); - } - else if (t.IsSequenceType() && !(instance is IDictionary)) - { - node = new TreeNode(new ModelTreeMember { Name = modelName, Kind = ModelTreeMemberKind.Collection }); - } - else - { - node = new TreeNode(new ModelTreeMember { Name = modelName, Kind = ModelTreeMemberKind.Complex }); - - if (instance is IDictionary dict) - { - foreach (var kvp in dict) - { - node.Append(BuildModelTreePart(kvp.Key, kvp.Value)); - } - } - else if (instance is IDynamicMetaObjectProvider dyn) - { - foreach (var name in dyn.GetMetaObject(Expression.Constant(dyn)).GetDynamicMemberNames()) - { - // we don't want to go deeper in "pure" dynamic objects - node.Append(new TreeNode(new ModelTreeMember { Name = name, Kind = ModelTreeMemberKind.Primitive })); - } - } - else - { - node.AppendRange(BuildModelTreePartForClass(instance)); - } - } - - return node; - } - - private IEnumerable> BuildModelTreePartForClass(object instance) - { - var type = instance?.GetType(); - - if (type == null) - { - yield break; - } - - foreach (var prop in FastProperty.GetProperties(type).Values) - { - var pi = prop.Property; - - if (pi.PropertyType.IsPredefinedType()) - { - yield return new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Primitive }); - } - else if (typeof(IDictionary).IsAssignableFrom(pi.PropertyType)) - { - yield return BuildModelTreePart(prop.Name, prop.GetValue(instance)); - } - else if (pi.PropertyType.IsSequenceType()) - { - yield return new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Collection }); - } - else - { - var node = new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Complex }); - node.AppendRange(BuildModelTreePartForClass(prop.GetValue(instance))); - yield return node; - } - } - } - - #endregion - } + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "Name", part.GetLocalized(x => x.Name, messageContext.Language).Value.NullEmpty() }, + { "GroupName", part.ForumGroup?.GetLocalized(x => x.Name, messageContext.Language)?.Value.NullEmpty() }, + { "NumPosts", part.NumPosts }, + { "NumTopics", part.NumTopics }, + { "Url", BuildRouteUrl("ForumSlug", new { id = part.Id, slug = part.GetSeName(messageContext.Language.Id) }, messageContext) }, + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(Address part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var settings = _services.Resolve(); + var languageId = messageContext.Language?.Id ?? messageContext.LanguageId; + + var salutation = part.Salutation.NullEmpty(); + var title = part.Title.NullEmpty(); + var company = settings.CompanyEnabled ? part.Company : null; + var firstName = part.FirstName.NullEmpty(); + var lastName = part.LastName.NullEmpty(); + var street1 = settings.StreetAddressEnabled ? part.Address1 : null; + var street2 = settings.StreetAddress2Enabled ? part.Address2 : null; + var zip = settings.ZipPostalCodeEnabled ? part.ZipPostalCode : null; + var city = settings.CityEnabled ? part.City : null; + var country = settings.CountryEnabled ? part.Country?.GetLocalized(x => x.Name, languageId ?? 0)?.Value.NullEmpty() : null; + var state = settings.StateProvinceEnabled ? part.StateProvince?.GetLocalized(x => x.Name, languageId ?? 0)?.Value.NullEmpty() : null; + + var m = new Dictionary + { + { "Title", title }, + { "Salutation", salutation }, + { "FullSalutation", part.GetFullSalutaion().NullEmpty() }, + { "FullName", part.GetFullName(false).NullEmpty() }, + { "Company", company }, + { "FirstName", firstName }, + { "LastName", lastName }, + { "Street1", street1 }, + { "Street2", street2 }, + { "Country", country }, + { "CountryId", part.Country?.Id }, + { "CountryAbbrev2", settings.CountryEnabled ? part.Country?.TwoLetterIsoCode.NullEmpty() : null }, + { "CountryAbbrev3", settings.CountryEnabled ? part.Country?.ThreeLetterIsoCode.NullEmpty() : null }, + { "State", state }, + { "StateAbbrev", settings.StateProvinceEnabled ? part.StateProvince?.Abbreviation.NullEmpty() : null }, + { "City", city }, + { "ZipCode", zip }, + { "Email", part.Email.NullEmpty() }, + { "Phone", settings.PhoneEnabled ? part.PhoneNumber : null }, + { "Fax", settings.FaxEnabled ? part.FaxNumber : null } + }; + + m["NameLine"] = Concat(salutation, title, firstName, lastName); + m["StreetLine"] = Concat(street1, street2); + m["CityLine"] = Concat(zip, city); + m["CountryLine"] = Concat(country, state); + + PublishModelPartCreatedEvent
(part, m); + + return m; + } + + protected virtual object CreateModelPart(RewardPointsHistory part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "Id", part.Id }, + { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) }, + { "Message", part.Message.NullEmpty() }, + { "Points", part.Points }, + { "PointsBalance", part.PointsBalance }, + { "UsedAmount", part.UsedAmount } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(IEnumerable part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary(); + + foreach (var attr in part) + { + m[attr.Key] = attr.Value; + } + + PublishModelPartCreatedEvent>(part, m); + + return m; + } + + protected virtual object CreateModelPart(ForumSubscription part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "SubscriptionGuid", part.SubscriptionGuid }, + { "CustomerId", part.CustomerId }, + { "ForumId", part.ForumId }, + { "TopicId", part.TopicId }, + { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + protected virtual object CreateModelPart(BackInStockSubscription part, MessageContext messageContext) + { + Guard.NotNull(messageContext, nameof(messageContext)); + Guard.NotNull(part, nameof(part)); + + var m = new Dictionary + { + { "StoreId", part.StoreId }, + { "CustomerId", part.CustomerId }, + { "ProductId", part.ProductId }, + { "CreatedOn", ToUserDate(part.CreatedOnUtc, messageContext) } + }; + + PublishModelPartCreatedEvent(part, m); + + return m; + } + + #endregion + + #region Model Tree + + public TreeNode GetLastModelTree(string messageTemplateName) + { + Guard.NotEmpty(messageTemplateName, nameof(messageTemplateName)); + + var template = _messageTemplateService.GetMessageTemplateByName(messageTemplateName, _services.StoreContext.CurrentStore.Id); + + if (template != null) + { + return GetLastModelTree(template); + } + + return null; + } + + public TreeNode GetLastModelTree(MessageTemplate template) + { + Guard.NotNull(template, nameof(template)); + + if (template.LastModelTree.IsEmpty()) + { + return null; + } + + return Newtonsoft.Json.JsonConvert.DeserializeObject>(template.LastModelTree); + } + + public TreeNode BuildModelTree(TemplateModel model) + { + Guard.NotNull(model, nameof(model)); + + var root = new TreeNode(new ModelTreeMember { Name = "Model", Kind = ModelTreeMemberKind.Root }); + + foreach (var kvp in model) + { + root.Append(BuildModelTreePart(kvp.Key, kvp.Value)); + } + + return root; + } + + private TreeNode BuildModelTreePart(string modelName, object instance) + { + var t = instance?.GetType(); + TreeNode node = null; + + if (t == null || t.IsPredefinedType()) + { + node = new TreeNode(new ModelTreeMember { Name = modelName, Kind = ModelTreeMemberKind.Primitive }); + } + else if (t.IsSequenceType() && !(instance is IDictionary)) + { + node = new TreeNode(new ModelTreeMember { Name = modelName, Kind = ModelTreeMemberKind.Collection }); + } + else + { + node = new TreeNode(new ModelTreeMember { Name = modelName, Kind = ModelTreeMemberKind.Complex }); + + if (instance is IDictionary dict) + { + foreach (var kvp in dict) + { + node.Append(BuildModelTreePart(kvp.Key, kvp.Value)); + } + } + else if (instance is IDynamicMetaObjectProvider dyn) + { + foreach (var name in dyn.GetMetaObject(Expression.Constant(dyn)).GetDynamicMemberNames()) + { + // we don't want to go deeper in "pure" dynamic objects + node.Append(new TreeNode(new ModelTreeMember { Name = name, Kind = ModelTreeMemberKind.Primitive })); + } + } + else + { + node.AppendRange(BuildModelTreePartForClass(instance)); + } + } + + return node; + } + + private IEnumerable> BuildModelTreePartForClass(object instance) + { + var type = instance?.GetType(); + + if (type == null) + { + yield break; + } + + foreach (var prop in FastProperty.GetProperties(type).Values) + { + var pi = prop.Property; + + if (pi.PropertyType.IsPredefinedType()) + { + yield return new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Primitive }); + } + else if (typeof(IDictionary).IsAssignableFrom(pi.PropertyType)) + { + yield return BuildModelTreePart(prop.Name, prop.GetValue(instance)); + } + else if (pi.PropertyType.IsSequenceType()) + { + yield return new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Collection }); + } + else + { + var node = new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Complex }); + node.AppendRange(BuildModelTreePartForClass(prop.GetValue(instance))); + yield return node; + } + } + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Messages/MessageTemplateService.cs b/src/Libraries/SmartStore.Services/Messages/MessageTemplateService.cs index ede9e8df96..26d9f53c5e 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageTemplateService.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageTemplateService.cs @@ -10,62 +10,62 @@ namespace SmartStore.Services.Messages { - public partial class MessageTemplateService: IMessageTemplateService + public partial class MessageTemplateService : IMessageTemplateService { private const string MESSAGETEMPLATES_ALL_KEY = "SmartStore.messagetemplate.all-{0}"; private const string MESSAGETEMPLATES_BY_NAME_KEY = "SmartStore.messagetemplate.name-{0}-{1}"; private const string MESSAGETEMPLATES_PATTERN_KEY = "SmartStore.messagetemplate.*"; private readonly IRepository _messageTemplateRepository; - private readonly IRepository _storeMappingRepository; - private readonly ILanguageService _languageService; - private readonly IStoreMappingService _storeMappingService; - private readonly ILocalizedEntityService _localizedEntityService; + private readonly IRepository _storeMappingRepository; + private readonly ILanguageService _languageService; + private readonly IStoreMappingService _storeMappingService; + private readonly ILocalizedEntityService _localizedEntityService; private readonly IRequestCache _requestCache; public MessageTemplateService( - IRequestCache requestCache, - IRepository storeMappingRepository, - ILanguageService languageService, - ILocalizedEntityService localizedEntityService, - IStoreMappingService storeMappingService, + IRequestCache requestCache, + IRepository storeMappingRepository, + ILanguageService languageService, + ILocalizedEntityService localizedEntityService, + IStoreMappingService storeMappingService, IRepository messageTemplateRepository) { - _requestCache = requestCache; - _storeMappingRepository = storeMappingRepository; - _languageService = languageService; - _localizedEntityService = localizedEntityService; - _storeMappingService = storeMappingService; - _messageTemplateRepository = messageTemplateRepository; - - QuerySettings = DbQuerySettings.Default; - } + _requestCache = requestCache; + _storeMappingRepository = storeMappingRepository; + _languageService = languageService; + _localizedEntityService = localizedEntityService; + _storeMappingService = storeMappingService; + _messageTemplateRepository = messageTemplateRepository; + + QuerySettings = DbQuerySettings.Default; + } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } - public virtual void DeleteMessageTemplate(MessageTemplate messageTemplate) - { - Guard.NotNull(messageTemplate, nameof(messageTemplate)); + public virtual void DeleteMessageTemplate(MessageTemplate messageTemplate) + { + Guard.NotNull(messageTemplate, nameof(messageTemplate)); - _messageTemplateRepository.Delete(messageTemplate); + _messageTemplateRepository.Delete(messageTemplate); - _requestCache.RemoveByPattern(MESSAGETEMPLATES_PATTERN_KEY); - } + _requestCache.RemoveByPattern(MESSAGETEMPLATES_PATTERN_KEY); + } public virtual void InsertMessageTemplate(MessageTemplate messageTemplate) { - Guard.NotNull(messageTemplate, nameof(messageTemplate)); + Guard.NotNull(messageTemplate, nameof(messageTemplate)); - _messageTemplateRepository.Insert(messageTemplate); + _messageTemplateRepository.Insert(messageTemplate); _requestCache.RemoveByPattern(MESSAGETEMPLATES_PATTERN_KEY); } public virtual void UpdateMessageTemplate(MessageTemplate messageTemplate) { - Guard.NotNull(messageTemplate, nameof(messageTemplate)); + Guard.NotNull(messageTemplate, nameof(messageTemplate)); - _messageTemplateRepository.Update(messageTemplate); + _messageTemplateRepository.Update(messageTemplate); _requestCache.RemoveByPattern(MESSAGETEMPLATES_PATTERN_KEY); } @@ -78,109 +78,109 @@ public virtual MessageTemplate GetMessageTemplateById(int messageTemplateId) return _messageTemplateRepository.GetById(messageTemplateId); } - public virtual MessageTemplate GetMessageTemplateByName(string messageTemplateName, int storeId) + public virtual MessageTemplate GetMessageTemplateByName(string messageTemplateName, int storeId) { - Guard.NotEmpty(messageTemplateName, nameof(messageTemplateName)); + Guard.NotEmpty(messageTemplateName, nameof(messageTemplateName)); string key = string.Format(MESSAGETEMPLATES_BY_NAME_KEY, messageTemplateName, storeId); return _requestCache.Get(key, () => { - var query = _messageTemplateRepository.Table; - query = query.Where(t => t.Name == messageTemplateName); - query = query.OrderBy(t => t.Id); - var templates = query.ToList(); + var query = _messageTemplateRepository.Table; + query = query.Where(t => t.Name == messageTemplateName); + query = query.OrderBy(t => t.Id); + var templates = query.ToList(); - //store mapping - if (storeId > 0) - { - return templates.Where(t => _storeMappingService.Authorize(t, storeId)).FirstOrDefault(); - } + //store mapping + if (storeId > 0) + { + return templates.Where(t => _storeMappingService.Authorize(t, storeId)).FirstOrDefault(); + } return templates.FirstOrDefault(); }); } - public virtual IList GetAllMessageTemplates(int storeId) + public virtual IList GetAllMessageTemplates(int storeId) { - string key = string.Format(MESSAGETEMPLATES_ALL_KEY, storeId); - return _requestCache.Get(key, () => + string key = string.Format(MESSAGETEMPLATES_ALL_KEY, storeId); + return _requestCache.Get(key, () => { - var query = _messageTemplateRepository.Table; - query = query.OrderBy(t => t.Name); - - // Store mapping - if (storeId > 0 && !QuerySettings.IgnoreMultiStore) - { - query = from t in query - join sm in _storeMappingRepository.Table - on new { c1 = t.Id, c2 = "MessageTemplate" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into t_sm - from sm in t_sm.DefaultIfEmpty() - where !t.LimitedToStores || storeId == sm.StoreId - select t; - - // Only distinct items (group by ID) - query = from t in query - group t by t.Id into tGroup - orderby tGroup.Key - select tGroup.FirstOrDefault(); - query = query.OrderBy(t => t.Name); - } - - return query.ToList(); + var query = _messageTemplateRepository.Table; + query = query.OrderBy(t => t.Name); + + // Store mapping + if (storeId > 0 && !QuerySettings.IgnoreMultiStore) + { + query = from t in query + join sm in _storeMappingRepository.Table + on new { c1 = t.Id, c2 = "MessageTemplate" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into t_sm + from sm in t_sm.DefaultIfEmpty() + where !t.LimitedToStores || storeId == sm.StoreId + select t; + + // Only distinct items (group by ID) + query = from t in query + group t by t.Id into tGroup + orderby tGroup.Key + select tGroup.FirstOrDefault(); + query = query.OrderBy(t => t.Name); + } + + return query.ToList(); }); } - public virtual MessageTemplate CopyMessageTemplate(MessageTemplate messageTemplate) - { - Guard.NotNull(messageTemplate, nameof(messageTemplate)); - - var mtCopy = new MessageTemplate - { - Name = messageTemplate.Name, - To = messageTemplate.To, - ReplyTo = messageTemplate.ReplyTo, - BccEmailAddresses = messageTemplate.BccEmailAddresses, - Subject = messageTemplate.Subject, - Body = messageTemplate.Body, - IsActive = messageTemplate.IsActive, - EmailAccountId = messageTemplate.EmailAccountId, - LimitedToStores = messageTemplate.LimitedToStores - // INFO: we do not copy attachments - }; - - InsertMessageTemplate(mtCopy); - - var languages = _languageService.GetAllLanguages(true); - - // localization - foreach (var lang in languages) - { - string bccEmailAddresses = messageTemplate.GetLocalized(x => x.BccEmailAddresses, lang, false, false); - if (bccEmailAddresses.HasValue()) - _localizedEntityService.SaveLocalizedValue(mtCopy, x => x.BccEmailAddresses, bccEmailAddresses, lang.Id); - - string subject = messageTemplate.GetLocalized(x => x.Subject, lang, false, false); - if (subject.HasValue()) - _localizedEntityService.SaveLocalizedValue(mtCopy, x => x.Subject, subject, lang.Id); - - string body = messageTemplate.GetLocalized(x => x.Body, lang, false, false); - if (body.HasValue()) - _localizedEntityService.SaveLocalizedValue(mtCopy, x => x.Body, subject, lang.Id); - - int emailAccountId = messageTemplate.GetLocalized(x => x.EmailAccountId, lang, false, false); - if (emailAccountId > 0) - _localizedEntityService.SaveLocalizedValue(mtCopy, x => x.EmailAccountId, emailAccountId, lang.Id); - } - - // store mapping - var selectedStoreIds = _storeMappingService.GetStoresIdsWithAccess(messageTemplate); - foreach (var id in selectedStoreIds) - { - _storeMappingService.InsertStoreMapping(mtCopy, id); - } - - return mtCopy; - } + public virtual MessageTemplate CopyMessageTemplate(MessageTemplate messageTemplate) + { + Guard.NotNull(messageTemplate, nameof(messageTemplate)); + + var mtCopy = new MessageTemplate + { + Name = messageTemplate.Name, + To = messageTemplate.To, + ReplyTo = messageTemplate.ReplyTo, + BccEmailAddresses = messageTemplate.BccEmailAddresses, + Subject = messageTemplate.Subject, + Body = messageTemplate.Body, + IsActive = messageTemplate.IsActive, + EmailAccountId = messageTemplate.EmailAccountId, + LimitedToStores = messageTemplate.LimitedToStores + // INFO: we do not copy attachments + }; + + InsertMessageTemplate(mtCopy); + + var languages = _languageService.GetAllLanguages(true); + + // localization + foreach (var lang in languages) + { + string bccEmailAddresses = messageTemplate.GetLocalized(x => x.BccEmailAddresses, lang, false, false); + if (bccEmailAddresses.HasValue()) + _localizedEntityService.SaveLocalizedValue(mtCopy, x => x.BccEmailAddresses, bccEmailAddresses, lang.Id); + + string subject = messageTemplate.GetLocalized(x => x.Subject, lang, false, false); + if (subject.HasValue()) + _localizedEntityService.SaveLocalizedValue(mtCopy, x => x.Subject, subject, lang.Id); + + string body = messageTemplate.GetLocalized(x => x.Body, lang, false, false); + if (body.HasValue()) + _localizedEntityService.SaveLocalizedValue(mtCopy, x => x.Body, subject, lang.Id); + + int emailAccountId = messageTemplate.GetLocalized(x => x.EmailAccountId, lang, false, false); + if (emailAccountId > 0) + _localizedEntityService.SaveLocalizedValue(mtCopy, x => x.EmailAccountId, emailAccountId, lang.Id); + } + + // store mapping + var selectedStoreIds = _storeMappingService.GetStoresIdsWithAccess(messageTemplate); + foreach (var id in selectedStoreIds) + { + _storeMappingService.InsertStoreMapping(mtCopy, id); + } + + return mtCopy; + } } } diff --git a/src/Libraries/SmartStore.Services/Messages/NewsLetterSubscriptionService.cs b/src/Libraries/SmartStore.Services/Messages/NewsLetterSubscriptionService.cs index 6802877bc9..b116b8c3ac 100644 --- a/src/Libraries/SmartStore.Services/Messages/NewsLetterSubscriptionService.cs +++ b/src/Libraries/SmartStore.Services/Messages/NewsLetterSubscriptionService.cs @@ -13,24 +13,24 @@ public class NewsLetterSubscriptionService : INewsLetterSubscriptionService private readonly IRepository _customerRepository; private readonly ICommonServices _services; - public NewsLetterSubscriptionService( + public NewsLetterSubscriptionService( IRepository subscriptionRepository, IRepository customerRepository, ICommonServices services) { _subscriptionRepository = subscriptionRepository; _customerRepository = customerRepository; - _services = services; - } + _services = services; + } public void InsertNewsLetterSubscription(NewsLetterSubscription newsLetterSubscription, bool publishSubscriptionEvents = true) { - Guard.NotNull(newsLetterSubscription, nameof(newsLetterSubscription)); + Guard.NotNull(newsLetterSubscription, nameof(newsLetterSubscription)); - if (newsLetterSubscription.StoreId == 0) - { - throw new SmartException("News letter subscription must be assigned to a valid store."); - } + if (newsLetterSubscription.StoreId == 0) + { + throw new SmartException("News letter subscription must be assigned to a valid store."); + } // Handle e-mail newsLetterSubscription.Email = EnsureSubscriberEmailOrThrow(newsLetterSubscription.Email); @@ -47,12 +47,12 @@ public void InsertNewsLetterSubscription(NewsLetterSubscription newsLetterSubscr public void UpdateNewsLetterSubscription(NewsLetterSubscription newsLetterSubscription, bool publishSubscriptionEvents = true) { - Guard.NotNull(newsLetterSubscription, nameof(newsLetterSubscription)); + Guard.NotNull(newsLetterSubscription, nameof(newsLetterSubscription)); - if (newsLetterSubscription.StoreId == 0) - { - throw new SmartException("News letter subscription must be assigned to a valid store."); - } + if (newsLetterSubscription.StoreId == 0) + { + throw new SmartException("News letter subscription must be assigned to a valid store."); + } // Handle e-mail newsLetterSubscription.Email = EnsureSubscriberEmailOrThrow(newsLetterSubscription.Email); @@ -70,8 +70,8 @@ public void UpdateNewsLetterSubscription(NewsLetterSubscription newsLetterSubscr // If the previous entry was false, but this one is true, publish a subscribe. PublishSubscriptionEvent(newsLetterSubscription.Email, true, publishSubscriptionEvents); } - - if ((originalSubscription.Active && newsLetterSubscription.Active) && + + if ((originalSubscription.Active && newsLetterSubscription.Active) && (originalSubscription.Email != newsLetterSubscription.Email)) { // If the two emails are different publish an unsubscribe. @@ -87,7 +87,7 @@ public void UpdateNewsLetterSubscription(NewsLetterSubscription newsLetterSubscr public virtual void DeleteNewsLetterSubscription(NewsLetterSubscription newsLetterSubscription, bool publishSubscriptionEvents = true) { - Guard.NotNull(newsLetterSubscription, nameof(newsLetterSubscription)); + Guard.NotNull(newsLetterSubscription, nameof(newsLetterSubscription)); _subscriptionRepository.Delete(newsLetterSubscription); @@ -95,55 +95,55 @@ public virtual void DeleteNewsLetterSubscription(NewsLetterSubscription newsLett PublishSubscriptionEvent(newsLetterSubscription.Email, false, publishSubscriptionEvents); } - public virtual bool? AddNewsLetterSubscriptionFor(bool add, string email, int storeId) - { - bool? result = null; - - if (email.IsEmail()) - { - var newsletter = GetNewsLetterSubscriptionByEmail(email, storeId); - if (newsletter != null) - { - if (add) - { - if (!newsletter.Active) - { - _services.MessageFactory.SendNewsLetterSubscriptionActivationMessage(newsletter, _services.WorkContext.WorkingLanguage.Id); - } - UpdateNewsLetterSubscription(newsletter); - result = true; - } - else - { - DeleteNewsLetterSubscription(newsletter); - result = false; - } - } - else - { - if (add) - { - newsletter = new NewsLetterSubscription - { - NewsLetterSubscriptionGuid = Guid.NewGuid(), - Email = email, - Active = false, - CreatedOnUtc = DateTime.UtcNow, - StoreId = storeId, + public virtual bool? AddNewsLetterSubscriptionFor(bool add, string email, int storeId) + { + bool? result = null; + + if (email.IsEmail()) + { + var newsletter = GetNewsLetterSubscriptionByEmail(email, storeId); + if (newsletter != null) + { + if (add) + { + if (!newsletter.Active) + { + _services.MessageFactory.SendNewsLetterSubscriptionActivationMessage(newsletter, _services.WorkContext.WorkingLanguage.Id); + } + UpdateNewsLetterSubscription(newsletter); + result = true; + } + else + { + DeleteNewsLetterSubscription(newsletter); + result = false; + } + } + else + { + if (add) + { + newsletter = new NewsLetterSubscription + { + NewsLetterSubscriptionGuid = Guid.NewGuid(), + Email = email, + Active = false, + CreatedOnUtc = DateTime.UtcNow, + StoreId = storeId, WorkingLanguageId = _services.WorkContext.WorkingLanguage.Id - }; - InsertNewsLetterSubscription(newsletter); + }; + InsertNewsLetterSubscription(newsletter); - _services.MessageFactory.SendNewsLetterSubscriptionActivationMessage(newsletter, _services.WorkContext.WorkingLanguage.Id); + _services.MessageFactory.SendNewsLetterSubscriptionActivationMessage(newsletter, _services.WorkContext.WorkingLanguage.Id); - result = true; - } - } - } - return result; - } + result = true; + } + } + } + return result; + } - public virtual NewsLetterSubscription GetNewsLetterSubscriptionById(int newsLetterSubscriptionId) + public virtual NewsLetterSubscription GetNewsLetterSubscriptionById(int newsLetterSubscriptionId) { if (newsLetterSubscriptionId == 0) return null; @@ -165,20 +165,20 @@ orderby nls.Id public virtual NewsLetterSubscription GetNewsLetterSubscriptionByEmail(string email, int storeId = 0) { - if (!email.IsEmail()) - return null; + if (!email.IsEmail()) + return null; email = email.Trim(); - var query = _subscriptionRepository.Table - .Where(x => x.Email == email); + var query = _subscriptionRepository.Table + .Where(x => x.Email == email); - if (storeId > 0) - query = query.Where(x => x.StoreId == storeId); + if (storeId > 0) + query = query.Where(x => x.StoreId == storeId); - var subscription = query.OrderBy(x => x.Id).FirstOrDefault(); + var subscription = query.OrderBy(x => x.Id).FirstOrDefault(); - return subscription; + return subscription; } public virtual IPagedList GetAllNewsLetterSubscriptions( @@ -237,27 +237,27 @@ private void PublishSubscriptionEvent(string email, bool isSubscribe, bool publi { if (publishSubscriptionEvents) { - if (isSubscribe) + if (isSubscribe) { - _services.EventPublisher.Publish(new EmailSubscribedEvent(email)); - } + _services.EventPublisher.Publish(new EmailSubscribedEvent(email)); + } else { - _services.EventPublisher.Publish(new EmailUnsubscribedEvent(email)); - } + _services.EventPublisher.Publish(new EmailUnsubscribedEvent(email)); + } } } - private static string EnsureSubscriberEmailOrThrow(string email) - { - string output = email.EmptyNull().Trim().Truncate(255); + private static string EnsureSubscriberEmailOrThrow(string email) + { + string output = email.EmptyNull().Trim().Truncate(255); - if (!output.IsEmail()) - { - throw Error.ArgumentOutOfRange("email", "Email is not valid", email); - } + if (!output.IsEmail()) + { + throw Error.ArgumentOutOfRange("email", "Email is not valid", email); + } - return output; - } - } + return output; + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs b/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs index b24defdee0..8e0a9846fc 100644 --- a/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs +++ b/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs @@ -20,55 +20,55 @@ namespace SmartStore.Services.Messages { - public partial class QueuedEmailService : IQueuedEmailService + public partial class QueuedEmailService : IQueuedEmailService { private readonly IRepository _queuedEmailRepository; - private readonly IRepository _queuedEmailAttachmentRepository; - private readonly IEmailSender _emailSender; - private readonly ICommonServices _services; - - public QueuedEmailService( - IRepository queuedEmailRepository, - IRepository queuedEmailAttachmentRepository, - IEmailSender emailSender, - ICommonServices services) + private readonly IRepository _queuedEmailAttachmentRepository; + private readonly IEmailSender _emailSender; + private readonly ICommonServices _services; + + public QueuedEmailService( + IRepository queuedEmailRepository, + IRepository queuedEmailAttachmentRepository, + IEmailSender emailSender, + ICommonServices services) { _queuedEmailRepository = queuedEmailRepository; - _queuedEmailAttachmentRepository = queuedEmailAttachmentRepository; - _emailSender = emailSender; - _services = services; - } + _queuedEmailAttachmentRepository = queuedEmailAttachmentRepository; + _emailSender = emailSender; + _services = services; + } - public Localizer T { get; set; } = NullLocalizer.Instance; - public ILogger Logger { get; set; } = NullLogger.Instance; + public Localizer T { get; set; } = NullLocalizer.Instance; + public ILogger Logger { get; set; } = NullLogger.Instance; - public virtual void InsertQueuedEmail(QueuedEmail queuedEmail) + public virtual void InsertQueuedEmail(QueuedEmail queuedEmail) { - Guard.NotNull(queuedEmail, nameof(queuedEmail)); + Guard.NotNull(queuedEmail, nameof(queuedEmail)); - _queuedEmailRepository.Insert(queuedEmail); + _queuedEmailRepository.Insert(queuedEmail); } public virtual void UpdateQueuedEmail(QueuedEmail queuedEmail) { - Guard.NotNull(queuedEmail, nameof(queuedEmail)); + Guard.NotNull(queuedEmail, nameof(queuedEmail)); - _queuedEmailRepository.Update(queuedEmail); + _queuedEmailRepository.Update(queuedEmail); } public virtual void DeleteQueuedEmail(QueuedEmail queuedEmail) { - Guard.NotNull(queuedEmail, nameof(queuedEmail)); + Guard.NotNull(queuedEmail, nameof(queuedEmail)); _queuedEmailRepository.Delete(queuedEmail); } - public virtual int DeleteAllQueuedEmails() - { - // do not delete e-mails which are about to be sent - return _queuedEmailRepository.DeleteAll(x => x.SentOnUtc.HasValue || x.SentTries >= 3); - } + public virtual int DeleteAllQueuedEmails() + { + // do not delete e-mails which are about to be sent + return _queuedEmailRepository.DeleteAll(x => x.SentOnUtc.HasValue || x.SentTries >= 3); + } public virtual QueuedEmail GetQueuedEmailById(int queuedEmailId) { @@ -76,7 +76,7 @@ public virtual QueuedEmail GetQueuedEmailById(int queuedEmailId) return null; var queuedEmail = _queuedEmailRepository.GetById(queuedEmailId); - return queuedEmail; + return queuedEmail; } public virtual IList GetQueuedEmailsByIds(int[] queuedEmailIds) @@ -90,29 +90,29 @@ where queuedEmailIds.Contains(qe.Id) var queuedEmails = query.ToList(); - // sort by passed identifier sequence - return queuedEmails.OrderBySequence(queuedEmailIds).ToList(); - } + // sort by passed identifier sequence + return queuedEmails.OrderBySequence(queuedEmailIds).ToList(); + } public virtual IPagedList SearchEmails(SearchEmailsQuery query) { - Guard.NotNull(query, nameof(query)); - + Guard.NotNull(query, nameof(query)); + var q = _queuedEmailRepository.Table; - if (query.Expand.HasValue()) - { - var expands = query.Expand.Split(','); - foreach (var expand in expands) - { - q = q.Expand(expand.Trim()); - } - } + if (query.Expand.HasValue()) + { + var expands = query.Expand.Split(','); + foreach (var expand in expands) + { + q = q.Expand(expand.Trim()); + } + } if (query.From.HasValue()) - q = q.Where(qe => qe.From.Contains(query.From.Trim())); + q = q.Where(qe => qe.From.Contains(query.From.Trim())); - if (query.To.HasValue()) + if (query.To.HasValue()) q = q.Where(qe => qe.To.Contains(query.To.Trim())); if (query.StartTime.HasValue) @@ -124,14 +124,14 @@ public virtual IPagedList SearchEmails(SearchEmailsQuery query) if (query.UnsentOnly) q = q.Where(qe => !qe.SentOnUtc.HasValue); - if (query.SendManually.HasValue) - q = q.Where(qe => qe.SendManually == query.SendManually.Value); + if (query.SendManually.HasValue) + q = q.Where(qe => qe.SendManually == query.SendManually.Value); q = q.Where(qe => qe.SentTries < query.MaxSendTries); - - q = q.OrderByDescending(qe => qe.Priority); - q = query.OrderByLatest ? + q = q.OrderByDescending(qe => qe.Priority); + + q = query.OrderByLatest ? ((IOrderedQueryable)q).ThenByDescending(qe => qe.CreatedOnUtc) : ((IOrderedQueryable)q).ThenBy(qe => qe.CreatedOnUtc); @@ -139,164 +139,164 @@ public virtual IPagedList SearchEmails(SearchEmailsQuery query) return queuedEmails; } - public virtual async Task SendEmailAsync(QueuedEmail queuedEmail) - { - var result = false; - - try - { - var smtpContext = new SmtpContext(queuedEmail.EmailAccount); - var msg = ConvertEmail(queuedEmail); - - await _emailSender.SendEmailAsync(smtpContext, msg); - - queuedEmail.SentOnUtc = DateTime.UtcNow; - result = true; - } - catch (Exception ex) - { - Logger.Error(ex, string.Concat(T("Admin.Common.ErrorSendingEmail"), ": ", ex.Message)); - } - finally - { - queuedEmail.SentTries += 1; - UpdateQueuedEmail(queuedEmail); - } - - return result; - } - - private void AddEmailAddresses(string addresses, ICollection target) - { - var arr = addresses.IsEmpty() ? null : addresses.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - if (arr != null && arr.Length > 0) - { - target.AddRange(arr.Where(x => x.Trim().HasValue()).Select(x => new EmailAddress(x))); - } - } - - internal EmailMessage ConvertEmail(QueuedEmail qe) - { - // 'internal' for testing purposes - - var msg = new EmailMessage( - new EmailAddress(qe.To), - qe.Subject.Replace("\r\n", string.Empty), - qe.Body, - new EmailAddress(qe.From)); - - if (qe.ReplyTo.HasValue()) - { - msg.ReplyTo.Add(new EmailAddress(qe.ReplyTo)); - } - - AddEmailAddresses(qe.CC, msg.Cc); - AddEmailAddresses(qe.Bcc, msg.Bcc); - - if (qe.Attachments != null && qe.Attachments.Count > 0) - { - foreach (var qea in qe.Attachments) - { - Attachment attachment = null; - - if (qea.StorageLocation == EmailAttachmentStorageLocation.Blob) - { - var data = qea.MediaStorage?.Data; - - if (data != null && data.LongLength > 0) - { - attachment = new Attachment(data.ToStream(), qea.Name, qea.MimeType); - } - } - else if (qea.StorageLocation == EmailAttachmentStorageLocation.Path) - { - var path = qea.Path; - if (path.HasValue()) - { - if (path[0] == '~' || path[0] == '/') - { - path = CommonHelper.MapPath(VirtualPathUtility.ToAppRelative(path), false); - } - if (File.Exists(path)) - { - attachment = new Attachment(path, qea.MimeType) { Name = qea.Name }; - } - } - } - else if (qea.StorageLocation == EmailAttachmentStorageLocation.FileReference) - { - var file = qea.MediaFile; - if (file != null) - { + public virtual async Task SendEmailAsync(QueuedEmail queuedEmail) + { + var result = false; + + try + { + var smtpContext = new SmtpContext(queuedEmail.EmailAccount); + var msg = ConvertEmail(queuedEmail); + + await _emailSender.SendEmailAsync(smtpContext, msg); + + queuedEmail.SentOnUtc = DateTime.UtcNow; + result = true; + } + catch (Exception ex) + { + Logger.Error(ex, string.Concat(T("Admin.Common.ErrorSendingEmail"), ": ", ex.Message)); + } + finally + { + queuedEmail.SentTries += 1; + UpdateQueuedEmail(queuedEmail); + } + + return result; + } + + private void AddEmailAddresses(string addresses, ICollection target) + { + var arr = addresses.IsEmpty() ? null : addresses.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + if (arr != null && arr.Length > 0) + { + target.AddRange(arr.Where(x => x.Trim().HasValue()).Select(x => new EmailAddress(x))); + } + } + + internal EmailMessage ConvertEmail(QueuedEmail qe) + { + // 'internal' for testing purposes + + var msg = new EmailMessage( + new EmailAddress(qe.To), + qe.Subject.Replace("\r\n", string.Empty), + qe.Body, + new EmailAddress(qe.From)); + + if (qe.ReplyTo.HasValue()) + { + msg.ReplyTo.Add(new EmailAddress(qe.ReplyTo)); + } + + AddEmailAddresses(qe.CC, msg.Cc); + AddEmailAddresses(qe.Bcc, msg.Bcc); + + if (qe.Attachments != null && qe.Attachments.Count > 0) + { + foreach (var qea in qe.Attachments) + { + Attachment attachment = null; + + if (qea.StorageLocation == EmailAttachmentStorageLocation.Blob) + { + var data = qea.MediaStorage?.Data; + + if (data != null && data.LongLength > 0) + { + attachment = new Attachment(data.ToStream(), qea.Name, qea.MimeType); + } + } + else if (qea.StorageLocation == EmailAttachmentStorageLocation.Path) + { + var path = qea.Path; + if (path.HasValue()) + { + if (path[0] == '~' || path[0] == '/') + { + path = CommonHelper.MapPath(VirtualPathUtility.ToAppRelative(path), false); + } + if (File.Exists(path)) + { + attachment = new Attachment(path, qea.MimeType) { Name = qea.Name }; + } + } + } + else if (qea.StorageLocation == EmailAttachmentStorageLocation.FileReference) + { + var file = qea.MediaFile; + if (file != null) + { var mediaFile = _services.MediaService.ConvertMediaFile(file); - var stream = mediaFile.OpenRead(); + var stream = mediaFile.OpenRead(); if (stream != null) { attachment = new Attachment(stream, file.Name, file.MimeType); } } - } - - if (attachment != null) - { - msg.Attachments.Add(attachment); - } - } - } - - return msg; - } - - #region Attachments - - public virtual QueuedEmailAttachment GetQueuedEmailAttachmentById(int id) - { - if (id == 0) - return null; - - var qea = _queuedEmailAttachmentRepository.GetById(id); - return qea; - } - - public virtual void DeleteQueuedEmailAttachment(QueuedEmailAttachment attachment) - { - Guard.NotNull(attachment, nameof(attachment)); - - _queuedEmailAttachmentRepository.Delete(attachment); - } - - public virtual byte[] LoadQueuedEmailAttachmentBinary(QueuedEmailAttachment attachment) - { - Guard.NotNull(attachment, nameof(attachment)); - - if (attachment.StorageLocation == EmailAttachmentStorageLocation.Blob) - { - return attachment.MediaStorage?.Data ?? new byte[0]; - } - - return null; - } - - #endregion - } - - public class SearchEmailsQuery - { - public string From { get; set; } - public string To { get; set; } - public DateTime? StartTime { get; set; } - public DateTime? EndTime { get; set; } - public bool UnsentOnly { get; set; } - public int MaxSendTries { get; set; } - public bool OrderByLatest { get; set; } - public int PageIndex { get; set; } - public int PageSize { get; set; } - public bool? SendManually { get; set; } - - /// - /// Navigation properties to eager load (comma separataed) - /// - public string Expand { get; set; } - } + } + + if (attachment != null) + { + msg.Attachments.Add(attachment); + } + } + } + + return msg; + } + + #region Attachments + + public virtual QueuedEmailAttachment GetQueuedEmailAttachmentById(int id) + { + if (id == 0) + return null; + + var qea = _queuedEmailAttachmentRepository.GetById(id); + return qea; + } + + public virtual void DeleteQueuedEmailAttachment(QueuedEmailAttachment attachment) + { + Guard.NotNull(attachment, nameof(attachment)); + + _queuedEmailAttachmentRepository.Delete(attachment); + } + + public virtual byte[] LoadQueuedEmailAttachmentBinary(QueuedEmailAttachment attachment) + { + Guard.NotNull(attachment, nameof(attachment)); + + if (attachment.StorageLocation == EmailAttachmentStorageLocation.Blob) + { + return attachment.MediaStorage?.Data ?? new byte[0]; + } + + return null; + } + + #endregion + } + + public class SearchEmailsQuery + { + public string From { get; set; } + public string To { get; set; } + public DateTime? StartTime { get; set; } + public DateTime? EndTime { get; set; } + public bool UnsentOnly { get; set; } + public int MaxSendTries { get; set; } + public bool OrderByLatest { get; set; } + public int PageIndex { get; set; } + public int PageSize { get; set; } + public bool? SendManually { get; set; } + + /// + /// Navigation properties to eager load (comma separataed) + /// + public string Expand { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Messages/QueuedMessagesClearTask.cs b/src/Libraries/SmartStore.Services/Messages/QueuedMessagesClearTask.cs index 1af83916e8..6c2bae3d97 100644 --- a/src/Libraries/SmartStore.Services/Messages/QueuedMessagesClearTask.cs +++ b/src/Libraries/SmartStore.Services/Messages/QueuedMessagesClearTask.cs @@ -19,16 +19,16 @@ public QueuedMessagesClearTask( IRepository qeRepository, CommonSettings commonSettings) { - _qeRepository = qeRepository; + _qeRepository = qeRepository; _commonSettings = commonSettings; } - public override async Task ExecuteAsync(TaskExecutionContext ctx) + public override async Task ExecuteAsync(TaskExecutionContext ctx) { - var olderThan = DateTime.UtcNow.AddDays(-Math.Abs(_commonSettings.MaxQueuedMessagesAgeInDays)); - await _qeRepository.DeleteAllAsync(x => x.SentOnUtc.HasValue && x.CreatedOnUtc < olderThan); + var olderThan = DateTime.UtcNow.AddDays(-Math.Abs(_commonSettings.MaxQueuedMessagesAgeInDays)); + await _qeRepository.DeleteAllAsync(x => x.SentOnUtc.HasValue && x.CreatedOnUtc < olderThan); - _qeRepository.Context.ShrinkDatabase(); + _qeRepository.Context.ShrinkDatabase(); } } } diff --git a/src/Libraries/SmartStore.Services/Messages/QueuedMessagesSendTask.cs b/src/Libraries/SmartStore.Services/Messages/QueuedMessagesSendTask.cs index abcd1c2315..eccd83e7ab 100644 --- a/src/Libraries/SmartStore.Services/Messages/QueuedMessagesSendTask.cs +++ b/src/Libraries/SmartStore.Services/Messages/QueuedMessagesSendTask.cs @@ -16,33 +16,33 @@ public QueuedMessagesSendTask(IQueuedEmailService queuedEmailService) _queuedEmailService = queuedEmailService; } - public override async Task ExecuteAsync(TaskExecutionContext ctx) + public override async Task ExecuteAsync(TaskExecutionContext ctx) { - const int pageSize = 1000; - const int maxTries = 3; + const int pageSize = 1000; + const int maxTries = 3; - for (int i = 0; i < 9999999; ++i) - { - var q = new SearchEmailsQuery - { - MaxSendTries = maxTries, - PageIndex = i, - PageSize = pageSize, - Expand = "Attachments", - UnsentOnly = true, - SendManually = false - }; + for (int i = 0; i < 9999999; ++i) + { + var q = new SearchEmailsQuery + { + MaxSendTries = maxTries, + PageIndex = i, + PageSize = pageSize, + Expand = "Attachments", + UnsentOnly = true, + SendManually = false + }; - var queuedEmails = await _queuedEmailService.SearchEmails(q).LoadAsync(); + var queuedEmails = await _queuedEmailService.SearchEmails(q).LoadAsync(); - foreach (var queuedEmail in queuedEmails) - { - await _queuedEmailService.SendEmailAsync(queuedEmail); - } + foreach (var queuedEmail in queuedEmails) + { + await _queuedEmailService.SendEmailAsync(queuedEmail); + } - if (!queuedEmails.HasNextPage) - break; - } + if (!queuedEmails.HasNextPage) + break; + } } } } diff --git a/src/Libraries/SmartStore.Services/Messages/TemplateModel.cs b/src/Libraries/SmartStore.Services/Messages/TemplateModel.cs index 61037c1e01..c7e92c361a 100644 --- a/src/Libraries/SmartStore.Services/Messages/TemplateModel.cs +++ b/src/Libraries/SmartStore.Services/Messages/TemplateModel.cs @@ -4,21 +4,21 @@ namespace SmartStore.Services.Messages { - public class TemplateModel : HybridExpando - { - public T GetFromBag(string key) - { - Guard.NotEmpty(key, nameof(key)); + public class TemplateModel : HybridExpando + { + public T GetFromBag(string key) + { + Guard.NotEmpty(key, nameof(key)); - if (base.Contains("Bag") && base["Bag"] is IDictionary bag) - { - if (bag.TryGetValue(key, out var value) && value is T result) - { - return result; - } - } + if (base.Contains("Bag") && base["Bag"] is IDictionary bag) + { + if (bag.TryGetValue(key, out var value) && value is T result) + { + return result; + } + } - return default(T); - } - } + return default(T); + } + } } diff --git a/src/Libraries/SmartStore.Services/News/INewsService.cs b/src/Libraries/SmartStore.Services/News/INewsService.cs index a666078fe7..f3df6d5d4e 100644 --- a/src/Libraries/SmartStore.Services/News/INewsService.cs +++ b/src/Libraries/SmartStore.Services/News/INewsService.cs @@ -23,12 +23,12 @@ public partial interface INewsService /// News NewsItem GetNewsById(int newsId); - /// - /// Get news by identifiers - /// - /// News identifiers - /// News query - IQueryable GetNewsByIds(int[] newsIds); + /// + /// Get news by identifiers + /// + /// News identifiers + /// News query + IQueryable GetNewsByIds(int[] newsIds); /// /// Gets all news diff --git a/src/Libraries/SmartStore.Services/News/NewsMessageFactoryExtensions.cs b/src/Libraries/SmartStore.Services/News/NewsMessageFactoryExtensions.cs index be7b2f8284..5138eddb03 100644 --- a/src/Libraries/SmartStore.Services/News/NewsMessageFactoryExtensions.cs +++ b/src/Libraries/SmartStore.Services/News/NewsMessageFactoryExtensions.cs @@ -5,15 +5,15 @@ namespace SmartStore.Services.News { - public static class NewsMessageFactoryExtensions - { - /// - /// Sends a news comment notification message to a store owner - /// - public static CreateMessageResult SendNewsCommentNotificationMessage(this IMessageFactory factory, NewsComment newsComment, int languageId = 0) - { - Guard.NotNull(newsComment, nameof(newsComment)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewsCommentStoreOwner, languageId, customer: newsComment.Customer), true, newsComment); - } - } + public static class NewsMessageFactoryExtensions + { + /// + /// Sends a news comment notification message to a store owner + /// + public static CreateMessageResult SendNewsCommentNotificationMessage(this IMessageFactory factory, NewsComment newsComment, int languageId = 0) + { + Guard.NotNull(newsComment, nameof(newsComment)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewsCommentStoreOwner, languageId, customer: newsComment.Customer), true, newsComment); + } + } } diff --git a/src/Libraries/SmartStore.Services/News/NewsService.cs b/src/Libraries/SmartStore.Services/News/NewsService.cs index f1dde2a738..ec75be16dd 100644 --- a/src/Libraries/SmartStore.Services/News/NewsService.cs +++ b/src/Libraries/SmartStore.Services/News/NewsService.cs @@ -13,18 +13,18 @@ namespace SmartStore.Services.News public partial class NewsService : INewsService, IXmlSitemapPublisher { private readonly IRepository _newsItemRepository; - private readonly IRepository _storeMappingRepository; + private readonly IRepository _storeMappingRepository; public NewsService(IRepository newsItemRepository, - IRepository storeMappingRepository) + IRepository storeMappingRepository) { _newsItemRepository = newsItemRepository; - _storeMappingRepository = storeMappingRepository; + _storeMappingRepository = storeMappingRepository; - this.QuerySettings = DbQuerySettings.Default; - } + this.QuerySettings = DbQuerySettings.Default; + } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } public virtual void DeleteNews(NewsItem newsItem) { @@ -42,33 +42,33 @@ public virtual NewsItem GetNewsById(int newsId) return _newsItemRepository.GetById(newsId); } - public virtual IQueryable GetNewsByIds(int[] newsIds) - { - if (newsIds == null || newsIds.Length == 0) - return null; + public virtual IQueryable GetNewsByIds(int[] newsIds) + { + if (newsIds == null || newsIds.Length == 0) + return null; - var query = - from x in _newsItemRepository.Table - where newsIds.Contains(x.Id) - select x; + var query = + from x in _newsItemRepository.Table + where newsIds.Contains(x.Id) + select x; - return query; - } + return query; + } - public virtual IPagedList GetAllNews(int languageId, int storeId, int pageIndex, int pageSize, bool showHidden = false, DateTime? maxAge = null, + public virtual IPagedList GetAllNews(int languageId, int storeId, int pageIndex, int pageSize, bool showHidden = false, DateTime? maxAge = null, string title = "", string intro = "", string full = "") { var query = _newsItemRepository.Table; - if (languageId > 0) - { - query = query.Where(n => languageId == n.LanguageId); - } + if (languageId > 0) + { + query = query.Where(n => languageId == n.LanguageId); + } - if (maxAge.HasValue) - { - query = query.Where(n => n.CreatedOnUtc >= maxAge.Value); - } + if (maxAge.HasValue) + { + query = query.Where(n => n.CreatedOnUtc >= maxAge.Value); + } if (title.HasValue()) query = query.Where(b => b.Title.Contains(title)); @@ -76,7 +76,7 @@ public virtual IPagedList GetAllNews(int languageId, int storeId, int query = query.Where(b => b.Short.Contains(intro)); if (full.HasValue()) query = query.Where(b => b.Full.Contains(full)); - + if (!showHidden) { var utcNow = DateTime.UtcNow; @@ -85,26 +85,26 @@ public virtual IPagedList GetAllNews(int languageId, int storeId, int query = query.Where(n => !n.EndDateUtc.HasValue || n.EndDateUtc >= utcNow); } - query = query.OrderByDescending(n => n.CreatedOnUtc); - - //Store mapping - if (storeId > 0 && !QuerySettings.IgnoreMultiStore) - { - query = from n in query - join sm in _storeMappingRepository.Table - on new { c1 = n.Id, c2 = "NewsItem" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into n_sm - from sm in n_sm.DefaultIfEmpty() - where !n.LimitedToStores || storeId == sm.StoreId - select n; - - //only distinct items (group by ID) - query = from n in query - group n by n.Id into nGroup - orderby nGroup.Key - select nGroup.FirstOrDefault(); + query = query.OrderByDescending(n => n.CreatedOnUtc); - query = query.OrderByDescending(n => n.CreatedOnUtc); - } + //Store mapping + if (storeId > 0 && !QuerySettings.IgnoreMultiStore) + { + query = from n in query + join sm in _storeMappingRepository.Table + on new { c1 = n.Id, c2 = "NewsItem" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into n_sm + from sm in n_sm.DefaultIfEmpty() + where !n.LimitedToStores || storeId == sm.StoreId + select n; + + //only distinct items (group by ID) + query = from n in query + group n by n.Id into nGroup + orderby nGroup.Key + select nGroup.FirstOrDefault(); + + query = query.OrderByDescending(n => n.CreatedOnUtc); + } var news = new PagedList(query, pageIndex, pageSize); return news; @@ -125,7 +125,7 @@ public virtual void UpdateNews(NewsItem news) _newsItemRepository.Update(news); } - + public virtual void UpdateCommentTotals(NewsItem newsItem) { if (newsItem == null) diff --git a/src/Libraries/SmartStore.Services/Orders/AddToCartContext.cs b/src/Libraries/SmartStore.Services/Orders/AddToCartContext.cs index e747b73fa3..e409494c69 100644 --- a/src/Libraries/SmartStore.Services/Orders/AddToCartContext.cs +++ b/src/Libraries/SmartStore.Services/Orders/AddToCartContext.cs @@ -6,37 +6,31 @@ namespace SmartStore.Services.Orders { - public class AddToCartContext - { - public AddToCartContext() - { - Warnings = new List(); - CustomerEnteredPrice = decimal.Zero; - ChildItems = new List(); - } + public class AddToCartContext + { + public AddToCartContext() + { + Warnings = new List(); + CustomerEnteredPrice = decimal.Zero; + ChildItems = new List(); + } - public List Warnings { get; set; } + public List Warnings { get; set; } - public ShoppingCartItem Item { get; set; } - public List ChildItems { get; set; } - public ProductBundleItem BundleItem { get; set; } + public ShoppingCartItem Item { get; set; } + public List ChildItems { get; set; } + public ProductBundleItem BundleItem { get; set; } - public Customer Customer { get; set; } - public Product Product { get; set; } - public ShoppingCartType CartType { get; set; } - public ProductVariantQuery VariantQuery { get; set; } - public string AttributesXml { get; set; } - public decimal CustomerEnteredPrice { get; set; } - public int Quantity { get; set; } - public bool AddRequiredProducts { get; set; } - public int? StoreId { get; set; } + public Customer Customer { get; set; } + public Product Product { get; set; } + public ShoppingCartType CartType { get; set; } + public ProductVariantQuery VariantQuery { get; set; } + public string AttributesXml { get; set; } + public decimal CustomerEnteredPrice { get; set; } + public int Quantity { get; set; } + public bool AddRequiredProducts { get; set; } + public int? StoreId { get; set; } - public int BundleItemId - { - get - { - return (BundleItem == null ? 0 : BundleItem.Id); - } - } - } + public int BundleItemId => (BundleItem == null ? 0 : BundleItem.Id); + } } diff --git a/src/Libraries/SmartStore.Services/Orders/AutoUpdateOrderItemContext.cs b/src/Libraries/SmartStore.Services/Orders/AutoUpdateOrderItemContext.cs index 38528c835c..fa2de4a435 100644 --- a/src/Libraries/SmartStore.Services/Orders/AutoUpdateOrderItemContext.cs +++ b/src/Libraries/SmartStore.Services/Orders/AutoUpdateOrderItemContext.cs @@ -4,101 +4,95 @@ namespace SmartStore.Services.Orders { - public class AutoUpdateOrderItemContext - { - /// - /// [IN] Whether order item is new - /// - public bool IsNewOrderItem { get; set; } - - /// - /// [IN] Order item - /// - public OrderItem OrderItem { get; set; } - - /// - /// [IN] Whether to adjust the inventory - /// - public bool AdjustInventory { get; set; } - - /// - /// [IN] Whether to update order totals if order is in pending state - /// - public bool UpdateTotals { get; set; } - - /// - /// [IN] Whether to update reward points - /// - public bool UpdateRewardPoints { get; set; } - - /// - /// [IN] Quantity old - /// - public int QuantityOld { get; set; } - - /// - /// [IN] Quantity new - /// - public int QuantityNew { get; set; } - - /// - /// [OUT] Inventory changes - /// - public AdjustInventoryResult Inventory { get; set; } - - /// - /// [OUT] Reward points old - /// - public int RewardPointsOld { get; set; } - - /// - /// [OUT] Reward points new - /// - public int RewardPointsNew { get; set; } - - public static string InfoKey { get { return "UpdateOrderItemContextInfo"; } } - - /// - /// The value to which the quantity amount has changed - /// - public int QuantityDelta - { - get - { - return QuantityNew - QuantityOld; - } - } - - public decimal QuantityChangeFactor - { - get - { - if (QuantityOld != 0) - return (decimal)QuantityNew / (decimal)QuantityOld; - - return 1.0M; - } - } - - public string ToString(ILocalizationService localizationService) - { - if (Inventory == null && RewardPointsOld == 0 && RewardPointsNew == 0) - return ""; - - string stockOld = null; - string stockNew = null; - - if (Inventory != null && Inventory.HasClearStockQuantityResult) - { - stockOld = Inventory.StockQuantityOld.ToString(); - stockNew = Inventory.StockQuantityNew.ToString(); - } - - string result = localizationService.GetResource("Admin.Orders.OrderItem.Update.Info").FormatWith( - stockOld.NaIfEmpty(), stockNew.NaIfEmpty(), RewardPointsOld, RewardPointsNew - ); - - return result; - } - } + public class AutoUpdateOrderItemContext + { + /// + /// [IN] Whether order item is new + /// + public bool IsNewOrderItem { get; set; } + + /// + /// [IN] Order item + /// + public OrderItem OrderItem { get; set; } + + /// + /// [IN] Whether to adjust the inventory + /// + public bool AdjustInventory { get; set; } + + /// + /// [IN] Whether to update order totals if order is in pending state + /// + public bool UpdateTotals { get; set; } + + /// + /// [IN] Whether to update reward points + /// + public bool UpdateRewardPoints { get; set; } + + /// + /// [IN] Quantity old + /// + public int QuantityOld { get; set; } + + /// + /// [IN] Quantity new + /// + public int QuantityNew { get; set; } + + /// + /// [OUT] Inventory changes + /// + public AdjustInventoryResult Inventory { get; set; } + + /// + /// [OUT] Reward points old + /// + public int RewardPointsOld { get; set; } + + /// + /// [OUT] Reward points new + /// + public int RewardPointsNew { get; set; } + + public static string InfoKey => "UpdateOrderItemContextInfo"; + + /// + /// The value to which the quantity amount has changed + /// + public int QuantityDelta => QuantityNew - QuantityOld; + + public decimal QuantityChangeFactor + { + get + { + if (QuantityOld != 0) + return (decimal)QuantityNew / (decimal)QuantityOld; + + return 1.0M; + } + } + + public string ToString(ILocalizationService localizationService) + { + if (Inventory == null && RewardPointsOld == 0 && RewardPointsNew == 0) + return ""; + + string stockOld = null; + string stockNew = null; + + if (Inventory != null && Inventory.HasClearStockQuantityResult) + { + stockOld = Inventory.StockQuantityOld.ToString(); + stockNew = Inventory.StockQuantityNew.ToString(); + } + + string result = localizationService.GetResource("Admin.Orders.OrderItem.Update.Info").FormatWith( + stockOld.NaIfEmpty(), stockNew.NaIfEmpty(), RewardPointsOld, RewardPointsNew + ); + + return result; + } + } } diff --git a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeExtensions.cs b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeExtensions.cs index ceda7c8b9d..1529de1509 100644 --- a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeExtensions.cs +++ b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeExtensions.cs @@ -26,7 +26,7 @@ public static bool ShouldHaveValues(this CheckoutAttribute checkoutAttribute) checkoutAttribute.AttributeControlType == AttributeControlType.Datepicker || checkoutAttribute.AttributeControlType == AttributeControlType.FileUpload) return false; - + //other attribute controle types support values return true; } diff --git a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeFormatter.cs b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeFormatter.cs index 377cace034..84fd3b046f 100644 --- a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeFormatter.cs +++ b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeFormatter.cs @@ -68,9 +68,9 @@ public string FormatAttributes(string attributes) /// A value indicating whether to HTML hyperink tags could be rendered (if required) /// Attributes public string FormatAttributes(string attributes, - Customer customer, - string serapator = "
", - bool htmlEncode = true, + Customer customer, + string serapator = "
", + bool htmlEncode = true, bool renderPrices = true, bool allowHyperlinks = true) { @@ -101,8 +101,8 @@ public string FormatAttributes(string attributes, if (htmlEncode) attributeName = HttpUtility.HtmlEncode(attributeName); - caAttribute = string.Format("{0}: {1}", attributeName, - HtmlUtils.ConvertPlainTextToHtml(valueStr.EmptyNull().Replace(":", "").HtmlEncode())); + caAttribute = string.Format("{0}: {1}", attributeName, + HtmlUtils.ConvertPlainTextToHtml(valueStr.EmptyNull().Replace(":", "").HtmlEncode())); //we never encode multiline textbox input } @@ -184,6 +184,6 @@ public string FormatAttributes(string attributes, return result.ToString(); } - + } } diff --git a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeParser.cs b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeParser.cs index ed51878fd0..4393805397 100644 --- a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeParser.cs +++ b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeParser.cs @@ -91,39 +91,39 @@ public IList ParseValues(string attributes, int checkoutAttributeId) { var selectedCheckoutAttributeValues = new List(); - if (attributes.HasValue()) - { - try - { - var xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(attributes); - - var nodeList1 = xmlDoc.SelectNodes(@"//Attributes/CheckoutAttribute"); - foreach (XmlNode node1 in nodeList1) - { - if (node1.Attributes != null && node1.Attributes["ID"] != null) - { - var str1 = node1.Attributes["ID"].InnerText.Trim(); - if (int.TryParse(str1, out var id)) - { - if (id == checkoutAttributeId) - { - var nodeList2 = node1.SelectNodes(@"CheckoutAttributeValue/Value"); - foreach (XmlNode node2 in nodeList2) - { - string value = node2.InnerText.Trim(); - selectedCheckoutAttributeValues.Add(value); - } - } - } - } - } - } - catch (Exception ex) - { - Debug.Write(ex.ToString()); - } - } + if (attributes.HasValue()) + { + try + { + var xmlDoc = new XmlDocument(); + xmlDoc.LoadXml(attributes); + + var nodeList1 = xmlDoc.SelectNodes(@"//Attributes/CheckoutAttribute"); + foreach (XmlNode node1 in nodeList1) + { + if (node1.Attributes != null && node1.Attributes["ID"] != null) + { + var str1 = node1.Attributes["ID"].InnerText.Trim(); + if (int.TryParse(str1, out var id)) + { + if (id == checkoutAttributeId) + { + var nodeList2 = node1.SelectNodes(@"CheckoutAttributeValue/Value"); + foreach (XmlNode node2 in nodeList2) + { + string value = node2.InnerText.Trim(); + selectedCheckoutAttributeValues.Add(value); + } + } + } + } + } + } + catch (Exception ex) + { + Debug.Write(ex.ToString()); + } + } return selectedCheckoutAttributeValues; } diff --git a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeService.cs b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeService.cs index 63a0d65b12..afa40cda5f 100644 --- a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeService.cs @@ -9,32 +9,32 @@ namespace SmartStore.Services.Orders { - public partial class CheckoutAttributeService : ICheckoutAttributeService + public partial class CheckoutAttributeService : ICheckoutAttributeService { private readonly IRepository _checkoutAttributeRepository; private readonly IRepository _checkoutAttributeValueRepository; - private readonly IRepository _storeMappingRepository; - private readonly IEventPublisher _eventPublisher; + private readonly IRepository _storeMappingRepository; + private readonly IEventPublisher _eventPublisher; public CheckoutAttributeService( IRepository checkoutAttributeRepository, IRepository checkoutAttributeValueRepository, - IRepository storeMappingRepository, - IEventPublisher eventPublisher) + IRepository storeMappingRepository, + IEventPublisher eventPublisher) { _checkoutAttributeRepository = checkoutAttributeRepository; _checkoutAttributeValueRepository = checkoutAttributeValueRepository; - _storeMappingRepository = storeMappingRepository; + _storeMappingRepository = storeMappingRepository; _eventPublisher = eventPublisher; - this.QuerySettings = DbQuerySettings.Default; - } + this.QuerySettings = DbQuerySettings.Default; + } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } - #region Checkout attributes + #region Checkout attributes - public virtual void DeleteCheckoutAttribute(CheckoutAttribute checkoutAttribute) + public virtual void DeleteCheckoutAttribute(CheckoutAttribute checkoutAttribute) { if (checkoutAttribute == null) throw new ArgumentNullException("checkoutAttribute"); @@ -42,39 +42,39 @@ public virtual void DeleteCheckoutAttribute(CheckoutAttribute checkoutAttribute) _checkoutAttributeRepository.Delete(checkoutAttribute); } - public virtual IQueryable GetCheckoutAttributes(int storeId = 0, bool showHidden = false) - { - var query = _checkoutAttributeRepository.Table; - - if (!showHidden) - query = query.Where(x => x.IsActive); - - if (storeId > 0 && !QuerySettings.IgnoreMultiStore) - { - query = - from x in query - join sm in _storeMappingRepository.Table on new { c1 = x.Id, c2 = "CheckoutAttribute" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into x_sm - from sm in x_sm.DefaultIfEmpty() - where !x.LimitedToStores || storeId == sm.StoreId - select x; - - query = - from x in query - group x by x.Id into grp - orderby grp.Key - select grp.FirstOrDefault(); - } - - query = query.OrderBy(x => x.DisplayOrder); - - return query; - } + public virtual IQueryable GetCheckoutAttributes(int storeId = 0, bool showHidden = false) + { + var query = _checkoutAttributeRepository.Table; + + if (!showHidden) + query = query.Where(x => x.IsActive); + + if (storeId > 0 && !QuerySettings.IgnoreMultiStore) + { + query = + from x in query + join sm in _storeMappingRepository.Table on new { c1 = x.Id, c2 = "CheckoutAttribute" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into x_sm + from sm in x_sm.DefaultIfEmpty() + where !x.LimitedToStores || storeId == sm.StoreId + select x; + + query = + from x in query + group x by x.Id into grp + orderby grp.Key + select grp.FirstOrDefault(); + } + + query = query.OrderBy(x => x.DisplayOrder); + + return query; + } - public virtual IList GetAllCheckoutAttributes(int storeId = 0, bool showHidden = false) + public virtual IList GetAllCheckoutAttributes(int storeId = 0, bool showHidden = false) { - var query = GetCheckoutAttributes(storeId, showHidden); - return query.ToListCached("db.checkoutattrs.{0}.{1}".FormatInvariant(storeId, showHidden)); - } + var query = GetCheckoutAttributes(storeId, showHidden); + return query.ToListCached("db.checkoutattrs.{0}.{1}".FormatInvariant(storeId, showHidden)); + } /// /// Gets a checkout attribute @@ -86,8 +86,8 @@ public virtual CheckoutAttribute GetCheckoutAttributeById(int checkoutAttributeI if (checkoutAttributeId == 0) return null; - return _checkoutAttributeRepository.GetByIdCached(checkoutAttributeId, "db.checkoutattr.id-" + checkoutAttributeId); - } + return _checkoutAttributeRepository.GetByIdCached(checkoutAttributeId, "db.checkoutattr.id-" + checkoutAttributeId); + } public virtual void InsertCheckoutAttribute(CheckoutAttribute checkoutAttribute) { @@ -119,21 +119,21 @@ public virtual void DeleteCheckoutAttributeValue(CheckoutAttributeValue checkout public virtual IList GetCheckoutAttributeValues(int checkoutAttributeId) { - var query = from cav in _checkoutAttributeValueRepository.Table - orderby cav.DisplayOrder - where cav.CheckoutAttributeId == checkoutAttributeId - select cav; - var checkoutAttributeValues = query.ToListCached(); - return checkoutAttributeValues; - } - + var query = from cav in _checkoutAttributeValueRepository.Table + orderby cav.DisplayOrder + where cav.CheckoutAttributeId == checkoutAttributeId + select cav; + var checkoutAttributeValues = query.ToListCached(); + return checkoutAttributeValues; + } + public virtual CheckoutAttributeValue GetCheckoutAttributeValueById(int checkoutAttributeValueId) { if (checkoutAttributeValueId == 0) return null; - return _checkoutAttributeValueRepository.GetByIdCached(checkoutAttributeValueId, "db.checkoutattrval.id-" + checkoutAttributeValueId); - } + return _checkoutAttributeValueRepository.GetByIdCached(checkoutAttributeValueId, "db.checkoutattrval.id-" + checkoutAttributeValueId); + } public virtual void InsertCheckoutAttributeValue(CheckoutAttributeValue checkoutAttributeValue) { @@ -150,7 +150,7 @@ public virtual void UpdateCheckoutAttributeValue(CheckoutAttributeValue checkout _checkoutAttributeValueRepository.Update(checkoutAttributeValue); } - + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Orders/CheckoutState.cs b/src/Libraries/SmartStore.Services/Orders/CheckoutState.cs index a2da7e33e2..103405a4a7 100644 --- a/src/Libraries/SmartStore.Services/Orders/CheckoutState.cs +++ b/src/Libraries/SmartStore.Services/Orders/CheckoutState.cs @@ -3,35 +3,35 @@ namespace SmartStore.Services.Orders { - [Serializable] - public partial class CheckoutState - { - public CheckoutState() - { - CustomProperties = new Dictionary(); - PaymentData = new Dictionary(); - } + [Serializable] + public partial class CheckoutState + { + public CheckoutState() + { + CustomProperties = new Dictionary(); + PaymentData = new Dictionary(); + } - public static string CheckoutStateSessionKey { get { return "SmCheckoutState"; } } + public static string CheckoutStateSessionKey => "SmCheckoutState"; - /// - /// The payment summary as displayed on the checkout confirmation page - /// - public string PaymentSummary { get; set; } + /// + /// The payment summary as displayed on the checkout confirmation page + /// + public string PaymentSummary { get; set; } - /// - /// Indicates whether the payment method selection page was skipped - /// - public bool IsPaymentSelectionSkipped { get; set; } + /// + /// Indicates whether the payment method selection page was skipped + /// + public bool IsPaymentSelectionSkipped { get; set; } - /// - /// Use this dictionary for any custom data required along checkout flow - /// - public IDictionary CustomProperties { get; set; } + /// + /// Use this dictionary for any custom data required along checkout flow + /// + public IDictionary CustomProperties { get; set; } - /// - /// Payment data entered on payment method selection page - /// - public IDictionary PaymentData { get; set; } - } + /// + /// Payment data entered on payment method selection page + /// + public IDictionary PaymentData { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Orders/EventPublisherExtensions.cs b/src/Libraries/SmartStore.Services/Orders/EventPublisherExtensions.cs index 00bab7dad1..8e5bd4f491 100644 --- a/src/Libraries/SmartStore.Services/Orders/EventPublisherExtensions.cs +++ b/src/Libraries/SmartStore.Services/Orders/EventPublisherExtensions.cs @@ -26,28 +26,28 @@ public static void PublishOrderPlaced(this IEventPublisher eventPublisher, Order eventPublisher.Publish(new OrderPlacedEvent(order)); } - /// - /// Publishes the order updated event. - /// - /// The event publisher. - /// The order. - public static void PublishOrderUpdated(this IEventPublisher eventPublisher, Order order) - { - if (order != null) - eventPublisher.Publish(new OrderUpdatedEvent(order)); - } + /// + /// Publishes the order updated event. + /// + /// The event publisher. + /// The order. + public static void PublishOrderUpdated(this IEventPublisher eventPublisher, Order order) + { + if (order != null) + eventPublisher.Publish(new OrderUpdatedEvent(order)); + } - /// - /// Publishes the migrate shopping cart event. - /// - /// The event publisher. - /// The source customer entity. - /// The destination customer entity. - /// Store identifier. - public static void PublishMigrateShoppingCart(this IEventPublisher eventPublisher, Customer fromCustomer, Customer toCustomer, int storeId) - { - if (fromCustomer != null && toCustomer != null) - eventPublisher.Publish(new MigrateShoppingCartEvent(fromCustomer, toCustomer, storeId)); - } + /// + /// Publishes the migrate shopping cart event. + /// + /// The event publisher. + /// The source customer entity. + /// The destination customer entity. + /// Store identifier. + public static void PublishMigrateShoppingCart(this IEventPublisher eventPublisher, Customer fromCustomer, Customer toCustomer, int storeId) + { + if (fromCustomer != null && toCustomer != null) + eventPublisher.Publish(new MigrateShoppingCartEvent(fromCustomer, toCustomer, storeId)); + } } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Orders/GiftCardService.cs b/src/Libraries/SmartStore.Services/Orders/GiftCardService.cs index d89896397d..752dfc3a22 100644 --- a/src/Libraries/SmartStore.Services/Orders/GiftCardService.cs +++ b/src/Libraries/SmartStore.Services/Orders/GiftCardService.cs @@ -15,7 +15,7 @@ namespace SmartStore.Services.Orders public partial class GiftCardService : IGiftCardService { #region Fields - + private readonly IRepository _giftCardRepository; private readonly IEventPublisher _eventPublisher; @@ -35,7 +35,7 @@ public GiftCardService(IRepository giftCardRepository, IEventPublisher } #endregion - + #region Methods /// @@ -74,7 +74,7 @@ public virtual GiftCard GetGiftCardById(int giftCardId) /// Value indicating whether gift card is activated; null to load all records /// Gift card coupon code; null or string.empty to load all records /// Gift cards - public virtual IList GetAllGiftCards(int? purchasedWithOrderId, + public virtual IList GetAllGiftCards(int? purchasedWithOrderId, DateTime? startTime = null, DateTime? endTime = null, bool? isGiftCardActivated = null, string giftCardCouponCode = "") { diff --git a/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeFormatter.cs b/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeFormatter.cs index 7394315ccd..86735a79ba 100644 --- a/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeFormatter.cs +++ b/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeFormatter.cs @@ -27,8 +27,8 @@ public partial interface ICheckoutAttributeFormatter /// A value indicating whether to HTML hyperink tags could be rendered (if required) /// Attributes string FormatAttributes(string attributes, - Customer customer, - string serapator = "
", + Customer customer, + string serapator = "
", bool htmlEncode = true, bool renderPrices = true, bool allowHyperlinks = true); diff --git a/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeService.cs b/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeService.cs index 9a520ca28b..e7c70c9c93 100644 --- a/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeService.cs @@ -4,10 +4,10 @@ namespace SmartStore.Services.Orders { - /// - /// Checkout attribute service - /// - public partial interface ICheckoutAttributeService + /// + /// Checkout attribute service + /// + public partial interface ICheckoutAttributeService { #region Checkout attributes @@ -17,21 +17,21 @@ public partial interface ICheckoutAttributeService /// Checkout attribute void DeleteCheckoutAttribute(CheckoutAttribute checkoutAttribute); - /// - /// Gets checkout attributes - /// - /// Whether to filter result by store identifier - /// A value indicating whether to show hidden records - /// Checkout attributes query - IQueryable GetCheckoutAttributes(int storeId = 0, bool showHidden = false); + /// + /// Gets checkout attributes + /// + /// Whether to filter result by store identifier + /// A value indicating whether to show hidden records + /// Checkout attributes query + IQueryable GetCheckoutAttributes(int storeId = 0, bool showHidden = false); - /// - /// Gets all checkout attributes - /// - /// Whether to filter result by store identifier - /// A value indicating whether to show hidden records - /// Checkout attribute collection - IList GetAllCheckoutAttributes(int storeId = 0, bool showHidden = false); + /// + /// Gets all checkout attributes + /// + /// Whether to filter result by store identifier + /// A value indicating whether to show hidden records + /// Checkout attribute collection + IList GetAllCheckoutAttributes(int storeId = 0, bool showHidden = false); /// /// Gets a checkout attribute @@ -68,7 +68,7 @@ public partial interface ICheckoutAttributeService /// The checkout attribute identifier /// Checkout attribute value collection IList GetCheckoutAttributeValues(int checkoutAttributeId); - + /// /// Gets a checkout attribute value /// @@ -87,7 +87,7 @@ public partial interface ICheckoutAttributeService /// /// Checkout attribute value void UpdateCheckoutAttributeValue(CheckoutAttributeValue checkoutAttributeValue); - + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Orders/IGiftCardService.cs b/src/Libraries/SmartStore.Services/Orders/IGiftCardService.cs index 6c7255852b..fa819a1e39 100644 --- a/src/Libraries/SmartStore.Services/Orders/IGiftCardService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IGiftCardService.cs @@ -53,12 +53,12 @@ IList GetAllGiftCards(int? purchasedWithOrderId, DateTime? startTime = /// Purchased with order item identifier /// Gift card entries IList GetGiftCardsByPurchasedWithOrderItemId(int purchasedWithOrderItemId); - + /// /// Get active gift cards that are applied by a customer /// /// Customer - /// Store identifier + /// Store identifier /// Active gift cards IList GetActiveGiftCardsAppliedByCustomer(Customer customer, int storeId); diff --git a/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs index 9c825dc868..96b6f07843 100644 --- a/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IOrderProcessingService.cs @@ -81,7 +81,7 @@ IList GetOrderPlacementWarnings( bool CanCancelRecurringPayment(Customer customerToValidate, RecurringPayment recurringPayment); - + /// @@ -90,7 +90,7 @@ IList GetOrderPlacementWarnings( /// Shipment /// True to notify customer void Ship(Shipment shipment, bool notifyCustomer); - + /// /// Marks a shipment as delivered /// @@ -114,11 +114,11 @@ IList GetOrderPlacementWarnings( /// True to notify customer void CancelOrder(Order order, bool notifyCustomer); - /// - /// Auto update order details - /// - /// Context parameters - void AutoUpdateOrderDetails(AutoUpdateOrderItemContext context); + /// + /// Auto update order details + /// + /// Context parameters + void AutoUpdateOrderDetails(AutoUpdateOrderItemContext context); /// @@ -135,18 +135,18 @@ IList GetOrderPlacementWarnings( void MarkAsAuthorized(Order order); - /// - /// Gets a value indicating whether the order can be marked as completed - /// - /// Order - /// A value indicating whether the order can be marked as completed - bool CanCompleteOrder(Order order); + /// + /// Gets a value indicating whether the order can be marked as completed + /// + /// Order + /// A value indicating whether the order can be marked as completed + bool CanCompleteOrder(Order order); - /// - /// Marks the order as completed - /// - /// Order - void CompleteOrder(Order order); + /// + /// Marks the order as completed + /// + /// Order + void CompleteOrder(Order order); /// @@ -273,7 +273,7 @@ IList GetOrderPlacementWarnings( /// /// The order void ReOrder(Order order); - + /// /// Check whether return request is allowed /// diff --git a/src/Libraries/SmartStore.Services/Orders/IOrderReportService.cs b/src/Libraries/SmartStore.Services/Orders/IOrderReportService.cs index ec2a328843..4894bf6549 100644 --- a/src/Libraries/SmartStore.Services/Orders/IOrderReportService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IOrderReportService.cs @@ -77,8 +77,8 @@ IPagedList BestSellersReport( int storeId, DateTime? startTime, DateTime? endTime, - OrderStatus? orderStatus, - PaymentStatus? paymentStatus, + OrderStatus? orderStatus, + PaymentStatus? paymentStatus, ShippingStatus? shippingStatus, int billingCountryId = 0, int pageIndex = 0, diff --git a/src/Libraries/SmartStore.Services/Orders/IOrderService.cs b/src/Libraries/SmartStore.Services/Orders/IOrderService.cs index 73622696a3..51e4d43746 100644 --- a/src/Libraries/SmartStore.Services/Orders/IOrderService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IOrderService.cs @@ -48,21 +48,21 @@ public partial interface IOrderService /// Order Order GetOrderByGuid(Guid orderGuid); - /// - /// Get order by payment authorization data - /// - /// System name of the payment method - /// Authorization transaction Id - /// Order entity - Order GetOrderByPaymentAuthorization(string paymentMethodSystemName, string authorizationTransactionId); - - /// - /// Get order by payment capture data - /// - /// System name of the payment method - /// Capture transaction Id - /// Order entity - Order GetOrderByPaymentCapture(string paymentMethodSystemName, string captureTransactionId); + /// + /// Get order by payment authorization data + /// + /// System name of the payment method + /// Authorization transaction Id + /// Order entity + Order GetOrderByPaymentAuthorization(string paymentMethodSystemName, string authorizationTransactionId); + + /// + /// Get order by payment capture data + /// + /// System name of the payment method + /// Capture transaction Id + /// Order entity + Order GetOrderByPaymentCapture(string paymentMethodSystemName, string captureTransactionId); /// /// Deletes an order @@ -70,32 +70,32 @@ public partial interface IOrderService /// The order void DeleteOrder(Order order); - /// - /// Get orders - /// - /// Store identifier; null to load all orders - /// Customer identifier; null to load all orders - /// Order start time; null to load all orders - /// Order end time; null to load all orders - /// Filter by order status - /// Filter by payment status - /// Filter by shipping status - /// Billing email. Leave empty to load all records. - /// Filter by order number - /// Billing name. Leave empty to load all records. + /// + /// Get orders + /// + /// Store identifier; null to load all orders + /// Customer identifier; null to load all orders + /// Order start time; null to load all orders + /// Order end time; null to load all orders + /// Filter by order status + /// Filter by payment status + /// Filter by shipping status + /// Billing email. Leave empty to load all records. + /// Filter by order number + /// Billing name. Leave empty to load all records. /// Filter by payment method system names. - /// Order query - IQueryable GetOrders( - int storeId, - int customerId, - DateTime? startTime, - DateTime? endTime, - int[] orderStatusIds, - int[] paymentStatusIds, - int[] shippingStatusIds, - string billingEmail, - string orderNumber, - string billingName = null, + /// Order query + IQueryable GetOrders( + int storeId, + int customerId, + DateTime? startTime, + DateTime? endTime, + int[] orderStatusIds, + int[] paymentStatusIds, + int[] shippingStatusIds, + string billingEmail, + string orderNumber, + string billingName = null, string[] paymentMethods = null); /// @@ -117,8 +117,8 @@ IQueryable GetOrders( /// Filter by payment method system names. /// Order collection IPagedList SearchOrders(int storeId, int customerId, DateTime? startTime, DateTime? endTime, - int[] orderStatusIds, int[] paymentStatusIds, int[] shippingStatusIds, - string billingEmail, string orderGuid, string orderNumber, int pageIndex, int pageSize, string billingName = null, + int[] orderStatusIds, int[] paymentStatusIds, int[] shippingStatusIds, + string billingEmail, string orderGuid, string orderNumber, int pageIndex, int pageSize, string billingName = null, string[] paymentMethods = null); /// @@ -163,24 +163,24 @@ IPagedList SearchOrders(int storeId, int customerId, DateTime? startTime, /// Order Order GetOrderByAuthorizationTransactionIdAndPaymentMethod(string authorizationTransactionId, string paymentMethodSystemName); - /// - /// Shortcut to add an order - /// - /// Order - /// Order note - /// Whether to display the note to the customer - void AddOrderNote(Order order, string note, bool displayToCustomer = false); + /// + /// Shortcut to add an order + /// + /// Order + /// Order note + /// Whether to display the note to the customer + void AddOrderNote(Order order, string note, bool displayToCustomer = false); - #endregion + #endregion - #region Orders items + #region Orders items - /// - /// Gets an order item - /// - /// Order item identifier - /// Order item - OrderItem GetOrderItemById(int orderItemId); + /// + /// Gets an order item + /// + /// Order item identifier + /// Order item + OrderItem GetOrderItemById(int orderItemId); /// /// Gets an order item @@ -206,12 +206,12 @@ IList GetAllOrderItems(int? orderId, OrderStatus? os, PaymentStatus? ps, ShippingStatus? ss, bool loadDownloableProductsOnly = false); - /// - /// Get order items by order identifiers - /// - /// Order identifiers - /// Order items - Multimap GetOrderItemsByOrderIds(int[] orderIds); + /// + /// Get order items by order identifiers + /// + /// Order identifiers + /// Order items + Multimap GetOrderItemsByOrderIds(int[] orderIds); /// /// Delete an order item @@ -260,8 +260,8 @@ IList GetAllOrderItems(int? orderId, /// Page size /// Recurring payment collection IPagedList SearchRecurringPayments( - int storeId, - int customerId, + int storeId, + int customerId, int initialOrderId, OrderStatus? initialOrderStatus, bool showHidden = false, @@ -284,20 +284,20 @@ IPagedList SearchRecurringPayments( /// Return request identifier /// Return request ReturnRequest GetReturnRequestById(int returnRequestId); - + /// /// Search return requests /// - /// Store identifier; 0 to load all entries + /// Store identifier; 0 to load all entries /// Customer identifier; null to load all entries /// Order item identifier; null to load all entries /// Return request status; null to load all entries - /// Page index - /// Page size - /// Return Request Id + /// Page index + /// Page size + /// Return Request Id /// Return requests - IPagedList SearchReturnRequests(int storeId, int customerId, int orderItemId, ReturnRequestStatus? rs, int pageIndex, int pageSize, int id = 0); - + IPagedList SearchReturnRequests(int storeId, int customerId, int orderItemId, ReturnRequestStatus? rs, int pageIndex, int pageSize, int id = 0); + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Orders/IOrderTotalCalculationService.cs b/src/Libraries/SmartStore.Services/Orders/IOrderTotalCalculationService.cs index 3f5ee14bb5..627723b438 100644 --- a/src/Libraries/SmartStore.Services/Orders/IOrderTotalCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IOrderTotalCalculationService.cs @@ -72,7 +72,7 @@ decimal GetOrderSubtotalDiscount(Customer customer, /// Applied discount /// Adjusted shipping rate decimal AdjustShippingRate(decimal shippingRate, IList cart, - ShippingOption shippingOption, IList shippingMethods, out Discount appliedDiscount); + ShippingOption shippingOption, IList shippingMethods, out Discount appliedDiscount); /// /// Gets shopping cart additional shipping charge @@ -114,14 +114,14 @@ decimal AdjustShippingRate(decimal shippingRate, IList cart, bool includingTax, out decimal taxRate, out Discount appliedDiscount); - /// - /// Gets a shipping discount - /// - /// Customer - /// Shipping total - /// Applied discount - /// Shipping discount - decimal GetShippingDiscount(Customer customer, decimal shippingTotal, out Discount appliedDiscount); + /// + /// Gets a shipping discount + /// + /// Customer + /// Shipping total + /// Applied discount + /// Shipping discount + decimal GetShippingDiscount(Customer customer, decimal shippingTotal, out Discount appliedDiscount); @@ -161,7 +161,7 @@ ShoppingCartTotal GetShoppingCartTotal( IList cart, bool ignoreRewardPoints = false, bool usePaymentMethodAdditionalFee = true, - bool ignoreCreditBalance = false); + bool ignoreCreditBalance = false); /// diff --git a/src/Libraries/SmartStore.Services/Orders/IShoppingCartService.cs b/src/Libraries/SmartStore.Services/Orders/IShoppingCartService.cs index 65db9f38a9..40563cf31d 100644 --- a/src/Libraries/SmartStore.Services/Orders/IShoppingCartService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IShoppingCartService.cs @@ -12,42 +12,42 @@ namespace SmartStore.Services.Orders /// public partial interface IShoppingCartService { - /// - /// Gets the shopping cart items count - /// - /// Customer. Cannot be null. - /// Type of cart to get items count for - /// Store id - /// Sum of all item quantities - int CountItems(Customer customer, ShoppingCartType cartType, int? storeId = null); + /// + /// Gets the shopping cart items count + /// + /// Customer. Cannot be null. + /// Type of cart to get items count for + /// Store id + /// Sum of all item quantities + int CountItems(Customer customer, ShoppingCartType cartType, int? storeId = null); - /// - /// Gets the shopping cart items - /// - /// Customer. Cannot be null. - /// Type of cart to get items for - /// Store id - /// All cart items - List GetCartItems(Customer customer, ShoppingCartType cartType, int? storeId = null); + /// + /// Gets the shopping cart items + /// + /// Customer. Cannot be null. + /// Type of cart to get items for + /// Store id + /// All cart items + List GetCartItems(Customer customer, ShoppingCartType cartType, int? storeId = null); - /// - /// Delete shopping cart item - /// - /// Shopping cart item - /// A value indicating whether to reset checkout data - /// A value indicating whether to ensure that only active checkout attributes are attached to the current customer - /// A value indicating whether to delete child cart items - void DeleteShoppingCartItem( - ShoppingCartItem shoppingCartItem, - bool resetCheckoutData = true, - bool ensureOnlyActiveCheckoutAttributes = false, - bool deleteChildCartItems = true); + /// + /// Delete shopping cart item + /// + /// Shopping cart item + /// A value indicating whether to reset checkout data + /// A value indicating whether to ensure that only active checkout attributes are attached to the current customer + /// A value indicating whether to delete child cart items + void DeleteShoppingCartItem( + ShoppingCartItem shoppingCartItem, + bool resetCheckoutData = true, + bool ensureOnlyActiveCheckoutAttributes = false, + bool deleteChildCartItems = true); - void DeleteShoppingCartItem( - int shoppingCartItemId, - bool resetCheckoutData = true, - bool ensureOnlyActiveCheckoutAttributes = false, - bool deleteChildCartItems = true); + void DeleteShoppingCartItem( + int shoppingCartItemId, + bool resetCheckoutData = true, + bool ensureOnlyActiveCheckoutAttributes = false, + bool deleteChildCartItems = true); /// /// Deletes expired shopping cart items @@ -67,11 +67,11 @@ void DeleteShoppingCartItem( /// Automatically add required products if enabled /// Warnings IList GetRequiredProductWarnings( - Customer customer, - ShoppingCartType shoppingCartType, - Product product, - int storeId, - bool automaticallyAddRequiredProductsIfEnabled); + Customer customer, + ShoppingCartType shoppingCartType, + Product product, + int storeId, + bool automaticallyAddRequiredProductsIfEnabled); /// /// Validates a product for standard properties @@ -84,32 +84,32 @@ IList GetRequiredProductWarnings( /// Quantity /// Warnings IList GetStandardWarnings( - Customer customer, - ShoppingCartType shoppingCartType, - Product product, - string selectedAttributes, - decimal customerEnteredPrice, - int quantity); + Customer customer, + ShoppingCartType shoppingCartType, + Product product, + string selectedAttributes, + decimal customerEnteredPrice, + int quantity); - /// - /// Validates shopping cart item attributes - /// - /// The customer - /// Shopping cart type - /// Product - /// Selected attributes - /// The product variant attribute combination instance (reduces database roundtrips) - /// Quantity - /// Product bundle item - /// Warnings - IList GetShoppingCartItemAttributeWarnings( - Customer customer, - ShoppingCartType shoppingCartType, - Product product, - string selectedAttributes, - int quantity = 1, - ProductBundleItem bundleItem = null, - ProductVariantAttributeCombination combination = null); + /// + /// Validates shopping cart item attributes + /// + /// The customer + /// Shopping cart type + /// Product + /// Selected attributes + /// The product variant attribute combination instance (reduces database roundtrips) + /// Quantity + /// Product bundle item + /// Warnings + IList GetShoppingCartItemAttributeWarnings( + Customer customer, + ShoppingCartType shoppingCartType, + Product product, + string selectedAttributes, + int quantity = 1, + ProductBundleItem bundleItem = null, + ProductVariantAttributeCombination combination = null); /// /// Validates shopping cart item (gift card) @@ -120,14 +120,14 @@ IList GetShoppingCartItemAttributeWarnings( /// Warnings IList GetShoppingCartItemGiftCardWarnings(ShoppingCartType shoppingCartType, Product product, string selectedAttributes); - /// - /// Validates bundle items - /// - /// Shopping cart type - /// Product bundle item - /// Warnings - IList GetBundleItemWarnings(ProductBundleItem bundleItem); - IList GetBundleItemWarnings(IList cartItems); + /// + /// Validates bundle items + /// + /// Shopping cart type + /// Product bundle item + /// Warnings + IList GetBundleItemWarnings(ProductBundleItem bundleItem); + IList GetBundleItemWarnings(IList cartItems); /// /// Validates shopping cart item @@ -149,21 +149,21 @@ IList GetShoppingCartItemAttributeWarnings( /// Child cart items to validate bundle items /// Warnings IList GetShoppingCartItemWarnings( - Customer customer, - ShoppingCartType shoppingCartType, - Product product, - int storeId, - string selectedAttributes, - decimal customerEnteredPrice, - int quantity, - bool automaticallyAddRequiredProductsIfEnabled, - bool getStandardWarnings = true, - bool getAttributesWarnings = true, - bool getGiftCardWarnings = true, - bool getRequiredProductWarnings = true, - bool getBundleWarnings = true, - ProductBundleItem bundleItem = null, - IList childItems = null); + Customer customer, + ShoppingCartType shoppingCartType, + Product product, + int storeId, + string selectedAttributes, + decimal customerEnteredPrice, + int quantity, + bool automaticallyAddRequiredProductsIfEnabled, + bool getStandardWarnings = true, + bool getAttributesWarnings = true, + bool getGiftCardWarnings = true, + bool getRequiredProductWarnings = true, + bool getBundleWarnings = true, + ProductBundleItem bundleItem = null, + IList childItems = null); /// /// Validates whether this shopping cart is valid @@ -184,47 +184,47 @@ IList GetShoppingCartItemWarnings( /// Price entered by a customer /// Found shopping cart item OrganizedShoppingCartItem FindShoppingCartItemInTheCart( - IList shoppingCart, + IList shoppingCart, ShoppingCartType shoppingCartType, - Product product, + Product product, string selectedAttributes = "", decimal customerEnteredPrice = decimal.Zero); - /// - /// Add product to cart - /// - /// The customer - /// The product - /// Cart type - /// Store identifier - /// Selected attributes - /// Price entered by customer - /// Quantity - /// Whether to add required products - /// Add to cart context - /// List with warnings - List AddToCart( - Customer customer, - Product product, - ShoppingCartType cartType, - int storeId, - string selectedAttributes, - decimal customerEnteredPrice, - int quantity, - bool automaticallyAddRequiredProductsIfEnabled, - AddToCartContext ctx = null); + /// + /// Add product to cart + /// + /// The customer + /// The product + /// Cart type + /// Store identifier + /// Selected attributes + /// Price entered by customer + /// Quantity + /// Whether to add required products + /// Add to cart context + /// List with warnings + List AddToCart( + Customer customer, + Product product, + ShoppingCartType cartType, + int storeId, + string selectedAttributes, + decimal customerEnteredPrice, + int quantity, + bool automaticallyAddRequiredProductsIfEnabled, + AddToCartContext ctx = null); - /// - /// Add product to cart - /// - /// Add to cart context - void AddToCart(AddToCartContext ctx); + /// + /// Add product to cart + /// + /// Add to cart context + void AddToCart(AddToCartContext ctx); - /// - /// Stores the shopping card items in the database - /// - /// Add to cart context - void AddToCartStoring(AddToCartContext ctx); + /// + /// Stores the shopping card items in the database + /// + /// Add to cart context + void AddToCartStoring(AddToCartContext ctx); /// /// Validates if all required attributes are selected @@ -251,16 +251,16 @@ List AddToCart( /// To customer void MigrateShoppingCart(Customer fromCustomer, Customer toCustomer); - /// - /// Copies a shopping cart item. - /// - /// Shopping cart item - /// The customer - /// Shopping cart type - /// Store Id - /// Add required products if enabled - /// List with add-to-cart warnings. - IList Copy(OrganizedShoppingCartItem sci, Customer customer, ShoppingCartType cartType, int storeId, bool addRequiredProductsIfEnabled); + /// + /// Copies a shopping cart item. + /// + /// Shopping cart item + /// The customer + /// Shopping cart type + /// Store Id + /// Add required products if enabled + /// List with add-to-cart warnings. + IList Copy(OrganizedShoppingCartItem sci, Customer customer, ShoppingCartType cartType, int storeId, bool addRequiredProductsIfEnabled); /// /// Gets the subtotal of cart items for the current user @@ -279,23 +279,23 @@ List AddToCart( /// /// Formatted subtotal of cart items for the current user string GetFormattedCurrentCartSubTotal(); - + /// /// Gets the formatted subtotal of cart items for the current user /// /// Formatted subtotal of cart items for the current user string GetFormattedCurrentCartSubTotal(IList cart); - /// - /// Get open carts subtotal - /// - /// subtotal - decimal GetAllOpenCartSubTotal(); + /// + /// Get open carts subtotal + /// + /// subtotal + decimal GetAllOpenCartSubTotal(); - /// - /// Get open wishlists subtotal - /// - /// subtotal - decimal GetAllOpenWishlistSubTotal(); - } + /// + /// Get open wishlists subtotal + /// + /// subtotal + decimal GetAllOpenWishlistSubTotal(); + } } diff --git a/src/Libraries/SmartStore.Services/Orders/OrderExtensions.cs b/src/Libraries/SmartStore.Services/Orders/OrderExtensions.cs index 5a5803d728..2c032bd403 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderExtensions.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderExtensions.cs @@ -10,23 +10,23 @@ namespace SmartStore.Services.Orders { - public static class OrderExtensions + public static class OrderExtensions { - private static int AggregateQuantity(IEnumerable shipments, OrderItem orderItem) - { - var result = 0; - - foreach (var shipment in shipments) - { - var item = shipment.ShipmentItems.FirstOrDefault(x => x.OrderItemId == orderItem.Id); - if (item != null) - { - result += item.Quantity; - } - } - - return result; - } + private static int AggregateQuantity(IEnumerable shipments, OrderItem orderItem) + { + var result = 0; + + foreach (var shipment in shipments) + { + var item = shipment.ShipmentItems.FirstOrDefault(x => x.OrderItemId == orderItem.Id); + if (item != null) + { + result += item.Quantity; + } + } + + return result; + } /// /// Formats the order note text @@ -35,7 +35,7 @@ private static int AggregateQuantity(IEnumerable shipments, OrderItem /// Formatted text public static string FormatOrderNoteText(this OrderNote orderNote) { - Guard.NotNull(orderNote, nameof(orderNote)); + Guard.NotNull(orderNote, nameof(orderNote)); if (orderNote.Note.IsEmpty()) return string.Empty; @@ -43,25 +43,25 @@ public static string FormatOrderNoteText(this OrderNote orderNote) return HtmlUtils.ConvertPlainTextToHtml(orderNote.Note); } - public static List GetBundleData(this OrderItem orderItem) - { - if (orderItem != null && orderItem.BundleData.HasValue()) - { - var data = orderItem.BundleData.Convert>(); - return data; - } - return new List(); - } + public static List GetBundleData(this OrderItem orderItem) + { + if (orderItem != null && orderItem.BundleData.HasValue()) + { + var data = orderItem.BundleData.Convert>(); + return data; + } + return new List(); + } - public static void SetBundleData(this OrderItem orderItem, List bundleData) - { - string rawData = null; + public static void SetBundleData(this OrderItem orderItem, List bundleData) + { + string rawData = null; - if (bundleData != null && bundleData.Count > 0) - rawData = bundleData.Convert(); + if (bundleData != null && bundleData.Count > 0) + rawData = bundleData.Convert(); - orderItem.BundleData = rawData; - } + orderItem.BundleData = rawData; + } /// /// Get the order total in the currency of the customer @@ -107,143 +107,143 @@ public static decimal GetOrderTotalInCustomerCurrency( /// Order /// A value indicating whether an order has items to dispatch public static bool HasItemsToDispatch(this Order order) - { - Guard.NotNull(order, nameof(order)); - - foreach (var orderItem in order.OrderItems.Where(x => x.Product.IsShipEnabled)) - { - var notDispatchedItems = orderItem.GetNotDispatchedItemsCount(); - if (notDispatchedItems <= 0) - continue; - - // yes, we have at least one item to ship - return true; - } - return false; - } - - /// - /// Gets a value indicating whether an order has items to deliver - /// - /// Order - /// A value indicating whether an order has items to deliver - public static bool HasItemsToDeliver(this Order order) - { - Guard.NotNull(order, nameof(order)); - - foreach (var orderItem in order.OrderItems.Where(x => x.Product.IsShipEnabled)) - { - var dispatchedItems = orderItem.GetDispatchedItemsCount(); - var deliveredItems = orderItem.GetDeliveredItemsCount(); - - if (dispatchedItems <= deliveredItems) - continue; - - // yes, we have at least one item to deliver - return true; - } - return false; - } - - /// - /// Gets a value indicating whether an order has items to be added to a shipment - /// - /// Order - /// A value indicating whether an order has items to be added to a shipment - public static bool CanAddItemsToShipment(this Order order) - { - Guard.NotNull(order, nameof(order)); - - foreach (var orderItem in order.OrderItems.Where(x => x.Product.IsShipEnabled)) - { - var canBeAddedToShipment = orderItem.GetItemsCanBeAddedToShipmentCount(); - if (canBeAddedToShipment <= 0) - continue; - - // yes, we have at least one item to create a new shipment - return true; - } - return false; - } - - - /// - /// Gets the total number of items which can be added to new shipments - /// - /// Order item - /// Total number of items which can be added to new shipments - public static int GetItemsCanBeAddedToShipmentCount(this OrderItem orderItem) - { - Guard.NotNull(orderItem, nameof(orderItem)); - - var itemsCount = orderItem.GetShipmentItemsCount(); - - return Math.Max(orderItem.Quantity - itemsCount, 0); - } - - /// - /// Gets the total number of items in all shipments - /// - /// Order item - /// Total number of items in all shipmentss - public static int GetShipmentItemsCount(this OrderItem orderItem) { - Guard.NotNull(orderItem, nameof(orderItem)); + Guard.NotNull(order, nameof(order)); + + foreach (var orderItem in order.OrderItems.Where(x => x.Product.IsShipEnabled)) + { + var notDispatchedItems = orderItem.GetNotDispatchedItemsCount(); + if (notDispatchedItems <= 0) + continue; + + // yes, we have at least one item to ship + return true; + } + return false; + } + + /// + /// Gets a value indicating whether an order has items to deliver + /// + /// Order + /// A value indicating whether an order has items to deliver + public static bool HasItemsToDeliver(this Order order) + { + Guard.NotNull(order, nameof(order)); + + foreach (var orderItem in order.OrderItems.Where(x => x.Product.IsShipEnabled)) + { + var dispatchedItems = orderItem.GetDispatchedItemsCount(); + var deliveredItems = orderItem.GetDeliveredItemsCount(); + + if (dispatchedItems <= deliveredItems) + continue; + + // yes, we have at least one item to deliver + return true; + } + return false; + } + + /// + /// Gets a value indicating whether an order has items to be added to a shipment + /// + /// Order + /// A value indicating whether an order has items to be added to a shipment + public static bool CanAddItemsToShipment(this Order order) + { + Guard.NotNull(order, nameof(order)); + + foreach (var orderItem in order.OrderItems.Where(x => x.Product.IsShipEnabled)) + { + var canBeAddedToShipment = orderItem.GetItemsCanBeAddedToShipmentCount(); + if (canBeAddedToShipment <= 0) + continue; + + // yes, we have at least one item to create a new shipment + return true; + } + return false; + } + + + /// + /// Gets the total number of items which can be added to new shipments + /// + /// Order item + /// Total number of items which can be added to new shipments + public static int GetItemsCanBeAddedToShipmentCount(this OrderItem orderItem) + { + Guard.NotNull(orderItem, nameof(orderItem)); + + var itemsCount = orderItem.GetShipmentItemsCount(); + + return Math.Max(orderItem.Quantity - itemsCount, 0); + } + + /// + /// Gets the total number of items in all shipments + /// + /// Order item + /// Total number of items in all shipmentss + public static int GetShipmentItemsCount(this OrderItem orderItem) + { + Guard.NotNull(orderItem, nameof(orderItem)); + + var shipments = orderItem.Order.Shipments.ToList(); + return AggregateQuantity(shipments, orderItem); + } + + /// + /// Gets the total number of dispatched items + /// + /// Order item + /// Total number of dispatched items + public static int GetDispatchedItemsCount(this OrderItem orderItem) + { + Guard.NotNull(orderItem, nameof(orderItem)); var shipments = orderItem.Order.Shipments.ToList(); - return AggregateQuantity(shipments, orderItem); + return AggregateQuantity(shipments.Where(x => x.ShippedDateUtc.HasValue), orderItem); } - /// - /// Gets the total number of dispatched items - /// - /// Order item - /// Total number of dispatched items - public static int GetDispatchedItemsCount(this OrderItem orderItem) - { - Guard.NotNull(orderItem, nameof(orderItem)); - - var shipments = orderItem.Order.Shipments.ToList(); - return AggregateQuantity(shipments.Where(x => x.ShippedDateUtc.HasValue), orderItem); - } - - /// - /// Gets the total number of not dispatched items - /// - /// Order item - /// Total number of not dispatched items - public static int GetNotDispatchedItemsCount(this OrderItem orderItem) + /// + /// Gets the total number of not dispatched items + /// + /// Order item + /// Total number of not dispatched items + public static int GetNotDispatchedItemsCount(this OrderItem orderItem) { - Guard.NotNull(orderItem, nameof(orderItem)); + Guard.NotNull(orderItem, nameof(orderItem)); var shipments = orderItem.Order.Shipments.ToList(); - return AggregateQuantity(shipments.Where(x => !x.ShippedDateUtc.HasValue), orderItem); + return AggregateQuantity(shipments.Where(x => !x.ShippedDateUtc.HasValue), orderItem); } - /// - /// Gets the total number of already delivered items - /// - /// Order item - /// Total number of already delivered items - public static int GetDeliveredItemsCount(this OrderItem orderItem) - { - Guard.NotNull(orderItem, nameof(orderItem)); - - var shipments = orderItem.Order.Shipments.ToList(); - return AggregateQuantity(shipments.Where(x => x.DeliveryDateUtc.HasValue), orderItem); - } - - /// - /// Gets the total number of not delivered items - /// - /// Order item - /// Total number of already delivered items - public static int GetNotDeliveredItemsCount(this OrderItem orderItem) - { - Guard.NotNull(orderItem, nameof(orderItem)); - - var shipments = orderItem.Order.Shipments.ToList(); - return AggregateQuantity(shipments.Where(x => !x.DeliveryDateUtc.HasValue), orderItem); - } - } + /// + /// Gets the total number of already delivered items + /// + /// Order item + /// Total number of already delivered items + public static int GetDeliveredItemsCount(this OrderItem orderItem) + { + Guard.NotNull(orderItem, nameof(orderItem)); + + var shipments = orderItem.Order.Shipments.ToList(); + return AggregateQuantity(shipments.Where(x => x.DeliveryDateUtc.HasValue), orderItem); + } + + /// + /// Gets the total number of not delivered items + /// + /// Order item + /// Total number of already delivered items + public static int GetNotDeliveredItemsCount(this OrderItem orderItem) + { + Guard.NotNull(orderItem, nameof(orderItem)); + + var shipments = orderItem.Order.Shipments.ToList(); + return AggregateQuantity(shipments.Where(x => !x.DeliveryDateUtc.HasValue), orderItem); + } + } } diff --git a/src/Libraries/SmartStore.Services/Orders/OrderMessageFactoryExtensions.cs b/src/Libraries/SmartStore.Services/Orders/OrderMessageFactoryExtensions.cs index 50bb45426e..e640cf85d1 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderMessageFactoryExtensions.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderMessageFactoryExtensions.cs @@ -6,121 +6,121 @@ namespace SmartStore.Services.Orders { - public static class OrderMessageFactoryExtensions - { - /// - /// Sends an order placed notification to a store owner - /// - public static CreateMessageResult SendOrderPlacedStoreOwnerNotification(this IMessageFactory factory, Order order, int languageId = 0) - { - Guard.NotNull(order, nameof(order)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderPlacedStoreOwner, languageId, order.StoreId), true, order, order.Customer); - } - - /// - /// Sends an order placed notification to a customer - /// - public static CreateMessageResult SendOrderPlacedCustomerNotification(this IMessageFactory factory, Order order, int languageId = 0) - { - Guard.NotNull(order, nameof(order)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderPlacedCustomer, languageId, order.StoreId, order.Customer), true, order); - } - - /// - /// Sends a shipment sent notification to a customer - /// - public static CreateMessageResult SendShipmentSentCustomerNotification(this IMessageFactory factory, Shipment shipment, int languageId = 0) - { - Guard.NotNull(shipment, nameof(shipment)); - Guard.NotNull(shipment.Order, nameof(shipment.Order)); - - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ShipmentSentCustomer, languageId, shipment.Order.StoreId, shipment.Order.Customer), true, shipment, shipment.Order); - } - - /// - /// Sends a shipment delivered notification to a customer - /// - public static CreateMessageResult SendShipmentDeliveredCustomerNotification(this IMessageFactory factory, Shipment shipment, int languageId = 0) - { - Guard.NotNull(shipment, nameof(shipment)); - Guard.NotNull(shipment.Order, nameof(shipment.Order)); - - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ShipmentDeliveredCustomer, languageId, shipment.Order.StoreId, shipment.Order.Customer), true, shipment, shipment.Order); - } - - /// - /// Sends an order completed notification to a customer - /// - public static CreateMessageResult SendOrderCompletedCustomerNotification(this IMessageFactory factory, Order order, int languageId = 0) - { - Guard.NotNull(order, nameof(order)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderCompletedCustomer, languageId, order.StoreId, order.Customer), true, order); - } - - /// - /// Sends an order cancelled notification to a customer - /// - public static CreateMessageResult SendOrderCancelledCustomerNotification(this IMessageFactory factory, Order order, int languageId = 0) - { - Guard.NotNull(order, nameof(order)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderCancelledCustomer, languageId, order.StoreId, order.Customer), true, order); - } - - /// - /// Sends a new order note added notification to a customer - /// - public static CreateMessageResult SendNewOrderNoteAddedCustomerNotification(this IMessageFactory factory, OrderNote orderNote, int languageId = 0) - { - Guard.NotNull(orderNote, nameof(orderNote)); - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderNoteAddedCustomer, languageId, orderNote.Order?.StoreId, orderNote.Order?.Customer), true, orderNote, orderNote.Order); - } - - /// - /// Sends a "Recurring payment cancelled" notification to a store owner - /// - public static CreateMessageResult SendRecurringPaymentCancelledStoreOwnerNotification(this IMessageFactory factory, RecurringPayment recurringPayment, int languageId = 0) - { - Guard.NotNull(recurringPayment, nameof(recurringPayment)); - - var order = recurringPayment.InitialOrder; - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.RecurringPaymentCancelledStoreOwner, languageId, order?.StoreId, order?.Customer), true, - recurringPayment, order); - } - - /// - /// Sends 'New Return Request' message to a store owner - /// - public static CreateMessageResult SendNewReturnRequestStoreOwnerNotification(this IMessageFactory factory, ReturnRequest returnRequest, OrderItem orderItem, int languageId = 0) - { - Guard.NotNull(returnRequest, nameof(returnRequest)); - Guard.NotNull(orderItem, nameof(orderItem)); - - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewReturnRequestStoreOwner, languageId, orderItem.Order?.StoreId, returnRequest.Customer), true, - returnRequest, orderItem, orderItem.Order, orderItem.Product); - } - - /// - /// Sends 'Return Request status changed' message to a customer - /// - public static CreateMessageResult SendReturnRequestStatusChangedCustomerNotification(this IMessageFactory factory, ReturnRequest returnRequest, OrderItem orderItem, int languageId = 0) - { - Guard.NotNull(returnRequest, nameof(returnRequest)); - Guard.NotNull(orderItem, nameof(orderItem)); - - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ReturnRequestStatusChangedCustomer, languageId, orderItem.Order?.StoreId, returnRequest.Customer), true, returnRequest); - } - - /// - /// Sends a gift card notification - /// - public static CreateMessageResult SendGiftCardNotification(this IMessageFactory factory, GiftCard giftCard, int languageId = 0) - { - Guard.NotNull(giftCard, nameof(giftCard)); - - var orderItem = giftCard.PurchasedWithOrderItem; - var customer = orderItem?.Order?.Customer; - var storeId = orderItem?.Order?.StoreId; - return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.GiftCardCustomer, languageId, storeId, customer), true, giftCard, orderItem, orderItem?.Product); - } - } + public static class OrderMessageFactoryExtensions + { + /// + /// Sends an order placed notification to a store owner + /// + public static CreateMessageResult SendOrderPlacedStoreOwnerNotification(this IMessageFactory factory, Order order, int languageId = 0) + { + Guard.NotNull(order, nameof(order)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderPlacedStoreOwner, languageId, order.StoreId), true, order, order.Customer); + } + + /// + /// Sends an order placed notification to a customer + /// + public static CreateMessageResult SendOrderPlacedCustomerNotification(this IMessageFactory factory, Order order, int languageId = 0) + { + Guard.NotNull(order, nameof(order)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderPlacedCustomer, languageId, order.StoreId, order.Customer), true, order); + } + + /// + /// Sends a shipment sent notification to a customer + /// + public static CreateMessageResult SendShipmentSentCustomerNotification(this IMessageFactory factory, Shipment shipment, int languageId = 0) + { + Guard.NotNull(shipment, nameof(shipment)); + Guard.NotNull(shipment.Order, nameof(shipment.Order)); + + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ShipmentSentCustomer, languageId, shipment.Order.StoreId, shipment.Order.Customer), true, shipment, shipment.Order); + } + + /// + /// Sends a shipment delivered notification to a customer + /// + public static CreateMessageResult SendShipmentDeliveredCustomerNotification(this IMessageFactory factory, Shipment shipment, int languageId = 0) + { + Guard.NotNull(shipment, nameof(shipment)); + Guard.NotNull(shipment.Order, nameof(shipment.Order)); + + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ShipmentDeliveredCustomer, languageId, shipment.Order.StoreId, shipment.Order.Customer), true, shipment, shipment.Order); + } + + /// + /// Sends an order completed notification to a customer + /// + public static CreateMessageResult SendOrderCompletedCustomerNotification(this IMessageFactory factory, Order order, int languageId = 0) + { + Guard.NotNull(order, nameof(order)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderCompletedCustomer, languageId, order.StoreId, order.Customer), true, order); + } + + /// + /// Sends an order cancelled notification to a customer + /// + public static CreateMessageResult SendOrderCancelledCustomerNotification(this IMessageFactory factory, Order order, int languageId = 0) + { + Guard.NotNull(order, nameof(order)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderCancelledCustomer, languageId, order.StoreId, order.Customer), true, order); + } + + /// + /// Sends a new order note added notification to a customer + /// + public static CreateMessageResult SendNewOrderNoteAddedCustomerNotification(this IMessageFactory factory, OrderNote orderNote, int languageId = 0) + { + Guard.NotNull(orderNote, nameof(orderNote)); + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.OrderNoteAddedCustomer, languageId, orderNote.Order?.StoreId, orderNote.Order?.Customer), true, orderNote, orderNote.Order); + } + + /// + /// Sends a "Recurring payment cancelled" notification to a store owner + /// + public static CreateMessageResult SendRecurringPaymentCancelledStoreOwnerNotification(this IMessageFactory factory, RecurringPayment recurringPayment, int languageId = 0) + { + Guard.NotNull(recurringPayment, nameof(recurringPayment)); + + var order = recurringPayment.InitialOrder; + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.RecurringPaymentCancelledStoreOwner, languageId, order?.StoreId, order?.Customer), true, + recurringPayment, order); + } + + /// + /// Sends 'New Return Request' message to a store owner + /// + public static CreateMessageResult SendNewReturnRequestStoreOwnerNotification(this IMessageFactory factory, ReturnRequest returnRequest, OrderItem orderItem, int languageId = 0) + { + Guard.NotNull(returnRequest, nameof(returnRequest)); + Guard.NotNull(orderItem, nameof(orderItem)); + + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.NewReturnRequestStoreOwner, languageId, orderItem.Order?.StoreId, returnRequest.Customer), true, + returnRequest, orderItem, orderItem.Order, orderItem.Product); + } + + /// + /// Sends 'Return Request status changed' message to a customer + /// + public static CreateMessageResult SendReturnRequestStatusChangedCustomerNotification(this IMessageFactory factory, ReturnRequest returnRequest, OrderItem orderItem, int languageId = 0) + { + Guard.NotNull(returnRequest, nameof(returnRequest)); + Guard.NotNull(orderItem, nameof(orderItem)); + + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.ReturnRequestStatusChangedCustomer, languageId, orderItem.Order?.StoreId, returnRequest.Customer), true, returnRequest); + } + + /// + /// Sends a gift card notification + /// + public static CreateMessageResult SendGiftCardNotification(this IMessageFactory factory, GiftCard giftCard, int languageId = 0) + { + Guard.NotNull(giftCard, nameof(giftCard)); + + var orderItem = giftCard.PurchasedWithOrderItem; + var customer = orderItem?.Order?.Customer; + var storeId = orderItem?.Order?.StoreId; + return factory.CreateMessage(MessageContext.Create(MessageTemplateNames.GiftCardCustomer, languageId, storeId, customer), true, giftCard, orderItem, orderItem?.Product); + } + } } diff --git a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs index 9f59031a0d..d9a41d105d 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs @@ -35,7 +35,7 @@ namespace SmartStore.Services.Orders public partial class OrderProcessingService : IOrderProcessingService { #region Fields - + private readonly IOrderService _orderService; private readonly IWebHelper _webHelper; private readonly ILocalizationService _localizationService; @@ -57,21 +57,21 @@ public partial class OrderProcessingService : IOrderProcessingService private readonly IDiscountService _discountService; private readonly IEncryptionService _encryptionService; private readonly IWorkContext _workContext; - private readonly IStoreContext _storeContext; + private readonly IStoreContext _storeContext; private readonly IMessageFactory _messageFactory; private readonly ICustomerActivityService _customerActivityService; private readonly ICurrencyService _currencyService; - private readonly IAffiliateService _affiliateService; + private readonly IAffiliateService _affiliateService; private readonly IEventPublisher _eventPublisher; - private readonly IGenericAttributeService _genericAttributeService; - private readonly INewsLetterSubscriptionService _newsLetterSubscriptionService; + private readonly IGenericAttributeService _genericAttributeService; + private readonly INewsLetterSubscriptionService _newsLetterSubscriptionService; - private readonly PaymentSettings _paymentSettings; + private readonly PaymentSettings _paymentSettings; private readonly RewardPointsSettings _rewardPointsSettings; private readonly OrderSettings _orderSettings; private readonly TaxSettings _taxSettings; private readonly LocalizationSettings _localizationSettings; - private readonly ShoppingCartSettings _shoppingCartSettings; + private readonly ShoppingCartSettings _shoppingCartSettings; private readonly CatalogSettings _catalogSettings; #endregion @@ -79,7 +79,7 @@ public partial class OrderProcessingService : IOrderProcessingService #region Ctor public OrderProcessingService( - IOrderService orderService, + IOrderService orderService, IWebHelper webHelper, ILocalizationService localizationService, ILanguageService languageService, @@ -100,20 +100,20 @@ public OrderProcessingService( IDiscountService discountService, IEncryptionService encryptionService, IWorkContext workContext, - IStoreContext storeContext, + IStoreContext storeContext, IMessageFactory messageFactory, ICustomerActivityService customerActivityService, ICurrencyService currencyService, - IAffiliateService affiliateService, + IAffiliateService affiliateService, IEventPublisher eventPublisher, - IGenericAttributeService genericAttributeService, - INewsLetterSubscriptionService newsLetterSubscriptionService, - PaymentSettings paymentSettings, + IGenericAttributeService genericAttributeService, + INewsLetterSubscriptionService newsLetterSubscriptionService, + PaymentSettings paymentSettings, RewardPointsSettings rewardPointsSettings, OrderSettings orderSettings, TaxSettings taxSettings, LocalizationSettings localizationSettings, - ShoppingCartSettings shoppingCartSettings, + ShoppingCartSettings shoppingCartSettings, CatalogSettings catalogSettings) { _orderService = orderService; @@ -131,7 +131,7 @@ public OrderProcessingService( _shoppingCartService = shoppingCartService; _checkoutAttributeFormatter = checkoutAttributeFormatter; _workContext = workContext; - _storeContext = storeContext; + _storeContext = storeContext; _messageFactory = messageFactory; _shippingService = shippingService; _shipmentService = shipmentService; @@ -141,53 +141,53 @@ public OrderProcessingService( _encryptionService = encryptionService; _customerActivityService = customerActivityService; _currencyService = currencyService; - _affiliateService = affiliateService; + _affiliateService = affiliateService; _eventPublisher = eventPublisher; - _genericAttributeService = genericAttributeService; - _newsLetterSubscriptionService = newsLetterSubscriptionService; + _genericAttributeService = genericAttributeService; + _newsLetterSubscriptionService = newsLetterSubscriptionService; _paymentSettings = paymentSettings; _rewardPointsSettings = rewardPointsSettings; _orderSettings = orderSettings; _taxSettings = taxSettings; _localizationSettings = localizationSettings; - _shoppingCartSettings = shoppingCartSettings; + _shoppingCartSettings = shoppingCartSettings; _catalogSettings = catalogSettings; - T = NullLocalizer.Instance; - Logger = NullLogger.Instance; - } + T = NullLocalizer.Instance; + Logger = NullLogger.Instance; + } - public Localizer T { get; set; } - public ILogger Logger { get; set; } + public Localizer T { get; set; } + public ILogger Logger { get; set; } - #endregion + #endregion - #region Utilities + #region Utilities - protected string FormatTaxRates(SortedDictionary taxRates) - { - var result = string.Empty; + protected string FormatTaxRates(SortedDictionary taxRates) + { + var result = string.Empty; - foreach (var rate in taxRates) - { - result += "{0}:{1}; ".FormatInvariant( - rate.Key.ToString(CultureInfo.InvariantCulture), - rate.Value.ToString(CultureInfo.InvariantCulture)); - } - - return result; - } + foreach (var rate in taxRates) + { + result += "{0}:{1}; ".FormatInvariant( + rate.Key.ToString(CultureInfo.InvariantCulture), + rate.Value.ToString(CultureInfo.InvariantCulture)); + } - private void ProcessErrors(Order order, IList errors, string messageKey) - { - if (errors.Any()) - { - var msg = string.Concat(T(messageKey, order.GetOrderNumber()), " ", string.Join(" ", errors)); + return result; + } + + private void ProcessErrors(Order order, IList errors, string messageKey) + { + if (errors.Any()) + { + var msg = string.Concat(T(messageKey, order.GetOrderNumber()), " ", string.Join(" ", errors)); - _orderService.AddOrderNote(order, msg); - Logger.Error(msg); - } - } + _orderService.AddOrderNote(order, msg); + Logger.Error(msg); + } + } /// /// Award reward points @@ -206,12 +206,12 @@ protected void AwardRewardPoints(Order order, decimal? amount = null) if (order.Customer == null || order.Customer.IsGuest()) return; - //Ensure that reward points were not added before. We should not add reward points if they were already earned for this order - if (order.RewardPointsWereAdded) - return; + //Ensure that reward points were not added before. We should not add reward points if they were already earned for this order + if (order.RewardPointsWereAdded) + return; - // Truncate same as Floor for positive amounts - var points = (int)Math.Truncate((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points); + // Truncate same as Floor for positive amounts + var points = (int)Math.Truncate((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points); if (points == 0) return; @@ -235,32 +235,32 @@ protected void ReduceRewardPoints(Order order, decimal? amount = null) if (_rewardPointsSettings.PointsForPurchases_Amount <= decimal.Zero) return; - //ensure that reward points were already earned for this order before - if (!order.RewardPointsWereAdded) - return; + //ensure that reward points were already earned for this order before + if (!order.RewardPointsWereAdded) + return; //Ensure that reward points are applied only to registered users if (order.Customer == null || order.Customer.IsGuest()) return; - // Truncate increases the risk of inaccuracy of rounding - //int points = (int)Math.Truncate((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points); + // Truncate increases the risk of inaccuracy of rounding + //int points = (int)Math.Truncate((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points); - int points = (int)Math.Round((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points); + int points = (int)Math.Round((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points); - if (order.RewardPointsRemaining.HasValue && order.RewardPointsRemaining.Value < points) - points = order.RewardPointsRemaining.Value; + if (order.RewardPointsRemaining.HasValue && order.RewardPointsRemaining.Value < points) + points = order.RewardPointsRemaining.Value; - if (points == 0) - return; + if (points == 0) + return; //reduce reward points order.Customer.AddRewardPointsHistoryEntry(-points, T("RewardPoints.Message.ReducedForOrder", order.GetOrderNumber())); - if (!order.RewardPointsRemaining.HasValue) - order.RewardPointsRemaining = (int)Math.Round(order.OrderTotal / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points); + if (!order.RewardPointsRemaining.HasValue) + order.RewardPointsRemaining = (int)Math.Round(order.OrderTotal / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points); - order.RewardPointsRemaining = Math.Max(order.RewardPointsRemaining.Value - points, 0); + order.RewardPointsRemaining = Math.Max(order.RewardPointsRemaining.Value - points, 0); _orderService.UpdateOrder(order); } @@ -291,7 +291,7 @@ protected void SetActivatedValueForPurchasedGiftCards(Order order, bool activate customerLang = _languageService.GetAllLanguages().FirstOrDefault(); var qe = _messageFactory.SendGiftCardNotification(gc, customerLang.Id); - isRecipientNotified = qe?.Email.Id != null; + isRecipientNotified = qe?.Email.Id != null; } } @@ -329,7 +329,7 @@ protected void SetOrderStatus(Order order, OrderStatus os, bool notifyCustomer) order.OrderStatusId = (int)os; _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderStatusChanged", os.GetLocalizedEnum(_localizationService))); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderStatusChanged", os.GetLocalizedEnum(_localizationService))); if (prevOrderStatus != OrderStatus.Complete && os == OrderStatus.Complete && notifyCustomer) { @@ -337,7 +337,7 @@ protected void SetOrderStatus(Order order, OrderStatus os, bool notifyCustomer) var msg = _messageFactory.SendOrderCompletedCustomerNotification(order, order.CustomerLanguageId); if (msg?.Email?.Id != null) { - _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerCompletedEmailQueued", msg.Email.Id)); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerCompletedEmailQueued", msg.Email.Id)); } } @@ -347,7 +347,7 @@ protected void SetOrderStatus(Order order, OrderStatus os, bool notifyCustomer) var msg = _messageFactory.SendOrderCancelledCustomerNotification(order, order.CustomerLanguageId); if (msg?.Email?.Id != null) { - _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerCancelledEmailQueued", msg.Email.Id)); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerCancelledEmailQueued", msg.Email.Id)); } } @@ -529,11 +529,11 @@ public virtual IList GetOrderPlacementWarnings( if (!isAboveOrderTotalMinimum) { orderTotalMinimum = _currencyService.ConvertFromPrimaryStoreCurrency( - orderTotalMinimum, + orderTotalMinimum, _workContext.WorkingCurrency); - var msg = _orderSettings.ApplyToSubtotal - ? T("Checkout.MinOrderSubtotalAmount", _priceFormatter.FormatPrice(orderTotalMinimum, true, false)) + var msg = _orderSettings.ApplyToSubtotal + ? T("Checkout.MinOrderSubtotalAmount", _priceFormatter.FormatPrice(orderTotalMinimum, true, false)) : T("Checkout.MinOrderTotalAmount", _priceFormatter.FormatPrice(orderTotalMinimum, true, false)); warnings.Add(msg); @@ -545,7 +545,7 @@ public virtual IList GetOrderPlacementWarnings( if (isAboveOrderTotalMinimum && !isBelowOrderTotalMaximum) { orderTotalMaximum = _currencyService.ConvertFromPrimaryStoreCurrency( - orderTotalMaximum, + orderTotalMaximum, _workContext.WorkingCurrency); var msg = _orderSettings.ApplyToSubtotal @@ -715,7 +715,7 @@ public virtual IList GetOrderPlacementWarnings( } public virtual PlaceOrderResult PlaceOrder( - ProcessPaymentRequest processPaymentRequest, + ProcessPaymentRequest processPaymentRequest, Dictionary extraData) { // Think about moving functionality of processing recurring orders (after the initial order was placed) to ProcessNextRecurringPayment() method. @@ -727,7 +727,7 @@ public virtual PlaceOrderResult PlaceOrder( } var result = new PlaceOrderResult(); - var utcNow = DateTime.UtcNow; + var utcNow = DateTime.UtcNow; try { @@ -749,13 +749,13 @@ public virtual PlaceOrderResult PlaceOrder( processPaymentRequest.PaymentMethodSystemName = initialOrder.PaymentMethodSystemName; } - // Affilites. - var affiliateId = 0; - var affiliate = _affiliateService.GetAffiliateById(customer.AffiliateId); - if (affiliate != null && affiliate.Active && !affiliate.Deleted) - { - affiliateId = affiliate.Id; - } + // Affilites. + var affiliateId = 0; + var affiliate = _affiliateService.GetAffiliateById(customer.AffiliateId); + if (affiliate != null && affiliate.Active && !affiliate.Deleted) + { + affiliateId = affiliate.Id; + } // Customer currency. var customerCurrencyCode = string.Empty; @@ -778,24 +778,24 @@ public virtual PlaceOrderResult PlaceOrder( // Customer language. Language customerLanguage = null; if (!processPaymentRequest.IsRecurringPayment) - { + { customerLanguage = _languageService.GetLanguageById(customer.GetAttribute(SystemCustomerAttributeNames.LanguageId, processPaymentRequest.StoreId)); } - else - { - customerLanguage = _languageService.GetLanguageById(initialOrder.CustomerLanguageId); - } + else + { + customerLanguage = _languageService.GetLanguageById(initialOrder.CustomerLanguageId); + } + + if (customerLanguage == null || !customerLanguage.Published) + { + customerLanguage = _workContext.WorkingLanguage; + } - if (customerLanguage == null || !customerLanguage.Published) - { - customerLanguage = _workContext.WorkingLanguage; - } - // Tax display type. var customerTaxDisplayType = TaxDisplayType.IncludingTax; if (!processPaymentRequest.IsRecurringPayment) { - customerTaxDisplayType = _workContext.GetTaxDisplayTypeFor(customer, processPaymentRequest.StoreId); + customerTaxDisplayType = _workContext.GetTaxDisplayTypeFor(customer, processPaymentRequest.StoreId); } else { @@ -806,12 +806,12 @@ public virtual PlaceOrderResult PlaceOrder( string checkoutAttributeDescription, checkoutAttributesXml; if (!processPaymentRequest.IsRecurringPayment) { - checkoutAttributesXml = customer.GetAttribute(SystemCustomerAttributeNames.CheckoutAttributes); - checkoutAttributeDescription = _checkoutAttributeFormatter.FormatAttributes(checkoutAttributesXml, customer); + checkoutAttributesXml = customer.GetAttribute(SystemCustomerAttributeNames.CheckoutAttributes); + checkoutAttributeDescription = _checkoutAttributeFormatter.FormatAttributes(checkoutAttributesXml, customer); } else { - checkoutAttributesXml = initialOrder.CheckoutAttributesXml; + checkoutAttributesXml = initialOrder.CheckoutAttributesXml; checkoutAttributeDescription = initialOrder.CheckoutAttributeDescription; } @@ -880,7 +880,7 @@ public virtual PlaceOrderResult PlaceOrder( // Shipping total. decimal? orderShippingTotalInclTax, orderShippingTotalExclTax = null; - decimal orderShippingTaxRate = decimal.Zero; + decimal orderShippingTaxRate = decimal.Zero; if (!processPaymentRequest.IsRecurringPayment) { orderShippingTotalInclTax = _orderTotalCalculationService.GetShoppingCartShippingTotal(cart, true, out orderShippingTaxRate, out var shippingTotalDiscount); @@ -895,11 +895,11 @@ public virtual PlaceOrderResult PlaceOrder( { orderShippingTotalInclTax = initialOrder.OrderShippingInclTax; orderShippingTotalExclTax = initialOrder.OrderShippingExclTax; - orderShippingTaxRate = initialOrder.OrderShippingTaxRate; + orderShippingTaxRate = initialOrder.OrderShippingTaxRate; } // Payment total. - decimal paymentAdditionalFeeInclTax, paymentAdditionalFeeExclTax, paymentAdditionalFeeTaxRate; + decimal paymentAdditionalFeeInclTax, paymentAdditionalFeeExclTax, paymentAdditionalFeeTaxRate; if (!processPaymentRequest.IsRecurringPayment) { var paymentAdditionalFee = _paymentService.GetAdditionalHandlingFee(cart, processPaymentRequest.PaymentMethodSystemName); @@ -910,7 +910,7 @@ public virtual PlaceOrderResult PlaceOrder( { paymentAdditionalFeeInclTax = initialOrder.PaymentMethodAdditionalFeeInclTax; paymentAdditionalFeeExclTax = initialOrder.PaymentMethodAdditionalFeeExclTax; - paymentAdditionalFeeTaxRate = initialOrder.PaymentMethodAdditionalFeeTaxRate; + paymentAdditionalFeeTaxRate = initialOrder.PaymentMethodAdditionalFeeTaxRate; } // Tax total. @@ -922,13 +922,13 @@ public virtual PlaceOrderResult PlaceOrder( orderTaxTotal = _orderTotalCalculationService.GetTaxTotal(cart, out var taxRatesDictionary); // VAT number. - var customerVatStatus = (VatNumberStatus)customer.VatNumberStatusId; - if (_taxSettings.EuVatEnabled && customerVatStatus == VatNumberStatus.Valid) - { - vatNumber = customer.GetAttribute(SystemCustomerAttributeNames.VatNumber); - } + var customerVatStatus = (VatNumberStatus)customer.VatNumberStatusId; + if (_taxSettings.EuVatEnabled && customerVatStatus == VatNumberStatus.Valid) + { + vatNumber = customer.GetAttribute(SystemCustomerAttributeNames.VatNumber); + } - taxRates = FormatTaxRates(taxRatesDictionary); + taxRates = FormatTaxRates(taxRatesDictionary); } else { @@ -936,7 +936,7 @@ public virtual PlaceOrderResult PlaceOrder( vatNumber = initialOrder.VatNumber; } - processPaymentRequest.OrderTax = orderTaxTotal; + processPaymentRequest.OrderTax = orderTaxTotal; // Order total (and applied discounts, gift cards, reward points). ShoppingCartTotal cartTotal = null; @@ -945,11 +945,11 @@ public virtual PlaceOrderResult PlaceOrder( { cartTotal = _orderTotalCalculationService.GetShoppingCartTotal(cart); - // Discount history. - if (cartTotal.AppliedDiscount != null && !appliedDiscounts.Any(x => x.Id == cartTotal.AppliedDiscount.Id)) - { - appliedDiscounts.Add(cartTotal.AppliedDiscount); - } + // Discount history. + if (cartTotal.AppliedDiscount != null && !appliedDiscounts.Any(x => x.Id == cartTotal.AppliedDiscount.Id)) + { + appliedDiscounts.Add(cartTotal.AppliedDiscount); + } } else { @@ -961,66 +961,66 @@ public virtual PlaceOrderResult PlaceOrder( #endregion - #region Addresses & pre-payment workflow - - // Give payment processor the opportunity to fullfill billing address. - var preProcessPaymentResult = _paymentService.PreProcessPayment(processPaymentRequest); + #region Addresses & pre-payment workflow - if (!preProcessPaymentResult.Success) - { - result.Errors.AddRange(preProcessPaymentResult.Errors); - result.Errors.Add(T("Common.Error.PreProcessPayment")); - return result; - } + // Give payment processor the opportunity to fullfill billing address. + var preProcessPaymentResult = _paymentService.PreProcessPayment(processPaymentRequest); + + if (!preProcessPaymentResult.Success) + { + result.Errors.AddRange(preProcessPaymentResult.Errors); + result.Errors.Add(T("Common.Error.PreProcessPayment")); + return result; + } var billingAddress = !processPaymentRequest.IsRecurringPayment ? (Address)customer.BillingAddress.Clone() : (Address)initialOrder.BillingAddress.Clone(); - Address shippingAddress = null; - if (shoppingCartRequiresShipping) - { + Address shippingAddress = null; + if (shoppingCartRequiresShipping) + { shippingAddress = !processPaymentRequest.IsRecurringPayment ? (Address)customer.ShippingAddress.Clone() : (Address)initialOrder.ShippingAddress.Clone(); - } + } - #endregion + #endregion - #region Payment workflow + #region Payment workflow - // Skip payment workflow if order total equals zero. + // Skip payment workflow if order total equals zero. var skipPaymentWorkflow = cartTotal.TotalAmount.Value == decimal.Zero; // Payment workflow. Provider paymentMethod = null; - if (!skipPaymentWorkflow) - { - paymentMethod = _paymentService.LoadPaymentMethodBySystemName(processPaymentRequest.PaymentMethodSystemName); - } - else - { - processPaymentRequest.PaymentMethodSystemName = ""; - } + if (!skipPaymentWorkflow) + { + paymentMethod = _paymentService.LoadPaymentMethodBySystemName(processPaymentRequest.PaymentMethodSystemName); + } + else + { + processPaymentRequest.PaymentMethodSystemName = ""; + } // Recurring or standard shopping cart? var isRecurringShoppingCart = false; - if (!processPaymentRequest.IsRecurringPayment) - { - isRecurringShoppingCart = cart.IsRecurring(); - if (isRecurringShoppingCart) - { - var unused = cart.GetRecurringCycleInfo(_localizationService, out var recurringCycleLength, out var recurringCyclePeriod, out var recurringTotalCycles); - - processPaymentRequest.RecurringCycleLength = recurringCycleLength; - processPaymentRequest.RecurringCyclePeriod = recurringCyclePeriod; - processPaymentRequest.RecurringTotalCycles = recurringTotalCycles; - } - } - else - { - isRecurringShoppingCart = true; - } + if (!processPaymentRequest.IsRecurringPayment) + { + isRecurringShoppingCart = cart.IsRecurring(); + if (isRecurringShoppingCart) + { + var unused = cart.GetRecurringCycleInfo(_localizationService, out var recurringCycleLength, out var recurringCyclePeriod, out var recurringTotalCycles); + + processPaymentRequest.RecurringCycleLength = recurringCycleLength; + processPaymentRequest.RecurringCyclePeriod = recurringCyclePeriod; + processPaymentRequest.RecurringTotalCycles = recurringTotalCycles; + } + } + else + { + isRecurringShoppingCart = true; + } // Process payment. ProcessPaymentResult processPaymentResult = null; @@ -1066,7 +1066,7 @@ public virtual PlaceOrderResult PlaceOrder( processPaymentRequest.CreditCardExpireMonth = initialOrder.AllowStoringCreditCardNumber ? Convert.ToInt32(_encryptionService.DecryptText(initialOrder.CardExpirationMonth)) : 0; processPaymentRequest.CreditCardExpireYear = initialOrder.AllowStoringCreditCardNumber ? Convert.ToInt32(_encryptionService.DecryptText(initialOrder.CardExpirationYear)) : 0; } - catch {} + catch { } var recurringPaymentType = _paymentService.GetRecurringPaymentType(processPaymentRequest.PaymentMethodSystemName); switch (recurringPaymentType) @@ -1081,8 +1081,8 @@ public virtual PlaceOrderResult PlaceOrder( processPaymentResult = new ProcessPaymentResult(); break; default: - throw new SmartException(T("Payment.RecurringPaymentTypeUnknown")); - } + throw new SmartException(T("Payment.RecurringPaymentTypeUnknown")); + } } else { @@ -1110,14 +1110,14 @@ public virtual PlaceOrderResult PlaceOrder( #region Save order details var shippingStatus = ShippingStatus.NotYetShipped; - if (!shoppingCartRequiresShipping) - { - shippingStatus = ShippingStatus.ShippingNotRequired; - } - + if (!shoppingCartRequiresShipping) + { + shippingStatus = ShippingStatus.ShippingNotRequired; + } + var order = new Order { - StoreId = processPaymentRequest.StoreId, + StoreId = processPaymentRequest.StoreId, OrderGuid = processPaymentRequest.OrderGuid, CustomerId = customer.Id, CustomerLanguageId = customerLanguage.Id, @@ -1129,22 +1129,22 @@ public virtual PlaceOrderResult PlaceOrder( OrderSubTotalDiscountExclTax = orderSubTotalDiscountExclTax, OrderShippingInclTax = orderShippingTotalInclTax.Value, OrderShippingExclTax = orderShippingTotalExclTax.Value, - OrderShippingTaxRate = orderShippingTaxRate, + OrderShippingTaxRate = orderShippingTaxRate, PaymentMethodAdditionalFeeInclTax = paymentAdditionalFeeInclTax, PaymentMethodAdditionalFeeExclTax = paymentAdditionalFeeExclTax, - PaymentMethodAdditionalFeeTaxRate = paymentAdditionalFeeTaxRate, + PaymentMethodAdditionalFeeTaxRate = paymentAdditionalFeeTaxRate, TaxRates = taxRates, OrderTax = orderTaxTotal, OrderTotalRounding = cartTotal.RoundingAmount, OrderTotal = cartTotal.TotalAmount.Value, RefundedAmount = decimal.Zero, OrderDiscount = cartTotal.DiscountAmount, - CreditBalance = cartTotal.CreditBalance, + CreditBalance = cartTotal.CreditBalance, CheckoutAttributeDescription = checkoutAttributeDescription, CheckoutAttributesXml = checkoutAttributesXml, CustomerCurrencyCode = customerCurrencyCode, CurrencyRate = customerCurrencyRate, - AffiliateId = affiliateId, + AffiliateId = affiliateId, OrderStatus = OrderStatus.Pending, AllowStoringCreditCardNumber = processPaymentResult.AllowStoringCreditCardNumber, CardType = processPaymentResult.AllowStoringCreditCardNumber ? _encryptionService.EncryptText(processPaymentRequest.CreditCardType) : string.Empty, @@ -1181,10 +1181,10 @@ public virtual PlaceOrderResult PlaceOrder( CustomerOrderComment = extraData.ContainsKey("CustomerComment") ? extraData["CustomerComment"] : "" }; - if (extraData.ContainsKey("AcceptThirdPartyEmailHandOver") && _shoppingCartSettings.ThirdPartyEmailHandOver != CheckoutThirdPartyEmailHandOver.None) - { - order.AcceptThirdPartyEmailHandOver = extraData["AcceptThirdPartyEmailHandOver"].ToBool(); - } + if (extraData.ContainsKey("AcceptThirdPartyEmailHandOver") && _shoppingCartSettings.ThirdPartyEmailHandOver != CheckoutThirdPartyEmailHandOver.None) + { + order.AcceptThirdPartyEmailHandOver = extraData["AcceptThirdPartyEmailHandOver"].ToBool(); + } _orderService.InsertOrder(order); @@ -1195,14 +1195,14 @@ public virtual PlaceOrderResult PlaceOrder( // Move shopping cart items to order products. foreach (var sc in cart) { - sc.Item.Product.MergeWithCombination(sc.Item.AttributesXml); + sc.Item.Product.MergeWithCombination(sc.Item.AttributesXml); // Prices. decimal taxRate = decimal.Zero; - decimal unitPriceTaxRate = decimal.Zero; + decimal unitPriceTaxRate = decimal.Zero; decimal scUnitPrice = _priceCalculationService.GetUnitPrice(sc, true); decimal scSubTotal = _priceCalculationService.GetSubTotal(sc, true); - decimal scUnitPriceInclTax = _taxService.GetProductPrice(sc.Item.Product, scUnitPrice, true, customer, out unitPriceTaxRate); + decimal scUnitPriceInclTax = _taxService.GetProductPrice(sc.Item.Product, scUnitPrice, true, customer, out unitPriceTaxRate); decimal scUnitPriceExclTax = _taxService.GetProductPrice(sc.Item.Product, scUnitPrice, false, customer, out taxRate); decimal scSubTotalInclTax = _taxService.GetProductPrice(sc.Item.Product, scSubTotal, true, customer, out taxRate); decimal scSubTotalExclTax = _taxService.GetProductPrice(sc.Item.Product, scSubTotal, false, customer, out taxRate); @@ -1213,14 +1213,14 @@ public virtual PlaceOrderResult PlaceOrder( decimal discountAmountInclTax = _taxService.GetProductPrice(sc.Item.Product, discountAmount, true, customer, out taxRate); decimal discountAmountExclTax = _taxService.GetProductPrice(sc.Item.Product, discountAmount, false, customer, out taxRate); - if (scDiscount != null && !appliedDiscounts.Any(x => x.Id == scDiscount.Id)) - { - appliedDiscounts.Add(scDiscount); - } + if (scDiscount != null && !appliedDiscounts.Any(x => x.Id == scDiscount.Id)) + { + appliedDiscounts.Add(scDiscount); + } var attributeDescription = _productAttributeFormatter.FormatAttributes(sc.Item.Product, sc.Item.AttributesXml, customer); var itemWeight = _shippingService.GetShoppingCartItemWeight(sc); - var displayDeliveryTime = + var displayDeliveryTime = _shoppingCartSettings.ShowDeliveryTimes && sc.Item.Product.DeliveryTimeId.HasValue && sc.Item.Product.IsShipEnabled && @@ -1236,7 +1236,7 @@ public virtual PlaceOrderResult PlaceOrder( UnitPriceExclTax = scUnitPriceExclTax, PriceInclTax = scSubTotalInclTax, PriceExclTax = scSubTotalExclTax, - TaxRate = unitPriceTaxRate, + TaxRate = unitPriceTaxRate, AttributeDescription = attributeDescription, AttributesXml = sc.Item.AttributesXml, Quantity = sc.Item.Quantity, @@ -1246,27 +1246,27 @@ public virtual PlaceOrderResult PlaceOrder( IsDownloadActivated = false, LicenseDownloadId = 0, ItemWeight = itemWeight, - ProductCost = _priceCalculationService.GetProductCost(sc.Item.Product, sc.Item.AttributesXml), + ProductCost = _priceCalculationService.GetProductCost(sc.Item.Product, sc.Item.AttributesXml), DeliveryTimeId = sc.Item.Product.GetDeliveryTimeIdAccordingToStock(_catalogSettings), DisplayDeliveryTime = displayDeliveryTime }; if (sc.Item.Product.ProductType == ProductType.BundledProduct && sc.ChildItems != null) - { - var listBundleData = new List(); + { + var listBundleData = new List(); - foreach (var childItem in sc.ChildItems) - { - var bundleItemSubTotal = _taxService.GetProductPrice(childItem.Item.Product, _priceCalculationService.GetSubTotal(childItem, true), out taxRate); + foreach (var childItem in sc.ChildItems) + { + var bundleItemSubTotal = _taxService.GetProductPrice(childItem.Item.Product, _priceCalculationService.GetSubTotal(childItem, true), out taxRate); - var attributesInfo = _productAttributeFormatter.FormatAttributes(childItem.Item.Product, childItem.Item.AttributesXml, order.Customer, - renderPrices: false, allowHyperlinks: true); + var attributesInfo = _productAttributeFormatter.FormatAttributes(childItem.Item.Product, childItem.Item.AttributesXml, order.Customer, + renderPrices: false, allowHyperlinks: true); - childItem.BundleItemData.ToOrderData(listBundleData, bundleItemSubTotal, childItem.Item.AttributesXml, attributesInfo); - } + childItem.BundleItemData.ToOrderData(listBundleData, bundleItemSubTotal, childItem.Item.AttributesXml, attributesInfo); + } - orderItem.SetBundleData(listBundleData); - } + orderItem.SetBundleData(listBundleData); + } order.OrderItems.Add(orderItem); _orderService.UpdateOrder(order); @@ -1275,12 +1275,12 @@ public virtual PlaceOrderResult PlaceOrder( if (sc.Item.Product.IsGiftCard) { _productAttributeParser.GetGiftCardAttribute( - sc.Item.AttributesXml, + sc.Item.AttributesXml, out var giftCardRecipientName, - out var giftCardRecipientEmail, - out var giftCardSenderName, - out var giftCardSenderEmail, - out var giftCardMessage); + out var giftCardRecipientEmail, + out var giftCardSenderName, + out var giftCardSenderEmail, + out var giftCardMessage); for (int i = 0; i < sc.Item.Quantity; i++) { @@ -1297,20 +1297,20 @@ public virtual PlaceOrderResult PlaceOrder( SenderEmail = giftCardSenderEmail, Message = giftCardMessage, IsRecipientNotified = false, - CreatedOnUtc = utcNow + CreatedOnUtc = utcNow }; _giftCardService.InsertGiftCard(gc); } } - _productService.AdjustInventory(sc, true); + _productService.AdjustInventory(sc, true); } - // Clear shopping cart. - if (!processPaymentRequest.IsMultiOrder) - { - cart.ToList().ForEach(sci => _shoppingCartService.DeleteShoppingCartItem(sci.Item, false)); - } + // Clear shopping cart. + if (!processPaymentRequest.IsMultiOrder) + { + cart.ToList().ForEach(sci => _shoppingCartService.DeleteShoppingCartItem(sci.Item, false)); + } } else { @@ -1328,7 +1328,7 @@ public virtual PlaceOrderResult PlaceOrder( UnitPriceExclTax = orderItem.UnitPriceExclTax, PriceInclTax = orderItem.PriceInclTax, PriceExclTax = orderItem.PriceExclTax, - TaxRate = orderItem.TaxRate, + TaxRate = orderItem.TaxRate, AttributeDescription = orderItem.AttributeDescription, AttributesXml = orderItem.AttributesXml, Quantity = orderItem.Quantity, @@ -1338,8 +1338,8 @@ public virtual PlaceOrderResult PlaceOrder( IsDownloadActivated = false, LicenseDownloadId = 0, ItemWeight = orderItem.ItemWeight, - BundleData = orderItem.BundleData, - ProductCost = orderItem.ProductCost, + BundleData = orderItem.BundleData, + ProductCost = orderItem.ProductCost, DeliveryTimeId = orderItem.DeliveryTimeId, DisplayDeliveryTime = orderItem.DisplayDeliveryTime }; @@ -1350,12 +1350,12 @@ public virtual PlaceOrderResult PlaceOrder( if (orderItem.Product.IsGiftCard) { _productAttributeParser.GetGiftCardAttribute( - orderItem.AttributesXml, - out var giftCardRecipientName, - out var giftCardRecipientEmail, - out var giftCardSenderName, - out var giftCardSenderEmail, - out var giftCardMessage); + orderItem.AttributesXml, + out var giftCardRecipientName, + out var giftCardRecipientEmail, + out var giftCardSenderName, + out var giftCardSenderEmail, + out var giftCardMessage); for (int i = 0; i < orderItem.Quantity; i++) { @@ -1372,54 +1372,54 @@ public virtual PlaceOrderResult PlaceOrder( SenderEmail = giftCardSenderEmail, Message = giftCardMessage, IsRecipientNotified = false, - CreatedOnUtc = utcNow + CreatedOnUtc = utcNow }; _giftCardService.InsertGiftCard(gc); } } - _productService.AdjustInventory(orderItem, true, orderItem.Quantity); + _productService.AdjustInventory(orderItem, true, orderItem.Quantity); } } // Discount usage history. - if (!processPaymentRequest.IsRecurringPayment) - { - foreach (var discount in appliedDiscounts) - { - var duh = new DiscountUsageHistory - { - Discount = discount, - Order = order, - CreatedOnUtc = utcNow - }; - _discountService.InsertDiscountUsageHistory(duh); - } - } + if (!processPaymentRequest.IsRecurringPayment) + { + foreach (var discount in appliedDiscounts) + { + var duh = new DiscountUsageHistory + { + Discount = discount, + Order = order, + CreatedOnUtc = utcNow + }; + _discountService.InsertDiscountUsageHistory(duh); + } + } // Gift card usage history. - if (!processPaymentRequest.IsRecurringPayment && cartTotal.AppliedGiftCards != null) - { - foreach (var agc in cartTotal.AppliedGiftCards) - { - var amountUsed = agc.AmountCanBeUsed; - var gcuh = new GiftCardUsageHistory - { - GiftCard = agc.GiftCard, - UsedWithOrder = order, - UsedValue = amountUsed, - CreatedOnUtc = utcNow - }; - agc.GiftCard.GiftCardUsageHistory.Add(gcuh); - _giftCardService.UpdateGiftCard(agc.GiftCard); - } - } + if (!processPaymentRequest.IsRecurringPayment && cartTotal.AppliedGiftCards != null) + { + foreach (var agc in cartTotal.AppliedGiftCards) + { + var amountUsed = agc.AmountCanBeUsed; + var gcuh = new GiftCardUsageHistory + { + GiftCard = agc.GiftCard, + UsedWithOrder = order, + UsedValue = amountUsed, + CreatedOnUtc = utcNow + }; + agc.GiftCard.GiftCardUsageHistory.Add(gcuh); + _giftCardService.UpdateGiftCard(agc.GiftCard); + } + } // Reward points history. if (cartTotal.RedeemedRewardPointsAmount > decimal.Zero) { customer.AddRewardPointsHistoryEntry(-cartTotal.RedeemedRewardPoints, - _localizationService.GetResource("RewardPoints.Message.RedeemedForOrder", order.CustomerLanguageId).FormatInvariant(order.GetOrderNumber()), + _localizationService.GetResource("RewardPoints.Message.RedeemedForOrder", order.CustomerLanguageId).FormatInvariant(order.GetOrderNumber()), order, cartTotal.RedeemedRewardPointsAmount); @@ -1437,7 +1437,7 @@ public virtual PlaceOrderResult PlaceOrder( TotalCycles = processPaymentRequest.RecurringTotalCycles, StartDateUtc = utcNow, IsActive = true, - CreatedOnUtc = utcNow, + CreatedOnUtc = utcNow, InitialOrder = order, }; _orderService.InsertRecurringPayment(rp); @@ -1469,40 +1469,40 @@ public virtual PlaceOrderResult PlaceOrder( } } - #endregion + #endregion + + #region Notifications, notes and attributes - #region Notifications, notes and attributes + // Notes, messages. + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderPlaced")); - // Notes, messages. - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderPlaced")); - // Send email notifications. var msg = _messageFactory.SendOrderPlacedStoreOwnerNotification(order, _localizationSettings.DefaultAdminLanguageId); if (msg?.Email?.Id != null) { - _orderService.AddOrderNote(order, T("Admin.OrderNotice.MerchantEmailQueued", msg.Email.Id)); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.MerchantEmailQueued", msg.Email.Id)); } - msg = _messageFactory.SendOrderPlacedCustomerNotification(order, order.CustomerLanguageId); + msg = _messageFactory.SendOrderPlacedCustomerNotification(order, order.CustomerLanguageId); if (msg?.Email?.Id != null) { - _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerEmailQueued", msg.Email.Id)); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerEmailQueued", msg.Email.Id)); } // Check order status. CheckOrderStatus(order); - // Reset checkout data. + // Reset checkout data. if (!processPaymentRequest.IsRecurringPayment && !processPaymentRequest.IsMultiOrder) - { - _customerService.ResetCheckoutData(customer, processPaymentRequest.StoreId, true, true, true, clearCreditBalance: true); - } + { + _customerService.ResetCheckoutData(customer, processPaymentRequest.StoreId, true, true, true, clearCreditBalance: true); + } - // Check for generic attributes to be inserted automatically. - foreach (var customProperty in processPaymentRequest.CustomProperties.Where(x => x.Key.HasValue() && x.Value.AutoCreateGenericAttribute)) - { - _genericAttributeService.SaveAttribute(order, customProperty.Key, customProperty.Value.Value, order.StoreId); - } + // Check for generic attributes to be inserted automatically. + foreach (var customProperty in processPaymentRequest.CustomProperties.Where(x => x.Key.HasValue() && x.Value.AutoCreateGenericAttribute)) + { + _genericAttributeService.SaveAttribute(order, customProperty.Key, customProperty.Value.Value, order.StoreId); + } // Uncomment this line to support transactions. //scope.Complete(); @@ -1514,51 +1514,51 @@ public virtual PlaceOrderResult PlaceOrder( { _customerActivityService.InsertActivity("PublicStore.PlaceOrder", T("ActivityLog.PublicStore.PlaceOrder", order.GetOrderNumber())); } - + if (order.PaymentStatus == PaymentStatus.Paid) { _eventPublisher.PublishOrderPaid(order); } - #endregion + #endregion - #region Newsletter subscription + #region Newsletter subscription - if (extraData.ContainsKey("SubscribeToNewsLetter") && _shoppingCartSettings.NewsLetterSubscription != CheckoutNewsLetterSubscription.None) - { - var addSubscription = extraData["SubscribeToNewsLetter"].ToBool(); + if (extraData.ContainsKey("SubscribeToNewsLetter") && _shoppingCartSettings.NewsLetterSubscription != CheckoutNewsLetterSubscription.None) + { + var addSubscription = extraData["SubscribeToNewsLetter"].ToBool(); - bool? nsResult = _newsLetterSubscriptionService.AddNewsLetterSubscriptionFor(addSubscription, customer.Email, order.StoreId); + bool? nsResult = _newsLetterSubscriptionService.AddNewsLetterSubscriptionFor(addSubscription, customer.Email, order.StoreId); - if (nsResult.HasValue) - { + if (nsResult.HasValue) + { _orderService.AddOrderNote(order, T(nsResult.Value ? "Admin.OrderNotice.NewsLetterSubscriptionAdded" : "Admin.OrderNotice.NewsLetterSubscriptionRemoved")); - } - } + } + } - #endregion - } - } + #endregion + } + } else { - result.AddError(T("Payment.PayingFailed")); + result.AddError(T("Payment.PayingFailed")); - foreach (var paymentError in processPaymentResult.Errors) - { - result.AddError(paymentError); - } + foreach (var paymentError in processPaymentResult.Errors) + { + result.AddError(paymentError); + } } } catch (Exception ex) { - Logger.Error(ex); + Logger.Error(ex); result.AddError(ex.Message); } - if (result.Errors.Any()) - { - Logger.Error(string.Join(" ", result.Errors)); - } + if (result.Errors.Any()) + { + Logger.Error(string.Join(" ", result.Errors)); + } return result; } @@ -1623,7 +1623,7 @@ public virtual void ProcessNextRecurringPayment(RecurringPayment recurringPaymen var paymentInfo = new ProcessPaymentRequest { - StoreId = initialOrder.StoreId, + StoreId = initialOrder.StoreId, CustomerId = customer.Id, OrderGuid = Guid.NewGuid(), IsRecurringPayment = true, @@ -1652,13 +1652,13 @@ public virtual void ProcessNextRecurringPayment(RecurringPayment recurringPaymen _orderService.UpdateRecurringPayment(recurringPayment); } else if (result.Errors.Count > 0) - { + { throw new SmartException(string.Join(" ", result.Errors)); } } catch (Exception exception) { - Logger.ErrorsAll(exception); + Logger.ErrorsAll(exception); throw; } } @@ -1683,7 +1683,7 @@ public virtual IList CancelRecurringPayment(RecurringPayment recurringPa { request.Order = initialOrder; - result = _paymentService.CancelRecurringPayment(request); + result = _paymentService.CancelRecurringPayment(request); if (result.Success) { @@ -1691,7 +1691,7 @@ public virtual IList CancelRecurringPayment(RecurringPayment recurringPa recurringPayment.IsActive = false; _orderService.UpdateRecurringPayment(recurringPayment); - _orderService.AddOrderNote(initialOrder, T("Admin.OrderNotice.RecurringPaymentCancelled")); + _orderService.AddOrderNote(initialOrder, T("Admin.OrderNotice.RecurringPaymentCancelled")); //notify a store owner _messageFactory.SendRecurringPaymentCancelledStoreOwnerNotification(recurringPayment, _localizationSettings.DefaultAdminLanguageId); @@ -1699,17 +1699,17 @@ public virtual IList CancelRecurringPayment(RecurringPayment recurringPa } catch (Exception exception) { - if (result == null) - { - result = new CancelRecurringPaymentResult(); - } + if (result == null) + { + result = new CancelRecurringPaymentResult(); + } result.AddError(exception.ToAllMessages()); } - ProcessErrors(initialOrder, result.Errors, "Admin.OrderNotice.RecurringPaymentCancellationError"); + ProcessErrors(initialOrder, result.Errors, "Admin.OrderNotice.RecurringPaymentCancellationError"); - return result.Errors; + return result.Errors; } /// @@ -1779,7 +1779,7 @@ public virtual void Ship(Shipment shipment, bool notifyCustomer) _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.ShipmentSent", shipment.Id)); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.ShipmentSent", shipment.Id)); if (notifyCustomer) { @@ -1787,7 +1787,7 @@ public virtual void Ship(Shipment shipment, bool notifyCustomer) var msg = _messageFactory.SendShipmentSentCustomerNotification(shipment, order.CustomerLanguageId); if (msg?.Email?.Id != null) { - _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerShippedEmailQueued", msg.Email.Id)); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerShippedEmailQueued", msg.Email.Id)); } } @@ -1807,22 +1807,22 @@ public virtual void Deliver(Shipment shipment, bool notifyCustomer) var order = shipment.Order; if (order == null) - throw new SmartException(T("Order.NotFound", shipment.OrderId)); + throw new SmartException(T("Order.NotFound", shipment.OrderId)); - if (shipment.DeliveryDateUtc.HasValue) + if (shipment.DeliveryDateUtc.HasValue) throw new SmartException(T("Shipment.AlreadyDelivered")); shipment.DeliveryDateUtc = DateTime.UtcNow; _shipmentService.UpdateShipment(shipment); - if (!order.CanAddItemsToShipment() && !order.HasItemsToDispatch() && !order.HasItemsToDeliver()) - { - order.ShippingStatusId = (int)ShippingStatus.Delivered; - } + if (!order.CanAddItemsToShipment() && !order.HasItemsToDispatch() && !order.HasItemsToDeliver()) + { + order.ShippingStatusId = (int)ShippingStatus.Delivered; + } _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.ShipmentDelivered", shipment.Id)); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.ShipmentDelivered", shipment.Id)); if (notifyCustomer) { @@ -1830,7 +1830,7 @@ public virtual void Deliver(Shipment shipment, bool notifyCustomer) var msg = _messageFactory.SendShipmentDeliveredCustomerNotification(shipment, order.CustomerLanguageId); if (msg?.Email?.Id != null) { - _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerDeliveredEmailQueued", msg.Email.Id)); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.CustomerDeliveredEmailQueued", msg.Email.Id)); } } @@ -1873,7 +1873,7 @@ public virtual void CancelOrder(Order order, bool notifyCustomer) // Cancel order. SetOrderStatus(order, OrderStatus.Cancelled, notifyCustomer); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderCancelled")); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderCancelled")); // Cancel recurring payments. var recurringPayments = _orderService.SearchRecurringPayments(0, 0, order.Id, null); @@ -1883,88 +1883,88 @@ public virtual void CancelOrder(Order order, bool notifyCustomer) } // Adjust inventory. - foreach (var orderItem in order.OrderItems) - { - _productService.AdjustInventory(orderItem, false, orderItem.Quantity); - } + foreach (var orderItem in order.OrderItems) + { + _productService.AdjustInventory(orderItem, false, orderItem.Quantity); + } } - /// - /// Auto update order details - /// - /// Context parameters - public virtual void AutoUpdateOrderDetails(AutoUpdateOrderItemContext context) - { - var oi = context.OrderItem; + /// + /// Auto update order details + /// + /// Context parameters + public virtual void AutoUpdateOrderDetails(AutoUpdateOrderItemContext context) + { + var oi = context.OrderItem; - context.RewardPointsOld = context.RewardPointsNew = oi.Order.Customer.GetRewardPointsBalance(); + context.RewardPointsOld = context.RewardPointsNew = oi.Order.Customer.GetRewardPointsBalance(); - if (context.UpdateTotals && oi.Order.OrderStatusId <= (int)OrderStatus.Pending) - { - var currency = _currencyService.GetCurrencyByCode(oi.Order.CustomerCurrencyCode); + if (context.UpdateTotals && oi.Order.OrderStatusId <= (int)OrderStatus.Pending) + { + var currency = _currencyService.GetCurrencyByCode(oi.Order.CustomerCurrencyCode); - decimal priceInclTax = (context.QuantityNew * oi.UnitPriceInclTax).RoundIfEnabledFor(currency); - decimal priceExclTax = (context.QuantityNew * oi.UnitPriceExclTax).RoundIfEnabledFor(currency); + decimal priceInclTax = (context.QuantityNew * oi.UnitPriceInclTax).RoundIfEnabledFor(currency); + decimal priceExclTax = (context.QuantityNew * oi.UnitPriceExclTax).RoundIfEnabledFor(currency); - decimal deltaPriceInclTax = priceInclTax - (context.IsNewOrderItem ? decimal.Zero : oi.PriceInclTax); - decimal deltaPriceExclTax = priceExclTax - (context.IsNewOrderItem ? decimal.Zero : oi.PriceExclTax); + decimal deltaPriceInclTax = priceInclTax - (context.IsNewOrderItem ? decimal.Zero : oi.PriceInclTax); + decimal deltaPriceExclTax = priceExclTax - (context.IsNewOrderItem ? decimal.Zero : oi.PriceExclTax); - oi.Quantity = context.QuantityNew; - oi.PriceInclTax = priceInclTax.RoundIfEnabledFor(currency); - oi.PriceExclTax = priceExclTax.RoundIfEnabledFor(currency); + oi.Quantity = context.QuantityNew; + oi.PriceInclTax = priceInclTax.RoundIfEnabledFor(currency); + oi.PriceExclTax = priceExclTax.RoundIfEnabledFor(currency); - decimal subtotalInclTax = oi.Order.OrderSubtotalInclTax + deltaPriceInclTax; - decimal subtotalExclTax = oi.Order.OrderSubtotalExclTax + deltaPriceExclTax; + decimal subtotalInclTax = oi.Order.OrderSubtotalInclTax + deltaPriceInclTax; + decimal subtotalExclTax = oi.Order.OrderSubtotalExclTax + deltaPriceExclTax; - oi.Order.OrderSubtotalInclTax = subtotalInclTax.RoundIfEnabledFor(currency); - oi.Order.OrderSubtotalExclTax = subtotalExclTax.RoundIfEnabledFor(currency); + oi.Order.OrderSubtotalInclTax = subtotalInclTax.RoundIfEnabledFor(currency); + oi.Order.OrderSubtotalExclTax = subtotalExclTax.RoundIfEnabledFor(currency); - decimal discountInclTax = oi.DiscountAmountInclTax * context.QuantityChangeFactor; - decimal discountExclTax = oi.DiscountAmountExclTax * context.QuantityChangeFactor; + decimal discountInclTax = oi.DiscountAmountInclTax * context.QuantityChangeFactor; + decimal discountExclTax = oi.DiscountAmountExclTax * context.QuantityChangeFactor; - decimal deltaDiscountInclTax = discountInclTax - oi.DiscountAmountInclTax; - decimal deltaDiscountExclTax = discountExclTax - oi.DiscountAmountExclTax; + decimal deltaDiscountInclTax = discountInclTax - oi.DiscountAmountInclTax; + decimal deltaDiscountExclTax = discountExclTax - oi.DiscountAmountExclTax; - oi.DiscountAmountInclTax = discountInclTax.RoundIfEnabledFor(currency); - oi.DiscountAmountExclTax = discountExclTax.RoundIfEnabledFor(currency); + oi.DiscountAmountInclTax = discountInclTax.RoundIfEnabledFor(currency); + oi.DiscountAmountExclTax = discountExclTax.RoundIfEnabledFor(currency); - decimal total = Math.Max(oi.Order.OrderTotal + deltaPriceInclTax, 0); - decimal tax = Math.Max(oi.Order.OrderTax + (deltaPriceInclTax - deltaPriceExclTax), 0); + decimal total = Math.Max(oi.Order.OrderTotal + deltaPriceInclTax, 0); + decimal tax = Math.Max(oi.Order.OrderTax + (deltaPriceInclTax - deltaPriceExclTax), 0); - oi.Order.OrderTotal = total.RoundIfEnabledFor(currency); - oi.Order.OrderTax = tax.RoundIfEnabledFor(currency); + oi.Order.OrderTotal = total.RoundIfEnabledFor(currency); + oi.Order.OrderTax = tax.RoundIfEnabledFor(currency); - // Update tax rate value. - var deltaTax = deltaPriceInclTax - deltaPriceExclTax; - if (deltaTax != decimal.Zero) - { - var taxRates = oi.Order.TaxRatesDictionary; + // Update tax rate value. + var deltaTax = deltaPriceInclTax - deltaPriceExclTax; + if (deltaTax != decimal.Zero) + { + var taxRates = oi.Order.TaxRatesDictionary; - taxRates[oi.TaxRate] = taxRates.ContainsKey(oi.TaxRate) - ? Math.Max(taxRates[oi.TaxRate] + deltaTax, 0) - : Math.Max(deltaTax, 0); + taxRates[oi.TaxRate] = taxRates.ContainsKey(oi.TaxRate) + ? Math.Max(taxRates[oi.TaxRate] + deltaTax, 0) + : Math.Max(deltaTax, 0); - oi.Order.TaxRates = FormatTaxRates(taxRates); - } + oi.Order.TaxRates = FormatTaxRates(taxRates); + } - _orderService.UpdateOrder(oi.Order); - } + _orderService.UpdateOrder(oi.Order); + } - if (context.AdjustInventory && context.QuantityDelta != 0) - { - context.Inventory = _productService.AdjustInventory(oi, context.QuantityDelta > 0, Math.Abs(context.QuantityDelta)); - } + if (context.AdjustInventory && context.QuantityDelta != 0) + { + context.Inventory = _productService.AdjustInventory(oi, context.QuantityDelta > 0, Math.Abs(context.QuantityDelta)); + } - if (context.UpdateRewardPoints && context.QuantityDelta < 0) - { - // we reduce but we do not award points subsequently. they can be awarded once per order anyway (see Order.RewardPointsWereAdded). - // UpdateRewardPoints only visible for unpending orders (see RewardPointsSettingsValidator). - // note: reducing can of cource only work if oi.UnitPriceExclTax has not been changed! - decimal reduceAmount = Math.Abs(context.QuantityDelta) * oi.UnitPriceInclTax; - ReduceRewardPoints(oi.Order, reduceAmount); - context.RewardPointsNew = oi.Order.Customer.GetRewardPointsBalance(); - } - } + if (context.UpdateRewardPoints && context.QuantityDelta < 0) + { + // we reduce but we do not award points subsequently. they can be awarded once per order anyway (see Order.RewardPointsWereAdded). + // UpdateRewardPoints only visible for unpending orders (see RewardPointsSettingsValidator). + // note: reducing can of cource only work if oi.UnitPriceExclTax has not been changed! + decimal reduceAmount = Math.Abs(context.QuantityDelta) * oi.UnitPriceInclTax; + ReduceRewardPoints(oi.Order, reduceAmount); + context.RewardPointsNew = oi.Order.Customer.GetRewardPointsBalance(); + } + } /// @@ -1998,49 +1998,49 @@ public virtual void MarkAsAuthorized(Order order) order.PaymentStatusId = (int)PaymentStatus.Authorized; _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsAuthorized")); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsAuthorized")); //check order status CheckOrderStatus(order); } - /// - /// Gets a value indicating whether the order can be marked as completed - /// - /// Order - /// A value indicating whether the order can be marked as completed - public virtual bool CanCompleteOrder(Order order) - { - if (order == null) - throw new ArgumentNullException("order"); - - return (order.OrderStatus != OrderStatus.Complete && order.OrderStatus != OrderStatus.Cancelled); - } - - /// - /// Marks the order as completed - /// - /// Order - public virtual void CompleteOrder(Order order) - { + /// + /// Gets a value indicating whether the order can be marked as completed + /// + /// Order + /// A value indicating whether the order can be marked as completed + public virtual bool CanCompleteOrder(Order order) + { + if (order == null) + throw new ArgumentNullException("order"); + + return (order.OrderStatus != OrderStatus.Complete && order.OrderStatus != OrderStatus.Cancelled); + } + + /// + /// Marks the order as completed + /// + /// Order + public virtual void CompleteOrder(Order order) + { if (!CanCompleteOrder(order)) throw new SmartException(T("Order.CannotMarkCompleted")); - if (CanMarkOrderAsPaid(order)) - { - MarkOrderAsPaid(order); - } + if (CanMarkOrderAsPaid(order)) + { + MarkOrderAsPaid(order); + } - if (order.ShippingStatus != ShippingStatus.ShippingNotRequired) - { - order.ShippingStatusId = (int)ShippingStatus.Delivered; - } + if (order.ShippingStatus != ShippingStatus.ShippingNotRequired) + { + order.ShippingStatusId = (int)ShippingStatus.Delivered; + } - _orderService.UpdateOrder(order); + _orderService.UpdateOrder(order); - CheckOrderStatus(order); - } + CheckOrderStatus(order); + } /// @@ -2086,10 +2086,10 @@ public virtual IList Capture(Order order) if (result.Success) { var paidDate = order.PaidDateUtc; - if (result.NewPaymentStatus == PaymentStatus.Paid) - { - paidDate = DateTime.UtcNow; - } + if (result.NewPaymentStatus == PaymentStatus.Paid) + { + paidDate = DateTime.UtcNow; + } order.CaptureTransactionId = result.CaptureTransactionId; order.CaptureTransactionResult = result.CaptureTransactionResult; @@ -2098,7 +2098,7 @@ public virtual IList Capture(Order order) _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderCaptured")); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderCaptured")); CheckOrderStatus(order); @@ -2111,17 +2111,17 @@ public virtual IList Capture(Order order) } catch (Exception exception) { - if (result == null) - { - result = new CapturePaymentResult(); - } + if (result == null) + { + result = new CapturePaymentResult(); + } - result.AddError(exception.ToAllMessages()); - } + result.AddError(exception.ToAllMessages()); + } - ProcessErrors(order, result.Errors, "Admin.OrderNotice.OrderCaptureError"); + ProcessErrors(order, result.Errors, "Admin.OrderNotice.OrderCaptureError"); - return result.Errors; + return result.Errors; } /// @@ -2160,9 +2160,9 @@ public virtual void MarkOrderAsPaid(Order order) order.PaymentStatusId = (int)PaymentStatus.Paid; order.PaidDateUtc = DateTime.UtcNow; - _orderService.UpdateOrder(order); + _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsPaid")); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsPaid")); CheckOrderStatus(order); @@ -2188,20 +2188,20 @@ public virtual bool CanRefund(Order order) if (order.OrderTotal == decimal.Zero) return false; - // Only partial refunds allowed if already refunded. - if (order.RefundedAmount > decimal.Zero) - return false; + // Only partial refunds allowed if already refunded. + if (order.RefundedAmount > decimal.Zero) + return false; - // Uncomment the lines below in order to allow this operation for cancelled orders. - //if (order.OrderStatus == OrderStatus.Cancelled) - // return false; + // Uncomment the lines below in order to allow this operation for cancelled orders. + //if (order.OrderStatus == OrderStatus.Cancelled) + // return false; - if (order.PaymentStatus == PaymentStatus.Paid && _paymentService.SupportRefund(order.PaymentMethodSystemName)) + if (order.PaymentStatus == PaymentStatus.Paid && _paymentService.SupportRefund(order.PaymentMethodSystemName)) return true; return false; } - + /// /// Refunds an order (from admin panel) /// @@ -2223,7 +2223,7 @@ public virtual IList Refund(Order order) request.AmountToRefund = order.OrderTotal; request.IsPartialRefund = false; - result = _paymentService.Refund(request); + result = _paymentService.Refund(request); if (result.Success) { @@ -2236,7 +2236,7 @@ public virtual IList Refund(Order order) _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderRefunded", _priceFormatter.FormatPrice(request.AmountToRefund, true, false))); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderRefunded", _priceFormatter.FormatPrice(request.AmountToRefund, true, false))); CheckOrderStatus(order); } @@ -2244,17 +2244,17 @@ public virtual IList Refund(Order order) } catch (Exception exception) { - if (result == null) - { - result = new RefundPaymentResult(); - } + if (result == null) + { + result = new RefundPaymentResult(); + } - result.AddError(exception.ToAllMessages()); + result.AddError(exception.ToAllMessages()); } - ProcessErrors(order, result.Errors, "Admin.OrderNotice.OrderRefundError"); + ProcessErrors(order, result.Errors, "Admin.OrderNotice.OrderRefundError"); - return result.Errors; + return result.Errors; } /// @@ -2270,15 +2270,15 @@ public virtual bool CanRefundOffline(Order order) if (order.OrderTotal == decimal.Zero) return false; - // Only partial refunds allowed if already refunded. - if (order.RefundedAmount > decimal.Zero) - return false; + // Only partial refunds allowed if already refunded. + if (order.RefundedAmount > decimal.Zero) + return false; - // Uncomment the lines below in order to allow this operation for cancelled orders. - //if (order.OrderStatus == OrderStatus.Cancelled) - // return false; + // Uncomment the lines below in order to allow this operation for cancelled orders. + //if (order.OrderStatus == OrderStatus.Cancelled) + // return false; - if (order.PaymentStatus == PaymentStatus.Paid) + if (order.PaymentStatus == PaymentStatus.Paid) return true; return false; @@ -2308,7 +2308,7 @@ public virtual void RefundOffline(Order order) _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsRefunded", _priceFormatter.FormatPrice(amountToRefund, true, false))); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsRefunded", _priceFormatter.FormatPrice(amountToRefund, true, false))); CheckOrderStatus(order); } @@ -2382,7 +2382,7 @@ public virtual IList PartiallyRefund(Order order, decimal amountToRefund _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderPartiallyRefunded", _priceFormatter.FormatPrice(amountToRefund, true, false))); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderPartiallyRefunded", _priceFormatter.FormatPrice(amountToRefund, true, false))); //check order status CheckOrderStatus(order); @@ -2390,17 +2390,17 @@ public virtual IList PartiallyRefund(Order order, decimal amountToRefund } catch (Exception exception) { - if (result == null) - { - result = new RefundPaymentResult(); - } + if (result == null) + { + result = new RefundPaymentResult(); + } - result.AddError(exception.ToAllMessages()); - } + result.AddError(exception.ToAllMessages()); + } - ProcessErrors(order, result.Errors, "Admin.OrderNotice.OrderPartiallyRefundError"); + ProcessErrors(order, result.Errors, "Admin.OrderNotice.OrderPartiallyRefundError"); - return result.Errors; + return result.Errors; } /// @@ -2444,7 +2444,7 @@ public virtual void PartiallyRefundOffline(Order order, decimal amountToRefund) { if (order == null) throw new ArgumentNullException("order"); - + if (!CanPartiallyRefundOffline(order, amountToRefund)) throw new SmartException(T("Order.CannotPartialRefund")); @@ -2458,7 +2458,7 @@ public virtual void PartiallyRefundOffline(Order order, decimal amountToRefund) _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsPartiallyRefunded", _priceFormatter.FormatPrice(amountToRefund, true, false))); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsPartiallyRefunded", _priceFormatter.FormatPrice(amountToRefund, true, false))); //check order status CheckOrderStatus(order); @@ -2518,7 +2518,7 @@ public virtual IList Void(Order order) _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderVoided")); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderVoided")); //check order status CheckOrderStatus(order); @@ -2526,15 +2526,15 @@ public virtual IList Void(Order order) } catch (Exception exception) { - if (result == null) - { - result = new VoidPaymentResult(); - } + if (result == null) + { + result = new VoidPaymentResult(); + } - result.AddError(exception.ToAllMessages()); - } + result.AddError(exception.ToAllMessages()); + } - ProcessErrors(order, result.Errors, "Admin.OrderNotice.OrderVoidError"); + ProcessErrors(order, result.Errors, "Admin.OrderNotice.OrderVoidError"); return result.Errors; } @@ -2572,13 +2572,13 @@ public virtual void VoidOffline(Order order) throw new ArgumentNullException("order"); if (!CanVoidOffline(order)) - throw new SmartException(T("Order.CannotVoid")); + throw new SmartException(T("Order.CannotVoid")); - order.PaymentStatusId = (int)PaymentStatus.Voided; + order.PaymentStatusId = (int)PaymentStatus.Voided; _orderService.UpdateOrder(order); - _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsVoided")); + _orderService.AddOrderNote(order, T("Admin.OrderNotice.OrderMarkedAsVoided")); //check orer status CheckOrderStatus(order); @@ -2597,26 +2597,26 @@ public virtual void ReOrder(Order order) foreach (var orderItem in order.OrderItems) { - var isBundle = (orderItem.Product.ProductType == ProductType.BundledProduct); + var isBundle = (orderItem.Product.ProductType == ProductType.BundledProduct); - var addToCartContext = new AddToCartContext(); + var addToCartContext = new AddToCartContext(); - addToCartContext.Warnings = _shoppingCartService.AddToCart(order.Customer, orderItem.Product, ShoppingCartType.ShoppingCart, order.StoreId, - orderItem.AttributesXml, isBundle ? decimal.Zero : orderItem.UnitPriceExclTax, orderItem.Quantity, false, addToCartContext); + addToCartContext.Warnings = _shoppingCartService.AddToCart(order.Customer, orderItem.Product, ShoppingCartType.ShoppingCart, order.StoreId, + orderItem.AttributesXml, isBundle ? decimal.Zero : orderItem.UnitPriceExclTax, orderItem.Quantity, false, addToCartContext); - if (isBundle && orderItem.BundleData.HasValue() && addToCartContext.Warnings.Count == 0) - { - foreach (var bundleData in orderItem.GetBundleData()) - { - var bundleItem = _productService.GetBundleItemById(bundleData.BundleItemId); - addToCartContext.BundleItem = bundleItem; + if (isBundle && orderItem.BundleData.HasValue() && addToCartContext.Warnings.Count == 0) + { + foreach (var bundleData in orderItem.GetBundleData()) + { + var bundleItem = _productService.GetBundleItemById(bundleData.BundleItemId); + addToCartContext.BundleItem = bundleItem; - addToCartContext.Warnings = _shoppingCartService.AddToCart(order.Customer, bundleItem.Product, ShoppingCartType.ShoppingCart, order.StoreId, - bundleData.AttributesXml, decimal.Zero, bundleData.Quantity, false, addToCartContext); - } - } + addToCartContext.Warnings = _shoppingCartService.AddToCart(order.Customer, bundleItem.Product, ShoppingCartType.ShoppingCart, order.StoreId, + bundleData.AttributesXml, decimal.Zero, bundleData.Quantity, false, addToCartContext); + } + } - _shoppingCartService.AddToCartStoring(addToCartContext); + _shoppingCartService.AddToCartStoring(addToCartContext); } } @@ -2747,79 +2747,79 @@ public virtual Shipment AddShipment( string trackingNumber, string trackingUrl, Dictionary quantities) - { - Guard.NotNull(order, nameof(order)); - - Shipment shipment = null; - decimal? totalWeight = null; - - foreach (var orderItem in order.OrderItems) - { - if (!orderItem.Product.IsShipEnabled) - continue; - - // Ensure that this product can be shipped (have at least one item to ship). - var maxQtyToAdd = orderItem.GetItemsCanBeAddedToShipmentCount(); - if (maxQtyToAdd <= 0) - continue; - - var qtyToAdd = 0; - - if (quantities != null && quantities.ContainsKey(orderItem.Id)) - qtyToAdd = quantities[orderItem.Id]; - else if (quantities == null) - qtyToAdd = maxQtyToAdd; - - if (qtyToAdd <= 0) - continue; - - if (qtyToAdd > maxQtyToAdd) - qtyToAdd = maxQtyToAdd; - - var orderItemTotalWeight = orderItem.ItemWeight.HasValue ? orderItem.ItemWeight * qtyToAdd : null; - if (orderItemTotalWeight.HasValue) - { - if (!totalWeight.HasValue) - totalWeight = 0; - - totalWeight += orderItemTotalWeight.Value; - } - - if (shipment == null) - { - shipment = new Shipment - { - OrderId = order.Id, - Order = order, // Otherwise order updated event would not be fired during InsertShipment. - TrackingNumber = trackingNumber, + { + Guard.NotNull(order, nameof(order)); + + Shipment shipment = null; + decimal? totalWeight = null; + + foreach (var orderItem in order.OrderItems) + { + if (!orderItem.Product.IsShipEnabled) + continue; + + // Ensure that this product can be shipped (have at least one item to ship). + var maxQtyToAdd = orderItem.GetItemsCanBeAddedToShipmentCount(); + if (maxQtyToAdd <= 0) + continue; + + var qtyToAdd = 0; + + if (quantities != null && quantities.ContainsKey(orderItem.Id)) + qtyToAdd = quantities[orderItem.Id]; + else if (quantities == null) + qtyToAdd = maxQtyToAdd; + + if (qtyToAdd <= 0) + continue; + + if (qtyToAdd > maxQtyToAdd) + qtyToAdd = maxQtyToAdd; + + var orderItemTotalWeight = orderItem.ItemWeight.HasValue ? orderItem.ItemWeight * qtyToAdd : null; + if (orderItemTotalWeight.HasValue) + { + if (!totalWeight.HasValue) + totalWeight = 0; + + totalWeight += orderItemTotalWeight.Value; + } + + if (shipment == null) + { + shipment = new Shipment + { + OrderId = order.Id, + Order = order, // Otherwise order updated event would not be fired during InsertShipment. + TrackingNumber = trackingNumber, TrackingUrl = trackingUrl, - TotalWeight = null, - ShippedDateUtc = null, - DeliveryDateUtc = null, - CreatedOnUtc = DateTime.UtcNow, - }; - } + TotalWeight = null, + ShippedDateUtc = null, + DeliveryDateUtc = null, + CreatedOnUtc = DateTime.UtcNow, + }; + } - var shipmentItem = new ShipmentItem - { - OrderItemId = orderItem.Id, - Quantity = qtyToAdd - }; + var shipmentItem = new ShipmentItem + { + OrderItemId = orderItem.Id, + Quantity = qtyToAdd + }; - shipment.ShipmentItems.Add(shipmentItem); - } + shipment.ShipmentItems.Add(shipmentItem); + } - if (shipment != null && shipment.ShipmentItems.Count > 0) - { - shipment.TotalWeight = totalWeight; + if (shipment != null && shipment.ShipmentItems.Count > 0) + { + shipment.TotalWeight = totalWeight; - _shipmentService.InsertShipment(shipment); + _shipmentService.InsertShipment(shipment); - return shipment; - } + return shipment; + } - return null; - } + return null; + } #endregion } diff --git a/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs b/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs index 0a3f263c26..a3e30eea97 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs @@ -365,7 +365,7 @@ public virtual IPagedList GetIncompleteOrders(int storeId, DateT } query = query.Where(x => - x.ShippingStatusId == (int)ShippingStatus.NotYetShipped + x.ShippingStatusId == (int)ShippingStatus.NotYetShipped || x.PaymentStatusId == (int)PaymentStatus.Pending ); var dataPoints = query.Select(x => new OrderDataPoint @@ -402,7 +402,7 @@ public virtual IPagedList GetOrdersDashboardData(int storeId, Da { CreatedOn = x.CreatedOnUtc, OrderTotal = x.OrderTotal, - OrderStatusId = x.OrderStatusId + OrderStatusId = x.OrderStatusId }); return new PagedList(dataPoints, pageIndex, pageSize); } diff --git a/src/Libraries/SmartStore.Services/Orders/OrderService.cs b/src/Libraries/SmartStore.Services/Orders/OrderService.cs index a316eafb29..92ec02f77f 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderService.cs @@ -19,7 +19,7 @@ public partial class OrderService : IOrderService private readonly IRepository _orderRepository; private readonly IRepository _orderItemRepository; private readonly IRepository _orderNoteRepository; - private readonly IRepository _productRepository; + private readonly IRepository _productRepository; private readonly IRepository _recurringPaymentRepository; private readonly IRepository _customerRepository; private readonly IRepository _returnRequestRepository; @@ -28,16 +28,16 @@ public partial class OrderService : IOrderService public OrderService(IRepository orderRepository, IRepository orderItemRepository, IRepository orderNoteRepository, - IRepository productRepository, + IRepository productRepository, IRepository recurringPaymentRepository, - IRepository customerRepository, + IRepository customerRepository, IRepository returnRequestRepository, IEventPublisher eventPublisher) { _orderRepository = orderRepository; _orderItemRepository = orderItemRepository; _orderNoteRepository = orderNoteRepository; - _productRepository = productRepository; + _productRepository = productRepository; _recurringPaymentRepository = recurringPaymentRepository; _customerRepository = customerRepository; _returnRequestRepository = returnRequestRepository; @@ -62,9 +62,9 @@ where orderIds.Contains(o.Id) select o; var orders = query.ToList(); - // sort by passed identifier sequence - return orders.OrderBySequence(orderIds).ToList(); - } + // sort by passed identifier sequence + return orders.OrderBySequence(orderIds).ToList(); + } public virtual Order GetOrderByNumber(string orderNumber) { @@ -99,114 +99,114 @@ public virtual Order GetOrderByGuid(Guid orderGuid) return order; } - public virtual Order GetOrderByPaymentAuthorization(string paymentMethodSystemName, string authorizationTransactionId) - { - if (paymentMethodSystemName.IsEmpty() || authorizationTransactionId.IsEmpty()) - return null; - - var query = - from o in _orderRepository.Table - where o.PaymentMethodSystemName == paymentMethodSystemName && o.AuthorizationTransactionId == authorizationTransactionId - select o; - - return query.FirstOrDefault(); - } - - public virtual Order GetOrderByPaymentCapture(string paymentMethodSystemName, string captureTransactionId) - { - if (paymentMethodSystemName.IsEmpty() || captureTransactionId.IsEmpty()) - return null; - - var query = - from o in _orderRepository.Table - where o.PaymentMethodSystemName == paymentMethodSystemName && o.CaptureTransactionId == captureTransactionId - select o; - - return query.FirstOrDefault(); - } - - public virtual IQueryable GetOrders( - int storeId, - int customerId, - DateTime? startTime, - DateTime? endTime, - int[] orderStatusIds, - int[] paymentStatusIds, - int[] shippingStatusIds, - string billingEmail, - string orderNumber, - string billingName = null, + public virtual Order GetOrderByPaymentAuthorization(string paymentMethodSystemName, string authorizationTransactionId) + { + if (paymentMethodSystemName.IsEmpty() || authorizationTransactionId.IsEmpty()) + return null; + + var query = + from o in _orderRepository.Table + where o.PaymentMethodSystemName == paymentMethodSystemName && o.AuthorizationTransactionId == authorizationTransactionId + select o; + + return query.FirstOrDefault(); + } + + public virtual Order GetOrderByPaymentCapture(string paymentMethodSystemName, string captureTransactionId) + { + if (paymentMethodSystemName.IsEmpty() || captureTransactionId.IsEmpty()) + return null; + + var query = + from o in _orderRepository.Table + where o.PaymentMethodSystemName == paymentMethodSystemName && o.CaptureTransactionId == captureTransactionId + select o; + + return query.FirstOrDefault(); + } + + public virtual IQueryable GetOrders( + int storeId, + int customerId, + DateTime? startTime, + DateTime? endTime, + int[] orderStatusIds, + int[] paymentStatusIds, + int[] shippingStatusIds, + string billingEmail, + string orderNumber, + string billingName = null, string[] paymentMethods = null) - { - var query = _orderRepository.Table; + { + var query = _orderRepository.Table; if (customerId > 0) query = query.Where(x => x.CustomerId == customerId); if (storeId > 0) - query = query.Where(x => x.StoreId == storeId); + query = query.Where(x => x.StoreId == storeId); - if (startTime.HasValue) - query = query.Where(x => startTime.Value <= x.CreatedOnUtc); + if (startTime.HasValue) + query = query.Where(x => startTime.Value <= x.CreatedOnUtc); - if (endTime.HasValue) - query = query.Where(x => endTime.Value >= x.CreatedOnUtc); + if (endTime.HasValue) + query = query.Where(x => endTime.Value >= x.CreatedOnUtc); - if (billingEmail.HasValue()) - query = query.Where(x => x.BillingAddress != null && !String.IsNullOrEmpty(x.BillingAddress.Email) && x.BillingAddress.Email.Contains(billingEmail)); + if (billingEmail.HasValue()) + query = query.Where(x => x.BillingAddress != null && !String.IsNullOrEmpty(x.BillingAddress.Email) && x.BillingAddress.Email.Contains(billingEmail)); - if (billingName.HasValue()) - { - query = query.Where(x => x.BillingAddress != null && ( - (!String.IsNullOrEmpty(x.BillingAddress.LastName) && x.BillingAddress.LastName.Contains(billingName)) || - (!String.IsNullOrEmpty(x.BillingAddress.FirstName) && x.BillingAddress.FirstName.Contains(billingName)) - )); - } + if (billingName.HasValue()) + { + query = query.Where(x => x.BillingAddress != null && ( + (!String.IsNullOrEmpty(x.BillingAddress.LastName) && x.BillingAddress.LastName.Contains(billingName)) || + (!String.IsNullOrEmpty(x.BillingAddress.FirstName) && x.BillingAddress.FirstName.Contains(billingName)) + )); + } - if (orderNumber.HasValue()) - query = query.Where(x => x.OrderNumber.ToLower().Contains(orderNumber.ToLower())); + if (orderNumber.HasValue()) + query = query.Where(x => x.OrderNumber.ToLower().Contains(orderNumber.ToLower())); - if (orderStatusIds != null && orderStatusIds.Count() > 0) - query = query.Where(x => orderStatusIds.Contains(x.OrderStatusId)); + if (orderStatusIds != null && orderStatusIds.Count() > 0) + query = query.Where(x => orderStatusIds.Contains(x.OrderStatusId)); - if (paymentStatusIds != null && paymentStatusIds.Count() > 0) - query = query.Where(x => paymentStatusIds.Contains(x.PaymentStatusId)); + if (paymentStatusIds != null && paymentStatusIds.Count() > 0) + query = query.Where(x => paymentStatusIds.Contains(x.PaymentStatusId)); - if (shippingStatusIds != null && shippingStatusIds.Count() > 0) - query = query.Where(x => shippingStatusIds.Contains(x.ShippingStatusId)); + if (shippingStatusIds != null && shippingStatusIds.Count() > 0) + query = query.Where(x => shippingStatusIds.Contains(x.ShippingStatusId)); if (paymentMethods != null && paymentMethods.Any()) { query = query.Where(x => paymentMethods.Contains(x.PaymentMethodSystemName)); } - query = query.Where(x => !x.Deleted); + query = query.Where(x => !x.Deleted); - return query; - } + return query; + } - public virtual IPagedList SearchOrders(int storeId, int customerId, DateTime? startTime, DateTime? endTime, - int[] orderStatusIds, int[] paymentStatusIds, int[] shippingStatusIds, - string billingEmail, string orderGuid, string orderNumber, int pageIndex, int pageSize, string billingName = null, + public virtual IPagedList SearchOrders(int storeId, int customerId, DateTime? startTime, DateTime? endTime, + int[] orderStatusIds, int[] paymentStatusIds, int[] shippingStatusIds, + string billingEmail, string orderGuid, string orderNumber, int pageIndex, int pageSize, string billingName = null, string[] paymentMethods = null) { - var query = GetOrders(storeId, customerId, startTime, endTime, orderStatusIds, paymentStatusIds, shippingStatusIds, - billingEmail, orderNumber, billingName, paymentMethods); - - query = query.OrderByDescending(x => x.CreatedOnUtc); - - if (orderGuid.HasValue()) - { - // Filter by GUID. Filter in BLL because EF doesn't support casting of GUID to string - var orders = query.ToList(); - orders = orders.FindAll(x => x.OrderGuid.ToString().ToLowerInvariant().Contains(orderGuid.ToLowerInvariant())); - - return new PagedList(orders, pageIndex, pageSize); - } - else - { - return new PagedList(query, pageIndex, pageSize); - } + var query = GetOrders(storeId, customerId, startTime, endTime, orderStatusIds, paymentStatusIds, shippingStatusIds, + billingEmail, orderNumber, billingName, paymentMethods); + + query = query.OrderByDescending(x => x.CreatedOnUtc); + + if (orderGuid.HasValue()) + { + // Filter by GUID. Filter in BLL because EF doesn't support casting of GUID to string + var orders = query.ToList(); + orders = orders.FindAll(x => x.OrderGuid.ToString().ToLowerInvariant().Contains(orderGuid.ToLowerInvariant())); + + return new PagedList(orders, pageIndex, pageSize); + } + else + { + return new PagedList(query, pageIndex, pageSize); + } } public virtual IPagedList GetAllOrders(int affiliateId, int pageIndex, int pageSize) @@ -245,63 +245,63 @@ public virtual void UpdateOrder(Order order) _orderRepository.Update(order); - _eventPublisher.PublishOrderUpdated(order); + _eventPublisher.PublishOrderUpdated(order); } - public virtual void DeleteOrder(Order order) - { - if (order == null) - throw new ArgumentNullException("order"); + public virtual void DeleteOrder(Order order) + { + if (order == null) + throw new ArgumentNullException("order"); - order.Deleted = true; - UpdateOrder(order); - } + order.Deleted = true; + UpdateOrder(order); + } public virtual void DeleteOrderNote(OrderNote orderNote) { if (orderNote == null) throw new ArgumentNullException("orderNote"); - int orderId = orderNote.OrderId; + int orderId = orderNote.OrderId; _orderNoteRepository.Delete(orderNote); - var order = GetOrderById(orderId); - _eventPublisher.PublishOrderUpdated(order); + var order = GetOrderById(orderId); + _eventPublisher.PublishOrderUpdated(order); } public virtual Order GetOrderByAuthorizationTransactionIdAndPaymentMethod(string authorizationTransactionId, string paymentMethodSystemName) - { + { var query = _orderRepository.Table; if (!String.IsNullOrWhiteSpace(authorizationTransactionId)) query = query.Where(o => o.AuthorizationTransactionId == authorizationTransactionId); - + if (!String.IsNullOrWhiteSpace(paymentMethodSystemName)) query = query.Where(o => o.PaymentMethodSystemName == paymentMethodSystemName); - + query = query.OrderByDescending(o => o.CreatedOnUtc); var order = query.FirstOrDefault(); return order; } - public virtual void AddOrderNote(Order order, string note, bool displayToCustomer = false) - { - if (order != null && note.HasValue()) - { - order.OrderNotes.Add(new OrderNote - { - Note = note, - DisplayToCustomer = displayToCustomer, - CreatedOnUtc = DateTime.UtcNow - }); - - UpdateOrder(order); - } - } + public virtual void AddOrderNote(Order order, string note, bool displayToCustomer = false) + { + if (order != null && note.HasValue()) + { + order.OrderNotes.Add(new OrderNote + { + Note = note, + DisplayToCustomer = displayToCustomer, + CreatedOnUtc = DateTime.UtcNow + }); + + UpdateOrder(order); + } + } - #region Order items + #region Order items - public virtual OrderItem GetOrderItemById(int orderItemId) + public virtual OrderItem GetOrderItemById(int orderItemId) { if (orderItemId == 0) return null; @@ -313,7 +313,7 @@ public virtual OrderItem GetOrderItemByGuid(Guid orderItemGuid) { if (orderItemGuid == Guid.Empty) return null; - + var query = from orderItem in _orderItemRepository.Table where orderItem.OrderItemGuid == orderItemGuid select orderItem; @@ -337,11 +337,11 @@ public virtual IList GetAllOrderItems(int? orderId, int? shippingStatusId = null; if (ss.HasValue) shippingStatusId = (int)ss.Value; - + var query = from orderItem in _orderItemRepository.Table join o in _orderRepository.Table on orderItem.OrderId equals o.Id - join p in _productRepository.Table on orderItem.ProductId equals p.Id + join p in _productRepository.Table on orderItem.ProductId equals p.Id where (!orderId.HasValue || orderId.Value == 0 || orderId == o.Id) && (!customerId.HasValue || customerId.Value == 0 || customerId == o.CustomerId) && (!startTime.HasValue || startTime.Value <= o.CreatedOnUtc) && @@ -358,38 +358,38 @@ join p in _productRepository.Table on orderItem.ProductId equals p.Id return orderItems; } - public virtual Multimap GetOrderItemsByOrderIds(int[] orderIds) - { - Guard.NotNull(orderIds, nameof(orderIds)); + public virtual Multimap GetOrderItemsByOrderIds(int[] orderIds) + { + Guard.NotNull(orderIds, nameof(orderIds)); - var query = - from x in _orderItemRepository.TableUntracked.Expand(x => x.Product) - where orderIds.Contains(x.OrderId) - select x; + var query = + from x in _orderItemRepository.TableUntracked.Expand(x => x.Product) + where orderIds.Contains(x.OrderId) + select x; - var map = query - .OrderBy(x => x.OrderId) - .ToList() - .ToMultimap(x => x.OrderId, x => x); + var map = query + .OrderBy(x => x.OrderId) + .ToList() + .ToMultimap(x => x.OrderId, x => x); - return map; - } + return map; + } public virtual void DeleteOrderItem(OrderItem orderItem) { if (orderItem == null) throw new ArgumentNullException("orderItem"); - int orderId = orderItem.OrderId; + int orderId = orderItem.OrderId; _orderItemRepository.Delete(orderItem); - var order = GetOrderById(orderId); - _eventPublisher.PublishOrderUpdated(order); + var order = GetOrderById(orderId); + _eventPublisher.PublishOrderUpdated(order); } #endregion - + #region Recurring payments public virtual void DeleteRecurringPayment(RecurringPayment recurringPayment) @@ -406,7 +406,7 @@ public virtual RecurringPayment GetRecurringPaymentById(int recurringPaymentId) if (recurringPaymentId == 0) return null; - return _recurringPaymentRepository.GetById(recurringPaymentId); + return _recurringPaymentRepository.GetById(recurringPaymentId); } public virtual void InsertRecurringPayment(RecurringPayment recurringPayment) @@ -416,7 +416,7 @@ public virtual void InsertRecurringPayment(RecurringPayment recurringPayment) _recurringPaymentRepository.Insert(recurringPayment); - _eventPublisher.PublishOrderUpdated(recurringPayment.InitialOrder); + _eventPublisher.PublishOrderUpdated(recurringPayment.InitialOrder); } public virtual void UpdateRecurringPayment(RecurringPayment recurringPayment) @@ -426,15 +426,15 @@ public virtual void UpdateRecurringPayment(RecurringPayment recurringPayment) _recurringPaymentRepository.Update(recurringPayment); - _eventPublisher.PublishOrderUpdated(recurringPayment.InitialOrder); + _eventPublisher.PublishOrderUpdated(recurringPayment.InitialOrder); } - public virtual IPagedList SearchRecurringPayments( - int storeId, - int customerId, + public virtual IPagedList SearchRecurringPayments( + int storeId, + int customerId, int initialOrderId, OrderStatus? initialOrderStatus, - bool showHidden = false, + bool showHidden = false, int pageIndex = 0, int pageSize = int.MaxValue) { @@ -453,7 +453,7 @@ join c in _customerRepository.Table on rp.InitialOrder.CustomerId equals c.Id (showHidden || !c.Deleted) && (showHidden || rp.IsActive) && (customerId == 0 || rp.InitialOrder.CustomerId == customerId) && - (storeId == 0 || rp.InitialOrder.StoreId == storeId) && + (storeId == 0 || rp.InitialOrder.StoreId == storeId) && (initialOrderId == 0 || rp.InitialOrder.Id == initialOrderId) && (!initialOrderStatusId.HasValue || initialOrderStatusId.Value == 0 || rp.InitialOrder.OrderStatusId == initialOrderStatusId.Value) select rp.Id; @@ -475,12 +475,12 @@ public virtual void DeleteReturnRequest(ReturnRequest returnRequest) if (returnRequest == null) throw new ArgumentNullException("returnRequest"); - int orderItemId = returnRequest.OrderItemId; + int orderItemId = returnRequest.OrderItemId; _returnRequestRepository.Delete(returnRequest); - var orderItem = GetOrderItemById(orderItemId); - _eventPublisher.PublishOrderUpdated(orderItem.Order); + var orderItem = GetOrderItemById(orderItemId); + _eventPublisher.PublishOrderUpdated(orderItem.Order); } public virtual ReturnRequest GetReturnRequestById(int returnRequestId) @@ -491,21 +491,21 @@ public virtual ReturnRequest GetReturnRequestById(int returnRequestId) return _returnRequestRepository.GetById(returnRequestId); } - public virtual IPagedList SearchReturnRequests(int storeId, int customerId, int orderItemId, ReturnRequestStatus? rs, int pageIndex, int pageSize, int id = 0) + public virtual IPagedList SearchReturnRequests(int storeId, int customerId, int orderItemId, ReturnRequestStatus? rs, int pageIndex, int pageSize, int id = 0) { var query = _returnRequestRepository.Table; - if (storeId > 0) - query = query.Where(rr => storeId == rr.StoreId); - - if (customerId > 0) + if (storeId > 0) + query = query.Where(rr => storeId == rr.StoreId); + + if (customerId > 0) query = query.Where(rr => customerId == rr.CustomerId); - if (orderItemId > 0) - query = query.Where(rr => rr.OrderItemId == orderItemId); + if (orderItemId > 0) + query = query.Where(rr => rr.OrderItemId == orderItemId); - if (id != 0) - query = query.Where(rr => rr.Id == id); + if (id != 0) + query = query.Where(rr => rr.Id == id); if (rs.HasValue) { @@ -515,7 +515,7 @@ public virtual IPagedList SearchReturnRequests(int storeId, int c query = query.OrderByDescending(rr => rr.CreatedOnUtc).ThenByDescending(rr => rr.Id); - var returnRequests = new PagedList(query, pageIndex, pageSize); + var returnRequests = new PagedList(query, pageIndex, pageSize); return returnRequests; } diff --git a/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs b/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs index 05f2757f98..9a0aa20a08 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs @@ -27,16 +27,16 @@ namespace SmartStore.Services.Orders /// public partial class OrderTotalCalculationService : IOrderTotalCalculationService { - private const string CART_TAXING_INFO_KEY = "CartTaxingInfos"; + private const string CART_TAXING_INFO_KEY = "CartTaxingInfos"; - #region Fields + #region Fields - private readonly IWorkContext _workContext; - private readonly IStoreContext _storeContext; + private readonly IWorkContext _workContext; + private readonly IStoreContext _storeContext; private readonly IPriceCalculationService _priceCalculationService; private readonly ITaxService _taxService; private readonly IShippingService _shippingService; - private readonly IProviderManager _providerManager; + private readonly IProviderManager _providerManager; private readonly ICheckoutAttributeParser _checkoutAttributeParser; private readonly IDiscountService _discountService; private readonly IGiftCardService _giftCardService; @@ -74,11 +74,11 @@ public partial class OrderTotalCalculationService : IOrderTotalCalculationServic /// Catalog settings public OrderTotalCalculationService( IWorkContext workContext, - IStoreContext storeContext, + IStoreContext storeContext, IPriceCalculationService priceCalculationService, ITaxService taxService, IShippingService shippingService, - IProviderManager providerManager, + IProviderManager providerManager, ICheckoutAttributeParser checkoutAttributeParser, IDiscountService discountService, IGiftCardService giftCardService, @@ -93,210 +93,210 @@ public OrderTotalCalculationService( CatalogSettings catalogSettings) { _workContext = workContext; - _storeContext = storeContext; + _storeContext = storeContext; _priceCalculationService = priceCalculationService; _taxService = taxService; _shippingService = shippingService; - _providerManager = providerManager; + _providerManager = providerManager; _checkoutAttributeParser = checkoutAttributeParser; _discountService = discountService; _giftCardService = giftCardService; _genericAttributeService = genericAttributeService; _paymentService = paymentService; _currencyService = currencyService; - _productAttributeParser = productAttributeParser; + _productAttributeParser = productAttributeParser; _taxSettings = taxSettings; _rewardPointsSettings = rewardPointsSettings; _shippingSettings = shippingSettings; _shoppingCartSettings = shoppingCartSettings; _catalogSettings = catalogSettings; - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - - #endregion - - #region Utilities - - private Func GetTaxingInfo = cartItem => (CartTaxingInfo)cartItem.CustomProperties[CART_TAXING_INFO_KEY]; - - protected virtual void PrepareAuxiliaryServicesTaxingInfos(IList cart) - { - // no additional infos required - if (!cart.Any() || _taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.SpecifiedTaxCategory) - return; - - // additional infos already collected - if (cart.First().CustomProperties.ContainsKey(CART_TAXING_INFO_KEY)) - return; - - // instance taxing info objects - cart.Each(x => x.CustomProperties[CART_TAXING_INFO_KEY] = new CartTaxingInfo()); - - // collect infos - if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestCartAmount) - { - // calculate all subtotals - cart.Each(x => GetTaxingInfo(x).SubTotalWithoutDiscount = _priceCalculationService.GetSubTotal(x, false)); - - // items with the highest subtotal - var highestAmountItems = cart - .GroupBy(x => x.Item.Product.TaxCategoryId) - .OrderByDescending(x => x.Sum(y => GetTaxingInfo(y).SubTotalWithoutDiscount)) - .First(); - - // mark items - highestAmountItems.Each(x => GetTaxingInfo(x).HasHighestCartAmount = true); - } - else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestTaxRate) - { - var customer = cart.GetCustomer(); - var maxTaxRate = decimal.Zero; - var maxTaxCategoryId = 0; - - // get tax category id with the highest rate - cart.Each(x => - { - var taxRate = _taxService.GetTaxRate(x.Item.Product, x.Item.Product.TaxCategoryId, customer); - if (taxRate > maxTaxRate) - { - maxTaxRate = taxRate; - maxTaxCategoryId = x.Item.Product.TaxCategoryId; - } - }); - - // mark items - cart.Where(x => x.Item.Product.TaxCategoryId == maxTaxCategoryId) - .Each(x => GetTaxingInfo(x).HasHighestTaxRate = true); - } - //else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.ProRata) - //{ - // // calculate all subtotals - // cart.Each(x => GetTaxingInfo(x).SubTotalWithoutDiscount = _priceCalculationService.GetSubTotal(x, false)); - - // // sum over all subtotals - // var subTotalSum = cart.Sum(x => GetTaxingInfo(x).SubTotalWithoutDiscount); - - // // calculate pro rata weightings - // cart.Each(x => - // { - // var taxingInfo = GetTaxingInfo(x); - // taxingInfo.ProRataWeighting = taxingInfo.SubTotalWithoutDiscount / subTotalSum; - // }); - //} - } - - protected virtual decimal? GetAdjustedShippingTotal(IList cart, out Discount appliedDiscount) - { - appliedDiscount = null; - - decimal? shippingTotal = null; - ShippingOption shippingOption = null; - var customer = cart.GetCustomer(); - var storeId = _storeContext.CurrentStore.Id; - - if (customer != null) - { - shippingOption = customer.GetAttribute(SystemCustomerAttributeNames.SelectedShippingOption, _genericAttributeService, storeId); - } - - if (shippingOption != null) - { - // use last shipping option (get from cache) - var shippingMethods = _shippingService.GetAllShippingMethods(null, storeId); - shippingTotal = AdjustShippingRate(shippingOption.Rate, cart, shippingOption, shippingMethods, out appliedDiscount); - } - else - { - // use fixed rate (if possible) - Address shippingAddress = null; - if (customer != null) - shippingAddress = customer.ShippingAddress; - - var shippingRateComputationMethods = _shippingService.LoadActiveShippingRateComputationMethods(storeId); - if (!shippingRateComputationMethods.Any()) - throw new SmartException(T("Shipping.CouldNotLoadMethod")); - - if (shippingRateComputationMethods.Count() == 1) - { - var shippingRateComputationMethod = shippingRateComputationMethods.First(); - var getShippingOptionRequest = _shippingService.CreateShippingOptionRequest(cart, shippingAddress, storeId); - var fixedRate = shippingRateComputationMethod.Value.GetFixedRate(getShippingOptionRequest); - - if (fixedRate.HasValue) - { - shippingTotal = AdjustShippingRate(fixedRate.Value, cart, null, null, out appliedDiscount); - } - } - } - - return shippingTotal; - } - - protected virtual decimal GetShippingTaxAmount( - decimal shipping, - Customer customer, - int taxCategoryId, - SortedDictionary taxRates) - { - var taxRate = decimal.Zero; - var shippingExclTax = _taxService.GetShippingPrice(shipping, false, customer, taxCategoryId, out taxRate); - var shippingInclTax = _taxService.GetShippingPrice(shipping, true, customer, taxCategoryId, out taxRate); - - var shippingTax = shippingInclTax - shippingExclTax; - - if (shippingTax < decimal.Zero) - shippingTax = decimal.Zero; - - if (taxRate > decimal.Zero && shippingTax > decimal.Zero) - { - if (taxRates.ContainsKey(taxRate)) - taxRates[taxRate] = taxRates[taxRate] + shippingTax; - else - taxRates.Add(taxRate, shippingTax); - } - - return shippingTax; - } - - protected virtual decimal GetPaymentFeeTaxAmount( - decimal paymentFee, - Customer customer, - int taxCategoryId, - SortedDictionary taxRates) - { - var taxRate = decimal.Zero; - var paymentFeeExclTax = _taxService.GetPaymentMethodAdditionalFee(paymentFee, false, customer, taxCategoryId, out taxRate); - var paymentFeeInclTax = _taxService.GetPaymentMethodAdditionalFee(paymentFee, true, customer, taxCategoryId, out taxRate); - - var paymentFeeTax = paymentFeeInclTax - paymentFeeExclTax; - - if (taxRate > decimal.Zero && paymentFeeTax != decimal.Zero) - { - if (taxRates.ContainsKey(taxRate)) - taxRates[taxRate] = taxRates[taxRate] + paymentFeeTax; - else - taxRates.Add(taxRate, paymentFeeTax); - } - - return paymentFeeTax; - } - - #endregion - - #region Methods - - /// - /// Gets shopping cart subtotal - /// - /// Cart - /// Applied discount amount - /// Applied discount - /// Sub total (without discount) - /// Sub total (with discount) - public virtual void GetShoppingCartSubTotal(IList cart, + T = NullLocalizer.Instance; + } + + public Localizer T { get; set; } + + #endregion + + #region Utilities + + private Func GetTaxingInfo = cartItem => (CartTaxingInfo)cartItem.CustomProperties[CART_TAXING_INFO_KEY]; + + protected virtual void PrepareAuxiliaryServicesTaxingInfos(IList cart) + { + // no additional infos required + if (!cart.Any() || _taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.SpecifiedTaxCategory) + return; + + // additional infos already collected + if (cart.First().CustomProperties.ContainsKey(CART_TAXING_INFO_KEY)) + return; + + // instance taxing info objects + cart.Each(x => x.CustomProperties[CART_TAXING_INFO_KEY] = new CartTaxingInfo()); + + // collect infos + if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestCartAmount) + { + // calculate all subtotals + cart.Each(x => GetTaxingInfo(x).SubTotalWithoutDiscount = _priceCalculationService.GetSubTotal(x, false)); + + // items with the highest subtotal + var highestAmountItems = cart + .GroupBy(x => x.Item.Product.TaxCategoryId) + .OrderByDescending(x => x.Sum(y => GetTaxingInfo(y).SubTotalWithoutDiscount)) + .First(); + + // mark items + highestAmountItems.Each(x => GetTaxingInfo(x).HasHighestCartAmount = true); + } + else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestTaxRate) + { + var customer = cart.GetCustomer(); + var maxTaxRate = decimal.Zero; + var maxTaxCategoryId = 0; + + // get tax category id with the highest rate + cart.Each(x => + { + var taxRate = _taxService.GetTaxRate(x.Item.Product, x.Item.Product.TaxCategoryId, customer); + if (taxRate > maxTaxRate) + { + maxTaxRate = taxRate; + maxTaxCategoryId = x.Item.Product.TaxCategoryId; + } + }); + + // mark items + cart.Where(x => x.Item.Product.TaxCategoryId == maxTaxCategoryId) + .Each(x => GetTaxingInfo(x).HasHighestTaxRate = true); + } + //else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.ProRata) + //{ + // // calculate all subtotals + // cart.Each(x => GetTaxingInfo(x).SubTotalWithoutDiscount = _priceCalculationService.GetSubTotal(x, false)); + + // // sum over all subtotals + // var subTotalSum = cart.Sum(x => GetTaxingInfo(x).SubTotalWithoutDiscount); + + // // calculate pro rata weightings + // cart.Each(x => + // { + // var taxingInfo = GetTaxingInfo(x); + // taxingInfo.ProRataWeighting = taxingInfo.SubTotalWithoutDiscount / subTotalSum; + // }); + //} + } + + protected virtual decimal? GetAdjustedShippingTotal(IList cart, out Discount appliedDiscount) + { + appliedDiscount = null; + + decimal? shippingTotal = null; + ShippingOption shippingOption = null; + var customer = cart.GetCustomer(); + var storeId = _storeContext.CurrentStore.Id; + + if (customer != null) + { + shippingOption = customer.GetAttribute(SystemCustomerAttributeNames.SelectedShippingOption, _genericAttributeService, storeId); + } + + if (shippingOption != null) + { + // use last shipping option (get from cache) + var shippingMethods = _shippingService.GetAllShippingMethods(null, storeId); + shippingTotal = AdjustShippingRate(shippingOption.Rate, cart, shippingOption, shippingMethods, out appliedDiscount); + } + else + { + // use fixed rate (if possible) + Address shippingAddress = null; + if (customer != null) + shippingAddress = customer.ShippingAddress; + + var shippingRateComputationMethods = _shippingService.LoadActiveShippingRateComputationMethods(storeId); + if (!shippingRateComputationMethods.Any()) + throw new SmartException(T("Shipping.CouldNotLoadMethod")); + + if (shippingRateComputationMethods.Count() == 1) + { + var shippingRateComputationMethod = shippingRateComputationMethods.First(); + var getShippingOptionRequest = _shippingService.CreateShippingOptionRequest(cart, shippingAddress, storeId); + var fixedRate = shippingRateComputationMethod.Value.GetFixedRate(getShippingOptionRequest); + + if (fixedRate.HasValue) + { + shippingTotal = AdjustShippingRate(fixedRate.Value, cart, null, null, out appliedDiscount); + } + } + } + + return shippingTotal; + } + + protected virtual decimal GetShippingTaxAmount( + decimal shipping, + Customer customer, + int taxCategoryId, + SortedDictionary taxRates) + { + var taxRate = decimal.Zero; + var shippingExclTax = _taxService.GetShippingPrice(shipping, false, customer, taxCategoryId, out taxRate); + var shippingInclTax = _taxService.GetShippingPrice(shipping, true, customer, taxCategoryId, out taxRate); + + var shippingTax = shippingInclTax - shippingExclTax; + + if (shippingTax < decimal.Zero) + shippingTax = decimal.Zero; + + if (taxRate > decimal.Zero && shippingTax > decimal.Zero) + { + if (taxRates.ContainsKey(taxRate)) + taxRates[taxRate] = taxRates[taxRate] + shippingTax; + else + taxRates.Add(taxRate, shippingTax); + } + + return shippingTax; + } + + protected virtual decimal GetPaymentFeeTaxAmount( + decimal paymentFee, + Customer customer, + int taxCategoryId, + SortedDictionary taxRates) + { + var taxRate = decimal.Zero; + var paymentFeeExclTax = _taxService.GetPaymentMethodAdditionalFee(paymentFee, false, customer, taxCategoryId, out taxRate); + var paymentFeeInclTax = _taxService.GetPaymentMethodAdditionalFee(paymentFee, true, customer, taxCategoryId, out taxRate); + + var paymentFeeTax = paymentFeeInclTax - paymentFeeExclTax; + + if (taxRate > decimal.Zero && paymentFeeTax != decimal.Zero) + { + if (taxRates.ContainsKey(taxRate)) + taxRates[taxRate] = taxRates[taxRate] + paymentFeeTax; + else + taxRates.Add(taxRate, paymentFeeTax); + } + + return paymentFeeTax; + } + + #endregion + + #region Methods + + /// + /// Gets shopping cart subtotal + /// + /// Cart + /// Applied discount amount + /// Applied discount + /// Sub total (without discount) + /// Sub total (with discount) + public virtual void GetShoppingCartSubTotal(IList cart, out decimal discountAmount, out Discount appliedDiscount, out decimal subTotalWithoutDiscount, out decimal subTotalWithDiscount) { @@ -312,12 +312,12 @@ public virtual void GetShoppingCartSubTotal(IList car break; } - GetShoppingCartSubTotal(cart, - includingTax, - out discountAmount, - out appliedDiscount, - out subTotalWithoutDiscount, - out subTotalWithDiscount); + GetShoppingCartSubTotal(cart, + includingTax, + out discountAmount, + out appliedDiscount, + out subTotalWithoutDiscount, + out subTotalWithDiscount); } /// @@ -336,13 +336,13 @@ public virtual void GetShoppingCartSubTotal(IList car { SortedDictionary taxRates = null; - GetShoppingCartSubTotal(cart, - includingTax, - out discountAmount, - out appliedDiscount, - out subTotalWithoutDiscount, - out subTotalWithDiscount, - out taxRates); + GetShoppingCartSubTotal(cart, + includingTax, + out discountAmount, + out appliedDiscount, + out subTotalWithoutDiscount, + out subTotalWithDiscount, + out taxRates); } /// @@ -357,10 +357,10 @@ public virtual void GetShoppingCartSubTotal(IList car /// Tax rates (of order sub total) public virtual void GetShoppingCartSubTotal(IList cart, bool includingTax, - out decimal discountAmount, - out Discount appliedDiscount, - out decimal subTotalWithoutDiscount, - out decimal subTotalWithDiscount, + out decimal discountAmount, + out Discount appliedDiscount, + out decimal subTotalWithoutDiscount, + out decimal subTotalWithDiscount, out SortedDictionary taxRates) { discountAmount = decimal.Zero; @@ -374,42 +374,42 @@ public virtual void GetShoppingCartSubTotal(IList car // get the customer var customer = cart.GetCustomer(); - var currency = _workContext.WorkingCurrency; + var currency = _workContext.WorkingCurrency; - // sub totals - decimal subTotalExclTaxWithoutDiscount = decimal.Zero; + // sub totals + decimal subTotalExclTaxWithoutDiscount = decimal.Zero; decimal subTotalInclTaxWithoutDiscount = decimal.Zero; foreach (var shoppingCartItem in cart) - { - if (shoppingCartItem.Item.Product == null) - continue; - - decimal taxRate, sciSubTotal, sciExclTax, sciInclTax = decimal.Zero; - - shoppingCartItem.Item.Product.MergeWithCombination(shoppingCartItem.Item.AttributesXml, _productAttributeParser); - - if (currency.RoundOrderItemsEnabled) - { - // Gross > Net RoundFix - int qty = shoppingCartItem.Item.Quantity; - - sciSubTotal = _priceCalculationService.GetUnitPrice(shoppingCartItem, true); - - // Adaption to eliminate rounding issues - sciExclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, false, customer, out taxRate); - sciExclTax = sciExclTax.RoundIfEnabledFor(currency) * qty; - sciInclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, true, customer, out taxRate); - sciInclTax = sciInclTax.RoundIfEnabledFor(currency) * qty; - } - else - { - sciSubTotal = _priceCalculationService.GetSubTotal(shoppingCartItem, true); - sciExclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, false, customer, out taxRate); - sciInclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, true, customer, out taxRate); - } - - subTotalExclTaxWithoutDiscount += sciExclTax; + { + if (shoppingCartItem.Item.Product == null) + continue; + + decimal taxRate, sciSubTotal, sciExclTax, sciInclTax = decimal.Zero; + + shoppingCartItem.Item.Product.MergeWithCombination(shoppingCartItem.Item.AttributesXml, _productAttributeParser); + + if (currency.RoundOrderItemsEnabled) + { + // Gross > Net RoundFix + int qty = shoppingCartItem.Item.Quantity; + + sciSubTotal = _priceCalculationService.GetUnitPrice(shoppingCartItem, true); + + // Adaption to eliminate rounding issues + sciExclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, false, customer, out taxRate); + sciExclTax = sciExclTax.RoundIfEnabledFor(currency) * qty; + sciInclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, true, customer, out taxRate); + sciInclTax = sciInclTax.RoundIfEnabledFor(currency) * qty; + } + else + { + sciSubTotal = _priceCalculationService.GetSubTotal(shoppingCartItem, true); + sciExclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, false, customer, out taxRate); + sciInclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, true, customer, out taxRate); + } + + subTotalExclTaxWithoutDiscount += sciExclTax; subTotalInclTaxWithoutDiscount += sciInclTax; // tax rates @@ -430,8 +430,8 @@ public virtual void GetShoppingCartSubTotal(IList car // checkout attributes if (customer != null) { - var checkoutAttributesXml = customer.GetAttribute(SystemCustomerAttributeNames.CheckoutAttributes, _genericAttributeService); - var caValues = _checkoutAttributeParser.ParseCheckoutAttributeValues(checkoutAttributesXml); + var checkoutAttributesXml = customer.GetAttribute(SystemCustomerAttributeNames.CheckoutAttributes, _genericAttributeService); + var caValues = _checkoutAttributeParser.ParseCheckoutAttributeValues(checkoutAttributesXml); if (caValues != null) { foreach (var caValue in caValues) @@ -460,20 +460,20 @@ public virtual void GetShoppingCartSubTotal(IList car } } - //subtotal without discount - if (includingTax) - { - subTotalWithoutDiscount = subTotalInclTaxWithoutDiscount; - } - else - { - subTotalWithoutDiscount = subTotalExclTaxWithoutDiscount; - } - - if (subTotalWithoutDiscount < decimal.Zero) - { - subTotalWithoutDiscount = decimal.Zero; - } + //subtotal without discount + if (includingTax) + { + subTotalWithoutDiscount = subTotalInclTaxWithoutDiscount; + } + else + { + subTotalWithoutDiscount = subTotalExclTaxWithoutDiscount; + } + + if (subTotalWithoutDiscount < decimal.Zero) + { + subTotalWithoutDiscount = decimal.Zero; + } subTotalWithoutDiscount = subTotalWithoutDiscount.RoundIfEnabledFor(currency); @@ -526,11 +526,11 @@ public virtual void GetShoppingCartSubTotal(IList car discountAmount = discountAmountExclTax; } - //round - if (subTotalWithDiscount < decimal.Zero) - { - subTotalWithDiscount = decimal.Zero; - } + //round + if (subTotalWithDiscount < decimal.Zero) + { + subTotalWithDiscount = decimal.Zero; + } subTotalWithDiscount = subTotalWithDiscount.RoundIfEnabledFor(currency); } @@ -551,16 +551,16 @@ public virtual decimal GetOrderSubtotalDiscount(Customer customer, decimal order var allDiscounts = _discountService.GetAllDiscounts(DiscountType.AssignedToOrderSubTotal); var allowedDiscounts = new List(); - if (allDiscounts != null) - { - foreach (var discount in allDiscounts) - { - if (discount.DiscountType == DiscountType.AssignedToOrderSubTotal && !allowedDiscounts.Any(x => x.Id == discount.Id) && _discountService.IsDiscountValid(discount, customer)) - { - allowedDiscounts.Add(discount); - } - } - } + if (allDiscounts != null) + { + foreach (var discount in allDiscounts) + { + if (discount.DiscountType == DiscountType.AssignedToOrderSubTotal && !allowedDiscounts.Any(x => x.Id == discount.Id) && _discountService.IsDiscountValid(discount, customer)) + { + allowedDiscounts.Add(discount); + } + } + } appliedDiscount = allowedDiscounts.GetPreferredDiscount(orderSubTotal); if (appliedDiscount != null) @@ -572,21 +572,21 @@ public virtual decimal GetOrderSubtotalDiscount(Customer customer, decimal order return discountAmount; } - + /// /// Gets shopping cart additional shipping charge /// /// Cart /// Additional shipping charge - public virtual decimal GetShoppingCartAdditionalShippingCharge(IList cart) + public virtual decimal GetShoppingCartAdditionalShippingCharge(IList cart) { if (IsFreeShipping(cart)) return decimal.Zero; - decimal additionalShippingCharge = decimal.Zero; + decimal additionalShippingCharge = decimal.Zero; - foreach (var sci in cart) - { + foreach (var sci in cart) + { if (_shippingSettings.ChargeOnlyHighestProductShippingSurcharge) { @@ -595,7 +595,7 @@ public virtual decimal GetShoppingCartAdditionalShippingCharge(IList cart) /// Cart /// Applied discount /// Adjusted shipping rate - public virtual decimal AdjustShippingRate(decimal shippingRate, IList cart, - ShippingOption shippingOption, IList shippingMethods, out Discount appliedDiscount) + public virtual decimal AdjustShippingRate(decimal shippingRate, IList cart, + ShippingOption shippingOption, IList shippingMethods, out Discount appliedDiscount) { appliedDiscount = null; - if (IsFreeShipping(cart)) - { - return decimal.Zero; - } - - var adjustedRate = decimal.Zero; - var bundlePerItemShipping = decimal.Zero; - var ignoreAdditionalShippingCharge = false; - - foreach (var sci in cart) - { - if (sci.Item.Product != null && sci.Item.Product.ProductType == ProductType.BundledProduct && sci.Item.Product.BundlePerItemShipping) - { - if (sci.ChildItems != null) - { - foreach (var childItem in sci.ChildItems.Where(x => x.Item.IsShipEnabled && !x.Item.IsFreeShipping)) - { - bundlePerItemShipping += shippingRate; - } - } - } - else if (adjustedRate == decimal.Zero) - { - adjustedRate = shippingRate; - } - } - - adjustedRate += bundlePerItemShipping; - - if (shippingOption != null && shippingMethods != null) - { - var shippingMethod = shippingMethods.FirstOrDefault(x => x.Id == shippingOption.ShippingMethodId); - if (shippingMethod != null) - { - ignoreAdditionalShippingCharge = shippingMethod.IgnoreCharges; - } - } - - // Additional shipping charges. - if (!ignoreAdditionalShippingCharge) - { - decimal additionalShippingCharge = GetShoppingCartAdditionalShippingCharge(cart); - adjustedRate += additionalShippingCharge; - } + if (IsFreeShipping(cart)) + { + return decimal.Zero; + } + + var adjustedRate = decimal.Zero; + var bundlePerItemShipping = decimal.Zero; + var ignoreAdditionalShippingCharge = false; + + foreach (var sci in cart) + { + if (sci.Item.Product != null && sci.Item.Product.ProductType == ProductType.BundledProduct && sci.Item.Product.BundlePerItemShipping) + { + if (sci.ChildItems != null) + { + foreach (var childItem in sci.ChildItems.Where(x => x.Item.IsShipEnabled && !x.Item.IsFreeShipping)) + { + bundlePerItemShipping += shippingRate; + } + } + } + else if (adjustedRate == decimal.Zero) + { + adjustedRate = shippingRate; + } + } + + adjustedRate += bundlePerItemShipping; + + if (shippingOption != null && shippingMethods != null) + { + var shippingMethod = shippingMethods.FirstOrDefault(x => x.Id == shippingOption.ShippingMethodId); + if (shippingMethod != null) + { + ignoreAdditionalShippingCharge = shippingMethod.IgnoreCharges; + } + } + + // Additional shipping charges. + if (!ignoreAdditionalShippingCharge) + { + decimal additionalShippingCharge = GetShoppingCartAdditionalShippingCharge(cart); + adjustedRate += additionalShippingCharge; + } // Discount. var customer = cart.GetCustomer(); var discountAmount = GetShippingDiscount(customer, adjustedRate, out appliedDiscount); adjustedRate = adjustedRate - discountAmount; - if (adjustedRate < decimal.Zero) - { - adjustedRate = decimal.Zero; - } + if (adjustedRate < decimal.Zero) + { + adjustedRate = decimal.Zero; + } adjustedRate = adjustedRate.RoundIfEnabledFor(_workContext.WorkingCurrency); return adjustedRate; @@ -773,9 +773,9 @@ public virtual decimal AdjustShippingRate(decimal shippingRate, IList cart, bool includingTax) { var taxRate = decimal.Zero; - Discount appliedDiscount = null; + Discount appliedDiscount = null; - return GetShoppingCartShippingTotal(cart, includingTax, out taxRate, out appliedDiscount); + return GetShoppingCartShippingTotal(cart, includingTax, out taxRate, out appliedDiscount); } /// @@ -787,93 +787,93 @@ public virtual decimal AdjustShippingRate(decimal shippingRate, IListApplied discount /// Shipping total public virtual decimal? GetShoppingCartShippingTotal( - IList cart, - bool includingTax, + IList cart, + bool includingTax, out decimal taxRate, - out Discount appliedDiscount) + out Discount appliedDiscount) { - appliedDiscount = null; - taxRate = decimal.Zero; + appliedDiscount = null; + taxRate = decimal.Zero; - if (IsFreeShipping(cart)) - return decimal.Zero; + if (IsFreeShipping(cart)) + return decimal.Zero; - decimal? shippingTotalTaxed = null; - var taxCategoryId = 0; - var customer = cart.GetCustomer(); - var currency = _workContext.WorkingCurrency; + decimal? shippingTotalTaxed = null; + var taxCategoryId = 0; + var customer = cart.GetCustomer(); + var currency = _workContext.WorkingCurrency; - var shippingTotal = GetAdjustedShippingTotal(cart, out appliedDiscount); + var shippingTotal = GetAdjustedShippingTotal(cart, out appliedDiscount); - if (!shippingTotal.HasValue) - return null; + if (!shippingTotal.HasValue) + return null; - if (shippingTotal.Value < decimal.Zero) - { - shippingTotal = decimal.Zero; - } + if (shippingTotal.Value < decimal.Zero) + { + shippingTotal = decimal.Zero; + } shippingTotal = shippingTotal.Value.RoundIfEnabledFor(currency); - PrepareAuxiliaryServicesTaxingInfos(cart); - - // commented out cause requires several plugins to be updated and migration of Order.OrderShippingTaxRate and Order.PaymentMethodAdditionalFeeTaxRate - //if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.ProRata) - //{ - // // calculate proRataShipping: get product weightings for cart and multiply them with the shipping amount - // shippingTotalTaxed = decimal.Zero; - - // var tmpTaxRate = decimal.Zero; - // var taxRates = new List(); - - // foreach (var item in cart) - // { - // var proRataShipping = shippingTotal.Value * GetTaxingInfo(item).ProRataWeighting; - // shippingTotalTaxed += _taxService.GetShippingPrice(proRataShipping, includingTax, customer, item.Item.Product.TaxCategoryId, out tmpTaxRate); - - // taxRates.Add(tmpTaxRate); - // } - - // // a tax rate is only defined if all rates are equal. return zero tax rate in all other cases. - // if (taxRates.Any() && taxRates.Distinct().Count() == 1) - // { - // taxRate = taxRates.First(); - // } - //} - //else - //{ - - if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestCartAmount) - { - var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestCartAmount); - taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); - } - else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestTaxRate) - { - var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestTaxRate); - taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); - } - - // fallback to setting - if (taxCategoryId == 0) - { - taxCategoryId = _taxSettings.ShippingTaxClassId; - } - - shippingTotalTaxed = _taxService.GetShippingPrice(shippingTotal.Value, includingTax, customer, taxCategoryId, out taxRate); + PrepareAuxiliaryServicesTaxingInfos(cart); + + // commented out cause requires several plugins to be updated and migration of Order.OrderShippingTaxRate and Order.PaymentMethodAdditionalFeeTaxRate + //if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.ProRata) + //{ + // // calculate proRataShipping: get product weightings for cart and multiply them with the shipping amount + // shippingTotalTaxed = decimal.Zero; + + // var tmpTaxRate = decimal.Zero; + // var taxRates = new List(); + + // foreach (var item in cart) + // { + // var proRataShipping = shippingTotal.Value * GetTaxingInfo(item).ProRataWeighting; + // shippingTotalTaxed += _taxService.GetShippingPrice(proRataShipping, includingTax, customer, item.Item.Product.TaxCategoryId, out tmpTaxRate); + + // taxRates.Add(tmpTaxRate); + // } + + // // a tax rate is only defined if all rates are equal. return zero tax rate in all other cases. + // if (taxRates.Any() && taxRates.Distinct().Count() == 1) + // { + // taxRate = taxRates.First(); + // } + //} + //else + //{ + + if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestCartAmount) + { + var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestCartAmount); + taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); + } + else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestTaxRate) + { + var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestTaxRate); + taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); + } + + // fallback to setting + if (taxCategoryId == 0) + { + taxCategoryId = _taxSettings.ShippingTaxClassId; + } + + shippingTotalTaxed = _taxService.GetShippingPrice(shippingTotal.Value, includingTax, customer, taxCategoryId, out taxRate); shippingTotalTaxed = shippingTotalTaxed.Value.RoundIfEnabledFor(currency); - return shippingTotalTaxed; + return shippingTotalTaxed; } - /// - /// Gets a shipping discount - /// - /// Customer - /// Shipping total - /// Applied discount - /// Shipping discount - public virtual decimal GetShippingDiscount(Customer customer, decimal shippingTotal, out Discount appliedDiscount) + /// + /// Gets a shipping discount + /// + /// Customer + /// Shipping total + /// Applied discount + /// Shipping discount + public virtual decimal GetShippingDiscount(Customer customer, decimal shippingTotal, out Discount appliedDiscount) { appliedDiscount = null; decimal shippingDiscountAmount = decimal.Zero; @@ -883,16 +883,16 @@ public virtual decimal GetShippingDiscount(Customer customer, decimal shippingTo var allDiscounts = _discountService.GetAllDiscounts(DiscountType.AssignedToShipping); var allowedDiscounts = new List(); - if (allDiscounts != null) - { - foreach (var discount in allDiscounts) - { - if (discount.DiscountType == DiscountType.AssignedToShipping && !allowedDiscounts.Any(x => x.Id == discount.Id) && _discountService.IsDiscountValid(discount, customer)) - { - allowedDiscounts.Add(discount); - } - } - } + if (allDiscounts != null) + { + foreach (var discount in allDiscounts) + { + if (discount.DiscountType == DiscountType.AssignedToShipping && !allowedDiscounts.Any(x => x.Id == discount.Id) && _discountService.IsDiscountValid(discount, customer)) + { + allowedDiscounts.Add(discount); + } + } + } appliedDiscount = allowedDiscounts.GetPreferredDiscount(shippingTotal); if (appliedDiscount != null) @@ -900,10 +900,10 @@ public virtual decimal GetShippingDiscount(Customer customer, decimal shippingTo shippingDiscountAmount = appliedDiscount.GetDiscountAmount(shippingTotal); } - if (shippingDiscountAmount < decimal.Zero) - { - shippingDiscountAmount = decimal.Zero; - } + if (shippingDiscountAmount < decimal.Zero) + { + shippingDiscountAmount = decimal.Zero; + } shippingDiscountAmount = shippingDiscountAmount.RoundIfEnabledFor(_workContext.WorkingCurrency); return shippingDiscountAmount; @@ -942,27 +942,27 @@ public virtual decimal GetTaxTotal(IList cart, out So taxRates = new SortedDictionary(); - var subTotalTax = decimal.Zero; - var shippingTax = decimal.Zero; - var paymentFeeTax = decimal.Zero; - var customer = cart.GetCustomer(); - var currency = _workContext.WorkingCurrency; + var subTotalTax = decimal.Zero; + var shippingTax = decimal.Zero; + var paymentFeeTax = decimal.Zero; + var customer = cart.GetCustomer(); + var currency = _workContext.WorkingCurrency; - //// (VATFIX) - if (_taxService.IsVatExempt(null, customer)) - { - taxRates.Add(decimal.Zero, decimal.Zero); - return decimal.Zero; - } - //// (VATFIX) + //// (VATFIX) + if (_taxService.IsVatExempt(null, customer)) + { + taxRates.Add(decimal.Zero, decimal.Zero); + return decimal.Zero; + } + //// (VATFIX) - #region order sub total (items + checkout attributes) + #region order sub total (items + checkout attributes) - var orderSubTotalDiscountAmount = decimal.Zero; + var orderSubTotalDiscountAmount = decimal.Zero; var subTotalWithoutDiscountBase = decimal.Zero; var subTotalWithDiscountBase = decimal.Zero; - Discount appliedDiscount = null; - SortedDictionary orderSubTotalTaxRates = null; + Discount appliedDiscount = null; + SortedDictionary orderSubTotalTaxRates = null; GetShoppingCartSubTotal(cart, false, out orderSubTotalDiscountAmount, out appliedDiscount, @@ -984,114 +984,114 @@ public virtual decimal GetTaxTotal(IList cart, out So } } - #endregion + #endregion - #region shipping tax amount + #region shipping tax amount - if (_taxSettings.ShippingIsTaxable && !IsFreeShipping(cart)) - { - var taxCategoryId = 0; - var shippingTotal = GetAdjustedShippingTotal(cart, out appliedDiscount); + if (_taxSettings.ShippingIsTaxable && !IsFreeShipping(cart)) + { + var taxCategoryId = 0; + var shippingTotal = GetAdjustedShippingTotal(cart, out appliedDiscount); - if (shippingTotal.HasValue) - { - if (shippingTotal.Value < decimal.Zero) - { - shippingTotal = decimal.Zero; - } + if (shippingTotal.HasValue) + { + if (shippingTotal.Value < decimal.Zero) + { + shippingTotal = decimal.Zero; + } shippingTotal = shippingTotal.Value.RoundIfEnabledFor(currency); - PrepareAuxiliaryServicesTaxingInfos(cart); - - // commented out cause requires several plugins to be updated and migration of Order.OrderShippingTaxRate and Order.PaymentMethodAdditionalFeeTaxRate - //if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.ProRata) - //{ - // // calculate proRataShipping: get product weightings for cart and multiply them with the shipping amount - // foreach (var item in cart) - // { - // var proRataShipping = shippingTotal.Value * GetTaxingInfo(item).ProRataWeighting; - // shippingTax += GetShippingTaxAmount(proRataShipping, customer, item.Item.Product.TaxCategoryId, taxRates); - // } - //} - //else - //{ - - if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestCartAmount) - { - var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestCartAmount); - taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); - } - else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestTaxRate) - { - var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestTaxRate); - taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); - } - - // fallback to setting - if (taxCategoryId == 0) - { - taxCategoryId = _taxSettings.ShippingTaxClassId; - } - - shippingTax = GetShippingTaxAmount(shippingTotal.Value, customer, taxCategoryId, taxRates); + PrepareAuxiliaryServicesTaxingInfos(cart); + + // commented out cause requires several plugins to be updated and migration of Order.OrderShippingTaxRate and Order.PaymentMethodAdditionalFeeTaxRate + //if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.ProRata) + //{ + // // calculate proRataShipping: get product weightings for cart and multiply them with the shipping amount + // foreach (var item in cart) + // { + // var proRataShipping = shippingTotal.Value * GetTaxingInfo(item).ProRataWeighting; + // shippingTax += GetShippingTaxAmount(proRataShipping, customer, item.Item.Product.TaxCategoryId, taxRates); + // } + //} + //else + //{ + + if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestCartAmount) + { + var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestCartAmount); + taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); + } + else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestTaxRate) + { + var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestTaxRate); + taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); + } + + // fallback to setting + if (taxCategoryId == 0) + { + taxCategoryId = _taxSettings.ShippingTaxClassId; + } + + shippingTax = GetShippingTaxAmount(shippingTotal.Value, customer, taxCategoryId, taxRates); shippingTax = shippingTax.RoundIfEnabledFor(currency); - } - } + } + } - #endregion + #endregion - #region payment fee tax amount + #region payment fee tax amount - if (usePaymentMethodAdditionalFee && _taxSettings.PaymentMethodAdditionalFeeIsTaxable && customer != null) - { - var paymentMethodSystemName = customer.GetAttribute(SystemCustomerAttributeNames.SelectedPaymentMethod, _genericAttributeService, _storeContext.CurrentStore.Id); - var provider = _providerManager.GetProvider(paymentMethodSystemName); + if (usePaymentMethodAdditionalFee && _taxSettings.PaymentMethodAdditionalFeeIsTaxable && customer != null) + { + var paymentMethodSystemName = customer.GetAttribute(SystemCustomerAttributeNames.SelectedPaymentMethod, _genericAttributeService, _storeContext.CurrentStore.Id); + var provider = _providerManager.GetProvider(paymentMethodSystemName); - if (provider != null) - { - var taxCategoryId = 0; - var paymentFee = provider.Value.GetAdditionalHandlingFee(cart); + if (provider != null) + { + var taxCategoryId = 0; + var paymentFee = provider.Value.GetAdditionalHandlingFee(cart); paymentFee = paymentFee.RoundIfEnabledFor(currency); - PrepareAuxiliaryServicesTaxingInfos(cart); - - // commented out cause requires several plugins to be updated and migration of Order.OrderShippingTaxRate and Order.PaymentMethodAdditionalFeeTaxRate - //if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.ProRata) - //{ - // // calculate proRataShipping: get product weightings for cart and multiply them with the shipping amount - // foreach (var item in cart) - // { - // var proRataPaymentFees = paymentFee * GetTaxingInfo(item).ProRataWeighting; - // paymentFeeTax += GetPaymentFeeTaxAmount(proRataPaymentFees, customer, item.Item.Product.TaxCategoryId, taxRates); - // } - //} - //else - //{ - - if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestCartAmount) - { - var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestCartAmount); - taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); - } - else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestTaxRate) - { - var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestTaxRate); - taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); - } - - // fallback to setting - if (taxCategoryId == 0) - taxCategoryId = _taxSettings.PaymentMethodAdditionalFeeTaxClassId; - - paymentFeeTax = GetPaymentFeeTaxAmount(paymentFee, customer, taxCategoryId, taxRates); - } - } - - #endregion - - // add at least one tax rate (0%) - if (taxRates.Count == 0) + PrepareAuxiliaryServicesTaxingInfos(cart); + + // commented out cause requires several plugins to be updated and migration of Order.OrderShippingTaxRate and Order.PaymentMethodAdditionalFeeTaxRate + //if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.ProRata) + //{ + // // calculate proRataShipping: get product weightings for cart and multiply them with the shipping amount + // foreach (var item in cart) + // { + // var proRataPaymentFees = paymentFee * GetTaxingInfo(item).ProRataWeighting; + // paymentFeeTax += GetPaymentFeeTaxAmount(proRataPaymentFees, customer, item.Item.Product.TaxCategoryId, taxRates); + // } + //} + //else + //{ + + if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestCartAmount) + { + var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestCartAmount); + taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); + } + else if (_taxSettings.AuxiliaryServicesTaxingType == AuxiliaryServicesTaxType.HighestTaxRate) + { + var cartItem = cart.FirstOrDefault(x => GetTaxingInfo(x).HasHighestTaxRate); + taxCategoryId = (cartItem != null ? cartItem.Item.Product.TaxCategoryId : 0); + } + + // fallback to setting + if (taxCategoryId == 0) + taxCategoryId = _taxSettings.PaymentMethodAdditionalFeeTaxClassId; + + paymentFeeTax = GetPaymentFeeTaxAmount(paymentFee, customer, taxCategoryId, taxRates); + } + } + + #endregion + + // add at least one tax rate (0%) + if (taxRates.Count == 0) taxRates.Add(decimal.Zero, decimal.Zero); // summarize taxes @@ -1114,7 +1114,7 @@ public virtual ShoppingCartTotal GetShoppingCartTotal( IList cart, bool ignoreRewardPoints = false, bool usePaymentMethodAdditionalFee = true, - bool ignoreCreditBalance = false) + bool ignoreCreditBalance = false) { var customer = cart.GetCustomer(); var store = _storeContext.CurrentStore; @@ -1247,47 +1247,47 @@ public virtual ShoppingCartTotal GetShoppingCartTotal( } } - #endregion + #endregion - if (resultTemp < decimal.Zero) + if (resultTemp < decimal.Zero) { resultTemp = decimal.Zero; } resultTemp = resultTemp.RoundIfEnabledFor(currency); - var roundingAmount = decimal.Zero; + var roundingAmount = decimal.Zero; var roundingAmountConverted = decimal.Zero; // Return null if we have errors: var orderTotal = shoppingCartShipping.HasValue ? resultTemp : (decimal?)null; var orderTotalConverted = orderTotal; - var appliedCreditBalance = decimal.Zero; + var appliedCreditBalance = decimal.Zero; - if (orderTotal.HasValue) + if (orderTotal.HasValue) { orderTotal = orderTotal.Value - redeemedRewardPointsAmount; - // Credit balance. - if (!ignoreCreditBalance && customer != null && orderTotal > decimal.Zero) - { - var creditBalance = customer.GetAttribute(SystemCustomerAttributeNames.UseCreditBalanceDuringCheckout, _genericAttributeService, store.Id); - if (creditBalance > decimal.Zero) - { - if (creditBalance > orderTotal) - { - // Normalize used amount. - appliedCreditBalance = orderTotal.Value; - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.UseCreditBalanceDuringCheckout, orderTotal.Value, store.Id); - } - else - { - appliedCreditBalance = creditBalance; - } - } - } - - orderTotal = orderTotal.Value - appliedCreditBalance; - orderTotal = orderTotal.Value.RoundIfEnabledFor(currency); + // Credit balance. + if (!ignoreCreditBalance && customer != null && orderTotal > decimal.Zero) + { + var creditBalance = customer.GetAttribute(SystemCustomerAttributeNames.UseCreditBalanceDuringCheckout, _genericAttributeService, store.Id); + if (creditBalance > decimal.Zero) + { + if (creditBalance > orderTotal) + { + // Normalize used amount. + appliedCreditBalance = orderTotal.Value; + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.UseCreditBalanceDuringCheckout, orderTotal.Value, store.Id); + } + else + { + appliedCreditBalance = creditBalance; + } + } + } + + orderTotal = orderTotal.Value - appliedCreditBalance; + orderTotal = orderTotal.Value.RoundIfEnabledFor(currency); orderTotalConverted = _currencyService.ConvertFromPrimaryStoreCurrency(orderTotal.Value, currency, store); @@ -1310,7 +1310,7 @@ public virtual ShoppingCartTotal GetShoppingCartTotal( result.AppliedGiftCards = appliedGiftCards; result.RedeemedRewardPoints = redeemedRewardPoints; result.RedeemedRewardPointsAmount = redeemedRewardPointsAmount; - result.CreditBalance = appliedCreditBalance; + result.CreditBalance = appliedCreditBalance; result.ConvertedFromPrimaryStoreCurrency.TotalAmount = orderTotalConverted; result.ConvertedFromPrimaryStoreCurrency.RoundingAmount = roundingAmountConverted; @@ -1335,16 +1335,16 @@ public virtual decimal GetOrderTotalDiscount(Customer customer, decimal orderTot var allDiscounts = _discountService.GetAllDiscounts(DiscountType.AssignedToOrderTotal); var allowedDiscounts = new List(); - if (allDiscounts != null) - { - foreach (var discount in allDiscounts) - { - if (discount.DiscountType == DiscountType.AssignedToOrderTotal && !allowedDiscounts.Any(x => x.Id == discount.Id) &&_discountService.IsDiscountValid(discount, customer)) - { - allowedDiscounts.Add(discount); - } - } - } + if (allDiscounts != null) + { + foreach (var discount in allDiscounts) + { + if (discount.DiscountType == DiscountType.AssignedToOrderTotal && !allowedDiscounts.Any(x => x.Id == discount.Id) && _discountService.IsDiscountValid(discount, customer)) + { + allowedDiscounts.Add(discount); + } + } + } appliedDiscount = allowedDiscounts.GetPreferredDiscount(orderTotal); if (appliedDiscount != null) @@ -1389,13 +1389,13 @@ public virtual int ConvertAmountToRewardPoints(decimal amount) if (amount <= 0) return 0; - if (_rewardPointsSettings.ExchangeRate > 0) - { - if (_rewardPointsSettings.RoundDownRewardPoints) - result = (int)Math.Floor(amount / _rewardPointsSettings.ExchangeRate); - else - result = (int)Math.Ceiling(amount / _rewardPointsSettings.ExchangeRate); - } + if (_rewardPointsSettings.ExchangeRate > 0) + { + if (_rewardPointsSettings.RoundDownRewardPoints) + result = (int)Math.Floor(amount / _rewardPointsSettings.ExchangeRate); + else + result = (int)Math.Ceiling(amount / _rewardPointsSettings.ExchangeRate); + } return result; } @@ -1404,16 +1404,16 @@ public virtual int ConvertAmountToRewardPoints(decimal amount) } - internal class CartTaxingInfo - { - internal CartTaxingInfo() - { - ProRataWeighting = decimal.Zero; - } + internal class CartTaxingInfo + { + internal CartTaxingInfo() + { + ProRataWeighting = decimal.Zero; + } - public decimal SubTotalWithoutDiscount { get; internal set; } - public bool HasHighestCartAmount { get; internal set; } - public bool HasHighestTaxRate { get; internal set; } - public decimal ProRataWeighting { get; internal set; } - } + public decimal SubTotalWithoutDiscount { get; internal set; } + public bool HasHighestCartAmount { get; internal set; } + public bool HasHighestTaxRate { get; internal set; } + public decimal ProRataWeighting { get; internal set; } + } } diff --git a/src/Libraries/SmartStore.Services/Orders/PlaceOrderResult.cs b/src/Libraries/SmartStore.Services/Orders/PlaceOrderResult.cs index 2ed059da87..780352bef5 100644 --- a/src/Libraries/SmartStore.Services/Orders/PlaceOrderResult.cs +++ b/src/Libraries/SmartStore.Services/Orders/PlaceOrderResult.cs @@ -10,22 +10,19 @@ public partial class PlaceOrderResult { public IList Errors { get; set; } - public PlaceOrderResult() + public PlaceOrderResult() { this.Errors = new List(); } - public bool Success - { - get { return (this.Errors.Count == 0); } - } + public bool Success => (this.Errors.Count == 0); public void AddError(string error) { this.Errors.Add(error); } - + /// /// Gets or sets the placed order /// diff --git a/src/Libraries/SmartStore.Services/Orders/ShoppingCartExtensions.cs b/src/Libraries/SmartStore.Services/Orders/ShoppingCartExtensions.cs index 1f6c7970dd..3e9653b209 100644 --- a/src/Libraries/SmartStore.Services/Orders/ShoppingCartExtensions.cs +++ b/src/Libraries/SmartStore.Services/Orders/ShoppingCartExtensions.cs @@ -61,11 +61,11 @@ public static bool IsRecurring(this IList shoppingCar /// Cycle period /// Total cycles /// Error (if exists); otherwise, empty string - public static string GetRecurringCycleInfo(this IList shoppingCart, - ILocalizationService localizationService, - out int cycleLength, - out RecurringProductCyclePeriod cyclePeriod, - out int totalCycles) + public static string GetRecurringCycleInfo(this IList shoppingCart, + ILocalizationService localizationService, + out int cycleLength, + out RecurringProductCyclePeriod cyclePeriod, + out int totalCycles) { string error = ""; @@ -85,7 +85,7 @@ public static string GetRecurringCycleInfo(this IList throw new SmartException(string.Format("Product (Id={0}) cannot be loaded", sci.Item.ProductId)); } - string conflictError = localizationService.GetResource("ShoppingCart.ConflictingShipmentSchedules"); + string conflictError = localizationService.GetResource("ShoppingCart.ConflictingShipmentSchedules"); if (product.IsRecurring) { // cycle length @@ -123,7 +123,7 @@ public static string GetRecurringCycleInfo(this IList } } - if (_cycleLength.HasValue && _cyclePeriod.HasValue && _totalCycles.HasValue) + if (_cycleLength.HasValue && _cyclePeriod.HasValue && _totalCycles.HasValue) { cycleLength = _cycleLength.Value; cyclePeriod = _cyclePeriod.Value; @@ -146,14 +146,14 @@ public static Customer GetCustomer(this IList shoppin return shoppingCart[0].Item.Customer; } - public static IEnumerable Filter(this IEnumerable shoppingCart, ShoppingCartType type, int? storeId = null) - { - var enumerable = shoppingCart.Where(x => x.ShoppingCartType == type); + public static IEnumerable Filter(this IEnumerable shoppingCart, ShoppingCartType type, int? storeId = null) + { + var enumerable = shoppingCart.Where(x => x.ShoppingCartType == type); - if (storeId.HasValue) - enumerable = enumerable.Where(x => x.StoreId == storeId.Value); + if (storeId.HasValue) + enumerable = enumerable.Where(x => x.StoreId == storeId.Value); - return enumerable; - } + return enumerable; + } } } diff --git a/src/Libraries/SmartStore.Services/Orders/ShoppingCartTotal.cs b/src/Libraries/SmartStore.Services/Orders/ShoppingCartTotal.cs index 65155d6db7..65e170e814 100644 --- a/src/Libraries/SmartStore.Services/Orders/ShoppingCartTotal.cs +++ b/src/Libraries/SmartStore.Services/Orders/ShoppingCartTotal.cs @@ -56,12 +56,12 @@ public static implicit operator ShoppingCartTotal(decimal? obj) /// public decimal RedeemedRewardPointsAmount { get; set; } - /// - /// Credit balance. - /// - public decimal CreditBalance { get; set; } + /// + /// Credit balance. + /// + public decimal CreditBalance { get; set; } - public ConvertedAmounts ConvertedFromPrimaryStoreCurrency { get; set; } + public ConvertedAmounts ConvertedFromPrimaryStoreCurrency { get; set; } public override string ToString() { diff --git a/src/Libraries/SmartStore.Services/Payments/CancelRecurringPaymentResult.cs b/src/Libraries/SmartStore.Services/Payments/CancelRecurringPaymentResult.cs index 02478591cc..b98e608271 100644 --- a/src/Libraries/SmartStore.Services/Payments/CancelRecurringPaymentResult.cs +++ b/src/Libraries/SmartStore.Services/Payments/CancelRecurringPaymentResult.cs @@ -9,17 +9,14 @@ public partial class CancelRecurringPaymentResult { public IList Errors { get; set; } - public CancelRecurringPaymentResult() + public CancelRecurringPaymentResult() { this.Errors = new List(); } - public bool Success - { - get { return (this.Errors.Count == 0); } - } + public bool Success => (this.Errors.Count == 0); - public void AddError(string error) + public void AddError(string error) { this.Errors.Add(error); } diff --git a/src/Libraries/SmartStore.Services/Payments/CapturePaymentHook.cs b/src/Libraries/SmartStore.Services/Payments/CapturePaymentHook.cs index 22ab547627..7cb73dbdd4 100644 --- a/src/Libraries/SmartStore.Services/Payments/CapturePaymentHook.cs +++ b/src/Libraries/SmartStore.Services/Payments/CapturePaymentHook.cs @@ -9,81 +9,81 @@ namespace SmartStore.Services.Payments { - public class CapturePaymentHook : DbSaveHook - { - private readonly Lazy _services; - private readonly Lazy _orderProcessingService; - private readonly HashSet _toCapture = new HashSet(); + public class CapturePaymentHook : DbSaveHook + { + private readonly Lazy _services; + private readonly Lazy _orderProcessingService; + private readonly HashSet _toCapture = new HashSet(); - public CapturePaymentHook( - Lazy services, - Lazy orderProcessingService) - { - _services = services; - _orderProcessingService = orderProcessingService; - } + public CapturePaymentHook( + Lazy services, + Lazy orderProcessingService) + { + _services = services; + _orderProcessingService = orderProcessingService; + } - private bool IsStatusPropertyModifiedTo(IHookedEntity entry, string propertyName, int statusId) - { - var prop = entry.Entry.Property(propertyName); + private bool IsStatusPropertyModifiedTo(IHookedEntity entry, string propertyName, int statusId) + { + var prop = entry.Entry.Property(propertyName); - if (prop != null && prop.CurrentValue != null) - { - if (!prop.CurrentValue.Equals(prop.OriginalValue)) - { - return (int)prop.CurrentValue == statusId; - } - } + if (prop != null && prop.CurrentValue != null) + { + if (!prop.CurrentValue.Equals(prop.OriginalValue)) + { + return (int)prop.CurrentValue == statusId; + } + } - return false; - } + return false; + } - protected override void OnUpdating(Order entity, IHookedEntity entry) - { - var isShipped = IsStatusPropertyModifiedTo(entry, nameof(entity.ShippingStatusId), (int)ShippingStatus.Shipped); - var isDelivered = IsStatusPropertyModifiedTo(entry, nameof(entity.ShippingStatusId), (int)ShippingStatus.Delivered); + protected override void OnUpdating(Order entity, IHookedEntity entry) + { + var isShipped = IsStatusPropertyModifiedTo(entry, nameof(entity.ShippingStatusId), (int)ShippingStatus.Shipped); + var isDelivered = IsStatusPropertyModifiedTo(entry, nameof(entity.ShippingStatusId), (int)ShippingStatus.Delivered); - if (isShipped || isDelivered) - { - var settings = _services.Value.Settings.LoadSetting(entity.StoreId); - if (settings.CapturePaymentReason.HasValue) - { - if (isShipped && settings.CapturePaymentReason.Value == CapturePaymentReason.OrderShipped) - { - _toCapture.Add(entity); - } - else if (isDelivered && settings.CapturePaymentReason.Value == CapturePaymentReason.OrderDelivered) - { - _toCapture.Add(entity); - } - } - } + if (isShipped || isDelivered) + { + var settings = _services.Value.Settings.LoadSetting(entity.StoreId); + if (settings.CapturePaymentReason.HasValue) + { + if (isShipped && settings.CapturePaymentReason.Value == CapturePaymentReason.OrderShipped) + { + _toCapture.Add(entity); + } + else if (isDelivered && settings.CapturePaymentReason.Value == CapturePaymentReason.OrderDelivered) + { + _toCapture.Add(entity); + } + } + } - //if (IsStatusPropertyModifiedTo(entry, nameof(entity.OrderStatusId), (int)OrderStatus.Complete)) - //{ - // That's too late. The payment is already marked as paid and the capture process would never be executed. - //} - } + //if (IsStatusPropertyModifiedTo(entry, nameof(entity.OrderStatusId), (int)OrderStatus.Complete)) + //{ + // That's too late. The payment is already marked as paid and the capture process would never be executed. + //} + } - public override void OnAfterSave(IHookedEntity entry) - { - // Do not remove. - } + public override void OnAfterSave(IHookedEntity entry) + { + // Do not remove. + } - public override void OnAfterSaveCompleted() - { - if (_toCapture.Any()) - { - foreach (var order in _toCapture) - { - if (_orderProcessingService.Value.CanCapture(order)) - { - _orderProcessingService.Value.Capture(order); - } - } + public override void OnAfterSaveCompleted() + { + if (_toCapture.Any()) + { + foreach (var order in _toCapture) + { + if (_orderProcessingService.Value.CanCapture(order)) + { + _orderProcessingService.Value.Capture(order); + } + } - _toCapture.Clear(); - } - } - } + _toCapture.Clear(); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Payments/CapturePaymentResult.cs b/src/Libraries/SmartStore.Services/Payments/CapturePaymentResult.cs index dd7d95be5a..dba210f775 100644 --- a/src/Libraries/SmartStore.Services/Payments/CapturePaymentResult.cs +++ b/src/Libraries/SmartStore.Services/Payments/CapturePaymentResult.cs @@ -11,21 +11,18 @@ public partial class CapturePaymentResult private PaymentStatus _newPaymentStatus = PaymentStatus.Pending; public IList Errors { get; set; } - public CapturePaymentResult() + public CapturePaymentResult() { this.Errors = new List(); } - public bool Success - { - get { return (this.Errors.Count == 0); } - } + public bool Success => (this.Errors.Count == 0); public void AddError(string error) { this.Errors.Add(error); } - + /// /// Gets or sets the capture transaction identifier /// @@ -41,14 +38,8 @@ public void AddError(string error) /// public PaymentStatus NewPaymentStatus { - get - { - return _newPaymentStatus; - } - set - { - _newPaymentStatus = value; - } + get => _newPaymentStatus; + set => _newPaymentStatus = value; } } } diff --git a/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs b/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs index 9dc48a1b85..2b439f7b26 100644 --- a/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs +++ b/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs @@ -13,12 +13,12 @@ public partial interface IPaymentMethod : IProvider, IUserEditable { #region Methods - /// - /// Pre process payment - /// - /// Payment info required for an order processing - /// Pre process payment result - PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest processPaymentRequest); + /// + /// Pre process payment + /// + /// Payment info required for an order processing + /// Pre process payment result + PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest processPaymentRequest); /// /// Process a payment @@ -97,16 +97,16 @@ public partial interface IPaymentMethod : IProvider, IUserEditable #region Properties - /// - /// Gets a value indicating whether the payment method is active and should be offered to customers - /// - bool IsActive { get; } + /// + /// Gets a value indicating whether the payment method is active and should be offered to customers + /// + bool IsActive { get; } - /// - /// Gets a value indicating whether the payment method requires user input - /// before proceeding (e.g. CreditCard, DirectDebit etc.) - /// - bool RequiresInteraction { get; } + /// + /// Gets a value indicating whether the payment method requires user input + /// before proceeding (e.g. CreditCard, DirectDebit etc.) + /// + bool RequiresInteraction { get; } /// /// Gets a value indicating whether capture is supported diff --git a/src/Libraries/SmartStore.Services/Payments/IPaymentMethodFilter.cs b/src/Libraries/SmartStore.Services/Payments/IPaymentMethodFilter.cs index f70985ef08..b04726c2b8 100644 --- a/src/Libraries/SmartStore.Services/Payments/IPaymentMethodFilter.cs +++ b/src/Libraries/SmartStore.Services/Payments/IPaymentMethodFilter.cs @@ -9,36 +9,36 @@ namespace SmartStore.Services.Payments /// Allows to filter out payment methods. /// public partial interface IPaymentMethodFilter - { - /// - /// Gets a value indicating whether a payment method should be filtered out. - /// - /// Payment filter request. - /// true filter out method, false do not filter out method. - bool IsExcluded(PaymentFilterRequest request); - } + { + /// + /// Gets a value indicating whether a payment method should be filtered out. + /// + /// Payment filter request. + /// true filter out method, false do not filter out method. + bool IsExcluded(PaymentFilterRequest request); + } - public partial class PaymentFilterRequest - { - /// - /// The payment method to be checked - /// - public Provider PaymentMethod { get; set; } + public partial class PaymentFilterRequest + { + /// + /// The payment method to be checked + /// + public Provider PaymentMethod { get; set; } - /// - /// The context shopping cart - /// - public IList Cart { get; set; } + /// + /// The context shopping cart + /// + public IList Cart { get; set; } - /// - /// The context store identifier - /// - public int StoreId { get; set; } + /// + /// The context store identifier + /// + public int StoreId { get; set; } - /// - /// The context customer - /// - public Customer Customer { get; set; } - } + /// + /// The context customer + /// + public Customer Customer { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Payments/IPaymentService.cs b/src/Libraries/SmartStore.Services/Payments/IPaymentService.cs index 5cd9fcee05..e699eb5323 100644 --- a/src/Libraries/SmartStore.Services/Payments/IPaymentService.cs +++ b/src/Libraries/SmartStore.Services/Payments/IPaymentService.cs @@ -33,20 +33,20 @@ bool IsPaymentMethodActive( /// Provide a fallback payment method if there is no match. /// Filtered payment methods. IEnumerable> LoadActivePaymentMethods( - Customer customer = null, - IList cart = null, - int storeId = 0, - PaymentMethodType[] types = null, - bool provideFallbackMethod = true); - - /// - /// Load payment provider by system name - /// - /// System name - /// true to load only active provider - /// Load records allowed only in specified store; pass 0 to load all records - /// Found payment provider - Provider LoadPaymentMethodBySystemName(string systemName, bool onlyWhenActive = false, int storeId = 0); + Customer customer = null, + IList cart = null, + int storeId = 0, + PaymentMethodType[] types = null, + bool provideFallbackMethod = true); + + /// + /// Load payment provider by system name + /// + /// System name + /// true to load only active provider + /// Load records allowed only in specified store; pass 0 to load all records + /// Found payment provider + Provider LoadPaymentMethodBySystemName(string systemName, bool onlyWhenActive = false, int storeId = 0); /// /// Load all payment providers @@ -62,38 +62,38 @@ IEnumerable> LoadActivePaymentMethods( /// Dictionary of payment methods. Key is the payment method system name. IDictionary GetAllPaymentMethods(int storeId = 0); - /// - /// Gets payment method extra data by system name - /// - /// Provider system name - /// Payment method entity - PaymentMethod GetPaymentMethodBySystemName(string systemName); + /// + /// Gets payment method extra data by system name + /// + /// Provider system name + /// Payment method entity + PaymentMethod GetPaymentMethodBySystemName(string systemName); - /// - /// Insert payment method extra data - /// - /// Payment method - void InsertPaymentMethod(PaymentMethod paymentMethod); + /// + /// Insert payment method extra data + /// + /// Payment method + void InsertPaymentMethod(PaymentMethod paymentMethod); - /// - /// Updates payment method extra data - /// - /// Payment method - void UpdatePaymentMethod(PaymentMethod paymentMethod); + /// + /// Updates payment method extra data + /// + /// Payment method + void UpdatePaymentMethod(PaymentMethod paymentMethod); - /// - /// Delete payment method extra data - /// - /// Payment method - void DeletePaymentMethod(PaymentMethod paymentMethod); + /// + /// Delete payment method extra data + /// + /// Payment method + void DeletePaymentMethod(PaymentMethod paymentMethod); - /// - /// Pre process a payment - /// - /// Payment info required for an order processing - /// Pre process payment result - PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest processPaymentRequest); + /// + /// Pre process a payment + /// + /// Payment info required for an order processing + /// Pre process payment result + PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest processPaymentRequest); /// /// Process a payment @@ -218,10 +218,10 @@ IEnumerable> LoadActivePaymentMethods( /// Masked credit card number string GetMaskedCreditCardNumber(string creditCardNumber); - /// - /// Gets all payment filters - /// - /// List of payment filters - IList GetAllPaymentMethodFilters(); + /// + /// Gets all payment filters + /// + /// List of payment filters + IList GetAllPaymentMethodFilters(); } } diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs b/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs index 85504dad98..f157ef74d9 100644 --- a/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs +++ b/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs @@ -9,7 +9,7 @@ namespace SmartStore.Services.Payments { - public static class PaymentExtentions + public static class PaymentExtentions { /// /// Is payment method active? @@ -28,10 +28,10 @@ public static bool IsPaymentMethodActive(this Provider paymentMe if (paymentSettings.ActivePaymentMethodSystemNames == null) return false; - if (!paymentMethod.Value.IsActive) - return false; + if (!paymentMethod.Value.IsActive) + return false; - return paymentSettings.ActivePaymentMethodSystemNames.Contains(paymentMethod.Metadata.SystemName, StringComparer.OrdinalIgnoreCase); + return paymentSettings.ActivePaymentMethodSystemNames.Contains(paymentMethod.Metadata.SystemName, StringComparer.OrdinalIgnoreCase); } /// @@ -44,10 +44,10 @@ public static bool IsPaymentMethodActive(this Provider paymentMe /// Is fee amount specified as percentage or fixed value? /// Result public static decimal CalculateAdditionalFee(this IPaymentMethod paymentMethod, - IOrderTotalCalculationService orderTotalCalculationService, - IList cart, - decimal fee, - bool usePercentage) + IOrderTotalCalculationService orderTotalCalculationService, + IList cart, + decimal fee, + bool usePercentage) { if (paymentMethod == null) throw new ArgumentNullException("paymentMethod"); @@ -70,43 +70,43 @@ public static decimal CalculateAdditionalFee(this IPaymentMethod paymentMethod, return result; } - public static RouteInfo GetConfigurationRoute(this IPaymentMethod method) - { - Guard.NotNull(method, nameof(method)); - - string action; - string controller; - RouteValueDictionary routeValues; - - var configurable = method as IConfigurable; - - if (configurable != null) - { - configurable.GetConfigurationRoute(out action, out controller, out routeValues); - if (action.HasValue()) - { - return new RouteInfo(action, controller, routeValues); - } - } - - return null; - } - - public static RouteInfo GetPaymentInfoRoute(this IPaymentMethod method) - { - Guard.NotNull(method, nameof(method)); - - string action; - string controller; - RouteValueDictionary routeValues; - - method.GetPaymentInfoRoute(out action, out controller, out routeValues); - if (action.HasValue()) - { - return new RouteInfo(action, controller, routeValues); - } - - return null; - } + public static RouteInfo GetConfigurationRoute(this IPaymentMethod method) + { + Guard.NotNull(method, nameof(method)); + + string action; + string controller; + RouteValueDictionary routeValues; + + var configurable = method as IConfigurable; + + if (configurable != null) + { + configurable.GetConfigurationRoute(out action, out controller, out routeValues); + if (action.HasValue()) + { + return new RouteInfo(action, controller, routeValues); + } + } + + return null; + } + + public static RouteInfo GetPaymentInfoRoute(this IPaymentMethod method) + { + Guard.NotNull(method, nameof(method)); + + string action; + string controller; + RouteValueDictionary routeValues; + + method.GetPaymentInfoRoute(out action, out controller, out routeValues); + if (action.HasValue()) + { + return new RouteInfo(action, controller, routeValues); + } + + return null; + } } } diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs b/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs index 3510b71b2a..bfa3fd2948 100644 --- a/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs +++ b/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs @@ -9,254 +9,206 @@ namespace SmartStore.Services.Payments { - /// - /// Base class for payment methods - /// - public abstract class PaymentMethodBase : IPaymentMethod - { - - protected PaymentMethodBase() - { - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - - #region Methods - - /// - /// Pre process payment - /// - /// Payment info required for an order processing - /// Pre process payment result - public virtual PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest processPaymentRequest) - { - var result = new PreProcessPaymentResult(); - return result; - } - - /// - /// Process payment - /// - /// Payment info required for an order processing - /// Process payment result - public abstract ProcessPaymentResult ProcessPayment(ProcessPaymentRequest processPaymentRequest); - - /// - /// Post process payment (used by payment gateways that require redirecting to a third-party URL) - /// - /// Payment info required for an order processing - public virtual void PostProcessPayment(PostProcessPaymentRequest postProcessPaymentRequest) - { - // NoImpl - } - - /// - /// Gets additional handling fee - /// - /// Additional handling fee - public virtual decimal GetAdditionalHandlingFee(IList cart) - { - return 0; - } - - /// - /// Captures payment - /// - /// Capture payment request - /// Capture payment result - public virtual CapturePaymentResult Capture(CapturePaymentRequest capturePaymentRequest) - { - var result = new CapturePaymentResult(); - result.AddError(T("Common.Payment.NoCaptureSupport")); - return result; - } - - /// - /// Refunds a payment - /// - /// Request - /// Result - public virtual RefundPaymentResult Refund(RefundPaymentRequest refundPaymentRequest) - { - var result = new RefundPaymentResult(); - result.AddError(T("Common.Payment.NoRefundSupport")); - return result; - } - - /// - /// Voids a payment - /// - /// Request - /// Result - public virtual VoidPaymentResult Void(VoidPaymentRequest voidPaymentRequest) - { - var result = new VoidPaymentResult(); - result.AddError(T("Common.Payment.NoVoidSupport")); - return result; - } - - /// - /// Process recurring payment - /// - /// Payment info required for an order processing - /// Process payment result - public virtual ProcessPaymentResult ProcessRecurringPayment(ProcessPaymentRequest processPaymentRequest) - { - var result = new ProcessPaymentResult(); - result.AddError(T("Common.Payment.NoRecurringPaymentSupport")); - return result; - } - - /// - /// Cancels a recurring payment - /// - /// Request - /// Result - public virtual CancelRecurringPaymentResult CancelRecurringPayment(CancelRecurringPaymentRequest cancelPaymentRequest) - { - var result = new CancelRecurringPaymentResult(); - result.AddError(T("Common.Payment.NoRecurringPaymentSupport")); - return result; - } - - /// - /// Gets a value indicating whether customers can complete a payment after order is placed but not completed (for redirection payment methods) - /// - /// Order - /// Result - public virtual bool CanRePostProcessPayment(Order order) - { - return false; - } - - /// - /// Gets a route for provider configuration - /// - /// Action name - /// Controller name - /// Route values - public abstract void GetConfigurationRoute(out string actionName, out string controllerName, out RouteValueDictionary routeValues); - - /// - /// Gets a route for payment info - /// - /// Action name - /// Controller name - /// Route values - public abstract void GetPaymentInfoRoute(out string actionName, out string controllerName, out RouteValueDictionary routeValues); - - /// - /// Gets a route for the payment info handler controller action - /// - /// Order - /// Result - /// - /// The defined route is being redirected to during the checkout process > PaymentInfo page. - /// Implementors should return null if no redirection occurs. - /// - public virtual RouteInfo GetPaymentInfoHandlerRoute() - { - return null; - } - - public abstract Type GetControllerType(); - - #endregion - - #region Properties - - /// - /// Gets a value indicating whether the payment method is active and should be offered to customers - /// - public virtual bool IsActive - { - get - { - return true; - } - } - - /// - /// Gets a value indicating whether the payment method requires user input - /// before proceeding (e.g. CreditCard, DirectDebit etc.) - /// - public virtual bool RequiresInteraction - { - get - { - return false; - } - } - - /// - /// Gets a value indicating whether capture is supported - /// - public virtual bool SupportCapture - { - get - { - return false; - } - } - - /// - /// Gets a value indicating whether partial refund is supported - /// - public virtual bool SupportPartiallyRefund - { - get - { - return false; - } - } - - /// - /// Gets a value indicating whether refund is supported - /// - public virtual bool SupportRefund - { - get - { - return false; - } - } - - /// - /// Gets a value indicating whether void is supported - /// - public virtual bool SupportVoid - { - get - { - return false; - } - } - - /// - /// Gets a recurring payment type of payment method - /// - public virtual RecurringPaymentType RecurringPaymentType - { - get - { - return RecurringPaymentType.NotSupported; - } - } - - /// - /// Gets a payment method type - /// - public virtual PaymentMethodType PaymentMethodType - { - get - { - return PaymentMethodType.Unknown; - } - } - - #endregion - - } + /// + /// Base class for payment methods + /// + public abstract class PaymentMethodBase : IPaymentMethod + { + + protected PaymentMethodBase() + { + T = NullLocalizer.Instance; + } + + public Localizer T { get; set; } + + #region Methods + + /// + /// Pre process payment + /// + /// Payment info required for an order processing + /// Pre process payment result + public virtual PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest processPaymentRequest) + { + var result = new PreProcessPaymentResult(); + return result; + } + + /// + /// Process payment + /// + /// Payment info required for an order processing + /// Process payment result + public abstract ProcessPaymentResult ProcessPayment(ProcessPaymentRequest processPaymentRequest); + + /// + /// Post process payment (used by payment gateways that require redirecting to a third-party URL) + /// + /// Payment info required for an order processing + public virtual void PostProcessPayment(PostProcessPaymentRequest postProcessPaymentRequest) + { + // NoImpl + } + + /// + /// Gets additional handling fee + /// + /// Additional handling fee + public virtual decimal GetAdditionalHandlingFee(IList cart) + { + return 0; + } + + /// + /// Captures payment + /// + /// Capture payment request + /// Capture payment result + public virtual CapturePaymentResult Capture(CapturePaymentRequest capturePaymentRequest) + { + var result = new CapturePaymentResult(); + result.AddError(T("Common.Payment.NoCaptureSupport")); + return result; + } + + /// + /// Refunds a payment + /// + /// Request + /// Result + public virtual RefundPaymentResult Refund(RefundPaymentRequest refundPaymentRequest) + { + var result = new RefundPaymentResult(); + result.AddError(T("Common.Payment.NoRefundSupport")); + return result; + } + + /// + /// Voids a payment + /// + /// Request + /// Result + public virtual VoidPaymentResult Void(VoidPaymentRequest voidPaymentRequest) + { + var result = new VoidPaymentResult(); + result.AddError(T("Common.Payment.NoVoidSupport")); + return result; + } + + /// + /// Process recurring payment + /// + /// Payment info required for an order processing + /// Process payment result + public virtual ProcessPaymentResult ProcessRecurringPayment(ProcessPaymentRequest processPaymentRequest) + { + var result = new ProcessPaymentResult(); + result.AddError(T("Common.Payment.NoRecurringPaymentSupport")); + return result; + } + + /// + /// Cancels a recurring payment + /// + /// Request + /// Result + public virtual CancelRecurringPaymentResult CancelRecurringPayment(CancelRecurringPaymentRequest cancelPaymentRequest) + { + var result = new CancelRecurringPaymentResult(); + result.AddError(T("Common.Payment.NoRecurringPaymentSupport")); + return result; + } + + /// + /// Gets a value indicating whether customers can complete a payment after order is placed but not completed (for redirection payment methods) + /// + /// Order + /// Result + public virtual bool CanRePostProcessPayment(Order order) + { + return false; + } + + /// + /// Gets a route for provider configuration + /// + /// Action name + /// Controller name + /// Route values + public abstract void GetConfigurationRoute(out string actionName, out string controllerName, out RouteValueDictionary routeValues); + + /// + /// Gets a route for payment info + /// + /// Action name + /// Controller name + /// Route values + public abstract void GetPaymentInfoRoute(out string actionName, out string controllerName, out RouteValueDictionary routeValues); + + /// + /// Gets a route for the payment info handler controller action + /// + /// Order + /// Result + /// + /// The defined route is being redirected to during the checkout process > PaymentInfo page. + /// Implementors should return null if no redirection occurs. + /// + public virtual RouteInfo GetPaymentInfoHandlerRoute() + { + return null; + } + + public abstract Type GetControllerType(); + + #endregion + + #region Properties + + /// + /// Gets a value indicating whether the payment method is active and should be offered to customers + /// + public virtual bool IsActive => true; + + /// + /// Gets a value indicating whether the payment method requires user input + /// before proceeding (e.g. CreditCard, DirectDebit etc.) + /// + public virtual bool RequiresInteraction => false; + + /// + /// Gets a value indicating whether capture is supported + /// + public virtual bool SupportCapture => false; + + /// + /// Gets a value indicating whether partial refund is supported + /// + public virtual bool SupportPartiallyRefund => false; + + /// + /// Gets a value indicating whether refund is supported + /// + public virtual bool SupportRefund => false; + + /// + /// Gets a value indicating whether void is supported + /// + public virtual bool SupportVoid => false; + + /// + /// Gets a recurring payment type of payment method + /// + public virtual RecurringPaymentType RecurringPaymentType => RecurringPaymentType.NotSupported; + + /// + /// Gets a payment method type + /// + public virtual PaymentMethodType PaymentMethodType => PaymentMethodType.Unknown; + + #endregion + + } } diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentMethodType.cs b/src/Libraries/SmartStore.Services/Payments/PaymentMethodType.cs index cfa24c23b7..5caf5afd51 100644 --- a/src/Libraries/SmartStore.Services/Payments/PaymentMethodType.cs +++ b/src/Libraries/SmartStore.Services/Payments/PaymentMethodType.cs @@ -25,9 +25,9 @@ public enum PaymentMethodType : int /// All payment information is entered on the site and is available via button /// StandardAndButton = 25, - /// - /// Payment information is entered in checkout and customer is redirected to complete payment (e.g. 3D Secure) after order has been placed - /// - StandardAndRedirection = 30 + /// + /// Payment information is entered in checkout and customer is redirected to complete payment (e.g. 3D Secure) after order has been placed + /// + StandardAndRedirection = 30 } } diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentPluginBase.cs b/src/Libraries/SmartStore.Services/Payments/PaymentPluginBase.cs index 3ab7d5b6e3..81ee03d9ef 100644 --- a/src/Libraries/SmartStore.Services/Payments/PaymentPluginBase.cs +++ b/src/Libraries/SmartStore.Services/Payments/PaymentPluginBase.cs @@ -2,27 +2,27 @@ namespace SmartStore.Services.Payments { - public abstract class PaymentPluginBase : PaymentMethodBase, IPlugin - { - /// - /// Gets or sets the plugin descriptor - /// - public virtual PluginDescriptor PluginDescriptor { get; set; } + public abstract class PaymentPluginBase : PaymentMethodBase, IPlugin + { + /// + /// Gets or sets the plugin descriptor + /// + public virtual PluginDescriptor PluginDescriptor { get; set; } - /// - /// Install plugin - /// - public virtual void Install() - { - PluginManager.MarkPluginAsInstalled(this.PluginDescriptor.SystemName); - } + /// + /// Install plugin + /// + public virtual void Install() + { + PluginManager.MarkPluginAsInstalled(this.PluginDescriptor.SystemName); + } - /// - /// Uninstall plugin - /// - public virtual void Uninstall() - { - PluginManager.MarkPluginAsUninstalled(this.PluginDescriptor.SystemName); - } - } + /// + /// Uninstall plugin + /// + public virtual void Uninstall() + { + PluginManager.MarkPluginAsUninstalled(this.PluginDescriptor.SystemName); + } + } } diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentService.cs b/src/Libraries/SmartStore.Services/Payments/PaymentService.cs index 165c770db5..e3c6c7b61a 100644 --- a/src/Libraries/SmartStore.Services/Payments/PaymentService.cs +++ b/src/Libraries/SmartStore.Services/Payments/PaymentService.cs @@ -21,48 +21,48 @@ public partial class PaymentService : IPaymentService private const string PAYMENT_METHODS_PATTERN_KEY = "SmartStore.paymentmethod.*"; private readonly static object _lock = new object(); - private static IList _paymentMethodFilterTypes = null; + private static IList _paymentMethodFilterTypes = null; - private readonly IRepository _paymentMethodRepository; - private readonly IRepository _storeMappingRepository; - private readonly IStoreMappingService _storeMappingService; - private readonly PaymentSettings _paymentSettings; + private readonly IRepository _paymentMethodRepository; + private readonly IRepository _storeMappingRepository; + private readonly IStoreMappingService _storeMappingService; + private readonly PaymentSettings _paymentSettings; private readonly ICartRuleProvider _cartRuleProvider; private readonly IProviderManager _providerManager; - private readonly ICommonServices _services; - private readonly ITypeFinder _typeFinder; - - public PaymentService( - IRepository paymentMethodRepository, - IRepository storeMappingRepository, - IStoreMappingService storeMappingService, - PaymentSettings paymentSettings, + private readonly ICommonServices _services; + private readonly ITypeFinder _typeFinder; + + public PaymentService( + IRepository paymentMethodRepository, + IRepository storeMappingRepository, + IStoreMappingService storeMappingService, + PaymentSettings paymentSettings, ICartRuleProvider cartRuleProvider, IProviderManager providerManager, - ICommonServices services, - ITypeFinder typeFinder) + ICommonServices services, + ITypeFinder typeFinder) { - _paymentMethodRepository = paymentMethodRepository; - _storeMappingRepository = storeMappingRepository; - _storeMappingService = storeMappingService; - _paymentSettings = paymentSettings; + _paymentMethodRepository = paymentMethodRepository; + _storeMappingRepository = storeMappingRepository; + _storeMappingService = storeMappingService; + _paymentSettings = paymentSettings; _cartRuleProvider = cartRuleProvider; - _providerManager = providerManager; - _services = services; - _typeFinder = typeFinder; - } + _providerManager = providerManager; + _services = services; + _typeFinder = typeFinder; + } - public Localizer T { get; set; } = NullLocalizer.Instance; + public Localizer T { get; set; } = NullLocalizer.Instance; public ILogger Logger { get; set; } = NullLogger.Instance; public DbQuerySettings QuerySettings { get; set; } = DbQuerySettings.Default; #region Methods public virtual bool IsPaymentMethodActive(string systemName, int storeId = 0) - { - var method = LoadPaymentMethodBySystemName(systemName, true, storeId); - return method != null; - } + { + var method = LoadPaymentMethodBySystemName(systemName, true, storeId); + return method != null; + } public virtual bool IsPaymentMethodActive( string systemName, @@ -79,18 +79,18 @@ public virtual bool IsPaymentMethodActive( } public virtual IEnumerable> LoadActivePaymentMethods( - Customer customer = null, - IList cart = null, - int storeId = 0, - PaymentMethodType[] types = null, - bool provideFallbackMethod = true) + Customer customer = null, + IList cart = null, + int storeId = 0, + PaymentMethodType[] types = null, + bool provideFallbackMethod = true) { - var filterRequest = new PaymentFilterRequest - { - Cart = cart, - StoreId = storeId, - Customer = customer - }; + var filterRequest = new PaymentFilterRequest + { + Cart = cart, + StoreId = storeId, + Customer = customer + }; var allFilters = GetAllPaymentMethodFilters(); var allProviders = types != null && types.Any() @@ -100,8 +100,8 @@ public virtual IEnumerable> LoadActivePaymentMethods( var paymentMethods = GetAllPaymentMethods(storeId); var activeProviders = allProviders - .Where(p => - { + .Where(p => + { try { // Only active payment methods. @@ -129,24 +129,24 @@ public virtual IEnumerable> LoadActivePaymentMethods( } catch (Exception ex) { - Logger.Error(ex); + Logger.Error(ex); } - return true; - }); + return true; + }); - if (!activeProviders.Any() && provideFallbackMethod) - { - var fallbackMethod = allProviders.FirstOrDefault(x => x.IsPaymentMethodActive(_paymentSettings)); + if (!activeProviders.Any() && provideFallbackMethod) + { + var fallbackMethod = allProviders.FirstOrDefault(x => x.IsPaymentMethodActive(_paymentSettings)); if (fallbackMethod == null) { fallbackMethod = allProviders.FirstOrDefault(); } - if (fallbackMethod != null) - { - return new Provider[] { fallbackMethod }; - } + if (fallbackMethod != null) + { + return new Provider[] { fallbackMethod }; + } if (DataSettings.DatabaseIsInstalled()) { @@ -157,36 +157,36 @@ public virtual IEnumerable> LoadActivePaymentMethods( return activeProviders; } - public virtual Provider LoadPaymentMethodBySystemName(string systemName, bool onlyWhenActive = false, int storeId = 0) + public virtual Provider LoadPaymentMethodBySystemName(string systemName, bool onlyWhenActive = false, int storeId = 0) { - var provider = _providerManager.GetProvider(systemName, storeId); - if (provider != null) - { - if (onlyWhenActive && !provider.IsPaymentMethodActive(_paymentSettings)) - { - return null; - } - - if (!QuerySettings.IgnoreMultiStore && storeId > 0) - { - // Return provider if paymentMethod is null! - var paymentMethod = _paymentMethodRepository.TableUntracked.FirstOrDefault(x => x.PaymentMethodSystemName == systemName); - if (paymentMethod != null && !_storeMappingService.Authorize(paymentMethod, storeId)) - { - return null; - } - } - } - - return provider; + var provider = _providerManager.GetProvider(systemName, storeId); + if (provider != null) + { + if (onlyWhenActive && !provider.IsPaymentMethodActive(_paymentSettings)) + { + return null; + } + + if (!QuerySettings.IgnoreMultiStore && storeId > 0) + { + // Return provider if paymentMethod is null! + var paymentMethod = _paymentMethodRepository.TableUntracked.FirstOrDefault(x => x.PaymentMethodSystemName == systemName); + if (paymentMethod != null && !_storeMappingService.Authorize(paymentMethod, storeId)) + { + return null; + } + } + } + + return provider; } - public virtual IEnumerable> LoadAllPaymentMethods(int storeId = 0) + public virtual IEnumerable> LoadAllPaymentMethods(int storeId = 0) { - var providers = _providerManager.GetAllProviders(storeId); + var providers = _providerManager.GetAllProviders(storeId); - if (providers.Any() && !QuerySettings.IgnoreMultiStore && storeId > 0) - { + if (providers.Any() && !QuerySettings.IgnoreMultiStore && storeId > 0) + { var paymentMethods = GetAllPaymentMethods(storeId); var unauthorizedMethodNames = paymentMethods.Values @@ -194,10 +194,10 @@ public virtual IEnumerable> LoadAllPaymentMethods(int s .Select(x => x.PaymentMethodSystemName) .ToList(); - return providers.Where(x => !unauthorizedMethodNames.Contains(x.Metadata.SystemName)); - } + return providers.Where(x => !unauthorizedMethodNames.Contains(x.Metadata.SystemName)); + } - return providers; + return providers; } public virtual IDictionary GetAllPaymentMethods(int storeId = 0) @@ -233,53 +233,53 @@ orderby mGroup.Key return result; } - /// - /// Gets payment method extra data by system name - /// - /// Provider system name - /// Payment method entity - public virtual PaymentMethod GetPaymentMethodBySystemName(string systemName) - { - if (systemName.HasValue()) - { - return _paymentMethodRepository.Table.FirstOrDefault(x => x.PaymentMethodSystemName == systemName); - } - - return null; - } - - /// - /// Insert payment method extra data - /// - /// Payment method - public virtual void InsertPaymentMethod(PaymentMethod paymentMethod) - { + /// + /// Gets payment method extra data by system name + /// + /// Provider system name + /// Payment method entity + public virtual PaymentMethod GetPaymentMethodBySystemName(string systemName) + { + if (systemName.HasValue()) + { + return _paymentMethodRepository.Table.FirstOrDefault(x => x.PaymentMethodSystemName == systemName); + } + + return null; + } + + /// + /// Insert payment method extra data + /// + /// Payment method + public virtual void InsertPaymentMethod(PaymentMethod paymentMethod) + { Guard.NotNull(paymentMethod, nameof(paymentMethod)); - _paymentMethodRepository.Insert(paymentMethod); + _paymentMethodRepository.Insert(paymentMethod); _services.RequestCache.RemoveByPattern(PAYMENT_METHODS_PATTERN_KEY); } - /// - /// Updates payment method extra data - /// - /// Payment method - public virtual void UpdatePaymentMethod(PaymentMethod paymentMethod) - { + /// + /// Updates payment method extra data + /// + /// Payment method + public virtual void UpdatePaymentMethod(PaymentMethod paymentMethod) + { Guard.NotNull(paymentMethod, nameof(paymentMethod)); - _paymentMethodRepository.Update(paymentMethod); + _paymentMethodRepository.Update(paymentMethod); _services.RequestCache.RemoveByPattern(PAYMENT_METHODS_PATTERN_KEY); } - /// - /// Delete payment method extra data - /// - /// Payment method - public virtual void DeletePaymentMethod(PaymentMethod paymentMethod) - { + /// + /// Delete payment method extra data + /// + /// Payment method + public virtual void DeletePaymentMethod(PaymentMethod paymentMethod) + { if (paymentMethod != null) { _paymentMethodRepository.Delete(paymentMethod); @@ -289,27 +289,27 @@ public virtual void DeletePaymentMethod(PaymentMethod paymentMethod) } - /// - /// Pre process a payment - /// - /// Payment info required for an order processing - /// Pre process payment result - public virtual PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest processPaymentRequest) - { - if (processPaymentRequest.OrderTotal == decimal.Zero) - { - var result = new PreProcessPaymentResult(); - return result; - } - else - { - var paymentMethod = LoadPaymentMethodBySystemName(processPaymentRequest.PaymentMethodSystemName); - if (paymentMethod == null) - throw new SmartException(T("Payment.CouldNotLoadMethod")); - - return paymentMethod.Value.PreProcessPayment(processPaymentRequest); - } - } + /// + /// Pre process a payment + /// + /// Payment info required for an order processing + /// Pre process payment result + public virtual PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest processPaymentRequest) + { + if (processPaymentRequest.OrderTotal == decimal.Zero) + { + var result = new PreProcessPaymentResult(); + return result; + } + else + { + var paymentMethod = LoadPaymentMethodBySystemName(processPaymentRequest.PaymentMethodSystemName); + if (paymentMethod == null) + throw new SmartException(T("Payment.CouldNotLoadMethod")); + + return paymentMethod.Value.PreProcessPayment(processPaymentRequest); + } + } /// /// Process a payment @@ -335,9 +335,9 @@ public virtual ProcessPaymentResult ProcessPayment(ProcessPaymentRequest process processPaymentRequest.CreditCardNumber = processPaymentRequest.CreditCardNumber.Replace("-", ""); } - var paymentMethod = LoadPaymentMethodBySystemName(processPaymentRequest.PaymentMethodSystemName); + var paymentMethod = LoadPaymentMethodBySystemName(processPaymentRequest.PaymentMethodSystemName); - if (paymentMethod == null) + if (paymentMethod == null) throw new SmartException(T("Payment.CouldNotLoadMethod")); return paymentMethod.Value.ProcessPayment(processPaymentRequest); @@ -351,14 +351,14 @@ public virtual ProcessPaymentResult ProcessPayment(ProcessPaymentRequest process /// Payment info required for an order processing public virtual void PostProcessPayment(PostProcessPaymentRequest postProcessPaymentRequest) { - if (postProcessPaymentRequest.Order.PaymentMethodSystemName.HasValue()) - { - var paymentMethod = LoadPaymentMethodBySystemName(postProcessPaymentRequest.Order.PaymentMethodSystemName); - if (paymentMethod == null) - throw new SmartException(T("Payment.CouldNotLoadMethod")); - - paymentMethod.Value.PostProcessPayment(postProcessPaymentRequest); - } + if (postProcessPaymentRequest.Order.PaymentMethodSystemName.HasValue()) + { + var paymentMethod = LoadPaymentMethodBySystemName(postProcessPaymentRequest.Order.PaymentMethodSystemName); + if (paymentMethod == null) + throw new SmartException(T("Payment.CouldNotLoadMethod")); + + paymentMethod.Value.PostProcessPayment(postProcessPaymentRequest); + } } /// @@ -378,7 +378,7 @@ public virtual bool CanRePostProcessPayment(Order order) if (paymentMethod == null) return false; //Payment method couldn't be loaded (for example, was uninstalled) - if (paymentMethod.Value.PaymentMethodType != PaymentMethodType.Redirection && paymentMethod.Value.PaymentMethodType != PaymentMethodType.StandardAndRedirection) + if (paymentMethod.Value.PaymentMethodType != PaymentMethodType.Redirection && paymentMethod.Value.PaymentMethodType != PaymentMethodType.StandardAndRedirection) return false; //this option is available only for redirection payment methods if (order.Deleted) @@ -390,7 +390,7 @@ public virtual bool CanRePostProcessPayment(Order order) if (order.PaymentStatus != PaymentStatus.Pending) return false; //payment status should be Pending - return paymentMethod.Value.CanRePostProcessPayment(order); + return paymentMethod.Value.CanRePostProcessPayment(order); } @@ -404,11 +404,11 @@ public virtual bool CanRePostProcessPayment(Order order) public virtual decimal GetAdditionalHandlingFee(IList cart, string paymentMethodSystemName) { var paymentMethod = LoadPaymentMethodBySystemName(paymentMethodSystemName); - var paymentMethodAdditionalFee = (paymentMethod != null ? paymentMethod.Value.GetAdditionalHandlingFee(cart) : decimal.Zero); + var paymentMethodAdditionalFee = (paymentMethod != null ? paymentMethod.Value.GetAdditionalHandlingFee(cart) : decimal.Zero); paymentMethodAdditionalFee = paymentMethodAdditionalFee.RoundIfEnabledFor(_services.WorkContext.WorkingCurrency); - return paymentMethodAdditionalFee; + return paymentMethodAdditionalFee; } @@ -423,7 +423,7 @@ public virtual bool SupportCapture(string paymentMethodSystemName) var paymentMethod = LoadPaymentMethodBySystemName(paymentMethodSystemName); if (paymentMethod == null) return false; - return paymentMethod.Value.SupportCapture; + return paymentMethod.Value.SupportCapture; } /// @@ -437,20 +437,20 @@ public virtual CapturePaymentResult Capture(CapturePaymentRequest capturePayment if (paymentMethod == null) throw new SmartException(T("Payment.CouldNotLoadMethod")); - try - { - return paymentMethod.Value.Capture(capturePaymentRequest); - } - catch (NotSupportedException) - { - var result = new CapturePaymentResult(); - result.AddError(T("Common.Payment.NoCaptureSupport")); - return result; - } - catch - { - throw; - } + try + { + return paymentMethod.Value.Capture(capturePaymentRequest); + } + catch (NotSupportedException) + { + var result = new CapturePaymentResult(); + result.AddError(T("Common.Payment.NoCaptureSupport")); + return result; + } + catch + { + throw; + } } @@ -465,7 +465,7 @@ public virtual bool SupportPartiallyRefund(string paymentMethodSystemName) var paymentMethod = LoadPaymentMethodBySystemName(paymentMethodSystemName); if (paymentMethod == null) return false; - return paymentMethod.Value.SupportPartiallyRefund; + return paymentMethod.Value.SupportPartiallyRefund; } /// @@ -478,7 +478,7 @@ public virtual bool SupportRefund(string paymentMethodSystemName) var paymentMethod = LoadPaymentMethodBySystemName(paymentMethodSystemName); if (paymentMethod == null) return false; - return paymentMethod.Value.SupportRefund; + return paymentMethod.Value.SupportRefund; } /// @@ -492,20 +492,20 @@ public virtual RefundPaymentResult Refund(RefundPaymentRequest refundPaymentRequ if (paymentMethod == null) throw new SmartException(T("Payment.CouldNotLoadMethod")); - try - { - return paymentMethod.Value.Refund(refundPaymentRequest); - } - catch (NotSupportedException) - { - var result = new RefundPaymentResult(); - result.AddError(T("Common.Payment.NoRefundSupport")); - return result; - } - catch - { - throw; - } + try + { + return paymentMethod.Value.Refund(refundPaymentRequest); + } + catch (NotSupportedException) + { + var result = new RefundPaymentResult(); + result.AddError(T("Common.Payment.NoRefundSupport")); + return result; + } + catch + { + throw; + } } @@ -520,7 +520,7 @@ public virtual bool SupportVoid(string paymentMethodSystemName) var paymentMethod = LoadPaymentMethodBySystemName(paymentMethodSystemName); if (paymentMethod == null) return false; - return paymentMethod.Value.SupportVoid; + return paymentMethod.Value.SupportVoid; } /// @@ -534,20 +534,20 @@ public virtual VoidPaymentResult Void(VoidPaymentRequest voidPaymentRequest) if (paymentMethod == null) throw new SmartException(T("Payment.CouldNotLoadMethod")); - try - { - return paymentMethod.Value.Void(voidPaymentRequest); - } - catch (NotSupportedException) - { - var result = new VoidPaymentResult(); - result.AddError(T("Common.Payment.NoVoidSupport")); - return result; - } - catch - { - throw; - } + try + { + return paymentMethod.Value.Void(voidPaymentRequest); + } + catch (NotSupportedException) + { + var result = new VoidPaymentResult(); + result.AddError(T("Common.Payment.NoVoidSupport")); + return result; + } + catch + { + throw; + } } @@ -563,7 +563,7 @@ public virtual RecurringPaymentType GetRecurringPaymentType(string paymentMethod if (paymentMethod == null) return RecurringPaymentType.NotSupported; - return paymentMethod.Value.RecurringPaymentType; + return paymentMethod.Value.RecurringPaymentType; } /// @@ -587,20 +587,20 @@ public virtual ProcessPaymentResult ProcessRecurringPayment(ProcessPaymentReques if (paymentMethod == null) throw new SmartException(T("Payment.CouldNotLoadMethod")); - try - { - return paymentMethod.Value.ProcessRecurringPayment(processPaymentRequest); - } - catch (NotSupportedException) - { - var result = new ProcessPaymentResult(); - result.AddError(T("Common.Payment.NoRecurringPaymentSupport")); - return result; - } - catch - { - throw; - } + try + { + return paymentMethod.Value.ProcessRecurringPayment(processPaymentRequest); + } + catch (NotSupportedException) + { + var result = new ProcessPaymentResult(); + result.AddError(T("Common.Payment.NoRecurringPaymentSupport")); + return result; + } + catch + { + throw; + } } } @@ -618,20 +618,20 @@ public virtual CancelRecurringPaymentResult CancelRecurringPayment(CancelRecurri if (paymentMethod == null) throw new SmartException(T("Payment.CouldNotLoadMethod")); - try - { - return paymentMethod.Value.CancelRecurringPayment(cancelPaymentRequest); - } - catch (NotSupportedException) - { - var result = new CancelRecurringPaymentResult(); - result.AddError(T("Common.Payment.NoRecurringPaymentSupport")); - return result; - } - catch - { - throw; - } + try + { + return paymentMethod.Value.CancelRecurringPayment(cancelPaymentRequest); + } + catch (NotSupportedException) + { + var result = new CancelRecurringPaymentResult(); + result.AddError(T("Common.Payment.NoRecurringPaymentSupport")); + return result; + } + catch + { + throw; + } } @@ -647,7 +647,7 @@ public virtual PaymentMethodType GetPaymentMethodType(string paymentMethodSystem if (paymentMethod == null) return PaymentMethodType.Unknown; - return paymentMethod.Value.PaymentMethodType; + return paymentMethod.Value.PaymentMethodType; } /// @@ -672,26 +672,26 @@ public virtual string GetMaskedCreditCardNumber(string creditCardNumber) return maskedChars + last4; } - public virtual IList GetAllPaymentMethodFilters() - { - if (_paymentMethodFilterTypes == null) - { - lock (_lock) - { - if (_paymentMethodFilterTypes == null) - { - _paymentMethodFilterTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true).ToList(); - } - } - } - - var paymentMethodFilters = _paymentMethodFilterTypes - .Select(x => EngineContext.Current.ContainerManager.ResolveUnregistered(x) as IPaymentMethodFilter) - .ToList(); - - return paymentMethodFilters; - } - - #endregion - } + public virtual IList GetAllPaymentMethodFilters() + { + if (_paymentMethodFilterTypes == null) + { + lock (_lock) + { + if (_paymentMethodFilterTypes == null) + { + _paymentMethodFilterTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true).ToList(); + } + } + } + + var paymentMethodFilters = _paymentMethodFilterTypes + .Select(x => EngineContext.Current.ContainerManager.ResolveUnregistered(x) as IPaymentMethodFilter) + .ToList(); + + return paymentMethodFilters; + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Payments/PostProcessPaymentRequest.cs b/src/Libraries/SmartStore.Services/Payments/PostProcessPaymentRequest.cs index f14a6cc6aa..45fff023f4 100644 --- a/src/Libraries/SmartStore.Services/Payments/PostProcessPaymentRequest.cs +++ b/src/Libraries/SmartStore.Services/Payments/PostProcessPaymentRequest.cs @@ -12,14 +12,14 @@ public partial class PostProcessPaymentRequest /// public Order Order { get; set; } - /// - /// Whether the customer clicked the button to re-post the payment process - /// - public bool IsRePostProcessPayment { get; set; } + /// + /// Whether the customer clicked the button to re-post the payment process + /// + public bool IsRePostProcessPayment { get; set; } - /// - /// URL to a payment provider to fulfill the payment. The .NET core will redirect to it. - /// - public string RedirectUrl { get; set; } + /// + /// URL to a payment provider to fulfill the payment. The .NET core will redirect to it. + /// + public string RedirectUrl { get; set; } } } diff --git a/src/Libraries/SmartStore.Services/Payments/PreProcessPaymentResult.cs b/src/Libraries/SmartStore.Services/Payments/PreProcessPaymentResult.cs index d59c10eb48..3dbf7b775f 100644 --- a/src/Libraries/SmartStore.Services/Payments/PreProcessPaymentResult.cs +++ b/src/Libraries/SmartStore.Services/Payments/PreProcessPaymentResult.cs @@ -1,10 +1,10 @@  namespace SmartStore.Services.Payments { - /// - /// Represents a pre process payment result - /// - public partial class PreProcessPaymentResult : ProcessPaymentResultBase - { - } + /// + /// Represents a pre process payment result + /// + public partial class PreProcessPaymentResult : ProcessPaymentResultBase + { + } } diff --git a/src/Libraries/SmartStore.Services/Payments/ProcessPaymentRequest.cs b/src/Libraries/SmartStore.Services/Payments/ProcessPaymentRequest.cs index 334a261ff0..e03d989008 100644 --- a/src/Libraries/SmartStore.Services/Payments/ProcessPaymentRequest.cs +++ b/src/Libraries/SmartStore.Services/Payments/ProcessPaymentRequest.cs @@ -11,17 +11,17 @@ namespace SmartStore.Services.Payments [Serializable] public partial class ProcessPaymentRequest { - public ProcessPaymentRequest() - { - CustomProperties = new Dictionary(); + public ProcessPaymentRequest() + { + CustomProperties = new Dictionary(); IsMultiOrder = false; ShoppingCartItemIds = new List(); } - /// - /// Gets or sets a store identifier - /// - public int StoreId { get; set; } + /// + /// Gets or sets a store identifier + /// + public int StoreId { get; set; } /// /// Gets or sets a customer @@ -38,10 +38,10 @@ public ProcessPaymentRequest() /// public decimal OrderTotal { get; set; } - /// - /// Gets or sets an order tax total - /// - public decimal OrderTax { get; set; } + /// + /// Gets or sets an order tax total + /// + public decimal OrderTax { get; set; } /// /// Gets or sets a payment method identifier @@ -53,10 +53,10 @@ public ProcessPaymentRequest() /// public bool IsMultiOrder { get; set; } - /// - /// Use that dictionary for any payment method or checkout flow specific data - /// - public Dictionary CustomProperties { get; set; } + /// + /// Use that dictionary for any payment method or checkout flow specific data + /// + public Dictionary CustomProperties { get; set; } public IList ShoppingCartItemIds { get; set; } @@ -112,16 +112,16 @@ public ProcessPaymentRequest() /// public string PurchaseOrderNumber { get; set; } - public int CreditCardStartYear { get; set; } - public int CreditCardStartMonth { get; set; } - public string CreditCardIssueNumber { get; set; } - public string DirectDebitAccountHolder { get; set; } - public string DirectDebitAccountNumber { get; set; } - public string DirectDebitBankCode { get; set; } - public string DirectDebitCountry { get; set; } - public string DirectDebitBankName { get; set; } - public string DirectDebitIban { get; set; } - public string DirectDebitBic { get; set; } + public int CreditCardStartYear { get; set; } + public int CreditCardStartMonth { get; set; } + public string CreditCardIssueNumber { get; set; } + public string DirectDebitAccountHolder { get; set; } + public string DirectDebitAccountNumber { get; set; } + public string DirectDebitBankCode { get; set; } + public string DirectDebitCountry { get; set; } + public string DirectDebitBankName { get; set; } + public string DirectDebitIban { get; set; } + public string DirectDebitBic { get; set; } public bool IsShippingMethodSet { get; set; } @@ -138,7 +138,7 @@ public ProcessPaymentRequest() /// Gets or sets an initial (parent) order identifier if order is recurring /// public int InitialOrderId { get; set; } - + /// /// Gets or sets the cycle length /// @@ -158,17 +158,17 @@ public ProcessPaymentRequest() } - [Serializable] - public partial class CustomPaymentRequestValue - { - /// - /// The value of the custom property - /// - public object Value { get; set; } + [Serializable] + public partial class CustomPaymentRequestValue + { + /// + /// The value of the custom property + /// + public object Value { get; set; } - /// - /// Indicates whether to automatically create a generic attribute if an order has been placed - /// - public bool AutoCreateGenericAttribute { get; set; } - } + /// + /// Indicates whether to automatically create a generic attribute if an order has been placed + /// + public bool AutoCreateGenericAttribute { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Payments/ProcessPaymentResult.cs b/src/Libraries/SmartStore.Services/Payments/ProcessPaymentResult.cs index 28977963d6..64ef7ad40e 100644 --- a/src/Libraries/SmartStore.Services/Payments/ProcessPaymentResult.cs +++ b/src/Libraries/SmartStore.Services/Payments/ProcessPaymentResult.cs @@ -44,7 +44,7 @@ public partial class ProcessPaymentResult : ProcessPaymentResultBase /// Gets or sets the subscription transaction identifier /// public string SubscriptionTransactionId { get; set; } - + /// /// Gets or sets a value indicating whether storing of credit card number, CVV2 is allowed /// @@ -60,14 +60,8 @@ public partial class ProcessPaymentResult : ProcessPaymentResultBase /// public PaymentStatus NewPaymentStatus { - get - { - return _newPaymentStatus; - } - set - { - _newPaymentStatus = value; - } + get => _newPaymentStatus; + set => _newPaymentStatus = value; } } } diff --git a/src/Libraries/SmartStore.Services/Payments/ProcessPaymentResultBase.cs b/src/Libraries/SmartStore.Services/Payments/ProcessPaymentResultBase.cs index 7657c293cc..cbce0a3ea8 100644 --- a/src/Libraries/SmartStore.Services/Payments/ProcessPaymentResultBase.cs +++ b/src/Libraries/SmartStore.Services/Payments/ProcessPaymentResultBase.cs @@ -2,23 +2,20 @@ namespace SmartStore.Services.Payments { - public partial class ProcessPaymentResultBase - { - public ProcessPaymentResultBase() - { - this.Errors = new List(); - } + public partial class ProcessPaymentResultBase + { + public ProcessPaymentResultBase() + { + this.Errors = new List(); + } - public IList Errors { get; set; } + public IList Errors { get; set; } - public bool Success - { - get { return (this.Errors.Count == 0); } - } + public bool Success => (this.Errors.Count == 0); - public void AddError(string error) - { - this.Errors.Add(error); - } - } + public void AddError(string error) + { + this.Errors.Add(error); + } + } } diff --git a/src/Libraries/SmartStore.Services/Payments/RefundPaymentResult.cs b/src/Libraries/SmartStore.Services/Payments/RefundPaymentResult.cs index bda98cf05e..b880e6029c 100644 --- a/src/Libraries/SmartStore.Services/Payments/RefundPaymentResult.cs +++ b/src/Libraries/SmartStore.Services/Payments/RefundPaymentResult.cs @@ -11,17 +11,14 @@ public partial class RefundPaymentResult private PaymentStatus _newPaymentStatus = PaymentStatus.Pending; public IList Errors { get; set; } - public RefundPaymentResult() + public RefundPaymentResult() { this.Errors = new List(); } - public bool Success - { - get { return (this.Errors.Count == 0); } - } + public bool Success => (this.Errors.Count == 0); - public void AddError(string error) + public void AddError(string error) { this.Errors.Add(error); } @@ -33,14 +30,8 @@ public void AddError(string error) /// public PaymentStatus NewPaymentStatus { - get - { - return _newPaymentStatus; - } - set - { - _newPaymentStatus = value; - } + get => _newPaymentStatus; + set => _newPaymentStatus = value; } #endregion diff --git a/src/Libraries/SmartStore.Services/Payments/VoidPaymentResult.cs b/src/Libraries/SmartStore.Services/Payments/VoidPaymentResult.cs index 5b13365083..8ec3cba1d6 100644 --- a/src/Libraries/SmartStore.Services/Payments/VoidPaymentResult.cs +++ b/src/Libraries/SmartStore.Services/Payments/VoidPaymentResult.cs @@ -11,17 +11,14 @@ public partial class VoidPaymentResult private PaymentStatus _newPaymentStatus = PaymentStatus.Pending; public IList Errors { get; set; } - public VoidPaymentResult() + public VoidPaymentResult() { this.Errors = new List(); } - public bool Success - { - get { return (this.Errors.Count == 0); } - } + public bool Success => (this.Errors.Count == 0); - public void AddError(string error) + public void AddError(string error) { this.Errors.Add(error); } @@ -33,14 +30,8 @@ public void AddError(string error) /// public PaymentStatus NewPaymentStatus { - get - { - return _newPaymentStatus; - } - set - { - _newPaymentStatus = value; - } + get => _newPaymentStatus; + set => _newPaymentStatus = value; } #endregion diff --git a/src/Libraries/SmartStore.Services/Pdf/Content/IPdfContent.cs b/src/Libraries/SmartStore.Services/Pdf/Content/IPdfContent.cs index 9a1319426c..6f983e1afe 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Content/IPdfContent.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Content/IPdfContent.cs @@ -4,20 +4,20 @@ namespace SmartStore.Services.Pdf { - public interface IPdfContent - { - PdfContentKind Kind { get; } + public interface IPdfContent + { + PdfContentKind Kind { get; } - string Process(string flag); + string Process(string flag); - void WriteArguments(string flag, StringBuilder builder); + void WriteArguments(string flag, StringBuilder builder); - void Teardown(); - } + void Teardown(); + } - public enum PdfContentKind - { - Html, - Url - } + public enum PdfContentKind + { + Html, + Url + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/Content/PdfHtmlContent.cs b/src/Libraries/SmartStore.Services/Pdf/Content/PdfHtmlContent.cs index 226e742928..493a48b521 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Content/PdfHtmlContent.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Content/PdfHtmlContent.cs @@ -9,107 +9,104 @@ namespace SmartStore.Services.Pdf { - public class PdfHtmlContent : IPdfContent - { - private static readonly Uri _engineBaseUri; - - private string _html; - private string _originalHtml; - private bool _processed; - private string _tempFilePath; - private PdfContentKind _kind = PdfContentKind.Html; - - static PdfHtmlContent() - { - var baseUrl = CommonHelper.GetAppSetting("sm:PdfEngineBaseUrl").TrimSafe().NullEmpty(); - if (baseUrl != null) - { - Uri uri; - if (Uri.TryCreate(baseUrl, UriKind.Absolute, out uri)) - { - _engineBaseUri = uri; - } - } - } - - public PdfHtmlContent(string html) - { - Guard.NotEmpty(html, nameof(html)); - - _originalHtml = html; - _html = html; - } - - public PdfContentKind Kind - { - get { return _kind; } - } - - public string Process(string flag) - { - if (!_processed) - { - if (_engineBaseUri != null) - { - _html = WebHelper.MakeAllUrlsAbsolute(_html, _engineBaseUri.Scheme, _engineBaseUri.Authority); - } - else if (HttpContext.Current?.Request != null) - { - _html = WebHelper.MakeAllUrlsAbsolute(_html, new HttpRequestWrapper(HttpContext.Current.Request)); - } - - if (!flag.IsCaseInsensitiveEqual("page")) - { - CreateTempFile(); - } - - _processed = true; - } - - return _tempFilePath ?? _html; - } - - private void CreateTempFile() - { - // TODO: (mc) This is a very weak mechanism to determine if html is partial. Find a better way! - bool isPartial = !_html.Trim().StartsWith("\r\n\r\n{0}\r\n", html); - } - - public void WriteArguments(string flag, StringBuilder builder) - { - // noop - } - - public void Teardown() - { - if (_tempFilePath != null && File.Exists(_tempFilePath)) - { - try - { - File.Delete(_tempFilePath); - } - catch { } - } - - _kind = PdfContentKind.Html; - _html = _originalHtml; - _tempFilePath = null; - _processed = false; - } - } + public class PdfHtmlContent : IPdfContent + { + private static readonly Uri _engineBaseUri; + + private string _html; + private string _originalHtml; + private bool _processed; + private string _tempFilePath; + private PdfContentKind _kind = PdfContentKind.Html; + + static PdfHtmlContent() + { + var baseUrl = CommonHelper.GetAppSetting("sm:PdfEngineBaseUrl").TrimSafe().NullEmpty(); + if (baseUrl != null) + { + Uri uri; + if (Uri.TryCreate(baseUrl, UriKind.Absolute, out uri)) + { + _engineBaseUri = uri; + } + } + } + + public PdfHtmlContent(string html) + { + Guard.NotEmpty(html, nameof(html)); + + _originalHtml = html; + _html = html; + } + + public PdfContentKind Kind => _kind; + + public string Process(string flag) + { + if (!_processed) + { + if (_engineBaseUri != null) + { + _html = WebHelper.MakeAllUrlsAbsolute(_html, _engineBaseUri.Scheme, _engineBaseUri.Authority); + } + else if (HttpContext.Current?.Request != null) + { + _html = WebHelper.MakeAllUrlsAbsolute(_html, new HttpRequestWrapper(HttpContext.Current.Request)); + } + + if (!flag.IsCaseInsensitiveEqual("page")) + { + CreateTempFile(); + } + + _processed = true; + } + + return _tempFilePath ?? _html; + } + + private void CreateTempFile() + { + // TODO: (mc) This is a very weak mechanism to determine if html is partial. Find a better way! + bool isPartial = !_html.Trim().StartsWith("\r\n\r\n{0}\r\n", html); + } + + public void WriteArguments(string flag, StringBuilder builder) + { + // noop + } + + public void Teardown() + { + if (_tempFilePath != null && File.Exists(_tempFilePath)) + { + try + { + File.Delete(_tempFilePath); + } + catch { } + } + + _kind = PdfContentKind.Html; + _html = _originalHtml; + _tempFilePath = null; + _processed = false; + } + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs b/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs index ecb19891bd..6065e91a84 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs @@ -10,147 +10,144 @@ namespace SmartStore.Services.Pdf { - public class PdfUrlContent : IPdfContent - { - private static readonly Uri _engineBaseUri; - private readonly string _url; - - static PdfUrlContent() - { - var baseUrl = CommonHelper.GetAppSetting("sm:PdfEngineBaseUrl").TrimSafe().NullEmpty(); - if (baseUrl != null) - { - Uri uri; - if (Uri.TryCreate(baseUrl, UriKind.Absolute, out uri)) - { - _engineBaseUri = uri; - } - } - } - - public PdfUrlContent(string url) - { - Guard.NotEmpty(url, nameof(url)); - _url = url; - - this.SendAuthCookie = false; - this.Post = new Dictionary(); - this.Cookies = new Dictionary(); - } - - #region Options - - /// - /// Send FormsAuthentication cookie to authorize - /// - public bool SendAuthCookie { get; set; } - - /// - /// HTTP Authentication username. - /// - public string UserName { get; set; } - - /// - /// HTTP Authentication password. - /// - public string Password { get; set; } - - /// - /// Sets cookies. - /// - public IDictionary Post { get; set; } - - /// - /// Sets post values. - /// - public IDictionary Cookies { get; set; } - - #endregion - - public PdfContentKind Kind - { - get { return PdfContentKind.Url; } - } - - protected virtual string GetAbsoluteUrl() - { - if (_engineBaseUri != null) - { - var url = _url; - if (url.StartsWith("~")) - { - url = VirtualPathUtility.ToAbsolute(url); - } - - return _engineBaseUri.ToString() + url.TrimStart('/'); - } - else if (HttpContext.Current?.Request != null) - { - return WebHelper.GetAbsoluteUrl(_url, new HttpRequestWrapper(HttpContext.Current.Request)); - } - - return _url; - } - - public string Process(string flag) - { - return GetAbsoluteUrl(); - } - - public void WriteArguments(string flag, StringBuilder builder) - { - if (UserName.HasValue()) - { - builder.AppendFormat(CultureInfo.InvariantCulture, " --username {0}", UserName); - } - - if (Password.HasValue()) - { - builder.AppendFormat(CultureInfo.InvariantCulture, " --password {0}", Password); - } - - if (Post != null && Post.Count > 0) - { - CreateRepeatableFlags("--post", Post, builder); - } - - if (Cookies != null && Cookies.Count > 0) - { - CreateRepeatableFlags("--cookie", Cookies, builder); - } - - // Send FormsAuthentication Cookie - var ctx = HttpContext.Current; - if (SendAuthCookie && ctx != null && ctx.Request != null && ctx.Request.Cookies != null) - { - var authCookieName = FormsAuthentication.FormsCookieName; - if (Cookies == null || !Cookies.ContainsKey(authCookieName)) - { - HttpCookie authCookie = null; - if (ctx.Request.Cookies.AllKeys.Contains(authCookieName)) - { - authCookie = ctx.Request.Cookies[authCookieName]; - } - if (authCookie != null) - { - var authCookieValue = authCookie.Value; - builder.AppendFormat(CultureInfo.InvariantCulture, " {0} {1} {2}", "--cookie", authCookieName, authCookieValue); - } - } - } - } - - private void CreateRepeatableFlags(string flagName, IDictionary dict, StringBuilder sb) - { - foreach (var kvp in dict) - { - sb.AppendFormat(CultureInfo.InvariantCulture, " {0} {1} {2}", flagName, kvp.Key, kvp.Value.EmptyNull()); - } - } - - public void Teardown() - { - // noop - } - } + public class PdfUrlContent : IPdfContent + { + private static readonly Uri _engineBaseUri; + private readonly string _url; + + static PdfUrlContent() + { + var baseUrl = CommonHelper.GetAppSetting("sm:PdfEngineBaseUrl").TrimSafe().NullEmpty(); + if (baseUrl != null) + { + Uri uri; + if (Uri.TryCreate(baseUrl, UriKind.Absolute, out uri)) + { + _engineBaseUri = uri; + } + } + } + + public PdfUrlContent(string url) + { + Guard.NotEmpty(url, nameof(url)); + _url = url; + + this.SendAuthCookie = false; + this.Post = new Dictionary(); + this.Cookies = new Dictionary(); + } + + #region Options + + /// + /// Send FormsAuthentication cookie to authorize + /// + public bool SendAuthCookie { get; set; } + + /// + /// HTTP Authentication username. + /// + public string UserName { get; set; } + + /// + /// HTTP Authentication password. + /// + public string Password { get; set; } + + /// + /// Sets cookies. + /// + public IDictionary Post { get; set; } + + /// + /// Sets post values. + /// + public IDictionary Cookies { get; set; } + + #endregion + + public PdfContentKind Kind => PdfContentKind.Url; + + protected virtual string GetAbsoluteUrl() + { + if (_engineBaseUri != null) + { + var url = _url; + if (url.StartsWith("~")) + { + url = VirtualPathUtility.ToAbsolute(url); + } + + return _engineBaseUri.ToString() + url.TrimStart('/'); + } + else if (HttpContext.Current?.Request != null) + { + return WebHelper.GetAbsoluteUrl(_url, new HttpRequestWrapper(HttpContext.Current.Request)); + } + + return _url; + } + + public string Process(string flag) + { + return GetAbsoluteUrl(); + } + + public void WriteArguments(string flag, StringBuilder builder) + { + if (UserName.HasValue()) + { + builder.AppendFormat(CultureInfo.InvariantCulture, " --username {0}", UserName); + } + + if (Password.HasValue()) + { + builder.AppendFormat(CultureInfo.InvariantCulture, " --password {0}", Password); + } + + if (Post != null && Post.Count > 0) + { + CreateRepeatableFlags("--post", Post, builder); + } + + if (Cookies != null && Cookies.Count > 0) + { + CreateRepeatableFlags("--cookie", Cookies, builder); + } + + // Send FormsAuthentication Cookie + var ctx = HttpContext.Current; + if (SendAuthCookie && ctx != null && ctx.Request != null && ctx.Request.Cookies != null) + { + var authCookieName = FormsAuthentication.FormsCookieName; + if (Cookies == null || !Cookies.ContainsKey(authCookieName)) + { + HttpCookie authCookie = null; + if (ctx.Request.Cookies.AllKeys.Contains(authCookieName)) + { + authCookie = ctx.Request.Cookies[authCookieName]; + } + if (authCookie != null) + { + var authCookieValue = authCookie.Value; + builder.AppendFormat(CultureInfo.InvariantCulture, " {0} {1} {2}", "--cookie", authCookieName, authCookieValue); + } + } + } + } + + private void CreateRepeatableFlags(string flagName, IDictionary dict, StringBuilder sb) + { + foreach (var kvp in dict) + { + sb.AppendFormat(CultureInfo.InvariantCulture, " {0} {1} {2}", flagName, kvp.Key, kvp.Value.EmptyNull()); + } + } + + public void Teardown() + { + // noop + } + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/IPdfConverter.cs b/src/Libraries/SmartStore.Services/Pdf/IPdfConverter.cs index 69bcad9872..0812726e74 100644 --- a/src/Libraries/SmartStore.Services/Pdf/IPdfConverter.cs +++ b/src/Libraries/SmartStore.Services/Pdf/IPdfConverter.cs @@ -5,13 +5,13 @@ namespace SmartStore.Services.Pdf { - public interface IPdfConverter - { - /// - /// Converts html content to PDF - /// - /// The settings to be used for the conversion process - /// The PDF binary data - byte[] Convert(PdfConvertSettings settings); - } + public interface IPdfConverter + { + /// + /// Converts html content to PDF + /// + /// The settings to be used for the conversion process + /// The PDF binary data + byte[] Convert(PdfConvertSettings settings); + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/Options/IPdfOptions.cs b/src/Libraries/SmartStore.Services/Pdf/Options/IPdfOptions.cs index 468a73ae6e..4f1f8e4c08 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Options/IPdfOptions.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Options/IPdfOptions.cs @@ -3,14 +3,14 @@ namespace SmartStore.Services.Pdf { - public interface IPdfOptions - { - /// - /// Processes the options by converting them to native arguments - /// - /// The section flag - /// The builder - /// Possible flags are: page | header | footer | cover | toc - void Process(string flag, StringBuilder builder); - } + public interface IPdfOptions + { + /// + /// Processes the options by converting them to native arguments + /// + /// The section flag + /// The builder + /// Possible flags are: page | header | footer | cover | toc + void Process(string flag, StringBuilder builder); + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/Options/PdfHeaderFooterOptions.cs b/src/Libraries/SmartStore.Services/Pdf/Options/PdfHeaderFooterOptions.cs index 2456fd4743..49569a396b 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Options/PdfHeaderFooterOptions.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Options/PdfHeaderFooterOptions.cs @@ -5,92 +5,89 @@ namespace SmartStore.Services.Pdf { - public class PdfHeaderFooterOptions : IPdfOptions - { + public class PdfHeaderFooterOptions : IPdfOptions + { - public PdfHeaderFooterOptions() - { - Spacing = 5; - FontSize = 10; - } + public PdfHeaderFooterOptions() + { + Spacing = 5; + FontSize = 10; + } - /// - /// Spacing between footer and content in mm (default 0) - /// - public float? Spacing { get; set; } + /// + /// Spacing between footer and content in mm (default 0) + /// + public float? Spacing { get; set; } - /// - /// Display line below the header / above the footer - /// - public bool ShowLine { get; set; } + /// + /// Display line below the header / above the footer + /// + public bool ShowLine { get; set; } - /// - /// Set font name (default Arial) - /// - public string FontName { get; set; } + /// + /// Set font name (default Arial) + /// + public string FontName { get; set; } - /// - /// Set font size (default 12) - /// - public float? FontSize { get; set; } + /// + /// Set font size (default 12) + /// + public float? FontSize { get; set; } - /// - /// Left aligned text - /// - public string TextLeft { get; set; } + /// + /// Left aligned text + /// + public string TextLeft { get; set; } - /// - /// Centered text - /// - public string TextCenter { get; set; } + /// + /// Centered text + /// + public string TextCenter { get; set; } - /// - /// Right aligned text - /// - public string TextRight { get; set; } + /// + /// Right aligned text + /// + public string TextRight { get; set; } - public bool HasText - { - get { return TextLeft.HasValue() || TextCenter.HasValue() || TextRight.HasValue(); } - } - - public void Process(string flag, StringBuilder builder) - { - if (Spacing.HasValue) - { - builder.AppendFormat(CultureInfo.InvariantCulture, " --{0}-spacing {1}", flag, Spacing.Value); - } + public bool HasText => TextLeft.HasValue() || TextCenter.HasValue() || TextRight.HasValue(); - if (ShowLine) - { - builder.AppendFormat(" --{0}-line", flag); - } + public void Process(string flag, StringBuilder builder) + { + if (Spacing.HasValue) + { + builder.AppendFormat(CultureInfo.InvariantCulture, " --{0}-spacing {1}", flag, Spacing.Value); + } - if (HasText) - { - if (FontName.HasValue()) - { - builder.AppendFormat(CultureInfo.InvariantCulture, " --{0}-font-name \"{1}\"", flag, FontName); - } - if (FontSize.HasValue) - { - builder.AppendFormat(CultureInfo.InvariantCulture, " --{0}-font-size {1}", flag, FontSize.Value); - } - } + if (ShowLine) + { + builder.AppendFormat(" --{0}-line", flag); + } - if (TextLeft.HasValue()) - { - builder.AppendFormat(CultureInfo.CurrentCulture, " --{0}-left \"{1}\"", flag, TextLeft); - } - if (TextCenter.HasValue()) - { - builder.AppendFormat(CultureInfo.CurrentCulture, " --{0}-center \"{1}\"", flag, TextCenter); - } - if (TextRight.HasValue()) - { - builder.AppendFormat(CultureInfo.CurrentCulture, " --{0}-right \"{1}\"", flag, TextRight); - } - } + if (HasText) + { + if (FontName.HasValue()) + { + builder.AppendFormat(CultureInfo.InvariantCulture, " --{0}-font-name \"{1}\"", flag, FontName); + } + if (FontSize.HasValue) + { + builder.AppendFormat(CultureInfo.InvariantCulture, " --{0}-font-size {1}", flag, FontSize.Value); + } + } - } + if (TextLeft.HasValue()) + { + builder.AppendFormat(CultureInfo.CurrentCulture, " --{0}-left \"{1}\"", flag, TextLeft); + } + if (TextCenter.HasValue()) + { + builder.AppendFormat(CultureInfo.CurrentCulture, " --{0}-center \"{1}\"", flag, TextCenter); + } + if (TextRight.HasValue()) + { + builder.AppendFormat(CultureInfo.CurrentCulture, " --{0}-right \"{1}\"", flag, TextRight); + } + } + + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/Options/PdfPageOptions.cs b/src/Libraries/SmartStore.Services/Pdf/Options/PdfPageOptions.cs index 2db0049016..f9c2d82d80 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Options/PdfPageOptions.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Options/PdfPageOptions.cs @@ -4,69 +4,69 @@ namespace SmartStore.Services.Pdf { - public class PdfPageOptions : IPdfOptions - { + public class PdfPageOptions : IPdfOptions + { - public PdfPageOptions() - { - this.Zoom = 1f; - this.UsePrintMediaType = true; - } + public PdfPageOptions() + { + this.Zoom = 1f; + this.UsePrintMediaType = true; + } - /// - /// Get or set zoom factor - /// - public float Zoom { get; set; } + /// + /// Get or set zoom factor + /// + public float Zoom { get; set; } - /// - /// Indicates whether the page background should be disabled. - /// - public bool BackgroundDisabled { get; set; } + /// + /// Indicates whether the page background should be disabled. + /// + public bool BackgroundDisabled { get; set; } - /// - /// Use print media-type instead of screen - /// - public bool UsePrintMediaType { get; set; } + /// + /// Use print media-type instead of screen + /// + public bool UsePrintMediaType { get; set; } - /// - /// Specifies a user style sheet to load with every page - /// - public string UserStylesheetUrl { get; set; } + /// + /// Specifies a user style sheet to load with every page + /// + public string UserStylesheetUrl { get; set; } - /// - /// Custom page pdf tool options - /// - public string CustomFlags { get; set; } + /// + /// Custom page pdf tool options + /// + public string CustomFlags { get; set; } - public virtual void Process(string flag, StringBuilder builder) - { - if (UserStylesheetUrl.HasValue()) - { - builder.AppendFormat(CultureInfo.InvariantCulture, " --user-style-sheet \"{0}\"", UserStylesheetUrl); - } + public virtual void Process(string flag, StringBuilder builder) + { + if (UserStylesheetUrl.HasValue()) + { + builder.AppendFormat(CultureInfo.InvariantCulture, " --user-style-sheet \"{0}\"", UserStylesheetUrl); + } - if (UsePrintMediaType) - { - builder.Append(" --print-media-type"); - } + if (UsePrintMediaType) + { + builder.Append(" --print-media-type"); + } - if (BackgroundDisabled) - { - builder.Append(" --no-background"); - } + if (BackgroundDisabled) + { + builder.Append(" --no-background"); + } - if (Zoom != 1 /*&& flag.IsCaseInsensitiveEqual("page")*/) - { - builder.AppendFormat(" --zoom {0}", Zoom); - } + if (Zoom != 1 /*&& flag.IsCaseInsensitiveEqual("page")*/) + { + builder.AppendFormat(" --zoom {0}", Zoom); + } - if (CustomFlags.HasValue()) - { - builder.AppendFormat(" {0}", CustomFlags); - } - } + if (CustomFlags.HasValue()) + { + builder.AppendFormat(" {0}", CustomFlags); + } + } - } + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/Options/PdfTocOptions.cs b/src/Libraries/SmartStore.Services/Pdf/Options/PdfTocOptions.cs index 89692ca7e6..3b116de25b 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Options/PdfTocOptions.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Options/PdfTocOptions.cs @@ -4,75 +4,75 @@ namespace SmartStore.Services.Pdf { - public class PdfTocOptions : PdfPageOptions - { - public PdfTocOptions() - : base() - { - } - - /// - /// TOC creation enabled - /// - public bool Enabled { get; set; } - - /// - /// The header text of the toc (default Table of Contents) - /// - public string TocHeaderText { get; set; } - - /// - /// Do not use dotted lines in the toc - /// - public bool DisableDottedLines { get; set; } - - /// - /// Do not link from toc to sections - /// - public bool DisableTocLinks { get; set; } - - /// - /// For each level of headings in the toc indent by this length (default 1em) - /// - public string TocLevelIndendation { get; set; } - - /// - /// For each level of headings in the toc the font is scaled by this factor (default 0.8) - /// - public float? TocTextSizeShrink { get; set; } - - - public override void Process(string flag, StringBuilder builder) - { - builder.Append(" toc"); - - if (TocHeaderText.HasValue()) - { - builder.AppendFormat(" --toc-header-text \"{0}\"", TocHeaderText.Replace("\"", "\\\"")); - } - - if (DisableDottedLines) - { - builder.Append(" --disable-dotted-lines"); - } - - if (DisableTocLinks) - { - builder.Append(" --disable-toc-links"); - } - - if (TocLevelIndendation.HasValue()) - { - builder.AppendFormat(" --toc-level-indentation {0}", TocLevelIndendation); - } - - if (TocTextSizeShrink.HasValue) - { - builder.AppendFormat(" --toc-text-size-shrink {0}", TocTextSizeShrink.Value); - } - - base.Process(flag, builder); - } - - } + public class PdfTocOptions : PdfPageOptions + { + public PdfTocOptions() + : base() + { + } + + /// + /// TOC creation enabled + /// + public bool Enabled { get; set; } + + /// + /// The header text of the toc (default Table of Contents) + /// + public string TocHeaderText { get; set; } + + /// + /// Do not use dotted lines in the toc + /// + public bool DisableDottedLines { get; set; } + + /// + /// Do not link from toc to sections + /// + public bool DisableTocLinks { get; set; } + + /// + /// For each level of headings in the toc indent by this length (default 1em) + /// + public string TocLevelIndendation { get; set; } + + /// + /// For each level of headings in the toc the font is scaled by this factor (default 0.8) + /// + public float? TocTextSizeShrink { get; set; } + + + public override void Process(string flag, StringBuilder builder) + { + builder.Append(" toc"); + + if (TocHeaderText.HasValue()) + { + builder.AppendFormat(" --toc-header-text \"{0}\"", TocHeaderText.Replace("\"", "\\\"")); + } + + if (DisableDottedLines) + { + builder.Append(" --disable-dotted-lines"); + } + + if (DisableTocLinks) + { + builder.Append(" --disable-toc-links"); + } + + if (TocLevelIndendation.HasValue()) + { + builder.AppendFormat(" --toc-level-indentation {0}", TocLevelIndendation); + } + + if (TocTextSizeShrink.HasValue) + { + builder.AppendFormat(" --toc-text-size-shrink {0}", TocTextSizeShrink.Value); + } + + base.Process(flag, builder); + } + + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/PdfConvertSettings.cs b/src/Libraries/SmartStore.Services/Pdf/PdfConvertSettings.cs index 8aa22eb59e..c099e3ddb4 100644 --- a/src/Libraries/SmartStore.Services/Pdf/PdfConvertSettings.cs +++ b/src/Libraries/SmartStore.Services/Pdf/PdfConvertSettings.cs @@ -2,110 +2,110 @@ namespace SmartStore.Services.Pdf { - public class PdfConvertSettings - { - public PdfConvertSettings() - { - this.Margins = new PdfPageMargins(); - this.Orientation = PdfPagePrientation.Default; - this.Size = PdfPageSize.Default; - this.PageOptions = new PdfPageOptions(); - this.HeaderOptions = new PdfHeaderFooterOptions(); - this.FooterOptions = new PdfHeaderFooterOptions(); - this.CoverOptions = new PdfPageOptions(); - this.TocOptions = new PdfTocOptions(); - } - - /// - /// The title of the generated pdf file (The title of the first document is used if not specified) - /// - public string Title { get; set; } - - /// - /// Get or set option to generate grayscale PDF - /// - public bool Grayscale { get; set; } - - /// - /// Get or set option to generate low quality PDF (shrink the result document space) - /// - public bool LowQuality { get; set; } - - /// - /// Get or set PDF page margins (in mm) - /// - public PdfPageMargins Margins { get; set; } - - /// - /// Get or set PDF page orientation - /// - public PdfPagePrientation Orientation { get; set; } - - /// - /// Get or set PDF page width (in mm) - /// - public float? PageWidth { get; set; } - - /// - /// Get or set PDF page height (in mm) - /// - public float? PageHeight { get; set; } - - /// - /// Get or set PDF page orientation - /// - public PdfPageSize Size { get; set; } - - /// - /// Custom global pdf tool options - /// - public string CustomFlags { get; set; } - - - - /// - /// Cover content - /// - public IPdfContent Cover { get; set; } - - /// - /// Cover content options - /// - public PdfPageOptions CoverOptions { get; set; } - - /// - /// Toc (table of contents) options - /// - public PdfTocOptions TocOptions { get; set; } - - /// - /// Page content (required) - /// - public IPdfContent Page { get; set; } - - /// - /// Page content options - /// - public PdfPageOptions PageOptions { get; set; } - - /// - /// Footer content - /// - public IPdfContent Footer { get; set; } - - /// - /// Footer content options - /// - public PdfHeaderFooterOptions FooterOptions { get; set; } - - /// - /// Header content - /// - public IPdfContent Header { get; set; } - - /// - /// Header content options - /// - public PdfHeaderFooterOptions HeaderOptions { get; set; } - } + public class PdfConvertSettings + { + public PdfConvertSettings() + { + this.Margins = new PdfPageMargins(); + this.Orientation = PdfPagePrientation.Default; + this.Size = PdfPageSize.Default; + this.PageOptions = new PdfPageOptions(); + this.HeaderOptions = new PdfHeaderFooterOptions(); + this.FooterOptions = new PdfHeaderFooterOptions(); + this.CoverOptions = new PdfPageOptions(); + this.TocOptions = new PdfTocOptions(); + } + + /// + /// The title of the generated pdf file (The title of the first document is used if not specified) + /// + public string Title { get; set; } + + /// + /// Get or set option to generate grayscale PDF + /// + public bool Grayscale { get; set; } + + /// + /// Get or set option to generate low quality PDF (shrink the result document space) + /// + public bool LowQuality { get; set; } + + /// + /// Get or set PDF page margins (in mm) + /// + public PdfPageMargins Margins { get; set; } + + /// + /// Get or set PDF page orientation + /// + public PdfPagePrientation Orientation { get; set; } + + /// + /// Get or set PDF page width (in mm) + /// + public float? PageWidth { get; set; } + + /// + /// Get or set PDF page height (in mm) + /// + public float? PageHeight { get; set; } + + /// + /// Get or set PDF page orientation + /// + public PdfPageSize Size { get; set; } + + /// + /// Custom global pdf tool options + /// + public string CustomFlags { get; set; } + + + + /// + /// Cover content + /// + public IPdfContent Cover { get; set; } + + /// + /// Cover content options + /// + public PdfPageOptions CoverOptions { get; set; } + + /// + /// Toc (table of contents) options + /// + public PdfTocOptions TocOptions { get; set; } + + /// + /// Page content (required) + /// + public IPdfContent Page { get; set; } + + /// + /// Page content options + /// + public PdfPageOptions PageOptions { get; set; } + + /// + /// Footer content + /// + public IPdfContent Footer { get; set; } + + /// + /// Footer content options + /// + public PdfHeaderFooterOptions FooterOptions { get; set; } + + /// + /// Header content + /// + public IPdfContent Header { get; set; } + + /// + /// Header content options + /// + public PdfHeaderFooterOptions HeaderOptions { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/PdfPageMargins.cs b/src/Libraries/SmartStore.Services/Pdf/PdfPageMargins.cs index a33aec6bbe..c49c723c56 100644 --- a/src/Libraries/SmartStore.Services/Pdf/PdfPageMargins.cs +++ b/src/Libraries/SmartStore.Services/Pdf/PdfPageMargins.cs @@ -2,16 +2,16 @@ namespace SmartStore.Services.Pdf { - public class PdfPageMargins - { - public PdfPageMargins() - { - Left = 20; - } - - public float? Bottom { get; set; } - public float? Left { get; set; } - public float? Right { get; set; } - public float? Top { get; set; } - } + public class PdfPageMargins + { + public PdfPageMargins() + { + Left = 20; + } + + public float? Bottom { get; set; } + public float? Left { get; set; } + public float? Right { get; set; } + public float? Top { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/PdfPagePrientation.cs b/src/Libraries/SmartStore.Services/Pdf/PdfPagePrientation.cs index 6c46162167..3ea74faebb 100644 --- a/src/Libraries/SmartStore.Services/Pdf/PdfPagePrientation.cs +++ b/src/Libraries/SmartStore.Services/Pdf/PdfPagePrientation.cs @@ -2,10 +2,10 @@ namespace SmartStore.Services.Pdf { - public enum PdfPagePrientation - { - Default, - Landscape, - Portrait - } + public enum PdfPagePrientation + { + Default, + Landscape, + Portrait + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/PdfPageSize.cs b/src/Libraries/SmartStore.Services/Pdf/PdfPageSize.cs index c6865b5b0e..670c8b4a9d 100644 --- a/src/Libraries/SmartStore.Services/Pdf/PdfPageSize.cs +++ b/src/Libraries/SmartStore.Services/Pdf/PdfPageSize.cs @@ -2,11 +2,11 @@ namespace SmartStore.Services.Pdf { - public enum PdfPageSize - { - Default, - A4, - A3, - Letter - } + public enum PdfPageSize + { + Default, + A4, + A3, + Letter + } } diff --git a/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs b/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs index 5c43feae89..3b2c9e288d 100644 --- a/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs +++ b/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs @@ -7,158 +7,158 @@ namespace SmartStore.Services.Pdf { - public class WkHtmlToPdfConverter : IPdfConverter - { - public WkHtmlToPdfConverter() - { - Logger = NullLogger.Instance; - } - - public ILogger Logger { get; set; } - - - public byte[] Convert(PdfConvertSettings settings) - { - Guard.NotNull(settings, nameof(settings)); - if (settings.Page == null) - { - throw Error.InvalidOperation("The 'Page' property of the 'settings' argument cannot be null."); - } - - try - { - var converter = CreateWkConverter(settings); - - var input = settings.Page.Process("page"); - - if (settings.Page.Kind == PdfContentKind.Url) - { - Logger.DebugFormat("Generating PDF from URL '{0}'. CustomWkHtmlPageArgs: {1}", input, converter.CustomWkHtmlPageArgs); - return converter.GeneratePdfFromFile(input, null); - } - else - { - Logger.DebugFormat("Generating PDF from HTML. CustomWkHtmlPageArgs: {0}", converter.CustomWkHtmlPageArgs); - return converter.GeneratePdf(input, null); - } - } - catch (Exception ex) - { - Logger.Error(ex, "Html to Pdf conversion error"); - throw; - } - finally - { - TeardownContent(settings.Cover); - TeardownContent(settings.Footer); - TeardownContent(settings.Header); - TeardownContent(settings.Page); - } - } - - private void TeardownContent(IPdfContent content) - { - if (content != null) - content.Teardown(); - } - - internal HtmlToPdfConverter CreateWkConverter(PdfConvertSettings settings) - { - // Global options - var converter = new HtmlToPdfConverter - { - Grayscale = settings.Grayscale, - LowQuality = settings.LowQuality, - Orientation = (PageOrientation)(int)settings.Orientation, - PageHeight = settings.PageHeight, - PageWidth = settings.PageWidth, - Size = (PageSize)(int)settings.Size, - PdfToolPath = FileSystemHelper.TempDir("wkhtmltopdf"), - TempFilesPath = FileSystemHelper.TempDirTenant() - }; - - if (settings.Margins != null) - { - converter.Margins.Bottom = settings.Margins.Bottom; - converter.Margins.Left = settings.Margins.Left; - converter.Margins.Right = settings.Margins.Right; - converter.Margins.Top = settings.Margins.Top; - } - - var sb = new StringBuilder(settings.CustomFlags); - - // doc title - if (settings.Title.HasValue()) - { - sb.AppendFormat(CultureInfo.CurrentCulture, " --title \"{0}\"", settings.Title); - } - - // Cover content & options - if (settings.Cover != null) - { - var path = settings.Cover.Process("cover"); - if (path.HasValue()) - { - sb.AppendFormat(" cover \"{0}\" ", path); - settings.Cover.WriteArguments("cover", sb); - if (settings.CoverOptions != null) - { - settings.CoverOptions.Process("cover", sb); - } - } - } - - // Toc options - if (settings.TocOptions != null && settings.TocOptions.Enabled) - { - settings.TocOptions.Process("toc", sb); - } - - // apply cover & toc - converter.CustomWkHtmlArgs = sb.ToString().Trim().NullEmpty(); - sb.Clear(); - - // Page options - if (settings.PageOptions != null) - { - settings.PageOptions.Process("page", sb); - } - - // Header content & options - if (settings.Header != null) - { - var path = settings.Header.Process("header"); - if (path.HasValue()) - { - sb.AppendFormat(" --header-html \"{0}\"", path); - settings.Header.WriteArguments("header", sb); - } - } - if (settings.HeaderOptions != null && (settings.Header != null || settings.HeaderOptions.HasText)) - { - settings.HeaderOptions.Process("header", sb); - } - - // Footer content & options - if (settings.Footer != null) - { - var path = settings.Footer.Process("footer"); - if (path.HasValue()) - { - sb.AppendFormat(" --footer-html \"{0}\"", path); - settings.Footer.WriteArguments("footer", sb); - } - } - if (settings.FooterOptions != null && (settings.Footer != null || settings.FooterOptions.HasText)) - { - settings.FooterOptions.Process("footer", sb); - } - - // apply settings - converter.CustomWkHtmlPageArgs = sb.ToString().Trim().NullEmpty(); - - return converter; - } - - } + public class WkHtmlToPdfConverter : IPdfConverter + { + public WkHtmlToPdfConverter() + { + Logger = NullLogger.Instance; + } + + public ILogger Logger { get; set; } + + + public byte[] Convert(PdfConvertSettings settings) + { + Guard.NotNull(settings, nameof(settings)); + if (settings.Page == null) + { + throw Error.InvalidOperation("The 'Page' property of the 'settings' argument cannot be null."); + } + + try + { + var converter = CreateWkConverter(settings); + + var input = settings.Page.Process("page"); + + if (settings.Page.Kind == PdfContentKind.Url) + { + Logger.DebugFormat("Generating PDF from URL '{0}'. CustomWkHtmlPageArgs: {1}", input, converter.CustomWkHtmlPageArgs); + return converter.GeneratePdfFromFile(input, null); + } + else + { + Logger.DebugFormat("Generating PDF from HTML. CustomWkHtmlPageArgs: {0}", converter.CustomWkHtmlPageArgs); + return converter.GeneratePdf(input, null); + } + } + catch (Exception ex) + { + Logger.Error(ex, "Html to Pdf conversion error"); + throw; + } + finally + { + TeardownContent(settings.Cover); + TeardownContent(settings.Footer); + TeardownContent(settings.Header); + TeardownContent(settings.Page); + } + } + + private void TeardownContent(IPdfContent content) + { + if (content != null) + content.Teardown(); + } + + internal HtmlToPdfConverter CreateWkConverter(PdfConvertSettings settings) + { + // Global options + var converter = new HtmlToPdfConverter + { + Grayscale = settings.Grayscale, + LowQuality = settings.LowQuality, + Orientation = (PageOrientation)(int)settings.Orientation, + PageHeight = settings.PageHeight, + PageWidth = settings.PageWidth, + Size = (PageSize)(int)settings.Size, + PdfToolPath = FileSystemHelper.TempDir("wkhtmltopdf"), + TempFilesPath = FileSystemHelper.TempDirTenant() + }; + + if (settings.Margins != null) + { + converter.Margins.Bottom = settings.Margins.Bottom; + converter.Margins.Left = settings.Margins.Left; + converter.Margins.Right = settings.Margins.Right; + converter.Margins.Top = settings.Margins.Top; + } + + var sb = new StringBuilder(settings.CustomFlags); + + // doc title + if (settings.Title.HasValue()) + { + sb.AppendFormat(CultureInfo.CurrentCulture, " --title \"{0}\"", settings.Title); + } + + // Cover content & options + if (settings.Cover != null) + { + var path = settings.Cover.Process("cover"); + if (path.HasValue()) + { + sb.AppendFormat(" cover \"{0}\" ", path); + settings.Cover.WriteArguments("cover", sb); + if (settings.CoverOptions != null) + { + settings.CoverOptions.Process("cover", sb); + } + } + } + + // Toc options + if (settings.TocOptions != null && settings.TocOptions.Enabled) + { + settings.TocOptions.Process("toc", sb); + } + + // apply cover & toc + converter.CustomWkHtmlArgs = sb.ToString().Trim().NullEmpty(); + sb.Clear(); + + // Page options + if (settings.PageOptions != null) + { + settings.PageOptions.Process("page", sb); + } + + // Header content & options + if (settings.Header != null) + { + var path = settings.Header.Process("header"); + if (path.HasValue()) + { + sb.AppendFormat(" --header-html \"{0}\"", path); + settings.Header.WriteArguments("header", sb); + } + } + if (settings.HeaderOptions != null && (settings.Header != null || settings.HeaderOptions.HasText)) + { + settings.HeaderOptions.Process("header", sb); + } + + // Footer content & options + if (settings.Footer != null) + { + var path = settings.Footer.Process("footer"); + if (path.HasValue()) + { + sb.AppendFormat(" --footer-html \"{0}\"", path); + settings.Footer.WriteArguments("footer", sb); + } + } + if (settings.FooterOptions != null && (settings.Footer != null || settings.FooterOptions.HasText)) + { + settings.FooterOptions.Process("footer", sb); + } + + // apply settings + converter.CustomWkHtmlPageArgs = sb.ToString().Trim().NullEmpty(); + + return converter; + } + + } } diff --git a/src/Libraries/SmartStore.Services/Polls/IPollService.cs b/src/Libraries/SmartStore.Services/Polls/IPollService.cs index bdf19bab73..2aaf474e8c 100644 --- a/src/Libraries/SmartStore.Services/Polls/IPollService.cs +++ b/src/Libraries/SmartStore.Services/Polls/IPollService.cs @@ -22,7 +22,7 @@ public partial interface IPollService /// A value indicating whether to show hidden records /// Poll Poll GetPollBySystemKeyword(string systemKeyword, int languageId, bool showHidden = false); - + /// /// Gets poll collection /// @@ -51,14 +51,14 @@ public partial interface IPollService /// /// Poll void UpdatePoll(Poll poll); - + /// /// Gets a poll answer /// /// Poll answer identifier /// Poll answer PollAnswer GetPollAnswerById(int pollAnswerId); - + /// /// Deletes a poll answer /// diff --git a/src/Libraries/SmartStore.Services/Polls/PollService.cs b/src/Libraries/SmartStore.Services/Polls/PollService.cs index e12cb2f6af..3c06bebc46 100644 --- a/src/Libraries/SmartStore.Services/Polls/PollService.cs +++ b/src/Libraries/SmartStore.Services/Polls/PollService.cs @@ -15,55 +15,55 @@ public partial class PollService : IPollService private readonly IRepository _pollRepository; private readonly IRepository _pollAnswerRepository; private readonly IRepository _pollVotingRecords; - private readonly IRepository _storeMappingRepository; + private readonly IRepository _storeMappingRepository; private readonly IEventPublisher _eventPublisher; - private readonly IStoreContext _storeContext; + private readonly IStoreContext _storeContext; public PollService( - IRepository pollRepository, + IRepository pollRepository, IRepository pollAnswerRepository, IRepository pollVotingRecords, - IRepository storeMappingRepository, - IEventPublisher eventPublisher, - IStoreContext storeContext) + IRepository storeMappingRepository, + IEventPublisher eventPublisher, + IStoreContext storeContext) { this._pollRepository = pollRepository; this._pollAnswerRepository = pollAnswerRepository; this._pollVotingRecords = pollVotingRecords; - this._storeMappingRepository = storeMappingRepository; + this._storeMappingRepository = storeMappingRepository; this._eventPublisher = eventPublisher; - this._storeContext = storeContext; + this._storeContext = storeContext; - this.QuerySettings = DbQuerySettings.Default; + this.QuerySettings = DbQuerySettings.Default; } - public DbQuerySettings QuerySettings { get; set; } - - private IQueryable Filter(IQueryable query, bool showHidden) - { - if (!showHidden) - { - var utcNow = DateTime.UtcNow; - query = query.Where(p => p.Published); - query = query.Where(p => !p.StartDateUtc.HasValue || p.StartDateUtc <= utcNow); - query = query.Where(p => !p.EndDateUtc.HasValue || p.EndDateUtc >= utcNow); - - if (!QuerySettings.IgnoreMultiStore) - { - var currentStoreId = _storeContext.CurrentStore.Id; - - query = - from p in query - join sm in _storeMappingRepository.Table - on new { c1 = p.Id, c2 = "Poll" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into p_sm - from sm in p_sm.DefaultIfEmpty() - where !p.LimitedToStores || currentStoreId == sm.StoreId - select p; - } - } - - return query; - } + public DbQuerySettings QuerySettings { get; set; } + + private IQueryable Filter(IQueryable query, bool showHidden) + { + if (!showHidden) + { + var utcNow = DateTime.UtcNow; + query = query.Where(p => p.Published); + query = query.Where(p => !p.StartDateUtc.HasValue || p.StartDateUtc <= utcNow); + query = query.Where(p => !p.EndDateUtc.HasValue || p.EndDateUtc >= utcNow); + + if (!QuerySettings.IgnoreMultiStore) + { + var currentStoreId = _storeContext.CurrentStore.Id; + + query = + from p in query + join sm in _storeMappingRepository.Table + on new { c1 = p.Id, c2 = "Poll" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into p_sm + from sm in p_sm.DefaultIfEmpty() + where !p.LimitedToStores || currentStoreId == sm.StoreId + select p; + } + } + + return query; + } public virtual Poll GetPollById(int pollId) { @@ -73,38 +73,38 @@ public virtual Poll GetPollById(int pollId) return _pollRepository.GetById(pollId); } - public virtual Poll GetPollBySystemKeyword(string systemKeyword, int languageId, bool showHidden = false) + public virtual Poll GetPollBySystemKeyword(string systemKeyword, int languageId, bool showHidden = false) { if (String.IsNullOrWhiteSpace(systemKeyword)) return null; - var query = - from p in _pollRepository.Table - where p.SystemKeyword == systemKeyword && p.LanguageId == languageId - select p; + var query = + from p in _pollRepository.Table + where p.SystemKeyword == systemKeyword && p.LanguageId == languageId + select p; - query = Filter(query, showHidden); + query = Filter(query, showHidden); var poll = query.FirstOrDefault(); return poll; } - + public virtual IPagedList GetPolls(int languageId, bool loadShownOnHomePageOnly, int pageIndex, int pageSize, bool showHidden = false) { var query = _pollRepository.Table; - query = Filter(query, showHidden); - - if (loadShownOnHomePageOnly) + query = Filter(query, showHidden); + + if (loadShownOnHomePageOnly) { query = query.Where(p => p.ShowOnHomePage); } - - if (languageId > 0) + + if (languageId > 0) { query = query.Where(p => p.LanguageId == languageId); } - - query = query.OrderBy(p => p.DisplayOrder); + + query = query.OrderBy(p => p.DisplayOrder); var polls = new PagedList(query, pageIndex, pageSize); return polls; @@ -133,7 +133,7 @@ public virtual void UpdatePoll(Poll poll) _pollRepository.Update(poll); } - + public virtual PollAnswer GetPollAnswerById(int pollAnswerId) { if (pollAnswerId == 0) @@ -145,7 +145,7 @@ public virtual PollAnswer GetPollAnswerById(int pollAnswerId) var pollAnswer = query.SingleOrDefault(); return pollAnswer; } - + public virtual void DeletePollAnswer(PollAnswer pollAnswer) { if (pollAnswer == null) diff --git a/src/Libraries/SmartStore.Services/ScopedServiceBase.cs b/src/Libraries/SmartStore.Services/ScopedServiceBase.cs index 961fa5cd6f..c75c0849f6 100644 --- a/src/Libraries/SmartStore.Services/ScopedServiceBase.cs +++ b/src/Libraries/SmartStore.Services/ScopedServiceBase.cs @@ -3,65 +3,65 @@ namespace SmartStore.Services { - public abstract class ScopedServiceBase : IScopedService - { - /// - /// Creates a long running unit of work in which cache eviction is suppressed - /// - /// Specifies whether the cache should be evicted completely on batch disposal - /// A disposable unit of work - public IDisposable BeginScope(bool clearCache = true) - { - if (IsInScope) - { - // nested batches are not supported - return ActionDisposable.Empty; - } + public abstract class ScopedServiceBase : IScopedService + { + /// + /// Creates a long running unit of work in which cache eviction is suppressed + /// + /// Specifies whether the cache should be evicted completely on batch disposal + /// A disposable unit of work + public IDisposable BeginScope(bool clearCache = true) + { + if (IsInScope) + { + // nested batches are not supported + return ActionDisposable.Empty; + } - OnBeginScope(); - IsInScope = true; + OnBeginScope(); + IsInScope = true; - return new ActionDisposable(() => - { - IsInScope = false; - OnEndScope(); - if (clearCache && HasChanges) - { - ClearCache(); - } - }); - } + return new ActionDisposable(() => + { + IsInScope = false; + OnEndScope(); + if (clearCache && HasChanges) + { + ClearCache(); + } + }); + } - /// - /// Gets a value indicating whether data has changed during a request, making cache eviction necessary. - /// - /// - /// Cache eviction sets this member to false - /// - public bool HasChanges - { - get; - protected set; - } + /// + /// Gets a value indicating whether data has changed during a request, making cache eviction necessary. + /// + /// + /// Cache eviction sets this member to false + /// + public bool HasChanges + { + get; + protected set; + } - protected bool IsInScope - { - get; - private set; - } + protected bool IsInScope + { + get; + private set; + } - public void ClearCache() - { - if (!IsInScope) - { - OnClearCache(); - HasChanges = false; - } - } + public void ClearCache() + { + if (!IsInScope) + { + OnClearCache(); + HasChanges = false; + } + } - protected abstract void OnClearCache(); + protected abstract void OnClearCache(); - protected virtual void OnBeginScope() { } - protected virtual void OnEndScope() { } - } + protected virtual void OnBeginScope() { } + protected virtual void OnEndScope() { } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchEvents.cs b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchEvents.cs index 44f2bab53f..04d68d3a09 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchEvents.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchEvents.cs @@ -3,31 +3,31 @@ namespace SmartStore.Services.Search { public class CatalogSearchingEvent - { + { public CatalogSearchingEvent(CatalogSearchQuery query, bool direct) { - Guard.NotNull(query, nameof(query)); + Guard.NotNull(query, nameof(query)); - Query = query; + Query = query; Direct = direct; - } + } public bool Direct { get; private set; } public CatalogSearchQuery Query { get; private set; } } - public class CatalogSearchedEvent - { - public CatalogSearchedEvent(CatalogSearchQuery query, CatalogSearchResult result) - { - Guard.NotNull(query, nameof(query)); - Guard.NotNull(result, nameof(result)); + public class CatalogSearchedEvent + { + public CatalogSearchedEvent(CatalogSearchQuery query, CatalogSearchResult result) + { + Guard.NotNull(query, nameof(query)); + Guard.NotNull(result, nameof(result)); - Query = query; - Result = result; - } + Query = query; + Result = result; + } - public CatalogSearchQuery Query { get; private set; } - public CatalogSearchResult Result { get; set; } - } + public CatalogSearchQuery Query { get; private set; } + public CatalogSearchResult Result { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchQuery.cs b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchQuery.cs index e0f172a567..d19d862cc5 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchQuery.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchQuery.cs @@ -7,104 +7,104 @@ namespace SmartStore.Services.Search { public partial class CatalogSearchQuery : SearchQuery, ICloneable - { - /// - /// Initializes a new instance of the class without a search term being set - /// - public CatalogSearchQuery() - : base((string[])null, null) - { - } - - public CatalogSearchQuery(string field, string term, SearchMode mode = SearchMode.Contains, bool escape = true, bool isFuzzySearch = false) - : base(field.HasValue() ? new[] { field } : null, term, mode, escape, isFuzzySearch) - { - } - - public CatalogSearchQuery(string[] fields, string term, SearchMode mode = SearchMode.Contains, bool escape = true, bool isFuzzySearch = false) - : base(fields, term, mode, escape, isFuzzySearch) - { - } - - public CatalogSearchQuery Clone() - { - return (CatalogSearchQuery)this.MemberwiseClone(); - } - - object ICloneable.Clone() - { - return this.MemberwiseClone(); - } - - public bool IsSubPage - { - get - { - if (PageIndex > 0) - { - return true; - } - - var hasActiveFilter = FacetDescriptors.Values.Any(x => x.Values.Any(y => y.IsSelected)); - return hasActiveFilter; - } - } - - #region Fluent builder - - public CatalogSearchQuery SortBy(ProductSortingEnum sort) - { - switch (sort) - { - case ProductSortingEnum.CreatedOnAsc: - case ProductSortingEnum.CreatedOn: - return SortBy(SearchSort.ByDateTimeField("createdon", sort == ProductSortingEnum.CreatedOn)); - - case ProductSortingEnum.NameAsc: - case ProductSortingEnum.NameDesc: - return SortBy(SearchSort.ByStringField("name", sort == ProductSortingEnum.NameDesc)); - - case ProductSortingEnum.PriceAsc: - case ProductSortingEnum.PriceDesc: - return SortBy(SearchSort.ByDoubleField("price", sort == ProductSortingEnum.PriceDesc)); - - case ProductSortingEnum.Relevance: - return SortBy(SearchSort.ByRelevance()); - - default: - return this; - } - } - - /// - /// Only products that are visible in frontend. - /// - /// Customer whose customer roles are to be checked. Can be null. - /// Catalog search query - public CatalogSearchQuery VisibleOnly(Customer customer) - { - if (customer != null) - { + { + /// + /// Initializes a new instance of the class without a search term being set + /// + public CatalogSearchQuery() + : base((string[])null, null) + { + } + + public CatalogSearchQuery(string field, string term, SearchMode mode = SearchMode.Contains, bool escape = true, bool isFuzzySearch = false) + : base(field.HasValue() ? new[] { field } : null, term, mode, escape, isFuzzySearch) + { + } + + public CatalogSearchQuery(string[] fields, string term, SearchMode mode = SearchMode.Contains, bool escape = true, bool isFuzzySearch = false) + : base(fields, term, mode, escape, isFuzzySearch) + { + } + + public CatalogSearchQuery Clone() + { + return (CatalogSearchQuery)this.MemberwiseClone(); + } + + object ICloneable.Clone() + { + return this.MemberwiseClone(); + } + + public bool IsSubPage + { + get + { + if (PageIndex > 0) + { + return true; + } + + var hasActiveFilter = FacetDescriptors.Values.Any(x => x.Values.Any(y => y.IsSelected)); + return hasActiveFilter; + } + } + + #region Fluent builder + + public CatalogSearchQuery SortBy(ProductSortingEnum sort) + { + switch (sort) + { + case ProductSortingEnum.CreatedOnAsc: + case ProductSortingEnum.CreatedOn: + return SortBy(SearchSort.ByDateTimeField("createdon", sort == ProductSortingEnum.CreatedOn)); + + case ProductSortingEnum.NameAsc: + case ProductSortingEnum.NameDesc: + return SortBy(SearchSort.ByStringField("name", sort == ProductSortingEnum.NameDesc)); + + case ProductSortingEnum.PriceAsc: + case ProductSortingEnum.PriceDesc: + return SortBy(SearchSort.ByDoubleField("price", sort == ProductSortingEnum.PriceDesc)); + + case ProductSortingEnum.Relevance: + return SortBy(SearchSort.ByRelevance()); + + default: + return this; + } + } + + /// + /// Only products that are visible in frontend. + /// + /// Customer whose customer roles are to be checked. Can be null. + /// Catalog search query + public CatalogSearchQuery VisibleOnly(Customer customer) + { + if (customer != null) + { var allowedCustomerRoleIds = customer.GetRoleIds(); - return VisibleOnly(allowedCustomerRoleIds); - } + return VisibleOnly(allowedCustomerRoleIds); + } - return VisibleOnly(new int[0]); - } + return VisibleOnly(new int[0]); + } - /// - /// Only products that are visible in frontend. - /// - /// List of allowed customer role ids. Can be null. - public CatalogSearchQuery VisibleOnly(params int[] allowedCustomerRoleIds) - { + /// + /// Only products that are visible in frontend. + /// + /// List of allowed customer role ids. Can be null. + public CatalogSearchQuery VisibleOnly(params int[] allowedCustomerRoleIds) + { PublishedOnly(true); AvailableByDate(true); AllowedCustomerRoles(allowedCustomerRoleIds); - return this; - } + return this; + } public CatalogSearchQuery AllowedCustomerRoles(params int[] customerRoleIds) { @@ -122,9 +122,9 @@ public CatalogSearchQuery AllowedCustomerRoles(params int[] customerRoleIds) } public CatalogSearchQuery PublishedOnly(bool value) - { - return WithFilter(SearchFilter.ByField("published", value).Mandatory().ExactMatch().NotAnalyzed()); - } + { + return WithFilter(SearchFilter.ByField("published", value).Mandatory().ExactMatch().NotAnalyzed()); + } /// /// Filters products based on their stock level. @@ -160,109 +160,109 @@ public CatalogSearchQuery WithVisibility(ProductVisibility value) return WithFilter(SearchFilter.ByField("visibility", (int)value).Mandatory().ExactMatch().NotAnalyzed()); } - public CatalogSearchQuery HasParentGroupedProduct(params int[] parentProductIds) - { + public CatalogSearchQuery HasParentGroupedProduct(params int[] parentProductIds) + { return CreateFilter("parentid", parentProductIds); - } + } - public override CatalogSearchQuery HasStoreId(int id) - { - base.HasStoreId(id); + public override CatalogSearchQuery HasStoreId(int id) + { + base.HasStoreId(id); - if (id == 0) - { + if (id == 0) + { // 0 is ignored in queries, i.e. no filtering takes place. // This should be kept here so that search engines do not provide different results. //WithFilter(SearchFilter.ByField("storeid", 0).ExactMatch().NotAnalyzed()); } - else - { - WithFilter(SearchFilter.Combined( - SearchFilter.ByField("storeid", 0).ExactMatch().NotAnalyzed(), - SearchFilter.ByField("storeid", id).ExactMatch().NotAnalyzed()) - ); - } - - return this; - } - - public CatalogSearchQuery IsProductType(ProductType type) - { - return WithFilter(SearchFilter.ByField("typeid", (int)type).Mandatory().ExactMatch().NotAnalyzed()); - } - - public CatalogSearchQuery WithProductIds(params int[] ids) - { + else + { + WithFilter(SearchFilter.Combined( + SearchFilter.ByField("storeid", 0).ExactMatch().NotAnalyzed(), + SearchFilter.ByField("storeid", id).ExactMatch().NotAnalyzed()) + ); + } + + return this; + } + + public CatalogSearchQuery IsProductType(ProductType type) + { + return WithFilter(SearchFilter.ByField("typeid", (int)type).Mandatory().ExactMatch().NotAnalyzed()); + } + + public CatalogSearchQuery WithProductIds(params int[] ids) + { return CreateFilter("id", ids); - } - - public CatalogSearchQuery WithProductId(int? fromId, int? toId) - { - if (fromId == null && toId == null) - { - return this; - } - - return WithFilter(SearchFilter.ByRange("id", fromId, toId, fromId.HasValue, toId.HasValue).Mandatory().ExactMatch().NotAnalyzed()); - } - - /// - /// Filter by category identifiers. - /// - /// - /// A value indicating whether loaded products are marked as featured (relates only to categories and manufacturers). - /// false to load featured products only, true to load unfeatured products only, null to load all products. - /// - /// The category identifiers. - /// Search query. - public CatalogSearchQuery WithCategoryIds(bool? featuredOnly, params int[] ids) - { - var fieldName = featuredOnly.HasValue + } + + public CatalogSearchQuery WithProductId(int? fromId, int? toId) + { + if (fromId == null && toId == null) + { + return this; + } + + return WithFilter(SearchFilter.ByRange("id", fromId, toId, fromId.HasValue, toId.HasValue).Mandatory().ExactMatch().NotAnalyzed()); + } + + /// + /// Filter by category identifiers. + /// + /// + /// A value indicating whether loaded products are marked as featured (relates only to categories and manufacturers). + /// false to load featured products only, true to load unfeatured products only, null to load all products. + /// + /// The category identifiers. + /// Search query. + public CatalogSearchQuery WithCategoryIds(bool? featuredOnly, params int[] ids) + { + var fieldName = featuredOnly.HasValue ? featuredOnly.Value ? "featuredcategoryid" : "notfeaturedcategoryid" : "categoryid"; return CreateFilter(fieldName, ids); - } - - /// Includes only published categories. - public CatalogSearchQuery HasAnyCategory(bool value) - { - if (value) - { - return WithFilter(SearchFilter.ByRange("categoryid", 1, int.MaxValue, true, true).Mandatory().NotAnalyzed()); - } - else - { - return WithFilter(SearchFilter.ByField("categoryid", 0).Mandatory().ExactMatch().NotAnalyzed()); - } - } - - public CatalogSearchQuery WithManufacturerIds(bool? featuredOnly, params int[] ids) - { - var fieldName = featuredOnly.HasValue + } + + /// Includes only published categories. + public CatalogSearchQuery HasAnyCategory(bool value) + { + if (value) + { + return WithFilter(SearchFilter.ByRange("categoryid", 1, int.MaxValue, true, true).Mandatory().NotAnalyzed()); + } + else + { + return WithFilter(SearchFilter.ByField("categoryid", 0).Mandatory().ExactMatch().NotAnalyzed()); + } + } + + public CatalogSearchQuery WithManufacturerIds(bool? featuredOnly, params int[] ids) + { + var fieldName = featuredOnly.HasValue ? featuredOnly.Value ? "featuredmanufacturerid" : "notfeaturedmanufacturerid" : "manufacturerid"; return CreateFilter(fieldName, ids); - } - - /// Includes only published manufacturers. - public CatalogSearchQuery HasAnyManufacturer(bool value) - { - if (value) - { - return WithFilter(SearchFilter.ByRange("manufacturerid", 1, int.MaxValue, true, true).Mandatory().NotAnalyzed()); - } - else - { - return WithFilter(SearchFilter.ByField("manufacturerid", 0).Mandatory().ExactMatch().NotAnalyzed()); - } - } - - public CatalogSearchQuery WithProductTagIds(params int[] ids) - { + } + + /// Includes only published manufacturers. + public CatalogSearchQuery HasAnyManufacturer(bool value) + { + if (value) + { + return WithFilter(SearchFilter.ByRange("manufacturerid", 1, int.MaxValue, true, true).Mandatory().NotAnalyzed()); + } + else + { + return WithFilter(SearchFilter.ByField("manufacturerid", 0).Mandatory().ExactMatch().NotAnalyzed()); + } + } + + public CatalogSearchQuery WithProductTagIds(params int[] ids) + { return CreateFilter("tagid", ids); - } + } public CatalogSearchQuery WithDeliveryTimeIds(params int[] ids) { @@ -330,16 +330,16 @@ public CatalogSearchQuery WithStockQuantity( int? toQuantity, bool? includeFrom = null, bool? includeTo = null) - { - if (fromQuantity == null && toQuantity == null) - { - return this; - } + { + if (fromQuantity == null && toQuantity == null) + { + return this; + } if (fromQuantity.HasValue && toQuantity.HasValue && fromQuantity == toQuantity) { var forbidden = includeFrom.HasValue && includeTo.HasValue && !includeFrom.Value && !includeTo.Value; - + return WithFilter(SearchFilter.ByField("stockquantity", fromQuantity.Value).Mandatory(!forbidden).ExactMatch().NotAnalyzed()); } else @@ -353,22 +353,22 @@ public CatalogSearchQuery WithStockQuantity( return WithFilter(filter.Mandatory().ExactMatch().NotAnalyzed()); } - } + } public CatalogSearchQuery PriceBetween( decimal? fromPrice, decimal? toPrice, bool? includeFrom = null, bool? includeTo = null) - { - if (fromPrice == null && toPrice == null) - { - return this; - } + { + if (fromPrice == null && toPrice == null) + { + return this; + } - Guard.NotEmpty(CurrencyCode, nameof(CurrencyCode)); + Guard.NotEmpty(CurrencyCode, nameof(CurrencyCode)); - var fieldName = "price_c-" + CurrencyCode.EmptyNull().ToLower(); + var fieldName = "price_c-" + CurrencyCode.EmptyNull().ToLower(); if (fromPrice.HasValue && toPrice.HasValue && fromPrice == toPrice) { @@ -386,18 +386,18 @@ public CatalogSearchQuery PriceBetween( return WithFilter(filter.Mandatory().ExactMatch().NotAnalyzed()); } - } + } - public CatalogSearchQuery CreatedBetween( + public CatalogSearchQuery CreatedBetween( DateTime? fromUtc, DateTime? toUtc, bool? includeFrom = null, bool? includeTo = null) - { - if (fromUtc == null && toUtc == null) - { - return this; - } + { + if (fromUtc == null && toUtc == null) + { + return this; + } if (fromUtc.HasValue && toUtc.HasValue && fromUtc == toUtc) { @@ -416,26 +416,26 @@ public CatalogSearchQuery CreatedBetween( return WithFilter(filter.Mandatory().ExactMatch().NotAnalyzed()); } - } + } - public CatalogSearchQuery WithRating( + public CatalogSearchQuery WithRating( double? fromRate, double? toRate, bool? includeFrom = null, bool? includeTo = null) - { - if (fromRate == null && toRate == null) - { - return this; - } - if (fromRate.HasValue) - { - Guard.InRange(fromRate.Value, 0.0, 5.0, nameof(fromRate.Value)); - } - if (toRate.HasValue) - { - Guard.InRange(toRate.Value, 0.0, 5.0, nameof(toRate.Value)); - } + { + if (fromRate == null && toRate == null) + { + return this; + } + if (fromRate.HasValue) + { + Guard.InRange(fromRate.Value, 0.0, 5.0, nameof(fromRate.Value)); + } + if (toRate.HasValue) + { + Guard.InRange(toRate.Value, 0.0, 5.0, nameof(toRate.Value)); + } if (fromRate.HasValue && toRate.HasValue && fromRate == toRate) { @@ -454,7 +454,7 @@ public CatalogSearchQuery WithRating( return WithFilter(filter.Mandatory().ExactMatch().NotAnalyzed()); } - } + } #endregion } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchResult.cs b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchResult.cs index 48e0ab8632..671840c654 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchResult.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchResult.cs @@ -8,64 +8,64 @@ namespace SmartStore.Services.Search { public partial class CatalogSearchResult - { + { private readonly Func> _hitsFactory; - private IPagedList _hits; + private IPagedList _hits; - public CatalogSearchResult( - ISearchEngine engine, - CatalogSearchQuery query, - int totalHitsCount, + public CatalogSearchResult( + ISearchEngine engine, + CatalogSearchQuery query, + int totalHitsCount, int[] hitsEntityIds, Func> hitsFactory, - string[] spellCheckerSuggestions, - IDictionary facets) - { - Guard.NotNull(query, nameof(query)); + string[] spellCheckerSuggestions, + IDictionary facets) + { + Guard.NotNull(query, nameof(query)); - Engine = engine; - Query = query; - SpellCheckerSuggestions = spellCheckerSuggestions ?? new string[0]; - Facets = facets ?? new Dictionary(); + Engine = engine; + Query = query; + SpellCheckerSuggestions = spellCheckerSuggestions ?? new string[0]; + Facets = facets ?? new Dictionary(); - _hitsFactory = hitsFactory ?? (() => new List()); + _hitsFactory = hitsFactory ?? (() => new List()); HitsEntityIds = hitsEntityIds ?? new int[0]; - TotalHitsCount = totalHitsCount; - } + TotalHitsCount = totalHitsCount; + } - /// - /// Constructor for an instance without any search hits - /// - /// Catalog search query - public CatalogSearchResult(CatalogSearchQuery query) - : this(null, query, 0, null, () => new List(), null, null) - { - } + /// + /// Constructor for an instance without any search hits + /// + /// Catalog search query + public CatalogSearchResult(CatalogSearchQuery query) + : this(null, query, 0, null, () => new List(), null, null) + { + } /// /// Entity identifiers of found products. /// public int[] HitsEntityIds { get; private set; } - /// - /// Products found - /// - public IPagedList Hits - { - get - { - if (_hits == null) - { - var products = TotalHitsCount == 0 - ? new List() - : _hitsFactory.Invoke(); + /// + /// Products found + /// + public IPagedList Hits + { + get + { + if (_hits == null) + { + var products = TotalHitsCount == 0 + ? new List() + : _hitsFactory.Invoke(); - _hits = new PagedList(products, Query.PageIndex, Query.Take, TotalHitsCount); - } + _hits = new PagedList(products, Query.PageIndex, Query.Take, TotalHitsCount); + } - return _hits; - } - } + return _hits; + } + } public int TotalHitsCount { get; } @@ -73,30 +73,30 @@ public IPagedList Hits /// The original catalog search query /// public CatalogSearchQuery Query - { - get; - private set; - } + { + get; + private set; + } - /// - /// Gets spell checking suggestions/corrections - /// - public string[] SpellCheckerSuggestions - { - get; - set; - } + /// + /// Gets spell checking suggestions/corrections + /// + public string[] SpellCheckerSuggestions + { + get; + set; + } - public IDictionary Facets - { - get; - private set; - } + public IDictionary Facets + { + get; + private set; + } - public ISearchEngine Engine - { - get; - private set; - } - } + public ISearchEngine Engine + { + get; + private set; + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchService.cs b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchService.cs index 39f0ed2d80..480c5190d0 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchService.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchService.cs @@ -17,50 +17,50 @@ namespace SmartStore.Services.Search { public partial class CatalogSearchService : SearchServiceBase, ICatalogSearchService, IXmlSitemapPublisher - { - private readonly ICommonServices _services; - private readonly IIndexManager _indexManager; - private readonly Lazy _productService; - private readonly ILogger _logger; - private readonly IPriceFormatter _priceFormatter; - private readonly UrlHelper _urlHelper; - - public CatalogSearchService( - ICommonServices services, - IIndexManager indexManager, - Lazy productService, - ILogger logger, - IPriceFormatter priceFormatter, - UrlHelper urlHelper) - { - _services = services; - _indexManager = indexManager; - _productService = productService; - _logger = logger; - _priceFormatter = priceFormatter; - _urlHelper = urlHelper; - - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - - /// - /// Bypasses the index provider and directly searches in the database - /// - /// Search query - /// LOad flags - /// Catalog search result - protected virtual CatalogSearchResult SearchDirect(CatalogSearchQuery searchQuery, ProductLoadFlags loadFlags = ProductLoadFlags.None) - { - // Fallback to linq search. - var linqCatalogSearchService = _services.Container.ResolveNamed("linq"); - - var result = linqCatalogSearchService.Search(searchQuery, loadFlags, true); - ApplyFacetLabels(result.Facets); - - return result; - } + { + private readonly ICommonServices _services; + private readonly IIndexManager _indexManager; + private readonly Lazy _productService; + private readonly ILogger _logger; + private readonly IPriceFormatter _priceFormatter; + private readonly UrlHelper _urlHelper; + + public CatalogSearchService( + ICommonServices services, + IIndexManager indexManager, + Lazy productService, + ILogger logger, + IPriceFormatter priceFormatter, + UrlHelper urlHelper) + { + _services = services; + _indexManager = indexManager; + _productService = productService; + _logger = logger; + _priceFormatter = priceFormatter; + _urlHelper = urlHelper; + + T = NullLocalizer.Instance; + } + + public Localizer T { get; set; } + + /// + /// Bypasses the index provider and directly searches in the database + /// + /// Search query + /// LOad flags + /// Catalog search result + protected virtual CatalogSearchResult SearchDirect(CatalogSearchQuery searchQuery, ProductLoadFlags loadFlags = ProductLoadFlags.None) + { + // Fallback to linq search. + var linqCatalogSearchService = _services.Container.ResolveNamed("linq"); + + var result = linqCatalogSearchService.Search(searchQuery, loadFlags, true); + ApplyFacetLabels(result.Facets); + + return result; + } protected virtual void ApplyFacetLabels(IDictionary facets) { @@ -142,168 +142,168 @@ protected virtual string FormatPrice(decimal price) } public CatalogSearchResult Search( - CatalogSearchQuery searchQuery, - ProductLoadFlags loadFlags = ProductLoadFlags.None, - bool direct = false) - { - Guard.NotNull(searchQuery, nameof(searchQuery)); - Guard.NotNegative(searchQuery.Take, nameof(searchQuery.Take)); - - var provider = _indexManager.GetIndexProvider("Catalog"); - - if (!direct && provider != null) - { - var indexStore = provider.GetIndexStore("Catalog"); - if (indexStore.Exists) - { - var searchEngine = provider.GetSearchEngine(indexStore, searchQuery); - var stepPrefix = searchEngine.GetType().Name + " - "; - - int totalCount = 0; + CatalogSearchQuery searchQuery, + ProductLoadFlags loadFlags = ProductLoadFlags.None, + bool direct = false) + { + Guard.NotNull(searchQuery, nameof(searchQuery)); + Guard.NotNegative(searchQuery.Take, nameof(searchQuery.Take)); + + var provider = _indexManager.GetIndexProvider("Catalog"); + + if (!direct && provider != null) + { + var indexStore = provider.GetIndexStore("Catalog"); + if (indexStore.Exists) + { + var searchEngine = provider.GetSearchEngine(indexStore, searchQuery); + var stepPrefix = searchEngine.GetType().Name + " - "; + + int totalCount = 0; int[] hitsEntityIds = null; string[] spellCheckerSuggestions = null; - IEnumerable searchHits; - Func> hitsFactory = null; - IDictionary facets = null; - - _services.EventPublisher.Publish(new CatalogSearchingEvent(searchQuery, false)); - - if (searchQuery.Take > 0) - { - using (_services.Chronometer.Step(stepPrefix + "Search")) - { - totalCount = searchEngine.Count(); - // Fix paging boundaries - if (searchQuery.Skip > 0 && searchQuery.Skip >= totalCount) - { - searchQuery.Slice((totalCount / searchQuery.Take) * searchQuery.Take, searchQuery.Take); - } - } - - if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithHits)) - { - using (_services.Chronometer.Step(stepPrefix + "Hits")) - { - searchHits = searchEngine.Search(); - } - - using (_services.Chronometer.Step(stepPrefix + "Collect")) - { + IEnumerable searchHits; + Func> hitsFactory = null; + IDictionary facets = null; + + _services.EventPublisher.Publish(new CatalogSearchingEvent(searchQuery, false)); + + if (searchQuery.Take > 0) + { + using (_services.Chronometer.Step(stepPrefix + "Search")) + { + totalCount = searchEngine.Count(); + // Fix paging boundaries + if (searchQuery.Skip > 0 && searchQuery.Skip >= totalCount) + { + searchQuery.Slice((totalCount / searchQuery.Take) * searchQuery.Take, searchQuery.Take); + } + } + + if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithHits)) + { + using (_services.Chronometer.Step(stepPrefix + "Hits")) + { + searchHits = searchEngine.Search(); + } + + using (_services.Chronometer.Step(stepPrefix + "Collect")) + { hitsEntityIds = searchHits.Select(x => x.EntityId).ToArray(); - hitsFactory = () => _productService.Value.GetProductsByIds(hitsEntityIds, loadFlags); - } - } - - if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithFacets)) - { - try - { - using (_services.Chronometer.Step(stepPrefix + "Facets")) - { - facets = searchEngine.GetFacetMap(); - ApplyFacetLabels(facets); - } - } - catch (Exception ex) - { - _logger.Error(ex); - } - } - } - - if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithSuggestions)) - { - try - { - using (_services.Chronometer.Step(stepPrefix + "Spellcheck")) - { - spellCheckerSuggestions = searchEngine.CheckSpelling(); - } - } - catch (Exception ex) - { - // Spell checking should not break the search. - _logger.Error(ex); - } - } - - var result = new CatalogSearchResult( - searchEngine, - searchQuery, - totalCount, + hitsFactory = () => _productService.Value.GetProductsByIds(hitsEntityIds, loadFlags); + } + } + + if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithFacets)) + { + try + { + using (_services.Chronometer.Step(stepPrefix + "Facets")) + { + facets = searchEngine.GetFacetMap(); + ApplyFacetLabels(facets); + } + } + catch (Exception ex) + { + _logger.Error(ex); + } + } + } + + if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithSuggestions)) + { + try + { + using (_services.Chronometer.Step(stepPrefix + "Spellcheck")) + { + spellCheckerSuggestions = searchEngine.CheckSpelling(); + } + } + catch (Exception ex) + { + // Spell checking should not break the search. + _logger.Error(ex); + } + } + + var result = new CatalogSearchResult( + searchEngine, + searchQuery, + totalCount, hitsEntityIds, hitsFactory, - spellCheckerSuggestions, - facets); + spellCheckerSuggestions, + facets); var searchedEvent = new CatalogSearchedEvent(searchQuery, result); _services.EventPublisher.Publish(searchedEvent); - return searchedEvent.Result; - } - else if (searchQuery.Origin.IsCaseInsensitiveEqual("Search/Search")) - { - IndexingRequiredNotification(_services, _urlHelper); - } - } - - return SearchDirect(searchQuery); - } - - public IQueryable PrepareQuery(CatalogSearchQuery searchQuery, IQueryable baseQuery = null) - { - var linqCatalogSearchService = _services.Container.ResolveNamed("linq"); - return linqCatalogSearchService.PrepareQuery(searchQuery, baseQuery); - } - - #region XML Sitemap - - public XmlSitemapProvider PublishXmlSitemap(XmlSitemapBuildContext context) - { - if (!context.LoadSetting().XmlSitemapIncludesProducts) - return null; - - var searchQuery = new CatalogSearchQuery() - .VisibleOnly(_services.WorkContext.CurrentCustomer) - .WithVisibility(ProductVisibility.Full) - .HasStoreId(context.RequestStoreId); - - var query = PrepareQuery(searchQuery); - - return new ProductXmlSitemapResult { Query = query, Context = context }; - } - - class ProductXmlSitemapResult : XmlSitemapProvider - { - public IQueryable Query { get; set; } - public XmlSitemapBuildContext Context { get; set; } - - public override int GetTotalCount() - { - return Query.Count(); - } - - public override IEnumerable Enlist() - { - var pager = new FastPager(Query.AsNoTracking(), Context.MaximumNodeCount); - - while (pager.ReadNextPage(x => new { x.Id, x.UpdatedOnUtc }, x => x.Id, out var products)) - { - if (Context.CancellationToken.IsCancellationRequested) - { - break; - } - - foreach (var x in products) - { - yield return new NamedEntity { EntityName = "Product", Id = x.Id, LastMod = x.UpdatedOnUtc }; - } - } - } - - public override int Order => int.MaxValue; - } - - #endregion - } + return searchedEvent.Result; + } + else if (searchQuery.Origin.IsCaseInsensitiveEqual("Search/Search")) + { + IndexingRequiredNotification(_services, _urlHelper); + } + } + + return SearchDirect(searchQuery); + } + + public IQueryable PrepareQuery(CatalogSearchQuery searchQuery, IQueryable baseQuery = null) + { + var linqCatalogSearchService = _services.Container.ResolveNamed("linq"); + return linqCatalogSearchService.PrepareQuery(searchQuery, baseQuery); + } + + #region XML Sitemap + + public XmlSitemapProvider PublishXmlSitemap(XmlSitemapBuildContext context) + { + if (!context.LoadSetting().XmlSitemapIncludesProducts) + return null; + + var searchQuery = new CatalogSearchQuery() + .VisibleOnly(_services.WorkContext.CurrentCustomer) + .WithVisibility(ProductVisibility.Full) + .HasStoreId(context.RequestStoreId); + + var query = PrepareQuery(searchQuery); + + return new ProductXmlSitemapResult { Query = query, Context = context }; + } + + class ProductXmlSitemapResult : XmlSitemapProvider + { + public IQueryable Query { get; set; } + public XmlSitemapBuildContext Context { get; set; } + + public override int GetTotalCount() + { + return Query.Count(); + } + + public override IEnumerable Enlist() + { + var pager = new FastPager(Query.AsNoTracking(), Context.MaximumNodeCount); + + while (pager.ReadNextPage(x => new { x.Id, x.UpdatedOnUtc }, x => x.Id, out var products)) + { + if (Context.CancellationToken.IsCancellationRequested) + { + break; + } + + foreach (var x in products) + { + yield return new NamedEntity { EntityName = "Product", Id = x.Id, LastMod = x.UpdatedOnUtc }; + } + } + } + + public override int Order => int.MaxValue; + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/ICatalogSearchService.cs b/src/Libraries/SmartStore.Services/Search/Catalog/ICatalogSearchService.cs index 21ffebbbe1..8327b3bade 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/ICatalogSearchService.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/ICatalogSearchService.cs @@ -4,23 +4,23 @@ namespace SmartStore.Services.Search { - public partial interface ICatalogSearchService - { - /// - /// Searches for products - /// - /// Search term, filters and other parameters used for searching - /// Which product navigation properties to eager load - /// Bypasses the index provider (if available) and directly searches in the database - /// Catalog search result - CatalogSearchResult Search(CatalogSearchQuery searchQuery, ProductLoadFlags loadFlags = ProductLoadFlags.None, bool direct = false); + public partial interface ICatalogSearchService + { + /// + /// Searches for products + /// + /// Search term, filters and other parameters used for searching + /// Which product navigation properties to eager load + /// Bypasses the index provider (if available) and directly searches in the database + /// Catalog search result + CatalogSearchResult Search(CatalogSearchQuery searchQuery, ProductLoadFlags loadFlags = ProductLoadFlags.None, bool direct = false); - /// - /// Builds a product query using linq search - /// - /// Search term, filters and other parameters used for searching - /// Optional query used to build the product query. - /// Product queryable - IQueryable PrepareQuery(CatalogSearchQuery searchQuery, IQueryable baseQuery = null); - } + /// + /// Builds a product query using linq search + /// + /// Search term, filters and other parameters used for searching + /// Optional query used to build the product query. + /// Product queryable + IQueryable PrepareQuery(CatalogSearchQuery searchQuery, IQueryable baseQuery = null); + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/LinqCatalogSearchService.cs b/src/Libraries/SmartStore.Services/Search/Catalog/LinqCatalogSearchService.cs index 45946d64a3..6df8e46af0 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/LinqCatalogSearchService.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/LinqCatalogSearchService.cs @@ -17,48 +17,48 @@ namespace SmartStore.Services.Search { public partial class LinqCatalogSearchService : SearchServiceBase, ICatalogSearchService { - private static int[] _priceThresholds = new int[] { 10, 25, 50, 100, 250, 500, 1000 }; + private static int[] _priceThresholds = new int[] { 10, 25, 50, 100, 250, 500, 1000 }; private readonly ICommonServices _services; private readonly IProductService _productService; - private readonly IRepository _productRepository; - private readonly IRepository _localizedPropertyRepository; - private readonly IRepository _storeMappingRepository; - private readonly IRepository _aclRepository; - private readonly IDeliveryTimeService _deliveryTimeService; - private readonly IManufacturerService _manufacturerService; - private readonly ICategoryService _categoryService; - - public LinqCatalogSearchService( + private readonly IRepository _productRepository; + private readonly IRepository _localizedPropertyRepository; + private readonly IRepository _storeMappingRepository; + private readonly IRepository _aclRepository; + private readonly IDeliveryTimeService _deliveryTimeService; + private readonly IManufacturerService _manufacturerService; + private readonly ICategoryService _categoryService; + + public LinqCatalogSearchService( ICommonServices services, IProductService productService, - IRepository productRepository, - IRepository localizedPropertyRepository, - IRepository storeMappingRepository, - IRepository aclRepository, - IDeliveryTimeService deliveryTimeService, - IManufacturerService manufacturerService, - ICategoryService categoryService) - { + IRepository productRepository, + IRepository localizedPropertyRepository, + IRepository storeMappingRepository, + IRepository aclRepository, + IDeliveryTimeService deliveryTimeService, + IManufacturerService manufacturerService, + ICategoryService categoryService) + { _services = services; _productService = productService; - _productRepository = productRepository; - _localizedPropertyRepository = localizedPropertyRepository; - _storeMappingRepository = storeMappingRepository; - _aclRepository = aclRepository; - _deliveryTimeService = deliveryTimeService; - _manufacturerService = manufacturerService; - _categoryService = categoryService; - - QuerySettings = DbQuerySettings.Default; - } + _productRepository = productRepository; + _localizedPropertyRepository = localizedPropertyRepository; + _storeMappingRepository = storeMappingRepository; + _aclRepository = aclRepository; + _deliveryTimeService = deliveryTimeService; + _manufacturerService = manufacturerService; + _categoryService = categoryService; + + QuerySettings = DbQuerySettings.Default; + } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } #region Utilities - private IQueryable QueryCategories(IQueryable query, List ids, bool? featuredOnly) - { + private IQueryable QueryCategories(IQueryable query, List ids, bool? featuredOnly) + { return from p in query from pc in p.ProductCategories.Where(pc => ids.Contains(pc.CategoryId)) @@ -67,7 +67,7 @@ from pc in p.ProductCategories.Where(pc => ids.Contains(pc.CategoryId)) } private IQueryable QueryManufacturers(IQueryable query, List ids, bool? featuredOnly) - { + { return from p in query from pm in p.ProductManufacturers.Where(pm => ids.Contains(pm.ManufacturerId)) @@ -76,88 +76,88 @@ from pm in p.ProductManufacturers.Where(pm => ids.Contains(pm.ManufacturerId)) } protected virtual IQueryable ApplySearchTerm(IQueryable query, CatalogSearchQuery searchQuery, out bool isGroupingRequired) - { + { isGroupingRequired = false; - var term = searchQuery.Term; - var fields = searchQuery.Fields; - var languageId = searchQuery.LanguageId ?? 0; + var term = searchQuery.Term; + var fields = searchQuery.Fields; + var languageId = searchQuery.LanguageId ?? 0; - if (term.HasValue() && fields != null && fields.Length != 0 && fields.Any(x => x.HasValue())) - { + if (term.HasValue() && fields != null && fields.Length != 0 && fields.Any(x => x.HasValue())) + { isGroupingRequired = true; - // SearchMode.ExactMatch doesn't make sense here - if (searchQuery.Mode == SearchMode.StartsWith) - { - query = - from p in query - join lp in _localizedPropertyRepository.Table on p.Id equals lp.EntityId into plp - from lp in plp.DefaultIfEmpty() - where - (fields.Contains("name") && p.Name.StartsWith(term)) || - (fields.Contains("sku") && p.Sku.StartsWith(term)) || - (fields.Contains("shortdescription") && p.ShortDescription.StartsWith(term)) || - (languageId != 0 && lp.LanguageId == languageId && lp.LocaleKeyGroup == "Product" && lp.LocaleKey == "Name" && lp.LocaleValue.StartsWith(term)) || - (languageId != 0 && lp.LanguageId == languageId && lp.LocaleKeyGroup == "Product" && lp.LocaleKey == "ShortDescription" && lp.LocaleValue.StartsWith(term)) - select p; - } - else - { - query = - from p in query - join lp in _localizedPropertyRepository.Table on p.Id equals lp.EntityId into plp - from lp in plp.DefaultIfEmpty() - where - (fields.Contains("name") && p.Name.Contains(term)) || - (fields.Contains("sku") && p.Sku.Contains(term)) || - (fields.Contains("shortdescription") && p.ShortDescription.Contains(term)) || - (languageId != 0 && lp.LanguageId == languageId && lp.LocaleKeyGroup == "Product" && lp.LocaleKey == "Name" && lp.LocaleValue.Contains(term)) || - (languageId != 0 && lp.LanguageId == languageId && lp.LocaleKeyGroup == "Product" && lp.LocaleKey == "ShortDescription" && lp.LocaleValue.Contains(term)) - select p; - } - } - - return query; - } - - protected virtual IQueryable GetProductQuery(CatalogSearchQuery searchQuery, IQueryable baseQuery) - { - var ordered = false; - var utcNow = DateTime.UtcNow; + // SearchMode.ExactMatch doesn't make sense here + if (searchQuery.Mode == SearchMode.StartsWith) + { + query = + from p in query + join lp in _localizedPropertyRepository.Table on p.Id equals lp.EntityId into plp + from lp in plp.DefaultIfEmpty() + where + (fields.Contains("name") && p.Name.StartsWith(term)) || + (fields.Contains("sku") && p.Sku.StartsWith(term)) || + (fields.Contains("shortdescription") && p.ShortDescription.StartsWith(term)) || + (languageId != 0 && lp.LanguageId == languageId && lp.LocaleKeyGroup == "Product" && lp.LocaleKey == "Name" && lp.LocaleValue.StartsWith(term)) || + (languageId != 0 && lp.LanguageId == languageId && lp.LocaleKeyGroup == "Product" && lp.LocaleKey == "ShortDescription" && lp.LocaleValue.StartsWith(term)) + select p; + } + else + { + query = + from p in query + join lp in _localizedPropertyRepository.Table on p.Id equals lp.EntityId into plp + from lp in plp.DefaultIfEmpty() + where + (fields.Contains("name") && p.Name.Contains(term)) || + (fields.Contains("sku") && p.Sku.Contains(term)) || + (fields.Contains("shortdescription") && p.ShortDescription.Contains(term)) || + (languageId != 0 && lp.LanguageId == languageId && lp.LocaleKeyGroup == "Product" && lp.LocaleKey == "Name" && lp.LocaleValue.Contains(term)) || + (languageId != 0 && lp.LanguageId == languageId && lp.LocaleKeyGroup == "Product" && lp.LocaleKey == "ShortDescription" && lp.LocaleValue.Contains(term)) + select p; + } + } + + return query; + } + + protected virtual IQueryable GetProductQuery(CatalogSearchQuery searchQuery, IQueryable baseQuery) + { + var ordered = false; + var utcNow = DateTime.UtcNow; var categoryId = 0; var manufacturerId = 0; - var query = baseQuery ?? _productRepository.Table; + var query = baseQuery ?? _productRepository.Table; - query = query.Where(x => !x.Deleted && !x.IsSystemProduct); - query = ApplySearchTerm(query, searchQuery, out var isGroupingRequired); + query = query.Where(x => !x.Deleted && !x.IsSystemProduct); + query = ApplySearchTerm(query, searchQuery, out var isGroupingRequired); - #region Filters + #region Filters - var filters = new List(); - FlattenFilters(searchQuery.Filters, filters); + var filters = new List(); + FlattenFilters(searchQuery.Filters, filters); - var productIds = GetIdList(filters, "id"); - if (productIds.Any()) - { + var productIds = GetIdList(filters, "id"); + if (productIds.Any()) + { query = query.Where(x => productIds.Contains(x.Id)); - } + } - var categoryIds = GetIdList(filters, "categoryid"); - if (categoryIds.Any()) - { + var categoryIds = GetIdList(filters, "categoryid"); + if (categoryIds.Any()) + { isGroupingRequired = true; categoryId = categoryIds.First(); - if (categoryIds.Count == 1 && categoryId == 0) - { - // Has no category. - query = query.Where(x => x.ProductCategories.Count == 0); - } - else - { + if (categoryIds.Count == 1 && categoryId == 0) + { + // Has no category. + query = query.Where(x => x.ProductCategories.Count == 0); + } + else + { query = QueryCategories(query, categoryIds, null); - } - } + } + } var featuredCategoryIds = GetIdList(filters, "featuredcategoryid"); var notFeaturedCategoryIds = GetIdList(filters, "notfeaturedcategoryid"); @@ -174,21 +174,21 @@ protected virtual IQueryable GetProductQuery(CatalogSearchQuery searchQ query = QueryCategories(query, notFeaturedCategoryIds, false); } - var manufacturerIds = GetIdList(filters, "manufacturerid"); - if (manufacturerIds.Any()) - { + var manufacturerIds = GetIdList(filters, "manufacturerid"); + if (manufacturerIds.Any()) + { isGroupingRequired = true; manufacturerId = manufacturerIds.First(); - if (manufacturerIds.Count == 1 && manufacturerId == 0) - { - // Has no manufacturer. - query = query.Where(x => x.ProductManufacturers.Count == 0); - } - else - { + if (manufacturerIds.Count == 1 && manufacturerId == 0) + { + // Has no manufacturer. + query = query.Where(x => x.ProductManufacturers.Count == 0); + } + else + { query = QueryManufacturers(query, manufacturerIds, null); - } - } + } + } var featuredManuIds = GetIdList(filters, "featuredmanufacturerid"); var notFeaturedManuIds = GetIdList(filters, "notfeaturedmanufacturerid"); @@ -205,42 +205,42 @@ protected virtual IQueryable GetProductQuery(CatalogSearchQuery searchQ query = QueryManufacturers(query, notFeaturedManuIds, false); } - var tagIds = GetIdList(filters, "tagid"); - if (tagIds.Any()) - { + var tagIds = GetIdList(filters, "tagid"); + if (tagIds.Any()) + { isGroupingRequired = true; query = - from p in query - from pt in p.ProductTags.Where(pt => tagIds.Contains(pt.Id)) - select p; - } - - if (!QuerySettings.IgnoreAcl) - { - var roleIds = GetIdList(filters, "roleid"); - if (roleIds.Any()) - { + from p in query + from pt in p.ProductTags.Where(pt => tagIds.Contains(pt.Id)) + select p; + } + + if (!QuerySettings.IgnoreAcl) + { + var roleIds = GetIdList(filters, "roleid"); + if (roleIds.Any()) + { isGroupingRequired = true; query = - from p in query - join acl in _aclRepository.Table on new { pid = p.Id, pname = "Product" } equals new { pid = acl.EntityId, pname = acl.EntityName } into pacl - from acl in pacl.DefaultIfEmpty() - where !p.SubjectToAcl || roleIds.Contains(acl.CustomerRoleId) - select p; - } - } - - var deliverTimeIds = GetIdList(filters, "deliveryid"); - if (deliverTimeIds.Any()) - { + from p in query + join acl in _aclRepository.Table on new { pid = p.Id, pname = "Product" } equals new { pid = acl.EntityId, pname = acl.EntityName } into pacl + from acl in pacl.DefaultIfEmpty() + where !p.SubjectToAcl || roleIds.Contains(acl.CustomerRoleId) + select p; + } + } + + var deliverTimeIds = GetIdList(filters, "deliveryid"); + if (deliverTimeIds.Any()) + { query = query.Where(x => x.DeliveryTimeId != null && deliverTimeIds.Contains(x.DeliveryTimeId.Value)); - } + } - var parentProductIds = GetIdList(filters, "parentid"); - if (parentProductIds.Any()) - { + var parentProductIds = GetIdList(filters, "parentid"); + if (parentProductIds.Any()) + { query = query.Where(x => parentProductIds.Contains(x.ParentGroupedProductId)); - } + } var conditions = GetIdList(filters, "condition"); if (conditions.Any()) @@ -248,9 +248,9 @@ from acl in pacl.DefaultIfEmpty() query = query.Where(x => conditions.Contains((int)x.Condition)); } - foreach (IAttributeSearchFilter filter in filters) - { - var rf = filter as IRangeSearchFilter; + foreach (IAttributeSearchFilter filter in filters) + { + var rf = filter as IRangeSearchFilter; if (filter.FieldName == "id") { @@ -588,7 +588,7 @@ from sm in psm.DefaultIfEmpty() } } } - } + } #endregion @@ -605,314 +605,314 @@ orderby grp.Key #region Sorting foreach (var sort in searchQuery.Sorting) - { - if (sort.FieldName.IsEmpty()) - { - // Sort by relevance. - if (categoryId != 0) - { - query = OrderBy(ref ordered, query, x => x.ProductCategories.Where(pc => pc.CategoryId == categoryId).FirstOrDefault().DisplayOrder); - } - else if (manufacturerId != 0) - { - query = OrderBy(ref ordered, query, x => x.ProductManufacturers.Where(pm => pm.ManufacturerId == manufacturerId).FirstOrDefault().DisplayOrder); - } - else if (FindFilter(searchQuery.Filters, "parentid") != null) - { - query = OrderBy(ref ordered, query, x => x.DisplayOrder); - } - else - { - query = OrderBy(ref ordered, query, x => x.Name); - } - } - else if (sort.FieldName == "createdon") - { - query = OrderBy(ref ordered, query, x => x.CreatedOnUtc, sort.Descending); - } - else if (sort.FieldName == "name") - { - query = OrderBy(ref ordered, query, x => x.Name, sort.Descending); - } - else if (sort.FieldName == "price") - { - query = OrderBy(ref ordered, query, x => x.Price, sort.Descending); - } - else - { - query = OrderBy(ref ordered, query, x => x.Name); - } - } - - if (!ordered) - { - if (FindFilter(searchQuery.Filters, "parentid") != null) - { - query = query.OrderBy(x => x.DisplayOrder); - } - else - { - query = query.OrderBy(x => x.Id); - } - } + { + if (sort.FieldName.IsEmpty()) + { + // Sort by relevance. + if (categoryId != 0) + { + query = OrderBy(ref ordered, query, x => x.ProductCategories.Where(pc => pc.CategoryId == categoryId).FirstOrDefault().DisplayOrder); + } + else if (manufacturerId != 0) + { + query = OrderBy(ref ordered, query, x => x.ProductManufacturers.Where(pm => pm.ManufacturerId == manufacturerId).FirstOrDefault().DisplayOrder); + } + else if (FindFilter(searchQuery.Filters, "parentid") != null) + { + query = OrderBy(ref ordered, query, x => x.DisplayOrder); + } + else + { + query = OrderBy(ref ordered, query, x => x.Name); + } + } + else if (sort.FieldName == "createdon") + { + query = OrderBy(ref ordered, query, x => x.CreatedOnUtc, sort.Descending); + } + else if (sort.FieldName == "name") + { + query = OrderBy(ref ordered, query, x => x.Name, sort.Descending); + } + else if (sort.FieldName == "price") + { + query = OrderBy(ref ordered, query, x => x.Price, sort.Descending); + } + else + { + query = OrderBy(ref ordered, query, x => x.Name); + } + } + + if (!ordered) + { + if (FindFilter(searchQuery.Filters, "parentid") != null) + { + query = query.OrderBy(x => x.DisplayOrder); + } + else + { + query = query.OrderBy(x => x.Id); + } + } #endregion - return query; - } - - protected virtual IDictionary GetFacets(CatalogSearchQuery searchQuery, int totalHits) - { - var result = new Dictionary(); - var storeId = searchQuery.StoreId ?? _services.StoreContext.CurrentStore.Id; - var languageId = searchQuery.LanguageId ?? _services.WorkContext.WorkingLanguage.Id; - - foreach (var key in searchQuery.FacetDescriptors.Keys) - { - var descriptor = searchQuery.FacetDescriptors[key]; - var facets = new List(); - var kind = FacetGroup.GetKindByKey("Catalog", key); - - switch (kind) - { - case FacetGroupKind.Category: - case FacetGroupKind.Brand: - case FacetGroupKind.DeliveryTime: - case FacetGroupKind.Rating: - case FacetGroupKind.Price: - if (totalHits == 0 && !descriptor.Values.Any(x => x.IsSelected)) - { - continue; - } - break; - } - - if (kind == FacetGroupKind.Category) - { - var categoryTree = _categoryService.GetCategoryTree(0, false, storeId); - var categories = categoryTree.Flatten(false); - - if (descriptor.MaxChoicesCount > 0) - { - categories = categories.Take(descriptor.MaxChoicesCount); - } - - var nameQuery = _localizedPropertyRepository.TableUntracked - .Where(x => x.LocaleKeyGroup == "Category" && x.LocaleKey == "Name" && x.LanguageId == languageId); - var names = nameQuery.ToList().ToDictionarySafe(x => x.EntityId, x => x.LocaleValue); - - foreach (var category in categories) - { - names.TryGetValue(category.Id, out var label); - - facets.Add(new Facet(new FacetValue(category.Id, IndexTypeCode.Int32) - { - IsSelected = descriptor.Values.Any(x => x.IsSelected && x.Value.Equals(category.Id)), - Label = label.HasValue() ? label : category.Name, - DisplayOrder = category.DisplayOrder - })); - } - } - else if (kind == FacetGroupKind.Brand) - { - var manufacturers = _manufacturerService.GetAllManufacturers(null, storeId); - if (descriptor.MaxChoicesCount > 0) - { - manufacturers = manufacturers.Take(descriptor.MaxChoicesCount).ToList(); - } - - var nameQuery = _localizedPropertyRepository.TableUntracked - .Where(x => x.LocaleKeyGroup == "Manufacturer" && x.LocaleKey == "Name" && x.LanguageId == languageId); - var names = nameQuery.ToList().ToDictionarySafe(x => x.EntityId, x => x.LocaleValue); - - foreach (var manu in manufacturers) - { - names.TryGetValue(manu.Id, out var label); - - facets.Add(new Facet(new FacetValue(manu.Id, IndexTypeCode.Int32) - { - IsSelected = descriptor.Values.Any(x => x.IsSelected && x.Value.Equals(manu.Id)), - Label = label.HasValue() ? label : manu.Name, - DisplayOrder = manu.DisplayOrder - })); - } - } - else if (kind == FacetGroupKind.DeliveryTime) - { - var deliveryTimes = _deliveryTimeService.GetAllDeliveryTimes(); - var nameQuery = _localizedPropertyRepository.TableUntracked - .Where(x => x.LocaleKeyGroup == "DeliveryTime" && x.LocaleKey == "Name" && x.LanguageId == languageId); - var names = nameQuery.ToList().ToDictionarySafe(x => x.EntityId, x => x.LocaleValue); - - foreach (var deliveryTime in deliveryTimes) - { - if (descriptor.MaxChoicesCount > 0 && facets.Count >= descriptor.MaxChoicesCount) - break; - - names.TryGetValue(deliveryTime.Id, out var label); - - facets.Add(new Facet(new FacetValue(deliveryTime.Id, IndexTypeCode.Int32) - { - IsSelected = descriptor.Values.Any(x => x.IsSelected && x.Value.Equals(deliveryTime.Id)), - Label = label.HasValue() ? label : deliveryTime.Name, - DisplayOrder = deliveryTime.DisplayOrder - })); - } - } - else if (kind == FacetGroupKind.Price) - { - var count = 0; - var hasActivePredefinedFacet = false; - var minPrice = _productRepository.Table.Where(x => x.Published && !x.Deleted && !x.IsSystemProduct).Min(x => (double)x.Price); - var maxPrice = _productRepository.Table.Where(x => x.Published && !x.Deleted && !x.IsSystemProduct).Max(x => (double)x.Price); - minPrice = FacetUtility.MakePriceEven(minPrice); - maxPrice = FacetUtility.MakePriceEven(maxPrice); - - for (var i = 0; i < _priceThresholds.Length; ++i) - { - if (descriptor.MaxChoicesCount > 0 && facets.Count >= descriptor.MaxChoicesCount) - break; - - var price = _priceThresholds[i]; - if (price < minPrice) - continue; - - if (price >= maxPrice) - i = int.MaxValue - 1; - - var selected = descriptor.Values.Any(x => x.IsSelected && x.Value == null && x.UpperValue != null && (double)x.UpperValue == price); - if (selected) - hasActivePredefinedFacet = true; - - facets.Add(new Facet(new FacetValue(null, price, IndexTypeCode.Double, false, true) - { - DisplayOrder = ++count, - IsSelected = selected - })); - } - - // Add facet for custom price range. - var priceDescriptorValue = descriptor.Values.FirstOrDefault(); - - var customPriceFacetValue = new FacetValue( - priceDescriptorValue != null && !hasActivePredefinedFacet ? priceDescriptorValue.Value : null, - priceDescriptorValue != null && !hasActivePredefinedFacet ? priceDescriptorValue.UpperValue : null, - IndexTypeCode.Double, - true, - true); - - customPriceFacetValue.IsSelected = customPriceFacetValue.Value != null || customPriceFacetValue.UpperValue != null; - - if (!(totalHits == 0 && !customPriceFacetValue.IsSelected)) - { - facets.Insert(0, new Facet("custom", customPriceFacetValue)); - } - } - else if (kind == FacetGroupKind.Rating) - { - foreach (var rating in FacetUtility.GetRatings()) - { - var newFacet = new Facet(rating); - newFacet.Value.IsSelected = descriptor.Values.Any(x => x.IsSelected && x.Value.Equals(rating.Value)); - facets.Add(newFacet); - } - } - else if (kind == FacetGroupKind.Availability || kind == FacetGroupKind.NewArrivals) - { - var value = descriptor.Values.FirstOrDefault(); - if (value != null) - { - if (kind == FacetGroupKind.NewArrivals && totalHits == 0 && !value.IsSelected) - { - continue; - } - - var newValue = value.Clone(); - newValue.Value = true; - newValue.TypeCode = IndexTypeCode.Boolean; - newValue.IsRange = false; - newValue.IsSelected = value.IsSelected; - - facets.Add(new Facet(newValue)); - } - } - - if (facets.Any(x => x.Published)) - { - //facets.Each(x => $"{key} {x.Value.ToString()}".Dump()); - - result.Add(key, new FacetGroup( + return query; + } + + protected virtual IDictionary GetFacets(CatalogSearchQuery searchQuery, int totalHits) + { + var result = new Dictionary(); + var storeId = searchQuery.StoreId ?? _services.StoreContext.CurrentStore.Id; + var languageId = searchQuery.LanguageId ?? _services.WorkContext.WorkingLanguage.Id; + + foreach (var key in searchQuery.FacetDescriptors.Keys) + { + var descriptor = searchQuery.FacetDescriptors[key]; + var facets = new List(); + var kind = FacetGroup.GetKindByKey("Catalog", key); + + switch (kind) + { + case FacetGroupKind.Category: + case FacetGroupKind.Brand: + case FacetGroupKind.DeliveryTime: + case FacetGroupKind.Rating: + case FacetGroupKind.Price: + if (totalHits == 0 && !descriptor.Values.Any(x => x.IsSelected)) + { + continue; + } + break; + } + + if (kind == FacetGroupKind.Category) + { + var categoryTree = _categoryService.GetCategoryTree(0, false, storeId); + var categories = categoryTree.Flatten(false); + + if (descriptor.MaxChoicesCount > 0) + { + categories = categories.Take(descriptor.MaxChoicesCount); + } + + var nameQuery = _localizedPropertyRepository.TableUntracked + .Where(x => x.LocaleKeyGroup == "Category" && x.LocaleKey == "Name" && x.LanguageId == languageId); + var names = nameQuery.ToList().ToDictionarySafe(x => x.EntityId, x => x.LocaleValue); + + foreach (var category in categories) + { + names.TryGetValue(category.Id, out var label); + + facets.Add(new Facet(new FacetValue(category.Id, IndexTypeCode.Int32) + { + IsSelected = descriptor.Values.Any(x => x.IsSelected && x.Value.Equals(category.Id)), + Label = label.HasValue() ? label : category.Name, + DisplayOrder = category.DisplayOrder + })); + } + } + else if (kind == FacetGroupKind.Brand) + { + var manufacturers = _manufacturerService.GetAllManufacturers(null, storeId); + if (descriptor.MaxChoicesCount > 0) + { + manufacturers = manufacturers.Take(descriptor.MaxChoicesCount).ToList(); + } + + var nameQuery = _localizedPropertyRepository.TableUntracked + .Where(x => x.LocaleKeyGroup == "Manufacturer" && x.LocaleKey == "Name" && x.LanguageId == languageId); + var names = nameQuery.ToList().ToDictionarySafe(x => x.EntityId, x => x.LocaleValue); + + foreach (var manu in manufacturers) + { + names.TryGetValue(manu.Id, out var label); + + facets.Add(new Facet(new FacetValue(manu.Id, IndexTypeCode.Int32) + { + IsSelected = descriptor.Values.Any(x => x.IsSelected && x.Value.Equals(manu.Id)), + Label = label.HasValue() ? label : manu.Name, + DisplayOrder = manu.DisplayOrder + })); + } + } + else if (kind == FacetGroupKind.DeliveryTime) + { + var deliveryTimes = _deliveryTimeService.GetAllDeliveryTimes(); + var nameQuery = _localizedPropertyRepository.TableUntracked + .Where(x => x.LocaleKeyGroup == "DeliveryTime" && x.LocaleKey == "Name" && x.LanguageId == languageId); + var names = nameQuery.ToList().ToDictionarySafe(x => x.EntityId, x => x.LocaleValue); + + foreach (var deliveryTime in deliveryTimes) + { + if (descriptor.MaxChoicesCount > 0 && facets.Count >= descriptor.MaxChoicesCount) + break; + + names.TryGetValue(deliveryTime.Id, out var label); + + facets.Add(new Facet(new FacetValue(deliveryTime.Id, IndexTypeCode.Int32) + { + IsSelected = descriptor.Values.Any(x => x.IsSelected && x.Value.Equals(deliveryTime.Id)), + Label = label.HasValue() ? label : deliveryTime.Name, + DisplayOrder = deliveryTime.DisplayOrder + })); + } + } + else if (kind == FacetGroupKind.Price) + { + var count = 0; + var hasActivePredefinedFacet = false; + var minPrice = _productRepository.Table.Where(x => x.Published && !x.Deleted && !x.IsSystemProduct).Min(x => (double)x.Price); + var maxPrice = _productRepository.Table.Where(x => x.Published && !x.Deleted && !x.IsSystemProduct).Max(x => (double)x.Price); + minPrice = FacetUtility.MakePriceEven(minPrice); + maxPrice = FacetUtility.MakePriceEven(maxPrice); + + for (var i = 0; i < _priceThresholds.Length; ++i) + { + if (descriptor.MaxChoicesCount > 0 && facets.Count >= descriptor.MaxChoicesCount) + break; + + var price = _priceThresholds[i]; + if (price < minPrice) + continue; + + if (price >= maxPrice) + i = int.MaxValue - 1; + + var selected = descriptor.Values.Any(x => x.IsSelected && x.Value == null && x.UpperValue != null && (double)x.UpperValue == price); + if (selected) + hasActivePredefinedFacet = true; + + facets.Add(new Facet(new FacetValue(null, price, IndexTypeCode.Double, false, true) + { + DisplayOrder = ++count, + IsSelected = selected + })); + } + + // Add facet for custom price range. + var priceDescriptorValue = descriptor.Values.FirstOrDefault(); + + var customPriceFacetValue = new FacetValue( + priceDescriptorValue != null && !hasActivePredefinedFacet ? priceDescriptorValue.Value : null, + priceDescriptorValue != null && !hasActivePredefinedFacet ? priceDescriptorValue.UpperValue : null, + IndexTypeCode.Double, + true, + true); + + customPriceFacetValue.IsSelected = customPriceFacetValue.Value != null || customPriceFacetValue.UpperValue != null; + + if (!(totalHits == 0 && !customPriceFacetValue.IsSelected)) + { + facets.Insert(0, new Facet("custom", customPriceFacetValue)); + } + } + else if (kind == FacetGroupKind.Rating) + { + foreach (var rating in FacetUtility.GetRatings()) + { + var newFacet = new Facet(rating); + newFacet.Value.IsSelected = descriptor.Values.Any(x => x.IsSelected && x.Value.Equals(rating.Value)); + facets.Add(newFacet); + } + } + else if (kind == FacetGroupKind.Availability || kind == FacetGroupKind.NewArrivals) + { + var value = descriptor.Values.FirstOrDefault(); + if (value != null) + { + if (kind == FacetGroupKind.NewArrivals && totalHits == 0 && !value.IsSelected) + { + continue; + } + + var newValue = value.Clone(); + newValue.Value = true; + newValue.TypeCode = IndexTypeCode.Boolean; + newValue.IsRange = false; + newValue.IsSelected = value.IsSelected; + + facets.Add(new Facet(newValue)); + } + } + + if (facets.Any(x => x.Published)) + { + //facets.Each(x => $"{key} {x.Value.ToString()}".Dump()); + + result.Add(key, new FacetGroup( "Catalog", key, - descriptor.Label, - descriptor.IsMultiSelect, - false, - descriptor.DisplayOrder, - facets.OrderBy(descriptor))); - } - } - - return result; - } + descriptor.Label, + descriptor.IsMultiSelect, + false, + descriptor.DisplayOrder, + facets.OrderBy(descriptor))); + } + } + + return result; + } #endregion - public CatalogSearchResult Search(CatalogSearchQuery searchQuery, ProductLoadFlags loadFlags = ProductLoadFlags.None, bool direct = false) - { + public CatalogSearchResult Search(CatalogSearchQuery searchQuery, ProductLoadFlags loadFlags = ProductLoadFlags.None, bool direct = false) + { _services.EventPublisher.Publish(new CatalogSearchingEvent(searchQuery, true)); - var totalHits = 0; + var totalHits = 0; int[] hitsEntityIds = null; Func> hitsFactory = null; - IDictionary facets = null; + IDictionary facets = null; - if (searchQuery.Take > 0) - { - var query = GetProductQuery(searchQuery, null); + if (searchQuery.Take > 0) + { + var query = GetProductQuery(searchQuery, null); - totalHits = query.Count(); + totalHits = query.Count(); - // Fix paging boundaries - if (searchQuery.Skip > 0 && searchQuery.Skip >= totalHits) - { - searchQuery.Slice((totalHits / searchQuery.Take) * searchQuery.Take, searchQuery.Take); - } + // Fix paging boundaries + if (searchQuery.Skip > 0 && searchQuery.Skip >= totalHits) + { + searchQuery.Slice((totalHits / searchQuery.Take) * searchQuery.Take, searchQuery.Take); + } - if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithHits)) - { + if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithHits)) + { var skip = searchQuery.PageIndex * searchQuery.Take; query = query - .Skip(() => skip) - .Take(() => searchQuery.Take); + .Skip(() => skip) + .Take(() => searchQuery.Take); hitsEntityIds = query.Select(x => x.Id).ToArray(); - hitsFactory = () => _productService.GetProductsByIds(hitsEntityIds, loadFlags); - } - - if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithFacets) && searchQuery.FacetDescriptors.Any()) - { - facets = GetFacets(searchQuery, totalHits); - } - } - - var result = new CatalogSearchResult( - null, - searchQuery, - totalHits, + hitsFactory = () => _productService.GetProductsByIds(hitsEntityIds, loadFlags); + } + + if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithFacets) && searchQuery.FacetDescriptors.Any()) + { + facets = GetFacets(searchQuery, totalHits); + } + } + + var result = new CatalogSearchResult( + null, + searchQuery, + totalHits, hitsEntityIds, hitsFactory, - null, - facets); + null, + facets); - _services.EventPublisher.Publish(new CatalogSearchedEvent(searchQuery, result)); + _services.EventPublisher.Publish(new CatalogSearchedEvent(searchQuery, result)); - return result; - } + return result; + } - public IQueryable PrepareQuery(CatalogSearchQuery searchQuery, IQueryable baseQuery = null) - { - return GetProductQuery(searchQuery, baseQuery); - } - } + public IQueryable PrepareQuery(CatalogSearchQuery searchQuery, IQueryable baseQuery = null) + { + return GetProductQuery(searchQuery, baseQuery); + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryAliasMapper.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryAliasMapper.cs index 6cfae38fd0..18e94da4a2 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryAliasMapper.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryAliasMapper.cs @@ -15,60 +15,60 @@ namespace SmartStore.Services.Search.Modelling { public class CatalogSearchQueryAliasMapper : ICatalogSearchQueryAliasMapper - { - private const string ALL_ATTRIBUTE_ID_BY_ALIAS_KEY = "search:attribute.id.alias.mappings.all"; - private const string ALL_ATTRIBUTE_ALIAS_BY_ID_KEY = "search:attribute.alias.id.mappings.all"; - private const string ALL_COMMONFACET_ALIAS_BY_KIND_KEY = "search:commonfacet.alias.kind.mappings.all"; - - private const string ALL_VARIANT_ID_BY_ALIAS_KEY = "search:variant.id.alias.mappings.all"; - private const string ALL_VARIANT_ALIAS_BY_ID_KEY = "search:variant.alias.id.mappings.all"; - - private readonly ICacheManager _cacheManager; - private readonly IRepository _localizedPropertyRepository; - private readonly IRepository _productAttributeRepository; - private readonly IRepository _productVariantAttributeValueRepository; - private readonly ISpecificationAttributeService _specificationAttributeService; - private readonly ISettingService _settingService; - private readonly ILanguageService _languageService; - - public CatalogSearchQueryAliasMapper( - ICacheManager cacheManager, - IRepository localizedPropertyRepository, - IRepository productAttributeRepository, - IRepository productVariantAttributeValueRepository, - ISpecificationAttributeService specificationAttributeService, - ISettingService settingService, - ILanguageService languageService) - { - _cacheManager = cacheManager; - _localizedPropertyRepository = localizedPropertyRepository; - _productAttributeRepository = productAttributeRepository; - _productVariantAttributeValueRepository = productVariantAttributeValueRepository; - _specificationAttributeService = specificationAttributeService; - _settingService = settingService; - _languageService = languageService; - } - - protected string CreateKey(string prefix, int languageId, string alias) - { - return $"{prefix}.{languageId}.{alias}"; - } - protected string CreateKey(string prefix, int languageId, int attributeId) - { - return $"{prefix}.{languageId}.{attributeId}"; - } - - protected string CreateOptionKey(string prefix, int languageId, int attributeId, string optionAlias) - { - return $"{prefix}.{languageId}.{attributeId}.{optionAlias}"; - } - protected string CreateOptionKey(string prefix, int languageId, int optionId) - { - return $"{prefix}.{languageId}.{optionId}"; - } - - protected void CachedLocalizedAlias(string localeKeyGroup, Action caching) - { + { + private const string ALL_ATTRIBUTE_ID_BY_ALIAS_KEY = "search:attribute.id.alias.mappings.all"; + private const string ALL_ATTRIBUTE_ALIAS_BY_ID_KEY = "search:attribute.alias.id.mappings.all"; + private const string ALL_COMMONFACET_ALIAS_BY_KIND_KEY = "search:commonfacet.alias.kind.mappings.all"; + + private const string ALL_VARIANT_ID_BY_ALIAS_KEY = "search:variant.id.alias.mappings.all"; + private const string ALL_VARIANT_ALIAS_BY_ID_KEY = "search:variant.alias.id.mappings.all"; + + private readonly ICacheManager _cacheManager; + private readonly IRepository _localizedPropertyRepository; + private readonly IRepository _productAttributeRepository; + private readonly IRepository _productVariantAttributeValueRepository; + private readonly ISpecificationAttributeService _specificationAttributeService; + private readonly ISettingService _settingService; + private readonly ILanguageService _languageService; + + public CatalogSearchQueryAliasMapper( + ICacheManager cacheManager, + IRepository localizedPropertyRepository, + IRepository productAttributeRepository, + IRepository productVariantAttributeValueRepository, + ISpecificationAttributeService specificationAttributeService, + ISettingService settingService, + ILanguageService languageService) + { + _cacheManager = cacheManager; + _localizedPropertyRepository = localizedPropertyRepository; + _productAttributeRepository = productAttributeRepository; + _productVariantAttributeValueRepository = productVariantAttributeValueRepository; + _specificationAttributeService = specificationAttributeService; + _settingService = settingService; + _languageService = languageService; + } + + protected string CreateKey(string prefix, int languageId, string alias) + { + return $"{prefix}.{languageId}.{alias}"; + } + protected string CreateKey(string prefix, int languageId, int attributeId) + { + return $"{prefix}.{languageId}.{attributeId}"; + } + + protected string CreateOptionKey(string prefix, int languageId, int attributeId, string optionAlias) + { + return $"{prefix}.{languageId}.{attributeId}.{optionAlias}"; + } + protected string CreateOptionKey(string prefix, int languageId, int optionId) + { + return $"{prefix}.{languageId}.{optionId}"; + } + + protected void CachedLocalizedAlias(string localeKeyGroup, Action caching) + { var properties = _localizedPropertyRepository.TableUntracked .Where(x => x.LocaleKeyGroup == localeKeyGroup && x.LocaleKey == "Alias") .ToList(); @@ -78,418 +78,418 @@ protected void CachedLocalizedAlias(string localeKeyGroup, Action !string.IsNullOrWhiteSpace(x.LocaleValue)) .ToList() .ForEach(caching); - } - - #region Specification Attributes - - protected virtual IDictionary GetAttributeIdByAliasMappings() - { - return _cacheManager.Get(ALL_ATTRIBUTE_ID_BY_ALIAS_KEY, () => - { - var result = new Dictionary(StringComparer.OrdinalIgnoreCase); - var optionIdMappings = new Dictionary(); - IPagedList attributes = null; - var attributeId = 0; - var pageIndex = 0; - - var query = _specificationAttributeService.GetSpecificationAttributes() - .Expand(x => x.SpecificationAttributeOptions) - .OrderBy(x => x.Id); - - do - { - attributes = new PagedList(query, pageIndex++, 500); - - foreach (var attribute in attributes) - { - if (attribute.Alias.HasValue()) - { - result[CreateKey("attr", 0, attribute.Alias)] = attribute.Id; - } - - foreach (var option in attribute.SpecificationAttributeOptions) - { - optionIdMappings[option.Id] = option.SpecificationAttributeId; - - if (option.Alias.HasValue()) - { - result[CreateOptionKey("attr.option", 0, attribute.Id, option.Alias)] = option.Id; - } - } - } - } - while (attributes.HasNextPage); - - attributes.Clear(); - - CachedLocalizedAlias("SpecificationAttribute", x => result[CreateKey("attr", x.LanguageId, x.LocaleValue)] = x.EntityId); - CachedLocalizedAlias("SpecificationAttributeOption", x => - { - if (optionIdMappings.TryGetValue(x.EntityId, out attributeId)) - result[CreateOptionKey("attr.option", x.LanguageId, attributeId, x.LocaleValue)] = x.EntityId; - }); - - return result; - }); - } - - protected virtual IDictionary GetAttributeAliasByIdMappings() - { - return _cacheManager.Get(ALL_ATTRIBUTE_ALIAS_BY_ID_KEY, () => - { - var result = new Dictionary(StringComparer.OrdinalIgnoreCase); - IPagedList attributes = null; - var pageIndex = 0; - - var query = _specificationAttributeService.GetSpecificationAttributes() - .Expand(x => x.SpecificationAttributeOptions) - .OrderBy(x => x.Id); - - do - { - attributes = new PagedList(query, pageIndex++, 500); - - foreach (var attribute in attributes) - { - if (attribute.Alias.HasValue()) - { - result[CreateKey("attr", 0, attribute.Id)] = attribute.Alias; - } - - foreach (var option in attribute.SpecificationAttributeOptions.Where(x => x.Alias.HasValue())) - { - result[CreateOptionKey("attr.option", 0, option.Id)] = option.Alias; - } - } - } - while (attributes.HasNextPage); - - attributes.Clear(); - - CachedLocalizedAlias("SpecificationAttribute", x => result[CreateKey("attr", x.LanguageId, x.EntityId)] = x.LocaleValue); - CachedLocalizedAlias("SpecificationAttributeOption", x => result[CreateOptionKey("attr.option", x.LanguageId, x.EntityId)] = x.LocaleValue); - - return result; - }); - } - - public void ClearAttributeCache() - { - _cacheManager.Remove(ALL_ATTRIBUTE_ID_BY_ALIAS_KEY); - _cacheManager.Remove(ALL_ATTRIBUTE_ALIAS_BY_ID_KEY); - } - - public int GetAttributeIdByAlias(string attributeAlias, int languageId = 0) - { - var result = 0; - - if (attributeAlias.HasValue()) - { - var mappings = GetAttributeIdByAliasMappings(); - - if (!mappings.TryGetValue(CreateKey("attr", languageId, attributeAlias), out result) && languageId != 0) - { - mappings.TryGetValue(CreateKey("attr", 0, attributeAlias), out result); - } - } - - return result; - } - - public int GetAttributeOptionIdByAlias(string optionAlias, int attributeId, int languageId = 0) - { - var result = 0; - - if (optionAlias.HasValue() && attributeId != 0) - { - var mappings = GetAttributeIdByAliasMappings(); - - if (!mappings.TryGetValue(CreateOptionKey("attr.option", languageId, attributeId, optionAlias), out result) && languageId != 0) - { - mappings.TryGetValue(CreateOptionKey("attr.option", 0, attributeId, optionAlias), out result); - } - } - - return result; - } - - public string GetAttributeAliasById(int attributeId, int languageId = 0) - { - string result = null; - - if (attributeId != 0) - { - var mappings = GetAttributeAliasByIdMappings(); - - if (!mappings.TryGetValue(CreateKey("attr", languageId, attributeId), out result) && languageId != 0) - { - mappings.TryGetValue(CreateKey("attr", 0, attributeId), out result); - } - } - - return result; - } - - public string GetAttributeOptionAliasById(int optionId, int languageId = 0) - { - string result = null; - - if (optionId != 0) - { - var mappings = GetAttributeAliasByIdMappings(); - - if (!mappings.TryGetValue(CreateOptionKey("attr.option", languageId, optionId), out result) && languageId != 0) - { - mappings.TryGetValue(CreateOptionKey("attr.option", 0, optionId), out result); - } - } - - return result; - } - - #endregion - - #region Product Variants - - protected virtual IDictionary GetVariantIdByAliasMappings() - { - return _cacheManager.Get(ALL_VARIANT_ID_BY_ALIAS_KEY, () => - { - var result = new Dictionary(StringComparer.OrdinalIgnoreCase); - IPagedList variants = null; - IPagedList options = null; - var variantId = 0; - var pageIndex = 0; - - var variantQuery = _productAttributeRepository.TableUntracked - .Where(x => !string.IsNullOrEmpty(x.Alias)) - .OrderBy(x => x.Id); - - var optionQuery = _productVariantAttributeValueRepository.TableUntracked - .Expand(x => x.ProductVariantAttribute) - .Expand("ProductVariantAttribute.ProductAttribute") - .Where(x => !string.IsNullOrEmpty(x.Alias)) - .OrderBy(x => x.Id); - - do - { - variants = new PagedList(variantQuery, pageIndex++, 500); - - foreach (var variant in variants) - { - result[CreateKey("vari", 0, variant.Alias)] = variant.Id; - } - } - while (variants.HasNextPage); - pageIndex = 0; - variants.Clear(); - - do - { - options = new PagedList(optionQuery, pageIndex++, 500); - - foreach (var option in options) - { - var variant = option.ProductVariantAttribute.ProductAttribute; - result[CreateOptionKey("vari.option", 0, variant.Id, option.Alias)] = option.Id; - } - } - while (options.HasNextPage); - options.Clear(); - - var optionIdMappings = _productVariantAttributeValueRepository.TableUntracked - .Expand(x => x.ProductVariantAttribute.ProductAttribute) - .Select(x => new - { - OptionId = x.Id, - VariantId = x.ProductVariantAttribute.ProductAttribute.Id - }) - .ToDictionary(x => x.OptionId, x => x.VariantId); - - CachedLocalizedAlias("ProductAttribute", x => result[CreateKey("vari", x.LanguageId, x.LocaleValue)] = x.EntityId); - CachedLocalizedAlias("ProductVariantAttributeValue", x => - { - if (optionIdMappings.TryGetValue(x.EntityId, out variantId)) - result[CreateOptionKey("vari.option", x.LanguageId, variantId, x.LocaleValue)] = x.EntityId; - }); - - return result; - }); - } - - protected virtual IDictionary GetVariantAliasByIdMappings() - { - return _cacheManager.Get(ALL_VARIANT_ALIAS_BY_ID_KEY, () => - { - var result = new Dictionary(StringComparer.OrdinalIgnoreCase); - IPagedList variants = null; - IPagedList options = null; - var pageIndex = 0; - - var variantQuery = _productAttributeRepository.TableUntracked - .Where(x => !string.IsNullOrEmpty(x.Alias)) - .OrderBy(x => x.Id); - - var optionQuery = _productVariantAttributeValueRepository.TableUntracked - .Where(x => !string.IsNullOrEmpty(x.Alias)) - .OrderBy(x => x.Id); - - do - { - variants = new PagedList(variantQuery, pageIndex++, 500); - - foreach (var variant in variants) - { - result[CreateKey("vari", 0, variant.Id)] = variant.Alias; - } - } - while (variants.HasNextPage); - pageIndex = 0; - variants.Clear(); - - do - { - options = new PagedList(optionQuery, pageIndex++, 500); - - foreach (var option in options) - { - result[CreateOptionKey("attr.option", 0, option.Id)] = option.Alias; - } - } - while (options.HasNextPage); - options.Clear(); - - CachedLocalizedAlias("ProductAttribute", x => result[CreateKey("vari", x.LanguageId, x.EntityId)] = x.LocaleValue); - CachedLocalizedAlias("ProductVariantAttributeValue", x => result[CreateOptionKey("vari.option", x.LanguageId, x.EntityId)] = x.LocaleValue); - - return result; - }); - } - - public void ClearVariantCache() - { - _cacheManager.Remove(ALL_VARIANT_ID_BY_ALIAS_KEY); - _cacheManager.Remove(ALL_VARIANT_ALIAS_BY_ID_KEY); - } - - public int GetVariantIdByAlias(string variantAlias, int languageId = 0) - { - var result = 0; - - if (variantAlias.HasValue()) - { - var mappings = GetVariantIdByAliasMappings(); - - if (!mappings.TryGetValue(CreateKey("vari", languageId, variantAlias), out result) && languageId != 0) - { - mappings.TryGetValue(CreateKey("vari", 0, variantAlias), out result); - } - } - - return result; - } - - public int GetVariantOptionIdByAlias(string optionAlias, int variantId, int languageId = 0) - { - var result = 0; - - if (optionAlias.HasValue() && variantId != 0) - { - var mappings = GetVariantIdByAliasMappings(); - - if (!mappings.TryGetValue(CreateOptionKey("vari.option", languageId, variantId, optionAlias), out result) && languageId != 0) - { - mappings.TryGetValue(CreateOptionKey("vari.option", 0, variantId, optionAlias), out result); - } - } - - return result; - } - - public string GetVariantAliasById(int variantId, int languageId = 0) - { - string result = null; - - if (variantId != 0) - { - var mappings = GetVariantAliasByIdMappings(); - - if (!mappings.TryGetValue(CreateKey("vari", languageId, variantId), out result) && languageId != 0) - { - mappings.TryGetValue(CreateKey("vari", 0, variantId), out result); - } - } - - return result; - } - - public string GetVariantOptionAliasById(int optionId, int languageId = 0) - { - string result = null; - - if (optionId != 0) - { - var mappings = GetVariantAliasByIdMappings(); - - if (!mappings.TryGetValue(CreateOptionKey("vari.option", languageId, optionId), out result) && languageId != 0) - { - mappings.TryGetValue(CreateOptionKey("vari.option", 0, optionId), out result); - } - } - - return result; - } - - #endregion - - #region Common Facets - - protected virtual IDictionary GetCommonFacetAliasByGroupKindMappings() - { - return _cacheManager.Get(ALL_COMMONFACET_ALIAS_BY_KIND_KEY, () => - { - var result = new Dictionary(StringComparer.OrdinalIgnoreCase); - - var groupKinds = new FacetGroupKind[] - { - FacetGroupKind.Category, - FacetGroupKind.Brand, - FacetGroupKind.Price, - FacetGroupKind.Rating, - FacetGroupKind.DeliveryTime, - FacetGroupKind.Availability, - FacetGroupKind.NewArrivals - }; - - foreach (var language in _languageService.GetAllLanguages()) - { - foreach (var groupKind in groupKinds) - { - var key = FacetUtility.GetFacetAliasSettingKey(groupKind, language.Id); - var value = _settingService.GetSettingByKey(key); - if (value.HasValue()) - { - result.Add(key, value); - } - } - } - - return result; - }); - } - - public void ClearCommonFacetCache() - { - _cacheManager.Remove(ALL_COMMONFACET_ALIAS_BY_KIND_KEY); - } - - public string GetCommonFacetAliasByGroupKind(FacetGroupKind kind, int languageId) - { - var mappings = GetCommonFacetAliasByGroupKindMappings(); - - return mappings.Get(FacetUtility.GetFacetAliasSettingKey(kind, languageId)); - } - - #endregion - } + } + + #region Specification Attributes + + protected virtual IDictionary GetAttributeIdByAliasMappings() + { + return _cacheManager.Get(ALL_ATTRIBUTE_ID_BY_ALIAS_KEY, () => + { + var result = new Dictionary(StringComparer.OrdinalIgnoreCase); + var optionIdMappings = new Dictionary(); + IPagedList attributes = null; + var attributeId = 0; + var pageIndex = 0; + + var query = _specificationAttributeService.GetSpecificationAttributes() + .Expand(x => x.SpecificationAttributeOptions) + .OrderBy(x => x.Id); + + do + { + attributes = new PagedList(query, pageIndex++, 500); + + foreach (var attribute in attributes) + { + if (attribute.Alias.HasValue()) + { + result[CreateKey("attr", 0, attribute.Alias)] = attribute.Id; + } + + foreach (var option in attribute.SpecificationAttributeOptions) + { + optionIdMappings[option.Id] = option.SpecificationAttributeId; + + if (option.Alias.HasValue()) + { + result[CreateOptionKey("attr.option", 0, attribute.Id, option.Alias)] = option.Id; + } + } + } + } + while (attributes.HasNextPage); + + attributes.Clear(); + + CachedLocalizedAlias("SpecificationAttribute", x => result[CreateKey("attr", x.LanguageId, x.LocaleValue)] = x.EntityId); + CachedLocalizedAlias("SpecificationAttributeOption", x => + { + if (optionIdMappings.TryGetValue(x.EntityId, out attributeId)) + result[CreateOptionKey("attr.option", x.LanguageId, attributeId, x.LocaleValue)] = x.EntityId; + }); + + return result; + }); + } + + protected virtual IDictionary GetAttributeAliasByIdMappings() + { + return _cacheManager.Get(ALL_ATTRIBUTE_ALIAS_BY_ID_KEY, () => + { + var result = new Dictionary(StringComparer.OrdinalIgnoreCase); + IPagedList attributes = null; + var pageIndex = 0; + + var query = _specificationAttributeService.GetSpecificationAttributes() + .Expand(x => x.SpecificationAttributeOptions) + .OrderBy(x => x.Id); + + do + { + attributes = new PagedList(query, pageIndex++, 500); + + foreach (var attribute in attributes) + { + if (attribute.Alias.HasValue()) + { + result[CreateKey("attr", 0, attribute.Id)] = attribute.Alias; + } + + foreach (var option in attribute.SpecificationAttributeOptions.Where(x => x.Alias.HasValue())) + { + result[CreateOptionKey("attr.option", 0, option.Id)] = option.Alias; + } + } + } + while (attributes.HasNextPage); + + attributes.Clear(); + + CachedLocalizedAlias("SpecificationAttribute", x => result[CreateKey("attr", x.LanguageId, x.EntityId)] = x.LocaleValue); + CachedLocalizedAlias("SpecificationAttributeOption", x => result[CreateOptionKey("attr.option", x.LanguageId, x.EntityId)] = x.LocaleValue); + + return result; + }); + } + + public void ClearAttributeCache() + { + _cacheManager.Remove(ALL_ATTRIBUTE_ID_BY_ALIAS_KEY); + _cacheManager.Remove(ALL_ATTRIBUTE_ALIAS_BY_ID_KEY); + } + + public int GetAttributeIdByAlias(string attributeAlias, int languageId = 0) + { + var result = 0; + + if (attributeAlias.HasValue()) + { + var mappings = GetAttributeIdByAliasMappings(); + + if (!mappings.TryGetValue(CreateKey("attr", languageId, attributeAlias), out result) && languageId != 0) + { + mappings.TryGetValue(CreateKey("attr", 0, attributeAlias), out result); + } + } + + return result; + } + + public int GetAttributeOptionIdByAlias(string optionAlias, int attributeId, int languageId = 0) + { + var result = 0; + + if (optionAlias.HasValue() && attributeId != 0) + { + var mappings = GetAttributeIdByAliasMappings(); + + if (!mappings.TryGetValue(CreateOptionKey("attr.option", languageId, attributeId, optionAlias), out result) && languageId != 0) + { + mappings.TryGetValue(CreateOptionKey("attr.option", 0, attributeId, optionAlias), out result); + } + } + + return result; + } + + public string GetAttributeAliasById(int attributeId, int languageId = 0) + { + string result = null; + + if (attributeId != 0) + { + var mappings = GetAttributeAliasByIdMappings(); + + if (!mappings.TryGetValue(CreateKey("attr", languageId, attributeId), out result) && languageId != 0) + { + mappings.TryGetValue(CreateKey("attr", 0, attributeId), out result); + } + } + + return result; + } + + public string GetAttributeOptionAliasById(int optionId, int languageId = 0) + { + string result = null; + + if (optionId != 0) + { + var mappings = GetAttributeAliasByIdMappings(); + + if (!mappings.TryGetValue(CreateOptionKey("attr.option", languageId, optionId), out result) && languageId != 0) + { + mappings.TryGetValue(CreateOptionKey("attr.option", 0, optionId), out result); + } + } + + return result; + } + + #endregion + + #region Product Variants + + protected virtual IDictionary GetVariantIdByAliasMappings() + { + return _cacheManager.Get(ALL_VARIANT_ID_BY_ALIAS_KEY, () => + { + var result = new Dictionary(StringComparer.OrdinalIgnoreCase); + IPagedList variants = null; + IPagedList options = null; + var variantId = 0; + var pageIndex = 0; + + var variantQuery = _productAttributeRepository.TableUntracked + .Where(x => !string.IsNullOrEmpty(x.Alias)) + .OrderBy(x => x.Id); + + var optionQuery = _productVariantAttributeValueRepository.TableUntracked + .Expand(x => x.ProductVariantAttribute) + .Expand("ProductVariantAttribute.ProductAttribute") + .Where(x => !string.IsNullOrEmpty(x.Alias)) + .OrderBy(x => x.Id); + + do + { + variants = new PagedList(variantQuery, pageIndex++, 500); + + foreach (var variant in variants) + { + result[CreateKey("vari", 0, variant.Alias)] = variant.Id; + } + } + while (variants.HasNextPage); + pageIndex = 0; + variants.Clear(); + + do + { + options = new PagedList(optionQuery, pageIndex++, 500); + + foreach (var option in options) + { + var variant = option.ProductVariantAttribute.ProductAttribute; + result[CreateOptionKey("vari.option", 0, variant.Id, option.Alias)] = option.Id; + } + } + while (options.HasNextPage); + options.Clear(); + + var optionIdMappings = _productVariantAttributeValueRepository.TableUntracked + .Expand(x => x.ProductVariantAttribute.ProductAttribute) + .Select(x => new + { + OptionId = x.Id, + VariantId = x.ProductVariantAttribute.ProductAttribute.Id + }) + .ToDictionary(x => x.OptionId, x => x.VariantId); + + CachedLocalizedAlias("ProductAttribute", x => result[CreateKey("vari", x.LanguageId, x.LocaleValue)] = x.EntityId); + CachedLocalizedAlias("ProductVariantAttributeValue", x => + { + if (optionIdMappings.TryGetValue(x.EntityId, out variantId)) + result[CreateOptionKey("vari.option", x.LanguageId, variantId, x.LocaleValue)] = x.EntityId; + }); + + return result; + }); + } + + protected virtual IDictionary GetVariantAliasByIdMappings() + { + return _cacheManager.Get(ALL_VARIANT_ALIAS_BY_ID_KEY, () => + { + var result = new Dictionary(StringComparer.OrdinalIgnoreCase); + IPagedList variants = null; + IPagedList options = null; + var pageIndex = 0; + + var variantQuery = _productAttributeRepository.TableUntracked + .Where(x => !string.IsNullOrEmpty(x.Alias)) + .OrderBy(x => x.Id); + + var optionQuery = _productVariantAttributeValueRepository.TableUntracked + .Where(x => !string.IsNullOrEmpty(x.Alias)) + .OrderBy(x => x.Id); + + do + { + variants = new PagedList(variantQuery, pageIndex++, 500); + + foreach (var variant in variants) + { + result[CreateKey("vari", 0, variant.Id)] = variant.Alias; + } + } + while (variants.HasNextPage); + pageIndex = 0; + variants.Clear(); + + do + { + options = new PagedList(optionQuery, pageIndex++, 500); + + foreach (var option in options) + { + result[CreateOptionKey("attr.option", 0, option.Id)] = option.Alias; + } + } + while (options.HasNextPage); + options.Clear(); + + CachedLocalizedAlias("ProductAttribute", x => result[CreateKey("vari", x.LanguageId, x.EntityId)] = x.LocaleValue); + CachedLocalizedAlias("ProductVariantAttributeValue", x => result[CreateOptionKey("vari.option", x.LanguageId, x.EntityId)] = x.LocaleValue); + + return result; + }); + } + + public void ClearVariantCache() + { + _cacheManager.Remove(ALL_VARIANT_ID_BY_ALIAS_KEY); + _cacheManager.Remove(ALL_VARIANT_ALIAS_BY_ID_KEY); + } + + public int GetVariantIdByAlias(string variantAlias, int languageId = 0) + { + var result = 0; + + if (variantAlias.HasValue()) + { + var mappings = GetVariantIdByAliasMappings(); + + if (!mappings.TryGetValue(CreateKey("vari", languageId, variantAlias), out result) && languageId != 0) + { + mappings.TryGetValue(CreateKey("vari", 0, variantAlias), out result); + } + } + + return result; + } + + public int GetVariantOptionIdByAlias(string optionAlias, int variantId, int languageId = 0) + { + var result = 0; + + if (optionAlias.HasValue() && variantId != 0) + { + var mappings = GetVariantIdByAliasMappings(); + + if (!mappings.TryGetValue(CreateOptionKey("vari.option", languageId, variantId, optionAlias), out result) && languageId != 0) + { + mappings.TryGetValue(CreateOptionKey("vari.option", 0, variantId, optionAlias), out result); + } + } + + return result; + } + + public string GetVariantAliasById(int variantId, int languageId = 0) + { + string result = null; + + if (variantId != 0) + { + var mappings = GetVariantAliasByIdMappings(); + + if (!mappings.TryGetValue(CreateKey("vari", languageId, variantId), out result) && languageId != 0) + { + mappings.TryGetValue(CreateKey("vari", 0, variantId), out result); + } + } + + return result; + } + + public string GetVariantOptionAliasById(int optionId, int languageId = 0) + { + string result = null; + + if (optionId != 0) + { + var mappings = GetVariantAliasByIdMappings(); + + if (!mappings.TryGetValue(CreateOptionKey("vari.option", languageId, optionId), out result) && languageId != 0) + { + mappings.TryGetValue(CreateOptionKey("vari.option", 0, optionId), out result); + } + } + + return result; + } + + #endregion + + #region Common Facets + + protected virtual IDictionary GetCommonFacetAliasByGroupKindMappings() + { + return _cacheManager.Get(ALL_COMMONFACET_ALIAS_BY_KIND_KEY, () => + { + var result = new Dictionary(StringComparer.OrdinalIgnoreCase); + + var groupKinds = new FacetGroupKind[] + { + FacetGroupKind.Category, + FacetGroupKind.Brand, + FacetGroupKind.Price, + FacetGroupKind.Rating, + FacetGroupKind.DeliveryTime, + FacetGroupKind.Availability, + FacetGroupKind.NewArrivals + }; + + foreach (var language in _languageService.GetAllLanguages()) + { + foreach (var groupKind in groupKinds) + { + var key = FacetUtility.GetFacetAliasSettingKey(groupKind, language.Id); + var value = _settingService.GetSettingByKey(key); + if (value.HasValue()) + { + result.Add(key, value); + } + } + } + + return result; + }); + } + + public void ClearCommonFacetCache() + { + _cacheManager.Remove(ALL_COMMONFACET_ALIAS_BY_KIND_KEY); + } + + public string GetCommonFacetAliasByGroupKind(FacetGroupKind kind, int languageId) + { + var mappings = GetCommonFacetAliasByGroupKindMappings(); + + return mappings.Get(FacetUtility.GetFacetAliasSettingKey(kind, languageId)); + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs index a9cde30a30..f03d97bd69 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs @@ -37,53 +37,53 @@ public class CatalogSearchQueryFactory : SearchQueryFactoryBase, ICatalogSearchQ { protected static readonly string[] _instantSearchFields = new string[] { "manufacturer", "sku", "gtin", "mpn", "attrname", "variantname" }; - protected readonly CatalogSettings _catalogSettings; - protected readonly SearchSettings _searchSettings; - protected readonly ICommonServices _services; - protected readonly ICatalogSearchQueryAliasMapper _catalogSearchQueryAliasMapper; - - public CatalogSearchQueryFactory( - HttpContextBase httpContext, - CatalogSettings catalogSettings, - SearchSettings searchSettings, - ICommonServices services, - ICatalogSearchQueryAliasMapper catalogSearchQueryAliasMapper) + protected readonly CatalogSettings _catalogSettings; + protected readonly SearchSettings _searchSettings; + protected readonly ICommonServices _services; + protected readonly ICatalogSearchQueryAliasMapper _catalogSearchQueryAliasMapper; + + public CatalogSearchQueryFactory( + HttpContextBase httpContext, + CatalogSettings catalogSettings, + SearchSettings searchSettings, + ICommonServices services, + ICatalogSearchQueryAliasMapper catalogSearchQueryAliasMapper) : base(httpContext) - { - _catalogSettings = catalogSettings; - _searchSettings = searchSettings; - _services = services; - _catalogSearchQueryAliasMapper = catalogSearchQueryAliasMapper; + { + _catalogSettings = catalogSettings; + _searchSettings = searchSettings; + _services = services; + _catalogSearchQueryAliasMapper = catalogSearchQueryAliasMapper; - QuerySettings = DbQuerySettings.Default; - } + QuerySettings = DbQuerySettings.Default; + } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } - public CatalogSearchQuery Current { get; private set; } + public CatalogSearchQuery Current { get; private set; } protected override string[] Tokens => new string[] { "q", "i", "s", "o", "p", "c", "m", "r", "a", "n", "d", "v" }; public CatalogSearchQuery CreateFromQuery() - { - var ctx = _httpContext; - - if (ctx.Request == null) - return null; - - var routeData = ctx.Request.RequestContext.RouteData; - var area = routeData.GetAreaName(); - var controller = routeData.GetRequiredString("controller"); - var action = routeData.GetRequiredString("action"); - var origin = "{0}{1}/{2}".FormatInvariant(area == null ? "" : area + "/", controller, action); - var fields = new List { "name" }; - var term = GetValueFor("q"); - var isInstantSearch = origin.IsCaseInsensitiveEqual("Search/InstantSearch"); - - if (isInstantSearch) - { - fields.Add("shortdescription"); - fields.Add("tagname"); + { + var ctx = _httpContext; + + if (ctx.Request == null) + return null; + + var routeData = ctx.Request.RequestContext.RouteData; + var area = routeData.GetAreaName(); + var controller = routeData.GetRequiredString("controller"); + var action = routeData.GetRequiredString("action"); + var origin = "{0}{1}/{2}".FormatInvariant(area == null ? "" : area + "/", controller, action); + var fields = new List { "name" }; + var term = GetValueFor("q"); + var isInstantSearch = origin.IsCaseInsensitiveEqual("Search/InstantSearch"); + + if (isInstantSearch) + { + fields.Add("shortdescription"); + fields.Add("tagname"); foreach (var fieldName in _instantSearchFields) { @@ -93,19 +93,19 @@ public CatalogSearchQuery CreateFromQuery() } } } - else - { - fields.AddRange(_searchSettings.SearchFields); - } + else + { + fields.AddRange(_searchSettings.SearchFields); + } - var query = new CatalogSearchQuery(fields.ToArray(), term, _searchSettings.SearchMode) - .OriginatesFrom(origin) - .WithLanguage(_services.WorkContext.WorkingLanguage) - .WithCurrency(_services.WorkContext.WorkingCurrency) - .BuildFacetMap(!isInstantSearch); + var query = new CatalogSearchQuery(fields.ToArray(), term, _searchSettings.SearchMode) + .OriginatesFrom(origin) + .WithLanguage(_services.WorkContext.WorkingLanguage) + .WithCurrency(_services.WorkContext.WorkingCurrency) + .BuildFacetMap(!isInstantSearch); - // Visibility. - query.VisibleOnly(!QuerySettings.IgnoreAcl ? _services.WorkContext.CurrentCustomer : null); + // Visibility. + query.VisibleOnly(!QuerySettings.IgnoreAcl ? _services.WorkContext.CurrentCustomer : null); if (isInstantSearch || origin.IsCaseInsensitiveEqual("Search/Search")) { @@ -116,495 +116,495 @@ public CatalogSearchQuery CreateFromQuery() query.WithVisibility(ProductVisibility.Full); } - // Store. - if (!QuerySettings.IgnoreMultiStore) - { - query.HasStoreId(_services.StoreContext.CurrentStore.Id); - } - - // Availability. - ConvertAvailability(query, routeData, origin); - - // Instant-Search never uses these filter parameters. - if (!isInstantSearch) - { - ConvertPagingSorting(query, routeData, origin); - ConvertPrice(query, routeData, origin); - ConvertCategory(query, routeData, origin); - ConvertManufacturer(query, routeData, origin); - ConvertRating(query, routeData, origin); - ConvertNewArrivals(query, routeData, origin); - ConvertDeliveryTime(query, routeData, origin); - } - - OnConverted(query, routeData, origin); - - Current = query; - return query; - } - - protected virtual void ConvertPagingSorting(CatalogSearchQuery query, RouteData routeData, string origin) - { - var index = Math.Max(1, GetValueFor("i") ?? 1); - var size = GetPageSize(query, routeData, origin); - - query.Slice((index - 1) * size, size); - - var orderBy = GetValueFor("o"); - if (orderBy == null || orderBy == ProductSortingEnum.Initial) - { + // Store. + if (!QuerySettings.IgnoreMultiStore) + { + query.HasStoreId(_services.StoreContext.CurrentStore.Id); + } + + // Availability. + ConvertAvailability(query, routeData, origin); + + // Instant-Search never uses these filter parameters. + if (!isInstantSearch) + { + ConvertPagingSorting(query, routeData, origin); + ConvertPrice(query, routeData, origin); + ConvertCategory(query, routeData, origin); + ConvertManufacturer(query, routeData, origin); + ConvertRating(query, routeData, origin); + ConvertNewArrivals(query, routeData, origin); + ConvertDeliveryTime(query, routeData, origin); + } + + OnConverted(query, routeData, origin); + + Current = query; + return query; + } + + protected virtual void ConvertPagingSorting(CatalogSearchQuery query, RouteData routeData, string origin) + { + var index = Math.Max(1, GetValueFor("i") ?? 1); + var size = GetPageSize(query, routeData, origin); + + query.Slice((index - 1) * size, size); + + var orderBy = GetValueFor("o"); + if (orderBy == null || orderBy == ProductSortingEnum.Initial) + { orderBy = origin.IsCaseInsensitiveEqual("Search/Search") ? _searchSettings.DefaultSortOrder : _catalogSettings.DefaultSortOrder; - } - - query.CustomData["CurrentSortOrder"] = orderBy.Value; - - query.SortBy(orderBy.Value); - } - - private int GetPageSize(CatalogSearchQuery query, RouteData routeData, string origin) - { - string entityViewMode = null; - - // Determine entity id if possible - IPagingOptions entity = null; - int? entityId; - if (origin.IsCaseInsensitiveEqual("Catalog/Category")) - { - entityId = (int?)routeData.Values["categoryId"]; - if (entityId.HasValue) - { - entity = _services.Resolve().GetCategoryById(entityId.Value) as IPagingOptions; - entityViewMode = ((Category)entity)?.DefaultViewMode; - } - } - else if (origin.IsCaseInsensitiveEqual("Catalog/Manufacturer")) - { - entityId = (int?)routeData.Values["manufacturerId"]; - if (entityId.HasValue) - { - entity = _services.Resolve().GetManufacturerById(entityId.Value) as IPagingOptions; - } - } - - var entitySize = entity?.PageSize; - - var sessionKey = origin; - if (entitySize.HasValue) - { - sessionKey += "/" + entitySize.Value; - } - - DetectViewMode(query, sessionKey, entityViewMode); - - var allowChange = entity?.AllowCustomersToSelectPageSize ?? _catalogSettings.AllowCustomersToSelectPageSize; - if (!allowChange) - { - return entitySize ?? _catalogSettings.DefaultProductListPageSize; - } - - sessionKey = "PageSize:" + sessionKey; - - // Get from form or query - var selectedSize = GetValueFor("s"); - - if (selectedSize.HasValue) - { - // Save the selection in session. We'll fetch this session value - // on subsequent requests for this route. - if (_httpContext.Session != null) - { - _httpContext.Session[sessionKey] = selectedSize.Value; - } - return selectedSize.Value; - } - - // Return user size from session - if (_httpContext.Session != null) - { - var sessionSize = _httpContext.Session[sessionKey].Convert(); - if (sessionSize.HasValue) - { - return sessionSize.Value; - } - } - - // Return default size for entity (IPagingOptions) - if (entitySize.HasValue) - { - return entitySize.Value; - } - - // Return default page size - return _catalogSettings.DefaultProductListPageSize; - } - - private void DetectViewMode(CatalogSearchQuery query, string sessionKey, string entityViewMode = null) - { - if (!_catalogSettings.AllowProductViewModeChanging) - { - query.CustomData["ViewMode"] = entityViewMode.NullEmpty() ?? _catalogSettings.DefaultViewMode; - return; - } - - var selectedViewMode = GetValueFor("v"); - - sessionKey = "ViewMode:" + sessionKey; - - if (selectedViewMode != null) - { - // Save the view mode selection in session. We'll fetch this session value - // on subsequent requests for this route. - if (_httpContext.Session != null) - { - _httpContext.Session[sessionKey] = selectedViewMode; - } - query.CustomData["ViewMode"] = selectedViewMode; - return; - } - - // Set view mode from session - if (_httpContext.Session != null) - { - var sessionViewMode = _httpContext.Session[sessionKey].Convert(); - if (sessionViewMode != null) - { - query.CustomData["ViewMode"] = sessionViewMode; - return; - } - } - - // Set default view mode for entity - if (entityViewMode != null) - { - query.CustomData["ViewMode"] = entityViewMode; - return; - } - - // Set default view mode - query.CustomData["ViewMode"] = _catalogSettings.DefaultViewMode; - } - - private void AddFacet( - CatalogSearchQuery query, - FacetGroupKind kind, - bool isMultiSelect, - FacetSorting sorting, - Action addValues) - { - string fieldName; - var displayOrder = 0; - - switch (kind) - { - case FacetGroupKind.Category: - fieldName = _catalogSettings.IncludeFeaturedProductsInNormalLists ? "categoryid" : "notfeaturedcategoryid"; - break; - case FacetGroupKind.Brand: - if (_searchSettings.BrandDisabled) - return; - fieldName = "manufacturerid"; - displayOrder = _searchSettings.BrandDisplayOrder; - break; - case FacetGroupKind.Price: - if (_searchSettings.PriceDisabled || !_services.Permissions.Authorize(Permissions.Catalog.DisplayPrice)) - return; - fieldName = "price"; - displayOrder = _searchSettings.PriceDisplayOrder; - break; - case FacetGroupKind.Rating: - if (_searchSettings.RatingDisabled) - return; - fieldName = "rating"; - displayOrder = _searchSettings.RatingDisplayOrder; - break; - case FacetGroupKind.DeliveryTime: - if (_searchSettings.DeliveryTimeDisabled) - return; - fieldName = "deliveryid"; - displayOrder = _searchSettings.DeliveryTimeDisplayOrder; - break; - case FacetGroupKind.Availability: - if (_searchSettings.AvailabilityDisabled) - return; - fieldName = "available"; - displayOrder = _searchSettings.AvailabilityDisplayOrder; - break; - case FacetGroupKind.NewArrivals: - if (_searchSettings.NewArrivalsDisabled) - return; - fieldName = "createdon"; - displayOrder = _searchSettings.NewArrivalsDisplayOrder; - break; - default: - throw new SmartException($"Unknown field name for facet group '{kind.ToString()}'"); - } - - var descriptor = new FacetDescriptor(fieldName) - { - Label = _services.Localization.GetResource(FacetUtility.GetLabelResourceKey(kind) ?? kind.ToString()), - IsMultiSelect = isMultiSelect, - DisplayOrder = displayOrder, - OrderBy = sorting, - MinHitCount = _searchSettings.FilterMinHitCount, - MaxChoicesCount = _searchSettings.FilterMaxChoicesCount - }; - - addValues(descriptor); - query.WithFacet(descriptor); - } - - protected virtual void ConvertCategory(CatalogSearchQuery query, RouteData routeData, string origin) - { - if (origin == "Catalog/Category") - { - // we don't need category facetting in category pages - return; - } - - List ids; - - if (GetValueFor(query, "c", FacetGroupKind.Category, out ids) && ids != null && ids.Any()) - { - // TODO; (mc) Get deep ids (???) Make a low-level version of CatalogHelper.GetChildCategoryIds() - query.WithCategoryIds(_catalogSettings.IncludeFeaturedProductsInNormalLists ? null : (bool?)false, ids.ToArray()); - } - - AddFacet(query, FacetGroupKind.Category, true, FacetSorting.HitsDesc, descriptor => - { - if (ids != null) - { - foreach (var id in ids) - { - descriptor.AddValue(new FacetValue(id, IndexTypeCode.Int32) - { - IsSelected = true - }); - } - } - }); - } - - protected virtual void ConvertManufacturer(CatalogSearchQuery query, RouteData routeData, string origin) - { - //List ids = null; - //int? minHitCount = null; - - //GetValueFor(query, "m", FacetGroupKind.Brand, out ids); - - //// Preselect manufacturer on manufacturer page.... and then? - //if (origin.IsCaseInsensitiveEqual("Catalog/Manufacturer")) - //{ - // minHitCount = 0; - - // var manufacturerId = routeData.Values["manufacturerid"].ToString().ToInt(); - // if (manufacturerId != 0) - // { - // if (ids == null) - // ids = new List { manufacturerId }; - // else if (!ids.Contains(manufacturerId)) - // ids.Add(manufacturerId); - // } - //} - - if (origin.IsCaseInsensitiveEqual("Catalog/Manufacturer")) - { - // we don't need brand facetting in brand pages - return; - } - - List ids; - - if (GetValueFor(query, "m", FacetGroupKind.Brand, out ids) && ids != null && ids.Any()) - { - query.WithManufacturerIds(null, ids.ToArray()); - } - - AddFacet(query, FacetGroupKind.Brand, true, FacetSorting.LabelAsc, descriptor => - { - if (ids != null) - { - foreach (var id in ids) - { - descriptor.AddValue(new FacetValue(id, IndexTypeCode.Int32) - { - IsSelected = true - }); - } - } - }); - } - - protected virtual void ConvertPrice(CatalogSearchQuery query, RouteData routeData, string origin) - { - string price; - double? minPrice = null; - double? maxPrice = null; - - if (GetValueFor(query, "p", FacetGroupKind.Price, out price) && TryParseRange(price, out minPrice, out maxPrice)) - { - var currency = _services.WorkContext.WorkingCurrency; - - if (minPrice.HasValue) - { - // TODO: (mc) Why the heck did I convert this??!! - //minPrice = _currencyService.ConvertToPrimaryStoreCurrency(minPrice.Value, currency); - } - - if (maxPrice.HasValue) - { - //maxPrice = _currencyService.ConvertToPrimaryStoreCurrency(maxPrice.Value, currency); - } - - if (minPrice.HasValue && maxPrice.HasValue && minPrice > maxPrice) - { - var tmp = minPrice; - minPrice = maxPrice; - maxPrice = tmp; - } - - if (minPrice.HasValue || maxPrice.HasValue) - { - query.PriceBetween((decimal?)minPrice, (decimal?)maxPrice); - } - } - - AddFacet(query, FacetGroupKind.Price, false, FacetSorting.DisplayOrder, descriptor => - { - if (minPrice.HasValue || maxPrice.HasValue) - { - descriptor.AddValue(new FacetValue( - minPrice, - maxPrice, - IndexTypeCode.Double, - minPrice.HasValue, - maxPrice.HasValue) - { - IsSelected = true - }); - } - }); - } - - protected virtual void ConvertRating(CatalogSearchQuery query, RouteData routeData, string origin) - { - double? fromRate; - - if (GetValueFor(query, "r", FacetGroupKind.Rating, out fromRate) && fromRate.HasValue) - { - query.WithRating(fromRate, null); - } - - AddFacet(query, FacetGroupKind.Rating, false, FacetSorting.DisplayOrder, descriptor => - { - descriptor.MinHitCount = 0; - descriptor.MaxChoicesCount = 5; - - if (fromRate.HasValue) - { - descriptor.AddValue(new FacetValue(fromRate.Value, IndexTypeCode.Double) - { - IsSelected = true - }); - } - }); - } - - protected virtual void ConvertAvailability(CatalogSearchQuery query, RouteData routeData, string origin) - { - bool availability; - GetValueFor(query, "a", FacetGroupKind.Availability, out availability); - - // Setting specifies the logical direction of the filter. That's smarter than just to specify a default value. - if (_searchSettings.IncludeNotAvailable) - { - // False = show, True = hide unavailable products. - if (availability) - { - query.AvailableOnly(true); - } - } - else - { - // False = hide, True = show unavailable products. - if (!availability) - { - query.AvailableOnly(true); - } - } - - AddFacet(query, FacetGroupKind.Availability, true, FacetSorting.LabelAsc, descriptor => - { - descriptor.MinHitCount = 0; - - var newValue = availability - ? new FacetValue(true, IndexTypeCode.Boolean) - : new FacetValue(null, IndexTypeCode.Empty); - - newValue.IsSelected = availability; - newValue.Label = _services.Localization.GetResource(_searchSettings.IncludeNotAvailable ? "Search.Facet.ExcludeOutOfStock" : "Search.Facet.IncludeOutOfStock"); - - descriptor.AddValue(newValue); - }); - } - - protected virtual void ConvertNewArrivals(CatalogSearchQuery query, RouteData routeData, string origin) - { - var newForMaxDays = _catalogSettings.LabelAsNewForMaxDays ?? 0; - if (newForMaxDays <= 0) - { - // we cannot filter without it - return; - } - - bool newArrivalsOnly; - var fromUtc = DateTime.UtcNow.Subtract(TimeSpan.FromDays(newForMaxDays)); - - if (GetValueFor(query, "n", FacetGroupKind.NewArrivals, out newArrivalsOnly) && newArrivalsOnly) - { - query.CreatedBetween(fromUtc, null); - } - - AddFacet(query, FacetGroupKind.NewArrivals, true, FacetSorting.LabelAsc, descriptor => - { - descriptor.AddValue(new FacetValue(fromUtc, null, IndexTypeCode.DateTime, true, false) - { - IsSelected = newArrivalsOnly, - Label = _services.Localization.GetResource("Search.Facet.LastDays").FormatInvariant(newForMaxDays) - }); - }); - } - - protected virtual void ConvertDeliveryTime(CatalogSearchQuery query, RouteData routeData, string origin) - { - List ids; - - if (GetValueFor(query, "d", FacetGroupKind.DeliveryTime, out ids) && ids != null && ids.Any()) - { - query.WithDeliveryTimeIds(ids.ToArray()); - } - - AddFacet(query, FacetGroupKind.DeliveryTime, true, FacetSorting.DisplayOrder, descriptor => - { - if (ids != null) - { - foreach (var id in ids) - { - descriptor.AddValue(new FacetValue(id, IndexTypeCode.Int32) - { - IsSelected = true - }); - } - } - }); - } - - protected virtual void OnConverted(CatalogSearchQuery query, RouteData routeData, string origin) - { - } - - protected virtual bool GetValueFor(CatalogSearchQuery query, string key, FacetGroupKind kind, out T value) - { - return TryGetValueFor(_catalogSearchQueryAliasMapper.GetCommonFacetAliasByGroupKind(kind, query.LanguageId ?? 0) ?? key, out value); - } - } + } + + query.CustomData["CurrentSortOrder"] = orderBy.Value; + + query.SortBy(orderBy.Value); + } + + private int GetPageSize(CatalogSearchQuery query, RouteData routeData, string origin) + { + string entityViewMode = null; + + // Determine entity id if possible + IPagingOptions entity = null; + int? entityId; + if (origin.IsCaseInsensitiveEqual("Catalog/Category")) + { + entityId = (int?)routeData.Values["categoryId"]; + if (entityId.HasValue) + { + entity = _services.Resolve().GetCategoryById(entityId.Value) as IPagingOptions; + entityViewMode = ((Category)entity)?.DefaultViewMode; + } + } + else if (origin.IsCaseInsensitiveEqual("Catalog/Manufacturer")) + { + entityId = (int?)routeData.Values["manufacturerId"]; + if (entityId.HasValue) + { + entity = _services.Resolve().GetManufacturerById(entityId.Value) as IPagingOptions; + } + } + + var entitySize = entity?.PageSize; + + var sessionKey = origin; + if (entitySize.HasValue) + { + sessionKey += "/" + entitySize.Value; + } + + DetectViewMode(query, sessionKey, entityViewMode); + + var allowChange = entity?.AllowCustomersToSelectPageSize ?? _catalogSettings.AllowCustomersToSelectPageSize; + if (!allowChange) + { + return entitySize ?? _catalogSettings.DefaultProductListPageSize; + } + + sessionKey = "PageSize:" + sessionKey; + + // Get from form or query + var selectedSize = GetValueFor("s"); + + if (selectedSize.HasValue) + { + // Save the selection in session. We'll fetch this session value + // on subsequent requests for this route. + if (_httpContext.Session != null) + { + _httpContext.Session[sessionKey] = selectedSize.Value; + } + return selectedSize.Value; + } + + // Return user size from session + if (_httpContext.Session != null) + { + var sessionSize = _httpContext.Session[sessionKey].Convert(); + if (sessionSize.HasValue) + { + return sessionSize.Value; + } + } + + // Return default size for entity (IPagingOptions) + if (entitySize.HasValue) + { + return entitySize.Value; + } + + // Return default page size + return _catalogSettings.DefaultProductListPageSize; + } + + private void DetectViewMode(CatalogSearchQuery query, string sessionKey, string entityViewMode = null) + { + if (!_catalogSettings.AllowProductViewModeChanging) + { + query.CustomData["ViewMode"] = entityViewMode.NullEmpty() ?? _catalogSettings.DefaultViewMode; + return; + } + + var selectedViewMode = GetValueFor("v"); + + sessionKey = "ViewMode:" + sessionKey; + + if (selectedViewMode != null) + { + // Save the view mode selection in session. We'll fetch this session value + // on subsequent requests for this route. + if (_httpContext.Session != null) + { + _httpContext.Session[sessionKey] = selectedViewMode; + } + query.CustomData["ViewMode"] = selectedViewMode; + return; + } + + // Set view mode from session + if (_httpContext.Session != null) + { + var sessionViewMode = _httpContext.Session[sessionKey].Convert(); + if (sessionViewMode != null) + { + query.CustomData["ViewMode"] = sessionViewMode; + return; + } + } + + // Set default view mode for entity + if (entityViewMode != null) + { + query.CustomData["ViewMode"] = entityViewMode; + return; + } + + // Set default view mode + query.CustomData["ViewMode"] = _catalogSettings.DefaultViewMode; + } + + private void AddFacet( + CatalogSearchQuery query, + FacetGroupKind kind, + bool isMultiSelect, + FacetSorting sorting, + Action addValues) + { + string fieldName; + var displayOrder = 0; + + switch (kind) + { + case FacetGroupKind.Category: + fieldName = _catalogSettings.IncludeFeaturedProductsInNormalLists ? "categoryid" : "notfeaturedcategoryid"; + break; + case FacetGroupKind.Brand: + if (_searchSettings.BrandDisabled) + return; + fieldName = "manufacturerid"; + displayOrder = _searchSettings.BrandDisplayOrder; + break; + case FacetGroupKind.Price: + if (_searchSettings.PriceDisabled || !_services.Permissions.Authorize(Permissions.Catalog.DisplayPrice)) + return; + fieldName = "price"; + displayOrder = _searchSettings.PriceDisplayOrder; + break; + case FacetGroupKind.Rating: + if (_searchSettings.RatingDisabled) + return; + fieldName = "rating"; + displayOrder = _searchSettings.RatingDisplayOrder; + break; + case FacetGroupKind.DeliveryTime: + if (_searchSettings.DeliveryTimeDisabled) + return; + fieldName = "deliveryid"; + displayOrder = _searchSettings.DeliveryTimeDisplayOrder; + break; + case FacetGroupKind.Availability: + if (_searchSettings.AvailabilityDisabled) + return; + fieldName = "available"; + displayOrder = _searchSettings.AvailabilityDisplayOrder; + break; + case FacetGroupKind.NewArrivals: + if (_searchSettings.NewArrivalsDisabled) + return; + fieldName = "createdon"; + displayOrder = _searchSettings.NewArrivalsDisplayOrder; + break; + default: + throw new SmartException($"Unknown field name for facet group '{kind.ToString()}'"); + } + + var descriptor = new FacetDescriptor(fieldName) + { + Label = _services.Localization.GetResource(FacetUtility.GetLabelResourceKey(kind) ?? kind.ToString()), + IsMultiSelect = isMultiSelect, + DisplayOrder = displayOrder, + OrderBy = sorting, + MinHitCount = _searchSettings.FilterMinHitCount, + MaxChoicesCount = _searchSettings.FilterMaxChoicesCount + }; + + addValues(descriptor); + query.WithFacet(descriptor); + } + + protected virtual void ConvertCategory(CatalogSearchQuery query, RouteData routeData, string origin) + { + if (origin == "Catalog/Category") + { + // we don't need category facetting in category pages + return; + } + + List ids; + + if (GetValueFor(query, "c", FacetGroupKind.Category, out ids) && ids != null && ids.Any()) + { + // TODO; (mc) Get deep ids (???) Make a low-level version of CatalogHelper.GetChildCategoryIds() + query.WithCategoryIds(_catalogSettings.IncludeFeaturedProductsInNormalLists ? null : (bool?)false, ids.ToArray()); + } + + AddFacet(query, FacetGroupKind.Category, true, FacetSorting.HitsDesc, descriptor => + { + if (ids != null) + { + foreach (var id in ids) + { + descriptor.AddValue(new FacetValue(id, IndexTypeCode.Int32) + { + IsSelected = true + }); + } + } + }); + } + + protected virtual void ConvertManufacturer(CatalogSearchQuery query, RouteData routeData, string origin) + { + //List ids = null; + //int? minHitCount = null; + + //GetValueFor(query, "m", FacetGroupKind.Brand, out ids); + + //// Preselect manufacturer on manufacturer page.... and then? + //if (origin.IsCaseInsensitiveEqual("Catalog/Manufacturer")) + //{ + // minHitCount = 0; + + // var manufacturerId = routeData.Values["manufacturerid"].ToString().ToInt(); + // if (manufacturerId != 0) + // { + // if (ids == null) + // ids = new List { manufacturerId }; + // else if (!ids.Contains(manufacturerId)) + // ids.Add(manufacturerId); + // } + //} + + if (origin.IsCaseInsensitiveEqual("Catalog/Manufacturer")) + { + // we don't need brand facetting in brand pages + return; + } + + List ids; + + if (GetValueFor(query, "m", FacetGroupKind.Brand, out ids) && ids != null && ids.Any()) + { + query.WithManufacturerIds(null, ids.ToArray()); + } + + AddFacet(query, FacetGroupKind.Brand, true, FacetSorting.LabelAsc, descriptor => + { + if (ids != null) + { + foreach (var id in ids) + { + descriptor.AddValue(new FacetValue(id, IndexTypeCode.Int32) + { + IsSelected = true + }); + } + } + }); + } + + protected virtual void ConvertPrice(CatalogSearchQuery query, RouteData routeData, string origin) + { + string price; + double? minPrice = null; + double? maxPrice = null; + + if (GetValueFor(query, "p", FacetGroupKind.Price, out price) && TryParseRange(price, out minPrice, out maxPrice)) + { + var currency = _services.WorkContext.WorkingCurrency; + + if (minPrice.HasValue) + { + // TODO: (mc) Why the heck did I convert this??!! + //minPrice = _currencyService.ConvertToPrimaryStoreCurrency(minPrice.Value, currency); + } + + if (maxPrice.HasValue) + { + //maxPrice = _currencyService.ConvertToPrimaryStoreCurrency(maxPrice.Value, currency); + } + + if (minPrice.HasValue && maxPrice.HasValue && minPrice > maxPrice) + { + var tmp = minPrice; + minPrice = maxPrice; + maxPrice = tmp; + } + + if (minPrice.HasValue || maxPrice.HasValue) + { + query.PriceBetween((decimal?)minPrice, (decimal?)maxPrice); + } + } + + AddFacet(query, FacetGroupKind.Price, false, FacetSorting.DisplayOrder, descriptor => + { + if (minPrice.HasValue || maxPrice.HasValue) + { + descriptor.AddValue(new FacetValue( + minPrice, + maxPrice, + IndexTypeCode.Double, + minPrice.HasValue, + maxPrice.HasValue) + { + IsSelected = true + }); + } + }); + } + + protected virtual void ConvertRating(CatalogSearchQuery query, RouteData routeData, string origin) + { + double? fromRate; + + if (GetValueFor(query, "r", FacetGroupKind.Rating, out fromRate) && fromRate.HasValue) + { + query.WithRating(fromRate, null); + } + + AddFacet(query, FacetGroupKind.Rating, false, FacetSorting.DisplayOrder, descriptor => + { + descriptor.MinHitCount = 0; + descriptor.MaxChoicesCount = 5; + + if (fromRate.HasValue) + { + descriptor.AddValue(new FacetValue(fromRate.Value, IndexTypeCode.Double) + { + IsSelected = true + }); + } + }); + } + + protected virtual void ConvertAvailability(CatalogSearchQuery query, RouteData routeData, string origin) + { + bool availability; + GetValueFor(query, "a", FacetGroupKind.Availability, out availability); + + // Setting specifies the logical direction of the filter. That's smarter than just to specify a default value. + if (_searchSettings.IncludeNotAvailable) + { + // False = show, True = hide unavailable products. + if (availability) + { + query.AvailableOnly(true); + } + } + else + { + // False = hide, True = show unavailable products. + if (!availability) + { + query.AvailableOnly(true); + } + } + + AddFacet(query, FacetGroupKind.Availability, true, FacetSorting.LabelAsc, descriptor => + { + descriptor.MinHitCount = 0; + + var newValue = availability + ? new FacetValue(true, IndexTypeCode.Boolean) + : new FacetValue(null, IndexTypeCode.Empty); + + newValue.IsSelected = availability; + newValue.Label = _services.Localization.GetResource(_searchSettings.IncludeNotAvailable ? "Search.Facet.ExcludeOutOfStock" : "Search.Facet.IncludeOutOfStock"); + + descriptor.AddValue(newValue); + }); + } + + protected virtual void ConvertNewArrivals(CatalogSearchQuery query, RouteData routeData, string origin) + { + var newForMaxDays = _catalogSettings.LabelAsNewForMaxDays ?? 0; + if (newForMaxDays <= 0) + { + // we cannot filter without it + return; + } + + bool newArrivalsOnly; + var fromUtc = DateTime.UtcNow.Subtract(TimeSpan.FromDays(newForMaxDays)); + + if (GetValueFor(query, "n", FacetGroupKind.NewArrivals, out newArrivalsOnly) && newArrivalsOnly) + { + query.CreatedBetween(fromUtc, null); + } + + AddFacet(query, FacetGroupKind.NewArrivals, true, FacetSorting.LabelAsc, descriptor => + { + descriptor.AddValue(new FacetValue(fromUtc, null, IndexTypeCode.DateTime, true, false) + { + IsSelected = newArrivalsOnly, + Label = _services.Localization.GetResource("Search.Facet.LastDays").FormatInvariant(newForMaxDays) + }); + }); + } + + protected virtual void ConvertDeliveryTime(CatalogSearchQuery query, RouteData routeData, string origin) + { + List ids; + + if (GetValueFor(query, "d", FacetGroupKind.DeliveryTime, out ids) && ids != null && ids.Any()) + { + query.WithDeliveryTimeIds(ids.ToArray()); + } + + AddFacet(query, FacetGroupKind.DeliveryTime, true, FacetSorting.DisplayOrder, descriptor => + { + if (ids != null) + { + foreach (var id in ids) + { + descriptor.AddValue(new FacetValue(id, IndexTypeCode.Int32) + { + IsSelected = true + }); + } + } + }); + } + + protected virtual void OnConverted(CatalogSearchQuery query, RouteData routeData, string origin) + { + } + + protected virtual bool GetValueFor(CatalogSearchQuery query, string key, FacetGroupKind kind, out T value) + { + return TryGetValueFor(_catalogSearchQueryAliasMapper.GetCommonFacetAliasByGroupKind(kind, query.LanguageId ?? 0) ?? key, out value); + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs index dce6a49f57..817f082d51 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs @@ -4,39 +4,39 @@ namespace SmartStore.Services.Search.Modelling { [ModelBinderType(typeof(CatalogSearchQuery))] - public class CatalogSearchQueryModelBinder : IModelBinder - { - private readonly ICatalogSearchQueryFactory _factory; + public class CatalogSearchQueryModelBinder : IModelBinder + { + private readonly ICatalogSearchQueryFactory _factory; - public CatalogSearchQueryModelBinder(ICatalogSearchQueryFactory factory) - { - _factory = factory; - } + public CatalogSearchQueryModelBinder(ICatalogSearchQueryFactory factory) + { + _factory = factory; + } - public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) - { - if (_factory.Current != null) - { - // Don't bind again for current request. - return _factory.Current; - } + public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) + { + if (_factory.Current != null) + { + // Don't bind again for current request. + return _factory.Current; + } - if (controllerContext.IsChildAction) - { - // Never attempt to bind in child actions. We require the binding to happen - // in a parent action. If the child action is part of a request with an already bound - // 'CatalogSearchQuery', good for you :-) You'll get an instance, but null otherwise. - return _factory.Current; - } + if (controllerContext.IsChildAction) + { + // Never attempt to bind in child actions. We require the binding to happen + // in a parent action. If the child action is part of a request with an already bound + // 'CatalogSearchQuery', good for you :-) You'll get an instance, but null otherwise. + return _factory.Current; + } - var modelType = bindingContext.ModelType; - if (modelType != typeof(CatalogSearchQuery)) - { - return new CatalogSearchQuery(); - } + var modelType = bindingContext.ModelType; + if (modelType != typeof(CatalogSearchQuery)) + { + return new CatalogSearchQuery(); + } - var query = _factory.CreateFromQuery(); - return query; - } - } + var query = _factory.CreateFromQuery(); + return query; + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryAliasMapper.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryAliasMapper.cs index c036029c6d..16d08f7524 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryAliasMapper.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryAliasMapper.cs @@ -2,95 +2,95 @@ namespace SmartStore.Services.Search.Modelling { - public interface ICatalogSearchQueryAliasMapper - { - /// - /// Clears all cached attribute mappings - /// - void ClearAttributeCache(); + public interface ICatalogSearchQueryAliasMapper + { + /// + /// Clears all cached attribute mappings + /// + void ClearAttributeCache(); - /// - /// Gets the attribute id by attribute alias - /// - /// Attribute alias - /// Language identifier - /// Attribute identifier - int GetAttributeIdByAlias(string attributeAlias, int languageId = 0); + /// + /// Gets the attribute id by attribute alias + /// + /// Attribute alias + /// Language identifier + /// Attribute identifier + int GetAttributeIdByAlias(string attributeAlias, int languageId = 0); - /// - /// Gets the attribute option id by option alias - /// - /// Attribute option alias - /// Attribute identifier - /// Language identifier - /// Attribute option identifier - int GetAttributeOptionIdByAlias(string optionAlias, int attributeId, int languageId = 0); + /// + /// Gets the attribute option id by option alias + /// + /// Attribute option alias + /// Attribute identifier + /// Language identifier + /// Attribute option identifier + int GetAttributeOptionIdByAlias(string optionAlias, int attributeId, int languageId = 0); - /// - /// Gets the attribute alias by attribute id - /// - /// Attribute identifier - /// Language identifier - /// Attribute alias - string GetAttributeAliasById(int attributeId, int languageId = 0); + /// + /// Gets the attribute alias by attribute id + /// + /// Attribute identifier + /// Language identifier + /// Attribute alias + string GetAttributeAliasById(int attributeId, int languageId = 0); - /// - /// Get the attribute option alias by option id - /// - /// Option identifier - /// Language identifier - /// Attribute option alias - string GetAttributeOptionAliasById(int optionId, int languageId = 0); + /// + /// Get the attribute option alias by option id + /// + /// Option identifier + /// Language identifier + /// Attribute option alias + string GetAttributeOptionAliasById(int optionId, int languageId = 0); - /// - /// Clears all cached variant mappings - /// - void ClearVariantCache(); + /// + /// Clears all cached variant mappings + /// + void ClearVariantCache(); - /// - /// Gets the variant id by variant alias - /// - /// Variant alias - /// Language identifier - /// Variant identifier - int GetVariantIdByAlias(string variantAlias, int languageId = 0); + /// + /// Gets the variant id by variant alias + /// + /// Variant alias + /// Language identifier + /// Variant identifier + int GetVariantIdByAlias(string variantAlias, int languageId = 0); - /// - /// Gets the variant option id by option alias - /// - /// Variant option alias - /// Variant identifier - /// Language identifier - /// Variant option identifier - int GetVariantOptionIdByAlias(string optionAlias, int variantId, int languageId = 0); + /// + /// Gets the variant option id by option alias + /// + /// Variant option alias + /// Variant identifier + /// Language identifier + /// Variant option identifier + int GetVariantOptionIdByAlias(string optionAlias, int variantId, int languageId = 0); - /// - /// Gets the variant alias by variant id - /// - /// Variant identifier - /// Language identifier - /// Variant alias - string GetVariantAliasById(int variantId, int languageId = 0); + /// + /// Gets the variant alias by variant id + /// + /// Variant identifier + /// Language identifier + /// Variant alias + string GetVariantAliasById(int variantId, int languageId = 0); - /// - /// Get the variant option alias by value id - /// - /// Option identifier - /// Language identifier - /// Variant option alias - string GetVariantOptionAliasById(int optionId, int languageId = 0); + /// + /// Get the variant option alias by value id + /// + /// Option identifier + /// Language identifier + /// Variant option alias + string GetVariantOptionAliasById(int optionId, int languageId = 0); - /// - /// Clears all cached common facet mappings - /// - void ClearCommonFacetCache(); + /// + /// Clears all cached common facet mappings + /// + void ClearCommonFacetCache(); - /// - /// Get the common facet alias by facet group kind - /// - /// Facet group kind - /// Language identifier - /// Common facet alias - string GetCommonFacetAliasByGroupKind(FacetGroupKind kind, int languageId); - } + /// + /// Get the common facet alias by facet group kind + /// + /// Facet group kind + /// Language identifier + /// Common facet alias + string GetCommonFacetAliasByGroupKind(FacetGroupKind kind, int languageId); + } } diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryFactory.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryFactory.cs index 7b0afdba68..03026bf532 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryFactory.cs @@ -1,17 +1,17 @@ namespace SmartStore.Services.Search.Modelling { - public interface ICatalogSearchQueryFactory - { - /// - /// Creates a instance from the current - /// by looking up corresponding keys in posted form and/or query string - /// - /// The query object - CatalogSearchQuery CreateFromQuery(); + public interface ICatalogSearchQueryFactory + { + /// + /// Creates a instance from the current + /// by looking up corresponding keys in posted form and/or query string + /// + /// The query object + CatalogSearchQuery CreateFromQuery(); - /// - /// The last created query instance. The MVC model binder uses this property to avoid repeated binding. - /// - CatalogSearchQuery Current { get; } - } + /// + /// The last created query instance. The MVC model binder uses this property to avoid repeated binding. + /// + CatalogSearchQuery Current { get; } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs b/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs index d39648af11..407dc43f9c 100644 --- a/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs +++ b/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs @@ -13,26 +13,26 @@ namespace SmartStore.Services.Search.Extensions { public class FacetUrlHelper - { - private readonly ICatalogSearchQueryAliasMapper _catalogAliasMapper; + { + private readonly ICatalogSearchQueryAliasMapper _catalogAliasMapper; private readonly IForumSearchQueryAliasMapper _forumAliasMapper; private readonly IWorkContext _workContext; - private readonly HttpRequestBase _httpRequest; + private readonly HttpRequestBase _httpRequest; - private readonly int _languageId; - private readonly string _url; - private readonly QueryString _initialQuery; + private readonly int _languageId; + private readonly string _url; + private readonly QueryString _initialQuery; - private readonly static IDictionary _queryNames = new Dictionary - { + private readonly static IDictionary _queryNames = new Dictionary + { // Catalog. { FacetGroupKind.Brand, "m" }, - { FacetGroupKind.Category, "c" }, - { FacetGroupKind.Price, "p" }, - { FacetGroupKind.Rating, "r" }, - { FacetGroupKind.DeliveryTime, "d" }, - { FacetGroupKind.Availability, "a" }, - { FacetGroupKind.NewArrivals, "n" }, + { FacetGroupKind.Category, "c" }, + { FacetGroupKind.Price, "p" }, + { FacetGroupKind.Rating, "r" }, + { FacetGroupKind.DeliveryTime, "d" }, + { FacetGroupKind.Availability, "a" }, + { FacetGroupKind.NewArrivals, "n" }, // Forum. { FacetGroupKind.Forum, "f" }, @@ -40,173 +40,173 @@ public class FacetUrlHelper { FacetGroupKind.Date, "d" } }; - public FacetUrlHelper( - ICatalogSearchQueryAliasMapper catalogAliasMapper, + public FacetUrlHelper( + ICatalogSearchQueryAliasMapper catalogAliasMapper, IForumSearchQueryAliasMapper forumAliasMapper, IWorkContext workContext, - HttpRequestBase httpRequest) - { - _catalogAliasMapper = catalogAliasMapper; + HttpRequestBase httpRequest) + { + _catalogAliasMapper = catalogAliasMapper; _forumAliasMapper = forumAliasMapper; - _workContext = workContext; - _httpRequest = httpRequest; - - _languageId = _workContext.WorkingLanguage.Id; - _url = _httpRequest.CurrentExecutionFilePath; - //_initialQuery = new QueryString().FillFromString(_httpRequest.QueryString.ToString(), false); - _initialQuery = QueryString.CurrentUnvalidated; - - // Remove page index (i) from query string - _initialQuery.Remove("i"); - } - - public string Toggle(Facet facet) - { - if (facet.Value.IsSelected) - { - return Remove(facet); - } - else - { - return Add(facet); - } - } - - public string Add(params Facet[] facets) - { - var qs = new QueryString(_initialQuery); - - foreach (var facet in facets) - { - var parts = GetQueryParts(facet); - foreach (var name in parts.AllKeys) - { - qs.Add(name, parts[name], !facet.FacetGroup.IsMultiSelect); - } - } - - return _url + qs.ToString(false); - } - - public string Remove(params Facet[] facets) - { - var qs = new QueryString(_initialQuery); - - foreach (var facet in facets) - { - var parts = GetQueryParts(facet); - foreach (var name in parts.AllKeys) - { - var qsName = name; - - if (!qs.AllKeys.Contains(name)) - { - // Query string does not contain that name. Try the unmapped name. - switch (facet.FacetGroup.Kind) - { - case FacetGroupKind.Attribute: - qsName = "attr" + facet.Value.ParentId; - break; - case FacetGroupKind.Variant: - qsName = "vari" + facet.Value.ParentId; - break; - case FacetGroupKind.Category: - case FacetGroupKind.Brand: - case FacetGroupKind.Price: - case FacetGroupKind.Rating: - case FacetGroupKind.DeliveryTime: - case FacetGroupKind.Availability: - case FacetGroupKind.NewArrivals: + _workContext = workContext; + _httpRequest = httpRequest; + + _languageId = _workContext.WorkingLanguage.Id; + _url = _httpRequest.CurrentExecutionFilePath; + //_initialQuery = new QueryString().FillFromString(_httpRequest.QueryString.ToString(), false); + _initialQuery = QueryString.CurrentUnvalidated; + + // Remove page index (i) from query string + _initialQuery.Remove("i"); + } + + public string Toggle(Facet facet) + { + if (facet.Value.IsSelected) + { + return Remove(facet); + } + else + { + return Add(facet); + } + } + + public string Add(params Facet[] facets) + { + var qs = new QueryString(_initialQuery); + + foreach (var facet in facets) + { + var parts = GetQueryParts(facet); + foreach (var name in parts.AllKeys) + { + qs.Add(name, parts[name], !facet.FacetGroup.IsMultiSelect); + } + } + + return _url + qs.ToString(false); + } + + public string Remove(params Facet[] facets) + { + var qs = new QueryString(_initialQuery); + + foreach (var facet in facets) + { + var parts = GetQueryParts(facet); + foreach (var name in parts.AllKeys) + { + var qsName = name; + + if (!qs.AllKeys.Contains(name)) + { + // Query string does not contain that name. Try the unmapped name. + switch (facet.FacetGroup.Kind) + { + case FacetGroupKind.Attribute: + qsName = "attr" + facet.Value.ParentId; + break; + case FacetGroupKind.Variant: + qsName = "vari" + facet.Value.ParentId; + break; + case FacetGroupKind.Category: + case FacetGroupKind.Brand: + case FacetGroupKind.Price: + case FacetGroupKind.Rating: + case FacetGroupKind.DeliveryTime: + case FacetGroupKind.Availability: + case FacetGroupKind.NewArrivals: case FacetGroupKind.Forum: case FacetGroupKind.Customer: case FacetGroupKind.Date: - qsName = _queryNames[facet.FacetGroup.Kind]; - break; - } - } - - string[] currentValues = null; - - // The query string value is not necessarily equal to the facet value. - // We must skip subsequent lines here to not add the removed value again and again. - if (facet.FacetGroup.Kind != FacetGroupKind.Price && - facet.FacetGroup.Kind != FacetGroupKind.Availability && - facet.FacetGroup.Kind != FacetGroupKind.NewArrivals) - { - currentValues = qs.Get(qsName)?.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToArray(); - } - - qs.Remove(qsName); - - if (currentValues != null) - { - var removeValues = parts.GetValues(name); - var newValues = currentValues.Except(removeValues).ToArray(); - if (newValues.Length > 0) - { - newValues.Each(x => qs.Add(name, x, false)); - } - } - } - } - - return _url + qs.ToString(false); - } - - public string GetQueryName(Facet facet) - { - var parts = GetQueryParts(facet); - return parts.GetKey(0); - } - - protected virtual NameValueCollection GetQueryParts(Facet facet) - { - string name = null; - string value = null; - int entityId; - - var group = facet.FacetGroup; - var val = facet.Value; - - var result = new NameValueCollection(2); - - switch (group.Kind) - { - case FacetGroupKind.Attribute: - if (facet.Value.TypeCode == IndexTypeCode.Double) - { - value = "{0}~{1}".FormatInvariant( - val.Value != null ? ((double)val.Value).ToString(CultureInfo.InvariantCulture) : "", - val.UpperValue != null ? ((double)val.UpperValue).ToString(CultureInfo.InvariantCulture) : ""); - } - else - { - entityId = val.Value.Convert(); - value = _catalogAliasMapper.GetAttributeOptionAliasById(entityId, _languageId) ?? "opt" + entityId; - } - name = _catalogAliasMapper.GetAttributeAliasById(val.ParentId, _languageId) ?? "attr" + val.ParentId; - result.Add(name, value); - break; - case FacetGroupKind.Variant: - entityId = val.Value.Convert(); - name = _catalogAliasMapper.GetVariantAliasById(val.ParentId, _languageId) ?? "vari" + val.ParentId; - value = _catalogAliasMapper.GetVariantOptionAliasById(entityId, _languageId) ?? "opt" + entityId; - result.Add(name, value); - break; - case FacetGroupKind.Category: - case FacetGroupKind.Brand: - case FacetGroupKind.Price: - case FacetGroupKind.Rating: - case FacetGroupKind.DeliveryTime: - case FacetGroupKind.Availability: - case FacetGroupKind.NewArrivals: - value = val.ToString(); - if (value.HasValue()) - { - name = _catalogAliasMapper.GetCommonFacetAliasByGroupKind(group.Kind, _languageId) ?? _queryNames[group.Kind]; - result.Add(name, value); - } - break; + qsName = _queryNames[facet.FacetGroup.Kind]; + break; + } + } + + string[] currentValues = null; + + // The query string value is not necessarily equal to the facet value. + // We must skip subsequent lines here to not add the removed value again and again. + if (facet.FacetGroup.Kind != FacetGroupKind.Price && + facet.FacetGroup.Kind != FacetGroupKind.Availability && + facet.FacetGroup.Kind != FacetGroupKind.NewArrivals) + { + currentValues = qs.Get(qsName)?.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToArray(); + } + + qs.Remove(qsName); + + if (currentValues != null) + { + var removeValues = parts.GetValues(name); + var newValues = currentValues.Except(removeValues).ToArray(); + if (newValues.Length > 0) + { + newValues.Each(x => qs.Add(name, x, false)); + } + } + } + } + + return _url + qs.ToString(false); + } + + public string GetQueryName(Facet facet) + { + var parts = GetQueryParts(facet); + return parts.GetKey(0); + } + + protected virtual NameValueCollection GetQueryParts(Facet facet) + { + string name = null; + string value = null; + int entityId; + + var group = facet.FacetGroup; + var val = facet.Value; + + var result = new NameValueCollection(2); + + switch (group.Kind) + { + case FacetGroupKind.Attribute: + if (facet.Value.TypeCode == IndexTypeCode.Double) + { + value = "{0}~{1}".FormatInvariant( + val.Value != null ? ((double)val.Value).ToString(CultureInfo.InvariantCulture) : "", + val.UpperValue != null ? ((double)val.UpperValue).ToString(CultureInfo.InvariantCulture) : ""); + } + else + { + entityId = val.Value.Convert(); + value = _catalogAliasMapper.GetAttributeOptionAliasById(entityId, _languageId) ?? "opt" + entityId; + } + name = _catalogAliasMapper.GetAttributeAliasById(val.ParentId, _languageId) ?? "attr" + val.ParentId; + result.Add(name, value); + break; + case FacetGroupKind.Variant: + entityId = val.Value.Convert(); + name = _catalogAliasMapper.GetVariantAliasById(val.ParentId, _languageId) ?? "vari" + val.ParentId; + value = _catalogAliasMapper.GetVariantOptionAliasById(entityId, _languageId) ?? "opt" + entityId; + result.Add(name, value); + break; + case FacetGroupKind.Category: + case FacetGroupKind.Brand: + case FacetGroupKind.Price: + case FacetGroupKind.Rating: + case FacetGroupKind.DeliveryTime: + case FacetGroupKind.Availability: + case FacetGroupKind.NewArrivals: + value = val.ToString(); + if (value.HasValue()) + { + name = _catalogAliasMapper.GetCommonFacetAliasByGroupKind(group.Kind, _languageId) ?? _queryNames[group.Kind]; + result.Add(name, value); + } + break; case FacetGroupKind.Forum: case FacetGroupKind.Customer: case FacetGroupKind.Date: @@ -217,9 +217,9 @@ protected virtual NameValueCollection GetQueryParts(Facet facet) result.Add(name, value); } break; - } + } - return result; - } - } + return result; + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Extensions/FacetUtility.cs b/src/Libraries/SmartStore.Services/Search/Extensions/FacetUtility.cs index 5503a09110..6f29143638 100644 --- a/src/Libraries/SmartStore.Services/Search/Extensions/FacetUtility.cs +++ b/src/Libraries/SmartStore.Services/Search/Extensions/FacetUtility.cs @@ -14,119 +14,119 @@ namespace SmartStore.Services.Search.Extensions /// Contains methods that are specifically required for facet processing. /// public static class FacetUtility - { - private const double MAX_PRICE = 1000000000; - - private static int[,] _priceThresholds = new int[,] - { - { 10, 5 }, - { 25, 15 }, - { 200, 25 }, - { 500, 50 }, - { 1000, 100 }, - { 2000, 250 }, - { 5000, 500 }, - { 10000, 1000 }, - { 20000, 2500 }, - { 50000, 5000 }, - { 100000, 10000 }, - { 200000, 25000 }, - { 500000, 50000 }, - { 1000000, 100000 }, - { 2000000, 250000 }, - { 5000000, 500000 }, - { 10000000, 1000000 }, - { 20000000, 2500000 }, - { 50000000, 5000000 } - }; - - public static double GetNextPrice(double price) - { - for (var i = 0; i <= _priceThresholds.GetUpperBound(0); ++i) - { - if (price < _priceThresholds[i, 0]) - return price + _priceThresholds[i, 1]; - } - - return MAX_PRICE; - } - - public static double MakePriceEven(double price) - { - if (price == 0.0) - return GetNextPrice(0.0); - - // Get previous threshold for price. - var result = 0.0; - for (var i = 1; i <= _priceThresholds.GetUpperBound(0) && result == 0.0; ++i) - { - if (price < _priceThresholds[i, 0]) - result = _priceThresholds[i - 1, 0]; - } - - while (result < price && result < MAX_PRICE) - { - result = GetNextPrice(result); - } - - return result; - } - - public static List GetLessPriceFacets(List facets, int maxNumber) - { - const double expFactor = 2.0; - const double flatten = 2.0; - - if (facets.Count <= 3) - return facets; - - // Remove too granular facets. - if (facets.Any(x => x.Value.UpperValue != null && (double)x.Value.UpperValue == 25.0)) - { - facets.RemoveFacet(5.0, true); - facets.RemoveFacet(10.0, true); - } - - var result = new List(); - var expIndexes = new HashSet(); - var lastIndex = facets.Count - 1; - - // Get exponential distributed indexes. - for (var i = 0.0; i < lastIndex; ++i) - { - var x = (int)Math.Floor(Math.Pow(expFactor, i / flatten)); - expIndexes.Add(x); - } - - for (var index = 0; index <= lastIndex; ++index) - { - var facet = facets[index]; - - // Always return first, last and selected facets. - if (index == 0 || index == lastIndex || facet.Value.IsSelected) - { - result.Add(facet); - } - else if (expIndexes.Contains(index) && result.Count < maxNumber && index < (lastIndex - 1)) - { - result.Add(facet); - } - } - - return result; - } - - public static IEnumerable GetRatings() - { - var count = 0; - for (double rate = 1.0; rate <= 5.0; ++rate) - { - yield return new FacetValue(rate, IndexTypeCode.Double) - { - DisplayOrder = ++count - }; - } - } + { + private const double MAX_PRICE = 1000000000; + + private static int[,] _priceThresholds = new int[,] + { + { 10, 5 }, + { 25, 15 }, + { 200, 25 }, + { 500, 50 }, + { 1000, 100 }, + { 2000, 250 }, + { 5000, 500 }, + { 10000, 1000 }, + { 20000, 2500 }, + { 50000, 5000 }, + { 100000, 10000 }, + { 200000, 25000 }, + { 500000, 50000 }, + { 1000000, 100000 }, + { 2000000, 250000 }, + { 5000000, 500000 }, + { 10000000, 1000000 }, + { 20000000, 2500000 }, + { 50000000, 5000000 } + }; + + public static double GetNextPrice(double price) + { + for (var i = 0; i <= _priceThresholds.GetUpperBound(0); ++i) + { + if (price < _priceThresholds[i, 0]) + return price + _priceThresholds[i, 1]; + } + + return MAX_PRICE; + } + + public static double MakePriceEven(double price) + { + if (price == 0.0) + return GetNextPrice(0.0); + + // Get previous threshold for price. + var result = 0.0; + for (var i = 1; i <= _priceThresholds.GetUpperBound(0) && result == 0.0; ++i) + { + if (price < _priceThresholds[i, 0]) + result = _priceThresholds[i - 1, 0]; + } + + while (result < price && result < MAX_PRICE) + { + result = GetNextPrice(result); + } + + return result; + } + + public static List GetLessPriceFacets(List facets, int maxNumber) + { + const double expFactor = 2.0; + const double flatten = 2.0; + + if (facets.Count <= 3) + return facets; + + // Remove too granular facets. + if (facets.Any(x => x.Value.UpperValue != null && (double)x.Value.UpperValue == 25.0)) + { + facets.RemoveFacet(5.0, true); + facets.RemoveFacet(10.0, true); + } + + var result = new List(); + var expIndexes = new HashSet(); + var lastIndex = facets.Count - 1; + + // Get exponential distributed indexes. + for (var i = 0.0; i < lastIndex; ++i) + { + var x = (int)Math.Floor(Math.Pow(expFactor, i / flatten)); + expIndexes.Add(x); + } + + for (var index = 0; index <= lastIndex; ++index) + { + var facet = facets[index]; + + // Always return first, last and selected facets. + if (index == 0 || index == lastIndex || facet.Value.IsSelected) + { + result.Add(facet); + } + else if (expIndexes.Contains(index) && result.Count < maxNumber && index < (lastIndex - 1)) + { + result.Add(facet); + } + } + + return result; + } + + public static IEnumerable GetRatings() + { + var count = 0; + for (double rate = 1.0; rate <= 5.0; ++rate) + { + yield return new FacetValue(rate, IndexTypeCode.Double) + { + DisplayOrder = ++count + }; + } + } public static IQueryable GetCustomersByNumberOfPosts( IRepository forumPostRepository, diff --git a/src/Libraries/SmartStore.Services/Search/Extensions/UrlHelperExtensions.cs b/src/Libraries/SmartStore.Services/Search/Extensions/UrlHelperExtensions.cs index 1f07ae6323..32e074e7ba 100644 --- a/src/Libraries/SmartStore.Services/Search/Extensions/UrlHelperExtensions.cs +++ b/src/Libraries/SmartStore.Services/Search/Extensions/UrlHelperExtensions.cs @@ -4,30 +4,30 @@ namespace SmartStore.Services.Search.Extensions { - public static class UrlHelperExtensions - { - public static string FacetToggle(this UrlHelper urlHelper, Facet facet) - { - var facetUrlHelper = EngineContext.Current.Resolve(); - return facetUrlHelper.Toggle(facet); - } + public static class UrlHelperExtensions + { + public static string FacetToggle(this UrlHelper urlHelper, Facet facet) + { + var facetUrlHelper = EngineContext.Current.Resolve(); + return facetUrlHelper.Toggle(facet); + } - public static string FacetAdd(this UrlHelper urlHelper, params Facet[] facets) - { - var facetUrlHelper = EngineContext.Current.Resolve(); - return facetUrlHelper.Add(facets); - } + public static string FacetAdd(this UrlHelper urlHelper, params Facet[] facets) + { + var facetUrlHelper = EngineContext.Current.Resolve(); + return facetUrlHelper.Add(facets); + } - public static string FacetRemove(this UrlHelper urlHelper, params Facet[] facets) - { - var facetUrlHelper = EngineContext.Current.Resolve(); - return facetUrlHelper.Remove(facets); - } + public static string FacetRemove(this UrlHelper urlHelper, params Facet[] facets) + { + var facetUrlHelper = EngineContext.Current.Resolve(); + return facetUrlHelper.Remove(facets); + } - public static string GetFacetQueryName(this UrlHelper urlHelper, Facet facet) - { - var facetUrlHelper = EngineContext.Current.Resolve(); - return facetUrlHelper.GetQueryName(facet); - } - } + public static string GetFacetQueryName(this UrlHelper urlHelper, Facet facet) + { + var facetUrlHelper = EngineContext.Current.Resolve(); + return facetUrlHelper.GetQueryName(facet); + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchEvents.cs b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchEvents.cs index 7c1c6f986c..91b55db08a 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchEvents.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchEvents.cs @@ -1,29 +1,29 @@ namespace SmartStore.Services.Search { public class ForumSearchingEvent - { + { public ForumSearchingEvent(ForumSearchQuery query) { - Guard.NotNull(query, nameof(query)); + Guard.NotNull(query, nameof(query)); - Query = query; - } + Query = query; + } public ForumSearchQuery Query { get; private set; } } - public class ForumSearchedEvent + public class ForumSearchedEvent { - public ForumSearchedEvent(ForumSearchQuery query, ForumSearchResult result) - { - Guard.NotNull(query, nameof(query)); - Guard.NotNull(result, nameof(result)); + public ForumSearchedEvent(ForumSearchQuery query, ForumSearchResult result) + { + Guard.NotNull(query, nameof(query)); + Guard.NotNull(result, nameof(result)); - Query = query; - Result = result; - } + Query = query; + Result = result; + } - public ForumSearchQuery Query { get; private set; } - public ForumSearchResult Result { get; private set; } - } + public ForumSearchQuery Query { get; private set; } + public ForumSearchResult Result { get; private set; } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchQuery.cs b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchQuery.cs index edd039de93..53313b67cc 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchQuery.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchQuery.cs @@ -8,34 +8,34 @@ namespace SmartStore.Services.Search { public partial class ForumSearchQuery : SearchQuery, ICloneable - { + { /// /// Initializes a new instance of the class without a search term being set. /// public ForumSearchQuery() - : base((string[])null, null) - { - } - - public ForumSearchQuery(string field, string term, SearchMode mode = SearchMode.Contains, bool escape = true, bool isFuzzySearch = false) - : base(field.HasValue() ? new[] { field } : null, term, mode, escape, isFuzzySearch) - { - } - - public ForumSearchQuery(string[] fields, string term, SearchMode mode = SearchMode.Contains, bool escape = true, bool isFuzzySearch = false) - : base(fields, term, mode, escape, isFuzzySearch) - { - } - - public ForumSearchQuery Clone() - { - return (ForumSearchQuery)this.MemberwiseClone(); - } - - object ICloneable.Clone() - { - return this.MemberwiseClone(); - } + : base((string[])null, null) + { + } + + public ForumSearchQuery(string field, string term, SearchMode mode = SearchMode.Contains, bool escape = true, bool isFuzzySearch = false) + : base(field.HasValue() ? new[] { field } : null, term, mode, escape, isFuzzySearch) + { + } + + public ForumSearchQuery(string[] fields, string term, SearchMode mode = SearchMode.Contains, bool escape = true, bool isFuzzySearch = false) + : base(fields, term, mode, escape, isFuzzySearch) + { + } + + public ForumSearchQuery Clone() + { + return (ForumSearchQuery)this.MemberwiseClone(); + } + + object ICloneable.Clone() + { + return this.MemberwiseClone(); + } #region Fluent builder diff --git a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchResult.cs b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchResult.cs index 031c94b177..540a93de22 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchResult.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchResult.cs @@ -10,37 +10,37 @@ namespace SmartStore.Services.Search public partial class ForumSearchResult { private readonly Func> _hitsFactory; - private IPagedList _hits; + private IPagedList _hits; - public ForumSearchResult( - ISearchEngine engine, + public ForumSearchResult( + ISearchEngine engine, ForumSearchQuery query, - int totalHitsCount, + int totalHitsCount, int[] hitsEntityIds, Func> hitsFactory, - string[] spellCheckerSuggestions, + string[] spellCheckerSuggestions, IDictionary facets) - { - Guard.NotNull(query, nameof(query)); + { + Guard.NotNull(query, nameof(query)); - Engine = engine; - Query = query; - SpellCheckerSuggestions = spellCheckerSuggestions ?? new string[0]; + Engine = engine; + Query = query; + SpellCheckerSuggestions = spellCheckerSuggestions ?? new string[0]; Facets = facets ?? new Dictionary(); _hitsFactory = hitsFactory ?? (() => new List()); HitsEntityIds = hitsEntityIds ?? new int[0]; TotalHitsCount = totalHitsCount; - } + } /// /// Constructor for an instance without any search hits /// /// Forum search query public ForumSearchResult(ForumSearchQuery query) - : this(null, query, 0, null, () => new List(), null, null) - { - } + : this(null, query, 0, null, () => new List(), null, null) + { + } /// /// Entity identifiers of found forum posts. @@ -51,21 +51,21 @@ public ForumSearchResult(ForumSearchQuery query) /// Forum posts found. /// public IPagedList Hits - { - get - { - if (_hits == null) - { - var entities = TotalHitsCount == 0 - ? new List() - : _hitsFactory.Invoke(); + { + get + { + if (_hits == null) + { + var entities = TotalHitsCount == 0 + ? new List() + : _hitsFactory.Invoke(); - _hits = new PagedList(entities, Query.PageIndex, Query.Take, TotalHitsCount); - } + _hits = new PagedList(entities, Query.PageIndex, Query.Take, TotalHitsCount); + } - return _hits; - } - } + return _hits; + } + } public int TotalHitsCount { get; } @@ -74,13 +74,13 @@ public IPagedList Hits /// public ForumSearchQuery Query { get; private set; } - /// - /// Gets spell checking suggestions/corrections. - /// - public string[] SpellCheckerSuggestions { get; set; } + /// + /// Gets spell checking suggestions/corrections. + /// + public string[] SpellCheckerSuggestions { get; set; } public IDictionary Facets { get; private set; } - public ISearchEngine Engine { get; private set; } + public ISearchEngine Engine { get; private set; } } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchService.cs b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchService.cs index 0066621ac1..0cff069cf5 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchService.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchService.cs @@ -12,25 +12,25 @@ namespace SmartStore.Services.Search { public partial class ForumSearchService : SearchServiceBase, IForumSearchService - { - private readonly ICommonServices _services; - private readonly IIndexManager _indexManager; + { + private readonly ICommonServices _services; + private readonly IIndexManager _indexManager; private readonly Lazy _forumService; private readonly ILogger _logger; - private readonly UrlHelper _urlHelper; + private readonly UrlHelper _urlHelper; - public ForumSearchService( - ICommonServices services, - IIndexManager indexManager, + public ForumSearchService( + ICommonServices services, + IIndexManager indexManager, Lazy forumService, - ILogger logger, - UrlHelper urlHelper) - { - _services = services; - _indexManager = indexManager; + ILogger logger, + UrlHelper urlHelper) + { + _services = services; + _indexManager = indexManager; _forumService = forumService; - _logger = logger; - _urlHelper = urlHelper; + _logger = logger; + _urlHelper = urlHelper; } /// @@ -39,58 +39,58 @@ public ForumSearchService( /// Search query. /// Forum search result. protected virtual ForumSearchResult SearchDirect(ForumSearchQuery searchQuery) - { - // Fallback to linq search. - var linqForumSearchService = _services.Container.ResolveNamed("linq"); - var result = linqForumSearchService.Search(searchQuery, true); + { + // Fallback to linq search. + var linqForumSearchService = _services.Container.ResolveNamed("linq"); + var result = linqForumSearchService.Search(searchQuery, true); return result; - } + } public ForumSearchResult Search(ForumSearchQuery searchQuery, bool direct = false) { - Guard.NotNull(searchQuery, nameof(searchQuery)); - Guard.NotNegative(searchQuery.Take, nameof(searchQuery.Take)); - - var provider = _indexManager.GetIndexProvider("Forum"); - - if (!direct && provider != null) - { - var indexStore = provider.GetIndexStore("Forum"); - if (indexStore.Exists) - { - var searchEngine = provider.GetSearchEngine(indexStore, searchQuery); - var stepPrefix = searchEngine.GetType().Name + " - "; - var totalCount = 0; + Guard.NotNull(searchQuery, nameof(searchQuery)); + Guard.NotNegative(searchQuery.Take, nameof(searchQuery.Take)); + + var provider = _indexManager.GetIndexProvider("Forum"); + + if (!direct && provider != null) + { + var indexStore = provider.GetIndexStore("Forum"); + if (indexStore.Exists) + { + var searchEngine = provider.GetSearchEngine(indexStore, searchQuery); + var stepPrefix = searchEngine.GetType().Name + " - "; + var totalCount = 0; int[] hitsEntityIds = null; string[] spellCheckerSuggestions = null; - IEnumerable searchHits; - Func> hitsFactory = null; + IEnumerable searchHits; + Func> hitsFactory = null; IDictionary facets = null; _services.EventPublisher.Publish(new ForumSearchingEvent(searchQuery)); - if (searchQuery.Take > 0) - { - using (_services.Chronometer.Step(stepPrefix + "Count")) - { - totalCount = searchEngine.Count(); - // Fix paging boundaries. - if (searchQuery.Skip > 0 && searchQuery.Skip >= totalCount) - { - searchQuery.Slice((totalCount / searchQuery.Take) * searchQuery.Take, searchQuery.Take); - } - } - - using (_services.Chronometer.Step(stepPrefix + "Hits")) - { - searchHits = searchEngine.Search(); - } - - if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithHits)) - { - using (_services.Chronometer.Step(stepPrefix + "Collect")) - { + if (searchQuery.Take > 0) + { + using (_services.Chronometer.Step(stepPrefix + "Count")) + { + totalCount = searchEngine.Count(); + // Fix paging boundaries. + if (searchQuery.Skip > 0 && searchQuery.Skip >= totalCount) + { + searchQuery.Slice((totalCount / searchQuery.Take) * searchQuery.Take, searchQuery.Take); + } + } + + using (_services.Chronometer.Step(stepPrefix + "Hits")) + { + searchHits = searchEngine.Search(); + } + + if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithHits)) + { + using (_services.Chronometer.Step(stepPrefix + "Collect")) + { hitsEntityIds = searchHits.Select(x => x.EntityId).ToArray(); hitsFactory = () => _forumService.Value.GetPostsByIds(hitsEntityIds); } @@ -112,48 +112,48 @@ public ForumSearchResult Search(ForumSearchQuery searchQuery, bool direct = fals } } - if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithSuggestions)) - { - try - { - using (_services.Chronometer.Step(stepPrefix + "Spellcheck")) - { - spellCheckerSuggestions = searchEngine.CheckSpelling(); - } - } - catch (Exception ex) - { - // Spell checking should not break the search. - _logger.Error(ex); - } - } - - var result = new ForumSearchResult( - searchEngine, - searchQuery, - totalCount, + if (searchQuery.ResultFlags.HasFlag(SearchResultFlags.WithSuggestions)) + { + try + { + using (_services.Chronometer.Step(stepPrefix + "Spellcheck")) + { + spellCheckerSuggestions = searchEngine.CheckSpelling(); + } + } + catch (Exception ex) + { + // Spell checking should not break the search. + _logger.Error(ex); + } + } + + var result = new ForumSearchResult( + searchEngine, + searchQuery, + totalCount, hitsEntityIds, hitsFactory, - spellCheckerSuggestions, + spellCheckerSuggestions, facets); - _services.EventPublisher.Publish(new ForumSearchedEvent(searchQuery, result)); + _services.EventPublisher.Publish(new ForumSearchedEvent(searchQuery, result)); - return result; - } - else if (searchQuery.Origin.IsCaseInsensitiveEqual("Boards/Search")) - { - IndexingRequiredNotification(_services, _urlHelper); - } - } + return result; + } + else if (searchQuery.Origin.IsCaseInsensitiveEqual("Boards/Search")) + { + IndexingRequiredNotification(_services, _urlHelper); + } + } - return SearchDirect(searchQuery); - } + return SearchDirect(searchQuery); + } - public IQueryable PrepareQuery(ForumSearchQuery searchQuery, IQueryable baseQuery = null) + public IQueryable PrepareQuery(ForumSearchQuery searchQuery, IQueryable baseQuery = null) { - var linqForumSearchService = _services.Container.ResolveNamed("linq"); - return linqForumSearchService.PrepareQuery(searchQuery, baseQuery); - } - } + var linqForumSearchService = _services.Container.ResolveNamed("linq"); + return linqForumSearchService.PrepareQuery(searchQuery, baseQuery); + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/IForumSearchService.cs b/src/Libraries/SmartStore.Services/Search/Forum/IForumSearchService.cs index e6a7f135af..a14dce90dc 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/IForumSearchService.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/IForumSearchService.cs @@ -4,7 +4,7 @@ namespace SmartStore.Services.Search { public partial interface IForumSearchService - { + { /// /// Searches for forum posts. /// @@ -20,5 +20,5 @@ public partial interface IForumSearchService /// Optional query used to build the forum post query. /// Forum post queryable. IQueryable PrepareQuery(ForumSearchQuery searchQuery, IQueryable baseQuery = null); - } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/LinqForumSearchService.cs b/src/Libraries/SmartStore.Services/Search/Forum/LinqForumSearchService.cs index 347806f060..0d9257c4f1 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/LinqForumSearchService.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/LinqForumSearchService.cs @@ -39,7 +39,7 @@ public LinqForumSearchService( IForumService forumService, ICommonServices services, CustomerSettings customerSettings) - { + { _forumPostRepository = forumPostRepository; _forumTopicRepository = forumTopicRepository; _forumRepository = forumRepository; @@ -47,7 +47,7 @@ public LinqForumSearchService( _storeMappingRepository = storeMappingRepository; _aclRepository = aclRepository; _forumService = forumService; - _services = services; + _services = services; _customerSettings = customerSettings; T = NullLocalizer.Instance; @@ -381,16 +381,16 @@ protected virtual IDictionary GetFacets(ForumSearchQuery sea } public ForumSearchResult Search(ForumSearchQuery searchQuery, bool direct = false) - { + { _services.EventPublisher.Publish(new ForumSearchingEvent(searchQuery)); - var totalHits = 0; + var totalHits = 0; int[] hitsEntityIds = null; Func> hitsFactory = null; IDictionary facets = null; if (searchQuery.Take > 0) - { + { var query = GetPostQuery(searchQuery, null); totalHits = query.Count(); @@ -418,22 +418,22 @@ public ForumSearchResult Search(ForumSearchQuery searchQuery, bool direct = fals } var result = new ForumSearchResult( - null, - searchQuery, - totalHits, + null, + searchQuery, + totalHits, hitsEntityIds, hitsFactory, - null, + null, facets); _services.EventPublisher.Publish(new ForumSearchedEvent(searchQuery, result)); - return result; - } + return result; + } - public IQueryable PrepareQuery(ForumSearchQuery searchQuery, IQueryable baseQuery = null) - { + public IQueryable PrepareQuery(ForumSearchQuery searchQuery, IQueryable baseQuery = null) + { return GetPostQuery(searchQuery, baseQuery); } - } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryAliasMapper.cs b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryAliasMapper.cs index ccded4cd3f..de2c8be999 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryAliasMapper.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryAliasMapper.cs @@ -9,63 +9,63 @@ namespace SmartStore.Services.Search.Modelling { public class ForumSearchQueryAliasMapper : IForumSearchQueryAliasMapper - { - private const string ALL_FORUM_COMMONFACET_ALIAS_BY_KIND_KEY = "search.forum.commonfacet.alias.kind.mappings.all"; + { + private const string ALL_FORUM_COMMONFACET_ALIAS_BY_KIND_KEY = "search.forum.commonfacet.alias.kind.mappings.all"; - private readonly ICacheManager _cacheManager; - private readonly ISettingService _settingService; - private readonly ILanguageService _languageService; + private readonly ICacheManager _cacheManager; + private readonly ISettingService _settingService; + private readonly ILanguageService _languageService; - public ForumSearchQueryAliasMapper( - ICacheManager cacheManager, - ISettingService settingService, - ILanguageService languageService) - { - _cacheManager = cacheManager; - _settingService = settingService; - _languageService = languageService; - } + public ForumSearchQueryAliasMapper( + ICacheManager cacheManager, + ISettingService settingService, + ILanguageService languageService) + { + _cacheManager = cacheManager; + _settingService = settingService; + _languageService = languageService; + } - protected virtual IDictionary GetCommonFacetAliasByGroupKindMappings() - { - return _cacheManager.Get(ALL_FORUM_COMMONFACET_ALIAS_BY_KIND_KEY, () => - { - var result = new Dictionary(StringComparer.OrdinalIgnoreCase); + protected virtual IDictionary GetCommonFacetAliasByGroupKindMappings() + { + return _cacheManager.Get(ALL_FORUM_COMMONFACET_ALIAS_BY_KIND_KEY, () => + { + var result = new Dictionary(StringComparer.OrdinalIgnoreCase); - var groupKinds = new FacetGroupKind[] - { + var groupKinds = new FacetGroupKind[] + { FacetGroupKind.Forum, FacetGroupKind.Customer, FacetGroupKind.Date - }; + }; - foreach (var language in _languageService.GetAllLanguages()) - { - foreach (var groupKind in groupKinds) - { - var key = FacetUtility.GetFacetAliasSettingKey(groupKind, language.Id, "Forum"); - var value = _settingService.GetSettingByKey(key); - if (value.HasValue()) - { - result.Add(key, value); - } - } - } + foreach (var language in _languageService.GetAllLanguages()) + { + foreach (var groupKind in groupKinds) + { + var key = FacetUtility.GetFacetAliasSettingKey(groupKind, language.Id, "Forum"); + var value = _settingService.GetSettingByKey(key); + if (value.HasValue()) + { + result.Add(key, value); + } + } + } - return result; - }); - } + return result; + }); + } - public void ClearCommonFacetCache() - { - _cacheManager.Remove(ALL_FORUM_COMMONFACET_ALIAS_BY_KIND_KEY); - } + public void ClearCommonFacetCache() + { + _cacheManager.Remove(ALL_FORUM_COMMONFACET_ALIAS_BY_KIND_KEY); + } - public string GetCommonFacetAliasByGroupKind(FacetGroupKind kind, int languageId) - { - var mappings = GetCommonFacetAliasByGroupKindMappings(); + public string GetCommonFacetAliasByGroupKind(FacetGroupKind kind, int languageId) + { + var mappings = GetCommonFacetAliasByGroupKindMappings(); - return mappings.Get(FacetUtility.GetFacetAliasSettingKey(kind, languageId, "Forum")); - } - } + return mappings.Get(FacetUtility.GetFacetAliasSettingKey(kind, languageId, "Forum")); + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs index ec47720bb5..cc3e935fe7 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs @@ -4,39 +4,39 @@ namespace SmartStore.Services.Search.Modelling { [ModelBinderType(typeof(ForumSearchQuery))] - public class ForumSearchQueryModelBinder : IModelBinder - { - private readonly IForumSearchQueryFactory _factory; + public class ForumSearchQueryModelBinder : IModelBinder + { + private readonly IForumSearchQueryFactory _factory; - public ForumSearchQueryModelBinder(IForumSearchQueryFactory factory) - { - _factory = factory; - } + public ForumSearchQueryModelBinder(IForumSearchQueryFactory factory) + { + _factory = factory; + } - public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) - { - if (_factory.Current != null) - { - // Don't bind again for current request. - return _factory.Current; - } + public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) + { + if (_factory.Current != null) + { + // Don't bind again for current request. + return _factory.Current; + } - if (controllerContext.IsChildAction) - { + if (controllerContext.IsChildAction) + { // Never attempt to bind in child actions. We require the binding to happen // in a parent action. If the child action is part of a request with an already bound // 'ForumSearchQuery', good for you :-) You'll get an instance, but null otherwise. return _factory.Current; - } + } - var modelType = bindingContext.ModelType; - if (modelType != typeof(ForumSearchQuery)) - { - return new ForumSearchQuery(); - } + var modelType = bindingContext.ModelType; + if (modelType != typeof(ForumSearchQuery)) + { + return new ForumSearchQuery(); + } - var query = _factory.CreateFromQuery(); - return query; - } - } + var query = _factory.CreateFromQuery(); + return query; + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryAliasMapper.cs b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryAliasMapper.cs index 70b8785535..042dd41947 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryAliasMapper.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryAliasMapper.cs @@ -2,19 +2,19 @@ namespace SmartStore.Services.Search.Modelling { - public interface IForumSearchQueryAliasMapper - { - /// - /// Clears all cached common facet mappings - /// - void ClearCommonFacetCache(); + public interface IForumSearchQueryAliasMapper + { + /// + /// Clears all cached common facet mappings + /// + void ClearCommonFacetCache(); - /// - /// Get the common facet alias by facet group kind - /// - /// Facet group kind - /// Language identifier - /// Common facet alias - string GetCommonFacetAliasByGroupKind(FacetGroupKind kind, int languageId); - } + /// + /// Get the common facet alias by facet group kind + /// + /// Facet group kind + /// Language identifier + /// Common facet alias + string GetCommonFacetAliasByGroupKind(FacetGroupKind kind, int languageId); + } } diff --git a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryFactory.cs b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryFactory.cs index 05ca8c4866..fc936ce5a6 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryFactory.cs @@ -1,6 +1,6 @@ namespace SmartStore.Services.Search.Modelling { - public interface IForumSearchQueryFactory + public interface IForumSearchQueryFactory { /// /// Creates a instance from the current @@ -13,5 +13,5 @@ public interface IForumSearchQueryFactory /// The last created query instance. The MVC model binder uses this property to avoid repeated binding. /// ForumSearchQuery Current { get; } - } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Rendering/FacetTemplateProvider.cs b/src/Libraries/SmartStore.Services/Search/Rendering/FacetTemplateProvider.cs index c8e4860470..f8c30e06f6 100644 --- a/src/Libraries/SmartStore.Services/Search/Rendering/FacetTemplateProvider.cs +++ b/src/Libraries/SmartStore.Services/Search/Rendering/FacetTemplateProvider.cs @@ -5,23 +5,23 @@ namespace SmartStore.Services.Search.Rendering { - public class FacetTemplateProvider : IFacetTemplateProvider - { - private readonly IEnumerable _selectors; + public class FacetTemplateProvider : IFacetTemplateProvider + { + private readonly IEnumerable _selectors; - public FacetTemplateProvider(IEnumerable selectors) - { - _selectors = selectors; - } + public FacetTemplateProvider(IEnumerable selectors) + { + _selectors = selectors; + } - public RouteInfo GetTemplateRoute(FacetGroup facetGroup) - { - var route = _selectors - .OrderByDescending(x => x.Ordinal) - .Select(x => x.GetTemplateRoute(facetGroup)) - .FirstOrDefault(x => x != null); + public RouteInfo GetTemplateRoute(FacetGroup facetGroup) + { + var route = _selectors + .OrderByDescending(x => x.Ordinal) + .Select(x => x.GetTemplateRoute(facetGroup)) + .FirstOrDefault(x => x != null); - return route; - } - } + return route; + } + } } diff --git a/src/Libraries/SmartStore.Services/Search/Rendering/IFacetTemplateProvider.cs b/src/Libraries/SmartStore.Services/Search/Rendering/IFacetTemplateProvider.cs index 45893675d6..9f8eb7757a 100644 --- a/src/Libraries/SmartStore.Services/Search/Rendering/IFacetTemplateProvider.cs +++ b/src/Libraries/SmartStore.Services/Search/Rendering/IFacetTemplateProvider.cs @@ -3,8 +3,8 @@ namespace SmartStore.Services.Search.Rendering { - public interface IFacetTemplateProvider - { - RouteInfo GetTemplateRoute(FacetGroup facetGroup); - } + public interface IFacetTemplateProvider + { + RouteInfo GetTemplateRoute(FacetGroup facetGroup); + } } diff --git a/src/Libraries/SmartStore.Services/Search/Rendering/IFacetTemplateSelector.cs b/src/Libraries/SmartStore.Services/Search/Rendering/IFacetTemplateSelector.cs index d7efdbc334..3d6f9fbea8 100644 --- a/src/Libraries/SmartStore.Services/Search/Rendering/IFacetTemplateSelector.cs +++ b/src/Libraries/SmartStore.Services/Search/Rendering/IFacetTemplateSelector.cs @@ -3,8 +3,8 @@ namespace SmartStore.Services.Search.Rendering { - public interface IFacetTemplateSelector : IOrdered - { - RouteInfo GetTemplateRoute(FacetGroup facetGroup); - } + public interface IFacetTemplateSelector : IOrdered + { + RouteInfo GetTemplateRoute(FacetGroup facetGroup); + } } diff --git a/src/Libraries/SmartStore.Services/Security/AclService.cs b/src/Libraries/SmartStore.Services/Security/AclService.cs index 57fb239fb2..938489dce9 100644 --- a/src/Libraries/SmartStore.Services/Security/AclService.cs +++ b/src/Libraries/SmartStore.Services/Security/AclService.cs @@ -13,51 +13,51 @@ namespace SmartStore.Services.Security { public partial class AclService : IAclService { - /// - /// 0 = segment (EntityName.IdRange) - /// - const string ACL_SEGMENT_KEY = "acl:range-{0}"; - internal const string ACL_SEGMENT_PATTERN = "acl:range-*"; + /// + /// 0 = segment (EntityName.IdRange) + /// + const string ACL_SEGMENT_KEY = "acl:range-{0}"; + internal const string ACL_SEGMENT_PATTERN = "acl:range-*"; private readonly IRepository _aclRecordRepository; private readonly Work _workContext; private readonly ICacheManager _cacheManager; - private readonly Work _customerService; + private readonly Work _customerService; - private bool? _hasActiveAcl; + private bool? _hasActiveAcl; public AclService( - ICacheManager cacheManager, - Work workContext, - IRepository aclRecordRepository, - Work customerService) + ICacheManager cacheManager, + Work workContext, + IRepository aclRecordRepository, + Work customerService) { _cacheManager = cacheManager; _workContext = workContext; _aclRecordRepository = aclRecordRepository; - _customerService = customerService; - } - - public bool HasActiveAcl - { - get - { - if (!_hasActiveAcl.HasValue) - { - _hasActiveAcl = _aclRecordRepository.TableUntracked.Any(x => !x.IsIdle); - } - return _hasActiveAcl.Value; - } - } + _customerService = customerService; + } + + public bool HasActiveAcl + { + get + { + if (!_hasActiveAcl.HasValue) + { + _hasActiveAcl = _aclRecordRepository.TableUntracked.Any(x => !x.IsIdle); + } + return _hasActiveAcl.Value; + } + } public virtual void DeleteAclRecord(AclRecord aclRecord) { - Guard.NotNull(aclRecord,nameof(aclRecord)); + Guard.NotNull(aclRecord, nameof(aclRecord)); _aclRecordRepository.Delete(aclRecord); - ClearCacheSegment(aclRecord.EntityName, aclRecord.EntityId); - } + ClearCacheSegment(aclRecord.EntityName, aclRecord.EntityId); + } public virtual AclRecord GetAclRecordById(int aclRecordId) { @@ -70,73 +70,73 @@ public virtual AclRecord GetAclRecordById(int aclRecordId) public IList GetAclRecords(T entity) where T : BaseEntity, IAclSupported { - Guard.NotNull(entity, nameof(entity)); + Guard.NotNull(entity, nameof(entity)); - int entityId = entity.Id; + int entityId = entity.Id; string entityName = entity.GetEntityName(); - return GetAclRecordsFor(entityName, entityId); + return GetAclRecordsFor(entityName, entityId); } - public virtual IList GetAclRecordsFor(string entityName, int entityId) - { - Guard.IsPositive(entityId, nameof(entityId)); - Guard.NotEmpty(entityName, nameof(entityName)); - - var query = from ur in _aclRecordRepository.Table - where ur.EntityId == entityId && - ur.EntityName == entityName - select ur; - var aclRecords = query.ToList(); - return aclRecords; - } - - public virtual void SaveAclMappings(T entity, params int[] selectedCustomerRoleIds) where T : BaseEntity, IAclSupported - { - var existingAclRecords = GetAclRecords(entity); - var allCustomerRoles = _customerService.Value.GetAllCustomerRoles(true); + public virtual IList GetAclRecordsFor(string entityName, int entityId) + { + Guard.IsPositive(entityId, nameof(entityId)); + Guard.NotEmpty(entityName, nameof(entityName)); + + var query = from ur in _aclRecordRepository.Table + where ur.EntityId == entityId && + ur.EntityName == entityName + select ur; + var aclRecords = query.ToList(); + return aclRecords; + } + + public virtual void SaveAclMappings(T entity, params int[] selectedCustomerRoleIds) where T : BaseEntity, IAclSupported + { + var existingAclRecords = GetAclRecords(entity); + var allCustomerRoles = _customerService.Value.GetAllCustomerRoles(true); entity.SubjectToAcl = selectedCustomerRoleIds.Length == 1 && selectedCustomerRoleIds[0] == 0 ? false : selectedCustomerRoleIds.Any(); foreach (var customerRole in allCustomerRoles) - { - if (selectedCustomerRoleIds != null && selectedCustomerRoleIds.Contains(customerRole.Id)) - { - // New role - if (!existingAclRecords.Any(x => x.CustomerRoleId == customerRole.Id)) - InsertAclRecord(entity, customerRole.Id); - } - else - { - // Removed role - var aclRecordToDelete = existingAclRecords.FirstOrDefault(x => x.CustomerRoleId == customerRole.Id); - if (aclRecordToDelete != null) - DeleteAclRecord(aclRecordToDelete); - } - } + { + if (selectedCustomerRoleIds != null && selectedCustomerRoleIds.Contains(customerRole.Id)) + { + // New role + if (!existingAclRecords.Any(x => x.CustomerRoleId == customerRole.Id)) + InsertAclRecord(entity, customerRole.Id); + } + else + { + // Removed role + var aclRecordToDelete = existingAclRecords.FirstOrDefault(x => x.CustomerRoleId == customerRole.Id); + if (aclRecordToDelete != null) + DeleteAclRecord(aclRecordToDelete); + } + } // TODO: Find a way to detect the context of the entity. Until then we don't check for modified props //if (_aclRecordRepository.Context.TryGetModifiedProperty(entity, nameof(entity.SubjectToAcl), out _)) //{ - _aclRecordRepository.Context.SaveChanges(); + _aclRecordRepository.Context.SaveChanges(); //} - } + } - public virtual void InsertAclRecord(AclRecord aclRecord) + public virtual void InsertAclRecord(AclRecord aclRecord) { - Guard.NotNull(aclRecord, nameof(aclRecord)); + Guard.NotNull(aclRecord, nameof(aclRecord)); - _aclRecordRepository.Insert(aclRecord); + _aclRecordRepository.Insert(aclRecord); - ClearCacheSegment(aclRecord.EntityName, aclRecord.EntityId); - } + ClearCacheSegment(aclRecord.EntityName, aclRecord.EntityId); + } public virtual void InsertAclRecord(T entity, int customerRoleId) where T : BaseEntity, IAclSupported { - Guard.NotNull(entity, nameof(entity)); - - if (customerRoleId == 0) + Guard.NotNull(entity, nameof(entity)); + + if (customerRoleId == 0) throw new ArgumentOutOfRangeException(nameof(customerRoleId)); int entityId = entity.Id; @@ -154,127 +154,127 @@ public virtual void InsertAclRecord(T entity, int customerRoleId) where T : B public virtual void UpdateAclRecord(AclRecord aclRecord) { - Guard.NotNull(aclRecord, nameof(aclRecord)); + Guard.NotNull(aclRecord, nameof(aclRecord)); - _aclRecordRepository.Update(aclRecord); + _aclRecordRepository.Update(aclRecord); - ClearCacheSegment(aclRecord.EntityName, aclRecord.EntityId); - } + ClearCacheSegment(aclRecord.EntityName, aclRecord.EntityId); + } - public virtual int[] GetCustomerRoleIdsWithAccessTo(string entityName, int entityId) - { - Guard.NotEmpty(entityName, nameof(entityName)); + public virtual int[] GetCustomerRoleIdsWithAccessTo(string entityName, int entityId) + { + Guard.NotEmpty(entityName, nameof(entityName)); - if (entityId <= 0) - return new int[0]; + if (entityId <= 0) + return new int[0]; - var cacheSegment = GetCacheSegment(entityName, entityId); + var cacheSegment = GetCacheSegment(entityName, entityId); - if (!cacheSegment.TryGetValue(entityId, out var roleIds)) - { - return Array.Empty(); - } + if (!cacheSegment.TryGetValue(entityId, out var roleIds)) + { + return Array.Empty(); + } - return roleIds; - } + return roleIds; + } - public bool Authorize(string entityName, int entityId) - { - return Authorize(entityName, entityId, _workContext.Value.CurrentCustomer?.CustomerRoleMappings?.Select(x => x.CustomerRole)); - } + public bool Authorize(string entityName, int entityId) + { + return Authorize(entityName, entityId, _workContext.Value.CurrentCustomer?.CustomerRoleMappings?.Select(x => x.CustomerRole)); + } - public virtual bool Authorize(string entityName, int entityId, IEnumerable roles) - { - Guard.NotEmpty(entityName, nameof(entityName)); + public virtual bool Authorize(string entityName, int entityId, IEnumerable roles) + { + Guard.NotEmpty(entityName, nameof(entityName)); - if (entityId <= 0) - return false; + if (entityId <= 0) + return false; if (!HasActiveAcl) - return true; - - if (roles == null) - return false; - - foreach (var role in roles) - { - if (!role.Active) - continue; - - foreach (var role2Id in GetCustomerRoleIdsWithAccessTo(entityName, entityId)) - { - if (role.Id == role2Id) - { - // Yes, we have such permission - return true; - } - } - } - - // No permission granted - return false; - } - - #region Cache segmenting - - protected virtual IDictionary GetCacheSegment(string entityName, int entityId) - { - Guard.NotEmpty(entityName, nameof(entityName)); - - var segmentKey = GetSegmentKeyPart(entityName, entityId, out var minEntityId, out var maxEntityId); - var cacheKey = BuildCacheSegmentKey(segmentKey); - - return _cacheManager.Get(cacheKey, () => - { - var query = from sm in _aclRecordRepository.TableUntracked - where - sm.EntityId >= minEntityId && - sm.EntityId <= maxEntityId && - sm.EntityName == entityName - select sm; - - var mappings = query.ToLookup(x => x.EntityId, x => x.CustomerRoleId); - - var dict = new Dictionary(mappings.Count); - - foreach (var sm in mappings) - { - dict[sm.Key] = sm.ToArray(); - } - - return dict; - }); - } - - /// - /// Clears the cached segment from the cache - /// - protected virtual void ClearCacheSegment(string entityName, int entityId) - { - try - { - var segmentKey = GetSegmentKeyPart(entityName, entityId); - _cacheManager.Remove(BuildCacheSegmentKey(segmentKey)); - } - catch { } - } - - private string BuildCacheSegmentKey(string segment) - { - return String.Format(ACL_SEGMENT_KEY, segment); - } - - private string GetSegmentKeyPart(string entityName, int entityId) - { - return GetSegmentKeyPart(entityName, entityId, out _, out _); - } - - private string GetSegmentKeyPart(string entityName, int entityId, out int minId, out int maxId) - { - maxId = entityId.GetRange(1000, out minId); - return (entityName + "." + maxId.ToString()).ToLowerInvariant(); - } - - #endregion - } + return true; + + if (roles == null) + return false; + + foreach (var role in roles) + { + if (!role.Active) + continue; + + foreach (var role2Id in GetCustomerRoleIdsWithAccessTo(entityName, entityId)) + { + if (role.Id == role2Id) + { + // Yes, we have such permission + return true; + } + } + } + + // No permission granted + return false; + } + + #region Cache segmenting + + protected virtual IDictionary GetCacheSegment(string entityName, int entityId) + { + Guard.NotEmpty(entityName, nameof(entityName)); + + var segmentKey = GetSegmentKeyPart(entityName, entityId, out var minEntityId, out var maxEntityId); + var cacheKey = BuildCacheSegmentKey(segmentKey); + + return _cacheManager.Get(cacheKey, () => + { + var query = from sm in _aclRecordRepository.TableUntracked + where + sm.EntityId >= minEntityId && + sm.EntityId <= maxEntityId && + sm.EntityName == entityName + select sm; + + var mappings = query.ToLookup(x => x.EntityId, x => x.CustomerRoleId); + + var dict = new Dictionary(mappings.Count); + + foreach (var sm in mappings) + { + dict[sm.Key] = sm.ToArray(); + } + + return dict; + }); + } + + /// + /// Clears the cached segment from the cache + /// + protected virtual void ClearCacheSegment(string entityName, int entityId) + { + try + { + var segmentKey = GetSegmentKeyPart(entityName, entityId); + _cacheManager.Remove(BuildCacheSegmentKey(segmentKey)); + } + catch { } + } + + private string BuildCacheSegmentKey(string segment) + { + return String.Format(ACL_SEGMENT_KEY, segment); + } + + private string GetSegmentKeyPart(string entityName, int entityId) + { + return GetSegmentKeyPart(entityName, entityId, out _, out _); + } + + private string GetSegmentKeyPart(string entityName, int entityId, out int minId, out int maxId) + { + maxId = entityId.GetRange(1000, out minId); + return (entityName + "." + maxId.ToString()).ToLowerInvariant(); + } + + #endregion + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Security/IAclService.cs b/src/Libraries/SmartStore.Services/Security/IAclService.cs index 7fbc3bfd2c..c42785ee94 100644 --- a/src/Libraries/SmartStore.Services/Security/IAclService.cs +++ b/src/Libraries/SmartStore.Services/Security/IAclService.cs @@ -12,12 +12,12 @@ namespace SmartStore.Services.Security /// public partial interface IAclService { - /// - /// Gets a value indicating whether at least one ACL record is in active state system-wide - /// - bool HasActiveAcl { get; } - - /// + /// + /// Gets a value indicating whether at least one ACL record is in active state system-wide + /// + bool HasActiveAcl { get; } + + /// /// Deletes an ACL record /// /// ACL record @@ -29,7 +29,7 @@ public partial interface IAclService /// ACL record identifier /// ACL record AclRecord GetAclRecordById(int aclRecordId); - + /// /// Gets ACL records /// @@ -38,34 +38,34 @@ public partial interface IAclService /// ACL records IList GetAclRecords(T entity) where T : BaseEntity, IAclSupported; - /// - /// Gets ACL records - /// - /// Name of entity - /// Id of entity - /// ACL records - IList GetAclRecordsFor(string entityName, int entityId); - - /// - /// Save the ACL mappings for an entity - /// - /// Entity type - /// The entity - /// Array of selected customer role ids with access to the passed entity - void SaveAclMappings(T entity, params int[] selectedCustomerRoleIds) where T : BaseEntity, IAclSupported; - - /// - /// Inserts an ACL record - /// - /// ACL record - void InsertAclRecord(AclRecord aclRecord); - + /// + /// Gets ACL records + /// + /// Name of entity + /// Id of entity + /// ACL records + IList GetAclRecordsFor(string entityName, int entityId); + + /// + /// Save the ACL mappings for an entity + /// + /// Entity type + /// The entity + /// Array of selected customer role ids with access to the passed entity + void SaveAclMappings(T entity, params int[] selectedCustomerRoleIds) where T : BaseEntity, IAclSupported; + + /// + /// Inserts an ACL record + /// + /// ACL record + void InsertAclRecord(AclRecord aclRecord); + /// /// Inserts an ACL record /// /// Type /// Entity - /// Customer role id + /// Customer role id void InsertAclRecord(T entity, int customerRoleId) where T : BaseEntity, IAclSupported; /// @@ -74,115 +74,115 @@ public partial interface IAclService /// ACL record void UpdateAclRecord(AclRecord aclRecord); - /// - /// Find customer role identifiers with granted access - /// - /// Entity name to check permission for - /// Entity id to check permission for - /// Customer role identifiers - int[] GetCustomerRoleIdsWithAccessTo(string entityName, int entityId); - - /// - /// Authorize ACL permission - /// - /// Type - /// Entity name to check permission for - /// Entity id to check permission for - /// true - authorized; otherwise, false - bool Authorize(string entityName, int entityId); - - ///// - ///// Authorize ACL permission - ///// - ///// Type - ///// Entity name to check permission for - ///// Entity id to check permission for - ///// Customer - ///// true - authorized; otherwise, false - //bool Authorize(string entityName, int entityId, Customer customer); - - /// - /// Authorize ACL permission - /// - /// Entity name to check permission for - /// Entity id to check permission for - /// Roles to check access permission for. Inactive roles will be skipped. - /// true - authorized; otherwise, false - bool Authorize(string entityName, int entityId, IEnumerable roles); - } - - public static class IAclServiceExtensions - { - /// - /// Find customer role identifiers with granted access - /// - /// Type - /// Entity - /// Customer role identifiers - public static int[] GetCustomerRoleIdsWithAccessTo(this IAclService aclService, T entity) where T : BaseEntity, IAclSupported - { - if (entity == null) - return new int[0]; - - return aclService.GetCustomerRoleIdsWithAccessTo(entity.GetEntityName(), entity.Id); - } - - public static bool Authorize(this IAclService aclService, string entityName, int entityId, Customer customer) - { - return aclService.Authorize(entityName, entityId, customer?.CustomerRoleMappings?.Select(x => x.CustomerRole)); - } - - /// - /// Authorize ACL permission - /// - /// Type - /// Entity - /// true - authorized; otherwise, false - public static bool Authorize(this IAclService aclService, T entity) where T : BaseEntity, IAclSupported - { - if (entity == null) - return false; - - if (!entity.SubjectToAcl) - return true; - - return aclService.Authorize(entity.GetEntityName(), entity.Id); - } - - /// - /// Authorize ACL permission - /// - /// Type - /// Entity - /// Customer - /// true - authorized; otherwise, false - public static bool Authorize(this IAclService aclService, T entity, Customer customer) where T : BaseEntity, IAclSupported - { - if (entity == null) - return false; - - if (!entity.SubjectToAcl) - return true; - - return aclService.Authorize(entity.GetEntityName(), entity.Id, customer?.CustomerRoleMappings?.Select(x => x.CustomerRole)); - } - - /// - /// Authorize ACL permission - /// - /// Type - /// Entity - /// Roles to check access permission for. Inactive roles will be skipped. - /// true - authorized; otherwise, false - public static bool Authorize(this IAclService aclService, T entity, IEnumerable roles) where T : BaseEntity, IAclSupported - { - if (entity == null) - return false; - - if (!entity.SubjectToAcl) - return true; - - return aclService.Authorize(entity.GetEntityName(), entity.Id, roles); - } - } + /// + /// Find customer role identifiers with granted access + /// + /// Entity name to check permission for + /// Entity id to check permission for + /// Customer role identifiers + int[] GetCustomerRoleIdsWithAccessTo(string entityName, int entityId); + + /// + /// Authorize ACL permission + /// + /// Type + /// Entity name to check permission for + /// Entity id to check permission for + /// true - authorized; otherwise, false + bool Authorize(string entityName, int entityId); + + ///// + ///// Authorize ACL permission + ///// + ///// Type + ///// Entity name to check permission for + ///// Entity id to check permission for + ///// Customer + ///// true - authorized; otherwise, false + //bool Authorize(string entityName, int entityId, Customer customer); + + /// + /// Authorize ACL permission + /// + /// Entity name to check permission for + /// Entity id to check permission for + /// Roles to check access permission for. Inactive roles will be skipped. + /// true - authorized; otherwise, false + bool Authorize(string entityName, int entityId, IEnumerable roles); + } + + public static class IAclServiceExtensions + { + /// + /// Find customer role identifiers with granted access + /// + /// Type + /// Entity + /// Customer role identifiers + public static int[] GetCustomerRoleIdsWithAccessTo(this IAclService aclService, T entity) where T : BaseEntity, IAclSupported + { + if (entity == null) + return new int[0]; + + return aclService.GetCustomerRoleIdsWithAccessTo(entity.GetEntityName(), entity.Id); + } + + public static bool Authorize(this IAclService aclService, string entityName, int entityId, Customer customer) + { + return aclService.Authorize(entityName, entityId, customer?.CustomerRoleMappings?.Select(x => x.CustomerRole)); + } + + /// + /// Authorize ACL permission + /// + /// Type + /// Entity + /// true - authorized; otherwise, false + public static bool Authorize(this IAclService aclService, T entity) where T : BaseEntity, IAclSupported + { + if (entity == null) + return false; + + if (!entity.SubjectToAcl) + return true; + + return aclService.Authorize(entity.GetEntityName(), entity.Id); + } + + /// + /// Authorize ACL permission + /// + /// Type + /// Entity + /// Customer + /// true - authorized; otherwise, false + public static bool Authorize(this IAclService aclService, T entity, Customer customer) where T : BaseEntity, IAclSupported + { + if (entity == null) + return false; + + if (!entity.SubjectToAcl) + return true; + + return aclService.Authorize(entity.GetEntityName(), entity.Id, customer?.CustomerRoleMappings?.Select(x => x.CustomerRole)); + } + + /// + /// Authorize ACL permission + /// + /// Type + /// Entity + /// Roles to check access permission for. Inactive roles will be skipped. + /// true - authorized; otherwise, false + public static bool Authorize(this IAclService aclService, T entity, IEnumerable roles) where T : BaseEntity, IAclSupported + { + if (entity == null) + return false; + + if (!entity.SubjectToAcl) + return true; + + return aclService.Authorize(entity.GetEntityName(), entity.Id, roles); + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Security/InstallPermissionsStarter.cs b/src/Libraries/SmartStore.Services/Security/InstallPermissionsStarter.cs index 7e5d1f0e00..3f627046c2 100644 --- a/src/Libraries/SmartStore.Services/Security/InstallPermissionsStarter.cs +++ b/src/Libraries/SmartStore.Services/Security/InstallPermissionsStarter.cs @@ -49,7 +49,7 @@ public void Start(HttpContextBase httpContext) // INFO: even if no plugin has changed: directly after a DB migration this code block MUST run. It seems awkward // that pending migrations exist when binaries has not changed. But after a manual DB reset for a migration rerun // nobody touches the binaries usually. - + // Standard permission provider and all plugin providers. var types = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true).ToList(); foreach (var type in types) diff --git a/src/Libraries/SmartStore.Services/Security/StandardPermissionProvider.cs b/src/Libraries/SmartStore.Services/Security/StandardPermissionProvider.cs index 5973923741..d356ce3094 100644 --- a/src/Libraries/SmartStore.Services/Security/StandardPermissionProvider.cs +++ b/src/Libraries/SmartStore.Services/Security/StandardPermissionProvider.cs @@ -11,7 +11,7 @@ public partial class StandardPermissionProvider : IPermissionProvider public virtual IEnumerable GetPermissions() { var permissionSystemNames = PermissionHelper.GetPermissions(typeof(Permissions)); - var permissions = permissionSystemNames.Select(x => new PermissionRecord { SystemName = x }); + var permissions = permissionSystemNames.Select(x => new PermissionRecord { SystemName = x }); return permissions; } diff --git a/src/Libraries/SmartStore.Services/Seo/IUrlRecordService.cs b/src/Libraries/SmartStore.Services/Seo/IUrlRecordService.cs index 4ec0aa0df3..10676d15d7 100644 --- a/src/Libraries/SmartStore.Services/Seo/IUrlRecordService.cs +++ b/src/Libraries/SmartStore.Services/Seo/IUrlRecordService.cs @@ -9,7 +9,7 @@ namespace SmartStore.Services.Seo /// /// Provides information about URL records /// - public partial interface IUrlRecordService : IScopedService + public partial interface IUrlRecordService : IScopedService { /// /// Deletes an URL record @@ -24,12 +24,12 @@ public partial interface IUrlRecordService : IScopedService /// URL record UrlRecord GetUrlRecordById(int urlRecordId); - /// - /// Gets URL records by identifiers - /// - /// - /// List of URL records - IList GetUrlRecordsByIds(int[] urlRecordIds); + /// + /// Gets URL records by identifiers + /// + /// + /// List of URL records + IList GetUrlRecordsByIds(int[] urlRecordIds); /// /// Inserts an URL record @@ -63,47 +63,47 @@ public partial interface IUrlRecordService : IScopedService /// Customer collection IPagedList GetAllUrlRecords(int pageIndex, int pageSize, string slug, string entityName, int? entityId, int? languageId, bool? isActive); - /// - /// Prefetches a collection of url records properties for a range of entities in one go - /// and caches them for the duration of the current request. - /// - /// Entity name - /// - /// The entity ids to prefetch url records for. Can be null, - /// in which case all records for the requested entity name are loaded. - /// - /// Whether represents a range of ids (perf). - /// Whether is already sorted (perf). - /// Url record collection - /// - /// Be careful not to load large amounts of data at once (e.g. for "Product" scope with large range). - /// - void PrefetchUrlRecords(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false); + /// + /// Prefetches a collection of url records properties for a range of entities in one go + /// and caches them for the duration of the current request. + /// + /// Entity name + /// + /// The entity ids to prefetch url records for. Can be null, + /// in which case all records for the requested entity name are loaded. + /// + /// Whether represents a range of ids (perf). + /// Whether is already sorted (perf). + /// Url record collection + /// + /// Be careful not to load large amounts of data at once (e.g. for "Product" scope with large range). + /// + void PrefetchUrlRecords(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false); - /// - /// Prefetches a collection of url records properties for a range of entities in one go. - /// - /// Entity name - /// - /// The entity ids to prefetch url records for. Can be null, - /// in which case all records for the requested entity name are loaded. - /// - /// Whether represents a range of ids (perf). - /// Whether is already sorted (perf). - /// Url record collection - /// - /// Be careful not to load large amounts of data at once (e.g. for "Product" scope with large range). - /// - UrlRecordCollection GetUrlRecordCollection(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false); + /// + /// Prefetches a collection of url records properties for a range of entities in one go. + /// + /// Entity name + /// + /// The entity ids to prefetch url records for. Can be null, + /// in which case all records for the requested entity name are loaded. + /// + /// Whether represents a range of ids (perf). + /// Whether is already sorted (perf). + /// Url record collection + /// + /// Be careful not to load large amounts of data at once (e.g. for "Product" scope with large range). + /// + UrlRecordCollection GetUrlRecordCollection(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false); - /// - /// Gets all URL records for the specified entity - /// - /// Type - /// Entity - /// Specifies whether only active URL records should be returned - /// List of URL records - IList GetUrlRecordsFor(string entityName, int entityId, bool activeOnly = false); + /// + /// Gets all URL records for the specified entity + /// + /// Type + /// Entity + /// Specifies whether only active URL records should be returned + /// List of URL records + IList GetUrlRecordsFor(string entityName, int entityId, bool activeOnly = false); /// /// Find slug @@ -126,28 +126,28 @@ public partial interface IUrlRecordService : IScopedService /// UrlRecord SaveSlug(T entity, string slug, int languageId) where T : BaseEntity, ISlugSupported; - /// - /// Save slug - /// - /// Type - /// Entity - /// Name of a property - /// Url record - UrlRecord SaveSlug(T entity, Func nameProperty) where T : BaseEntity, ISlugSupported; + /// + /// Save slug + /// + /// Type + /// Entity + /// Name of a property + /// Url record + UrlRecord SaveSlug(T entity, Func nameProperty) where T : BaseEntity, ISlugSupported; - /// - /// Get number of slugs per entity - /// - /// URL record identifier - /// Dictionary of slugs per entity count - Dictionary CountSlugsPerEntity(int[] urlRecordIds); + /// + /// Get number of slugs per entity + /// + /// URL record identifier + /// Dictionary of slugs per entity count + Dictionary CountSlugsPerEntity(int[] urlRecordIds); - /// - /// Get number of slugs per entity - /// - /// Entity name - /// Entity identifier - /// Number of slugs per entity - int CountSlugsPerEntity(string entityName, int entityId); + /// + /// Get number of slugs per entity + /// + /// Entity name + /// Entity identifier + /// Number of slugs per entity + int CountSlugsPerEntity(string entityName, int entityId); } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Seo/IXmlSitemapGenerator.cs b/src/Libraries/SmartStore.Services/Seo/IXmlSitemapGenerator.cs index 5e833a086e..0987f2b928 100644 --- a/src/Libraries/SmartStore.Services/Seo/IXmlSitemapGenerator.cs +++ b/src/Libraries/SmartStore.Services/Seo/IXmlSitemapGenerator.cs @@ -10,42 +10,42 @@ namespace SmartStore.Services.Seo /// public partial interface IXmlSitemapGenerator { - /// - /// Gets the sitemap partition - /// - /// - /// The page index. 0 retrieves the first document, which can be a sitemap INDEX document - /// (when the sitemap size exceeded the limits). An index greater 0 retrieves the - /// sitemap XML document at this index, but only when the sitemap is actually indexed (otherwise null is returned) - /// - /// Sitemap partition - Task GetSitemapPartAsync(int index = 0); + /// + /// Gets the sitemap partition + /// + /// + /// The page index. 0 retrieves the first document, which can be a sitemap INDEX document + /// (when the sitemap size exceeded the limits). An index greater 0 retrieves the + /// sitemap XML document at this index, but only when the sitemap is actually indexed (otherwise null is returned) + /// + /// Sitemap partition + Task GetSitemapPartAsync(int index = 0); - /// - /// Rebuilds the collection of XML sitemap documents for a store/language combination. If there are less than 1.000 sitemap - /// nodes, only one sitemap document will exist in the collection, otherwise a sitemap index document will be - /// the first entry in the collection and all other entries will be sitemap XML documents. - /// - /// The build context - /// - /// During rebuilding, requests are being served from the existing cache. - /// Once rebuild is completed, the cache is updated. - /// - Task RebuildAsync(XmlSitemapBuildContext ctx); + /// + /// Rebuilds the collection of XML sitemap documents for a store/language combination. If there are less than 1.000 sitemap + /// nodes, only one sitemap document will exist in the collection, otherwise a sitemap index document will be + /// the first entry in the collection and all other entries will be sitemap XML documents. + /// + /// The build context + /// + /// During rebuilding, requests are being served from the existing cache. + /// Once rebuild is completed, the cache is updated. + /// + Task RebuildAsync(XmlSitemapBuildContext ctx); - /// - /// Determines whether a rebuild is already running. - /// - bool IsRebuilding(int storeId, int languageId); + /// + /// Determines whether a rebuild is already running. + /// + bool IsRebuilding(int storeId, int languageId); - /// - /// Indicates whether the sitemap has been generated and cached. - /// - bool IsGenerated(int storeId, int languageId); + /// + /// Indicates whether the sitemap has been generated and cached. + /// + bool IsGenerated(int storeId, int languageId); - /// - /// Removes the sitemap from the cache for a rebuild. - /// - void Invalidate(int storeId, int languageId); - } + /// + /// Removes the sitemap from the cache for a rebuild. + /// + void Invalidate(int storeId, int languageId); + } } diff --git a/src/Libraries/SmartStore.Services/Seo/NamedEntity.cs b/src/Libraries/SmartStore.Services/Seo/NamedEntity.cs index f8bb6fd0e0..79f1e0d83c 100644 --- a/src/Libraries/SmartStore.Services/Seo/NamedEntity.cs +++ b/src/Libraries/SmartStore.Services/Seo/NamedEntity.cs @@ -4,17 +4,17 @@ namespace SmartStore.Services.Seo { - public class NamedEntity : BaseEntity, ISlugSupported - { - public string EntityName { get; set; } - public string DisplayName { get; set; } - public string Slug { get; set; } - public DateTime LastMod { get; set; } - public int? LanguageId { get; set; } + public class NamedEntity : BaseEntity, ISlugSupported + { + public string EntityName { get; set; } + public string DisplayName { get; set; } + public string Slug { get; set; } + public DateTime LastMod { get; set; } + public int? LanguageId { get; set; } - public override string GetEntityName() - { - return EntityName; - } - } + public override string GetEntityName() + { + return EntityName; + } + } } diff --git a/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs b/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs index fd989a0f4f..5d55c51331 100644 --- a/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs +++ b/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs @@ -37,9 +37,9 @@ public static string GetSeName(this ProductTag productTag) /// Product tag SE (search engine) name public static string GetSeName(this ProductTag productTag, int languageId) { - Guard.NotNull(productTag, nameof(productTag)); + Guard.NotNull(productTag, nameof(productTag)); - return GetSeName((string)productTag.GetLocalized(x => x.Name, languageId)); + return GetSeName((string)productTag.GetLocalized(x => x.Name, languageId)); } /// @@ -49,9 +49,9 @@ public static string GetSeName(this ProductTag productTag, int languageId) /// Blog post SE (search engine) name public static string GetSeName(this BlogPost blogPost) { - Guard.NotNull(blogPost, nameof(blogPost)); + Guard.NotNull(blogPost, nameof(blogPost)); - return GetSeName(blogPost.Title); + return GetSeName(blogPost.Title); } /// @@ -61,9 +61,9 @@ public static string GetSeName(this BlogPost blogPost) /// Blog post SE (search engine) name public static string GetSeName(this BlogPostTag blogPostTag) { - Guard.NotNull(blogPostTag, nameof(blogPostTag)); + Guard.NotNull(blogPostTag, nameof(blogPostTag)); - return GetSeName(blogPostTag.Name); + return GetSeName(blogPostTag.Name); } /// @@ -73,21 +73,21 @@ public static string GetSeName(this BlogPostTag blogPostTag) /// News item SE (search engine) name public static string GetSeName(this NewsItem newsItem) { - Guard.NotNull(newsItem, nameof(newsItem)); + Guard.NotNull(newsItem, nameof(newsItem)); - return GetSeName(newsItem.Title); + return GetSeName(newsItem.Title); } - /// - /// Gets ForumTopic SE (search engine) name - /// - /// ForumTopic - /// ForumTopic SE (search engine) name - public static string GetSeName(this ForumTopic forumTopic) + /// + /// Gets ForumTopic SE (search engine) name + /// + /// ForumTopic + /// ForumTopic SE (search engine) name + public static string GetSeName(this ForumTopic forumTopic) { - Guard.NotNull(forumTopic, nameof(forumTopic)); + Guard.NotNull(forumTopic, nameof(forumTopic)); - string seName = GetSeName(forumTopic.Subject); + string seName = GetSeName(forumTopic.Subject); // Trim SE name to avoid URLs that are too long var maxLength = 100; @@ -106,11 +106,11 @@ public static string GetSeName(this ForumTopic forumTopic) /// SEO slug [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string GetSeName(this ICategoryNode node) - { - Guard.NotNull(node, nameof(node)); + { + Guard.NotNull(node, nameof(node)); return EngineContext.Current.Resolve().GetSeName("Category", node.Id, null); - } + } #endregion @@ -126,79 +126,79 @@ public static string GetSeName(this ICategoryNode node) /// A value indicating whether to ensure that we have at least two published languages; otherwise, load only default value /// SEO slug [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string GetSeName(this T entity, - int? languageId = null, - bool returnDefaultValue = true, - bool ensureTwoPublishedLanguages = true) + public static string GetSeName(this T entity, + int? languageId = null, + bool returnDefaultValue = true, + bool ensureTwoPublishedLanguages = true) where T : BaseEntity, ISlugSupported { - Guard.NotNull(entity, nameof(entity)); - - return EngineContext.Current.Resolve().GetSeName( - entity.GetEntityName(), - entity.Id, - languageId, - returnDefaultValue, - ensureTwoPublishedLanguages); + Guard.NotNull(entity, nameof(entity)); + + return EngineContext.Current.Resolve().GetSeName( + entity.GetEntityName(), + entity.Id, + languageId, + returnDefaultValue, + ensureTwoPublishedLanguages); } - /// - /// Validate search engine name - /// - /// Entity - /// Search engine name to validate - /// User-friendly name used to generate sename - /// Ensreu that sename is not empty - /// Valid sename - public static string ValidateSeName(this T entity, string seName, string name, bool ensureNotEmpty, int? languageId = null) + /// + /// Validate search engine name + /// + /// Entity + /// Search engine name to validate + /// User-friendly name used to generate sename + /// Ensreu that sename is not empty + /// Valid sename + public static string ValidateSeName(this T entity, string seName, string name, bool ensureNotEmpty, int? languageId = null) where T : BaseEntity, ISlugSupported { - return entity.ValidateSeName( - seName, - name, - ensureNotEmpty, - EngineContext.Current.Resolve(), - EngineContext.Current.Resolve(), - languageId); + return entity.ValidateSeName( + seName, + name, + ensureNotEmpty, + EngineContext.Current.Resolve(), + EngineContext.Current.Resolve(), + languageId); } - public static string ValidateSeName(this T entity, - string seName, - string name, - bool ensureNotEmpty, - IUrlRecordService urlRecordService, - SeoSettings seoSettings, - int? languageId = null, - Func extraSlugLookup = null) - where T : BaseEntity, ISlugSupported - { - Guard.NotNull(urlRecordService, nameof(urlRecordService)); - Guard.NotNull(seoSettings, nameof(seoSettings)); - Guard.NotNull(entity, nameof(entity)); - - // use name if sename is not specified - if (String.IsNullOrWhiteSpace(seName) && !String.IsNullOrWhiteSpace(name)) - seName = name; - - // validation - seName = GetSeName(seName, seoSettings); - - // max length - seName = seName.Truncate(400); - - if (String.IsNullOrWhiteSpace(seName)) - { - if (ensureNotEmpty) - { - // use entity identifier as sename if empty - seName = entity.Id.ToString(); - } - else - { - // return. no need for further processing - return seName; - } - } + public static string ValidateSeName(this T entity, + string seName, + string name, + bool ensureNotEmpty, + IUrlRecordService urlRecordService, + SeoSettings seoSettings, + int? languageId = null, + Func extraSlugLookup = null) + where T : BaseEntity, ISlugSupported + { + Guard.NotNull(urlRecordService, nameof(urlRecordService)); + Guard.NotNull(seoSettings, nameof(seoSettings)); + Guard.NotNull(entity, nameof(entity)); + + // use name if sename is not specified + if (String.IsNullOrWhiteSpace(seName) && !String.IsNullOrWhiteSpace(name)) + seName = name; + + // validation + seName = GetSeName(seName, seoSettings); + + // max length + seName = seName.Truncate(400); + + if (String.IsNullOrWhiteSpace(seName)) + { + if (ensureNotEmpty) + { + // use entity identifier as sename if empty + seName = entity.Id.ToString(); + } + else + { + // return. no need for further processing + return seName; + } + } // validate and alter SeName if it could be interpreted as SEO code if (LocalizationHelper.IsValidCultureCode(seName)) @@ -208,33 +208,33 @@ public static string ValidateSeName(this T entity, seName += "-0"; } } - - // ensure this sename is not reserved yet - string entityName = entity.GetEntityName(); - int i = 2; - var tempSeName = seName; - while (true) - { - // check whether such slug already exists (and that it's not the current entity) - var urlRecord = urlRecordService.GetBySlug(tempSeName) ?? extraSlugLookup?.Invoke(tempSeName); - var reserved1 = urlRecord != null && !(urlRecord.EntityId == entity.Id && urlRecord.EntityName.Equals(entityName, StringComparison.InvariantCultureIgnoreCase)); + // ensure this sename is not reserved yet + string entityName = entity.GetEntityName(); + int i = 2; + var tempSeName = seName; + + while (true) + { + // check whether such slug already exists (and that it's not the current entity) + var urlRecord = urlRecordService.GetBySlug(tempSeName) ?? extraSlugLookup?.Invoke(tempSeName); + var reserved1 = urlRecord != null && !(urlRecord.EntityId == entity.Id && urlRecord.EntityName.Equals(entityName, StringComparison.InvariantCultureIgnoreCase)); - if (!reserved1 && urlRecord != null && languageId.HasValue) - reserved1 = (urlRecord.LanguageId != languageId.Value); + if (!reserved1 && urlRecord != null && languageId.HasValue) + reserved1 = (urlRecord.LanguageId != languageId.Value); - // and it's not in the list of reserved slugs - var reserved2 = seoSettings.ReservedUrlRecordSlugs.Contains(tempSeName, StringComparer.InvariantCultureIgnoreCase); - if (!reserved1 && !reserved2) - break; + // and it's not in the list of reserved slugs + var reserved2 = seoSettings.ReservedUrlRecordSlugs.Contains(tempSeName, StringComparer.InvariantCultureIgnoreCase); + if (!reserved1 && !reserved2) + break; - tempSeName = string.Format("{0}-{1}", seName, i); - i++; - } - seName = tempSeName; + tempSeName = string.Format("{0}-{1}", seName, i); + i++; + } + seName = tempSeName; - return seName; - } + return seName; + } /// @@ -245,24 +245,24 @@ public static string ValidateSeName(this T entity, public static string GetSeName(string name) { var seoSettings = EngineContext.Current.Resolve(); - return GetSeName(name, seoSettings); + return GetSeName(name, seoSettings); } - /// - /// Get SEO friendly name - /// - /// Name - /// SEO settings - /// Result - public static string GetSeName(string name, SeoSettings seoSettings) - { - return SeoHelper.GetSeName( - name, - seoSettings == null ? false : seoSettings.ConvertNonWesternChars, - seoSettings == null ? false : seoSettings.AllowUnicodeCharsInUrls, + /// + /// Get SEO friendly name + /// + /// Name + /// SEO settings + /// Result + public static string GetSeName(string name, SeoSettings seoSettings) + { + return SeoHelper.GetSeName( + name, + seoSettings == null ? false : seoSettings.ConvertNonWesternChars, + seoSettings == null ? false : seoSettings.AllowUnicodeCharsInUrls, true, - seoSettings?.SeoNameCharConversion); - } + seoSettings?.SeoNameCharConversion); + } #endregion } diff --git a/src/Libraries/SmartStore.Services/Seo/Tasks/RebuildXmlSitemapTask.cs b/src/Libraries/SmartStore.Services/Seo/Tasks/RebuildXmlSitemapTask.cs index 034f4b3414..e2e99c680f 100644 --- a/src/Libraries/SmartStore.Services/Seo/Tasks/RebuildXmlSitemapTask.cs +++ b/src/Libraries/SmartStore.Services/Seo/Tasks/RebuildXmlSitemapTask.cs @@ -11,45 +11,45 @@ namespace SmartStore.Services.Seo { - public class RebuildXmlSitemapTask : AsyncTask - { - private readonly IStoreService _storeService; - private readonly ILanguageService _languageService; - private readonly IXmlSitemapGenerator _generator; - private readonly ISettingService _settingService; + public class RebuildXmlSitemapTask : AsyncTask + { + private readonly IStoreService _storeService; + private readonly ILanguageService _languageService; + private readonly IXmlSitemapGenerator _generator; + private readonly ISettingService _settingService; - public RebuildXmlSitemapTask( - IStoreService storeService, - ILanguageService languageService, - IXmlSitemapGenerator generator, - ISettingService settingService) - { - _storeService = storeService; - _languageService = languageService; - _generator = generator; - _settingService = settingService; - } + public RebuildXmlSitemapTask( + IStoreService storeService, + ILanguageService languageService, + IXmlSitemapGenerator generator, + ISettingService settingService) + { + _storeService = storeService; + _languageService = languageService; + _generator = generator; + _settingService = settingService; + } - public override async Task ExecuteAsync(TaskExecutionContext ctx) - { - var stores = _storeService.GetAllStores(); - - foreach (var store in stores) - { - var languages = _languageService.GetAllLanguages(false, store.Id); - var buildContext = new XmlSitemapBuildContext(store, languages.ToArray(), _settingService, _storeService.IsSingleStoreMode()) - { - CancellationToken = ctx.CancellationToken, - ProgressCallback = OnProgress - }; + public override async Task ExecuteAsync(TaskExecutionContext ctx) + { + var stores = _storeService.GetAllStores(); - await _generator.RebuildAsync(buildContext); - } + foreach (var store in stores) + { + var languages = _languageService.GetAllLanguages(false, store.Id); + var buildContext = new XmlSitemapBuildContext(store, languages.ToArray(), _settingService, _storeService.IsSingleStoreMode()) + { + CancellationToken = ctx.CancellationToken, + ProgressCallback = OnProgress + }; - void OnProgress(int value, int max, string msg) - { - ctx.SetProgress(value, max, msg, true); - } - } - } + await _generator.RebuildAsync(buildContext); + } + + void OnProgress(int value, int max, string msg) + { + ctx.SetProgress(value, max, msg, true); + } + } + } } diff --git a/src/Libraries/SmartStore.Services/Seo/UrlRecordService.cs b/src/Libraries/SmartStore.Services/Seo/UrlRecordService.cs index adf9767858..68c0cda502 100644 --- a/src/Libraries/SmartStore.Services/Seo/UrlRecordService.cs +++ b/src/Libraries/SmartStore.Services/Seo/UrlRecordService.cs @@ -13,81 +13,81 @@ namespace SmartStore.Services.Seo { public partial class UrlRecordService : ScopedServiceBase, IUrlRecordService { - /// - /// 0 = segment (EntityName.IdRange), 1 = language id - /// - const string URLRECORD_SEGMENT_KEY = "urlrecord:segment:{0}-lang-{1}"; - const string URLRECORD_SEGMENT_PATTERN = "urlrecord:segment:{0}*"; - const string URLRECORD_ALL_PATTERN = "urlrecord:*"; - const string URLRECORD_ALL_ACTIVESLUGS_KEY = "urlrecord:all-active-slugs"; - - private readonly IRepository _urlRecordRepository; + /// + /// 0 = segment (EntityName.IdRange), 1 = language id + /// + const string URLRECORD_SEGMENT_KEY = "urlrecord:segment:{0}-lang-{1}"; + const string URLRECORD_SEGMENT_PATTERN = "urlrecord:segment:{0}*"; + const string URLRECORD_ALL_PATTERN = "urlrecord:*"; + const string URLRECORD_ALL_ACTIVESLUGS_KEY = "urlrecord:all-active-slugs"; + + private readonly IRepository _urlRecordRepository; private readonly ICacheManager _cacheManager; - private readonly SeoSettings _seoSettings; - private readonly PerformanceSettings _performanceSettings; + private readonly SeoSettings _seoSettings; + private readonly PerformanceSettings _performanceSettings; - private readonly IDictionary _prefetchedCollections; - private static int _lastCacheSegmentSize = -1; + private readonly IDictionary _prefetchedCollections; + private static int _lastCacheSegmentSize = -1; - public UrlRecordService( - ICacheManager cacheManager, - IRepository urlRecordRepository, - SeoSettings seoSettings, - PerformanceSettings performanceSettings) + public UrlRecordService( + ICacheManager cacheManager, + IRepository urlRecordRepository, + SeoSettings seoSettings, + PerformanceSettings performanceSettings) { _cacheManager = cacheManager; _urlRecordRepository = urlRecordRepository; - _seoSettings = seoSettings; - _performanceSettings = performanceSettings; + _seoSettings = seoSettings; + _performanceSettings = performanceSettings; - _prefetchedCollections = new Dictionary(StringComparer.OrdinalIgnoreCase); + _prefetchedCollections = new Dictionary(StringComparer.OrdinalIgnoreCase); - ValidateCacheState(); + ValidateCacheState(); } - private void ValidateCacheState() - { - // Ensure that after a segment size change the cache segments are invalidated. - var size = _performanceSettings.CacheSegmentSize; - var changed = _lastCacheSegmentSize == -1; - - if (size <= 0) - { - _performanceSettings.CacheSegmentSize = size = 1; - } - - if (_lastCacheSegmentSize > 0 && _lastCacheSegmentSize != size) - { - _cacheManager.RemoveByPattern(URLRECORD_SEGMENT_PATTERN); - changed = true; - } - - if (changed) - { - Interlocked.Exchange(ref _lastCacheSegmentSize, size); - } - } - - protected override void OnClearCache() - { - _cacheManager.Remove(URLRECORD_ALL_PATTERN); - } - - public virtual void DeleteUrlRecord(UrlRecord urlRecord) + private void ValidateCacheState() { - Guard.NotNull(urlRecord, nameof(urlRecord)); + // Ensure that after a segment size change the cache segments are invalidated. + var size = _performanceSettings.CacheSegmentSize; + var changed = _lastCacheSegmentSize == -1; - try - { - // cache - ClearCacheSegment(urlRecord.EntityName, urlRecord.EntityId, urlRecord.LanguageId); - HasChanges = true; + if (size <= 0) + { + _performanceSettings.CacheSegmentSize = size = 1; + } + + if (_lastCacheSegmentSize > 0 && _lastCacheSegmentSize != size) + { + _cacheManager.RemoveByPattern(URLRECORD_SEGMENT_PATTERN); + changed = true; + } - // db - _urlRecordRepository.Delete(urlRecord); - } - catch { } - } + if (changed) + { + Interlocked.Exchange(ref _lastCacheSegmentSize, size); + } + } + + protected override void OnClearCache() + { + _cacheManager.Remove(URLRECORD_ALL_PATTERN); + } + + public virtual void DeleteUrlRecord(UrlRecord urlRecord) + { + Guard.NotNull(urlRecord, nameof(urlRecord)); + + try + { + // cache + ClearCacheSegment(urlRecord.EntityName, urlRecord.EntityId, urlRecord.LanguageId); + HasChanges = true; + + // db + _urlRecordRepository.Delete(urlRecord); + } + catch { } + } public virtual UrlRecord GetUrlRecordById(int urlRecordId) { @@ -98,267 +98,267 @@ public virtual UrlRecord GetUrlRecordById(int urlRecordId) return urlRecord; } - public virtual IList GetUrlRecordsByIds(int[] urlRecordIds) - { - if (urlRecordIds == null || urlRecordIds.Length == 0) - return new List(); + public virtual IList GetUrlRecordsByIds(int[] urlRecordIds) + { + if (urlRecordIds == null || urlRecordIds.Length == 0) + return new List(); - var urlRecords = _urlRecordRepository.Table - .Where(x => urlRecordIds.Contains(x.Id)) - .ToList(); + var urlRecords = _urlRecordRepository.Table + .Where(x => urlRecordIds.Contains(x.Id)) + .ToList(); - return urlRecords; - } + return urlRecords; + } public virtual void InsertUrlRecord(UrlRecord urlRecord) { - Guard.NotNull(urlRecord, nameof(urlRecord)); - - try - { - // db - _urlRecordRepository.Insert(urlRecord); - HasChanges = true; - - // cache - ClearCacheSegment(urlRecord.EntityName, urlRecord.EntityId, urlRecord.LanguageId); - } - catch { } + Guard.NotNull(urlRecord, nameof(urlRecord)); + + try + { + // db + _urlRecordRepository.Insert(urlRecord); + HasChanges = true; + + // cache + ClearCacheSegment(urlRecord.EntityName, urlRecord.EntityId, urlRecord.LanguageId); + } + catch { } } public virtual void UpdateUrlRecord(UrlRecord urlRecord) { - Guard.NotNull(urlRecord, nameof(urlRecord)); + Guard.NotNull(urlRecord, nameof(urlRecord)); - try - { - // db - _urlRecordRepository.Update(urlRecord); - HasChanges = true; + try + { + // db + _urlRecordRepository.Update(urlRecord); + HasChanges = true; - // cache - ClearCacheSegment(urlRecord.EntityName, urlRecord.EntityId, urlRecord.LanguageId); - } - catch { } - } + // cache + ClearCacheSegment(urlRecord.EntityName, urlRecord.EntityId, urlRecord.LanguageId); + } + catch { } + } public virtual IPagedList GetAllUrlRecords(int pageIndex, int pageSize, string slug, string entityName, int? entityId, int? languageId, bool? isActive) { var query = _urlRecordRepository.Table; - if (slug.HasValue()) - query = query.Where(x => x.Slug.Contains(slug)); + if (slug.HasValue()) + query = query.Where(x => x.Slug.Contains(slug)); + + if (entityName.HasValue()) + query = query.Where(x => x.EntityName == entityName); + + if (entityId.HasValue) + query = query.Where(x => x.EntityId == entityId.Value); + + if (isActive.HasValue) + query = query.Where(x => x.IsActive == isActive.Value); + + if (languageId.HasValue) + query = query.Where(x => x.LanguageId == languageId); - if (entityName.HasValue()) - query = query.Where(x => x.EntityName == entityName); + query = query.OrderBy(x => x.Slug); - if (entityId.HasValue) - query = query.Where(x => x.EntityId == entityId.Value); + var urlRecords = new PagedList(query, pageIndex, pageSize); + return urlRecords; + } + + public virtual IList GetUrlRecordsFor(string entityName, int entityId, bool activeOnly = false) + { + Guard.NotEmpty(entityName, nameof(entityName)); + + var query = from ur in _urlRecordRepository.Table + where ur.EntityId == entityId && + ur.EntityName == entityName + select ur; + + if (activeOnly) + { + query = query.Where(ur => ur.IsActive); + } - if (isActive.HasValue) - query = query.Where(x => x.IsActive == isActive.Value); + return query.ToList(); + } - if (languageId.HasValue) - query = query.Where(x => x.LanguageId == languageId); + public virtual void PrefetchUrlRecords(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false) + { + var collection = GetUrlRecordCollectionInternal(entityName, languageIds, entityIds, isRange, isSorted); - query = query.OrderBy(x => x.Slug); + if (_prefetchedCollections.TryGetValue(entityName, out var existing)) + { + collection.MergeWith(existing); + } + else + { + _prefetchedCollections[entityName] = collection; + } + } - var urlRecords = new PagedList(query, pageIndex, pageSize); - return urlRecords; + public virtual UrlRecordCollection GetUrlRecordCollection(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false) + { + return GetUrlRecordCollectionInternal(entityName, languageIds, entityIds, isRange, isSorted); } - public virtual IList GetUrlRecordsFor(string entityName, int entityId, bool activeOnly = false) - { - Guard.NotEmpty(entityName, nameof(entityName)); - - var query = from ur in _urlRecordRepository.Table - where ur.EntityId == entityId && - ur.EntityName == entityName - select ur; - - if (activeOnly) - { - query = query.Where(ur => ur.IsActive); - } - - return query.ToList(); - } - - public virtual void PrefetchUrlRecords(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false) - { - var collection = GetUrlRecordCollectionInternal(entityName, languageIds, entityIds, isRange, isSorted); - - if (_prefetchedCollections.TryGetValue(entityName, out var existing)) - { - collection.MergeWith(existing); - } - else - { - _prefetchedCollections[entityName] = collection; - } - } - - public virtual UrlRecordCollection GetUrlRecordCollection(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false) - { - return GetUrlRecordCollectionInternal(entityName, languageIds, entityIds, isRange, isSorted); - } - - public virtual UrlRecordCollection GetUrlRecordCollectionInternal(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false) - { - Guard.NotEmpty(entityName, nameof(entityName)); - - using (new DbContextScope(proxyCreation: false, lazyLoading: false)) - { - var query = from x in _urlRecordRepository.TableUntracked - where x.EntityName == entityName && x.IsActive - select x; - - var requestedSet = entityIds; - - if (entityIds != null && entityIds.Length > 0) - { - if (isRange) - { - if (!isSorted) - { - Array.Sort(entityIds); - } - - var min = entityIds[0]; - var max = entityIds[entityIds.Length - 1]; - - if (entityIds.Length == 2 && max > min + 1) - { - // Only min & max were passed, create the range sequence. - requestedSet = Enumerable.Range(min, max - min + 1).ToArray(); - } - - query = query.Where(x => x.EntityId >= min && x.EntityId <= max); - } - else - { - requestedSet = entityIds; - query = query.Where(x => entityIds.Contains(x.EntityId)); - } - } - - if (languageIds != null && languageIds.Length > 0) - { - if (languageIds.Length == 1) - { + public virtual UrlRecordCollection GetUrlRecordCollectionInternal(string entityName, int[] languageIds, int[] entityIds, bool isRange = false, bool isSorted = false) + { + Guard.NotEmpty(entityName, nameof(entityName)); + + using (new DbContextScope(proxyCreation: false, lazyLoading: false)) + { + var query = from x in _urlRecordRepository.TableUntracked + where x.EntityName == entityName && x.IsActive + select x; + + var requestedSet = entityIds; + + if (entityIds != null && entityIds.Length > 0) + { + if (isRange) + { + if (!isSorted) + { + Array.Sort(entityIds); + } + + var min = entityIds[0]; + var max = entityIds[entityIds.Length - 1]; + + if (entityIds.Length == 2 && max > min + 1) + { + // Only min & max were passed, create the range sequence. + requestedSet = Enumerable.Range(min, max - min + 1).ToArray(); + } + + query = query.Where(x => x.EntityId >= min && x.EntityId <= max); + } + else + { + requestedSet = entityIds; + query = query.Where(x => entityIds.Contains(x.EntityId)); + } + } + + if (languageIds != null && languageIds.Length > 0) + { + if (languageIds.Length == 1) + { // Avoid "The LINQ expression node type 'ArrayIndex' is not supported in LINQ to Entities". var languageId = languageIds[0]; query = query.Where(x => x.LanguageId == languageId); - } - else - { - query = query.Where(x => languageIds.Contains(x.LanguageId)); - } - } - - // Don't sort DESC, because latter items overwrite exisiting ones (it's the same as sorting DESC and taking the first) - return new UrlRecordCollection(entityName, requestedSet, query.OrderBy(x => x.Id).ToList()); - } - } - - public virtual UrlRecord GetBySlug(string slug) - { - // INFO: (mc) Caching unnecessary here. This is not a 'bottleneck' function. - if (String.IsNullOrEmpty(slug)) - return null; - - var query = from ur in _urlRecordRepository.Table - where ur.Slug == slug - select ur; - - var urlRecord = query.FirstOrDefault(); - return urlRecord; - } + } + else + { + query = query.Where(x => languageIds.Contains(x.LanguageId)); + } + } + + // Don't sort DESC, because latter items overwrite exisiting ones (it's the same as sorting DESC and taking the first) + return new UrlRecordCollection(entityName, requestedSet, query.OrderBy(x => x.Id).ToList()); + } + } + + public virtual UrlRecord GetBySlug(string slug) + { + // INFO: (mc) Caching unnecessary here. This is not a 'bottleneck' function. + if (String.IsNullOrEmpty(slug)) + return null; + + var query = from ur in _urlRecordRepository.Table + where ur.Slug == slug + select ur; + + var urlRecord = query.FirstOrDefault(); + return urlRecord; + } public virtual string GetActiveSlug(int entityId, string entityName, int languageId) { - if (_prefetchedCollections.TryGetValue(entityName, out var collection)) - { - var cachedItem = collection.Find(languageId, entityId); - if (cachedItem != null) - { - return cachedItem.Slug.EmptyNull(); - } - } - - if (IsInScope) - { - return GetActiveSlugUncached(entityId, entityName, languageId); - } - - string slug = null; - - if (_seoSettings.LoadAllUrlAliasesOnStartup) - { - var allActiveSlugs = _cacheManager.Get(URLRECORD_ALL_ACTIVESLUGS_KEY, () => - { - using (new DbContextScope(proxyCreation: false, lazyLoading: false)) - { - var query = from x in _urlRecordRepository.TableUntracked - where x.IsActive - orderby x.Id descending - select x; - - var result = query.ToDictionarySafe( - x => GenerateKey(x.EntityId, x.EntityName, x.LanguageId), - x => x.Slug, - StringComparer.OrdinalIgnoreCase); - - return result; - } - }, independent: true); - - var key = GenerateKey(entityId, entityName, languageId); - if (!allActiveSlugs.TryGetValue(key, out slug)) - { - return string.Empty; - } - } - else - { - var slugs = GetCacheSegment(entityName, entityId, languageId); - - if (!slugs.TryGetValue(entityId, out slug)) - { - return string.Empty; - } - } - - return slug; + if (_prefetchedCollections.TryGetValue(entityName, out var collection)) + { + var cachedItem = collection.Find(languageId, entityId); + if (cachedItem != null) + { + return cachedItem.Slug.EmptyNull(); + } + } + + if (IsInScope) + { + return GetActiveSlugUncached(entityId, entityName, languageId); + } + + string slug = null; + + if (_seoSettings.LoadAllUrlAliasesOnStartup) + { + var allActiveSlugs = _cacheManager.Get(URLRECORD_ALL_ACTIVESLUGS_KEY, () => + { + using (new DbContextScope(proxyCreation: false, lazyLoading: false)) + { + var query = from x in _urlRecordRepository.TableUntracked + where x.IsActive + orderby x.Id descending + select x; + + var result = query.ToDictionarySafe( + x => GenerateKey(x.EntityId, x.EntityName, x.LanguageId), + x => x.Slug, + StringComparer.OrdinalIgnoreCase); + + return result; + } + }, independent: true); + + var key = GenerateKey(entityId, entityName, languageId); + if (!allActiveSlugs.TryGetValue(key, out slug)) + { + return string.Empty; + } + } + else + { + var slugs = GetCacheSegment(entityName, entityId, languageId); + + if (!slugs.TryGetValue(entityId, out slug)) + { + return string.Empty; + } + } + + return slug; } - protected string GetActiveSlugUncached(int entityId, string entityName, int languageId) - { - var query = from x in _urlRecordRepository.TableUntracked - where - x.EntityId == entityId && - x.EntityName == entityName && - x.LanguageId == languageId && - x.IsActive - orderby x.Id descending - select x.Slug; - - return query.FirstOrDefault().EmptyNull(); - } - - public virtual UrlRecord SaveSlug(T entity, string slug, int languageId) where T : BaseEntity, ISlugSupported + protected string GetActiveSlugUncached(int entityId, string entityName, int languageId) { - Guard.NotNull(entity, nameof(entity)); + var query = from x in _urlRecordRepository.TableUntracked + where + x.EntityId == entityId && + x.EntityName == entityName && + x.LanguageId == languageId && + x.IsActive + orderby x.Id descending + select x.Slug; + + return query.FirstOrDefault().EmptyNull(); + } + + public virtual UrlRecord SaveSlug(T entity, string slug, int languageId) where T : BaseEntity, ISlugSupported + { + Guard.NotNull(entity, nameof(entity)); int entityId = entity.Id; string entityName = entity.GetEntityName(); - UrlRecord result = null; + UrlRecord result = null; var query = from ur in _urlRecordRepository.Table where ur.EntityId == entityId && ur.EntityName == entityName && ur.LanguageId == languageId - orderby ur.Id descending + orderby ur.Id descending select ur; var allUrlRecords = query.ToList(); @@ -385,7 +385,7 @@ orderby ur.Id descending IsActive = true, }; InsertUrlRecord(urlRecord); - result = urlRecord; + result = urlRecord; } } @@ -421,164 +421,164 @@ orderby ur.Id descending } else { - // MC: Absolutely ensure, that we have no duplicate active record for this entity. - // In such case a record other than "activeUrlRecord" could have same seName - // and the DB would report an Index error. - var alreadyActiveDuplicate = allUrlRecords.FirstOrDefault(x => x.Slug.IsCaseInsensitiveEqual(slug) && x.IsActive); - if (alreadyActiveDuplicate != null) - { - // deactivate all - allUrlRecords.Each(x => x.IsActive = false); - // set the existing one to active again - alreadyActiveDuplicate.IsActive = true; - // update all records - allUrlRecords.Each(x => UpdateUrlRecord(x)); - } - else - { - // insert new record - // we do not update the existing record because we should track all previously entered slugs - // to ensure that URLs will work fine - var urlRecord = new UrlRecord - { - EntityId = entity.Id, - EntityName = entityName, - Slug = slug, - LanguageId = languageId, - IsActive = true, - }; - InsertUrlRecord(urlRecord); - result = urlRecord; - - // disable the previous active URL record - activeUrlRecord.IsActive = false; - UpdateUrlRecord(activeUrlRecord); - } + // MC: Absolutely ensure, that we have no duplicate active record for this entity. + // In such case a record other than "activeUrlRecord" could have same seName + // and the DB would report an Index error. + var alreadyActiveDuplicate = allUrlRecords.FirstOrDefault(x => x.Slug.IsCaseInsensitiveEqual(slug) && x.IsActive); + if (alreadyActiveDuplicate != null) + { + // deactivate all + allUrlRecords.Each(x => x.IsActive = false); + // set the existing one to active again + alreadyActiveDuplicate.IsActive = true; + // update all records + allUrlRecords.Each(x => UpdateUrlRecord(x)); + } + else + { + // insert new record + // we do not update the existing record because we should track all previously entered slugs + // to ensure that URLs will work fine + var urlRecord = new UrlRecord + { + EntityId = entity.Id, + EntityName = entityName, + Slug = slug, + LanguageId = languageId, + IsActive = true, + }; + InsertUrlRecord(urlRecord); + result = urlRecord; + + // disable the previous active URL record + activeUrlRecord.IsActive = false; + UpdateUrlRecord(activeUrlRecord); + } } } } - return result; + return result; + } + + public virtual UrlRecord SaveSlug(T entity, Func nameProperty) where T : BaseEntity, ISlugSupported + { + string name = nameProperty.Invoke(entity); + + string existingSeName = entity.GetSeName(0, true, false); + existingSeName = entity.ValidateSeName(existingSeName, name, true); + + return SaveSlug(entity, existingSeName, 0); + } + + private string GenerateKey(int entityId, string entityName, int languageId) + { + return "{0}.{1}.{2}".FormatInvariant(entityId, entityName, languageId); } - public virtual UrlRecord SaveSlug(T entity, Func nameProperty) where T : BaseEntity, ISlugSupported - { - string name = nameProperty.Invoke(entity); - - string existingSeName = entity.GetSeName(0, true, false); - existingSeName = entity.ValidateSeName(existingSeName, name, true); - - return SaveSlug(entity, existingSeName, 0); - } - - private string GenerateKey(int entityId, string entityName, int languageId) - { - return "{0}.{1}.{2}".FormatInvariant(entityId, entityName, languageId); - } - - public virtual Dictionary CountSlugsPerEntity(int[] urlRecordIds) - { - if (urlRecordIds == null || urlRecordIds.Length == 0) - return new Dictionary(); - - var query = - from x in _urlRecordRepository.TableUntracked - where urlRecordIds.Contains(x.Id) - select new - { - Id = x.Id, - Count = _urlRecordRepository.TableUntracked.Where(y => y.EntityName == x.EntityName && y.EntityId == x.EntityId).Count() - }; - - var result = query - .ToList() - .ToDictionary(x => x.Id, x => x.Count); - - return result; - } - - public virtual int CountSlugsPerEntity(string entityName, int entityId) - { - var count = _urlRecordRepository.Table - .Where(x => x.EntityName == entityName && x.EntityId == entityId) - .Count(); - - return count; - } - - protected virtual IDictionary GetCacheSegment(string entityName, int entityId, int languageId) - { - Guard.NotEmpty(entityName, nameof(entityName)); - - var segmentKey = GetSegmentKeyPart(entityName, entityId, out var minEntityId, out var maxEntityId); - var cacheKey = BuildCacheSegmentKey(segmentKey, languageId); - - return _cacheManager.Get(cacheKey, () => - { - using (new DbContextScope(proxyCreation: false, lazyLoading: false)) - { - var query = from ur in _urlRecordRepository.TableUntracked - where - ur.EntityId >= minEntityId && - ur.EntityId <= maxEntityId && - ur.EntityName == entityName && - ur.LanguageId == languageId && - ur.IsActive - orderby ur.Id descending - select ur; - - var urlRecords = query.ToList(); - - var dict = new Dictionary(urlRecords.Count); - - foreach (var ur in urlRecords) - { - dict[ur.EntityId] = ur.Slug.EmptyNull(); - } - - return dict; - } - }, independent: true); - } - - /// - /// Clears the cached segment from the cache - /// - protected virtual void ClearCacheSegment(string entityName, int entityId, int? languageId = null) - { - if (IsInScope) - return; - - var segmentKey = GetSegmentKeyPart(entityName, entityId); - - if (languageId.HasValue && languageId.Value > 0) - { - _cacheManager.Remove(BuildCacheSegmentKey(segmentKey, languageId.Value)); - } - else - { - _cacheManager.RemoveByPattern(URLRECORD_SEGMENT_PATTERN.FormatInvariant(segmentKey)); - } - - // always delete this (in case when LoadAllOnStartup is true) - _cacheManager.Remove(URLRECORD_ALL_ACTIVESLUGS_KEY); - } - - private string BuildCacheSegmentKey(string segment, int languageId) - { - return String.Format(URLRECORD_SEGMENT_KEY, segment, languageId); - } - - private string GetSegmentKeyPart(string entityName, int entityId) - { - return GetSegmentKeyPart(entityName, entityId, out _, out _); - } - - private string GetSegmentKeyPart(string entityName, int entityId, out int minId, out int maxId) - { - maxId = entityId.GetRange(_performanceSettings.CacheSegmentSize, out minId); - return (entityName + "." + maxId.ToString()).ToLowerInvariant(); - } - } + public virtual Dictionary CountSlugsPerEntity(int[] urlRecordIds) + { + if (urlRecordIds == null || urlRecordIds.Length == 0) + return new Dictionary(); + + var query = + from x in _urlRecordRepository.TableUntracked + where urlRecordIds.Contains(x.Id) + select new + { + Id = x.Id, + Count = _urlRecordRepository.TableUntracked.Where(y => y.EntityName == x.EntityName && y.EntityId == x.EntityId).Count() + }; + + var result = query + .ToList() + .ToDictionary(x => x.Id, x => x.Count); + + return result; + } + + public virtual int CountSlugsPerEntity(string entityName, int entityId) + { + var count = _urlRecordRepository.Table + .Where(x => x.EntityName == entityName && x.EntityId == entityId) + .Count(); + + return count; + } + + protected virtual IDictionary GetCacheSegment(string entityName, int entityId, int languageId) + { + Guard.NotEmpty(entityName, nameof(entityName)); + + var segmentKey = GetSegmentKeyPart(entityName, entityId, out var minEntityId, out var maxEntityId); + var cacheKey = BuildCacheSegmentKey(segmentKey, languageId); + + return _cacheManager.Get(cacheKey, () => + { + using (new DbContextScope(proxyCreation: false, lazyLoading: false)) + { + var query = from ur in _urlRecordRepository.TableUntracked + where + ur.EntityId >= minEntityId && + ur.EntityId <= maxEntityId && + ur.EntityName == entityName && + ur.LanguageId == languageId && + ur.IsActive + orderby ur.Id descending + select ur; + + var urlRecords = query.ToList(); + + var dict = new Dictionary(urlRecords.Count); + + foreach (var ur in urlRecords) + { + dict[ur.EntityId] = ur.Slug.EmptyNull(); + } + + return dict; + } + }, independent: true); + } + + /// + /// Clears the cached segment from the cache + /// + protected virtual void ClearCacheSegment(string entityName, int entityId, int? languageId = null) + { + if (IsInScope) + return; + + var segmentKey = GetSegmentKeyPart(entityName, entityId); + + if (languageId.HasValue && languageId.Value > 0) + { + _cacheManager.Remove(BuildCacheSegmentKey(segmentKey, languageId.Value)); + } + else + { + _cacheManager.RemoveByPattern(URLRECORD_SEGMENT_PATTERN.FormatInvariant(segmentKey)); + } + + // always delete this (in case when LoadAllOnStartup is true) + _cacheManager.Remove(URLRECORD_ALL_ACTIVESLUGS_KEY); + } + + private string BuildCacheSegmentKey(string segment, int languageId) + { + return String.Format(URLRECORD_SEGMENT_KEY, segment, languageId); + } + + private string GetSegmentKeyPart(string entityName, int entityId) + { + return GetSegmentKeyPart(entityName, entityId, out _, out _); + } + + private string GetSegmentKeyPart(string entityName, int entityId, out int minId, out int maxId) + { + maxId = entityId.GetRange(_performanceSettings.CacheSegmentSize, out minId); + return (entityName + "." + maxId.ToString()).ToLowerInvariant(); + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Seo/XmlSitemapBuildContext.cs b/src/Libraries/SmartStore.Services/Seo/XmlSitemapBuildContext.cs index 02ab997f92..82f7514c67 100644 --- a/src/Libraries/SmartStore.Services/Seo/XmlSitemapBuildContext.cs +++ b/src/Libraries/SmartStore.Services/Seo/XmlSitemapBuildContext.cs @@ -9,38 +9,38 @@ namespace SmartStore.Services.Seo { - public class XmlSitemapBuildContext - { - private readonly ISettingService _settingService; - private readonly bool _isSingleStoreMode; - - public XmlSitemapBuildContext(Store store, Language[] languages, ISettingService settingService, bool isSingleStoreMode) - { - Guard.NotNull(store, nameof(store)); - Guard.NotEmpty(languages, nameof(languages)); - - Store = store; - Languages = languages; - Protocol = Store.ForceSslForAllPages ? "https" : "http"; - - _settingService = settingService; - _isSingleStoreMode = isSingleStoreMode; - - RequestStoreId = _isSingleStoreMode ? 0 : store.Id; - } - - public CancellationToken CancellationToken { get; set; } - public ProgressCallback ProgressCallback { get; set; } - public Store Store { get; set; } - public int RequestStoreId { get; private set; } - public Language[] Languages { get; set; } - public int MaximumNodeCount { get; set; } = XmlSitemapGenerator.MaximumSiteMapNodeCount; - - public string Protocol { get; private set; } - - public T LoadSetting() where T : ISettings, new() - { - return _settingService.LoadSetting(RequestStoreId); - } - } + public class XmlSitemapBuildContext + { + private readonly ISettingService _settingService; + private readonly bool _isSingleStoreMode; + + public XmlSitemapBuildContext(Store store, Language[] languages, ISettingService settingService, bool isSingleStoreMode) + { + Guard.NotNull(store, nameof(store)); + Guard.NotEmpty(languages, nameof(languages)); + + Store = store; + Languages = languages; + Protocol = Store.ForceSslForAllPages ? "https" : "http"; + + _settingService = settingService; + _isSingleStoreMode = isSingleStoreMode; + + RequestStoreId = _isSingleStoreMode ? 0 : store.Id; + } + + public CancellationToken CancellationToken { get; set; } + public ProgressCallback ProgressCallback { get; set; } + public Store Store { get; set; } + public int RequestStoreId { get; private set; } + public Language[] Languages { get; set; } + public int MaximumNodeCount { get; set; } = XmlSitemapGenerator.MaximumSiteMapNodeCount; + + public string Protocol { get; private set; } + + public T LoadSetting() where T : ISettings, new() + { + return _settingService.LoadSetting(RequestStoreId); + } + } } diff --git a/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs b/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs index 0e7c4086c7..3ce70076e7 100644 --- a/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs +++ b/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs @@ -22,677 +22,677 @@ namespace SmartStore.Services.Seo { - public partial class XmlSitemapGenerator : IXmlSitemapGenerator + public partial class XmlSitemapGenerator : IXmlSitemapGenerator { - private const string SiteMapsNamespace = "http://www.sitemaps.org/schemas/sitemap/0.9"; - private const string XhtmlNamespace = "http://www.w3.org/1999/xhtml"; - private const string SiteMapFileNamePattern = "sitemap-{0}.xml"; - private const string LockFileNamePattern = "sitemap-{0}-{1}.lock"; - - /// - /// The maximum number of sitemaps a sitemap index file can contain. - /// - private const int MaximumSiteMapCount = 50000; - - /// - /// The maximum number of sitemap nodes allowed in a sitemap file. The absolute maximum allowed is 50,000 - /// according to the specification. See http://www.sitemaps.org/protocol.html but the file size must also be - /// less than 10MB. After some experimentation, a maximum of 2.000 nodes keeps the file size below 10MB. - /// - internal const int MaximumSiteMapNodeCount = 2000; - - /// - /// The maximum size of a sitemap file in bytes (10MB). - /// - private const int MaximumSiteMapSizeInBytes = 10485760; - - private readonly IEnumerable> _publishers; - private readonly ILanguageService _languageService; - private readonly ICustomerService _customerService; - private readonly IUrlRecordService _urlRecordService; - private readonly ICommonServices _services; - private readonly ILockFileManager _lockFileManager; - private readonly UrlHelper _urlHelper; - - private readonly IVirtualFolder _tenantFolder; - private readonly string _baseDir; - - public XmlSitemapGenerator( - IEnumerable> publishers, - ILanguageService languageService, - ICustomerService customerService, - IUrlRecordService urlRecordService, - ICommonServices services, - ILockFileManager lockFileManager, - UrlHelper urlHelper) + private const string SiteMapsNamespace = "http://www.sitemaps.org/schemas/sitemap/0.9"; + private const string XhtmlNamespace = "http://www.w3.org/1999/xhtml"; + private const string SiteMapFileNamePattern = "sitemap-{0}.xml"; + private const string LockFileNamePattern = "sitemap-{0}-{1}.lock"; + + /// + /// The maximum number of sitemaps a sitemap index file can contain. + /// + private const int MaximumSiteMapCount = 50000; + + /// + /// The maximum number of sitemap nodes allowed in a sitemap file. The absolute maximum allowed is 50,000 + /// according to the specification. See http://www.sitemaps.org/protocol.html but the file size must also be + /// less than 10MB. After some experimentation, a maximum of 2.000 nodes keeps the file size below 10MB. + /// + internal const int MaximumSiteMapNodeCount = 2000; + + /// + /// The maximum size of a sitemap file in bytes (10MB). + /// + private const int MaximumSiteMapSizeInBytes = 10485760; + + private readonly IEnumerable> _publishers; + private readonly ILanguageService _languageService; + private readonly ICustomerService _customerService; + private readonly IUrlRecordService _urlRecordService; + private readonly ICommonServices _services; + private readonly ILockFileManager _lockFileManager; + private readonly UrlHelper _urlHelper; + + private readonly IVirtualFolder _tenantFolder; + private readonly string _baseDir; + + public XmlSitemapGenerator( + IEnumerable> publishers, + ILanguageService languageService, + ICustomerService customerService, + IUrlRecordService urlRecordService, + ICommonServices services, + ILockFileManager lockFileManager, + UrlHelper urlHelper) { - _publishers = publishers; - _languageService = languageService; - _customerService = customerService; - _urlRecordService = urlRecordService; - _services = services; - _lockFileManager = lockFileManager; - _urlHelper = urlHelper; - - _tenantFolder = _services.ApplicationEnvironment.TenantFolder; - _baseDir = _tenantFolder.Combine("Sitemaps"); - - Logger = NullLogger.Instance; - - } - - public ILogger Logger { get; set; } - - public virtual async Task GetSitemapPartAsync(int index = 0) - { - return await GetSitemapPartAsync(index, false); - } - - private async Task GetSitemapPartAsync(int index, bool isRetry) - { - Guard.NotNegative(index, nameof(index)); - - var store = _services.StoreContext.CurrentStore; - var language = _services.WorkContext.WorkingLanguage; - - var exists = SitemapFileExists(store.Id, language.Id, index, out var path, out var name); - - if (exists) - { - return new XmlSitemapPartition - { - Index = index, - Name = name, - LanguageId = language.Id, - StoreId = store.Id, - ModifiedOnUtc = _tenantFolder.GetFileLastWriteTimeUtc(path), - Stream = _tenantFolder.OpenFile(path) - }; - } - - if (isRetry) - { - var msg = "Could not generate XML sitemap. Index: {0}, Date: {1}".FormatInvariant(index, DateTime.UtcNow); - Logger.Error(msg); - throw new SmartException(msg); - } - - if (index > 0) - { - // File with index greater 0 has been requested, but it does not exist. - // Now we have to determine whether just the passed index is out of range - // or the files has never been created before. - // If the main file (index 0) exists, the action should return NotFoundResult, - // otherwise the rebuild process should be started or waited for. - - if (SitemapFileExists(store.Id, language.Id, 0, out path, out name)) - { - throw new IndexOutOfRangeException("The sitemap file '{0}' does not exist.".FormatInvariant(name)); - } - } - - // The main sitemap document with index 0 does not exist, meaning: the whole sitemap - // needs to be created and cached by partitions. - - var wasRebuilding = false; - var lockFilePath = GetLockFilePath(store.Id, language.Id); - - while (IsRebuilding(lockFilePath)) - { - // The rebuild process is already running, either started - // by the task scheduler or another HTTP request. - // We should wait for completion. - - wasRebuilding = true; - Thread.Sleep(1000); - } - - if (!wasRebuilding) - { - // No lock. Rebuild now. - var buildContext = new XmlSitemapBuildContext(store, new[] { language }, _services.Settings, _services.StoreService.IsSingleStoreMode()) - { - CancellationToken = CancellationToken.None - }; - - await RebuildAsync(buildContext); - } - - // DRY: call self to get sitemap partition object - return await GetSitemapPartAsync(index, true); - } - - private bool SitemapFileExists(int storeId, int languageId, int index, out string path, out string name) - { - path = BuildSitemapFilePath(storeId, languageId, index, out name); - - // Does not work reliably with symlinks due to framework caching - //var exists = _tenantFolder.FileExists(path); - - var exists = File.Exists(_tenantFolder.MapPath(path)); - - if (!exists) - { - path = null; - name = null; - } - - return exists; - } - - private string BuildSitemapFilePath(int storeId, int languageId, int index, out string fileName) - { - fileName = SiteMapFileNamePattern.FormatInvariant(index); - return _tenantFolder.Combine(BuildSitemapDirPath(storeId, languageId), fileName); - } - - private string BuildSitemapDirPath(int storeId, int languageId) - { - return _tenantFolder.Combine(_baseDir, storeId + "/" + languageId); - } - - private string GetLockFilePath(int storeId, int languageId) - { - var fileName = LockFileNamePattern.FormatInvariant(storeId, languageId); - return _tenantFolder.Combine(_baseDir, fileName); - } - - public virtual async Task RebuildAsync(XmlSitemapBuildContext ctx) - { - Guard.NotNull(ctx, nameof(ctx)); - - // Double seo code otherwise - _urlHelper.RequestContext.RouteData.DataTokens["SeoCodeReplacement"] = string.Empty; - - var languageData = new Dictionary(); - - foreach (var language in ctx.Languages) - { - var lockFilePath = GetLockFilePath(ctx.Store.Id, language.Id); - - if (_lockFileManager.TryAcquireLock(lockFilePath, out var lockFile)) - { - // Process only languages that are unlocked right now - // It is possible that an HTTP request triggered the generation - // of a language specific sitemap. - - var sitemapDir = BuildSitemapDirPath(ctx.Store.Id, language.Id); - var data = new LanguageData - { - Store = ctx.Store, - Language = language, - LockFile = lockFile, - LockFilePath = lockFilePath, - TempDir = sitemapDir + "~", - FinalDir = sitemapDir, - BaseUrl = BuildBaseUrl(ctx.Store, language) - }; - - _tenantFolder.TryDeleteDirectory(data.TempDir); - _tenantFolder.CreateDirectory(data.TempDir); - - languageData[language.Id] = data; - } - } - - if (languageData.Count == 0) - { - Logger.Warn("XML sitemap rebuild already in process."); - return; - } - - var languages = languageData.Values.Select(x => x.Language); - var languageIds = languages.Select(x => x.Id).Concat(new[] { 0 }).ToArray(); - - // All sitemaps grouped by language - var sitemaps = new Multimap(); - - var compositeFileLock = new ActionDisposable(() => - { - foreach (var data in languageData.Values) - { - data.LockFile.Release(); - } - }); - - using (compositeFileLock) - { - // Impersonate - var prevCustomer = _services.WorkContext.CurrentCustomer; - // no need to vary xml sitemap by customer roles: it's relevant to crawlers only. - _services.WorkContext.CurrentCustomer = _customerService.GetCustomerBySystemName(SystemCustomerNames.SearchEngine); - - try - { - var nodes = new List(); - - var providers = CreateProviders(ctx); - var total = providers.Sum(x => x.GetTotalCount()); - - var totalSegments = (int)Math.Ceiling(total / (double)MaximumSiteMapNodeCount); - var hasIndex = totalSegments > 1; - var indexNodes = new Multimap(); - var segment = 0; - var numProcessed = 0; - - CheckSitemapCount(totalSegments); - - using (new DbContextScope(autoDetectChanges: false, forceNoTracking: true, proxyCreation: false, lazyLoading: false)) - { - var entities = EnlistEntities(providers); - - foreach (var batch in entities.Slice(MaximumSiteMapNodeCount)) - { - if (ctx.CancellationToken.IsCancellationRequested) - { - break; - } - - segment++; - numProcessed = segment * MaximumSiteMapNodeCount; - ctx.ProgressCallback?.Invoke(numProcessed, total, "{0} / {1}".FormatCurrent(numProcessed, total)); - - var slugs = GetUrlRecordCollectionsForBatch(batch.Select(x => x.Entry), languageIds); - - foreach (var data in languageData.Values) - { - var language = data.Language; - var baseUrl = data.BaseUrl; - - // Create all node entries for this segment - var entries = batch - .Where(x => x.Entry.LanguageId.GetValueOrDefault() == 0 || x.Entry.LanguageId.Value == language.Id) - .Select(x => x.Provider.CreateNode(_urlHelper, baseUrl, x.Entry, slugs[x.Entry.EntityName], language)); - sitemaps[language.Id].AddRange(entries.Where(x => x != null)); - - // Create index node for this segment/language combination - if (hasIndex) - { - indexNodes[language.Id].Add(new XmlSitemapNode - { - LastMod = sitemaps[language.Id].Select(x => x.LastMod).Where(x => x.HasValue).DefaultIfEmpty().Max(), - Loc = GetSitemapIndexUrl(segment, baseUrl), - }); - } - - if (segment % 5 == 0 || segment == totalSegments) - { - // Commit every 5th segment (10.000 nodes) temporarily to disk to minimize RAM usage - var documents = GetSiteMapDocuments((IReadOnlyCollection)sitemaps[language.Id]); - await SaveTempAsync(documents, data, segment - documents.Count + (hasIndex ? 1 : 0)); - - documents.Clear(); - sitemaps.RemoveAll(language.Id); - } - } - - slugs.Clear(); - - //GC.Collect(); - //GC.WaitForPendingFinalizers(); - } - - // Process custom nodes - if (!ctx.CancellationToken.IsCancellationRequested) - { - ctx.ProgressCallback?.Invoke(numProcessed, total, "Processing custom nodes".FormatCurrent(numProcessed, total)); - ProcessCustomNodes(ctx, sitemaps); - - foreach (var data in languageData.Values) - { - if (sitemaps.ContainsKey(data.Language.Id) && sitemaps[data.Language.Id].Count > 0) - { - var documents = GetSiteMapDocuments((IReadOnlyCollection)sitemaps[data.Language.Id]); - await SaveTempAsync(documents, data, (segment + 1) - documents.Count + (hasIndex ? 1 : 0)); - } - else if (segment == 0) - { - // Ensure that at least one entry exists. Otherwise, - // the system will try to rebuild again. - var homeNode = new XmlSitemapNode { LastMod = DateTime.UtcNow, Loc = data.BaseUrl }; - var documents = GetSiteMapDocuments(new List { homeNode }); - await SaveTempAsync(documents, data, 0); - } - - } - } - } - - ctx.CancellationToken.ThrowIfCancellationRequested(); - - ctx.ProgressCallback?.Invoke(totalSegments, totalSegments, "Finalizing...'"); - - foreach (var data in languageData.Values) - { - // Create index documents (if any) - if (hasIndex && indexNodes.Any()) - { - var indexDocument = CreateSitemapIndexDocument(indexNodes[data.Language.Id]); - await SaveTempAsync(new List { indexDocument }, data, 0); - } - - // Save finally (actually renames temp folder) - SaveFinal(data); - } - } - finally - { - // Undo impersonation - _services.WorkContext.CurrentCustomer = prevCustomer; - sitemaps.Clear(); - - foreach (var data in languageData.Values) - { - if (_tenantFolder.DirectoryExists(data.TempDir)) - { - _tenantFolder.TryDeleteDirectory(data.TempDir); - } - } - - //GC.Collect(); - //GC.WaitForPendingFinalizers(); - } - } - } - - private string BuildBaseUrl(Store store, Language language) - { - var host = _services.StoreService.GetHost(store).EnsureEndsWith("/"); - - var locSettings = _services.Settings.LoadSetting(store.Id); - if (locSettings.SeoFriendlyUrlsForLanguagesEnabled) - { - var defaultLangId = _languageService.GetDefaultLanguageId(store.Id); - if (language.Id != defaultLangId || locSettings.DefaultLanguageRedirectBehaviour < DefaultLanguageRedirectBehaviour.StripSeoCode) - { - host += language.GetTwoLetterISOLanguageName() + "/"; - } - } - - return host; - } - - private async Task SaveTempAsync(List documents, LanguageData data, int start) - { - for (int i = 0; i < documents.Count; i++) - { - // Save segment to disk - var fileName = SiteMapFileNamePattern.FormatInvariant(i + start); - var filePath = _tenantFolder.Combine(data.TempDir, fileName); - - await _tenantFolder.CreateTextFileAsync(filePath, documents[i]); - } - } - - private void SaveFinal(LanguageData data) - { - // Delete current sitemap dir - _tenantFolder.TryDeleteDirectory(data.FinalDir); - - var source = _tenantFolder.MapPath(data.TempDir); - var dest = _tenantFolder.MapPath(data.FinalDir); - - // Move/Rename new (temp) dir to current - System.IO.Directory.Move(source, dest); - - int retries = 0; - while (!SitemapFileExists(data.Store.Id, data.Language.Id, 0, out _, out _)) - { - if (retries > 20) - { - break; - } - - // IO breathe: directly after a folder rename a file check fails. Wait a sec... - Task.Delay(500).Wait(); - retries++; - } - } - - private IEnumerable EnlistEntities(XmlSitemapProvider[] providers) - { - var result = Enumerable.Empty(); - foreach (var provider in providers) - { - result = result.Concat(provider.Enlist().Select(x => new NodeEntry { Entry = x, Provider = provider })); - } - - return result; - } - - private IDictionary GetUrlRecordCollectionsForBatch(IEnumerable batch, int[] languageIds) - { - var result = new Dictionary(); - - if (batch.First().EntityName == "Product") - { - // nothing comes after product - int min = batch.Last().Id; - int max = batch.First().Id; - - result["Product"] = _urlRecordService.GetUrlRecordCollection("Product", languageIds, new[] { min, max }, true, true); - } - - var entityGroups = batch.ToMultimap(x => x.EntityName, x => x.Id); - foreach (var group in entityGroups) - { - var isRange = group.Key == "Product"; - var entityIds = isRange ? new[] { group.Value.Last(), group.Value.First() } : group.Value.ToArray(); - - result[group.Key] = _urlRecordService.GetUrlRecordCollection(group.Key, languageIds, entityIds, isRange, isRange); - } - - return result; - } - - protected virtual List GetSiteMapDocuments(IReadOnlyCollection nodes) - { - int siteMapCount = (int)Math.Ceiling(nodes.Count / (double)MaximumSiteMapNodeCount); - CheckSitemapCount(siteMapCount); - - var siteMaps = Enumerable - .Range(0, siteMapCount) - .Select(x => - { - return new KeyValuePair>( - x + 1, - nodes.Skip(x * MaximumSiteMapNodeCount).Take(MaximumSiteMapNodeCount)); - }); - - var siteMapDocuments = new List(siteMapCount); - - foreach (var kvp in siteMaps) - { - siteMapDocuments.Add(this.GetSitemapDocument(kvp.Value)); - } - - return siteMapDocuments; - } - - /// - /// Gets the sitemap XML document for the specified set of nodes. - /// - /// The sitemap nodes. - /// The sitemap XML document for the specified set of nodes. - private string GetSitemapDocument(IEnumerable nodes) - { - //var languages = _languageService.GetAllLanguages(); - - XNamespace ns = SiteMapsNamespace; - XNamespace xhtml = XhtmlNamespace; - - XElement root = new XElement( - ns + "urlset", - new XAttribute(XNamespace.Xmlns + "xhtml", xhtml)); - - foreach (var node in nodes) - { - // url - var xel = new XElement - ( - ns + "url", - // url/loc - new XElement(ns + "loc", node.Loc), - // url/lastmod - node.LastMod == null ? null : new XElement( - ns + "lastmod", - node.LastMod.Value.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:sszzz")), - // url/changefreq - node.ChangeFreq == null ? null : new XElement( - ns + "changefreq", - node.ChangeFreq.Value.ToString().ToLowerInvariant()), - // url/priority - node.Priority == null ? null : new XElement( - ns + "priority", - node.Priority.Value.ToString("F1", CultureInfo.InvariantCulture)) - ); - - if (node.Links != null) - { - foreach (var entry in node.Links) - { - // url/xhtml:link[culture] - xel.Add(new XElement - ( - xhtml + "link", - new XAttribute("rel", "alternate"), - new XAttribute("hreflang", entry.Lang), - new XAttribute("href", entry.Href) - )); - } - } - - root.Add(xel); - } - - XDocument document = new XDocument(root); - var xml = document.ToString(SaveOptions.DisableFormatting); - CheckDocumentSize(xml); - - return xml; - } - - /// - /// Gets the sitemap index XML document, containing links to all the sitemap XML documents. - /// - /// The collection of sitemaps containing their index and nodes. - /// The sitemap index XML document, containing links to all the sitemap XML documents. - private string CreateSitemapIndexDocument(IEnumerable nodes) - { - XNamespace ns = SiteMapsNamespace; - - XElement root = new XElement(ns + "sitemapindex"); - - foreach (var node in nodes) - { - var xel = new XElement( - ns + "sitemap", - new XElement(ns + "loc", node.Loc), - node.LastMod.HasValue ? - new XElement( - ns + "lastmod", - node.LastMod.Value.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:sszzz")) : - null); - - root.Add(xel); - } - - var document = new XDocument(root); - var xml = document.ToString(SaveOptions.DisableFormatting); - CheckDocumentSize(xml); - - return xml; - } - - private string GetSitemapIndexUrl(int index, string baseUrl) - { - var url = _urlHelper.RouteUrl("XmlSitemap", new { index }).TrimStart('/'); - return baseUrl + url; - } - - private XmlSitemapProvider[] CreateProviders(XmlSitemapBuildContext context) - { - return _publishers - .Select(x => x.Value.PublishXmlSitemap(context)) - .Where(x => x != null) - .OrderBy(x => x.Order) - .ToArray(); - } - - protected void ProcessCustomNodes(XmlSitemapBuildContext ctx, Multimap sitemaps) - { - // For inheritors - } - - /// - /// Checks the size of the XML sitemap document. If it is over 10MB, logs an error. - /// - /// The sitemap XML document. - private void CheckDocumentSize(string siteMapXml) - { - if (siteMapXml.Length >= MaximumSiteMapSizeInBytes) - { - Logger.Error(new InvalidOperationException($"Sitemap exceeds the maximum size of 10MB. This is because you have unusually long URL's. Consider reducing the MaximumSitemapNodeCount. Size:<{siteMapXml.Length}>")); - } - } - - /// - /// Checks the count of the number of sitemaps. If it is over 50,000, logs an error. - /// - /// The sitemap count. - private void CheckSitemapCount(int sitemapCount) - { - if (sitemapCount > MaximumSiteMapCount) - { - var ex = new InvalidOperationException($"Sitemap index file exceeds the maximum number of allowed sitemaps of 50,000. Count:<{sitemapCount}>"); - Logger.Warn(ex, ex.Message); - } - } - - public bool IsRebuilding(int storeId, int languageId) - { - return IsRebuilding(GetLockFilePath(storeId, languageId)); - } - - private bool IsRebuilding(string lockFilePath) - { - return _lockFileManager.IsLocked(lockFilePath); - } - - public virtual bool IsGenerated(int storeId, int languageId) - { - return SitemapFileExists(storeId, languageId, 0, out _, out _); - } - - public virtual void Invalidate(int storeId, int languageId) - { - var dir = BuildSitemapDirPath(storeId, languageId); - - if (_tenantFolder.DirectoryExists(dir)) - { - _tenantFolder.DeleteDirectory(dir); - } - } - - #region Nested classes - - struct NodeEntry - { - public NamedEntity Entry { get; set; } - public XmlSitemapProvider Provider { get; set; } - } - - class LanguageData - { - public Store Store { get; set; } - public Language Language { get; set; } - public ILockFile LockFile { get; set; } - public string LockFilePath { get; set; } - public string TempDir { get; set; } - public string FinalDir { get; set; } - public string BaseUrl { get; set; } - } - - #endregion - } + _publishers = publishers; + _languageService = languageService; + _customerService = customerService; + _urlRecordService = urlRecordService; + _services = services; + _lockFileManager = lockFileManager; + _urlHelper = urlHelper; + + _tenantFolder = _services.ApplicationEnvironment.TenantFolder; + _baseDir = _tenantFolder.Combine("Sitemaps"); + + Logger = NullLogger.Instance; + + } + + public ILogger Logger { get; set; } + + public virtual async Task GetSitemapPartAsync(int index = 0) + { + return await GetSitemapPartAsync(index, false); + } + + private async Task GetSitemapPartAsync(int index, bool isRetry) + { + Guard.NotNegative(index, nameof(index)); + + var store = _services.StoreContext.CurrentStore; + var language = _services.WorkContext.WorkingLanguage; + + var exists = SitemapFileExists(store.Id, language.Id, index, out var path, out var name); + + if (exists) + { + return new XmlSitemapPartition + { + Index = index, + Name = name, + LanguageId = language.Id, + StoreId = store.Id, + ModifiedOnUtc = _tenantFolder.GetFileLastWriteTimeUtc(path), + Stream = _tenantFolder.OpenFile(path) + }; + } + + if (isRetry) + { + var msg = "Could not generate XML sitemap. Index: {0}, Date: {1}".FormatInvariant(index, DateTime.UtcNow); + Logger.Error(msg); + throw new SmartException(msg); + } + + if (index > 0) + { + // File with index greater 0 has been requested, but it does not exist. + // Now we have to determine whether just the passed index is out of range + // or the files has never been created before. + // If the main file (index 0) exists, the action should return NotFoundResult, + // otherwise the rebuild process should be started or waited for. + + if (SitemapFileExists(store.Id, language.Id, 0, out path, out name)) + { + throw new IndexOutOfRangeException("The sitemap file '{0}' does not exist.".FormatInvariant(name)); + } + } + + // The main sitemap document with index 0 does not exist, meaning: the whole sitemap + // needs to be created and cached by partitions. + + var wasRebuilding = false; + var lockFilePath = GetLockFilePath(store.Id, language.Id); + + while (IsRebuilding(lockFilePath)) + { + // The rebuild process is already running, either started + // by the task scheduler or another HTTP request. + // We should wait for completion. + + wasRebuilding = true; + Thread.Sleep(1000); + } + + if (!wasRebuilding) + { + // No lock. Rebuild now. + var buildContext = new XmlSitemapBuildContext(store, new[] { language }, _services.Settings, _services.StoreService.IsSingleStoreMode()) + { + CancellationToken = CancellationToken.None + }; + + await RebuildAsync(buildContext); + } + + // DRY: call self to get sitemap partition object + return await GetSitemapPartAsync(index, true); + } + + private bool SitemapFileExists(int storeId, int languageId, int index, out string path, out string name) + { + path = BuildSitemapFilePath(storeId, languageId, index, out name); + + // Does not work reliably with symlinks due to framework caching + //var exists = _tenantFolder.FileExists(path); + + var exists = File.Exists(_tenantFolder.MapPath(path)); + + if (!exists) + { + path = null; + name = null; + } + + return exists; + } + + private string BuildSitemapFilePath(int storeId, int languageId, int index, out string fileName) + { + fileName = SiteMapFileNamePattern.FormatInvariant(index); + return _tenantFolder.Combine(BuildSitemapDirPath(storeId, languageId), fileName); + } + + private string BuildSitemapDirPath(int storeId, int languageId) + { + return _tenantFolder.Combine(_baseDir, storeId + "/" + languageId); + } + + private string GetLockFilePath(int storeId, int languageId) + { + var fileName = LockFileNamePattern.FormatInvariant(storeId, languageId); + return _tenantFolder.Combine(_baseDir, fileName); + } + + public virtual async Task RebuildAsync(XmlSitemapBuildContext ctx) + { + Guard.NotNull(ctx, nameof(ctx)); + + // Double seo code otherwise + _urlHelper.RequestContext.RouteData.DataTokens["SeoCodeReplacement"] = string.Empty; + + var languageData = new Dictionary(); + + foreach (var language in ctx.Languages) + { + var lockFilePath = GetLockFilePath(ctx.Store.Id, language.Id); + + if (_lockFileManager.TryAcquireLock(lockFilePath, out var lockFile)) + { + // Process only languages that are unlocked right now + // It is possible that an HTTP request triggered the generation + // of a language specific sitemap. + + var sitemapDir = BuildSitemapDirPath(ctx.Store.Id, language.Id); + var data = new LanguageData + { + Store = ctx.Store, + Language = language, + LockFile = lockFile, + LockFilePath = lockFilePath, + TempDir = sitemapDir + "~", + FinalDir = sitemapDir, + BaseUrl = BuildBaseUrl(ctx.Store, language) + }; + + _tenantFolder.TryDeleteDirectory(data.TempDir); + _tenantFolder.CreateDirectory(data.TempDir); + + languageData[language.Id] = data; + } + } + + if (languageData.Count == 0) + { + Logger.Warn("XML sitemap rebuild already in process."); + return; + } + + var languages = languageData.Values.Select(x => x.Language); + var languageIds = languages.Select(x => x.Id).Concat(new[] { 0 }).ToArray(); + + // All sitemaps grouped by language + var sitemaps = new Multimap(); + + var compositeFileLock = new ActionDisposable(() => + { + foreach (var data in languageData.Values) + { + data.LockFile.Release(); + } + }); + + using (compositeFileLock) + { + // Impersonate + var prevCustomer = _services.WorkContext.CurrentCustomer; + // no need to vary xml sitemap by customer roles: it's relevant to crawlers only. + _services.WorkContext.CurrentCustomer = _customerService.GetCustomerBySystemName(SystemCustomerNames.SearchEngine); + + try + { + var nodes = new List(); + + var providers = CreateProviders(ctx); + var total = providers.Sum(x => x.GetTotalCount()); + + var totalSegments = (int)Math.Ceiling(total / (double)MaximumSiteMapNodeCount); + var hasIndex = totalSegments > 1; + var indexNodes = new Multimap(); + var segment = 0; + var numProcessed = 0; + + CheckSitemapCount(totalSegments); + + using (new DbContextScope(autoDetectChanges: false, forceNoTracking: true, proxyCreation: false, lazyLoading: false)) + { + var entities = EnlistEntities(providers); + + foreach (var batch in entities.Slice(MaximumSiteMapNodeCount)) + { + if (ctx.CancellationToken.IsCancellationRequested) + { + break; + } + + segment++; + numProcessed = segment * MaximumSiteMapNodeCount; + ctx.ProgressCallback?.Invoke(numProcessed, total, "{0} / {1}".FormatCurrent(numProcessed, total)); + + var slugs = GetUrlRecordCollectionsForBatch(batch.Select(x => x.Entry), languageIds); + + foreach (var data in languageData.Values) + { + var language = data.Language; + var baseUrl = data.BaseUrl; + + // Create all node entries for this segment + var entries = batch + .Where(x => x.Entry.LanguageId.GetValueOrDefault() == 0 || x.Entry.LanguageId.Value == language.Id) + .Select(x => x.Provider.CreateNode(_urlHelper, baseUrl, x.Entry, slugs[x.Entry.EntityName], language)); + sitemaps[language.Id].AddRange(entries.Where(x => x != null)); + + // Create index node for this segment/language combination + if (hasIndex) + { + indexNodes[language.Id].Add(new XmlSitemapNode + { + LastMod = sitemaps[language.Id].Select(x => x.LastMod).Where(x => x.HasValue).DefaultIfEmpty().Max(), + Loc = GetSitemapIndexUrl(segment, baseUrl), + }); + } + + if (segment % 5 == 0 || segment == totalSegments) + { + // Commit every 5th segment (10.000 nodes) temporarily to disk to minimize RAM usage + var documents = GetSiteMapDocuments((IReadOnlyCollection)sitemaps[language.Id]); + await SaveTempAsync(documents, data, segment - documents.Count + (hasIndex ? 1 : 0)); + + documents.Clear(); + sitemaps.RemoveAll(language.Id); + } + } + + slugs.Clear(); + + //GC.Collect(); + //GC.WaitForPendingFinalizers(); + } + + // Process custom nodes + if (!ctx.CancellationToken.IsCancellationRequested) + { + ctx.ProgressCallback?.Invoke(numProcessed, total, "Processing custom nodes".FormatCurrent(numProcessed, total)); + ProcessCustomNodes(ctx, sitemaps); + + foreach (var data in languageData.Values) + { + if (sitemaps.ContainsKey(data.Language.Id) && sitemaps[data.Language.Id].Count > 0) + { + var documents = GetSiteMapDocuments((IReadOnlyCollection)sitemaps[data.Language.Id]); + await SaveTempAsync(documents, data, (segment + 1) - documents.Count + (hasIndex ? 1 : 0)); + } + else if (segment == 0) + { + // Ensure that at least one entry exists. Otherwise, + // the system will try to rebuild again. + var homeNode = new XmlSitemapNode { LastMod = DateTime.UtcNow, Loc = data.BaseUrl }; + var documents = GetSiteMapDocuments(new List { homeNode }); + await SaveTempAsync(documents, data, 0); + } + + } + } + } + + ctx.CancellationToken.ThrowIfCancellationRequested(); + + ctx.ProgressCallback?.Invoke(totalSegments, totalSegments, "Finalizing...'"); + + foreach (var data in languageData.Values) + { + // Create index documents (if any) + if (hasIndex && indexNodes.Any()) + { + var indexDocument = CreateSitemapIndexDocument(indexNodes[data.Language.Id]); + await SaveTempAsync(new List { indexDocument }, data, 0); + } + + // Save finally (actually renames temp folder) + SaveFinal(data); + } + } + finally + { + // Undo impersonation + _services.WorkContext.CurrentCustomer = prevCustomer; + sitemaps.Clear(); + + foreach (var data in languageData.Values) + { + if (_tenantFolder.DirectoryExists(data.TempDir)) + { + _tenantFolder.TryDeleteDirectory(data.TempDir); + } + } + + //GC.Collect(); + //GC.WaitForPendingFinalizers(); + } + } + } + + private string BuildBaseUrl(Store store, Language language) + { + var host = _services.StoreService.GetHost(store).EnsureEndsWith("/"); + + var locSettings = _services.Settings.LoadSetting(store.Id); + if (locSettings.SeoFriendlyUrlsForLanguagesEnabled) + { + var defaultLangId = _languageService.GetDefaultLanguageId(store.Id); + if (language.Id != defaultLangId || locSettings.DefaultLanguageRedirectBehaviour < DefaultLanguageRedirectBehaviour.StripSeoCode) + { + host += language.GetTwoLetterISOLanguageName() + "/"; + } + } + + return host; + } + + private async Task SaveTempAsync(List documents, LanguageData data, int start) + { + for (int i = 0; i < documents.Count; i++) + { + // Save segment to disk + var fileName = SiteMapFileNamePattern.FormatInvariant(i + start); + var filePath = _tenantFolder.Combine(data.TempDir, fileName); + + await _tenantFolder.CreateTextFileAsync(filePath, documents[i]); + } + } + + private void SaveFinal(LanguageData data) + { + // Delete current sitemap dir + _tenantFolder.TryDeleteDirectory(data.FinalDir); + + var source = _tenantFolder.MapPath(data.TempDir); + var dest = _tenantFolder.MapPath(data.FinalDir); + + // Move/Rename new (temp) dir to current + System.IO.Directory.Move(source, dest); + + int retries = 0; + while (!SitemapFileExists(data.Store.Id, data.Language.Id, 0, out _, out _)) + { + if (retries > 20) + { + break; + } + + // IO breathe: directly after a folder rename a file check fails. Wait a sec... + Task.Delay(500).Wait(); + retries++; + } + } + + private IEnumerable EnlistEntities(XmlSitemapProvider[] providers) + { + var result = Enumerable.Empty(); + foreach (var provider in providers) + { + result = result.Concat(provider.Enlist().Select(x => new NodeEntry { Entry = x, Provider = provider })); + } + + return result; + } + + private IDictionary GetUrlRecordCollectionsForBatch(IEnumerable batch, int[] languageIds) + { + var result = new Dictionary(); + + if (batch.First().EntityName == "Product") + { + // nothing comes after product + int min = batch.Last().Id; + int max = batch.First().Id; + + result["Product"] = _urlRecordService.GetUrlRecordCollection("Product", languageIds, new[] { min, max }, true, true); + } + + var entityGroups = batch.ToMultimap(x => x.EntityName, x => x.Id); + foreach (var group in entityGroups) + { + var isRange = group.Key == "Product"; + var entityIds = isRange ? new[] { group.Value.Last(), group.Value.First() } : group.Value.ToArray(); + + result[group.Key] = _urlRecordService.GetUrlRecordCollection(group.Key, languageIds, entityIds, isRange, isRange); + } + + return result; + } + + protected virtual List GetSiteMapDocuments(IReadOnlyCollection nodes) + { + int siteMapCount = (int)Math.Ceiling(nodes.Count / (double)MaximumSiteMapNodeCount); + CheckSitemapCount(siteMapCount); + + var siteMaps = Enumerable + .Range(0, siteMapCount) + .Select(x => + { + return new KeyValuePair>( + x + 1, + nodes.Skip(x * MaximumSiteMapNodeCount).Take(MaximumSiteMapNodeCount)); + }); + + var siteMapDocuments = new List(siteMapCount); + + foreach (var kvp in siteMaps) + { + siteMapDocuments.Add(this.GetSitemapDocument(kvp.Value)); + } + + return siteMapDocuments; + } + + /// + /// Gets the sitemap XML document for the specified set of nodes. + /// + /// The sitemap nodes. + /// The sitemap XML document for the specified set of nodes. + private string GetSitemapDocument(IEnumerable nodes) + { + //var languages = _languageService.GetAllLanguages(); + + XNamespace ns = SiteMapsNamespace; + XNamespace xhtml = XhtmlNamespace; + + XElement root = new XElement( + ns + "urlset", + new XAttribute(XNamespace.Xmlns + "xhtml", xhtml)); + + foreach (var node in nodes) + { + // url + var xel = new XElement + ( + ns + "url", + // url/loc + new XElement(ns + "loc", node.Loc), + // url/lastmod + node.LastMod == null ? null : new XElement( + ns + "lastmod", + node.LastMod.Value.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:sszzz")), + // url/changefreq + node.ChangeFreq == null ? null : new XElement( + ns + "changefreq", + node.ChangeFreq.Value.ToString().ToLowerInvariant()), + // url/priority + node.Priority == null ? null : new XElement( + ns + "priority", + node.Priority.Value.ToString("F1", CultureInfo.InvariantCulture)) + ); + + if (node.Links != null) + { + foreach (var entry in node.Links) + { + // url/xhtml:link[culture] + xel.Add(new XElement + ( + xhtml + "link", + new XAttribute("rel", "alternate"), + new XAttribute("hreflang", entry.Lang), + new XAttribute("href", entry.Href) + )); + } + } + + root.Add(xel); + } + + XDocument document = new XDocument(root); + var xml = document.ToString(SaveOptions.DisableFormatting); + CheckDocumentSize(xml); + + return xml; + } + + /// + /// Gets the sitemap index XML document, containing links to all the sitemap XML documents. + /// + /// The collection of sitemaps containing their index and nodes. + /// The sitemap index XML document, containing links to all the sitemap XML documents. + private string CreateSitemapIndexDocument(IEnumerable nodes) + { + XNamespace ns = SiteMapsNamespace; + + XElement root = new XElement(ns + "sitemapindex"); + + foreach (var node in nodes) + { + var xel = new XElement( + ns + "sitemap", + new XElement(ns + "loc", node.Loc), + node.LastMod.HasValue ? + new XElement( + ns + "lastmod", + node.LastMod.Value.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:sszzz")) : + null); + + root.Add(xel); + } + + var document = new XDocument(root); + var xml = document.ToString(SaveOptions.DisableFormatting); + CheckDocumentSize(xml); + + return xml; + } + + private string GetSitemapIndexUrl(int index, string baseUrl) + { + var url = _urlHelper.RouteUrl("XmlSitemap", new { index }).TrimStart('/'); + return baseUrl + url; + } + + private XmlSitemapProvider[] CreateProviders(XmlSitemapBuildContext context) + { + return _publishers + .Select(x => x.Value.PublishXmlSitemap(context)) + .Where(x => x != null) + .OrderBy(x => x.Order) + .ToArray(); + } + + protected void ProcessCustomNodes(XmlSitemapBuildContext ctx, Multimap sitemaps) + { + // For inheritors + } + + /// + /// Checks the size of the XML sitemap document. If it is over 10MB, logs an error. + /// + /// The sitemap XML document. + private void CheckDocumentSize(string siteMapXml) + { + if (siteMapXml.Length >= MaximumSiteMapSizeInBytes) + { + Logger.Error(new InvalidOperationException($"Sitemap exceeds the maximum size of 10MB. This is because you have unusually long URL's. Consider reducing the MaximumSitemapNodeCount. Size:<{siteMapXml.Length}>")); + } + } + + /// + /// Checks the count of the number of sitemaps. If it is over 50,000, logs an error. + /// + /// The sitemap count. + private void CheckSitemapCount(int sitemapCount) + { + if (sitemapCount > MaximumSiteMapCount) + { + var ex = new InvalidOperationException($"Sitemap index file exceeds the maximum number of allowed sitemaps of 50,000. Count:<{sitemapCount}>"); + Logger.Warn(ex, ex.Message); + } + } + + public bool IsRebuilding(int storeId, int languageId) + { + return IsRebuilding(GetLockFilePath(storeId, languageId)); + } + + private bool IsRebuilding(string lockFilePath) + { + return _lockFileManager.IsLocked(lockFilePath); + } + + public virtual bool IsGenerated(int storeId, int languageId) + { + return SitemapFileExists(storeId, languageId, 0, out _, out _); + } + + public virtual void Invalidate(int storeId, int languageId) + { + var dir = BuildSitemapDirPath(storeId, languageId); + + if (_tenantFolder.DirectoryExists(dir)) + { + _tenantFolder.DeleteDirectory(dir); + } + } + + #region Nested classes + + struct NodeEntry + { + public NamedEntity Entry { get; set; } + public XmlSitemapProvider Provider { get; set; } + } + + class LanguageData + { + public Store Store { get; set; } + public Language Language { get; set; } + public ILockFile LockFile { get; set; } + public string LockFilePath { get; set; } + public string TempDir { get; set; } + public string FinalDir { get; set; } + public string BaseUrl { get; set; } + } + + #endregion + } } diff --git a/src/Libraries/SmartStore.Services/Seo/XmlSitemapNode.cs b/src/Libraries/SmartStore.Services/Seo/XmlSitemapNode.cs index a3d2f89f6b..30b35a9d27 100644 --- a/src/Libraries/SmartStore.Services/Seo/XmlSitemapNode.cs +++ b/src/Libraries/SmartStore.Services/Seo/XmlSitemapNode.cs @@ -6,53 +6,53 @@ namespace SmartStore.Services.Seo { - public class XmlSitemapNode - { - public string Loc { get; set; } - public DateTime? LastMod { get; set; } - public ChangeFrequency? ChangeFreq { get; set; } - public float? Priority { get; set; } - public IEnumerable Links { get; set; } + public class XmlSitemapNode + { + public string Loc { get; set; } + public DateTime? LastMod { get; set; } + public ChangeFrequency? ChangeFreq { get; set; } + public float? Priority { get; set; } + public IEnumerable Links { get; set; } - public class LinkEntry - { - public string Lang { get; set; } - public string Href { get; set; } - } - } + public class LinkEntry + { + public string Lang { get; set; } + public string Href { get; set; } + } + } - /// - /// Represents a sitemap update frequency - /// - public enum ChangeFrequency - { - /// - /// Always - /// - Always, - /// - /// Hourly - /// - Hourly, - /// - /// Daily - /// - Daily, - /// - /// Weekly - /// - Weekly, - /// - /// Monthly - /// - Monthly, - /// - /// Yearly - /// - Yearly, - /// - /// Never - /// - Never - } + /// + /// Represents a sitemap update frequency + /// + public enum ChangeFrequency + { + /// + /// Always + /// + Always, + /// + /// Hourly + /// + Hourly, + /// + /// Daily + /// + Daily, + /// + /// Weekly + /// + Weekly, + /// + /// Monthly + /// + Monthly, + /// + /// Yearly + /// + Yearly, + /// + /// Never + /// + Never + } } diff --git a/src/Libraries/SmartStore.Services/Seo/XmlSitemapPartition.cs b/src/Libraries/SmartStore.Services/Seo/XmlSitemapPartition.cs index ec5e519913..152e16b5c1 100644 --- a/src/Libraries/SmartStore.Services/Seo/XmlSitemapPartition.cs +++ b/src/Libraries/SmartStore.Services/Seo/XmlSitemapPartition.cs @@ -3,13 +3,13 @@ namespace SmartStore.Services.Seo { - public class XmlSitemapPartition - { - public string Name { get; set; } - public int Index { get; set; } - public int StoreId { get; set; } - public int LanguageId { get; set; } - public DateTime ModifiedOnUtc { get; set; } - public Stream Stream { get; set; } - } + public class XmlSitemapPartition + { + public string Name { get; set; } + public int Index { get; set; } + public int StoreId { get; set; } + public int LanguageId { get; set; } + public DateTime ModifiedOnUtc { get; set; } + public Stream Stream { get; set; } + } } diff --git a/src/Libraries/SmartStore.Services/ServiceCacheBuster.cs b/src/Libraries/SmartStore.Services/ServiceCacheBuster.cs index 165f9c78ca..16dc5affa7 100644 --- a/src/Libraries/SmartStore.Services/ServiceCacheBuster.cs +++ b/src/Libraries/SmartStore.Services/ServiceCacheBuster.cs @@ -7,39 +7,39 @@ namespace SmartStore.Services { - public partial class ServiceCacheBuster : DbSaveHook - { - public const string STORE_LANGUAGE_MAP_KEY = "svc:storelangmap*"; + public partial class ServiceCacheBuster : DbSaveHook + { + public const string STORE_LANGUAGE_MAP_KEY = "svc:storelangmap*"; - private readonly ICacheManager _cacheManager; + private readonly ICacheManager _cacheManager; public ServiceCacheBuster(ICacheManager cacheManager) { - _cacheManager = cacheManager; + _cacheManager = cacheManager; } - protected override void OnInserted(BaseEntity entity, IHookedEntity entry) - { - if (entry.EntityType != typeof(Store) && entry.EntityType != typeof(Language)) - throw new NotSupportedException(); + protected override void OnInserted(BaseEntity entity, IHookedEntity entry) + { + if (entry.EntityType != typeof(Store) && entry.EntityType != typeof(Language)) + throw new NotSupportedException(); - _cacheManager.Remove(STORE_LANGUAGE_MAP_KEY); - } + _cacheManager.Remove(STORE_LANGUAGE_MAP_KEY); + } - protected override void OnDeleted(BaseEntity entity, IHookedEntity entry) - { - if (entry.EntityType != typeof(Store) && entry.EntityType != typeof(Language)) - throw new NotImplementedException(); + protected override void OnDeleted(BaseEntity entity, IHookedEntity entry) + { + if (entry.EntityType != typeof(Store) && entry.EntityType != typeof(Language)) + throw new NotImplementedException(); - _cacheManager.Remove(STORE_LANGUAGE_MAP_KEY); - } + _cacheManager.Remove(STORE_LANGUAGE_MAP_KEY); + } - protected override void OnUpdated(BaseEntity entity, IHookedEntity entry) - { - if (entry.EntityType != typeof(Language)) - throw new NotImplementedException(); + protected override void OnUpdated(BaseEntity entity, IHookedEntity entry) + { + if (entry.EntityType != typeof(Language)) + throw new NotImplementedException(); - _cacheManager.Remove(STORE_LANGUAGE_MAP_KEY); - } - } + _cacheManager.Remove(STORE_LANGUAGE_MAP_KEY); + } + } } diff --git a/src/Libraries/SmartStore.Services/Shipping/GetShippingOptionRequest.cs b/src/Libraries/SmartStore.Services/Shipping/GetShippingOptionRequest.cs index 3439b6fd4f..80af4d3a4c 100644 --- a/src/Libraries/SmartStore.Services/Shipping/GetShippingOptionRequest.cs +++ b/src/Libraries/SmartStore.Services/Shipping/GetShippingOptionRequest.cs @@ -16,10 +16,10 @@ public GetShippingOptionRequest() this.Items = new List(); } - /// - /// The context store identifier - /// - public int StoreId { get; set; } + /// + /// The context store identifier + /// + public int StoreId { get; set; } /// /// Gets or sets a customer diff --git a/src/Libraries/SmartStore.Services/Shipping/GetShippingOptionResponse.cs b/src/Libraries/SmartStore.Services/Shipping/GetShippingOptionResponse.cs index cbb2586fa5..eea7127b98 100644 --- a/src/Libraries/SmartStore.Services/Shipping/GetShippingOptionResponse.cs +++ b/src/Libraries/SmartStore.Services/Shipping/GetShippingOptionResponse.cs @@ -24,13 +24,7 @@ public GetShippingOptionResponse() /// public IList Errors { get; set; } - public bool Success - { - get - { - return this.Errors.Count == 0; - } - } + public bool Success => this.Errors.Count == 0; public void AddError(string error) { diff --git a/src/Libraries/SmartStore.Services/Shipping/IShipmentService.cs b/src/Libraries/SmartStore.Services/Shipping/IShipmentService.cs index 0a544651ad..db53312558 100644 --- a/src/Libraries/SmartStore.Services/Shipping/IShipmentService.cs +++ b/src/Libraries/SmartStore.Services/Shipping/IShipmentService.cs @@ -26,9 +26,9 @@ public partial interface IShipmentService /// Page index /// Page size /// Customer collection - IPagedList GetAllShipments(string trackingNumber, DateTime? createdFrom, DateTime? createdTo, + IPagedList GetAllShipments(string trackingNumber, DateTime? createdFrom, DateTime? createdTo, int pageIndex, int pageSize); - + /// /// Get shipments by identifiers /// @@ -36,12 +36,12 @@ IPagedList GetAllShipments(string trackingNumber, DateTime? createdFro /// Shipments IList GetShipmentsByIds(int[] shipmentIds); - /// - /// Get shipments by order identifiers - /// - /// Order identifiers - /// Shipments - Multimap GetShipmentsByOrderIds(int[] orderIds); + /// + /// Get shipments by order identifiers + /// + /// Order identifiers + /// Shipments + Multimap GetShipmentsByOrderIds(int[] orderIds); /// /// Gets a shipment diff --git a/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs b/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs index fd13e71b4c..52f1a590fb 100644 --- a/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs +++ b/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs @@ -33,9 +33,9 @@ public partial interface IShippingRateComputationMethod : IProvider, IUserEditab /// IShipmentTracker ShipmentTracker { get; } - /// - /// Gets a value indicating whether the shipping rate computation method is active and should be offered to customers - /// - bool IsActive { get; } + /// + /// Gets a value indicating whether the shipping rate computation method is active and should be offered to customers + /// + bool IsActive { get; } } } diff --git a/src/Libraries/SmartStore.Services/Shipping/IShippingService.cs b/src/Libraries/SmartStore.Services/Shipping/IShippingService.cs index f1694fe50a..22a56abbda 100644 --- a/src/Libraries/SmartStore.Services/Shipping/IShippingService.cs +++ b/src/Libraries/SmartStore.Services/Shipping/IShippingService.cs @@ -47,13 +47,13 @@ public partial interface IShippingService ShippingMethod GetShippingMethodById(int shippingMethodId); - /// - /// Gets all shipping methods - /// - /// Shipping option request to filter out shipping methods. null to load all shipping methods. - /// Whether to filter methods by store identifier. - /// Shipping method collection - IList GetAllShippingMethods(GetShippingOptionRequest request = null, int storeId = 0); + /// + /// Gets all shipping methods + /// + /// Shipping option request to filter out shipping methods. null to load all shipping methods. + /// Whether to filter methods by store identifier. + /// Shipping method collection + IList GetAllShippingMethods(GetShippingOptionRequest request = null, int storeId = 0); /// /// Inserts a shipping method @@ -90,15 +90,15 @@ public partial interface IShippingService /// Shopping cart weight decimal GetShoppingCartTotalWeight(IList cart, bool includeFreeShippingProducts = true); - + /// /// Create shipment package from shopping cart /// /// Shopping cart /// Shipping address - /// Store identifier + /// Store identifier /// Shipment package - GetShippingOptionRequest CreateShippingOptionRequest(IList cart, Address shippingAddress, int storeId); + GetShippingOptionRequest CreateShippingOptionRequest(IList cart, Address shippingAddress, int storeId); /// /// Gets available shipping options @@ -109,6 +109,6 @@ public partial interface IShippingService /// Load records allows only in specified store; pass 0 to load all records /// Shipping options GetShippingOptionResponse GetShippingOptions(IList cart, Address shippingAddress, - string allowedShippingRateComputationMethodSystemName = "", int storeId = 0); + string allowedShippingRateComputationMethodSystemName = "", int storeId = 0); } } diff --git a/src/Libraries/SmartStore.Services/Shipping/ShipmentService.cs b/src/Libraries/SmartStore.Services/Shipping/ShipmentService.cs index 8cd9b39030..18fff61b17 100644 --- a/src/Libraries/SmartStore.Services/Shipping/ShipmentService.cs +++ b/src/Libraries/SmartStore.Services/Shipping/ShipmentService.cs @@ -22,7 +22,7 @@ public partial class ShipmentService : IShipmentService private readonly IRepository _siRepository; private readonly IRepository _orderRepository; private readonly IEventPublisher _eventPublisher; - + #endregion #region Ctor @@ -58,32 +58,32 @@ public virtual void DeleteShipment(Shipment shipment) if (shipment == null) throw new ArgumentNullException("shipment"); - int orderId = shipment.OrderId; + int orderId = shipment.OrderId; _shipmentRepository.Delete(shipment); - if (orderId != 0) - { - var order = _orderRepository.GetById(orderId); - _eventPublisher.PublishOrderUpdated(order); - } + if (orderId != 0) + { + var order = _orderRepository.GetById(orderId); + _eventPublisher.PublishOrderUpdated(order); + } } - + /// /// Search shipments /// - /// Search by tracking number + /// Search by tracking number /// Created date from; null to load all records /// Created date to; null to load all records /// Page index /// Page size /// Customer collection - public virtual IPagedList GetAllShipments(string trackingNumber, DateTime? createdFrom, DateTime? createdTo, + public virtual IPagedList GetAllShipments(string trackingNumber, DateTime? createdFrom, DateTime? createdTo, int pageIndex, int pageSize) { var query = _shipmentRepository.Table.Expand(x => x.Order); - if (!String.IsNullOrEmpty(trackingNumber)) - query = query.Where(s => s.TrackingNumber.Contains(trackingNumber)); + if (!String.IsNullOrEmpty(trackingNumber)) + query = query.Where(s => s.TrackingNumber.Contains(trackingNumber)); if (createdFrom.HasValue) query = query.Where(s => createdFrom.Value <= s.CreatedOnUtc); if (createdTo.HasValue) @@ -105,33 +105,33 @@ public virtual IList GetShipmentsByIds(int[] shipmentIds) if (shipmentIds == null || shipmentIds.Length == 0) return new List(); - var query = from o in _shipmentRepository.Table.Expand(x => x.Order) + var query = from o in _shipmentRepository.Table.Expand(x => x.Order) where shipmentIds.Contains(o.Id) select o; var shipments = query.ToList(); - // sort by passed identifier sequence - return shipments.OrderBySequence(shipmentIds).ToList(); - } + // sort by passed identifier sequence + return shipments.OrderBySequence(shipmentIds).ToList(); + } - public virtual Multimap GetShipmentsByOrderIds(int[] orderIds) - { - Guard.NotNull(orderIds, nameof(orderIds)); + public virtual Multimap GetShipmentsByOrderIds(int[] orderIds) + { + Guard.NotNull(orderIds, nameof(orderIds)); - var query = - from x in _shipmentRepository.TableUntracked.Expand(x => x.ShipmentItems) - where orderIds.Contains(x.OrderId) - select x; + var query = + from x in _shipmentRepository.TableUntracked.Expand(x => x.ShipmentItems) + where orderIds.Contains(x.OrderId) + select x; - var map = query - .OrderBy(x => x.OrderId) - .ThenBy(x => x.CreatedOnUtc) - .ToList() - .ToMultimap(x => x.OrderId, x => x); + var map = query + .OrderBy(x => x.OrderId) + .ThenBy(x => x.CreatedOnUtc) + .ToList() + .ToMultimap(x => x.OrderId, x => x); - return map; - } + return map; + } /// /// Gets a shipment @@ -159,7 +159,7 @@ public virtual void InsertShipment(Shipment shipment) _shipmentRepository.Insert(shipment); //event notification - _eventPublisher.PublishOrderUpdated(shipment.Order); + _eventPublisher.PublishOrderUpdated(shipment.Order); } /// @@ -174,11 +174,11 @@ public virtual void UpdateShipment(Shipment shipment) _shipmentRepository.Update(shipment); //event notification - _eventPublisher.PublishOrderUpdated(shipment.Order); + _eventPublisher.PublishOrderUpdated(shipment.Order); } - + /// /// Deletes a shipment item /// @@ -186,17 +186,17 @@ public virtual void UpdateShipment(Shipment shipment) public virtual void DeleteShipmentItem(ShipmentItem shipmentItem) { if (shipmentItem == null) - throw new ArgumentNullException("shipmentItem"); + throw new ArgumentNullException("shipmentItem"); - int orderId = shipmentItem.Shipment.OrderId; + int orderId = shipmentItem.Shipment.OrderId; _siRepository.Delete(shipmentItem); - if (orderId != 0) - { - var order = _orderRepository.GetById(orderId); - _eventPublisher.PublishOrderUpdated(order); - } + if (orderId != 0) + { + var order = _orderRepository.GetById(orderId); + _eventPublisher.PublishOrderUpdated(order); + } } /// @@ -212,7 +212,7 @@ public virtual ShipmentItem GetShipmentItemById(int shipmentItemId) var si = _siRepository.GetById(shipmentItemId); return si; } - + /// /// Inserts a shipment item /// @@ -220,23 +220,23 @@ public virtual ShipmentItem GetShipmentItemById(int shipmentItemId) public virtual void InsertShipmentItem(ShipmentItem shipmentItem) { if (shipmentItem == null) - throw new ArgumentNullException("shipmentItem"); + throw new ArgumentNullException("shipmentItem"); _siRepository.Insert(shipmentItem); - if (shipmentItem.Shipment != null && shipmentItem.Shipment.Order != null) - { - _eventPublisher.PublishOrderUpdated(shipmentItem.Shipment.Order); - } - else - { - var shipment = _shipmentRepository.Table - .Expand(x => x.Order) - .FirstOrDefault(x => x.Id == shipmentItem.ShipmentId); - - if (shipment != null) - _eventPublisher.PublishOrderUpdated(shipment.Order); - } + if (shipmentItem.Shipment != null && shipmentItem.Shipment.Order != null) + { + _eventPublisher.PublishOrderUpdated(shipmentItem.Shipment.Order); + } + else + { + var shipment = _shipmentRepository.Table + .Expand(x => x.Order) + .FirstOrDefault(x => x.Id == shipmentItem.ShipmentId); + + if (shipment != null) + _eventPublisher.PublishOrderUpdated(shipment.Order); + } } /// @@ -246,25 +246,25 @@ public virtual void InsertShipmentItem(ShipmentItem shipmentItem) public virtual void UpdateShipmentItem(ShipmentItem shipmentItem) { if (shipmentItem == null) - throw new ArgumentNullException("shipmentItem"); + throw new ArgumentNullException("shipmentItem"); _siRepository.Update(shipmentItem); - if (shipmentItem.Shipment != null && shipmentItem.Shipment.Order != null) - { - _eventPublisher.PublishOrderUpdated(shipmentItem.Shipment.Order); - } - else - { - var shipment = _shipmentRepository.Table - .Expand(x => x.Order) - .FirstOrDefault(x => x.Id == shipmentItem.ShipmentId); - - if (shipment != null) - _eventPublisher.PublishOrderUpdated(shipment.Order); - } + if (shipmentItem.Shipment != null && shipmentItem.Shipment.Order != null) + { + _eventPublisher.PublishOrderUpdated(shipmentItem.Shipment.Order); + } + else + { + var shipment = _shipmentRepository.Table + .Expand(x => x.Order) + .FirstOrDefault(x => x.Id == shipmentItem.ShipmentId); + + if (shipment != null) + _eventPublisher.PublishOrderUpdated(shipment.Order); + } } - - #endregion + + #endregion } } diff --git a/src/Libraries/SmartStore.Services/Shipping/ShippingExtentions.cs b/src/Libraries/SmartStore.Services/Shipping/ShippingExtentions.cs index b83fdc68ee..832354ccfa 100644 --- a/src/Libraries/SmartStore.Services/Shipping/ShippingExtentions.cs +++ b/src/Libraries/SmartStore.Services/Shipping/ShippingExtentions.cs @@ -5,7 +5,7 @@ namespace SmartStore.Services.Shipping { - public static class ShippingExtentions + public static class ShippingExtentions { public static bool IsShippingRateComputationMethodActive(this Provider srcm, ShippingSettings shippingSettings) { @@ -18,10 +18,10 @@ public static bool IsShippingRateComputationMethodActive(this Provider _shippingMethodRepository; - private readonly IRepository _storeMappingRepository; - private readonly IProductAttributeParser _productAttributeParser; - private readonly IProductService _productService; + private readonly IRepository _shippingMethodRepository; + private readonly IRepository _storeMappingRepository; + private readonly IProductAttributeParser _productAttributeParser; + private readonly IProductService _productService; private readonly ICheckoutAttributeParser _checkoutAttributeParser; - private readonly IGenericAttributeService _genericAttributeService; + private readonly IGenericAttributeService _genericAttributeService; private readonly ShippingSettings _shippingSettings; - private readonly ISettingService _settingService; - private readonly IProviderManager _providerManager; - private readonly ICommonServices _services; + private readonly ISettingService _settingService; + private readonly IProviderManager _providerManager; + private readonly ICommonServices _services; private readonly ICartRuleProvider _cartRuleProvider; public ShippingService( IRepository shippingMethodRepository, - IRepository storeMappingRepository, - IProductAttributeParser productAttributeParser, - IProductService productService, + IRepository storeMappingRepository, + IProductAttributeParser productAttributeParser, + IProductService productService, ICheckoutAttributeParser checkoutAttributeParser, - IGenericAttributeService genericAttributeService, + IGenericAttributeService genericAttributeService, ShippingSettings shippingSettings, - ISettingService settingService, - IProviderManager providerManager, - ICommonServices services, + ISettingService settingService, + IProviderManager providerManager, + ICommonServices services, ICartRuleProvider cartRuleProvider) { _shippingMethodRepository = shippingMethodRepository; - _storeMappingRepository = storeMappingRepository; + _storeMappingRepository = storeMappingRepository; _productAttributeParser = productAttributeParser; - _productService = productService; + _productService = productService; _checkoutAttributeParser = checkoutAttributeParser; - _genericAttributeService = genericAttributeService; + _genericAttributeService = genericAttributeService; _shippingSettings = shippingSettings; - _settingService = settingService; - _providerManager = providerManager; - _services = services; + _settingService = settingService; + _providerManager = providerManager; + _services = services; _cartRuleProvider = cartRuleProvider; - T = NullLocalizer.Instance; - Logger = NullLogger.Instance; - QuerySettings = DbQuerySettings.Default; - } + T = NullLocalizer.Instance; + Logger = NullLogger.Instance; + QuerySettings = DbQuerySettings.Default; + } - public Localizer T { get; set; } - public ILogger Logger { get; set; } - public DbQuerySettings QuerySettings { get; set; } + public Localizer T { get; set; } + public ILogger Logger { get; set; } + public DbQuerySettings QuerySettings { get; set; } - #region Shipping rate computation methods + #region Shipping rate computation methods - /// - /// Load active shipping rate computation methods - /// - /// Load records allows only in specified store; pass 0 to load all records - /// Shipping rate computation methods - public virtual IEnumerable> LoadActiveShippingRateComputationMethods(int storeId = 0) + /// + /// Load active shipping rate computation methods + /// + /// Load records allows only in specified store; pass 0 to load all records + /// Shipping rate computation methods + public virtual IEnumerable> LoadActiveShippingRateComputationMethods(int storeId = 0) { - var allMethods = LoadAllShippingRateComputationMethods(storeId); - - var activeMethods = allMethods - .Where(p => p.Value.IsActive && _shippingSettings.ActiveShippingRateComputationMethodSystemNames.Contains(p.Metadata.SystemName, StringComparer.InvariantCultureIgnoreCase)); - - if (!activeMethods.Any()) - { - var fallbackMethod = allMethods.FirstOrDefault(x => x.IsShippingRateComputationMethodActive(_shippingSettings)); - - if (fallbackMethod == null) - fallbackMethod = allMethods.FirstOrDefault(); - - if (fallbackMethod != null) - { - _shippingSettings.ActiveShippingRateComputationMethodSystemNames.Clear(); - _shippingSettings.ActiveShippingRateComputationMethodSystemNames.Add(fallbackMethod.Metadata.SystemName); - _settingService.SaveSetting(_shippingSettings); - - return new Provider[] { fallbackMethod }; - } - else - { - if (DataSettings.DatabaseIsInstalled()) - throw new SmartException(T("Shipping.OneActiveMethodProviderRequired")); - } - } - - return activeMethods; + var allMethods = LoadAllShippingRateComputationMethods(storeId); + + var activeMethods = allMethods + .Where(p => p.Value.IsActive && _shippingSettings.ActiveShippingRateComputationMethodSystemNames.Contains(p.Metadata.SystemName, StringComparer.InvariantCultureIgnoreCase)); + + if (!activeMethods.Any()) + { + var fallbackMethod = allMethods.FirstOrDefault(x => x.IsShippingRateComputationMethodActive(_shippingSettings)); + + if (fallbackMethod == null) + fallbackMethod = allMethods.FirstOrDefault(); + + if (fallbackMethod != null) + { + _shippingSettings.ActiveShippingRateComputationMethodSystemNames.Clear(); + _shippingSettings.ActiveShippingRateComputationMethodSystemNames.Add(fallbackMethod.Metadata.SystemName); + _settingService.SaveSetting(_shippingSettings); + + return new Provider[] { fallbackMethod }; + } + else + { + if (DataSettings.DatabaseIsInstalled()) + throw new SmartException(T("Shipping.OneActiveMethodProviderRequired")); + } + } + + return activeMethods; } /// @@ -113,7 +113,7 @@ public virtual IEnumerable> LoadActiveS /// Found Shipping rate computation method public virtual Provider LoadShippingRateComputationMethodBySystemName(string systemName, int storeId = 0) { - return _providerManager.GetProvider(systemName, storeId); + return _providerManager.GetProvider(systemName, storeId); } /// @@ -123,7 +123,7 @@ public virtual Provider LoadShippingRateComputat /// Shipping rate computation methods public virtual IEnumerable> LoadAllShippingRateComputationMethods(int storeId = 0) { - return _providerManager.GetAllProviders(storeId); + return _providerManager.GetAllProviders(storeId); } #endregion @@ -156,48 +156,48 @@ public virtual ShippingMethod GetShippingMethodById(int shippingMethodId) return _shippingMethodRepository.GetById(shippingMethodId); } - public virtual IList GetAllShippingMethods(GetShippingOptionRequest request = null, int storeId = 0) + public virtual IList GetAllShippingMethods(GetShippingOptionRequest request = null, int storeId = 0) { - var query = - from sm in _shippingMethodRepository.Table - select sm; - - if (!QuerySettings.IgnoreMultiStore && storeId > 0) - { - query = - from x in query - join sm in _storeMappingRepository.TableUntracked - on new { c1 = x.Id, c2 = "ShippingMethod" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into x_sm - from sm in x_sm.DefaultIfEmpty() - where !x.LimitedToStores || storeId == sm.StoreId - select x; - - query = - from x in query - group x by x.Id into grp - orderby grp.Key - select grp.FirstOrDefault(); - } - - var allMethods = query.OrderBy(x => x.DisplayOrder).ToList(); - - if (request == null) - { - return allMethods; - } - - var activeShippingMethods = allMethods.Where(s => - { + var query = + from sm in _shippingMethodRepository.Table + select sm; + + if (!QuerySettings.IgnoreMultiStore && storeId > 0) + { + query = + from x in query + join sm in _storeMappingRepository.TableUntracked + on new { c1 = x.Id, c2 = "ShippingMethod" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into x_sm + from sm in x_sm.DefaultIfEmpty() + where !x.LimitedToStores || storeId == sm.StoreId + select x; + + query = + from x in query + group x by x.Id into grp + orderby grp.Key + select grp.FirstOrDefault(); + } + + var allMethods = query.OrderBy(x => x.DisplayOrder).ToList(); + + if (request == null) + { + return allMethods; + } + + var activeShippingMethods = allMethods.Where(s => + { // Rule sets. if (!_cartRuleProvider.RuleMatches(s)) { return false; } - return true; - }); + return true; + }); - return activeShippingMethods.ToList(); + return activeShippingMethods.ToList(); } /// @@ -228,7 +228,7 @@ public virtual void UpdateShippingMethod(ShippingMethod shippingMethod) #region Workflow - public virtual decimal GetShoppingCartItemWeight(OrganizedShoppingCartItem shoppingCartItem) + public virtual decimal GetShoppingCartItemWeight(OrganizedShoppingCartItem shoppingCartItem) { if (shoppingCartItem == null) throw new ArgumentNullException("shoppingCartItem"); @@ -243,19 +243,19 @@ public virtual decimal GetShoppingCartItemWeight(OrganizedShoppingCartItem shopp { var pvaValues = _productAttributeParser.ParseProductVariantAttributeValues(shoppingCartItem.Item.AttributesXml).ToList(); - foreach (var pvaValue in pvaValues) - { - if (pvaValue.ValueType == ProductVariantAttributeValueType.ProductLinkage) - { - var linkedProduct = _productService.GetProductById(pvaValue.LinkedProductId); - if (linkedProduct != null && linkedProduct.IsShipEnabled) - attributesTotalWeight += (linkedProduct.Weight * pvaValue.Quantity); - } - else - { - attributesTotalWeight += pvaValue.WeightAdjustment; - } - } + foreach (var pvaValue in pvaValues) + { + if (pvaValue.ValueType == ProductVariantAttributeValueType.ProductLinkage) + { + var linkedProduct = _productService.GetProductById(pvaValue.LinkedProductId); + if (linkedProduct != null && linkedProduct.IsShipEnabled) + attributesTotalWeight += (linkedProduct.Weight * pvaValue.Quantity); + } + else + { + attributesTotalWeight += pvaValue.WeightAdjustment; + } + } } weight = shoppingCartItem.Item.Product.Weight + attributesTotalWeight; @@ -263,7 +263,7 @@ public virtual decimal GetShoppingCartItemWeight(OrganizedShoppingCartItem shopp return weight; } - public virtual decimal GetShoppingCartItemTotalWeight(OrganizedShoppingCartItem shoppingCartItem) + public virtual decimal GetShoppingCartItemTotalWeight(OrganizedShoppingCartItem shoppingCartItem) { if (shoppingCartItem == null) throw new ArgumentNullException("shoppingCartItem"); @@ -272,84 +272,84 @@ public virtual decimal GetShoppingCartItemTotalWeight(OrganizedShoppingCartItem return totalWeight; } - public virtual decimal GetShoppingCartTotalWeight(IList cart, bool includeFreeShippingProducts = true) + public virtual decimal GetShoppingCartTotalWeight(IList cart, bool includeFreeShippingProducts = true) { - var totalWeight = decimal.Zero; - var customer = cart.GetCustomer(); - - // shopping cart items - foreach (var cartItem in cart) - { - var product = cartItem.Item.Product; - if (product != null) - { - if (!includeFreeShippingProducts && product.IsFreeShipping) - { - // skip product - } - else - { - totalWeight += GetShoppingCartItemTotalWeight(cartItem); - } - } - } + var totalWeight = decimal.Zero; + var customer = cart.GetCustomer(); + + // shopping cart items + foreach (var cartItem in cart) + { + var product = cartItem.Item.Product; + if (product != null) + { + if (!includeFreeShippingProducts && product.IsFreeShipping) + { + // skip product + } + else + { + totalWeight += GetShoppingCartItemTotalWeight(cartItem); + } + } + } // checkout attributes if (customer != null) { - var checkoutAttributesXml = customer.GetAttribute(SystemCustomerAttributeNames.CheckoutAttributes, _genericAttributeService); - if (!String.IsNullOrEmpty(checkoutAttributesXml)) - { - var caValues = _checkoutAttributeParser.ParseCheckoutAttributeValues(checkoutAttributesXml); - foreach (var caValue in caValues) - { - totalWeight += caValue.WeightAdjustment; - } - } + var checkoutAttributesXml = customer.GetAttribute(SystemCustomerAttributeNames.CheckoutAttributes, _genericAttributeService); + if (!String.IsNullOrEmpty(checkoutAttributesXml)) + { + var caValues = _checkoutAttributeParser.ParseCheckoutAttributeValues(checkoutAttributesXml); + foreach (var caValue in caValues) + { + totalWeight += caValue.WeightAdjustment; + } + } } return totalWeight; } - public virtual GetShippingOptionRequest CreateShippingOptionRequest(IList cart, Address shippingAddress, int storeId) + public virtual GetShippingOptionRequest CreateShippingOptionRequest(IList cart, Address shippingAddress, int storeId) { var request = new GetShippingOptionRequest(); - request.StoreId = storeId; + request.StoreId = storeId; request.Customer = cart.GetCustomer(); request.ShippingAddress = shippingAddress; request.CountryFrom = null; request.StateProvinceFrom = null; request.ZipPostalCodeFrom = string.Empty; - request.Items = new List(); + request.Items = new List(); - foreach (var sc in cart) - { - if (sc.Item.IsShipEnabled) - request.Items.Add(sc); - } + foreach (var sc in cart) + { + if (sc.Item.IsShipEnabled) + request.Items.Add(sc); + } return request; } - public virtual GetShippingOptionResponse GetShippingOptions( - IList cart, - Address shippingAddress, - string allowedShippingRateComputationMethodSystemName = "", - int storeId = 0) + public virtual GetShippingOptionResponse GetShippingOptions( + IList cart, + Address shippingAddress, + string allowedShippingRateComputationMethodSystemName = "", + int storeId = 0) { if (cart == null) throw new ArgumentNullException("cart"); var result = new GetShippingOptionResponse(); - + //create a package var getShippingOptionRequest = CreateShippingOptionRequest(cart, shippingAddress, storeId); var shippingRateComputationMethods = LoadActiveShippingRateComputationMethods(storeId) - .Where(srcm => - String.IsNullOrWhiteSpace(allowedShippingRateComputationMethodSystemName) || + .Where(srcm => + String.IsNullOrWhiteSpace(allowedShippingRateComputationMethodSystemName) || allowedShippingRateComputationMethodSystemName.Equals(srcm.Metadata.SystemName, StringComparison.InvariantCultureIgnoreCase)) .ToList(); @@ -372,15 +372,15 @@ public virtual GetShippingOptionResponse GetShippingOptions( //log errors if (!getShippingOptionResponse.Success) { - var hasItemsToShip = getShippingOptionRequest.Items != null && getShippingOptionRequest.Items.Count > 0; + var hasItemsToShip = getShippingOptionRequest.Items != null && getShippingOptionRequest.Items.Count > 0; - foreach (string error in getShippingOptionResponse.Errors) + foreach (string error in getShippingOptionResponse.Errors) { result.AddError(error); - if (hasItemsToShip) - { - Logger.Warn(error); - } + if (hasItemsToShip) + { + Logger.Warn(error); + } } } } @@ -392,12 +392,12 @@ public virtual GetShippingOptionResponse GetShippingOptions( result.Errors.Clear(); } - //no shipping options loaded - if (result.ShippingOptions.Count == 0 && result.Errors.Count == 0) - { - result.Errors.Add(T("Checkout.ShippingOptionCouldNotBeLoaded")); - } - + //no shipping options loaded + if (result.ShippingOptions.Count == 0 && result.Errors.Count == 0) + { + result.Errors.Add(T("Checkout.ShippingOptionCouldNotBeLoaded")); + } + return result; } diff --git a/src/Libraries/SmartStore.Services/Shipping/Tracking/GeneralShipmentTracker.cs b/src/Libraries/SmartStore.Services/Shipping/Tracking/GeneralShipmentTracker.cs index 33713acfbf..2bb952546a 100644 --- a/src/Libraries/SmartStore.Services/Shipping/Tracking/GeneralShipmentTracker.cs +++ b/src/Libraries/SmartStore.Services/Shipping/Tracking/GeneralShipmentTracker.cs @@ -18,7 +18,7 @@ public partial class GeneralShipmentTracker : IShipmentTracker private readonly ITypeFinder _typeFinder; #endregion - + #region Ctor /// @@ -31,7 +31,7 @@ public GeneralShipmentTracker(ITypeFinder typeFinder) } #endregion - + #region Utilities /// @@ -40,7 +40,7 @@ public GeneralShipmentTracker(ITypeFinder typeFinder) /// All available shipment trackers protected virtual IList GetAllTrackers() { - return _typeFinder.FindClassesOfType(ignoreInactivePlugins: true) + return _typeFinder.FindClassesOfType(ignoreInactivePlugins: true) //exclude this one .Where(x => x != typeof(GeneralShipmentTracker)) .Select(x => EngineContext.Current.ContainerManager.ResolveUnregistered(x) as IShipmentTracker) @@ -51,9 +51,9 @@ protected virtual IShipmentTracker GetTrackerByTrackingNumber(string trackingNum { return GetAllTrackers().FirstOrDefault(c => c.IsMatch(trackingNumber)); } - + #endregion - + #region Methods /// diff --git a/src/Libraries/SmartStore.Services/Stores/IStoreMappingService.cs b/src/Libraries/SmartStore.Services/Stores/IStoreMappingService.cs index 02e9f61346..ccf1a4584d 100644 --- a/src/Libraries/SmartStore.Services/Stores/IStoreMappingService.cs +++ b/src/Libraries/SmartStore.Services/Stores/IStoreMappingService.cs @@ -6,143 +6,143 @@ namespace SmartStore.Services.Stores { - /// - /// Store mapping service interface - /// - public partial interface IStoreMappingService - { - /// - /// Deletes a store mapping record - /// - /// Store mapping record - void DeleteStoreMapping(StoreMapping storeMapping); - - /// - /// Gets a store mapping record - /// - /// Store mapping record identifier - /// Store mapping record - StoreMapping GetStoreMappingById(int storeMappingId); - - /// - /// Gets store mapping records - /// - /// Type - /// Entity - /// Store mapping records - IList GetStoreMappings(T entity) where T : BaseEntity, IStoreMappingSupported; - - /// - /// Gets store mapping records - /// - /// Could be null - /// Could be 0 - /// Store mapping record query - IQueryable GetStoreMappingsFor(string entityName, int entityId); - - /// - /// Save the store mapping for an entity - /// - /// Entity type - /// The entity - /// Array of selected store ids - void SaveStoreMappings(T entity, int[] selectedStoreIds) where T : BaseEntity, IStoreMappingSupported; - - /// - /// Inserts a store mapping record - /// - /// Store mapping - void InsertStoreMapping(StoreMapping storeMapping); - - /// - /// Inserts a store mapping record - /// - /// Type - /// Store id - /// Entity - void InsertStoreMapping(T entity, int storeId) where T : BaseEntity, IStoreMappingSupported; - - /// - /// Updates the store mapping record - /// - /// Store mapping - void UpdateStoreMapping(StoreMapping storeMapping); - - /// - /// Find store identifiers with granted access (mapped to the entity) - /// - /// Entity name to check - /// Entity id to check - /// Store identifiers - int[] GetStoresIdsWithAccess(string entityName, int entityId); - - /// - /// Checks whether an entity can be accessed in a store (mapped to this store) - /// - /// Entity name to check - /// Entity id to check - /// true - authorized; otherwise, false - bool Authorize(string entityName, int entityId); - - /// - /// Checks whether an entity can be accessed in a store (mapped to this store) - /// - /// Entity name to check - /// Entity id to check - /// Store identifier to check against - /// true - authorized; otherwise, false - bool Authorize(string entityName, int entityId, int storeId); - } - - public static class IStoreMappingServiceExtensions - { - /// - /// Find store identifiers with granted access (mapped to the entity) - /// - /// Type - /// Entity - /// Store identifiers - public static int[] GetStoresIdsWithAccess(this IStoreMappingService svc, T entity) where T : BaseEntity, IStoreMappingSupported - { - if (entity == null) - return new int[0]; - - return svc.GetStoresIdsWithAccess(entity.GetEntityName(), entity.Id); - } - - /// - /// Authorize whether entity could be accessed in the current store (mapped to this store) - /// - /// Type - /// Entity - /// true - authorized; otherwise, false - public static bool Authorize(this IStoreMappingService svc, T entity) where T : BaseEntity, IStoreMappingSupported - { - if (entity == null) - return false; - - if (!entity.LimitedToStores) - return true; - - return svc.Authorize(entity.GetEntityName(), entity.Id); - } - - /// - /// Authorize whether entity could be accessed in a store (mapped to this store) - /// - /// Type - /// Entity - /// Store identifier to check against - /// true - authorized; otherwise, false - public static bool Authorize(this IStoreMappingService svc, T entity, int storeId) where T : BaseEntity, IStoreMappingSupported - { - if (entity == null) - return false; - - if (!entity.LimitedToStores) - return true; - - return svc.Authorize(entity.GetEntityName(), entity.Id, storeId); - } - } + /// + /// Store mapping service interface + /// + public partial interface IStoreMappingService + { + /// + /// Deletes a store mapping record + /// + /// Store mapping record + void DeleteStoreMapping(StoreMapping storeMapping); + + /// + /// Gets a store mapping record + /// + /// Store mapping record identifier + /// Store mapping record + StoreMapping GetStoreMappingById(int storeMappingId); + + /// + /// Gets store mapping records + /// + /// Type + /// Entity + /// Store mapping records + IList GetStoreMappings(T entity) where T : BaseEntity, IStoreMappingSupported; + + /// + /// Gets store mapping records + /// + /// Could be null + /// Could be 0 + /// Store mapping record query + IQueryable GetStoreMappingsFor(string entityName, int entityId); + + /// + /// Save the store mapping for an entity + /// + /// Entity type + /// The entity + /// Array of selected store ids + void SaveStoreMappings(T entity, int[] selectedStoreIds) where T : BaseEntity, IStoreMappingSupported; + + /// + /// Inserts a store mapping record + /// + /// Store mapping + void InsertStoreMapping(StoreMapping storeMapping); + + /// + /// Inserts a store mapping record + /// + /// Type + /// Store id + /// Entity + void InsertStoreMapping(T entity, int storeId) where T : BaseEntity, IStoreMappingSupported; + + /// + /// Updates the store mapping record + /// + /// Store mapping + void UpdateStoreMapping(StoreMapping storeMapping); + + /// + /// Find store identifiers with granted access (mapped to the entity) + /// + /// Entity name to check + /// Entity id to check + /// Store identifiers + int[] GetStoresIdsWithAccess(string entityName, int entityId); + + /// + /// Checks whether an entity can be accessed in a store (mapped to this store) + /// + /// Entity name to check + /// Entity id to check + /// true - authorized; otherwise, false + bool Authorize(string entityName, int entityId); + + /// + /// Checks whether an entity can be accessed in a store (mapped to this store) + /// + /// Entity name to check + /// Entity id to check + /// Store identifier to check against + /// true - authorized; otherwise, false + bool Authorize(string entityName, int entityId, int storeId); + } + + public static class IStoreMappingServiceExtensions + { + /// + /// Find store identifiers with granted access (mapped to the entity) + /// + /// Type + /// Entity + /// Store identifiers + public static int[] GetStoresIdsWithAccess(this IStoreMappingService svc, T entity) where T : BaseEntity, IStoreMappingSupported + { + if (entity == null) + return new int[0]; + + return svc.GetStoresIdsWithAccess(entity.GetEntityName(), entity.Id); + } + + /// + /// Authorize whether entity could be accessed in the current store (mapped to this store) + /// + /// Type + /// Entity + /// true - authorized; otherwise, false + public static bool Authorize(this IStoreMappingService svc, T entity) where T : BaseEntity, IStoreMappingSupported + { + if (entity == null) + return false; + + if (!entity.LimitedToStores) + return true; + + return svc.Authorize(entity.GetEntityName(), entity.Id); + } + + /// + /// Authorize whether entity could be accessed in a store (mapped to this store) + /// + /// Type + /// Entity + /// Store identifier to check against + /// true - authorized; otherwise, false + public static bool Authorize(this IStoreMappingService svc, T entity, int storeId) where T : BaseEntity, IStoreMappingSupported + { + if (entity == null) + return false; + + if (!entity.LimitedToStores) + return true; + + return svc.Authorize(entity.GetEntityName(), entity.Id, storeId); + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Stores/IStoreService.cs b/src/Libraries/SmartStore.Services/Stores/IStoreService.cs index 90a6da14ce..1cef9569da 100644 --- a/src/Libraries/SmartStore.Services/Stores/IStoreService.cs +++ b/src/Libraries/SmartStore.Services/Stores/IStoreService.cs @@ -4,62 +4,62 @@ namespace SmartStore.Services.Stores { - /// - /// Store service interface - /// - public partial interface IStoreService - { - /// - /// Deletes a store - /// - /// Store - void DeleteStore(Store store); + /// + /// Store service interface + /// + public partial interface IStoreService + { + /// + /// Deletes a store + /// + /// Store + void DeleteStore(Store store); - /// - /// Gets all stores - /// - /// Store collection - IList GetAllStores(); + /// + /// Gets all stores + /// + /// Store collection + IList GetAllStores(); - /// - /// Gets a store - /// - /// Store identifier - /// Store - Store GetStoreById(int storeId); + /// + /// Gets a store + /// + /// Store identifier + /// Store + Store GetStoreById(int storeId); - /// - /// Inserts a store - /// - /// Store - void InsertStore(Store store); + /// + /// Inserts a store + /// + /// Store + void InsertStore(Store store); - /// - /// Updates the store - /// - /// Store - void UpdateStore(Store store); + /// + /// Updates the store + /// + /// Store + void UpdateStore(Store store); - /// - /// True if there's only one store. Otherwise False. - /// - bool IsSingleStoreMode(); + /// + /// True if there's only one store. Otherwise False. + /// + bool IsSingleStoreMode(); - /// - /// True if the store data is valid. Otherwise False. - /// - /// Store entity - bool IsStoreDataValid(Store store); + /// + /// True if the store data is valid. Otherwise False. + /// + /// Store entity + bool IsStoreDataValid(Store store); - /// - /// Gets the store host name - /// - /// The store to get the host name for - /// - /// If null, checks whether all pages should be secured per . - /// If true, returns the secure url, but only if SSL is enabled for the store. - /// - /// The host name - string GetHost(Store store, bool? secure = null); - } + /// + /// Gets the store host name + /// + /// The store to get the host name for + /// + /// If null, checks whether all pages should be secured per . + /// If true, returns the secure url, but only if SSL is enabled for the store. + /// + /// The host name + string GetHost(Store store, bool? secure = null); + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Stores/StoreMappingService.cs b/src/Libraries/SmartStore.Services/Stores/StoreMappingService.cs index d5578486ca..93448e6aa2 100644 --- a/src/Libraries/SmartStore.Services/Stores/StoreMappingService.cs +++ b/src/Libraries/SmartStore.Services/Stores/StoreMappingService.cs @@ -8,240 +8,240 @@ namespace SmartStore.Services.Stores { - public partial class StoreMappingService : IStoreMappingService - { - /// - /// 0 = segment (EntityName.IdRange) - /// - const string STOREMAPPING_SEGMENT_KEY = "storemapping:range-{0}"; - const string STOREMAPPING_SEGMENT_PATTERN = "storemapping:range-*"; - - private readonly IRepository _storeMappingRepository; - private readonly IStoreContext _storeContext; - private readonly IStoreService _storeService; - private readonly ICacheManager _cacheManager; - - public StoreMappingService( - ICacheManager cacheManager, - IStoreContext storeContext, - IStoreService storeService, - IRepository storeMappingRepository) - { - _cacheManager = cacheManager; - _storeContext = storeContext; - _storeService = storeService; - _storeMappingRepository = storeMappingRepository; - - QuerySettings = DbQuerySettings.Default; - } - - public DbQuerySettings QuerySettings { get; set; } - - public virtual void DeleteStoreMapping(StoreMapping storeMapping) - { - Guard.NotNull(storeMapping, nameof(storeMapping)); - - _storeMappingRepository.Delete(storeMapping); - - ClearCacheSegment(storeMapping.EntityName, storeMapping.EntityId); - } - - public virtual StoreMapping GetStoreMappingById(int storeMappingId) - { - if (storeMappingId == 0) - return null; - - var storeMapping = _storeMappingRepository.GetById(storeMappingId); - return storeMapping; - } - - public virtual IList GetStoreMappings(T entity) where T : BaseEntity, IStoreMappingSupported - { - Guard.NotNull(entity, nameof(entity)); - - int entityId = entity.Id; - string entityName = entity.GetEntityName(); - - var query = from sm in _storeMappingRepository.Table - where sm.EntityId == entityId && - sm.EntityName == entityName - select sm; - var storeMappings = query.ToList(); - return storeMappings; - } - - public virtual IQueryable GetStoreMappingsFor(string entityName, int entityId) - { - var query = _storeMappingRepository.Table; - - if (entityName.HasValue()) - query = query.Where(x => x.EntityName == entityName); - - if (entityId != 0) - query = query.Where(x => x.EntityId == entityId); - - return query; - } - - public virtual void SaveStoreMappings(T entity, int[] selectedStoreIds) where T : BaseEntity, IStoreMappingSupported - { - var existingStoreMappings = GetStoreMappings(entity); - var allStores = _storeService.GetAllStores(); - - foreach (var store in allStores) - { - if (selectedStoreIds != null && selectedStoreIds.Contains(store.Id)) - { - if (!existingStoreMappings.Any(x => x.StoreId == store.Id)) - InsertStoreMapping(entity, store.Id); - } - else - { - var storeMappingToDelete = existingStoreMappings.FirstOrDefault(x => x.StoreId == store.Id); - if (storeMappingToDelete != null) - DeleteStoreMapping(storeMappingToDelete); - } - } - } - - public virtual void InsertStoreMapping(StoreMapping storeMapping) - { - Guard.NotNull(storeMapping, nameof(storeMapping)); - - _storeMappingRepository.Insert(storeMapping); - - ClearCacheSegment(storeMapping.EntityName, storeMapping.EntityId); - } - - public virtual void InsertStoreMapping(T entity, int storeId) where T : BaseEntity, IStoreMappingSupported - { - Guard.NotNull(entity, nameof(entity)); - - if (storeId == 0) - throw new ArgumentOutOfRangeException(nameof(storeId)); - - int entityId = entity.Id; - string entityName = entity.GetEntityName(); - - var storeMapping = new StoreMapping - { - EntityId = entityId, - EntityName = entityName, - StoreId = storeId - }; - - InsertStoreMapping(storeMapping); - } - - public virtual void UpdateStoreMapping(StoreMapping storeMapping) - { - Guard.NotNull(storeMapping, nameof(storeMapping)); - - _storeMappingRepository.Update(storeMapping); - - ClearCacheSegment(storeMapping.EntityName, storeMapping.EntityId); - } - - public virtual int[] GetStoresIdsWithAccess(string entityName, int entityId) - { - Guard.NotEmpty(entityName, nameof(entityName)); - - if (entityId <= 0) - return new int[0]; - - var cacheSegment = GetCacheSegment(entityName, entityId); - - if (!cacheSegment.TryGetValue(entityId, out var storeIds)) - { - return Array.Empty(); - } - - return storeIds; - } - - public bool Authorize(string entityName, int entityId) - { - return Authorize(entityName, entityId, _storeContext.CurrentStore.Id); - } - - public virtual bool Authorize(string entityName, int entityId, int storeId) - { - Guard.NotEmpty(entityName, nameof(entityName)); - - if (entityId <= 0) - return false; - - if (storeId <= 0) - // return true if no store specified/found - return true; - - if (QuerySettings.IgnoreMultiStore) - return true; - - // Permission granted only when the id list contains the passed storeId - return GetStoresIdsWithAccess(entityName, entityId).Any(x => x == storeId); - } - - #region Cache segmenting - - protected virtual IDictionary GetCacheSegment(string entityName, int entityId) - { - Guard.NotEmpty(entityName, nameof(entityName)); - - var segmentKey = GetSegmentKeyPart(entityName, entityId, out var minEntityId, out var maxEntityId); - var cacheKey = BuildCacheSegmentKey(segmentKey); - - return _cacheManager.Get(cacheKey, () => - { - var query = from sm in _storeMappingRepository.TableUntracked - where - sm.EntityId >= minEntityId && - sm.EntityId <= maxEntityId && - sm.EntityName == entityName - select sm; - - var mappings = query.ToLookup(x => x.EntityId, x => x.StoreId); + public partial class StoreMappingService : IStoreMappingService + { + /// + /// 0 = segment (EntityName.IdRange) + /// + const string STOREMAPPING_SEGMENT_KEY = "storemapping:range-{0}"; + const string STOREMAPPING_SEGMENT_PATTERN = "storemapping:range-*"; + + private readonly IRepository _storeMappingRepository; + private readonly IStoreContext _storeContext; + private readonly IStoreService _storeService; + private readonly ICacheManager _cacheManager; + + public StoreMappingService( + ICacheManager cacheManager, + IStoreContext storeContext, + IStoreService storeService, + IRepository storeMappingRepository) + { + _cacheManager = cacheManager; + _storeContext = storeContext; + _storeService = storeService; + _storeMappingRepository = storeMappingRepository; + + QuerySettings = DbQuerySettings.Default; + } + + public DbQuerySettings QuerySettings { get; set; } + + public virtual void DeleteStoreMapping(StoreMapping storeMapping) + { + Guard.NotNull(storeMapping, nameof(storeMapping)); + + _storeMappingRepository.Delete(storeMapping); + + ClearCacheSegment(storeMapping.EntityName, storeMapping.EntityId); + } + + public virtual StoreMapping GetStoreMappingById(int storeMappingId) + { + if (storeMappingId == 0) + return null; + + var storeMapping = _storeMappingRepository.GetById(storeMappingId); + return storeMapping; + } + + public virtual IList GetStoreMappings(T entity) where T : BaseEntity, IStoreMappingSupported + { + Guard.NotNull(entity, nameof(entity)); + + int entityId = entity.Id; + string entityName = entity.GetEntityName(); + + var query = from sm in _storeMappingRepository.Table + where sm.EntityId == entityId && + sm.EntityName == entityName + select sm; + var storeMappings = query.ToList(); + return storeMappings; + } + + public virtual IQueryable GetStoreMappingsFor(string entityName, int entityId) + { + var query = _storeMappingRepository.Table; + + if (entityName.HasValue()) + query = query.Where(x => x.EntityName == entityName); + + if (entityId != 0) + query = query.Where(x => x.EntityId == entityId); + + return query; + } + + public virtual void SaveStoreMappings(T entity, int[] selectedStoreIds) where T : BaseEntity, IStoreMappingSupported + { + var existingStoreMappings = GetStoreMappings(entity); + var allStores = _storeService.GetAllStores(); + + foreach (var store in allStores) + { + if (selectedStoreIds != null && selectedStoreIds.Contains(store.Id)) + { + if (!existingStoreMappings.Any(x => x.StoreId == store.Id)) + InsertStoreMapping(entity, store.Id); + } + else + { + var storeMappingToDelete = existingStoreMappings.FirstOrDefault(x => x.StoreId == store.Id); + if (storeMappingToDelete != null) + DeleteStoreMapping(storeMappingToDelete); + } + } + } + + public virtual void InsertStoreMapping(StoreMapping storeMapping) + { + Guard.NotNull(storeMapping, nameof(storeMapping)); + + _storeMappingRepository.Insert(storeMapping); + + ClearCacheSegment(storeMapping.EntityName, storeMapping.EntityId); + } + + public virtual void InsertStoreMapping(T entity, int storeId) where T : BaseEntity, IStoreMappingSupported + { + Guard.NotNull(entity, nameof(entity)); + + if (storeId == 0) + throw new ArgumentOutOfRangeException(nameof(storeId)); + + int entityId = entity.Id; + string entityName = entity.GetEntityName(); + + var storeMapping = new StoreMapping + { + EntityId = entityId, + EntityName = entityName, + StoreId = storeId + }; + + InsertStoreMapping(storeMapping); + } + + public virtual void UpdateStoreMapping(StoreMapping storeMapping) + { + Guard.NotNull(storeMapping, nameof(storeMapping)); + + _storeMappingRepository.Update(storeMapping); + + ClearCacheSegment(storeMapping.EntityName, storeMapping.EntityId); + } + + public virtual int[] GetStoresIdsWithAccess(string entityName, int entityId) + { + Guard.NotEmpty(entityName, nameof(entityName)); + + if (entityId <= 0) + return new int[0]; + + var cacheSegment = GetCacheSegment(entityName, entityId); + + if (!cacheSegment.TryGetValue(entityId, out var storeIds)) + { + return Array.Empty(); + } + + return storeIds; + } + + public bool Authorize(string entityName, int entityId) + { + return Authorize(entityName, entityId, _storeContext.CurrentStore.Id); + } + + public virtual bool Authorize(string entityName, int entityId, int storeId) + { + Guard.NotEmpty(entityName, nameof(entityName)); + + if (entityId <= 0) + return false; + + if (storeId <= 0) + // return true if no store specified/found + return true; + + if (QuerySettings.IgnoreMultiStore) + return true; + + // Permission granted only when the id list contains the passed storeId + return GetStoresIdsWithAccess(entityName, entityId).Any(x => x == storeId); + } + + #region Cache segmenting + + protected virtual IDictionary GetCacheSegment(string entityName, int entityId) + { + Guard.NotEmpty(entityName, nameof(entityName)); + + var segmentKey = GetSegmentKeyPart(entityName, entityId, out var minEntityId, out var maxEntityId); + var cacheKey = BuildCacheSegmentKey(segmentKey); + + return _cacheManager.Get(cacheKey, () => + { + var query = from sm in _storeMappingRepository.TableUntracked + where + sm.EntityId >= minEntityId && + sm.EntityId <= maxEntityId && + sm.EntityName == entityName + select sm; + + var mappings = query.ToLookup(x => x.EntityId, x => x.StoreId); - var dict = new Dictionary(mappings.Count); + var dict = new Dictionary(mappings.Count); - foreach (var sm in mappings) - { - dict[sm.Key] = sm.ToArray(); - } - - return dict; - }); - } - - /// - /// Clears the cached segment from the cache - /// - protected virtual void ClearCacheSegment(string entityName, int entityId) - { - try - { - var segmentKey = GetSegmentKeyPart(entityName, entityId); - _cacheManager.Remove(BuildCacheSegmentKey(segmentKey)); - } - catch { } - } - - private string BuildCacheSegmentKey(string segment) - { - return String.Format(STOREMAPPING_SEGMENT_KEY, segment); - } - - private string GetSegmentKeyPart(string entityName, int entityId) - { - return GetSegmentKeyPart(entityName, entityId, out _, out _); - } - - private string GetSegmentKeyPart(string entityName, int entityId, out int minId, out int maxId) - { - maxId = entityId.GetRange(1000, out minId); - return (entityName + "." + maxId.ToString()).ToLowerInvariant(); - } - - #endregion - } + foreach (var sm in mappings) + { + dict[sm.Key] = sm.ToArray(); + } + + return dict; + }); + } + + /// + /// Clears the cached segment from the cache + /// + protected virtual void ClearCacheSegment(string entityName, int entityId) + { + try + { + var segmentKey = GetSegmentKeyPart(entityName, entityId); + _cacheManager.Remove(BuildCacheSegmentKey(segmentKey)); + } + catch { } + } + + private string BuildCacheSegmentKey(string segment) + { + return String.Format(STOREMAPPING_SEGMENT_KEY, segment); + } + + private string GetSegmentKeyPart(string entityName, int entityId) + { + return GetSegmentKeyPart(entityName, entityId, out _, out _); + } + + private string GetSegmentKeyPart(string entityName, int entityId, out int minId, out int maxId) + { + maxId = entityId.GetRange(1000, out minId); + return (entityName + "." + maxId.ToString()).ToLowerInvariant(); + } + + #endregion + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Stores/StoreService.cs b/src/Libraries/SmartStore.Services/Stores/StoreService.cs index f8cde15ab0..a7add0c0f1 100644 --- a/src/Libraries/SmartStore.Services/Stores/StoreService.cs +++ b/src/Libraries/SmartStore.Services/Stores/StoreService.cs @@ -7,108 +7,108 @@ namespace SmartStore.Services.Stores { - public partial class StoreService : IStoreService - { - private readonly IRepository _storeRepository; - - private bool? _isSingleStoreMode = null; - - public StoreService(IRepository storeRepository) - { - _storeRepository = storeRepository; - } - - public virtual IList GetAllStores() - { - var query = _storeRepository.Table - .Expand(x => x.PrimaryStoreCurrency) - .Expand(x => x.PrimaryExchangeRateCurrency) - .OrderBy(x => x.DisplayOrder) - .ThenBy(x => x.Name); - - var stores = query.ToListCached("db.store.all"); - return stores; - } - - public virtual Store GetStoreById(int storeId) - { - if (storeId == 0) - return null; - - return _storeRepository.GetByIdCached(storeId, "db.store.id-" + storeId); - } - - public virtual void InsertStore(Store store) - { - Guard.NotNull(store, nameof(store)); - - _storeRepository.Insert(store); - } - - public virtual void UpdateStore(Store store) - { - Guard.NotNull(store, nameof(store)); - - _storeRepository.Update(store); - } - - public virtual void DeleteStore(Store store) - { - Guard.NotNull(store, nameof(store)); - - var allStores = GetAllStores(); - if (allStores.Count == 1) - throw new Exception("You cannot delete the only configured store."); - - _storeRepository.Delete(store); - } - - public virtual bool IsSingleStoreMode() - { - if (!_isSingleStoreMode.HasValue) - { - _isSingleStoreMode = (_storeRepository.TableUntracked.Count() <= 1); - } - - return _isSingleStoreMode.Value; - } - - public virtual bool IsStoreDataValid(Store store) - { - Guard.NotNull(store, nameof(store)); - - if (store.Url.IsEmpty()) - return false; - - try - { - var uri = new Uri(store.Url); - var domain = uri.DnsSafeHost.EmptyNull().ToLower(); - - switch (domain) - { - case "www.yourstore.com": - case "yourstore.com": - case "www.mystore.com": - case "mystore.com": - case "www.mein-shop.de": - case "mein-shop.de": - return false; - default: - return store.Url.IsWebUrl(); - } - } - catch - { - return false; - } - } - - public string GetHost(Store store, bool? secure = null) - { - Guard.NotNull(store, nameof(store)); - - return store.GetHost(secure ?? store.ForceSslForAllPages); - } - } + public partial class StoreService : IStoreService + { + private readonly IRepository _storeRepository; + + private bool? _isSingleStoreMode = null; + + public StoreService(IRepository storeRepository) + { + _storeRepository = storeRepository; + } + + public virtual IList GetAllStores() + { + var query = _storeRepository.Table + .Expand(x => x.PrimaryStoreCurrency) + .Expand(x => x.PrimaryExchangeRateCurrency) + .OrderBy(x => x.DisplayOrder) + .ThenBy(x => x.Name); + + var stores = query.ToListCached("db.store.all"); + return stores; + } + + public virtual Store GetStoreById(int storeId) + { + if (storeId == 0) + return null; + + return _storeRepository.GetByIdCached(storeId, "db.store.id-" + storeId); + } + + public virtual void InsertStore(Store store) + { + Guard.NotNull(store, nameof(store)); + + _storeRepository.Insert(store); + } + + public virtual void UpdateStore(Store store) + { + Guard.NotNull(store, nameof(store)); + + _storeRepository.Update(store); + } + + public virtual void DeleteStore(Store store) + { + Guard.NotNull(store, nameof(store)); + + var allStores = GetAllStores(); + if (allStores.Count == 1) + throw new Exception("You cannot delete the only configured store."); + + _storeRepository.Delete(store); + } + + public virtual bool IsSingleStoreMode() + { + if (!_isSingleStoreMode.HasValue) + { + _isSingleStoreMode = (_storeRepository.TableUntracked.Count() <= 1); + } + + return _isSingleStoreMode.Value; + } + + public virtual bool IsStoreDataValid(Store store) + { + Guard.NotNull(store, nameof(store)); + + if (store.Url.IsEmpty()) + return false; + + try + { + var uri = new Uri(store.Url); + var domain = uri.DnsSafeHost.EmptyNull().ToLower(); + + switch (domain) + { + case "www.yourstore.com": + case "yourstore.com": + case "www.mystore.com": + case "mystore.com": + case "www.mein-shop.de": + case "mein-shop.de": + return false; + default: + return store.Url.IsWebUrl(); + } + } + catch + { + return false; + } + } + + public string GetHost(Store store, bool? secure = null) + { + Guard.NotNull(store, nameof(store)); + + return store.GetHost(secure ?? store.ForceSslForAllPages); + } + } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Tasks/CronExpression.cs b/src/Libraries/SmartStore.Services/Tasks/CronExpression.cs index 28598352c2..5432120b91 100644 --- a/src/Libraries/SmartStore.Services/Tasks/CronExpression.cs +++ b/src/Libraries/SmartStore.Services/Tasks/CronExpression.cs @@ -7,65 +7,65 @@ namespace SmartStore.Services.Tasks { - public static class CronExpression - { - public static bool IsValid(string expression) - { - try - { - CrontabSchedule.Parse(expression); - return true; - } - catch { } + public static class CronExpression + { + public static bool IsValid(string expression) + { + try + { + CrontabSchedule.Parse(expression); + return true; + } + catch { } - return false; - } + return false; + } - public static DateTime GetNextSchedule(string expression, DateTime baseTime) - { - return GetFutureSchedules(expression, baseTime, 1).FirstOrDefault(); - } + public static DateTime GetNextSchedule(string expression, DateTime baseTime) + { + return GetFutureSchedules(expression, baseTime, 1).FirstOrDefault(); + } - public static DateTime GetNextSchedule(string expression, DateTime baseTime, DateTime endTime) - { - return GetFutureSchedules(expression, baseTime, endTime, 1).FirstOrDefault(); - } + public static DateTime GetNextSchedule(string expression, DateTime baseTime, DateTime endTime) + { + return GetFutureSchedules(expression, baseTime, endTime, 1).FirstOrDefault(); + } - public static IEnumerable GetFutureSchedules(string expression, DateTime baseTime, int max = 10) - { - return GetFutureSchedules(expression, baseTime, DateTime.MaxValue); - } + public static IEnumerable GetFutureSchedules(string expression, DateTime baseTime, int max = 10) + { + return GetFutureSchedules(expression, baseTime, DateTime.MaxValue); + } - public static IEnumerable GetFutureSchedules(string expression, DateTime baseTime, DateTime endTime, int max = 10) - { - Guard.NotEmpty(expression, nameof(expression)); + public static IEnumerable GetFutureSchedules(string expression, DateTime baseTime, DateTime endTime, int max = 10) + { + Guard.NotEmpty(expression, nameof(expression)); - var schedule = CrontabSchedule.Parse(expression); - return schedule.GetNextOccurrences(baseTime, endTime).Take(max); - } + var schedule = CrontabSchedule.Parse(expression); + return schedule.GetNextOccurrences(baseTime, endTime).Take(max); + } - public static string GetFriendlyDescription(string expression) - { - var options = new Options - { - DayOfWeekStartIndexZero = true, - ThrowExceptionOnParseError = true, - Verbose = false, - Use24HourTimeFormat = Thread.CurrentThread.CurrentUICulture.DateTimeFormat.AMDesignator.IsEmpty() - }; + public static string GetFriendlyDescription(string expression) + { + var options = new Options + { + DayOfWeekStartIndexZero = true, + ThrowExceptionOnParseError = true, + Verbose = false, + Use24HourTimeFormat = Thread.CurrentThread.CurrentUICulture.DateTimeFormat.AMDesignator.IsEmpty() + }; - if (expression.HasValue()) - { - try - { - return ExpressionDescriptor.GetDescription(expression, options); - } - catch { } - } + if (expression.HasValue()) + { + try + { + return ExpressionDescriptor.GetDescription(expression, options); + } + catch { } + } - return "?"; - } + return "?"; + } - } + } } diff --git a/src/Libraries/SmartStore.Services/Tasks/IScheduleTaskService.cs b/src/Libraries/SmartStore.Services/Tasks/IScheduleTaskService.cs index be442aa61a..89bb1a7acc 100644 --- a/src/Libraries/SmartStore.Services/Tasks/IScheduleTaskService.cs +++ b/src/Libraries/SmartStore.Services/Tasks/IScheduleTaskService.cs @@ -56,30 +56,30 @@ public partial interface IScheduleTaskService /// Task void UpdateTask(ScheduleTask task); - /// - /// Inserts a new task definition to the database or returns an existing one - /// - /// The concrete implementation of the task - /// Wraps the newly created instance - /// A newly created or existing task instance - /// - /// This method does NOT update an already exising task - /// - ScheduleTask GetOrAddTask(Action newAction) where T : ITask; - - /// - /// Calculates - according to their cron expressions - all task future schedules - /// and saves them to the database. - /// - /// When true, determines stale tasks and fixes their states to idle. - void CalculateFutureSchedules(IEnumerable tasks, bool isAppStart = false); - - /// - /// Calculates the next schedule according to the task's cron expression - /// - /// ScheduleTask - /// The next schedule or null if the task is disabled - DateTime? GetNextSchedule(ScheduleTask task); + /// + /// Inserts a new task definition to the database or returns an existing one + /// + /// The concrete implementation of the task + /// Wraps the newly created instance + /// A newly created or existing task instance + /// + /// This method does NOT update an already exising task + /// + ScheduleTask GetOrAddTask(Action newAction) where T : ITask; + + /// + /// Calculates - according to their cron expressions - all task future schedules + /// and saves them to the database. + /// + /// When true, determines stale tasks and fixes their states to idle. + void CalculateFutureSchedules(IEnumerable tasks, bool isAppStart = false); + + /// + /// Calculates the next schedule according to the task's cron expression + /// + /// ScheduleTask + /// The next schedule or null if the task is disabled + DateTime? GetNextSchedule(ScheduleTask task); #region Schedule task history @@ -168,32 +168,32 @@ IPagedList GetHistoryEntries( } public static class IScheduleTaskServiceExtensions - { - public static ScheduleTask GetTaskByType(this IScheduleTaskService service) where T : ITask - { - return service.GetTaskByType(typeof(T)); - } - - public static ScheduleTask GetTaskByType(this IScheduleTaskService service, Type taskType) - { - Guard.NotNull(taskType, nameof(taskType)); - - var name = taskType.AssemblyQualifiedNameWithoutVersion(); - - return service.GetTaskByType(name); - } - - public static bool TryDeleteTask(this IScheduleTaskService service) where T : ITask - { - var task = service.GetTaskByType(typeof(T)); - - if (task != null) - { - service.DeleteTask(task); - return true; - } - - return false; - } - } + { + public static ScheduleTask GetTaskByType(this IScheduleTaskService service) where T : ITask + { + return service.GetTaskByType(typeof(T)); + } + + public static ScheduleTask GetTaskByType(this IScheduleTaskService service, Type taskType) + { + Guard.NotNull(taskType, nameof(taskType)); + + var name = taskType.AssemblyQualifiedNameWithoutVersion(); + + return service.GetTaskByType(name); + } + + public static bool TryDeleteTask(this IScheduleTaskService service) where T : ITask + { + var task = service.GetTaskByType(typeof(T)); + + if (task != null) + { + service.DeleteTask(task); + return true; + } + + return false; + } + } } diff --git a/src/Libraries/SmartStore.Services/Tasks/ITask.cs b/src/Libraries/SmartStore.Services/Tasks/ITask.cs index 01e576c330..43055fa729 100644 --- a/src/Libraries/SmartStore.Services/Tasks/ITask.cs +++ b/src/Libraries/SmartStore.Services/Tasks/ITask.cs @@ -18,25 +18,27 @@ public partial interface ITask void Execute(TaskExecutionContext ctx); } - /// - /// Interface that should be implemented by background tasks - /// - public interface IAsyncTask : ITask - { - /// - /// Executes a task asynchronously - /// - /// - /// The execution context - /// - Task ExecuteAsync(TaskExecutionContext ctx); - } + /// + /// Interface that should be implemented by background tasks + /// + public interface IAsyncTask : ITask + { + /// + /// Executes a task asynchronously + /// + /// + /// The execution context + /// + Task ExecuteAsync(TaskExecutionContext ctx); + } - public abstract class AsyncTask : IAsyncTask - { - public void Execute(TaskExecutionContext ctx) => - throw new NotSupportedException(); + public abstract class AsyncTask : IAsyncTask + { + public void Execute(TaskExecutionContext ctx) + { + throw new NotSupportedException(); + } - public abstract Task ExecuteAsync(TaskExecutionContext ctx); - } + public abstract Task ExecuteAsync(TaskExecutionContext ctx); + } } diff --git a/src/Libraries/SmartStore.Services/Tasks/ITaskExecutor.cs b/src/Libraries/SmartStore.Services/Tasks/ITaskExecutor.cs index 5f0f126359..f18f72916e 100644 --- a/src/Libraries/SmartStore.Services/Tasks/ITaskExecutor.cs +++ b/src/Libraries/SmartStore.Services/Tasks/ITaskExecutor.cs @@ -7,8 +7,8 @@ namespace SmartStore.Services.Tasks public interface ITaskExecutor { Task ExecuteAsync( - ScheduleTask entity, - IDictionary taskParameters = null, - bool throwOnError = false); + ScheduleTask entity, + IDictionary taskParameters = null, + bool throwOnError = false); } } diff --git a/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs b/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs index 0070ad48f6..af80694d8c 100644 --- a/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs +++ b/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs @@ -17,58 +17,58 @@ public interface ITaskScheduler /// int SweepIntervalMinutes { get; set; } - /// - /// The fully qualified base url - /// + /// + /// The fully qualified base url + /// string BaseUrl { get; set; } - /// - /// Gets a value indicating whether the scheduler is active and periodically sweeps all tasks. - /// + /// + /// Gets a value indicating whether the scheduler is active and periodically sweeps all tasks. + /// bool IsActive { get; } - /// - /// Gets the unique key by which a instance - /// can be retrieved from an instance - /// - /// The schedule task id - /// A unique string key - string GetAsyncStateKey(int scheduleTaskId); + /// + /// Gets the unique key by which a instance + /// can be retrieved from an instance + /// + /// The schedule task id + /// A unique string key + string GetAsyncStateKey(int scheduleTaskId); - /// - /// Starts/initializes the scheduler - /// - void Start(); + /// + /// Starts/initializes the scheduler + /// + void Start(); - /// - /// Stops the scheduler - /// + /// + /// Stops the scheduler + /// void Stop(); - /// - /// Executes a single task immediately - /// - /// - /// Optional task parameters + /// + /// Executes a single task immediately + /// + /// + /// Optional task parameters void RunSingleTask(int scheduleTaskId, IDictionary taskParameters = null); - /// - /// Verifies the authentication token which is generated right before the HTTP endpoint gets called. - /// - /// The authentication token to verify - /// true if the validation succeeds, false otherwise - /// - /// The task scheduler sends the token as a HTTP request header item. - /// The called endpoint (e.g. a controller action) is reponsible for invoking - /// this method and quitting the tasks's execution - preferrably with HTTP 403 - - /// if the verification fails. - /// + /// + /// Verifies the authentication token which is generated right before the HTTP endpoint gets called. + /// + /// The authentication token to verify + /// true if the validation succeeds, false otherwise + /// + /// The task scheduler sends the token as a HTTP request header item. + /// The called endpoint (e.g. a controller action) is reponsible for invoking + /// this method and quitting the tasks's execution - preferrably with HTTP 403 - + /// if the verification fails. + /// bool VerifyAuthToken(string authToken); } public static class ITaskSchedulerExtensions { - internal static void SetBaseUrl(this ITaskScheduler scheduler, IStoreService storeService, HttpContextBase httpContext) + internal static void SetBaseUrl(this ITaskScheduler scheduler, IStoreService storeService, HttpContextBase httpContext) { string url = ""; @@ -83,7 +83,7 @@ internal static void SetBaseUrl(this ITaskScheduler scheduler, IStoreService sto if (url.IsEmpty()) { - url = WebHelper.GetAbsoluteUrl(VirtualPathUtility.ToAbsolute("~/TaskScheduler"), httpContext.Request); + url = WebHelper.GetAbsoluteUrl(VirtualPathUtility.ToAbsolute("~/TaskScheduler"), httpContext.Request); } scheduler.BaseUrl = url; diff --git a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs index 5820c12024..c9990757c2 100644 --- a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs +++ b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs @@ -33,20 +33,20 @@ public ScheduleTaskService( { _taskRepository = taskRepository; _taskHistoryRepository = taskHistoryRepository; - _dtHelper = dtHelper; + _dtHelper = dtHelper; _env = env; _commonSettings = commonSettings; - T = NullLocalizer.Instance; - Logger = NullLogger.Instance; + T = NullLocalizer.Instance; + Logger = NullLogger.Instance; } - public Localizer T { get; set; } - public ILogger Logger { get; set; } + public Localizer T { get; set; } + public ILogger Logger { get; set; } public virtual void DeleteTask(ScheduleTask task) { - Guard.NotNull(task, nameof(task)); + Guard.NotNull(task, nameof(task)); _taskRepository.Delete(task); } @@ -56,49 +56,49 @@ public virtual ScheduleTask GetTaskById(int taskId) if (taskId == 0) return null; - return Retry.Run( - () => _taskRepository.GetById(taskId), - 3, TimeSpan.FromMilliseconds(100), - RetryOnDeadlockException); - } + return Retry.Run( + () => _taskRepository.GetById(taskId), + 3, TimeSpan.FromMilliseconds(100), + RetryOnDeadlockException); + } public virtual ScheduleTask GetTaskByType(string type) { - try - { - if (type.HasValue()) - { - var query = _taskRepository.Table - .Where(t => t.Type == type) - .OrderByDescending(t => t.Id); - - var task = query.FirstOrDefault(); - return task; - } - } - catch (Exception exc) - { - // Do not throw an exception if the underlying provider failed on Open. - exc.Dump(); - } - - return null; + try + { + if (type.HasValue()) + { + var query = _taskRepository.Table + .Where(t => t.Type == type) + .OrderByDescending(t => t.Id); + + var task = query.FirstOrDefault(); + return task; + } + } + catch (Exception exc) + { + // Do not throw an exception if the underlying provider failed on Open. + exc.Dump(); + } + + return null; } - public virtual IList GetAllTasks(bool includeDisabled = false) + public virtual IList GetAllTasks(bool includeDisabled = false) { var query = _taskRepository.Table; - if (!includeDisabled) + if (!includeDisabled) { query = query.Where(t => t.Enabled); } query = query.OrderByDescending(t => t.Enabled); - return Retry.Run( - () => query.ToList(), - 3, TimeSpan.FromMilliseconds(100), - RetryOnDeadlockException); - } + return Retry.Run( + () => query.ToList(), + 3, TimeSpan.FromMilliseconds(100), + RetryOnDeadlockException); + } public async virtual Task> GetPendingTasksAsync() { @@ -135,76 +135,76 @@ from t in _taskRepository.Table .ToList(); return pendingTasks; - } + } public virtual void InsertTask(ScheduleTask task) { - Guard.NotNull(task, nameof(task)); + Guard.NotNull(task, nameof(task)); - _taskRepository.Insert(task); + _taskRepository.Insert(task); } public virtual void UpdateTask(ScheduleTask task) { - Guard.NotNull(task, nameof(task)); + Guard.NotNull(task, nameof(task)); - try - { + try + { _taskRepository.Update(task); - } - catch (Exception ex) - { - Logger.Error(ex); - throw; - } + } + catch (Exception ex) + { + Logger.Error(ex); + throw; + } + } + + public ScheduleTask GetOrAddTask(Action newAction) where T : ITask + { + Guard.NotNull(newAction, nameof(newAction)); + + var type = typeof(T); + + if (type.IsAbstract || type.IsInterface || type.IsNotPublic) + { + throw new InvalidOperationException("Only concrete public task types can be registered."); + } + + var scheduleTask = this.GetTaskByType(); + + if (scheduleTask == null) + { + scheduleTask = new ScheduleTask { Type = type.AssemblyQualifiedNameWithoutVersion() }; + newAction(scheduleTask); + InsertTask(scheduleTask); + } + + return scheduleTask; } - public ScheduleTask GetOrAddTask(Action newAction) where T : ITask - { - Guard.NotNull(newAction, nameof(newAction)); - - var type = typeof(T); - - if (type.IsAbstract || type.IsInterface || type.IsNotPublic) - { - throw new InvalidOperationException("Only concrete public task types can be registered."); - } - - var scheduleTask = this.GetTaskByType(); - - if (scheduleTask == null) - { - scheduleTask = new ScheduleTask { Type = type.AssemblyQualifiedNameWithoutVersion() }; - newAction(scheduleTask); - InsertTask(scheduleTask); - } - - return scheduleTask; - } - - public void CalculateFutureSchedules(IEnumerable tasks, bool isAppStart = false) - { - Guard.NotNull(tasks, nameof(tasks)); - - foreach (var task in tasks) - { - task.NextRunUtc = GetNextSchedule(task); - if (isAppStart) - { - FixTypeName(task); - } - else - { - UpdateTask(task); - } - } - - if (isAppStart) - { - // On app start this method's execution is thread-safe, making it sufficient - // to commit all changes in one go. - _taskRepository.Context.SaveChanges(); - } + public void CalculateFutureSchedules(IEnumerable tasks, bool isAppStart = false) + { + Guard.NotNull(tasks, nameof(tasks)); + + foreach (var task in tasks) + { + task.NextRunUtc = GetNextSchedule(task); + if (isAppStart) + { + FixTypeName(task); + } + else + { + UpdateTask(task); + } + } + + if (isAppStart) + { + // On app start this method's execution is thread-safe, making it sufficient + // to commit all changes in one go. + _taskRepository.Context.SaveChanges(); + } if (isAppStart) { @@ -245,49 +245,49 @@ public void CalculateFutureSchedules(IEnumerable tasks, bool isApp } } - private void FixTypeName(ScheduleTask task) - { - // In versions prior V3 a double space could exist in ScheduleTask type name. - if (task.Type.IndexOf(", ") > 0) - { - task.Type = task.Type.Replace(", ", ", "); - } - } - - public virtual DateTime? GetNextSchedule(ScheduleTask task) - { - if (task.Enabled) - { - try - { - var localTimeZone = _dtHelper.DefaultStoreTimeZone; - var baseTime = TimeZoneInfo.ConvertTime(DateTime.UtcNow, localTimeZone); - var next = CronExpression.GetNextSchedule(task.CronExpression, baseTime); - var utcTime = _dtHelper.ConvertToUtcTime(next, localTimeZone); - - return utcTime; - } - catch (Exception ex) - { - Logger.ErrorFormat(ex, "Could not calculate next schedule time for task '{0}'", task.Name); - } - } - - return null; - } - - private static void RetryOnDeadlockException(int attemp, Exception ex) - { - var isDeadLockException = - (ex as EntityCommandExecutionException).IsDeadlockException() || - (ex as SqlException).IsDeadlockException(); - - if (!isDeadLockException) - { - // We only want to retry on deadlock stuff. - throw ex; - } - } + private void FixTypeName(ScheduleTask task) + { + // In versions prior V3 a double space could exist in ScheduleTask type name. + if (task.Type.IndexOf(", ") > 0) + { + task.Type = task.Type.Replace(", ", ", "); + } + } + + public virtual DateTime? GetNextSchedule(ScheduleTask task) + { + if (task.Enabled) + { + try + { + var localTimeZone = _dtHelper.DefaultStoreTimeZone; + var baseTime = TimeZoneInfo.ConvertTime(DateTime.UtcNow, localTimeZone); + var next = CronExpression.GetNextSchedule(task.CronExpression, baseTime); + var utcTime = _dtHelper.ConvertToUtcTime(next, localTimeZone); + + return utcTime; + } + catch (Exception ex) + { + Logger.ErrorFormat(ex, "Could not calculate next schedule time for task '{0}'", task.Name); + } + } + + return null; + } + + private static void RetryOnDeadlockException(int attemp, Exception ex) + { + var isDeadLockException = + (ex as EntityCommandExecutionException).IsDeadlockException() || + (ex as SqlException).IsDeadlockException(); + + if (!isDeadLockException) + { + // We only want to retry on deadlock stuff. + throw ex; + } + } #region Schedule task history diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskExecutionContext.cs b/src/Libraries/SmartStore.Services/Tasks/TaskExecutionContext.cs index fa52d51967..0c79140495 100644 --- a/src/Libraries/SmartStore.Services/Tasks/TaskExecutionContext.cs +++ b/src/Libraries/SmartStore.Services/Tasks/TaskExecutionContext.cs @@ -7,14 +7,14 @@ namespace SmartStore.Services.Tasks { - public delegate void ProgressCallback(int value, int maximum, string message); - - /// - /// Provides the context for the Execute method of the interface. - /// - public class TaskExecutionContext - { - private readonly IComponentContext _componentContext; + public delegate void ProgressCallback(int value, int maximum, string message); + + /// + /// Provides the context for the Execute method of the interface. + /// + public class TaskExecutionContext + { + private readonly IComponentContext _componentContext; private readonly ScheduleTaskHistory _originalTaskHistory; internal TaskExecutionContext(IComponentContext componentContext, ScheduleTaskHistory originalTaskHistory) @@ -25,19 +25,19 @@ internal TaskExecutionContext(IComponentContext componentContext, ScheduleTaskHi } public T Resolve(object key = null) where T : class - { - if (key == null) - { - return _componentContext.Resolve(); - } + { + if (key == null) + { + return _componentContext.Resolve(); + } - return _componentContext.ResolveKeyed(key); - } + return _componentContext.ResolveKeyed(key); + } - public T ResolveNamed(string name) where T : class - { - return _componentContext.ResolveNamed(name); - } + public T ResolveNamed(string name) where T : class + { + return _componentContext.ResolveNamed(name); + } /// /// A cancellation token for the running task. @@ -49,84 +49,84 @@ public T ResolveNamed(string name) where T : class public IDictionary Parameters { get; set; } - /// - /// Persists a task's progress information to the database - /// - /// Progress value (numerator) - /// Progress maximum (denominator) - /// Progress message. Can be null. - /// if true, saves the updated task entity immediately, or lazily with the next database commit otherwise. - public void SetProgress(int value, int maximum, string message, bool immediately = false) - { - if (value == 0 && maximum == 0) - { - SetProgress(null, message, immediately); - } - else - { - float fraction = (float)value / (float)Math.Max(maximum, 1f); - int percentage = (int)Math.Round(fraction * 100f, 0); - - SetProgress(Math.Min(Math.Max(percentage, 0), 100), message, immediately); - } - } - - /// - /// Persists a task's progress information to the database - /// - /// Percentual progress. Can be null or a value between 0 and 100. - /// Progress message. Can be null. - /// if true, saves the updated task entity immediately, or lazily with the next database commit otherwise. - public virtual void SetProgress(int? progress, string message, bool immediately = false) - { + /// + /// Persists a task's progress information to the database + /// + /// Progress value (numerator) + /// Progress maximum (denominator) + /// Progress message. Can be null. + /// if true, saves the updated task entity immediately, or lazily with the next database commit otherwise. + public void SetProgress(int value, int maximum, string message, bool immediately = false) + { + if (value == 0 && maximum == 0) + { + SetProgress(null, message, immediately); + } + else + { + float fraction = (float)value / (float)Math.Max(maximum, 1f); + int percentage = (int)Math.Round(fraction * 100f, 0); + + SetProgress(Math.Min(Math.Max(percentage, 0), 100), message, immediately); + } + } + + /// + /// Persists a task's progress information to the database + /// + /// Percentual progress. Can be null or a value between 0 and 100. + /// Progress message. Can be null. + /// if true, saves the updated task entity immediately, or lazily with the next database commit otherwise. + public virtual void SetProgress(int? progress, string message, bool immediately = false) + { if (progress.HasValue) { Guard.InRange(progress.Value, 0, 100, nameof(progress)); } - // Update cloned entity. - ScheduleTaskHistory.ProgressPercent = progress; + // Update cloned entity. + ScheduleTaskHistory.ProgressPercent = progress; ScheduleTaskHistory.ProgressMessage = message; // Update attached entity. _originalTaskHistory.ProgressPercent = progress; _originalTaskHistory.ProgressMessage = message; - if (immediately) - { + if (immediately) + { // Dont't let this abort the task on failure. try { - var dbContext = _componentContext.Resolve(); - //dbContext.ChangeState(_originalTask, System.Data.Entity.EntityState.Modified); - dbContext.SaveChanges(); - } - catch { } - } - } - - /// - /// Creates a transient context, which can be passed to methods requiring a instance. - /// Such methods are usually executed by the task executor in the background. If a manual invocation of such - /// methods is required, this is the way to go. - /// - /// The component context - /// A transient context - public static TaskExecutionContext CreateTransientContext(IComponentContext componentContext) - { - return CreateTransientContext(componentContext, CancellationToken.None); - } - - /// - /// Creates a transient context, which can be passed to methods requiring a instance. - /// Such methods are usually executed by the task executor in the background. If a manual invocation of such - /// methods is required, this is the way to go. - /// - /// The component context - /// The cancellation token - /// A transient context - public static TaskExecutionContext CreateTransientContext(IComponentContext componentContext, CancellationToken cancellationToken) - { + var dbContext = _componentContext.Resolve(); + //dbContext.ChangeState(_originalTask, System.Data.Entity.EntityState.Modified); + dbContext.SaveChanges(); + } + catch { } + } + } + + /// + /// Creates a transient context, which can be passed to methods requiring a instance. + /// Such methods are usually executed by the task executor in the background. If a manual invocation of such + /// methods is required, this is the way to go. + /// + /// The component context + /// A transient context + public static TaskExecutionContext CreateTransientContext(IComponentContext componentContext) + { + return CreateTransientContext(componentContext, CancellationToken.None); + } + + /// + /// Creates a transient context, which can be passed to methods requiring a instance. + /// Such methods are usually executed by the task executor in the background. If a manual invocation of such + /// methods is required, this is the way to go. + /// + /// The component context + /// The cancellation token + /// A transient context + public static TaskExecutionContext CreateTransientContext(IComponentContext componentContext, CancellationToken cancellationToken) + { var originalHistoryEntry = new ScheduleTaskHistory { ScheduleTask = new ScheduleTask @@ -137,24 +137,24 @@ public static TaskExecutionContext CreateTransientContext(IComponentContext comp } }; - var context = new TransientTaskExecutionContext(componentContext, originalHistoryEntry); - context.CancellationToken = cancellationToken; + var context = new TransientTaskExecutionContext(componentContext, originalHistoryEntry); + context.CancellationToken = cancellationToken; context.ScheduleTaskHistory = originalHistoryEntry.Clone(); - return context; - } - } - - internal class TransientTaskExecutionContext : TaskExecutionContext - { - public TransientTaskExecutionContext(IComponentContext componentContext, ScheduleTaskHistory originalHistoryEntry) - : base(componentContext, originalHistoryEntry) - { - } - - public override void SetProgress(int? progress, string message, bool immediately = false) - { - base.SetProgress(progress, message, false /* skip committing to DB */); - } - } + return context; + } + } + + internal class TransientTaskExecutionContext : TaskExecutionContext + { + public TransientTaskExecutionContext(IComponentContext componentContext, ScheduleTaskHistory originalHistoryEntry) + : base(componentContext, originalHistoryEntry) + { + } + + public override void SetProgress(int? progress, string message, bool immediately = false) + { + base.SetProgress(progress, message, false /* skip committing to DB */); + } + } } diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskExecutor.cs b/src/Libraries/SmartStore.Services/Tasks/TaskExecutor.cs index 05676a0490..e79a3e5a9a 100644 --- a/src/Libraries/SmartStore.Services/Tasks/TaskExecutor.cs +++ b/src/Libraries/SmartStore.Services/Tasks/TaskExecutor.cs @@ -17,36 +17,36 @@ public class TaskExecutor : ITaskExecutor { private readonly IScheduleTaskService _scheduledTaskService; private readonly Func _taskResolver; - private readonly IComponentContext _componentContext; - private readonly IAsyncState _asyncState; + private readonly IComponentContext _componentContext; + private readonly IAsyncState _asyncState; private readonly IApplicationEnvironment _env; public const string CurrentCustomerIdParamName = "CurrentCustomerId"; - public const string CurrentStoreIdParamName = "CurrentStoreId"; + public const string CurrentStoreIdParamName = "CurrentStoreId"; - public TaskExecutor( - IScheduleTaskService scheduledTaskService, - IComponentContext componentContext, - IAsyncState asyncState, - Func taskResolver, + public TaskExecutor( + IScheduleTaskService scheduledTaskService, + IComponentContext componentContext, + IAsyncState asyncState, + Func taskResolver, IApplicationEnvironment env) { _scheduledTaskService = scheduledTaskService; - _componentContext = componentContext; - _asyncState = asyncState; + _componentContext = componentContext; + _asyncState = asyncState; _taskResolver = taskResolver; _env = env; Logger = NullLogger.Instance; - T = NullLocalizer.Instance; - } + T = NullLocalizer.Instance; + } public ILogger Logger { get; set; } - public Localizer T { get; set; } + public Localizer T { get; set; } - public async Task ExecuteAsync( - ScheduleTask entity, - IDictionary taskParameters = null, + public async Task ExecuteAsync( + ScheduleTask entity, + IDictionary taskParameters = null, bool throwOnError = false) { if (AsyncRunner.AppShutdownCancellationToken.IsCancellationRequested) @@ -66,11 +66,11 @@ public async Task ExecuteAsync( } bool faulted = false; - bool canceled = false; + bool canceled = false; string lastError = null; ITask task = null; - string stateName = null; - Type taskType = null; + string stateName = null; + Type taskType = null; Exception exception = null; var historyEntry = new ScheduleTaskHistory @@ -83,61 +83,61 @@ public async Task ExecuteAsync( try { - taskType = Type.GetType(entity.Type); - if (taskType == null) - { - Logger.DebugFormat("Invalid scheduled task type: {0}", entity.Type.NaIfEmpty()); - } + taskType = Type.GetType(entity.Type); + if (taskType == null) + { + Logger.DebugFormat("Invalid scheduled task type: {0}", entity.Type.NaIfEmpty()); + } - if (taskType == null) - return; + if (taskType == null) + return; - if (!PluginManager.IsActivePluginAssembly(taskType.Assembly)) - return; + if (!PluginManager.IsActivePluginAssembly(taskType.Assembly)) + return; entity.ScheduleTaskHistory.Add(historyEntry); _scheduledTaskService.UpdateTask(entity); } catch - { - return; - } + { + return; + } try { // Task history entry has been successfully added, now we execute the task. - // Create task instance. - task = _taskResolver(taskType); - stateName = entity.Id.ToString(); + // Create task instance. + task = _taskResolver(taskType); + stateName = entity.Id.ToString(); - // Create & set a composite CancellationTokenSource which also contains the global app shoutdown token. - var cts = CancellationTokenSource.CreateLinkedTokenSource(AsyncRunner.AppShutdownCancellationToken, new CancellationTokenSource().Token); - _asyncState.SetCancelTokenSource(cts, stateName); + // Create & set a composite CancellationTokenSource which also contains the global app shoutdown token. + var cts = CancellationTokenSource.CreateLinkedTokenSource(AsyncRunner.AppShutdownCancellationToken, new CancellationTokenSource().Token); + _asyncState.SetCancelTokenSource(cts, stateName); - var ctx = new TaskExecutionContext(_componentContext, historyEntry) - { + var ctx = new TaskExecutionContext(_componentContext, historyEntry) + { ScheduleTaskHistory = historyEntry.Clone(), - CancellationToken = cts.Token, - Parameters = taskParameters ?? new Dictionary() - }; - - Logger.DebugFormat("Executing scheduled task: {0}", entity.Type); - - if (task is IAsyncTask asyncTask) - { - await asyncTask.ExecuteAsync(ctx); - } - else - { - task.Execute(ctx); - } + CancellationToken = cts.Token, + Parameters = taskParameters ?? new Dictionary() + }; + + Logger.DebugFormat("Executing scheduled task: {0}", entity.Type); + + if (task is IAsyncTask asyncTask) + { + await asyncTask.ExecuteAsync(ctx); + } + else + { + task.Execute(ctx); + } } catch (Exception ex) { exception = ex; faulted = true; - canceled = ex is OperationCanceledException; - lastError = ex.ToAllMessages(true); + canceled = ex is OperationCanceledException; + lastError = ex.ToAllMessages(true); if (canceled) { @@ -145,7 +145,7 @@ public async Task ExecuteAsync( } else { - Logger.Error(ex, string.Concat(T("Admin.System.ScheduleTasks.RunningError", entity.Name), ": ", ex.Message)); + Logger.Error(ex, string.Concat(T("Admin.System.ScheduleTasks.RunningError", entity.Name), ": ", ex.Message)); } } finally @@ -158,19 +158,19 @@ public async Task ExecuteAsync( historyEntry.ProgressMessage = null; historyEntry.Error = lastError; historyEntry.FinishedOnUtc = now; - - if (faulted) - { - if ((!canceled && entity.StopOnError) || task == null) - { - entity.Enabled = false; + + if (faulted) + { + if ((!canceled && entity.StopOnError) || task == null) + { + entity.Enabled = false; updateTask = true; - } - } - else - { + } + } + else + { historyEntry.SucceededOnUtc = now; - } + } try { @@ -190,8 +190,8 @@ public async Task ExecuteAsync( } if (entity.Enabled) - { - entity.NextRunUtc = _scheduledTaskService.GetNextSchedule(entity); + { + entity.NextRunUtc = _scheduledTaskService.GetNextSchedule(entity); updateTask = true; } diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs b/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs index 72eaabfc7c..f286db5350 100644 --- a/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs +++ b/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs @@ -10,137 +10,134 @@ namespace SmartStore.Services.Tasks { - public class DefaultTaskScheduler : DisposableObject, ITaskScheduler, IRegisteredObject + public class DefaultTaskScheduler : DisposableObject, ITaskScheduler, IRegisteredObject { - private readonly ICacheManager _cache; + private readonly ICacheManager _cache; - private bool _intervalFixed; - private int _sweepInterval; - private string _baseUrl; + private bool _intervalFixed; + private int _sweepInterval; + private string _baseUrl; private System.Timers.Timer _timer; private bool _shuttingDown; - private int _errCount; + private int _errCount; public DefaultTaskScheduler(ICacheManager cache) { - _cache = cache; + _cache = cache; - _sweepInterval = 1; - _timer = new System.Timers.Timer(); + _sweepInterval = 1; + _timer = new System.Timers.Timer(); _timer.Elapsed += Elapsed; - Logger = NullLogger.Instance; + Logger = NullLogger.Instance; HostingEnvironment.RegisterObject(this); } - public ILogger Logger - { - get; - set; - } + public ILogger Logger + { + get; + set; + } - public int SweepIntervalMinutes + public int SweepIntervalMinutes { - get { return _sweepInterval; } - set { _sweepInterval = value; } + get => _sweepInterval; + set => _sweepInterval = value; } public string BaseUrl { // TODO: HTTPS? - get { return _baseUrl; } + get => _baseUrl; set { CheckUrl(value); _baseUrl = value.TrimEnd('/', '\\'); - } + } } public void Start() { - if (_timer.Enabled) - return; - - lock (_timer) + if (_timer.Enabled) + return; + + lock (_timer) { CheckUrl(_baseUrl); - _timer.Interval = GetFixedInterval(); + _timer.Interval = GetFixedInterval(); _timer.Start(); } } - private double GetFixedInterval() - { - // Gets seconds to next sweep minute - int seconds = (_sweepInterval * 60) - DateTime.Now.Second; - return seconds * 1000; - } + private double GetFixedInterval() + { + // Gets seconds to next sweep minute + int seconds = (_sweepInterval * 60) - DateTime.Now.Second; + return seconds * 1000; + } public void Stop() { - if (!_timer.Enabled) - return; - - lock (_timer) + if (!_timer.Enabled) + return; + + lock (_timer) { _timer.Stop(); } } - public bool IsActive + public bool IsActive => _timer.Enabled; + + public string GetAsyncStateKey(int scheduleTaskId) { - get { return _timer.Enabled; } + return scheduleTaskId.ToString(); } - public string GetAsyncStateKey(int scheduleTaskId) - { - return scheduleTaskId.ToString(); - } - - private string CreateAuthToken() - { - string authToken = Guid.NewGuid().ToString(); + private string CreateAuthToken() + { + string authToken = Guid.NewGuid().ToString(); - _cache.Put(GenerateAuthTokenCacheKey(authToken), true, TimeSpan.FromMinutes(1)); + _cache.Put(GenerateAuthTokenCacheKey(authToken), true, TimeSpan.FromMinutes(1)); - return authToken; - } + return authToken; + } - private string GenerateAuthTokenCacheKey(string authToken) - { - return "Scheduler:AuthToken:" + authToken; - } + private string GenerateAuthTokenCacheKey(string authToken) + { + return "Scheduler:AuthToken:" + authToken; + } public bool VerifyAuthToken(string authToken) { if (authToken.IsEmpty()) return false; - var cacheKey = GenerateAuthTokenCacheKey(authToken); - if (_cache.Contains(cacheKey)) - { - _cache.Remove(cacheKey); - return true; - } + var cacheKey = GenerateAuthTokenCacheKey(authToken); + if (_cache.Contains(cacheKey)) + { + _cache.Remove(cacheKey); + return true; + } - return false; + return false; } public void RunSingleTask(int scheduleTaskId, IDictionary taskParameters = null) { - taskParameters = taskParameters ?? new Dictionary(); + taskParameters = taskParameters ?? new Dictionary(); - // User executes task in backend explicitly - taskParameters["Explicit"] = "true"; + // User executes task in backend explicitly + taskParameters["Explicit"] = "true"; var qs = new QueryString(); - taskParameters.Each(x => qs.Add(x.Key, x.Value)); - var query = qs.ToString(); + taskParameters.Each(x => qs.Add(x.Key, x.Value)); + var query = qs.ToString(); - CallEndpoint(new Uri("{0}/Execute/{1}{2}".FormatInvariant(_baseUrl, scheduleTaskId, query))); + CallEndpoint(new Uri("{0}/Execute/{1}{2}".FormatInvariant(_baseUrl, scheduleTaskId, query))); } - private void Elapsed(object sender, System.Timers.ElapsedEventArgs e) + private void Elapsed(object sender, System.Timers.ElapsedEventArgs e) { if (!System.Threading.Monitor.TryEnter(_timer)) return; @@ -149,13 +146,13 @@ private void Elapsed(object sender, System.Timers.ElapsedEventArgs e) { if (_timer.Enabled) { - if (!_intervalFixed) - { - _timer.Interval = TimeSpan.FromMinutes(_sweepInterval).TotalMilliseconds; - _intervalFixed = true; - } + if (!_intervalFixed) + { + _timer.Interval = TimeSpan.FromMinutes(_sweepInterval).TotalMilliseconds; + _intervalFixed = true; + } - CallEndpoint(new Uri(_baseUrl + "/Sweep")); + CallEndpoint(new Uri(_baseUrl + "/Sweep")); } } finally @@ -169,73 +166,73 @@ protected internal virtual void CallEndpoint(Uri uri) if (_shuttingDown) return; - var req = WebHelper.CreateHttpRequestForSafeLocalCall(uri); - req.Method = "POST"; + var req = WebHelper.CreateHttpRequestForSafeLocalCall(uri); + req.Method = "POST"; req.ContentType = "text/plain"; - req.ContentLength = 0; - req.Timeout = 10000; // 10 sec. + req.ContentLength = 0; + req.Timeout = 10000; // 10 sec. string authToken = CreateAuthToken(); req.Headers.Add("X-AUTH-TOKEN", authToken); - req.GetResponseAsync().ContinueWith(t => - { - if (t.IsFaulted) - { - HandleException(t.Exception, uri); - _errCount++; - if (_errCount >= 10) - { - // 10 failed attempts in succession. Stop the timer! - this.Stop(); - Logger.Info("Stopping TaskScheduler sweep timer. Too many failed requests in succession."); - } - } - else - { - _errCount = 0; - var response = t.Result; - - //_logger.DebugFormat("TaskScheduler Sweep called successfully: {0}", response.GetResponseStream().AsString()); - - response.Dispose(); - } - }); - } - - private void HandleException(AggregateException exception, Uri uri) - { - string msg = "Error while calling TaskScheduler endpoint '{0}'.".FormatInvariant(uri.OriginalString); - var wex = exception.InnerExceptions.OfType().FirstOrDefault(); - - if (wex == null) - { - Logger.Error(exception.InnerException, msg); - } - else if (wex.Response == null) - { - Logger.Error(wex, msg); - } - else - { - using (var response = wex.Response as HttpWebResponse) - { - if (response != null) - { - var statusCode = (int)response.StatusCode; - if (statusCode < 500) - { - // Any internal server error (>= 500) already handled by TaskSchedulerController's exception filter - msg += " HTTP {0}, {1}".FormatCurrent(statusCode, response.StatusDescription); - Logger.Error(msg); - } - } - - } - } - } - - private void CheckUrl(string url) + req.GetResponseAsync().ContinueWith(t => + { + if (t.IsFaulted) + { + HandleException(t.Exception, uri); + _errCount++; + if (_errCount >= 10) + { + // 10 failed attempts in succession. Stop the timer! + this.Stop(); + Logger.Info("Stopping TaskScheduler sweep timer. Too many failed requests in succession."); + } + } + else + { + _errCount = 0; + var response = t.Result; + + //_logger.DebugFormat("TaskScheduler Sweep called successfully: {0}", response.GetResponseStream().AsString()); + + response.Dispose(); + } + }); + } + + private void HandleException(AggregateException exception, Uri uri) + { + string msg = "Error while calling TaskScheduler endpoint '{0}'.".FormatInvariant(uri.OriginalString); + var wex = exception.InnerExceptions.OfType().FirstOrDefault(); + + if (wex == null) + { + Logger.Error(exception.InnerException, msg); + } + else if (wex.Response == null) + { + Logger.Error(wex, msg); + } + else + { + using (var response = wex.Response as HttpWebResponse) + { + if (response != null) + { + var statusCode = (int)response.StatusCode; + if (statusCode < 500) + { + // Any internal server error (>= 500) already handled by TaskSchedulerController's exception filter + msg += " HTTP {0}, {1}".FormatCurrent(statusCode, response.StatusDescription); + Logger.Error(msg); + } + } + + } + } + } + + private void CheckUrl(string url) { if (!url.IsWebUrl()) { @@ -254,7 +251,7 @@ protected override void OnDispose(bool disposing) void IRegisteredObject.Stop(bool immediate) { _shuttingDown = true; - HostingEnvironment.UnregisterObject(this); + HostingEnvironment.UnregisterObject(this); } } } diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskSchedulerStarter.cs b/src/Libraries/SmartStore.Services/Tasks/TaskSchedulerStarter.cs index d3d5cc1906..c2de669aea 100644 --- a/src/Libraries/SmartStore.Services/Tasks/TaskSchedulerStarter.cs +++ b/src/Libraries/SmartStore.Services/Tasks/TaskSchedulerStarter.cs @@ -16,16 +16,16 @@ public sealed class TaskSchedulerStarter : IPostApplicationStart private readonly IEventPublisher _eventPublisher; public TaskSchedulerStarter( - ITaskScheduler taskScheduler, - IScheduleTaskService taskService, - IStoreService storeService, + ITaskScheduler taskScheduler, + IScheduleTaskService taskService, + IStoreService storeService, IEventPublisher eventPublisher) { _taskScheduler = taskScheduler; _taskService = taskService; _storeService = storeService; _eventPublisher = eventPublisher; - + Logger = NullLogger.Instance; } diff --git a/src/Libraries/SmartStore.Services/Tax/CalculateTaxResult.cs b/src/Libraries/SmartStore.Services/Tax/CalculateTaxResult.cs index bca952c015..4431af2868 100644 --- a/src/Libraries/SmartStore.Services/Tax/CalculateTaxResult.cs +++ b/src/Libraries/SmartStore.Services/Tax/CalculateTaxResult.cs @@ -22,13 +22,7 @@ public CalculateTaxResult() /// public IList Errors { get; set; } - public bool Success - { - get - { - return this.Errors.Count == 0; - } - } + public bool Success => this.Errors.Count == 0; public void AddError(string error) { diff --git a/src/Libraries/SmartStore.Services/Tax/FreeTaxProvider.cs b/src/Libraries/SmartStore.Services/Tax/FreeTaxProvider.cs index 679cef0249..22737cf44d 100644 --- a/src/Libraries/SmartStore.Services/Tax/FreeTaxProvider.cs +++ b/src/Libraries/SmartStore.Services/Tax/FreeTaxProvider.cs @@ -4,17 +4,17 @@ namespace SmartStore.Services.Tax { - [SystemName("Tax.Free")] - [FriendlyName("Free tax rate provider")] - [DisplayOrder(0)] + [SystemName("Tax.Free")] + [FriendlyName("Free tax rate provider")] + [DisplayOrder(0)] public class FreeTaxProvider : ITaxProvider { - - public CalculateTaxResult GetTaxRate(CalculateTaxRequest calculateTaxRequest) + + public CalculateTaxResult GetTaxRate(CalculateTaxRequest calculateTaxRequest) { var result = new CalculateTaxResult() { - TaxRate = decimal.Zero + TaxRate = decimal.Zero }; return result; } diff --git a/src/Libraries/SmartStore.Services/Tax/ITaxService.cs b/src/Libraries/SmartStore.Services/Tax/ITaxService.cs index 95bbe83faf..f38335ce69 100644 --- a/src/Libraries/SmartStore.Services/Tax/ITaxService.cs +++ b/src/Libraries/SmartStore.Services/Tax/ITaxService.cs @@ -33,14 +33,14 @@ public partial interface ITaxService /// /// Tax providers IEnumerable> LoadAllTaxProviders(); - + /// /// Gets tax rate /// - /// Product + /// Product /// Customer /// Tax rate decimal GetTaxRate(Product product, Customer customer); @@ -52,23 +52,23 @@ public partial interface ITaxService /// Customer /// Tax rate decimal GetTaxRate(int taxCategoryId, Customer customer); - + /// /// Gets tax rate /// - /// Product + /// Product /// Tax category identifier /// Customer /// Tax rate - decimal GetTaxRate(Product product, int taxCategoryId, Customer customer); - + decimal GetTaxRate(Product product, int taxCategoryId, Customer customer); + /// /// Gets price /// - /// Product + /// Product /// Price /// Tax rate /// Price @@ -84,140 +84,140 @@ public partial interface ITaxService /// Price decimal GetProductPrice(Product product, decimal price, Customer customer, out decimal taxRate); - /// - /// Gets price - /// - /// Product - /// Price - /// Customer - /// Currency - /// Tax rate - /// Price - decimal GetProductPrice(Product product, decimal price, Customer customer, Currency currency, out decimal taxRate); - - /// - /// Gets price - /// - /// Product - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Tax rate - /// Price - decimal GetProductPrice(Product product, decimal price, bool includingTax, Customer customer, out decimal taxRate); - - /// - /// Gets price - /// - /// Product - /// Tax category identifier - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Currency - /// A value indicating whether price already includes tax - /// Tax rate - /// Price - decimal GetProductPrice(Product product, - int taxCategoryId, - decimal price, + /// + /// Gets price + /// + /// Product + /// Price + /// Customer + /// Currency + /// Tax rate + /// Price + decimal GetProductPrice(Product product, decimal price, Customer customer, Currency currency, out decimal taxRate); + + /// + /// Gets price + /// + /// Product + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Tax rate + /// Price + decimal GetProductPrice(Product product, decimal price, bool includingTax, Customer customer, out decimal taxRate); + + /// + /// Gets price + /// + /// Product + /// Tax category identifier + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Currency + /// A value indicating whether price already includes tax + /// Tax rate + /// Price + decimal GetProductPrice(Product product, + int taxCategoryId, + decimal price, bool includingTax, - Customer customer, - Currency currency, - bool priceIncludesTax, - out decimal taxRate); - - - - - /// - /// Gets the shipping price - /// - /// Price - /// Customer - /// Shipping price - decimal GetShippingPrice(decimal price, Customer customer); - - /// - /// Gets the shipping price - /// - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Shipping price - decimal GetShippingPrice(decimal price, bool includingTax, Customer customer); - - /// - /// Gets the shipping price - /// - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Tax rate - /// Shipping price - decimal GetShippingPrice(decimal price, bool includingTax, Customer customer, out decimal taxRate); - - /// - /// Gets the shipping price - /// - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Tax category id - /// Tax rate - /// Shipping price - decimal GetShippingPrice(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate); - - - - - /// - /// Gets payment method additional handling fee - /// - /// Price - /// Customer - /// Payment fee - decimal GetPaymentMethodAdditionalFee(decimal price, Customer customer); - - /// - /// Gets payment method additional handling fee - /// - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Payment fee - decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer); - - /// - /// Gets payment method additional handling fee - /// - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Tax rate - /// Payment fee - decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, out decimal taxRate); - - /// - /// Gets payment method additional handling fee - /// - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Tax category id - /// Tax rate - /// Payment fee - decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate); - - - - - /// - /// Gets checkout attribute value price - /// - /// Checkout attribute value - /// Price - decimal GetCheckoutAttributePrice(CheckoutAttributeValue cav); + Customer customer, + Currency currency, + bool priceIncludesTax, + out decimal taxRate); + + + + + /// + /// Gets the shipping price + /// + /// Price + /// Customer + /// Shipping price + decimal GetShippingPrice(decimal price, Customer customer); + + /// + /// Gets the shipping price + /// + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Shipping price + decimal GetShippingPrice(decimal price, bool includingTax, Customer customer); + + /// + /// Gets the shipping price + /// + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Tax rate + /// Shipping price + decimal GetShippingPrice(decimal price, bool includingTax, Customer customer, out decimal taxRate); + + /// + /// Gets the shipping price + /// + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Tax category id + /// Tax rate + /// Shipping price + decimal GetShippingPrice(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate); + + + + + /// + /// Gets payment method additional handling fee + /// + /// Price + /// Customer + /// Payment fee + decimal GetPaymentMethodAdditionalFee(decimal price, Customer customer); + + /// + /// Gets payment method additional handling fee + /// + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Payment fee + decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer); + + /// + /// Gets payment method additional handling fee + /// + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Tax rate + /// Payment fee + decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, out decimal taxRate); + + /// + /// Gets payment method additional handling fee + /// + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Tax category id + /// Tax rate + /// Payment fee + decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate); + + + + + /// + /// Gets checkout attribute value price + /// + /// Checkout attribute value + /// Price + decimal GetCheckoutAttributePrice(CheckoutAttributeValue cav); /// /// Gets checkout attribute value price @@ -251,7 +251,7 @@ decimal GetCheckoutAttributePrice(CheckoutAttributeValue cav, - + /// /// Gets VAT Number status @@ -276,7 +276,7 @@ VatNumberStatus GetVatNumberStatus(string fullVatNumber, /// VAT number /// VAT Number status VatNumberStatus GetVatNumberStatus(string twoLetterIsoCode, string vatNumber); - + /// /// Gets VAT Number status /// @@ -285,7 +285,7 @@ VatNumberStatus GetVatNumberStatus(string fullVatNumber, /// Name (if received) /// Address (if received) /// VAT Number status - VatNumberStatus GetVatNumberStatus(string twoLetterIsoCode, string vatNumber, + VatNumberStatus GetVatNumberStatus(string twoLetterIsoCode, string vatNumber, out string name, out string address); /// @@ -297,7 +297,7 @@ VatNumberStatus GetVatNumberStatus(string twoLetterIsoCode, string vatNumber, /// Address /// Exception /// VAT number status - VatNumberStatus DoVatCheck(string twoLetterIsoCode, string vatNumber, + VatNumberStatus DoVatCheck(string twoLetterIsoCode, string vatNumber, out string name, out string address, out Exception exception); diff --git a/src/Libraries/SmartStore.Services/Tax/TaxCategoryService.cs b/src/Libraries/SmartStore.Services/Tax/TaxCategoryService.cs index 4038498b9b..30bbe8f8b2 100644 --- a/src/Libraries/SmartStore.Services/Tax/TaxCategoryService.cs +++ b/src/Libraries/SmartStore.Services/Tax/TaxCategoryService.cs @@ -31,21 +31,21 @@ public virtual void DeleteTaxCategory(TaxCategory taxCategory) public virtual IList GetAllTaxCategories() { - var query = from tc in _taxCategoryRepository.Table - orderby tc.DisplayOrder - select tc; + var query = from tc in _taxCategoryRepository.Table + orderby tc.DisplayOrder + select tc; - var taxCategories = query.ToListCached("db.taxcategory.all"); - return taxCategories; - } + var taxCategories = query.ToListCached("db.taxcategory.all"); + return taxCategories; + } public virtual TaxCategory GetTaxCategoryById(int taxCategoryId) { if (taxCategoryId == 0) return null; - return _taxCategoryRepository.GetByIdCached(taxCategoryId, "db.taxcategory.id-" + taxCategoryId); - } + return _taxCategoryRepository.GetByIdCached(taxCategoryId, "db.taxcategory.id-" + taxCategoryId); + } public virtual void InsertTaxCategory(TaxCategory taxCategory) { diff --git a/src/Libraries/SmartStore.Services/Tax/TaxService.cs b/src/Libraries/SmartStore.Services/Tax/TaxService.cs index 20ad5a02ef..241b85f9fb 100644 --- a/src/Libraries/SmartStore.Services/Tax/TaxService.cs +++ b/src/Libraries/SmartStore.Services/Tax/TaxService.cs @@ -19,55 +19,55 @@ namespace SmartStore.Services.Tax /// Tax service /// public partial class TaxService : ITaxService - { - #region Nested classes + { + #region Nested classes - private class TaxAddressKey : Tuple // - { - public TaxAddressKey(int customerId, bool productIsEsd) - : base(customerId, productIsEsd) - { - } - } + private class TaxAddressKey : Tuple // + { + public TaxAddressKey(int customerId, bool productIsEsd) + : base(customerId, productIsEsd) + { + } + } - #endregion + #endregion - #region Fields + #region Fields - private static readonly DateTime _euEsdRegulationStart = new DateTime(2015, 01, 01); + private static readonly DateTime _euEsdRegulationStart = new DateTime(2015, 01, 01); - private readonly IAddressService _addressService; + private readonly IAddressService _addressService; private readonly IWorkContext _workContext; private readonly TaxSettings _taxSettings; - private readonly ShoppingCartSettings _cartSettings; + private readonly ShoppingCartSettings _cartSettings; private readonly IPluginFinder _pluginFinder; private readonly IDictionary _cachedTaxRates; - private readonly IDictionary _cachedTaxAddresses; - private readonly IProviderManager _providerManager; - private readonly IGeoCountryLookup _geoCountryLookup; + private readonly IDictionary _cachedTaxAddresses; + private readonly IProviderManager _providerManager; + private readonly IGeoCountryLookup _geoCountryLookup; #endregion #region Ctor public TaxService( - IAddressService addressService, + IAddressService addressService, IWorkContext workContext, TaxSettings taxSettings, - ShoppingCartSettings cartSettings, + ShoppingCartSettings cartSettings, IPluginFinder pluginFinder, - IGeoCountryLookup geoCountryLookup, - IProviderManager providerManager) + IGeoCountryLookup geoCountryLookup, + IProviderManager providerManager) { this._addressService = addressService; - this._workContext = workContext; - this._taxSettings = taxSettings; - this._cartSettings = cartSettings; - this._pluginFinder = pluginFinder; - this._cachedTaxRates = new Dictionary(); - this._cachedTaxAddresses = new Dictionary(); - this._providerManager = providerManager; - this._geoCountryLookup = geoCountryLookup; + this._workContext = workContext; + this._taxSettings = taxSettings; + this._cartSettings = cartSettings; + this._pluginFinder = pluginFinder; + this._cachedTaxRates = new Dictionary(); + this._cachedTaxAddresses = new Dictionary(); + this._providerManager = providerManager; + this._geoCountryLookup = geoCountryLookup; } #endregion @@ -119,95 +119,95 @@ protected CalculateTaxRequest CreateCalculateTaxRequest(Product product, int tax return calculateTaxRequest; } - /// - /// Gets a value indicating whether the given customer is a consumer (NOT a business/company) within the EU - /// - /// Customer - /// true if the customer is a consumer, false otherwise - /// - /// A customer is assumed to be a consumer if the default tax address doesn't include a company name, - /// OR if a company name was specified but the EU VAT number for this record is invalid. - /// - protected virtual bool IsEuConsumer(Customer customer) - { - if (customer == null) - return false; - - var address = customer.BillingAddress; - if (address != null && address.Company.IsEmpty()) - { - // BillingAddress is explicitly set, but no CompanyName in there: so we assume a consumer - return true; - } + /// + /// Gets a value indicating whether the given customer is a consumer (NOT a business/company) within the EU + /// + /// Customer + /// true if the customer is a consumer, false otherwise + /// + /// A customer is assumed to be a consumer if the default tax address doesn't include a company name, + /// OR if a company name was specified but the EU VAT number for this record is invalid. + /// + protected virtual bool IsEuConsumer(Customer customer) + { + if (customer == null) + return false; + + var address = customer.BillingAddress; + if (address != null && address.Company.IsEmpty()) + { + // BillingAddress is explicitly set, but no CompanyName in there: so we assume a consumer + return true; + } // No Country or BillingAddress set: try to resolve country from IP address var subjectToVat = _geoCountryLookup.LookupCountry(customer.LastIpAddress)?.IsInEu == true; - if (!subjectToVat) - { - return false; - } + if (!subjectToVat) + { + return false; + } - // It's EU: check VAT number status - var vatStatus = (VatNumberStatus)customer.VatNumberStatusId; - // companies with invalid VAT numbers are assumed to be consumers - return vatStatus != VatNumberStatus.Valid; - } + // It's EU: check VAT number status + var vatStatus = (VatNumberStatus)customer.VatNumberStatusId; + // companies with invalid VAT numbers are assumed to be consumers + return vatStatus != VatNumberStatus.Valid; + } protected virtual Address GetTaxAddress(Customer customer, Product product = null) { - int customerId = customer != null ? customer.Id : 0; - Address address = null; - - bool productIsEsd = product != null ? product.IsEsd : false; - - var cacheKey = new TaxAddressKey(customerId, productIsEsd); - if (_cachedTaxAddresses.TryGetValue(cacheKey, out address)) - { - return address; - } - - var basedOn = _taxSettings.TaxBasedOn; - - // According to the new EU VAT regulations for electronic services from 2015 on, - // VAT must be charged in the EU country the customer originates from (BILLING address). - // In addition to this, the IP addresses' origin should also be checked for verification. - if (DateTime.UtcNow > _euEsdRegulationStart) - { - if (_taxSettings.EuVatEnabled && productIsEsd) - { - if (IsEuConsumer(customer)) - { - basedOn = TaxBasedOn.BillingAddress; - } - } - } - - if (basedOn == TaxBasedOn.BillingAddress && (customer == null || customer.BillingAddress == null)) - { - basedOn = TaxBasedOn.DefaultAddress; - } - if (basedOn == TaxBasedOn.ShippingAddress && (customer == null || customer.ShippingAddress == null)) - { - basedOn = TaxBasedOn.DefaultAddress; - } - - switch (basedOn) - { - case TaxBasedOn.BillingAddress: - address = customer.BillingAddress; - break; - case TaxBasedOn.ShippingAddress: - address = customer.ShippingAddress; - break; - case TaxBasedOn.DefaultAddress: - default: - address = _addressService.GetAddressById(_taxSettings.DefaultTaxAddressId); - break; - } - - _cachedTaxAddresses[cacheKey] = address; - - return address; + int customerId = customer != null ? customer.Id : 0; + Address address = null; + + bool productIsEsd = product != null ? product.IsEsd : false; + + var cacheKey = new TaxAddressKey(customerId, productIsEsd); + if (_cachedTaxAddresses.TryGetValue(cacheKey, out address)) + { + return address; + } + + var basedOn = _taxSettings.TaxBasedOn; + + // According to the new EU VAT regulations for electronic services from 2015 on, + // VAT must be charged in the EU country the customer originates from (BILLING address). + // In addition to this, the IP addresses' origin should also be checked for verification. + if (DateTime.UtcNow > _euEsdRegulationStart) + { + if (_taxSettings.EuVatEnabled && productIsEsd) + { + if (IsEuConsumer(customer)) + { + basedOn = TaxBasedOn.BillingAddress; + } + } + } + + if (basedOn == TaxBasedOn.BillingAddress && (customer == null || customer.BillingAddress == null)) + { + basedOn = TaxBasedOn.DefaultAddress; + } + if (basedOn == TaxBasedOn.ShippingAddress && (customer == null || customer.ShippingAddress == null)) + { + basedOn = TaxBasedOn.DefaultAddress; + } + + switch (basedOn) + { + case TaxBasedOn.BillingAddress: + address = customer.BillingAddress; + break; + case TaxBasedOn.ShippingAddress: + address = customer.ShippingAddress; + break; + case TaxBasedOn.DefaultAddress: + default: + address = _addressService.GetAddressById(_taxSettings.DefaultTaxAddressId); + break; + } + + _cachedTaxAddresses[cacheKey] = address; + + return address; } /// @@ -228,10 +228,10 @@ protected decimal CalculatePrice(decimal price, decimal percent, bool increase, result = price * (1 + percent / 100); } else - { - var decreaseValue = (price) / (100 + percent) * percent; + { + var decreaseValue = (price) / (100 + percent) * percent; result = price - decreaseValue; - } + } // Gross > Net RoundFix result = result.RoundIfEnabledFor(currency); @@ -252,7 +252,7 @@ public virtual Provider LoadActiveTaxProvider() if (taxProvider == null) { taxProvider = LoadAllTaxProviders().FirstOrDefault(); - } + } return taxProvider; } @@ -263,7 +263,7 @@ public virtual Provider LoadActiveTaxProvider() /// Found tax provider public virtual Provider LoadTaxProviderBySystemName(string systemName) { - return _providerManager.GetProvider(systemName); + return _providerManager.GetProvider(systemName); } /// @@ -272,7 +272,7 @@ public virtual Provider LoadTaxProviderBySystemName(string systemN /// Tax providers public virtual IEnumerable> LoadAllTaxProviders() { - return _providerManager.GetAllProviders(); + return _providerManager.GetAllProviders(); } @@ -325,31 +325,31 @@ public virtual decimal GetTaxRate(Product product, int taxCategoryId, Customer c protected virtual decimal GetTaxRateCore(Product product, int taxCategoryId, Customer customer) { - // active tax provider - var activeTaxProvider = LoadActiveTaxProvider(); - if (activeTaxProvider == null) - { - return decimal.Zero; - } + // active tax provider + var activeTaxProvider = LoadActiveTaxProvider(); + if (activeTaxProvider == null) + { + return decimal.Zero; + } if (IsTaxExempt(product, customer)) { return decimal.Zero; } - // tax request + // tax request var calculateTaxRequest = CreateCalculateTaxRequest(product, taxCategoryId, customer); - #region Legacy - ////make EU VAT exempt validation (the European Union Value Added Tax) (VATFIX) + #region Legacy + ////make EU VAT exempt validation (the European Union Value Added Tax) (VATFIX) //if (_taxSettings.EuVatEnabled && IsVatExempt(calculateTaxRequest.Address, calculateTaxRequest.Customer)) //{ // //return zero if VAT is not chargeable // return decimal.Zero; - //} - #endregion + //} + #endregion - //get tax rate + //get tax rate var calculateTaxResult = activeTaxProvider.Value.GetTaxRate(calculateTaxRequest); if (calculateTaxResult.Success) { @@ -390,61 +390,61 @@ public virtual decimal GetProductPrice(Product product, decimal price, Customer return GetProductPrice(product, price, includingTax, customer, out taxRate); } - public virtual decimal GetProductPrice(Product product, decimal price, Customer customer, Currency currency, out decimal taxRate) - { - var includingTax = _workContext.TaxDisplayType == TaxDisplayType.IncludingTax; - var priceIncludesTax = _taxSettings.PricesIncludeTax; - var taxCategoryId = product.TaxCategoryId; // 0; // (VATFIX) + public virtual decimal GetProductPrice(Product product, decimal price, Customer customer, Currency currency, out decimal taxRate) + { + var includingTax = _workContext.TaxDisplayType == TaxDisplayType.IncludingTax; + var priceIncludesTax = _taxSettings.PricesIncludeTax; + var taxCategoryId = product.TaxCategoryId; // 0; // (VATFIX) - return GetProductPrice(product, taxCategoryId, price, includingTax, customer, currency, priceIncludesTax, out taxRate); - } + return GetProductPrice(product, taxCategoryId, price, includingTax, customer, currency, priceIncludesTax, out taxRate); + } - /// - /// Gets price - /// - /// Product - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// Tax rate - /// Price - public virtual decimal GetProductPrice(Product product, decimal price, bool includingTax, Customer customer, out decimal taxRate) + /// + /// Gets price + /// + /// Product + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// Tax rate + /// Price + public virtual decimal GetProductPrice(Product product, decimal price, bool includingTax, Customer customer, out decimal taxRate) { var priceIncludesTax = _taxSettings.PricesIncludeTax; var taxCategoryId = product.TaxCategoryId; // 0; // (VATFIX) return GetProductPrice(product, taxCategoryId, price, includingTax, customer, _workContext.WorkingCurrency, priceIncludesTax, out taxRate); - } + } - /// - /// Gets price - /// - /// Product - /// Tax category identifier - /// Price - /// A value indicating whether calculated price should include tax - /// Customer - /// A value indicating whether price already includes tax - /// Tax rate - /// Price - public virtual decimal GetProductPrice( - Product product, - int taxCategoryId, - decimal price, - bool includingTax, - Customer customer, - Currency currency, - bool priceIncludesTax, - out decimal taxRate) - { - // don't calculate if price is 0 - if (price == decimal.Zero) - { - taxRate = decimal.Zero; - return decimal.Zero; - } - - taxRate = GetTaxRate(product, taxCategoryId, customer); + /// + /// Gets price + /// + /// Product + /// Tax category identifier + /// Price + /// A value indicating whether calculated price should include tax + /// Customer + /// A value indicating whether price already includes tax + /// Tax rate + /// Price + public virtual decimal GetProductPrice( + Product product, + int taxCategoryId, + decimal price, + bool includingTax, + Customer customer, + Currency currency, + bool priceIncludesTax, + out decimal taxRate) + { + // don't calculate if price is 0 + if (price == decimal.Zero) + { + taxRate = decimal.Zero; + return decimal.Zero; + } + + taxRate = GetTaxRate(product, taxCategoryId, customer); // Admin: GROSS prices if (priceIncludesTax) @@ -473,7 +473,7 @@ public virtual decimal GetProductPrice( - public virtual decimal GetShippingPrice(decimal price, Customer customer) + public virtual decimal GetShippingPrice(decimal price, Customer customer) { var includingTax = (_workContext.TaxDisplayType == TaxDisplayType.IncludingTax); return GetShippingPrice(price, includingTax, customer); @@ -487,32 +487,32 @@ public virtual decimal GetShippingPrice(decimal price, bool includingTax, Custom public virtual decimal GetShippingPrice(decimal price, bool includingTax, Customer customer, out decimal taxRate) { - return GetShippingPrice(price, includingTax, customer, _taxSettings.ShippingTaxClassId, out taxRate); - } + return GetShippingPrice(price, includingTax, customer, _taxSettings.ShippingTaxClassId, out taxRate); + } - public virtual decimal GetShippingPrice(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate) - { - taxRate = decimal.Zero; + public virtual decimal GetShippingPrice(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate) + { + taxRate = decimal.Zero; - if (!_taxSettings.ShippingIsTaxable) - return price; + if (!_taxSettings.ShippingIsTaxable) + return price; - var result = GetProductPrice( - null, - taxCategoryId, - price, - includingTax, - customer, - _workContext.WorkingCurrency, - _taxSettings.ShippingPriceIncludesTax, - out taxRate); + var result = GetProductPrice( + null, + taxCategoryId, + price, + includingTax, + customer, + _workContext.WorkingCurrency, + _taxSettings.ShippingPriceIncludesTax, + out taxRate); - return result; - } + return result; + } - public virtual decimal GetPaymentMethodAdditionalFee(decimal price, Customer customer) + public virtual decimal GetPaymentMethodAdditionalFee(decimal price, Customer customer) { var includingTax = (_workContext.TaxDisplayType == TaxDisplayType.IncludingTax); return GetPaymentMethodAdditionalFee(price, includingTax, customer); @@ -524,12 +524,12 @@ public virtual decimal GetPaymentMethodAdditionalFee(decimal price, bool includi return GetPaymentMethodAdditionalFee(price, includingTax, customer, out taxRate); } - public virtual decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, out decimal taxRate) - { - return GetPaymentMethodAdditionalFee(price, includingTax, customer, _taxSettings.PaymentMethodAdditionalFeeTaxClassId, out taxRate); - } + public virtual decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, out decimal taxRate) + { + return GetPaymentMethodAdditionalFee(price, includingTax, customer, _taxSettings.PaymentMethodAdditionalFeeTaxClassId, out taxRate); + } - public virtual decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate) + public virtual decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate) { taxRate = decimal.Zero; @@ -537,16 +537,16 @@ public virtual decimal GetPaymentMethodAdditionalFee(decimal price, bool includi return price; var result = GetProductPrice( - null, - taxCategoryId, - price, - includingTax, - customer, - _workContext.WorkingCurrency, - _taxSettings.PaymentMethodAdditionalFeeIncludesTax, - out taxRate); + null, + taxCategoryId, + price, + includingTax, + customer, + _workContext.WorkingCurrency, + _taxSettings.PaymentMethodAdditionalFeeIncludesTax, + out taxRate); - return result; + return result; } @@ -605,8 +605,8 @@ public virtual decimal GetCheckoutAttributePrice(CheckoutAttributeValue cav, taxRate = decimal.Zero; var priceIncludesTax = _taxSettings.PricesIncludeTax; - var taxClassId = cav.CheckoutAttribute.TaxCategoryId; - var price = cav.PriceAdjustment; + var taxClassId = cav.CheckoutAttribute.TaxCategoryId; + var price = cav.PriceAdjustment; if (cav.CheckoutAttribute.IsTaxExempt) { diff --git a/src/Libraries/SmartStore.Services/Themes/ThemeValidationException.cs b/src/Libraries/SmartStore.Services/Themes/ThemeValidationException.cs index 060775b69b..fda9d06f1f 100644 --- a/src/Libraries/SmartStore.Services/Themes/ThemeValidationException.cs +++ b/src/Libraries/SmartStore.Services/Themes/ThemeValidationException.cs @@ -3,16 +3,16 @@ namespace SmartStore.Services.Themes { - public class ThemeValidationException : Exception - { - public ThemeValidationException(string message, IDictionary attemptedVars) - : base(message) - { - Guard.NotNull(attemptedVars, nameof(attemptedVars)); + public class ThemeValidationException : Exception + { + public ThemeValidationException(string message, IDictionary attemptedVars) + : base(message) + { + Guard.NotNull(attemptedVars, nameof(attemptedVars)); - AttemptedVars = attemptedVars; - } + AttemptedVars = attemptedVars; + } - public IDictionary AttemptedVars { get; private set; } - } + public IDictionary AttemptedVars { get; private set; } + } } diff --git a/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs b/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs index 79f000af32..5f9b98f6a3 100644 --- a/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs +++ b/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs @@ -21,30 +21,30 @@ public class ThemeVariablesService : IThemeVariablesService private const string THEMEVARS_BY_THEME_KEY = "SmartStore.themevars.theme-{0}-{1}"; private const string THEMEVARS_PATTERN_KEY = "SmartStore.themevars."; - private readonly IRepository _rsVariables; + private readonly IRepository _rsVariables; private readonly IThemeRegistry _themeRegistry; private readonly IRequestCache _requestCache; private readonly IEventPublisher _eventPublisher; - private readonly Lazy _themeFileResolver; - private readonly HttpContextBase _httpContext; - - public ThemeVariablesService( - IRepository rsVariables, - IThemeRegistry themeRegistry, - IRequestCache requestCache, - IEventPublisher eventPublisher, - Lazy themeFileResolver, - HttpContextBase httpContext) + private readonly Lazy _themeFileResolver; + private readonly HttpContextBase _httpContext; + + public ThemeVariablesService( + IRepository rsVariables, + IThemeRegistry themeRegistry, + IRequestCache requestCache, + IEventPublisher eventPublisher, + Lazy themeFileResolver, + HttpContextBase httpContext) { _rsVariables = rsVariables; _themeRegistry = themeRegistry; _requestCache = requestCache; _eventPublisher = eventPublisher; - _themeFileResolver = themeFileResolver; - _httpContext = httpContext; - } + _themeFileResolver = themeFileResolver; + _httpContext = httpContext; + } - public virtual ExpandoObject GetThemeVariables(string themeName, int storeId) + public virtual ExpandoObject GetThemeVariables(string themeName, int storeId) { if (themeName.IsEmpty()) return null; @@ -60,17 +60,18 @@ public virtual ExpandoObject GetThemeVariables(string themeName, int storeId) // first get all default (static) var values from manifest... var manifest = _themeRegistry.GetThemeManifest(themeName); - manifest.Variables.Values.Each(v => { + manifest.Variables.Values.Each(v => + { dict.Add(v.Name, v.DefaultValue); }); // ...then merge with persisted runtime records var query = from v in _rsVariables.TableUntracked - where v.StoreId == storeId && v.Theme.Equals(themeName, StringComparison.OrdinalIgnoreCase) + where v.StoreId == storeId && v.Theme.Equals(themeName, StringComparison.OrdinalIgnoreCase) select v; - query.ToList().Each(v => - { + query.ToList().Each(v => + { if (v.Value.HasValue() && dict.ContainsKey(v.Name)) { dict[v.Name] = v.Value; @@ -83,155 +84,155 @@ public virtual ExpandoObject GetThemeVariables(string themeName, int storeId) public virtual void DeleteThemeVariables(string themeName, int storeId) { - DeleteThemeVariablesInternal(themeName, storeId); - } - - private void DeleteThemeVariablesInternal(string themeName, int storeId) - { - Guard.NotEmpty(themeName, nameof(themeName)); - - var query = from v in _rsVariables.Table - where v.StoreId == storeId && v.Theme == themeName - select v; - - if (query.Any()) - { - using (var scope = new DbContextScope(ctx: _rsVariables.Context, autoCommit: false)) - { - query.Each(v => - { - _rsVariables.Delete(v); - }); - - _requestCache.Remove(THEMEVARS_BY_THEME_KEY.FormatInvariant(themeName, storeId)); - - _rsVariables.Context.SaveChanges(); - } - } - } - - public virtual int SaveThemeVariables(string themeName, int storeId, IDictionary variables) - { - Guard.NotEmpty(themeName, nameof(themeName)); - Guard.Against(!_themeRegistry.ThemeManifestExists(themeName), "The theme '{0}' does not exist in the registry.".FormatInvariant(themeName)); - Guard.NotNull(variables, nameof(variables)); - - if (!variables.Any()) - return 0; - - var manifest = _themeRegistry.GetThemeManifest(themeName); - if (manifest == null) - { - throw new ArgumentException("Theme '{0}' does not exist".FormatInvariant(themeName), nameof(themeName)); - } - - // Get current for later restore on parse error - var currentVars = GetThemeVariables(themeName, storeId); - - // Save - var result = SaveThemeVariablesInternal(manifest, storeId, variables); - - if (result.TouchedVariablesCount > 0) - { - // Check for parsing error - string error = ValidateSass(manifest, storeId); - if (error.HasValue()) - { - // Restore previous vars - try - { - DeleteThemeVariablesInternal(themeName, storeId); - } - finally - { - // We do it here to absolutely ensure that this gets called - SaveThemeVariablesInternal(manifest, storeId, currentVars); - } - - throw new ThemeValidationException(error, variables); - } - } - - return result.TouchedVariablesCount; - } - - private SaveThemeVariablesResult SaveThemeVariablesInternal(ThemeManifest manifest, int storeId, IDictionary variables) + DeleteThemeVariablesInternal(themeName, storeId); + } + + private void DeleteThemeVariablesInternal(string themeName, int storeId) + { + Guard.NotEmpty(themeName, nameof(themeName)); + + var query = from v in _rsVariables.Table + where v.StoreId == storeId && v.Theme == themeName + select v; + + if (query.Any()) + { + using (var scope = new DbContextScope(ctx: _rsVariables.Context, autoCommit: false)) + { + query.Each(v => + { + _rsVariables.Delete(v); + }); + + _requestCache.Remove(THEMEVARS_BY_THEME_KEY.FormatInvariant(themeName, storeId)); + + _rsVariables.Context.SaveChanges(); + } + } + } + + public virtual int SaveThemeVariables(string themeName, int storeId, IDictionary variables) + { + Guard.NotEmpty(themeName, nameof(themeName)); + Guard.Against(!_themeRegistry.ThemeManifestExists(themeName), "The theme '{0}' does not exist in the registry.".FormatInvariant(themeName)); + Guard.NotNull(variables, nameof(variables)); + + if (!variables.Any()) + return 0; + + var manifest = _themeRegistry.GetThemeManifest(themeName); + if (manifest == null) + { + throw new ArgumentException("Theme '{0}' does not exist".FormatInvariant(themeName), nameof(themeName)); + } + + // Get current for later restore on parse error + var currentVars = GetThemeVariables(themeName, storeId); + + // Save + var result = SaveThemeVariablesInternal(manifest, storeId, variables); + + if (result.TouchedVariablesCount > 0) + { + // Check for parsing error + string error = ValidateSass(manifest, storeId); + if (error.HasValue()) + { + // Restore previous vars + try + { + DeleteThemeVariablesInternal(themeName, storeId); + } + finally + { + // We do it here to absolutely ensure that this gets called + SaveThemeVariablesInternal(manifest, storeId, currentVars); + } + + throw new ThemeValidationException(error, variables); + } + } + + return result.TouchedVariablesCount; + } + + private SaveThemeVariablesResult SaveThemeVariablesInternal(ThemeManifest manifest, int storeId, IDictionary variables) { - var result = new SaveThemeVariablesResult(); + var result = new SaveThemeVariablesResult(); var infos = manifest.Variables; - using (var scope = new DbContextScope(ctx: _rsVariables.Context, autoCommit: false)) - { - var unsavedVars = new List(); - var savedThemeVars = _rsVariables.Table - .Where(v => v.StoreId == storeId && v.Theme == manifest.ThemeName) - .ToDictionary(x => x.Name); - - bool touched = false; - - foreach (var v in variables) - { - ThemeVariableInfo info; - if (!infos.TryGetValue(v.Key, out info)) - { - // var not specified in metadata so don't save - // TODO: (MC) delete from db also if it exists - continue; - } - - var value = v.Value == null ? string.Empty : v.Value.ToString(); - - var savedThemeVar = savedThemeVars.Get(v.Key); - if (savedThemeVar != null) - { - if (value.IsEmpty() || String.Equals(info.DefaultValue, value, StringComparison.CurrentCultureIgnoreCase)) - { - // it's either null or the default value, so delete - _rsVariables.Delete(savedThemeVar); - result.Deleted.Add(savedThemeVar); - touched = true; - } - else - { - // update entity - if (!savedThemeVar.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) - { - savedThemeVar.Value = value; - result.Updated.Add(savedThemeVar); - touched = true; - } - } - } - else - { - if (value.HasValue() && !String.Equals(info.DefaultValue, value, StringComparison.CurrentCultureIgnoreCase)) - { - // insert entity (only when not default value) - unsavedVars.Add(v.Key); - savedThemeVar = new ThemeVariable - { - Theme = manifest.ThemeName, - Name = v.Key, - Value = value, - StoreId = storeId - }; - _rsVariables.Insert(savedThemeVar); - result.Inserted.Add(savedThemeVar); - touched = true; - } - } - } - - if (touched) - { - _rsVariables.Context.SaveChanges(); - } - } + using (var scope = new DbContextScope(ctx: _rsVariables.Context, autoCommit: false)) + { + var unsavedVars = new List(); + var savedThemeVars = _rsVariables.Table + .Where(v => v.StoreId == storeId && v.Theme == manifest.ThemeName) + .ToDictionary(x => x.Name); + + bool touched = false; + + foreach (var v in variables) + { + ThemeVariableInfo info; + if (!infos.TryGetValue(v.Key, out info)) + { + // var not specified in metadata so don't save + // TODO: (MC) delete from db also if it exists + continue; + } + + var value = v.Value == null ? string.Empty : v.Value.ToString(); + + var savedThemeVar = savedThemeVars.Get(v.Key); + if (savedThemeVar != null) + { + if (value.IsEmpty() || String.Equals(info.DefaultValue, value, StringComparison.CurrentCultureIgnoreCase)) + { + // it's either null or the default value, so delete + _rsVariables.Delete(savedThemeVar); + result.Deleted.Add(savedThemeVar); + touched = true; + } + else + { + // update entity + if (!savedThemeVar.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) + { + savedThemeVar.Value = value; + result.Updated.Add(savedThemeVar); + touched = true; + } + } + } + else + { + if (value.HasValue() && !String.Equals(info.DefaultValue, value, StringComparison.CurrentCultureIgnoreCase)) + { + // insert entity (only when not default value) + unsavedVars.Add(v.Key); + savedThemeVar = new ThemeVariable + { + Theme = manifest.ThemeName, + Name = v.Key, + Value = value, + StoreId = storeId + }; + _rsVariables.Insert(savedThemeVar); + result.Inserted.Add(savedThemeVar); + touched = true; + } + } + } + + if (touched) + { + _rsVariables.Context.SaveChanges(); + } + } return result; } - public int ImportVariables(string themeName, int storeId, string configurationXml) + public int ImportVariables(string themeName, int storeId, string configurationXml) { Guard.NotEmpty(themeName, nameof(themeName)); Guard.NotEmpty(configurationXml, nameof(configurationXml)); @@ -279,7 +280,7 @@ public string ExportVariables(string themeName, int storeId) using (var xmlWriter = XmlWriter.Create(sb)) { - + xmlWriter.WriteStartDocument(); xmlWriter.WriteStartElement("ThemeVars"); xmlWriter.WriteAttributeString("for", themeName); @@ -311,88 +312,85 @@ public string ExportVariables(string themeName, int storeId) } - /// - /// Validates the result SASS file by calling it's url. - /// - /// Theme name - /// Stored Id - /// The error message when a parsing error occured, null otherwise - private string ValidateSass(ThemeManifest manifest, int storeId) - { - string error = string.Empty; - - var virtualPath = "~/Themes/{0}/Content/theme.scss".FormatCurrent(manifest.ThemeName); - var resolver = _themeFileResolver.Value; - var file = resolver.Resolve(virtualPath); - if (file != null) - { - virtualPath = file.ResultVirtualPath; - } - - var url = "{0}?storeId={1}&theme={2}&validate=1".FormatInvariant( - WebHelper.GetAbsoluteUrl(virtualPath, _httpContext.Request), - storeId, - manifest.ThemeName); - - var request = WebHelper.CreateHttpRequestForSafeLocalCall(new Uri(url)); - WebResponse response = null; - - try - { - response = request.GetResponse(); - } - catch (WebException ex) - { - if (ex.Response is HttpWebResponse) - { - var webResponse = (HttpWebResponse)ex.Response; - var statusCode = webResponse.StatusCode; - - if (statusCode == HttpStatusCode.InternalServerError) - { - // catch only 500, as this indicates a parsing error. - var stream = webResponse.GetResponseStream(); - - using (var streamReader = new StreamReader(stream)) - { - // read the content (the error message has been put there) - error = streamReader.ReadToEnd(); - streamReader.Close(); - stream.Close(); - } - } - } - } - catch (Exception ex) - { - error = ex.Message; - } - finally - { - if (response != null) - response.Close(); - } - - return error; - } - } - - class SaveThemeVariablesResult - { - public SaveThemeVariablesResult() - { - Inserted = new List(); - Updated = new List(); - Deleted = new List(); - } - - public IList Inserted { get; private set; } - public IList Updated { get; private set; } - public IList Deleted { get; private set; } - - public int TouchedVariablesCount - { - get { return Inserted.Count + Updated.Count + Deleted.Count; } - } - } + /// + /// Validates the result SASS file by calling it's url. + /// + /// Theme name + /// Stored Id + /// The error message when a parsing error occured, null otherwise + private string ValidateSass(ThemeManifest manifest, int storeId) + { + string error = string.Empty; + + var virtualPath = "~/Themes/{0}/Content/theme.scss".FormatCurrent(manifest.ThemeName); + var resolver = _themeFileResolver.Value; + var file = resolver.Resolve(virtualPath); + if (file != null) + { + virtualPath = file.ResultVirtualPath; + } + + var url = "{0}?storeId={1}&theme={2}&validate=1".FormatInvariant( + WebHelper.GetAbsoluteUrl(virtualPath, _httpContext.Request), + storeId, + manifest.ThemeName); + + var request = WebHelper.CreateHttpRequestForSafeLocalCall(new Uri(url)); + WebResponse response = null; + + try + { + response = request.GetResponse(); + } + catch (WebException ex) + { + if (ex.Response is HttpWebResponse) + { + var webResponse = (HttpWebResponse)ex.Response; + var statusCode = webResponse.StatusCode; + + if (statusCode == HttpStatusCode.InternalServerError) + { + // catch only 500, as this indicates a parsing error. + var stream = webResponse.GetResponseStream(); + + using (var streamReader = new StreamReader(stream)) + { + // read the content (the error message has been put there) + error = streamReader.ReadToEnd(); + streamReader.Close(); + stream.Close(); + } + } + } + } + catch (Exception ex) + { + error = ex.Message; + } + finally + { + if (response != null) + response.Close(); + } + + return error; + } + } + + class SaveThemeVariablesResult + { + public SaveThemeVariablesResult() + { + Inserted = new List(); + Updated = new List(); + Deleted = new List(); + } + + public IList Inserted { get; private set; } + public IList Updated { get; private set; } + public IList Deleted { get; private set; } + + public int TouchedVariablesCount => Inserted.Count + Updated.Count + Deleted.Count; + } } diff --git a/src/Libraries/SmartStore.Services/Topics/ITopicService.cs b/src/Libraries/SmartStore.Services/Topics/ITopicService.cs index ccdd2e3588..7eede60f7a 100644 --- a/src/Libraries/SmartStore.Services/Topics/ITopicService.cs +++ b/src/Libraries/SmartStore.Services/Topics/ITopicService.cs @@ -22,28 +22,28 @@ public partial interface ITopicService /// Topic Topic GetTopicById(int topicId); - /// - /// Gets a topic - /// - /// The topic system name - /// Store identifier - /// Whether to check for permission (ACL). If true and check fails, null is returned. - /// Topic - Topic GetTopicBySystemName(string systemName, int storeId = 0, bool checkPermission = true); + /// + /// Gets a topic + /// + /// The topic system name + /// Store identifier + /// Whether to check for permission (ACL). If true and check fails, null is returned. + /// Topic + Topic GetTopicBySystemName(string systemName, int storeId = 0, bool checkPermission = true); - /// - /// Gets all topics - /// - /// Store identifier; pass 0 to load all records - /// Whether to load hidden records - /// Topics - IPagedList GetAllTopics(int storeId = 0, int pageIndex = 0, int pageSize = int.MaxValue, bool showHidden = false); + /// + /// Gets all topics + /// + /// Store identifier; pass 0 to load all records + /// Whether to load hidden records + /// Topics + IPagedList GetAllTopics(int storeId = 0, int pageIndex = 0, int pageSize = int.MaxValue, bool showHidden = false); - /// - /// Inserts a topic - /// - /// Topic - void InsertTopic(Topic topic); + /// + /// Inserts a topic + /// + /// Topic + void InsertTopic(Topic topic); /// /// Updates the topic diff --git a/src/Libraries/SmartStore.Services/Topics/TopicService.cs b/src/Libraries/SmartStore.Services/Topics/TopicService.cs index ecc51a491c..b91a15d2e1 100644 --- a/src/Libraries/SmartStore.Services/Topics/TopicService.cs +++ b/src/Libraries/SmartStore.Services/Topics/TopicService.cs @@ -15,36 +15,36 @@ namespace SmartStore.Services.Topics { public partial class TopicService : ITopicService, IXmlSitemapPublisher { - private readonly ICommonServices _services; - private readonly IRepository _topicRepository; - private readonly IRepository _storeMappingRepository; - private readonly IStoreMappingService _storeMappingService; - private readonly IRepository _aclRepository; - - public TopicService( - ICommonServices services, - IRepository topicRepository, - IRepository storeMappingRepository, - IStoreMappingService storeMappingService, - IRepository aclRepository, - SeoSettings seoSettings) + private readonly ICommonServices _services; + private readonly IRepository _topicRepository; + private readonly IRepository _storeMappingRepository; + private readonly IStoreMappingService _storeMappingService; + private readonly IRepository _aclRepository; + + public TopicService( + ICommonServices services, + IRepository topicRepository, + IRepository storeMappingRepository, + IStoreMappingService storeMappingService, + IRepository aclRepository, + SeoSettings seoSettings) { - _services = services; - _topicRepository = topicRepository; - _storeMappingRepository = storeMappingRepository; - _storeMappingService = storeMappingService; - _aclRepository = aclRepository; + _services = services; + _topicRepository = topicRepository; + _storeMappingRepository = storeMappingRepository; + _storeMappingService = storeMappingService; + _aclRepository = aclRepository; - this.QuerySettings = DbQuerySettings.Default; - } + this.QuerySettings = DbQuerySettings.Default; + } - public DbQuerySettings QuerySettings { get; set; } + public DbQuerySettings QuerySettings { get; set; } public virtual void DeleteTopic(Topic topic) { - Guard.NotNull(topic, nameof(topic)); + Guard.NotNull(topic, nameof(topic)); - _topicRepository.Delete(topic); + _topicRepository.Delete(topic); } public virtual Topic GetTopicById(int topicId) @@ -55,131 +55,131 @@ public virtual Topic GetTopicById(int topicId) return _topicRepository.GetByIdCached(topicId, "db.topic.id-" + topicId); } - public virtual Topic GetTopicBySystemName(string systemName, int storeId = 0, bool checkPermission = true) + public virtual Topic GetTopicBySystemName(string systemName, int storeId = 0, bool checkPermission = true) { - if (systemName.IsEmpty()) - return null; + if (systemName.IsEmpty()) + return null; + + var query = BuildTopicsQuery(systemName, storeId, !checkPermission); + var rolesIdent = checkPermission + ? "0" + : _services.WorkContext.CurrentCustomer.GetRolesIdent(); + + var result = query.FirstOrDefaultCached("db.topic.bysysname-{0}-{1}-{2}".FormatInvariant(systemName, storeId, rolesIdent)); - var query = BuildTopicsQuery(systemName, storeId, !checkPermission); - var rolesIdent = checkPermission - ? "0" - : _services.WorkContext.CurrentCustomer.GetRolesIdent(); - - var result = query.FirstOrDefaultCached("db.topic.bysysname-{0}-{1}-{2}".FormatInvariant(systemName, storeId, rolesIdent)); + return result; + } - return result; + public virtual IPagedList GetAllTopics(int storeId = 0, int pageIndex = 0, int pageSize = int.MaxValue, bool showHidden = false) + { + var query = BuildTopicsQuery(null, storeId, showHidden); + return new PagedList(query, pageIndex, pageSize); } - public virtual IPagedList GetAllTopics(int storeId = 0, int pageIndex = 0, int pageSize = int.MaxValue, bool showHidden = false) + protected virtual IQueryable BuildTopicsQuery(string systemName, int storeId, bool showHidden = false) { - var query = BuildTopicsQuery(null, storeId, showHidden); - return new PagedList(query, pageIndex, pageSize); - } - - protected virtual IQueryable BuildTopicsQuery(string systemName, int storeId, bool showHidden = false) - { - var entityName = nameof(Topic); - var joinApplied = false; - - var query = _topicRepository.Table.Where(x => showHidden || x.IsPublished); - - if (systemName.HasValue()) - { - query = query.Where(x => x.SystemName == systemName); - } - - // Store mapping - if (storeId > 0 && !QuerySettings.IgnoreMultiStore) - { - query = from t in query - join m in _storeMappingRepository.Table - on new { c1 = t.Id, c2 = "Topic" } equals new { c1 = m.EntityId, c2 = m.EntityName } into tm - from m in tm.DefaultIfEmpty() - where !t.LimitedToStores || storeId == m.StoreId - select t; - - joinApplied = true; - } - - // ACL (access control list) - if (!showHidden && !QuerySettings.IgnoreAcl) - { + var entityName = nameof(Topic); + var joinApplied = false; + + var query = _topicRepository.Table.Where(x => showHidden || x.IsPublished); + + if (systemName.HasValue()) + { + query = query.Where(x => x.SystemName == systemName); + } + + // Store mapping + if (storeId > 0 && !QuerySettings.IgnoreMultiStore) + { + query = from t in query + join m in _storeMappingRepository.Table + on new { c1 = t.Id, c2 = "Topic" } equals new { c1 = m.EntityId, c2 = m.EntityName } into tm + from m in tm.DefaultIfEmpty() + where !t.LimitedToStores || storeId == m.StoreId + select t; + + joinApplied = true; + } + + // ACL (access control list) + if (!showHidden && !QuerySettings.IgnoreAcl) + { var allowedCustomerRolesIds = _services.WorkContext.CurrentCustomer.GetRoleIds(); - query = from c in query - join a in _aclRepository.Table - on new { c1 = c.Id, c2 = entityName } equals new { c1 = a.EntityId, c2 = a.EntityName } into ca - from a in ca.DefaultIfEmpty() - where !c.SubjectToAcl || allowedCustomerRolesIds.Contains(a.CustomerRoleId) - select c; + query = from c in query + join a in _aclRepository.Table + on new { c1 = c.Id, c2 = entityName } equals new { c1 = a.EntityId, c2 = a.EntityName } into ca + from a in ca.DefaultIfEmpty() + where !c.SubjectToAcl || allowedCustomerRolesIds.Contains(a.CustomerRoleId) + select c; - joinApplied = true; - } + joinApplied = true; + } - if (joinApplied) - { - // Only distinct topics (group by ID) - query = from t in query - group t by t.Id into tGroup - orderby tGroup.Key - select tGroup.FirstOrDefault(); - } + if (joinApplied) + { + // Only distinct topics (group by ID) + query = from t in query + group t by t.Id into tGroup + orderby tGroup.Key + select tGroup.FirstOrDefault(); + } - query = query.OrderBy(t => t.Priority).ThenBy(t => t.SystemName); + query = query.OrderBy(t => t.Priority).ThenBy(t => t.SystemName); - return query; - } + return query; + } public virtual void InsertTopic(Topic topic) { - Guard.NotNull(topic, nameof(topic)); + Guard.NotNull(topic, nameof(topic)); - _topicRepository.Insert(topic); + _topicRepository.Insert(topic); } public virtual void UpdateTopic(Topic topic) { - Guard.NotNull(topic, nameof(topic)); + Guard.NotNull(topic, nameof(topic)); - _topicRepository.Update(topic); + _topicRepository.Update(topic); } #region XML Sitemap public XmlSitemapProvider PublishXmlSitemap(XmlSitemapBuildContext context) - { - if (!context.LoadSetting().XmlSitemapIncludesTopics) - return null; - - var query = GetAllTopics(context.RequestStoreId).AlterQuery(q => - { - return q.Where(t => t.IncludeInSitemap && !t.RenderAsWidget); - }).SourceQuery; - - return new TopicXmlSitemapResult { Query = query }; - } - - class TopicXmlSitemapResult : XmlSitemapProvider - { - public IQueryable Query { get; set; } - - public override int GetTotalCount() - { - return Query.Count(); - } - - public override IEnumerable Enlist() - { - var topics = Query.Select(x => new { x.Id }).ToList(); - foreach (var x in topics) - { - yield return new NamedEntity { EntityName = "Topic", Id = x.Id, LastMod = DateTime.UtcNow }; - } - } - - public override int Order => 200; - } - - #endregion - } + { + if (!context.LoadSetting().XmlSitemapIncludesTopics) + return null; + + var query = GetAllTopics(context.RequestStoreId).AlterQuery(q => + { + return q.Where(t => t.IncludeInSitemap && !t.RenderAsWidget); + }).SourceQuery; + + return new TopicXmlSitemapResult { Query = query }; + } + + class TopicXmlSitemapResult : XmlSitemapProvider + { + public IQueryable Query { get; set; } + + public override int GetTotalCount() + { + return Query.Count(); + } + + public override IEnumerable Enlist() + { + var topics = Query.Select(x => new { x.Id }).ToList(); + foreach (var x in topics) + { + yield return new NamedEntity { EntityName = "Topic", Id = x.Id, LastMod = DateTime.UtcNow }; + } + } + + public override int Order => 200; + } + + #endregion + } } From b2048174f8bdf60ed3e07bb0e9de22d1e22f0b57 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 11 Sep 2020 20:18:32 +0200 Subject: [PATCH 201/695] Applied code cleanup to SmartStore.Web.Framework --- .../Bundling/BundlePublisher.cs | 2 +- .../Controllers/AdminControllerBase.cs | 56 +- .../Controllers/ContollerExtensions.cs | 502 ++-- .../Controllers/ManageController.cs | 30 +- .../Controllers/PaymentControllerBase.cs | 10 +- .../Controllers/PluginControllerBase.cs | 5 +- .../Controllers/PublicControllerBase.cs | 10 +- .../Controllers/SmartController.cs | 454 ++-- .../DependencyRegistrar.cs | 2086 ++++++++--------- .../Events/TabStripCreated.cs | 10 +- .../Extensions/ActionResultExtensions.cs | 31 +- .../Extensions/DateTimeExtensions.cs | 106 +- .../Extensions/HtmlExtensions.cs | 1216 +++++----- .../Extensions/HtmlPrefixScopeExtensions.cs | 6 +- .../Extensions/HtmlSelectListExtensions.cs | 278 +-- .../Extensions/HtmlZoneExtensions.cs | 266 +-- .../Extensions/HttpExtensions.cs | 499 ++-- .../Extensions/HttpSessionStateExtensions.cs | 90 +- .../Extensions/LocalizedValueExtensions.cs | 41 +- .../NameValueCollectionExtensions.cs | 10 +- .../Extensions/PostedFileResult.cs | 259 +- .../Extensions/TagBuilderExtensions.cs | 4 - .../Extensions/TelerikExtensions.cs | 458 ++-- .../Extensions/UrlHelperExtensions.cs | 258 +- .../Filters/CheckAffiliateAttribute.cs | 23 +- .../Filters/CompressAttribute.cs | 45 +- .../Filters/CookieConsentFilter.cs | 313 ++- .../Filters/CustomerLastActivityAttribute.cs | 20 +- .../Filters/FormValueRequiredAttribute.cs | 198 +- .../Filters/GdprConsentAttribute.cs | 184 +- .../Filters/HandleExceptionFilter.cs | 75 +- .../Filters/HandleInstallFilter.cs | 42 +- .../Filters/JsonNetAttribute.cs | 6 +- .../Filters/NotifyAttribute.cs | 127 +- .../PublicStoreAllowNavigationAttribute.cs | 60 +- .../Filters/ResponseFilterStream.cs | 52 +- .../Filters/StoreClosedAttribute.cs | 136 +- .../Filters/StoreIpAddressAttribute.cs | 28 +- .../Filters/StoreLastVisitedPageAttribute.cs | 32 +- .../Filters/UnitOfWorkAttribute.cs | 10 +- .../FrameworkCacheConsumer.cs | 144 +- .../Localization/ErrorMessageProvider.cs | 126 +- .../Localization/ILocalizedModel.cs | 11 +- .../Localization/IText.cs | 13 +- .../Localization/LanguageSeoCodeAttribute.cs | 30 +- .../Localization/LocalizedRoute.cs | 66 +- .../Localization/LocalizedRouteExtensions.cs | 6 +- .../SetWorkingCultureAttribute.cs | 255 +- .../Localization/SmartResourceDisplayName.cs | 8 +- .../TelerikLocalizationService.cs | 43 +- .../TelerikLocalizationServiceFactory.cs | 12 +- .../Localization/Text.cs | 77 +- .../Modelling/MediaTemplateModel.cs | 2 - .../Modelling/ModelBase.cs | 176 +- .../Modelling/ModelBoundEvent.cs | 18 +- .../Modelling/Results/CachedFileResult.cs | 457 ++-- .../Modelling/Results/FileResponder.cs | 1162 ++++----- .../Modelling/Results/FileTransmitter.cs | 244 +- .../Modelling/Results/IFileResponse.cs | 21 +- .../Modelling/Results/JsonNetResult.cs | 178 +- .../Results/PermissiveRedirectResult.cs | 37 +- .../Modelling/Results/RootActionViewResult.cs | 40 +- .../Modelling/Results/RssActionResult.cs | 2 +- .../Modelling/SmartMetadataProvider.cs | 58 +- .../Modelling/SmartModelBinder.cs | 248 +- .../Pdf/Content/PdfPartialViewContent.cs | 17 +- .../Pdf/Content/PdfRouteContent.cs | 63 +- .../Pdf/Content/PdfViewContent.cs | 72 +- .../Pdf/PdfHeaderFooterVariables.cs | 110 +- .../Pdf/PdfReceiptHeaderFooterModel.cs | 18 +- .../SmartStore.Web.Framework/Pdf/PdfResult.cs | 89 +- .../Plugins/PluginExtensions.cs | 46 +- .../Plugins/PluginMediator.cs | 591 +++-- .../Plugins/PluginRazorHost.cs | 59 +- .../Plugins/ProviderManager.cs | 268 +-- .../Plugins/ProviderModel.cs | 143 +- .../Properties/AssemblyInfo.cs | 1 - .../Routing/GuidConstraint.cs | 2 +- .../Routing/RoutePublisher.cs | 10 +- .../Security/AdminAuthorizeAttribute.cs | 8 +- .../AdminValidateIpAddressAttribute.cs | 93 +- .../Security/Captcha/CaptchaSettings.cs | 4 +- .../Security/Captcha/HtmlCaptchaExtensions.cs | 4 +- .../Captcha/ValidateCaptchaAttribute.cs | 36 +- .../Security/FilePermissionHelper.cs | 20 +- .../Security/Honeypot/Honeypot.cs | 104 +- .../Honeypot/HtmlHoneypotExtensions.cs | 25 +- .../Honeypot/ValidateHoneypotAttribute.cs | 46 +- .../Security/SanitizeHtmlAttribute.cs | 36 +- .../Seo/GenericPathRoute.cs | 138 +- .../Seo/GenericPathRouteExtensions.cs | 44 +- .../SmartStore.Web.Framework/Seo/ISeoModel.cs | 3 +- .../Seo/RewriteUrlAttribute.cs | 490 ++-- .../Settings/LoadSettingAttribute.cs | 256 +- .../Settings/SaveSettingAttribute.cs | 172 +- .../Settings/StoreDependingSettingData.cs | 20 +- .../Settings/StoreDependingSettingHelper.cs | 404 ++-- .../SmartUrlRoutingModule.cs | 519 ++-- .../Templating/Events.cs | 151 +- .../Templating/Liquid/Drops/DictionaryDrop.cs | 49 +- .../Liquid/Drops/EnumerableWrapper.cs | 58 +- .../Templating/Liquid/Drops/ObjectDrop.cs | 100 +- .../Templating/Liquid/Drops/SafeDropBase.cs | 81 +- .../Templating/Liquid/Drops/TestDrop.cs | 147 +- .../Liquid/Filters/AdditionalFilters.cs | 388 +-- .../Templating/Liquid/LiquidTemplate.cs | 135 +- .../Templating/Liquid/LiquidTemplateEngine.cs | 296 +-- .../Templating/Liquid/LiquidUtil.cs | 108 +- .../Templating/Liquid/Tags/Zone.cs | 147 +- .../Theming/AdminThemedAttribute.cs | 86 +- .../Theming/Assets/AssetTranslator.cs | 277 ++- .../Theming/Assets/AssetTranslorUtil.cs | 35 +- .../Theming/Assets/AutoPrefixPostProcessor.cs | 99 +- .../Assets/BundlingVirtualPathProvider.cs | 364 +-- .../Theming/Assets/CachedAsset.cs | 33 +- .../Theming/Assets/DefaultAssetCache.cs | 834 +++---- .../Theming/Assets/IAssetCache.cs | 48 +- .../Assets/ModuleImportsVirtualFile.cs | 291 ++- .../Theming/Assets/SmartStyleBundle.cs | 12 +- .../Theming/CssHttpHandler.cs | 181 +- .../Theming/DefaultThemeFileResolver.cs | 585 +++-- .../Theming/IFileDependencyProvider.cs | 11 +- .../Theming/InheritedVirtualThemeFile.cs | 51 +- .../Theming/LocalizedDisplayMode.cs | 172 +- .../Theming/SmartVirtualPathProvider.cs | 325 ++- .../Theming/ThemeContext.cs | 226 +- .../Theming/ThemeHelper.cs | 403 ++-- .../Theming/ThemeHtmlExtensions.cs | 140 +- .../Theming/ThemeVarsRepository.cs | 165 +- .../Theming/ThemeVarsVirtualFile.cs | 51 +- .../Theming/ThemeableRazorViewEngine.cs | 88 +- .../ThemeableVirtualPathProviderViewEngine.cs | 946 ++++---- .../Theming/ThemingVirtualPathProvider.cs | 261 +-- .../Theming/TwoLevelViewLocationCache.cs | 86 +- .../Theming/WebViewPage.cs | 447 ++-- .../Theming/WebViewPageHelper.cs | 351 ++- .../SmartStore.Web.Framework/UI/Breadcrumb.cs | 61 +- .../UI/BundleBuilder.cs | 36 +- .../UI/Choices/ChoiceItemModel.cs | 31 +- .../UI/Choices/ChoiceModel.cs | 167 +- .../UI/Choices/GenericChoiceModel.cs | 66 +- .../UI/Components/BoxSpacing.cs | 34 +- .../UI/Components/Component.cs | 29 +- .../UI/Components/ComponentBuilder.cs | 78 +- .../UI/Components/ComponentFactory.cs | 20 +- .../UI/Components/ComponentRenderer.cs | 56 +- .../UI/Components/ComponentRendererUtils.cs | 2 +- .../Components/EntityPicker/EntityPicker.cs | 80 +- .../EntityPicker/EntityPickerBuilder.cs | 280 +-- .../UI/Components/Enums.cs | 46 +- .../Components/FileUploader/FileUploader.cs | 92 +- .../FileUploader/FileUploaderBuilder.cs | 354 +-- .../UI/Components/HtmlHelperExtensions.cs | 65 +- .../UI/Components/IContentContainer.cs | 3 +- .../UI/Components/IHtmlAttributesContainer.cs | 3 +- .../UI/Components/IUiComponent.cs | 4 +- .../UI/Components/Menu/AdminMenuProvider.cs | 31 +- .../UI/Components/Menu/CatalogMenuProvider.cs | 21 +- .../UI/Components/Menu/IMenuProvider.cs | 19 +- .../UI/Components/Menu/Menu.cs | 2 +- .../UI/Components/Menu/MenuBuilder.cs | 18 +- .../UI/Components/Menu/MenuExtensions.cs | 130 +- .../UI/Components/Menu/MenuItem.cs | 33 +- .../UI/Components/Menu/MenuItemBuilder.cs | 3 +- .../UI/Components/Menu/MenuModel.cs | 38 +- .../UI/Components/Menu/MenuPublisher.cs | 101 +- .../UI/Components/Menu/MenuRenderer.cs | 94 +- .../UI/Components/Menu/NodePathState.cs | 17 +- .../UI/Components/NavigatableComponent.cs | 131 +- .../Components/NavigatableComponentBuilder.cs | 1 - .../UI/Components/NavigationItem.cs | 112 +- .../UI/Components/NavigationItemBuilder.cs | 95 +- .../Pager/ForumTopicPagerRenderer.cs | 7 +- .../UI/Components/Pager/Pager.cs | 63 +- .../UI/Components/Pager/PagerBuilder.cs | 3 +- .../UI/Components/Pager/PagerItem.cs | 8 +- .../UI/Components/Pager/PagerRenderer.cs | 125 +- .../UI/Components/TabStrip/Tab.cs | 21 +- .../UI/Components/TabStrip/TabBuilder.cs | 2 +- .../UI/Components/TabStrip/TabFactory.cs | 7 +- .../UI/Components/TabStrip/TabStrip.cs | 87 +- .../UI/Components/TabStrip/TabStripBuilder.cs | 120 +- .../Components/TabStrip/TabStripRenderer.cs | 765 +++--- .../Components/ViewBasedComponentRenderer.cs | 36 +- .../UI/Components/Window/Window.cs | 66 +- .../UI/Components/Window/WindowBuilder.cs | 92 +- .../UI/Components/Window/WindowRenderer.cs | 195 +- .../UI/Extensions/DataListExtensions.cs | 12 +- .../UI/Extensions/HtmlAttributeExtensions.cs | 3 +- .../UI/Extensions/LayoutExtensions.cs | 188 +- .../UI/Extensions/NavigatableExtensions.cs | 316 ++- .../RouteValueDictionaryExtensions.cs | 2 +- .../UI/Extensions/ScaffoldExtensions.cs | 166 +- .../UI/INavigatable.cs | 37 +- .../UI/IPageAssetsBuilder.cs | 66 +- .../UI/IWidgetProvider.cs | 115 +- .../UI/IWidgetSelector.cs | 7 +- .../UI/Icons/IIcon.cs | 14 +- .../UI/Icons/IconDescription.cs | 183 +- .../UI/Icons/IconExplorer.cs | 372 +-- .../UI/Menus/DatabaseMenu.cs | 17 +- .../UI/Menus/DatabaseMenuResolver.cs | 14 +- .../UI/Menus/DependencyMenuResolver.cs | 12 +- .../UI/Menus/IMenu.cs | 48 +- .../UI/Menus/IMenuResolver.cs | 6 +- .../UI/Menus/IMenuService.cs | 50 +- .../UI/Menus/MenuBase.cs | 162 +- .../UI/Menus/MenuBuiltEvent.cs | 18 +- .../UI/Menus/MenuFilter.cs | 6 +- .../UI/Menus/MenuInvalidator.cs | 17 +- .../Menus/Providers/CatalogMenuInvalidator.cs | 124 +- .../Providers/CatalogMenuItemProvider.cs | 16 +- .../Menus/Providers/EntityMenuItemProvider.cs | 6 +- .../UI/Menus/Providers/IMenuItemProvider.cs | 4 +- .../Menus/Providers/MenuItemProviderBase.cs | 27 +- .../Providers/MenuItemProviderMetadata.cs | 2 +- .../Menus/Providers/RouteMenuItemProvider.cs | 6 +- .../UI/PageAssetsBuilder.cs | 244 +- .../SmartStore.Web.Framework/UI/Spacing.cs | 5 +- .../UI/WidgetProvider.cs | 299 ++- .../UI/WidgetRouteInfo.cs | 4 +- .../UI/WidgetZoneModel.cs | 17 +- .../Validators/FluentValidatorExtensions.cs | 120 +- .../Validators/SmartBaseValidator.cs | 58 +- .../Validators/SmartValidatorFactory.cs | 24 +- .../Validators/ValidatorLanguageManager.cs | 34 +- .../WebApi/AutofacWebApiDependencyResolver.cs | 119 +- .../WebApi/AutofacWebApiDependencyScope.cs | 131 +- .../Caching/WebApiCachingControllingData.cs | 116 +- .../WebApi/Caching/WebApiCachingUserData.cs | 294 ++- .../IWebApiConfigurationProvider.cs | 10 +- .../IWebApiConfigurationPublisher.cs | 8 +- .../WebApiConfigurationBroadcaster.cs | 14 +- .../WebApiConfigurationPublisher.cs | 45 +- .../Extensions/ApiControllerExtensions.cs | 142 +- .../HttpRequestMessageExtensions.cs | 70 +- .../WebApi/OData/WebApiQueryableAttribute.cs | 86 +- .../WebApi/Security/HmacAuthentication.cs | 296 +-- .../Security/WebApiAuthenticateAttribute.cs | 438 ++-- .../WebApi/WebApiContractResolver.cs | 3 +- .../WebApi/WebApiCore.cs | 137 +- .../WebApi/WebApiSettings.cs | 32 +- .../WebApi/WebApiStartupTask.cs | 144 +- .../WebStoreContext.cs | 381 ++- .../WebWorkContext.cs | 405 ++-- 245 files changed, 16347 insertions(+), 16906 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/Bundling/BundlePublisher.cs b/src/Presentation/SmartStore.Web.Framework/Bundling/BundlePublisher.cs index b8c831476e..7232a13e11 100644 --- a/src/Presentation/SmartStore.Web.Framework/Bundling/BundlePublisher.cs +++ b/src/Presentation/SmartStore.Web.Framework/Bundling/BundlePublisher.cs @@ -17,7 +17,7 @@ public BundlePublisher(ITypeFinder typeFinder) public void RegisterBundles(BundleCollection bundles) { - var bundleProviderTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); + var bundleProviderTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); var bundleProviders = new List(); foreach (var providerType in bundleProviderTypes) { diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs index 399b405c28..e390c90952 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs @@ -8,39 +8,39 @@ namespace SmartStore.Web.Framework.Controllers { - [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)] - public sealed class NonAdminAttribute : FilterAttribute, IActionFilter - { - public Lazy WorkContext { get; set; } + [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)] + public sealed class NonAdminAttribute : FilterAttribute, IActionFilter + { + public Lazy WorkContext { get; set; } - public void OnActionExecuting(ActionExecutingContext filterContext) - { - } + public void OnActionExecuting(ActionExecutingContext filterContext) + { + } - public void OnActionExecuted(ActionExecutedContext filterContext) - { - if (!filterContext.IsChildAction) - { - WorkContext.Value.IsAdmin = false; - filterContext.HttpContext.Items["IsNonAdmin"] = true; - } - } - } + public void OnActionExecuted(ActionExecutedContext filterContext) + { + if (!filterContext.IsChildAction) + { + WorkContext.Value.IsAdmin = false; + filterContext.HttpContext.Items["IsNonAdmin"] = true; + } + } + } - [AdminValidateIpAddress] - [RewriteUrl(SslRequirement.Yes, Order = 0, AppendTrailingSlash = false, LowercaseUrls = false)] + [AdminValidateIpAddress] + [RewriteUrl(SslRequirement.Yes, Order = 0, AppendTrailingSlash = false, LowercaseUrls = false)] [CustomerLastActivity(Order = int.MaxValue)] [StoreIpAddress(Order = int.MaxValue)] - [AdminThemed] - public abstract class AdminControllerBase : ManageController - { - protected override void OnActionExecuting(ActionExecutingContext filterContext) - { - if (filterContext.IsChildAction) - return; + [AdminThemed] + public abstract class AdminControllerBase : ManageController + { + protected override void OnActionExecuting(ActionExecutingContext filterContext) + { + if (filterContext.IsChildAction) + return; - var isNonAdmin = filterContext.ActionDescriptor.HasAttribute(true); - Services.WorkContext.IsAdmin = !isNonAdmin; - } + var isNonAdmin = filterContext.ActionDescriptor.HasAttribute(true); + Services.WorkContext.IsAdmin = !isNonAdmin; + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs index 083ec1ef9b..063643c745 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs @@ -1,7 +1,5 @@ -using System; -using System.Globalization; +using System.Globalization; using System.IO; -using System.Text; using System.Web.Mvc; using System.Web.Mvc.Html; using System.Web.Routing; @@ -18,109 +16,109 @@ namespace SmartStore.Web.Framework.Controllers { public static class ContollerExtensions { - #region InvokeAction - - public static MvcHtmlString InvokeAction(this ControllerBase controller, string actionName, string controllerName = null, RouteValueDictionary routeValues = null) - { - Guard.NotNull(controller, nameof(controller)); - Guard.NotEmpty(actionName, nameof(actionName)); - - using (StringWriter writer = new StringWriter(CultureInfo.CurrentCulture)) - { - InvokeAction(controller, writer, actionName, controllerName, routeValues); - return MvcHtmlString.Create(writer.ToString()); - } - } - - public static void InvokeAction(this ControllerBase controller, TextWriter writer, string actionName, string controllerName = null, RouteValueDictionary routeValues = null) - { - Guard.NotNull(controller, nameof(controller)); - Guard.NotNull(writer, nameof(writer)); - Guard.NotEmpty(actionName, nameof(actionName)); - - var viewContext = new ViewContext( - controller.ControllerContext, - new WebFormView(controller.ControllerContext, "tmp"), - controller.ViewData, - controller.TempData, - writer - ); - - var htmlHelper = new HtmlHelper(viewContext, new ViewPage()); - htmlHelper.RenderAction(actionName, controllerName, routeValues); - } - - #endregion - - #region Render view - - /// - /// Render partial view to string - /// - /// Result - public static string RenderPartialViewToString(this ControllerBase controller) + #region InvokeAction + + public static MvcHtmlString InvokeAction(this ControllerBase controller, string actionName, string controllerName = null, RouteValueDictionary routeValues = null) + { + Guard.NotNull(controller, nameof(controller)); + Guard.NotEmpty(actionName, nameof(actionName)); + + using (StringWriter writer = new StringWriter(CultureInfo.CurrentCulture)) + { + InvokeAction(controller, writer, actionName, controllerName, routeValues); + return MvcHtmlString.Create(writer.ToString()); + } + } + + public static void InvokeAction(this ControllerBase controller, TextWriter writer, string actionName, string controllerName = null, RouteValueDictionary routeValues = null) + { + Guard.NotNull(controller, nameof(controller)); + Guard.NotNull(writer, nameof(writer)); + Guard.NotEmpty(actionName, nameof(actionName)); + + var viewContext = new ViewContext( + controller.ControllerContext, + new WebFormView(controller.ControllerContext, "tmp"), + controller.ViewData, + controller.TempData, + writer + ); + + var htmlHelper = new HtmlHelper(viewContext, new ViewPage()); + htmlHelper.RenderAction(actionName, controllerName, routeValues); + } + + #endregion + + #region Render view + + /// + /// Render partial view to string + /// + /// Result + public static string RenderPartialViewToString(this ControllerBase controller) { return RenderPartialViewToString(controller, null, null, null); } - /// - /// Render partial view to string - /// - /// - /// View name - /// Result - public static string RenderPartialViewToString(this ControllerBase controller, string viewName) + /// + /// Render partial view to string + /// + /// + /// View name + /// Result + public static string RenderPartialViewToString(this ControllerBase controller, string viewName) { return RenderPartialViewToString(controller, viewName, null, null); } - /// - /// Render partial view to string - /// - /// - /// Model - /// Result - public static string RenderPartialViewToString(this ControllerBase controller, object model) + /// + /// Render partial view to string + /// + /// + /// Model + /// Result + public static string RenderPartialViewToString(this ControllerBase controller, object model) { return RenderPartialViewToString(controller, null, model, null); } - /// - /// Render partial view to string - /// - /// - /// View name - /// Model - /// Result - public static string RenderPartialViewToString(this ControllerBase controller, string viewName, object model) - { - return RenderPartialViewToString(controller, viewName, model, null); - } - - /// - /// Render partial view to string - /// - /// - /// View name - /// Model - /// Additional view data - /// Result - public static string RenderPartialViewToString(this ControllerBase controller, string viewName, object model, object additionalViewData) + /// + /// Render partial view to string + /// + /// + /// View name + /// Model + /// Result + public static string RenderPartialViewToString(this ControllerBase controller, string viewName, object model) + { + return RenderPartialViewToString(controller, viewName, model, null); + } + + /// + /// Render partial view to string + /// + /// + /// View name + /// Model + /// Additional view data + /// Result + public static string RenderPartialViewToString(this ControllerBase controller, string viewName, object model, object additionalViewData) { if (viewName.IsEmpty()) viewName = controller.ControllerContext.RouteData.GetRequiredString("action"); controller.ViewData.Model = model; - if (additionalViewData != null) - { - controller.ViewData.AddRange(CommonHelper.ObjectToDictionary(additionalViewData)); + if (additionalViewData != null) + { + controller.ViewData.AddRange(CommonHelper.ObjectToDictionary(additionalViewData)); - if (additionalViewData is ViewDataDictionary vdd) - { - controller.ViewData.TemplateInfo.HtmlFieldPrefix = vdd.TemplateInfo.HtmlFieldPrefix; - } - } + if (additionalViewData is ViewDataDictionary vdd) + { + controller.ViewData.TemplateInfo.HtmlFieldPrefix = vdd.TemplateInfo.HtmlFieldPrefix; + } + } using (var sw = new StringWriter()) { @@ -135,81 +133,81 @@ public static string RenderPartialViewToString(this ControllerBase controller, s } } - /// - /// Render view to string - /// - /// Result - public static string RenderViewToString(this ControllerBase controller) - { - return RenderViewToString(controller, null, null, null); - } - - /// - /// Render view to string - /// - /// Model - /// Result - public static string RenderViewToString(this ControllerBase controller, object model) - { - return RenderViewToString(controller, null, null, model); - } - - /// - /// Render view to string - /// - /// View name - /// Result - public static string RenderViewToString(this ControllerBase controller, string viewName) - { - return RenderViewToString(controller, viewName, null, null); - } - - /// - /// Render view to string - /// - /// View name - /// Model - /// Result - public static string RenderViewToString(this ControllerBase controller, string viewName, string masterName) - { - return RenderViewToString(controller, viewName, masterName, null); - } - - /// - /// Render view to string - /// - /// View name - /// Master name - /// Model - /// Result - public static string RenderViewToString(this ControllerBase controller, string viewName, string masterName, object model) - { - if (viewName.IsEmpty()) - viewName = controller.ControllerContext.RouteData.GetRequiredString("action"); - - controller.ViewData.Model = model; - - using (var sw = new StringWriter()) - { - var viewResult = System.Web.Mvc.ViewEngines.Engines.FindView(controller.ControllerContext, viewName.EmptyNull(), masterName.EmptyNull()); - - ThrowIfViewNotFound(viewResult, viewName); - - var viewContext = new ViewContext(controller.ControllerContext, viewResult.View, controller.ViewData, controller.TempData, sw); - viewResult.View.Render(viewContext, sw); - - return sw.GetStringBuilder().ToString(); - } - } - - private static void ThrowIfViewNotFound(ViewEngineResult viewResult, string viewName) - { - // if view not found, throw an exception with searched locations - if (viewResult.View == null) - { - throw new ViewNotFoundException(viewName, viewResult.SearchedLocations); - } - } + /// + /// Render view to string + /// + /// Result + public static string RenderViewToString(this ControllerBase controller) + { + return RenderViewToString(controller, null, null, null); + } + + /// + /// Render view to string + /// + /// Model + /// Result + public static string RenderViewToString(this ControllerBase controller, object model) + { + return RenderViewToString(controller, null, null, model); + } + + /// + /// Render view to string + /// + /// View name + /// Result + public static string RenderViewToString(this ControllerBase controller, string viewName) + { + return RenderViewToString(controller, viewName, null, null); + } + + /// + /// Render view to string + /// + /// View name + /// Model + /// Result + public static string RenderViewToString(this ControllerBase controller, string viewName, string masterName) + { + return RenderViewToString(controller, viewName, masterName, null); + } + + /// + /// Render view to string + /// + /// View name + /// Master name + /// Model + /// Result + public static string RenderViewToString(this ControllerBase controller, string viewName, string masterName, object model) + { + if (viewName.IsEmpty()) + viewName = controller.ControllerContext.RouteData.GetRequiredString("action"); + + controller.ViewData.Model = model; + + using (var sw = new StringWriter()) + { + var viewResult = System.Web.Mvc.ViewEngines.Engines.FindView(controller.ControllerContext, viewName.EmptyNull(), masterName.EmptyNull()); + + ThrowIfViewNotFound(viewResult, viewName); + + var viewContext = new ViewContext(controller.ControllerContext, viewResult.View, controller.ViewData, controller.TempData, sw); + viewResult.View.Render(viewContext, sw); + + return sw.GetStringBuilder().ToString(); + } + } + + private static void ThrowIfViewNotFound(ViewEngineResult viewResult, string viewName) + { + // if view not found, throw an exception with searched locations + if (viewResult.View == null) + { + throw new ViewNotFoundException(viewName, viewResult.SearchedLocations); + } + } #endregion @@ -219,95 +217,95 @@ private static void ThrowIfViewNotFound(ViewEngineResult viewResult, string view /// Creates a object using the root actions's for view resolution. /// public static ViewResult RootActionView(this Controller controller, string viewName) - { - return RootActionView(controller, viewName, (string)null, null); - } - - /// - /// Creates a object using the root actions's for view resolution. - /// - public static ViewResult RootActionView(this Controller controller, string viewName, string masterName) - { - return RootActionView(controller, viewName, masterName, null); - } - - /// - /// Creates a object using the root actions's for view resolution. - /// - public static ViewResult RootActionView(this Controller controller, string viewName, object model) - { - return RootActionView(controller, viewName, (string)null, model); - } - - /// - /// Creates a object using the root actions's for view resolution. - /// - public static ViewResult RootActionView(this Controller controller, string viewName, string masterName, object model) - { - Guard.NotEmpty(viewName, nameof(viewName)); - - if (model != null) - { - controller.ViewData.Model = model; - } - - return new RootActionViewResult - { - ViewName = viewName, - MasterName = masterName, - ViewData = controller.ViewData, - TempData = controller.TempData, - ViewEngineCollection = controller.ViewEngineCollection - }; - } - - /// - /// Creates a object using the root actions's for view resolution. - /// - public static PartialViewResult RootActionPartialView(this Controller controller, string viewName) - { - return RootActionPartialView(controller, viewName, null); - } - - /// - /// Creates a object using the root actions's for view resolution. - /// - public static PartialViewResult RootActionPartialView(this Controller controller, string viewName, object model) - { - Guard.NotEmpty(viewName, nameof(viewName)); - - if (model != null) - { - controller.ViewData.Model = model; - } - - return new RootActionPartialViewResult - { - ViewName = viewName, - ViewData = controller.ViewData, - TempData = controller.TempData, - ViewEngineCollection = controller.ViewEngineCollection - }; - } - - #endregion - - /// - /// Get active store scope (for multi-store configuration mode) - /// - /// Controller - /// Store service - /// Work context - /// Store ID; 0 if we are in a shared mode - public static int GetActiveStoreScopeConfiguration(this IController controller, IStoreService storeService, IWorkContext workContext) - { - //ensure that we have 2 (or more) stores - if (storeService.GetAllStores().Count < 2) - return 0; - - var storeId = workContext.CurrentCustomer.GetAttribute(SystemCustomerAttributeNames.AdminAreaStoreScopeConfiguration); - var store = storeService.GetStoreById(storeId); - return store != null ? store.Id : 0; - } + { + return RootActionView(controller, viewName, (string)null, null); + } + + /// + /// Creates a object using the root actions's for view resolution. + /// + public static ViewResult RootActionView(this Controller controller, string viewName, string masterName) + { + return RootActionView(controller, viewName, masterName, null); + } + + /// + /// Creates a object using the root actions's for view resolution. + /// + public static ViewResult RootActionView(this Controller controller, string viewName, object model) + { + return RootActionView(controller, viewName, (string)null, model); + } + + /// + /// Creates a object using the root actions's for view resolution. + /// + public static ViewResult RootActionView(this Controller controller, string viewName, string masterName, object model) + { + Guard.NotEmpty(viewName, nameof(viewName)); + + if (model != null) + { + controller.ViewData.Model = model; + } + + return new RootActionViewResult + { + ViewName = viewName, + MasterName = masterName, + ViewData = controller.ViewData, + TempData = controller.TempData, + ViewEngineCollection = controller.ViewEngineCollection + }; + } + + /// + /// Creates a object using the root actions's for view resolution. + /// + public static PartialViewResult RootActionPartialView(this Controller controller, string viewName) + { + return RootActionPartialView(controller, viewName, null); + } + + /// + /// Creates a object using the root actions's for view resolution. + /// + public static PartialViewResult RootActionPartialView(this Controller controller, string viewName, object model) + { + Guard.NotEmpty(viewName, nameof(viewName)); + + if (model != null) + { + controller.ViewData.Model = model; + } + + return new RootActionPartialViewResult + { + ViewName = viewName, + ViewData = controller.ViewData, + TempData = controller.TempData, + ViewEngineCollection = controller.ViewEngineCollection + }; + } + + #endregion + + /// + /// Get active store scope (for multi-store configuration mode) + /// + /// Controller + /// Store service + /// Work context + /// Store ID; 0 if we are in a shared mode + public static int GetActiveStoreScopeConfiguration(this IController controller, IStoreService storeService, IWorkContext workContext) + { + //ensure that we have 2 (or more) stores + if (storeService.GetAllStores().Count < 2) + return 0; + + var storeId = workContext.CurrentCustomer.GetAttribute(SystemCustomerAttributeNames.AdminAreaStoreScopeConfiguration); + var store = storeService.GetStoreById(storeId); + return store != null ? store.Id : 0; + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs index f83e6d6db0..dca39cdb28 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs @@ -15,14 +15,14 @@ namespace SmartStore.Web.Framework.Controllers { public abstract class ManageController : SmartController - { - /// - /// Add locales for localizable entities - /// - /// Localizable model - /// Language service - /// Locales - protected virtual void AddLocales(ILanguageService languageService, IList locales) where TLocalizedModelLocal : ILocalizedModelLocal + { + /// + /// Add locales for localizable entities + /// + /// Localizable model + /// Language service + /// Locales + protected virtual void AddLocales(ILanguageService languageService, IList locales) where TLocalizedModelLocal : ILocalizedModelLocal { AddLocales(languageService, locales, null); } @@ -86,12 +86,12 @@ protected ActionResult AccessDeniedView() return RedirectToAction("AccessDenied", "Security", new { pageUrl = this.Request.RawUrl, area = "Admin" }); } - /// - /// Renders default access denied view as a partial - /// - protected ActionResult AccessDeniedPartialView() - { - return PartialView("~/Administration/Views/Security/AccessDenied.cshtml"); - } + /// + /// Renders default access denied view as a partial + /// + protected ActionResult AccessDeniedPartialView() + { + return PartialView("~/Administration/Views/Security/AccessDenied.cshtml"); + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs index afb217a5ac..00aefaf66c 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs @@ -4,14 +4,14 @@ namespace SmartStore.Web.Framework.Controllers { - public abstract class PaymentControllerBase : SmartController + public abstract class PaymentControllerBase : SmartController { public abstract IList ValidatePaymentForm(FormCollection form); public abstract ProcessPaymentRequest GetPaymentInfo(FormCollection form); - public virtual string GetPaymentSummary(FormCollection form) - { - return null; - } + public virtual string GetPaymentSummary(FormCollection form) + { + return null; + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/PluginControllerBase.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/PluginControllerBase.cs index 4a3acc5710..aca65ba40d 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/PluginControllerBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/PluginControllerBase.cs @@ -1,7 +1,4 @@ -using System; -using System.Web.Mvc; - -namespace SmartStore.Web.Framework.Controllers +namespace SmartStore.Web.Framework.Controllers { public abstract partial class PluginControllerBase : ManageController { diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/PublicControllerBase.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/PublicControllerBase.cs index e92ab660f2..cbeedc9d66 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/PublicControllerBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/PublicControllerBase.cs @@ -9,10 +9,10 @@ namespace SmartStore.Web.Framework.Controllers [RewriteUrl(SslRequirement.Retain, Order = 0)] [LanguageSeoCode(Order = 1)] [CustomerLastActivity] - [StoreIpAddress] - [StoreLastVisitedPage] - [CheckAffiliate] - public abstract partial class PublicControllerBase : SmartController + [StoreIpAddress] + [StoreLastVisitedPage] + [CheckAffiliate] + public abstract partial class PublicControllerBase : SmartController { - } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs index 5aa0dc6090..cadbef89cf 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs @@ -17,231 +17,231 @@ namespace SmartStore.Web.Framework.Controllers [JsonNet(Order = -1)] // Run first (OnActionExecuted) [Notify(Order = 1000)] // Run last (OnResultExecuting) public abstract partial class SmartController : Controller - { - protected SmartController() - { - } - - public ILogger Logger - { - get; - set; - } = NullLogger.Instance; - - public Localizer T - { - get; - set; - } = NullLocalizer.Instance; - - public ICommonServices Services - { - get; - set; - } - - /// - /// Pushes an info message to the notification queue - /// - /// Message - /// A value indicating whether the message should be persisted for the next request - protected virtual void NotifyInfo(string message, bool durable = true) - { - Services.Notifier.Information(message, durable); - } - - /// - /// Pushes a warning message to the notification queue - /// - /// Message - /// A value indicating whether the message should be persisted for the next request - protected virtual void NotifyWarning(string message, bool durable = true) - { - Services.Notifier.Warning(message, durable); - } - - /// - /// Pushes a success message to the notification queue - /// - /// Message - /// A value indicating whether the message should be persisted for the next request - protected virtual void NotifySuccess(string message, bool durable = true) - { - Services.Notifier.Success(message, durable); - } - - /// - /// Pushes an error message to the notification queue - /// - /// Message - /// A value indicating whether the message should be persisted for the next request - protected virtual void NotifyError(string message, bool durable = true) - { - Services.Notifier.Error(message, durable); - } - - /// - /// Pushes an error message to the notification queue - /// - /// Exception - /// A value indicating whether a message should be persisted for the next request - /// A value indicating whether the exception should be logged - protected virtual void NotifyError(Exception exception, bool durable = true, bool logException = true) - { - if (logException) - { - LogException(exception); - } - - Services.Notifier.Error(HttpUtility.HtmlEncode(exception.ToAllMessages()), durable); - } - - /// - /// Pushes an error message to the notification queue that the access to a resource has been denied - /// - /// A value indicating whether a message should be persisted for the next request - /// A value indicating whether the message should be logged - protected virtual void NotifyAccessDenied(bool durable = true, bool log = true) - { - var message = T("Admin.AccessDenied.Description"); - - if (log) - { - Logger.Error(message); - } - - Services.Notifier.Error(message, durable); - } - - protected ActionResult RedirectToReferrer() - { - return RedirectToReferrer(null, () => RedirectToRoute("HomePage")); - } - - protected ActionResult RedirectToReferrer(string referrer) - { - return RedirectToReferrer(referrer, () => RedirectToRoute("HomePage")); - } - - protected ActionResult RedirectToReferrer(string referrer, string fallbackUrl) - { - // addressing "Open Redirection Vulnerability" (prevent cross-domain redirects / phishing) - if (fallbackUrl.HasValue() && !Url.IsLocalUrl(fallbackUrl)) - { - fallbackUrl = null; - } - - return RedirectToReferrer( - referrer, - fallbackUrl.HasValue() ? () => Redirect(fallbackUrl) : (Func)null); - } - - protected virtual ActionResult RedirectToReferrer(string referrer, Func fallbackResult) - { - bool skipLocalCheck = false; - - if (referrer.IsEmpty() && Request.UrlReferrer != null && Request.UrlReferrer.ToString().HasValue()) - { - referrer = Request.UrlReferrer.ToString(); - if (referrer.HasValue()) - { - var domain1 = (new Uri(referrer)).GetLeftPart(UriPartial.Authority); - var domain2 = this.Request.Url.GetLeftPart(UriPartial.Authority); - if (domain1.IsCaseInsensitiveEqual(domain2)) - { - // always allow fully qualified urls from local host - skipLocalCheck = true; - } - else - { - referrer = null; - } - } - } - - // addressing "Open Redirection Vulnerability" (prevent cross-domain redirects / phishing) - if (referrer.HasValue() && !skipLocalCheck && !Url.IsLocalUrl(referrer)) - { - referrer = null; - } - - if (referrer.HasValue()) - { - return Redirect(referrer); - } - - if (fallbackResult != null) - { - return fallbackResult(); - } - - return HttpNotFound(); - } - - /// - /// Redirects to the configuration page of a plugin or a provider. - /// - /// The system name of the plugin or the provider. - /// true plugin configuration, false provider configuration. - protected virtual ActionResult RedirectToConfiguration(string systemName, bool isPlugin = true) - { - Guard.NotEmpty(systemName, nameof(systemName)); - - var actionName = isPlugin ? "ConfigurePlugin" : "ConfigureProvider"; - - if (ControllerContext.IsChildAction) - { - var url = Url.Action(actionName, "Plugin", new { systemName, area = "Admin" }); - return new PermissiveRedirectResult(url); - } - - return RedirectToAction(actionName, "Plugin", new { systemName, area = "Admin" }); - } - - /// - /// On exception - /// - /// Filter context - protected override void OnException(ExceptionContext filterContext) - { - if (filterContext.Exception != null) - { - LogException(filterContext.Exception); - } - - base.OnException(filterContext); - } - - /// - /// Log exception - /// - /// Exception - private void LogException(Exception ex) - { - Logger.Error(ex); - } - - ///// - ///// Creates a object that serializes the specified object to JavaScript Object Notation (JSON) format using the content type, - ///// content encoding, and the JSON request behavior. - ///// - ///// The JavaScript object graph to serialize. - ///// The content type (MIME type). - ///// The content encoding. - ///// The JSON request behavior - ///// The result object that serializes the specified object to JSON format. - ///// - ///// This overridden method internally uses the Json.NET library for serialization. - ///// - //protected override JsonResult Json(object data, string contentType, Encoding contentEncoding, JsonRequestBehavior behavior) - //{ - // return new JsonNetResult(Services.DateTimeHelper) - // { - // Data = data, - // ContentType = contentType, - // ContentEncoding = contentEncoding, - // JsonRequestBehavior = behavior - // }; - //} - } + { + protected SmartController() + { + } + + public ILogger Logger + { + get; + set; + } = NullLogger.Instance; + + public Localizer T + { + get; + set; + } = NullLocalizer.Instance; + + public ICommonServices Services + { + get; + set; + } + + /// + /// Pushes an info message to the notification queue + /// + /// Message + /// A value indicating whether the message should be persisted for the next request + protected virtual void NotifyInfo(string message, bool durable = true) + { + Services.Notifier.Information(message, durable); + } + + /// + /// Pushes a warning message to the notification queue + /// + /// Message + /// A value indicating whether the message should be persisted for the next request + protected virtual void NotifyWarning(string message, bool durable = true) + { + Services.Notifier.Warning(message, durable); + } + + /// + /// Pushes a success message to the notification queue + /// + /// Message + /// A value indicating whether the message should be persisted for the next request + protected virtual void NotifySuccess(string message, bool durable = true) + { + Services.Notifier.Success(message, durable); + } + + /// + /// Pushes an error message to the notification queue + /// + /// Message + /// A value indicating whether the message should be persisted for the next request + protected virtual void NotifyError(string message, bool durable = true) + { + Services.Notifier.Error(message, durable); + } + + /// + /// Pushes an error message to the notification queue + /// + /// Exception + /// A value indicating whether a message should be persisted for the next request + /// A value indicating whether the exception should be logged + protected virtual void NotifyError(Exception exception, bool durable = true, bool logException = true) + { + if (logException) + { + LogException(exception); + } + + Services.Notifier.Error(HttpUtility.HtmlEncode(exception.ToAllMessages()), durable); + } + + /// + /// Pushes an error message to the notification queue that the access to a resource has been denied + /// + /// A value indicating whether a message should be persisted for the next request + /// A value indicating whether the message should be logged + protected virtual void NotifyAccessDenied(bool durable = true, bool log = true) + { + var message = T("Admin.AccessDenied.Description"); + + if (log) + { + Logger.Error(message); + } + + Services.Notifier.Error(message, durable); + } + + protected ActionResult RedirectToReferrer() + { + return RedirectToReferrer(null, () => RedirectToRoute("HomePage")); + } + + protected ActionResult RedirectToReferrer(string referrer) + { + return RedirectToReferrer(referrer, () => RedirectToRoute("HomePage")); + } + + protected ActionResult RedirectToReferrer(string referrer, string fallbackUrl) + { + // addressing "Open Redirection Vulnerability" (prevent cross-domain redirects / phishing) + if (fallbackUrl.HasValue() && !Url.IsLocalUrl(fallbackUrl)) + { + fallbackUrl = null; + } + + return RedirectToReferrer( + referrer, + fallbackUrl.HasValue() ? () => Redirect(fallbackUrl) : (Func)null); + } + + protected virtual ActionResult RedirectToReferrer(string referrer, Func fallbackResult) + { + bool skipLocalCheck = false; + + if (referrer.IsEmpty() && Request.UrlReferrer != null && Request.UrlReferrer.ToString().HasValue()) + { + referrer = Request.UrlReferrer.ToString(); + if (referrer.HasValue()) + { + var domain1 = (new Uri(referrer)).GetLeftPart(UriPartial.Authority); + var domain2 = this.Request.Url.GetLeftPart(UriPartial.Authority); + if (domain1.IsCaseInsensitiveEqual(domain2)) + { + // always allow fully qualified urls from local host + skipLocalCheck = true; + } + else + { + referrer = null; + } + } + } + + // addressing "Open Redirection Vulnerability" (prevent cross-domain redirects / phishing) + if (referrer.HasValue() && !skipLocalCheck && !Url.IsLocalUrl(referrer)) + { + referrer = null; + } + + if (referrer.HasValue()) + { + return Redirect(referrer); + } + + if (fallbackResult != null) + { + return fallbackResult(); + } + + return HttpNotFound(); + } + + /// + /// Redirects to the configuration page of a plugin or a provider. + /// + /// The system name of the plugin or the provider. + /// true plugin configuration, false provider configuration. + protected virtual ActionResult RedirectToConfiguration(string systemName, bool isPlugin = true) + { + Guard.NotEmpty(systemName, nameof(systemName)); + + var actionName = isPlugin ? "ConfigurePlugin" : "ConfigureProvider"; + + if (ControllerContext.IsChildAction) + { + var url = Url.Action(actionName, "Plugin", new { systemName, area = "Admin" }); + return new PermissiveRedirectResult(url); + } + + return RedirectToAction(actionName, "Plugin", new { systemName, area = "Admin" }); + } + + /// + /// On exception + /// + /// Filter context + protected override void OnException(ExceptionContext filterContext) + { + if (filterContext.Exception != null) + { + LogException(filterContext.Exception); + } + + base.OnException(filterContext); + } + + /// + /// Log exception + /// + /// Exception + private void LogException(Exception ex) + { + Logger.Error(ex); + } + + ///// + ///// Creates a object that serializes the specified object to JavaScript Object Notation (JSON) format using the content type, + ///// content encoding, and the JSON request behavior. + ///// + ///// The JavaScript object graph to serialize. + ///// The content type (MIME type). + ///// The content encoding. + ///// The JSON request behavior + ///// The result object that serializes the specified object to JSON format. + ///// + ///// This overridden method internally uses the Json.NET library for serialization. + ///// + //protected override JsonResult Json(object data, string contentType, Encoding contentEncoding, JsonRequestBehavior behavior) + //{ + // return new JsonNetResult(Services.DateTimeHelper) + // { + // Data = data, + // ContentType = contentType, + // ContentEncoding = contentEncoding, + // JsonRequestBehavior = behavior + // }; + //} + } } diff --git a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs index 9675905c1d..89f19f735a 100644 --- a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs +++ b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs @@ -102,522 +102,519 @@ namespace SmartStore.Web.Framework { public class DependencyRegistrar : IDependencyRegistrar { - public virtual void Register(ContainerBuilder builder, ITypeFinder typeFinder, bool isActiveModule) + public virtual void Register(ContainerBuilder builder, ITypeFinder typeFinder, bool isActiveModule) { - // plugins - var pluginFinder = PluginFinder.Current; - builder.RegisterInstance(pluginFinder); - builder.RegisterType(); - - // modules - builder.RegisterModule(new CoreModule(typeFinder)); - builder.RegisterModule(new MediaModule(typeFinder)); - builder.RegisterModule(new DbModule(typeFinder)); - builder.RegisterModule(new CachingModule()); - builder.RegisterModule(new SearchModule()); - builder.RegisterModule(new LocalizationModule()); - builder.RegisterModule(new MessagingModule()); - builder.RegisterModule(new WebModule(typeFinder)); - builder.RegisterModule(new WebApiModule(typeFinder)); - builder.RegisterModule(new UiModule(typeFinder)); - builder.RegisterModule(new IOModule()); - builder.RegisterModule(new PackagingModule()); - builder.RegisterModule(new ProvidersModule(typeFinder, pluginFinder)); + // plugins + var pluginFinder = PluginFinder.Current; + builder.RegisterInstance(pluginFinder); + builder.RegisterType(); + + // modules + builder.RegisterModule(new CoreModule(typeFinder)); + builder.RegisterModule(new MediaModule(typeFinder)); + builder.RegisterModule(new DbModule(typeFinder)); + builder.RegisterModule(new CachingModule()); + builder.RegisterModule(new SearchModule()); + builder.RegisterModule(new LocalizationModule()); + builder.RegisterModule(new MessagingModule()); + builder.RegisterModule(new WebModule(typeFinder)); + builder.RegisterModule(new WebApiModule(typeFinder)); + builder.RegisterModule(new UiModule(typeFinder)); + builder.RegisterModule(new IOModule()); + builder.RegisterModule(new PackagingModule()); + builder.RegisterModule(new ProvidersModule(typeFinder, pluginFinder)); builder.RegisterModule(new TasksModule(typeFinder)); - builder.RegisterModule(new DataExchangeModule(typeFinder)); - builder.RegisterModule(new EventModule(typeFinder, pluginFinder)); + builder.RegisterModule(new DataExchangeModule(typeFinder)); + builder.RegisterModule(new EventModule(typeFinder, pluginFinder)); builder.RegisterModule(new RuleModule(typeFinder)); } - public int Order + public int Order => -100; + } + + #region Modules + + internal class CoreModule : Module + { + private readonly ITypeFinder _typeFinder; + + public CoreModule(ITypeFinder typeFinder) { - get { return -100; } + _typeFinder = typeFinder; } - } - #region Modules - - internal class CoreModule : Module - { - private readonly ITypeFinder _typeFinder; - - public CoreModule(ITypeFinder typeFinder) - { - _typeFinder = typeFinder; - } - - protected override void Load(ContainerBuilder builder) - { - builder.RegisterType().As().SingleInstance(); - - // sources - builder.RegisterGeneric(typeof(WorkValues<>)).InstancePerRequest(); - builder.RegisterSource(new SettingsSource()); - builder.RegisterSource(new WorkSource()); - - // Logging stuff - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - // web helper - builder.RegisterType().As().InstancePerRequest(); - - // work context - builder.RegisterType().As().InstancePerRequest(); - - // store context - builder.RegisterType().As().InstancePerRequest(); - - // services - builder.RegisterType().As().As().InstancePerRequest(); - - builder.RegisterType().As() - .As() - .WithNullCache() - .InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerLifetimeScope(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + protected override void Load(ContainerBuilder builder) + { + builder.RegisterType().As().SingleInstance(); + + // sources + builder.RegisterGeneric(typeof(WorkValues<>)).InstancePerRequest(); + builder.RegisterSource(new SettingsSource()); + builder.RegisterSource(new WorkSource()); + + // Logging stuff + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + + // web helper + builder.RegisterType().As().InstancePerRequest(); + + // work context + builder.RegisterType().As().InstancePerRequest(); + + // store context + builder.RegisterType().As().InstancePerRequest(); + + // services + builder.RegisterType().As().As().InstancePerRequest(); + + builder.RegisterType().As() + .As() + .WithNullCache() + .InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerLifetimeScope(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().As().InstancePerRequest(); + builder.RegisterType().As().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().As().InstancePerRequest(); - builder.RegisterType().As().As().InstancePerRequest(); - builder.RegisterType().As().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().As().InstancePerRequest(); + builder.RegisterType().As().As().InstancePerRequest(); + builder.RegisterType().As().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - } - - protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) - { - // Look for first settable property of type "ICommonServices" and inject - var servicesProperty = FindCommonServicesProperty(registration.Activator.LimitType); - - if (servicesProperty == null) - return; - - registration.Metadata.Add("Property.ICommonServices", FastProperty.Create(servicesProperty)); - - registration.Activated += (sender, e) => - { - if (DataSettings.DatabaseIsInstalled()) - { - var prop = e.Component.Metadata.Get("Property.ICommonServices") as FastProperty; - var services = e.Context.Resolve(); - prop.SetValue(e.Instance, services); - } - }; - } - - private static PropertyInfo FindCommonServicesProperty(Type type) - { - var prop = type - .GetProperties(BindingFlags.SetProperty | BindingFlags.Public | BindingFlags.Instance) - .Select(p => new - { - PropertyInfo = p, - p.PropertyType, - IndexParameters = p.GetIndexParameters(), - Accessors = p.GetAccessors(false) - }) - .Where(x => x.PropertyType == typeof(ICommonServices)) // must be ICommonServices - .Where(x => x.IndexParameters.Count() == 0) // must not be an indexer - .Where(x => x.Accessors.Length != 1 || x.Accessors[0].ReturnType == typeof(void)) //must have get/set, or only set - .Select(x => x.PropertyInfo) - .FirstOrDefault(); - - return prop; - } - - private IEnumerable> BuildLoggerInjectors(Type componentType) - { - // Look for first settable property of type "ICommonServices" - var loggerProperties = componentType - .GetProperties(BindingFlags.SetProperty | BindingFlags.Public | BindingFlags.Instance) - .Select(p => new - { - PropertyInfo = p, - p.PropertyType, - IndexParameters = p.GetIndexParameters(), - Accessors = p.GetAccessors(false) - }) - .Where(x => x.PropertyType == typeof(ILogger)) // must be a logger - .Where(x => x.IndexParameters.Count() == 0) // must not be an indexer - .Where(x => x.Accessors.Length != 1 || x.Accessors[0].ReturnType == typeof(void)) //must have get/set, or only set - .Select(x => FastProperty.Create(x.PropertyInfo)); - - // Return an array of actions that resolve a logger and assign the property - foreach (var prop in loggerProperties) - { - yield return (ctx, instance) => - { - string component = componentType.ToString(); - var logger = ctx.Resolve(); - prop.SetValue(instance, logger); - }; - } - } - } + builder.RegisterType().As().InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + } + + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) + { + // Look for first settable property of type "ICommonServices" and inject + var servicesProperty = FindCommonServicesProperty(registration.Activator.LimitType); + + if (servicesProperty == null) + return; + + registration.Metadata.Add("Property.ICommonServices", FastProperty.Create(servicesProperty)); + + registration.Activated += (sender, e) => + { + if (DataSettings.DatabaseIsInstalled()) + { + var prop = e.Component.Metadata.Get("Property.ICommonServices") as FastProperty; + var services = e.Context.Resolve(); + prop.SetValue(e.Instance, services); + } + }; + } + + private static PropertyInfo FindCommonServicesProperty(Type type) + { + var prop = type + .GetProperties(BindingFlags.SetProperty | BindingFlags.Public | BindingFlags.Instance) + .Select(p => new + { + PropertyInfo = p, + p.PropertyType, + IndexParameters = p.GetIndexParameters(), + Accessors = p.GetAccessors(false) + }) + .Where(x => x.PropertyType == typeof(ICommonServices)) // must be ICommonServices + .Where(x => x.IndexParameters.Count() == 0) // must not be an indexer + .Where(x => x.Accessors.Length != 1 || x.Accessors[0].ReturnType == typeof(void)) //must have get/set, or only set + .Select(x => x.PropertyInfo) + .FirstOrDefault(); + + return prop; + } + + private IEnumerable> BuildLoggerInjectors(Type componentType) + { + // Look for first settable property of type "ICommonServices" + var loggerProperties = componentType + .GetProperties(BindingFlags.SetProperty | BindingFlags.Public | BindingFlags.Instance) + .Select(p => new + { + PropertyInfo = p, + p.PropertyType, + IndexParameters = p.GetIndexParameters(), + Accessors = p.GetAccessors(false) + }) + .Where(x => x.PropertyType == typeof(ILogger)) // must be a logger + .Where(x => x.IndexParameters.Count() == 0) // must not be an indexer + .Where(x => x.Accessors.Length != 1 || x.Accessors[0].ReturnType == typeof(void)) //must have get/set, or only set + .Select(x => FastProperty.Create(x.PropertyInfo)); + + // Return an array of actions that resolve a logger and assign the property + foreach (var prop in loggerProperties) + { + yield return (ctx, instance) => + { + string component = componentType.ToString(); + var logger = ctx.Resolve(); + prop.SetValue(instance, logger); + }; + } + } + } internal class DbModule : Module - { - private readonly ITypeFinder _typeFinder; + { + private readonly ITypeFinder _typeFinder; - public DbModule(ITypeFinder typeFinder) - { - _typeFinder = typeFinder; - } + public DbModule(ITypeFinder typeFinder) + { + _typeFinder = typeFinder; + } - private static (Type ContextType, Type EntityType) DiscoverHookTypes(Type type) - { - var x = type.BaseType; + private static (Type ContextType, Type EntityType) DiscoverHookTypes(Type type) + { + var x = type.BaseType; while (x != null && x != typeof(object)) { if (x.IsGenericType) { - var gtd = x.GetGenericTypeDefinition(); - if (gtd == typeof(DbSaveHook<>)) - { - return (typeof(SmartObjectContext), x.GetGenericArguments()[0]); - } - if (gtd == typeof(DbSaveHook<,>)) - { - var args = x.GetGenericArguments(); - return (args[0], args[1]); - } - } + var gtd = x.GetGenericTypeDefinition(); + if (gtd == typeof(DbSaveHook<>)) + { + return (typeof(SmartObjectContext), x.GetGenericArguments()[0]); + } + if (gtd == typeof(DbSaveHook<,>)) + { + var args = x.GetGenericArguments(); + return (args[0], args[1]); + } + } x = x.BaseType; } - foreach (var intface in type.GetInterfaces()) - { - if (intface.IsGenericType) + foreach (var intface in type.GetInterfaces()) + { + if (intface.IsGenericType) { - var gtd = intface.GetGenericTypeDefinition(); - if (gtd == typeof(IDbSaveHook<>)) + var gtd = intface.GetGenericTypeDefinition(); + if (gtd == typeof(IDbSaveHook<>)) { - return (intface.GetGenericArguments()[0], typeof(BaseEntity)); - } - } - } - - return (typeof(SmartObjectContext), typeof(BaseEntity)); - - //if (type.IsSubClass(typeof(DbSaveHook<,>), out Type baseType)) - //{ - // var args = baseType.GetGenericArguments(); - // return (args[0], args[1]); - //} - //else if (type.IsSubClass(typeof(IDbSaveHook<>), out baseType)) - //{ - // var args = baseType.GetGenericArguments(); - // return (args[0], typeof(BaseEntity)); - //} - - //return (typeof(SmartObjectContext), typeof(BaseEntity)); - } - - protected override void Load(ContainerBuilder builder) - { - builder.Register(c => DataSettings.Current).As().InstancePerDependency(); - builder.Register(x => new EfDataProviderFactory(x.Resolve())).As().InstancePerDependency(); - - builder.Register(x => x.Resolve().LoadDataProvider()).As().InstancePerDependency(); - builder.Register(x => (IEfDataProvider)x.Resolve().LoadDataProvider()).As().InstancePerDependency(); - - builder.RegisterType().As().InstancePerRequest(); - - builder.RegisterType().As().SingleInstance(); - - if (DataSettings.DatabaseIsInstalled()) - { - // Register DB Hooks (only when app was installed properly) - - var hookTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); - foreach (var hookType in hookTypes) - { - var types = DiscoverHookTypes(hookType); - - var registration = builder.RegisterType(hookType) - .As() - .InstancePerRequest() - .WithMetadata(m => - { - m.For(em => em.HookedType, types.EntityType); - m.For(em => em.ImplType, hookType); - m.For(em => em.DbContextType, types.ContextType ?? typeof(SmartObjectContext)); - m.For(em => em.Important, hookType.HasAttribute(false)); - }); - } - - builder.Register(c => new SmartObjectContext(DataSettings.Current.DataConnectionString)) - //.PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies) - .PropertiesAutowired(new DbContextPropertySelector(), false) - .InstancePerRequest(); - } - else - { - builder.Register(c => - { - try - { - return new SmartObjectContext(DataSettings.Current.DataConnectionString); - } - catch - { - // return new SmartObjectContext(); - return null; - } - - }) - .PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies) - .InstancePerRequest(); - } - - builder.Register>(c => - { - var cc = c.Resolve(); - return named => cc.ResolveNamed(named); - }); - - builder.RegisterGeneric(typeof(EfRepository<>)).As(typeof(IRepository<>)).InstancePerRequest(); - - builder.Register(c => - { - var storeService = c.Resolve(); - var aclService = c.Resolve(); - - return new DbQuerySettings(!aclService.HasActiveAcl, storeService.IsSingleStoreMode()); - }) - .InstancePerRequest(); - } - - protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) - { - var querySettingsProperty = FindQuerySettingsProperty(registration.Activator.LimitType); - - if (querySettingsProperty == null) - return; - - registration.Metadata.Add("Property.DbQuerySettings", FastProperty.Create(querySettingsProperty)); - - registration.Activated += (sender, e) => - { - if (DataSettings.DatabaseIsInstalled()) - { - if (e.Component.Metadata.Get("Property.DbQuerySettings") is FastProperty prop) - { - var querySettings = e.Context.Resolve(); - prop.SetValue(e.Instance, querySettings); - } - } - }; - } - - private static PropertyInfo FindQuerySettingsProperty(Type type) - { - return type.GetProperty("QuerySettings", typeof(DbQuerySettings)); - } - - private class DbContextPropertySelector : IPropertySelector - { - public bool InjectProperty(PropertyInfo propertyInfo, object instance) - { - // Prevent Autofac circularity exception & never trigger hooks during tooling or tests - return HostingEnvironment.IsHosted && typeof(IDbHookHandler).IsAssignableFrom(propertyInfo.PropertyType); - } - } - } + return (intface.GetGenericArguments()[0], typeof(BaseEntity)); + } + } + } + + return (typeof(SmartObjectContext), typeof(BaseEntity)); + + //if (type.IsSubClass(typeof(DbSaveHook<,>), out Type baseType)) + //{ + // var args = baseType.GetGenericArguments(); + // return (args[0], args[1]); + //} + //else if (type.IsSubClass(typeof(IDbSaveHook<>), out baseType)) + //{ + // var args = baseType.GetGenericArguments(); + // return (args[0], typeof(BaseEntity)); + //} + + //return (typeof(SmartObjectContext), typeof(BaseEntity)); + } + + protected override void Load(ContainerBuilder builder) + { + builder.Register(c => DataSettings.Current).As().InstancePerDependency(); + builder.Register(x => new EfDataProviderFactory(x.Resolve())).As().InstancePerDependency(); + + builder.Register(x => x.Resolve().LoadDataProvider()).As().InstancePerDependency(); + builder.Register(x => (IEfDataProvider)x.Resolve().LoadDataProvider()).As().InstancePerDependency(); + + builder.RegisterType().As().InstancePerRequest(); + + builder.RegisterType().As().SingleInstance(); + + if (DataSettings.DatabaseIsInstalled()) + { + // Register DB Hooks (only when app was installed properly) + + var hookTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); + foreach (var hookType in hookTypes) + { + var types = DiscoverHookTypes(hookType); + + var registration = builder.RegisterType(hookType) + .As() + .InstancePerRequest() + .WithMetadata(m => + { + m.For(em => em.HookedType, types.EntityType); + m.For(em => em.ImplType, hookType); + m.For(em => em.DbContextType, types.ContextType ?? typeof(SmartObjectContext)); + m.For(em => em.Important, hookType.HasAttribute(false)); + }); + } + + builder.Register(c => new SmartObjectContext(DataSettings.Current.DataConnectionString)) + //.PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies) + .PropertiesAutowired(new DbContextPropertySelector(), false) + .InstancePerRequest(); + } + else + { + builder.Register(c => + { + try + { + return new SmartObjectContext(DataSettings.Current.DataConnectionString); + } + catch + { + // return new SmartObjectContext(); + return null; + } + + }) + .PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies) + .InstancePerRequest(); + } + + builder.Register>(c => + { + var cc = c.Resolve(); + return named => cc.ResolveNamed(named); + }); + + builder.RegisterGeneric(typeof(EfRepository<>)).As(typeof(IRepository<>)).InstancePerRequest(); + + builder.Register(c => + { + var storeService = c.Resolve(); + var aclService = c.Resolve(); + + return new DbQuerySettings(!aclService.HasActiveAcl, storeService.IsSingleStoreMode()); + }) + .InstancePerRequest(); + } + + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) + { + var querySettingsProperty = FindQuerySettingsProperty(registration.Activator.LimitType); + + if (querySettingsProperty == null) + return; + + registration.Metadata.Add("Property.DbQuerySettings", FastProperty.Create(querySettingsProperty)); + + registration.Activated += (sender, e) => + { + if (DataSettings.DatabaseIsInstalled()) + { + if (e.Component.Metadata.Get("Property.DbQuerySettings") is FastProperty prop) + { + var querySettings = e.Context.Resolve(); + prop.SetValue(e.Instance, querySettings); + } + } + }; + } + + private static PropertyInfo FindQuerySettingsProperty(Type type) + { + return type.GetProperty("QuerySettings", typeof(DbQuerySettings)); + } + + private class DbContextPropertySelector : IPropertySelector + { + public bool InjectProperty(PropertyInfo propertyInfo, object instance) + { + // Prevent Autofac circularity exception & never trigger hooks during tooling or tests + return HostingEnvironment.IsHosted && typeof(IDbHookHandler).IsAssignableFrom(propertyInfo.PropertyType); + } + } + } internal class LocalizationModule : Module - { - protected override void Load(ContainerBuilder builder) - { - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - builder.Register(c => c.Resolve().Get).InstancePerRequest(); - builder.Register(c => c.Resolve().GetEx).InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + { + protected override void Load(ContainerBuilder builder) + { + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + builder.Register(c => c.Resolve().Get).InstancePerRequest(); + builder.Register(c => c.Resolve().GetEx).InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().InstancePerRequest(); - } - - protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) - { - var userProperty = FindUserProperty(registration.Activator.LimitType); - - if (userProperty == null) - return; - - registration.Metadata.Add("Property.T", FastProperty.Create(userProperty)); - - registration.Activated += (sender, e) => - { - if (DataSettings.DatabaseIsInstalled() && e.Context.Resolve().IsFullyInitialized) - { - if (e.Component.Metadata.Get("Property.T") is FastProperty prop) - { - try - { - var iText = e.Context.Resolve(); - if (prop.Property.PropertyType == typeof(Localizer)) - { - Localizer localizer = e.Context.Resolve().Get; - prop.SetValue(e.Instance, localizer); - } - else - { - LocalizerEx localizerEx = e.Context.Resolve().GetEx; - prop.SetValue(e.Instance, localizerEx); - } - } - catch { } - } - } - }; - } - - private static PropertyInfo FindUserProperty(Type type) - { - return type.GetProperty("T", typeof(Localizer)) ?? type.GetProperty("T", typeof(LocalizerEx)); - } - } + } + + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) + { + var userProperty = FindUserProperty(registration.Activator.LimitType); + + if (userProperty == null) + return; + + registration.Metadata.Add("Property.T", FastProperty.Create(userProperty)); + + registration.Activated += (sender, e) => + { + if (DataSettings.DatabaseIsInstalled() && e.Context.Resolve().IsFullyInitialized) + { + if (e.Component.Metadata.Get("Property.T") is FastProperty prop) + { + try + { + var iText = e.Context.Resolve(); + if (prop.Property.PropertyType == typeof(Localizer)) + { + Localizer localizer = e.Context.Resolve().Get; + prop.SetValue(e.Instance, localizer); + } + else + { + LocalizerEx localizerEx = e.Context.Resolve().GetEx; + prop.SetValue(e.Instance, localizerEx); + } + } + catch { } + } + } + }; + } + + private static PropertyInfo FindUserProperty(Type type) + { + return type.GetProperty("T", typeof(Localizer)) ?? type.GetProperty("T", typeof(LocalizerEx)); + } + } internal class CachingModule : Module - { - protected override void Load(ContainerBuilder builder) - { - // Output cache - builder.RegisterType().As().InstancePerRequest(); - builder.Register(c => NullOutputCacheInvalidationObserver.Instance).SingleInstance(); - builder.RegisterType().As().InstancePerRequest(); - - // Request cache - builder.RegisterType().As().InstancePerRequest(); - - // Model/Business cache (application scoped) - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().Named("null").SingleInstance(); - - // Register MemoryCacheManager twice, this time explicitly named. - // We may need this later in decorator classes as a kind of fallback. - builder.RegisterType().Named("memory").SingleInstance(); - - // Asset cache - if (DataSettings.DatabaseIsInstalled()) - { - builder.RegisterType().As().InstancePerRequest(); - } - else - { - builder.Register(c => DefaultAssetCache.Null).SingleInstance(); - } - } - } + { + protected override void Load(ContainerBuilder builder) + { + // Output cache + builder.RegisterType().As().InstancePerRequest(); + builder.Register(c => NullOutputCacheInvalidationObserver.Instance).SingleInstance(); + builder.RegisterType().As().InstancePerRequest(); + + // Request cache + builder.RegisterType().As().InstancePerRequest(); + + // Model/Business cache (application scoped) + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().Named("null").SingleInstance(); + + // Register MemoryCacheManager twice, this time explicitly named. + // We may need this later in decorator classes as a kind of fallback. + builder.RegisterType().Named("memory").SingleInstance(); + + // Asset cache + if (DataSettings.DatabaseIsInstalled()) + { + builder.RegisterType().As().InstancePerRequest(); + } + else + { + builder.Register(c => DefaultAssetCache.Null).SingleInstance(); + } + } + } internal class SearchModule : Module - { - protected override void Load(ContainerBuilder builder) - { + { + protected override void Load(ContainerBuilder builder) + { // General. - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); @@ -633,238 +630,239 @@ protected override void Load(ContainerBuilder builder) builder.RegisterType().As().InstancePerRequest(); builder.RegisterType().As().InstancePerRequest(); } - } + } internal class EventModule : Module - { - private readonly ITypeFinder _typeFinder; - private readonly IPluginFinder _pluginFinder; - - public EventModule(ITypeFinder typeFinder, IPluginFinder pluginFinder) - { - _typeFinder = typeFinder; - _pluginFinder = pluginFinder; - } - - protected override void Load(ContainerBuilder builder) - { - builder.RegisterType().As().SingleInstance(); - - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); - - var consumerTypes = _typeFinder.FindClassesOfType(typeof(IConsumer)); - foreach (var type in consumerTypes) - { - var registration = builder - .RegisterType(type) - .As() - .Keyed(type) - .InstancePerRequest(); - - var pluginDescriptor = _pluginFinder.GetPluginDescriptorByAssembly(type.Assembly); - var isActive = PluginManager.IsActivePluginAssembly(type.Assembly); - - registration.WithMetadata(m => { - m.For(em => em.IsActive, isActive); - m.For(em => em.ContainerType, type); - m.For(em => em.PluginDescriptor, pluginDescriptor); - }); - } - } - } + { + private readonly ITypeFinder _typeFinder; + private readonly IPluginFinder _pluginFinder; + + public EventModule(ITypeFinder typeFinder, IPluginFinder pluginFinder) + { + _typeFinder = typeFinder; + _pluginFinder = pluginFinder; + } + + protected override void Load(ContainerBuilder builder) + { + builder.RegisterType().As().SingleInstance(); + + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().SingleInstance(); + + var consumerTypes = _typeFinder.FindClassesOfType(typeof(IConsumer)); + foreach (var type in consumerTypes) + { + var registration = builder + .RegisterType(type) + .As() + .Keyed(type) + .InstancePerRequest(); + + var pluginDescriptor = _pluginFinder.GetPluginDescriptorByAssembly(type.Assembly); + var isActive = PluginManager.IsActivePluginAssembly(type.Assembly); + + registration.WithMetadata(m => + { + m.For(em => em.IsActive, isActive); + m.For(em => em.ContainerType, type); + m.For(em => em.PluginDescriptor, pluginDescriptor); + }); + } + } + } internal class MessagingModule : Module - { - protected override void Load(ContainerBuilder builder) - { - // Templating - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().SingleInstance(); - } - } + { + protected override void Load(ContainerBuilder builder) + { + // Templating + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().SingleInstance(); + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().SingleInstance(); + } + } internal class WebModule : Module - { - private readonly ITypeFinder _typeFinder; + { + private readonly ITypeFinder _typeFinder; - public WebModule(ITypeFinder typeFinder) - { - _typeFinder = typeFinder; - } + public WebModule(ITypeFinder typeFinder) + { + _typeFinder = typeFinder; + } - protected override void Load(ContainerBuilder builder) - { - var foundAssemblies = _typeFinder.GetAssemblies(ignoreInactivePlugins: true).ToArray(); + protected override void Load(ContainerBuilder builder) + { + var foundAssemblies = _typeFinder.GetAssemblies(ignoreInactivePlugins: true).ToArray(); - builder.RegisterModule(new AutofacWebTypesModule()); - builder.Register(HttpContextBaseFactory).As(); + builder.RegisterModule(new AutofacWebTypesModule()); + builder.Register(HttpContextBaseFactory).As(); - // register all controllers - builder.RegisterControllers(foundAssemblies); + // register all controllers + builder.RegisterControllers(foundAssemblies); - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().InstancePerRequest(); + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().InstancePerRequest(); - // Filter provider - builder.RegisterFilterProvider(); + // Filter provider + builder.RegisterFilterProvider(); - // Model binding - builder.RegisterModelBinders(foundAssemblies); - builder.RegisterModelBinderProvider(); + // Model binding + builder.RegisterModelBinders(foundAssemblies); + builder.RegisterModelBinderProvider(); - var pageHelperRegistration = builder.RegisterType().InstancePerRequest(); + var pageHelperRegistration = builder.RegisterType().InstancePerRequest(); - // Global exception handling - if (DataSettings.DatabaseIsInstalled()) - { - pageHelperRegistration.PropertiesAutowired(PropertyWiringOptions.None); + // Global exception handling + if (DataSettings.DatabaseIsInstalled()) + { + pageHelperRegistration.PropertiesAutowired(PropertyWiringOptions.None); - builder.RegisterType() + builder.RegisterType() .AsExceptionFilterFor(-100) .AsActionFilterFor(int.MaxValue) .InstancePerRequest(); - builder.RegisterType() + builder.RegisterType() .AsActionFilterFor() .InstancePerRequest(); - } - } - - static HttpContextBase HttpContextBaseFactory(IComponentContext ctx) - { - if (IsRequestValid()) - { - return new HttpContextWrapper(HttpContext.Current); - } - - // register FakeHttpContext when HttpContext is not available - return new FakeHttpContext("~/"); - } - - static bool IsRequestValid() - { - if (HttpContext.Current == null) - { - return false; - } - - return HttpContext.Current.SafeGetHttpRequest() != null; - } - } + } + } + + static HttpContextBase HttpContextBaseFactory(IComponentContext ctx) + { + if (IsRequestValid()) + { + return new HttpContextWrapper(HttpContext.Current); + } + + // register FakeHttpContext when HttpContext is not available + return new FakeHttpContext("~/"); + } + + static bool IsRequestValid() + { + if (HttpContext.Current == null) + { + return false; + } + + return HttpContext.Current.SafeGetHttpRequest() != null; + } + } internal class WebApiModule : Module - { - private readonly ITypeFinder _typeFinder; - - public WebApiModule(ITypeFinder typeFinder) - { - _typeFinder = typeFinder; - } - - protected override void Load(ContainerBuilder builder) - { - var foundAssemblies = _typeFinder.GetAssemblies(ignoreInactivePlugins: true).ToArray(); - - // register all api controllers - builder.RegisterApiControllers(foundAssemblies); - - builder.RegisterType().As(); - } - - protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) - { - if (!DataSettings.DatabaseIsInstalled()) - return; - - var baseType = typeof(WebApiEntityController<,>); - var type = registration.Activator.LimitType; - - if (!type.IsSubClass(baseType, out var implementingType)) - return; - - var repoProperty = FindRepositoryProperty(type, implementingType.GetGenericArguments()[0]); - var serviceProperty = FindServiceProperty(type, implementingType.GetGenericArguments()[1]); - - if (repoProperty != null || serviceProperty != null) - { - registration.Activated += (sender, e) => - { - if (repoProperty != null) - { - var repo = e.Context.Resolve(repoProperty.PropertyType); - repoProperty.SetValue(e.Instance, repo, null); - } - - if (serviceProperty != null) - { - var service = e.Context.Resolve(serviceProperty.PropertyType); - serviceProperty.SetValue(e.Instance, service, null); - } - }; - } - } - - private static PropertyInfo FindRepositoryProperty(Type type, Type entityType) - { - var pi = type.GetProperty("Repository", typeof(IRepository<>).MakeGenericType(entityType)); - return pi; - } - - private static PropertyInfo FindServiceProperty(Type type, Type serviceType) - { - var pi = type.GetProperty("Service", serviceType); - return pi; - } - - } + { + private readonly ITypeFinder _typeFinder; + + public WebApiModule(ITypeFinder typeFinder) + { + _typeFinder = typeFinder; + } + + protected override void Load(ContainerBuilder builder) + { + var foundAssemblies = _typeFinder.GetAssemblies(ignoreInactivePlugins: true).ToArray(); + + // register all api controllers + builder.RegisterApiControllers(foundAssemblies); + + builder.RegisterType().As(); + } + + protected override void AttachToComponentRegistration(IComponentRegistryBuilder componentRegistry, IComponentRegistration registration) + { + if (!DataSettings.DatabaseIsInstalled()) + return; + + var baseType = typeof(WebApiEntityController<,>); + var type = registration.Activator.LimitType; + + if (!type.IsSubClass(baseType, out var implementingType)) + return; + + var repoProperty = FindRepositoryProperty(type, implementingType.GetGenericArguments()[0]); + var serviceProperty = FindServiceProperty(type, implementingType.GetGenericArguments()[1]); + + if (repoProperty != null || serviceProperty != null) + { + registration.Activated += (sender, e) => + { + if (repoProperty != null) + { + var repo = e.Context.Resolve(repoProperty.PropertyType); + repoProperty.SetValue(e.Instance, repo, null); + } + + if (serviceProperty != null) + { + var service = e.Context.Resolve(serviceProperty.PropertyType); + serviceProperty.SetValue(e.Instance, service, null); + } + }; + } + } + + private static PropertyInfo FindRepositoryProperty(Type type, Type entityType) + { + var pi = type.GetProperty("Repository", typeof(IRepository<>).MakeGenericType(entityType)); + return pi; + } + + private static PropertyInfo FindServiceProperty(Type type, Type serviceType) + { + var pi = type.GetProperty("Service", serviceType); + return pi; + } + + } internal class UiModule : Module - { - private readonly ITypeFinder _typeFinder; + { + private readonly ITypeFinder _typeFinder; public UiModule(ITypeFinder typeFinder) - { - _typeFinder = typeFinder; + { + _typeFinder = typeFinder; } - protected override void Load(ContainerBuilder builder) - { - // register theming services - builder.Register(x => new DefaultThemeRegistry(x.Resolve(), x.Resolve(), null, null, true)).As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); + protected override void Load(ContainerBuilder builder) + { + // register theming services + builder.Register(x => new DefaultThemeRegistry(x.Resolve(), x.Resolve(), null, null, true)).As().SingleInstance(); + builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); - // register UI component renderers - builder.RegisterType().As>(); - builder.RegisterType().As>(); - builder.RegisterType().As>(); + // register UI component renderers + builder.RegisterType().As>(); + builder.RegisterType().As>(); + builder.RegisterType().As>(); builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().SingleInstance(); // Menus builder.RegisterType().As().InstancePerRequest(); - + var menuResolverTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); foreach (var type in menuResolverTypes) { @@ -898,256 +896,256 @@ protected override void Load(ContainerBuilder builder) builder.RegisterType().AsResultFilterFor(0); } } - } + } internal class IOModule : Module - { - protected override void Load(ContainerBuilder builder) - { - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); - - // Register IFileSystem twice, this time explicitly named. - // We may need this later in decorator classes as a kind of fallback. - builder.RegisterType().Named("local").SingleInstance(); - builder.RegisterType().Named("local").SingleInstance(); - - builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); - } - } + { + protected override void Load(ContainerBuilder builder) + { + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().SingleInstance(); + + // Register IFileSystem twice, this time explicitly named. + // We may need this later in decorator classes as a kind of fallback. + builder.RegisterType().Named("local").SingleInstance(); + builder.RegisterType().Named("local").SingleInstance(); + + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().SingleInstance(); + } + } internal class PackagingModule : Module - { - protected override void Load(ContainerBuilder builder) - { - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - } - } + { + protected override void Load(ContainerBuilder builder) + { + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + } + } internal class ProvidersModule : Module - { - private readonly ITypeFinder _typeFinder; - private readonly IPluginFinder _pluginFinder; - - public ProvidersModule(ITypeFinder typeFinder, IPluginFinder pluginFinder) - { - _typeFinder = typeFinder; - _pluginFinder = pluginFinder; - } - - protected override void Load(ContainerBuilder builder) - { - builder.RegisterType().As().InstancePerRequest(); - - if (!DataSettings.DatabaseIsInstalled()) - return; - - var providerTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true).ToList(); - - foreach (var type in providerTypes) - { - var pluginDescriptor = _pluginFinder.GetPluginDescriptorByAssembly(type.Assembly); - var groupName = ProviderTypeToKnownGroupName(type); - var systemName = GetSystemName(type, pluginDescriptor); - var friendlyName = GetFriendlyName(type, pluginDescriptor); - var displayOrder = GetDisplayOrder(type, pluginDescriptor); - var dependentWidgets = GetDependentWidgets(type); - var resPattern = (pluginDescriptor != null ? "Plugins" : "Providers") + ".{1}.{0}"; // e.g. Plugins.FriendlyName.MySystemName - var settingPattern = (pluginDescriptor != null ? "Plugins" : "Providers") + ".{0}.{1}"; // e.g. Plugins.MySystemName.DisplayOrder - var isConfigurable = typeof(IConfigurable).IsAssignableFrom(type); - var isEditable = typeof(IUserEditable).IsAssignableFrom(type); - var isHidden = GetIsHidden(type); - var exportFeature = GetExportFeature(type); - - var registration = builder.RegisterType(type).Named(systemName).InstancePerRequest().PropertiesAutowired(PropertyWiringOptions.None); - registration.WithMetadata(m => - { - m.For(em => em.PluginDescriptor, pluginDescriptor); - m.For(em => em.GroupName, groupName); - m.For(em => em.SystemName, systemName); - m.For(em => em.ResourceKeyPattern, resPattern); - m.For(em => em.SettingKeyPattern, settingPattern); - m.For(em => em.FriendlyName, friendlyName.Item1); - m.For(em => em.Description, friendlyName.Item2); - m.For(em => em.DisplayOrder, displayOrder); - m.For(em => em.DependentWidgets, dependentWidgets); - m.For(em => em.IsConfigurable, isConfigurable); - m.For(em => em.IsEditable, isEditable); - m.For(em => em.IsHidden, isHidden); - m.For(em => em.ExportFeatures, exportFeature); - }); - - // Register specific provider type. - RegisterAsSpecificProvider(type, systemName, registration); - RegisterAsSpecificProvider(type, systemName, registration); - RegisterAsSpecificProvider(type, systemName, registration); - RegisterAsSpecificProvider(type, systemName, registration); - RegisterAsSpecificProvider(type, systemName, registration); - RegisterAsSpecificProvider(type, systemName, registration); - RegisterAsSpecificProvider(type, systemName, registration); - RegisterAsSpecificProvider(type, systemName, registration); - RegisterAsSpecificProvider(type, systemName, registration); - } - } - - #region Helpers - - private void RegisterAsSpecificProvider(Type implType, string systemName, IRegistrationBuilder registration) where T : IProvider - { - if (typeof(T).IsAssignableFrom(implType)) - { - try - { - registration.As().Named(systemName); - registration.WithMetadata(m => - { - m.For(em => em.ProviderType, typeof(T)); - }); - } - catch (Exception) { } - } - } - - private string GetSystemName(Type type, PluginDescriptor descriptor) - { - var attr = type.GetAttribute(false); - if (attr != null) - { - return attr.Name; - } - - if (typeof(IPlugin).IsAssignableFrom(type) && descriptor != null) - { - return descriptor.SystemName; - } - - return type.FullName; - //throw Error.Application("The 'SystemNameAttribute' must be applied to a provider type if the provider does not implement 'IPlugin' (provider type: {0}, plugin: {1})".FormatInvariant(type.FullName, descriptor != null ? descriptor.SystemName : "-")); - } - - private int GetDisplayOrder(Type type, PluginDescriptor descriptor) - { - var attr = type.GetAttribute(false); - if (attr != null) - { - return attr.DisplayOrder; - } - - if (typeof(IPlugin).IsAssignableFrom(type) && descriptor != null) - { - return descriptor.DisplayOrder; - } - - return 0; - } - - private bool GetIsHidden(Type type) - { - var attr = type.GetAttribute(false); - if (attr != null) - { - return attr.IsHidden; - } - - return false; - } - - private ExportFeatures GetExportFeature(Type type) - { - var attr = type.GetAttribute(false); - - if (attr != null) - { - return attr.Features; - } - - return ExportFeatures.None; - } - - private Tuple GetFriendlyName(Type type, PluginDescriptor descriptor) - { - string name = null; - string description = name; - - var attr = type.GetAttribute(false); - if (attr != null) - { - name = attr.Name; - description = attr.Description; - } - else if (typeof(IPlugin).IsAssignableFrom(type) && descriptor != null) - { - name = descriptor.FriendlyName; - description = descriptor.Description; - } - else - { - name = Inflector.Titleize(type.Name); - //throw Error.Application("The 'FriendlyNameAttribute' must be applied to a provider type if the provider does not implement 'IPlugin' (provider type: {0}, plugin: {1})".FormatInvariant(type.FullName, descriptor != null ? descriptor.SystemName : "-")); - } - - return new Tuple(name, description); - } - - private string[] GetDependentWidgets(Type type) - { - if (!typeof(IWidget).IsAssignableFrom(type)) - { - // don't let widgets depend on other widgets - var attr = type.GetAttribute(false); - if (attr != null) - { - return attr.WidgetSystemNames; - } - } - - return new string[] {}; - } - - private string ProviderTypeToKnownGroupName(Type implType) - { - if (typeof(ITaxProvider).IsAssignableFrom(implType)) - { - return "Tax"; - } - else if (typeof(IExchangeRateProvider).IsAssignableFrom(implType)) - { - return "Payment"; - } - else if (typeof(IShippingRateComputationMethod).IsAssignableFrom(implType)) - { - return "Shipping"; - } - else if (typeof(IPaymentMethod).IsAssignableFrom(implType)) - { - return "Payment"; - } - else if (typeof(IExternalAuthenticationMethod).IsAssignableFrom(implType)) - { - return "Security"; - } - else if (typeof(IWidget).IsAssignableFrom(implType)) - { - return "CMS"; - } - else if (typeof(IExportProvider).IsAssignableFrom(implType)) - { - return "Exporting"; - } - else if (typeof(IOutputCacheProvider).IsAssignableFrom(implType)) - { - return "OutputCache"; - } - - return null; - } - - #endregion - } + { + private readonly ITypeFinder _typeFinder; + private readonly IPluginFinder _pluginFinder; + + public ProvidersModule(ITypeFinder typeFinder, IPluginFinder pluginFinder) + { + _typeFinder = typeFinder; + _pluginFinder = pluginFinder; + } + + protected override void Load(ContainerBuilder builder) + { + builder.RegisterType().As().InstancePerRequest(); + + if (!DataSettings.DatabaseIsInstalled()) + return; + + var providerTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true).ToList(); + + foreach (var type in providerTypes) + { + var pluginDescriptor = _pluginFinder.GetPluginDescriptorByAssembly(type.Assembly); + var groupName = ProviderTypeToKnownGroupName(type); + var systemName = GetSystemName(type, pluginDescriptor); + var friendlyName = GetFriendlyName(type, pluginDescriptor); + var displayOrder = GetDisplayOrder(type, pluginDescriptor); + var dependentWidgets = GetDependentWidgets(type); + var resPattern = (pluginDescriptor != null ? "Plugins" : "Providers") + ".{1}.{0}"; // e.g. Plugins.FriendlyName.MySystemName + var settingPattern = (pluginDescriptor != null ? "Plugins" : "Providers") + ".{0}.{1}"; // e.g. Plugins.MySystemName.DisplayOrder + var isConfigurable = typeof(IConfigurable).IsAssignableFrom(type); + var isEditable = typeof(IUserEditable).IsAssignableFrom(type); + var isHidden = GetIsHidden(type); + var exportFeature = GetExportFeature(type); + + var registration = builder.RegisterType(type).Named(systemName).InstancePerRequest().PropertiesAutowired(PropertyWiringOptions.None); + registration.WithMetadata(m => + { + m.For(em => em.PluginDescriptor, pluginDescriptor); + m.For(em => em.GroupName, groupName); + m.For(em => em.SystemName, systemName); + m.For(em => em.ResourceKeyPattern, resPattern); + m.For(em => em.SettingKeyPattern, settingPattern); + m.For(em => em.FriendlyName, friendlyName.Item1); + m.For(em => em.Description, friendlyName.Item2); + m.For(em => em.DisplayOrder, displayOrder); + m.For(em => em.DependentWidgets, dependentWidgets); + m.For(em => em.IsConfigurable, isConfigurable); + m.For(em => em.IsEditable, isEditable); + m.For(em => em.IsHidden, isHidden); + m.For(em => em.ExportFeatures, exportFeature); + }); + + // Register specific provider type. + RegisterAsSpecificProvider(type, systemName, registration); + RegisterAsSpecificProvider(type, systemName, registration); + RegisterAsSpecificProvider(type, systemName, registration); + RegisterAsSpecificProvider(type, systemName, registration); + RegisterAsSpecificProvider(type, systemName, registration); + RegisterAsSpecificProvider(type, systemName, registration); + RegisterAsSpecificProvider(type, systemName, registration); + RegisterAsSpecificProvider(type, systemName, registration); + RegisterAsSpecificProvider(type, systemName, registration); + } + } + + #region Helpers + + private void RegisterAsSpecificProvider(Type implType, string systemName, IRegistrationBuilder registration) where T : IProvider + { + if (typeof(T).IsAssignableFrom(implType)) + { + try + { + registration.As().Named(systemName); + registration.WithMetadata(m => + { + m.For(em => em.ProviderType, typeof(T)); + }); + } + catch (Exception) { } + } + } + + private string GetSystemName(Type type, PluginDescriptor descriptor) + { + var attr = type.GetAttribute(false); + if (attr != null) + { + return attr.Name; + } + + if (typeof(IPlugin).IsAssignableFrom(type) && descriptor != null) + { + return descriptor.SystemName; + } + + return type.FullName; + //throw Error.Application("The 'SystemNameAttribute' must be applied to a provider type if the provider does not implement 'IPlugin' (provider type: {0}, plugin: {1})".FormatInvariant(type.FullName, descriptor != null ? descriptor.SystemName : "-")); + } + + private int GetDisplayOrder(Type type, PluginDescriptor descriptor) + { + var attr = type.GetAttribute(false); + if (attr != null) + { + return attr.DisplayOrder; + } + + if (typeof(IPlugin).IsAssignableFrom(type) && descriptor != null) + { + return descriptor.DisplayOrder; + } + + return 0; + } + + private bool GetIsHidden(Type type) + { + var attr = type.GetAttribute(false); + if (attr != null) + { + return attr.IsHidden; + } + + return false; + } + + private ExportFeatures GetExportFeature(Type type) + { + var attr = type.GetAttribute(false); + + if (attr != null) + { + return attr.Features; + } + + return ExportFeatures.None; + } + + private Tuple GetFriendlyName(Type type, PluginDescriptor descriptor) + { + string name = null; + string description = name; + + var attr = type.GetAttribute(false); + if (attr != null) + { + name = attr.Name; + description = attr.Description; + } + else if (typeof(IPlugin).IsAssignableFrom(type) && descriptor != null) + { + name = descriptor.FriendlyName; + description = descriptor.Description; + } + else + { + name = Inflector.Titleize(type.Name); + //throw Error.Application("The 'FriendlyNameAttribute' must be applied to a provider type if the provider does not implement 'IPlugin' (provider type: {0}, plugin: {1})".FormatInvariant(type.FullName, descriptor != null ? descriptor.SystemName : "-")); + } + + return new Tuple(name, description); + } + + private string[] GetDependentWidgets(Type type) + { + if (!typeof(IWidget).IsAssignableFrom(type)) + { + // don't let widgets depend on other widgets + var attr = type.GetAttribute(false); + if (attr != null) + { + return attr.WidgetSystemNames; + } + } + + return new string[] { }; + } + + private string ProviderTypeToKnownGroupName(Type implType) + { + if (typeof(ITaxProvider).IsAssignableFrom(implType)) + { + return "Tax"; + } + else if (typeof(IExchangeRateProvider).IsAssignableFrom(implType)) + { + return "Payment"; + } + else if (typeof(IShippingRateComputationMethod).IsAssignableFrom(implType)) + { + return "Shipping"; + } + else if (typeof(IPaymentMethod).IsAssignableFrom(implType)) + { + return "Payment"; + } + else if (typeof(IExternalAuthenticationMethod).IsAssignableFrom(implType)) + { + return "Security"; + } + else if (typeof(IWidget).IsAssignableFrom(implType)) + { + return "CMS"; + } + else if (typeof(IExportProvider).IsAssignableFrom(implType)) + { + return "Exporting"; + } + else if (typeof(IOutputCacheProvider).IsAssignableFrom(implType)) + { + return "OutputCache"; + } + + return null; + } + + #endregion + } internal class TasksModule : Module { @@ -1191,39 +1189,39 @@ protected override void Load(ContainerBuilder builder) } internal class DataExchangeModule : Module - { - private readonly ITypeFinder _typeFinder; - - public DataExchangeModule(ITypeFinder typeFinder) - { - _typeFinder = typeFinder; - } - - protected override void Load(ContainerBuilder builder) - { - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - if (!DataSettings.DatabaseIsInstalled()) - return; - - builder.RegisterType().As().InstancePerRequest(); - builder.RegisterType().As().InstancePerRequest(); - - // IEntityImporter implementations - builder.RegisterType().Keyed(ImportEntityType.Product).InstancePerRequest(); - builder.RegisterType().Keyed(ImportEntityType.Category).InstancePerRequest(); - builder.RegisterType().Keyed(ImportEntityType.Customer).InstancePerRequest(); - builder.RegisterType().Keyed(ImportEntityType.NewsLetterSubscription).InstancePerRequest(); - - // Register resolving delegate - builder.Register>(c => - { - var cc = c.Resolve(); - return keyed => cc.ResolveKeyed(keyed); - }); - } - } + { + private readonly ITypeFinder _typeFinder; + + public DataExchangeModule(ITypeFinder typeFinder) + { + _typeFinder = typeFinder; + } + + protected override void Load(ContainerBuilder builder) + { + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + + if (!DataSettings.DatabaseIsInstalled()) + return; + + builder.RegisterType().As().InstancePerRequest(); + builder.RegisterType().As().InstancePerRequest(); + + // IEntityImporter implementations + builder.RegisterType().Keyed(ImportEntityType.Product).InstancePerRequest(); + builder.RegisterType().Keyed(ImportEntityType.Category).InstancePerRequest(); + builder.RegisterType().Keyed(ImportEntityType.Customer).InstancePerRequest(); + builder.RegisterType().Keyed(ImportEntityType.NewsLetterSubscription).InstancePerRequest(); + + // Register resolving delegate + builder.Register>(c => + { + var cc = c.Resolve(); + return keyed => cc.ResolveKeyed(keyed); + }); + } + } internal class RuleModule : SmartStore.Rules.RuleModule { @@ -1263,139 +1261,137 @@ protected override void Load(ContainerBuilder builder) } } - #endregion + #endregion - #region Sources + #region Sources - class SettingsSource : IRegistrationSource + class SettingsSource : IRegistrationSource { static readonly MethodInfo BuildMethod = typeof(SettingsSource).GetMethod( "BuildRegistration", BindingFlags.Static | BindingFlags.NonPublic); public IEnumerable RegistrationsFor( - Service service, - Func> registrations) + Service service, + Func> registrations) { if (service is TypedService ts && typeof(ISettings).IsAssignableFrom(ts.ServiceType)) { - var buildMethod = BuildMethod.MakeGenericMethod(ts.ServiceType); - yield return (IComponentRegistration)buildMethod.Invoke(null, null); + var buildMethod = BuildMethod.MakeGenericMethod(ts.ServiceType); + yield return (IComponentRegistration)buildMethod.Invoke(null, null); } } static IComponentRegistration BuildRegistration() where TSettings : ISettings, new() { return RegistrationBuilder - .ForDelegate((c, p) => - { - int currentStoreId = 0; - if (EngineContext.Current.IsFullyInitialized) - { - try - { - if (c.TryResolve(out IStoreContext storeContext)) - { - currentStoreId = storeContext.CurrentStore.Id; - } - } - catch { } - } - - try - { - return c.Resolve().LoadSetting(currentStoreId); - } - catch - { - // Unit tests & tooling - return new TSettings(); - } - }) + .ForDelegate((c, p) => + { + int currentStoreId = 0; + if (EngineContext.Current.IsFullyInitialized) + { + try + { + if (c.TryResolve(out IStoreContext storeContext)) + { + currentStoreId = storeContext.CurrentStore.Id; + } + } + catch { } + } + + try + { + return c.Resolve().LoadSetting(currentStoreId); + } + catch + { + // Unit tests & tooling + return new TSettings(); + } + }) .InstancePerRequest() .CreateRegistration(); } - public bool IsAdapterForIndividualComponents { get { return false; } } + public bool IsAdapterForIndividualComponents => false; + } + + class WorkSource : IRegistrationSource + { + static readonly MethodInfo CreateMetaRegistrationMethod = typeof(WorkSource).GetMethod( + "CreateMetaRegistration", BindingFlags.Static | BindingFlags.NonPublic); + + private static bool IsClosingTypeOf(Type type, Type openGenericType) + { + return type.IsGenericType && type.GetGenericTypeDefinition() == openGenericType; + } + + public IEnumerable RegistrationsFor(Service service, Func> registrationAccessor) + { + if (!(service is IServiceWithType swt) || !IsClosingTypeOf(swt.ServiceType, typeof(Work<>))) + return Enumerable.Empty(); + + var valueType = swt.ServiceType.GetGenericArguments()[0]; + + var valueService = swt.ChangeType(valueType); + + var registrationCreator = CreateMetaRegistrationMethod.MakeGenericMethod(valueType); + + return registrationAccessor(valueService) + .Select(v => registrationCreator.Invoke(null, new object[] { service, v })) + .Cast(); + } + + public bool IsAdapterForIndividualComponents => true; + + static IComponentRegistration CreateMetaRegistration(Service providedService, IComponentRegistration valueRegistration) where T : class + { + var rb = RegistrationBuilder.ForDelegate( + (c, p) => + { + var accessor = c.Resolve(); + return new Work(w => + { + var scope = accessor.GetLifetimeScope(null); + if (scope == null) + return default(T); + + var workValues = scope.Resolve>(); + + if (!workValues.Values.TryGetValue(w, out T value)) + { + var request = new ResolveRequest(providedService, valueRegistration, p); + value = (T)workValues.ComponentContext.ResolveComponent(request); + workValues.Values[w] = value; + } + + return value; + + ////T value = default(T); // accessor.GetLifetimeScope(null).Resolve(); + //return accessor.GetLifetimeScope(null).Resolve(); + }); + }) + .As(providedService) + .Targeting(valueRegistration, false) + .SingleInstance(); + + return rb.CreateRegistration(); + } + } + + class WorkValues where T : class + { + public WorkValues(IComponentContext componentContext) + { + ComponentContext = componentContext; + Values = new Dictionary, T>(); + } + + public IComponentContext ComponentContext { get; private set; } + public IDictionary, T> Values { get; private set; } } - class WorkSource : IRegistrationSource - { - static readonly MethodInfo CreateMetaRegistrationMethod = typeof(WorkSource).GetMethod( - "CreateMetaRegistration", BindingFlags.Static | BindingFlags.NonPublic); - - private static bool IsClosingTypeOf(Type type, Type openGenericType) - { - return type.IsGenericType && type.GetGenericTypeDefinition() == openGenericType; - } - - public IEnumerable RegistrationsFor(Service service, Func> registrationAccessor) - { - if (!(service is IServiceWithType swt) || !IsClosingTypeOf(swt.ServiceType, typeof(Work<>))) - return Enumerable.Empty(); - - var valueType = swt.ServiceType.GetGenericArguments()[0]; - - var valueService = swt.ChangeType(valueType); - - var registrationCreator = CreateMetaRegistrationMethod.MakeGenericMethod(valueType); - - return registrationAccessor(valueService) - .Select(v => registrationCreator.Invoke(null, new object[] { service, v })) - .Cast(); - } - - public bool IsAdapterForIndividualComponents - { - get { return true; } - } - - static IComponentRegistration CreateMetaRegistration(Service providedService, IComponentRegistration valueRegistration) where T : class - { - var rb = RegistrationBuilder.ForDelegate( - (c, p) => { - var accessor = c.Resolve(); - return new Work(w => - { - var scope = accessor.GetLifetimeScope(null); - if (scope == null) - return default(T); - - var workValues = scope.Resolve>(); - - if (!workValues.Values.TryGetValue(w, out T value)) - { - var request = new ResolveRequest(providedService, valueRegistration, p); - value = (T)workValues.ComponentContext.ResolveComponent(request); - workValues.Values[w] = value; - } - - return value; - - ////T value = default(T); // accessor.GetLifetimeScope(null).Resolve(); - //return accessor.GetLifetimeScope(null).Resolve(); - }); - }) - .As(providedService) - .Targeting(valueRegistration, false) - .SingleInstance(); - - return rb.CreateRegistration(); - } - } - - class WorkValues where T : class - { - public WorkValues(IComponentContext componentContext) - { - ComponentContext = componentContext; - Values = new Dictionary, T>(); - } - - public IComponentContext ComponentContext { get; private set; } - public IDictionary, T> Values { get; private set; } - } - - #endregion + #endregion } diff --git a/src/Presentation/SmartStore.Web.Framework/Events/TabStripCreated.cs b/src/Presentation/SmartStore.Web.Framework/Events/TabStripCreated.cs index 30d4d9b9a3..91f9b08a0e 100644 --- a/src/Presentation/SmartStore.Web.Framework/Events/TabStripCreated.cs +++ b/src/Presentation/SmartStore.Web.Framework/Events/TabStripCreated.cs @@ -1,10 +1,8 @@ -using System; +using System.Collections.Generic; using System.Web.Mvc; -using SmartStore.Web.Framework.UI; -using System.Collections; -using System.Collections.Generic; using SmartStore.Core.Infrastructure; using SmartStore.Web.Framework.Localization; +using SmartStore.Web.Framework.UI; namespace SmartStore.Web.Framework.Events { @@ -22,7 +20,7 @@ public TabStripCreated(TabFactory itemFactory, string tabStripName, HtmlHelper h this.Model = model; this.ItemFactory = itemFactory; } - + public string TabStripName { get; private set; } public HtmlHelper Html { get; private set; } public object Model { get; private set; } @@ -41,7 +39,7 @@ public void AddWidget(RouteInfo routeInfo) { _widgets = new List(); Html.ViewContext.ViewData["Tab.{0}.Widgets".FormatInvariant(this.TabStripName)] = _widgets; - + CreateWidgetsTab(); } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/ActionResultExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/ActionResultExtensions.cs index b0dbc907ce..8e5f88e4c3 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/ActionResultExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/ActionResultExtensions.cs @@ -1,23 +1,22 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; // use base SmartStore Namespace to ensure the extension methods are always available namespace SmartStore { - public static class ActionResultExtensions - { - public static bool IsHtmlViewResult(this ActionResult result) - { - if (result is ViewResultBase) - return true; + public static class ActionResultExtensions + { + public static bool IsHtmlViewResult(this ActionResult result) + { + if (result is ViewResultBase) + return true; - var contentResult = result as ContentResult; - if (contentResult != null) - { - return contentResult.ContentType.IsCaseInsensitiveEqual("text/html"); - } + var contentResult = result as ContentResult; + if (contentResult != null) + { + return contentResult.ContentType.IsCaseInsensitiveEqual("text/html"); + } - return false; - } - } + return false; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/DateTimeExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/DateTimeExtensions.cs index 45fb4bc233..854fe04c54 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/DateTimeExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/DateTimeExtensions.cs @@ -7,8 +7,8 @@ namespace SmartStore.Web.Framework { - public static class DateTimeExtensions - { + public static class DateTimeExtensions + { /// /// Relative formatting of DateTime (e.g. 2 hours ago, a month ago) /// @@ -42,8 +42,8 @@ public static string RelativeFormat(this DateTime source, string defaultFormat) public static string RelativeFormat(this DateTime source, bool convertToUserTime, string defaultFormat) { string result = ""; - Localizer T = EngineContext.Current.Resolve().Get; - + Localizer T = EngineContext.Current.Resolve().Get; + var ts = new TimeSpan(DateTime.UtcNow.Ticks - source.Ticks); double delta = ts.TotalSeconds; @@ -51,44 +51,44 @@ public static string RelativeFormat(this DateTime source, bool convertToUserTime { if (delta < 60) // 60 (seconds) { - result = ts.Seconds == 1 ? T("Time.OneSecondAgo") : T("Time.SecondsAgo", ts.Seconds); + result = ts.Seconds == 1 ? T("Time.OneSecondAgo") : T("Time.SecondsAgo", ts.Seconds); } else if (delta < 120) //2 (minutes) * 60 (seconds) { - result = T("Time.OneMinuteAgo"); + result = T("Time.OneMinuteAgo"); } else if (delta < 2700) // 45 (minutes) * 60 (seconds) { - result = String.Format(T("Time.MinutesAgo"), ts.Minutes); + result = String.Format(T("Time.MinutesAgo"), ts.Minutes); } else if (delta < 5400) // 90 (minutes) * 60 (seconds) { - result = T("Time.OneHourAgo"); + result = T("Time.OneHourAgo"); } else if (delta < 86400) // 24 (hours) * 60 (minutes) * 60 (seconds) { int hours = ts.Hours; if (hours == 1) hours = 2; - result = T("Time.HoursAgo", hours); + result = T("Time.HoursAgo", hours); } else if (delta < 172800) // 48 (hours) * 60 (minutes) * 60 (seconds) { - result = T("Time.Yesterday"); + result = T("Time.Yesterday"); } else if (delta < 2592000) // 30 (days) * 24 (hours) * 60 (minutes) * 60 (seconds) { - result = String.Format(T("Time.DaysAgo"), ts.Days); + result = String.Format(T("Time.DaysAgo"), ts.Days); } else if (delta < 31104000) // 12 (months) * 30 (days) * 24 (hours) * 60 (minutes) * 60 (seconds) { int months = Convert.ToInt32(Math.Floor((double)ts.Days / 30)); - result = months <= 1 ? T("Time.OneMonthAgo") : T("Time.MonthsAgo", months); + result = months <= 1 ? T("Time.OneMonthAgo") : T("Time.MonthsAgo", months); } else { int years = Convert.ToInt32(Math.Floor((double)ts.Days / 365)); - result = years <= 1 ? T("Time.OneYearAgo") : T("Time.YearsAgo", years); + result = years <= 1 ? T("Time.OneYearAgo") : T("Time.YearsAgo", years); } } else @@ -112,51 +112,51 @@ public static string RelativeFormat(this DateTime source, bool convertToUserTime return result.ReplaceNativeDigits(); } - public static string Prettify(this TimeSpan ts) - { - Localizer T = EngineContext.Current.Resolve().Get; - double seconds = ts.TotalSeconds; + public static string Prettify(this TimeSpan ts) + { + Localizer T = EngineContext.Current.Resolve().Get; + double seconds = ts.TotalSeconds; - try - { - int secsTemp = Convert.ToInt32(seconds); - string label = T("Time.SecondsAbbr"); - int remainder = 0; - string remainderLabel = ""; + try + { + int secsTemp = Convert.ToInt32(seconds); + string label = T("Time.SecondsAbbr"); + int remainder = 0; + string remainderLabel = ""; - if (secsTemp > 59) - { - remainder = secsTemp % 60; - secsTemp /= 60; - label = T("Time.MinutesAbbr"); - remainderLabel = T("Time.SecondsAbbr"); - } + if (secsTemp > 59) + { + remainder = secsTemp % 60; + secsTemp /= 60; + label = T("Time.MinutesAbbr"); + remainderLabel = T("Time.SecondsAbbr"); + } - if (secsTemp > 59) - { - remainder = secsTemp % 60; - secsTemp /= 60; - label = (secsTemp == 1) ? T("Time.HourAbbr") : T("Time.HoursAbbr"); - remainderLabel = T("Time.MinutesAbbr"); - } + if (secsTemp > 59) + { + remainder = secsTemp % 60; + secsTemp /= 60; + label = (secsTemp == 1) ? T("Time.HourAbbr") : T("Time.HoursAbbr"); + remainderLabel = T("Time.MinutesAbbr"); + } - string result = null; + string result = null; - if (remainder == 0) - { - result = string.Format("{0:#,##0.#} {1}", secsTemp, label); - } - else - { - result = string.Format("{0:#,##0} {1} {2} {3}", secsTemp, label, remainder, remainderLabel); - } + if (remainder == 0) + { + result = string.Format("{0:#,##0.#} {1}", secsTemp, label); + } + else + { + result = string.Format("{0:#,##0} {1} {2} {3}", secsTemp, label, remainder, remainderLabel); + } - return result.ReplaceNativeDigits(); - } - catch - { - return "(-)"; - } - } + return result.ReplaceNativeDigits(); + } + catch + { + return "(-)"; + } + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs index daf0460f86..407e14ec77 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs @@ -15,7 +15,6 @@ using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Infrastructure; -using SmartStore.Core.Localization; using SmartStore.Services.Localization; using SmartStore.Services.Media; using SmartStore.Utilities; @@ -27,25 +26,26 @@ namespace SmartStore.Web.Framework { - public enum InputEditorType - { TextBox, + public enum InputEditorType + { + TextBox, Password, Hidden, Checkbox/*, RadioButton*/ } - + public static class HtmlExtensions { public static MvcHtmlString Hint(this HtmlHelper helper, string value) { - if (String.IsNullOrEmpty(value)) - { - return MvcHtmlString.Empty; - } + if (String.IsNullOrEmpty(value)) + { + return MvcHtmlString.Empty; + } - // create a - var a = new TagBuilder("a"); + // create a + var a = new TagBuilder("a"); a.MergeAttribute("href", "#"); a.MergeAttribute("onclick", "return false;"); //a.MergeAttribute("rel", "tooltip"); @@ -53,9 +53,9 @@ public static MvcHtmlString Hint(this HtmlHelper helper, string value) a.MergeAttribute("tabindex", "-1"); a.AddCssClass("hint"); - // Create img - var img = new TagBuilder("i"); - img.AddCssClass("fa fa-question-circle"); + // Create img + var img = new TagBuilder("i"); + img.AddCssClass("fa fa-question-circle"); a.InnerHtml = img.ToString(); @@ -63,39 +63,39 @@ public static MvcHtmlString Hint(this HtmlHelper helper, string value) return MvcHtmlString.Create(a.ToString()); } - public static HelperResult LocalizedEditor(this HtmlHelper helper, string name, Func localizedTemplate, Func standardTemplate) + public static HelperResult LocalizedEditor(this HtmlHelper helper, string name, Func localizedTemplate, Func standardTemplate) where T : ILocalizedModel where TLocalizedModelLocal : ILocalizedModelLocal { - return new HelperResult(writer => + return new HelperResult(writer => { if (helper.ViewData.Model.Locales.Count > 1) { - var languageService = EngineContext.Current.Resolve(); + var languageService = EngineContext.Current.Resolve(); - writer.Write("
"); + writer.Write("
"); var tabStrip = helper.SmartStore().TabStrip().Name(name).SmartTabSelection(false).Style(TabsStyle.Tabs).AddCssClass("nav-locales").Items(x => { - if (standardTemplate != null) - { - var masterLanguage = languageService.GetLanguageById(languageService.GetDefaultLanguageId()); - x.Add().Text(EngineContext.Current.Resolve().GetResource("Admin.Common.Standard")) - .ContentHtmlAttributes(new { @class = "locale-editor-content", data_lang = masterLanguage.LanguageCulture, data_rtl = masterLanguage.Rtl.ToString().ToLower() }) - .Content(standardTemplate(helper.ViewData.Model).ToHtmlString()) - .Selected(true); - } + if (standardTemplate != null) + { + var masterLanguage = languageService.GetLanguageById(languageService.GetDefaultLanguageId()); + x.Add().Text(EngineContext.Current.Resolve().GetResource("Admin.Common.Standard")) + .ContentHtmlAttributes(new { @class = "locale-editor-content", data_lang = masterLanguage.LanguageCulture, data_rtl = masterLanguage.Rtl.ToString().ToLower() }) + .Content(standardTemplate(helper.ViewData.Model).ToHtmlString()) + .Selected(true); + } for (int i = 0; i < helper.ViewData.Model.Locales.Count; i++) { var locale = helper.ViewData.Model.Locales[i]; var language = languageService.GetLanguageById(locale.LanguageId); - x.Add().Text(language.Name) - .LinkHtmlAttributes(new { title = language.Name }) - .ContentHtmlAttributes(new { @class = "locale-editor-content", data_lang = language.LanguageCulture, data_rtl = language.Rtl.ToString().ToLower() }) - .Content(localizedTemplate(i)) - .ImageUrl("~/Content/images/flags/" + language.FlagImageFileName) - .Selected(i == 0 && standardTemplate == null); + x.Add().Text(language.Name) + .LinkHtmlAttributes(new { title = language.Name }) + .ContentHtmlAttributes(new { @class = "locale-editor-content", data_lang = language.LanguageCulture, data_rtl = language.Rtl.ToString().ToLower() }) + .Content(localizedTemplate(i)) + .ImageUrl("~/Content/images/flags/" + language.FlagImageFileName) + .Selected(i == 0 && standardTemplate == null); } }).ToHtmlString(); writer.Write(tabStrip); @@ -114,15 +114,15 @@ public static MvcHtmlString DeleteConfirmation(this HtmlHelper helper, str return DeleteConfirmation(helper, "", buttonsSelector); } - /// - /// Adds an action name parameter for using other delete action names - /// - /// - /// - /// - /// - /// - public static MvcHtmlString DeleteConfirmation(this HtmlHelper helper, string actionName, string buttonsSelector = null) where T : EntityModelBase + /// + /// Adds an action name parameter for using other delete action names + /// + /// + /// + /// + /// + /// + public static MvcHtmlString DeleteConfirmation(this HtmlHelper helper, string actionName, string buttonsSelector = null) where T : EntityModelBase { if (String.IsNullOrEmpty(actionName)) actionName = "Delete"; @@ -139,28 +139,28 @@ public static MvcHtmlString DeleteConfirmation(this HtmlHelper helper, str EntityType = buttonsSelector.Replace("-delete", "") }; - var script = string.Empty; - if (buttonsSelector.HasValue()) - { - script = "\n"; - } + var script = string.Empty; + if (buttonsSelector.HasValue()) + { + script = "\n"; + } - helper.SmartStore().Window().Name(modalId) - .Title(EngineContext.Current.Resolve().GetResource("Admin.Common.AreYouSure")) - .AddCssClass("modal-confirm-delete") - .BodyHtmlAttributes(new { @class = "pt-0" }) - .Content(helper.Partial("Delete", deleteConfirmationModel).ToHtmlString()) - .Show(false) - .Render(); + helper.SmartStore().Window().Name(modalId) + .Title(EngineContext.Current.Resolve().GetResource("Admin.Common.AreYouSure")) + .AddCssClass("modal-confirm-delete") + .BodyHtmlAttributes(new { @class = "pt-0" }) + .Content(helper.Partial("Delete", deleteConfirmationModel).ToHtmlString()) + .Show(false) + .Render(); return new MvcHtmlString(script); } - public static MvcHtmlString SmartLabel(this HtmlHelper helper, string expression, string labelText, string hint = null, object htmlAttributes = null) - { - var result = PooledStringBuilder.Rent(); + public static MvcHtmlString SmartLabel(this HtmlHelper helper, string expression, string labelText, string hint = null, object htmlAttributes = null) + { + var result = PooledStringBuilder.Rent(); - result.Append("
"); + result.Append("
"); if (expression.IsEmpty() && labelText.IsEmpty()) { @@ -181,95 +181,95 @@ public static MvcHtmlString SmartLabel(this HtmlHelper helper, string expression result.Append("
"); - return MvcHtmlString.Create(result.ToStringAndReturn()); - } + return MvcHtmlString.Create(result.ToStringAndReturn()); + } + + public static MvcHtmlString SmartLabelFor( + this HtmlHelper helper, + Expression> expression, + bool displayHint = true, + object htmlAttributes = null) + { + var metadata = ModelMetadata.FromLambdaExpression(expression, helper.ViewData); + metadata.AdditionalValues.TryGetValue("SmartResourceDisplayName", out object resourceDisplayName); + + return SmartLabelFor(helper, expression, resourceDisplayName as SmartResourceDisplayName, metadata, displayHint, htmlAttributes); + } public static MvcHtmlString SmartLabelFor( - this HtmlHelper helper, - Expression> expression, - bool displayHint = true, - object htmlAttributes = null) - { - var metadata = ModelMetadata.FromLambdaExpression(expression, helper.ViewData); - metadata.AdditionalValues.TryGetValue("SmartResourceDisplayName", out object resourceDisplayName); - - return SmartLabelFor(helper, expression, resourceDisplayName as SmartResourceDisplayName, metadata, displayHint, htmlAttributes); - } - - public static MvcHtmlString SmartLabelFor( - this HtmlHelper helper, - Expression> expression, - string resourceKey, - bool displayHint = true, - object htmlAttributes = null) - { - Guard.NotEmpty(resourceKey, nameof(resourceKey)); - - var metadata = ModelMetadata.FromLambdaExpression(expression, helper.ViewData); - var resourceDisplayName = new SmartResourceDisplayName(resourceKey, metadata.PropertyName); - - return SmartLabelFor(helper, expression, resourceDisplayName, metadata, displayHint, htmlAttributes); - } - - private static MvcHtmlString SmartLabelFor( - this HtmlHelper helper, - Expression> expression, - SmartResourceDisplayName resourceDisplayName, - ModelMetadata metadata, - bool displayHint = true, - object htmlAttributes = null) - { - var result = PooledStringBuilder.Rent(); - string labelText = null; - string hint = null; - - if (resourceDisplayName != null) - { - // resolve label display name - labelText = resourceDisplayName.DisplayName.NullEmpty(); - if (labelText == null) - { - // take reskey as absolute fallback - labelText = resourceDisplayName.ResourceKey; - } - - // resolve hint - if (displayHint) - { - var langId = EngineContext.Current.Resolve().WorkingLanguage.Id; - hint = EngineContext.Current.Resolve().GetResource(resourceDisplayName.ResourceKey + ".Hint", langId, false, "", true); - } - } - - if (labelText == null) - { - labelText = metadata.PropertyName.SplitPascalCase(); - } - - var labelAttrs = new RouteValueDictionary(htmlAttributes); - //labelAttrs.AppendCssClass("col-form-label"); - - var label = helper.LabelFor(expression, labelText, labelAttrs); - - if (displayHint) - { - result.Append("
"); - { - result.Append(label); - if (hint.HasValue()) - { - result.Append(helper.Hint(hint).ToHtmlString()); - } - } - result.Append("
"); - } - else - { - result.Append(label); - } - - return MvcHtmlString.Create(result.ToStringAndReturn()); - } + this HtmlHelper helper, + Expression> expression, + string resourceKey, + bool displayHint = true, + object htmlAttributes = null) + { + Guard.NotEmpty(resourceKey, nameof(resourceKey)); + + var metadata = ModelMetadata.FromLambdaExpression(expression, helper.ViewData); + var resourceDisplayName = new SmartResourceDisplayName(resourceKey, metadata.PropertyName); + + return SmartLabelFor(helper, expression, resourceDisplayName, metadata, displayHint, htmlAttributes); + } + + private static MvcHtmlString SmartLabelFor( + this HtmlHelper helper, + Expression> expression, + SmartResourceDisplayName resourceDisplayName, + ModelMetadata metadata, + bool displayHint = true, + object htmlAttributes = null) + { + var result = PooledStringBuilder.Rent(); + string labelText = null; + string hint = null; + + if (resourceDisplayName != null) + { + // resolve label display name + labelText = resourceDisplayName.DisplayName.NullEmpty(); + if (labelText == null) + { + // take reskey as absolute fallback + labelText = resourceDisplayName.ResourceKey; + } + + // resolve hint + if (displayHint) + { + var langId = EngineContext.Current.Resolve().WorkingLanguage.Id; + hint = EngineContext.Current.Resolve().GetResource(resourceDisplayName.ResourceKey + ".Hint", langId, false, "", true); + } + } + + if (labelText == null) + { + labelText = metadata.PropertyName.SplitPascalCase(); + } + + var labelAttrs = new RouteValueDictionary(htmlAttributes); + //labelAttrs.AppendCssClass("col-form-label"); + + var label = helper.LabelFor(expression, labelText, labelAttrs); + + if (displayHint) + { + result.Append("
"); + { + result.Append(label); + if (hint.HasValue()) + { + result.Append(helper.Hint(hint).ToHtmlString()); + } + } + result.Append("
"); + } + else + { + result.Append(label); + } + + return MvcHtmlString.Create(result.ToStringAndReturn()); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string FieldNameFor(this HtmlHelper html, Expression> expression) @@ -304,19 +304,19 @@ public static MvcHtmlString DatePickerDropDowns(this HtmlHelper html, int? beginYear = null, int? endYear = null, int? selectedDay = null, int? selectedMonth = null, int? selectedYear = null, bool localizeLabels = true, bool disabled = false) { - var row = new TagBuilder("div"); - row.AddCssClass("row xs-gutters"); + var row = new TagBuilder("div"); + row.AddCssClass("row xs-gutters"); - var daysCol = new TagBuilder("div"); - daysCol.AddCssClass("col"); + var daysCol = new TagBuilder("div"); + daysCol.AddCssClass("col"); - var monthsCol = new TagBuilder("div"); - monthsCol.AddCssClass("col"); + var monthsCol = new TagBuilder("div"); + monthsCol.AddCssClass("col"); - var yearsCol = new TagBuilder("div"); - yearsCol.AddCssClass("col"); + var yearsCol = new TagBuilder("div"); + yearsCol.AddCssClass("col"); - var daysList = new TagBuilder("select"); + var daysList = new TagBuilder("select"); var monthsList = new TagBuilder("select"); var yearsList = new TagBuilder("select"); @@ -328,24 +328,24 @@ public static MvcHtmlString DatePickerDropDowns(this HtmlHelper html, monthsList.Attributes.Add("name", monthName); yearsList.Attributes.Add("name", yearName); - daysList.Attributes.Add("id", dayName); - monthsList.Attributes.Add("id", monthName); - yearsList.Attributes.Add("id", yearName); + daysList.Attributes.Add("id", dayName); + monthsList.Attributes.Add("id", monthName); + yearsList.Attributes.Add("id", yearName); - daysList.Attributes.Add("class", "date-part form-control noskin remember"); + daysList.Attributes.Add("class", "date-part form-control noskin remember"); monthsList.Attributes.Add("class", "date-part form-control noskin remember"); yearsList.Attributes.Add("class", "date-part form-control noskin remember"); - daysList.Attributes.Add("data-minimum-results-for-search", "100"); - monthsList.Attributes.Add("data-minimum-results-for-search", "100"); - //yearsList.Attributes.Add("data-minimum-results-for-search", "100"); + daysList.Attributes.Add("data-minimum-results-for-search", "100"); + monthsList.Attributes.Add("data-minimum-results-for-search", "100"); + //yearsList.Attributes.Add("data-minimum-results-for-search", "100"); - if (disabled) - { - daysList.Attributes.Add("disabled", "disabled"); - monthsList.Attributes.Add("disabled", "disabled"); - yearsList.Attributes.Add("disabled", "disabled"); - } + if (disabled) + { + daysList.Attributes.Add("disabled", "disabled"); + monthsList.Attributes.Add("disabled", "disabled"); + yearsList.Attributes.Add("disabled", "disabled"); + } var days = new StringBuilder(); var months = new StringBuilder(); @@ -376,7 +376,7 @@ public static MvcHtmlString DatePickerDropDowns(this HtmlHelper html, for (int i = 1; i <= 12; i++) { months.AppendFormat("", - i, + i, (selectedMonth.HasValue && selectedMonth.Value == i) ? " selected=\"selected\"" : null, CultureInfo.CurrentUICulture.DateTimeFormat.GetMonthName(i)); } @@ -397,13 +397,13 @@ public static MvcHtmlString DatePickerDropDowns(this HtmlHelper html, monthsList.InnerHtml = months.ToString(); yearsList.InnerHtml = years.ToString(); - daysCol.InnerHtml = daysList.ToString(); - monthsCol.InnerHtml = monthsList.ToString(); - yearsCol.InnerHtml = yearsList.ToString(); + daysCol.InnerHtml = daysList.ToString(); + monthsCol.InnerHtml = monthsList.ToString(); + yearsCol.InnerHtml = yearsList.ToString(); - row.InnerHtml = string.Concat(daysCol, monthsCol, yearsCol); + row.InnerHtml = string.Concat(daysCol, monthsCol, yearsCol); - return MvcHtmlString.Create(row.ToString()); + return MvcHtmlString.Create(row.ToString()); } #region DropDownList Extensions @@ -434,7 +434,7 @@ public static MvcHtmlString DropDownListForEnum( } public static MvcHtmlString DropDownListForEnum( - this HtmlHelper htmlHelper, + this HtmlHelper htmlHelper, Expression> expression, IDictionary htmlAttributes, string optionLabel = null) where TEnum : struct @@ -448,7 +448,7 @@ public static MvcHtmlString DropDownListForEnum( ModelMetadata metadata = ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData); Type enumType = metadata.ModelType.GetNonNullableType(); IEnumerable values = Enum.GetValues(enumType).Cast(); - + IEnumerable items = values.Select(value => new SelectListItem { @@ -470,120 +470,120 @@ public static MvcHtmlString DropDownListForEnum( [MethodImpl(MethodImplOptions.AggressiveInlining)] public static MvcHtmlString Widget(this HtmlHelper helper, string widgetZone) { - return helper.Widget(widgetZone, null); + return helper.Widget(widgetZone, null); } - public static MvcHtmlString Widget(this HtmlHelper helper, string widgetZone, object model) - { - var routeValues = GetWidgetsByZoneRouteValues(helper, widgetZone, model); - if (routeValues != null) - { - return helper.Action("WidgetsByZone", "Widget", routeValues); - } + public static MvcHtmlString Widget(this HtmlHelper helper, string widgetZone, object model) + { + var routeValues = GetWidgetsByZoneRouteValues(helper, widgetZone, model); + if (routeValues != null) + { + return helper.Action("WidgetsByZone", "Widget", routeValues); + } - return MvcHtmlString.Empty; - } + return MvcHtmlString.Empty; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void RenderWidget(this HtmlHelper helper, string widgetZone) - { - helper.RenderWidget(widgetZone, null); - } - - public static void RenderWidget(this HtmlHelper helper, string widgetZone, object model) - { - var routeValues = GetWidgetsByZoneRouteValues(helper, widgetZone, model); - if (routeValues != null) - { - helper.RenderAction("WidgetsByZone", "Widget", routeValues); - } - } - - private static object GetWidgetsByZoneRouteValues(HtmlHelper helper, string widgetZone, object model) - { - if (widgetZone.HasValue()) - { - model = model ?? helper.ViewData.Model; - var widgetSelector = EngineContext.Current.Resolve(); - var widgets = widgetSelector.GetWidgets(widgetZone, model).ToList(); - if (widgets.Any()) - { - var zoneModel = new WidgetZoneModel { Widgets = widgets, WidgetZone = widgetZone, Model = model }; - return new { zoneModel = zoneModel, model = model, area = "" }; - } - } - - return null; - } - - public static IHtmlString MetaAcceptLanguage(this HtmlHelper html) + { + helper.RenderWidget(widgetZone, null); + } + + public static void RenderWidget(this HtmlHelper helper, string widgetZone, object model) + { + var routeValues = GetWidgetsByZoneRouteValues(helper, widgetZone, model); + if (routeValues != null) + { + helper.RenderAction("WidgetsByZone", "Widget", routeValues); + } + } + + private static object GetWidgetsByZoneRouteValues(HtmlHelper helper, string widgetZone, object model) + { + if (widgetZone.HasValue()) + { + model = model ?? helper.ViewData.Model; + var widgetSelector = EngineContext.Current.Resolve(); + var widgets = widgetSelector.GetWidgets(widgetZone, model).ToList(); + if (widgets.Any()) + { + var zoneModel = new WidgetZoneModel { Widgets = widgets, WidgetZone = widgetZone, Model = model }; + return new { zoneModel = zoneModel, model = model, area = "" }; + } + } + + return null; + } + + public static IHtmlString MetaAcceptLanguage(this HtmlHelper html) { var acceptLang = HttpUtility.HtmlAttributeEncode(Thread.CurrentThread.CurrentUICulture.ToString()); return new MvcHtmlString(string.Format("", acceptLang)); } - public static IHtmlString LanguageAttributes(this HtmlHelper html, bool omitLTR = false) - { - return LanguageAttributes(html, EngineContext.Current.Resolve().WorkingLanguage, omitLTR); - } + public static IHtmlString LanguageAttributes(this HtmlHelper html, bool omitLTR = false) + { + return LanguageAttributes(html, EngineContext.Current.Resolve().WorkingLanguage, omitLTR); + } - public static IHtmlString LanguageAttributes(this HtmlHelper html, LocalizedValue localizedValue) - { - if (localizedValue == null || !localizedValue.BidiOverride) - { - return MvcHtmlString.Empty; - } + public static IHtmlString LanguageAttributes(this HtmlHelper html, LocalizedValue localizedValue) + { + if (localizedValue == null || !localizedValue.BidiOverride) + { + return MvcHtmlString.Empty; + } - return LanguageAttributes(html, localizedValue.CurrentLanguage, false); - } + return LanguageAttributes(html, localizedValue.CurrentLanguage, false); + } - public static IHtmlString LanguageAttributes(this HtmlHelper html, Language currentLanguage, bool omitLTR = false) - { - Guard.NotNull(currentLanguage, nameof(currentLanguage)); + public static IHtmlString LanguageAttributes(this HtmlHelper html, Language currentLanguage, bool omitLTR = false) + { + Guard.NotNull(currentLanguage, nameof(currentLanguage)); - var code = currentLanguage.GetTwoLetterISOLanguageName(); - var rtl = currentLanguage.Rtl; + var code = currentLanguage.GetTwoLetterISOLanguageName(); + var rtl = currentLanguage.Rtl; - var result = "lang=\"" + code + "\""; - if (rtl || !omitLTR) - { - result += " dir=\"" + (rtl ? "rtl" : "ltr") + "\""; - } + var result = "lang=\"" + code + "\""; + if (rtl || !omitLTR) + { + result += " dir=\"" + (rtl ? "rtl" : "ltr") + "\""; + } - return new MvcHtmlString(result); - } + return new MvcHtmlString(result); + } - public static IHtmlString LanguageAttributes(this HtmlHelper html, bool currentRtl, Language pageLanguage) - { - Guard.NotNull(pageLanguage, nameof(pageLanguage)); + public static IHtmlString LanguageAttributes(this HtmlHelper html, bool currentRtl, Language pageLanguage) + { + Guard.NotNull(pageLanguage, nameof(pageLanguage)); - if (currentRtl == pageLanguage.Rtl) - { - return MvcHtmlString.Empty; - } + if (currentRtl == pageLanguage.Rtl) + { + return MvcHtmlString.Empty; + } - var result = "dir=\"" + (currentRtl ? "rtl" : "ltr") + "\""; - return new MvcHtmlString(result); - } + var result = "dir=\"" + (currentRtl ? "rtl" : "ltr") + "\""; + return new MvcHtmlString(result); + } - public static MvcHtmlString ControlGroupFor( - this HtmlHelper html, - Expression> expression, + public static MvcHtmlString ControlGroupFor( + this HtmlHelper html, + Expression> expression, InputEditorType editorType = InputEditorType.TextBox, bool required = false, string helpHint = null, - string breakpoint = "md", - string additionalCtrlClasses = "") + string breakpoint = "md", + string additionalCtrlClasses = "") { if (editorType == InputEditorType.Hidden) { return html.HiddenFor(expression); } - string inputHtml = ""; - var htmlAttributes = new RouteValueDictionary(); - var metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData); - var dataTypeName = metadata.DataTypeName.EmptyNull(); + string inputHtml = ""; + var htmlAttributes = new RouteValueDictionary(); + var metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData); + var dataTypeName = metadata.DataTypeName.EmptyNull(); var groupClass = "form-group row"; var labelClass = "col-{0}-3 col-form-label".FormatInvariant(breakpoint.NullEmpty() ?? "md"); var controlsClass = "col-{0}-9".FormatInvariant(breakpoint.NullEmpty() ?? "md"); @@ -600,29 +600,29 @@ public static MvcHtmlString ControlGroupFor( if (!required && (editorType == InputEditorType.TextBox || editorType == InputEditorType.Password)) { - htmlAttributes.Add("placeholder", EngineContext.Current.Resolve().GetResource("Common.Optional")); + htmlAttributes.Add("placeholder", EngineContext.Current.Resolve().GetResource("Common.Optional")); + } + + switch (dataTypeName) + { + case "EmailAddress": + htmlAttributes.Add("type", "email"); + break; + case "PhoneNumber": + htmlAttributes.Add("type", "tel"); + break; } - switch (dataTypeName) - { - case "EmailAddress": - htmlAttributes.Add("type", "email"); - break; - case "PhoneNumber": - htmlAttributes.Add("type", "tel"); - break; - } - htmlAttributes.Add("class", "form-control" + (additionalCtrlClasses.HasValue() ? " " + additionalCtrlClasses : "")); - + switch (editorType) { case InputEditorType.Checkbox: - CommonHelper.TryConvert(metadata.Model, out var isChecked); + CommonHelper.TryConvert(metadata.Model, out var isChecked); inputHtml = string.Format("
{0}
", html.CheckBox(ExpressionHelper.GetExpressionText(expression), isChecked, new { @class = "form-check-input" }).ToString(), - html.IdFor(expression), - metadata.DisplayName); + html.IdFor(expression), + metadata.DisplayName); break; case InputEditorType.Password: inputHtml = html.PasswordFor(expression, htmlAttributes).ToString(); @@ -631,7 +631,7 @@ public static MvcHtmlString ControlGroupFor( inputHtml = html.TextBoxFor(expression, htmlAttributes).ToString(); break; } - + sb.AppendLine(inputHtml); sb.AppendLine(html.ValidationMessageFor(expression).ToString()); if (helpHint.HasValue()) @@ -647,16 +647,16 @@ public static MvcHtmlString ControlGroupFor( [MethodImpl(MethodImplOptions.AggressiveInlining)] public static MvcHtmlString ColorBox(this HtmlHelper html, string name, string color) - { - return ColorBox(html, name, color, null); - } + { + return ColorBox(html, name, color, null); + } public static MvcHtmlString ColorBox(this HtmlHelper html, string name, string color, string defaultColor) { - var sb = PooledStringBuilder.Rent(); + var sb = PooledStringBuilder.Rent(); - defaultColor = defaultColor.EmptyNull(); - var isDefault = color.IsCaseInsensitiveEqual(defaultColor); + defaultColor = defaultColor.EmptyNull(); + var isDefault = color.IsCaseInsensitiveEqual(defaultColor); sb.Append("
".FormatInvariant(defaultColor)); @@ -668,340 +668,344 @@ public static MvcHtmlString ColorBox(this HtmlHelper html, string name, string c return MvcHtmlString.Create(sb.ToStringAndReturn()); } - public static MvcHtmlString TableFormattedVariantAttributes(this HtmlHelper helper, string formattedVariantAttributes, string separatorLines = "
", string separatorValues = ": ") { - var sb = new StringBuilder(); - string name, value; - string[] lines = formattedVariantAttributes.SplitSafe(separatorLines); - - if (lines.Length <= 0) - return MvcHtmlString.Empty; - - sb.Append(""); - - foreach (string line in lines) { - sb.Append(""); - if (line.SplitToPair(out name, out value, separatorValues)) { - sb.AppendFormat("", name); - sb.AppendFormat("", value); - } - else { - sb.AppendFormat("", line); - } - sb.Append(""); - } - - sb.Append("
{0}:{0}{0}
"); - return MvcHtmlString.Create(sb.ToString()); - } - - public static MvcHtmlString SettingEditorFor( - this HtmlHelper helper, - Expression> expression, - string parentSelector = null, - object additionalViewData = null) - { - return SettingEditorFor( - helper, - expression, - helper.EditorFor(expression, additionalViewData), - parentSelector); - } - - public static MvcHtmlString SettingEditorFor( - this HtmlHelper helper, - Expression> expression, - Func editor, - string parentSelector = null) - { - return SettingEditorFor( - helper, - expression, - new MvcHtmlString(editor(helper.ViewData.Model).ToHtmlString()), - parentSelector); - } - - public static MvcHtmlString EnumSettingEditorFor( - this HtmlHelper helper, - Expression> expression, - string parentSelector = null, - object htmlAttributes = null, - string optionLabel = null) where TValue : struct - { - return SettingEditorFor( - helper, - expression, - helper.DropDownListForEnum(expression, htmlAttributes, optionLabel), - parentSelector); - } - - public static MvcHtmlString SettingEditorFor( - this HtmlHelper helper, - Expression> expression, - MvcHtmlString editor, - string parentSelector = null) - { - Guard.NotNull(expression, nameof(expression)); - Guard.NotNull(editor, nameof(editor)); - - var data = helper.ViewData[StoreDependingSettingHelper.ViewDataKey] as StoreDependingSettingData; - if (data == null || data.ActiveStoreScopeConfiguration <= 0) - return editor; // CONTROL - - var sb = PooledStringBuilder.Rent("
"); - sb.Append("
"); - sb.Append(helper.SettingOverrideCheckboxInternal(expression, data, parentSelector)); // CHECK - sb.Append("
"); - sb.Append("
"); - sb.Append(editor.ToHtmlString()); // CONTROL - sb.Append("
"); - - return MvcHtmlString.Create(sb.ToStringAndReturn()); - } - - private static MvcHtmlString SettingOverrideCheckboxInternal( - this HtmlHelper helper, - Expression> expression, - StoreDependingSettingData data, - string parentSelector = null) - { - var fieldPrefix = helper.ViewData.TemplateInfo.HtmlFieldPrefix; - var settingKey = ExpressionHelper.GetExpressionText(expression); - var localizeService = EngineContext.Current.Resolve(); - - if (fieldPrefix.HasValue()) - settingKey = string.Concat(fieldPrefix, ".", settingKey); - else if (!settingKey.Contains(".")) - settingKey = string.Concat(data.RootSettingClass, ".", settingKey); - - var overrideForStore = (data.OverrideSettingKeys.FirstOrDefault(x => x.IsCaseInsensitiveEqual(settingKey)) != null); - var fieldId = settingKey + (settingKey.EndsWith("_OverrideForStore") ? "" : "_OverrideForStore"); - - var sb = PooledStringBuilder.Rent(); - sb.Append(""); - // Controls are not floating, so line-break prevents different distances between them. - sb.Append("\r\n"); - - return MvcHtmlString.Create(sb.ToStringAndReturn()); - } - - public static MvcHtmlString CollapsedText(this HtmlHelper helper, string text) - { - if (text.IsEmpty()) - return MvcHtmlString.Empty; - - var catalogSettings = EngineContext.Current.Resolve(); - - if (!catalogSettings.EnableHtmlTextCollapser) - return MvcHtmlString.Create(text); - - string result = "
{1}
".FormatWith( - catalogSettings.HtmlTextCollapsedHeight, text - ); - - return MvcHtmlString.Create(result); - } + public static MvcHtmlString TableFormattedVariantAttributes(this HtmlHelper helper, string formattedVariantAttributes, string separatorLines = "
", string separatorValues = ": ") + { + var sb = new StringBuilder(); + string name, value; + string[] lines = formattedVariantAttributes.SplitSafe(separatorLines); + + if (lines.Length <= 0) + return MvcHtmlString.Empty; + + sb.Append(""); + + foreach (string line in lines) + { + sb.Append(""); + if (line.SplitToPair(out name, out value, separatorValues)) + { + sb.AppendFormat("", name); + sb.AppendFormat("", value); + } + else + { + sb.AppendFormat("", line); + } + sb.Append(""); + } + + sb.Append("
{0}:{0}{0}
"); + return MvcHtmlString.Create(sb.ToString()); + } + + public static MvcHtmlString SettingEditorFor( + this HtmlHelper helper, + Expression> expression, + string parentSelector = null, + object additionalViewData = null) + { + return SettingEditorFor( + helper, + expression, + helper.EditorFor(expression, additionalViewData), + parentSelector); + } + + public static MvcHtmlString SettingEditorFor( + this HtmlHelper helper, + Expression> expression, + Func editor, + string parentSelector = null) + { + return SettingEditorFor( + helper, + expression, + new MvcHtmlString(editor(helper.ViewData.Model).ToHtmlString()), + parentSelector); + } + + public static MvcHtmlString EnumSettingEditorFor( + this HtmlHelper helper, + Expression> expression, + string parentSelector = null, + object htmlAttributes = null, + string optionLabel = null) where TValue : struct + { + return SettingEditorFor( + helper, + expression, + helper.DropDownListForEnum(expression, htmlAttributes, optionLabel), + parentSelector); + } + + public static MvcHtmlString SettingEditorFor( + this HtmlHelper helper, + Expression> expression, + MvcHtmlString editor, + string parentSelector = null) + { + Guard.NotNull(expression, nameof(expression)); + Guard.NotNull(editor, nameof(editor)); + + var data = helper.ViewData[StoreDependingSettingHelper.ViewDataKey] as StoreDependingSettingData; + if (data == null || data.ActiveStoreScopeConfiguration <= 0) + return editor; // CONTROL + + var sb = PooledStringBuilder.Rent("
"); + sb.Append("
"); + sb.Append(helper.SettingOverrideCheckboxInternal(expression, data, parentSelector)); // CHECK + sb.Append("
"); + sb.Append("
"); + sb.Append(editor.ToHtmlString()); // CONTROL + sb.Append("
"); + + return MvcHtmlString.Create(sb.ToStringAndReturn()); + } + + private static MvcHtmlString SettingOverrideCheckboxInternal( + this HtmlHelper helper, + Expression> expression, + StoreDependingSettingData data, + string parentSelector = null) + { + var fieldPrefix = helper.ViewData.TemplateInfo.HtmlFieldPrefix; + var settingKey = ExpressionHelper.GetExpressionText(expression); + var localizeService = EngineContext.Current.Resolve(); + + if (fieldPrefix.HasValue()) + settingKey = string.Concat(fieldPrefix, ".", settingKey); + else if (!settingKey.Contains(".")) + settingKey = string.Concat(data.RootSettingClass, ".", settingKey); + + var overrideForStore = (data.OverrideSettingKeys.FirstOrDefault(x => x.IsCaseInsensitiveEqual(settingKey)) != null); + var fieldId = settingKey + (settingKey.EndsWith("_OverrideForStore") ? "" : "_OverrideForStore"); + + var sb = PooledStringBuilder.Rent(); + sb.Append(""); + // Controls are not floating, so line-break prevents different distances between them. + sb.Append("\r\n"); + + return MvcHtmlString.Create(sb.ToStringAndReturn()); + } + + public static MvcHtmlString CollapsedText(this HtmlHelper helper, string text) + { + if (text.IsEmpty()) + return MvcHtmlString.Empty; + + var catalogSettings = EngineContext.Current.Resolve(); + + if (!catalogSettings.EnableHtmlTextCollapser) + return MvcHtmlString.Create(text); + + string result = "
{1}
".FormatWith( + catalogSettings.HtmlTextCollapsedHeight, text + ); + + return MvcHtmlString.Create(result); + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static MvcHtmlString IconForFileExtension(this HtmlHelper helper, string fileExtension, bool renderLabel = false) - { - return IconForFileExtension(helper, fileExtension, null, renderLabel); - } - - public static MvcHtmlString IconForFileExtension(this HtmlHelper helper, string fileExtension, string extraCssClasses = null, bool renderLabel = false) - { - Guard.NotNull(helper, nameof(helper)); - Guard.NotEmpty(fileExtension, nameof(fileExtension)); - - var icon = "far fa-file"; - var ext = fileExtension; - - if (ext != null && ext.StartsWith(".")) - { - ext = ext.Substring(1); - } - - if (ext.HasValue()) - { - switch (ext.ToLowerInvariant()) - { - case "pdf": - icon = "far fa-file-pdf"; - break; - case "doc": - case "docx": - case "docm": - case "odt": - case "dot": - case "dotx": - case "dotm": - icon = "far fa-file-word"; - break; - case "xls": - case "xlsx": - case "xlsm": - case "xlsb": - case "ods": - icon = "far fa-file-excel"; - break; - case "csv": - case "tab": - icon = "fa fa-file-csv"; - break; - case "ppt": - case "pptx": - case "pptm": - case "ppsx": - case "odp": - case "potx": - case "pot": - case "potm": - case "pps": - case "ppsm": - icon = "far fa-file-powerpoint"; - break; - case "zip": - case "rar": - case "7z": - icon = "far fa-file-archive"; - break; - case "png": - case "jpg": - case "jpeg": - case "bmp": - case "psd": - icon = "far fa-file-image"; - break; - case "mp3": - case "wav": - case "ogg": - case "wma": - icon = "far fa-file-audio"; - break; - case "mp4": - case "mkv": - case "wmv": - case "avi": - case "asf": - case "mpg": - case "mpeg": - icon = "far fa-file-video"; - break; - case "txt": - icon = "far fa-file-alt"; - break; - case "exe": - icon = "fa fa-cog"; - break; - case "xml": - case "html": - case "htm": - icon = "far fa-file-code"; - break; - } - } - - var label = ext.NaIfEmpty().ToUpper(); - - var result = "".FormatInvariant( - icon, - extraCssClasses.HasValue() ? " " + extraCssClasses : "", - label); - - if (renderLabel) - { - if (ext.IsEmpty()) - { - result = "{0}".FormatInvariant("".NaIfEmpty()); - } - else - { - result = result + "{0}".FormatInvariant(label); - } - } - - return MvcHtmlString.Create(result); - } - - #region Media - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static MvcHtmlString MediaViewer(this HtmlHelper helper, MediaFileInfo file, object htmlAttributes = null) - { - return MediaInternal(helper, file, true, 0, CommonHelper.ObjectToDictionary(htmlAttributes)); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static MvcHtmlString MediaViewer(this HtmlHelper helper, MediaFileInfo file, IDictionary htmlAttributes) - { - return MediaInternal(helper, file, true, 0, htmlAttributes); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] + { + return IconForFileExtension(helper, fileExtension, null, renderLabel); + } + + public static MvcHtmlString IconForFileExtension(this HtmlHelper helper, string fileExtension, string extraCssClasses = null, bool renderLabel = false) + { + Guard.NotNull(helper, nameof(helper)); + Guard.NotEmpty(fileExtension, nameof(fileExtension)); + + var icon = "far fa-file"; + var ext = fileExtension; + + if (ext != null && ext.StartsWith(".")) + { + ext = ext.Substring(1); + } + + if (ext.HasValue()) + { + switch (ext.ToLowerInvariant()) + { + case "pdf": + icon = "far fa-file-pdf"; + break; + case "doc": + case "docx": + case "docm": + case "odt": + case "dot": + case "dotx": + case "dotm": + icon = "far fa-file-word"; + break; + case "xls": + case "xlsx": + case "xlsm": + case "xlsb": + case "ods": + icon = "far fa-file-excel"; + break; + case "csv": + case "tab": + icon = "fa fa-file-csv"; + break; + case "ppt": + case "pptx": + case "pptm": + case "ppsx": + case "odp": + case "potx": + case "pot": + case "potm": + case "pps": + case "ppsm": + icon = "far fa-file-powerpoint"; + break; + case "zip": + case "rar": + case "7z": + icon = "far fa-file-archive"; + break; + case "png": + case "jpg": + case "jpeg": + case "bmp": + case "psd": + icon = "far fa-file-image"; + break; + case "mp3": + case "wav": + case "ogg": + case "wma": + icon = "far fa-file-audio"; + break; + case "mp4": + case "mkv": + case "wmv": + case "avi": + case "asf": + case "mpg": + case "mpeg": + icon = "far fa-file-video"; + break; + case "txt": + icon = "far fa-file-alt"; + break; + case "exe": + icon = "fa fa-cog"; + break; + case "xml": + case "html": + case "htm": + icon = "far fa-file-code"; + break; + } + } + + var label = ext.NaIfEmpty().ToUpper(); + + var result = "".FormatInvariant( + icon, + extraCssClasses.HasValue() ? " " + extraCssClasses : "", + label); + + if (renderLabel) + { + if (ext.IsEmpty()) + { + result = "{0}".FormatInvariant("".NaIfEmpty()); + } + else + { + result = result + "{0}".FormatInvariant(label); + } + } + + return MvcHtmlString.Create(result); + } + + #region Media + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static MvcHtmlString MediaViewer(this HtmlHelper helper, MediaFileInfo file, object htmlAttributes = null) + { + return MediaInternal(helper, file, true, 0, CommonHelper.ObjectToDictionary(htmlAttributes)); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static MvcHtmlString MediaViewer(this HtmlHelper helper, MediaFileInfo file, IDictionary htmlAttributes) + { + return MediaInternal(helper, file, true, 0, htmlAttributes); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static MvcHtmlString MediaThumbnail(this HtmlHelper helper, MediaFileInfo file, int size, object htmlAttributes = null) { return MediaInternal(helper, file, false, size, CommonHelper.ObjectToDictionary(htmlAttributes)); } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static MvcHtmlString MediaThumbnail(this HtmlHelper helper, MediaFileInfo file, int size, IDictionary htmlAttributes) - { - return MediaInternal(helper, file, false, size, htmlAttributes); - } - - private static MvcHtmlString MediaInternal( - HtmlHelper helper, - MediaFileInfo file, - bool renderViewer, - int size, - IDictionary htmlAttributes) - { - if (file?.File == null) - { - return MvcHtmlString.Empty; - } - - // Validate size parameter. - if (file.MediaType != "image" && !renderViewer) - { - Guard.IsPositive(size, nameof(size), $"The size must be greater than 0 to get a thumbnail for type '{file.MediaType.NaIfEmpty()}'."); - } - - var f = file?.File; - - var model = new MediaTemplateModel(file, renderViewer) - { - ThumbSize = size, - HtmlAttributes = htmlAttributes - }; - - if (htmlAttributes.TryGetValue("alt", out var alt)) - { - htmlAttributes.Remove("alt"); - } - - if (htmlAttributes.TryGetValue("title", out var title)) - { - htmlAttributes.Remove("title"); - } - - //alt != null ? (string)alt : f?.GetLocalized(x => x.Alt).Value - - model.Alt = (string)(alt ?? f?.GetLocalized(x => x.Alt).Value); - model.Title = (string)(title ?? f?.GetLocalized(x => x.Title).Value); - - return helper.Partial("MediaTemplates/" + file.MediaType, model); - } - - #endregion - } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static MvcHtmlString MediaThumbnail(this HtmlHelper helper, MediaFileInfo file, int size, IDictionary htmlAttributes) + { + return MediaInternal(helper, file, false, size, htmlAttributes); + } + + private static MvcHtmlString MediaInternal( + HtmlHelper helper, + MediaFileInfo file, + bool renderViewer, + int size, + IDictionary htmlAttributes) + { + if (file?.File == null) + { + return MvcHtmlString.Empty; + } + + // Validate size parameter. + if (file.MediaType != "image" && !renderViewer) + { + Guard.IsPositive(size, nameof(size), $"The size must be greater than 0 to get a thumbnail for type '{file.MediaType.NaIfEmpty()}'."); + } + + var f = file?.File; + + var model = new MediaTemplateModel(file, renderViewer) + { + ThumbSize = size, + HtmlAttributes = htmlAttributes + }; + + if (htmlAttributes.TryGetValue("alt", out var alt)) + { + htmlAttributes.Remove("alt"); + } + + if (htmlAttributes.TryGetValue("title", out var title)) + { + htmlAttributes.Remove("title"); + } + + //alt != null ? (string)alt : f?.GetLocalized(x => x.Alt).Value + + model.Alt = (string)(alt ?? f?.GetLocalized(x => x.Alt).Value); + model.Title = (string)(title ?? f?.GetLocalized(x => x.Title).Value); + + return helper.Partial("MediaTemplates/" + file.MediaType, model); + } + + #endregion + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs index 30f54829bf..86ddff19a9 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs @@ -1,8 +1,8 @@ using System; +using System.Collections.Generic; using System.IO; -using System.Web.Mvc; using System.Web; -using System.Collections.Generic; +using System.Web.Mvc; using SmartStore.Utilities; namespace SmartStore.Web.Framework @@ -52,7 +52,7 @@ private static Queue GetIdsToReuse(HttpContextBase httpContext, string c foreach (var previouslyUsedId in previouslyUsedIds.Split(',')) { queue.Enqueue(previouslyUsedId); - } + } } } return queue; diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs index 6644ac91bc..6d042beca7 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs @@ -13,143 +13,143 @@ namespace SmartStore.Web.Framework { - public static class HtmlSelectListExtensions - { - public static SelectList ToSelectList(this TEnum enumObj, bool markCurrentAsSelected = true) where TEnum : struct - { - if (!typeof(TEnum).IsEnum) - throw new ArgumentException("An Enumeration type is required.", "enumObj"); - - var localizationService = EngineContext.Current.Resolve(); - var workContext = EngineContext.Current.Resolve(); - - var values = from TEnum enumValue in Enum.GetValues(typeof(TEnum)) - select new { ID = Convert.ToInt32(enumValue), Name = enumValue.GetLocalizedEnum(localizationService, workContext) }; - - object selectedValue = null; - if (markCurrentAsSelected) - selectedValue = Convert.ToInt32(enumObj); - - return new SelectList(values, "ID", "Name", selectedValue); - } - - /// - /// Get a select list of all stores - /// - public static IList ToSelectListItems(this IEnumerable stores, params int[] selectedStoreIds) - { - var list = new List(); - - foreach (var store in stores) - { - list.Add(new SelectListItem - { - Text = store.Name, - Value = store.Id.ToString(), - Selected = selectedStoreIds != null && selectedStoreIds.Contains(store.Id) - }); - } - - return list; - } - - /// - /// Get a select list of all customer roles - /// - public static IList ToSelectListItems(this IEnumerable roles, params int[] selectedCustomerRoleIds) - { - var list = new List(); - - foreach (var role in roles) - { - list.Add(new SelectListItem - { - Text = role.Name, - Value = role.Id.ToString(), - Selected = selectedCustomerRoleIds != null && selectedCustomerRoleIds.Contains(role.Id) - }); - } - - return list; - } - - /// - /// Get a select list of all payment methods. - /// - /// Payment providers. - /// Plugin mediator. - /// System name of selected methods. - /// List of select items - public static IList ToSelectListItems( - this IEnumerable> paymentProviders, - PluginMediator pluginMediator, - params string[] selectedMethods) - { - var list = new List(); - - foreach (var provider in paymentProviders) - { - var systemName = provider.Metadata.SystemName; - var name = pluginMediator.GetLocalizedFriendlyName(provider.Metadata); - - if (name.IsEmpty()) - { - name = provider.Metadata.FriendlyName; - } - - if (name.IsEmpty()) - { - name = provider.Metadata.SystemName; - } - - var item = new ExtendedSelectListItem - { - Text = name.NaIfEmpty(), - Value = systemName, - Selected = selectedMethods != null && selectedMethods.Contains(systemName) - }; - - item.CustomProperties.Add("hint", systemName.Replace("SmartStore.", "").Replace("Payments.", "")); - - list.Add(item); - } - - return list.OrderBy(x => x.Text).ToList(); - } - - public static void SelectValue(this List lst, string value, string defaultValue = null) - { - if (lst != null) - { - var itm = lst.FirstOrDefault(i => i.Value.IsCaseInsensitiveEqual(value)); - - if (itm == null && defaultValue != null) - itm = lst.FirstOrDefault(i => i.Value.IsCaseInsensitiveEqual(defaultValue)); - - if (itm != null) - itm.Selected = true; - } - } - } - - - public partial class ExtendedSelectListItem : SelectListItem - { - public ExtendedSelectListItem() - { - CustomProperties = new Dictionary(); - } - - public Dictionary CustomProperties { get; set; } - - public TProperty Get(string key, TProperty defaultValue = default(TProperty)) - { - if (CustomProperties.TryGetValue(key, out object value)) - { - return (TProperty)value; - } - - return defaultValue; - } - } + public static class HtmlSelectListExtensions + { + public static SelectList ToSelectList(this TEnum enumObj, bool markCurrentAsSelected = true) where TEnum : struct + { + if (!typeof(TEnum).IsEnum) + throw new ArgumentException("An Enumeration type is required.", "enumObj"); + + var localizationService = EngineContext.Current.Resolve(); + var workContext = EngineContext.Current.Resolve(); + + var values = from TEnum enumValue in Enum.GetValues(typeof(TEnum)) + select new { ID = Convert.ToInt32(enumValue), Name = enumValue.GetLocalizedEnum(localizationService, workContext) }; + + object selectedValue = null; + if (markCurrentAsSelected) + selectedValue = Convert.ToInt32(enumObj); + + return new SelectList(values, "ID", "Name", selectedValue); + } + + /// + /// Get a select list of all stores + /// + public static IList ToSelectListItems(this IEnumerable stores, params int[] selectedStoreIds) + { + var list = new List(); + + foreach (var store in stores) + { + list.Add(new SelectListItem + { + Text = store.Name, + Value = store.Id.ToString(), + Selected = selectedStoreIds != null && selectedStoreIds.Contains(store.Id) + }); + } + + return list; + } + + /// + /// Get a select list of all customer roles + /// + public static IList ToSelectListItems(this IEnumerable roles, params int[] selectedCustomerRoleIds) + { + var list = new List(); + + foreach (var role in roles) + { + list.Add(new SelectListItem + { + Text = role.Name, + Value = role.Id.ToString(), + Selected = selectedCustomerRoleIds != null && selectedCustomerRoleIds.Contains(role.Id) + }); + } + + return list; + } + + /// + /// Get a select list of all payment methods. + /// + /// Payment providers. + /// Plugin mediator. + /// System name of selected methods. + /// List of select items + public static IList ToSelectListItems( + this IEnumerable> paymentProviders, + PluginMediator pluginMediator, + params string[] selectedMethods) + { + var list = new List(); + + foreach (var provider in paymentProviders) + { + var systemName = provider.Metadata.SystemName; + var name = pluginMediator.GetLocalizedFriendlyName(provider.Metadata); + + if (name.IsEmpty()) + { + name = provider.Metadata.FriendlyName; + } + + if (name.IsEmpty()) + { + name = provider.Metadata.SystemName; + } + + var item = new ExtendedSelectListItem + { + Text = name.NaIfEmpty(), + Value = systemName, + Selected = selectedMethods != null && selectedMethods.Contains(systemName) + }; + + item.CustomProperties.Add("hint", systemName.Replace("SmartStore.", "").Replace("Payments.", "")); + + list.Add(item); + } + + return list.OrderBy(x => x.Text).ToList(); + } + + public static void SelectValue(this List lst, string value, string defaultValue = null) + { + if (lst != null) + { + var itm = lst.FirstOrDefault(i => i.Value.IsCaseInsensitiveEqual(value)); + + if (itm == null && defaultValue != null) + itm = lst.FirstOrDefault(i => i.Value.IsCaseInsensitiveEqual(defaultValue)); + + if (itm != null) + itm.Selected = true; + } + } + } + + + public partial class ExtendedSelectListItem : SelectListItem + { + public ExtendedSelectListItem() + { + CustomProperties = new Dictionary(); + } + + public Dictionary CustomProperties { get; set; } + + public TProperty Get(string key, TProperty defaultValue = default(TProperty)) + { + if (CustomProperties.TryGetValue(key, out object value)) + { + return (TProperty)value; + } + + return defaultValue; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs index fd9b6f3717..9677aa41a9 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs @@ -1,147 +1,139 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Web; using System.Web.Mvc; using SmartStore.Collections; -using SmartStore.Utilities; namespace SmartStore.Web.Framework { - public enum ZoneInjectMode - { - Append, - Prepend, - Replace - } - - public static class HtmlZoneExtensions - { - private class DocumentZone : IDisposable - { - internal const string ItemsKey = "DocumentTail.Snippets"; - private const string UniqueKeysKey = "DocumentTail.UniqueKeys"; - - private readonly ViewContext _viewContext; - private readonly TextWriter _originalViewContextWriter; - private readonly WebViewPage _page; - private readonly string _targetZone; - private readonly ZoneInjectMode _injectMode; - private readonly bool _isVoid; - - public DocumentZone(HtmlHelper html, string targetZone, ZoneInjectMode injectMode, string key) - { - Guard.NotEmpty(targetZone, nameof(targetZone)); - - _viewContext = html.ViewContext; - _originalViewContextWriter = _viewContext.Writer; - _page = (WebViewPage)html.ViewDataContainer; - - var writer = new StringWriter(); - _page.OutputStack.Push(writer); - _viewContext.Writer = writer; - - _targetZone = targetZone; - _injectMode = injectMode; - - if (key.HasValue()) - { - if (HasUniqueKey(key)) - { - _isVoid = true; - } - else - { - UniqueKeys.Add(key); - } - } - - if (_page.Request.IsAjaxRequest()) - { - _isVoid = true; - } - } - - public static IEnumerable GetZoneContent(string zone) - { - Guard.NotEmpty(zone, nameof(zone)); - - var storage = HttpContext.Current?.GetItem>(ItemsKey, forceCreation: false); - return storage?[zone]; - } - - public static bool HasUniqueKey(string key) - { - Guard.NotEmpty(key, nameof(key)); - - var uniqueKeys = HttpContext.Current?.GetItem>(UniqueKeysKey, forceCreation: false); - return uniqueKeys != null && uniqueKeys.Contains(key); - } - - private static HashSet UniqueKeys - { - get - { - return HttpContext.Current?.GetItem>(UniqueKeysKey, () => new HashSet(StringComparer.OrdinalIgnoreCase), true); - } - } - - private Multimap GetStorage() - { - return _page.ViewContext?.HttpContext?.GetItem>(ItemsKey, () => new Multimap(StringComparer.OrdinalIgnoreCase)); - } - - public void Dispose() - { - var storage = GetStorage(); - if (storage == null) - return; - - var writer = ((StringWriter)_page.OutputStack.Pop()); - var content = _isVoid ? string.Empty : writer.ToString(); - - _viewContext.Writer = _originalViewContextWriter; - - if (_injectMode == ZoneInjectMode.Append) - { - storage[_targetZone].Add(content); - } - else if (_injectMode == ZoneInjectMode.Prepend) - { - var list = new List(storage[_targetZone]); - list.Insert(0, content); - storage.RemoveAll(_targetZone); - storage[_targetZone].AddRange(list); - } - else // Replace - { - storage.RemoveAll(_targetZone); - storage[_targetZone].Add(content); - } - } - } - - public static IDisposable BeginZoneContent(this HtmlHelper helper, - string targetZone, - ZoneInjectMode injectMode = ZoneInjectMode.Append, - string key = null) - { - return new DocumentZone(helper, targetZone, injectMode, key); - } - - public static void RenderZone(this HtmlHelper helper, string zone) - { - var snippets = DocumentZone.GetZoneContent(zone); - if (snippets == null) - { - return; - } - - foreach (var snippet in snippets) - { - helper.ViewContext.Writer.WriteLine(snippet); - } - } - } + public enum ZoneInjectMode + { + Append, + Prepend, + Replace + } + + public static class HtmlZoneExtensions + { + private class DocumentZone : IDisposable + { + internal const string ItemsKey = "DocumentTail.Snippets"; + private const string UniqueKeysKey = "DocumentTail.UniqueKeys"; + + private readonly ViewContext _viewContext; + private readonly TextWriter _originalViewContextWriter; + private readonly WebViewPage _page; + private readonly string _targetZone; + private readonly ZoneInjectMode _injectMode; + private readonly bool _isVoid; + + public DocumentZone(HtmlHelper html, string targetZone, ZoneInjectMode injectMode, string key) + { + Guard.NotEmpty(targetZone, nameof(targetZone)); + + _viewContext = html.ViewContext; + _originalViewContextWriter = _viewContext.Writer; + _page = (WebViewPage)html.ViewDataContainer; + + var writer = new StringWriter(); + _page.OutputStack.Push(writer); + _viewContext.Writer = writer; + + _targetZone = targetZone; + _injectMode = injectMode; + + if (key.HasValue()) + { + if (HasUniqueKey(key)) + { + _isVoid = true; + } + else + { + UniqueKeys.Add(key); + } + } + + if (_page.Request.IsAjaxRequest()) + { + _isVoid = true; + } + } + + public static IEnumerable GetZoneContent(string zone) + { + Guard.NotEmpty(zone, nameof(zone)); + + var storage = HttpContext.Current?.GetItem>(ItemsKey, forceCreation: false); + return storage?[zone]; + } + + public static bool HasUniqueKey(string key) + { + Guard.NotEmpty(key, nameof(key)); + + var uniqueKeys = HttpContext.Current?.GetItem>(UniqueKeysKey, forceCreation: false); + return uniqueKeys != null && uniqueKeys.Contains(key); + } + + private static HashSet UniqueKeys => HttpContext.Current?.GetItem>(UniqueKeysKey, () => new HashSet(StringComparer.OrdinalIgnoreCase), true); + + private Multimap GetStorage() + { + return _page.ViewContext?.HttpContext?.GetItem>(ItemsKey, () => new Multimap(StringComparer.OrdinalIgnoreCase)); + } + + public void Dispose() + { + var storage = GetStorage(); + if (storage == null) + return; + + var writer = ((StringWriter)_page.OutputStack.Pop()); + var content = _isVoid ? string.Empty : writer.ToString(); + + _viewContext.Writer = _originalViewContextWriter; + + if (_injectMode == ZoneInjectMode.Append) + { + storage[_targetZone].Add(content); + } + else if (_injectMode == ZoneInjectMode.Prepend) + { + var list = new List(storage[_targetZone]); + list.Insert(0, content); + storage.RemoveAll(_targetZone); + storage[_targetZone].AddRange(list); + } + else // Replace + { + storage.RemoveAll(_targetZone); + storage[_targetZone].Add(content); + } + } + } + + public static IDisposable BeginZoneContent(this HtmlHelper helper, + string targetZone, + ZoneInjectMode injectMode = ZoneInjectMode.Append, + string key = null) + { + return new DocumentZone(helper, targetZone, injectMode, key); + } + + public static void RenderZone(this HtmlHelper helper, string zone) + { + var snippets = DocumentZone.GetZoneContent(zone); + if (snippets == null) + { + return; + } + + foreach (var snippet in snippets) + { + helper.ViewContext.Writer.WriteLine(snippet); + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs index 28b7f2312e..19d0128b72 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs @@ -11,122 +11,122 @@ namespace SmartStore { - public static class HttpExtensions - { - public static bool IsAdminArea(this HttpRequest request) - { - if (request != null) - { - return IsAdminArea(new HttpRequestWrapper(request)); - } - - return false; - } - - public static bool IsAdminArea(this HttpRequestBase request) - { - try - { - // TODO: not really reliable. Change this. - var area = request?.RequestContext?.RouteData?.GetAreaName(); - if (area != null) - { - return area.IsCaseInsensitiveEqual("admin"); - } - else - { - var paths = new[] { "~/administration/", "~/admin/" }; - return paths.Any(x => request?.AppRelativeCurrentExecutionFilePath?.StartsWith(x, StringComparison.OrdinalIgnoreCase) == true); - } - } - catch - { - return false; - } - } - - public static bool IsPublicArea(this HttpRequest request) - { - if (request != null) - { - return IsPublicArea(new HttpRequestWrapper(request)); - } - - return false; - } - - public static bool IsPublicArea(this HttpRequestBase request) - { - try - { - // TODO: not really reliable. Change this. - var area = request?.RequestContext?.RouteData?.GetAreaName(); - return area.IsEmpty(); - } - catch - { - return false; - } - } - - public static PostedFileResult ToPostedFileResult(this HttpRequestBase httpRequest) - { - if (httpRequest != null && httpRequest.Files.Count > 0) - { - return httpRequest.Files[0].ToPostedFileResult(); - } - - return null; - } - - public static PostedFileResult ToPostedFileResult(this HttpPostedFile httpFile) - { - if (httpFile != null && httpFile.ContentLength > 0) - { - return new PostedFileResult(new HttpPostedFileWrapper(httpFile)); - } - - return null; - } - - public static PostedFileResult ToPostedFileResult(this HttpPostedFileBase httpFile) - { - if (httpFile != null && httpFile.ContentLength > 0) - { - return new PostedFileResult(httpFile); - } - - return null; - } - - public static IEnumerable ToPostedFileResults(this HttpFileCollection httpFileCollection) - { - if (httpFileCollection != null && httpFileCollection.Count > 0) - { - return new HttpFileCollectionWrapper(httpFileCollection).ToPostedFileResults(); - } - - return Enumerable.Empty(); - } - - public static IEnumerable ToPostedFileResults(this HttpFileCollectionBase httpFileCollection) - { - if (httpFileCollection == null) - yield break; - - var batchId = Guid.NewGuid(); - - for (var i = 0; i < httpFileCollection.Count; i++) - { - var httpFile = httpFileCollection[i]; - var result = httpFile.ToPostedFileResult(); - if (result != null) - { - result.BatchId = batchId; - yield return result; - } - } - } + public static class HttpExtensions + { + public static bool IsAdminArea(this HttpRequest request) + { + if (request != null) + { + return IsAdminArea(new HttpRequestWrapper(request)); + } + + return false; + } + + public static bool IsAdminArea(this HttpRequestBase request) + { + try + { + // TODO: not really reliable. Change this. + var area = request?.RequestContext?.RouteData?.GetAreaName(); + if (area != null) + { + return area.IsCaseInsensitiveEqual("admin"); + } + else + { + var paths = new[] { "~/administration/", "~/admin/" }; + return paths.Any(x => request?.AppRelativeCurrentExecutionFilePath?.StartsWith(x, StringComparison.OrdinalIgnoreCase) == true); + } + } + catch + { + return false; + } + } + + public static bool IsPublicArea(this HttpRequest request) + { + if (request != null) + { + return IsPublicArea(new HttpRequestWrapper(request)); + } + + return false; + } + + public static bool IsPublicArea(this HttpRequestBase request) + { + try + { + // TODO: not really reliable. Change this. + var area = request?.RequestContext?.RouteData?.GetAreaName(); + return area.IsEmpty(); + } + catch + { + return false; + } + } + + public static PostedFileResult ToPostedFileResult(this HttpRequestBase httpRequest) + { + if (httpRequest != null && httpRequest.Files.Count > 0) + { + return httpRequest.Files[0].ToPostedFileResult(); + } + + return null; + } + + public static PostedFileResult ToPostedFileResult(this HttpPostedFile httpFile) + { + if (httpFile != null && httpFile.ContentLength > 0) + { + return new PostedFileResult(new HttpPostedFileWrapper(httpFile)); + } + + return null; + } + + public static PostedFileResult ToPostedFileResult(this HttpPostedFileBase httpFile) + { + if (httpFile != null && httpFile.ContentLength > 0) + { + return new PostedFileResult(httpFile); + } + + return null; + } + + public static IEnumerable ToPostedFileResults(this HttpFileCollection httpFileCollection) + { + if (httpFileCollection != null && httpFileCollection.Count > 0) + { + return new HttpFileCollectionWrapper(httpFileCollection).ToPostedFileResults(); + } + + return Enumerable.Empty(); + } + + public static IEnumerable ToPostedFileResults(this HttpFileCollectionBase httpFileCollection) + { + if (httpFileCollection == null) + yield break; + + var batchId = Guid.NewGuid(); + + for (var i = 0; i < httpFileCollection.Count; i++) + { + var httpFile = httpFileCollection[i]; + var result = httpFile.ToPostedFileResult(); + if (result != null) + { + result.BatchId = batchId; + yield return result; + } + } + } public static RouteData GetRouteData(this HttpContextBase httpContext) { @@ -146,149 +146,150 @@ public static bool TryGetRouteData(this HttpContextBase httpContext, out RouteDa return routeData != null; } - public static CheckoutState GetCheckoutState(this HttpContextBase httpContext) - { - Guard.NotNull(httpContext, nameof(httpContext)); + public static CheckoutState GetCheckoutState(this HttpContextBase httpContext) + { + Guard.NotNull(httpContext, nameof(httpContext)); - var state = httpContext.Session.SafeGetValue(CheckoutState.CheckoutStateSessionKey); + var state = httpContext.Session.SafeGetValue(CheckoutState.CheckoutStateSessionKey); - if (state != null) - return state; + if (state != null) + return state; - state = new CheckoutState(); - httpContext.Session.SafeSet(CheckoutState.CheckoutStateSessionKey, state); + state = new CheckoutState(); + httpContext.Session.SafeSet(CheckoutState.CheckoutStateSessionKey, state); - return state; - } + return state; + } - public static void RemoveCheckoutState(this HttpContextBase httpContext) - { - Guard.NotNull(httpContext, nameof(httpContext)); + public static void RemoveCheckoutState(this HttpContextBase httpContext) + { + Guard.NotNull(httpContext, nameof(httpContext)); - httpContext.Session.SafeRemove(CheckoutState.CheckoutStateSessionKey); - } + httpContext.Session.SafeRemove(CheckoutState.CheckoutStateSessionKey); + } - internal static string GetUserThemeChoiceFromCookie(this HttpContextBase context) - { - if (context == null) - return null; + internal static string GetUserThemeChoiceFromCookie(this HttpContextBase context) + { + if (context == null) + return null; - var cookie = context.Request.Cookies.Get("sm.UserThemeChoice"); - if (cookie != null) - { - return cookie.Value.NullEmpty(); - } + var cookie = context.Request.Cookies.Get("sm.UserThemeChoice"); + if (cookie != null) + { + return cookie.Value.NullEmpty(); + } - return null; - } + return null; + } - internal static void SetUserThemeChoiceInCookie(this HttpContextBase context, string value) - { - if (context?.Request == null) - { - return; - } + internal static void SetUserThemeChoiceInCookie(this HttpContextBase context, string value) + { + if (context?.Request == null) + { + return; + } if (value.IsEmpty()) - { - context.Request.Cookies.Remove("sm.UserThemeChoice"); - return; - } - - var settings = EngineContext.Current.Resolve(); - var cookie = context.Request.Cookies.Get("sm.UserThemeChoice") ?? new HttpCookie("sm.UserThemeChoice"); - cookie.Value = value; - cookie.Expires = DateTime.UtcNow.AddYears(1); - cookie.HttpOnly = true; - cookie.Secure = context.Request.IsHttps(); - cookie.SameSite = cookie.Secure ? (SameSiteMode)settings.SameSiteMode : SameSiteMode.Lax; - - context.Request.Cookies.Set(cookie); - } - - internal static HttpCookie GetPreviewModeCookie(this HttpContextBase context, bool createIfMissing) - { - var httpRequest = context.SafeGetHttpRequest(); - var cookie = httpRequest?.Cookies?.Get("sm.PreviewModeOverrides"); - - if (cookie == null && createIfMissing && httpRequest != null) - { - var settings = EngineContext.Current.Resolve(); - var secure = context.Request.IsHttps(); - cookie = new HttpCookie("sm.PreviewModeOverrides") { - HttpOnly = true, - Secure = secure, - SameSite = secure ? (SameSiteMode)settings.SameSiteMode : SameSiteMode.Lax - }; - httpRequest.Cookies.Set(cookie); - } - - if (cookie != null) - { - // when cookie gets created or touched, extend its lifetime - cookie.Expires = DateTime.UtcNow.AddMinutes(20); - } - - return cookie; - } - - internal static void SetPreviewModeValue(this HttpContextBase context, string key, string value) - { - if (context == null) - return; - - var cookie = context.GetPreviewModeCookie(value.HasValue()); - if (cookie != null) - { - if (value.HasValue()) - { - cookie.Values[key] = value; - } - else - { - cookie.Values.Remove(key); - } - } - } - - public static IDisposable PreviewModeCookie(this HttpContextBase context) - { - var disposable = new ActionDisposable(() => - { - var cookie = GetPreviewModeCookie(context, false); - if (cookie != null) - { - if (!cookie.HasKeys) - { - cookie.Expires = DateTime.UtcNow.AddYears(-10); - } - else - { - cookie.Expires = DateTime.UtcNow.AddMinutes(20); - } - - context.Response.SetCookie(cookie); - } - }); - - return disposable; - } - - public static string GetContentUrl(this HttpContextBase context, string path) - { - if (path.HasValue()) - { - if (!path.StartsWith("~")) - { - if (!path.StartsWith("/")) - path = "/" + path; - path = "~" + path; - } - - return UrlHelper.GenerateContentUrl(path, context); - } - - return path; - } - } + { + context.Request.Cookies.Remove("sm.UserThemeChoice"); + return; + } + + var settings = EngineContext.Current.Resolve(); + var cookie = context.Request.Cookies.Get("sm.UserThemeChoice") ?? new HttpCookie("sm.UserThemeChoice"); + cookie.Value = value; + cookie.Expires = DateTime.UtcNow.AddYears(1); + cookie.HttpOnly = true; + cookie.Secure = context.Request.IsHttps(); + cookie.SameSite = cookie.Secure ? (SameSiteMode)settings.SameSiteMode : SameSiteMode.Lax; + + context.Request.Cookies.Set(cookie); + } + + internal static HttpCookie GetPreviewModeCookie(this HttpContextBase context, bool createIfMissing) + { + var httpRequest = context.SafeGetHttpRequest(); + var cookie = httpRequest?.Cookies?.Get("sm.PreviewModeOverrides"); + + if (cookie == null && createIfMissing && httpRequest != null) + { + var settings = EngineContext.Current.Resolve(); + var secure = context.Request.IsHttps(); + cookie = new HttpCookie("sm.PreviewModeOverrides") + { + HttpOnly = true, + Secure = secure, + SameSite = secure ? (SameSiteMode)settings.SameSiteMode : SameSiteMode.Lax + }; + httpRequest.Cookies.Set(cookie); + } + + if (cookie != null) + { + // when cookie gets created or touched, extend its lifetime + cookie.Expires = DateTime.UtcNow.AddMinutes(20); + } + + return cookie; + } + + internal static void SetPreviewModeValue(this HttpContextBase context, string key, string value) + { + if (context == null) + return; + + var cookie = context.GetPreviewModeCookie(value.HasValue()); + if (cookie != null) + { + if (value.HasValue()) + { + cookie.Values[key] = value; + } + else + { + cookie.Values.Remove(key); + } + } + } + + public static IDisposable PreviewModeCookie(this HttpContextBase context) + { + var disposable = new ActionDisposable(() => + { + var cookie = GetPreviewModeCookie(context, false); + if (cookie != null) + { + if (!cookie.HasKeys) + { + cookie.Expires = DateTime.UtcNow.AddYears(-10); + } + else + { + cookie.Expires = DateTime.UtcNow.AddMinutes(20); + } + + context.Response.SetCookie(cookie); + } + }); + + return disposable; + } + + public static string GetContentUrl(this HttpContextBase context, string path) + { + if (path.HasValue()) + { + if (!path.StartsWith("~")) + { + if (!path.StartsWith("/")) + path = "/" + path; + path = "~" + path; + } + + return UrlHelper.GenerateContentUrl(path, context); + } + + return path; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs index 5f07d27c58..2f77e252da 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs @@ -3,52 +3,52 @@ namespace SmartStore { - public static class HttpSessionStateExtensions - { - public static void SafeRemove(this HttpSessionStateBase session, string key) - { - try - { - if (session != null && session[key] != null) - session.Remove(key); - } - catch (Exception exc) - { - exc.Dump(); - } - } + public static class HttpSessionStateExtensions + { + public static void SafeRemove(this HttpSessionStateBase session, string key) + { + try + { + if (session != null && session[key] != null) + session.Remove(key); + } + catch (Exception exc) + { + exc.Dump(); + } + } - public static T SafeGetValue(this HttpSessionStateBase session, string key, T defaultValue = default(T)) - { - try - { - if (session != null && session[key] != null) - return (T)session[key]; - } - catch (Exception exc) - { - exc.Dump(); - } + public static T SafeGetValue(this HttpSessionStateBase session, string key, T defaultValue = default(T)) + { + try + { + if (session != null && session[key] != null) + return (T)session[key]; + } + catch (Exception exc) + { + exc.Dump(); + } - return defaultValue; - } + return defaultValue; + } - public static void SafeSet(this HttpSessionStateBase session, string key, object value) - { - try - { - if (session != null) - { - if (value == null) - session.SafeRemove(key); - else - session[key] = value; - } - } - catch (Exception exc) - { - exc.Dump(); - } - } - } + public static void SafeSet(this HttpSessionStateBase session, string key, object value) + { + try + { + if (session != null) + { + if (value == null) + session.SafeRemove(key); + else + session[key] = value; + } + } + catch (Exception exc) + { + exc.Dump(); + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/LocalizedValueExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/LocalizedValueExtensions.cs index ffc474ff87..97be49e86f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/LocalizedValueExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/LocalizedValueExtensions.cs @@ -1,27 +1,26 @@ -using System; -using SmartStore.Services.Localization; +using SmartStore.Services.Localization; namespace SmartStore.Web.Framework { - /// - /// Wrapper for the most common string extension helpers used in views. - /// Just here to avoid runtime exceptions in views after refactoring GetLocalized() helper. - /// - public static class LocalizedValueExtensions - { - public static bool HasValue(this LocalizedValue value) - { - return value?.Value?.HasValue() == true; - } + /// + /// Wrapper for the most common string extension helpers used in views. + /// Just here to avoid runtime exceptions in views after refactoring GetLocalized() helper. + /// + public static class LocalizedValueExtensions + { + public static bool HasValue(this LocalizedValue value) + { + return value?.Value?.HasValue() == true; + } - public static bool IsEmpty(this LocalizedValue value) - { - return value?.Value?.IsEmpty() == false; - } + public static bool IsEmpty(this LocalizedValue value) + { + return value?.Value?.IsEmpty() == false; + } - public static string Truncate(this LocalizedValue value, int maxLength, string suffix = "") - { - return value?.Value?.Truncate(maxLength, suffix); - } - } + public static string Truncate(this LocalizedValue value, int maxLength, string suffix = "") + { + return value?.Value?.Truncate(maxLength, suffix); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/NameValueCollectionExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/NameValueCollectionExtensions.cs index 87ba980283..e1c7dce05f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/NameValueCollectionExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/NameValueCollectionExtensions.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Collections.Specialized; +using System.Linq; namespace SmartStore { - public static class NameValueCollectionExtension - { + public static class NameValueCollectionExtension + { public static IDictionary ToDictionary(this NameValueCollection collection) { Guard.NotNull(collection, nameof(collection)); - + var query = from key in collection.AllKeys where key != null select key; @@ -19,5 +19,5 @@ public static IDictionary ToDictionary(this NameValueCollection return query.ToDictionary(key => key, elementSelector); } - } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs index 366d07a05e..cf55ba8490 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs @@ -6,138 +6,129 @@ namespace SmartStore { - public class PostedFileResult - { - private static readonly Regex s_ImageTypes = new Regex(@"(.*?)\.(gif|jpg|jpeg|jpe|jfif|pjpeg|pjp|png|tiff|tif|bmp|ico|svg)", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private readonly HttpPostedFileBase _httpFile; - - private string _contentType; - private string _fileName; - private string _fileTitle; - private string _fileExt; - private bool? _isImage; - private byte[] _buffer; - - public PostedFileResult(HttpPostedFileBase httpFile) - { - Guard.NotNull(httpFile, nameof(httpFile)); - - this._httpFile = httpFile; - - this.TimeStamp = DateTime.UtcNow; - this.BatchId = Guid.NewGuid(); - } - - public HttpPostedFileBase File - { - get { return _httpFile; } - } - - public DateTime TimeStamp - { - get; - private set; - } - - public Guid BatchId - { - get; - internal set; - } - - public string FileName - { - get - { - if (_fileName == null) - { - _fileName = Path.GetFileName(_httpFile.FileName); - } - return _fileName; - } - } - - public string FileTitle - { - get - { - if (_fileTitle == null) - { - _fileTitle = Path.GetFileNameWithoutExtension(this.FileName); - } - return _fileTitle; - } - } - - public string FileExtension - { - get - { - if (_fileExt == null) - { - _fileExt = Path.GetExtension(this.FileName).EmptyNull(); - } - return _fileExt; - } - } - - public string ContentType - { - get - { - if (_contentType == null) - { - var contentType = _httpFile.ContentType; - - if (contentType == null && this.FileExtension.HasValue()) - { - contentType = MimeTypes.MapNameToMimeType(this.FileExtension); - } - - _contentType = contentType.EmptyNull(); - } - return _contentType; - } - } - - public bool IsImage - { - get - { - if (!_isImage.HasValue) - { - _isImage = s_ImageTypes.IsMatch(FileExtension); - } - return _isImage.Value; - } - } - - public int Size - { - get { return _httpFile.ContentLength; } - } - - public Stream Stream - { - get { return _httpFile.InputStream; } - } - - public byte[] Buffer - { - get - { - if (_buffer == null) - { - _buffer = _httpFile.InputStream.ToByteArray(); - } - - return _buffer; - } - } - - public bool FileNameMatches(string pattern) - { - return Regex.IsMatch(_httpFile.FileName, pattern, RegexOptions.IgnoreCase | RegexOptions.Singleline); - } - } + public class PostedFileResult + { + private static readonly Regex s_ImageTypes = new Regex(@"(.*?)\.(gif|jpg|jpeg|jpe|jfif|pjpeg|pjp|png|tiff|tif|bmp|ico|svg)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private readonly HttpPostedFileBase _httpFile; + + private string _contentType; + private string _fileName; + private string _fileTitle; + private string _fileExt; + private bool? _isImage; + private byte[] _buffer; + + public PostedFileResult(HttpPostedFileBase httpFile) + { + Guard.NotNull(httpFile, nameof(httpFile)); + + this._httpFile = httpFile; + + this.TimeStamp = DateTime.UtcNow; + this.BatchId = Guid.NewGuid(); + } + + public HttpPostedFileBase File => _httpFile; + + public DateTime TimeStamp + { + get; + private set; + } + + public Guid BatchId + { + get; + internal set; + } + + public string FileName + { + get + { + if (_fileName == null) + { + _fileName = Path.GetFileName(_httpFile.FileName); + } + return _fileName; + } + } + + public string FileTitle + { + get + { + if (_fileTitle == null) + { + _fileTitle = Path.GetFileNameWithoutExtension(this.FileName); + } + return _fileTitle; + } + } + + public string FileExtension + { + get + { + if (_fileExt == null) + { + _fileExt = Path.GetExtension(this.FileName).EmptyNull(); + } + return _fileExt; + } + } + + public string ContentType + { + get + { + if (_contentType == null) + { + var contentType = _httpFile.ContentType; + + if (contentType == null && this.FileExtension.HasValue()) + { + contentType = MimeTypes.MapNameToMimeType(this.FileExtension); + } + + _contentType = contentType.EmptyNull(); + } + return _contentType; + } + } + + public bool IsImage + { + get + { + if (!_isImage.HasValue) + { + _isImage = s_ImageTypes.IsMatch(FileExtension); + } + return _isImage.Value; + } + } + + public int Size => _httpFile.ContentLength; + + public Stream Stream => _httpFile.InputStream; + + public byte[] Buffer + { + get + { + if (_buffer == null) + { + _buffer = _httpFile.InputStream.ToByteArray(); + } + + return _buffer; + } + } + + public bool FileNameMatches(string pattern) + { + return Regex.IsMatch(_httpFile.FileName, pattern, RegexOptions.IgnoreCase | RegexOptions.Singleline); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/TagBuilderExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/TagBuilderExtensions.cs index e21d61de5e..17834cb11b 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/TagBuilderExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/TagBuilderExtensions.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Globalization; using System.Web.Mvc; diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs index 898e7a2923..dbcebdbc32 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs @@ -10,233 +10,233 @@ namespace SmartStore.Web.Framework { - [Serializable] - public class GridStateInfo - { - public GridStateInfo.GridState State { get; set; } - public string Path { get; set; } - - [Serializable] - public class GridState - { - public string Filter { get; set; } - public string GroupBy { get; set; } - public string OrderBy { get; set; } - public int Page { get; set; } - public int Size { get; set; } - } - } - - public static class TelerikExtensions - { - [SuppressMessage("ReSharper", "Mvc.AreaNotResolved")] - public static GridBuilder PreserveGridState(this GridBuilder builder) where T : class - { - var grid = builder.ToComponent(); - - if (!grid.DataBinding.Ajax.Enabled) - return builder; - - if (grid.Id.IsEmpty()) - throw new SmartException("A grid with preservable state must have a valid Id or Name"); - - var urlHelper = new UrlHelper(grid.ViewContext.RequestContext); - - var gridId = "GridState." + grid.Id + "__" + grid.ViewContext.RouteData.GenerateRouteIdentifier(); - - grid.AppendCssClass("grid-preservestate"); - grid.HtmlAttributes.Add("data-statepreserver-href", urlHelper.Action("SetGridState", "Common", new { area = "admin" })); - grid.HtmlAttributes.Add("data-statepreserver-key", gridId); - - // Try restore state from a previous request - var info = (GridStateInfo)grid.ViewContext.TempData[gridId]; - - if (info == null) - return builder; - - var state = info.State; - var command = GridCommand.Parse(state.Page, state.Size, state.OrderBy, state.GroupBy, state.Filter); - - if (grid.Paging.Enabled) - { - var pathChanged = !info.Path.Equals(grid.ViewContext.HttpContext.Request.RawUrl, StringComparison.OrdinalIgnoreCase); - if (!pathChanged) - { - if (command.PageSize > 0) - grid.Paging.PageSize = command.PageSize; - if (command.Page > 0) - grid.Paging.CurrentPage = command.Page; - } - } - - if (grid.Sorting.Enabled) - { - grid.Sorting.OrderBy.Clear(); - - foreach (var sort in command.SortDescriptors) - { - var existingSort = grid.Sorting.OrderBy.FirstOrDefault(x => x.Member.IsCaseInsensitiveEqual(sort.Member)); - if (existingSort != null) - { - grid.Sorting.OrderBy.Remove(existingSort); - } - grid.Sorting.OrderBy.Add(sort); - } - } - - if (grid.Grouping.Enabled) - { - grid.Grouping.Groups.Clear(); - - foreach (var group in command.GroupDescriptors) - { - var existingGroup = grid.Grouping.Groups.FirstOrDefault(x => x.Member.IsCaseInsensitiveEqual(group.Member)); - if (existingGroup != null) - { - grid.Grouping.Groups.Remove(existingGroup); - } - grid.Grouping.Groups.Add(group); - } - } - - if (grid.Filtering.Enabled) - { - grid.Filtering.Filters.Clear(); - - foreach (var filter in command.FilterDescriptors) - { - var compositeFilter = filter as CompositeFilterDescriptor; - if (compositeFilter == null) - { - compositeFilter = new CompositeFilterDescriptor { LogicalOperator = FilterCompositionLogicalOperator.And }; - compositeFilter.FilterDescriptors.Add(filter); - } - grid.Filtering.Filters.Add(compositeFilter); - } - } - - // persist again for the next request - grid.ViewContext.TempData[gridId] = info; - - return builder; - } - - public static IEnumerable ForCommand(this IEnumerable current, GridCommand command) - { - var query = current.AsQueryable() as IQueryable; - if (command.FilterDescriptors.Any()) - { - query = query.Where(command.FilterDescriptors.AsEnumerable()).AsQueryable() as IQueryable; - } - - IList temporarySortDescriptors = new List(); - - if (!command.SortDescriptors.Any() && query.Provider.IsEntityFrameworkProvider()) - { - // The Entity Framework provider demands OrderBy before calling Skip. - SortDescriptor sortDescriptor = new SortDescriptor - { - Member = GetFirstSortableProperty(query.ElementType) - }; - command.SortDescriptors.Add(sortDescriptor); - temporarySortDescriptors.Add(sortDescriptor); - } - - if (command.GroupDescriptors.Any()) - { - command.GroupDescriptors.Reverse().Each(groupDescriptor => - { - SortDescriptor sortDescriptor = new SortDescriptor - { - Member = groupDescriptor.Member, - SortDirection = groupDescriptor.SortDirection - }; - - command.SortDescriptors.Insert(0, sortDescriptor); - temporarySortDescriptors.Add(sortDescriptor); - }); - } - - if (command.SortDescriptors.Any()) - { - query = query.Sort(command.SortDescriptors); - } - - return query as IQueryable; - } - - public static IEnumerable PagedForCommand(this IEnumerable current, GridCommand command) - { - return current.Skip((command.Page - 1) * command.PageSize).Take(command.PageSize); - } - - - public static GridBoundColumnBuilder Centered(this GridBoundColumnBuilder columnBuilder) where T : class - { - return columnBuilder.HtmlAttributes(new { align = "center" }).HeaderHtmlAttributes(new { style = "text-align:center;" }); - } - - public static GridTemplateColumnBuilder Centered(this GridTemplateColumnBuilder columnBuilder) where T : class - { - return columnBuilder.HtmlAttributes(new { align = "center" }).HeaderHtmlAttributes(new { style = "text-align:center;" }); - } - - public static GridBoundColumnBuilder RightAlign(this GridBoundColumnBuilder columnBuilder) where T : class - { - return columnBuilder.HtmlAttributes(new { style = "text-align:right;" }).HeaderHtmlAttributes(new { style = "text-align:right;" }); - } - - public static GridTemplateColumnBuilder RightAlign(this GridTemplateColumnBuilder columnBuilder) where T : class - { - return columnBuilder.HtmlAttributes(new { style = "text-align:right;" }).HeaderHtmlAttributes(new { style = "text-align:right;" }); - } - - public static string GetValueFromAppliedFilter(this IFilterDescriptor filter, string valueName, FilterOperator? filterOperator = null) - { - if (filter is CompositeFilterDescriptor) - { - foreach (IFilterDescriptor childFilter in ((CompositeFilterDescriptor)filter).FilterDescriptors) - { - var val1 = GetValueFromAppliedFilter(childFilter, valueName, filterOperator); - if (!String.IsNullOrEmpty(val1)) - return val1; - } - } - else - { - var filterDescriptor = (FilterDescriptor)filter; - if (filterDescriptor != null && - filterDescriptor.Member.Equals(valueName, StringComparison.InvariantCultureIgnoreCase)) - { - if (!filterOperator.HasValue || filterDescriptor.Operator == filterOperator.Value) - return Convert.ToString(filterDescriptor.Value); - } - } - - return ""; - } - - public static string GetValueFromAppliedFilters(this IList filters, string valueName, FilterOperator? filterOperator = null) - { - foreach (var filter in filters) - { - var val1 = GetValueFromAppliedFilter(filter, valueName, filterOperator); - if (!String.IsNullOrEmpty(val1)) - return val1; - } - return ""; - } - - private static string GetFirstSortableProperty(Type type) - { - PropertyInfo firstSortableProperty = type.GetProperties().Where(property => property.PropertyType.IsPredefinedSimpleType()).FirstOrDefault(); - - if (firstSortableProperty == null) - { - throw new NotSupportedException("Cannot find property to sort by."); - } - - return firstSortableProperty.Name; - } - } + [Serializable] + public class GridStateInfo + { + public GridStateInfo.GridState State { get; set; } + public string Path { get; set; } + + [Serializable] + public class GridState + { + public string Filter { get; set; } + public string GroupBy { get; set; } + public string OrderBy { get; set; } + public int Page { get; set; } + public int Size { get; set; } + } + } + + public static class TelerikExtensions + { + [SuppressMessage("ReSharper", "Mvc.AreaNotResolved")] + public static GridBuilder PreserveGridState(this GridBuilder builder) where T : class + { + var grid = builder.ToComponent(); + + if (!grid.DataBinding.Ajax.Enabled) + return builder; + + if (grid.Id.IsEmpty()) + throw new SmartException("A grid with preservable state must have a valid Id or Name"); + + var urlHelper = new UrlHelper(grid.ViewContext.RequestContext); + + var gridId = "GridState." + grid.Id + "__" + grid.ViewContext.RouteData.GenerateRouteIdentifier(); + + grid.AppendCssClass("grid-preservestate"); + grid.HtmlAttributes.Add("data-statepreserver-href", urlHelper.Action("SetGridState", "Common", new { area = "admin" })); + grid.HtmlAttributes.Add("data-statepreserver-key", gridId); + + // Try restore state from a previous request + var info = (GridStateInfo)grid.ViewContext.TempData[gridId]; + + if (info == null) + return builder; + + var state = info.State; + var command = GridCommand.Parse(state.Page, state.Size, state.OrderBy, state.GroupBy, state.Filter); + + if (grid.Paging.Enabled) + { + var pathChanged = !info.Path.Equals(grid.ViewContext.HttpContext.Request.RawUrl, StringComparison.OrdinalIgnoreCase); + if (!pathChanged) + { + if (command.PageSize > 0) + grid.Paging.PageSize = command.PageSize; + if (command.Page > 0) + grid.Paging.CurrentPage = command.Page; + } + } + + if (grid.Sorting.Enabled) + { + grid.Sorting.OrderBy.Clear(); + + foreach (var sort in command.SortDescriptors) + { + var existingSort = grid.Sorting.OrderBy.FirstOrDefault(x => x.Member.IsCaseInsensitiveEqual(sort.Member)); + if (existingSort != null) + { + grid.Sorting.OrderBy.Remove(existingSort); + } + grid.Sorting.OrderBy.Add(sort); + } + } + + if (grid.Grouping.Enabled) + { + grid.Grouping.Groups.Clear(); + + foreach (var group in command.GroupDescriptors) + { + var existingGroup = grid.Grouping.Groups.FirstOrDefault(x => x.Member.IsCaseInsensitiveEqual(group.Member)); + if (existingGroup != null) + { + grid.Grouping.Groups.Remove(existingGroup); + } + grid.Grouping.Groups.Add(group); + } + } + + if (grid.Filtering.Enabled) + { + grid.Filtering.Filters.Clear(); + + foreach (var filter in command.FilterDescriptors) + { + var compositeFilter = filter as CompositeFilterDescriptor; + if (compositeFilter == null) + { + compositeFilter = new CompositeFilterDescriptor { LogicalOperator = FilterCompositionLogicalOperator.And }; + compositeFilter.FilterDescriptors.Add(filter); + } + grid.Filtering.Filters.Add(compositeFilter); + } + } + + // persist again for the next request + grid.ViewContext.TempData[gridId] = info; + + return builder; + } + + public static IEnumerable ForCommand(this IEnumerable current, GridCommand command) + { + var query = current.AsQueryable() as IQueryable; + if (command.FilterDescriptors.Any()) + { + query = query.Where(command.FilterDescriptors.AsEnumerable()).AsQueryable() as IQueryable; + } + + IList temporarySortDescriptors = new List(); + + if (!command.SortDescriptors.Any() && query.Provider.IsEntityFrameworkProvider()) + { + // The Entity Framework provider demands OrderBy before calling Skip. + SortDescriptor sortDescriptor = new SortDescriptor + { + Member = GetFirstSortableProperty(query.ElementType) + }; + command.SortDescriptors.Add(sortDescriptor); + temporarySortDescriptors.Add(sortDescriptor); + } + + if (command.GroupDescriptors.Any()) + { + command.GroupDescriptors.Reverse().Each(groupDescriptor => + { + SortDescriptor sortDescriptor = new SortDescriptor + { + Member = groupDescriptor.Member, + SortDirection = groupDescriptor.SortDirection + }; + + command.SortDescriptors.Insert(0, sortDescriptor); + temporarySortDescriptors.Add(sortDescriptor); + }); + } + + if (command.SortDescriptors.Any()) + { + query = query.Sort(command.SortDescriptors); + } + + return query as IQueryable; + } + + public static IEnumerable PagedForCommand(this IEnumerable current, GridCommand command) + { + return current.Skip((command.Page - 1) * command.PageSize).Take(command.PageSize); + } + + + public static GridBoundColumnBuilder Centered(this GridBoundColumnBuilder columnBuilder) where T : class + { + return columnBuilder.HtmlAttributes(new { align = "center" }).HeaderHtmlAttributes(new { style = "text-align:center;" }); + } + + public static GridTemplateColumnBuilder Centered(this GridTemplateColumnBuilder columnBuilder) where T : class + { + return columnBuilder.HtmlAttributes(new { align = "center" }).HeaderHtmlAttributes(new { style = "text-align:center;" }); + } + + public static GridBoundColumnBuilder RightAlign(this GridBoundColumnBuilder columnBuilder) where T : class + { + return columnBuilder.HtmlAttributes(new { style = "text-align:right;" }).HeaderHtmlAttributes(new { style = "text-align:right;" }); + } + + public static GridTemplateColumnBuilder RightAlign(this GridTemplateColumnBuilder columnBuilder) where T : class + { + return columnBuilder.HtmlAttributes(new { style = "text-align:right;" }).HeaderHtmlAttributes(new { style = "text-align:right;" }); + } + + public static string GetValueFromAppliedFilter(this IFilterDescriptor filter, string valueName, FilterOperator? filterOperator = null) + { + if (filter is CompositeFilterDescriptor) + { + foreach (IFilterDescriptor childFilter in ((CompositeFilterDescriptor)filter).FilterDescriptors) + { + var val1 = GetValueFromAppliedFilter(childFilter, valueName, filterOperator); + if (!String.IsNullOrEmpty(val1)) + return val1; + } + } + else + { + var filterDescriptor = (FilterDescriptor)filter; + if (filterDescriptor != null && + filterDescriptor.Member.Equals(valueName, StringComparison.InvariantCultureIgnoreCase)) + { + if (!filterOperator.HasValue || filterDescriptor.Operator == filterOperator.Value) + return Convert.ToString(filterDescriptor.Value); + } + } + + return ""; + } + + public static string GetValueFromAppliedFilters(this IList filters, string valueName, FilterOperator? filterOperator = null) + { + foreach (var filter in filters) + { + var val1 = GetValueFromAppliedFilter(filter, valueName, filterOperator); + if (!String.IsNullOrEmpty(val1)) + return val1; + } + return ""; + } + + private static string GetFirstSortableProperty(Type type) + { + PropertyInfo firstSortableProperty = type.GetProperties().Where(property => property.PropertyType.IsPredefinedSimpleType()).FirstOrDefault(); + + if (firstSortableProperty == null) + { + throw new NotSupportedException("Cannot find property to sort by."); + } + + return firstSortableProperty.Name; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs index 5a15d51207..e88283e4f3 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs @@ -16,7 +16,7 @@ public static string LogOn(this UrlHelper urlHelper, string returnUrl) return urlHelper.Action("Login", "Customer", new { returnUrl, area = "" }); } - return urlHelper.Action("Login", "Customer", new { area = "" }); + return urlHelper.Action("Login", "Customer", new { area = "" }); } public static string LogOff(this UrlHelper urlHelper, string returnUrl) @@ -26,134 +26,134 @@ public static string LogOff(this UrlHelper urlHelper, string returnUrl) return urlHelper.Action("Logout", "Customer", new { returnUrl, area = "" }); } - return urlHelper.Action("Logout", "Customer", new { area = "" }); + return urlHelper.Action("Logout", "Customer", new { area = "" }); } - public static string Referrer(this UrlHelper urlHelper, string fallbackUrl = "") - { - var request = urlHelper.RequestContext.HttpContext.Request; - if (request.UrlReferrer != null && request.UrlReferrer.ToString().HasValue()) - { - return request.UrlReferrer.ToString(); - } - - return fallbackUrl; - } - - /// - /// Resolves a link to a topic page. - /// - /// The system name of the topic. - /// Link - /// - /// This method returns an empty string in following cases: - /// - the requested page does not exist. - /// - the current user has no permission to acces the page. - /// - public static string Topic(this UrlHelper urlHelper, string systemName, bool popup = false) - { - Guard.NotEmpty(systemName, nameof(systemName)); - - var expression = "topic:" + systemName; - if (popup) - { - expression += "?popup=true"; - } - - return Entity(urlHelper, expression); - } - - /// - /// Resolves a link label for a topic page. - /// The label is either the page short title or title. - /// - /// The system name of the topic. - /// Label - /// - /// This method returns an empty string if the requested page does not exist. - /// - public static string TopicLabel(this UrlHelper urlHelper, string systemName) - { - Guard.NotEmpty(systemName, nameof(systemName)); - - return EntityLabel(urlHelper, "topic:" + systemName); - } - - /// - /// Resolves a link to a system internal entity like product, topic, category or manufacturer. - /// - /// A link expression as supported by the - /// Link - /// - /// This method returns an empty string in following cases: - /// - the requested entity does not exist. - /// - the current user has no permission to acces the entity. - /// - public static string Entity(this UrlHelper urlHelper, string expression) - { - Guard.NotEmpty(expression, nameof(expression)); - - var linkResolver = EngineContext.Current.Resolve(); - var link = linkResolver.Resolve(expression); - - if (link.Status == LinkStatus.Ok) - { - return link.Link.EmptyNull(); - } - - return string.Empty; - } - - /// - /// Resolves a link label for a system internal entity like product, topic, category or manufacturer. - /// The label is either the entity short title, title or name, whichever is applicable. - /// - /// A link expression as supported by the - /// Label - /// - /// This method returns an empty string if the requested entity does not exist. - /// - public static string EntityLabel(this UrlHelper urlHelper, string expression) - { - Guard.NotEmpty(expression, nameof(expression)); - - var linkResolver = EngineContext.Current.Resolve(); - var link = linkResolver.Resolve(expression); - - if (link.Status == LinkStatus.Ok || link.Status == LinkStatus.Forbidden) - { - return link.Label; - } - - return string.Empty; - } - - #region Media - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string Media(this UrlHelper urlHelper, int? fileId, int thumbnailSize = 0, string host = null, bool doFallback = true) - { - return EngineContext.Current.Resolve().GetUrl(fileId, thumbnailSize, host, doFallback); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string Media(this UrlHelper urlHelper, MediaFileInfo file, int thumbnailSize = 0, string host = null, bool doFallback = true) - { - return EngineContext.Current.Resolve().GetUrl(file, thumbnailSize, host, doFallback); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string Media(this UrlHelper urlHelper, int? fileId, ProcessImageQuery query, string host = null, bool doFallback = true) - { - return EngineContext.Current.Resolve().GetUrl(fileId, query, host, doFallback); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string Media(this UrlHelper urlHelper, MediaFileInfo file, ProcessImageQuery query, string host = null, bool doFallback = true) - { - return EngineContext.Current.Resolve().GetUrl(file, query, host, doFallback); - } - - #endregion - } + public static string Referrer(this UrlHelper urlHelper, string fallbackUrl = "") + { + var request = urlHelper.RequestContext.HttpContext.Request; + if (request.UrlReferrer != null && request.UrlReferrer.ToString().HasValue()) + { + return request.UrlReferrer.ToString(); + } + + return fallbackUrl; + } + + /// + /// Resolves a link to a topic page. + /// + /// The system name of the topic. + /// Link + /// + /// This method returns an empty string in following cases: + /// - the requested page does not exist. + /// - the current user has no permission to acces the page. + /// + public static string Topic(this UrlHelper urlHelper, string systemName, bool popup = false) + { + Guard.NotEmpty(systemName, nameof(systemName)); + + var expression = "topic:" + systemName; + if (popup) + { + expression += "?popup=true"; + } + + return Entity(urlHelper, expression); + } + + /// + /// Resolves a link label for a topic page. + /// The label is either the page short title or title. + /// + /// The system name of the topic. + /// Label + /// + /// This method returns an empty string if the requested page does not exist. + /// + public static string TopicLabel(this UrlHelper urlHelper, string systemName) + { + Guard.NotEmpty(systemName, nameof(systemName)); + + return EntityLabel(urlHelper, "topic:" + systemName); + } + + /// + /// Resolves a link to a system internal entity like product, topic, category or manufacturer. + /// + /// A link expression as supported by the + /// Link + /// + /// This method returns an empty string in following cases: + /// - the requested entity does not exist. + /// - the current user has no permission to acces the entity. + /// + public static string Entity(this UrlHelper urlHelper, string expression) + { + Guard.NotEmpty(expression, nameof(expression)); + + var linkResolver = EngineContext.Current.Resolve(); + var link = linkResolver.Resolve(expression); + + if (link.Status == LinkStatus.Ok) + { + return link.Link.EmptyNull(); + } + + return string.Empty; + } + + /// + /// Resolves a link label for a system internal entity like product, topic, category or manufacturer. + /// The label is either the entity short title, title or name, whichever is applicable. + /// + /// A link expression as supported by the + /// Label + /// + /// This method returns an empty string if the requested entity does not exist. + /// + public static string EntityLabel(this UrlHelper urlHelper, string expression) + { + Guard.NotEmpty(expression, nameof(expression)); + + var linkResolver = EngineContext.Current.Resolve(); + var link = linkResolver.Resolve(expression); + + if (link.Status == LinkStatus.Ok || link.Status == LinkStatus.Forbidden) + { + return link.Label; + } + + return string.Empty; + } + + #region Media + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static string Media(this UrlHelper urlHelper, int? fileId, int thumbnailSize = 0, string host = null, bool doFallback = true) + { + return EngineContext.Current.Resolve().GetUrl(fileId, thumbnailSize, host, doFallback); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static string Media(this UrlHelper urlHelper, MediaFileInfo file, int thumbnailSize = 0, string host = null, bool doFallback = true) + { + return EngineContext.Current.Resolve().GetUrl(file, thumbnailSize, host, doFallback); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static string Media(this UrlHelper urlHelper, int? fileId, ProcessImageQuery query, string host = null, bool doFallback = true) + { + return EngineContext.Current.Resolve().GetUrl(fileId, query, host, doFallback); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static string Media(this UrlHelper urlHelper, MediaFileInfo file, ProcessImageQuery query, string host = null, bool doFallback = true) + { + return EngineContext.Current.Resolve().GetUrl(file, query, host, doFallback); + } + + #endregion + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs index 34d50eb997..ed1663b5be 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs @@ -1,5 +1,4 @@ using System; -using System.Web; using System.Web.Mvc; using SmartStore.Core; using SmartStore.Services.Affiliates; @@ -9,11 +8,11 @@ namespace SmartStore.Web.Framework.Filters { public class CheckAffiliateAttribute : FilterAttribute, IActionFilter { - public Lazy AffiliateService { get; set; } - public Lazy WorkContext { get; set; } - public Lazy CustomerService { get; set; } - - public virtual void OnActionExecuting(ActionExecutingContext filterContext) + public Lazy AffiliateService { get; set; } + public Lazy WorkContext { get; set; } + public Lazy CustomerService { get; set; } + + public virtual void OnActionExecuting(ActionExecutingContext filterContext) { if (filterContext?.HttpContext?.Request == null) return; @@ -35,16 +34,16 @@ public virtual void OnActionExecuting(ActionExecutingContext filterContext) var customer = WorkContext.Value.CurrentCustomer; if (customer != null && !customer.IsSystemAccount && customer.AffiliateId != affiliate.Id) { - customer.AffiliateId = affiliate.Id; - CustomerService.Value.UpdateCustomer(customer); + customer.AffiliateId = affiliate.Id; + CustomerService.Value.UpdateCustomer(customer); } } } } } - public virtual void OnActionExecuted(ActionExecutedContext filterContext) - { - } - } + public virtual void OnActionExecuted(ActionExecutedContext filterContext) + { + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs index 9f568db703..6ce3ae8ce2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs @@ -1,32 +1,31 @@ using System.IO.Compression; -using System.Web; using System.Web.Mvc; namespace SmartStore.Web.Framework.Filters { - public class CompressAttribute : ActionFilterAttribute - { - public bool PreferDeflate { get; set; } + public class CompressAttribute : ActionFilterAttribute + { + public bool PreferDeflate { get; set; } - public override void OnActionExecuting(ActionExecutingContext filterContext) - { - var response = filterContext.HttpContext.Response; - var acceptEncoding = filterContext.HttpContext.Request.Headers["Accept-Encoding"].EmptyNull().ToLower(); + public override void OnActionExecuting(ActionExecutingContext filterContext) + { + var response = filterContext.HttpContext.Response; + var acceptEncoding = filterContext.HttpContext.Request.Headers["Accept-Encoding"].EmptyNull().ToLower(); - if (acceptEncoding.Contains("gzip") && !(PreferDeflate && acceptEncoding.Contains("deflate"))) - { - response.Filter = new GZipStream(response.Filter, CompressionMode.Compress); - response.Headers.Remove("Content-Encoding"); - response.AppendHeader("Content-Encoding", "gzip"); - } - else if (acceptEncoding.Contains("deflate")) - { - response.Filter = new DeflateStream(response.Filter, CompressionMode.Compress); - response.Headers.Remove("Content-Encoding"); - response.AppendHeader("Content-Encoding", "deflate"); - } + if (acceptEncoding.Contains("gzip") && !(PreferDeflate && acceptEncoding.Contains("deflate"))) + { + response.Filter = new GZipStream(response.Filter, CompressionMode.Compress); + response.Headers.Remove("Content-Encoding"); + response.AppendHeader("Content-Encoding", "gzip"); + } + else if (acceptEncoding.Contains("deflate")) + { + response.Filter = new DeflateStream(response.Filter, CompressionMode.Compress); + response.Headers.Remove("Content-Encoding"); + response.AppendHeader("Content-Encoding", "deflate"); + } - response.AppendHeader("Vary", "Content-Encoding"); - } - } + response.AppendHeader("Vary", "Content-Encoding"); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs index 46f7ef511f..ca99c83119 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs @@ -1,5 +1,4 @@ using System; -using System.Web; using System.Web.Mvc; using Newtonsoft.Json; using SmartStore.Core.Domain.Customers; @@ -10,160 +9,160 @@ namespace SmartStore.Web.Framework.Filters { - public class CookieConsentFilter : IActionFilter, IResultFilter - { - private readonly IUserAgent _userAgent; - private readonly ICommonServices _services; - private readonly Lazy _widgetProvider; - private readonly PrivacySettings _privacySettings; - private readonly ICookieManager _cookieManager; - - private bool _isProcessableRequest; - - public CookieConsentFilter( - IUserAgent userAgent, - ICommonServices services, - Lazy widgetProvider, - PrivacySettings privacySettings, - ICookieManager cookieManager) - { - _userAgent = userAgent; - _services = services; - _widgetProvider = widgetProvider; - _privacySettings = privacySettings; - _cookieManager = cookieManager; - } - - private bool IsProcessableRequest(ControllerContext controllerContext) - { - if (!_privacySettings.EnableCookieConsent) - return false; - - if (controllerContext.IsChildAction) - return false; - - var request = controllerContext.HttpContext?.Request; - - if (request == null) - return false; - - if (request.IsAjaxRequest()) - return false; - - if (!String.Equals(request.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)) - return false; - - return true; - } - - public void OnActionExecuting(ActionExecutingContext filterContext) - { - _isProcessableRequest = IsProcessableRequest(filterContext); - - if (!_isProcessableRequest) - return; - - var isLegacy = false; - var request = filterContext.HttpContext.Request; - var response = filterContext.HttpContext.Response; - ConsentCookie cookieData = null; - - // Check if the user has a consent cookie. - var consentCookie = request.Cookies["CookieConsent"]; - if (consentCookie == null) - { - // No consent cookie. We first check the Do Not Track header value, this can have the value "0" or "1" - var doNotTrack = request.Headers.Get("DNT"); - - // If we receive a DNT header, we accept its value (0 = give consent, 1 = deny) and do not ask the user anymore. - if (doNotTrack.HasValue()) - { - if (doNotTrack.Equals("0")) - { - // Tracking consented. - _cookieManager.SetConsentCookie(response, true, true); - } - else - { - // Tracking denied. - _cookieManager.SetConsentCookie(response, false, false); - } - } - else - { - if (_userAgent.IsBot) - { - // Don't ask consent from search engines, also don't set cookies. - _cookieManager.SetConsentCookie(response, true, true); - } - else - { - // First request on the site and no DNT header (we could use session cookie, which is allowed by EU cookie law). - // Don't set cookie! - } - } - } - else - { - // We received a consent cookie - try - { - cookieData = JsonConvert.DeserializeObject(consentCookie.Value); - } - catch { } - - if (cookieData == null) - { - // Cookie was found but could not be converted thus it's a legacy cookie. - isLegacy = true; - var str = consentCookie.Value; - - // 'asked' means customer has not consented. - // '2' was the Value of legacy enum CookieConsentStatus.Denied - if (str.Equals("asked") || str.Equals("2")) - { - // Remove legacy Cookie & thus show CookieManager. - request.Cookies.Remove("CookieConsent"); - } - // 'true' means consented to all cookies. - // '1' was the Value of legacy enum CookieConsentStatus.Consented - else if (str.Equals("true") || str.Equals("1")) - { - // Set Cookie with all types allowed. - _cookieManager.SetConsentCookie(response, true, true); - } - } - } - - if (!isLegacy) - { - filterContext.HttpContext.Items["CookieConsent"] = cookieData; - } - } - - public void OnActionExecuted(ActionExecutedContext filterContext) - { - } - - public void OnResultExecuting(ResultExecutingContext filterContext) - { - if (!_isProcessableRequest) - return; - - // Should only run on a full view rendering result or HTML ContentResult. - if (!filterContext.Result.IsHtmlViewResult()) - return; - - // Always render the child action because of output caching. - _widgetProvider.Value.RegisterAction( - new[] { "body_end_html_tag_before" }, - "CookieManager", - "Common", - new { area = "" }); - } - - public void OnResultExecuted(ResultExecutedContext filterContext) - { - } - } + public class CookieConsentFilter : IActionFilter, IResultFilter + { + private readonly IUserAgent _userAgent; + private readonly ICommonServices _services; + private readonly Lazy _widgetProvider; + private readonly PrivacySettings _privacySettings; + private readonly ICookieManager _cookieManager; + + private bool _isProcessableRequest; + + public CookieConsentFilter( + IUserAgent userAgent, + ICommonServices services, + Lazy widgetProvider, + PrivacySettings privacySettings, + ICookieManager cookieManager) + { + _userAgent = userAgent; + _services = services; + _widgetProvider = widgetProvider; + _privacySettings = privacySettings; + _cookieManager = cookieManager; + } + + private bool IsProcessableRequest(ControllerContext controllerContext) + { + if (!_privacySettings.EnableCookieConsent) + return false; + + if (controllerContext.IsChildAction) + return false; + + var request = controllerContext.HttpContext?.Request; + + if (request == null) + return false; + + if (request.IsAjaxRequest()) + return false; + + if (!String.Equals(request.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)) + return false; + + return true; + } + + public void OnActionExecuting(ActionExecutingContext filterContext) + { + _isProcessableRequest = IsProcessableRequest(filterContext); + + if (!_isProcessableRequest) + return; + + var isLegacy = false; + var request = filterContext.HttpContext.Request; + var response = filterContext.HttpContext.Response; + ConsentCookie cookieData = null; + + // Check if the user has a consent cookie. + var consentCookie = request.Cookies["CookieConsent"]; + if (consentCookie == null) + { + // No consent cookie. We first check the Do Not Track header value, this can have the value "0" or "1" + var doNotTrack = request.Headers.Get("DNT"); + + // If we receive a DNT header, we accept its value (0 = give consent, 1 = deny) and do not ask the user anymore. + if (doNotTrack.HasValue()) + { + if (doNotTrack.Equals("0")) + { + // Tracking consented. + _cookieManager.SetConsentCookie(response, true, true); + } + else + { + // Tracking denied. + _cookieManager.SetConsentCookie(response, false, false); + } + } + else + { + if (_userAgent.IsBot) + { + // Don't ask consent from search engines, also don't set cookies. + _cookieManager.SetConsentCookie(response, true, true); + } + else + { + // First request on the site and no DNT header (we could use session cookie, which is allowed by EU cookie law). + // Don't set cookie! + } + } + } + else + { + // We received a consent cookie + try + { + cookieData = JsonConvert.DeserializeObject(consentCookie.Value); + } + catch { } + + if (cookieData == null) + { + // Cookie was found but could not be converted thus it's a legacy cookie. + isLegacy = true; + var str = consentCookie.Value; + + // 'asked' means customer has not consented. + // '2' was the Value of legacy enum CookieConsentStatus.Denied + if (str.Equals("asked") || str.Equals("2")) + { + // Remove legacy Cookie & thus show CookieManager. + request.Cookies.Remove("CookieConsent"); + } + // 'true' means consented to all cookies. + // '1' was the Value of legacy enum CookieConsentStatus.Consented + else if (str.Equals("true") || str.Equals("1")) + { + // Set Cookie with all types allowed. + _cookieManager.SetConsentCookie(response, true, true); + } + } + } + + if (!isLegacy) + { + filterContext.HttpContext.Items["CookieConsent"] = cookieData; + } + } + + public void OnActionExecuted(ActionExecutedContext filterContext) + { + } + + public void OnResultExecuting(ResultExecutingContext filterContext) + { + if (!_isProcessableRequest) + return; + + // Should only run on a full view rendering result or HTML ContentResult. + if (!filterContext.Result.IsHtmlViewResult()) + return; + + // Always render the child action because of output caching. + _widgetProvider.Value.RegisterAction( + new[] { "body_end_html_tag_before" }, + "CookieManager", + "Common", + new { area = "" }); + } + + public void OnResultExecuted(ResultExecutedContext filterContext) + { + } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs index 60ed2a7f90..8d797b1dcd 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs @@ -8,10 +8,10 @@ namespace SmartStore.Web.Framework.Filters { public class CustomerLastActivityAttribute : FilterAttribute, IActionFilter { - public Lazy WorkContext { get; set; } - public Lazy CustomerService { get; set; } - - public virtual void OnActionExecuting(ActionExecutingContext filterContext) + public Lazy WorkContext { get; set; } + public Lazy CustomerService { get; set; } + + public virtual void OnActionExecuting(ActionExecutingContext filterContext) { if (!DataSettings.DatabaseIsInstalled()) return; @@ -26,17 +26,17 @@ public virtual void OnActionExecuting(ActionExecutingContext filterContext) return; var customer = WorkContext.Value.CurrentCustomer; - + // update last activity date if (!customer.IsSystemAccount && customer.LastActivityDateUtc.AddMinutes(1.0) < DateTime.UtcNow) { customer.LastActivityDateUtc = DateTime.UtcNow; - CustomerService.Value.UpdateCustomer(customer); + CustomerService.Value.UpdateCustomer(customer); } } - public virtual void OnActionExecuted(ActionExecutedContext filterContext) - { - } - } + public virtual void OnActionExecuted(ActionExecutedContext filterContext) + { + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/FormValueRequiredAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/FormValueRequiredAttribute.cs index c0a759a5c5..e24540ab11 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/FormValueRequiredAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/FormValueRequiredAttribute.cs @@ -7,125 +7,125 @@ namespace SmartStore.Web.Framework.Filters { - - public class FormValueRequiredAttribute : ActionMethodSelectorAttribute + + public class FormValueRequiredAttribute : ActionMethodSelectorAttribute { private readonly string[] _submitButtonNames; private readonly FormValueRequirement _requirement; - private readonly FormValueRequirementRule _rule; - private readonly bool _inverse; + private readonly FormValueRequirementRule _rule; + private readonly bool _inverse; - public FormValueRequiredAttribute(params string[] submitButtonNames): + public FormValueRequiredAttribute(params string[] submitButtonNames) : this(FormValueRequirement.Equal, FormValueRequirementRule.MatchAny, false, submitButtonNames) { } public FormValueRequiredAttribute(FormValueRequirement requirement, params string[] submitButtonNames) - : this(requirement, FormValueRequirementRule.MatchAny, false, submitButtonNames) + : this(requirement, FormValueRequirementRule.MatchAny, false, submitButtonNames) + { + } + + public FormValueRequiredAttribute(FormValueRequirementRule rule, params string[] submitButtonNames) + : this(FormValueRequirement.Equal, rule, false, submitButtonNames) + { + } + + public FormValueRequiredAttribute(FormValueRequirement requirement, FormValueRequirementRule rule, params string[] submitButtonNames) + : this(requirement, rule, false, submitButtonNames) { } - public FormValueRequiredAttribute(FormValueRequirementRule rule, params string[] submitButtonNames) - : this(FormValueRequirement.Equal, rule, false, submitButtonNames) - { - } - - public FormValueRequiredAttribute(FormValueRequirement requirement, FormValueRequirementRule rule, params string[] submitButtonNames) - : this(requirement, rule, false, submitButtonNames) - { - } - - protected internal FormValueRequiredAttribute( - FormValueRequirement requirement, - FormValueRequirementRule rule, - bool inverse, - params string[] submitButtonNames) - { - // at least one submit button should be found (or being absent if 'inverse') - this._submitButtonNames = submitButtonNames; - this._requirement = requirement; - this._rule = rule; - this._inverse = inverse; - } + protected internal FormValueRequiredAttribute( + FormValueRequirement requirement, + FormValueRequirementRule rule, + bool inverse, + params string[] submitButtonNames) + { + // at least one submit button should be found (or being absent if 'inverse') + this._submitButtonNames = submitButtonNames; + this._requirement = requirement; + this._rule = rule; + this._inverse = inverse; + } public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) { - return IsValidForRequest(controllerContext.HttpContext.Request.Form); - } - - protected internal virtual bool IsValidForRequest(NameValueCollection form) - { - try - { - bool isMatch = false; - if (_rule == FormValueRequirementRule.MatchAny) - { - isMatch = _submitButtonNames.Any(x => IsMatch(form, x)); - } - else - { - isMatch = _submitButtonNames.All(x => IsMatch(form, x)); - } - return isMatch; - } - catch (Exception ex) - { - Debug.WriteLine(ex.Message); - } - - return false; - } - - private bool IsMatch(NameValueCollection form, string key) - { - string value = ""; - - if (_requirement == FormValueRequirement.Equal) - { - // do not iterate because "Invalid request" exception can be thrown - value = form[key]; - } - else - { - var firstMatch = form.AllKeys.FirstOrDefault(x => x.StartsWith(key, StringComparison.InvariantCultureIgnoreCase)); - if (firstMatch != null) - { - value = form[firstMatch]; - } - } - - if (_inverse) - { - return value.IsEmpty(); - } - - return value.HasValue(); - } + return IsValidForRequest(controllerContext.HttpContext.Request.Form); + } + + protected internal virtual bool IsValidForRequest(NameValueCollection form) + { + try + { + bool isMatch = false; + if (_rule == FormValueRequirementRule.MatchAny) + { + isMatch = _submitButtonNames.Any(x => IsMatch(form, x)); + } + else + { + isMatch = _submitButtonNames.All(x => IsMatch(form, x)); + } + return isMatch; + } + catch (Exception ex) + { + Debug.WriteLine(ex.Message); + } + + return false; + } + + private bool IsMatch(NameValueCollection form, string key) + { + string value = ""; + + if (_requirement == FormValueRequirement.Equal) + { + // do not iterate because "Invalid request" exception can be thrown + value = form[key]; + } + else + { + var firstMatch = form.AllKeys.FirstOrDefault(x => x.StartsWith(key, StringComparison.InvariantCultureIgnoreCase)); + if (firstMatch != null) + { + value = form[firstMatch]; + } + } + + if (_inverse) + { + return value.IsEmpty(); + } + + return value.HasValue(); + } } - [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] - public class FormValueAbsentAttribute : FormValueRequiredAttribute - { - public FormValueAbsentAttribute(params string[] submitButtonNames): + [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] + public class FormValueAbsentAttribute : FormValueRequiredAttribute + { + public FormValueAbsentAttribute(params string[] submitButtonNames) : base(FormValueRequirement.Equal, FormValueRequirementRule.MatchAny, true, submitButtonNames) { } - public FormValueAbsentAttribute(FormValueRequirement requirement, params string[] submitButtonNames) - : base(requirement, FormValueRequirementRule.MatchAny, true, submitButtonNames) + public FormValueAbsentAttribute(FormValueRequirement requirement, params string[] submitButtonNames) + : base(requirement, FormValueRequirementRule.MatchAny, true, submitButtonNames) { } - public FormValueAbsentAttribute(FormValueRequirementRule rule, params string[] submitButtonNames) - : base(FormValueRequirement.Equal, rule, true, submitButtonNames) - { - } + public FormValueAbsentAttribute(FormValueRequirementRule rule, params string[] submitButtonNames) + : base(FormValueRequirement.Equal, rule, true, submitButtonNames) + { + } - public FormValueAbsentAttribute(FormValueRequirement requirement, FormValueRequirementRule rule, params string[] submitButtonNames) - : base(requirement, rule, true, submitButtonNames) - { - } - } + public FormValueAbsentAttribute(FormValueRequirement requirement, FormValueRequirementRule rule, params string[] submitButtonNames) + : base(requirement, rule, true, submitButtonNames) + { + } + } public enum FormValueRequirement { @@ -133,9 +133,9 @@ public enum FormValueRequirement StartsWith } - public enum FormValueRequirementRule - { - MatchAny, - MatchAll - } + public enum FormValueRequirementRule + { + MatchAny, + MatchAll + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs index b76bf74857..a15a40a478 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs @@ -1,102 +1,100 @@ -using SmartStore.Core; +using System; +using System.Web.Mvc; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Logging; using SmartStore.Services; using SmartStore.Services.Common; using SmartStore.Web.Framework.UI; -using System; -using System.Web.Mvc; -using System.Web.Routing; namespace SmartStore.Web.Framework.Filters { - public class GdprConsentAttribute : FilterAttribute, IActionFilter, IResultFilter - { - public Lazy Services { get; set; } - public Lazy PrivacySettings { get; set; } - public Lazy GenericAttributeService { get; set; } - public Lazy WidgetProvider { get; set; } - public Lazy Notifier { get; set; } - - public void OnActionExecuting(ActionExecutingContext filterContext) - { - if (!PrivacySettings.Value.DisplayGdprConsentOnForms) - return; - - if (filterContext?.ActionDescriptor == null || filterContext?.HttpContext?.Request == null) - return; - - if (filterContext.HttpContext.Request.HttpMethod.Equals("GET")) - return; - - var customer = Services.Value.WorkContext.CurrentCustomer; - var hasConsentedToGdpr = filterContext.HttpContext.Request.Form["GdprConsent"]; - - if (filterContext.HttpContext.Request.HttpMethod.Equals("POST") && hasConsentedToGdpr.HasValue()) - { - // set flag which can be accessed in corresponding action - filterContext.Controller.ViewData.Add("GdprConsent", hasConsentedToGdpr.Contains("true")); - - if (hasConsentedToGdpr.Contains("true")) - { - GenericAttributeService.Value.SaveAttribute(customer, SystemCustomerAttributeNames.HasConsentedToGdpr, true); - } - else - { - if (!filterContext.HttpContext.Request.IsAjaxRequest()) - { - // add a validation message - filterContext.Controller.ViewData.ModelState.AddModelError("", Services.Value.Localization.GetResource("Gdpr.Consent.ValidationMessage")); - } - else - { - // notify - Notifier.Value.Error(Services.Value.Localization.GetResource("Gdpr.Consent.ValidationMessage")); - } - - return; - } - } - } - - public void OnActionExecuted(ActionExecutedContext filterContext) - { - } - - public void OnResultExecuting(ResultExecutingContext filterContext) - { - if (!PrivacySettings.Value.DisplayGdprConsentOnForms) - return; - - if (filterContext.HttpContext.Items.Contains("GdprConsentRendered")) - return; - - var result = filterContext.Result; - - // should only run on a full view rendering result or HTML ContentResult - if (!result.IsHtmlViewResult()) - return; - - if (!filterContext.IsChildAction) - { - WidgetProvider.Value.RegisterAction( - new[] { "gdpr_consent" }, - "GdprConsent", - "Common", - new { area = "", isSmall = false }); - } - - WidgetProvider.Value.RegisterAction( - new[] { "gdpr_consent_small" }, - "GdprConsent", - "Common", - new { area = "", isSmall = true }); - - filterContext.HttpContext.Items["GdprConsentRendered"] = true; - } - - public void OnResultExecuted(ResultExecutedContext filterContext) - { - } - } + public class GdprConsentAttribute : FilterAttribute, IActionFilter, IResultFilter + { + public Lazy Services { get; set; } + public Lazy PrivacySettings { get; set; } + public Lazy GenericAttributeService { get; set; } + public Lazy WidgetProvider { get; set; } + public Lazy Notifier { get; set; } + + public void OnActionExecuting(ActionExecutingContext filterContext) + { + if (!PrivacySettings.Value.DisplayGdprConsentOnForms) + return; + + if (filterContext?.ActionDescriptor == null || filterContext?.HttpContext?.Request == null) + return; + + if (filterContext.HttpContext.Request.HttpMethod.Equals("GET")) + return; + + var customer = Services.Value.WorkContext.CurrentCustomer; + var hasConsentedToGdpr = filterContext.HttpContext.Request.Form["GdprConsent"]; + + if (filterContext.HttpContext.Request.HttpMethod.Equals("POST") && hasConsentedToGdpr.HasValue()) + { + // set flag which can be accessed in corresponding action + filterContext.Controller.ViewData.Add("GdprConsent", hasConsentedToGdpr.Contains("true")); + + if (hasConsentedToGdpr.Contains("true")) + { + GenericAttributeService.Value.SaveAttribute(customer, SystemCustomerAttributeNames.HasConsentedToGdpr, true); + } + else + { + if (!filterContext.HttpContext.Request.IsAjaxRequest()) + { + // add a validation message + filterContext.Controller.ViewData.ModelState.AddModelError("", Services.Value.Localization.GetResource("Gdpr.Consent.ValidationMessage")); + } + else + { + // notify + Notifier.Value.Error(Services.Value.Localization.GetResource("Gdpr.Consent.ValidationMessage")); + } + + return; + } + } + } + + public void OnActionExecuted(ActionExecutedContext filterContext) + { + } + + public void OnResultExecuting(ResultExecutingContext filterContext) + { + if (!PrivacySettings.Value.DisplayGdprConsentOnForms) + return; + + if (filterContext.HttpContext.Items.Contains("GdprConsentRendered")) + return; + + var result = filterContext.Result; + + // should only run on a full view rendering result or HTML ContentResult + if (!result.IsHtmlViewResult()) + return; + + if (!filterContext.IsChildAction) + { + WidgetProvider.Value.RegisterAction( + new[] { "gdpr_consent" }, + "GdprConsent", + "Common", + new { area = "", isSmall = false }); + } + + WidgetProvider.Value.RegisterAction( + new[] { "gdpr_consent_small" }, + "GdprConsent", + "Common", + new { area = "", isSmall = true }); + + filterContext.HttpContext.Items["GdprConsentRendered"] = true; + } + + public void OnResultExecuted(ResultExecutedContext filterContext) + { + } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs b/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs index 00f5db4645..4d4240b971 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs @@ -1,10 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Net; -using System.Runtime.InteropServices; -using System.Security; -using System.Threading; using System.Web; using System.Web.Mvc; using SmartStore.Core; @@ -13,29 +8,29 @@ namespace SmartStore.Web.Framework.Filters { - public class HandleExceptionFilter : IActionFilter, IExceptionFilter + public class HandleExceptionFilter : IActionFilter, IExceptionFilter { - private readonly ILoggerFactory _loggerFactory; - private readonly Lazy _workContext; + private readonly ILoggerFactory _loggerFactory; + private readonly Lazy _workContext; - public HandleExceptionFilter(ILoggerFactory loggerFactory, Lazy workContext) - { - _loggerFactory = loggerFactory; - _workContext = workContext; - } + public HandleExceptionFilter(ILoggerFactory loggerFactory, Lazy workContext) + { + _loggerFactory = loggerFactory; + _workContext = workContext; + } public virtual void OnActionExecuting(ActionExecutingContext filterContext) { } - + public virtual void OnActionExecuted(ActionExecutedContext filterContext) { if (filterContext.IsChildAction) return; - + if (filterContext.Result is HttpStatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 404) - { - // Handle not found (404) from within the MVC pipeline (only called when HttpNotFoundResult is returned from actions) + { + // Handle not found (404) from within the MVC pipeline (only called when HttpNotFoundResult is returned from actions) filterContext.Result = Create404Result(filterContext); _workContext.Value.IsAdmin = false; @@ -54,7 +49,7 @@ public void OnException(ExceptionContext filterContext) { LogException(exception, filterContext); } - + if (!filterContext.IsChildAction) { var controllerName = filterContext.RouteData.GetRequiredString("controller"); @@ -121,28 +116,28 @@ protected internal static ActionResult Create404Result(ControllerContext context } protected void LogException(Exception exception, ControllerContext context) - { - if (exception == null) - return; - - if (!DataSettings.DatabaseIsInstalled()) - return; - - //// ignore 404 HTTP errors - //var httpException = exception as HttpException; - //if (httpException != null && httpException.GetHttpCode() == 404) - // return; - - try - { - var logger = _loggerFactory.GetLogger(context.Controller.GetType()); - logger.Error(exception); - } - catch - { - // don't throw new exception - } - } + { + if (exception == null) + return; + + if (!DataSettings.DatabaseIsInstalled()) + return; + + //// ignore 404 HTTP errors + //var httpException = exception as HttpException; + //if (httpException != null && httpException.GetHttpCode() == 404) + // return; + + try + { + var logger = _loggerFactory.GetLogger(context.Controller.GetType()); + logger.Error(exception); + } + catch + { + // don't throw new exception + } + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs b/src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs index af2e1fbaf5..d89f8c6eb7 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs @@ -3,29 +3,29 @@ using SmartStore.Core.Data; namespace SmartStore.Web.Framework.Filters -{ +{ public class HandleInstallFilter : IAuthorizationFilter - { - public void OnAuthorization(AuthorizationContext filterContext) - { - var controllerName = filterContext.ActionDescriptor.ControllerDescriptor.ControllerName; - var actionName = filterContext.ActionDescriptor.ActionName; + { + public void OnAuthorization(AuthorizationContext filterContext) + { + var controllerName = filterContext.ActionDescriptor.ControllerDescriptor.ControllerName; + var actionName = filterContext.ActionDescriptor.ActionName; - if (controllerName == "Install" && actionName != "Index" && filterContext.HttpContext.Request.IsAjaxRequest()) - { - // probably "progress" or "finalize" call - return; - } + if (controllerName == "Install" && actionName != "Index" && filterContext.HttpContext.Request.IsAjaxRequest()) + { + // probably "progress" or "finalize" call + return; + } - if (!DataSettings.DatabaseIsInstalled() && controllerName != "Install") - { - filterContext.Result = new RedirectToRouteResult( - new RouteValueDictionary { - { "Controller", "Install" }, - { "Action", "Index" } - }); - } - } - } + if (!DataSettings.DatabaseIsInstalled() && controllerName != "Install") + { + filterContext.Result = new RedirectToRouteResult( + new RouteValueDictionary { + { "Controller", "Install" }, + { "Action", "Index" } + }); + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs index a1f5532806..ee45056709 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs @@ -6,9 +6,9 @@ namespace SmartStore.Web.Framework.Filters { - public class JsonNetAttribute : FilterAttribute, IActionFilter - { - public Lazy DateTimeHelper { get; set; } + public class JsonNetAttribute : FilterAttribute, IActionFilter + { + public Lazy DateTimeHelper { get; set; } public void OnActionExecuting(ActionExecutingContext filterContext) { diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs index ec44b5bb1d..2cc6b8665f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.Mvc; @@ -7,67 +6,67 @@ namespace SmartStore.Web.Framework.Filters { - public class NotifyAttribute : FilterAttribute, IResultFilter - { - public const string NotificationsKey = "sm.notifications.all"; - - public INotifier Notifier { get; set; } - - public virtual void OnResultExecuting(ResultExecutingContext filterContext) - { - if (Notifier == null || Notifier.Entries.Count == 0) - return; - - if (!filterContext.IsChildAction && filterContext.HttpContext.Request.IsAjaxRequest()) - { - HandleAjaxRequest(Notifier.Entries.FirstOrDefault(), filterContext.HttpContext.Response); - return; - } - - Persist(filterContext.Controller.ViewData, Notifier.Entries.Where(x => x.Durable == false)); - Persist(filterContext.Controller.TempData, Notifier.Entries.Where(x => x.Durable == true)); - - Notifier.Entries.Clear(); - } - - public virtual void OnResultExecuted(ResultExecutedContext filterContext) - { - } - - private void Persist(IDictionary bag, IEnumerable source) - { - if (!source.Any()) - return; - - var existing = (bag[NotificationsKey] ?? new HashSet()) as HashSet; - - source.Each(x => - { - if (x.Message.Text.HasValue()) - existing.Add(x); - }); - - bag[NotificationsKey] = TrimSet(existing); - } - - private void HandleAjaxRequest(NotifyEntry entry, HttpResponseBase response) - { - if (entry == null) - return; - - response.AddHeader("X-Message-Type", entry.Type.ToString().ToLower()); - response.AddHeader("X-Message", entry.Message.Text); - } - - private HashSet TrimSet(HashSet entries) - { - if (entries.Count <= 20) - { - return entries; - } - - return new HashSet(entries.Skip(entries.Count - 20)); - } - } + public class NotifyAttribute : FilterAttribute, IResultFilter + { + public const string NotificationsKey = "sm.notifications.all"; + + public INotifier Notifier { get; set; } + + public virtual void OnResultExecuting(ResultExecutingContext filterContext) + { + if (Notifier == null || Notifier.Entries.Count == 0) + return; + + if (!filterContext.IsChildAction && filterContext.HttpContext.Request.IsAjaxRequest()) + { + HandleAjaxRequest(Notifier.Entries.FirstOrDefault(), filterContext.HttpContext.Response); + return; + } + + Persist(filterContext.Controller.ViewData, Notifier.Entries.Where(x => x.Durable == false)); + Persist(filterContext.Controller.TempData, Notifier.Entries.Where(x => x.Durable == true)); + + Notifier.Entries.Clear(); + } + + public virtual void OnResultExecuted(ResultExecutedContext filterContext) + { + } + + private void Persist(IDictionary bag, IEnumerable source) + { + if (!source.Any()) + return; + + var existing = (bag[NotificationsKey] ?? new HashSet()) as HashSet; + + source.Each(x => + { + if (x.Message.Text.HasValue()) + existing.Add(x); + }); + + bag[NotificationsKey] = TrimSet(existing); + } + + private void HandleAjaxRequest(NotifyEntry entry, HttpResponseBase response) + { + if (entry == null) + return; + + response.AddHeader("X-Message-Type", entry.Type.ToString().ToLower()); + response.AddHeader("X-Message", entry.Message.Text); + } + + private HashSet TrimSet(HashSet entries) + { + if (entries.Count <= 20) + { + return entries; + } + + return new HashSet(entries.Skip(entries.Count - 20)); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs index 191cec1eeb..e6d3dea060 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs @@ -9,22 +9,22 @@ namespace SmartStore.Web.Framework.Filters { public class PublicStoreAllowNavigationAttribute : FilterAttribute, IAuthorizationFilter { - private static readonly List> s_permittedRoutes = new List> - { - new Tuple("SmartStore.Web.Controllers.CustomerController", "Login"), - new Tuple("SmartStore.Web.Controllers.CustomerController", "Logout"), - new Tuple("SmartStore.Web.Controllers.CustomerController", "Register"), - new Tuple("SmartStore.Web.Controllers.CustomerController", "PasswordRecovery"), - new Tuple("SmartStore.Web.Controllers.CustomerController", "PasswordRecoveryConfirm"), - new Tuple("SmartStore.Web.Controllers.CustomerController", "AccountActivation"), - new Tuple("SmartStore.Web.Controllers.CustomerController", "CheckUsernameAvailability"), + private static readonly List> s_permittedRoutes = new List> + { + new Tuple("SmartStore.Web.Controllers.CustomerController", "Login"), + new Tuple("SmartStore.Web.Controllers.CustomerController", "Logout"), + new Tuple("SmartStore.Web.Controllers.CustomerController", "Register"), + new Tuple("SmartStore.Web.Controllers.CustomerController", "PasswordRecovery"), + new Tuple("SmartStore.Web.Controllers.CustomerController", "PasswordRecoveryConfirm"), + new Tuple("SmartStore.Web.Controllers.CustomerController", "AccountActivation"), + new Tuple("SmartStore.Web.Controllers.CustomerController", "CheckUsernameAvailability"), new Tuple("SmartStore.Web.Controllers.MenuController", "OffCanvas"), new Tuple("SmartStore.Web.Controllers.ShoppingCartController", "CartSummary") }; - public Lazy PermissionService { get; set; } - - public virtual void OnAuthorization(AuthorizationContext filterContext) + public Lazy PermissionService { get; set; } + + public virtual void OnAuthorization(AuthorizationContext filterContext) { if (filterContext == null || filterContext.HttpContext == null) return; @@ -37,13 +37,13 @@ public virtual void OnAuthorization(AuthorizationContext filterContext) if (filterContext.IsChildAction) return; - string actionName = filterContext.ActionDescriptor.ActionName; - if (String.IsNullOrEmpty(actionName)) - return; + string actionName = filterContext.ActionDescriptor.ActionName; + if (String.IsNullOrEmpty(actionName)) + return; - string controllerName = filterContext.Controller.ToString(); - if (String.IsNullOrEmpty(controllerName)) - return; + string controllerName = filterContext.Controller.ToString(); + if (String.IsNullOrEmpty(controllerName)) + return; if (!DataSettings.DatabaseIsInstalled()) return; @@ -69,17 +69,17 @@ protected virtual bool HasStoreAccess() return false; } - private static bool IsPermittedRoute(string controllerName, string actionName) - { - foreach (var route in s_permittedRoutes) - { - if (controllerName.IsCaseInsensitiveEqual(route.Item1) && actionName.IsCaseInsensitiveEqual(route.Item2)) - { - return true; - } - } + private static bool IsPermittedRoute(string controllerName, string actionName) + { + foreach (var route in s_permittedRoutes) + { + if (controllerName.IsCaseInsensitiveEqual(route.Item1) && actionName.IsCaseInsensitiveEqual(route.Item2)) + { + return true; + } + } - return false; - } - } + return false; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs b/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs index d6e0948edb..3b7905ca67 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Web; namespace SmartStore.Web.Framework.Filters @@ -62,19 +58,13 @@ public ResponseFilterStream(Stream innerStream, HttpContextBase httpContext, int /// /// Determines whether the stream is captured /// - private bool IsCaptured - { - get => CaptureStream != null || CaptureString != null || TransformStream != null || TransformString != null; - } + private bool IsCaptured => CaptureStream != null || CaptureString != null || TransformStream != null || TransformString != null; /// /// Determines whether the Write method is outputting data immediately /// or delaying output until Flush() is fired. /// - private bool IsOutputDelayed - { - get => TransformStream != null || TransformString != null; - } + private bool IsOutputDelayed => TransformStream != null || TransformString != null; /// @@ -203,40 +193,40 @@ internal MemoryStream OnTransformCompleteStringInternal(MemoryStream ms) return ms; } - public override bool CanRead + public override bool CanRead => true; + + public override bool CanSeek => true; + + public override bool CanWrite => true; + + public override long Length => 0; + + public override long Position { - get => true; + get => _position; + set => _position = value; } - public override bool CanSeek + public override long Seek(long offset, SeekOrigin direction) { - get => true; + return _innerStream.Seek(offset, direction); } - public override bool CanWrite + public override void SetLength(long length) { - get => true; + _innerStream.SetLength(length); } - public override long Length + public override void Close() { - get => 0; + _innerStream.Close(); } - public override long Position + public override int Read(byte[] buffer, int offset, int count) { - get { return _position; } - set { _position = value; } + return _innerStream.Read(buffer, offset, count); } - public override long Seek(long offset, SeekOrigin direction) => _innerStream.Seek(offset, direction); - - public override void SetLength(long length) => _innerStream.SetLength(length); - - public override void Close() => _innerStream.Close(); - - public override int Read(byte[] buffer, int offset, int count) => _innerStream.Read(buffer, offset, count); - /// /// Overriden to capture output written by ASP.NET and captured /// into a cached stream that is written out later when Flush() is called. diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs index ac4c1c9f3d..43cbd1dce2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs @@ -13,84 +13,84 @@ namespace SmartStore.Web.Framework.Filters { public class StoreClosedAttribute : FilterAttribute, IAuthorizationFilter { - private static readonly List> s_permittedRoutes = new List> - { - new Tuple("SmartStore.Web.Controllers.CustomerController", "Login"), - new Tuple("SmartStore.Web.Controllers.CustomerController", "Logout"), - new Tuple("SmartStore.Web.Controllers.HomeController", "StoreClosed"), - new Tuple("SmartStore.Web.Controllers.CommonController", "SetLanguage") - }; + private static readonly List> s_permittedRoutes = new List> + { + new Tuple("SmartStore.Web.Controllers.CustomerController", "Login"), + new Tuple("SmartStore.Web.Controllers.CustomerController", "Logout"), + new Tuple("SmartStore.Web.Controllers.HomeController", "StoreClosed"), + new Tuple("SmartStore.Web.Controllers.CommonController", "SetLanguage") + }; + + public Lazy Localizer { get; set; } + public Lazy Notifier { get; set; } + public Lazy WorkContext { get; set; } + public Lazy StoreInformationSettings { get; set; } - public Lazy Localizer { get; set; } - public Lazy Notifier { get; set; } - public Lazy WorkContext { get; set; } - public Lazy StoreInformationSettings { get; set; } - - public virtual void OnAuthorization(AuthorizationContext filterContext) + public virtual void OnAuthorization(AuthorizationContext filterContext) { - if (filterContext == null || filterContext.HttpContext == null) - return; + if (filterContext == null || filterContext.HttpContext == null) + return; - HttpRequestBase request = filterContext.HttpContext.Request; - if (request == null) - return; + HttpRequestBase request = filterContext.HttpContext.Request; + if (request == null) + return; - // Don't apply filter to child methods - if (filterContext.IsChildAction) - return; + // Don't apply filter to child methods + if (filterContext.IsChildAction) + return; - string actionName = filterContext.ActionDescriptor.ActionName; - if (String.IsNullOrEmpty(actionName)) - return; + string actionName = filterContext.ActionDescriptor.ActionName; + if (String.IsNullOrEmpty(actionName)) + return; - string controllerName = filterContext.Controller.ToString(); - if (String.IsNullOrEmpty(controllerName)) - return; + string controllerName = filterContext.Controller.ToString(); + if (String.IsNullOrEmpty(controllerName)) + return; - if (!DataSettings.DatabaseIsInstalled()) - return; + if (!DataSettings.DatabaseIsInstalled()) + return; - var storeInformationSettings = StoreInformationSettings.Value; - if (!storeInformationSettings.StoreClosed) - return; + var storeInformationSettings = StoreInformationSettings.Value; + if (!storeInformationSettings.StoreClosed) + return; - if (!IsPermittedRoute(controllerName, actionName)) - { - if (storeInformationSettings.StoreClosedAllowForAdmins && WorkContext.Value.CurrentCustomer.IsAdmin()) - { - //do nothing - allow admin access - } - else - { - if (request.IsAjaxRequest()) - { - var storeClosedMessage = "{0} {1}".FormatCurrentUI( - Localizer.Value.GetResource("StoreClosed", 0, false), - Localizer.Value.GetResource("StoreClosed.Hint", 0, false)); - Notifier.Value.Error(storeClosedMessage); + if (!IsPermittedRoute(controllerName, actionName)) + { + if (storeInformationSettings.StoreClosedAllowForAdmins && WorkContext.Value.CurrentCustomer.IsAdmin()) + { + //do nothing - allow admin access + } + else + { + if (request.IsAjaxRequest()) + { + var storeClosedMessage = "{0} {1}".FormatCurrentUI( + Localizer.Value.GetResource("StoreClosed", 0, false), + Localizer.Value.GetResource("StoreClosed.Hint", 0, false)); + Notifier.Value.Error(storeClosedMessage); - //filterContext.Result = new ContentResult { Content = "", ContentType = "text/html" }; - } - else - { - var storeClosedUrl = new UrlHelper(filterContext.RequestContext).RouteUrl("StoreClosed"); - filterContext.Result = new RedirectResult(storeClosedUrl); - } - } - } - } + //filterContext.Result = new ContentResult { Content = "", ContentType = "text/html" }; + } + else + { + var storeClosedUrl = new UrlHelper(filterContext.RequestContext).RouteUrl("StoreClosed"); + filterContext.Result = new RedirectResult(storeClosedUrl); + } + } + } + } - private static bool IsPermittedRoute(string controllerName, string actionName) - { - foreach (var route in s_permittedRoutes) - { - if (controllerName.IsCaseInsensitiveEqual(route.Item1) && actionName.IsCaseInsensitiveEqual(route.Item2)) - { - return true; - } - } + private static bool IsPermittedRoute(string controllerName, string actionName) + { + foreach (var route in s_permittedRoutes) + { + if (controllerName.IsCaseInsensitiveEqual(route.Item1) && actionName.IsCaseInsensitiveEqual(route.Item2)) + { + return true; + } + } - return false; - } - } + return false; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs index 8a65cd046a..8d04cee8c9 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs @@ -9,12 +9,12 @@ namespace SmartStore.Web.Framework.Filters { public class StoreIpAddressAttribute : FilterAttribute, IActionFilter { - public Lazy WebHelper { get; set; } - public Lazy WorkContext { get; set; } - public Lazy CustomerService { get; set; } - public Lazy PrivacySettings { get; set; } + public Lazy WebHelper { get; set; } + public Lazy WorkContext { get; set; } + public Lazy CustomerService { get; set; } + public Lazy PrivacySettings { get; set; } - public virtual void OnActionExecuting(ActionExecutingContext filterContext) + public virtual void OnActionExecuting(ActionExecutingContext filterContext) { if (!DataSettings.DatabaseIsInstalled()) return; @@ -30,12 +30,12 @@ public virtual void OnActionExecuting(ActionExecutingContext filterContext) if (!String.Equals(filterContext.HttpContext.Request.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)) return; - if (!PrivacySettings.Value.StoreLastIpAddress) - return; + if (!PrivacySettings.Value.StoreLastIpAddress) + return; - // Update IP address. - var webHelper = WebHelper.Value; - var currentIpAddress = webHelper.GetCurrentIpAddress(); + // Update IP address. + var webHelper = WebHelper.Value; + var currentIpAddress = webHelper.GetCurrentIpAddress(); if (!String.IsNullOrEmpty(currentIpAddress)) { var customer = WorkContext.Value.CurrentCustomer; @@ -48,8 +48,8 @@ public virtual void OnActionExecuting(ActionExecutingContext filterContext) } } - public virtual void OnActionExecuted(ActionExecutedContext filterContext) - { - } - } + public virtual void OnActionExecuted(ActionExecutedContext filterContext) + { + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs index cfa570c868..1bbb6abd78 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs @@ -11,17 +11,17 @@ namespace SmartStore.Web.Framework.Filters { public class StoreLastVisitedPageAttribute : FilterAttribute, IActionFilter { - public Lazy WebHelper { get; set; } - public Lazy WorkContext { get; set; } - public Lazy CustomerSettings { get; set; } - public Lazy GenericAttributeService { get; set; } - public Lazy UserAgent { get; set; } + public Lazy WebHelper { get; set; } + public Lazy WorkContext { get; set; } + public Lazy CustomerSettings { get; set; } + public Lazy GenericAttributeService { get; set; } + public Lazy UserAgent { get; set; } public Lazy CustomerService { get; set; } public Lazy Logger { get; set; } public virtual void OnActionExecuting(ActionExecutingContext filterContext) { - if (!DataSettings.DatabaseIsInstalled()) + if (!DataSettings.DatabaseIsInstalled()) return; if (filterContext == null || filterContext.HttpContext == null || filterContext.HttpContext.Request == null) @@ -38,13 +38,13 @@ public virtual void OnActionExecuting(ActionExecutingContext filterContext) if (!CustomerSettings.Value.StoreLastVisitedPage) return; - var customer = WorkContext.Value.CurrentCustomer; + var customer = WorkContext.Value.CurrentCustomer; - if (customer == null || customer.Deleted || customer.IsSystemAccount) - return; + if (customer == null || customer.Deleted || customer.IsSystemAccount) + return; - var pageUrl = WebHelper.Value.GetThisPageUrl(true); - var userAgent = UserAgent.Value.RawValue; + var pageUrl = WebHelper.Value.GetThisPageUrl(true); + var userAgent = UserAgent.Value.RawValue; try { @@ -71,10 +71,10 @@ public virtual void OnActionExecuting(ActionExecutingContext filterContext) { Logger?.Value?.Error(ex); } - } + } - public virtual void OnActionExecuted(ActionExecutedContext filterContext) - { - } - } + public virtual void OnActionExecuted(ActionExecutedContext filterContext) + { + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs index 2721a44f65..93eddf7752 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs @@ -7,12 +7,12 @@ namespace SmartStore.Web.Framework.Filters [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)] public class UnitOfWorkAttribute : ActionFilterAttribute { - public UnitOfWorkAttribute() + public UnitOfWorkAttribute() : this(null, int.MaxValue) { } - public UnitOfWorkAttribute(int ordinal) + public UnitOfWorkAttribute(int ordinal) : this(null, ordinal) { } @@ -28,7 +28,7 @@ public UnitOfWorkAttribute(string alias, int ordinal) base.Order = ordinal; } - public Func DbContext { get; set; } + public Func DbContext { get; set; } public string Alias { get; set; } @@ -37,8 +37,8 @@ public override void OnActionExecuted(ActionExecutedContext filterContext) if (filterContext.Exception != null) return; - var context = DbContext(this.Alias); - + var context = DbContext(this.Alias); + if (context != null && context.HasChanges) { try diff --git a/src/Presentation/SmartStore.Web.Framework/FrameworkCacheConsumer.cs b/src/Presentation/SmartStore.Web.Framework/FrameworkCacheConsumer.cs index 5dee2d6c96..13a5991802 100644 --- a/src/Presentation/SmartStore.Web.Framework/FrameworkCacheConsumer.cs +++ b/src/Presentation/SmartStore.Web.Framework/FrameworkCacheConsumer.cs @@ -26,8 +26,8 @@ public partial class FrameworkCacheConsumer : DbSaveHook, IConsumer /// {1} : store identifier /// public const string THEMEVARS_KEY = "fw:themevars-{0}-{1}"; - public const string THEMEVARS_THEME_KEY = "fw:themevars-{0}"; - + public const string THEMEVARS_THEME_KEY = "fw:themevars-{0}"; + /// /// Key for tax display type caching /// @@ -38,75 +38,75 @@ public partial class FrameworkCacheConsumer : DbSaveHook, IConsumer public const string CUSTOMERROLES_TAX_DISPLAY_TYPES_KEY = "fw:customerroles:taxdisplaytypes-{0}-{1}"; public const string CUSTOMERROLES_TAX_DISPLAY_TYPES_PATTERN_KEY = "fw:customerroles:taxdisplaytypes*"; - private readonly ICacheManager _cacheManager; - private readonly IAssetCache _assetCache; + private readonly ICacheManager _cacheManager; + private readonly IAssetCache _assetCache; + + // Item1 = ThemeName, Item2 = StoreId + private HashSet> _themeScopes; + + public FrameworkCacheConsumer(ICacheManager cacheManager, IAssetCache assetCache) + { + _cacheManager = cacheManager; + _assetCache = assetCache; + } + + public void HandleEvent(ThemeTouchedEvent eventMessage) + { + var cacheKey = BuildThemeVarsCacheKey(eventMessage.ThemeName, 0); + HttpRuntime.Cache.RemoveByPattern(cacheKey); + } + + public override void OnAfterSave(IHookedEntity entry) + { + if (entry.Entity is ThemeVariable) + { + var themeVar = entry.Entity as ThemeVariable; + AddEvictableThemeScope(themeVar.Theme, themeVar.StoreId); + } + else if (entry.Entity is CustomerRole) + { + _cacheManager.RemoveByPattern(CUSTOMERROLES_TAX_DISPLAY_TYPES_PATTERN_KEY); + } + else if (entry.Entity is Setting && entry.InitialState == EntityState.Modified) + { + var setting = entry.Entity as Setting; + if (setting.Name.IsCaseInsensitiveEqual(TypeHelper.NameOf(x => x.TaxDisplayType, true))) + { + _cacheManager.RemoveByPattern(CUSTOMERROLES_TAX_DISPLAY_TYPES_PATTERN_KEY); // depends on TaxSettings.TaxDisplayType + } + } + else + { + throw new NotImplementedException(); + } + } + + public override void OnAfterSaveCompleted() + { + FlushThemeVarsCacheEviction(); + } - // Item1 = ThemeName, Item2 = StoreId - private HashSet> _themeScopes; + #region Helpers - public FrameworkCacheConsumer(ICacheManager cacheManager, IAssetCache assetCache) + private void AddEvictableThemeScope(string themeName, int storeId) { - _cacheManager = cacheManager; - _assetCache = assetCache; + if (_themeScopes == null) + _themeScopes = new HashSet>(); + _themeScopes.Add(new Tuple(themeName, storeId)); } - public void HandleEvent(ThemeTouchedEvent eventMessage) - { - var cacheKey = BuildThemeVarsCacheKey(eventMessage.ThemeName, 0); - HttpRuntime.Cache.RemoveByPattern(cacheKey); - } - - public override void OnAfterSave(IHookedEntity entry) - { - if (entry.Entity is ThemeVariable) - { - var themeVar = entry.Entity as ThemeVariable; - AddEvictableThemeScope(themeVar.Theme, themeVar.StoreId); - } - else if (entry.Entity is CustomerRole) - { - _cacheManager.RemoveByPattern(CUSTOMERROLES_TAX_DISPLAY_TYPES_PATTERN_KEY); - } - else if (entry.Entity is Setting && entry.InitialState == EntityState.Modified) - { - var setting = entry.Entity as Setting; - if (setting.Name.IsCaseInsensitiveEqual(TypeHelper.NameOf(x => x.TaxDisplayType, true))) - { - _cacheManager.RemoveByPattern(CUSTOMERROLES_TAX_DISPLAY_TYPES_PATTERN_KEY); // depends on TaxSettings.TaxDisplayType - } - } - else - { - throw new NotImplementedException(); - } - } - - public override void OnAfterSaveCompleted() - { - FlushThemeVarsCacheEviction(); - } - - #region Helpers - - private void AddEvictableThemeScope(string themeName, int storeId) - { - if (_themeScopes == null) - _themeScopes = new HashSet>(); - _themeScopes.Add(new Tuple(themeName, storeId)); - } - - private void FlushThemeVarsCacheEviction() - { - if (_themeScopes == null || _themeScopes.Count == 0) - return; - - foreach (var scope in _themeScopes) - { - HttpRuntime.Cache.Remove(BuildThemeVarsCacheKey(scope.Item1 /* ThemeName */, scope.Item2 /* StoreId */)); - } - - _themeScopes.Clear(); - } + private void FlushThemeVarsCacheEviction() + { + if (_themeScopes == null || _themeScopes.Count == 0) + return; + + foreach (var scope in _themeScopes) + { + HttpRuntime.Cache.Remove(BuildThemeVarsCacheKey(scope.Item1 /* ThemeName */, scope.Item2 /* StoreId */)); + } + + _themeScopes.Clear(); + } private static string BuildThemeVarsCacheKey(ThemeVariable entity) { @@ -115,14 +115,14 @@ private static string BuildThemeVarsCacheKey(ThemeVariable entity) internal static string BuildThemeVarsCacheKey(string themeName, int storeId) { - if (storeId > 0) - { - return HttpRuntime.Cache.BuildScopedKey(THEMEVARS_KEY.FormatInvariant(themeName, storeId)); - } + if (storeId > 0) + { + return HttpRuntime.Cache.BuildScopedKey(THEMEVARS_KEY.FormatInvariant(themeName, storeId)); + } - return HttpRuntime.Cache.BuildScopedKey(THEMEVARS_THEME_KEY.FormatInvariant(themeName)); + return HttpRuntime.Cache.BuildScopedKey(THEMEVARS_THEME_KEY.FormatInvariant(themeName)); } #endregion - } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/ErrorMessageProvider.cs b/src/Presentation/SmartStore.Web.Framework/Localization/ErrorMessageProvider.cs index c927fc2d38..972cb931f1 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/ErrorMessageProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/ErrorMessageProvider.cs @@ -4,74 +4,74 @@ namespace SmartStore.Web.Framework.Localization { - public class ErrorMessageProvider - { - private static string _resourceClassKey; - - public static void SetResourceClassKey(string resourceClassKey) - { - if (resourceClassKey == null) - { - throw new ArgumentNullException("resourceClassKey"); - } + public class ErrorMessageProvider + { + private static string _resourceClassKey; - _resourceClassKey = resourceClassKey; + public static void SetResourceClassKey(string resourceClassKey) + { + if (resourceClassKey == null) + { + throw new ArgumentNullException("resourceClassKey"); + } - ModelBinderErrorMessageProviders.ValueRequiredErrorMessageProvider = ErrorMessageProvider.DefaultValueRequiredErrorMessageProvider; - ModelBinderErrorMessageProviders.TypeConversionErrorMessageProvider = ErrorMessageProvider.DefaultTypeConversionErrorMessageProvider; - } + _resourceClassKey = resourceClassKey; - private static string DefaultTypeConversionErrorMessageProvider(ModelBindingExecutionContext modelBindingExecutionContext, ModelMetadata modelMetadata, object incomingValue) - { - return GetResourceCommon(modelBindingExecutionContext, modelMetadata, incomingValue, new Func(GetValueInvalidResource)); - } - - private static string DefaultValueRequiredErrorMessageProvider(ModelBindingExecutionContext modelBindingExecutionContext, ModelMetadata modelMetadata, object incomingValue) - { - return GetResourceCommon(modelBindingExecutionContext, modelMetadata, incomingValue, new Func(GetValueRequiredResource)); - } + ModelBinderErrorMessageProviders.ValueRequiredErrorMessageProvider = ErrorMessageProvider.DefaultValueRequiredErrorMessageProvider; + ModelBinderErrorMessageProviders.TypeConversionErrorMessageProvider = ErrorMessageProvider.DefaultTypeConversionErrorMessageProvider; + } - private static string GetResourceCommon(ModelBindingExecutionContext modelBindingExecutionContext, ModelMetadata modelMetadata, object incomingValue, - Func resourceAccessor) - { - string displayName = modelMetadata.GetDisplayName(); - string str = resourceAccessor(modelBindingExecutionContext); - object[] objArray = new object[2]; + private static string DefaultTypeConversionErrorMessageProvider(ModelBindingExecutionContext modelBindingExecutionContext, ModelMetadata modelMetadata, object incomingValue) + { + return GetResourceCommon(modelBindingExecutionContext, modelMetadata, incomingValue, new Func(GetValueInvalidResource)); + } - objArray[0] = incomingValue; - objArray[1] = displayName; + private static string DefaultValueRequiredErrorMessageProvider(ModelBindingExecutionContext modelBindingExecutionContext, ModelMetadata modelMetadata, object incomingValue) + { + return GetResourceCommon(modelBindingExecutionContext, modelMetadata, incomingValue, new Func(GetValueRequiredResource)); + } - string str1 = string.Format(CultureInfo.CurrentCulture, str, objArray); - return str1; - } + private static string GetResourceCommon(ModelBindingExecutionContext modelBindingExecutionContext, ModelMetadata modelMetadata, object incomingValue, + Func resourceAccessor) + { + string displayName = modelMetadata.GetDisplayName(); + string str = resourceAccessor(modelBindingExecutionContext); + object[] objArray = new object[2]; - private static string GetUserResourceString(ModelBindingExecutionContext modelBindingExecutionContext, string resourceName, string resourceClassKey) - { - if (string.IsNullOrEmpty(resourceClassKey) || modelBindingExecutionContext == null || modelBindingExecutionContext.HttpContext == null) - { - return null; - } - else - { - return modelBindingExecutionContext.HttpContext.GetGlobalResourceObject(resourceClassKey, resourceName, CultureInfo.CurrentUICulture) as string; - } - } - - private static string GetUserResourceString(ModelBindingExecutionContext modelBindingExecutionContext, string resourceName) - { - return GetUserResourceString(modelBindingExecutionContext, resourceName, _resourceClassKey); - } - - private static string GetValueInvalidResource(ModelBindingExecutionContext modelBindingExecutionContext) - { - string userResourceString = GetUserResourceString(modelBindingExecutionContext, "PropertyValueInvalid"); - return userResourceString; - } - - private static string GetValueRequiredResource(ModelBindingExecutionContext modelBindingExecutionContext) - { - string userResourceString = GetUserResourceString(modelBindingExecutionContext, "PropertyValueRequired"); - return userResourceString; - } - } + objArray[0] = incomingValue; + objArray[1] = displayName; + + string str1 = string.Format(CultureInfo.CurrentCulture, str, objArray); + return str1; + } + + private static string GetUserResourceString(ModelBindingExecutionContext modelBindingExecutionContext, string resourceName, string resourceClassKey) + { + if (string.IsNullOrEmpty(resourceClassKey) || modelBindingExecutionContext == null || modelBindingExecutionContext.HttpContext == null) + { + return null; + } + else + { + return modelBindingExecutionContext.HttpContext.GetGlobalResourceObject(resourceClassKey, resourceName, CultureInfo.CurrentUICulture) as string; + } + } + + private static string GetUserResourceString(ModelBindingExecutionContext modelBindingExecutionContext, string resourceName) + { + return GetUserResourceString(modelBindingExecutionContext, resourceName, _resourceClassKey); + } + + private static string GetValueInvalidResource(ModelBindingExecutionContext modelBindingExecutionContext) + { + string userResourceString = GetUserResourceString(modelBindingExecutionContext, "PropertyValueInvalid"); + return userResourceString; + } + + private static string GetValueRequiredResource(ModelBindingExecutionContext modelBindingExecutionContext) + { + string userResourceString = GetUserResourceString(modelBindingExecutionContext, "PropertyValueRequired"); + return userResourceString; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs b/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs index b4a818c976..c5dba1916c 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Framework.Localization { - public interface ILocalizedModel where T : ILocalizedModelLocal + public interface ILocalizedModel where T : ILocalizedModelLocal { IList Locales { get; set; } } - public interface ILocalizedModelLocal - { - int LanguageId { get; set; } - } + public interface ILocalizedModelLocal + { + int LanguageId { get; set; } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/IText.cs b/src/Presentation/SmartStore.Web.Framework/Localization/IText.cs index ec648c3377..732cea82eb 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/IText.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/IText.cs @@ -1,11 +1,10 @@ -using System; -using SmartStore.Core.Localization; +using SmartStore.Core.Localization; namespace SmartStore.Web.Framework.Localization { - public interface IText - { - LocalizedString Get(string key, params object[] args); - LocalizedString GetEx(string key, int languageId, params object[] args); - } + public interface IText + { + LocalizedString Get(string key, params object[] args); + LocalizedString GetEx(string key, int languageId, params object[] args); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/LanguageSeoCodeAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Localization/LanguageSeoCodeAttribute.cs index baadafd956..bdb4489842 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/LanguageSeoCodeAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/LanguageSeoCodeAttribute.cs @@ -1,6 +1,4 @@ using System; -using System.Net; -using System.Web; using System.Web.Mvc; using SmartStore.Core; using SmartStore.Core.Data; @@ -15,9 +13,9 @@ namespace SmartStore.Web.Framework.Localization /// public class LanguageSeoCodeAttribute : FilterAttribute, IAuthorizationFilter { - public Lazy WorkContext { get; set; } - public Lazy LanguageService { get; set; } - public Lazy LocalizationSettings { get; set; } + public Lazy WorkContext { get; set; } + public Lazy LanguageService { get; set; } + public Lazy LocalizationSettings { get; set; } public virtual void OnAuthorization(AuthorizationContext filterContext) { @@ -37,30 +35,30 @@ public virtual void OnAuthorization(AuthorizationContext filterContext) if (!(filterContext.RouteData?.Route is LocalizedRoute)) return; - if (!DataSettings.DatabaseIsInstalled()) + if (!DataSettings.DatabaseIsInstalled()) return; var localizationSettings = LocalizationSettings.Value; if (!localizationSettings.SeoFriendlyUrlsForLanguagesEnabled) return; - + // Process current URL - var workContext = WorkContext.Value; - var languageService = LanguageService.Value; + var workContext = WorkContext.Value; + var languageService = LanguageService.Value; var workingLanguage = workContext.WorkingLanguage; var helper = new LocalizedUrlHelper(request, true); - var defaultSeoCode = languageService.GetDefaultLanguageSeoCode(); - - if (helper.IsLocalizedUrl(out var seoCode)) + var defaultSeoCode = languageService.GetDefaultLanguageSeoCode(); + + if (helper.IsLocalizedUrl(out var seoCode)) { - if (!languageService.IsPublishedLanguage(seoCode)) + if (!languageService.IsPublishedLanguage(seoCode)) { - // Language is not defined in system or not assigned to store - if (localizationSettings.InvalidLanguageRedirectBehaviour == InvalidLanguageRedirectBehaviour.ReturnHttp404) + // Language is not defined in system or not assigned to store + if (localizationSettings.InvalidLanguageRedirectBehaviour == InvalidLanguageRedirectBehaviour.ReturnHttp404) { filterContext.Result = HandleExceptionFilter.Create404Result(filterContext); - var seoCodeReplacement = localizationSettings.DefaultLanguageRedirectBehaviour == DefaultLanguageRedirectBehaviour.PrependSeoCodeAndRedirect + var seoCodeReplacement = localizationSettings.DefaultLanguageRedirectBehaviour == DefaultLanguageRedirectBehaviour.PrependSeoCodeAndRedirect ? workingLanguage.GetTwoLetterISOLanguageName() : string.Empty; diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs index 12567ecccd..dba94ca1cc 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs @@ -18,7 +18,7 @@ public class LocalizedRoute : Route, ICloneable #region Fields private static bool? _seoFriendlyUrlsForLanguagesEnabled; - private string _leftPart; + private string _leftPart; #endregion @@ -96,16 +96,16 @@ public override RouteData GetRouteData(HttpContextBase httpContext) } } - if (_leftPart == null) - { - var url = this.Url; - int idx = url.IndexOf('{'); - _leftPart = "~/" + (idx >= 0 ? url.Substring(0, idx) : url).TrimEnd('/'); - } + if (_leftPart == null) + { + var url = this.Url; + int idx = url.IndexOf('{'); + _leftPart = "~/" + (idx >= 0 ? url.Substring(0, idx) : url).TrimEnd('/'); + } - // Perf - if (!httpContext.Request.AppRelativeCurrentExecutionFilePath.StartsWith(_leftPart, true, CultureInfo.InvariantCulture)) - return null; + // Perf + if (!httpContext.Request.AppRelativeCurrentExecutionFilePath.StartsWith(_leftPart, true, CultureInfo.InvariantCulture)) + return null; RouteData data = base.GetRouteData(httpContext); return data; @@ -126,8 +126,8 @@ public override VirtualPathData GetVirtualPath(RequestContext requestContext, Ro if (data != null && DataSettings.DatabaseIsInstalled() && SeoFriendlyUrlsForLanguagesEnabled) { var helper = new LocalizedUrlHelper(requestContext.HttpContext.Request, true); - if (helper.IsLocalizedUrl(out string cultureCode)) - { + if (helper.IsLocalizedUrl(out string cultureCode)) + { if (requestContext.RouteData.DataTokens.Get("SeoCodeReplacement") is string seoCodeReplacement) { // The LanguageSeoCode filter detected a localized URL, but the locale does not exist or is inactive. @@ -142,7 +142,7 @@ public override VirtualPathData GetVirtualPath(RequestContext requestContext, Ro data.VirtualPath = String.Concat(cultureCode, "/", data.VirtualPath).TrimEnd('/'); } } - } + } return data; } @@ -163,16 +163,16 @@ protected internal static bool SeoFriendlyUrlsForLanguagesEnabled get { if (_seoFriendlyUrlsForLanguagesEnabled == null && EngineContext.Current.IsFullyInitialized) - { - try - { - var enabled = EngineContext.Current.Resolve().SeoFriendlyUrlsForLanguagesEnabled; - _seoFriendlyUrlsForLanguagesEnabled = enabled; - } - catch { } - } - - // Assume is enabled on very first request to prevent IIS 404 with localized URLs + { + try + { + var enabled = EngineContext.Current.Resolve().SeoFriendlyUrlsForLanguagesEnabled; + _seoFriendlyUrlsForLanguagesEnabled = enabled; + } + catch { } + } + + // Assume is enabled on very first request to prevent IIS 404 with localized URLs return _seoFriendlyUrlsForLanguagesEnabled ?? true; } } @@ -183,16 +183,16 @@ protected internal static bool SeoFriendlyUrlsForLanguagesEnabled public LocalizedRoute Clone() { - var clone = new LocalizedRoute(this.Url, - new RouteValueDictionary(this.Defaults), - new RouteValueDictionary(this.Constraints), - new RouteValueDictionary(this.DataTokens), - new MvcRouteHandler()) - { - RouteExistingFiles = this.RouteExistingFiles, - IsClone = true - }; - return clone; + var clone = new LocalizedRoute(this.Url, + new RouteValueDictionary(this.Defaults), + new RouteValueDictionary(this.Constraints), + new RouteValueDictionary(this.DataTokens), + new MvcRouteHandler()) + { + RouteExistingFiles = this.RouteExistingFiles, + IsClone = true + }; + return clone; } object ICloneable.Clone() diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs index 1b039c9e98..aeb0c37107 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using System.Web.Mvc; +using System.Web.Mvc; using System.Web.Routing; namespace SmartStore.Web.Framework.Localization @@ -64,7 +62,7 @@ private static Route MapLocalizedRouteInternal(this RouteCollection routes, stri if (add) { routes.Add(name, route); - } + } return route; } diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs index 6a4009863c..da34042022 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs @@ -1,15 +1,12 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; using System.Threading; -using System.Web; using System.Web.Mvc; using Newtonsoft.Json; using SmartStore.ComponentModel; using SmartStore.Core; using SmartStore.Core.Data; -using SmartStore.Core.Domain.Localization; using SmartStore.Utilities.ObjectPools; using SmartStore.Web.Framework.UI; @@ -20,152 +17,152 @@ namespace SmartStore.Web.Framework.Localization /// public class SetWorkingCultureAttribute : FilterAttribute, IAuthorizationFilter, IActionFilter { - public Lazy WorkContext { get; set; } - public Lazy AssetBuilder { get; set; } + public Lazy WorkContext { get; set; } + public Lazy AssetBuilder { get; set; } - public void OnAuthorization(AuthorizationContext filterContext) + public void OnAuthorization(AuthorizationContext filterContext) { var request = filterContext?.HttpContext?.Request; if (request == null) return; - if (filterContext.IsChildAction) - return; + if (filterContext.IsChildAction) + return; - if (!DataSettings.DatabaseIsInstalled()) + if (!DataSettings.DatabaseIsInstalled()) return; var workContext = WorkContext.Value; CultureInfo culture = workContext.CurrentCustomer != null && workContext.WorkingLanguage != null - ? new CultureInfo(workContext.WorkingLanguage.LanguageCulture) - : new CultureInfo("en-US"); + ? new CultureInfo(workContext.WorkingLanguage.LanguageCulture) + : new CultureInfo("en-US"); Thread.CurrentThread.CurrentCulture = culture; Thread.CurrentThread.CurrentUICulture = culture; } - public void OnActionExecuting(ActionExecutingContext filterContext) - { - } - - public void OnActionExecuted(ActionExecutedContext filterContext) - { - if (filterContext.IsChildAction) - return; - - if (!DataSettings.DatabaseIsInstalled()) - return; - - if (!(filterContext.Result is ViewResult)) - return; - - var culture = Thread.CurrentThread.CurrentUICulture; - if (culture.Name == "en-US") - return; - - var builder = AssetBuilder.Value; - var json = CreateCultureJson(culture); - - var sb = PooledStringBuilder.Rent(); - sb.Append(""); - - var script = sb.ToStringAndReturn(); - - builder.AppendCustomHeadParts(script); - } - - private string CreateCultureJson(CultureInfo ci) - { - var nf = ci.NumberFormat; - var df = ci.DateTimeFormat; - - var dict = new Dictionary - { - { "name", ci.Name }, - { "englishName", ci.EnglishName }, - { "nativeName", ci.NativeName }, - { "isRTL", WorkContext.Value.WorkingLanguage?.Rtl ?? ci.TextInfo.IsRightToLeft }, // favor RTL property of Language + public void OnActionExecuting(ActionExecutingContext filterContext) + { + } + + public void OnActionExecuted(ActionExecutedContext filterContext) + { + if (filterContext.IsChildAction) + return; + + if (!DataSettings.DatabaseIsInstalled()) + return; + + if (!(filterContext.Result is ViewResult)) + return; + + var culture = Thread.CurrentThread.CurrentUICulture; + if (culture.Name == "en-US") + return; + + var builder = AssetBuilder.Value; + var json = CreateCultureJson(culture); + + var sb = PooledStringBuilder.Rent(); + sb.Append(""); + + var script = sb.ToStringAndReturn(); + + builder.AppendCustomHeadParts(script); + } + + private string CreateCultureJson(CultureInfo ci) + { + var nf = ci.NumberFormat; + var df = ci.DateTimeFormat; + + var dict = new Dictionary + { + { "name", ci.Name }, + { "englishName", ci.EnglishName }, + { "nativeName", ci.NativeName }, + { "isRTL", WorkContext.Value.WorkingLanguage?.Rtl ?? ci.TextInfo.IsRightToLeft }, // favor RTL property of Language { "language", ci.TwoLetterISOLanguageName }, - { "numberFormat", new Dictionary - { - { ",", nf.NumberGroupSeparator }, - { ".", nf.NumberDecimalSeparator }, - { "pattern", new[] { nf.NumberNegativePattern } }, - { "decimals", nf.NumberDecimalDigits }, - { "groupSizes", nf.NumberGroupSizes }, - { "+", nf.PositiveSign }, - { "-", nf.NegativeSign }, - { "NaN", nf.NaNSymbol }, - { "negativeInfinity", nf.NegativeInfinitySymbol }, - { "positiveInfinity", nf.PositiveInfinitySymbol }, - { "percent", new Dictionary - { - { ",", nf.PercentGroupSeparator }, - { ".", nf.PercentDecimalSeparator }, - { "pattern", new[] { nf.PercentNegativePattern, nf.PercentPositivePattern } }, - { "decimals", nf.PercentDecimalDigits }, - { "groupSizes", nf.PercentGroupSizes }, - { "symbol", nf.PercentSymbol } - } }, - { "currency", new Dictionary - { - { ",", nf.CurrencyGroupSeparator }, - { ".", nf.CurrencyDecimalSeparator }, - { "pattern", new[] { nf.CurrencyNegativePattern, nf.CurrencyPositivePattern } }, - { "decimals", nf.CurrencyDecimalDigits }, - { "groupSizes", nf.CurrencyGroupSizes }, - { "symbol", nf.CurrencySymbol } - } }, - } }, - { "dateTimeFormat", new Dictionary - { - { "calendarName", df.NativeCalendarName }, - { "/", df.DateSeparator }, - { ":", df.TimeSeparator }, - { "firstDay", (int)df.FirstDayOfWeek }, - { "twoDigitYearMax", ci.Calendar.TwoDigitYearMax }, - { "AM", df.AMDesignator.IsEmpty() ? null : new[] { df.AMDesignator, df.AMDesignator.ToLower(), df.AMDesignator.ToUpper() } }, - { "PM", df.PMDesignator.IsEmpty() ? null : new[] { df.PMDesignator, df.PMDesignator.ToLower(), df.PMDesignator.ToUpper() } }, - { "days", new Dictionary - { - { "names", df.DayNames }, - { "namesAbbr", df.AbbreviatedDayNames }, - { "namesShort", df.ShortestDayNames }, - } }, - { "months", new Dictionary - { - { "names", df.MonthNames }, - { "namesAbbr", df.AbbreviatedMonthNames }, - } }, - { "patterns", new Dictionary - { - { "d", df.ShortDatePattern }, - { "D", df.LongDatePattern }, - { "t", df.ShortTimePattern }, - { "T", df.LongTimePattern }, - { "g", df.ShortDatePattern + " " + df.ShortTimePattern }, - { "G", df.ShortDatePattern + " " + df.LongTimePattern }, - { "f", df.FullDateTimePattern }, // TODO: (mc) find it actually + { "numberFormat", new Dictionary + { + { ",", nf.NumberGroupSeparator }, + { ".", nf.NumberDecimalSeparator }, + { "pattern", new[] { nf.NumberNegativePattern } }, + { "decimals", nf.NumberDecimalDigits }, + { "groupSizes", nf.NumberGroupSizes }, + { "+", nf.PositiveSign }, + { "-", nf.NegativeSign }, + { "NaN", nf.NaNSymbol }, + { "negativeInfinity", nf.NegativeInfinitySymbol }, + { "positiveInfinity", nf.PositiveInfinitySymbol }, + { "percent", new Dictionary + { + { ",", nf.PercentGroupSeparator }, + { ".", nf.PercentDecimalSeparator }, + { "pattern", new[] { nf.PercentNegativePattern, nf.PercentPositivePattern } }, + { "decimals", nf.PercentDecimalDigits }, + { "groupSizes", nf.PercentGroupSizes }, + { "symbol", nf.PercentSymbol } + } }, + { "currency", new Dictionary + { + { ",", nf.CurrencyGroupSeparator }, + { ".", nf.CurrencyDecimalSeparator }, + { "pattern", new[] { nf.CurrencyNegativePattern, nf.CurrencyPositivePattern } }, + { "decimals", nf.CurrencyDecimalDigits }, + { "groupSizes", nf.CurrencyGroupSizes }, + { "symbol", nf.CurrencySymbol } + } }, + } }, + { "dateTimeFormat", new Dictionary + { + { "calendarName", df.NativeCalendarName }, + { "/", df.DateSeparator }, + { ":", df.TimeSeparator }, + { "firstDay", (int)df.FirstDayOfWeek }, + { "twoDigitYearMax", ci.Calendar.TwoDigitYearMax }, + { "AM", df.AMDesignator.IsEmpty() ? null : new[] { df.AMDesignator, df.AMDesignator.ToLower(), df.AMDesignator.ToUpper() } }, + { "PM", df.PMDesignator.IsEmpty() ? null : new[] { df.PMDesignator, df.PMDesignator.ToLower(), df.PMDesignator.ToUpper() } }, + { "days", new Dictionary + { + { "names", df.DayNames }, + { "namesAbbr", df.AbbreviatedDayNames }, + { "namesShort", df.ShortestDayNames }, + } }, + { "months", new Dictionary + { + { "names", df.MonthNames }, + { "namesAbbr", df.AbbreviatedMonthNames }, + } }, + { "patterns", new Dictionary + { + { "d", df.ShortDatePattern }, + { "D", df.LongDatePattern }, + { "t", df.ShortTimePattern }, + { "T", df.LongTimePattern }, + { "g", df.ShortDatePattern + " " + df.ShortTimePattern }, + { "G", df.ShortDatePattern + " " + df.LongTimePattern }, + { "f", df.FullDateTimePattern }, // TODO: (mc) find it actually { "F", df.FullDateTimePattern }, - { "M", df.MonthDayPattern }, - { "Y", df.YearMonthPattern }, - { "u", df.UniversalSortableDateTimePattern }, - } } - } } - }; - - var json = JsonConvert.SerializeObject(dict, new JsonSerializerSettings - { + { "M", df.MonthDayPattern }, + { "Y", df.YearMonthPattern }, + { "u", df.UniversalSortableDateTimePattern }, + } } + } } + }; + + var json = JsonConvert.SerializeObject(dict, new JsonSerializerSettings + { ContractResolver = SmartContractResolver.Instance, Formatting = Formatting.None - }); + }); - return json; - } - } + return json; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/SmartResourceDisplayName.cs b/src/Presentation/SmartStore.Web.Framework/Localization/SmartResourceDisplayName.cs index e64ca7c164..b009eb95f2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/SmartResourceDisplayName.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/SmartResourceDisplayName.cs @@ -1,5 +1,4 @@ -using System; -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using SmartStore.Core; using SmartStore.Core.Infrastructure; using SmartStore.Services.Localization; @@ -37,9 +36,6 @@ public override string DisplayName } } - public string Name - { - get { return "SmartResourceDisplayName"; } - } + public string Name => "SmartResourceDisplayName"; } } diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/TelerikLocalizationService.cs b/src/Presentation/SmartStore.Web.Framework/Localization/TelerikLocalizationService.cs index 273283616e..c32631747d 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/TelerikLocalizationService.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/TelerikLocalizationService.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using SmartStore.Core.Caching; namespace SmartStore.Web.Framework.Localization @@ -9,43 +7,40 @@ public class TelerikLocalizationService : Telerik.Web.Mvc.Infrastructure.ILocali { private readonly string _componentName; private readonly SmartStore.Services.Localization.ILocalizationService _localizationService; - private readonly IRequestCache _requestCache; + private readonly IRequestCache _requestCache; private readonly int _currentLanguageId; public TelerikLocalizationService( - string componentName, - int currentLanguageId, - Services.Localization.ILocalizationService localizationService, - IRequestCache requestCache) + string componentName, + int currentLanguageId, + Services.Localization.ILocalizationService localizationService, + IRequestCache requestCache) { _componentName = componentName; _currentLanguageId = currentLanguageId; _localizationService = localizationService; - _requestCache = requestCache; + _requestCache = requestCache; } public IDictionary All() { - var scope = "Admin.Telerik." + _componentName; + var scope = "Admin.Telerik." + _componentName; - var cacheKey = scope + ".Resources"; + var cacheKey = scope + ".Resources"; - return _requestCache.Get(cacheKey, () => - { - var resources = _localizationService.GetResourcesByPattern(scope, _currentLanguageId); - var dict = resources.ToDictionarySafe( - x => x.ResourceName.Substring(scope.Length).ToLowerInvariant(), - x => x.ResourceValue); + return _requestCache.Get(cacheKey, () => + { + var resources = _localizationService.GetResourcesByPattern(scope, _currentLanguageId); + var dict = resources.ToDictionarySafe( + x => x.ResourceName.Substring(scope.Length).ToLowerInvariant(), + x => x.ResourceValue); - return dict; - }); - } - - public bool IsDefault - { - get { return true; } + return dict; + }); } + public bool IsDefault => true; + public string One(string key) { var resourceName = "Admin.Telerik." + _componentName + "." + key; diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/TelerikLocalizationServiceFactory.cs b/src/Presentation/SmartStore.Web.Framework/Localization/TelerikLocalizationServiceFactory.cs index 5d6855db9a..9bccaf1612 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/TelerikLocalizationServiceFactory.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/TelerikLocalizationServiceFactory.cs @@ -8,16 +8,16 @@ public class TelerikLocalizationServiceFactory : ILocalizationServiceFactory { private readonly IWorkContext _workContext; private readonly Services.Localization.ILocalizationService _localizationService; - private readonly IRequestCache _requestCache; + private readonly IRequestCache _requestCache; - public TelerikLocalizationServiceFactory( - IWorkContext workContext, - Services.Localization.ILocalizationService localizationService, - IRequestCache requestCache) + public TelerikLocalizationServiceFactory( + IWorkContext workContext, + Services.Localization.ILocalizationService localizationService, + IRequestCache requestCache) { _workContext = workContext; _localizationService = localizationService; - _requestCache = requestCache; + _requestCache = requestCache; } public ILocalizationService Create(string componentName, System.Globalization.CultureInfo culture) diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/Text.cs b/src/Presentation/SmartStore.Web.Framework/Localization/Text.cs index e3ace14f69..a2296ac505 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/Text.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/Text.cs @@ -1,44 +1,43 @@ -using System; -using SmartStore.Core.Localization; +using SmartStore.Core.Localization; using SmartStore.Services.Localization; namespace SmartStore.Web.Framework.Localization { - public class Text : IText - { - private readonly ILocalizationService _localizationService; - - public Text(ILocalizationService localizationService) - { - _localizationService = localizationService; - } - - public LocalizedString Get(string key, params object[] args) - { - return GetEx(key, 0, args); - } - - public LocalizedString GetEx(string key, int languageId, params object[] args) - { - try - { - var value = _localizationService.GetResource(key, languageId); - - if (string.IsNullOrEmpty(value)) - { - return new LocalizedString(key); - } - - if (args == null || args.Length == 0) - { - return new LocalizedString(value); - } - - return new LocalizedString(string.Format(value, args), key, args); - } - catch { } - - return new LocalizedString(key); - } - } + public class Text : IText + { + private readonly ILocalizationService _localizationService; + + public Text(ILocalizationService localizationService) + { + _localizationService = localizationService; + } + + public LocalizedString Get(string key, params object[] args) + { + return GetEx(key, 0, args); + } + + public LocalizedString GetEx(string key, int languageId, params object[] args) + { + try + { + var value = _localizationService.GetResource(key, languageId); + + if (string.IsNullOrEmpty(value)) + { + return new LocalizedString(key); + } + + if (args == null || args.Length == 0) + { + return new LocalizedString(value); + } + + return new LocalizedString(string.Format(value, args), key, args); + } + catch { } + + return new LocalizedString(key); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/MediaTemplateModel.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/MediaTemplateModel.cs index 843210f093..9b2b6bd456 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/MediaTemplateModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/MediaTemplateModel.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.Web.Routing; -using SmartStore.Services.Localization; using SmartStore.Services.Media; namespace SmartStore.Web.Framework.Modelling diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs index 2d81d39f80..9ae7515a84 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs @@ -7,111 +7,111 @@ namespace SmartStore.Web.Framework.Modelling { [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] - public sealed class CustomModelPartAttribute : Attribute + public sealed class CustomModelPartAttribute : Attribute { } - - [Serializable] - public sealed class CustomPropertiesDictionary : Dictionary - { - } - - [Serializable] - public abstract partial class ModelBase + + [Serializable] + public sealed class CustomPropertiesDictionary : Dictionary + { + } + + [Serializable] + public abstract partial class ModelBase { - private readonly static ContextState>> _contextState; + private readonly static ContextState>> _contextState; - static ModelBase() - { - _contextState = new ContextState>>("ModelBase.CustomThreadProperties"); - } + static ModelBase() + { + _contextState = new ContextState>>("ModelBase.CustomThreadProperties"); + } - protected ModelBase() + protected ModelBase() { - CustomProperties = new CustomPropertiesDictionary(); + CustomProperties = new CustomPropertiesDictionary(); } - + public virtual void BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { } - /// - /// Gets a custom property value either from the thread local or the static storage (in this particular order) - /// - /// Type of property - /// Custom property key - /// The property value or null - public TProperty Get(string key) - { - Guard.NotEmpty(key, nameof(key)); + /// + /// Gets a custom property value either from the thread local or the static storage (in this particular order) + /// + /// Type of property + /// Custom property key + /// The property value or null + public TProperty Get(string key) + { + Guard.NotEmpty(key, nameof(key)); - IDictionary dict; + IDictionary dict; - if (TryGetCustomThreadProperties(false, out dict) && dict.TryGetValue(key, out var value)) - { - return (TProperty)value; - } + if (TryGetCustomThreadProperties(false, out dict) && dict.TryGetValue(key, out var value)) + { + return (TProperty)value; + } - if (CustomProperties.TryGetValue(key, out value)) - { - return (TProperty)value; - } + if (CustomProperties.TryGetValue(key, out value)) + { + return (TProperty)value; + } - return default(TProperty); - } + return default(TProperty); + } /// /// Use this property to store any custom value for your models. /// public CustomPropertiesDictionary CustomProperties { get; set; } - /// - /// A data bag for custom model properties which only - /// lives during a thread/request lifecycle - /// - /// - /// Use thread properties whenever you need to persist request-scoped data, - /// but the model is potentially cached statically. - /// - [JsonIgnore] - public IDictionary CustomThreadProperties - { - get - { - IDictionary dict; - TryGetCustomThreadProperties(true, out dict); - return dict; - } - } - - private bool TryGetCustomThreadProperties(bool create, out IDictionary dict) - { - dict = null; - var state = _contextState.GetState(); - - if (state == null && create) - { - state = new Dictionary>(); - _contextState.SetState(state); - } - - if (state != null) - { - if (!state.TryGetValue(this, out dict)) - { - if (create) - { - dict = new Dictionary(StringComparer.OrdinalIgnoreCase); - state[this] = dict; - } - } - - return dict != null; - } - - return false; - } - } + /// + /// A data bag for custom model properties which only + /// lives during a thread/request lifecycle + /// + /// + /// Use thread properties whenever you need to persist request-scoped data, + /// but the model is potentially cached statically. + /// + [JsonIgnore] + public IDictionary CustomThreadProperties + { + get + { + IDictionary dict; + TryGetCustomThreadProperties(true, out dict); + return dict; + } + } + + private bool TryGetCustomThreadProperties(bool create, out IDictionary dict) + { + dict = null; + var state = _contextState.GetState(); + + if (state == null && create) + { + state = new Dictionary>(); + _contextState.SetState(state); + } + + if (state != null) + { + if (!state.TryGetValue(this, out dict)) + { + if (create) + { + dict = new Dictionary(StringComparer.OrdinalIgnoreCase); + state[this] = dict; + } + } + + return dict != null; + } + + return false; + } + } public abstract partial class EntityModelBase : ModelBase { @@ -128,8 +128,8 @@ public abstract partial class EntityModelBase : ModelBase } - public abstract partial class TabbableModel : EntityModelBase - { - public virtual string[] LoadedTabs { get; set; } - } + public abstract partial class TabbableModel : EntityModelBase + { + public virtual string[] LoadedTabs { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBoundEvent.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBoundEvent.cs index 756aceedde..976ac877b3 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBoundEvent.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBoundEvent.cs @@ -2,17 +2,17 @@ namespace SmartStore.Web.Framework.Modelling { - public class ModelBoundEvent - { - public ModelBoundEvent(TabbableModel boundModel, object entityModel, FormCollection form) + public class ModelBoundEvent + { + public ModelBoundEvent(TabbableModel boundModel, object entityModel, FormCollection form) { - this.BoundModel = boundModel; - this.EntityModel = entityModel; - this.Form = form; + this.BoundModel = boundModel; + this.EntityModel = entityModel; + this.Form = form; } - public TabbableModel BoundModel { get; private set; } + public TabbableModel BoundModel { get; private set; } public object EntityModel { get; private set; } - public FormCollection Form { get; private set; } - } + public FormCollection Form { get; private set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs index e536be675e..ed232f2cf9 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs @@ -1,5 +1,4 @@ using System; -using System.Drawing; using System.Globalization; using System.IO; using System.Web; @@ -10,232 +9,232 @@ namespace SmartStore.Web.Framework.Modelling { - public class CachedFileResult : ActionResult, IFileResponse - { - #region Ctor - - public CachedFileResult(string path, string contentType = null) - : this(GetFileInfo(path), contentType) - { - } - - public CachedFileResult(FileInfo file, string contentType = null) - { - Guard.NotNull(file, nameof(file)); - - if (!file.Exists) - { - throw new FileNotFoundException(file.FullName); - } - - Transmitter = new FileStreamTransmitter(file.OpenRead); - ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(file.Name); - FileLength = file.Length; - LastModifiedUtc = file.LastWriteTimeUtc; - } - - public CachedFileResult(IFile file, string contentType = null) - { - Guard.NotNull(file, nameof(file)); - - if (!file.Exists) - { - throw new FileNotFoundException(file.Path); - } - - Transmitter = new FileStreamTransmitter(file.OpenRead); - ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(file.Name); - FileLength = file.Size; - LastModifiedUtc = file.LastUpdated; - } - - public CachedFileResult(VirtualFile file, DateTime? lastModifiedUtc = null, string contentType = null) - { - Guard.NotNull(file, nameof(file)); - - try - { - var fi = GetFileInfo(file.VirtualPath); - if (fi.Exists) - { - ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(fi.Name); - FileLength = fi.Length; - LastModifiedUtc = fi.LastWriteTimeUtc; - } - } - finally - { - if (lastModifiedUtc == null) - { - throw new ArgumentNullException(nameof(lastModifiedUtc), "A modification date must be provided if the VirtualFile cannot be mapped to a physical path."); - } - - if (FileLength == null) - { - ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(file.Name); - using (var stream = file.Open()) - { - FileLength = stream.Length; - } - } - } - - Transmitter = new FileStreamTransmitter(file.Open); - LastModifiedUtc = lastModifiedUtc.Value; - } - - public CachedFileResult(string contentType, DateTime lastModifiedUtc, Func factory, long? fileLength = null) - { - Guard.NotNull(factory, nameof(factory)); - Guard.NotEmpty(contentType, nameof(contentType)); - - Transmitter = new FileStreamTransmitter(factory); - ContentType = contentType; - FileLength = fileLength; - LastModifiedUtc = lastModifiedUtc; - } - - public CachedFileResult(string contentType, DateTime lastModifiedUtc, Func factory, long? fileLength = null) - { - Guard.NotNull(factory, nameof(factory)); - Guard.NotEmpty(contentType, nameof(contentType)); - - Transmitter = new FileBufferTransmitter(factory); - ContentType = contentType; - FileLength = fileLength; - LastModifiedUtc = lastModifiedUtc; - } - - private static FileInfo GetFileInfo(string path) - { - Guard.NotEmpty(path, nameof(path)); - - if (!PathHelper.IsAbsolutePhysicalPath(path)) - { - path = CommonHelper.MapPath(path); - } - - return new FileInfo(path); - } - - #endregion - - #region Properties - - public string ContentType { get; private set; } - - public long? FileLength { get; set; } - - public DateTime LastModifiedUtc { get; set; } - - public TimeSpan MaxAge { get; set; } = TimeSpan.FromDays(7); - - /// - /// If not set, will be auto-generated based on property. - /// - public string ETag { get; set; } - - public FileTransmitter Transmitter { get; private set; } - - /// - /// A callback that will be invoked on successful result execution - /// - public Action OnExecuted { get; set; } - - #endregion - - public override void ExecuteResult(ControllerContext context) - { - var httpContext = context.HttpContext; - var request = httpContext.Request; - var response = httpContext.Response; - - // Fix Last Modified Time. We might need it soon - // if we encounter a Range: and If-Range header - // Using UTC time to avoid daylight savings time bug 83230 - var lastModified = new DateTime(LastModifiedUtc.Year, - LastModifiedUtc.Month, - LastModifiedUtc.Day, - LastModifiedUtc.Hour, - LastModifiedUtc.Minute, - LastModifiedUtc.Second, - 0, - DateTimeKind.Utc); - - // Because we can't set a "Last-Modified" header to any time - // in the future, check the last modified time and set it to - // DateTime.Now if it's in the future. - // This is to fix VSWhidbey #402323 - var utcNow = DateTime.UtcNow; - if (lastModified > utcNow) - { - // use 1 second resolution - lastModified = new DateTime(utcNow.Ticks - (utcNow.Ticks % TimeSpan.TicksPerSecond), DateTimeKind.Utc); - } - - LastModifiedUtc = lastModified; - - // Generate ETag if empty - if (ETag.IsEmpty()) - { - ETag = GenerateETag(httpContext, lastModified, utcNow); - } - - // Determine applicable file responder - var responder = ResolveResponder(request); - - // Execute response (send file) - if (responder.TrySendHeaders(httpContext)) - { - responder.SendFile(httpContext); - } - - // Finish: invoke the optional callback - OnExecuted?.Invoke(); - } - - private FileResponder ResolveResponder(HttpRequestBase request) - { - // Is this a HEAD request - if (request.HttpMethod == "HEAD") - { - return new HeadFileResponder(this); - } - - // Is this a request for an unmodified file? - var ifNoneMatch = request.Headers["If-None-Match"]; - if (ifNoneMatch.HasValue() && ETag == ifNoneMatch) - { - return new UnmodifiedFileResponder(this); - } - - // Is this a Range request? - var rangeHeader = request.Headers["Range"]; - if (rangeHeader.HasValue() && rangeHeader.StartsWith("bytes", StringComparison.OrdinalIgnoreCase)) - { - return new RangeFileResponder(this, rangeHeader); - } - - // Responder for sending the whole file - return new FullFileResponder(this); - } - - private static string GenerateETag(HttpContextBase context, DateTime lastModified, DateTime now) - { - // Get 64-bit FILETIME stamp - var lastModFileTime = lastModified.ToFileTime(); - var nowFileTime = now.ToFileTime(); - var hexFileTime = lastModFileTime.ToString("X8", CultureInfo.InvariantCulture); - - //// Do what IIS does to determine if this is a weak ETag. - //// Compare the last modified time to now and if the difference is - //// less than or equal to 3 seconds, then it is weak - //if ((nowFileTime - lastModFileTime) <= 30000000) - //{ - // return "W/\"" + hexFileTime + "\""; - //} - - return "\"" + hexFileTime + "\""; - } - } + public class CachedFileResult : ActionResult, IFileResponse + { + #region Ctor + + public CachedFileResult(string path, string contentType = null) + : this(GetFileInfo(path), contentType) + { + } + + public CachedFileResult(FileInfo file, string contentType = null) + { + Guard.NotNull(file, nameof(file)); + + if (!file.Exists) + { + throw new FileNotFoundException(file.FullName); + } + + Transmitter = new FileStreamTransmitter(file.OpenRead); + ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(file.Name); + FileLength = file.Length; + LastModifiedUtc = file.LastWriteTimeUtc; + } + + public CachedFileResult(IFile file, string contentType = null) + { + Guard.NotNull(file, nameof(file)); + + if (!file.Exists) + { + throw new FileNotFoundException(file.Path); + } + + Transmitter = new FileStreamTransmitter(file.OpenRead); + ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(file.Name); + FileLength = file.Size; + LastModifiedUtc = file.LastUpdated; + } + + public CachedFileResult(VirtualFile file, DateTime? lastModifiedUtc = null, string contentType = null) + { + Guard.NotNull(file, nameof(file)); + + try + { + var fi = GetFileInfo(file.VirtualPath); + if (fi.Exists) + { + ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(fi.Name); + FileLength = fi.Length; + LastModifiedUtc = fi.LastWriteTimeUtc; + } + } + finally + { + if (lastModifiedUtc == null) + { + throw new ArgumentNullException(nameof(lastModifiedUtc), "A modification date must be provided if the VirtualFile cannot be mapped to a physical path."); + } + + if (FileLength == null) + { + ContentType = contentType.NullEmpty() ?? MimeTypes.MapNameToMimeType(file.Name); + using (var stream = file.Open()) + { + FileLength = stream.Length; + } + } + } + + Transmitter = new FileStreamTransmitter(file.Open); + LastModifiedUtc = lastModifiedUtc.Value; + } + + public CachedFileResult(string contentType, DateTime lastModifiedUtc, Func factory, long? fileLength = null) + { + Guard.NotNull(factory, nameof(factory)); + Guard.NotEmpty(contentType, nameof(contentType)); + + Transmitter = new FileStreamTransmitter(factory); + ContentType = contentType; + FileLength = fileLength; + LastModifiedUtc = lastModifiedUtc; + } + + public CachedFileResult(string contentType, DateTime lastModifiedUtc, Func factory, long? fileLength = null) + { + Guard.NotNull(factory, nameof(factory)); + Guard.NotEmpty(contentType, nameof(contentType)); + + Transmitter = new FileBufferTransmitter(factory); + ContentType = contentType; + FileLength = fileLength; + LastModifiedUtc = lastModifiedUtc; + } + + private static FileInfo GetFileInfo(string path) + { + Guard.NotEmpty(path, nameof(path)); + + if (!PathHelper.IsAbsolutePhysicalPath(path)) + { + path = CommonHelper.MapPath(path); + } + + return new FileInfo(path); + } + + #endregion + + #region Properties + + public string ContentType { get; private set; } + + public long? FileLength { get; set; } + + public DateTime LastModifiedUtc { get; set; } + + public TimeSpan MaxAge { get; set; } = TimeSpan.FromDays(7); + + /// + /// If not set, will be auto-generated based on property. + /// + public string ETag { get; set; } + + public FileTransmitter Transmitter { get; private set; } + + /// + /// A callback that will be invoked on successful result execution + /// + public Action OnExecuted { get; set; } + + #endregion + + public override void ExecuteResult(ControllerContext context) + { + var httpContext = context.HttpContext; + var request = httpContext.Request; + var response = httpContext.Response; + + // Fix Last Modified Time. We might need it soon + // if we encounter a Range: and If-Range header + // Using UTC time to avoid daylight savings time bug 83230 + var lastModified = new DateTime(LastModifiedUtc.Year, + LastModifiedUtc.Month, + LastModifiedUtc.Day, + LastModifiedUtc.Hour, + LastModifiedUtc.Minute, + LastModifiedUtc.Second, + 0, + DateTimeKind.Utc); + + // Because we can't set a "Last-Modified" header to any time + // in the future, check the last modified time and set it to + // DateTime.Now if it's in the future. + // This is to fix VSWhidbey #402323 + var utcNow = DateTime.UtcNow; + if (lastModified > utcNow) + { + // use 1 second resolution + lastModified = new DateTime(utcNow.Ticks - (utcNow.Ticks % TimeSpan.TicksPerSecond), DateTimeKind.Utc); + } + + LastModifiedUtc = lastModified; + + // Generate ETag if empty + if (ETag.IsEmpty()) + { + ETag = GenerateETag(httpContext, lastModified, utcNow); + } + + // Determine applicable file responder + var responder = ResolveResponder(request); + + // Execute response (send file) + if (responder.TrySendHeaders(httpContext)) + { + responder.SendFile(httpContext); + } + + // Finish: invoke the optional callback + OnExecuted?.Invoke(); + } + + private FileResponder ResolveResponder(HttpRequestBase request) + { + // Is this a HEAD request + if (request.HttpMethod == "HEAD") + { + return new HeadFileResponder(this); + } + + // Is this a request for an unmodified file? + var ifNoneMatch = request.Headers["If-None-Match"]; + if (ifNoneMatch.HasValue() && ETag == ifNoneMatch) + { + return new UnmodifiedFileResponder(this); + } + + // Is this a Range request? + var rangeHeader = request.Headers["Range"]; + if (rangeHeader.HasValue() && rangeHeader.StartsWith("bytes", StringComparison.OrdinalIgnoreCase)) + { + return new RangeFileResponder(this, rangeHeader); + } + + // Responder for sending the whole file + return new FullFileResponder(this); + } + + private static string GenerateETag(HttpContextBase context, DateTime lastModified, DateTime now) + { + // Get 64-bit FILETIME stamp + var lastModFileTime = lastModified.ToFileTime(); + var nowFileTime = now.ToFileTime(); + var hexFileTime = lastModFileTime.ToString("X8", CultureInfo.InvariantCulture); + + //// Do what IIS does to determine if this is a weak ETag. + //// Compare the last modified time to now and if the difference is + //// less than or equal to 3 seconds, then it is weak + //if ((nowFileTime - lastModFileTime) <= 30000000) + //{ + // return "W/\"" + hexFileTime + "\""; + //} + + return "\"" + hexFileTime + "\""; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs index 777ae66757..bbf053767c 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs @@ -6,589 +6,589 @@ namespace SmartStore.Web.Framework.Modelling { - internal abstract class FileResponder - { - protected FileResponder(IFileResponse fileResponse) - { - Guard.NotNull(fileResponse, nameof(fileResponse)); - FileResponse = fileResponse; - } - - protected IFileResponse FileResponse { get; private set; } - - public virtual bool TrySendHeaders(HttpContextBase context) - { - var response = context.Response; - - var utcNow = DateTime.UtcNow; - - // Specify content type - response.ContentType = FileResponse.ContentType; - // We support byte ranges - response.AppendHeader("Accept-Ranges", "bytes"); - //// Set the expires header for HTTP 1.0 cliets - //response.Cache.SetExpires(utcNow.Add(FileResponse.MaxAge)); - // How often the browser should check that it has the latest version - response.Cache.SetMaxAge(FileResponse.MaxAge); - // The unique identifier for the entity - response.Cache.SetETag(FileResponse.ETag); - // Proxy and browser can cache response - response.Cache.SetCacheability(HttpCacheability.Public); - // Proxy cache should check with orginal server once cache has expired - response.Cache.SetRevalidation(HttpCacheRevalidation.AllCaches); - //// The date the file was last modified - //context.Response.Cache.SetLastModified(FileResponse.LastModifiedUtc); + internal abstract class FileResponder + { + protected FileResponder(IFileResponse fileResponse) + { + Guard.NotNull(fileResponse, nameof(fileResponse)); + FileResponse = fileResponse; + } + + protected IFileResponse FileResponse { get; private set; } + + public virtual bool TrySendHeaders(HttpContextBase context) + { + var response = context.Response; + + var utcNow = DateTime.UtcNow; + + // Specify content type + response.ContentType = FileResponse.ContentType; + // We support byte ranges + response.AppendHeader("Accept-Ranges", "bytes"); + //// Set the expires header for HTTP 1.0 cliets + //response.Cache.SetExpires(utcNow.Add(FileResponse.MaxAge)); + // How often the browser should check that it has the latest version + response.Cache.SetMaxAge(FileResponse.MaxAge); + // The unique identifier for the entity + response.Cache.SetETag(FileResponse.ETag); + // Proxy and browser can cache response + response.Cache.SetCacheability(HttpCacheability.Public); + // Proxy cache should check with orginal server once cache has expired + response.Cache.SetRevalidation(HttpCacheRevalidation.AllCaches); + //// The date the file was last modified + //context.Response.Cache.SetLastModified(FileResponse.LastModifiedUtc); - return true; - } - - public abstract void SendFile(HttpContextBase context); - } + return true; + } + + public abstract void SendFile(HttpContextBase context); + } - internal sealed class HeadFileResponder : FileResponder - { - public HeadFileResponder(IFileResponse fileResponse) - : base(fileResponse) - { - } - - public override bool TrySendHeaders(HttpContextBase context) - { - var response = context.Response; - - base.TrySendHeaders(context); + internal sealed class HeadFileResponder : FileResponder + { + public HeadFileResponder(IFileResponse fileResponse) + : base(fileResponse) + { + } + + public override bool TrySendHeaders(HttpContextBase context) + { + var response = context.Response; + + base.TrySendHeaders(context); - response.StatusCode = (int)HttpStatusCode.OK; - response.AddHeader("Content-Length", (FileResponse.FileLength ?? 0).ToString(CultureInfo.InvariantCulture)); - - //if (FileResponse.Dimensions != null) - //{ - // response.AddHeader("X-Width", FileResponse.Dimensions.Value.Width.ToString(CultureInfo.InvariantCulture)); - // response.AddHeader("X-Height", FileResponse.Dimensions.Value.Height.ToString(CultureInfo.InvariantCulture)); - //} - - response.End(); - - return true; - } - - public override void SendFile(HttpContextBase context) - { - // Don't send any file. - } - } - - - internal sealed class UnmodifiedFileResponder : FileResponder - { - public UnmodifiedFileResponder(IFileResponse fileResponse) - : base(fileResponse) - { - } - - public override bool TrySendHeaders(HttpContextBase context) - { - var response = context.Response; - - base.TrySendHeaders(context); - - response.StatusCode = (int)HttpStatusCode.NotModified; - response.StatusDescription = "Not Modified"; - - // Explicitly set the Content-Length header so the client doesn't wait for - // content but keeps the connection open for other requests - response.AddHeader("Content-Length", "0"); - - return true; - } - - public override void SendFile(HttpContextBase context) - { - // Don't send file, it is unmodified. Let browser fetch from its cache. - } - } - - - - internal sealed class FullFileResponder : FileResponder - { - public FullFileResponder(IFileResponse fileResponse) - : base(fileResponse) - { - } - - public override bool TrySendHeaders(HttpContextBase context) - { - base.TrySendHeaders(context); - - // The date the file was last modified - context.Response.Cache.SetLastModified(FileResponse.LastModifiedUtc); - - return true; - } - - public override void SendFile(HttpContextBase context) - { - var fileLength = FileResponse.FileLength ?? FileResponse.Transmitter.GetFileLength(); - FileResponse.Transmitter.TransmitFile(0, fileLength, fileLength, context); - } - } - - - - internal sealed class RangeFileResponder : FileResponder - { - internal struct ByteRange - { - internal long Offset; - internal long Length; - } - - private const string RANGE_BOUNDARY = ""; - private const string MULTIPART_CONTENT_TYPE = "multipart/byteranges; boundary="; - private const string MULTIPART_RANGE_DELIMITER = "--\r\n"; - private const string MULTIPART_RANGE_END = "----\r\n\r\n"; - private const string CONTENT_RANGE_FORMAT = "bytes {0}-{1}/{2}"; - private const int MAX_RANGE_ALLOWED = 5; - - private const int ERROR_ACCESS_DENIED = 5; - - private static readonly string[] _httpDateFormats = new string[] { "r", "dddd, dd-MMM-yy HH':'mm':'ss 'GMT'", "ddd MMM d HH':'mm':'ss yyyy" }; - - private readonly FileResponder _defaultResponder; - private readonly string _rangeHeader; - - public RangeFileResponder(IFileResponse fileResponse, string rangeHeader) - : base(fileResponse) - { - _defaultResponder = new FullFileResponder(fileResponse); - _rangeHeader = rangeHeader; - } - - public override bool TrySendHeaders(HttpContextBase context) - { - var fileLength = FileResponse.FileLength ?? FileResponse.Transmitter.GetFileLength(); - var etag = FileResponse.ETag; - var lastModified = FileResponse.LastModifiedUtc; - - var handled = ExecuteRangeRequest(context, fileLength, _rangeHeader, etag, lastModified); - if (!handled && _defaultResponder.TrySendHeaders(context)) - { - _defaultResponder.SendFile(context); - handled = true; - } - - return handled; - } - - public override void SendFile(HttpContextBase context) - { - // Do nothing here, we have handled everything in 'TrySendHeaders()' already - } - - #region Range Utils - - // Most of the helpers here were copied over from the internal StaticFileHandler.cs - - private bool ExecuteRangeRequest( - HttpContextBase context, - long fileLength, - string rangeHeader, - string etag, - DateTime lastModified) - { - var handled = false; - var request = context.Request; - var response = context.Response; - - // return "416 Requested range not satisfiable" if the file length is zero. - if (fileLength <= 0) - { - SendRangeNotSatisfiable(response, fileLength); - handled = true; - return handled; - } - - var ifRangeHeader = request.Headers["If-Range"]; - if (ifRangeHeader != null && ifRangeHeader.Length > 1) - { - // Is this an ETag or a Date? We only need to check two - // characters; an ETag either begins with W/ or it is quoted. - if (ifRangeHeader[0] == '"') - { - // it's a strong ETag - if (ifRangeHeader != etag) - { - // the etags do not match, and we will therefore return the entire response - return handled; - } - } - else if (ifRangeHeader[0] == 'W' && ifRangeHeader[1] == '/') - { - // it's a weak ETag, and is therefore not usable for sub-range retrieval and - // we will return the entire response - return handled; - } - else - { - // It's a date. If it is greater than or equal to the last-write time of the file, we can send the range. - if (IsOutDated(ifRangeHeader, lastModified)) - { - return handled; - } - } - } - - // the expected format is "bytes = [, , ...]" - // where is "-[]" or "-". - int indexOfEquals = rangeHeader.IndexOf('='); - if (indexOfEquals == -1 || indexOfEquals == rangeHeader.Length - 1) - { - // invalid syntax - return handled; - } - - int startIndex = indexOfEquals + 1; - bool isRangeHeaderSyntacticallyValid = true; - long offset; - long length; - bool isSatisfiable; - bool exceededMax = false; - ByteRange[] byteRanges = null; - int byteRangesCount = 0; - long totalBytes = 0; - while (startIndex < rangeHeader.Length && isRangeHeaderSyntacticallyValid) - { - isRangeHeaderSyntacticallyValid = GetNextRange(rangeHeader, ref startIndex, fileLength, out offset, out length, out isSatisfiable); - - if (!isRangeHeaderSyntacticallyValid) - { - break; - } - - if (!isSatisfiable) - { - continue; - } - - if (byteRanges == null) - { - byteRanges = new ByteRange[16]; - } - - if (byteRangesCount >= byteRanges.Length) - { - // grow byteRanges array - ByteRange[] buffer = new ByteRange[byteRanges.Length * 2]; - Array.Copy(byteRanges, buffer, byteRanges.Length); - byteRanges = buffer; - } - - byteRanges[byteRangesCount].Offset = offset; - byteRanges[byteRangesCount].Length = length; - byteRangesCount++; - - // IIS imposes this limitation too, and sends "400 Bad Request" if exceeded - totalBytes += length; - if (totalBytes > fileLength * MAX_RANGE_ALLOWED) - { - exceededMax = true; - break; - } - } - - if (!isRangeHeaderSyntacticallyValid) - { - return handled; - } - - if (exceededMax) - { - SendBadRequest(response); - handled = true; - return handled; - } - - if (byteRangesCount == 0) - { - // we parsed the Range header and found no satisfiable byte ranges, so return "416 Requested Range Not Satisfiable" - SendRangeNotSatisfiable(response, fileLength); - handled = true; - return handled; - } - - if (byteRangesCount == 1) - { - offset = byteRanges[0].Offset; - length = byteRanges[0].Length; - response.ContentType = FileResponse.ContentType; - string contentRange = String.Format(CultureInfo.InvariantCulture, CONTENT_RANGE_FORMAT, offset, offset + length - 1, fileLength); - response.AppendHeader("Content-Range", contentRange); - - SendResponseHeaders(); - FileResponse.Transmitter.TransmitFile(offset, length, fileLength, context); - } - else - { - response.ContentType = MULTIPART_CONTENT_TYPE; - string contentRange; - string partialContentType = "Content-Type: " + FileResponse.ContentType + "\r\n"; - - SendResponseHeaders(); - - for (int i = 0; i < byteRangesCount; i++) - { - offset = byteRanges[i].Offset; - length = byteRanges[i].Length; - response.Write(MULTIPART_RANGE_DELIMITER); - response.Write(partialContentType); - response.Write("Content-Range: "); - contentRange = String.Format(CultureInfo.InvariantCulture, CONTENT_RANGE_FORMAT, offset, offset + length - 1, fileLength); - response.Write(contentRange); - response.Write("\r\n\r\n"); - // Transmit - FileResponse.Transmitter.TransmitFile(offset, length, fileLength, context); - response.Write("\r\n"); - } - response.Write(MULTIPART_RANGE_END); - } - - handled = true; - return handled; - - void SendResponseHeaders() - { - // Send a "206 Partial Content" status - response.StatusCode = (int)HttpStatusCode.PartialContent; - response.AppendHeader("Accept-Ranges", "bytes"); - response.Cache.SetLastModified(lastModified); - response.Cache.SetETag(etag); - response.Cache.SetCacheability(HttpCacheability.Public); - } - } - - private void SendBadRequest(HttpResponseBase response) - { - response.StatusCode = (int)HttpStatusCode.BadRequest; - response.Write("Bad Request"); - } - - private void SendRangeNotSatisfiable(HttpResponseBase response, long fileLength) - { - response.StatusCode = (int)HttpStatusCode.RequestedRangeNotSatisfiable; - response.ContentType = null; - response.AppendHeader("Content-Range", "bytes */" + fileLength.ToString(NumberFormatInfo.InvariantInfo)); - } - - private static bool IsOutDated(string ifRangeHeader, DateTime lastModified) - { - try - { - var utcLastModified = lastModified.ToUniversalTime(); - var utc = UtcParse(ifRangeHeader); - return (utc < utcLastModified); - } - catch - { - return true; - } - } - - private static DateTime UtcParse(string time) - { - Guard.NotNull(time, nameof(time)); - - var dtStyles = DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal; - if (DateTime.TryParseExact(time, _httpDateFormats, null, dtStyles, out var utcDate)) - { - return utcDate; - } - - throw new FormatException($"{time} is an invalid date expression."); - } - - // initial space characters are skipped, and the string of digits up until the first non-digit - // are converted to a long. If digits are found the method returns true; otherwise false. - private static bool GetLongFromSubstring(string s, ref int startIndex, out long result) - { - result = 0; - - // get index of first digit - MovePastSpaceCharacters(s, ref startIndex); - int beginIndex = startIndex; - - // get index of last digit - MovePastDigits(s, ref startIndex); - int endIndex = startIndex - 1; - - // are there any digits? - if (endIndex < beginIndex) - { - return false; - } - - long multipleOfTen = 1; - for (int i = endIndex; i >= beginIndex; i--) - { - int digit = s[i] - '0'; - result += digit * multipleOfTen; - multipleOfTen *= 10; - // check for overflow - if (result < 0) - { - return false; - } - } - - return true; - } - - // The Range header consists of one or more byte range specifiers. E.g, "Range: bytes=0-1024,-1024" is a request - // for the first and last 1024 bytes of a file. Before this method is called, startIndex points to the beginning - // of a byte range specifier; and afterwards it points to the beginning of the next byte range specifier. - // If the current byte range specifier is syntactially inavlid, this function will return false indicating that the - // Range header must be ignored. If the function returns true, then the byte range specifier will be converted to - // an offset and length, and the startIndex will be incremented to the next byte range specifier. The byte range - // specifier (offset and length) returned by this function is satisfiable if and only if isSatisfiable is true. - private static bool GetNextRange(string rangeHeader, ref int startIndex, long fileLength, out long offset, out long length, out bool isSatisfiable) - { - // startIndex is first char after '=', or first char after ',' - Debug.Assert(startIndex < rangeHeader.Length, "startIndex < rangeHeader.Length"); - - offset = 0; - length = 0; - isSatisfiable = false; - - // A Range request to an empty file is never satisfiable, and will always receive a 416 status. - if (fileLength <= 0) - { - // put startIndex at end of string so we don't try to call GetNextRange again - startIndex = rangeHeader.Length; - return true; - } - - MovePastSpaceCharacters(rangeHeader, ref startIndex); - - if (startIndex < rangeHeader.Length && rangeHeader[startIndex] == '-') - { - // this range is of the form "-mmm" - startIndex++; - if (!GetLongFromSubstring(rangeHeader, ref startIndex, out length)) - { - return false; - } - - if (length > fileLength) - { - // send entire file - offset = 0; - length = fileLength; - } - else - { - // send last N bytes - offset = fileLength - length; - } - - isSatisfiable = IsRangeSatisfiable(offset, length, fileLength); - // we parsed the current range, but need to successfully move the startIndex to the next range - return IncrementToNextRange(rangeHeader, ref startIndex); - } - else - { - // this range is of the form "nnn-[mmm]" - if (!GetLongFromSubstring(rangeHeader, ref startIndex, out offset)) - { - return false; - } - - // increment startIndex past '-' - if (startIndex < rangeHeader.Length && rangeHeader[startIndex] == '-') - { - startIndex++; - } - else - { - return false; - } - - if (!GetLongFromSubstring(rangeHeader, ref startIndex, out long endPos)) - { - // assume range is of form "nnn-". If it isn't, - // the call to IncrementToNextRange will return false - length = fileLength - offset; - } - else - { - // if...greater than or equal to the current length of the entity-body, last-byte-pos - // is taken to be equal to one less than the current length of the entity- body in bytes. - if (endPos > fileLength - 1) - { - endPos = fileLength - 1; - } - - length = endPos - offset + 1; - - if (length < 1) - { - // the byte range specifier is syntactially invalid - // because the last-byte-pos < first-byte-pos - return false; - } - } - - isSatisfiable = IsRangeSatisfiable(offset, length, fileLength); - - // we parsed the current range, but need to successfully move the startIndex to the next range - return IncrementToNextRange(rangeHeader, ref startIndex); - } - } - - private static bool IncrementToNextRange(string s, ref int startIndex) - { - // increment startIndex until next token and return true, unless the syntax is invalid - MovePastSpaceCharacters(s, ref startIndex); - - if (startIndex < s.Length) - { - if (s[startIndex] != ',') - { - return false; - } - // move to first char after ',' - startIndex++; - } - - return true; - } - - private static bool IsRangeSatisfiable(long offset, long length, long fileLength) - { - return (offset < fileLength && length > 0); - } - - private static bool IsSecurityError(int ErrorCode) - { - return (ErrorCode == ERROR_ACCESS_DENIED); - } - - private static void MovePastSpaceCharacters(string s, ref int startIndex) - { - while (startIndex < s.Length && s[startIndex] == ' ') - { - startIndex++; - } - } - - private static void MovePastDigits(string s, ref int startIndex) - { - while (startIndex < s.Length && s[startIndex] <= '9' && s[startIndex] >= '0') - { - startIndex++; - } - } - - #endregion - } + response.StatusCode = (int)HttpStatusCode.OK; + response.AddHeader("Content-Length", (FileResponse.FileLength ?? 0).ToString(CultureInfo.InvariantCulture)); + + //if (FileResponse.Dimensions != null) + //{ + // response.AddHeader("X-Width", FileResponse.Dimensions.Value.Width.ToString(CultureInfo.InvariantCulture)); + // response.AddHeader("X-Height", FileResponse.Dimensions.Value.Height.ToString(CultureInfo.InvariantCulture)); + //} + + response.End(); + + return true; + } + + public override void SendFile(HttpContextBase context) + { + // Don't send any file. + } + } + + + internal sealed class UnmodifiedFileResponder : FileResponder + { + public UnmodifiedFileResponder(IFileResponse fileResponse) + : base(fileResponse) + { + } + + public override bool TrySendHeaders(HttpContextBase context) + { + var response = context.Response; + + base.TrySendHeaders(context); + + response.StatusCode = (int)HttpStatusCode.NotModified; + response.StatusDescription = "Not Modified"; + + // Explicitly set the Content-Length header so the client doesn't wait for + // content but keeps the connection open for other requests + response.AddHeader("Content-Length", "0"); + + return true; + } + + public override void SendFile(HttpContextBase context) + { + // Don't send file, it is unmodified. Let browser fetch from its cache. + } + } + + + + internal sealed class FullFileResponder : FileResponder + { + public FullFileResponder(IFileResponse fileResponse) + : base(fileResponse) + { + } + + public override bool TrySendHeaders(HttpContextBase context) + { + base.TrySendHeaders(context); + + // The date the file was last modified + context.Response.Cache.SetLastModified(FileResponse.LastModifiedUtc); + + return true; + } + + public override void SendFile(HttpContextBase context) + { + var fileLength = FileResponse.FileLength ?? FileResponse.Transmitter.GetFileLength(); + FileResponse.Transmitter.TransmitFile(0, fileLength, fileLength, context); + } + } + + + + internal sealed class RangeFileResponder : FileResponder + { + internal struct ByteRange + { + internal long Offset; + internal long Length; + } + + private const string RANGE_BOUNDARY = ""; + private const string MULTIPART_CONTENT_TYPE = "multipart/byteranges; boundary="; + private const string MULTIPART_RANGE_DELIMITER = "--\r\n"; + private const string MULTIPART_RANGE_END = "----\r\n\r\n"; + private const string CONTENT_RANGE_FORMAT = "bytes {0}-{1}/{2}"; + private const int MAX_RANGE_ALLOWED = 5; + + private const int ERROR_ACCESS_DENIED = 5; + + private static readonly string[] _httpDateFormats = new string[] { "r", "dddd, dd-MMM-yy HH':'mm':'ss 'GMT'", "ddd MMM d HH':'mm':'ss yyyy" }; + + private readonly FileResponder _defaultResponder; + private readonly string _rangeHeader; + + public RangeFileResponder(IFileResponse fileResponse, string rangeHeader) + : base(fileResponse) + { + _defaultResponder = new FullFileResponder(fileResponse); + _rangeHeader = rangeHeader; + } + + public override bool TrySendHeaders(HttpContextBase context) + { + var fileLength = FileResponse.FileLength ?? FileResponse.Transmitter.GetFileLength(); + var etag = FileResponse.ETag; + var lastModified = FileResponse.LastModifiedUtc; + + var handled = ExecuteRangeRequest(context, fileLength, _rangeHeader, etag, lastModified); + if (!handled && _defaultResponder.TrySendHeaders(context)) + { + _defaultResponder.SendFile(context); + handled = true; + } + + return handled; + } + + public override void SendFile(HttpContextBase context) + { + // Do nothing here, we have handled everything in 'TrySendHeaders()' already + } + + #region Range Utils + + // Most of the helpers here were copied over from the internal StaticFileHandler.cs + + private bool ExecuteRangeRequest( + HttpContextBase context, + long fileLength, + string rangeHeader, + string etag, + DateTime lastModified) + { + var handled = false; + var request = context.Request; + var response = context.Response; + + // return "416 Requested range not satisfiable" if the file length is zero. + if (fileLength <= 0) + { + SendRangeNotSatisfiable(response, fileLength); + handled = true; + return handled; + } + + var ifRangeHeader = request.Headers["If-Range"]; + if (ifRangeHeader != null && ifRangeHeader.Length > 1) + { + // Is this an ETag or a Date? We only need to check two + // characters; an ETag either begins with W/ or it is quoted. + if (ifRangeHeader[0] == '"') + { + // it's a strong ETag + if (ifRangeHeader != etag) + { + // the etags do not match, and we will therefore return the entire response + return handled; + } + } + else if (ifRangeHeader[0] == 'W' && ifRangeHeader[1] == '/') + { + // it's a weak ETag, and is therefore not usable for sub-range retrieval and + // we will return the entire response + return handled; + } + else + { + // It's a date. If it is greater than or equal to the last-write time of the file, we can send the range. + if (IsOutDated(ifRangeHeader, lastModified)) + { + return handled; + } + } + } + + // the expected format is "bytes = [, , ...]" + // where is "-[]" or "-". + int indexOfEquals = rangeHeader.IndexOf('='); + if (indexOfEquals == -1 || indexOfEquals == rangeHeader.Length - 1) + { + // invalid syntax + return handled; + } + + int startIndex = indexOfEquals + 1; + bool isRangeHeaderSyntacticallyValid = true; + long offset; + long length; + bool isSatisfiable; + bool exceededMax = false; + ByteRange[] byteRanges = null; + int byteRangesCount = 0; + long totalBytes = 0; + while (startIndex < rangeHeader.Length && isRangeHeaderSyntacticallyValid) + { + isRangeHeaderSyntacticallyValid = GetNextRange(rangeHeader, ref startIndex, fileLength, out offset, out length, out isSatisfiable); + + if (!isRangeHeaderSyntacticallyValid) + { + break; + } + + if (!isSatisfiable) + { + continue; + } + + if (byteRanges == null) + { + byteRanges = new ByteRange[16]; + } + + if (byteRangesCount >= byteRanges.Length) + { + // grow byteRanges array + ByteRange[] buffer = new ByteRange[byteRanges.Length * 2]; + Array.Copy(byteRanges, buffer, byteRanges.Length); + byteRanges = buffer; + } + + byteRanges[byteRangesCount].Offset = offset; + byteRanges[byteRangesCount].Length = length; + byteRangesCount++; + + // IIS imposes this limitation too, and sends "400 Bad Request" if exceeded + totalBytes += length; + if (totalBytes > fileLength * MAX_RANGE_ALLOWED) + { + exceededMax = true; + break; + } + } + + if (!isRangeHeaderSyntacticallyValid) + { + return handled; + } + + if (exceededMax) + { + SendBadRequest(response); + handled = true; + return handled; + } + + if (byteRangesCount == 0) + { + // we parsed the Range header and found no satisfiable byte ranges, so return "416 Requested Range Not Satisfiable" + SendRangeNotSatisfiable(response, fileLength); + handled = true; + return handled; + } + + if (byteRangesCount == 1) + { + offset = byteRanges[0].Offset; + length = byteRanges[0].Length; + response.ContentType = FileResponse.ContentType; + string contentRange = String.Format(CultureInfo.InvariantCulture, CONTENT_RANGE_FORMAT, offset, offset + length - 1, fileLength); + response.AppendHeader("Content-Range", contentRange); + + SendResponseHeaders(); + FileResponse.Transmitter.TransmitFile(offset, length, fileLength, context); + } + else + { + response.ContentType = MULTIPART_CONTENT_TYPE; + string contentRange; + string partialContentType = "Content-Type: " + FileResponse.ContentType + "\r\n"; + + SendResponseHeaders(); + + for (int i = 0; i < byteRangesCount; i++) + { + offset = byteRanges[i].Offset; + length = byteRanges[i].Length; + response.Write(MULTIPART_RANGE_DELIMITER); + response.Write(partialContentType); + response.Write("Content-Range: "); + contentRange = String.Format(CultureInfo.InvariantCulture, CONTENT_RANGE_FORMAT, offset, offset + length - 1, fileLength); + response.Write(contentRange); + response.Write("\r\n\r\n"); + // Transmit + FileResponse.Transmitter.TransmitFile(offset, length, fileLength, context); + response.Write("\r\n"); + } + response.Write(MULTIPART_RANGE_END); + } + + handled = true; + return handled; + + void SendResponseHeaders() + { + // Send a "206 Partial Content" status + response.StatusCode = (int)HttpStatusCode.PartialContent; + response.AppendHeader("Accept-Ranges", "bytes"); + response.Cache.SetLastModified(lastModified); + response.Cache.SetETag(etag); + response.Cache.SetCacheability(HttpCacheability.Public); + } + } + + private void SendBadRequest(HttpResponseBase response) + { + response.StatusCode = (int)HttpStatusCode.BadRequest; + response.Write("Bad Request"); + } + + private void SendRangeNotSatisfiable(HttpResponseBase response, long fileLength) + { + response.StatusCode = (int)HttpStatusCode.RequestedRangeNotSatisfiable; + response.ContentType = null; + response.AppendHeader("Content-Range", "bytes */" + fileLength.ToString(NumberFormatInfo.InvariantInfo)); + } + + private static bool IsOutDated(string ifRangeHeader, DateTime lastModified) + { + try + { + var utcLastModified = lastModified.ToUniversalTime(); + var utc = UtcParse(ifRangeHeader); + return (utc < utcLastModified); + } + catch + { + return true; + } + } + + private static DateTime UtcParse(string time) + { + Guard.NotNull(time, nameof(time)); + + var dtStyles = DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal; + if (DateTime.TryParseExact(time, _httpDateFormats, null, dtStyles, out var utcDate)) + { + return utcDate; + } + + throw new FormatException($"{time} is an invalid date expression."); + } + + // initial space characters are skipped, and the string of digits up until the first non-digit + // are converted to a long. If digits are found the method returns true; otherwise false. + private static bool GetLongFromSubstring(string s, ref int startIndex, out long result) + { + result = 0; + + // get index of first digit + MovePastSpaceCharacters(s, ref startIndex); + int beginIndex = startIndex; + + // get index of last digit + MovePastDigits(s, ref startIndex); + int endIndex = startIndex - 1; + + // are there any digits? + if (endIndex < beginIndex) + { + return false; + } + + long multipleOfTen = 1; + for (int i = endIndex; i >= beginIndex; i--) + { + int digit = s[i] - '0'; + result += digit * multipleOfTen; + multipleOfTen *= 10; + // check for overflow + if (result < 0) + { + return false; + } + } + + return true; + } + + // The Range header consists of one or more byte range specifiers. E.g, "Range: bytes=0-1024,-1024" is a request + // for the first and last 1024 bytes of a file. Before this method is called, startIndex points to the beginning + // of a byte range specifier; and afterwards it points to the beginning of the next byte range specifier. + // If the current byte range specifier is syntactially inavlid, this function will return false indicating that the + // Range header must be ignored. If the function returns true, then the byte range specifier will be converted to + // an offset and length, and the startIndex will be incremented to the next byte range specifier. The byte range + // specifier (offset and length) returned by this function is satisfiable if and only if isSatisfiable is true. + private static bool GetNextRange(string rangeHeader, ref int startIndex, long fileLength, out long offset, out long length, out bool isSatisfiable) + { + // startIndex is first char after '=', or first char after ',' + Debug.Assert(startIndex < rangeHeader.Length, "startIndex < rangeHeader.Length"); + + offset = 0; + length = 0; + isSatisfiable = false; + + // A Range request to an empty file is never satisfiable, and will always receive a 416 status. + if (fileLength <= 0) + { + // put startIndex at end of string so we don't try to call GetNextRange again + startIndex = rangeHeader.Length; + return true; + } + + MovePastSpaceCharacters(rangeHeader, ref startIndex); + + if (startIndex < rangeHeader.Length && rangeHeader[startIndex] == '-') + { + // this range is of the form "-mmm" + startIndex++; + if (!GetLongFromSubstring(rangeHeader, ref startIndex, out length)) + { + return false; + } + + if (length > fileLength) + { + // send entire file + offset = 0; + length = fileLength; + } + else + { + // send last N bytes + offset = fileLength - length; + } + + isSatisfiable = IsRangeSatisfiable(offset, length, fileLength); + // we parsed the current range, but need to successfully move the startIndex to the next range + return IncrementToNextRange(rangeHeader, ref startIndex); + } + else + { + // this range is of the form "nnn-[mmm]" + if (!GetLongFromSubstring(rangeHeader, ref startIndex, out offset)) + { + return false; + } + + // increment startIndex past '-' + if (startIndex < rangeHeader.Length && rangeHeader[startIndex] == '-') + { + startIndex++; + } + else + { + return false; + } + + if (!GetLongFromSubstring(rangeHeader, ref startIndex, out long endPos)) + { + // assume range is of form "nnn-". If it isn't, + // the call to IncrementToNextRange will return false + length = fileLength - offset; + } + else + { + // if...greater than or equal to the current length of the entity-body, last-byte-pos + // is taken to be equal to one less than the current length of the entity- body in bytes. + if (endPos > fileLength - 1) + { + endPos = fileLength - 1; + } + + length = endPos - offset + 1; + + if (length < 1) + { + // the byte range specifier is syntactially invalid + // because the last-byte-pos < first-byte-pos + return false; + } + } + + isSatisfiable = IsRangeSatisfiable(offset, length, fileLength); + + // we parsed the current range, but need to successfully move the startIndex to the next range + return IncrementToNextRange(rangeHeader, ref startIndex); + } + } + + private static bool IncrementToNextRange(string s, ref int startIndex) + { + // increment startIndex until next token and return true, unless the syntax is invalid + MovePastSpaceCharacters(s, ref startIndex); + + if (startIndex < s.Length) + { + if (s[startIndex] != ',') + { + return false; + } + // move to first char after ',' + startIndex++; + } + + return true; + } + + private static bool IsRangeSatisfiable(long offset, long length, long fileLength) + { + return (offset < fileLength && length > 0); + } + + private static bool IsSecurityError(int ErrorCode) + { + return (ErrorCode == ERROR_ACCESS_DENIED); + } + + private static void MovePastSpaceCharacters(string s, ref int startIndex) + { + while (startIndex < s.Length && s[startIndex] == ' ') + { + startIndex++; + } + } + + private static void MovePastDigits(string s, ref int startIndex) + { + while (startIndex < s.Length && s[startIndex] <= '9' && s[startIndex] >= '0') + { + startIndex++; + } + } + + #endregion + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs index bed604eaa9..10574118e1 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs @@ -4,126 +4,126 @@ namespace SmartStore.Web.Framework.Modelling { - public abstract class FileTransmitter - { - public abstract long GetFileLength(); - public abstract void TransmitFile(long offset, long length, long fileLength, HttpContextBase context); - } - - public sealed class FileBufferTransmitter : FileTransmitter - { - private readonly Func _bufferFactory; - private byte[] _buffer; - - public FileBufferTransmitter(Func bufferFactory) - { - Guard.NotNull(bufferFactory, nameof(bufferFactory)); - _bufferFactory = bufferFactory; - } - - public override long GetFileLength() - { - return GetBuffer().LongLength; - } - - public override void TransmitFile(long offset, long length, long fileLength, HttpContextBase context) - { - context.Response.OutputStream.Write(GetBuffer(), (int)offset, (int)length); - } - - private byte[] GetBuffer() - { - if (_buffer == null) - { - _buffer = _bufferFactory(); - if (_buffer == null) - { - throw new NullReferenceException("File buffer cannot be NULL."); - } - } - - return _buffer; - } - } - - public sealed class FileStreamTransmitter : FileTransmitter - { - // Default buffer size as defined in BufferedStream type - const int DefaultBufferSize = 81920; - - private readonly Func _streamFactory; - private Stream _stream; - - public FileStreamTransmitter(Func streamFactory) - { - Guard.NotNull(streamFactory, nameof(streamFactory)); - _streamFactory = streamFactory; - } - - public override long GetFileLength() - { - return GetStream().Length; - } - - public override void TransmitFile(long offset, long length, long fileLength, HttpContextBase context) - { - var response = context.Response; - var stream = GetStream(); - - response.BufferOutput = false; - //response.Buffer = true; // Buffering leads to high RAM usage - - using (stream) - { - int bufferSize = (int)Math.Min(DefaultBufferSize, length); - byte[] buffer = new byte[bufferSize]; - - int read; - long remaining = length; - - if (stream.CanSeek) - { - stream.Seek(offset, SeekOrigin.Begin); - } - while ((remaining > 0) && (read = stream.Read(buffer, 0, buffer.Length)) != 0) - { - if (response.IsClientConnected) - { - try - { - response.OutputStream.Write(buffer, 0, read); - remaining -= read; - } - catch (Exception ex) - { - var isConClose = ex is HttpException httpEx && httpEx.ErrorCode == -2147023901; - if (!isConClose) - { - throw ex; - } - } - } - else - { - remaining = 0; - break; - } - } - } - } - - private Stream GetStream() - { - if (_stream == null) - { - _stream = _streamFactory(); - if (_stream == null) - { - throw new NullReferenceException("File stream cannot be NULL."); - } - } - - return _stream; - } - } + public abstract class FileTransmitter + { + public abstract long GetFileLength(); + public abstract void TransmitFile(long offset, long length, long fileLength, HttpContextBase context); + } + + public sealed class FileBufferTransmitter : FileTransmitter + { + private readonly Func _bufferFactory; + private byte[] _buffer; + + public FileBufferTransmitter(Func bufferFactory) + { + Guard.NotNull(bufferFactory, nameof(bufferFactory)); + _bufferFactory = bufferFactory; + } + + public override long GetFileLength() + { + return GetBuffer().LongLength; + } + + public override void TransmitFile(long offset, long length, long fileLength, HttpContextBase context) + { + context.Response.OutputStream.Write(GetBuffer(), (int)offset, (int)length); + } + + private byte[] GetBuffer() + { + if (_buffer == null) + { + _buffer = _bufferFactory(); + if (_buffer == null) + { + throw new NullReferenceException("File buffer cannot be NULL."); + } + } + + return _buffer; + } + } + + public sealed class FileStreamTransmitter : FileTransmitter + { + // Default buffer size as defined in BufferedStream type + const int DefaultBufferSize = 81920; + + private readonly Func _streamFactory; + private Stream _stream; + + public FileStreamTransmitter(Func streamFactory) + { + Guard.NotNull(streamFactory, nameof(streamFactory)); + _streamFactory = streamFactory; + } + + public override long GetFileLength() + { + return GetStream().Length; + } + + public override void TransmitFile(long offset, long length, long fileLength, HttpContextBase context) + { + var response = context.Response; + var stream = GetStream(); + + response.BufferOutput = false; + //response.Buffer = true; // Buffering leads to high RAM usage + + using (stream) + { + int bufferSize = (int)Math.Min(DefaultBufferSize, length); + byte[] buffer = new byte[bufferSize]; + + int read; + long remaining = length; + + if (stream.CanSeek) + { + stream.Seek(offset, SeekOrigin.Begin); + } + while ((remaining > 0) && (read = stream.Read(buffer, 0, buffer.Length)) != 0) + { + if (response.IsClientConnected) + { + try + { + response.OutputStream.Write(buffer, 0, read); + remaining -= read; + } + catch (Exception ex) + { + var isConClose = ex is HttpException httpEx && httpEx.ErrorCode == -2147023901; + if (!isConClose) + { + throw ex; + } + } + } + else + { + remaining = 0; + break; + } + } + } + } + + private Stream GetStream() + { + if (_stream == null) + { + _stream = _streamFactory(); + if (_stream == null) + { + throw new NullReferenceException("File stream cannot be NULL."); + } + } + + return _stream; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/IFileResponse.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/IFileResponse.cs index 4da1582489..b24463c932 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/IFileResponse.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/IFileResponse.cs @@ -1,16 +1,15 @@ using System; -using System.Drawing; namespace SmartStore.Web.Framework.Modelling { - public interface IFileResponse - { - string ContentType { get; } - long? FileLength { get; } - //Func LazyDimensions { get; } - DateTime LastModifiedUtc { get; } - TimeSpan MaxAge { get; } - string ETag { get; } - FileTransmitter Transmitter { get; } - } + public interface IFileResponse + { + string ContentType { get; } + long? FileLength { get; } + //Func LazyDimensions { get; } + DateTime LastModifiedUtc { get; } + TimeSpan MaxAge { get; } + string ETag { get; } + FileTransmitter Transmitter { get; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs index fb9321e1de..aa85bc4b20 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs @@ -8,23 +8,23 @@ // ReSharper disable CheckNamespace namespace SmartStore.Web.Framework.Modelling { - public class JsonNetResult : JsonResult - { + public class JsonNetResult : JsonResult + { private readonly IDateTimeHelper _dateTimeHelper; - private readonly JsonSerializerSettings _settings; + private readonly JsonSerializerSettings _settings; - public JsonNetResult(IDateTimeHelper dateTimeHelper) - : this(dateTimeHelper, null) - { - } + public JsonNetResult(IDateTimeHelper dateTimeHelper) + : this(dateTimeHelper, null) + { + } - public JsonNetResult(IDateTimeHelper dateTimeHelper, JsonSerializerSettings settings) - { - Guard.NotNull(dateTimeHelper, nameof(dateTimeHelper)); + public JsonNetResult(IDateTimeHelper dateTimeHelper, JsonSerializerSettings settings) + { + Guard.NotNull(dateTimeHelper, nameof(dateTimeHelper)); - _dateTimeHelper = dateTimeHelper; - _settings = settings; - } + _dateTimeHelper = dateTimeHelper; + _settings = settings; + } public static JsonSerializerSettings CreateDefaultSerializerSettings() { @@ -49,88 +49,88 @@ public static JsonSerializerSettings CreateDefaultSerializerSettings() } public override void ExecuteResult(ControllerContext context) - { - Guard.NotNull(context, nameof(context)); + { + Guard.NotNull(context, nameof(context)); + + if (this.Data == null) + return; - if (this.Data == null) - return; + if (this.JsonRequestBehavior == JsonRequestBehavior.DenyGet && context.HttpContext.Request.HttpMethod.IsCaseInsensitiveEqual("GET")) + { + throw new InvalidOperationException("This request has been blocked because sensitive information could be disclosed to third party web sites when this is used in a GET request.To allow GET requests, set JsonRequestBehavior to AllowGet."); + } - if (this.JsonRequestBehavior == JsonRequestBehavior.DenyGet && context.HttpContext.Request.HttpMethod.IsCaseInsensitiveEqual("GET")) - { - throw new InvalidOperationException("This request has been blocked because sensitive information could be disclosed to third party web sites when this is used in a GET request.To allow GET requests, set JsonRequestBehavior to AllowGet."); - } + var response = context.HttpContext.Response; - var response = context.HttpContext.Response; + if (this.ContentEncoding != null) + { + response.ContentEncoding = this.ContentEncoding; + } - if (this.ContentEncoding != null) - { - response.ContentEncoding = this.ContentEncoding; - } - - response.ContentType = this.ContentType.NullEmpty() ?? "application/json"; + response.ContentType = this.ContentType.NullEmpty() ?? "application/json"; var serializerSettings = _settings ?? CreateDefaultSerializerSettings(); - if (_settings == null) - { - var utcDateTimeConverter = new UTCDateTimeConverter(_dateTimeHelper, new JavaScriptDateTimeConverter()); - serializerSettings.Converters.Add(utcDateTimeConverter); - } - - using (var jsonWriter = new JsonTextWriter(response.Output)) - { - jsonWriter.CloseOutput = false; - var jsonSerializer = JsonSerializer.Create(serializerSettings); - jsonSerializer.Serialize(jsonWriter, this.Data); + if (_settings == null) + { + var utcDateTimeConverter = new UTCDateTimeConverter(_dateTimeHelper, new JavaScriptDateTimeConverter()); + serializerSettings.Converters.Add(utcDateTimeConverter); + } + + using (var jsonWriter = new JsonTextWriter(response.Output)) + { + jsonWriter.CloseOutput = false; + var jsonSerializer = JsonSerializer.Create(serializerSettings); + jsonSerializer.Serialize(jsonWriter, this.Data); } - } - - class UTCDateTimeConverter : DateTimeConverterBase - { - private readonly IDateTimeHelper _dateTimeHelper; - private readonly DateTimeConverterBase _innerConverter; - - public UTCDateTimeConverter(IDateTimeHelper dateTimeHelper, DateTimeConverterBase innerConverter) - { - Guard.NotNull(innerConverter, nameof(innerConverter)); - - _dateTimeHelper = dateTimeHelper; - _innerConverter = innerConverter; - } - - public override bool CanConvert(Type objectType) - { - return _innerConverter.CanConvert(objectType); - } - - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - return _innerConverter.ReadJson(reader, objectType, existingValue, serializer); - } - - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - if (value is DateTime) - { - var d = (DateTime)value; - if (d.Kind == DateTimeKind.Unspecified) - { - // when DateTime kind is "Unspecified", it was very likely converted from UTC to - // SERVER*s preferred local time before (with DateTimeHelper.ConvertToUserTime()). - // While this works fine during server-time rendering, it can lead to wrong UTC offsets - // on the client (e.g. in AJAX mode Grids, where rendering is performed locally with JSON data). - // The issue occurs when the client's time zone is not the same as "CurrentTimeZone" (configured in the backend). - // To fix it, we have to convert the date back to UTC kind, but with the SERVER PREFERRED TIMEZONE - // in order to calculate with the correct UTC offset. Then it's up to the client to display the date - // in the CLIENT's time zone. Which is not perfect of course, because the same date would be displayed in the - // "CurrentTimeZone" if rendered on server. - // But: it fixes the issue and is way better than converting all AJAXable dates to strings on the server. - value = _dateTimeHelper.ConvertToUtcTime(d, _dateTimeHelper.CurrentTimeZone); - } - } - - _innerConverter.WriteJson(writer, value, serializer); - } - } - } + } + + class UTCDateTimeConverter : DateTimeConverterBase + { + private readonly IDateTimeHelper _dateTimeHelper; + private readonly DateTimeConverterBase _innerConverter; + + public UTCDateTimeConverter(IDateTimeHelper dateTimeHelper, DateTimeConverterBase innerConverter) + { + Guard.NotNull(innerConverter, nameof(innerConverter)); + + _dateTimeHelper = dateTimeHelper; + _innerConverter = innerConverter; + } + + public override bool CanConvert(Type objectType) + { + return _innerConverter.CanConvert(objectType); + } + + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + return _innerConverter.ReadJson(reader, objectType, existingValue, serializer); + } + + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + if (value is DateTime) + { + var d = (DateTime)value; + if (d.Kind == DateTimeKind.Unspecified) + { + // when DateTime kind is "Unspecified", it was very likely converted from UTC to + // SERVER*s preferred local time before (with DateTimeHelper.ConvertToUserTime()). + // While this works fine during server-time rendering, it can lead to wrong UTC offsets + // on the client (e.g. in AJAX mode Grids, where rendering is performed locally with JSON data). + // The issue occurs when the client's time zone is not the same as "CurrentTimeZone" (configured in the backend). + // To fix it, we have to convert the date back to UTC kind, but with the SERVER PREFERRED TIMEZONE + // in order to calculate with the correct UTC offset. Then it's up to the client to display the date + // in the CLIENT's time zone. Which is not perfect of course, because the same date would be displayed in the + // "CurrentTimeZone" if rendered on server. + // But: it fixes the issue and is way better than converting all AJAXable dates to strings on the server. + value = _dateTimeHelper.ConvertToUtcTime(d, _dateTimeHelper.CurrentTimeZone); + } + } + + _innerConverter.WriteJson(writer, value, serializer); + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/PermissiveRedirectResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/PermissiveRedirectResult.cs index e394aba608..7c6c729645 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/PermissiveRedirectResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/PermissiveRedirectResult.cs @@ -1,25 +1,24 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; namespace SmartStore.Web.Framework.Modelling { - /// - /// Allows redirects from within child actions while keeping TempData - /// - public class PermissiveRedirectResult : ActionResult - { - private readonly string _url; + /// + /// Allows redirects from within child actions while keeping TempData + /// + public class PermissiveRedirectResult : ActionResult + { + private readonly string _url; - public PermissiveRedirectResult(string url) - { - _url = url; - } + public PermissiveRedirectResult(string url) + { + _url = url; + } - public override void ExecuteResult(ControllerContext context) - { - var url = UrlHelper.GenerateContentUrl(_url, context.HttpContext); - context.Controller.TempData.Keep(); - context.HttpContext.Response.Redirect(url, false); - } - } + public override void ExecuteResult(ControllerContext context) + { + var url = UrlHelper.GenerateContentUrl(_url, context.HttpContext); + context.Controller.TempData.Keep(); + context.HttpContext.Response.Redirect(url, false); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RootActionViewResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RootActionViewResult.cs index 2e9f733b80..a112f0b355 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RootActionViewResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RootActionViewResult.cs @@ -1,31 +1,27 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Web.Mvc; namespace SmartStore.Web.Framework.Modelling.Results { - public class RootActionViewResult : ViewResult - { - protected override ViewEngineResult FindView(ControllerContext context) - { - if (base.ViewName.IsEmpty()) - throw new InvalidOperationException($"{nameof(ViewName)} is required when using {nameof(RootActionViewResult)}."); + public class RootActionViewResult : ViewResult + { + protected override ViewEngineResult FindView(ControllerContext context) + { + if (base.ViewName.IsEmpty()) + throw new InvalidOperationException($"{nameof(ViewName)} is required when using {nameof(RootActionViewResult)}."); - return base.FindView(context.GetRootControllerContext()); - } - } + return base.FindView(context.GetRootControllerContext()); + } + } - public class RootActionPartialViewResult : PartialViewResult - { - protected override ViewEngineResult FindView(ControllerContext context) - { - if (base.ViewName.IsEmpty()) - throw new InvalidOperationException($"{nameof(ViewName)} is required when using {nameof(RootActionPartialViewResult)}."); + public class RootActionPartialViewResult : PartialViewResult + { + protected override ViewEngineResult FindView(ControllerContext context) + { + if (base.ViewName.IsEmpty()) + throw new InvalidOperationException($"{nameof(ViewName)} is required when using {nameof(RootActionPartialViewResult)}."); - return base.FindView(context.GetRootControllerContext()); - } - } + return base.FindView(context.GetRootControllerContext()); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RssActionResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RssActionResult.cs index ead023a777..2d44042448 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RssActionResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RssActionResult.cs @@ -14,7 +14,7 @@ public override void ExecuteResult(ControllerContext context) context.HttpContext.Response.ContentType = "application/rss+xml"; var rssFormatter = new Rss20FeedFormatter(Feed, false); - var settings = new XmlWriterSettings { Indent = true, IndentChars = "\t", CheckCharacters = false }; + var settings = new XmlWriterSettings { Indent = true, IndentChars = "\t", CheckCharacters = false }; using (var writer = XmlWriter.Create(context.HttpContext.Response.Output, settings)) { diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartMetadataProvider.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartMetadataProvider.cs index 65215447ff..2f8edaa461 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartMetadataProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartMetadataProvider.cs @@ -13,39 +13,39 @@ namespace SmartStore.Web.Framework.Modelling ///
public class SmartMetadataProvider : CachedDataAnnotationsModelMetadataProvider { - [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] - [SuppressMessage("ReSharper", "SuspiciousTypeConversion.Global")] - protected override CachedDataAnnotationsModelMetadata CreateMetadataPrototype(IEnumerable attributes, Type containerType, Type modelType, string propertyName) - { - var metadata = base.CreateMetadataPrototype(attributes, containerType, modelType, propertyName); - var attrs = attributes.OfType().ToList(); + [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] + [SuppressMessage("ReSharper", "SuspiciousTypeConversion.Global")] + protected override CachedDataAnnotationsModelMetadata CreateMetadataPrototype(IEnumerable attributes, Type containerType, Type modelType, string propertyName) + { + var metadata = base.CreateMetadataPrototype(attributes, containerType, modelType, propertyName); + var attrs = attributes.OfType().ToList(); - foreach (var attr in attrs) - { - if (metadata.AdditionalValues.ContainsKey(attr.Name)) - { - throw new SmartException("There is already an attribute with the name of '{0}' on this model.".FormatCurrent(attr.Name)); - } - metadata.AdditionalValues.Add(attr.Name, attr); - } + foreach (var attr in attrs) + { + if (metadata.AdditionalValues.ContainsKey(attr.Name)) + { + throw new SmartException("There is already an attribute with the name of '{0}' on this model.".FormatCurrent(attr.Name)); + } + metadata.AdditionalValues.Add(attr.Name, attr); + } - return metadata; - } + return metadata; + } - protected override CachedDataAnnotationsModelMetadata CreateMetadataFromPrototype(CachedDataAnnotationsModelMetadata prototype, Func modelAccessor) - { - var result = base.CreateMetadataFromPrototype(prototype, modelAccessor); + protected override CachedDataAnnotationsModelMetadata CreateMetadataFromPrototype(CachedDataAnnotationsModelMetadata prototype, Func modelAccessor) + { + var result = base.CreateMetadataFromPrototype(prototype, modelAccessor); - if (prototype.AdditionalValues.Count > 0) - { - var attrs = prototype.AdditionalValues.Where(x => x.Value is IModelAttribute).ToArray(); - if (attrs.Any()) - { - result.AdditionalValues.AddRange(attrs); - } - } + if (prototype.AdditionalValues.Count > 0) + { + var attrs = prototype.AdditionalValues.Where(x => x.Value is IModelAttribute).ToArray(); + if (attrs.Any()) + { + result.AdditionalValues.AddRange(attrs); + } + } - return result; - } + return result; + } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs index 95e98bdc8b..350a009f70 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs @@ -9,18 +9,18 @@ namespace SmartStore.Web.Framework.Modelling { - public class SmartModelBinder : DefaultModelBinder + public class SmartModelBinder : DefaultModelBinder { public override object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { - var modelType = bindingContext.ModelType; + var modelType = bindingContext.ModelType; - if (modelType == typeof(CustomPropertiesDictionary)) - { - return BindCustomPropertiesDictioary(controllerContext, bindingContext); - } + if (modelType == typeof(CustomPropertiesDictionary)) + { + return BindCustomPropertiesDictioary(controllerContext, bindingContext); + } - var model = base.BindModel(controllerContext, bindingContext); + var model = base.BindModel(controllerContext, bindingContext); if (model is ModelBase) { @@ -31,125 +31,125 @@ public override object BindModel(ControllerContext controllerContext, ModelBindi } protected override void SetProperty(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor property, object value) - { - var attrs = property.Attributes; - var sanitizeHtmlAttr = attrs.OfType().FirstOrDefault(); - - if (property.PropertyType == typeof(string) && sanitizeHtmlAttr != null && value is string input && !string.IsNullOrWhiteSpace(input)) - { - value = HtmlUtils.SanitizeHtml(input, sanitizeHtmlAttr.IsFragment); - } - - base.SetProperty(controllerContext, bindingContext, property, value); - } - - private CustomPropertiesDictionary BindCustomPropertiesDictioary(ControllerContext controllerContext, ModelBindingContext bindingContext) - { - var model = bindingContext.Model as CustomPropertiesDictionary ?? new CustomPropertiesDictionary(); - - var keys = GetValueProviderKeys(controllerContext, bindingContext.ModelName + "["); - if (keys.Count == 0) - { - return model; - } - - foreach (var key in keys) - { - var keyName = GetKeyName(key); - if (keyName == null || model.ContainsKey(keyName)) - continue; - - var valueBinder = this.Binders.DefaultBinder; - - var subPropertyName = GetSubPropertyName(key); - if (subPropertyName.IsCaseInsensitiveEqual("__Type__")) - continue; - - if (subPropertyName == null) - { - var simpleBindingContext = new ModelBindingContext - { - ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, GetValueType(keys, key, bindingContext.ValueProvider)), - ModelName = key, - ModelState = bindingContext.ModelState, - PropertyFilter = bindingContext.PropertyFilter, - ValueProvider = bindingContext.ValueProvider - }; - var value = valueBinder.BindModel(controllerContext, simpleBindingContext); - model[keyName] = value; - } - else - { - // Is Complex type - var modelName = key.Substring(0, key.Length - subPropertyName.Length - 1); - var valueType = GetValueType(keys, modelName, bindingContext.ValueProvider); - if (!valueType.HasAttribute(false)) + { + var attrs = property.Attributes; + var sanitizeHtmlAttr = attrs.OfType().FirstOrDefault(); + + if (property.PropertyType == typeof(string) && sanitizeHtmlAttr != null && value is string input && !string.IsNullOrWhiteSpace(input)) + { + value = HtmlUtils.SanitizeHtml(input, sanitizeHtmlAttr.IsFragment); + } + + base.SetProperty(controllerContext, bindingContext, property, value); + } + + private CustomPropertiesDictionary BindCustomPropertiesDictioary(ControllerContext controllerContext, ModelBindingContext bindingContext) + { + var model = bindingContext.Model as CustomPropertiesDictionary ?? new CustomPropertiesDictionary(); + + var keys = GetValueProviderKeys(controllerContext, bindingContext.ModelName + "["); + if (keys.Count == 0) + { + return model; + } + + foreach (var key in keys) + { + var keyName = GetKeyName(key); + if (keyName == null || model.ContainsKey(keyName)) + continue; + + var valueBinder = this.Binders.DefaultBinder; + + var subPropertyName = GetSubPropertyName(key); + if (subPropertyName.IsCaseInsensitiveEqual("__Type__")) + continue; + + if (subPropertyName == null) + { + var simpleBindingContext = new ModelBindingContext { - throw new SecurityException("For security reasons complex types in '{0}' must be decorated with the '{1}' attribute.".FormatInvariant( - typeof(CustomPropertiesDictionary).AssemblyQualifiedNameWithoutVersion(), - typeof(CustomModelPartAttribute).AssemblyQualifiedNameWithoutVersion())); + ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, GetValueType(keys, key, bindingContext.ValueProvider)), + ModelName = key, + ModelState = bindingContext.ModelState, + PropertyFilter = bindingContext.PropertyFilter, + ValueProvider = bindingContext.ValueProvider + }; + var value = valueBinder.BindModel(controllerContext, simpleBindingContext); + model[keyName] = value; + } + else + { + // Is Complex type + var modelName = key.Substring(0, key.Length - subPropertyName.Length - 1); + var valueType = GetValueType(keys, modelName, bindingContext.ValueProvider); + if (!valueType.HasAttribute(false)) + { + throw new SecurityException("For security reasons complex types in '{0}' must be decorated with the '{1}' attribute.".FormatInvariant( + typeof(CustomPropertiesDictionary).AssemblyQualifiedNameWithoutVersion(), + typeof(CustomModelPartAttribute).AssemblyQualifiedNameWithoutVersion())); } - valueBinder = this.Binders.GetBinder(valueType); - var complexBindingContext = new ModelBindingContext - { - ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, valueType), - ModelName = key.Substring(0, key.Length - subPropertyName.Length - 1), - ModelState = bindingContext.ModelState, - PropertyFilter = bindingContext.PropertyFilter, - ValueProvider = bindingContext.ValueProvider - }; - var value = valueBinder.BindModel(controllerContext, complexBindingContext); - model[keyName] = value; - } - } - - return model; - } - - private HashSet GetValueProviderKeys(ControllerContext context, string prefix) - { - var keys = context.HttpContext.Request.Form.Keys.Cast() - .Concat(((IDictionary)context.RouteData.Values).Keys.Cast()) - .Concat(context.HttpContext.Request.QueryString.Keys.Cast()) - .Concat(context.HttpContext.Request.Files.Keys.Cast()) - .Where(x => x.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase)); - - return new HashSet(keys, StringComparer.InvariantCultureIgnoreCase); - } - - private string GetKeyName(string key) - { - int startBracket = key.IndexOf("["); - int endBracket = key.IndexOf("]", startBracket); - - if (endBracket == -1) - return null; - - return key.Substring(startBracket + 1, endBracket - startBracket - 1); - } - - private string GetSubPropertyName(string key) - { - var parts = key.Split('.'); - if (parts.Length > 1) - { - return parts[1]; - } - - return null; - } - - private Type GetValueType(HashSet keys, string prefix, IValueProvider valueProvider) - { - var typeKey = prefix + ".__Type__"; - if (keys.Contains(typeKey)) - { - var type = Type.GetType(valueProvider.GetValue(typeKey).AttemptedValue, true); - return type; - } - - return typeof(object); - } + valueBinder = this.Binders.GetBinder(valueType); + var complexBindingContext = new ModelBindingContext + { + ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, valueType), + ModelName = key.Substring(0, key.Length - subPropertyName.Length - 1), + ModelState = bindingContext.ModelState, + PropertyFilter = bindingContext.PropertyFilter, + ValueProvider = bindingContext.ValueProvider + }; + var value = valueBinder.BindModel(controllerContext, complexBindingContext); + model[keyName] = value; + } + } + + return model; + } + + private HashSet GetValueProviderKeys(ControllerContext context, string prefix) + { + var keys = context.HttpContext.Request.Form.Keys.Cast() + .Concat(((IDictionary)context.RouteData.Values).Keys.Cast()) + .Concat(context.HttpContext.Request.QueryString.Keys.Cast()) + .Concat(context.HttpContext.Request.Files.Keys.Cast()) + .Where(x => x.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase)); + + return new HashSet(keys, StringComparer.InvariantCultureIgnoreCase); + } + + private string GetKeyName(string key) + { + int startBracket = key.IndexOf("["); + int endBracket = key.IndexOf("]", startBracket); + + if (endBracket == -1) + return null; + + return key.Substring(startBracket + 1, endBracket - startBracket - 1); + } + + private string GetSubPropertyName(string key) + { + var parts = key.Split('.'); + if (parts.Length > 1) + { + return parts[1]; + } + + return null; + } + + private Type GetValueType(HashSet keys, string prefix, IValueProvider valueProvider) + { + var typeKey = prefix + ".__Type__"; + if (keys.Contains(typeKey)) + { + var type = Type.GetType(valueProvider.GetValue(typeKey).AttemptedValue, true); + return type; + } + + return typeof(object); + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfPartialViewContent.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfPartialViewContent.cs index eef903e167..19ad2d26bb 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfPartialViewContent.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfPartialViewContent.cs @@ -1,14 +1,13 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; using SmartStore.Services.Pdf; namespace SmartStore.Web.Framework.Pdf { - public class PdfPartialViewContent : PdfHtmlContent - { - public PdfPartialViewContent(string partialViewName, object model, ControllerContext controllerContext) - : base(PdfViewContent.ViewToString(partialViewName, null, model, true, controllerContext, false)) - { - } - } + public class PdfPartialViewContent : PdfHtmlContent + { + public PdfPartialViewContent(string partialViewName, object model, ControllerContext controllerContext) + : base(PdfViewContent.ViewToString(partialViewName, null, model, true, controllerContext, false)) + { + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs index 170a240570..67611c5559 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs @@ -1,41 +1,40 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; using System.Web.Routing; using SmartStore.Services.Pdf; namespace SmartStore.Web.Framework.Pdf -{ - public class PdfRouteContent : PdfUrlContent - { - public PdfRouteContent(string routeName, ControllerContext controllerContext) - : this(routeName, null, null, null, controllerContext) - { - } +{ + public class PdfRouteContent : PdfUrlContent + { + public PdfRouteContent(string routeName, ControllerContext controllerContext) + : this(routeName, null, null, null, controllerContext) + { + } - public PdfRouteContent(string routeName, RouteValueDictionary routeValues, ControllerContext controllerContext) - : this(routeName, null, null, routeValues, controllerContext) - { - } + public PdfRouteContent(string routeName, RouteValueDictionary routeValues, ControllerContext controllerContext) + : this(routeName, null, null, routeValues, controllerContext) + { + } - public PdfRouteContent(string action, string controller, ControllerContext controllerContext) - : this(null, action, controller, null, controllerContext) - { - } + public PdfRouteContent(string action, string controller, ControllerContext controllerContext) + : this(null, action, controller, null, controllerContext) + { + } - public PdfRouteContent(string action, string controller, RouteValueDictionary routeValues, ControllerContext controllerContext) - : this(null, action, controller, routeValues, controllerContext) - { - } + public PdfRouteContent(string action, string controller, RouteValueDictionary routeValues, ControllerContext controllerContext) + : this(null, action, controller, routeValues, controllerContext) + { + } - protected PdfRouteContent(string routeName, string action, string controller, RouteValueDictionary routeValues, ControllerContext controllerContext) - : base(UrlHelper.GenerateUrl(routeName, action, controller, routeValues, RouteTable.Routes, controllerContext.RequestContext, true)) - { - //Guard.NotNull(controllerContext, nameof(controllerContext)); - - //if (routeName.IsEmpty() || action.IsEmpty()) - //{ - // throw Error.InvalidOperation("Either 'routeName' or 'action' must be set"); - //} - } - } + protected PdfRouteContent(string routeName, string action, string controller, RouteValueDictionary routeValues, ControllerContext controllerContext) + : base(UrlHelper.GenerateUrl(routeName, action, controller, routeValues, RouteTable.Routes, controllerContext.RequestContext, true)) + { + //Guard.NotNull(controllerContext, nameof(controllerContext)); + + //if (routeName.IsEmpty() || action.IsEmpty()) + //{ + // throw Error.InvalidOperation("Either 'routeName' or 'action' must be set"); + //} + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs index a96f90c4b5..c81c46d4e7 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs @@ -1,49 +1,47 @@ using System; -using System.Linq; -using System.Text; using System.Web.Mvc; using SmartStore.Services.Pdf; using SmartStore.Web.Framework.Controllers; namespace SmartStore.Web.Framework.Pdf -{ - public class PdfViewContent : PdfHtmlContent - { - public PdfViewContent(string viewName, object model, ControllerContext controllerContext) - : this(viewName, null, model, controllerContext) - { - } +{ + public class PdfViewContent : PdfHtmlContent + { + public PdfViewContent(string viewName, object model, ControllerContext controllerContext) + : this(viewName, null, model, controllerContext) + { + } - public PdfViewContent(string viewName, string masterName, object model, ControllerContext controllerContext) - : base(ViewToString(viewName, masterName, model, false, controllerContext, true)) - { - } + public PdfViewContent(string viewName, string masterName, object model, ControllerContext controllerContext) + : base(ViewToString(viewName, masterName, model, false, controllerContext, true)) + { + } - protected internal static string ViewToString(string viewName, string masterName, object model, bool isPartial, ControllerContext context, bool throwOnError) - { - Guard.NotNull(context, nameof(context)); + protected internal static string ViewToString(string viewName, string masterName, object model, bool isPartial, ControllerContext context, bool throwOnError) + { + Guard.NotNull(context, nameof(context)); - string html = null; + string html = null; - try - { - html = isPartial - ? context.Controller.RenderPartialViewToString(viewName, model) - : context.Controller.RenderViewToString(viewName, masterName, model); - } - catch (Exception) - { - if (throwOnError) - { - throw; - } - else - { - return null; - } - } + try + { + html = isPartial + ? context.Controller.RenderPartialViewToString(viewName, model) + : context.Controller.RenderViewToString(viewName, masterName, model); + } + catch (Exception) + { + if (throwOnError) + { + throw; + } + else + { + return null; + } + } - return html; - } - } + return html; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfHeaderFooterVariables.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfHeaderFooterVariables.cs index 4b1dd669f6..65a5a86f36 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfHeaderFooterVariables.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfHeaderFooterVariables.cs @@ -1,59 +1,55 @@ -using System; -using System.Collections.Generic; -using System.Web.Mvc; - -namespace SmartStore.Web.Framework.Pdf +namespace SmartStore.Web.Framework.Pdf { - public class PdfHeaderFooterVariables - { - /// - /// The number of the page currently being printed - /// - public int Page { get; set; } - - /// - /// The number of the first page to be printed - /// - public int FromPage { get; set; } - - /// - /// The number of the last page to be printed - /// - public int ToPage { get; set; } - - /// - /// The URL of the page being printed - /// - public string WebPage { get; set; } - - /// - /// The name of the current section - /// - public string Section { get; set; } - - /// - /// The name of the current subsection - /// - public string SubSection { get; set; } - - /// - /// The title of the of the current page object - /// - public string Title { get; set; } - - /// - /// The title of the output document - /// - public string DocTitle { get; set; } - - /// - /// The number of the page in the current site being converted - /// - public int SitePage { get; set; } - - /// - /// The number of pages in the current site being converted - /// - public int SitePages { get; set; } - } + public class PdfHeaderFooterVariables + { + /// + /// The number of the page currently being printed + /// + public int Page { get; set; } + + /// + /// The number of the first page to be printed + /// + public int FromPage { get; set; } + + /// + /// The number of the last page to be printed + /// + public int ToPage { get; set; } + + /// + /// The URL of the page being printed + /// + public string WebPage { get; set; } + + /// + /// The name of the current section + /// + public string Section { get; set; } + + /// + /// The name of the current subsection + /// + public string SubSection { get; set; } + + /// + /// The title of the of the current page object + /// + public string Title { get; set; } + + /// + /// The title of the output document + /// + public string DocTitle { get; set; } + + /// + /// The number of the page in the current site being converted + /// + public int SitePage { get; set; } + + /// + /// The number of pages in the current site being converted + /// + public int SitePages { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfReceiptHeaderFooterModel.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfReceiptHeaderFooterModel.cs index 8335be20c9..a413692334 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfReceiptHeaderFooterModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfReceiptHeaderFooterModel.cs @@ -5,17 +5,17 @@ namespace SmartStore.Web.Framework.Pdf { public partial class PdfReceiptHeaderFooterModel : ModelBase { - public int StoreId { get; set; } - public string StoreName { get; set; } - public string StoreUrl { get; set; } - public int LogoId { get; set; } + public int StoreId { get; set; } + public string StoreName { get; set; } + public string StoreUrl { get; set; } + public int LogoId { get; set; } - public CompanyInformationSettings MerchantCompanyInfo { get; set; } - public BankConnectionSettings MerchantBankAccount { get; set; } - public ContactDataSettings MerchantContactData { get; set; } + public CompanyInformationSettings MerchantCompanyInfo { get; set; } + public BankConnectionSettings MerchantBankAccount { get; set; } + public ContactDataSettings MerchantContactData { get; set; } - public string MerchantFormattedAddress { get; set; } + public string MerchantFormattedAddress { get; set; } - public PdfHeaderFooterVariables Variables { get; set; } + public PdfHeaderFooterVariables Variables { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs index 19df5bc70a..525e0b070e 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs @@ -1,53 +1,50 @@ -using System.IO; -using System.Text.RegularExpressions; -using System.Web; +using System.Web; using System.Web.Mvc; -using System.Web.Security; using SmartStore.Services.Pdf; using SmartStore.Utilities; namespace SmartStore.Web.Framework.Pdf { - public class PdfResult : ActionResult - { - private const string ContentType = "application/pdf"; - - public PdfResult(IPdfConverter converter, PdfConvertSettings settings) - { - Guard.NotNull(converter, nameof(converter)); - - this.Converter = converter; - this.Settings = settings ?? new PdfConvertSettings(); - } - - protected IPdfConverter Converter { get; set; } - - protected PdfConvertSettings Settings { get; set; } - - /// - /// The name of the generated PDF file. - /// - public string FileName { get; set; } - - protected HttpResponseBase PrepareResponse(HttpResponseBase response) - { - response.ContentType = ContentType; - - if (FileName.HasValue()) - { - response.AddHeader("Content-Disposition", "attachment; filename=\"{0}\"".FormatCurrent(PathHelper.SanitizeFileName(FileName))); - } - - response.AddHeader("Content-Type", ContentType); - - return response; - } - - public override void ExecuteResult(ControllerContext context) - { - var buffer = Converter.Convert(Settings); - var response = PrepareResponse(context.HttpContext.Response); - response.OutputStream.Write(buffer, 0, buffer.Length); - } - } + public class PdfResult : ActionResult + { + private const string ContentType = "application/pdf"; + + public PdfResult(IPdfConverter converter, PdfConvertSettings settings) + { + Guard.NotNull(converter, nameof(converter)); + + this.Converter = converter; + this.Settings = settings ?? new PdfConvertSettings(); + } + + protected IPdfConverter Converter { get; set; } + + protected PdfConvertSettings Settings { get; set; } + + /// + /// The name of the generated PDF file. + /// + public string FileName { get; set; } + + protected HttpResponseBase PrepareResponse(HttpResponseBase response) + { + response.ContentType = ContentType; + + if (FileName.HasValue()) + { + response.AddHeader("Content-Disposition", "attachment; filename=\"{0}\"".FormatCurrent(PathHelper.SanitizeFileName(FileName))); + } + + response.AddHeader("Content-Type", ContentType); + + return response; + } + + public override void ExecuteResult(ControllerContext context) + { + var buffer = Converter.Convert(Settings); + var response = PrepareResponse(context.HttpContext.Response); + response.OutputStream.Write(buffer, 0, buffer.Length); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginExtensions.cs index 0925a59f65..e15f9f655a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginExtensions.cs @@ -4,29 +4,29 @@ namespace SmartStore.Web.Framework { - public static class PluginExtensions - { - /// - /// Determines whether a plugin is installed and activated for a particular store. - /// - public static bool IsPluginReady(this IPluginFinder pluginFinder, ISettingService settingService, string systemName, int storeId) - { - try - { - var pluginDescriptor = pluginFinder.GetPluginDescriptorBySystemName(systemName); + public static class PluginExtensions + { + /// + /// Determines whether a plugin is installed and activated for a particular store. + /// + public static bool IsPluginReady(this IPluginFinder pluginFinder, ISettingService settingService, string systemName, int storeId) + { + try + { + var pluginDescriptor = pluginFinder.GetPluginDescriptorBySystemName(systemName); - if (pluginDescriptor != null && pluginDescriptor.Installed) - { - if (storeId == 0 || settingService.GetSettingByKey(pluginDescriptor.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, true)) - return true; - } - } - catch (Exception exc) - { - exc.Dump(); - } + if (pluginDescriptor != null && pluginDescriptor.Installed) + { + if (storeId == 0 || settingService.GetSettingByKey(pluginDescriptor.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, true)) + return true; + } + } + catch (Exception exc) + { + exc.Dump(); + } - return false; - } - } + return false; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginMediator.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginMediator.cs index 6cd85d9b5f..cbeb1e7e75 100644 --- a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginMediator.cs +++ b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginMediator.cs @@ -2,12 +2,9 @@ using System.Collections.Concurrent; using System.IO; using System.Linq; -using System.Linq.Expressions; -using System.Web.Routing; using Autofac; using SmartStore.Core.Domain.Cms; using SmartStore.Core.Domain.Localization; -using SmartStore.Core.Localization; using SmartStore.Core.Plugins; using SmartStore.Services; using SmartStore.Services.Cms; @@ -16,298 +13,298 @@ namespace SmartStore.Web.Framework.Plugins { - public class PluginMediator - { - private static readonly ConcurrentDictionary _routesCache = new ConcurrentDictionary(); - private readonly ICommonServices _services; - private readonly IComponentContext _ctx; - - public PluginMediator(ICommonServices services, IComponentContext ctx) - { - _services = services; - _ctx = ctx; - } - - public string GetLocalizedFriendlyName(IProviderMetadata metadata, int languageId = 0, bool returnDefaultValue = true) - { - return GetLocalizedValue(metadata, "FriendlyName", x => x.FriendlyName, languageId, returnDefaultValue); - } - - public string GetLocalizedDescription(IProviderMetadata metadata, int languageId = 0, bool returnDefaultValue = true) - { - return GetLocalizedValue(metadata, "Description", x => x.Description, languageId, returnDefaultValue); - } - - public string GetLocalizedValue(TMetadata metadata, - string propertyName, - Func fallback, - int languageId = 0, - bool returnDefaultValue = true) - where TMetadata : IProviderMetadata - { - Guard.NotNull(metadata, nameof(metadata)); - - var systemName = metadata.SystemName; - var resourceName = metadata.ResourceKeyPattern.FormatInvariant(metadata.SystemName, propertyName); - string result = _services.Localization.GetResource(resourceName, languageId, false, "", true); - - if (result.IsEmpty() && returnDefaultValue) - result = fallback(metadata); - - return result; - } - - public void SaveLocalizedValue(IProviderMetadata metadata, int languageId, string propertyName, string value) - { - Guard.NotNull(metadata, nameof(metadata)); - Guard.IsPositive(languageId, nameof(languageId)); - Guard.NotEmpty(propertyName, nameof(propertyName)); - - var resourceName = metadata.ResourceKeyPattern.FormatInvariant(metadata.SystemName, propertyName); - var resource = _services.Localization.GetLocaleStringResourceByName(resourceName, languageId, false); - - if (resource != null) - { - if (value.IsEmpty()) - { - // delete - _services.Localization.DeleteLocaleStringResource(resource); - } - else - { - // update - resource.ResourceValue = value; - _services.Localization.UpdateLocaleStringResource(resource); - } - } - else - { - if (value.HasValue()) - { - // insert - resource = new LocaleStringResource - { - LanguageId = languageId, - ResourceName = resourceName, - ResourceValue = value, - }; - _services.Localization.InsertLocaleStringResource(resource); - } - } - } - - public int? GetUserDisplayOrder(ProviderMetadata metadata) - { - return GetSetting(metadata, "DisplayOrder"); - } - - public T GetSetting(ProviderMetadata metadata, string propertyName) - { - var settingKey = metadata.SettingKeyPattern.FormatInvariant(metadata.SystemName, propertyName); - return _services.Settings.GetSettingByKey(settingKey); - } - - public void SetUserDisplayOrder(ProviderMetadata metadata, int displayOrder) - { - Guard.NotNull(metadata, nameof(metadata)); - - metadata.DisplayOrder = displayOrder; - SetSetting(metadata, "DisplayOrder", displayOrder); - } - - public void SetSetting(ProviderMetadata metadata, string propertyName, T value) - { - Guard.NotNull(metadata, nameof(metadata)); - Guard.NotEmpty(propertyName, nameof(propertyName)); - - var settingKey = metadata.SettingKeyPattern.FormatInvariant(metadata.SystemName, propertyName); - - using (_services.Settings.BeginScope()) - { - if (value != null) - { - _services.Settings.SetSetting(settingKey, value, 0, false); - } - else - { - _services.Settings.DeleteSetting(settingKey); - } - } - } - - public ProviderModel ToProviderModel(Provider provider, bool forEdit = false, Action, ProviderModel> enhancer = null) - { - return ToProviderModel(provider, forEdit, enhancer); - } - - public TModel ToProviderModel(Provider provider, bool forEdit = false, Action, TModel> enhancer = null) - where TModel : ProviderModel, new() - where TProvider : IProvider - { - Guard.NotNull(provider, nameof(provider)); - - var metadata = provider.Metadata; - var model = new TModel(); - model.ProviderType = typeof(TProvider); - model.SystemName = metadata.SystemName; - model.FriendlyName = forEdit ? metadata.FriendlyName : GetLocalizedFriendlyName(metadata); - model.Description = forEdit ? metadata.Description : GetLocalizedDescription(metadata); - model.DisplayOrder = metadata.DisplayOrder; - model.IsEditable = metadata.IsEditable; - model.IconUrl = GetIconUrl(metadata); - model.PluginDescriptor = metadata.PluginDescriptor; - if (model.PluginDescriptor != null) - { - model.ProvidingPluginFriendlyName = model.PluginDescriptor.GetLocalizedValue(_services.Localization, "FriendlyName"); - } - - if (metadata.IsConfigurable) - { - var routeInfo = _routesCache.GetOrAdd(model.SystemName, (key) => - { - var configurable = (IConfigurable)provider.Value; - configurable.GetConfigurationRoute(out var actionName, out var controllerName, out var routeValues); - - if (actionName.IsEmpty()) - { - metadata.IsConfigurable = false; - return null; - } - else - { - return new RouteInfo(actionName, controllerName, routeValues); - } - }); - - if (routeInfo != null) - { - model.ConfigurationRoute = new RouteInfo(routeInfo); - } - } - - if (enhancer != null) - { - enhancer(provider, model); - } - - model.IsConfigurable = metadata.IsConfigurable; - - return model; - } - - public string GetBrandImageUrl(ProviderMetadata metadata) - { - var plugin = metadata.PluginDescriptor; - - if (plugin != null) - { - var filesToCheck = (new string[] { "branding.{0}.png", "branding.{0}.gif", "branding.{0}.jpg", "branding.{0}.jpeg" }).Select(x => x.FormatInvariant(metadata.SystemName)); - var dir = plugin.PhysicalPath; - foreach (var file in filesToCheck) - { - if (File.Exists(Path.Combine(dir, "Content", file))) - { - return "~/Plugins/{0}/Content/{1}".FormatInvariant(plugin.SystemName, file); - } - } - - var fallback = plugin.BrandImageFileName; - if (fallback.HasValue()) - { - return "~/Plugins/{0}/Content/{1}".FormatInvariant(plugin.SystemName, fallback); - } - } - - return null; - } - - public string GetIconUrl(ProviderMetadata metadata) - { - var plugin = metadata.PluginDescriptor; - - if (plugin == null) - { - return GetDefaultIconUrl(metadata.GroupName); - } - - return GetIconUrl(plugin, metadata.SystemName); - } - - /// - /// Returns the absolute path of a plugin/provider icon - /// - /// The plugin descriptor. Used to resolve the physical path - /// Optional system name of provider. If passed, an icon with this name gets being tried to resolve first. - /// The icon's absolute path - public string GetIconUrl(PluginDescriptor plugin, string providerSystemName = null) - { - //var cacheKey = new Tuple(plugin, providerSystemName); - - if (providerSystemName.HasValue()) - { - if (File.Exists(Path.Combine(plugin.PhysicalPath, "Content", "icon-{0}.png".FormatInvariant(providerSystemName)))) - { - return "~/Plugins/{0}/Content/icon-{1}.png".FormatInvariant(plugin.SystemName, providerSystemName); - } - } - - if (File.Exists(Path.Combine(plugin.PhysicalPath, "Content", "icon.png"))) - { - return "~/Plugins/{0}/Content/icon.png".FormatInvariant(plugin.SystemName); - } - else - { - return GetDefaultIconUrl(plugin.Group); - } - } - - public string GetDefaultIconUrl(string groupName) - { - if (groupName.HasValue()) - { - string path = "~/Administration/Content/images/icon-plugin-{0}.png".FormatInvariant(groupName.ToLower()); - if (File.Exists(CommonHelper.MapPath(path, false))) - { - return path; - } - } - - return "~/Administration/Content/images/icon-plugin-default.png"; - } - - public void ActivateDependentWidgets(ProviderMetadata parent, bool activate) - { - Guard.NotNull(parent, nameof(parent)); - - if (parent.DependentWidgets == null || parent.DependentWidgets.Length == 0) - return; - - foreach (var systemName in parent.DependentWidgets) - { - var widget = _ctx.ResolveOptionalNamed>(systemName); - if (widget != null) - { - var widgetSettings = _ctx.Resolve(); - - if (widget.IsWidgetActive(widgetSettings)) - { - if (!activate) - { - widgetSettings.ActiveWidgetSystemNames.Remove(systemName); - _services.Settings.SaveSetting(widgetSettings); - } - } - else - { - if (activate) - { - widgetSettings.ActiveWidgetSystemNames.Add(systemName); - _services.Settings.SaveSetting(widgetSettings); - } - } - } - } - } - - } + public class PluginMediator + { + private static readonly ConcurrentDictionary _routesCache = new ConcurrentDictionary(); + private readonly ICommonServices _services; + private readonly IComponentContext _ctx; + + public PluginMediator(ICommonServices services, IComponentContext ctx) + { + _services = services; + _ctx = ctx; + } + + public string GetLocalizedFriendlyName(IProviderMetadata metadata, int languageId = 0, bool returnDefaultValue = true) + { + return GetLocalizedValue(metadata, "FriendlyName", x => x.FriendlyName, languageId, returnDefaultValue); + } + + public string GetLocalizedDescription(IProviderMetadata metadata, int languageId = 0, bool returnDefaultValue = true) + { + return GetLocalizedValue(metadata, "Description", x => x.Description, languageId, returnDefaultValue); + } + + public string GetLocalizedValue(TMetadata metadata, + string propertyName, + Func fallback, + int languageId = 0, + bool returnDefaultValue = true) + where TMetadata : IProviderMetadata + { + Guard.NotNull(metadata, nameof(metadata)); + + var systemName = metadata.SystemName; + var resourceName = metadata.ResourceKeyPattern.FormatInvariant(metadata.SystemName, propertyName); + string result = _services.Localization.GetResource(resourceName, languageId, false, "", true); + + if (result.IsEmpty() && returnDefaultValue) + result = fallback(metadata); + + return result; + } + + public void SaveLocalizedValue(IProviderMetadata metadata, int languageId, string propertyName, string value) + { + Guard.NotNull(metadata, nameof(metadata)); + Guard.IsPositive(languageId, nameof(languageId)); + Guard.NotEmpty(propertyName, nameof(propertyName)); + + var resourceName = metadata.ResourceKeyPattern.FormatInvariant(metadata.SystemName, propertyName); + var resource = _services.Localization.GetLocaleStringResourceByName(resourceName, languageId, false); + + if (resource != null) + { + if (value.IsEmpty()) + { + // delete + _services.Localization.DeleteLocaleStringResource(resource); + } + else + { + // update + resource.ResourceValue = value; + _services.Localization.UpdateLocaleStringResource(resource); + } + } + else + { + if (value.HasValue()) + { + // insert + resource = new LocaleStringResource + { + LanguageId = languageId, + ResourceName = resourceName, + ResourceValue = value, + }; + _services.Localization.InsertLocaleStringResource(resource); + } + } + } + + public int? GetUserDisplayOrder(ProviderMetadata metadata) + { + return GetSetting(metadata, "DisplayOrder"); + } + + public T GetSetting(ProviderMetadata metadata, string propertyName) + { + var settingKey = metadata.SettingKeyPattern.FormatInvariant(metadata.SystemName, propertyName); + return _services.Settings.GetSettingByKey(settingKey); + } + + public void SetUserDisplayOrder(ProviderMetadata metadata, int displayOrder) + { + Guard.NotNull(metadata, nameof(metadata)); + + metadata.DisplayOrder = displayOrder; + SetSetting(metadata, "DisplayOrder", displayOrder); + } + + public void SetSetting(ProviderMetadata metadata, string propertyName, T value) + { + Guard.NotNull(metadata, nameof(metadata)); + Guard.NotEmpty(propertyName, nameof(propertyName)); + + var settingKey = metadata.SettingKeyPattern.FormatInvariant(metadata.SystemName, propertyName); + + using (_services.Settings.BeginScope()) + { + if (value != null) + { + _services.Settings.SetSetting(settingKey, value, 0, false); + } + else + { + _services.Settings.DeleteSetting(settingKey); + } + } + } + + public ProviderModel ToProviderModel(Provider provider, bool forEdit = false, Action, ProviderModel> enhancer = null) + { + return ToProviderModel(provider, forEdit, enhancer); + } + + public TModel ToProviderModel(Provider provider, bool forEdit = false, Action, TModel> enhancer = null) + where TModel : ProviderModel, new() + where TProvider : IProvider + { + Guard.NotNull(provider, nameof(provider)); + + var metadata = provider.Metadata; + var model = new TModel(); + model.ProviderType = typeof(TProvider); + model.SystemName = metadata.SystemName; + model.FriendlyName = forEdit ? metadata.FriendlyName : GetLocalizedFriendlyName(metadata); + model.Description = forEdit ? metadata.Description : GetLocalizedDescription(metadata); + model.DisplayOrder = metadata.DisplayOrder; + model.IsEditable = metadata.IsEditable; + model.IconUrl = GetIconUrl(metadata); + model.PluginDescriptor = metadata.PluginDescriptor; + if (model.PluginDescriptor != null) + { + model.ProvidingPluginFriendlyName = model.PluginDescriptor.GetLocalizedValue(_services.Localization, "FriendlyName"); + } + + if (metadata.IsConfigurable) + { + var routeInfo = _routesCache.GetOrAdd(model.SystemName, (key) => + { + var configurable = (IConfigurable)provider.Value; + configurable.GetConfigurationRoute(out var actionName, out var controllerName, out var routeValues); + + if (actionName.IsEmpty()) + { + metadata.IsConfigurable = false; + return null; + } + else + { + return new RouteInfo(actionName, controllerName, routeValues); + } + }); + + if (routeInfo != null) + { + model.ConfigurationRoute = new RouteInfo(routeInfo); + } + } + + if (enhancer != null) + { + enhancer(provider, model); + } + + model.IsConfigurable = metadata.IsConfigurable; + + return model; + } + + public string GetBrandImageUrl(ProviderMetadata metadata) + { + var plugin = metadata.PluginDescriptor; + + if (plugin != null) + { + var filesToCheck = (new string[] { "branding.{0}.png", "branding.{0}.gif", "branding.{0}.jpg", "branding.{0}.jpeg" }).Select(x => x.FormatInvariant(metadata.SystemName)); + var dir = plugin.PhysicalPath; + foreach (var file in filesToCheck) + { + if (File.Exists(Path.Combine(dir, "Content", file))) + { + return "~/Plugins/{0}/Content/{1}".FormatInvariant(plugin.SystemName, file); + } + } + + var fallback = plugin.BrandImageFileName; + if (fallback.HasValue()) + { + return "~/Plugins/{0}/Content/{1}".FormatInvariant(plugin.SystemName, fallback); + } + } + + return null; + } + + public string GetIconUrl(ProviderMetadata metadata) + { + var plugin = metadata.PluginDescriptor; + + if (plugin == null) + { + return GetDefaultIconUrl(metadata.GroupName); + } + + return GetIconUrl(plugin, metadata.SystemName); + } + + /// + /// Returns the absolute path of a plugin/provider icon + /// + /// The plugin descriptor. Used to resolve the physical path + /// Optional system name of provider. If passed, an icon with this name gets being tried to resolve first. + /// The icon's absolute path + public string GetIconUrl(PluginDescriptor plugin, string providerSystemName = null) + { + //var cacheKey = new Tuple(plugin, providerSystemName); + + if (providerSystemName.HasValue()) + { + if (File.Exists(Path.Combine(plugin.PhysicalPath, "Content", "icon-{0}.png".FormatInvariant(providerSystemName)))) + { + return "~/Plugins/{0}/Content/icon-{1}.png".FormatInvariant(plugin.SystemName, providerSystemName); + } + } + + if (File.Exists(Path.Combine(plugin.PhysicalPath, "Content", "icon.png"))) + { + return "~/Plugins/{0}/Content/icon.png".FormatInvariant(plugin.SystemName); + } + else + { + return GetDefaultIconUrl(plugin.Group); + } + } + + public string GetDefaultIconUrl(string groupName) + { + if (groupName.HasValue()) + { + string path = "~/Administration/Content/images/icon-plugin-{0}.png".FormatInvariant(groupName.ToLower()); + if (File.Exists(CommonHelper.MapPath(path, false))) + { + return path; + } + } + + return "~/Administration/Content/images/icon-plugin-default.png"; + } + + public void ActivateDependentWidgets(ProviderMetadata parent, bool activate) + { + Guard.NotNull(parent, nameof(parent)); + + if (parent.DependentWidgets == null || parent.DependentWidgets.Length == 0) + return; + + foreach (var systemName in parent.DependentWidgets) + { + var widget = _ctx.ResolveOptionalNamed>(systemName); + if (widget != null) + { + var widgetSettings = _ctx.Resolve(); + + if (widget.IsWidgetActive(widgetSettings)) + { + if (!activate) + { + widgetSettings.ActiveWidgetSystemNames.Remove(systemName); + _services.Settings.SaveSetting(widgetSettings); + } + } + else + { + if (activate) + { + widgetSettings.ActiveWidgetSystemNames.Add(systemName); + _services.Settings.SaveSetting(widgetSettings); + } + } + } + } + } + + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs index 01527d924f..ac2a4cd5fd 100644 --- a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs +++ b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs @@ -1,5 +1,4 @@ -using System; -using System.Web; +using System.Web; using System.Web.Hosting; using System.Web.Mvc.Razor; using System.Web.WebPages.Razor; @@ -8,35 +7,35 @@ namespace SmartStore.Web.Framework.Plugins { - public class PluginRazorHostFactory : WebRazorHostFactory - { - public override WebPageRazorHost CreateHost(string virtualPath, string physicalPath) - { - // Implementation borrowed from MvcRazorHostFactory - var host = base.CreateHost(virtualPath, physicalPath); + public class PluginRazorHostFactory : WebRazorHostFactory + { + public override WebPageRazorHost CreateHost(string virtualPath, string physicalPath) + { + // Implementation borrowed from MvcRazorHostFactory + var host = base.CreateHost(virtualPath, physicalPath); - if (!host.IsSpecialPage) - { - return new PluginRazorHost(virtualPath, physicalPath); - } + if (!host.IsSpecialPage) + { + return new PluginRazorHost(virtualPath, physicalPath); + } - return host; - } - } + return host; + } + } - public class PluginRazorHost : MvcWebPageRazorHost - { - public PluginRazorHost(string virtualPath, string physicalPath) - : base(virtualPath, physicalPath) - { - if (CommonHelper.IsDevEnvironment && HttpContext.Current.IsDebuggingEnabled) - { - var file = HostingEnvironment.VirtualPathProvider.GetFile(virtualPath) as DebugVirtualFile; - if (file != null) - { - PhysicalPath = file.PhysicalPath; - } - } - } - } + public class PluginRazorHost : MvcWebPageRazorHost + { + public PluginRazorHost(string virtualPath, string physicalPath) + : base(virtualPath, physicalPath) + { + if (CommonHelper.IsDevEnvironment && HttpContext.Current.IsDebuggingEnabled) + { + var file = HostingEnvironment.VirtualPathProvider.GetFile(virtualPath) as DebugVirtualFile; + if (file != null) + { + PhysicalPath = file.PhysicalPath; + } + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderManager.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderManager.cs index e08ef6561e..e346a0010c 100644 --- a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderManager.cs +++ b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderManager.cs @@ -7,139 +7,139 @@ namespace SmartStore.Web.Framework.Plugins { - public partial class ProviderManager : IProviderManager - { - private readonly IComponentContext _ctx; - private readonly ICommonServices _services; - private readonly PluginMediator _pluginMediator; - - public ProviderManager(IComponentContext ctx, ICommonServices services, PluginMediator pluginMediator) - { - _ctx = ctx; - _services = services; - _pluginMediator = pluginMediator; - } - - public Provider GetProvider(string systemName, int storeId = 0) where TProvider : IProvider - { - if (systemName.IsEmpty()) - return null; - - var provider = _ctx.ResolveOptionalNamed>(systemName); - if (provider != null) - { - if (storeId > 0) - { - var d = provider.Metadata.PluginDescriptor; - if (d != null && !IsActiveForStore(d, storeId)) - { - return null; - } - } - SetUserData(provider.Metadata); - return new Provider(provider); - } - - return null; - } - - public Provider GetProvider(string systemName, int storeId = 0) - { - Guard.NotEmpty(systemName, nameof(systemName)); - - var provider = _ctx.ResolveOptionalNamed>(systemName); - if (provider != null) - { - if (storeId > 0) - { - var d = provider.Metadata.PluginDescriptor; - if (d != null && !IsActiveForStore(d, storeId)) - { - return null; - } - } - SetUserData(provider.Metadata); - return new Provider(provider); - } - return null; - } - - public IEnumerable> GetAllProviders(int storeId = 0) where TProvider : IProvider - { - var providers = _ctx.Resolve>>(); - if (storeId > 0) - { - providers = from p in providers - let d = p.Metadata.PluginDescriptor - where d == null || IsActiveForStore(d, storeId) - select p; - } - return SortProviders(providers.Select(x => new Provider(x))); - } - - public IEnumerable> GetAllProviders(int storeId = 0) - { - var providers = _ctx.Resolve>>(); - if (storeId > 0) - { - providers = from p in providers - let d = p.Metadata.PluginDescriptor - where d == null || IsActiveForStore(d, storeId) - select p; - } - return SortProviders(providers.Select(x => new Provider(x))); - } - - protected virtual IEnumerable> SortProviders(IEnumerable> providers) where TProvider : IProvider - { - foreach (var m in providers.Select(x => x.Metadata)) - { - SetUserData(m); - } - - return providers.OrderBy(x => x.Metadata.DisplayOrder).ThenBy(x => x.Metadata.FriendlyName); - } - - protected virtual void SetUserData(ProviderMetadata metadata) - { - if (!metadata.IsEditable) - return; - - var displayOrder = _pluginMediator.GetUserDisplayOrder(metadata); - var name = _pluginMediator.GetSetting(metadata, "FriendlyName"); - var description = _pluginMediator.GetSetting(metadata, "Description"); - metadata.FriendlyName = name; - metadata.Description = description; - - if (displayOrder.HasValue) - { - metadata.DisplayOrder = displayOrder.Value; - } - } - - private bool IsActiveForStore(PluginDescriptor plugin, int storeId) - { - if (storeId == 0) - { - return true; - } - - var limitedToStoresSetting = _services.Settings.GetSettingByKey(plugin.GetSettingKey("LimitedToStores")); - if (limitedToStoresSetting.IsEmpty()) - { - return true; - } - - var limitedToStores = limitedToStoresSetting.ToIntArray(); - if (limitedToStores.Length > 0) - { - var flag = limitedToStores.Contains(storeId); - return flag; - } - - return true; - } - - } + public partial class ProviderManager : IProviderManager + { + private readonly IComponentContext _ctx; + private readonly ICommonServices _services; + private readonly PluginMediator _pluginMediator; + + public ProviderManager(IComponentContext ctx, ICommonServices services, PluginMediator pluginMediator) + { + _ctx = ctx; + _services = services; + _pluginMediator = pluginMediator; + } + + public Provider GetProvider(string systemName, int storeId = 0) where TProvider : IProvider + { + if (systemName.IsEmpty()) + return null; + + var provider = _ctx.ResolveOptionalNamed>(systemName); + if (provider != null) + { + if (storeId > 0) + { + var d = provider.Metadata.PluginDescriptor; + if (d != null && !IsActiveForStore(d, storeId)) + { + return null; + } + } + SetUserData(provider.Metadata); + return new Provider(provider); + } + + return null; + } + + public Provider GetProvider(string systemName, int storeId = 0) + { + Guard.NotEmpty(systemName, nameof(systemName)); + + var provider = _ctx.ResolveOptionalNamed>(systemName); + if (provider != null) + { + if (storeId > 0) + { + var d = provider.Metadata.PluginDescriptor; + if (d != null && !IsActiveForStore(d, storeId)) + { + return null; + } + } + SetUserData(provider.Metadata); + return new Provider(provider); + } + return null; + } + + public IEnumerable> GetAllProviders(int storeId = 0) where TProvider : IProvider + { + var providers = _ctx.Resolve>>(); + if (storeId > 0) + { + providers = from p in providers + let d = p.Metadata.PluginDescriptor + where d == null || IsActiveForStore(d, storeId) + select p; + } + return SortProviders(providers.Select(x => new Provider(x))); + } + + public IEnumerable> GetAllProviders(int storeId = 0) + { + var providers = _ctx.Resolve>>(); + if (storeId > 0) + { + providers = from p in providers + let d = p.Metadata.PluginDescriptor + where d == null || IsActiveForStore(d, storeId) + select p; + } + return SortProviders(providers.Select(x => new Provider(x))); + } + + protected virtual IEnumerable> SortProviders(IEnumerable> providers) where TProvider : IProvider + { + foreach (var m in providers.Select(x => x.Metadata)) + { + SetUserData(m); + } + + return providers.OrderBy(x => x.Metadata.DisplayOrder).ThenBy(x => x.Metadata.FriendlyName); + } + + protected virtual void SetUserData(ProviderMetadata metadata) + { + if (!metadata.IsEditable) + return; + + var displayOrder = _pluginMediator.GetUserDisplayOrder(metadata); + var name = _pluginMediator.GetSetting(metadata, "FriendlyName"); + var description = _pluginMediator.GetSetting(metadata, "Description"); + metadata.FriendlyName = name; + metadata.Description = description; + + if (displayOrder.HasValue) + { + metadata.DisplayOrder = displayOrder.Value; + } + } + + private bool IsActiveForStore(PluginDescriptor plugin, int storeId) + { + if (storeId == 0) + { + return true; + } + + var limitedToStoresSetting = _services.Settings.GetSettingByKey(plugin.GetSettingKey("LimitedToStores")); + if (limitedToStoresSetting.IsEmpty()) + { + return true; + } + + var limitedToStores = limitedToStoresSetting.ToIntArray(); + if (limitedToStores.Length > 0) + { + var flag = limitedToStores.Contains(storeId); + return flag; + } + + return true; + } + + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs index fa02cb9798..39fbe63e21 100644 --- a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs @@ -8,81 +8,72 @@ namespace SmartStore.Web.Framework.Plugins { - public class ProviderModel : ModelBase, ILocalizedModel - { - private IList _locales; - - public Type ProviderType { get; set; } - - [SmartResourceDisplayName("Common.SystemName")] - public string SystemName { get; set; } - - [SmartResourceDisplayName("Common.FriendlyName")] - [AllowHtml] - public string FriendlyName { get; set; } - - [SmartResourceDisplayName("Common.Description")] - [AllowHtml] - public string Description { get; set; } - - [SmartResourceDisplayName("Common.DisplayOrder")] - public int DisplayOrder { get; set; } - - public bool IsEditable { get; set; } - - public bool IsConfigurable { get; set; } - - public RouteInfo ConfigurationRoute { get; set; } - - public PluginDescriptor PluginDescriptor { get; set; } - - [SmartResourceDisplayName("Admin.Providers.ProvidingPlugin")] - public string ProvidingPluginFriendlyName { get; set; } - - /// - /// Returns the absolute path of the provider's icon url. - /// - /// - /// The parent plugin's icon url is returned as a fallback, if provider icon cannot be resolved. - /// - public string IconUrl { get; set; } - - public IList Locales - { - get - { - if (_locales == null) - { - _locales = new List(); - } - return _locales; - } - set - { - _locales = value; - } - } - - public bool IsPaymentMethod - { - get - { - return ProviderType == typeof(IPaymentMethod); - } - } - } - - public class ProviderLocalizedModel : ILocalizedModelLocal - { - public int LanguageId { get; set; } - - [SmartResourceDisplayName("Common.FriendlyName")] - [AllowHtml] - public string FriendlyName { get; set; } - - [SmartResourceDisplayName("Common.Description")] - [AllowHtml] - public string Description { get; set; } - } + public class ProviderModel : ModelBase, ILocalizedModel + { + private IList _locales; + + public Type ProviderType { get; set; } + + [SmartResourceDisplayName("Common.SystemName")] + public string SystemName { get; set; } + + [SmartResourceDisplayName("Common.FriendlyName")] + [AllowHtml] + public string FriendlyName { get; set; } + + [SmartResourceDisplayName("Common.Description")] + [AllowHtml] + public string Description { get; set; } + + [SmartResourceDisplayName("Common.DisplayOrder")] + public int DisplayOrder { get; set; } + + public bool IsEditable { get; set; } + + public bool IsConfigurable { get; set; } + + public RouteInfo ConfigurationRoute { get; set; } + + public PluginDescriptor PluginDescriptor { get; set; } + + [SmartResourceDisplayName("Admin.Providers.ProvidingPlugin")] + public string ProvidingPluginFriendlyName { get; set; } + + /// + /// Returns the absolute path of the provider's icon url. + /// + /// + /// The parent plugin's icon url is returned as a fallback, if provider icon cannot be resolved. + /// + public string IconUrl { get; set; } + + public IList Locales + { + get + { + if (_locales == null) + { + _locales = new List(); + } + return _locales; + } + set => _locales = value; + } + + public bool IsPaymentMethod => ProviderType == typeof(IPaymentMethod); + } + + public class ProviderLocalizedModel : ILocalizedModelLocal + { + public int LanguageId { get; set; } + + [SmartResourceDisplayName("Common.FriendlyName")] + [AllowHtml] + public string FriendlyName { get; set; } + + [SmartResourceDisplayName("Common.Description")] + [AllowHtml] + public string Description { get; set; } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Properties/AssemblyInfo.cs b/src/Presentation/SmartStore.Web.Framework/Properties/AssemblyInfo.cs index 3803039590..7ce572fa25 100644 --- a/src/Presentation/SmartStore.Web.Framework/Properties/AssemblyInfo.cs +++ b/src/Presentation/SmartStore.Web.Framework/Properties/AssemblyInfo.cs @@ -1,6 +1,5 @@ using System.Reflection; using System.Runtime.CompilerServices; -using System.Security; [assembly: AssemblyTitle("SmartStore.Web.Framework")] diff --git a/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs b/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs index 97f1550d1b..b936aaad1e 100644 --- a/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs +++ b/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs @@ -20,7 +20,7 @@ public bool Match(HttpContextBase httpContext, Route route, string parameterName if (!string.IsNullOrEmpty(stringValue)) { - return Guid.TryParse(stringValue, out var guidValue) && + return Guid.TryParse(stringValue, out var guidValue) && (_allowEmpty || guidValue != Guid.Empty); } } diff --git a/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs b/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs index 60191958db..8906a4a3c8 100644 --- a/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs +++ b/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs @@ -17,7 +17,7 @@ public RoutePublisher(ITypeFinder typeFinder) public void RegisterRoutes(RouteCollection routes) { - var routeProviderTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); + var routeProviderTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); var routeProviders = new List(); foreach (var providerType in routeProviderTypes) @@ -26,10 +26,10 @@ public void RegisterRoutes(RouteCollection routes) routeProviders.Add(provider); } routeProviders = routeProviders.OrderByDescending(rp => rp.Priority).ToList(); - routeProviders.Each(rp => - { - rp.RegisterRoutes(routes); - }); + routeProviders.Each(rp => + { + rp.RegisterRoutes(routes); + }); } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs index 14b9f93177..4493d1d338 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs @@ -6,12 +6,12 @@ namespace SmartStore.Web.Framework.Security { - [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited=true, AllowMultiple=true)] + [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = true, AllowMultiple = true)] public class AdminAuthorizeAttribute : FilterAttribute, IAuthorizationFilter { - public IPermissionService PermissionService { get; set; } - - private void HandleUnauthorizedRequest(AuthorizationContext filterContext) + public IPermissionService PermissionService { get; set; } + + private void HandleUnauthorizedRequest(AuthorizationContext filterContext) { filterContext.Result = new HttpUnauthorizedResult(); } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs index aca5a27830..9568d12685 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs @@ -3,62 +3,61 @@ using System.Web.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Security; -using SmartStore.Core.Infrastructure; namespace SmartStore.Web.Framework.Security { public class AdminValidateIpAddressAttribute : FilterAttribute, IAuthorizationFilter { - public Lazy WebHelper { get; set; } - public Lazy SecuritySettings { get; set; } + public Lazy WebHelper { get; set; } + public Lazy SecuritySettings { get; set; } - public virtual void OnAuthorization(AuthorizationContext filterContext) - { - if (filterContext == null || filterContext.HttpContext == null) - return; + public virtual void OnAuthorization(AuthorizationContext filterContext) + { + if (filterContext == null || filterContext.HttpContext == null) + return; - HttpRequestBase request = filterContext.HttpContext.Request; - if (request == null) - return; + HttpRequestBase request = filterContext.HttpContext.Request; + if (request == null) + return; - // don't apply filter to child methods - if (filterContext.IsChildAction) - return; + // don't apply filter to child methods + if (filterContext.IsChildAction) + return; - // Prevent lockout - if (filterContext.HttpContext.Request.IsLocal) - return; + // Prevent lockout + if (filterContext.HttpContext.Request.IsLocal) + return; - bool ok = false; - var ipAddresses = SecuritySettings.Value.AdminAreaAllowedIpAddresses; - if (ipAddresses != null && ipAddresses.Count > 0) - { - var webHelper = WebHelper.Value; - var curIpAddress = webHelper.GetCurrentIpAddress(); - foreach (string ip in ipAddresses) - if (ip.Equals(curIpAddress, StringComparison.InvariantCultureIgnoreCase)) - { - ok = true; - break; - } - } - else - { - //no restrictions - ok = true; - } + bool ok = false; + var ipAddresses = SecuritySettings.Value.AdminAreaAllowedIpAddresses; + if (ipAddresses != null && ipAddresses.Count > 0) + { + var webHelper = WebHelper.Value; + var curIpAddress = webHelper.GetCurrentIpAddress(); + foreach (string ip in ipAddresses) + if (ip.Equals(curIpAddress, StringComparison.InvariantCultureIgnoreCase)) + { + ok = true; + break; + } + } + else + { + //no restrictions + ok = true; + } - if (!ok) - { - //ensure that it's not 'Access denied' page - var webHelper = WebHelper.Value; - var thisPageUrl = webHelper.GetThisPageUrl(false); - if (!thisPageUrl.StartsWith(string.Format("{0}admin/security/accessdenied", webHelper.GetStoreLocation()), StringComparison.InvariantCultureIgnoreCase)) - { - //redirect to 'Access denied' page - filterContext.Result = new RedirectResult(webHelper.GetStoreLocation() + "admin/security/accessdenied"); - } - } - } - } + if (!ok) + { + //ensure that it's not 'Access denied' page + var webHelper = WebHelper.Value; + var thisPageUrl = webHelper.GetThisPageUrl(false); + if (!thisPageUrl.StartsWith(string.Format("{0}admin/security/accessdenied", webHelper.GetStoreLocation()), StringComparison.InvariantCultureIgnoreCase)) + { + //redirect to 'Access denied' page + filterContext.Result = new RedirectResult(webHelper.GetStoreLocation() + "admin/security/accessdenied"); + } + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/CaptchaSettings.cs b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/CaptchaSettings.cs index 799a507216..3ed092b904 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/CaptchaSettings.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/CaptchaSettings.cs @@ -17,8 +17,8 @@ public class CaptchaSettings : ISettings public bool ShowOnProductReviewPage { get; set; } public string ReCaptchaPublicKey { get; set; } public string ReCaptchaPrivateKey { get; set; } - public bool UseInvisibleReCaptcha { get; set; } + public bool UseInvisibleReCaptcha { get; set; } public bool CanDisplayCaptcha => Enabled && ReCaptchaPublicKey.HasValue() && ReCaptchaPrivateKey.HasValue(); - } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs index c2f4994e96..d00153bfac 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs @@ -7,7 +7,7 @@ namespace SmartStore.Web.Framework.Security { public static class HtmlCaptchaExtensions - { + { public static IHtmlString GenerateCaptcha(this HtmlHelper helper) { var captchaSettings = EngineContext.Current.Resolve(); @@ -25,7 +25,7 @@ public static IHtmlString GenerateCaptcha(this HtmlHelper helper) widgetUrl, callbackName, workContext.WorkingLanguage.UniqueSeoCode.EmptyNull().ToLower() - ); + ); var script = new[] { diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs index b3998389cd..d1f65774f2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs @@ -18,15 +18,15 @@ public class ValidateCaptchaAttribute : ActionFilterAttribute { public ILogger Logger { get; set; } = NullLogger.Instance; public Lazy CaptchaSettings { get; set; } - public Lazy LocalizationService { get; set; } + public Lazy LocalizationService { get; set; } - public override void OnActionExecuting(ActionExecutingContext filterContext) + public override void OnActionExecuting(ActionExecutingContext filterContext) { var valid = false; var verify = true; try - { + { verify = CaptchaSettings.Value.CanDisplayCaptcha && VerifyRecaptcha(filterContext); if (verify) @@ -70,14 +70,14 @@ public override void OnActionExecuting(ActionExecutingContext filterContext) } } } - } - catch (Exception ex) - { - Logger.ErrorsAll(ex); - } + } + catch (Exception ex) + { + Logger.ErrorsAll(ex); + } - // Push the result values as parameters in our action method. - filterContext.ActionParameters["captchaValid"] = valid; + // Push the result values as parameters in our action method. + filterContext.ActionParameters["captchaValid"] = valid; filterContext.ActionParameters["captchaError"] = !valid && verify ? LocalizationService.Value.GetResource(CaptchaSettings.Value.UseInvisibleReCaptcha ? "Common.WrongInvisibleCaptcha" : "Common.WrongCaptcha") @@ -147,13 +147,13 @@ private bool VerifyRecaptcha(ActionExecutingContext context) } - [DataContract] - public class GoogleRecaptchaApiResponse - { - [DataMember(Name = "success")] - public bool Success { get; set; } + [DataContract] + public class GoogleRecaptchaApiResponse + { + [DataMember(Name = "success")] + public bool Success { get; set; } - [DataMember(Name = "error-codes")] - public List ErrorCodes { get; set; } - } + [DataMember(Name = "error-codes")] + public List ErrorCodes { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/FilePermissionHelper.cs b/src/Presentation/SmartStore.Web.Framework/Security/FilePermissionHelper.cs index 35b5720dd3..1ee8d1b697 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/FilePermissionHelper.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/FilePermissionHelper.cs @@ -156,12 +156,12 @@ public static IEnumerable GetDirectoriesWrite(IWebHelper webHelper) string rootDir = webHelper.MapPath("~/"); var dirsToCheck = new List(); dirsToCheck.Add(Path.Combine(rootDir, "App_Data")); - dirsToCheck.Add(Path.Combine(rootDir, "App_Data", "Tenants", DataSettings.Current.TenantName)); - dirsToCheck.Add(Path.Combine(rootDir, "App_Data", "Tenants", DataSettings.Current.TenantName, "Media")); - dirsToCheck.Add(Path.Combine(rootDir, "bin")); + dirsToCheck.Add(Path.Combine(rootDir, "App_Data", "Tenants", DataSettings.Current.TenantName)); + dirsToCheck.Add(Path.Combine(rootDir, "App_Data", "Tenants", DataSettings.Current.TenantName, "Media")); + dirsToCheck.Add(Path.Combine(rootDir, "bin")); dirsToCheck.Add(Path.Combine(rootDir, "content")); - dirsToCheck.Add(Path.Combine(rootDir, "Exchange")); - dirsToCheck.Add(Path.Combine(rootDir, "plugins")); + dirsToCheck.Add(Path.Combine(rootDir, "Exchange")); + dirsToCheck.Add(Path.Combine(rootDir, "plugins")); dirsToCheck.Add(Path.Combine(rootDir, "plugins\\bin")); return dirsToCheck; } @@ -175,12 +175,12 @@ public static IEnumerable GetFilesWrite(IWebHelper webHelper) { string rootDir = webHelper.MapPath("~/"); var filesToCheck = new List(); - //filesToCheck.Add(Path.Combine(rootDir, "Global.asax")); - //filesToCheck.Add(Path.Combine(rootDir, "web.config")); - filesToCheck.Add(Path.Combine(rootDir, "App_Data", "Tenants", DataSettings.Current.TenantName, "InstalledPlugins.txt")); - filesToCheck.Add(Path.Combine(rootDir, "App_Data", "Tenants", DataSettings.Current.TenantName, "Settings.txt")); + //filesToCheck.Add(Path.Combine(rootDir, "Global.asax")); + //filesToCheck.Add(Path.Combine(rootDir, "web.config")); + filesToCheck.Add(Path.Combine(rootDir, "App_Data", "Tenants", DataSettings.Current.TenantName, "InstalledPlugins.txt")); + filesToCheck.Add(Path.Combine(rootDir, "App_Data", "Tenants", DataSettings.Current.TenantName, "Settings.txt")); - return filesToCheck; + return filesToCheck; } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs index c9e58fe770..8bad998c40 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs @@ -7,70 +7,70 @@ namespace SmartStore.Web.Framework.Security { - public class HoneypotField - { - public string Name { get; set; } - public DateTime CreatedOnUtc { get; set; } - } + public class HoneypotField + { + public string Name { get; set; } + public DateTime CreatedOnUtc { get; set; } + } - internal static class Honeypot - { - internal const string TokenFieldName = "__hpToken"; + internal static class Honeypot + { + internal const string TokenFieldName = "__hpToken"; - private static readonly string[] _fieldNames = new[] { "Phone", "Fax", "Email", "Age", "Name", "FirstName", "LastName", "Type", "Custom", "Reason", "Pet", "Question", "Region" }; - private static readonly string _fieldSuffix = CommonHelper.GenerateRandomDigitCode(5); + private static readonly string[] _fieldNames = new[] { "Phone", "Fax", "Email", "Age", "Name", "FirstName", "LastName", "Type", "Custom", "Reason", "Pet", "Question", "Region" }; + private static readonly string _fieldSuffix = CommonHelper.GenerateRandomDigitCode(5); - public static HoneypotField CreateToken() - { - var r = new Random(); + public static HoneypotField CreateToken() + { + var r = new Random(); - // Create a rondom field name with pattern "[random1]-[random2][suffix]" - var len = _fieldNames.Length; - var fieldName = string.Concat(_fieldNames[r.Next(0, len)], "-", _fieldNames[r.Next(0, len)], _fieldSuffix); + // Create a rondom field name with pattern "[random1]-[random2][suffix]" + var len = _fieldNames.Length; + var fieldName = string.Concat(_fieldNames[r.Next(0, len)], "-", _fieldNames[r.Next(0, len)], _fieldSuffix); - return new HoneypotField - { - Name = fieldName, - CreatedOnUtc = DateTime.UtcNow - }; - } + return new HoneypotField + { + Name = fieldName, + CreatedOnUtc = DateTime.UtcNow + }; + } - public static string SerializeToken(HoneypotField token) - { - Guard.NotNull(token, nameof(token)); + public static string SerializeToken(HoneypotField token) + { + Guard.NotNull(token, nameof(token)); - var json = JsonConvert.SerializeObject(token); - var encoded = MachineKey.Protect(Encoding.UTF8.GetBytes(json)); + var json = JsonConvert.SerializeObject(token); + var encoded = MachineKey.Protect(Encoding.UTF8.GetBytes(json)); - var result = Convert.ToBase64String(encoded); - return result; - } + var result = Convert.ToBase64String(encoded); + return result; + } - public static HoneypotField DeserializeToken(string token) - { - Guard.NotEmpty(token, nameof(token)); + public static HoneypotField DeserializeToken(string token) + { + Guard.NotEmpty(token, nameof(token)); - var encoded = Convert.FromBase64String(token); - var decoded = MachineKey.Unprotect(encoded); - var json = Encoding.UTF8.GetString(decoded); + var encoded = Convert.FromBase64String(token); + var decoded = MachineKey.Unprotect(encoded); + var json = Encoding.UTF8.GetString(decoded); - var result = JsonConvert.DeserializeObject(json); - return result; - } + var result = JsonConvert.DeserializeObject(json); + return result; + } - public static bool IsBot(HttpContextBase httpContext) - { - var tokenString = httpContext.Request.Form[TokenFieldName]; - if (tokenString.IsEmpty()) - { - throw new InvalidOperationException("The required honeypot form field is missing. Please render the field with 'Html.HoneypotField()'."); - } + public static bool IsBot(HttpContextBase httpContext) + { + var tokenString = httpContext.Request.Form[TokenFieldName]; + if (tokenString.IsEmpty()) + { + throw new InvalidOperationException("The required honeypot form field is missing. Please render the field with 'Html.HoneypotField()'."); + } - var token = DeserializeToken(tokenString); - var trap = httpContext.Request.Form[token.Name]; - var isBot = trap == null || trap.Length > 0 || (DateTime.UtcNow - token.CreatedOnUtc).TotalMilliseconds < 2000; + var token = DeserializeToken(tokenString); + var trap = httpContext.Request.Form[token.Name]; + var isBot = trap == null || trap.Length > 0 || (DateTime.UtcNow - token.CreatedOnUtc).TotalMilliseconds < 2000; - return isBot; - } - } + return isBot; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs index 49593920a1..328b3ce01d 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs @@ -1,20 +1,19 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; using System.Web.Mvc.Html; namespace SmartStore.Web.Framework.Security { - public static class HtmlHoneypotExtensions - { - public static MvcHtmlString HoneypotField(this HtmlHelper html) - { - var token = Honeypot.CreateToken(); - var serializedToken = Honeypot.SerializeToken(token); + public static class HtmlHoneypotExtensions + { + public static MvcHtmlString HoneypotField(this HtmlHelper html) + { + var token = Honeypot.CreateToken(); + var serializedToken = Honeypot.SerializeToken(token); - var textField = html.TextBox(token.Name, string.Empty, new { @class = "required-text-input", autocomplete = "off" }).ToHtmlString(); - var hiddenField = html.Hidden(Honeypot.TokenFieldName, serializedToken).ToHtmlString(); + var textField = html.TextBox(token.Name, string.Empty, new { @class = "required-text-input", autocomplete = "off" }).ToHtmlString(); + var hiddenField = html.Hidden(Honeypot.TokenFieldName, serializedToken).ToHtmlString(); - return MvcHtmlString.Create(textField + hiddenField); - } - } + return MvcHtmlString.Create(textField + hiddenField); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/ValidateHoneypotAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/ValidateHoneypotAttribute.cs index 3d026fc75f..b064401d34 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/ValidateHoneypotAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/ValidateHoneypotAttribute.cs @@ -7,32 +7,32 @@ namespace SmartStore.Web.Framework.Security { - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)] - public class ValidateHoneypotAttribute : FilterAttribute, IAuthorizationFilter + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)] + public class ValidateHoneypotAttribute : FilterAttribute, IAuthorizationFilter { - public ValidateHoneypotAttribute() - { - Logger = NullLogger.Instance; - } + public ValidateHoneypotAttribute() + { + Logger = NullLogger.Instance; + } - public SecuritySettings SecuritySettings { get; set; } - public ILogger Logger { get; set; } - public Localizer T { get; set; } - public Lazy WebHelper { get; set; } + public SecuritySettings SecuritySettings { get; set; } + public ILogger Logger { get; set; } + public Localizer T { get; set; } + public Lazy WebHelper { get; set; } - public void OnAuthorization(AuthorizationContext filterContext) - { - if (!SecuritySettings.EnableHoneypotProtection) - return; + public void OnAuthorization(AuthorizationContext filterContext) + { + if (!SecuritySettings.EnableHoneypotProtection) + return; - var isBot = Honeypot.IsBot(filterContext.HttpContext); - if (!isBot) - return; - - Logger.Warn("Honeypot detected a bot and rejected the request."); + var isBot = Honeypot.IsBot(filterContext.HttpContext); + if (!isBot) + return; - var redirectUrl = WebHelper.Value.GetThisPageUrl(true); - filterContext.Result = new RedirectResult(redirectUrl); - } - } + Logger.Warn("Honeypot detected a bot and rejected the request."); + + var redirectUrl = WebHelper.Value.GetThisPageUrl(true); + filterContext.Result = new RedirectResult(redirectUrl); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Security/SanitizeHtmlAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/SanitizeHtmlAttribute.cs index ddfb9cec9f..34939ca5e2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/SanitizeHtmlAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/SanitizeHtmlAttribute.cs @@ -3,25 +3,25 @@ namespace SmartStore.Web.Framework.Security { - [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)] - public class SanitizeHtmlAttribute : Attribute, IMetadataAware - { - public SanitizeHtmlAttribute() - { - IsFragment = true; - } + [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)] + public class SanitizeHtmlAttribute : Attribute, IMetadataAware + { + public SanitizeHtmlAttribute() + { + IsFragment = true; + } - public bool IsFragment - { - get; - set; - } + public bool IsFragment + { + get; + set; + } - public void OnMetadataCreated(ModelMetadata metadata) - { - Guard.NotNull(metadata, nameof(metadata)); + public void OnMetadataCreated(ModelMetadata metadata) + { + Guard.NotNull(metadata, nameof(metadata)); - metadata.RequestValidationEnabled = false; - } - } + metadata.RequestValidationEnabled = false; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs index 1b476d0284..33a63227bb 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs @@ -96,22 +96,22 @@ public static void RegisterPaths(params GenericPath[] paths) public static IEnumerable Paths { get; } = _paths.Values.OrderBy(x => x.Order); - public static void RegisterUrlPrefix(string prefix, params string[] entityNames) - { - Guard.NotEmpty(prefix, nameof(prefix)); + public static void RegisterUrlPrefix(string prefix, params string[] entityNames) + { + Guard.NotEmpty(prefix, nameof(prefix)); - _urlPrefixes.AddRange(prefix, entityNames); - } - - public static string GetUrlPrefixFor(string entityName) - { - Guard.NotEmpty(entityName, nameof(entityName)); + _urlPrefixes.AddRange(prefix, entityNames); + } - if (_urlPrefixes.Count == 0) - return null; + public static string GetUrlPrefixFor(string entityName) + { + Guard.NotEmpty(entityName, nameof(entityName)); - return _urlPrefixes.FirstOrDefault(x => x.Value.Contains(entityName, StringComparer.OrdinalIgnoreCase)).Key; - } + if (_urlPrefixes.Count == 0) + return null; + + return _urlPrefixes.FirstOrDefault(x => x.Value.Contains(entityName, StringComparer.OrdinalIgnoreCase)).Key; + } /// /// Returns information about the requested route. @@ -128,17 +128,17 @@ public override RouteData GetRouteData(HttpContextBase httpContext) { var slug = NormalizeSlug(data.Values); - if (TryResolveUrlPrefix(slug, out var urlPrefix, out var actualSlug, out var entityNames)) - { - slug = actualSlug; - } - - var urlRecordService = EngineContext.Current.Resolve(); - var urlRecord = urlRecordService.GetBySlug(slug); + if (TryResolveUrlPrefix(slug, out var urlPrefix, out var actualSlug, out var entityNames)) + { + slug = actualSlug; + } + + var urlRecordService = EngineContext.Current.Resolve(); + var urlRecord = urlRecordService.GetBySlug(slug); if (urlRecord == null) { // no URL record found - return NotFound(data); + return NotFound(data); } if (!urlRecord.IsActive) @@ -151,33 +151,33 @@ public override RouteData GetRouteData(HttpContextBase httpContext) var webHelper = EngineContext.Current.Resolve(); var response = httpContext.Response; response.Status = "301 Moved Permanently"; - if (urlPrefix.HasValue()) - { - activeSlug = urlPrefix + "/" + activeSlug; - } + if (urlPrefix.HasValue()) + { + activeSlug = urlPrefix + "/" + activeSlug; + } response.RedirectLocation = string.Format("{0}{1}", webHelper.GetStoreLocation(false), activeSlug); response.End(); return null; } else { - // no active slug found - return NotFound(data); - } + // no active slug found + return NotFound(data); + } } - // Verify prefix matches any assigned entity name - if (entityNames != null && !entityNames.Contains(urlRecord.EntityName, StringComparer.OrdinalIgnoreCase)) - { - // does NOT match - return NotFound(data); - } + // Verify prefix matches any assigned entity name + if (entityNames != null && !entityNames.Contains(urlRecord.EntityName, StringComparer.OrdinalIgnoreCase)) + { + // does NOT match + return NotFound(data); + } - // process URL - data.DataTokens["UrlRecord"] = urlRecord; - data.Values["SeName"] = slug; + // process URL + data.DataTokens["UrlRecord"] = urlRecord; + data.Values["SeName"] = slug; - //string controller, action, paramName; + //string controller, action, paramName; if (!_paths.TryGetValue(urlRecord.EntityName, out var path)) { @@ -208,36 +208,36 @@ private string NormalizeSlug(RouteValueDictionary routeValues) } private RouteData NotFound(RouteData data) - { - data.Values["controller"] = "Error"; - data.Values["action"] = "NotFound"; - - return data; - } - - private bool TryResolveUrlPrefix(string slug, out string urlPrefix, out string actualSlug, out ICollection entityNames) - { - urlPrefix = null; - actualSlug = null; - entityNames = null; - - if (_urlPrefixes.Count > 0) - { - var firstSepIndex = slug.IndexOf('/'); - if (firstSepIndex > 0) - { - var prefix = slug.Substring(0, firstSepIndex); - if (_urlPrefixes.ContainsKey(prefix)) - { - urlPrefix = prefix; - entityNames = _urlPrefixes[prefix]; - actualSlug = slug.Substring(prefix.Length + 1); - return true; - } - } - } - - return false; - } + { + data.Values["controller"] = "Error"; + data.Values["action"] = "NotFound"; + + return data; + } + + private bool TryResolveUrlPrefix(string slug, out string urlPrefix, out string actualSlug, out ICollection entityNames) + { + urlPrefix = null; + actualSlug = null; + entityNames = null; + + if (_urlPrefixes.Count > 0) + { + var firstSepIndex = slug.IndexOf('/'); + if (firstSepIndex > 0) + { + var prefix = slug.Substring(0, firstSepIndex); + if (_urlPrefixes.ContainsKey(prefix)) + { + urlPrefix = prefix; + entityNames = _urlPrefixes[prefix]; + actualSlug = slug.Substring(prefix.Length + 1); + return true; + } + } + } + + return false; + } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs index d402d26925..e83872c01a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs @@ -53,29 +53,29 @@ public static Route MapGenericPathRoute(this RouteCollection routes, string name return route; } - /// - /// Changes the url pattern of an existing named route. - /// - /// Route collection - /// Name of the route - /// The new url pattern - /// The route instance - public static Route ChangeRouteUrl(this RouteCollection routes, string name, string url) - { - Guard.NotNull(routes, nameof(routes)); - Guard.NotEmpty(name, nameof(name)); - Guard.NotEmpty(url, nameof(url)); - - var route = routes[name] as Route; + /// + /// Changes the url pattern of an existing named route. + /// + /// Route collection + /// Name of the route + /// The new url pattern + /// The route instance + public static Route ChangeRouteUrl(this RouteCollection routes, string name, string url) + { + Guard.NotNull(routes, nameof(routes)); + Guard.NotEmpty(name, nameof(name)); + Guard.NotEmpty(url, nameof(url)); + + var route = routes[name] as Route; + + if (route == null) + { + throw new ArgumentException("The route '{0}' does not exist or is not assignable from 'Route'.".FormatInvariant(name), nameof(name)); + } - if (route == null) - { - throw new ArgumentException("The route '{0}' does not exist or is not assignable from 'Route'.".FormatInvariant(name), nameof(name)); - } + route.Url = url; - route.Url = url; - - return route; - } + return route; + } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs index cce8426ee4..d39485def5 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs @@ -1,5 +1,4 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; using SmartStore.Web.Framework.Localization; namespace SmartStore.Web.Framework.Seo diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs index 51952a0649..f17ffe3e30 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs @@ -12,267 +12,267 @@ namespace SmartStore.Web.Framework.Seo { public class RewriteUrlAttribute : FilterAttribute, IAuthorizationFilter { - public RewriteUrlAttribute(SslRequirement sslRequirement) + public RewriteUrlAttribute(SslRequirement sslRequirement) { SslRequirement = sslRequirement; - AppendTrailingSlash = RouteTable.Routes.AppendTrailingSlash; - LowercaseUrls = RouteTable.Routes.LowercaseUrls; - Order = 100; + AppendTrailingSlash = RouteTable.Routes.AppendTrailingSlash; + LowercaseUrls = RouteTable.Routes.LowercaseUrls; + Order = 100; } - public Lazy SeoSettings { get; set; } - public Lazy SecuritySettings { get; set; } - public Lazy StoreContext { get; set; } - public Lazy WebHelper { get; set; } - public Lazy WorkContext { get; set; } + public Lazy SeoSettings { get; set; } + public Lazy SecuritySettings { get; set; } + public Lazy StoreContext { get; set; } + public Lazy WebHelper { get; set; } + public Lazy WorkContext { get; set; } - public SslRequirement SslRequirement { get; set; } - public bool AppendTrailingSlash { get; set; } - public bool LowercaseUrls { get; set; } + public SslRequirement SslRequirement { get; set; } + public bool AppendTrailingSlash { get; set; } + public bool LowercaseUrls { get; set; } - public virtual void OnAuthorization(AuthorizationContext filterContext) + public virtual void OnAuthorization(AuthorizationContext filterContext) { // don't apply filter to child methods if (filterContext.IsChildAction) return; - // only redirect for GET requests, - // otherwise the browser might not propagate the verb and request body correctly. - if (!string.Equals(filterContext.HttpContext.Request.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)) + // only redirect for GET requests, + // otherwise the browser might not propagate the verb and request body correctly. + if (!string.Equals(filterContext.HttpContext.Request.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)) return; - if (HostingEnvironment.IsHosted && !DataSettings.DatabaseIsInstalled()) + if (HostingEnvironment.IsHosted && !DataSettings.DatabaseIsInstalled()) return; - var currentStore = StoreContext.Value.CurrentStore; - var uri = filterContext.HttpContext.Request.Url; - var originalUrl = new Uri(uri.GetLeftPart(UriPartial.Authority) + filterContext.HttpContext.Request.RawUrl); - - var rewriteContext = new RewriteContext - { - ControllerContext = filterContext, - OriginalUrl = originalUrl, - IsLoopback = uri.IsLoopback || filterContext.HttpContext.Request.IsLocal, - CurrentStore = currentStore, - SecurityMode = currentStore.GetSecurityMode(), - IsAdmin = WorkContext.Value.IsAdmin - }; - - // Applies HTTP protocol rule - TryRewriteScheme(rewriteContext); - - // Applies canonical host name rule - TryRewriteHostName(rewriteContext); - - // Applies trailing slash and lowercase rules - TryRewritePath(rewriteContext); - - if (rewriteContext.Url.HasValue()) - { - filterContext.Result = new RedirectResult(rewriteContext.Url, rewriteContext.Permanent ?? !rewriteContext.IsLoopback); - } + var currentStore = StoreContext.Value.CurrentStore; + var uri = filterContext.HttpContext.Request.Url; + var originalUrl = new Uri(uri.GetLeftPart(UriPartial.Authority) + filterContext.HttpContext.Request.RawUrl); + + var rewriteContext = new RewriteContext + { + ControllerContext = filterContext, + OriginalUrl = originalUrl, + IsLoopback = uri.IsLoopback || filterContext.HttpContext.Request.IsLocal, + CurrentStore = currentStore, + SecurityMode = currentStore.GetSecurityMode(), + IsAdmin = WorkContext.Value.IsAdmin + }; + + // Applies HTTP protocol rule + TryRewriteScheme(rewriteContext); + + // Applies canonical host name rule + TryRewriteHostName(rewriteContext); + + // Applies trailing slash and lowercase rules + TryRewritePath(rewriteContext); + + if (rewriteContext.Url.HasValue()) + { + filterContext.Result = new RedirectResult(rewriteContext.Url, rewriteContext.Permanent ?? !rewriteContext.IsLoopback); + } } - /// - /// Applies HTTP protocol rule - /// - private bool TryRewriteScheme(RewriteContext context) - { - if (context.IsLoopback && !SecuritySettings.Value.UseSslOnLocalhost) - return false; - - var webHelper = WebHelper.Value; - - var currentConnectionSecured = webHelper.IsCurrentConnectionSecured(); - var currentStore = context.CurrentStore; - - if (currentStore.ForceSslForAllPages) - { - // all pages are forced to be SSL no matter of the specified value - this.SslRequirement = SslRequirement.Yes; - } - - switch (this.SslRequirement) - { - case SslRequirement.Yes: - { - if (!currentConnectionSecured && context.SecurityMode > HttpSecurityMode.Unsecured) - { - // Redirect to HTTPS version of page - context.Url = webHelper.GetThisPageUrl(true, true); - return true; - } - } - break; - case SslRequirement.No: - { - if (currentConnectionSecured) - { - // Redirect to HTTP version of page - context.Url = webHelper.GetThisPageUrl(true, false); - return true; - } - } - break; - default: - return false; - } - - return false; - } - - /// - /// Applies canonical host name rule - /// - private bool TryRewriteHostName(RewriteContext context) - { - var rule = SeoSettings.Value.CanonicalHostNameRule; - if (rule == CanonicalHostNameRule.NoRule) - return false; - - if (context.IsLoopback) - { - // Allows testing of "localtest.me" - return false; - } - - var uri = context.Url == null ? context.OriginalUrl : new Uri(context.Url); - var url = context.Url ?? uri.ToString(); - var protocol = uri.Scheme.ToLower(); - var isHttps = protocol.IsCaseInsensitiveEqual("https"); - var startsWith = "{0}://www.".FormatInvariant(protocol); - var hasPrefix = url.StartsWith(startsWith, StringComparison.OrdinalIgnoreCase); - - if (isHttps) - { - if (context.SecurityMode == HttpSecurityMode.SharedSsl) - { - // Don't attempt to redirect when shared SSL is being used and current request is secured. - // Redirecting from http://ssl.bla.com to https://www.ssl.bla.com will most probably fail. - return false; - } - } - - if (hasPrefix && rule == CanonicalHostNameRule.OmitWww) - { - context.Url = url.Replace("://www.", "://"); - return true; - } - - if (!hasPrefix && rule == CanonicalHostNameRule.RequireWww) - { - context.Url = url.Replace("{0}://".FormatInvariant(protocol), startsWith); - return true; - } - - return false; - } - - /// - /// Applies trailing slash and lowercase rules - /// - private bool TryRewritePath(RewriteContext context) - { - // Be tolerant in backend - if (context.IsAdmin) - return false; - - // Don't try to fix root path - if (context.ControllerContext.HttpContext.Request.Path == "/") - return false; - - bool rewritten = false; - - var url = context.Url ?? context.OriginalUrl.ToString(); - var queryIndex = url.IndexOf('?'); - - if (queryIndex == -1) - { - bool hasTrailingSlash = url[url.Length - 1] == '/'; - - if (this.AppendTrailingSlash) - { - // Append a trailing slash to the end of the URL. - if (!hasTrailingSlash) - { - url += "/"; - rewritten = true; - } - } - else - { - // Trim a trailing slash from the end of the URL. - if (hasTrailingSlash) - { - url = url.TrimEnd('/'); - rewritten = true; - } - } - } - else - { - bool hasTrailingSlash = url[queryIndex - 1] == '/'; - - if (this.AppendTrailingSlash) - { - // Append a trailing slash to the end of the URL but before the query string. - if (!hasTrailingSlash) - { - url = url.Insert(queryIndex, "/"); - rewritten = true; - } - } - else - { - // Trim a trailing slash to the end of the URL but before the query string. - if (hasTrailingSlash) - { - url = url.Remove(queryIndex - 1, 1); - rewritten = true; - } - } - } - - if (this.LowercaseUrls) - { - foreach (char c in url) - { - if (char.IsUpper(c)) - { - var qIndex = url.IndexOf('?'); - url = qIndex == -1 - ? url.ToLower() - : url.Substring(0, qIndex).ToLower() + url.Substring(qIndex); - - rewritten = true; - break; - } - if (c == '?') - { - break; - } - } - } - - if (rewritten) - { - context.Url = url; - } - - return rewritten; - } - - class RewriteContext - { - public Uri OriginalUrl { get; set; } - public bool IsLoopback { get; set; } - public HttpSecurityMode SecurityMode { get; set; } - public ControllerContext ControllerContext { get; set; } - public Store CurrentStore { get; set; } - public bool IsAdmin { get; set; } - - public string Url { get; set; } - public bool? Permanent { get; set; } - } + /// + /// Applies HTTP protocol rule + /// + private bool TryRewriteScheme(RewriteContext context) + { + if (context.IsLoopback && !SecuritySettings.Value.UseSslOnLocalhost) + return false; + + var webHelper = WebHelper.Value; + + var currentConnectionSecured = webHelper.IsCurrentConnectionSecured(); + var currentStore = context.CurrentStore; + + if (currentStore.ForceSslForAllPages) + { + // all pages are forced to be SSL no matter of the specified value + this.SslRequirement = SslRequirement.Yes; + } + + switch (this.SslRequirement) + { + case SslRequirement.Yes: + { + if (!currentConnectionSecured && context.SecurityMode > HttpSecurityMode.Unsecured) + { + // Redirect to HTTPS version of page + context.Url = webHelper.GetThisPageUrl(true, true); + return true; + } + } + break; + case SslRequirement.No: + { + if (currentConnectionSecured) + { + // Redirect to HTTP version of page + context.Url = webHelper.GetThisPageUrl(true, false); + return true; + } + } + break; + default: + return false; + } + + return false; + } + + /// + /// Applies canonical host name rule + /// + private bool TryRewriteHostName(RewriteContext context) + { + var rule = SeoSettings.Value.CanonicalHostNameRule; + if (rule == CanonicalHostNameRule.NoRule) + return false; + + if (context.IsLoopback) + { + // Allows testing of "localtest.me" + return false; + } + + var uri = context.Url == null ? context.OriginalUrl : new Uri(context.Url); + var url = context.Url ?? uri.ToString(); + var protocol = uri.Scheme.ToLower(); + var isHttps = protocol.IsCaseInsensitiveEqual("https"); + var startsWith = "{0}://www.".FormatInvariant(protocol); + var hasPrefix = url.StartsWith(startsWith, StringComparison.OrdinalIgnoreCase); + + if (isHttps) + { + if (context.SecurityMode == HttpSecurityMode.SharedSsl) + { + // Don't attempt to redirect when shared SSL is being used and current request is secured. + // Redirecting from http://ssl.bla.com to https://www.ssl.bla.com will most probably fail. + return false; + } + } + + if (hasPrefix && rule == CanonicalHostNameRule.OmitWww) + { + context.Url = url.Replace("://www.", "://"); + return true; + } + + if (!hasPrefix && rule == CanonicalHostNameRule.RequireWww) + { + context.Url = url.Replace("{0}://".FormatInvariant(protocol), startsWith); + return true; + } + + return false; + } + + /// + /// Applies trailing slash and lowercase rules + /// + private bool TryRewritePath(RewriteContext context) + { + // Be tolerant in backend + if (context.IsAdmin) + return false; + + // Don't try to fix root path + if (context.ControllerContext.HttpContext.Request.Path == "/") + return false; + + bool rewritten = false; + + var url = context.Url ?? context.OriginalUrl.ToString(); + var queryIndex = url.IndexOf('?'); + + if (queryIndex == -1) + { + bool hasTrailingSlash = url[url.Length - 1] == '/'; + + if (this.AppendTrailingSlash) + { + // Append a trailing slash to the end of the URL. + if (!hasTrailingSlash) + { + url += "/"; + rewritten = true; + } + } + else + { + // Trim a trailing slash from the end of the URL. + if (hasTrailingSlash) + { + url = url.TrimEnd('/'); + rewritten = true; + } + } + } + else + { + bool hasTrailingSlash = url[queryIndex - 1] == '/'; + + if (this.AppendTrailingSlash) + { + // Append a trailing slash to the end of the URL but before the query string. + if (!hasTrailingSlash) + { + url = url.Insert(queryIndex, "/"); + rewritten = true; + } + } + else + { + // Trim a trailing slash to the end of the URL but before the query string. + if (hasTrailingSlash) + { + url = url.Remove(queryIndex - 1, 1); + rewritten = true; + } + } + } + + if (this.LowercaseUrls) + { + foreach (char c in url) + { + if (char.IsUpper(c)) + { + var qIndex = url.IndexOf('?'); + url = qIndex == -1 + ? url.ToLower() + : url.Substring(0, qIndex).ToLower() + url.Substring(qIndex); + + rewritten = true; + break; + } + if (c == '?') + { + break; + } + } + } + + if (rewritten) + { + context.Url = url; + } + + return rewritten; + } + + class RewriteContext + { + public Uri OriginalUrl { get; set; } + public bool IsLoopback { get; set; } + public HttpSecurityMode SecurityMode { get; set; } + public ControllerContext ControllerContext { get; set; } + public Store CurrentStore { get; set; } + public bool IsAdmin { get; set; } + + public string Url { get; set; } + public bool? Permanent { get; set; } + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs index df6e25159f..91cde9e502 100644 --- a/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs @@ -8,132 +8,132 @@ namespace SmartStore.Web.Framework.Settings { - [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)] - public class LoadSettingAttribute : FilterAttribute, IActionFilter - { - public sealed class SettingParam - { - public ISettings Instance { get; set; } - public ParameterDescriptor Parameter { get; set; } - } - - protected int _storeId; - protected SettingParam[] _settingParams; - - public LoadSettingAttribute() - : this(true) - { - } - - public LoadSettingAttribute(bool updateParameterFromStore) - { - UpdateParameterFromStore = updateParameterFromStore; - } - - public bool UpdateParameterFromStore { get; set; } - public ICommonServices Services { get; set; } - - public virtual void OnActionExecuting(ActionExecutingContext filterContext) - { - // Get the current configured store id - _storeId = filterContext.Controller.GetActiveStoreScopeConfiguration(Services.StoreService, Services.WorkContext); - Func predicate = (x) => new[] { "storescope", "storeid" }.Contains(x.ParameterName, StringComparer.OrdinalIgnoreCase); - var storeScopeParam = FindActionParameters(filterContext.ActionDescriptor, false, false, predicate).FirstOrDefault(); - if (storeScopeParam != null) - { - // We found an action param named storeScope with type int. Assign our storeId to it. - filterContext.ActionParameters[storeScopeParam.ParameterName] = _storeId; - } - - // Find the required ISettings concrete types in ActionDescriptor.GetParameters() - _settingParams = FindActionParameters(filterContext.ActionDescriptor) - .Select(x => - { - // Load settings for the settings type obtained with FindActionParameters() - var settings = UpdateParameterFromStore - ? Services.Settings.LoadSetting(x.ParameterType, _storeId) - : filterContext.ActionParameters[x.ParameterName] as ISettings; - - if (settings == null) - { - throw new InvalidOperationException($"Could not load settings for type '{x.ParameterType.FullName}'."); - } - - // Replace settings from action parameters with our loaded settings - if (UpdateParameterFromStore) - { - filterContext.ActionParameters[x.ParameterName] = settings; - } - - return new SettingParam - { - Instance = settings, - Parameter = x - }; - }) - .ToArray(); - } - - public virtual void OnActionExecuted(ActionExecutedContext filterContext) - { - var viewResult = filterContext.Result as ViewResultBase; - - if (viewResult != null) - { - var model = viewResult.Model; - - if (model == null) - { - // Nothing to override. E.g. insufficient permission. - return; - } - - var settingsHelper = new StoreDependingSettingHelper(filterContext.Controller.ViewData); - - foreach (var param in _settingParams) - { - settingsHelper.GetOverrideKeys(param.Instance, model, _storeId, Services.Settings); - } - } - } - - protected IEnumerable FindActionParameters( - ActionDescriptor actionDescriptor, - bool requireDefaultConstructor = true, - bool throwIfNotFound = true, - Func predicate = null) - { - Guard.NotNull(actionDescriptor, nameof(actionDescriptor)); - - var t = typeof(T); - - var query = actionDescriptor - .GetParameters() - .Where(x => t.IsAssignableFrom(x.ParameterType)); - - if (predicate != null) - { - query = query.Where(predicate); - } - - if (throwIfNotFound && !query.Any()) - { - throw new InvalidOperationException( - $"A controller action method with a '{this.GetType().Name}' attribute requires an action parameter of type '{t.Name}' in order to execute properly."); - } - - if (requireDefaultConstructor) - { - foreach (var param in query) - { - if (!param.ParameterType.HasDefaultConstructor()) - { - throw new InvalidOperationException($"The parameter '{param.ParameterName}' must have a default parameterless constructor."); - } - } - } - - return query; - } - } + [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)] + public class LoadSettingAttribute : FilterAttribute, IActionFilter + { + public sealed class SettingParam + { + public ISettings Instance { get; set; } + public ParameterDescriptor Parameter { get; set; } + } + + protected int _storeId; + protected SettingParam[] _settingParams; + + public LoadSettingAttribute() + : this(true) + { + } + + public LoadSettingAttribute(bool updateParameterFromStore) + { + UpdateParameterFromStore = updateParameterFromStore; + } + + public bool UpdateParameterFromStore { get; set; } + public ICommonServices Services { get; set; } + + public virtual void OnActionExecuting(ActionExecutingContext filterContext) + { + // Get the current configured store id + _storeId = filterContext.Controller.GetActiveStoreScopeConfiguration(Services.StoreService, Services.WorkContext); + Func predicate = (x) => new[] { "storescope", "storeid" }.Contains(x.ParameterName, StringComparer.OrdinalIgnoreCase); + var storeScopeParam = FindActionParameters(filterContext.ActionDescriptor, false, false, predicate).FirstOrDefault(); + if (storeScopeParam != null) + { + // We found an action param named storeScope with type int. Assign our storeId to it. + filterContext.ActionParameters[storeScopeParam.ParameterName] = _storeId; + } + + // Find the required ISettings concrete types in ActionDescriptor.GetParameters() + _settingParams = FindActionParameters(filterContext.ActionDescriptor) + .Select(x => + { + // Load settings for the settings type obtained with FindActionParameters() + var settings = UpdateParameterFromStore + ? Services.Settings.LoadSetting(x.ParameterType, _storeId) + : filterContext.ActionParameters[x.ParameterName] as ISettings; + + if (settings == null) + { + throw new InvalidOperationException($"Could not load settings for type '{x.ParameterType.FullName}'."); + } + + // Replace settings from action parameters with our loaded settings + if (UpdateParameterFromStore) + { + filterContext.ActionParameters[x.ParameterName] = settings; + } + + return new SettingParam + { + Instance = settings, + Parameter = x + }; + }) + .ToArray(); + } + + public virtual void OnActionExecuted(ActionExecutedContext filterContext) + { + var viewResult = filterContext.Result as ViewResultBase; + + if (viewResult != null) + { + var model = viewResult.Model; + + if (model == null) + { + // Nothing to override. E.g. insufficient permission. + return; + } + + var settingsHelper = new StoreDependingSettingHelper(filterContext.Controller.ViewData); + + foreach (var param in _settingParams) + { + settingsHelper.GetOverrideKeys(param.Instance, model, _storeId, Services.Settings); + } + } + } + + protected IEnumerable FindActionParameters( + ActionDescriptor actionDescriptor, + bool requireDefaultConstructor = true, + bool throwIfNotFound = true, + Func predicate = null) + { + Guard.NotNull(actionDescriptor, nameof(actionDescriptor)); + + var t = typeof(T); + + var query = actionDescriptor + .GetParameters() + .Where(x => t.IsAssignableFrom(x.ParameterType)); + + if (predicate != null) + { + query = query.Where(predicate); + } + + if (throwIfNotFound && !query.Any()) + { + throw new InvalidOperationException( + $"A controller action method with a '{this.GetType().Name}' attribute requires an action parameter of type '{t.Name}' in order to execute properly."); + } + + if (requireDefaultConstructor) + { + foreach (var param in query) + { + if (!param.ParameterType.HasDefaultConstructor()) + { + throw new InvalidOperationException($"The parameter '{param.ParameterName}' must have a default parameterless constructor."); + } + } + } + + return query; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs index 278679dbde..e84d13adb9 100644 --- a/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs @@ -4,90 +4,90 @@ namespace SmartStore.Web.Framework.Settings { - [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)] - public sealed class SaveSettingAttribute : LoadSettingAttribute - { - private FormCollection _form; - private IDisposable _settingsWriteBatch; - - public SaveSettingAttribute() - : base(true) - { - } - - public SaveSettingAttribute(bool updateParameterFromStore) - : base(updateParameterFromStore) - { - } - - public override void OnActionExecuting(ActionExecutingContext filterContext) - { - base.OnActionExecuting(filterContext); - - if (!filterContext.Controller.ViewData.ModelState.IsValid) - { - return; - } - - // Find the required FormCollection parameter in ActionDescriptor.GetParameters() - var formParam = FindActionParameters(filterContext.ActionDescriptor, requireDefaultConstructor: false, throwIfNotFound: false).FirstOrDefault(); - _form = formParam != null - ? (FormCollection)filterContext.ActionParameters[formParam.ParameterName] - : BindFormCollection(filterContext.Controller.ControllerContext); - - - _settingsWriteBatch = Services.Settings.BeginScope(); - } - - public override void OnActionExecuted(ActionExecutedContext filterContext) - { - if (filterContext.Controller.ViewData.ModelState.IsValid) - { - var updateSettings = true; - var redirectResult = filterContext.Result as RedirectToRouteResult; - if (redirectResult != null) - { - var controllerName = redirectResult.RouteValues["controller"] as string; - var areaName = redirectResult.RouteValues["area"] as string; - if (controllerName.IsCaseInsensitiveEqual("security") && areaName.IsCaseInsensitiveEqual("admin")) - { - // Insufficient permission. We must not save because the action did not run. - updateSettings = false; - } - } - - if (updateSettings) - { - var settingHelper = new StoreDependingSettingHelper(filterContext.Controller.ViewData); - - foreach (var param in _settingParams) - { - settingHelper.UpdateSettings(param.Instance, _form, _storeId, Services.Settings); - } - } - } - - if (_settingsWriteBatch != null) - { - _settingsWriteBatch.Dispose(); - _settingsWriteBatch = null; - } - - base.OnActionExecuted(filterContext); - } - - private FormCollection BindFormCollection(ControllerContext controllerContext) - { - var bindingContext = new ModelBindingContext - { - ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, typeof(FormCollection)), - ModelState = controllerContext.Controller.ViewData.ModelState, - ValueProvider = controllerContext.Controller.ValueProvider - }; - - var modelBinder = ModelBinders.Binders.GetBinder(typeof(FormCollection)); - - return (FormCollection)modelBinder.BindModel(controllerContext, bindingContext); - } - } + [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)] + public sealed class SaveSettingAttribute : LoadSettingAttribute + { + private FormCollection _form; + private IDisposable _settingsWriteBatch; + + public SaveSettingAttribute() + : base(true) + { + } + + public SaveSettingAttribute(bool updateParameterFromStore) + : base(updateParameterFromStore) + { + } + + public override void OnActionExecuting(ActionExecutingContext filterContext) + { + base.OnActionExecuting(filterContext); + + if (!filterContext.Controller.ViewData.ModelState.IsValid) + { + return; + } + + // Find the required FormCollection parameter in ActionDescriptor.GetParameters() + var formParam = FindActionParameters(filterContext.ActionDescriptor, requireDefaultConstructor: false, throwIfNotFound: false).FirstOrDefault(); + _form = formParam != null + ? (FormCollection)filterContext.ActionParameters[formParam.ParameterName] + : BindFormCollection(filterContext.Controller.ControllerContext); + + + _settingsWriteBatch = Services.Settings.BeginScope(); + } + + public override void OnActionExecuted(ActionExecutedContext filterContext) + { + if (filterContext.Controller.ViewData.ModelState.IsValid) + { + var updateSettings = true; + var redirectResult = filterContext.Result as RedirectToRouteResult; + if (redirectResult != null) + { + var controllerName = redirectResult.RouteValues["controller"] as string; + var areaName = redirectResult.RouteValues["area"] as string; + if (controllerName.IsCaseInsensitiveEqual("security") && areaName.IsCaseInsensitiveEqual("admin")) + { + // Insufficient permission. We must not save because the action did not run. + updateSettings = false; + } + } + + if (updateSettings) + { + var settingHelper = new StoreDependingSettingHelper(filterContext.Controller.ViewData); + + foreach (var param in _settingParams) + { + settingHelper.UpdateSettings(param.Instance, _form, _storeId, Services.Settings); + } + } + } + + if (_settingsWriteBatch != null) + { + _settingsWriteBatch.Dispose(); + _settingsWriteBatch = null; + } + + base.OnActionExecuted(filterContext); + } + + private FormCollection BindFormCollection(ControllerContext controllerContext) + { + var bindingContext = new ModelBindingContext + { + ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, typeof(FormCollection)), + ModelState = controllerContext.Controller.ViewData.ModelState, + ValueProvider = controllerContext.Controller.ValueProvider + }; + + var modelBinder = ModelBinders.Binders.GetBinder(typeof(FormCollection)); + + return (FormCollection)modelBinder.BindModel(controllerContext, bindingContext); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingData.cs b/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingData.cs index 5894b7ab6f..3694968a0a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingData.cs +++ b/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingData.cs @@ -2,15 +2,15 @@ namespace SmartStore.Web.Framework.Settings { - public class StoreDependingSettingData - { - public StoreDependingSettingData() - { - OverrideSettingKeys = new List(); - } + public class StoreDependingSettingData + { + public StoreDependingSettingData() + { + OverrideSettingKeys = new List(); + } - public int ActiveStoreScopeConfiguration { get; set; } - public List OverrideSettingKeys { get; set; } - public string RootSettingClass { get; set; } - } + public int ActiveStoreScopeConfiguration { get; set; } + public List OverrideSettingKeys { get; set; } + public string RootSettingClass { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs b/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs index 7605dd7934..0e4e3b85df 100644 --- a/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs +++ b/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs @@ -9,77 +9,71 @@ namespace SmartStore.Web.Framework.Settings { - public class StoreDependingSettingHelper - { - private ViewDataDictionary _viewData; - - public StoreDependingSettingHelper(ViewDataDictionary viewData) - { - _viewData = viewData; - } - - public static string ViewDataKey => "StoreDependingSettingData"; - - public StoreDependingSettingData Data - { - get - { - return _viewData[ViewDataKey] as StoreDependingSettingData; - } - } - - private bool IsOverrideChecked(string settingKey, FormCollection form) - { - var rawOverrideKey = form.AllKeys.FirstOrDefault(k => k.IsCaseInsensitiveEqual(settingKey + "_OverrideForStore")); - - if (rawOverrideKey.HasValue()) - { - var checkboxValue = form[rawOverrideKey].EmptyNull().ToLower(); - return checkboxValue.Contains("on") || checkboxValue.Contains("true"); - } - return false; - } - - public bool IsOverrideChecked(object settings, string name, FormCollection form) - { - var key = settings.GetType().Name + "." + name; - return IsOverrideChecked(key, form); - } - - public void AddOverrideKey(object settings, string name) - { - if (Data == null) - { - throw new SmartException("You must call GetOverrideKeys or CreateViewDataObject before AddOverrideKey."); - } - - var key = settings.GetType().Name + "." + name; - Data.OverrideSettingKeys.Add(key); - } - - public void CreateViewDataObject(int activeStoreScopeConfiguration, string rootSettingClass = null) - { - _viewData[ViewDataKey] = new StoreDependingSettingData - { - ActiveStoreScopeConfiguration = activeStoreScopeConfiguration, - RootSettingClass = rootSettingClass - }; - } + public class StoreDependingSettingHelper + { + private ViewDataDictionary _viewData; + + public StoreDependingSettingHelper(ViewDataDictionary viewData) + { + _viewData = viewData; + } + + public static string ViewDataKey => "StoreDependingSettingData"; + + public StoreDependingSettingData Data => _viewData[ViewDataKey] as StoreDependingSettingData; + + private bool IsOverrideChecked(string settingKey, FormCollection form) + { + var rawOverrideKey = form.AllKeys.FirstOrDefault(k => k.IsCaseInsensitiveEqual(settingKey + "_OverrideForStore")); + + if (rawOverrideKey.HasValue()) + { + var checkboxValue = form[rawOverrideKey].EmptyNull().ToLower(); + return checkboxValue.Contains("on") || checkboxValue.Contains("true"); + } + return false; + } + + public bool IsOverrideChecked(object settings, string name, FormCollection form) + { + var key = settings.GetType().Name + "." + name; + return IsOverrideChecked(key, form); + } + + public void AddOverrideKey(object settings, string name) + { + if (Data == null) + { + throw new SmartException("You must call GetOverrideKeys or CreateViewDataObject before AddOverrideKey."); + } + + var key = settings.GetType().Name + "." + name; + Data.OverrideSettingKeys.Add(key); + } + + public void CreateViewDataObject(int activeStoreScopeConfiguration, string rootSettingClass = null) + { + _viewData[ViewDataKey] = new StoreDependingSettingData + { + ActiveStoreScopeConfiguration = activeStoreScopeConfiguration, + RootSettingClass = rootSettingClass + }; + } public void GetOverrideKeys( - object settings, - object model, - int storeId, - ISettingService settingService, - bool isRootModel = true, - ILocalizedModelLocal localized = null, - int? index = null) + object settings, + object model, + int storeId, + ISettingService settingService, + bool isRootModel = true, + ILocalizedModelLocal localized = null, + int? index = null) { - if (storeId <= 0) - { - // Single store mode -> there are no overrides. - return; - } + if (storeId <= 0) + { + // Single store mode -> there are no overrides. + return; + } var data = Data ?? new StoreDependingSettingData(); var settingName = settings.GetType().Name; @@ -93,37 +87,37 @@ public void GetOverrideKeys( var name = prop.Name; var modelProperty = modelType.GetProperty(name); - if (modelProperty == null) - { - // Setting is not configurable or missing or whatever... however we don't need the override info. - continue; - } - - string key = null; - - if (localized == null) - { - key = settingName + "." + name; - - if (settingService.GetSettingByKey(key, storeId: storeId) == null) - { - key = null; - } - } - else - { - var value = localizedEntityService.GetLocalizedValue(localized.LanguageId, 0, settingName, name); - if (!string.IsNullOrEmpty(value)) - { - key = string.Concat("Locales[", index.ToString(), "].", name); - } - } - - if (key != null) - { - data.OverrideSettingKeys.Add(key); - } - } + if (modelProperty == null) + { + // Setting is not configurable or missing or whatever... however we don't need the override info. + continue; + } + + string key = null; + + if (localized == null) + { + key = settingName + "." + name; + + if (settingService.GetSettingByKey(key, storeId: storeId) == null) + { + key = null; + } + } + else + { + var value = localizedEntityService.GetLocalizedValue(localized.LanguageId, 0, settingName, name); + if (!string.IsNullOrEmpty(value)) + { + key = string.Concat("Locales[", index.ToString(), "].", name); + } + } + + if (key != null) + { + data.OverrideSettingKeys.Add(key); + } + } if (isRootModel) { @@ -134,116 +128,116 @@ public void GetOverrideKeys( } } - public void GetOverrideKey( - string formKey, - string settingName, - object settings, - int storeId, - ISettingService settingService, - ILocalizedModelLocal localized = null, - int? index = null) - { - if (storeId <= 0) - { - // Single store mode -> there are no overrides. - return; - } - - var key = formKey; - - if (localized == null) - { - if (settingService.GetSettingByKey(string.Concat(settings.GetType().Name, ".", settingName), storeId: storeId) == null) - { - key = null; - } - } - else - { - // TODO if required - throw new ArgumentException("Localized override key not supported yet."); - } - - if (key != null) - { - var data = Data ?? new StoreDependingSettingData(); - data.OverrideSettingKeys.Add(key); - } - } - - /// - /// Updates settings for a store. - /// - /// Settings class instance. - /// Form value collection. - /// Store identifier. - /// Setting service. - /// Localized model. - /// Function to map property names. Return null to skip a property. - public void UpdateSettings( - object settings, - FormCollection form, - int storeId, - ISettingService settingService, - ILocalizedModelLocal localized = null, - Func propertyNameMapper = null) + public void GetOverrideKey( + string formKey, + string settingName, + object settings, + int storeId, + ISettingService settingService, + ILocalizedModelLocal localized = null, + int? index = null) + { + if (storeId <= 0) + { + // Single store mode -> there are no overrides. + return; + } + + var key = formKey; + + if (localized == null) + { + if (settingService.GetSettingByKey(string.Concat(settings.GetType().Name, ".", settingName), storeId: storeId) == null) + { + key = null; + } + } + else + { + // TODO if required + throw new ArgumentException("Localized override key not supported yet."); + } + + if (key != null) + { + var data = Data ?? new StoreDependingSettingData(); + data.OverrideSettingKeys.Add(key); + } + } + + /// + /// Updates settings for a store. + /// + /// Settings class instance. + /// Form value collection. + /// Store identifier. + /// Setting service. + /// Localized model. + /// Function to map property names. Return null to skip a property. + public void UpdateSettings( + object settings, + FormCollection form, + int storeId, + ISettingService settingService, + ILocalizedModelLocal localized = null, + Func propertyNameMapper = null) { var settingName = settings.GetType().Name; var properties = FastProperty.GetProperties(localized == null ? settings.GetType() : localized.GetType()).Values; - foreach (var prop in properties) - { - var name = prop.Name; - - if (propertyNameMapper != null) - { - name = propertyNameMapper(name); - } - - if (string.IsNullOrWhiteSpace(name)) - { - continue; - } - - var key = string.Concat(settingName, ".", name); - - if (storeId == 0 || IsOverrideChecked(key, form)) - { - dynamic value = prop.GetValue(localized == null ? settings : localized); - settingService.SetSetting(key, value == null ? "" : value, storeId, false); - } - else if (storeId > 0) - { - settingService.DeleteSetting(key, storeId); - } - } + foreach (var prop in properties) + { + var name = prop.Name; + + if (propertyNameMapper != null) + { + name = propertyNameMapper(name); + } + + if (string.IsNullOrWhiteSpace(name)) + { + continue; + } + + var key = string.Concat(settingName, ".", name); + + if (storeId == 0 || IsOverrideChecked(key, form)) + { + dynamic value = prop.GetValue(localized == null ? settings : localized); + settingService.SetSetting(key, value == null ? "" : value, storeId, false); + } + else if (storeId > 0) + { + settingService.DeleteSetting(key, storeId); + } + } } - public void UpdateSetting( - string formKey, - string settingName, - object settings, - FormCollection form, - int storeId, - ISettingService settingService, - ILocalizedModelLocal localized = null) - { - if (storeId == 0 || IsOverrideChecked(formKey, form)) - { - var prop = FastProperty.GetProperty(localized == null ? settings.GetType() : localized.GetType(), settingName); - if (prop != null) - { - dynamic value = prop.GetValue(localized == null ? settings : localized); - var key = string.Concat(settings.GetType().Name, ".", settingName); - - settingService.SetSetting(key, value == null ? "" : value, storeId, false); - } - } - else if (storeId > 0) - { - var key = string.Concat(settings.GetType().Name, ".", settingName); - settingService.DeleteSetting(key, storeId); - } - } - } + public void UpdateSetting( + string formKey, + string settingName, + object settings, + FormCollection form, + int storeId, + ISettingService settingService, + ILocalizedModelLocal localized = null) + { + if (storeId == 0 || IsOverrideChecked(formKey, form)) + { + var prop = FastProperty.GetProperty(localized == null ? settings.GetType() : localized.GetType(), settingName); + if (prop != null) + { + dynamic value = prop.GetValue(localized == null ? settings : localized); + var key = string.Concat(settings.GetType().Name, ".", settingName); + + settingService.SetSetting(key, value == null ? "" : value, storeId, false); + } + } + else if (storeId > 0) + { + var key = string.Concat(settings.GetType().Name, ".", settingName); + settingService.DeleteSetting(key, storeId); + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs index 0c2e922ea0..271d4c8e31 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs +++ b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs @@ -1,101 +1,98 @@ using System; using System.Collections.Generic; -using System.Collections.Concurrent; -using System.Web; -using System.Web.Routing; -using System.Text.RegularExpressions; -using SmartStore.Utilities; -using SmartStore.Core; -using SmartStore.Core.IO; using System.IO; -using System.Web.Hosting; using System.Reflection; -using SmartStore.Web.Framework.Theming; -using SmartStore.Core.Infrastructure; -using SmartStore.Core.Events; -using SmartStore.Core.Data; +using System.Text.RegularExpressions; +using System.Web; +using System.Web.Hosting; +using System.Web.Routing; using SmartStore.Collections; +using SmartStore.Core.Data; using SmartStore.Core.Domain.Customers; +using SmartStore.Core.Infrastructure; +using SmartStore.Core.IO; +using SmartStore.Utilities; using SmartStore.Web.Framework.Security; +using SmartStore.Web.Framework.Theming; namespace SmartStore.Web.Framework { - /// - /// Request event sequence: - /// - BeginRequest - /// - AuthenticateRequest - /// - PostAuthenticateRequest - /// - AuthorizeRequest - /// - PostAuthorizeRequest - /// - ResolveRequestCache - /// - PostResolveRequestCache - /// - MapRequestHandler - /// - PostMapRequestHandler - /// - AcquireRequestState - /// - PostAcquireRequestState - /// - PreRequestHandlerExecute - /// - PostRequestHandlerExecute - /// - ReleaseRequestState - /// - PostReleaseRequestState - /// - UpdateRequestCache - /// - PostUpdateRequestCache - /// - LogRequest - /// - PostLogRequest - /// - EndRequest - /// - PreSendRequestHeaders - /// - PreSendRequestContent - /// - public class SmartUrlRoutingModule : IHttpModule - { - private static readonly object _contextKey = new object(); - - private static readonly ICollection> _actions = - new SyncedCollection>(new List>()) { ReadLockFree = true }; - - private static readonly ICollection _routes = - new SyncedCollection(new List()) { ReadLockFree = true }; - - static SmartUrlRoutingModule() - { - StopSubDirMonitoring(); - } - - private static void StopSubDirMonitoring() - { - try - { - // http://stackoverflow.com/questions/2248825/asp-net-restarts-when-a-folder-is-created-renamed-or-deleted - var prop = typeof(HttpRuntime).GetProperty("FileChangesMonitor", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static); - var o = prop.GetValue(null, null); - - var fi = o.GetType().GetField("_dirMonSubdirs", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.IgnoreCase); - var monitor = fi.GetValue(o); - var mi = monitor.GetType().GetMethod("StopMonitoring", BindingFlags.Instance | BindingFlags.NonPublic); - mi.Invoke(monitor, new object[] { }); - } - catch { } - } - - public void Init(HttpApplication application) - { - if (!DataSettings.DatabaseIsInstalled()) - return; + /// + /// Request event sequence: + /// - BeginRequest + /// - AuthenticateRequest + /// - PostAuthenticateRequest + /// - AuthorizeRequest + /// - PostAuthorizeRequest + /// - ResolveRequestCache + /// - PostResolveRequestCache + /// - MapRequestHandler + /// - PostMapRequestHandler + /// - AcquireRequestState + /// - PostAcquireRequestState + /// - PreRequestHandlerExecute + /// - PostRequestHandlerExecute + /// - ReleaseRequestState + /// - PostReleaseRequestState + /// - UpdateRequestCache + /// - PostUpdateRequestCache + /// - LogRequest + /// - PostLogRequest + /// - EndRequest + /// - PreSendRequestHeaders + /// - PreSendRequestContent + /// + public class SmartUrlRoutingModule : IHttpModule + { + private static readonly object _contextKey = new object(); + + private static readonly ICollection> _actions = + new SyncedCollection>(new List>()) { ReadLockFree = true }; + + private static readonly ICollection _routes = + new SyncedCollection(new List()) { ReadLockFree = true }; + + static SmartUrlRoutingModule() + { + StopSubDirMonitoring(); + } + + private static void StopSubDirMonitoring() + { + try + { + // http://stackoverflow.com/questions/2248825/asp-net-restarts-when-a-folder-is-created-renamed-or-deleted + var prop = typeof(HttpRuntime).GetProperty("FileChangesMonitor", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static); + var o = prop.GetValue(null, null); + + var fi = o.GetType().GetField("_dirMonSubdirs", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.IgnoreCase); + var monitor = fi.GetValue(o); + var mi = monitor.GetType().GetMethod("StopMonitoring", BindingFlags.Instance | BindingFlags.NonPublic); + mi.Invoke(monitor, new object[] { }); + } + catch { } + } + + public void Init(HttpApplication application) + { + if (!DataSettings.DatabaseIsInstalled()) + return; if (application.Context.Items[_contextKey] == null) { application.Context.Items[_contextKey] = _contextKey; - application.BeginRequest += (s, e) => FilterSameSiteNoneForIncompatibleUserAgents(application); + application.BeginRequest += (s, e) => FilterSameSiteNoneForIncompatibleUserAgents(application); if (CommonHelper.IsDevEnvironment && HttpContext.Current.IsDebuggingEnabled) { // Handle plugin static file in DevMode application.PostAuthorizeRequest += (s, e) => RewritePluginStaticFilePaths((HttpApplication)s); application.PreSendRequestHeaders += (s, e) => HandlePluginStaticFileCaching((HttpApplication)s); - } + } - application.PreSendRequestHeaders += (s, e) => HandleSameSiteForAntiForgeryCookie((HttpApplication)s); - application.PostResolveRequestCache += (s, e) => TryResolveRoutablePath((HttpApplication)s); + application.PreSendRequestHeaders += (s, e) => HandleSameSiteForAntiForgeryCookie((HttpApplication)s); + application.PostResolveRequestCache += (s, e) => TryResolveRoutablePath((HttpApplication)s); // Publish event to give plugins the chance to register custom event handlers for the request lifecycle. foreach (var action in _actions) @@ -108,189 +105,189 @@ public void Init(HttpApplication application) } } - #region Handlers - - private static void RewritePluginStaticFilePaths(HttpApplication app) - { - var context = app.Context; - var request = context?.Request; - if (request == null) - return; - - if (IsExtensionPath(request) && context.IsStaticResourceRequested()) - { - // We're in debug mode and in dev environment - var file = HostingEnvironment.VirtualPathProvider.GetFile(request.AppRelativeCurrentExecutionFilePath) as DebugVirtualFile; - if (file != null) - { - context.Items["DebugFile"] = file; - context.Response.TransmitFile(file.PhysicalPath); - context.Response.Flush(); // TBD: optional? - context.Response.SuppressContent = true; // TBD: optional? - context.ApplicationInstance.CompleteRequest(); - } - } - } - - private static void HandlePluginStaticFileCaching(HttpApplication app) - { - var context = app.Context; - if (context?.Response == null) - return; - - var file = context.Items?["DebugFile"] as DebugVirtualFile; - if (file != null) - { - context.Response.AddFileDependency(file.PhysicalPath); - context.Response.ContentType = MimeTypes.MapNameToMimeType(Path.GetFileName(file.PhysicalPath)); - context.Response.Cache.SetNoStore(); - context.Response.Cache.SetLastModifiedFromFileDependencies(); - } - } - - private static void HandleSameSiteForAntiForgeryCookie(HttpApplication app) - { - var context = app.Context; - if (context?.Request == null || context?.Response == null) - return; - - if (context.IsStaticResourceRequested()) - return; - - if (SameSiteBrowserDetector.AllowsSameSiteNone(context.Request.UserAgent)) - { - // Set SameSite attribute for antiforgery token. - var privacySettings = EngineContext.Current.Resolve(); - var antiForgeryCookie = context.Request.Cookies["__requestverificationtoken"]; - - if (antiForgeryCookie != null) - { - antiForgeryCookie.HttpOnly = true; - antiForgeryCookie.Secure = context.Request.IsHttps(); - antiForgeryCookie.SameSite = antiForgeryCookie.Secure ? (SameSiteMode)privacySettings.SameSiteMode : SameSiteMode.Lax; - - context.Response.Cookies.Set(antiForgeryCookie); - } - } - } - - private static void TryResolveRoutablePath(HttpApplication app) - { - var context = app.Context; - var request = context?.Request; - if (request == null) - return; - - if (_routes.Count > 0) - { - var path = request.AppRelativeCurrentExecutionFilePath.TrimStart('~').TrimEnd('/'); - var method = request.HttpMethod.EmptyNull(); - - foreach (var route in _routes) - { - if (route.PathPattern.IsMatch(path) && route.HttpMethodPattern.IsMatch(method)) - { - var module = new UrlRoutingModule(); - module.PostResolveRequestCache(new HttpContextWrapper(context)); - return; - } - } - } - } - - private static void FilterSameSiteNoneForIncompatibleUserAgents(HttpApplication app) - { - var context = app?.Context; - if (context == null || context.IsStaticResourceRequested() || SameSiteBrowserDetector.AllowsSameSiteNone(context.Request?.UserAgent)) - return; - - app.Response.AddOnSendingHeaders(ctx => - { - var cookies = ctx.Response.Cookies; - for (var i = 0; i < cookies.Count; i++) - { - var cookie = cookies[i]; - if (cookie.SameSite == SameSiteMode.None) - { - cookie.SameSite = (SameSiteMode)(-1); // Unspecified - } - } - }); - } - - #endregion - - /// - /// Registers an action that is called on application init. Call this to register HTTP request lifecycle callbacks / event handlers. - /// - /// Action - public static void RegisterAction(Action action) - { - Guard.NotNull(action, nameof(action)); - - _actions.Add(action); - } - - /// - /// Registers a path pattern which should be handled by the - /// - /// The app relative path to handle (regular expression, e.g. /sitemap.xml or /mini-profiler-resources/(.*)) - /// The http method constraint (regular expression, e.g. GET|POST) - /// - /// For performance reasons Smartstore is configured to serve static files (files with extensions other than those mapped to managed handlers) - /// through the native StaticFileModule. This method lets you define exceptions to this default rule: every path registered as routable gets - /// handled by the and therefore enables dynamic processing of (physically non-existent) static files. - /// - public static void RegisterRoutablePath(string path, string verb = ".*") - { - Guard.NotEmpty(path, nameof(path)); - - if (path.IsWebUrl()) - { - throw new ArgumentException("Only relative paths are allowed.", "path"); - } - - var rgPath = new Regex(path, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); - var rgVerb = new Regex(verb, RegexOptions.CultureInvariant | RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.IgnoreCase); - - _routes.Add(new RoutablePath { PathPattern = rgPath, HttpMethodPattern = rgVerb }); - } - - public static bool HasMatchingPathHandler(string path, string method = "GET") - { - Guard.NotEmpty(path, nameof(path)); - Guard.NotEmpty(method, nameof(method)); - - if (_routes.Count > 0) - { - foreach (var route in _routes) - { - if (route.PathPattern.IsMatch(path) && route.HttpMethodPattern.IsMatch(method)) - { - return true; - } - } - } - - return false; - } - - private static bool IsExtensionPath(HttpRequest request) - { - var path = request.AppRelativeCurrentExecutionFilePath.ToLower(); - var result = path.StartsWith("~/plugins/") || path.StartsWith("~/themes/"); - return result; - } - - public void Dispose() - { - // nothing to dispose - } - - private class RoutablePath - { - public Regex PathPattern { get; set; } - public Regex HttpMethodPattern { get; set; } - } - } + #region Handlers + + private static void RewritePluginStaticFilePaths(HttpApplication app) + { + var context = app.Context; + var request = context?.Request; + if (request == null) + return; + + if (IsExtensionPath(request) && context.IsStaticResourceRequested()) + { + // We're in debug mode and in dev environment + var file = HostingEnvironment.VirtualPathProvider.GetFile(request.AppRelativeCurrentExecutionFilePath) as DebugVirtualFile; + if (file != null) + { + context.Items["DebugFile"] = file; + context.Response.TransmitFile(file.PhysicalPath); + context.Response.Flush(); // TBD: optional? + context.Response.SuppressContent = true; // TBD: optional? + context.ApplicationInstance.CompleteRequest(); + } + } + } + + private static void HandlePluginStaticFileCaching(HttpApplication app) + { + var context = app.Context; + if (context?.Response == null) + return; + + var file = context.Items?["DebugFile"] as DebugVirtualFile; + if (file != null) + { + context.Response.AddFileDependency(file.PhysicalPath); + context.Response.ContentType = MimeTypes.MapNameToMimeType(Path.GetFileName(file.PhysicalPath)); + context.Response.Cache.SetNoStore(); + context.Response.Cache.SetLastModifiedFromFileDependencies(); + } + } + + private static void HandleSameSiteForAntiForgeryCookie(HttpApplication app) + { + var context = app.Context; + if (context?.Request == null || context?.Response == null) + return; + + if (context.IsStaticResourceRequested()) + return; + + if (SameSiteBrowserDetector.AllowsSameSiteNone(context.Request.UserAgent)) + { + // Set SameSite attribute for antiforgery token. + var privacySettings = EngineContext.Current.Resolve(); + var antiForgeryCookie = context.Request.Cookies["__requestverificationtoken"]; + + if (antiForgeryCookie != null) + { + antiForgeryCookie.HttpOnly = true; + antiForgeryCookie.Secure = context.Request.IsHttps(); + antiForgeryCookie.SameSite = antiForgeryCookie.Secure ? (SameSiteMode)privacySettings.SameSiteMode : SameSiteMode.Lax; + + context.Response.Cookies.Set(antiForgeryCookie); + } + } + } + + private static void TryResolveRoutablePath(HttpApplication app) + { + var context = app.Context; + var request = context?.Request; + if (request == null) + return; + + if (_routes.Count > 0) + { + var path = request.AppRelativeCurrentExecutionFilePath.TrimStart('~').TrimEnd('/'); + var method = request.HttpMethod.EmptyNull(); + + foreach (var route in _routes) + { + if (route.PathPattern.IsMatch(path) && route.HttpMethodPattern.IsMatch(method)) + { + var module = new UrlRoutingModule(); + module.PostResolveRequestCache(new HttpContextWrapper(context)); + return; + } + } + } + } + + private static void FilterSameSiteNoneForIncompatibleUserAgents(HttpApplication app) + { + var context = app?.Context; + if (context == null || context.IsStaticResourceRequested() || SameSiteBrowserDetector.AllowsSameSiteNone(context.Request?.UserAgent)) + return; + + app.Response.AddOnSendingHeaders(ctx => + { + var cookies = ctx.Response.Cookies; + for (var i = 0; i < cookies.Count; i++) + { + var cookie = cookies[i]; + if (cookie.SameSite == SameSiteMode.None) + { + cookie.SameSite = (SameSiteMode)(-1); // Unspecified + } + } + }); + } + + #endregion + + /// + /// Registers an action that is called on application init. Call this to register HTTP request lifecycle callbacks / event handlers. + /// + /// Action + public static void RegisterAction(Action action) + { + Guard.NotNull(action, nameof(action)); + + _actions.Add(action); + } + + /// + /// Registers a path pattern which should be handled by the + /// + /// The app relative path to handle (regular expression, e.g. /sitemap.xml or /mini-profiler-resources/(.*)) + /// The http method constraint (regular expression, e.g. GET|POST) + /// + /// For performance reasons Smartstore is configured to serve static files (files with extensions other than those mapped to managed handlers) + /// through the native StaticFileModule. This method lets you define exceptions to this default rule: every path registered as routable gets + /// handled by the and therefore enables dynamic processing of (physically non-existent) static files. + /// + public static void RegisterRoutablePath(string path, string verb = ".*") + { + Guard.NotEmpty(path, nameof(path)); + + if (path.IsWebUrl()) + { + throw new ArgumentException("Only relative paths are allowed.", "path"); + } + + var rgPath = new Regex(path, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); + var rgVerb = new Regex(verb, RegexOptions.CultureInvariant | RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.IgnoreCase); + + _routes.Add(new RoutablePath { PathPattern = rgPath, HttpMethodPattern = rgVerb }); + } + + public static bool HasMatchingPathHandler(string path, string method = "GET") + { + Guard.NotEmpty(path, nameof(path)); + Guard.NotEmpty(method, nameof(method)); + + if (_routes.Count > 0) + { + foreach (var route in _routes) + { + if (route.PathPattern.IsMatch(path) && route.HttpMethodPattern.IsMatch(method)) + { + return true; + } + } + } + + return false; + } + + private static bool IsExtensionPath(HttpRequest request) + { + var path = request.AppRelativeCurrentExecutionFilePath.ToLower(); + var result = path.StartsWith("~/plugins/") || path.StartsWith("~/themes/"); + return result; + } + + public void Dispose() + { + // nothing to dispose + } + + private class RoutablePath + { + public Regex PathPattern { get; set; } + public Regex HttpMethodPattern { get; set; } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Events.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Events.cs index 7754edbf54..b86c81639b 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Events.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Events.cs @@ -1,96 +1,89 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using DotLiquid; namespace SmartStore.Templating { - /// - /// Published when a template zone is about to be rendered. - /// By subscribing to this event, implementors can inject custom - /// content to specific template zones. - /// - public sealed class ZoneRenderingEvent - { - private IList _snippets; + /// + /// Published when a template zone is about to be rendered. + /// By subscribing to this event, implementors can inject custom + /// content to specific template zones. + /// + public sealed class ZoneRenderingEvent + { + private IList _snippets; - public ZoneRenderingEvent(string zoneName, IDictionary model) - { - ZoneName = zoneName; - Model = model; - } + public ZoneRenderingEvent(string zoneName, IDictionary model) + { + ZoneName = zoneName; + Model = model; + } - internal Context LiquidContext { get; set; } + internal Context LiquidContext { get; set; } - /// - /// The name of the rendered template. - /// - public string TemplateName - { - get => Evaluate("Context.TemplateName") as string; - } + /// + /// The name of the rendered template. + /// + public string TemplateName => Evaluate("Context.TemplateName") as string; - /// - /// The name of the zone which is rendered. - /// - public string ZoneName { get; private set; } + /// + /// The name of the zone which is rendered. + /// + public string ZoneName { get; private set; } - /// - /// The template model - /// - public IDictionary Model { get; private set; } + /// + /// The template model + /// + public IDictionary Model { get; private set; } - /// - /// Evaluates an expression - e.g. Product.Sku - and returns it's value. - /// - /// - /// - public object Evaluate(string expression) - { - return LiquidContext[expression, false]; - } + /// + /// Evaluates an expression - e.g. Product.Sku - and returns it's value. + /// + /// + /// + public object Evaluate(string expression) + { + return LiquidContext[expression, false]; + } - /// - /// Specifies the custom content which the template engine should parse and inject. - /// - /// The content - public void InjectContent(string content) - { - if (content.HasValue()) - { - AddSnippet(new Snippet { Content = content, Parse = true }); - } - } + /// + /// Specifies the custom content which the template engine should parse and inject. + /// + /// The content + public void InjectContent(string content) + { + if (content.HasValue()) + { + AddSnippet(new Snippet { Content = content, Parse = true }); + } + } - /// - /// Specifies the custom content to inject. - /// - /// The content - /// This should be true if the content contains template syntax. - public void InjectContent(string content, bool parse) - { - if (content.HasValue()) - { - AddSnippet(new Snippet { Content = content, Parse = parse }); - } - } + /// + /// Specifies the custom content to inject. + /// + /// The content + /// This should be true if the content contains template syntax. + public void InjectContent(string content, bool parse) + { + if (content.HasValue()) + { + AddSnippet(new Snippet { Content = content, Parse = parse }); + } + } - private void AddSnippet(Snippet snippet) - { - if (_snippets == null) - _snippets = new List(); + private void AddSnippet(Snippet snippet) + { + if (_snippets == null) + _snippets = new List(); - _snippets.Add(snippet); - } + _snippets.Add(snippet); + } - internal IList Snippets - { - get => _snippets; - } + internal IList Snippets => _snippets; - internal class Snippet - { - public string Content { get; set; } - public bool Parse { get; set; } - } - } + internal class Snippet + { + public string Content { get; set; } + public bool Parse { get; set; } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/DictionaryDrop.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/DictionaryDrop.cs index e23556ddab..e061b9976d 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/DictionaryDrop.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/DictionaryDrop.cs @@ -1,34 +1,33 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace SmartStore.Templating.Liquid { - internal class DictionaryDrop : SafeDropBase - { - private readonly IDictionary _inner; + internal class DictionaryDrop : SafeDropBase + { + private readonly IDictionary _inner; - public DictionaryDrop(IDictionary data) - { - Guard.NotNull(data, nameof(data)); + public DictionaryDrop(IDictionary data) + { + Guard.NotNull(data, nameof(data)); - _inner = data; - } + _inner = data; + } - public override bool ContainsKey(object key) - { - return (key is string s) - ? _inner.ContainsKey(s) - : false; - } + public override bool ContainsKey(object key) + { + return (key is string s) + ? _inner.ContainsKey(s) + : false; + } - protected override object InvokeMember(string name) - { - return _inner.Get(name); - } + protected override object InvokeMember(string name) + { + return _inner.Get(name); + } - public override object GetWrappedObject() - { - return _inner; - } - } + public override object GetWrappedObject() + { + return _inner; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/EnumerableWrapper.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/EnumerableWrapper.cs index 721e73d533..e416575d82 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/EnumerableWrapper.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/EnumerableWrapper.cs @@ -1,40 +1,42 @@ -using System; -using System.Collections; +using System.Collections; using System.Collections.Generic; using System.Linq; using DotLiquid; namespace SmartStore.Templating.Liquid { - internal class EnumerableWrapper : IEnumerable, ISafeObject - { - private readonly IEnumerable _enumerable; + internal class EnumerableWrapper : IEnumerable, ISafeObject + { + private readonly IEnumerable _enumerable; - public EnumerableWrapper(IEnumerable enumerable) - { - Guard.NotNull(enumerable, nameof(enumerable)); - _enumerable = enumerable; - } + public EnumerableWrapper(IEnumerable enumerable) + { + Guard.NotNull(enumerable, nameof(enumerable)); + _enumerable = enumerable; + } - public IEnumerator GetEnumerator() - { - return GetEnumeratorInternal(); - } + public IEnumerator GetEnumerator() + { + return GetEnumeratorInternal(); + } - public object GetWrappedObject() => _enumerable; + public object GetWrappedObject() + { + return _enumerable; + } - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumeratorInternal(); - } + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumeratorInternal(); + } - private IEnumerator GetEnumeratorInternal() - { - return _enumerable - .Cast() - .Select(x => LiquidUtil.CreateSafeObject(x)) - .OfType() - .GetEnumerator(); - } - } + private IEnumerator GetEnumeratorInternal() + { + return _enumerable + .Cast() + .Select(x => LiquidUtil.CreateSafeObject(x)) + .OfType() + .GetEnumerator(); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/ObjectDrop.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/ObjectDrop.cs index 259f6ef028..8a384a5c9b 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/ObjectDrop.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/ObjectDrop.cs @@ -6,54 +6,54 @@ namespace SmartStore.Templating.Liquid { - internal class ObjectDrop : SafeDropBase - { - private readonly object _data; - private readonly Type _type; - - public ObjectDrop(object data) - { - Guard.NotNull(data, nameof(data)); - - _data = data; - - if (data is BaseEntity be) - { - _type = be.GetUnproxiedType(); - } - else - { - _type = data.GetType(); - } - } - - public override bool ContainsKey(object key) - { - return true; - } - - protected override object InvokeMember(string name) - { - var prop = FastProperty.GetProperty(_type, name); - if (prop != null) - { - return prop.Property.HasAttribute(true) - ? null - : prop.GetValue(_data); - } - - var method = _type.GetMethod(name, BindingFlags.Instance | BindingFlags.Public); - if (method != null && method.GetParameters().Length == 0) - { - return method.Invoke(_data, null); - } - - return null; - } - - public override object GetWrappedObject() - { - return _data; - } - } + internal class ObjectDrop : SafeDropBase + { + private readonly object _data; + private readonly Type _type; + + public ObjectDrop(object data) + { + Guard.NotNull(data, nameof(data)); + + _data = data; + + if (data is BaseEntity be) + { + _type = be.GetUnproxiedType(); + } + else + { + _type = data.GetType(); + } + } + + public override bool ContainsKey(object key) + { + return true; + } + + protected override object InvokeMember(string name) + { + var prop = FastProperty.GetProperty(_type, name); + if (prop != null) + { + return prop.Property.HasAttribute(true) + ? null + : prop.GetValue(_data); + } + + var method = _type.GetMethod(name, BindingFlags.Instance | BindingFlags.Public); + if (method != null && method.GetParameters().Length == 0) + { + return method.Invoke(_data, null); + } + + return null; + } + + public override object GetWrappedObject() + { + return _data; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/SafeDropBase.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/SafeDropBase.cs index 2974c3cacf..87d4423df6 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/SafeDropBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/SafeDropBase.cs @@ -1,49 +1,42 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using DotLiquid; namespace SmartStore.Templating.Liquid { - internal interface ISafeObject - { - object GetWrappedObject(); - } - - internal abstract class SafeDropBase : ILiquidizable, IIndexable, ISafeObject - { - private readonly IDictionary _safeObjects = new Dictionary(); - - protected object GetOrCreateSafeObject(string name) - { - if (!_safeObjects.TryGetValue(name, out var safeObject)) - { - safeObject = LiquidUtil.CreateSafeObject(InvokeMember(name)); - if (safeObject is ISafeObject) - { - _safeObjects[name] = safeObject; - } - } - - return safeObject; - } - - public abstract bool ContainsKey(object key); - - public object this[object key] - { - get - { - return (key is string s) ? GetOrCreateSafeObject(s) : null; - } - } - - protected abstract object InvokeMember(string name); - - public object ToLiquid() - { - return this; - } - - public abstract object GetWrappedObject(); - } + internal interface ISafeObject + { + object GetWrappedObject(); + } + + internal abstract class SafeDropBase : ILiquidizable, IIndexable, ISafeObject + { + private readonly IDictionary _safeObjects = new Dictionary(); + + protected object GetOrCreateSafeObject(string name) + { + if (!_safeObjects.TryGetValue(name, out var safeObject)) + { + safeObject = LiquidUtil.CreateSafeObject(InvokeMember(name)); + if (safeObject is ISafeObject) + { + _safeObjects[name] = safeObject; + } + } + + return safeObject; + } + + public abstract bool ContainsKey(object key); + + public object this[object key] => (key is string s) ? GetOrCreateSafeObject(s) : null; + + protected abstract object InvokeMember(string name); + + public object ToLiquid() + { + return this; + } + + public abstract object GetWrappedObject(); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/TestDrop.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/TestDrop.cs index 0c02cfc4c2..91e0c00b40 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/TestDrop.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Drops/TestDrop.cs @@ -6,91 +6,88 @@ namespace SmartStore.Templating.Liquid { - internal class TestDrop : ITestModel, ILiquidizable, IIndexable, ISafeObject - { - private readonly BaseEntity _entity; - private readonly Type _type; - private readonly string _modelPrefix; + internal class TestDrop : ITestModel, ILiquidizable, IIndexable, ISafeObject + { + private readonly BaseEntity _entity; + private readonly Type _type; + private readonly string _modelPrefix; - public TestDrop(BaseEntity entity, string modelPrefix) - { - _entity = entity; - _type = entity.GetUnproxiedType(); + public TestDrop(BaseEntity entity, string modelPrefix) + { + _entity = entity; + _type = entity.GetUnproxiedType(); - if (modelPrefix.HasValue()) - { - _modelPrefix = modelPrefix.EnsureEndsWith("."); - } + if (modelPrefix.HasValue()) + { + _modelPrefix = modelPrefix.EnsureEndsWith("."); + } - _modelPrefix = _modelPrefix ?? string.Empty; - } + _modelPrefix = _modelPrefix ?? string.Empty; + } - public string ModelName - { - get => _type.Name; - } + public string ModelName => _type.Name; - public object GetWrappedObject() - { - return _entity; - } + public object GetWrappedObject() + { + return _entity; + } - public bool ContainsKey(object key) - { - return true; - } + public bool ContainsKey(object key) + { + return true; + } - public object this[object key] - { - get - { - object value = null; + public object this[object key] + { + get + { + object value = null; - if (key is string name) - { - var modelPrefix = _modelPrefix + name; - var fastProp = FastProperty.GetProperty(_type, name); - var pi = fastProp?.Property; + if (key is string name) + { + var modelPrefix = _modelPrefix + name; + var fastProp = FastProperty.GetProperty(_type, name); + var pi = fastProp?.Property; - if (pi == null) - { - value = "{{ " + modelPrefix + " }}"; - } - else if (pi.PropertyType.IsPredefinedType()) - { - value = "{{ " + modelPrefix + " }}"; - } - else if (fastProp.IsSequenceType) - { - var seqType = pi.PropertyType.GetGenericArguments()[0]; - if (typeof(BaseEntity).IsAssignableFrom(seqType)) - { - var testObj1 = new TestDrop((BaseEntity)Activator.CreateInstance(seqType), "it"); - var testObj2 = new TestDrop((BaseEntity)Activator.CreateInstance(seqType), "it"); - var list = Activator.CreateInstance(typeof(List)) as List; - list.Add(testObj1); - list.Add(testObj2); - value = list; - } - } - else if (typeof(BaseEntity).IsAssignableFrom(pi.PropertyType)) - { - value = new TestDrop((BaseEntity)Activator.CreateInstance(pi.PropertyType), modelPrefix); - } + if (pi == null) + { + value = "{{ " + modelPrefix + " }}"; + } + else if (pi.PropertyType.IsPredefinedType()) + { + value = "{{ " + modelPrefix + " }}"; + } + else if (fastProp.IsSequenceType) + { + var seqType = pi.PropertyType.GetGenericArguments()[0]; + if (typeof(BaseEntity).IsAssignableFrom(seqType)) + { + var testObj1 = new TestDrop((BaseEntity)Activator.CreateInstance(seqType), "it"); + var testObj2 = new TestDrop((BaseEntity)Activator.CreateInstance(seqType), "it"); + var list = Activator.CreateInstance(typeof(List)) as List; + list.Add(testObj1); + list.Add(testObj2); + value = list; + } + } + else if (typeof(BaseEntity).IsAssignableFrom(pi.PropertyType)) + { + value = new TestDrop((BaseEntity)Activator.CreateInstance(pi.PropertyType), modelPrefix); + } - //if (value is string s) - //{ - // value = "{1}".FormatInvariant(invalid ? " invalid" : "", value); - //} - } + //if (value is string s) + //{ + // value = "{1}".FormatInvariant(invalid ? " invalid" : "", value); + //} + } - return value; - } - } + return value; + } + } - public object ToLiquid() - { - return this; - } - } + public object ToLiquid() + { + return this; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Filters/AdditionalFilters.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Filters/AdditionalFilters.cs index 41ba3dfbbb..a4bd7e1bb0 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Filters/AdditionalFilters.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Filters/AdditionalFilters.cs @@ -5,239 +5,239 @@ using System.Text; using DotLiquid; using Newtonsoft.Json; -using SmartStore.Utilities; -using SmartStore.Services; -using SmartStore.Services.Directory; +using SmartStore.ComponentModel; using SmartStore.Core.Domain.Directory; +using SmartStore.Services; using SmartStore.Services.Common; -using SmartStore.ComponentModel; +using SmartStore.Services.Directory; +using SmartStore.Utilities; namespace SmartStore.Templating.Liquid { - public static class AdditionalFilters - { - private static LiquidTemplateEngine GetEngine() - { - return (LiquidTemplateEngine)Template.FileSystem; - } - - #region Common Filters - - public static object Default(object input, object value) - { - return input ?? value; - } - - public static string Json(object input) - { - if (input == null) - return null; - - return JsonConvert.SerializeObject(input, new JsonSerializerSettings - { + public static class AdditionalFilters + { + private static LiquidTemplateEngine GetEngine() + { + return (LiquidTemplateEngine)Template.FileSystem; + } + + #region Common Filters + + public static object Default(object input, object value) + { + return input ?? value; + } + + public static string Json(object input) + { + if (input == null) + return null; + + return JsonConvert.SerializeObject(input, new JsonSerializerSettings + { ContractResolver = SmartContractResolver.Instance, ReferenceLoopHandling = ReferenceLoopHandling.Ignore - }); - } + }); + } - public static string FormatAddress(Context context, object input) - { - if (input == null) - return null; - - var engine = GetEngine(); - var countryService = engine.Services.Resolve(); - var addressService = engine.Services.Resolve(); + public static string FormatAddress(Context context, object input) + { + if (input == null) + return null; + + var engine = GetEngine(); + var countryService = engine.Services.Resolve(); + var addressService = engine.Services.Resolve(); - Country country = null; + Country country = null; - // We know that we converted Address entity to a dictionary. + // We know that we converted Address entity to a dictionary. - if (input is IDictionary dict) - { - country = countryService.GetCountryById(dict.Get("CountryId").Convert().GetValueOrDefault()); - } - else if (input is IIndexable lq) - { - country = countryService.GetCountryById(lq["CountryId"].Convert().GetValueOrDefault()); - } - - return addressService.FormatAddress(input, country?.AddressFormat, context.FormatProvider); - } - - #endregion - - #region Array Filters - - public static IEnumerable Uniq(IEnumerable input) - { - if (input == null) - return null; - - return input.Cast().Distinct(); - } - - public static IEnumerable Compact(IEnumerable input) - { - if (input == null) - return null; - - return input.Cast().Where(x => x != null); - } - - public static IEnumerable Reverse(IEnumerable input) - { - if (input == null) - return null; - - return input.Cast().Reverse(); - } - - #endregion - - #region Number Filters - - public static object Ceil(object input) - { - if (input == null) - return null; - - return CommonHelper.TryConvert(input, out var d) - ? Math.Ceiling(d) - : 0; - } + if (input is IDictionary dict) + { + country = countryService.GetCountryById(dict.Get("CountryId").Convert().GetValueOrDefault()); + } + else if (input is IIndexable lq) + { + country = countryService.GetCountryById(lq["CountryId"].Convert().GetValueOrDefault()); + } + + return addressService.FormatAddress(input, country?.AddressFormat, context.FormatProvider); + } + + #endregion + + #region Array Filters + + public static IEnumerable Uniq(IEnumerable input) + { + if (input == null) + return null; + + return input.Cast().Distinct(); + } + + public static IEnumerable Compact(IEnumerable input) + { + if (input == null) + return null; + + return input.Cast().Where(x => x != null); + } + + public static IEnumerable Reverse(IEnumerable input) + { + if (input == null) + return null; + + return input.Cast().Reverse(); + } + + #endregion + + #region Number Filters + + public static object Ceil(object input) + { + if (input == null) + return null; + + return CommonHelper.TryConvert(input, out var d) + ? Math.Ceiling(d) + : 0; + } - public static object Floor(object input) - { - if (input == null) - return null; + public static object Floor(object input) + { + if (input == null) + return null; - return CommonHelper.TryConvert(input, out var d) - ? Math.Floor(d) - : 0; - } + return CommonHelper.TryConvert(input, out var d) + ? Math.Floor(d) + : 0; + } - public static object Abs(object input) - { - if (input == null) - return null; + public static object Abs(object input) + { + if (input == null) + return null; - return CommonHelper.TryConvert(input, out var d) - ? Math.Abs(d) - : 0; - } + return CommonHelper.TryConvert(input, out var d) + ? Math.Abs(d) + : 0; + } - public static object AtMost(object input, object operand) - { - if (input == null || operand == null) - return null; + public static object AtMost(object input, object operand) + { + if (input == null || operand == null) + return null; - return CommonHelper.TryConvert(input, out var d) && CommonHelper.TryConvert(operand, out var o) - ? Math.Min(d, o) - : 0; - } + return CommonHelper.TryConvert(input, out var d) && CommonHelper.TryConvert(operand, out var o) + ? Math.Min(d, o) + : 0; + } - public static object AtLeast(object input, object operand) - { - if (input == null || operand == null) - return null; + public static object AtLeast(object input, object operand) + { + if (input == null || operand == null) + return null; - return CommonHelper.TryConvert(input, out var d) && CommonHelper.TryConvert(operand, out var o) - ? Math.Max(d, o) - : 0; - } + return CommonHelper.TryConvert(input, out var d) && CommonHelper.TryConvert(operand, out var o) + ? Math.Max(d, o) + : 0; + } - #endregion + #endregion - #region String Filters + #region String Filters - public static string Prettify(object input, bool allowSpace) - { - if (CommonHelper.TryConvert(input, out var l)) - { - return Prettifier.BytesToString(l); - } - else if (input is string s) - { - return s.Slugify(allowSpace); - } + public static string Prettify(object input, bool allowSpace) + { + if (CommonHelper.TryConvert(input, out var l)) + { + return Prettifier.BytesToString(l); + } + else if (input is string s) + { + return s.Slugify(allowSpace); + } - return null; - } + return null; + } - public static string SanitizeHtmlId(string input) - { - return input?.SanitizeHtmlId(); - } + public static string SanitizeHtmlId(string input) + { + return input?.SanitizeHtmlId(); + } - public static string Md5(string input) - { - return input?.Hash(Encoding.UTF8); - } + public static string Md5(string input) + { + return input?.Hash(Encoding.UTF8); + } - public static string UrlDecode(string input) - { - return input?.UrlDecode(); - } + public static string UrlDecode(string input) + { + return input?.UrlDecode(); + } - public static string Handleize(string input) - { - return Inflector.Handleize(input.EmptyNull()); - } + public static string Handleize(string input) + { + return Inflector.Handleize(input.EmptyNull()); + } - public static string Pluralize(string input) - { - return Inflector.Pluralize(input.EmptyNull()); - } + public static string Pluralize(string input) + { + return Inflector.Pluralize(input.EmptyNull()); + } - #endregion + #endregion - #region Localization Filters + #region Localization Filters - public static string T(Context context, string key, object arg1 = null, object arg2 = null, object arg3 = null, object arg4 = null) - { - var engine = GetEngine(); - - int languageId = 0; - - if (context["Context.LanguageId"] is int lid) - { - languageId = lid; - } - - var args = (new object[] { arg1, arg2, arg3, arg4 }).ToArray(); + public static string T(Context context, string key, object arg1 = null, object arg2 = null, object arg3 = null, object arg4 = null) + { + var engine = GetEngine(); + + int languageId = 0; + + if (context["Context.LanguageId"] is int lid) + { + languageId = lid; + } + + var args = (new object[] { arg1, arg2, arg3, arg4 }).ToArray(); - return engine.T(key, languageId, args); - } + return engine.T(key, languageId, args); + } - #endregion + #endregion - #region Url Filters + #region Url Filters - #endregion + #endregion - #region Html Filters + #region Html Filters - public static string ScriptTag(string input) - { - return String.Format("", input); - } + public static string ScriptTag(string input) + { + return String.Format("", input); + } - public static string StylesheetTag(string input) - { - return String.Format("", input); - } + public static string StylesheetTag(string input) + { + return String.Format("", input); + } - public static string ImgTag(string input, string alt = "", string css = "") - { - return input == null ? null : GetImageTag(input, alt, css); - } + public static string ImgTag(string input, string alt = "", string css = "") + { + return input == null ? null : GetImageTag(input, alt, css); + } - private static string GetImageTag(string src, string alt, string css) - { - return String.Format("\"{1}\"", src, alt, css); - } + private static string GetImageTag(string src, string alt, string css) + { + return String.Format("\"{1}\"", src, alt, css); + } - #endregion - } + #endregion + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplate.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplate.cs index 004877840d..3f6638c705 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplate.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplate.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Web.Hosting; using DotLiquid; @@ -7,81 +6,81 @@ namespace SmartStore.Templating.Liquid { - internal class LiquidTemplate : ITemplate - { - public LiquidTemplate(Template template, string source) - { - Guard.NotNull(template, nameof(template)); - Guard.NotNull(source, nameof(source)); + internal class LiquidTemplate : ITemplate + { + public LiquidTemplate(Template template, string source) + { + Guard.NotNull(template, nameof(template)); + Guard.NotNull(source, nameof(source)); - Template = template; - Source = source; - } + Template = template; + Source = source; + } - public string Source - { - get; - internal set; - } + public string Source + { + get; + internal set; + } - public Template Template - { - get; - internal set; - } + public Template Template + { + get; + internal set; + } - public string Render(object model, IFormatProvider formatProvider) - { - Guard.NotNull(model, nameof(model)); - Guard.NotNull(formatProvider, nameof(formatProvider)); - - var p = CreateParameters(model, formatProvider); - return Template.Render(p); - } + public string Render(object model, IFormatProvider formatProvider) + { + Guard.NotNull(model, nameof(model)); + Guard.NotNull(formatProvider, nameof(formatProvider)); - private RenderParameters CreateParameters(object data, IFormatProvider formatProvider) - { - var p = new RenderParameters(formatProvider); + var p = CreateParameters(model, formatProvider); + return Template.Render(p); + } - Hash hash = null; - - if (data is ISafeObject so) - { - if (so.GetWrappedObject() is IDictionary soDict) - { - hash = Hash.FromDictionary(soDict); - } - else - { - data = so.GetWrappedObject(); - } - } + private RenderParameters CreateParameters(object data, IFormatProvider formatProvider) + { + var p = new RenderParameters(formatProvider); - if (hash == null) - { - hash = new Hash(); + Hash hash = null; - if (data is IDictionary dict) - { - foreach (var kvp in dict) - { - hash[kvp.Key] = LiquidUtil.CreateSafeObject(kvp.Value); - } - } - else - { - var props = FastProperty.GetProperties(data.GetType()); - foreach (var prop in props) - { - hash[prop.Key] = LiquidUtil.CreateSafeObject(prop.Value.GetValue(data)); - } - } - } + if (data is ISafeObject so) + { + if (so.GetWrappedObject() is IDictionary soDict) + { + hash = Hash.FromDictionary(soDict); + } + else + { + data = so.GetWrappedObject(); + } + } - p.LocalVariables = hash; - p.ErrorsOutputMode = HostingEnvironment.IsHosted ? ErrorsOutputMode.Display : ErrorsOutputMode.Rethrow; + if (hash == null) + { + hash = new Hash(); - return p; - } - } + if (data is IDictionary dict) + { + foreach (var kvp in dict) + { + hash[kvp.Key] = LiquidUtil.CreateSafeObject(kvp.Value); + } + } + else + { + var props = FastProperty.GetProperties(data.GetType()); + foreach (var prop in props) + { + hash[prop.Key] = LiquidUtil.CreateSafeObject(prop.Value.GetValue(data)); + } + } + } + + p.LocalVariables = hash; + p.ErrorsOutputMode = HostingEnvironment.IsHosted ? ErrorsOutputMode.Display : ErrorsOutputMode.Rethrow; + + return p; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplateEngine.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplateEngine.cs index a229d69208..d2ee3c46bd 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplateEngine.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplateEngine.cs @@ -13,157 +13,157 @@ namespace SmartStore.Templating.Liquid { - public partial class LiquidTemplateEngine : ITemplateEngine, ITemplateFileSystem - { - private readonly Work _services; - private readonly Work _localizer; - private readonly Work _themeContext; - private readonly IVirtualPathProvider _vpp; - - public LiquidTemplateEngine( - Work services, - IVirtualPathProvider vpp, - Work themeContext, - Work localizer) - { - _services = services; - _vpp = vpp; - _localizer = localizer; - _themeContext = themeContext; - - // Register Value type transformers - var allowedMoneyProps = new[] - { - nameof(Money.Amount), - nameof(Money.RoundedAmount), - nameof(Money.TruncatedAmount), - nameof(Money.Formatted), - nameof(Money.DecimalDigits) - }; - Template.RegisterSafeType(typeof(Money), allowedMoneyProps, x => x); - - // Register tag "zone" - Template.RegisterTagFactory(new ZoneTagFactory(_services.Value.EventPublisher)); - - // Register Filters - Template.RegisterFilter(typeof(AdditionalFilters)); - - Template.NamingConvention = new CSharpNamingConvention(); - Template.FileSystem = this; - } - - #region Services - - public ICommonServices Services => _services.Value; - - public LocalizedString T(string key, int languageId, params object[] args) - { - return _localizer.Value(key, languageId, args); - } - - #endregion - - #region ITemplateEngine - - public ITemplate Compile(string source) - { - Guard.NotNull(source, nameof(source)); - - return new LiquidTemplate(Template.Parse(source), source); - } - - public string Render(string source, object model, IFormatProvider formatProvider) - { - Guard.NotNull(source, nameof(source)); - Guard.NotNull(model, nameof(model)); - Guard.NotNull(formatProvider, nameof(formatProvider)); - - return Compile(source).Render(model, formatProvider); - } - - public ITestModel CreateTestModelFor(BaseEntity entity, string modelPrefix) - { - Guard.NotNull(entity, nameof(entity)); - - return new TestDrop(entity, modelPrefix); - } - - #endregion - - #region ITemplateFileSystem - - public Template GetTemplate(Context context, string templateName) - { - var virtualPath = ResolveVirtualPath(context, templateName); - - if (virtualPath.IsEmpty()) - { - return null; - } - - var cacheKey = HttpRuntime.Cache.BuildScopedKey("LiquidPartial://" + virtualPath); - var cachedTemplate = HttpRuntime.Cache.Get(cacheKey); - - if (cachedTemplate == null) - { - // Read from file, compile and put to cache with file dependeny - var source = ReadTemplateFileInternal(virtualPath); - cachedTemplate = Template.Parse(source); - var cacheDependency = _vpp.GetCacheDependency(virtualPath, DateTime.UtcNow); - HttpRuntime.Cache.Insert(cacheKey, cachedTemplate, cacheDependency); - } - - return (Template)cachedTemplate; - } - - public string ReadTemplateFile(Context context, string templateName) - { - var virtualPath = ResolveVirtualPath(context, templateName); - - return ReadTemplateFileInternal(virtualPath); - } - - private string ReadTemplateFileInternal(string virtualPath) - { - if (virtualPath.IsEmpty()) - { - return string.Empty; - } - - if (!_vpp.FileExists(virtualPath)) - { - throw new FileNotFoundException($"Include file '{virtualPath}' does not exist."); - } - - using (var stream = _vpp.OpenFile(virtualPath)) - { - return stream.AsString(); - } - } + public partial class LiquidTemplateEngine : ITemplateEngine, ITemplateFileSystem + { + private readonly Work _services; + private readonly Work _localizer; + private readonly Work _themeContext; + private readonly IVirtualPathProvider _vpp; + + public LiquidTemplateEngine( + Work services, + IVirtualPathProvider vpp, + Work themeContext, + Work localizer) + { + _services = services; + _vpp = vpp; + _localizer = localizer; + _themeContext = themeContext; + + // Register Value type transformers + var allowedMoneyProps = new[] + { + nameof(Money.Amount), + nameof(Money.RoundedAmount), + nameof(Money.TruncatedAmount), + nameof(Money.Formatted), + nameof(Money.DecimalDigits) + }; + Template.RegisterSafeType(typeof(Money), allowedMoneyProps, x => x); + + // Register tag "zone" + Template.RegisterTagFactory(new ZoneTagFactory(_services.Value.EventPublisher)); + + // Register Filters + Template.RegisterFilter(typeof(AdditionalFilters)); + + Template.NamingConvention = new CSharpNamingConvention(); + Template.FileSystem = this; + } + + #region Services + + public ICommonServices Services => _services.Value; + + public LocalizedString T(string key, int languageId, params object[] args) + { + return _localizer.Value(key, languageId, args); + } + + #endregion + + #region ITemplateEngine + + public ITemplate Compile(string source) + { + Guard.NotNull(source, nameof(source)); + + return new LiquidTemplate(Template.Parse(source), source); + } + + public string Render(string source, object model, IFormatProvider formatProvider) + { + Guard.NotNull(source, nameof(source)); + Guard.NotNull(model, nameof(model)); + Guard.NotNull(formatProvider, nameof(formatProvider)); + + return Compile(source).Render(model, formatProvider); + } + + public ITestModel CreateTestModelFor(BaseEntity entity, string modelPrefix) + { + Guard.NotNull(entity, nameof(entity)); + + return new TestDrop(entity, modelPrefix); + } + + #endregion + + #region ITemplateFileSystem + + public Template GetTemplate(Context context, string templateName) + { + var virtualPath = ResolveVirtualPath(context, templateName); + + if (virtualPath.IsEmpty()) + { + return null; + } + + var cacheKey = HttpRuntime.Cache.BuildScopedKey("LiquidPartial://" + virtualPath); + var cachedTemplate = HttpRuntime.Cache.Get(cacheKey); + + if (cachedTemplate == null) + { + // Read from file, compile and put to cache with file dependeny + var source = ReadTemplateFileInternal(virtualPath); + cachedTemplate = Template.Parse(source); + var cacheDependency = _vpp.GetCacheDependency(virtualPath, DateTime.UtcNow); + HttpRuntime.Cache.Insert(cacheKey, cachedTemplate, cacheDependency); + } + + return (Template)cachedTemplate; + } + + public string ReadTemplateFile(Context context, string templateName) + { + var virtualPath = ResolveVirtualPath(context, templateName); + + return ReadTemplateFileInternal(virtualPath); + } + + private string ReadTemplateFileInternal(string virtualPath) + { + if (virtualPath.IsEmpty()) + { + return string.Empty; + } + + if (!_vpp.FileExists(virtualPath)) + { + throw new FileNotFoundException($"Include file '{virtualPath}' does not exist."); + } + + using (var stream = _vpp.OpenFile(virtualPath)) + { + return stream.AsString(); + } + } - private string ResolveVirtualPath(Context context, string templateName) - { - var path = ((string)context[templateName]).NullEmpty() ?? templateName; + private string ResolveVirtualPath(Context context, string templateName) + { + var path = ((string)context[templateName]).NullEmpty() ?? templateName; - if (path.IsEmpty()) - return string.Empty; + if (path.IsEmpty()) + return string.Empty; - path = path.EnsureEndsWith(".liquid"); + path = path.EnsureEndsWith(".liquid"); - string virtualPath = null; + string virtualPath = null; - if (!path.StartsWith("~/")) - { - var currentTheme = _themeContext.Value.CurrentTheme; - virtualPath = _vpp.Combine(currentTheme.Location, currentTheme.ThemeName, "Views/Shared/EmailTemplates", path); - } - else - { - virtualPath = VirtualPathUtility.ToAppRelative(path); - } - return virtualPath; - } - - #endregion - } + if (!path.StartsWith("~/")) + { + var currentTheme = _themeContext.Value.CurrentTheme; + virtualPath = _vpp.Combine(currentTheme.Location, currentTheme.ThemeName, "Views/Shared/EmailTemplates", path); + } + else + { + virtualPath = VirtualPathUtility.ToAppRelative(path); + } + return virtualPath; + } + + #endregion + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidUtil.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidUtil.cs index 9363346814..5937ea4fc6 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidUtil.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidUtil.cs @@ -4,58 +4,58 @@ namespace SmartStore.Templating.Liquid { - internal static class LiquidUtil - { - private static readonly IDictionary> _typeWrapperCache - = new Dictionary>(); - - internal static object CreateSafeObject(object value) - { - if (value == null) - { - return null; - } - - if (value is TestDrop || value is IFormattable) - { - return value; - } - - var valueType = value.GetType(); - - if (!_typeWrapperCache.TryGetValue(valueType, out var fn)) - { - if (value is IDictionary dict) - { - fn = x => new DictionaryDrop((IDictionary)x); - } - else if (valueType.IsSequenceType()) - { - var genericArgs = valueType.GetGenericArguments(); - var isEnumerable = genericArgs.Length == 1 && valueType.IsSubClass(typeof(IEnumerable<>)); - if (isEnumerable) - { - var seqType = genericArgs[0]; - if (!IsSafeType(seqType)) - { - fn = x => new EnumerableWrapper((IEnumerable)x); - } - } - } - else if (valueType.IsPlainObjectType()) - { - fn = x => new ObjectDrop(x); - } - - _typeWrapperCache[valueType] = fn; - } - - return fn?.Invoke(value) ?? value; - } - - public static bool IsSafeType(Type type) - { - return type.IsPredefinedType(); - } - } + internal static class LiquidUtil + { + private static readonly IDictionary> _typeWrapperCache + = new Dictionary>(); + + internal static object CreateSafeObject(object value) + { + if (value == null) + { + return null; + } + + if (value is TestDrop || value is IFormattable) + { + return value; + } + + var valueType = value.GetType(); + + if (!_typeWrapperCache.TryGetValue(valueType, out var fn)) + { + if (value is IDictionary dict) + { + fn = x => new DictionaryDrop((IDictionary)x); + } + else if (valueType.IsSequenceType()) + { + var genericArgs = valueType.GetGenericArguments(); + var isEnumerable = genericArgs.Length == 1 && valueType.IsSubClass(typeof(IEnumerable<>)); + if (isEnumerable) + { + var seqType = genericArgs[0]; + if (!IsSafeType(seqType)) + { + fn = x => new EnumerableWrapper((IEnumerable)x); + } + } + } + else if (valueType.IsPlainObjectType()) + { + fn = x => new ObjectDrop(x); + } + + _typeWrapperCache[valueType] = fn; + } + + return fn?.Invoke(value) ?? value; + } + + public static bool IsSafeType(Type type) + { + return type.IsPredefinedType(); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Tags/Zone.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Tags/Zone.cs index ed1113cf1c..4e9fb8037e 100644 --- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Tags/Zone.cs +++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Tags/Zone.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; @@ -10,76 +9,76 @@ namespace SmartStore.Templating.Liquid { - internal sealed class ZoneTagFactory : ITagFactory - { - private readonly IEventPublisher _eventPublisher; - - public ZoneTagFactory(IEventPublisher eventPublisher) - { - _eventPublisher = eventPublisher; - } - - public string TagName => "zone"; - - public Tag Create() - { - return new Zone { EventPublisher = _eventPublisher }; - } - - class Zone : Tag - { - private static readonly Regex Syntax = R.B(@"^({0})", DotLiquid.Liquid.QuotedFragment); - - private string _zoneName; - - public IEventPublisher EventPublisher { get; set; } - - public override void Initialize(string tagName, string markup, List tokens) - { - Match syntaxMatch = Syntax.Match(markup); - - if (syntaxMatch.Success) - { - _zoneName = syntaxMatch.Groups[1].Value; - } - else - { - throw new SyntaxException("Syntax Error in 'zone' tag - Valid syntax: zone '[ZoneName]'."); - } - - base.Initialize(tagName, markup, tokens); - } - - public override void Render(Context context, TextWriter result) - { - var zoneName = (string)context[_zoneName] ?? _zoneName; - - if (zoneName.IsEmpty()) - return; - - var model = context.Environments.First(); - var evt = new ZoneRenderingEvent(zoneName, model); - - evt.LiquidContext = context; - - EventPublisher.Publish(evt); - - if (evt.Snippets != null && evt.Snippets.Count > 0) - { - foreach (var snippet in evt.Snippets) - { - if (snippet.Parse) - { - Template.Parse(snippet.Content) - .Render(result, new RenderParameters(context.FormatProvider) { LocalVariables = model }); - } - else - { - result.Write(snippet.Content); - } - } - } - } - } - } + internal sealed class ZoneTagFactory : ITagFactory + { + private readonly IEventPublisher _eventPublisher; + + public ZoneTagFactory(IEventPublisher eventPublisher) + { + _eventPublisher = eventPublisher; + } + + public string TagName => "zone"; + + public Tag Create() + { + return new Zone { EventPublisher = _eventPublisher }; + } + + class Zone : Tag + { + private static readonly Regex Syntax = R.B(@"^({0})", DotLiquid.Liquid.QuotedFragment); + + private string _zoneName; + + public IEventPublisher EventPublisher { get; set; } + + public override void Initialize(string tagName, string markup, List tokens) + { + Match syntaxMatch = Syntax.Match(markup); + + if (syntaxMatch.Success) + { + _zoneName = syntaxMatch.Groups[1].Value; + } + else + { + throw new SyntaxException("Syntax Error in 'zone' tag - Valid syntax: zone '[ZoneName]'."); + } + + base.Initialize(tagName, markup, tokens); + } + + public override void Render(Context context, TextWriter result) + { + var zoneName = (string)context[_zoneName] ?? _zoneName; + + if (zoneName.IsEmpty()) + return; + + var model = context.Environments.First(); + var evt = new ZoneRenderingEvent(zoneName, model); + + evt.LiquidContext = context; + + EventPublisher.Publish(evt); + + if (evt.Snippets != null && evt.Snippets.Count > 0) + { + foreach (var snippet in evt.Snippets) + { + if (snippet.Parse) + { + Template.Parse(snippet.Content) + .Render(result, new RenderParameters(context.FormatProvider) { LocalVariables = model }); + } + else + { + result.Write(snippet.Content); + } + } + } + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/AdminThemedAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Theming/AdminThemedAttribute.cs index 5698f20851..59d32b7132 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/AdminThemedAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/AdminThemedAttribute.cs @@ -4,53 +4,53 @@ namespace SmartStore.Web.Framework.Theming { - /// - /// Instructs the view engine to additionally search in the admin area for views. - /// - /// - /// The "admin area" corresponds to the ~/Administration base folder. - /// This attribute is useful in plugins - which usually are areas on its own - where views - /// should be rendered as part of the admin backend. - /// Without this attribute the view resolver would directly fallback to the default nameless area - /// when a view could not be resolved from within the plugin area. - /// - public class AdminThemedAttribute : FilterAttribute, IResultFilter - { - public readonly static string[] ExtraAreaViewLocations = new string[] - { - "~/Administration/Views/{1}/{0}", - "~/Administration/Views/Shared/{0}" - }; + /// + /// Instructs the view engine to additionally search in the admin area for views. + /// + /// + /// The "admin area" corresponds to the ~/Administration base folder. + /// This attribute is useful in plugins - which usually are areas on its own - where views + /// should be rendered as part of the admin backend. + /// Without this attribute the view resolver would directly fallback to the default nameless area + /// when a view could not be resolved from within the plugin area. + /// + public class AdminThemedAttribute : FilterAttribute, IResultFilter + { + public readonly static string[] ExtraAreaViewLocations = new string[] + { + "~/Administration/Views/{1}/{0}", + "~/Administration/Views/Shared/{0}" + }; - public Lazy WorkContext { get; set; } + public Lazy WorkContext { get; set; } - public virtual void OnResultExecuting(ResultExecutingContext filterContext) - { - if (filterContext?.Result == null) - return; + public virtual void OnResultExecuting(ResultExecutingContext filterContext) + { + if (filterContext?.Result == null) + return; - if (!filterContext.Result.IsHtmlViewResult()) - return; + if (!filterContext.Result.IsHtmlViewResult()) + return; - if (filterContext.HttpContext.Response.StatusCode < 300) - { - var isNonAdmin = filterContext.HttpContext.GetItem("IsNonAdmin", forceCreation: false); - if(!isNonAdmin) - { - // Add extra view location formats to all view results (even the partial ones) - // {0} is appended by view engine - filterContext.RouteData.DataTokens["ExtraAreaViewLocations"] = ExtraAreaViewLocations; + if (filterContext.HttpContext.Response.StatusCode < 300) + { + var isNonAdmin = filterContext.HttpContext.GetItem("IsNonAdmin", forceCreation: false); + if (!isNonAdmin) + { + // Add extra view location formats to all view results (even the partial ones) + // {0} is appended by view engine + filterContext.RouteData.DataTokens["ExtraAreaViewLocations"] = ExtraAreaViewLocations; - if (!filterContext.IsChildAction) - { - WorkContext.Value.IsAdmin = true; - } - } - } - } + if (!filterContext.IsChildAction) + { + WorkContext.Value.IsAdmin = true; + } + } + } + } - public virtual void OnResultExecuted(ResultExecutedContext filterContext) - { - } - } + public virtual void OnResultExecuted(ResultExecutedContext filterContext) + { + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AssetTranslator.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AssetTranslator.cs index 62bf5fd53e..a77a3cee23 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AssetTranslator.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AssetTranslator.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using BundleTransformer.Core.Assets; using BundleTransformer.Core.Constants; @@ -11,144 +10,138 @@ namespace SmartStore.Web.Framework.Theming.Assets { - public abstract class AssetTranslator : ITranslator - where TTranslator : ITranslator, new() - { - private readonly ITranslator _inner; - - public AssetTranslator() - { - _inner = new TTranslator(); - } - - protected abstract string[] ValidTypeCodes { get; } - - private IAssetCache AssetCache - { - get { return EngineContext.Current.Resolve(); } - } - - public bool IsDebugMode - { - get { return _inner.IsDebugMode; } - set { _inner.IsDebugMode = value; } - } - - public IList Translate(IList assets) - { - var assets2 = WalkAndFindCachedAssets(assets).ToList(); - var result = _inner.Translate(assets2); - return result; - } - - private IEnumerable WalkAndFindCachedAssets(IList assets) - { - foreach (var asset in assets) - { - if (ValidTypeCodes.Contains(asset.AssetTypeCode.ToLowerInvariant())) - { - yield return TranslateInternal(asset); - } - else - { - yield return asset; - } - } - } - - public IAsset Translate(IAsset asset) - { - return TranslateInternal(asset); - } - - private IAsset TranslateInternal(IAsset asset) - { - IAsset result; - var chronometer = EngineContext.Current.Resolve(); - - using (chronometer.Step("Translate asset {0}".FormatInvariant(asset.VirtualPath))) - { - bool validationMode = ThemeHelper.IsStyleValidationRequest(); - - if (validationMode || !TryGetCachedAsset(asset, out result)) - { - using (KeyedLock.Lock("CachedAsset:" + asset.VirtualPath)) - { - if (validationMode || !TryGetCachedAsset(asset, out result)) - { - using (chronometer.Step("Compile asset {0}".FormatInvariant(asset.VirtualPath))) - { - result = _inner.Translate(asset); - - var cachedAsset = new CachedAsset - { - AssetTypeCode = AssetTypeCode.Css, - IsStylesheet = true, - Minified = result.Minified, - Combined = result.Combined, - Content = result.Content, - OriginalAssets = asset.OriginalAssets, - VirtualPath = asset.VirtualPath, - VirtualPathDependencies = result.VirtualPathDependencies, - Url = asset.Url - }; - - result = AssetTranslorUtil.PostProcessAsset(cachedAsset, this.IsDebugMode); - - if (!validationMode) - { - var pCodes = new List(3); - if (cachedAsset.Minified) pCodes.Add(DefaultAssetCache.MinificationCode); - if (cachedAsset.RelativePathsResolved) pCodes.Add(DefaultAssetCache.UrlRewriteCode); - if (cachedAsset.Autoprefixed) pCodes.Add(DefaultAssetCache.AutoprefixCode); - - AssetCache.InsertAsset( - cachedAsset.VirtualPath, - cachedAsset.VirtualPathDependencies, - cachedAsset.Content, - pCodes.ToArray()); - } - } - } - } - } - } - - return result; - } - - private bool TryGetCachedAsset(IAsset asset, out IAsset cachedAsset) - { - cachedAsset = null; - var entry = AssetCache.GetAsset(asset.VirtualPath); - - if (entry != null) - { - cachedAsset = new CachedAsset - { - AssetTypeCode = AssetTypeCode.Css, - Combined = true, - Content = entry.Content, - IsStylesheet = true, - Minified = entry.ProcessorCodes.Contains(DefaultAssetCache.MinificationCode), - RelativePathsResolved = entry.ProcessorCodes.Contains(DefaultAssetCache.UrlRewriteCode), - Autoprefixed = entry.ProcessorCodes.Contains(DefaultAssetCache.AutoprefixCode), - OriginalAssets = new List(), - VirtualPath = asset.VirtualPath, - VirtualPathDependencies = entry.VirtualPathDependencies.ToList(), - Url = asset.Url - }; - } - - return cachedAsset != null; - } - } - - public sealed class SassTranslator : AssetTranslator - { - protected override string[] ValidTypeCodes - { - get { return new[] { "sass", "scss" }; } - } - } + public abstract class AssetTranslator : ITranslator + where TTranslator : ITranslator, new() + { + private readonly ITranslator _inner; + + public AssetTranslator() + { + _inner = new TTranslator(); + } + + protected abstract string[] ValidTypeCodes { get; } + + private IAssetCache AssetCache => EngineContext.Current.Resolve(); + + public bool IsDebugMode + { + get => _inner.IsDebugMode; + set => _inner.IsDebugMode = value; + } + + public IList Translate(IList assets) + { + var assets2 = WalkAndFindCachedAssets(assets).ToList(); + var result = _inner.Translate(assets2); + return result; + } + + private IEnumerable WalkAndFindCachedAssets(IList assets) + { + foreach (var asset in assets) + { + if (ValidTypeCodes.Contains(asset.AssetTypeCode.ToLowerInvariant())) + { + yield return TranslateInternal(asset); + } + else + { + yield return asset; + } + } + } + + public IAsset Translate(IAsset asset) + { + return TranslateInternal(asset); + } + + private IAsset TranslateInternal(IAsset asset) + { + IAsset result; + var chronometer = EngineContext.Current.Resolve(); + + using (chronometer.Step("Translate asset {0}".FormatInvariant(asset.VirtualPath))) + { + bool validationMode = ThemeHelper.IsStyleValidationRequest(); + + if (validationMode || !TryGetCachedAsset(asset, out result)) + { + using (KeyedLock.Lock("CachedAsset:" + asset.VirtualPath)) + { + if (validationMode || !TryGetCachedAsset(asset, out result)) + { + using (chronometer.Step("Compile asset {0}".FormatInvariant(asset.VirtualPath))) + { + result = _inner.Translate(asset); + + var cachedAsset = new CachedAsset + { + AssetTypeCode = AssetTypeCode.Css, + IsStylesheet = true, + Minified = result.Minified, + Combined = result.Combined, + Content = result.Content, + OriginalAssets = asset.OriginalAssets, + VirtualPath = asset.VirtualPath, + VirtualPathDependencies = result.VirtualPathDependencies, + Url = asset.Url + }; + + result = AssetTranslorUtil.PostProcessAsset(cachedAsset, this.IsDebugMode); + + if (!validationMode) + { + var pCodes = new List(3); + if (cachedAsset.Minified) pCodes.Add(DefaultAssetCache.MinificationCode); + if (cachedAsset.RelativePathsResolved) pCodes.Add(DefaultAssetCache.UrlRewriteCode); + if (cachedAsset.Autoprefixed) pCodes.Add(DefaultAssetCache.AutoprefixCode); + + AssetCache.InsertAsset( + cachedAsset.VirtualPath, + cachedAsset.VirtualPathDependencies, + cachedAsset.Content, + pCodes.ToArray()); + } + } + } + } + } + } + + return result; + } + + private bool TryGetCachedAsset(IAsset asset, out IAsset cachedAsset) + { + cachedAsset = null; + var entry = AssetCache.GetAsset(asset.VirtualPath); + + if (entry != null) + { + cachedAsset = new CachedAsset + { + AssetTypeCode = AssetTypeCode.Css, + Combined = true, + Content = entry.Content, + IsStylesheet = true, + Minified = entry.ProcessorCodes.Contains(DefaultAssetCache.MinificationCode), + RelativePathsResolved = entry.ProcessorCodes.Contains(DefaultAssetCache.UrlRewriteCode), + Autoprefixed = entry.ProcessorCodes.Contains(DefaultAssetCache.AutoprefixCode), + OriginalAssets = new List(), + VirtualPath = asset.VirtualPath, + VirtualPathDependencies = entry.VirtualPathDependencies.ToList(), + Url = asset.Url + }; + } + + return cachedAsset != null; + } + } + + public sealed class SassTranslator : AssetTranslator + { + protected override string[] ValidTypeCodes => new[] { "sass", "scss" }; + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AssetTranslorUtil.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AssetTranslorUtil.cs index fc7d0b2c2f..834154cee3 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AssetTranslorUtil.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AssetTranslorUtil.cs @@ -1,26 +1,25 @@ -using System; -using System.Linq; +using System.Linq; using BundleTransformer.Core; using BundleTransformer.Core.Assets; using BundleTransformer.Core.Transformers; namespace SmartStore.Web.Framework.Theming.Assets { - internal static class AssetTranslorUtil - { - internal static IAsset PostProcessAsset(IAsset asset, bool isDebugMode) - { - var transformer = BundleTransformerContext.Current.Styles.GetDefaultTransformInstance() as ITransformer; - if (transformer != null) - { - var processors = transformer.PostProcessors.Where(x => x.UseInDebugMode || !isDebugMode); - foreach (var processor in processors) - { - asset = processor.PostProcess(asset); - } - } + internal static class AssetTranslorUtil + { + internal static IAsset PostProcessAsset(IAsset asset, bool isDebugMode) + { + var transformer = BundleTransformerContext.Current.Styles.GetDefaultTransformInstance() as ITransformer; + if (transformer != null) + { + var processors = transformer.PostProcessors.Where(x => x.UseInDebugMode || !isDebugMode); + foreach (var processor in processors) + { + asset = processor.PostProcess(asset); + } + } - return asset; - } - } + return asset; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AutoPrefixPostProcessor.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AutoPrefixPostProcessor.cs index 254d8a6bfd..694cbcd37a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AutoPrefixPostProcessor.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/AutoPrefixPostProcessor.cs @@ -1,71 +1,70 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using BundleTransformer.Core.Assets; using BundleTransformer.Core.PostProcessors; namespace SmartStore.Web.Framework.Theming.Assets { - public class AutoprefixPostProcessor : IPostProcessor - { - private readonly BundleTransformer.Autoprefixer.PostProcessors.AutoprefixCssPostProcessor _inner; + public class AutoprefixPostProcessor : IPostProcessor + { + private readonly BundleTransformer.Autoprefixer.PostProcessors.AutoprefixCssPostProcessor _inner; - public AutoprefixPostProcessor() - { - _inner = new BundleTransformer.Autoprefixer.PostProcessors.AutoprefixCssPostProcessor(); - } + public AutoprefixPostProcessor() + { + _inner = new BundleTransformer.Autoprefixer.PostProcessors.AutoprefixCssPostProcessor(); + } - public bool UseInDebugMode - { - get { return _inner.UseInDebugMode; } - set { _inner.UseInDebugMode = value; } - } + public bool UseInDebugMode + { + get => _inner.UseInDebugMode; + set => _inner.UseInDebugMode = value; + } - public IList PostProcess(IList assets) - { - Guard.NotNull(assets, nameof(assets)); + public IList PostProcess(IList assets) + { + Guard.NotNull(assets, nameof(assets)); - var list = assets.Where(CanProcess).ToList(); + var list = assets.Where(CanProcess).ToList(); - if (list.Count == 0) - { - return assets; - } + if (list.Count == 0) + { + return assets; + } - // Process only unprocessed assets... - _inner.PostProcess(list); + // Process only unprocessed assets... + _inner.PostProcess(list); - // Set Autoprefixed flag to true in our custom cached assets - list.OfType().Each(x => x.Autoprefixed = true); + // Set Autoprefixed flag to true in our custom cached assets + list.OfType().Each(x => x.Autoprefixed = true); - // ...but return the original list - return assets; - } + // ...but return the original list + return assets; + } - public IAsset PostProcess(IAsset asset) - { - Guard.NotNull(asset, nameof(asset)); + public IAsset PostProcess(IAsset asset) + { + Guard.NotNull(asset, nameof(asset)); - var cachedAsset = asset as CachedAsset; - if (cachedAsset == null || cachedAsset.Autoprefixed == false) - { - asset = _inner.PostProcess(asset); + var cachedAsset = asset as CachedAsset; + if (cachedAsset == null || cachedAsset.Autoprefixed == false) + { + asset = _inner.PostProcess(asset); - if (cachedAsset != null) - { - cachedAsset.Autoprefixed = true; - } + if (cachedAsset != null) + { + cachedAsset.Autoprefixed = true; + } - return asset; - } + return asset; + } - return asset; - } + return asset; + } - private static bool CanProcess(IAsset asset) - { - var cachedAsset = asset as CachedAsset; - return asset.IsStylesheet && (cachedAsset == null || cachedAsset.Autoprefixed == false); - } - } + private static bool CanProcess(IAsset asset) + { + var cachedAsset = asset as CachedAsset; + return asset.IsStylesheet && (cachedAsset == null || cachedAsset.Autoprefixed == false); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs index edb20c5c8b..9c9b79918f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs @@ -1,205 +1,205 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; using System.IO; +using System.Linq; using System.Web.Caching; using System.Web.Hosting; using SmartStore.Core.Infrastructure; namespace SmartStore.Web.Framework.Theming.Assets { - public sealed class BundlingVirtualPathProvider : ThemingVirtualPathProvider - { - private readonly SassCheckedPathStack _sassCheckedPathStack; + public sealed class BundlingVirtualPathProvider : ThemingVirtualPathProvider + { + private readonly SassCheckedPathStack _sassCheckedPathStack; - public BundlingVirtualPathProvider(VirtualPathProvider previous) - : base(previous) + public BundlingVirtualPathProvider(VirtualPathProvider previous) + : base(previous) { - _sassCheckedPathStack = new SassCheckedPathStack(); - } + _sassCheckedPathStack = new SassCheckedPathStack(); + } public override bool FileExists(string virtualPath) { - var exists = false; - var styleResult = ThemeHelper.IsStyleSheet(virtualPath); - - TokenizedSassPath sassPath = null; - - if (styleResult != null) - { - exists = _sassCheckedPathStack.Check(styleResult, out sassPath); - if (exists) - { - // It seems awkward to return false when check result actually says true. - // But true in this context means: a check for THIS sass file pattern (e.g. _slick.scss.sass) - // yielded true previously (because _slick.scss really exists on disks), therefore _slick.scss.sass - // CANNOT exist (or SHOULD not by convention). By returning false we prevent that a real filesystem check - // is made against _slick.scss.sass (which is huge performace saver considering that IThemeFileResolver - // also does some additional checks). - return false; - } - - if (styleResult.IsThemeVars || styleResult.IsModuleImports) - { - _sassCheckedPathStack.PushExistingPath(sassPath); - return true; - } - } - - exists = base.FileExists(virtualPath); - - if (exists && sassPath != null) - { - _sassCheckedPathStack.PushExistingPath(sassPath); - } - - return exists; + var exists = false; + var styleResult = ThemeHelper.IsStyleSheet(virtualPath); + + TokenizedSassPath sassPath = null; + + if (styleResult != null) + { + exists = _sassCheckedPathStack.Check(styleResult, out sassPath); + if (exists) + { + // It seems awkward to return false when check result actually says true. + // But true in this context means: a check for THIS sass file pattern (e.g. _slick.scss.sass) + // yielded true previously (because _slick.scss really exists on disks), therefore _slick.scss.sass + // CANNOT exist (or SHOULD not by convention). By returning false we prevent that a real filesystem check + // is made against _slick.scss.sass (which is huge performace saver considering that IThemeFileResolver + // also does some additional checks). + return false; + } + + if (styleResult.IsThemeVars || styleResult.IsModuleImports) + { + _sassCheckedPathStack.PushExistingPath(sassPath); + return true; + } + } + + exists = base.FileExists(virtualPath); + + if (exists && sassPath != null) + { + _sassCheckedPathStack.PushExistingPath(sassPath); + } + + return exists; } - + public override VirtualFile GetFile(string virtualPath) { - var styleResult = ThemeHelper.IsStyleSheet(virtualPath); - if (styleResult != null) - { - if (styleResult.IsThemeVars) - { - var theme = ThemeHelper.ResolveCurrentTheme(); - int storeId = ThemeHelper.ResolveCurrentStoreId(); - return new ThemeVarsVirtualFile(virtualPath, styleResult.Extension, theme.ThemeName, storeId); - } - else if (styleResult.IsModuleImports) - { - return new ModuleImportsVirtualFile(virtualPath, ThemeHelper.IsAdminArea()); - } - } - - return base.GetFile(virtualPath); + var styleResult = ThemeHelper.IsStyleSheet(virtualPath); + if (styleResult != null) + { + if (styleResult.IsThemeVars) + { + var theme = ThemeHelper.ResolveCurrentTheme(); + int storeId = ThemeHelper.ResolveCurrentStoreId(); + return new ThemeVarsVirtualFile(virtualPath, styleResult.Extension, theme.ThemeName, storeId); + } + else if (styleResult.IsModuleImports) + { + return new ModuleImportsVirtualFile(virtualPath, ThemeHelper.IsAdminArea()); + } + } + + return base.GetFile(virtualPath); + } + + public override CacheDependency GetCacheDependency(string virtualPath, IEnumerable virtualPathDependencies, DateTime utcStart) + { + if (ThemeHelper.IsStyleValidationRequest()) + { + var themeVarsPath = virtualPathDependencies.Cast().FirstOrDefault(x => ThemeHelper.PathIsThemeVars(x)); + if (themeVarsPath.HasValue()) + { + return base.GetCacheDependency(virtualPath, new[] { themeVarsPath }, utcStart); + } + } + + return base.GetCacheDependency(virtualPath, virtualPathDependencies, utcStart); } + } + + internal class SassCheckedPathStack + { + private readonly string[] _styleExtensions = new[] { ".scss", ".sass", ".css" }; - public override CacheDependency GetCacheDependency(string virtualPath, IEnumerable virtualPathDependencies, DateTime utcStart) + private readonly ContextState> _state + = new ContextState>("SassCheckedPathStack.State", () => new Stack()); + + public SassCheckedPathStack() { - if (ThemeHelper.IsStyleValidationRequest()) - { - var themeVarsPath = virtualPathDependencies.Cast().FirstOrDefault(x => ThemeHelper.PathIsThemeVars(x)); - if (themeVarsPath.HasValue()) - { - return base.GetCacheDependency(virtualPath, new[] { themeVarsPath }, utcStart); - } - } - - return base.GetCacheDependency(virtualPath, virtualPathDependencies, utcStart); } - } - - internal class SassCheckedPathStack - { - private readonly string[] _styleExtensions = new[] { ".scss", ".sass", ".css" }; - - private readonly ContextState> _state - = new ContextState>("SassCheckedPathStack.State", () => new Stack()); - - public SassCheckedPathStack() - { - } - - /// - /// Checks last path existence - /// - /// true = does exist, no need to check | false = not checked yet - public bool Check(StyleSheetResult styleResult, out TokenizedSassPath path) - { - path = new TokenizedSassPath(styleResult); - - var state = _state.GetState(); - if (state.Count == 0) - return false; - - var currentPath = path; - var lastPath = _state.GetState().Peek(); - - if (currentPath.Extension.IsEmpty()) - { - // We dont't allow extension-less Sass files, so no need to check. - return true; - } - - if (lastPath.Dir != currentPath.Dir) - { - return false; - } - - if (currentPath.StyleResult.IsBaseImport && lastPath.StyleResult.IsBaseImport && currentPath.FileName == lastPath.FileName) - { - return true; - } - - if (currentPath.StyleResult.IsModuleImports && lastPath.StyleResult.IsModuleImports) - { - return true; - } - - if (currentPath.StyleResult.IsThemeVars && lastPath.StyleResult.IsThemeVars) - { - return true; - } - - // slick.scss.(scss|sass|css) > slick.scss - if (Path.GetExtension(currentPath.FileNameWithoutExtension) == ".scss") - { - return true; - } - - // slick.(sass|css) > slick.scss - if (!currentPath.StyleResult.IsBaseImport && _styleExtensions.Contains(currentPath.Extension) && currentPath.FileNameWithoutExtension == lastPath.FileNameWithoutExtension) - { - return true; - } - - // _slick.scss > slick.scss - if (currentPath.FileName.StartsWith("_")) - { - if (currentPath.FileName.Substring(1) == lastPath.FileName) - { - return true; - } - } - - // slick.(scss|sass|css) > _slick.scss - if (lastPath.FileNameWithoutExtension.StartsWith("_")) - { - if (lastPath.FileNameWithoutExtension == "_" + currentPath.FileNameWithoutExtension) - { - return true; - } - } - - return false; - } - - public void PushExistingPath(TokenizedSassPath path) - { - _state.GetState().Push(path); - } - } - - internal class TokenizedSassPath - { - public TokenizedSassPath(StyleSheetResult styleResult) - { - StyleResult = styleResult; - VirtualPath = styleResult.Path; - Extension = styleResult.Extension.EmptyNull(); - FileName = Path.GetFileName(styleResult.Path); - FileNameWithoutExtension = FileName.Substring(0, FileName.Length - Extension.Length); - Dir = VirtualPath.Substring(0, VirtualPath.Length - FileName.Length); - } - - public StyleSheetResult StyleResult { get; set; } - public string VirtualPath { get; private set; } - public string Dir { get; private set; } - public string FileName { get; private set; } - public string FileNameWithoutExtension { get; private set; } - public string Extension { get; private set; } - } + + /// + /// Checks last path existence + /// + /// true = does exist, no need to check | false = not checked yet + public bool Check(StyleSheetResult styleResult, out TokenizedSassPath path) + { + path = new TokenizedSassPath(styleResult); + + var state = _state.GetState(); + if (state.Count == 0) + return false; + + var currentPath = path; + var lastPath = _state.GetState().Peek(); + + if (currentPath.Extension.IsEmpty()) + { + // We dont't allow extension-less Sass files, so no need to check. + return true; + } + + if (lastPath.Dir != currentPath.Dir) + { + return false; + } + + if (currentPath.StyleResult.IsBaseImport && lastPath.StyleResult.IsBaseImport && currentPath.FileName == lastPath.FileName) + { + return true; + } + + if (currentPath.StyleResult.IsModuleImports && lastPath.StyleResult.IsModuleImports) + { + return true; + } + + if (currentPath.StyleResult.IsThemeVars && lastPath.StyleResult.IsThemeVars) + { + return true; + } + + // slick.scss.(scss|sass|css) > slick.scss + if (Path.GetExtension(currentPath.FileNameWithoutExtension) == ".scss") + { + return true; + } + + // slick.(sass|css) > slick.scss + if (!currentPath.StyleResult.IsBaseImport && _styleExtensions.Contains(currentPath.Extension) && currentPath.FileNameWithoutExtension == lastPath.FileNameWithoutExtension) + { + return true; + } + + // _slick.scss > slick.scss + if (currentPath.FileName.StartsWith("_")) + { + if (currentPath.FileName.Substring(1) == lastPath.FileName) + { + return true; + } + } + + // slick.(scss|sass|css) > _slick.scss + if (lastPath.FileNameWithoutExtension.StartsWith("_")) + { + if (lastPath.FileNameWithoutExtension == "_" + currentPath.FileNameWithoutExtension) + { + return true; + } + } + + return false; + } + + public void PushExistingPath(TokenizedSassPath path) + { + _state.GetState().Push(path); + } + } + + internal class TokenizedSassPath + { + public TokenizedSassPath(StyleSheetResult styleResult) + { + StyleResult = styleResult; + VirtualPath = styleResult.Path; + Extension = styleResult.Extension.EmptyNull(); + FileName = Path.GetFileName(styleResult.Path); + FileNameWithoutExtension = FileName.Substring(0, FileName.Length - Extension.Length); + Dir = VirtualPath.Substring(0, VirtualPath.Length - FileName.Length); + } + + public StyleSheetResult StyleResult { get; set; } + public string VirtualPath { get; private set; } + public string Dir { get; private set; } + public string FileName { get; private set; } + public string FileNameWithoutExtension { get; private set; } + public string Extension { get; private set; } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/CachedAsset.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/CachedAsset.cs index 6844f235cc..d4f43fe25b 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/CachedAsset.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/CachedAsset.cs @@ -1,22 +1,21 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using BundleTransformer.Core.Assets; namespace SmartStore.Web.Framework.Theming.Assets { - internal class CachedAsset : IAsset - { - public string AssetTypeCode { get; set; } - public bool Combined { get; set; } - public string Content { get; set; } - public bool IsScript { get; set; } - public bool IsStylesheet { get; set; } - public bool Minified { get; set; } - public bool RelativePathsResolved { get; set; } - public bool Autoprefixed { get; set; } - public IList OriginalAssets { get; set; } - public string Url { get; set; } - public string VirtualPath { get; set; } - public IList VirtualPathDependencies { get; set; } - } + internal class CachedAsset : IAsset + { + public string AssetTypeCode { get; set; } + public bool Combined { get; set; } + public string Content { get; set; } + public bool IsScript { get; set; } + public bool IsStylesheet { get; set; } + public bool Minified { get; set; } + public bool RelativePathsResolved { get; set; } + public bool Autoprefixed { get; set; } + public IList OriginalAssets { get; set; } + public string Url { get; set; } + public string VirtualPath { get; set; } + public IList VirtualPathDependencies { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs index f1eaf270da..c86420202b 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs @@ -17,421 +17,421 @@ namespace SmartStore.Web.Framework.Theming.Assets { - public class DefaultAssetCache : IAssetCache - { - public const string MinificationCode = "min"; - public const string AutoprefixCode = "autoprefix"; - public const string UrlRewriteCode = "urlrewrite"; - - public static readonly IAssetCache Null = new NullCache(); - const string CacheKeyPrefix = "sm:AssetCacheEntry:"; - - private readonly bool _isEnabled; - private readonly ThemeSettings _themeSettings; - private readonly IApplicationEnvironment _env; - private readonly IThemeContext _themeContext; - private readonly IThemeRegistry _themeRegistry; - private readonly IThemeFileResolver _themeFileResolver; - private readonly ICommonServices _services; - - private VirtualFolder _cacheFolder; - - public DefaultAssetCache( - ThemeSettings themeSettings, - IApplicationEnvironment env, - IThemeFileResolver themeFileResolver, - IThemeContext themeContext, - IThemeRegistry themeRegistry, - ICommonServices services) - { - _themeSettings = themeSettings; - _isEnabled = _themeSettings.AssetCachingEnabled == 2 || (_themeSettings.AssetCachingEnabled == 0 && !HttpContext.Current.IsDebuggingEnabled); - - _env = env; - _themeContext = themeContext; - _themeFileResolver = themeFileResolver; - _themeRegistry = themeRegistry; - _services = services; - - Logger = NullLogger.Instance; - } - - public ILogger Logger { get; set; } - - public IVirtualFolder CacheFolder - { - get - { - if (_cacheFolder == null) - { - _cacheFolder = new VirtualFolder( - _env.TenantFolder.GetVirtualPath("AssetCache"), - _env.TenantFolder.VirtualPathProvider, - Logger); - } - - return _cacheFolder; - } - } - - public CachedAssetEntry GetAsset(string virtualPath) - { - if (!_isEnabled) - return null; - - Guard.NotEmpty(virtualPath, nameof(virtualPath)); - - var cacheDirectoryName = ResolveCacheDirectoryName(virtualPath, out string themeName, out int storeId); - - if (CacheFolder.DirectoryExists(cacheDirectoryName)) - { - try - { - var deps = CacheFolder.ReadFile(CacheFolder.Combine(cacheDirectoryName, "asset.dependencies")); - var hash = CacheFolder.ReadFile(CacheFolder.Combine(cacheDirectoryName, "asset.hash")); - - if (!TryValidate(virtualPath, deps, hash, out IEnumerable parsedDeps, out string currentHash)) - { - Logger.DebugFormat("Invalidating cached asset for '{0}' because it is not valid anymore.", virtualPath); - InvalidateAssetInternal(cacheDirectoryName, themeName, storeId); - return null; - } - - // TODO: determine correct file extension - var content = CacheFolder.ReadFile(CacheFolder.Combine(cacheDirectoryName, "asset.css")); - if (content == null) - { - using (KeyedLock.Lock(BuildLockKey(cacheDirectoryName))) - { - InvalidateAssetInternal(cacheDirectoryName, themeName, storeId); - return null; - } - } - - var codes = ParseFileContent(CacheFolder.ReadFile(CacheFolder.Combine(cacheDirectoryName, "asset.pcodes"))); - - var entry = new CachedAssetEntry - { - Content = content, - HashCode = currentHash, - OriginalVirtualPath = virtualPath, - VirtualPathDependencies = parsedDeps, - PhysicalPath = CacheFolder.MapPath(cacheDirectoryName), - ThemeName = themeName, - StoreId = storeId, - ProcessorCodes = codes.ToArray() - }; - - SetupEvictionObserver(entry); - - Logger.DebugFormat("Succesfully read asset '{0}' from cache.", virtualPath); - - return entry; - } - catch (Exception ex) - { - Logger.ErrorFormat(ex, "Error while resolving asset '{0}' from the asset cache.", virtualPath); - } - } - - return null; - } - - public CachedAssetEntry InsertAsset(string virtualPath, IEnumerable virtualPathDependencies, string content, params string[] processorCodes) - { - if (!_isEnabled) - return null; - - Guard.NotEmpty(virtualPath, nameof(virtualPath)); - Guard.NotEmpty(content, nameof(content)); - - var cacheDirectoryName = ResolveCacheDirectoryName(virtualPath, out string themeName, out int storeId); - - using (KeyedLock.Lock(BuildLockKey(cacheDirectoryName))) - { - CacheFolder.CreateDirectory(cacheDirectoryName); - - try - { - // Save main content file - // TODO: determine correct file extension - CreateFileFromEntries(cacheDirectoryName, "asset.css", new[] { content }); - - // Save dependencies file - var deps = ResolveVirtualPathDependencies(virtualPath, virtualPathDependencies, themeName); - CreateFileFromEntries(cacheDirectoryName, "asset.dependencies", deps); - - // Save hash file - var currentHash = BundleTable.VirtualPathProvider.GetFileHash(virtualPath, deps); - CreateFileFromEntries(cacheDirectoryName, "asset.hash", new[] { currentHash }); - - // Save codes file - CreateFileFromEntries(cacheDirectoryName, "asset.pcodes", processorCodes); - - var entry = new CachedAssetEntry - { - Content = content, - HashCode = currentHash, - OriginalVirtualPath = virtualPath, - VirtualPathDependencies = deps, - PhysicalPath = CacheFolder.MapPath(cacheDirectoryName), - ThemeName = themeName, - StoreId = storeId, - ProcessorCodes = processorCodes - }; - - SetupEvictionObserver(entry); - - Logger.DebugFormat("Succesfully inserted asset '{0}' to cache.", virtualPath); - - return entry; - } - catch (Exception ex) - { - Logger.ErrorFormat(ex, "Error while inserting asset '{0}' to the asset cache.", virtualPath); - InvalidateAssetInternal(cacheDirectoryName, themeName, storeId); - } - } - - return null; - } - - public void Clear() - { - if (_env.TenantFolder.DirectoryExists("AssetCache")) - { - _env.TenantFolder.TryDeleteDirectory("AssetCache"); - // Remove the eviction observer also - HttpRuntime.Cache.RemoveByPattern(CacheKeyPrefix); - } - } - - public bool InvalidateAsset(string virtualPath) - { - Guard.NotEmpty(virtualPath, nameof(virtualPath)); - - var cacheDirectoryName = ResolveCacheDirectoryName(virtualPath, out string themeName, out int storeId); - - using (KeyedLock.Lock(BuildLockKey(cacheDirectoryName))) - { - if (CacheFolder.DirectoryExists(cacheDirectoryName)) - { - return InvalidateAssetInternal(cacheDirectoryName, themeName, storeId); - } - - return false; - } - } - - private string BuildLockKey(string dirName) - { - return "AssetCache.Dir." + dirName; - } - - /// - /// Invalidates a cached asset when any themevar was changed or the theme was touched on file system - /// - /// - private static void SetupEvictionObserver(CachedAssetEntry entry) - { - if (entry.ThemeName == null) - return; - - var cacheKey = CacheKeyPrefix + "{0}:{1}".FormatInvariant(entry.ThemeName, entry.StoreId); - - var cacheDependency = new CacheDependency( - new string[0], - new[] { FrameworkCacheConsumer.BuildThemeVarsCacheKey(entry.ThemeName, entry.StoreId) }, - DateTime.UtcNow); - - HttpRuntime.Cache.Insert( - cacheKey, - entry.PhysicalPath, - cacheDependency, - Cache.NoAbsoluteExpiration, - Cache.NoSlidingExpiration, - CacheItemPriority.Default, - OnCacheItemRemoved); - } - - private static void OnCacheItemRemoved(string key, object value, CacheItemRemovedReason reason) - { - if (HostingEnvironment.ShutdownReason > ApplicationShutdownReason.None) - { - // Don't evict cached files during app shutdown. Dependant cache keys change - // during a shutdown caused by HttpRuntime.Cache full eviction. - return; - } - - // Keep this low level - var path = value as string; - if (path.HasValue() && reason == CacheItemRemovedReason.DependencyChanged) - { - try - { - Directory.Delete(path, true); - } - catch { } - } - } - - private IEnumerable ResolveVirtualPathDependencies(string virtualPath, IEnumerable deps, string themeName) - { - var list = new HashSet(StringComparer.OrdinalIgnoreCase); - - foreach (var d in (deps ?? new string[0]).Concat(new[] { virtualPath })) - { - var result = _themeFileResolver.Resolve(d); - list.Add(result != null ? result.ResultVirtualPath : d); - } - - // Add all theme.config files in the theme hierarchy chain - var manifest = _themeRegistry.GetThemeManifest(themeName); - while (manifest != null) - { - list.Add(VirtualPathUtility.ToAbsolute(CacheFolder.Combine(manifest.Location, manifest.ThemeName, "theme.config"))); - manifest = manifest.BaseTheme; - } - - return list; - } - - private bool InvalidateAssetInternal(string cacheDirectoryName, string theme, int storeId) - { - if (CacheFolder.TryDeleteDirectory(cacheDirectoryName)) - { - if (theme.HasValue()) - { - // Remove the eviction observer - var cacheKey = CacheKeyPrefix + "{0}:{1}".FormatInvariant(theme, storeId); - HttpRuntime.Cache.Remove(cacheKey); - - } - - return true; - } - - return false; - } - - /// - /// Checks whether asset is up-to-date. - /// - /// - /// - /// - /// - /// false if asset is not valid anymore and must be evicted from cache - private bool TryValidate(string virtualPath, string lastDeps, string lastHash, out IEnumerable parsedDeps, out string currentHash) - { - parsedDeps = null; - currentHash = null; - - try - { - if (lastDeps.IsEmpty() || lastHash.IsEmpty()) - { - return false; - } - - parsedDeps = ParseFileContent(lastDeps); - - // Check if dependency files hash matches the last saved hash - currentHash = BundleTable.VirtualPathProvider.GetFileHash(virtualPath, parsedDeps); - - return lastHash == currentHash; - } - catch - { - return false; - } - } - - private string ResolveCacheDirectoryName(string virtualPath, out string themeName, out int storeId) - { - themeName = null; - storeId = 0; - - if (virtualPath[0] != '~') - { - virtualPath = VirtualPathUtility.ToAppRelative(virtualPath); - } - - // Build a dir name: ~/Themes/Flex/Content/theme.scss > themes-flex-content-theme.scss-flex-1 - var folderName = virtualPath.TrimStart('~', '/', '\\') - .Replace('/', '-') - .Replace('\\', '-'); - - if (ThemeHelper.PathIsInheritableThemeFile(virtualPath)) - { - themeName = _themeContext.CurrentTheme.ThemeName; - storeId = _services.StoreContext.CurrentStore.Id; - folderName += "-" + themeName + "-" + storeId; - } - - return folderName.ToLowerInvariant(); - } - - private IEnumerable ParseFileContent(string content) - { - var list = new HashSet(StringComparer.OrdinalIgnoreCase); - if (content.IsEmpty()) return list; - - var sr = new StringReader(content); - while (true) - { - var f = sr.ReadLine(); - if (f != null && f.HasValue()) - { - list.Add(f); - } - else - { - break; - } - } - - return list; - } - - private void CreateFileFromEntries(string dirName, string fileName, IEnumerable entries) - { - if (entries == null || !entries.Any()) - return; - - var sb = new StringBuilder(); - foreach (var f in entries) - { - sb.AppendLine(f); - } - - var content = sb.ToString().TrimEnd(); - if (content.HasValue()) - { - CacheFolder.CreateTextFile(CacheFolder.Combine(dirName, fileName), content); - } - } - - class NullCache : IAssetCache - { - public void Clear() - { - } - - public CachedAssetEntry GetAsset(string virtualPath) - { - return null; - } - - public CachedAssetEntry InsertAsset(string virtualPath, IEnumerable virtualPathDependencies, string content, params string[] processorCodes) - { - return null; - } - - public bool InvalidateAsset(string virtualPath) - { - return false; - } - } - } + public class DefaultAssetCache : IAssetCache + { + public const string MinificationCode = "min"; + public const string AutoprefixCode = "autoprefix"; + public const string UrlRewriteCode = "urlrewrite"; + + public static readonly IAssetCache Null = new NullCache(); + const string CacheKeyPrefix = "sm:AssetCacheEntry:"; + + private readonly bool _isEnabled; + private readonly ThemeSettings _themeSettings; + private readonly IApplicationEnvironment _env; + private readonly IThemeContext _themeContext; + private readonly IThemeRegistry _themeRegistry; + private readonly IThemeFileResolver _themeFileResolver; + private readonly ICommonServices _services; + + private VirtualFolder _cacheFolder; + + public DefaultAssetCache( + ThemeSettings themeSettings, + IApplicationEnvironment env, + IThemeFileResolver themeFileResolver, + IThemeContext themeContext, + IThemeRegistry themeRegistry, + ICommonServices services) + { + _themeSettings = themeSettings; + _isEnabled = _themeSettings.AssetCachingEnabled == 2 || (_themeSettings.AssetCachingEnabled == 0 && !HttpContext.Current.IsDebuggingEnabled); + + _env = env; + _themeContext = themeContext; + _themeFileResolver = themeFileResolver; + _themeRegistry = themeRegistry; + _services = services; + + Logger = NullLogger.Instance; + } + + public ILogger Logger { get; set; } + + public IVirtualFolder CacheFolder + { + get + { + if (_cacheFolder == null) + { + _cacheFolder = new VirtualFolder( + _env.TenantFolder.GetVirtualPath("AssetCache"), + _env.TenantFolder.VirtualPathProvider, + Logger); + } + + return _cacheFolder; + } + } + + public CachedAssetEntry GetAsset(string virtualPath) + { + if (!_isEnabled) + return null; + + Guard.NotEmpty(virtualPath, nameof(virtualPath)); + + var cacheDirectoryName = ResolveCacheDirectoryName(virtualPath, out string themeName, out int storeId); + + if (CacheFolder.DirectoryExists(cacheDirectoryName)) + { + try + { + var deps = CacheFolder.ReadFile(CacheFolder.Combine(cacheDirectoryName, "asset.dependencies")); + var hash = CacheFolder.ReadFile(CacheFolder.Combine(cacheDirectoryName, "asset.hash")); + + if (!TryValidate(virtualPath, deps, hash, out IEnumerable parsedDeps, out string currentHash)) + { + Logger.DebugFormat("Invalidating cached asset for '{0}' because it is not valid anymore.", virtualPath); + InvalidateAssetInternal(cacheDirectoryName, themeName, storeId); + return null; + } + + // TODO: determine correct file extension + var content = CacheFolder.ReadFile(CacheFolder.Combine(cacheDirectoryName, "asset.css")); + if (content == null) + { + using (KeyedLock.Lock(BuildLockKey(cacheDirectoryName))) + { + InvalidateAssetInternal(cacheDirectoryName, themeName, storeId); + return null; + } + } + + var codes = ParseFileContent(CacheFolder.ReadFile(CacheFolder.Combine(cacheDirectoryName, "asset.pcodes"))); + + var entry = new CachedAssetEntry + { + Content = content, + HashCode = currentHash, + OriginalVirtualPath = virtualPath, + VirtualPathDependencies = parsedDeps, + PhysicalPath = CacheFolder.MapPath(cacheDirectoryName), + ThemeName = themeName, + StoreId = storeId, + ProcessorCodes = codes.ToArray() + }; + + SetupEvictionObserver(entry); + + Logger.DebugFormat("Succesfully read asset '{0}' from cache.", virtualPath); + + return entry; + } + catch (Exception ex) + { + Logger.ErrorFormat(ex, "Error while resolving asset '{0}' from the asset cache.", virtualPath); + } + } + + return null; + } + + public CachedAssetEntry InsertAsset(string virtualPath, IEnumerable virtualPathDependencies, string content, params string[] processorCodes) + { + if (!_isEnabled) + return null; + + Guard.NotEmpty(virtualPath, nameof(virtualPath)); + Guard.NotEmpty(content, nameof(content)); + + var cacheDirectoryName = ResolveCacheDirectoryName(virtualPath, out string themeName, out int storeId); + + using (KeyedLock.Lock(BuildLockKey(cacheDirectoryName))) + { + CacheFolder.CreateDirectory(cacheDirectoryName); + + try + { + // Save main content file + // TODO: determine correct file extension + CreateFileFromEntries(cacheDirectoryName, "asset.css", new[] { content }); + + // Save dependencies file + var deps = ResolveVirtualPathDependencies(virtualPath, virtualPathDependencies, themeName); + CreateFileFromEntries(cacheDirectoryName, "asset.dependencies", deps); + + // Save hash file + var currentHash = BundleTable.VirtualPathProvider.GetFileHash(virtualPath, deps); + CreateFileFromEntries(cacheDirectoryName, "asset.hash", new[] { currentHash }); + + // Save codes file + CreateFileFromEntries(cacheDirectoryName, "asset.pcodes", processorCodes); + + var entry = new CachedAssetEntry + { + Content = content, + HashCode = currentHash, + OriginalVirtualPath = virtualPath, + VirtualPathDependencies = deps, + PhysicalPath = CacheFolder.MapPath(cacheDirectoryName), + ThemeName = themeName, + StoreId = storeId, + ProcessorCodes = processorCodes + }; + + SetupEvictionObserver(entry); + + Logger.DebugFormat("Succesfully inserted asset '{0}' to cache.", virtualPath); + + return entry; + } + catch (Exception ex) + { + Logger.ErrorFormat(ex, "Error while inserting asset '{0}' to the asset cache.", virtualPath); + InvalidateAssetInternal(cacheDirectoryName, themeName, storeId); + } + } + + return null; + } + + public void Clear() + { + if (_env.TenantFolder.DirectoryExists("AssetCache")) + { + _env.TenantFolder.TryDeleteDirectory("AssetCache"); + // Remove the eviction observer also + HttpRuntime.Cache.RemoveByPattern(CacheKeyPrefix); + } + } + + public bool InvalidateAsset(string virtualPath) + { + Guard.NotEmpty(virtualPath, nameof(virtualPath)); + + var cacheDirectoryName = ResolveCacheDirectoryName(virtualPath, out string themeName, out int storeId); + + using (KeyedLock.Lock(BuildLockKey(cacheDirectoryName))) + { + if (CacheFolder.DirectoryExists(cacheDirectoryName)) + { + return InvalidateAssetInternal(cacheDirectoryName, themeName, storeId); + } + + return false; + } + } + + private string BuildLockKey(string dirName) + { + return "AssetCache.Dir." + dirName; + } + + /// + /// Invalidates a cached asset when any themevar was changed or the theme was touched on file system + /// + /// + private static void SetupEvictionObserver(CachedAssetEntry entry) + { + if (entry.ThemeName == null) + return; + + var cacheKey = CacheKeyPrefix + "{0}:{1}".FormatInvariant(entry.ThemeName, entry.StoreId); + + var cacheDependency = new CacheDependency( + new string[0], + new[] { FrameworkCacheConsumer.BuildThemeVarsCacheKey(entry.ThemeName, entry.StoreId) }, + DateTime.UtcNow); + + HttpRuntime.Cache.Insert( + cacheKey, + entry.PhysicalPath, + cacheDependency, + Cache.NoAbsoluteExpiration, + Cache.NoSlidingExpiration, + CacheItemPriority.Default, + OnCacheItemRemoved); + } + + private static void OnCacheItemRemoved(string key, object value, CacheItemRemovedReason reason) + { + if (HostingEnvironment.ShutdownReason > ApplicationShutdownReason.None) + { + // Don't evict cached files during app shutdown. Dependant cache keys change + // during a shutdown caused by HttpRuntime.Cache full eviction. + return; + } + + // Keep this low level + var path = value as string; + if (path.HasValue() && reason == CacheItemRemovedReason.DependencyChanged) + { + try + { + Directory.Delete(path, true); + } + catch { } + } + } + + private IEnumerable ResolveVirtualPathDependencies(string virtualPath, IEnumerable deps, string themeName) + { + var list = new HashSet(StringComparer.OrdinalIgnoreCase); + + foreach (var d in (deps ?? new string[0]).Concat(new[] { virtualPath })) + { + var result = _themeFileResolver.Resolve(d); + list.Add(result != null ? result.ResultVirtualPath : d); + } + + // Add all theme.config files in the theme hierarchy chain + var manifest = _themeRegistry.GetThemeManifest(themeName); + while (manifest != null) + { + list.Add(VirtualPathUtility.ToAbsolute(CacheFolder.Combine(manifest.Location, manifest.ThemeName, "theme.config"))); + manifest = manifest.BaseTheme; + } + + return list; + } + + private bool InvalidateAssetInternal(string cacheDirectoryName, string theme, int storeId) + { + if (CacheFolder.TryDeleteDirectory(cacheDirectoryName)) + { + if (theme.HasValue()) + { + // Remove the eviction observer + var cacheKey = CacheKeyPrefix + "{0}:{1}".FormatInvariant(theme, storeId); + HttpRuntime.Cache.Remove(cacheKey); + + } + + return true; + } + + return false; + } + + /// + /// Checks whether asset is up-to-date. + /// + /// + /// + /// + /// + /// false if asset is not valid anymore and must be evicted from cache + private bool TryValidate(string virtualPath, string lastDeps, string lastHash, out IEnumerable parsedDeps, out string currentHash) + { + parsedDeps = null; + currentHash = null; + + try + { + if (lastDeps.IsEmpty() || lastHash.IsEmpty()) + { + return false; + } + + parsedDeps = ParseFileContent(lastDeps); + + // Check if dependency files hash matches the last saved hash + currentHash = BundleTable.VirtualPathProvider.GetFileHash(virtualPath, parsedDeps); + + return lastHash == currentHash; + } + catch + { + return false; + } + } + + private string ResolveCacheDirectoryName(string virtualPath, out string themeName, out int storeId) + { + themeName = null; + storeId = 0; + + if (virtualPath[0] != '~') + { + virtualPath = VirtualPathUtility.ToAppRelative(virtualPath); + } + + // Build a dir name: ~/Themes/Flex/Content/theme.scss > themes-flex-content-theme.scss-flex-1 + var folderName = virtualPath.TrimStart('~', '/', '\\') + .Replace('/', '-') + .Replace('\\', '-'); + + if (ThemeHelper.PathIsInheritableThemeFile(virtualPath)) + { + themeName = _themeContext.CurrentTheme.ThemeName; + storeId = _services.StoreContext.CurrentStore.Id; + folderName += "-" + themeName + "-" + storeId; + } + + return folderName.ToLowerInvariant(); + } + + private IEnumerable ParseFileContent(string content) + { + var list = new HashSet(StringComparer.OrdinalIgnoreCase); + if (content.IsEmpty()) return list; + + var sr = new StringReader(content); + while (true) + { + var f = sr.ReadLine(); + if (f != null && f.HasValue()) + { + list.Add(f); + } + else + { + break; + } + } + + return list; + } + + private void CreateFileFromEntries(string dirName, string fileName, IEnumerable entries) + { + if (entries == null || !entries.Any()) + return; + + var sb = new StringBuilder(); + foreach (var f in entries) + { + sb.AppendLine(f); + } + + var content = sb.ToString().TrimEnd(); + if (content.HasValue()) + { + CacheFolder.CreateTextFile(CacheFolder.Combine(dirName, fileName), content); + } + } + + class NullCache : IAssetCache + { + public void Clear() + { + } + + public CachedAssetEntry GetAsset(string virtualPath) + { + return null; + } + + public CachedAssetEntry InsertAsset(string virtualPath, IEnumerable virtualPathDependencies, string content, params string[] processorCodes) + { + return null; + } + + public bool InvalidateAsset(string virtualPath) + { + return false; + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/IAssetCache.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/IAssetCache.cs index b0f888ef03..e8e4eee1dd 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/IAssetCache.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/IAssetCache.cs @@ -1,34 +1,30 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace SmartStore.Web.Framework.Theming.Assets { - public class CachedAssetEntry - { - public string Content { get; set; } - public string OriginalVirtualPath { get; set; } - public string PhysicalPath { get; set; } - public IEnumerable VirtualPathDependencies { get; set; } - public string HashCode { get; set; } - public string ThemeName { get; set; } - public int StoreId { get; set; } - public string[] ProcessorCodes { get; set; } - } + public class CachedAssetEntry + { + public string Content { get; set; } + public string OriginalVirtualPath { get; set; } + public string PhysicalPath { get; set; } + public IEnumerable VirtualPathDependencies { get; set; } + public string HashCode { get; set; } + public string ThemeName { get; set; } + public int StoreId { get; set; } + public string[] ProcessorCodes { get; set; } + } - /// - /// A file system based caching mechanism for dynamically translated assets like Sass, Less etc. - /// - public interface IAssetCache - { - CachedAssetEntry GetAsset(string virtualPath); + /// + /// A file system based caching mechanism for dynamically translated assets like Sass, Less etc. + /// + public interface IAssetCache + { + CachedAssetEntry GetAsset(string virtualPath); - CachedAssetEntry InsertAsset(string virtualPath, IEnumerable virtualPathDependencies, string content, params string[] processorCodes); + CachedAssetEntry InsertAsset(string virtualPath, IEnumerable virtualPathDependencies, string content, params string[] processorCodes); - bool InvalidateAsset(string virtualPath); + bool InvalidateAsset(string virtualPath); - void Clear(); - } + void Clear(); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/ModuleImportsVirtualFile.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/ModuleImportsVirtualFile.cs index 34b4557fe5..3b357666e7 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/ModuleImportsVirtualFile.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/ModuleImportsVirtualFile.cs @@ -1,159 +1,150 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; -using System.Text; using System.Linq; +using System.Text; using System.Web.Hosting; -using SmartStore.Core.Plugins; using SmartStore.Core.Data; -using System; +using SmartStore.Core.Plugins; using SmartStore.Utilities; namespace SmartStore.Web.Framework.Theming.Assets { - public sealed class ModuleImport - { - public string VirtualPath { get; internal set; } - public string PhysicalPath { get; internal set; } - public PluginDescriptor PluginDescriptor { get; internal set; } - public bool IsAdmin { get; internal set; } - - public override string ToString() - { - return VirtualPath; - } - - public override int GetHashCode() - { - return VirtualPath.GetHashCode(); - } - - public override bool Equals(object obj) - { - if (!(obj is ModuleImport other)) - return false; - - return string.Equals(this.VirtualPath, other.VirtualPath, StringComparison.OrdinalIgnoreCase); - } - } - - public class ModuleImportsVirtualFile : VirtualFile, IFileDependencyProvider - { - private static readonly HashSet _adminImports; - private static readonly HashSet _publicImports; - - static ModuleImportsVirtualFile() - { - _adminImports = new HashSet(); - _publicImports = new HashSet(); - - if (DataSettings.DatabaseIsInstalled()) - { - CollectModuleImports(); - } - } - - private static void CollectModuleImports() - { - var installedPlugins = PluginManager.ReferencedPlugins.Where(x => x.Installed); - var root = PluginManager.PluginsLocation; - - foreach (var plugin in installedPlugins) - { - var contentDir = Path.Combine(plugin.PhysicalPath, "Content"); - if (!Directory.Exists(contentDir)) - continue; - - TryAddImport(plugin, _publicImports, "public.scss"); - TryAddImport(plugin, _adminImports, "admin.scss"); - } - - void TryAddImport(PluginDescriptor plugin, HashSet imports, string name) - { - var physicalPath = Path.Combine(plugin.PhysicalPath, "Content", name); - if (File.Exists(physicalPath)) - { - imports.Add(new ModuleImport - { - PhysicalPath = physicalPath, - VirtualPath = $"{root}/{plugin.FolderName}/Content/{name}", - PluginDescriptor = plugin, - IsAdmin = name.Contains("admin") - }); - } - } - } - - public static ModuleImport[] PublicImports - { - get => _publicImports.ToArray(); - } - - public static ModuleImport[] AdminImports - { - get => _adminImports.ToArray(); - } - - public ModuleImportsVirtualFile(string virtualPath, bool isAdmin) - : base(virtualPath) - { - IsAdmin = isAdmin; - } - - public override bool IsDirectory - { - get { return false; } - } - - public bool IsAdmin - { - get; - private set; - } - - public override Stream Open() - { - var sb = new StringBuilder(); - - var imports = IsAdmin ? _adminImports : _publicImports; - foreach (var imp in imports) - { - sb.AppendLine($"@import '{imp.VirtualPath}';"); - } - - return GenerateStreamFromString(sb.ToString()); - } - - public void HashCombine(HashCodeCombiner combiner) - { - Guard.NotNull(combiner, nameof(combiner)); - - var imports = IsAdmin ? _adminImports : _publicImports; - foreach (var imp in imports) - { - combiner.Add(new FileInfo(imp.PhysicalPath)); - } - } - - private Stream GenerateStreamFromString(string value) - { - var stream = new MemoryStream(); - - using (var writer = new StreamWriter(stream, Encoding.Unicode, 1024, true)) - { - writer.Write(value); - writer.Flush(); - stream.Seek(0, SeekOrigin.Begin); - return stream; - } - } - - public void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys) - { - var imports = IsAdmin ? _adminImports : _publicImports; - foreach (var imp in imports) - { - mappedPaths.Add(imp.PhysicalPath); - } - } - } + public sealed class ModuleImport + { + public string VirtualPath { get; internal set; } + public string PhysicalPath { get; internal set; } + public PluginDescriptor PluginDescriptor { get; internal set; } + public bool IsAdmin { get; internal set; } + + public override string ToString() + { + return VirtualPath; + } + + public override int GetHashCode() + { + return VirtualPath.GetHashCode(); + } + + public override bool Equals(object obj) + { + if (!(obj is ModuleImport other)) + return false; + + return string.Equals(this.VirtualPath, other.VirtualPath, StringComparison.OrdinalIgnoreCase); + } + } + + public class ModuleImportsVirtualFile : VirtualFile, IFileDependencyProvider + { + private static readonly HashSet _adminImports; + private static readonly HashSet _publicImports; + + static ModuleImportsVirtualFile() + { + _adminImports = new HashSet(); + _publicImports = new HashSet(); + + if (DataSettings.DatabaseIsInstalled()) + { + CollectModuleImports(); + } + } + + private static void CollectModuleImports() + { + var installedPlugins = PluginManager.ReferencedPlugins.Where(x => x.Installed); + var root = PluginManager.PluginsLocation; + + foreach (var plugin in installedPlugins) + { + var contentDir = Path.Combine(plugin.PhysicalPath, "Content"); + if (!Directory.Exists(contentDir)) + continue; + + TryAddImport(plugin, _publicImports, "public.scss"); + TryAddImport(plugin, _adminImports, "admin.scss"); + } + + void TryAddImport(PluginDescriptor plugin, HashSet imports, string name) + { + var physicalPath = Path.Combine(plugin.PhysicalPath, "Content", name); + if (File.Exists(physicalPath)) + { + imports.Add(new ModuleImport + { + PhysicalPath = physicalPath, + VirtualPath = $"{root}/{plugin.FolderName}/Content/{name}", + PluginDescriptor = plugin, + IsAdmin = name.Contains("admin") + }); + } + } + } + + public static ModuleImport[] PublicImports => _publicImports.ToArray(); + + public static ModuleImport[] AdminImports => _adminImports.ToArray(); + + public ModuleImportsVirtualFile(string virtualPath, bool isAdmin) + : base(virtualPath) + { + IsAdmin = isAdmin; + } + + public override bool IsDirectory => false; + + public bool IsAdmin + { + get; + private set; + } + + public override Stream Open() + { + var sb = new StringBuilder(); + + var imports = IsAdmin ? _adminImports : _publicImports; + foreach (var imp in imports) + { + sb.AppendLine($"@import '{imp.VirtualPath}';"); + } + + return GenerateStreamFromString(sb.ToString()); + } + + public void HashCombine(HashCodeCombiner combiner) + { + Guard.NotNull(combiner, nameof(combiner)); + + var imports = IsAdmin ? _adminImports : _publicImports; + foreach (var imp in imports) + { + combiner.Add(new FileInfo(imp.PhysicalPath)); + } + } + + private Stream GenerateStreamFromString(string value) + { + var stream = new MemoryStream(); + + using (var writer = new StreamWriter(stream, Encoding.Unicode, 1024, true)) + { + writer.Write(value); + writer.Flush(); + stream.Seek(0, SeekOrigin.Begin); + return stream; + } + } + + public void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys) + { + var imports = IsAdmin ? _adminImports : _publicImports; + foreach (var imp in imports) + { + mappedPaths.Add(imp.PhysicalPath); + } + } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/SmartStyleBundle.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/SmartStyleBundle.cs index d2930486a7..185c640531 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/SmartStyleBundle.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/SmartStyleBundle.cs @@ -18,8 +18,8 @@ public SmartStyleBundle(string virtualPath) : this(virtualPath, null) { } - [SuppressMessage("ReSharper", "VirtualMemberCallInContructor")] - public SmartStyleBundle(string virtualPath, string cdnPath) + [SuppressMessage("ReSharper", "VirtualMemberCallInContructor")] + public SmartStyleBundle(string virtualPath, string cdnPath) : base(virtualPath, cdnPath, new IBundleTransform[] { BundleTransformerContext.Current.Styles.GetDefaultTransformInstance() }) { Builder = new NullBuilder(); @@ -31,10 +31,10 @@ public override BundleResponse GenerateBundleResponse(BundleContext context) // to the Bundle.Files collection. This is bad as we allow switching // Optimization mode per UI. Switching from true to false would also include // ALL LESS/SASS imports in the generated output ('link' tags) - + // get all ORIGINAL bundle parts (including LESS/SASS parents, no @imports) var files = this.EnumerateFiles(context); - + // replace file pattern like {version} and let Bundler resolve min/debug extensions. files = context.BundleCollection.FileExtensionReplacementList.ReplaceFileExtensions(context, files); // save originals for later use @@ -53,7 +53,7 @@ public override BundleResponse GenerateBundleResponse(BundleContext context) return response; } - + public override void UpdateCache(BundleContext context, BundleResponse response) { if (_wasCached && _transformedBundleFiles != null && _transformedBundleFiles.Any()) @@ -89,7 +89,7 @@ where _originalBundleFilePathes.Any(x => virtualPath.EndsWith(x, StringCompariso private static bool CacheIsEnabled(BundleContext context) { - Guard.NotNull(context, nameof(context)); + Guard.NotNull(context, nameof(context)); return context.HttpContext?.Cache != null && !context.EnableInstrumentation; diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs b/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs index e2fd7aa151..d0d3900fde 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs @@ -15,39 +15,36 @@ namespace SmartStore.Web.Framework.Theming { - public class SassCssHttpHandler : CssHttpHandlerBase - { - protected override IAsset TranslateAssetCore(IAsset asset, ITransformer transformer, bool isDebugMode) - { - return InnerTranslateAsset("SassTranslator", asset, transformer, isDebugMode); - } - } - - public abstract class CssHttpHandlerBase : BundleTransformer.Core.HttpHandlers.StyleAssetHandlerBase - { - protected CssHttpHandlerBase() + public class SassCssHttpHandler : CssHttpHandlerBase + { + protected override IAsset TranslateAssetCore(IAsset asset, ITransformer transformer, bool isDebugMode) + { + return InnerTranslateAsset("SassTranslator", asset, transformer, isDebugMode); + } + } + + public abstract class CssHttpHandlerBase : BundleTransformer.Core.HttpHandlers.StyleAssetHandlerBase + { + protected CssHttpHandlerBase() : this(HttpContext.Current.Cache, - BundleTransformerContext.Current.FileSystem.GetVirtualFileSystemWrapper(), - BundleTransformerContext.Current.Configuration.GetCoreSettings().AssetHandler) + BundleTransformerContext.Current.FileSystem.GetVirtualFileSystemWrapper(), + BundleTransformerContext.Current.Configuration.GetCoreSettings().AssetHandler) { - } + } - protected CssHttpHandlerBase( + protected CssHttpHandlerBase( Cache cache, IVirtualFileSystemWrapper virtualFileSystemWrapper, AssetHandlerSettings assetHandlerConfig) : base(cache, virtualFileSystemWrapper, assetHandlerConfig) - { - } + { + } - protected override bool IsStaticAsset - { - get { return false; } - } + protected override bool IsStaticAsset => false; - private bool IsThemeableRequest() + private bool IsThemeableRequest() { - if (!DataSettings.DatabaseIsInstalled()) + if (!DataSettings.DatabaseIsInstalled()) { return false; } @@ -63,73 +60,73 @@ private bool IsThemeableRequest() } } - protected override string GetCacheKey(string assetVirtualPath, string bundleVirtualPath) - { - string cacheKey = base.GetCacheKey(assetVirtualPath, bundleVirtualPath); - - if (IsThemeableRequest()) - { - if (HttpContext.Current?.Request != null) - { - var qs = QueryString.Current; - if (qs.Count > 0) - { - // required for Theme editing validation: See Admin.Controllers.ThemeController.ValidateLess() - if (qs.Contains("theme")) - { - EngineContext.Current.Resolve().SetRequestTheme(qs["theme"]); - } - if (qs.Contains("storeId")) - { - EngineContext.Current.Resolve().SetRequestStore(qs["storeId"].ToInt()); - } - } - } - - cacheKey += "_" + EngineContext.Current.Resolve().CurrentTheme.ThemeName + "_" + EngineContext.Current.Resolve().CurrentStore.Id; - - if (ThemeHelper.IsStyleValidationRequest()) - { - cacheKey += "_Validation"; - } - } - - return cacheKey; - } - - protected override IAsset TranslateAsset(IAsset asset, ITransformer transformer, bool isDebugMode) - { - bool validationMode = ThemeHelper.IsStyleValidationRequest(); - - try - { - var processedAsset = TranslateAssetCore(asset, transformer, validationMode || isDebugMode); - - if (transformer == null && !validationMode) - { - // BundleTransformer does NOT PostProcess when transformer instance is null, - // therefore we handle it ourselves, because we desperately need - // UrlRewrite even in debug mode. - return AssetTranslorUtil.PostProcessAsset(processedAsset, isDebugMode); - } - else - { - return processedAsset; - } - } - catch (Exception ex) - { - if (validationMode) - { - _context.Response.Write(ex.Message); - _context.Response.StatusCode = 500; - _context.Response.End(); - } - - throw; - } - } - - protected abstract IAsset TranslateAssetCore(IAsset asset, ITransformer transformer, bool isDebugMode); - } + protected override string GetCacheKey(string assetVirtualPath, string bundleVirtualPath) + { + string cacheKey = base.GetCacheKey(assetVirtualPath, bundleVirtualPath); + + if (IsThemeableRequest()) + { + if (HttpContext.Current?.Request != null) + { + var qs = QueryString.Current; + if (qs.Count > 0) + { + // required for Theme editing validation: See Admin.Controllers.ThemeController.ValidateLess() + if (qs.Contains("theme")) + { + EngineContext.Current.Resolve().SetRequestTheme(qs["theme"]); + } + if (qs.Contains("storeId")) + { + EngineContext.Current.Resolve().SetRequestStore(qs["storeId"].ToInt()); + } + } + } + + cacheKey += "_" + EngineContext.Current.Resolve().CurrentTheme.ThemeName + "_" + EngineContext.Current.Resolve().CurrentStore.Id; + + if (ThemeHelper.IsStyleValidationRequest()) + { + cacheKey += "_Validation"; + } + } + + return cacheKey; + } + + protected override IAsset TranslateAsset(IAsset asset, ITransformer transformer, bool isDebugMode) + { + bool validationMode = ThemeHelper.IsStyleValidationRequest(); + + try + { + var processedAsset = TranslateAssetCore(asset, transformer, validationMode || isDebugMode); + + if (transformer == null && !validationMode) + { + // BundleTransformer does NOT PostProcess when transformer instance is null, + // therefore we handle it ourselves, because we desperately need + // UrlRewrite even in debug mode. + return AssetTranslorUtil.PostProcessAsset(processedAsset, isDebugMode); + } + else + { + return processedAsset; + } + } + catch (Exception ex) + { + if (validationMode) + { + _context.Response.Write(ex.Message); + _context.Response.StatusCode = 500; + _context.Response.End(); + } + + throw; + } + } + + protected abstract IAsset TranslateAssetCore(IAsset asset, ITransformer transformer, bool isDebugMode); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs b/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs index dbbc5a5ab4..ee667a8d5a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs @@ -1,309 +1,300 @@ using System; +using System.Collections.Generic; using System.IO; using System.Linq; +using System.Threading; using System.Web; using System.Web.Hosting; -using System.Collections.Generic; -using System.Threading; -using SmartStore.Utilities.Threading; using SmartStore.Core; using SmartStore.Core.Infrastructure; using SmartStore.Core.Themes; +using SmartStore.Utilities.Threading; namespace SmartStore.Web.Framework.Theming { - public class DefaultThemeFileResolver : DisposableObject, IThemeFileResolver - { - private readonly Dictionary _files = new Dictionary(); - private readonly IThemeRegistry _themeRegistry; - private readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); - - public DefaultThemeFileResolver(IThemeRegistry themeRegistry) - { - _themeRegistry = themeRegistry; - - // listen to file monitoring events - _themeRegistry.ThemeFolderDeleted += OnThemeFolderDeleted; - _themeRegistry.ThemeFolderRenamed += OnThemeFolderRenamed; - _themeRegistry.BaseThemeChanged += OnBaseThemeChanged; - _themeRegistry.ThemeFileChanged += OnThemeFileChanged; - } - - private void OnThemeFolderDeleted(object sender, ThemeFolderDeletedEventArgs e) - { - OnThemeRemoved(e.Name); - } - - private void OnThemeFolderRenamed(object sender, ThemeFolderRenamedEventArgs e) - { - OnThemeRemoved(e.OldName); - } - - private void OnBaseThemeChanged(object sender, BaseThemeChangedEventArgs e) - { - // We should be smarter than just clearing the whole cache here. BUT: - // Changing the base theme is a very rare case, whereas determining all dependant files is rather sophisticated. - // So, who cares ;-) - _files.Clear(); - } - - private void OnThemeRemoved(string themeName) - { - using (_rwLock.GetWriteLock()) - { - var keys = _files.Keys.Where(x => x.ThemeName.IsCaseInsensitiveEqual(themeName)).ToList(); - foreach (var key in keys) - { - if (key.ThemeName.IsCaseInsensitiveEqual(themeName) || _themeRegistry.IsChildThemeOf(key.ThemeName, themeName)) - { - // remove all cached pathes for this theme (also in all derived themes) - _files.Remove(key); - } - } - } - } - - private void OnThemeFileChanged(object sender, ThemeFileChangedEventArgs e) - { - if (e.IsConfigurationFile) - return; - - using (_rwLock.GetWriteLock()) - { - // get keys with same relative path - var keys = _files.Keys.Where(x => x.RelativePath.IsCaseInsensitiveEqual(e.RelativePath)).ToList(); - foreach (var key in keys) - { - if (key.ThemeName.IsCaseInsensitiveEqual(e.ThemeName) || _themeRegistry.IsChildThemeOf(key.ThemeName, e.ThemeName)) - { - // remove all cached pathes for this file/theme combination (also in all derived themes) - InheritedThemeFileResult result; - if (_files.TryGetValue(key, out result)) - { - _files.Remove(key); - if (e.ChangeType == ThemeFileChangeType.Created) - { - // The file is new: no chance that our VPP dependencies - // could have been notified about this (only deletions/changes are monitored). - // Therefore we brutally set the result file's last write time - // to enforece VPP to invalidate cache. - try - { - File.SetLastWriteTimeUtc(result.ResultPhysicalPath, DateTime.UtcNow); - } - catch { } - } - } - } - } - } - } - - protected override void OnDispose(bool disposing) - { - if (disposing) - { - _themeRegistry.ThemeFileChanged -= OnThemeFileChanged; - _themeRegistry.ThemeFolderDeleted -= OnThemeFolderDeleted; - _themeRegistry.BaseThemeChanged -= OnBaseThemeChanged; - _themeRegistry.ThemeFolderRenamed -= OnThemeFolderRenamed; - } - } - - /// - /// Tries to resolve a file up in the current theme's hierarchy chain. - /// - /// The original virtual path of the theme file - /// - /// If the current working themme is based on another theme AND the requested file - /// was physically found in the theme's hierarchy chain, an instance of will be returned. - /// In any other case the return value is null. - /// - public InheritedThemeFileResult Resolve(string virtualPath) - { - Guard.NotEmpty(virtualPath, nameof(virtualPath)); - - if (virtualPath[0] != '~') - { - virtualPath = VirtualPathUtility.ToAppRelative(virtualPath); - } - - if (!ThemeHelper.PathIsInheritableThemeFile(virtualPath)) - { - return null; - } - - bool isBased = false; - - virtualPath = ThemeHelper.TokenizePath(virtualPath, out var requestedThemeName, out var relativePath, out var query); - - Func nullOrFile = () => - { - return isBased - ? new InheritedThemeFileResult { IsBased = true, OriginalVirtualPath = virtualPath, Query = query } - : null; - }; - - ThemeManifest currentTheme = ResolveTheme(requestedThemeName, relativePath, query, out isBased); - - if (currentTheme?.BaseTheme == null) - { - // dont't bother resolving files: the current theme is not inherited. - // Let the current VPP do the work. - return nullOrFile(); - } - - if (!currentTheme.ThemeName.Equals(requestedThemeName, StringComparison.OrdinalIgnoreCase)) - { - if (!_themeRegistry.IsChildThemeOf(currentTheme.ThemeName, requestedThemeName)) - { - return nullOrFile(); - } - } - else if (isBased && currentTheme.BaseTheme != null) - { - // A file from the base theme has been requested - currentTheme = currentTheme.BaseTheme; - } - - var fileKey = new FileKey(currentTheme.ThemeName, relativePath, query); - InheritedThemeFileResult result; - - using (_rwLock.GetUpgradeableReadLock()) - { - if (!_files.TryGetValue(fileKey, out result)) - { - using (_rwLock.GetWriteLock()) - { - // ALWAYS begin the search with the current working theme's location! - string actualLocation = LocateFile(currentTheme.ThemeName, relativePath, out var resultVirtualPath, out var resultPhysicalPath); - - if (actualLocation != null) - { - result = new InheritedThemeFileResult - { - RelativePath = relativePath, - OriginalVirtualPath = virtualPath, - ResultVirtualPath = resultVirtualPath, - ResultPhysicalPath = resultPhysicalPath, - OriginalThemeName = requestedThemeName, - ResultThemeName = actualLocation, - IsBased = isBased, - Query = query - }; - } - - _files[fileKey] = result; - } - } - } - - if (result == null) - return nullOrFile(); - - return result; - } - - private ThemeManifest ResolveTheme(string requestedThemeName, string relativePath, string query, out bool isBased) - { - isBased = false; - ThemeManifest currentTheme; - - var isAdmin = EngineContext.Current.Resolve().IsAdmin; - if (isAdmin) - { - currentTheme = _themeRegistry.GetThemeManifest(requestedThemeName); - } - else - { - var styleResult = ThemeHelper.IsStyleSheet(relativePath); - var isPreprocessor = styleResult != null && styleResult.IsPreprocessor; - if (isPreprocessor) - { - // special consideration for SASS/LESS files: they can be validated - // in the backend. For validation, a "theme" query is appended - // to the url. During validation we must work with the actual - // requested theme instead of dynamically resolving the working theme. - var httpContext = HttpContext.Current; - if (httpContext != null && httpContext.Request != null) - { - var qs = httpContext.Request.QueryString; - if (qs["theme"].HasValue()) - { - EngineContext.Current.Resolve().SetRequestTheme(qs["theme"]); - } - } - } - - currentTheme = ThemeHelper.ResolveCurrentTheme(); - - if (isPreprocessor && query != null && query.StartsWith("base", StringComparison.OrdinalIgnoreCase)) - { - // special case to support SASS @import declarations - // within inherited SASS files. Snenario: an inheritor wishes to - // include the same file from it's base theme (e.g. custom.scss) just to tweak it - // a bit for his child theme. Without the 'base' query the resolution starting point - // for custom.scss would be the CURRENT theme's folder, and NOT the requested one's, - // which inevitably would result in a cyclic dependency. - currentTheme = _themeRegistry.GetThemeManifest(requestedThemeName); - isBased = true; - } - } - - return currentTheme; - } - - /// - /// Tries to locate the file - /// - /// the theme's name where the file is actually located - private string LocateFile(string themeName, string relativePath, out string virtualPath, out string physicalPath) - { - virtualPath = null; - physicalPath = null; - - virtualPath = VirtualPathUtility.Combine("{0}{1}/".FormatInvariant(ThemeHelper.ThemesBasePath, themeName), relativePath); - physicalPath = HostingEnvironment.MapPath(virtualPath); - if (File.Exists(physicalPath)) - { - return themeName; - } - - var manifest = _themeRegistry.GetThemeManifest(themeName); - if (manifest != null && manifest.BaseTheme != null) - { - var baseLocation = LocateFile(manifest.BaseTheme.ThemeName, relativePath, out virtualPath, out physicalPath); - return baseLocation; - } - - virtualPath = null; - physicalPath = null; - return null; - } - - - private class FileKey : Tuple - { - public FileKey(string themeName, string relativePath, string query) - : base(themeName.ToLower(), relativePath.ToLower(), query?.ToLower()) - { - } - - public string ThemeName - { - get { return base.Item1; } - } - - public string RelativePath - { - get { return base.Item2; } - } - - public string Query - { - get { return base.Item3; } - } - } - - } + public class DefaultThemeFileResolver : DisposableObject, IThemeFileResolver + { + private readonly Dictionary _files = new Dictionary(); + private readonly IThemeRegistry _themeRegistry; + private readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); + + public DefaultThemeFileResolver(IThemeRegistry themeRegistry) + { + _themeRegistry = themeRegistry; + + // listen to file monitoring events + _themeRegistry.ThemeFolderDeleted += OnThemeFolderDeleted; + _themeRegistry.ThemeFolderRenamed += OnThemeFolderRenamed; + _themeRegistry.BaseThemeChanged += OnBaseThemeChanged; + _themeRegistry.ThemeFileChanged += OnThemeFileChanged; + } + + private void OnThemeFolderDeleted(object sender, ThemeFolderDeletedEventArgs e) + { + OnThemeRemoved(e.Name); + } + + private void OnThemeFolderRenamed(object sender, ThemeFolderRenamedEventArgs e) + { + OnThemeRemoved(e.OldName); + } + + private void OnBaseThemeChanged(object sender, BaseThemeChangedEventArgs e) + { + // We should be smarter than just clearing the whole cache here. BUT: + // Changing the base theme is a very rare case, whereas determining all dependant files is rather sophisticated. + // So, who cares ;-) + _files.Clear(); + } + + private void OnThemeRemoved(string themeName) + { + using (_rwLock.GetWriteLock()) + { + var keys = _files.Keys.Where(x => x.ThemeName.IsCaseInsensitiveEqual(themeName)).ToList(); + foreach (var key in keys) + { + if (key.ThemeName.IsCaseInsensitiveEqual(themeName) || _themeRegistry.IsChildThemeOf(key.ThemeName, themeName)) + { + // remove all cached pathes for this theme (also in all derived themes) + _files.Remove(key); + } + } + } + } + + private void OnThemeFileChanged(object sender, ThemeFileChangedEventArgs e) + { + if (e.IsConfigurationFile) + return; + + using (_rwLock.GetWriteLock()) + { + // get keys with same relative path + var keys = _files.Keys.Where(x => x.RelativePath.IsCaseInsensitiveEqual(e.RelativePath)).ToList(); + foreach (var key in keys) + { + if (key.ThemeName.IsCaseInsensitiveEqual(e.ThemeName) || _themeRegistry.IsChildThemeOf(key.ThemeName, e.ThemeName)) + { + // remove all cached pathes for this file/theme combination (also in all derived themes) + InheritedThemeFileResult result; + if (_files.TryGetValue(key, out result)) + { + _files.Remove(key); + if (e.ChangeType == ThemeFileChangeType.Created) + { + // The file is new: no chance that our VPP dependencies + // could have been notified about this (only deletions/changes are monitored). + // Therefore we brutally set the result file's last write time + // to enforece VPP to invalidate cache. + try + { + File.SetLastWriteTimeUtc(result.ResultPhysicalPath, DateTime.UtcNow); + } + catch { } + } + } + } + } + } + } + + protected override void OnDispose(bool disposing) + { + if (disposing) + { + _themeRegistry.ThemeFileChanged -= OnThemeFileChanged; + _themeRegistry.ThemeFolderDeleted -= OnThemeFolderDeleted; + _themeRegistry.BaseThemeChanged -= OnBaseThemeChanged; + _themeRegistry.ThemeFolderRenamed -= OnThemeFolderRenamed; + } + } + + /// + /// Tries to resolve a file up in the current theme's hierarchy chain. + /// + /// The original virtual path of the theme file + /// + /// If the current working themme is based on another theme AND the requested file + /// was physically found in the theme's hierarchy chain, an instance of will be returned. + /// In any other case the return value is null. + /// + public InheritedThemeFileResult Resolve(string virtualPath) + { + Guard.NotEmpty(virtualPath, nameof(virtualPath)); + + if (virtualPath[0] != '~') + { + virtualPath = VirtualPathUtility.ToAppRelative(virtualPath); + } + + if (!ThemeHelper.PathIsInheritableThemeFile(virtualPath)) + { + return null; + } + + bool isBased = false; + + virtualPath = ThemeHelper.TokenizePath(virtualPath, out var requestedThemeName, out var relativePath, out var query); + + Func nullOrFile = () => + { + return isBased + ? new InheritedThemeFileResult { IsBased = true, OriginalVirtualPath = virtualPath, Query = query } + : null; + }; + + ThemeManifest currentTheme = ResolveTheme(requestedThemeName, relativePath, query, out isBased); + + if (currentTheme?.BaseTheme == null) + { + // dont't bother resolving files: the current theme is not inherited. + // Let the current VPP do the work. + return nullOrFile(); + } + + if (!currentTheme.ThemeName.Equals(requestedThemeName, StringComparison.OrdinalIgnoreCase)) + { + if (!_themeRegistry.IsChildThemeOf(currentTheme.ThemeName, requestedThemeName)) + { + return nullOrFile(); + } + } + else if (isBased && currentTheme.BaseTheme != null) + { + // A file from the base theme has been requested + currentTheme = currentTheme.BaseTheme; + } + + var fileKey = new FileKey(currentTheme.ThemeName, relativePath, query); + InheritedThemeFileResult result; + + using (_rwLock.GetUpgradeableReadLock()) + { + if (!_files.TryGetValue(fileKey, out result)) + { + using (_rwLock.GetWriteLock()) + { + // ALWAYS begin the search with the current working theme's location! + string actualLocation = LocateFile(currentTheme.ThemeName, relativePath, out var resultVirtualPath, out var resultPhysicalPath); + + if (actualLocation != null) + { + result = new InheritedThemeFileResult + { + RelativePath = relativePath, + OriginalVirtualPath = virtualPath, + ResultVirtualPath = resultVirtualPath, + ResultPhysicalPath = resultPhysicalPath, + OriginalThemeName = requestedThemeName, + ResultThemeName = actualLocation, + IsBased = isBased, + Query = query + }; + } + + _files[fileKey] = result; + } + } + } + + if (result == null) + return nullOrFile(); + + return result; + } + + private ThemeManifest ResolveTheme(string requestedThemeName, string relativePath, string query, out bool isBased) + { + isBased = false; + ThemeManifest currentTheme; + + var isAdmin = EngineContext.Current.Resolve().IsAdmin; + if (isAdmin) + { + currentTheme = _themeRegistry.GetThemeManifest(requestedThemeName); + } + else + { + var styleResult = ThemeHelper.IsStyleSheet(relativePath); + var isPreprocessor = styleResult != null && styleResult.IsPreprocessor; + if (isPreprocessor) + { + // special consideration for SASS/LESS files: they can be validated + // in the backend. For validation, a "theme" query is appended + // to the url. During validation we must work with the actual + // requested theme instead of dynamically resolving the working theme. + var httpContext = HttpContext.Current; + if (httpContext != null && httpContext.Request != null) + { + var qs = httpContext.Request.QueryString; + if (qs["theme"].HasValue()) + { + EngineContext.Current.Resolve().SetRequestTheme(qs["theme"]); + } + } + } + + currentTheme = ThemeHelper.ResolveCurrentTheme(); + + if (isPreprocessor && query != null && query.StartsWith("base", StringComparison.OrdinalIgnoreCase)) + { + // special case to support SASS @import declarations + // within inherited SASS files. Snenario: an inheritor wishes to + // include the same file from it's base theme (e.g. custom.scss) just to tweak it + // a bit for his child theme. Without the 'base' query the resolution starting point + // for custom.scss would be the CURRENT theme's folder, and NOT the requested one's, + // which inevitably would result in a cyclic dependency. + currentTheme = _themeRegistry.GetThemeManifest(requestedThemeName); + isBased = true; + } + } + + return currentTheme; + } + + /// + /// Tries to locate the file + /// + /// the theme's name where the file is actually located + private string LocateFile(string themeName, string relativePath, out string virtualPath, out string physicalPath) + { + virtualPath = null; + physicalPath = null; + + virtualPath = VirtualPathUtility.Combine("{0}{1}/".FormatInvariant(ThemeHelper.ThemesBasePath, themeName), relativePath); + physicalPath = HostingEnvironment.MapPath(virtualPath); + if (File.Exists(physicalPath)) + { + return themeName; + } + + var manifest = _themeRegistry.GetThemeManifest(themeName); + if (manifest != null && manifest.BaseTheme != null) + { + var baseLocation = LocateFile(manifest.BaseTheme.ThemeName, relativePath, out virtualPath, out physicalPath); + return baseLocation; + } + + virtualPath = null; + physicalPath = null; + return null; + } + + + private class FileKey : Tuple + { + public FileKey(string themeName, string relativePath, string query) + : base(themeName.ToLower(), relativePath.ToLower(), query?.ToLower()) + { + } + + public string ThemeName => base.Item1; + + public string RelativePath => base.Item2; + + public string Query => base.Item3; + } + + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/IFileDependencyProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/IFileDependencyProvider.cs index e36f9c9fd4..eaf0c9b6b1 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/IFileDependencyProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/IFileDependencyProvider.cs @@ -1,10 +1,9 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace SmartStore.Web.Framework.Theming { - internal interface IFileDependencyProvider - { - void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys); - } + internal interface IFileDependencyProvider + { + void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/InheritedVirtualThemeFile.cs b/src/Presentation/SmartStore.Web.Framework/Theming/InheritedVirtualThemeFile.cs index ad49bed1d2..a0c19b1495 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/InheritedVirtualThemeFile.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/InheritedVirtualThemeFile.cs @@ -8,41 +8,38 @@ namespace SmartStore.Web.Framework.Theming { internal class InheritedVirtualThemeFile : VirtualFile, IFileDependencyProvider { - public InheritedVirtualThemeFile(InheritedThemeFileResult resolveResult) - : base(DetermineVirtualPath(resolveResult)) + public InheritedVirtualThemeFile(InheritedThemeFileResult resolveResult) + : base(DetermineVirtualPath(resolveResult)) { ResolveResult = resolveResult; } - public InheritedThemeFileResult ResolveResult { get; } + public InheritedThemeFileResult ResolveResult { get; } - public string ResultVirtualPath - { - get { return ResolveResult.ResultVirtualPath ?? ResolveResult.OriginalVirtualPath; } - } + public string ResultVirtualPath => ResolveResult.ResultVirtualPath ?? ResolveResult.OriginalVirtualPath; - public override Stream Open() + public override Stream Open() { - return new FileStream(ResolveResult.ResultPhysicalPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); + return new FileStream(ResolveResult.ResultPhysicalPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); } - private static string DetermineVirtualPath(InheritedThemeFileResult resolveResult) - { - if (resolveResult.RelativePath.EndsWith(".cshtml", StringComparison.OrdinalIgnoreCase)) - { - // ASP.NET BuildManager requires the original path for razor views, - // otherwise an exception is thrown - return resolveResult.OriginalVirtualPath; - } - else - { - return resolveResult.ResultVirtualPath; - } - } + private static string DetermineVirtualPath(InheritedThemeFileResult resolveResult) + { + if (resolveResult.RelativePath.EndsWith(".cshtml", StringComparison.OrdinalIgnoreCase)) + { + // ASP.NET BuildManager requires the original path for razor views, + // otherwise an exception is thrown + return resolveResult.OriginalVirtualPath; + } + else + { + return resolveResult.ResultVirtualPath; + } + } - public void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys) - { - mappedPaths.Add(ResolveResult.ResultPhysicalPath); - } - } + public void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys) + { + mappedPaths.Add(ResolveResult.ResultPhysicalPath); + } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs b/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs index 860d0560a2..58f46a29c1 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs @@ -6,94 +6,88 @@ namespace SmartStore.Web.Framework.Theming { - public class LocalizedDisplayMode : DefaultDisplayMode - { - private readonly bool _enabled; - - public LocalizedDisplayMode(bool enabled) - : this(DisplayModeProvider.DefaultDisplayModeId, enabled) - { - } - - public LocalizedDisplayMode(string suffix, bool enables) - : base(suffix) - { - _enabled = enables; - } - - public override DisplayInfo GetDisplayInfo(HttpContextBase httpContext, string virtualPath, Func virtualPathExists) - { - if (!_enabled) - { - // default behaviour, because localized views are not enabled - return base.GetDisplayInfo(httpContext, virtualPath, virtualPathExists); - } - - var lang = GetCurrentLanguageSeoCode(); - - var result = - GetDisplayInfoInternal(httpContext, virtualPath, lang, virtualPathExists) ?? - GetDisplayInfoInternal(httpContext, virtualPath, null, virtualPathExists); - - return result; - } - - private DisplayInfo GetDisplayInfoInternal(HttpContextBase httpContext, string virtualPath, string lang, Func virtualPathExists) - { - string path = this.TransformPath(virtualPath, "{0}{1}".FormatInvariant(base.DisplayModeId, lang.IsEmpty() ? "" : "." + lang)); - if (path != null && virtualPathExists(path)) - { - return new LocalizedDisplayInfo(path, this, lang); - } - - return null; - } - - public override string DisplayModeId - { - get - { - if (!_enabled) - { - return base.DisplayModeId; - } - - var lang = GetCurrentLanguageSeoCode(); - return "{0}{1}".FormatInvariant(base.DisplayModeId, lang.IsEmpty() ? "" : "." + lang); - } - } - - protected string GetCurrentLanguageSeoCode() - { - string result = null; - - var workContext = EngineContext.Current.Resolve(); - if (workContext != null && workContext.WorkingLanguage != null) - { - result = workContext.WorkingLanguage.UniqueSeoCode; - } - - return result.NullEmpty() ?? "en"; - } - } - - public class LocalizedDisplayInfo : DisplayInfo - { - public LocalizedDisplayInfo(string filePath, IDisplayMode displayMode, string lang) - : base(filePath, displayMode) - { - this.Lang = lang; - } - - public string Lang { get; set; } - - public string DisplayModeId - { - get - { - return "{0}{1}".FormatInvariant(DisplayMode.DisplayModeId, Lang.IsEmpty() ? "" : "." + Lang); - } - } - } + public class LocalizedDisplayMode : DefaultDisplayMode + { + private readonly bool _enabled; + + public LocalizedDisplayMode(bool enabled) + : this(DisplayModeProvider.DefaultDisplayModeId, enabled) + { + } + + public LocalizedDisplayMode(string suffix, bool enables) + : base(suffix) + { + _enabled = enables; + } + + public override DisplayInfo GetDisplayInfo(HttpContextBase httpContext, string virtualPath, Func virtualPathExists) + { + if (!_enabled) + { + // default behaviour, because localized views are not enabled + return base.GetDisplayInfo(httpContext, virtualPath, virtualPathExists); + } + + var lang = GetCurrentLanguageSeoCode(); + + var result = + GetDisplayInfoInternal(httpContext, virtualPath, lang, virtualPathExists) ?? + GetDisplayInfoInternal(httpContext, virtualPath, null, virtualPathExists); + + return result; + } + + private DisplayInfo GetDisplayInfoInternal(HttpContextBase httpContext, string virtualPath, string lang, Func virtualPathExists) + { + string path = this.TransformPath(virtualPath, "{0}{1}".FormatInvariant(base.DisplayModeId, lang.IsEmpty() ? "" : "." + lang)); + if (path != null && virtualPathExists(path)) + { + return new LocalizedDisplayInfo(path, this, lang); + } + + return null; + } + + public override string DisplayModeId + { + get + { + if (!_enabled) + { + return base.DisplayModeId; + } + + var lang = GetCurrentLanguageSeoCode(); + return "{0}{1}".FormatInvariant(base.DisplayModeId, lang.IsEmpty() ? "" : "." + lang); + } + } + + protected string GetCurrentLanguageSeoCode() + { + string result = null; + + var workContext = EngineContext.Current.Resolve(); + if (workContext != null && workContext.WorkingLanguage != null) + { + result = workContext.WorkingLanguage.UniqueSeoCode; + } + + return result.NullEmpty() ?? "en"; + } + } + + public class LocalizedDisplayInfo : DisplayInfo + { + public LocalizedDisplayInfo(string filePath, IDisplayMode displayMode, string lang) + : base(filePath, displayMode) + { + this.Lang = lang; + } + + public string Lang { get; set; } + + public string DisplayModeId => "{0}{1}".FormatInvariant(DisplayMode.DisplayModeId, Lang.IsEmpty() ? "" : "." + Lang); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs index 32c6d31fe8..f05bcca22a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs @@ -1,175 +1,172 @@ using System; using System.Collections.Generic; using System.IO; +using System.Threading; using System.Web; using System.Web.Hosting; -using System.Threading; using SmartStore.Core.Infrastructure; -using SmartStore.Utilities.Threading; -using SmartStore.Utilities; using SmartStore.Core.Themes; +using SmartStore.Utilities; +using SmartStore.Utilities.Threading; namespace SmartStore.Web.Framework.Theming { - public abstract class SmartVirtualPathProvider : VirtualPathProvider - { - private readonly IThemeRegistry _themeRegistry; - private readonly Dictionary _cachedDebugFilePaths = new Dictionary(); - private readonly ContextState> _requestState = new ContextState>("PluginDebugViewVPP.RequestCache", () => new Dictionary()); - private readonly DirectoryInfo _pluginsDebugDir; - private readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); - - protected static readonly bool _isDebug; - - static SmartVirtualPathProvider() - { - _isDebug = HttpContext.Current.IsDebuggingEnabled && CommonHelper.IsDevEnvironment; - } - - protected SmartVirtualPathProvider() - { - var appRootPath = HostingEnvironment.MapPath("~/").EnsureEndsWith("\\"); - - var pluginsDebugPath = Path.GetFullPath(Path.Combine(appRootPath, @"..\..\Plugins")); - if (Directory.Exists(pluginsDebugPath)) - { - _pluginsDebugDir = new DirectoryInfo(pluginsDebugPath); - } - - _themeRegistry = EngineContext.Current.Resolve(); - } - - protected internal string ResolveDebugFilePath(string virtualPath) - { - if (!_isDebug) - return null; - - // Two-Level caching: RequestCache > AppCache - var d = _requestState.GetState(); - - if (!d.TryGetValue(virtualPath, out var debugPath)) - { - if (!IsExtensionPath(virtualPath, out var root, out var appRelativePath)) - { - // don't query again in this request - d[virtualPath] = null; - return null; - } - - if (!d.TryGetValue(appRelativePath, out debugPath)) - { - // (perf) concurrency with ReaderWriterLockSlim seems way faster than ConcurrentDictionary - using (_rwLock.GetUpgradeableReadLock()) - { - if (!_cachedDebugFilePaths.TryGetValue(appRelativePath, out debugPath)) - { - using (_rwLock.GetWriteLock()) - { - debugPath = FindDebugFile(appRelativePath, root); - _cachedDebugFilePaths[appRelativePath] = d[appRelativePath] = debugPath; - } - } - } - } - } - - return debugPath; - } - - private string FindDebugFile(string appRelativePath, string root) - { - if (_pluginsDebugDir == null) - return null; - - // strip "~/Plugins/" or "~/Themes/" - var unrooted = appRelativePath.Substring(root.Length); - - // either plugin or theme name - var extensionName = unrooted.Substring(0, unrooted.IndexOf('/')); - - // get "Views/Something/View.cshtml" - var relativePath = unrooted.Substring(extensionName.Length + 1); - - if (root == "~/Themes/") - { - var theme = _themeRegistry.GetThemeManifest(extensionName); - if (theme != null && theme.IsSymbolicLink) - { - // Linked theme folders cannot compute cache dependencies correctly when - // working with source paths. We must determine the link target path, - var finalPath = Path.Combine(theme.Path, relativePath.Replace('/', '\\')); - return File.Exists(finalPath) ? finalPath : null; - } - } - else - { - // Root is "~/Plugin/" - var foldersToCheck = new[] { extensionName, extensionName + "-sym" }; - - foreach (var folder in foldersToCheck) - { - var pluginDir = new DirectoryInfo(Path.Combine(_pluginsDebugDir.FullName, folder)); - if (pluginDir != null && pluginDir.Exists) - { - var result = Path.Combine(pluginDir.FullName, relativePath).Replace("/", "\\"); - return File.Exists(result) ? result : null; - } - } - } - - return null; - } - - private bool IsExtensionPath(string virtualPath, out string root, out string appRelativePath) - { - root = null; - appRelativePath = virtualPath; - - if (virtualPath != null && virtualPath.Length > 0 && virtualPath[0] != '~') - { - appRelativePath = VirtualPathUtility.ToAppRelative(virtualPath); - } - - if (appRelativePath.StartsWith("~/Plugins/", StringComparison.InvariantCultureIgnoreCase)) - { - root = "~/Plugins/"; - return true; - } - - if (appRelativePath.StartsWith("~/Themes/", StringComparison.InvariantCultureIgnoreCase)) - { - root = "~/Themes/"; - return true; - } - - return false; - } - } - - internal class DebugVirtualFile : VirtualFile, IFileDependencyProvider - { - public DebugVirtualFile(string virtualPath, string debugPath) - : base(virtualPath) - { - this.PhysicalPath = debugPath; - } - - public string PhysicalPath { get; } - - public override bool IsDirectory - { - get { return false; } - } - - public override Stream Open() - { - var fileStream = new FileStream(PhysicalPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - return fileStream; - } - - public void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys) - { - mappedPaths.Add(PhysicalPath); - } - } + public abstract class SmartVirtualPathProvider : VirtualPathProvider + { + private readonly IThemeRegistry _themeRegistry; + private readonly Dictionary _cachedDebugFilePaths = new Dictionary(); + private readonly ContextState> _requestState = new ContextState>("PluginDebugViewVPP.RequestCache", () => new Dictionary()); + private readonly DirectoryInfo _pluginsDebugDir; + private readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); + + protected static readonly bool _isDebug; + + static SmartVirtualPathProvider() + { + _isDebug = HttpContext.Current.IsDebuggingEnabled && CommonHelper.IsDevEnvironment; + } + + protected SmartVirtualPathProvider() + { + var appRootPath = HostingEnvironment.MapPath("~/").EnsureEndsWith("\\"); + + var pluginsDebugPath = Path.GetFullPath(Path.Combine(appRootPath, @"..\..\Plugins")); + if (Directory.Exists(pluginsDebugPath)) + { + _pluginsDebugDir = new DirectoryInfo(pluginsDebugPath); + } + + _themeRegistry = EngineContext.Current.Resolve(); + } + + protected internal string ResolveDebugFilePath(string virtualPath) + { + if (!_isDebug) + return null; + + // Two-Level caching: RequestCache > AppCache + var d = _requestState.GetState(); + + if (!d.TryGetValue(virtualPath, out var debugPath)) + { + if (!IsExtensionPath(virtualPath, out var root, out var appRelativePath)) + { + // don't query again in this request + d[virtualPath] = null; + return null; + } + + if (!d.TryGetValue(appRelativePath, out debugPath)) + { + // (perf) concurrency with ReaderWriterLockSlim seems way faster than ConcurrentDictionary + using (_rwLock.GetUpgradeableReadLock()) + { + if (!_cachedDebugFilePaths.TryGetValue(appRelativePath, out debugPath)) + { + using (_rwLock.GetWriteLock()) + { + debugPath = FindDebugFile(appRelativePath, root); + _cachedDebugFilePaths[appRelativePath] = d[appRelativePath] = debugPath; + } + } + } + } + } + + return debugPath; + } + + private string FindDebugFile(string appRelativePath, string root) + { + if (_pluginsDebugDir == null) + return null; + + // strip "~/Plugins/" or "~/Themes/" + var unrooted = appRelativePath.Substring(root.Length); + + // either plugin or theme name + var extensionName = unrooted.Substring(0, unrooted.IndexOf('/')); + + // get "Views/Something/View.cshtml" + var relativePath = unrooted.Substring(extensionName.Length + 1); + + if (root == "~/Themes/") + { + var theme = _themeRegistry.GetThemeManifest(extensionName); + if (theme != null && theme.IsSymbolicLink) + { + // Linked theme folders cannot compute cache dependencies correctly when + // working with source paths. We must determine the link target path, + var finalPath = Path.Combine(theme.Path, relativePath.Replace('/', '\\')); + return File.Exists(finalPath) ? finalPath : null; + } + } + else + { + // Root is "~/Plugin/" + var foldersToCheck = new[] { extensionName, extensionName + "-sym" }; + + foreach (var folder in foldersToCheck) + { + var pluginDir = new DirectoryInfo(Path.Combine(_pluginsDebugDir.FullName, folder)); + if (pluginDir != null && pluginDir.Exists) + { + var result = Path.Combine(pluginDir.FullName, relativePath).Replace("/", "\\"); + return File.Exists(result) ? result : null; + } + } + } + + return null; + } + + private bool IsExtensionPath(string virtualPath, out string root, out string appRelativePath) + { + root = null; + appRelativePath = virtualPath; + + if (virtualPath != null && virtualPath.Length > 0 && virtualPath[0] != '~') + { + appRelativePath = VirtualPathUtility.ToAppRelative(virtualPath); + } + + if (appRelativePath.StartsWith("~/Plugins/", StringComparison.InvariantCultureIgnoreCase)) + { + root = "~/Plugins/"; + return true; + } + + if (appRelativePath.StartsWith("~/Themes/", StringComparison.InvariantCultureIgnoreCase)) + { + root = "~/Themes/"; + return true; + } + + return false; + } + } + + internal class DebugVirtualFile : VirtualFile, IFileDependencyProvider + { + public DebugVirtualFile(string virtualPath, string debugPath) + : base(virtualPath) + { + this.PhysicalPath = debugPath; + } + + public string PhysicalPath { get; } + + public override bool IsDirectory => false; + + public override Stream Open() + { + var fileStream = new FileStream(PhysicalPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); + return fileStream; + } + + public void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys) + { + mappedPaths.Add(PhysicalPath); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs index ce5b268dbf..3349b0df00 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs @@ -10,15 +10,15 @@ namespace SmartStore.Web.Framework.Theming { public partial class ThemeContext : IThemeContext { - internal const string OverriddenThemeNameKey = "OverriddenThemeName"; - - private readonly IWorkContext _workContext; - private readonly IStoreContext _storeContext; + internal const string OverriddenThemeNameKey = "OverriddenThemeName"; + + private readonly IWorkContext _workContext; + private readonly IStoreContext _storeContext; private readonly IGenericAttributeService _genericAttributeService; private readonly ThemeSettings _themeSettings; private readonly IThemeRegistry _themeRegistry; private readonly IMobileDeviceHelper _mobileDeviceHelper; - private readonly HttpContextBase _httpContext; + private readonly HttpContextBase _httpContext; private bool _themeIsCached; private string _cachedThemeName; @@ -27,20 +27,20 @@ public partial class ThemeContext : IThemeContext public ThemeContext( IWorkContext workContext, - IStoreContext storeContext, + IStoreContext storeContext, IGenericAttributeService genericAttributeService, - ThemeSettings themeSettings, + ThemeSettings themeSettings, IThemeRegistry themeRegistry, IMobileDeviceHelper mobileDeviceHelper, - HttpContextBase httpContext) + HttpContextBase httpContext) { this._workContext = workContext; - this._storeContext = storeContext; + this._storeContext = storeContext; this._genericAttributeService = genericAttributeService; this._themeSettings = themeSettings; this._themeRegistry = themeRegistry; this._mobileDeviceHelper = mobileDeviceHelper; - this._httpContext = httpContext; + this._httpContext = httpContext; } public string WorkingThemeName @@ -52,24 +52,24 @@ public string WorkingThemeName return _cachedThemeName; } - var customer = _workContext.CurrentCustomer; + var customer = _workContext.CurrentCustomer; bool isUserSpecific = false; string theme = ""; if (_themeSettings.AllowCustomerToSelectTheme) { - if (_themeSettings.SaveThemeChoiceInCookie) - { - theme = _httpContext.GetUserThemeChoiceFromCookie(); - } - else - { - if (customer != null) - { - theme = customer.GetAttribute(SystemCustomerAttributeNames.WorkingThemeName, _genericAttributeService, _storeContext.CurrentStore.Id); - } - } - - isUserSpecific = theme.HasValue(); + if (_themeSettings.SaveThemeChoiceInCookie) + { + theme = _httpContext.GetUserThemeChoiceFromCookie(); + } + else + { + if (customer != null) + { + theme = customer.GetAttribute(SystemCustomerAttributeNames.WorkingThemeName, _genericAttributeService, _storeContext.CurrentStore.Id); + } + } + + isUserSpecific = theme.HasValue(); } // default store theme @@ -82,23 +82,23 @@ public string WorkingThemeName if (!_themeRegistry.ThemeManifestExists(theme)) { var manifest = _themeRegistry.GetThemeManifests().FirstOrDefault(); - if (manifest == null) - { - // no active theme in system. Throw! - throw Error.Application("At least one theme must be in active state, but the theme registry does not contain a valid theme package."); - } - theme = manifest.ThemeName; + if (manifest == null) + { + // no active theme in system. Throw! + throw Error.Application("At least one theme must be in active state, but the theme registry does not contain a valid theme package."); + } + theme = manifest.ThemeName; if (isUserSpecific) { - // the customer chosen theme does not exists (anymore). Invalidate it! - _httpContext.SetUserThemeChoiceInCookie(null); - if (customer != null) - { - _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.WorkingThemeName, string.Empty, _storeContext.CurrentStore.Id); - } + // the customer chosen theme does not exists (anymore). Invalidate it! + _httpContext.SetUserThemeChoiceInCookie(null); + if (customer != null) + { + _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.WorkingThemeName, string.Empty, _storeContext.CurrentStore.Id); + } } } - + // cache theme this._cachedThemeName = theme; this._themeIsCached = true; @@ -109,96 +109,96 @@ public string WorkingThemeName if (!_themeSettings.AllowCustomerToSelectTheme) return; - if (value.HasValue() && !_themeRegistry.ThemeManifestExists(value)) - return; + if (value.HasValue() && !_themeRegistry.ThemeManifestExists(value)) + return; - _httpContext.SetUserThemeChoiceInCookie(value.NullEmpty()); + _httpContext.SetUserThemeChoiceInCookie(value.NullEmpty()); - if (_workContext.CurrentCustomer != null) - { - _genericAttributeService.SaveAttribute(_workContext.CurrentCustomer, SystemCustomerAttributeNames.WorkingThemeName, value.EmptyNull(), _storeContext.CurrentStore.Id); - } + if (_workContext.CurrentCustomer != null) + { + _genericAttributeService.SaveAttribute(_workContext.CurrentCustomer, SystemCustomerAttributeNames.WorkingThemeName, value.EmptyNull(), _storeContext.CurrentStore.Id); + } // clear cache this._themeIsCached = false; } } - public void SetRequestTheme(string theme) - { - try - { - var dataTokens = _httpContext.Request.RequestContext.RouteData.DataTokens; - if (theme.HasValue()) - { - dataTokens[OverriddenThemeNameKey] = theme; - } - else if (dataTokens.ContainsKey(OverriddenThemeNameKey)) - { - dataTokens.Remove(OverriddenThemeNameKey); - } - - _currentTheme = null; - } - catch { } - } - - public string GetRequestTheme() - { - try - { - return (string)_httpContext.Request?.RequestContext?.RouteData?.DataTokens[OverriddenThemeNameKey]; - } - catch - { - return null; - } - } - - public void SetPreviewTheme(string theme) - { - try - { - _httpContext.SetPreviewModeValue(OverriddenThemeNameKey, theme); - _currentTheme = null; - } - catch { } - } - - public string GetPreviewTheme() - { - try - { - var cookie = _httpContext.GetPreviewModeCookie(false); - if (cookie != null) - { - return cookie.Values[OverriddenThemeNameKey]; - } - - return null; - } - catch - { - return null; - } - } + public void SetRequestTheme(string theme) + { + try + { + var dataTokens = _httpContext.Request.RequestContext.RouteData.DataTokens; + if (theme.HasValue()) + { + dataTokens[OverriddenThemeNameKey] = theme; + } + else if (dataTokens.ContainsKey(OverriddenThemeNameKey)) + { + dataTokens.Remove(OverriddenThemeNameKey); + } + + _currentTheme = null; + } + catch { } + } + + public string GetRequestTheme() + { + try + { + return (string)_httpContext.Request?.RequestContext?.RouteData?.DataTokens[OverriddenThemeNameKey]; + } + catch + { + return null; + } + } + + public void SetPreviewTheme(string theme) + { + try + { + _httpContext.SetPreviewModeValue(OverriddenThemeNameKey, theme); + _currentTheme = null; + } + catch { } + } + + public string GetPreviewTheme() + { + try + { + var cookie = _httpContext.GetPreviewModeCookie(false); + if (cookie != null) + { + return cookie.Values[OverriddenThemeNameKey]; + } + + return null; + } + catch + { + return null; + } + } public ThemeManifest CurrentTheme { get { - if (_currentTheme == null) + if (_currentTheme == null) { - var themeOverride = GetRequestTheme() ?? GetPreviewTheme(); - if (themeOverride != null) - { - // the theme to be used can be overwritten on request/session basis (e.g. for live preview, editing etc.) - _currentTheme = _themeRegistry.GetThemeManifest(themeOverride); - } - else - { - _currentTheme = _themeRegistry.GetThemeManifest(this.WorkingThemeName); - } + var themeOverride = GetRequestTheme() ?? GetPreviewTheme(); + if (themeOverride != null) + { + // the theme to be used can be overwritten on request/session basis (e.g. for live preview, editing etc.) + _currentTheme = _themeRegistry.GetThemeManifest(themeOverride); + } + else + { + _currentTheme = _themeRegistry.GetThemeManifest(this.WorkingThemeName); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs index 074b0e48cb..bb16495453 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs @@ -15,215 +15,206 @@ namespace SmartStore.Web.Framework.Theming { internal static class ThemeHelper { - private static readonly Regex s_inheritableThemeFilePattern; - private static readonly Regex s_themeVarsPattern; - private static readonly Regex s_moduleImportsPattern; - private static readonly Regex s_extensionlessPathPattern; - - public static readonly string ThemesBasePath; - - static ThemeHelper() - { - ThemesBasePath = CommonHelper.GetAppSetting("sm:ThemesBasePath", "~/Themes/").EnsureEndsWith("/"); - - var pattern = @"^{0}(.*)/(.+)(\.)(png|gif|jpg|jpeg|css|scss|js|cshtml|svg|json|liquid)(\?base)*$".FormatInvariant(ThemesBasePath); - s_inheritableThemeFilePattern = new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); - s_themeVarsPattern = new Regex(@"\.(db|app)/[_]?themevars(.scss)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); - s_moduleImportsPattern = new Regex(@"\.app/[_]?moduleimports.scss", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); - s_extensionlessPathPattern = new Regex(@"~/(.+)/([^/.]*)$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); - } - - internal static IEnumerable RemoveVirtualImports(IEnumerable virtualPathDependencies) - { - Guard.NotNull(virtualPathDependencies, nameof(virtualPathDependencies)); - - // determine the virtual themevars scss import reference - var themeVarsFile = virtualPathDependencies.Where(x => ThemeHelper.PathIsThemeVars(x)).FirstOrDefault(); - var moduleImportsFile = virtualPathDependencies.Where(x => ThemeHelper.PathIsModuleImports(x)).FirstOrDefault(); - - if (themeVarsFile == null && moduleImportsFile == null) - { - // no themevars or moduleimports import... so no special considerations here - return virtualPathDependencies; - } - - // exclude the special imports from the file dependencies list, - // 'cause this one cannot be monitored by the physical file system - return virtualPathDependencies - .Except((new string[] { themeVarsFile, moduleImportsFile }) - .Where(x => x.HasValue())) - .ToArray(); - } + private static readonly Regex s_inheritableThemeFilePattern; + private static readonly Regex s_themeVarsPattern; + private static readonly Regex s_moduleImportsPattern; + private static readonly Regex s_extensionlessPathPattern; + + public static readonly string ThemesBasePath; + + static ThemeHelper() + { + ThemesBasePath = CommonHelper.GetAppSetting("sm:ThemesBasePath", "~/Themes/").EnsureEndsWith("/"); + + var pattern = @"^{0}(.*)/(.+)(\.)(png|gif|jpg|jpeg|css|scss|js|cshtml|svg|json|liquid)(\?base)*$".FormatInvariant(ThemesBasePath); + s_inheritableThemeFilePattern = new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); + s_themeVarsPattern = new Regex(@"\.(db|app)/[_]?themevars(.scss)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); + s_moduleImportsPattern = new Regex(@"\.app/[_]?moduleimports.scss", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); + s_extensionlessPathPattern = new Regex(@"~/(.+)/([^/.]*)$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline); + } + + internal static IEnumerable RemoveVirtualImports(IEnumerable virtualPathDependencies) + { + Guard.NotNull(virtualPathDependencies, nameof(virtualPathDependencies)); + + // determine the virtual themevars scss import reference + var themeVarsFile = virtualPathDependencies.Where(x => ThemeHelper.PathIsThemeVars(x)).FirstOrDefault(); + var moduleImportsFile = virtualPathDependencies.Where(x => ThemeHelper.PathIsModuleImports(x)).FirstOrDefault(); + + if (themeVarsFile == null && moduleImportsFile == null) + { + // no themevars or moduleimports import... so no special considerations here + return virtualPathDependencies; + } + + // exclude the special imports from the file dependencies list, + // 'cause this one cannot be monitored by the physical file system + return virtualPathDependencies + .Except((new string[] { themeVarsFile, moduleImportsFile }) + .Where(x => x.HasValue())) + .ToArray(); + } internal static bool PathIsThemeVars(string virtualPath) { - string extension = null; - return PathIsThemeVars(virtualPath, out extension); + string extension = null; + return PathIsThemeVars(virtualPath, out extension); + } + + internal static bool PathIsThemeVars(string virtualPath, out string extension) + { + extension = null; + + if (string.IsNullOrEmpty(virtualPath)) + return false; + + var match = s_themeVarsPattern.Match(virtualPath); + if (match.Success) + { + extension = match.Groups[2].Value; + return true; + } + + return false; + } + + internal static bool PathIsModuleImports(string virtualPath) + { + if (string.IsNullOrEmpty(virtualPath)) + return false; + + return s_moduleImportsPattern.IsMatch(virtualPath); + } + + internal static bool PathIsInheritableThemeFile(string virtualPath) + { + if (string.IsNullOrWhiteSpace(virtualPath)) + return false; + + if (virtualPath[0] != '~') + { + virtualPath = VirtualPathUtility.ToAppRelative(virtualPath); + } + + return s_inheritableThemeFilePattern.IsMatch(virtualPath); + } + + internal static bool IsAdminArea() + { + if (HttpContext.Current != null) + { + return HttpContext.Current.Request.IsAdminArea(); + } + + return false; + } + + internal static bool IsStyleValidationRequest() + { + return HttpContext.Current?.Request?.QueryString["validate"] != null; + } + + internal static StyleSheetResult IsStyleSheet(string path) + { + // Handle virtual Sass imports with '?base' query + // TBD: (mc) other query params could exist + var qindex = path.IndexOf('?'); + if (qindex > -1) + { + var pathWithoutQuery = path.Substring(0, qindex); + var query = path.Substring(pathWithoutQuery.Length); + if (query.StartsWith("?base", StringComparison.OrdinalIgnoreCase)) + { + // Process again, this time without query + var result = IsStyleSheet(pathWithoutQuery); + result.IsBaseImport = true; + return result; + } + } + + var extension = Path.GetExtension(path).ToLowerInvariant(); + + if (extension == ".cshtml") + { + // Perf + return null; + } + else if (extension == ".css") + { + return new StyleSheetResult { Path = path, IsCss = true, Extension = extension }; + } + else if (extension == ".scss" || extension == ".sass") + { + return new StyleSheetResult { Path = path, IsSass = true, Extension = extension }; + } + else if (extension.IsEmpty()) + { + if (path.Contains("/scss/")) + { + // Bootstrap and other libaries may import SASS files without extension + return new StyleSheetResult { Path = path, IsSass = true }; + } + + // StyleBundles are extension-less, so we have to ask 'BundleTable' + // if a style bundle has been registered for the given path. + if (s_extensionlessPathPattern.IsMatch(path)) + { + var bundle = BundleTable.Bundles.GetBundleFor(path); + if (bundle != null && ((bundle is SmartStyleBundle || bundle is StyleBundle))) + { + return new StyleSheetResult { Path = path, IsBundle = true }; + } + } + } + + return null; } - internal static bool PathIsThemeVars(string virtualPath, out string extension) - { - extension = null; - - if (string.IsNullOrEmpty(virtualPath)) - return false; - - var match = s_themeVarsPattern.Match(virtualPath); - if (match.Success) - { - extension = match.Groups[2].Value; - return true; - } - - return false; - } - - internal static bool PathIsModuleImports(string virtualPath) - { - if (string.IsNullOrEmpty(virtualPath)) - return false; - - return s_moduleImportsPattern.IsMatch(virtualPath); - } - - internal static bool PathIsInheritableThemeFile(string virtualPath) - { - if (string.IsNullOrWhiteSpace(virtualPath)) - return false; - - if (virtualPath[0] != '~') - { - virtualPath = VirtualPathUtility.ToAppRelative(virtualPath); - } - - return s_inheritableThemeFilePattern.IsMatch(virtualPath); - } - - internal static bool IsAdminArea() - { - if (HttpContext.Current != null) - { - return HttpContext.Current.Request.IsAdminArea(); - } - - return false; - } - - internal static bool IsStyleValidationRequest() - { - return HttpContext.Current?.Request?.QueryString["validate"] != null; - } - - internal static StyleSheetResult IsStyleSheet(string path) - { - // Handle virtual Sass imports with '?base' query - // TBD: (mc) other query params could exist - var qindex = path.IndexOf('?'); - if (qindex > -1) - { - var pathWithoutQuery = path.Substring(0, qindex); - var query = path.Substring(pathWithoutQuery.Length); - if (query.StartsWith("?base", StringComparison.OrdinalIgnoreCase)) - { - // Process again, this time without query - var result = IsStyleSheet(pathWithoutQuery); - result.IsBaseImport = true; - return result; - } - } - - var extension = Path.GetExtension(path).ToLowerInvariant(); - - if (extension == ".cshtml") - { - // Perf - return null; - } - else if (extension == ".css") - { - return new StyleSheetResult { Path = path, IsCss = true, Extension = extension }; - } - else if (extension == ".scss" || extension == ".sass") - { - return new StyleSheetResult { Path = path, IsSass = true, Extension = extension }; - } - else if (extension.IsEmpty()) - { - if (path.Contains("/scss/")) - { - // Bootstrap and other libaries may import SASS files without extension - return new StyleSheetResult { Path = path, IsSass = true }; - } - - // StyleBundles are extension-less, so we have to ask 'BundleTable' - // if a style bundle has been registered for the given path. - if (s_extensionlessPathPattern.IsMatch(path)) - { - var bundle = BundleTable.Bundles.GetBundleFor(path); - if (bundle != null && ((bundle is SmartStyleBundle || bundle is StyleBundle))) - { - return new StyleSheetResult { Path = path, IsBundle = true }; - } - } - } - - return null; - } - - internal static ThemeManifest ResolveCurrentTheme() - { - return EngineContext.Current.Resolve().CurrentTheme; - } - - internal static int ResolveCurrentStoreId() - { - return EngineContext.Current.Resolve().CurrentStore.Id; - } - - internal static string TokenizePath(string virtualPath, out string themeName, out string relativePath, out string query) - { - themeName = null; - relativePath = null; - query = null; - - var unrooted = virtualPath.Substring(ThemesBasePath.Length); // strip "~/Themes/" - themeName = unrooted.Substring(0, unrooted.IndexOf('/')); - relativePath = unrooted.Substring(themeName.Length + 1); - - var idx = relativePath.IndexOf('?'); - if (idx > 0) - { - query = relativePath.Substring(idx + 1); - relativePath = relativePath.Substring(0, idx); - } - - // strip out query - return "{0}{1}/{2}".FormatCurrent(ThemesBasePath, themeName, relativePath); - } - } - - internal class StyleSheetResult - { - public string Path { get; set; } - public string Extension { get; set; } - public bool IsCss { get; set; } - public bool IsSass { get; set; } - public bool IsBundle { get; set; } - public bool IsBaseImport { get; set; } - - public bool IsPreprocessor - { - get { return IsSass; } - } - - public bool IsThemeVars - { - get { return IsPreprocessor && ThemeHelper.PathIsThemeVars(Path); } - } - - public bool IsModuleImports - { - get { return IsSass && ThemeHelper.PathIsModuleImports(Path); } - } - } + internal static ThemeManifest ResolveCurrentTheme() + { + return EngineContext.Current.Resolve().CurrentTheme; + } + + internal static int ResolveCurrentStoreId() + { + return EngineContext.Current.Resolve().CurrentStore.Id; + } + + internal static string TokenizePath(string virtualPath, out string themeName, out string relativePath, out string query) + { + themeName = null; + relativePath = null; + query = null; + + var unrooted = virtualPath.Substring(ThemesBasePath.Length); // strip "~/Themes/" + themeName = unrooted.Substring(0, unrooted.IndexOf('/')); + relativePath = unrooted.Substring(themeName.Length + 1); + + var idx = relativePath.IndexOf('?'); + if (idx > 0) + { + query = relativePath.Substring(idx + 1); + relativePath = relativePath.Substring(0, idx); + } + + // strip out query + return "{0}{1}/{2}".FormatCurrent(ThemesBasePath, themeName, relativePath); + } + } + + internal class StyleSheetResult + { + public string Path { get; set; } + public string Extension { get; set; } + public bool IsCss { get; set; } + public bool IsSass { get; set; } + public bool IsBundle { get; set; } + public bool IsBaseImport { get; set; } + + public bool IsPreprocessor => IsSass; + + public bool IsThemeVars => IsPreprocessor && ThemeHelper.PathIsThemeVars(Path); + + public bool IsModuleImports => IsSass && ThemeHelper.PathIsModuleImports(Path); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs index f70718141f..2933507b6a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs @@ -1,19 +1,15 @@ -using System; -using System.Collections.Generic; +using System.IO; using System.Linq; -using System.IO; using System.Text; using System.Web.Mvc; using System.Web.Mvc.Html; using SmartStore.Core; using SmartStore.Core.Infrastructure; using SmartStore.Core.Themes; -using SmartStore.Services.Common; -using SmartStore.Utilities; using SmartStore.Services.Localization; namespace SmartStore.Web.Framework.Theming -{ +{ public static class ThemeHtmlExtensions { @@ -30,110 +26,110 @@ public static MvcHtmlString ThemeVarLabel(this HtmlHelper html, ThemeVariableInf var displayName = locService.GetResource(resKey, langId, false, "", true); - if (displayName.HasValue() && hint.IsEmpty()) - { - hint = locService.GetResource(resKey + ".Hint", langId, false, "", true); - hint = "${0}{1}".FormatInvariant(info.Name, hint.HasValue() ? "\n" + hint : ""); - } + if (displayName.HasValue() && hint.IsEmpty()) + { + hint = locService.GetResource(resKey + ".Hint", langId, false, "", true); + hint = "${0}{1}".FormatInvariant(info.Name, hint.HasValue() ? "\n" + hint : ""); + } result.Append("
"); result.Append(html.Label(html.NameForThemeVar(info), displayName.NullEmpty() ?? "$" + info.Name, new { @class = "x-col-form-label" })); - if (hint.HasValue()) - { - result.Append(html.Hint(hint).ToHtmlString()); - } + if (hint.HasValue()) + { + result.Append(html.Hint(hint).ToHtmlString()); + } result.Append("
"); return MvcHtmlString.Create(result.ToString()); } - + public static MvcHtmlString ThemeVarEditor(this HtmlHelper html, ThemeVariableInfo info, object value) { Guard.NotNull(info, "info"); string expression = html.NameForThemeVar(info); - var strValue = string.Empty; + var strValue = string.Empty; - var arrValue = value as string[]; - if (arrValue != null) - { - strValue = arrValue.Length > 0 ? arrValue[0] : value.ToString(); - } - else - { - strValue = value.ToString(); - } + var arrValue = value as string[]; + if (arrValue != null) + { + strValue = arrValue.Length > 0 ? arrValue[0] : value.ToString(); + } + else + { + strValue = value.ToString(); + } - var isDefault = strValue.IsCaseInsensitiveEqual(info.DefaultValue); - var isValidColor = info.Type == ThemeVariableType.Color - && ((strValue.HasValue() && ThemeVarsRepository.IsValidColor(strValue)) || (strValue.IsEmpty() && ThemeVarsRepository.IsValidColor(info.DefaultValue))); + var isDefault = strValue.IsCaseInsensitiveEqual(info.DefaultValue); + var isValidColor = info.Type == ThemeVariableType.Color + && ((strValue.HasValue() && ThemeVarsRepository.IsValidColor(strValue)) || (strValue.IsEmpty() && ThemeVarsRepository.IsValidColor(info.DefaultValue))); - MvcHtmlString control; + MvcHtmlString control; if (isValidColor) { - control = html.ColorBox(expression, strValue, info.DefaultValue); + control = html.ColorBox(expression, strValue, info.DefaultValue); } else if (info.Type == ThemeVariableType.Boolean) { - var locService = EngineContext.Current.Resolve(); - control = html.CheckBox(expression, strValue.ToBool()); - var custom = "".FormatInvariant( - control.ToString(), - locService.GetResource("Common.On").Truncate(3), - locService.GetResource("Common.Off").Truncate(3)); - - control = MvcHtmlString.Create(custom); + var locService = EngineContext.Current.Resolve(); + control = html.CheckBox(expression, strValue.ToBool()); + var custom = "".FormatInvariant( + control.ToString(), + locService.GetResource("Common.On").Truncate(3), + locService.GetResource("Common.Off").Truncate(3)); + + control = MvcHtmlString.Create(custom); + } + else if (info.Type == ThemeVariableType.Select) + { + control = ThemeVarSelectEditor(html, info, expression, strValue); + } + else + { + control = html.TextBox(expression, isDefault ? "" : strValue, new { placeholder = info.DefaultValue, @class = "form-control" }); } - else if (info.Type == ThemeVariableType.Select) - { - control = ThemeVarSelectEditor(html, info, expression, strValue); - } - else - { - control = html.TextBox(expression, isDefault ? "" : strValue, new { placeholder = info.DefaultValue, @class = "form-control" }); - } - return control; - } + return control; + } - public static MvcHtmlString ThemeVarChainInfo(this HtmlHelper html, ThemeVariableInfo info) - { - Guard.NotNull(info, "info"); + public static MvcHtmlString ThemeVarChainInfo(this HtmlHelper html, ThemeVariableInfo info) + { + Guard.NotNull(info, "info"); - var currentTheme = ThemeHelper.ResolveCurrentTheme(); + var currentTheme = ThemeHelper.ResolveCurrentTheme(); - if (currentTheme != info.Manifest) - { - // the variable is inherited from a base theme: display an info badge - var chainInfo = "{0}".FormatCurrent(info.Manifest.ThemeName); - return MvcHtmlString.Create(chainInfo); - } + if (currentTheme != info.Manifest) + { + // the variable is inherited from a base theme: display an info badge + var chainInfo = "{0}".FormatCurrent(info.Manifest.ThemeName); + return MvcHtmlString.Create(chainInfo); + } - return MvcHtmlString.Empty; - } + return MvcHtmlString.Empty; + } - private static MvcHtmlString ThemeVarSelectEditor(HtmlHelper html, ThemeVariableInfo info, string expression, string value) + private static MvcHtmlString ThemeVarSelectEditor(HtmlHelper html, ThemeVariableInfo info, string expression, string value) { - var manifest = info.Manifest; + var manifest = info.Manifest; if (!manifest.Selects.ContainsKey(info.SelectRef)) { throw new SmartException("A select list with id '{0}' was not specified. Please specify a 'Select' element with at least one 'Option' child.", info.SelectRef); } - //var isDefault = value.IsCaseInsensitiveEqual(info.DefaultValue); + //var isDefault = value.IsCaseInsensitiveEqual(info.DefaultValue); var selectList = from x in manifest.Selects[info.SelectRef] - select new SelectListItem - { - Value = x, + select new SelectListItem + { + Value = x, Text = x, // TODO: (mc) Localize - Selected = x.IsCaseInsensitiveEqual(value) + Selected = x.IsCaseInsensitiveEqual(value) }; - return html.DropDownList(expression, selectList, new { placeholder = info.DefaultValue, @class = "form-control" }); + return html.DropDownList(expression, selectList, new { placeholder = info.DefaultValue, @class = "form-control" }); } public static string NameForThemeVar(this HtmlHelper html, ThemeVariableInfo info) @@ -166,9 +162,9 @@ public static string ThemeAwareContent(this UrlHelper url, string path) public static string ThemeAwareContent(this UrlHelper url, ThemeManifest manifest, string path) { path = EnsurePath(path); - + string fullPath = Path.Combine(manifest.Path, path); - if (File.Exists(fullPath)) + if (File.Exists(fullPath)) { return url.Content(manifest.Location + "/" + Path.Combine(manifest.ThemeName, path)); } @@ -178,7 +174,7 @@ public static string ThemeAwareContent(this UrlHelper url, ThemeManifest manifes { return url.Content("~/" + path); } - + return string.Empty; } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs index 29cc34de82..255a417b68 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs @@ -3,24 +3,23 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; +using System.Web; using SmartStore.Core.Infrastructure; using SmartStore.Services.Themes; -using System.Web; -using System.IO; namespace SmartStore.Web.Framework.Theming -{ +{ internal class ThemeVarsRepository { private static readonly Regex s_keyWhitelist = new Regex(@"^[a-zA-Z0-9_-]+$", RegexOptions.Compiled); - private static readonly Regex s_valueBlacklist = new Regex(@"[:;]+", RegexOptions.Compiled); - private static readonly Regex s_valueSassVars = new Regex(@"[$][a-zA-Z0-9_-]+", RegexOptions.Compiled); - private static readonly Regex s_valueLessVars = new Regex(@"[@][a-zA-Z0-9_-]+", RegexOptions.Compiled); - //private static readonly Regex s_valueWhitelist = new Regex(@"^[#@]?[a-zA-Z0-9""' _\.,-]*$"); + private static readonly Regex s_valueBlacklist = new Regex(@"[:;]+", RegexOptions.Compiled); + private static readonly Regex s_valueSassVars = new Regex(@"[$][a-zA-Z0-9_-]+", RegexOptions.Compiled); + private static readonly Regex s_valueLessVars = new Regex(@"[@][a-zA-Z0-9_-]+", RegexOptions.Compiled); + //private static readonly Regex s_valueWhitelist = new Regex(@"^[#@]?[a-zA-Z0-9""' _\.,-]*$"); - const string SassVarPrefix = "$"; + const string SassVarPrefix = "$"; - public string GetPreprocessorCss(string extension, string themeName, int storeId) + public string GetPreprocessorCss(string extension, string themeName, int storeId) { Guard.NotEmpty(themeName, nameof(themeName)); Guard.IsPositive(storeId, nameof(storeId)); @@ -35,7 +34,7 @@ private IDictionary GetVariables(string themeName, int storeId) { var result = new Dictionary(); - var rawVars = this.GetRawVariables(themeName, storeId); + var rawVars = this.GetRawVariables(themeName, storeId); foreach (var v in rawVars) { @@ -46,13 +45,13 @@ private IDictionary GetVariables(string themeName, int storeId) string value = v.Value.ToString(); - if (s_valueBlacklist.IsMatch(value)) - continue; + if (s_valueBlacklist.IsMatch(value)) + continue; - //if (!s_valueWhitelist.IsMatch(value)) - // continue; + //if (!s_valueWhitelist.IsMatch(value)) + // continue; - result.Add(key, value); + result.Add(key, value); } return result; @@ -60,75 +59,75 @@ private IDictionary GetVariables(string themeName, int storeId) internal virtual ExpandoObject GetRawVariables(string themeName, int storeId) { - // we need the Asp.Net cache here in order to define cacheKey dependencies - bool validationMode = ThemeHelper.IsStyleValidationRequest(); - - if (validationMode) - { - // Return uncached fresh data (the variables is not nuked yet) - return GetRawVariablesCore(themeName, storeId); - } - else - { - string cacheKey = FrameworkCacheConsumer.BuildThemeVarsCacheKey(themeName, storeId); - return HttpRuntime.Cache.GetOrAdd(cacheKey, () => - { - return GetRawVariablesCore(themeName, storeId); - }); - } + // we need the Asp.Net cache here in order to define cacheKey dependencies + bool validationMode = ThemeHelper.IsStyleValidationRequest(); + + if (validationMode) + { + // Return uncached fresh data (the variables is not nuked yet) + return GetRawVariablesCore(themeName, storeId); + } + else + { + string cacheKey = FrameworkCacheConsumer.BuildThemeVarsCacheKey(themeName, storeId); + return HttpRuntime.Cache.GetOrAdd(cacheKey, () => + { + return GetRawVariablesCore(themeName, storeId); + }); + } + } + + private ExpandoObject GetRawVariablesCore(string themeName, int storeId) + { + var themeVarService = EngineContext.Current.Resolve(); + return themeVarService.GetThemeVariables(themeName, storeId) ?? new ExpandoObject(); + } + + private string Transform(IDictionary parameters) + { + if (parameters.Count == 0) + return string.Empty; + + var prefix = SassVarPrefix; + + var sb = new StringBuilder(); + foreach (var parameter in parameters.Where(kvp => kvp.Value.HasValue())) + { + sb.AppendFormat("{0}{1}: {2};\n", prefix, parameter.Key, parameter.Value); + } + + return sb.ToString(); } - private ExpandoObject GetRawVariablesCore(string themeName, int storeId) - { - var themeVarService = EngineContext.Current.Resolve(); - return themeVarService.GetThemeVariables(themeName, storeId) ?? new ExpandoObject(); - } - - private string Transform(IDictionary parameters) - { - if (parameters.Count == 0) - return string.Empty; - - var prefix = SassVarPrefix; - - var sb = new StringBuilder(); - foreach (var parameter in parameters.Where(kvp => kvp.Value.HasValue())) - { - sb.AppendFormat("{0}{1}: {2};\n", prefix, parameter.Key, parameter.Value); - } - - return sb.ToString(); - } - - /// - /// Checks whether the passed SASS value is a valid, displayable HTML color, - /// e.g.: "lighten($red, 20%)" would return false. - /// - /// The SASS value to test - /// - /// We need this helper during theme configuration: we just can't render - /// color pickers for color values containing var references or SASS functions. - /// - internal static bool IsValidColor(string value) - { - if (value.IsEmpty()) - { - return true; - } - - if (s_valueSassVars.IsMatch(value)) - { - return false; - } - - if (value[0] == '#' || value.StartsWith("rgb(") || value.StartsWith("rgba(") || value.StartsWith("hsl(") || value.StartsWith("hsla(")) - { - return true; - } - - // Let pass all color names (red, blue etc.), but reject functions, e.g. "lighten(#fff, 10%)" - return !value.Contains("("); - } - } + /// + /// Checks whether the passed SASS value is a valid, displayable HTML color, + /// e.g.: "lighten($red, 20%)" would return false. + /// + /// The SASS value to test + /// + /// We need this helper during theme configuration: we just can't render + /// color pickers for color values containing var references or SASS functions. + /// + internal static bool IsValidColor(string value) + { + if (value.IsEmpty()) + { + return true; + } + + if (s_valueSassVars.IsMatch(value)) + { + return false; + } + + if (value[0] == '#' || value.StartsWith("rgb(") || value.StartsWith("rgba(") || value.StartsWith("hsl(") || value.StartsWith("hsla(")) + { + return true; + } + + // Let pass all color names (red, blue etc.), but reject functions, e.g. "lighten(#fff, 10%)" + return !value.Contains("("); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsVirtualFile.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsVirtualFile.cs index b4bd7ab49b..9ac6d1fe4c 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsVirtualFile.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsVirtualFile.cs @@ -12,24 +12,21 @@ public ThemeVarsVirtualFile(string virtualPath, string themeName, int storeId) { } - internal ThemeVarsVirtualFile(string virtualPath, string extension, string themeName, int storeId) - : base(virtualPath) - { - Extension = extension; - ThemeName = themeName; - StoreId = storeId; - } - - public override bool IsDirectory + internal ThemeVarsVirtualFile(string virtualPath, string extension, string themeName, int storeId) + : base(virtualPath) { - get { return false; } + Extension = extension; + ThemeName = themeName; + StoreId = storeId; } - public string Extension { get; private set; } - public string ThemeName { get; private set; } - public int StoreId { get; private set; } + public override bool IsDirectory => false; - public override Stream Open() + public string Extension { get; private set; } + public string ThemeName { get; private set; } + public int StoreId { get; private set; } + + public override Stream Open() { var repo = new ThemeVarsRepository(); @@ -43,19 +40,19 @@ public override Stream Open() private Stream GenerateStreamFromString(string value) { var stream = new MemoryStream(); - - using (var writer = new StreamWriter(stream, Encoding.Unicode, 1024, true)) - { - writer.Write(value); - writer.Flush(); - stream.Seek(0, SeekOrigin.Begin); - return stream; - } + + using (var writer = new StreamWriter(stream, Encoding.Unicode, 1024, true)) + { + writer.Write(value); + writer.Flush(); + stream.Seek(0, SeekOrigin.Begin); + return stream; + } } - public void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys) - { - cacheKeys.Add(FrameworkCacheConsumer.BuildThemeVarsCacheKey(ThemeName, StoreId)); - } - } + public void AddFileDependencies(ICollection mappedPaths, ICollection cacheKeys) + { + cacheKeys.Add(FrameworkCacheConsumer.BuildThemeVarsCacheKey(ThemeName, StoreId)); + } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableRazorViewEngine.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableRazorViewEngine.cs index de832a6cd2..bc0fd04532 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableRazorViewEngine.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableRazorViewEngine.cs @@ -5,52 +5,52 @@ namespace SmartStore.Web.Framework.Theming { - public class ThemeableRazorViewEngine : ThemeableVirtualPathProviderViewEngine - { - [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] - public ThemeableRazorViewEngine() - { - var areaBasePathsSetting = CommonHelper.GetAppSetting("sm:AreaBasePaths", "~/Plugins/"); - var areaBasePaths = areaBasePathsSetting.Split(',').Select(x => x.Trim().EnsureEndsWith("/")).ToArray(); - - // 0: view, 1: controller, 2: area - var areaFormats = new[] - { - "{2}/Views/{1}/{0}", - "{2}/Views/Shared/{0}" - }; - var areaLocationFormats = areaBasePaths.SelectMany(x => areaFormats.Select(f => x + f)); - - AreaViewLocationFormats = ExpandLocationFormats(areaLocationFormats, ViewType.Layout).ToArray(); - AreaMasterLocationFormats = ExpandLocationFormats(areaLocationFormats, ViewType.Layout).ToArray(); - AreaPartialViewLocationFormats = ExpandLocationFormats(areaLocationFormats, ViewType.Partial).ToArray(); - - // 0: view, 1: controller, 2: theme - var locationFormats = new[] + public class ThemeableRazorViewEngine : ThemeableVirtualPathProviderViewEngine + { + [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")] + public ThemeableRazorViewEngine() + { + var areaBasePathsSetting = CommonHelper.GetAppSetting("sm:AreaBasePaths", "~/Plugins/"); + var areaBasePaths = areaBasePathsSetting.Split(',').Select(x => x.Trim().EnsureEndsWith("/")).ToArray(); + + // 0: view, 1: controller, 2: area + var areaFormats = new[] { - "~/Themes/{2}/Views/{1}/{0}", - "~/Views/{1}/{0}", - "~/Themes/{2}/Views/Shared/{0}", - "~/Views/Shared/{0}" - }; + "{2}/Views/{1}/{0}", + "{2}/Views/Shared/{0}" + }; + var areaLocationFormats = areaBasePaths.SelectMany(x => areaFormats.Select(f => x + f)); + + AreaViewLocationFormats = ExpandLocationFormats(areaLocationFormats, ViewType.Layout).ToArray(); + AreaMasterLocationFormats = ExpandLocationFormats(areaLocationFormats, ViewType.Layout).ToArray(); + AreaPartialViewLocationFormats = ExpandLocationFormats(areaLocationFormats, ViewType.Partial).ToArray(); + + // 0: view, 1: controller, 2: theme + var locationFormats = new[] + { + "~/Themes/{2}/Views/{1}/{0}", + "~/Views/{1}/{0}", + "~/Themes/{2}/Views/Shared/{0}", + "~/Views/Shared/{0}" + }; ViewLocationFormats = ExpandLocationFormats(locationFormats, ViewType.Layout).ToArray(); MasterLocationFormats = ExpandLocationFormats(locationFormats, ViewType.Layout).ToArray(); - PartialViewLocationFormats = ExpandLocationFormats(locationFormats, ViewType.Partial).ToArray(); - - FileExtensions = EnableVbViews - ? new[] { "cshtml", "vbhtml" } - : new[] { "cshtml" }; - } - - protected override IView CreatePartialView(ControllerContext controllerContext, string partialPath) - { - return new RazorView(controllerContext, partialPath, null, false, base.FileExtensions, base.ViewPageActivator); - } - - protected override IView CreateView(ControllerContext controllerContext, string viewPath, string masterPath) - { - return new RazorView(controllerContext, viewPath, masterPath, true, base.FileExtensions, base.ViewPageActivator); - } - } + PartialViewLocationFormats = ExpandLocationFormats(locationFormats, ViewType.Partial).ToArray(); + + FileExtensions = EnableVbViews + ? new[] { "cshtml", "vbhtml" } + : new[] { "cshtml" }; + } + + protected override IView CreatePartialView(ControllerContext controllerContext, string partialPath) + { + return new RazorView(controllerContext, partialPath, null, false, base.FileExtensions, base.ViewPageActivator); + } + + protected override IView CreateView(ControllerContext controllerContext, string viewPath, string masterPath) + { + return new RazorView(controllerContext, viewPath, masterPath, true, base.FileExtensions, base.ViewPageActivator); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs index d7b0e936d2..7bfa8c1161 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs @@ -13,487 +13,481 @@ namespace SmartStore.Web.Framework.Theming { - public abstract class ThemeableVirtualPathProviderViewEngine : BuildManagerViewEngine - { - internal Func GetExtensionThunk = VirtualPathUtility.GetExtension; + public abstract class ThemeableVirtualPathProviderViewEngine : BuildManagerViewEngine + { + internal Func GetExtensionThunk = VirtualPathUtility.GetExtension; - private static readonly string[] _emptyLocations = new string[0]; + private static readonly string[] _emptyLocations = new string[0]; - private static bool? _enableLocalizedViews; + private static bool? _enableLocalizedViews; private static bool? _enableVbViews; private readonly string _cacheKeyType = typeof(ThemeableRazorViewEngine).Name; - private readonly string _cacheKeyEntry = ":ViewCacheEntry:{0}:{1}:{2}:{3}:{4}:{5}"; - - protected ThemeableVirtualPathProviderViewEngine() - { - this.ViewLocationCache = new TwoLevelViewLocationCache(); - - // prepare localized mobile & desktop display modes - DisplayModeProvider.Modes.Clear(); - var mobileDisplayMode = new LocalizedDisplayMode(DisplayModeProvider.MobileDisplayModeId, EnableLocalizedViews) - { - ContextCondition = IsMobileDevice - }; - var desktopDisplayMode = new LocalizedDisplayMode(DisplayModeProvider.DefaultDisplayModeId, EnableLocalizedViews); - - DisplayModeProvider.Modes.Add(mobileDisplayMode); - DisplayModeProvider.Modes.Add(desktopDisplayMode); - } - - public static bool EnableLocalizedViews - { - get - { - if (!_enableLocalizedViews.HasValue) - { - _enableLocalizedViews = CommonHelper.GetAppSetting("sm:EnableLocalizedViews", false); - } - - return _enableLocalizedViews.Value; - } - set - { - _enableLocalizedViews = value; - } - } - - public static bool EnableVbViews - { - get - { - if (!_enableVbViews.HasValue) - { - _enableVbViews = CommonHelper.GetAppSetting("sm:EnableVbViews", false); - } - - return _enableVbViews.Value; - } - set - { - _enableVbViews = value; - } - } - - public override ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache) - { - Guard.NotNull(controllerContext, nameof(controllerContext)); - Guard.NotEmpty(viewName, nameof(viewName)); - - var chronometer = EngineContext.Current.Resolve(); - using (chronometer.Step("Find view '{0}'".FormatInvariant(viewName))) - { - var themeName = GetCurrentThemeName(controllerContext); - var controllerName = controllerContext.RouteData.GetRequiredString("controller"); - var areaName = controllerContext.RouteData.GetAreaName(); - - var viewPath = ResolveViewPath( - controllerContext, - areaName, - ViewLocationFormats, - AreaViewLocationFormats, - "ViewLocationFormats", - viewName, - controllerName, - themeName, - "View", - useCache, - out var viewLocationsSearched); - var masterPath = ResolveViewPath( - controllerContext, - areaName, - MasterLocationFormats, - AreaMasterLocationFormats, - "MasterLocationFormats", - masterName, - controllerName, - themeName, - "Master", - useCache, - out var masterLocationsSearched); - - if (!string.IsNullOrEmpty(viewPath) && (!string.IsNullOrEmpty(masterPath) || string.IsNullOrEmpty(masterName))) - { - return new ViewEngineResult(CreateView(controllerContext, viewPath, masterPath), this); - } - - return new ViewEngineResult(viewLocationsSearched.Union(masterLocationsSearched)); - } - } - - public override ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache) - { - Guard.NotNull(controllerContext, nameof(controllerContext)); - Guard.NotEmpty(partialViewName, nameof(partialViewName)); - - var chronometer = EngineContext.Current.Resolve(); - using (chronometer.Step("Find partial view '{0}'".FormatInvariant(partialViewName))) - { - string[] searchedLocations; - - var themeName = GetCurrentThemeName(controllerContext); - var controllerName = controllerContext.RouteData.GetRequiredString("controller"); - var areaName = controllerContext.RouteData.GetAreaName(); - - string partialPath = ResolveViewPath( - controllerContext, - areaName, - PartialViewLocationFormats, - AreaPartialViewLocationFormats, - "PartialViewLocationFormats", - partialViewName, - controllerName, - themeName, - "Partial", - useCache, - out searchedLocations); - - if (string.IsNullOrEmpty(partialPath)) - { - return new ViewEngineResult(searchedLocations); - } - - return new ViewEngineResult(CreatePartialView(controllerContext, partialPath), this); - } - } + private readonly string _cacheKeyEntry = ":ViewCacheEntry:{0}:{1}:{2}:{3}:{4}:{5}"; + + protected ThemeableVirtualPathProviderViewEngine() + { + this.ViewLocationCache = new TwoLevelViewLocationCache(); + + // prepare localized mobile & desktop display modes + DisplayModeProvider.Modes.Clear(); + var mobileDisplayMode = new LocalizedDisplayMode(DisplayModeProvider.MobileDisplayModeId, EnableLocalizedViews) + { + ContextCondition = IsMobileDevice + }; + var desktopDisplayMode = new LocalizedDisplayMode(DisplayModeProvider.DefaultDisplayModeId, EnableLocalizedViews); + + DisplayModeProvider.Modes.Add(mobileDisplayMode); + DisplayModeProvider.Modes.Add(desktopDisplayMode); + } + + public static bool EnableLocalizedViews + { + get + { + if (!_enableLocalizedViews.HasValue) + { + _enableLocalizedViews = CommonHelper.GetAppSetting("sm:EnableLocalizedViews", false); + } + + return _enableLocalizedViews.Value; + } + set => _enableLocalizedViews = value; + } + + public static bool EnableVbViews + { + get + { + if (!_enableVbViews.HasValue) + { + _enableVbViews = CommonHelper.GetAppSetting("sm:EnableVbViews", false); + } + + return _enableVbViews.Value; + } + set => _enableVbViews = value; + } + + public override ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache) + { + Guard.NotNull(controllerContext, nameof(controllerContext)); + Guard.NotEmpty(viewName, nameof(viewName)); + + var chronometer = EngineContext.Current.Resolve(); + using (chronometer.Step("Find view '{0}'".FormatInvariant(viewName))) + { + var themeName = GetCurrentThemeName(controllerContext); + var controllerName = controllerContext.RouteData.GetRequiredString("controller"); + var areaName = controllerContext.RouteData.GetAreaName(); + + var viewPath = ResolveViewPath( + controllerContext, + areaName, + ViewLocationFormats, + AreaViewLocationFormats, + "ViewLocationFormats", + viewName, + controllerName, + themeName, + "View", + useCache, + out var viewLocationsSearched); + var masterPath = ResolveViewPath( + controllerContext, + areaName, + MasterLocationFormats, + AreaMasterLocationFormats, + "MasterLocationFormats", + masterName, + controllerName, + themeName, + "Master", + useCache, + out var masterLocationsSearched); + + if (!string.IsNullOrEmpty(viewPath) && (!string.IsNullOrEmpty(masterPath) || string.IsNullOrEmpty(masterName))) + { + return new ViewEngineResult(CreateView(controllerContext, viewPath, masterPath), this); + } + + return new ViewEngineResult(viewLocationsSearched.Union(masterLocationsSearched)); + } + } + + public override ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache) + { + Guard.NotNull(controllerContext, nameof(controllerContext)); + Guard.NotEmpty(partialViewName, nameof(partialViewName)); + + var chronometer = EngineContext.Current.Resolve(); + using (chronometer.Step("Find partial view '{0}'".FormatInvariant(partialViewName))) + { + string[] searchedLocations; + + var themeName = GetCurrentThemeName(controllerContext); + var controllerName = controllerContext.RouteData.GetRequiredString("controller"); + var areaName = controllerContext.RouteData.GetAreaName(); + + string partialPath = ResolveViewPath( + controllerContext, + areaName, + PartialViewLocationFormats, + AreaPartialViewLocationFormats, + "PartialViewLocationFormats", + partialViewName, + controllerName, + themeName, + "Partial", + useCache, + out searchedLocations); + + if (string.IsNullOrEmpty(partialPath)) + { + return new ViewEngineResult(searchedLocations); + } + + return new ViewEngineResult(CreatePartialView(controllerContext, partialPath), this); + } + } protected virtual string ResolveViewPath( - ControllerContext controllerContext, - string areaName, - string[] locations, - string[] areaLocations, - string locationsPropertyName, - string name, - string controllerName, - string theme, - string cacheKeyPrefix, - bool useCache, - out string[] searchedLocations) - { - searchedLocations = _emptyLocations; - - if (String.IsNullOrEmpty(name)) - { - return String.Empty; - } - - bool usingAreas = !String.IsNullOrEmpty(areaName); - - if (usingAreas) - { - var isAdminArea = areaName.IsCaseInsensitiveEqual("admin"); - - // "ExtraAreaViewLocations" gets injected by AdminThemedAttribute - var extraAreaViewLocations = controllerContext.RouteData.DataTokens["ExtraAreaViewLocations"] as string[]; - - if (isAdminArea && extraAreaViewLocations == null && controllerContext.HttpContext.Request.IsAjaxRequest()) - { - // In admin area AJAX requests DataTokens["ExtraAreaViewLocations"] is not set. - extraAreaViewLocations = AdminThemedAttribute.ExtraAreaViewLocations; - } - - if (extraAreaViewLocations != null && extraAreaViewLocations.Length > 0) - { - var newLocations = areaLocations.ToList(); - var viewType = cacheKeyPrefix == "Partial" - ? ViewType.Partial - : ViewType.Layout; - - if (isAdminArea) - { - // the admin area cannot fallback to itself. Prepend to list. - ExpandLocationFormats(extraAreaViewLocations, viewType).Reverse().Each(x => newLocations.Insert(0, x)); - } - else - { - newLocations.AddRange(ExpandLocationFormats(extraAreaViewLocations, viewType)); - } - - areaLocations = newLocations.ToArray(); - } - } - - var viewLocations = GetViewLocations(locations, (usingAreas) ? areaLocations : null); - - if (viewLocations.Count == 0) - { - throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Properties cannot be null or empty.", new object[] { locationsPropertyName })); - } - - bool nameRepresentsPath = IsSpecificPath(name); - string cacheKey = CreateCacheKey(cacheKeyPrefix, name, (nameRepresentsPath) ? String.Empty : controllerName, areaName, theme); - - if (useCache) - { - // Only look at cached display modes that can handle the context. - var possibleDisplayModes = DisplayModeProvider.GetAvailableDisplayModesForContext(controllerContext.HttpContext, controllerContext.DisplayMode); - foreach (var displayMode in possibleDisplayModes) - { - string cachedLocation = ViewLocationCache.GetViewLocation(controllerContext.HttpContext, AppendDisplayModeToCacheKey(cacheKey, displayMode.DisplayModeId)); - - if (cachedLocation == null) - { - // If any matching display mode location is not in the cache, fall back to the uncached behavior, which will repopulate all of our caches. - return null; - } - - // A non-empty cachedLocation indicates that we have a matching file on disk. Return that result. - if (cachedLocation.Length > 0) - { - if (controllerContext.DisplayMode == null) - { - controllerContext.DisplayMode = displayMode; - } - - return cachedLocation; - } - // An empty cachedLocation value indicates that we don't have a matching file on disk. Keep going down the list of possible display modes. - } - - // ResolveViewPath is called again without using the cache. - return null; - } - else - { - return nameRepresentsPath - ? GetPathFromSpecificName(controllerContext, name, cacheKey, ref searchedLocations) - : GetPathFromGeneralName(controllerContext, viewLocations, name, controllerName, areaName, theme, cacheKey, ref searchedLocations); - } - } - - protected virtual string GetPathFromSpecificName(ControllerContext controllerContext, string name, string cacheKey, ref string[] searchedLocations) - { - string result = name; - - if (!(FilePathIsSupported(name) && FileExists(controllerContext, name))) - { - result = String.Empty; - searchedLocations = new[] { name }; - } - - ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, cacheKey, result); - return result; - } - - protected virtual string GetPathFromGeneralName( - ControllerContext controllerContext, - List locations, - string name, - string controllerName, - string areaName, - string theme, - string cacheKey, - ref string[] searchedLocations) - { - string result = String.Empty; - searchedLocations = new string[locations.Count]; - - for (int i = 0; i < locations.Count; i++) - { - ViewLocation location = locations[i]; - string virtualPath = location.Format(name, controllerName, areaName, theme); - DisplayInfo virtualPathDisplayInfo = DisplayModeProvider.GetDisplayInfoForVirtualPath(virtualPath, controllerContext.HttpContext, path => FileExists(controllerContext, path), controllerContext.DisplayMode); - - if (virtualPathDisplayInfo != null) - { - string resolvedVirtualPath = virtualPathDisplayInfo.FilePath; - - searchedLocations = _emptyLocations; - result = resolvedVirtualPath; - ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, AppendDisplayModeToCacheKey(cacheKey, GetDisplayModeId(virtualPathDisplayInfo)), result); - - if (controllerContext.DisplayMode == null) - { - controllerContext.DisplayMode = virtualPathDisplayInfo.DisplayMode; - } - - // Populate the cache for all other display modes. We want to cache both file system hits and misses so that we can distinguish - // in future requests whether a file's status was evicted from the cache (null value) or if the file doesn't exist (empty string). - IEnumerable allDisplayModes = DisplayModeProvider.Modes; - foreach (IDisplayMode displayMode in allDisplayModes) - { - if (displayMode.DisplayModeId != virtualPathDisplayInfo.DisplayMode.DisplayModeId) - { - DisplayInfo displayInfoToCache = displayMode.GetDisplayInfo(controllerContext.HttpContext, virtualPath, virtualPathExists: path => FileExists(controllerContext, path)); - - string displayModeId = String.Empty; - string cacheValue = String.Empty; - if (displayInfoToCache != null && displayInfoToCache.FilePath != null) - { - cacheValue = displayInfoToCache.FilePath; - displayModeId = GetDisplayModeId(displayInfoToCache); - } - else - { - displayModeId = displayMode.DisplayModeId; - } - - ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, AppendDisplayModeToCacheKey(cacheKey, displayModeId), cacheValue); - } - } - break; - } - - searchedLocations[i] = virtualPath; - } - - return result; - } - - protected virtual bool FilePathIsSupported(string virtualPath) - { - if (this.FileExtensions == null) - { - // legacy behavior for custom ViewEngine that might not set the FileExtensions property - return true; - } - - // get rid of the '.' because the FileExtensions property expects extensions withouth a dot. - string extension = GetExtensionThunk(virtualPath).TrimStart('.'); - return FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase); - } - - private string GetDisplayModeId(DisplayInfo displayInfo) - { - var localizedDisplayInfo = displayInfo as LocalizedDisplayInfo; - - return localizedDisplayInfo != null - ? localizedDisplayInfo.DisplayModeId - : displayInfo.DisplayMode.DisplayModeId; - } - - protected virtual string CreateCacheKey(string prefix, string name, string controllerName, string areaName, string theme/*, string lang*/) - { - return string.Format(_cacheKeyEntry, - _cacheKeyType, - prefix, - name, - controllerName, - areaName, - theme); - } - - internal static string AppendDisplayModeToCacheKey(string cacheKey, string displayMode) - { - // key format is ":ViewCacheEntry:{cacheType}:{prefix}:{name}:{controllerName}:{areaName}:{theme}" - // so append ":{displayMode}" to the key - return string.IsNullOrWhiteSpace(displayMode) - ? cacheKey - : cacheKey + ":" + displayMode; - } - - protected virtual IEnumerable ExpandLocationFormats(IEnumerable formats, ViewType viewType) - { - // Appends razor view file extensions to location formats - Guard.NotNull(formats, nameof(formats)); - - var subfolder = viewType == ViewType.Layout ? "Layouts" : "Partials"; - - foreach (var format in formats) - { - if (viewType > ViewType.View) - { - yield return format.Replace("{0}", subfolder + "/{0}.cshtml"); - - if (EnableVbViews) - { - yield return format.Replace("{0}", subfolder + "/{0}.vbhtml"); - } - } - - yield return format + ".cshtml"; - - if (EnableVbViews) - { - yield return format + ".vbhtml"; - } - } - } - - protected virtual List GetViewLocations(string[] viewLocationFormats, string[] areaViewLocationFormats) - { - List locations = new List( - (viewLocationFormats?.Length ?? 0) + - (areaViewLocationFormats?.Length ?? 0)); - - if (areaViewLocationFormats != null) - { - foreach (string areaViewLocationFormat in areaViewLocationFormats) - { - locations.Add(new AreaAwareViewLocation(areaViewLocationFormat)); - } - } - - if (viewLocationFormats != null) - { - foreach (string viewLocationFormat in viewLocationFormats) - { - locations.Add(new ViewLocation(viewLocationFormat)); - } - } - - return locations; - } - - protected virtual bool IsSpecificPath(string name) - { - char c = name[0]; - return (c == '~' || c == '/'); - } - - protected virtual bool IsMobileDevice(HttpContextBase httpContext) - { - var mobileDeviceHelper = EngineContext.Current.Resolve(); - var result = mobileDeviceHelper.IsMobileDevice(); - return result; - } - - protected virtual string GetCurrentThemeName(ControllerContext controllerContext) - { - var theme = EngineContext.Current.Resolve().CurrentTheme; - return theme.ThemeName; - } - - public enum ViewType - { - View, - Layout, - Partial - } - } - - public class AreaAwareViewLocation : ViewLocation - { - public AreaAwareViewLocation(string virtualPathFormatString) - : base(virtualPathFormatString) - { - } - - public override string Format(string viewName, string controllerName, string areaName, string theme) - { - return string.Format(_virtualPathFormatString, - viewName, - controllerName, - areaName, - theme); - } - } - - public class ViewLocation - { - protected readonly string _virtualPathFormatString; - - public ViewLocation(string virtualPathFormatString) - { - _virtualPathFormatString = virtualPathFormatString; - } - - public virtual string Format(string viewName, string controllerName, string areaName, string theme) - { - return string.Format(_virtualPathFormatString, - viewName, - controllerName, - theme); - } - } + ControllerContext controllerContext, + string areaName, + string[] locations, + string[] areaLocations, + string locationsPropertyName, + string name, + string controllerName, + string theme, + string cacheKeyPrefix, + bool useCache, + out string[] searchedLocations) + { + searchedLocations = _emptyLocations; + + if (String.IsNullOrEmpty(name)) + { + return String.Empty; + } + + bool usingAreas = !String.IsNullOrEmpty(areaName); + + if (usingAreas) + { + var isAdminArea = areaName.IsCaseInsensitiveEqual("admin"); + + // "ExtraAreaViewLocations" gets injected by AdminThemedAttribute + var extraAreaViewLocations = controllerContext.RouteData.DataTokens["ExtraAreaViewLocations"] as string[]; + + if (isAdminArea && extraAreaViewLocations == null && controllerContext.HttpContext.Request.IsAjaxRequest()) + { + // In admin area AJAX requests DataTokens["ExtraAreaViewLocations"] is not set. + extraAreaViewLocations = AdminThemedAttribute.ExtraAreaViewLocations; + } + + if (extraAreaViewLocations != null && extraAreaViewLocations.Length > 0) + { + var newLocations = areaLocations.ToList(); + var viewType = cacheKeyPrefix == "Partial" + ? ViewType.Partial + : ViewType.Layout; + + if (isAdminArea) + { + // the admin area cannot fallback to itself. Prepend to list. + ExpandLocationFormats(extraAreaViewLocations, viewType).Reverse().Each(x => newLocations.Insert(0, x)); + } + else + { + newLocations.AddRange(ExpandLocationFormats(extraAreaViewLocations, viewType)); + } + + areaLocations = newLocations.ToArray(); + } + } + + var viewLocations = GetViewLocations(locations, (usingAreas) ? areaLocations : null); + + if (viewLocations.Count == 0) + { + throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Properties cannot be null or empty.", new object[] { locationsPropertyName })); + } + + bool nameRepresentsPath = IsSpecificPath(name); + string cacheKey = CreateCacheKey(cacheKeyPrefix, name, (nameRepresentsPath) ? String.Empty : controllerName, areaName, theme); + + if (useCache) + { + // Only look at cached display modes that can handle the context. + var possibleDisplayModes = DisplayModeProvider.GetAvailableDisplayModesForContext(controllerContext.HttpContext, controllerContext.DisplayMode); + foreach (var displayMode in possibleDisplayModes) + { + string cachedLocation = ViewLocationCache.GetViewLocation(controllerContext.HttpContext, AppendDisplayModeToCacheKey(cacheKey, displayMode.DisplayModeId)); + + if (cachedLocation == null) + { + // If any matching display mode location is not in the cache, fall back to the uncached behavior, which will repopulate all of our caches. + return null; + } + + // A non-empty cachedLocation indicates that we have a matching file on disk. Return that result. + if (cachedLocation.Length > 0) + { + if (controllerContext.DisplayMode == null) + { + controllerContext.DisplayMode = displayMode; + } + + return cachedLocation; + } + // An empty cachedLocation value indicates that we don't have a matching file on disk. Keep going down the list of possible display modes. + } + + // ResolveViewPath is called again without using the cache. + return null; + } + else + { + return nameRepresentsPath + ? GetPathFromSpecificName(controllerContext, name, cacheKey, ref searchedLocations) + : GetPathFromGeneralName(controllerContext, viewLocations, name, controllerName, areaName, theme, cacheKey, ref searchedLocations); + } + } + + protected virtual string GetPathFromSpecificName(ControllerContext controllerContext, string name, string cacheKey, ref string[] searchedLocations) + { + string result = name; + + if (!(FilePathIsSupported(name) && FileExists(controllerContext, name))) + { + result = String.Empty; + searchedLocations = new[] { name }; + } + + ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, cacheKey, result); + return result; + } + + protected virtual string GetPathFromGeneralName( + ControllerContext controllerContext, + List locations, + string name, + string controllerName, + string areaName, + string theme, + string cacheKey, + ref string[] searchedLocations) + { + string result = String.Empty; + searchedLocations = new string[locations.Count]; + + for (int i = 0; i < locations.Count; i++) + { + ViewLocation location = locations[i]; + string virtualPath = location.Format(name, controllerName, areaName, theme); + DisplayInfo virtualPathDisplayInfo = DisplayModeProvider.GetDisplayInfoForVirtualPath(virtualPath, controllerContext.HttpContext, path => FileExists(controllerContext, path), controllerContext.DisplayMode); + + if (virtualPathDisplayInfo != null) + { + string resolvedVirtualPath = virtualPathDisplayInfo.FilePath; + + searchedLocations = _emptyLocations; + result = resolvedVirtualPath; + ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, AppendDisplayModeToCacheKey(cacheKey, GetDisplayModeId(virtualPathDisplayInfo)), result); + + if (controllerContext.DisplayMode == null) + { + controllerContext.DisplayMode = virtualPathDisplayInfo.DisplayMode; + } + + // Populate the cache for all other display modes. We want to cache both file system hits and misses so that we can distinguish + // in future requests whether a file's status was evicted from the cache (null value) or if the file doesn't exist (empty string). + IEnumerable allDisplayModes = DisplayModeProvider.Modes; + foreach (IDisplayMode displayMode in allDisplayModes) + { + if (displayMode.DisplayModeId != virtualPathDisplayInfo.DisplayMode.DisplayModeId) + { + DisplayInfo displayInfoToCache = displayMode.GetDisplayInfo(controllerContext.HttpContext, virtualPath, virtualPathExists: path => FileExists(controllerContext, path)); + + string displayModeId = String.Empty; + string cacheValue = String.Empty; + if (displayInfoToCache != null && displayInfoToCache.FilePath != null) + { + cacheValue = displayInfoToCache.FilePath; + displayModeId = GetDisplayModeId(displayInfoToCache); + } + else + { + displayModeId = displayMode.DisplayModeId; + } + + ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, AppendDisplayModeToCacheKey(cacheKey, displayModeId), cacheValue); + } + } + break; + } + + searchedLocations[i] = virtualPath; + } + + return result; + } + + protected virtual bool FilePathIsSupported(string virtualPath) + { + if (this.FileExtensions == null) + { + // legacy behavior for custom ViewEngine that might not set the FileExtensions property + return true; + } + + // get rid of the '.' because the FileExtensions property expects extensions withouth a dot. + string extension = GetExtensionThunk(virtualPath).TrimStart('.'); + return FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase); + } + + private string GetDisplayModeId(DisplayInfo displayInfo) + { + var localizedDisplayInfo = displayInfo as LocalizedDisplayInfo; + + return localizedDisplayInfo != null + ? localizedDisplayInfo.DisplayModeId + : displayInfo.DisplayMode.DisplayModeId; + } + + protected virtual string CreateCacheKey(string prefix, string name, string controllerName, string areaName, string theme/*, string lang*/) + { + return string.Format(_cacheKeyEntry, + _cacheKeyType, + prefix, + name, + controllerName, + areaName, + theme); + } + + internal static string AppendDisplayModeToCacheKey(string cacheKey, string displayMode) + { + // key format is ":ViewCacheEntry:{cacheType}:{prefix}:{name}:{controllerName}:{areaName}:{theme}" + // so append ":{displayMode}" to the key + return string.IsNullOrWhiteSpace(displayMode) + ? cacheKey + : cacheKey + ":" + displayMode; + } + + protected virtual IEnumerable ExpandLocationFormats(IEnumerable formats, ViewType viewType) + { + // Appends razor view file extensions to location formats + Guard.NotNull(formats, nameof(formats)); + + var subfolder = viewType == ViewType.Layout ? "Layouts" : "Partials"; + + foreach (var format in formats) + { + if (viewType > ViewType.View) + { + yield return format.Replace("{0}", subfolder + "/{0}.cshtml"); + + if (EnableVbViews) + { + yield return format.Replace("{0}", subfolder + "/{0}.vbhtml"); + } + } + + yield return format + ".cshtml"; + + if (EnableVbViews) + { + yield return format + ".vbhtml"; + } + } + } + + protected virtual List GetViewLocations(string[] viewLocationFormats, string[] areaViewLocationFormats) + { + List locations = new List( + (viewLocationFormats?.Length ?? 0) + + (areaViewLocationFormats?.Length ?? 0)); + + if (areaViewLocationFormats != null) + { + foreach (string areaViewLocationFormat in areaViewLocationFormats) + { + locations.Add(new AreaAwareViewLocation(areaViewLocationFormat)); + } + } + + if (viewLocationFormats != null) + { + foreach (string viewLocationFormat in viewLocationFormats) + { + locations.Add(new ViewLocation(viewLocationFormat)); + } + } + + return locations; + } + + protected virtual bool IsSpecificPath(string name) + { + char c = name[0]; + return (c == '~' || c == '/'); + } + + protected virtual bool IsMobileDevice(HttpContextBase httpContext) + { + var mobileDeviceHelper = EngineContext.Current.Resolve(); + var result = mobileDeviceHelper.IsMobileDevice(); + return result; + } + + protected virtual string GetCurrentThemeName(ControllerContext controllerContext) + { + var theme = EngineContext.Current.Resolve().CurrentTheme; + return theme.ThemeName; + } + + public enum ViewType + { + View, + Layout, + Partial + } + } + + public class AreaAwareViewLocation : ViewLocation + { + public AreaAwareViewLocation(string virtualPathFormatString) + : base(virtualPathFormatString) + { + } + + public override string Format(string viewName, string controllerName, string areaName, string theme) + { + return string.Format(_virtualPathFormatString, + viewName, + controllerName, + areaName, + theme); + } + } + + public class ViewLocation + { + protected readonly string _virtualPathFormatString; + + public ViewLocation(string virtualPathFormatString) + { + _virtualPathFormatString = virtualPathFormatString; + } + + public virtual string Format(string viewName, string controllerName, string areaName, string theme) + { + return string.Format(_virtualPathFormatString, + viewName, + controllerName, + theme); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs index cef62c8959..78195934d9 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs @@ -8,154 +8,153 @@ using SmartStore.Core.Infrastructure; using SmartStore.Core.Themes; using SmartStore.Utilities; -using SmartStore.Web.Framework.Theming.Assets; namespace SmartStore.Web.Framework.Theming { public class ThemingVirtualPathProvider : SmartVirtualPathProvider { - private readonly VirtualPathProvider _previous; - private static readonly ContextState> _requestState; + private readonly VirtualPathProvider _previous; + private static readonly ContextState> _requestState; - static ThemingVirtualPathProvider() - { - _requestState = new ContextState>("ThemeFileResolver.RequestCache", () => new Dictionary()); - } + static ThemingVirtualPathProvider() + { + _requestState = new ContextState>("ThemeFileResolver.RequestCache", () => new Dictionary()); + } - public ThemingVirtualPathProvider(VirtualPathProvider previous) + public ThemingVirtualPathProvider(VirtualPathProvider previous) { _previous = previous; - } + } public override bool FileExists(string virtualPath) { - var result = GetResolveResult(virtualPath); - if (result != null) - { - if (!result.IsBased) - { - return true; - } - else - { - if (result.Query.HasValue() && result.Query.IndexOf('.') >= 0) - { - // libSass tries to locate files by appending .[s]css extension to our querystring. Prevent this shit! - return false; - } - else - { - // Let system VPP check for this file - virtualPath = result.ResultVirtualPath ?? result.OriginalVirtualPath; - } - } - } - - return _previous.FileExists(virtualPath); + var result = GetResolveResult(virtualPath); + if (result != null) + { + if (!result.IsBased) + { + return true; + } + else + { + if (result.Query.HasValue() && result.Query.IndexOf('.') >= 0) + { + // libSass tries to locate files by appending .[s]css extension to our querystring. Prevent this shit! + return false; + } + else + { + // Let system VPP check for this file + virtualPath = result.ResultVirtualPath ?? result.OriginalVirtualPath; + } + } + } + + return _previous.FileExists(virtualPath); } - + public override VirtualFile GetFile(string virtualPath) { - VirtualFile file = null; - string debugPath = null; - - var result = GetResolveResult(virtualPath); - if (result != null) - { - // File is an inherited theme file. Set the result virtual path. - virtualPath = result.ResultVirtualPath ?? result.OriginalVirtualPath; - if (!result.IsBased) - { - file = new InheritedVirtualThemeFile(result); - } - } - - if (result == null || file is InheritedVirtualThemeFile) - { - // Handle plugin and symlinked theme folders in debug mode. - debugPath = ResolveDebugFilePath(virtualPath); - if (debugPath != null) - { - file = new DebugVirtualFile(file?.VirtualPath ?? virtualPath, debugPath); - } - } - - return file ?? _previous.GetFile(virtualPath); + VirtualFile file = null; + string debugPath = null; + + var result = GetResolveResult(virtualPath); + if (result != null) + { + // File is an inherited theme file. Set the result virtual path. + virtualPath = result.ResultVirtualPath ?? result.OriginalVirtualPath; + if (!result.IsBased) + { + file = new InheritedVirtualThemeFile(result); + } + } + + if (result == null || file is InheritedVirtualThemeFile) + { + // Handle plugin and symlinked theme folders in debug mode. + debugPath = ResolveDebugFilePath(virtualPath); + if (debugPath != null) + { + file = new DebugVirtualFile(file?.VirtualPath ?? virtualPath, debugPath); + } + } + + return file ?? _previous.GetFile(virtualPath); + } + + public override string GetFileHash(string virtualPath, IEnumerable virtualPathDependencies) + { + if (virtualPathDependencies == null) + { + return _previous.GetFileHash(virtualPath, virtualPathDependencies); + } + + var fileNames = MapDependencyPaths(virtualPathDependencies.Cast(), out _); + var combiner = HashCodeCombiner.Start(); + + foreach (var fileName in fileNames) + { + combiner.Add(new FileInfo(fileName)); + } + + return combiner.CombinedHashString; + } + + public override CacheDependency GetCacheDependency(string virtualPath, IEnumerable virtualPathDependencies, DateTime utcStart) + { + if (virtualPathDependencies == null) + { + return null; + } + + var mappedPaths = MapDependencyPaths(virtualPathDependencies.Cast(), out var cacheKeys); + + return new CacheDependency(mappedPaths, cacheKeys, utcStart); + } + + /// + /// Maps virtual to physical paths. Used to compute cache dependecies and file hashes. + /// + internal string[] MapDependencyPaths(IEnumerable virtualPathDependencies, out string[] cacheKeys) + { + cacheKeys = null; + + var mappedPaths = new HashSet(StringComparer.OrdinalIgnoreCase); + var cacheKeySet = new HashSet(StringComparer.OrdinalIgnoreCase); + + foreach (var dep in virtualPathDependencies) + { + var file = GetFile(dep); + + if (file is IFileDependencyProvider provider) + { + provider.AddFileDependencies(mappedPaths, cacheKeySet); + } + else if (file != null) + { + mappedPaths.Add(HostingEnvironment.MapPath(file.VirtualPath)); + } + } + + cacheKeys = cacheKeySet.ToArray(); + + var paths = mappedPaths.ToArray(); + Array.Sort(paths); + + return paths; } - public override string GetFileHash(string virtualPath, IEnumerable virtualPathDependencies) - { - if (virtualPathDependencies == null) - { - return _previous.GetFileHash(virtualPath, virtualPathDependencies); - } - - var fileNames = MapDependencyPaths(virtualPathDependencies.Cast(), out _); - var combiner = HashCodeCombiner.Start(); - - foreach (var fileName in fileNames) - { - combiner.Add(new FileInfo(fileName)); - } - - return combiner.CombinedHashString; - } - - public override CacheDependency GetCacheDependency(string virtualPath, IEnumerable virtualPathDependencies, DateTime utcStart) - { - if (virtualPathDependencies == null) - { - return null; - } - - var mappedPaths = MapDependencyPaths(virtualPathDependencies.Cast(), out var cacheKeys); - - return new CacheDependency(mappedPaths, cacheKeys, utcStart); - } - - /// - /// Maps virtual to physical paths. Used to compute cache dependecies and file hashes. - /// - internal string[] MapDependencyPaths(IEnumerable virtualPathDependencies, out string[] cacheKeys) - { - cacheKeys = null; - - var mappedPaths = new HashSet(StringComparer.OrdinalIgnoreCase); - var cacheKeySet = new HashSet(StringComparer.OrdinalIgnoreCase); - - foreach (var dep in virtualPathDependencies) - { - var file = GetFile(dep); - - if (file is IFileDependencyProvider provider) - { - provider.AddFileDependencies(mappedPaths, cacheKeySet); - } - else if (file != null) - { - mappedPaths.Add(HostingEnvironment.MapPath(file.VirtualPath)); - } - } - - cacheKeys = cacheKeySet.ToArray(); - - var paths = mappedPaths.ToArray(); - Array.Sort(paths); - - return paths; - } - - private static InheritedThemeFileResult GetResolveResult(string virtualPath) - { - var d = _requestState.GetState(); - - if (!d.TryGetValue(virtualPath, out var result)) - { - result = d[virtualPath] = EngineContext.Current.Resolve().Resolve(virtualPath); - } - - return result; - } + private static InheritedThemeFileResult GetResolveResult(string virtualPath) + { + var d = _requestState.GetState(); + + if (!d.TryGetValue(virtualPath, out var result)) + { + result = d[virtualPath] = EngineContext.Current.Resolve().Resolve(virtualPath); + } + + return result; + } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs b/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs index 165e3b194d..831cc4a036 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs @@ -6,53 +6,53 @@ namespace SmartStore.Web.Framework.Theming { - public class TwoLevelViewLocationCache : IViewLocationCache - { - private static readonly object s_key = new object(); - private readonly IViewLocationCache _innerCache; + public class TwoLevelViewLocationCache : IViewLocationCache + { + private static readonly object s_key = new object(); + private readonly IViewLocationCache _innerCache; - public TwoLevelViewLocationCache() - { - var cacheDuringDebug = CommonHelper.GetAppSetting("sm:EnableViewLocationCacheDuringDebug"); + public TwoLevelViewLocationCache() + { + var cacheDuringDebug = CommonHelper.GetAppSetting("sm:EnableViewLocationCacheDuringDebug"); - if (!cacheDuringDebug && (HttpContext.Current == null || HttpContext.Current.IsDebuggingEnabled)) - { - _innerCache = DefaultViewLocationCache.Null; - } - else - { - _innerCache = new DefaultViewLocationCache(TimeSpan.FromHours(2)); - } + if (!cacheDuringDebug && (HttpContext.Current == null || HttpContext.Current.IsDebuggingEnabled)) + { + _innerCache = DefaultViewLocationCache.Null; + } + else + { + _innerCache = new DefaultViewLocationCache(TimeSpan.FromHours(2)); + } - } + } - private static IDictionary GetRequestCache(HttpContextBase httpContext) - { - var d = httpContext.Items[s_key] as IDictionary; - if (d == null) - { - d = new Dictionary(); - httpContext.Items[s_key] = d; - } - return d; - } + private static IDictionary GetRequestCache(HttpContextBase httpContext) + { + var d = httpContext.Items[s_key] as IDictionary; + if (d == null) + { + d = new Dictionary(); + httpContext.Items[s_key] = d; + } + return d; + } - public string GetViewLocation(HttpContextBase httpContext, string key) - { - var d = GetRequestCache(httpContext); - string location; - if (!d.TryGetValue(key, out location)) - { - location = _innerCache.GetViewLocation(httpContext, key); - d[key] = location; - } - return location; - } + public string GetViewLocation(HttpContextBase httpContext, string key) + { + var d = GetRequestCache(httpContext); + string location; + if (!d.TryGetValue(key, out location)) + { + location = _innerCache.GetViewLocation(httpContext, key); + d[key] = location; + } + return location; + } - public void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath) - { - _innerCache.InsertViewLocation(httpContext, key, virtualPath); - GetRequestCache(httpContext)[key] = virtualPath; - } - } + public void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath) + { + _innerCache.InsertViewLocation(httpContext, key, virtualPath); + GetRequestCache(httpContext)[key] = virtualPath; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs index 8be02c7bac..7fe8956162 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs @@ -16,143 +16,59 @@ namespace SmartStore.Web.Framework.Theming { public abstract class WebViewPage : System.Web.Mvc.WebViewPage { - private WebViewPageHelper _helper; + private WebViewPageHelper _helper; - protected string CurrentPageType - { - get => _helper.CurrentPageType; - } + protected string CurrentPageType => _helper.CurrentPageType; - protected object CurrentPageId - { - get => _helper.CurrentPageId; - } + protected object CurrentPageId => _helper.CurrentPageId; - protected int CurrentCategoryId - { - get - { - return _helper.CurrentPageType == "category" ? _helper.CurrentPageId.Convert() : 0; - } - } + protected int CurrentCategoryId => _helper.CurrentPageType == "category" ? _helper.CurrentPageId.Convert() : 0; - protected int CurrentManufacturerId - { - get - { - return _helper.CurrentPageType == "manufacturer" ? _helper.CurrentPageId.Convert() : 0; - } - } + protected int CurrentManufacturerId => _helper.CurrentPageType == "manufacturer" ? _helper.CurrentPageId.Convert() : 0; - protected int CurrentProductId - { - get - { - return _helper.CurrentPageType == "product" ? _helper.CurrentPageId.Convert() : 0; - } - } + protected int CurrentProductId => _helper.CurrentPageType == "product" ? _helper.CurrentPageId.Convert() : 0; - protected int CurrentTopicId - { - get - { - return _helper.CurrentPageType == "topic" ? _helper.CurrentPageId.Convert() : 0; - } - } + protected int CurrentTopicId => _helper.CurrentPageType == "topic" ? _helper.CurrentPageId.Convert() : 0; - protected bool IsHomePage - { - get - { - return _helper.IsHomePage; - } - } + protected bool IsHomePage => _helper.IsHomePage; + + protected bool IsMobileDevice => _helper.IsMobileDevice; + + protected bool IsStoreClosed => _helper.IsStoreClosed; + + public bool EnableHoneypotProtection => _helper.EnableHoneypotProtection; - protected bool IsMobileDevice - { - get - { - return _helper.IsMobileDevice; - } - } + public string FileManagerUrl => _helper.FileManagerUrl; - protected bool IsStoreClosed + protected bool HasMessages => _helper.ResolveNotifications(null).Any(); + + protected ICollection GetMessages(NotifyType type) { - get - { - return _helper.IsStoreClosed; - } + return _helper.ResolveNotifications(type).AsReadOnly(); } - public bool EnableHoneypotProtection - { - get { return _helper.EnableHoneypotProtection; } - } - - public string FileManagerUrl - { - get { return _helper.FileManagerUrl; } - } - - protected bool HasMessages - { - get - { - return _helper.ResolveNotifications(null).Any(); - } - } - - protected ICollection GetMessages(NotifyType type) - { - return _helper.ResolveNotifications(type).AsReadOnly(); - } - /// /// Get a localized resource /// - public Localizer T - { - get - { - return _helper.T; - } - } + public Localizer T => _helper.T; - public ICommonServices CommonServices - { - get - { - return _helper.Services; - } - } + public ICommonServices CommonServices => _helper.Services; - public IWorkContext WorkContext - { - get - { - return _helper.Services.WorkContext; - } - } + public IWorkContext WorkContext => _helper.Services.WorkContext; - public ILinkResolver LinkResolver - { - get - { - return _helper.LinkResolver; - } - } + public ILinkResolver LinkResolver => _helper.LinkResolver; - public override void InitHelpers() + public override void InitHelpers() { base.InitHelpers(); - _helper = EngineContext.Current.Resolve(); - _helper.Initialize(this.ViewContext); + _helper = EngineContext.Current.Resolve(); + _helper.Initialize(this.ViewContext); } public HelperResult RenderWrappedSection(string name, object wrapperHtmlAttributes) { - Action action = delegate(TextWriter tw) + Action action = delegate (TextWriter tw) { var htmlAttributes = HtmlHelper.AnonymousObjectToHtmlAttributes(wrapperHtmlAttributes); var tagBuilder = new TagBuilder("div"); @@ -193,34 +109,19 @@ public override string Layout return layout; } - set - { - base.Layout = value; - } + set => base.Layout = value; } - /// - /// Gets the manifest of the current active theme - /// - protected ThemeManifest ThemeManifest - { - get - { - return _helper.ThemeContext?.CurrentTheme; - } - } + /// + /// Gets the manifest of the current active theme + /// + protected ThemeManifest ThemeManifest => _helper.ThemeContext?.CurrentTheme; /// /// Gets the current theme name. Override this in configuration views. /// [Obsolete("The theme name gets resolved automatically now. No need to override anymore.")] - protected virtual string ThemeName - { - get - { - return _helper.ThemeContext?.WorkingThemeName; - } - } + protected virtual string ThemeName => _helper.ThemeContext?.WorkingThemeName; public string GetThemeVariable(string varname, string defaultValue = "") { @@ -251,150 +152,144 @@ public string GetThemeVariable(string varname, string defaultValue = "") return defaultValue; } - /// - /// Gets the runtime theme variables as specified in the theme's config file - /// alongside the merged user-defined variables - /// - public dynamic ThemeVariables - { - get - { - return _helper.ThemeVariables; - } - } - - /// - /// Modifies a URL (appends/updates a query string part and optionally removes another query string). - /// - /// The URL to modifiy. If null, the current page's URL is resolved. - /// The new query string part. - /// A query string name to remove. - /// The modified URL. - public string ModifyUrl(string url, string query, string removeQueryName = null) - { - var webHelper = _helper.Services?.WebHelper; - if (webHelper == null) - { - return url; - } - - url = url.NullEmpty() ?? webHelper.GetThisPageUrl(true); - var url2 = webHelper.ModifyQueryString(url, query, null); - - if (removeQueryName.HasValue()) - { - url2 = webHelper.RemoveQueryString(url2, removeQueryName); - } - - return url2; - } - - public string GenerateHelpUrl(HelpTopic topic) - { - var seoCode = WorkContext?.WorkingLanguage?.UniqueSeoCode; - if (seoCode.IsEmpty()) - { - return topic?.EnPath; - } - - return SmartStoreVersion.GenerateHelpUrl(seoCode, topic); - } - - public string GenerateHelpUrl(string path) - { - var seoCode = WorkContext?.WorkingLanguage?.UniqueSeoCode; - if (seoCode.IsEmpty()) - { - return path; - } - - return SmartStoreVersion.GenerateHelpUrl(seoCode, path); - } - - /// - /// Tries to find a matching localization file for a given culture in the following order - /// (assuming is 'de-DE', is 'lang-*.js' and is 'en-US'): - /// - /// Exact match > lang-de-DE.js - /// Neutral culture > lang-de.js - /// Any region for language > lang-de-CH.js - /// Exact match for fallback culture > lang-en-US.js - /// Neutral fallback culture > lang-en.js - /// Any region for fallback language > lang-en-GB.js - /// - /// - /// The ISO culture code to get a localization file for, e.g. 'de-DE' - /// The virtual path to search in - /// The pattern to match, e.g. 'lang-*.js'. The wildcard char MUST exist. - /// Optional. - /// Result - public LocalizationFileResolveResult ResolveLocalizationFile( - string culture, - string virtualPath, - string pattern, - string fallbackCulture = "en") - { - return _helper.LocalizationFileResolver.Resolve(culture, virtualPath, pattern, true, fallbackCulture); - } - - public bool HasMetadata(string name) - { - return TryGetMetadata(name, out _); - } - - /// - /// Looks up an entry in ViewData dictionary first, then in ViewData.ModelMetadata.AdditionalValues dictionary - /// - /// Actual type of value - /// Name of entry - /// Result - public T GetMetadata(string name) - { - TryGetMetadata(name, out var value); - return value; - } - - /// - /// Looks up an entry in ViewData dictionary first, then in ViewData.ModelMetadata.AdditionalValues dictionary - /// - /// Actual type of value - /// Name of entry - /// The default value to return if item does not exist. - /// Result - public T GetMetadata(string name, T defaultValue) - { - if (TryGetMetadata(name, out var value)) - { - return value; - } - - return defaultValue; - } - - /// - /// Looks up an entry in ViewData dictionary first, then in ViewData.ModelMetadata.AdditionalValues dictionary - /// - /// Actual type of value - /// Name of entry - /// true if the entry exists in any of the dictionaries, false otherwise - public bool TryGetMetadata(string name, out T value) - { - value = default(T); - - var exists = ViewData.TryGetValue(name, out var raw); - if (!exists) - { - exists = ViewData.ModelMetadata?.AdditionalValues?.TryGetValue(name, out raw) == true; - } - - if (raw != null) - { - value = raw.Convert(); - } - - return exists; - } - } + /// + /// Gets the runtime theme variables as specified in the theme's config file + /// alongside the merged user-defined variables + /// + public dynamic ThemeVariables => _helper.ThemeVariables; + + /// + /// Modifies a URL (appends/updates a query string part and optionally removes another query string). + /// + /// The URL to modifiy. If null, the current page's URL is resolved. + /// The new query string part. + /// A query string name to remove. + /// The modified URL. + public string ModifyUrl(string url, string query, string removeQueryName = null) + { + var webHelper = _helper.Services?.WebHelper; + if (webHelper == null) + { + return url; + } + + url = url.NullEmpty() ?? webHelper.GetThisPageUrl(true); + var url2 = webHelper.ModifyQueryString(url, query, null); + + if (removeQueryName.HasValue()) + { + url2 = webHelper.RemoveQueryString(url2, removeQueryName); + } + + return url2; + } + + public string GenerateHelpUrl(HelpTopic topic) + { + var seoCode = WorkContext?.WorkingLanguage?.UniqueSeoCode; + if (seoCode.IsEmpty()) + { + return topic?.EnPath; + } + + return SmartStoreVersion.GenerateHelpUrl(seoCode, topic); + } + + public string GenerateHelpUrl(string path) + { + var seoCode = WorkContext?.WorkingLanguage?.UniqueSeoCode; + if (seoCode.IsEmpty()) + { + return path; + } + + return SmartStoreVersion.GenerateHelpUrl(seoCode, path); + } + + /// + /// Tries to find a matching localization file for a given culture in the following order + /// (assuming is 'de-DE', is 'lang-*.js' and is 'en-US'): + /// + /// Exact match > lang-de-DE.js + /// Neutral culture > lang-de.js + /// Any region for language > lang-de-CH.js + /// Exact match for fallback culture > lang-en-US.js + /// Neutral fallback culture > lang-en.js + /// Any region for fallback language > lang-en-GB.js + /// + /// + /// The ISO culture code to get a localization file for, e.g. 'de-DE' + /// The virtual path to search in + /// The pattern to match, e.g. 'lang-*.js'. The wildcard char MUST exist. + /// Optional. + /// Result + public LocalizationFileResolveResult ResolveLocalizationFile( + string culture, + string virtualPath, + string pattern, + string fallbackCulture = "en") + { + return _helper.LocalizationFileResolver.Resolve(culture, virtualPath, pattern, true, fallbackCulture); + } + + public bool HasMetadata(string name) + { + return TryGetMetadata(name, out _); + } + + /// + /// Looks up an entry in ViewData dictionary first, then in ViewData.ModelMetadata.AdditionalValues dictionary + /// + /// Actual type of value + /// Name of entry + /// Result + public T GetMetadata(string name) + { + TryGetMetadata(name, out var value); + return value; + } + + /// + /// Looks up an entry in ViewData dictionary first, then in ViewData.ModelMetadata.AdditionalValues dictionary + /// + /// Actual type of value + /// Name of entry + /// The default value to return if item does not exist. + /// Result + public T GetMetadata(string name, T defaultValue) + { + if (TryGetMetadata(name, out var value)) + { + return value; + } + + return defaultValue; + } + + /// + /// Looks up an entry in ViewData dictionary first, then in ViewData.ModelMetadata.AdditionalValues dictionary + /// + /// Actual type of value + /// Name of entry + /// true if the entry exists in any of the dictionaries, false otherwise + public bool TryGetMetadata(string name, out T value) + { + value = default(T); + + var exists = ViewData.TryGetValue(name, out var raw); + if (!exists) + { + exists = ViewData.ModelMetadata?.AdditionalValues?.TryGetValue(name, out raw) == true; + } + + if (raw != null) + { + value = raw.Convert(); + } + + return exists; + } + } public abstract class WebViewPage : WebViewPage { diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPageHelper.cs b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPageHelper.cs index 006a054f48..b8fa11ecfd 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPageHelper.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPageHelper.cs @@ -1,79 +1,70 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Dynamic; using System.Linq; using System.Web.Mvc; +using SmartStore.Core.Domain; +using SmartStore.Core.Domain.Security; using SmartStore.Core.Localization; using SmartStore.Core.Logging; using SmartStore.Core.Themes; using SmartStore.Services; +using SmartStore.Services.Cms; using SmartStore.Services.Common; -using SmartStore.Web.Framework.Filters; -using SmartStore.Core.Domain; using SmartStore.Services.Customers; -using SmartStore.Core.Domain.Security; -using SmartStore.Services.Cms; -using System.Web.Routing; -using System.Globalization; +using SmartStore.Web.Framework.Filters; namespace SmartStore.Web.Framework.Theming { - public class FileManagerUrlRequested - { - public UrlHelper UrlHelper { get; set; } - public string Url { get; set; } - } - - public class WebViewPageHelper - { - private bool _initialized; - private ControllerContext _controllerContext; - private ExpandoObject _themeVars; - private ICollection _internalNotifications; + public class FileManagerUrlRequested + { + public UrlHelper UrlHelper { get; set; } + public string Url { get; set; } + } + + public class WebViewPageHelper + { + private bool _initialized; + private ControllerContext _controllerContext; + private ExpandoObject _themeVars; + private ICollection _internalNotifications; private string _currentPageType; private object _currentPageId; private bool? _isHomePage; - private bool? _isMobileDevice; + private bool? _isMobileDevice; private bool? _isStoreClosed; - private bool? _enableHoneypot; - private string _fileManagerUrl; - - public WebViewPageHelper() - { - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - public ILocalizationFileResolver LocalizationFileResolver { get; set; } - public ICommonServices Services { get; set; } - public IThemeRegistry ThemeRegistry { get; set; } - public IThemeContext ThemeContext { get; set; } - public IMobileDeviceHelper MobileDeviceHelper { get; set; } - public ILinkResolver LinkResolver { get; set; } - public UrlHelper UrlHelper { get; set; } - - public void Initialize(ControllerContext controllerContext) - { - if (!_initialized) - { - _controllerContext = controllerContext.GetRootControllerContext(); - IdentifyPage(); - _initialized = true; - } - } + private bool? _enableHoneypot; + private string _fileManagerUrl; - public string CurrentPageType + public WebViewPageHelper() { - get => _currentPageType; + T = NullLocalizer.Instance; } - public object CurrentPageId + public Localizer T { get; set; } + public ILocalizationFileResolver LocalizationFileResolver { get; set; } + public ICommonServices Services { get; set; } + public IThemeRegistry ThemeRegistry { get; set; } + public IThemeContext ThemeContext { get; set; } + public IMobileDeviceHelper MobileDeviceHelper { get; set; } + public ILinkResolver LinkResolver { get; set; } + public UrlHelper UrlHelper { get; set; } + + public void Initialize(ControllerContext controllerContext) { - get => _currentPageId; + if (!_initialized) + { + _controllerContext = controllerContext.GetRootControllerContext(); + IdentifyPage(); + _initialized = true; + } } + public string CurrentPageType => _currentPageType; + + public object CurrentPageId => _currentPageId; + private void IdentifyPage() { var routeData = _controllerContext.RequestContext.RouteData; @@ -82,7 +73,7 @@ private void IdentifyPage() _currentPageType = "system"; _currentPageId = controllerName + "." + actionName; - + if (IsHomePage) { _currentPageType = "home"; @@ -120,34 +111,34 @@ private void IdentifyPage() } public bool IsHomePage - { - get - { - if (!_isHomePage.HasValue) - { - var routeData = _controllerContext.RequestContext.RouteData; - var response = _controllerContext.RequestContext.HttpContext.Response; - _isHomePage = response.StatusCode != 404 && - routeData.GetRequiredString("controller").IsCaseInsensitiveEqual("Home") && - routeData.GetRequiredString("action").IsCaseInsensitiveEqual("Index"); - } - - return _isHomePage.Value; - } - } - - public bool IsMobileDevice - { - get - { - if (!_isMobileDevice.HasValue) - { - _isMobileDevice = MobileDeviceHelper.IsMobileDevice(); - } - - return _isMobileDevice.Value; - } - } + { + get + { + if (!_isHomePage.HasValue) + { + var routeData = _controllerContext.RequestContext.RouteData; + var response = _controllerContext.RequestContext.HttpContext.Response; + _isHomePage = response.StatusCode != 404 && + routeData.GetRequiredString("controller").IsCaseInsensitiveEqual("Home") && + routeData.GetRequiredString("action").IsCaseInsensitiveEqual("Index"); + } + + return _isHomePage.Value; + } + } + + public bool IsMobileDevice + { + get + { + if (!_isMobileDevice.HasValue) + { + _isMobileDevice = MobileDeviceHelper.IsMobileDevice(); + } + + return _isMobileDevice.Value; + } + } public bool IsStoreClosed { @@ -155,112 +146,112 @@ public bool IsStoreClosed { if (!_isStoreClosed.HasValue) { - var settings = Services.Settings.LoadSetting(Services.StoreContext.CurrentStore.Id); - _isStoreClosed = Services.WorkContext.CurrentCustomer.IsAdmin() && settings.StoreClosedAllowForAdmins ? false : settings.StoreClosed; + var settings = Services.Settings.LoadSetting(Services.StoreContext.CurrentStore.Id); + _isStoreClosed = Services.WorkContext.CurrentCustomer.IsAdmin() && settings.StoreClosedAllowForAdmins ? false : settings.StoreClosed; } return _isStoreClosed.Value; } } - public bool EnableHoneypotProtection - { - get - { - if (!_enableHoneypot.HasValue) - { - var settings = Services.Settings.LoadSetting(Services.StoreContext.CurrentStore.Id); - _enableHoneypot = settings.EnableHoneypotProtection; - } - - return _enableHoneypot.Value; - } - } - - public string FileManagerUrl - { - get - { - if (_fileManagerUrl == null) - { - var defaultUrl = UrlHelper.Action("Index", "RoxyFileManager", new { area = "admin" }); - var message = new FileManagerUrlRequested - { - UrlHelper = UrlHelper, - Url = defaultUrl - }; - - Services.EventPublisher.Publish(message); - - _fileManagerUrl = message.Url ?? defaultUrl; - } - - return _fileManagerUrl; - } - } - - public IEnumerable ResolveNotifications(NotifyType? type) - { - IEnumerable result = Enumerable.Empty(); - - if (_internalNotifications == null) - { - string key = NotifyAttribute.NotificationsKey; - ICollection entries; - - var tempData = _controllerContext.Controller.TempData; - if (tempData.ContainsKey(key)) - { - entries = tempData[key] as ICollection; - if (entries != null) - { - result = result.Concat(entries); - } - } - - var viewData = _controllerContext.Controller.ViewData; - if (viewData.ContainsKey(key)) - { - entries = viewData[key] as ICollection; - if (entries != null) - { - result = result.Concat(entries); - } - } - - _internalNotifications = new HashSet(result); - } - - if (type == null) - { - return _internalNotifications.Select(x => x.Message); - } - - return _internalNotifications.Where(x => x.Type == type.Value).Select(x => x.Message); - } - - public dynamic ThemeVariables - { - get - { - if (_themeVars == null) - { - var storeContext = Services?.StoreContext; - var themeManifest = ThemeContext?.CurrentTheme; + public bool EnableHoneypotProtection + { + get + { + if (!_enableHoneypot.HasValue) + { + var settings = Services.Settings.LoadSetting(Services.StoreContext.CurrentStore.Id); + _enableHoneypot = settings.EnableHoneypotProtection; + } + + return _enableHoneypot.Value; + } + } + + public string FileManagerUrl + { + get + { + if (_fileManagerUrl == null) + { + var defaultUrl = UrlHelper.Action("Index", "RoxyFileManager", new { area = "admin" }); + var message = new FileManagerUrlRequested + { + UrlHelper = UrlHelper, + Url = defaultUrl + }; + + Services.EventPublisher.Publish(message); + + _fileManagerUrl = message.Url ?? defaultUrl; + } + + return _fileManagerUrl; + } + } + + public IEnumerable ResolveNotifications(NotifyType? type) + { + IEnumerable result = Enumerable.Empty(); + + if (_internalNotifications == null) + { + string key = NotifyAttribute.NotificationsKey; + ICollection entries; + + var tempData = _controllerContext.Controller.TempData; + if (tempData.ContainsKey(key)) + { + entries = tempData[key] as ICollection; + if (entries != null) + { + result = result.Concat(entries); + } + } + + var viewData = _controllerContext.Controller.ViewData; + if (viewData.ContainsKey(key)) + { + entries = viewData[key] as ICollection; + if (entries != null) + { + result = result.Concat(entries); + } + } + + _internalNotifications = new HashSet(result); + } + + if (type == null) + { + return _internalNotifications.Select(x => x.Message); + } + + return _internalNotifications.Where(x => x.Type == type.Value).Select(x => x.Message); + } + + public dynamic ThemeVariables + { + get + { + if (_themeVars == null) + { + var storeContext = Services?.StoreContext; + var themeManifest = ThemeContext?.CurrentTheme; if (storeContext == null || themeManifest == null) - { - _themeVars = new ExpandoObject(); - } - else - { - var repo = new ThemeVarsRepository(); - _themeVars = repo.GetRawVariables(themeManifest.ThemeName, storeContext.CurrentStore.Id); - } - } - - return _themeVars; - } - } - } + { + _themeVars = new ExpandoObject(); + } + else + { + var repo = new ThemeVarsRepository(); + _themeVars = repo.GetRawVariables(themeManifest.ThemeName, storeContext.CurrentStore.Id); + } + } + + return _themeVars; + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Breadcrumb.cs b/src/Presentation/SmartStore.Web.Framework/UI/Breadcrumb.cs index 43b71c4ea0..c6e9556940 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Breadcrumb.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Breadcrumb.cs @@ -1,43 +1,36 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace SmartStore.Web.Framework.UI { - public interface IBreadcrumb - { - void Track(MenuItem item, bool prepend = false); - IReadOnlyList Trail { get; } - } + public interface IBreadcrumb + { + void Track(MenuItem item, bool prepend = false); + IReadOnlyList Trail { get; } + } - public class DefaultBreadcrumb : IBreadcrumb - { - private List _trail; + public class DefaultBreadcrumb : IBreadcrumb + { + private List _trail; - public void Track(MenuItem item, bool prepend = false) - { - Guard.NotNull(item, nameof(item)); + public void Track(MenuItem item, bool prepend = false) + { + Guard.NotNull(item, nameof(item)); - if (_trail == null) - { - _trail = new List(); - } + if (_trail == null) + { + _trail = new List(); + } - if (prepend) - { - _trail.Insert(0, item); - } - else - { - _trail.Add(item); - } - } + if (prepend) + { + _trail.Insert(0, item); + } + else + { + _trail.Add(item); + } + } - public IReadOnlyList Trail - { - get - { - return _trail; - } - } - } + public IReadOnlyList Trail => _trail; + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs index ad9ecb2725..e6fba32534 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs @@ -5,13 +5,13 @@ using System.Text; using System.Web; using System.Web.Optimization; -using BundleTransformer.Core.Orderers; using BundleTransformer.Core.Bundles; +using BundleTransformer.Core.Orderers; using SmartStore.Core; -using SmartStore.Services.Seo; -using SmartStore.Web.Framework.Theming.Assets; using SmartStore.Core.Themes; +using SmartStore.Services.Seo; using SmartStore.Utilities.Threading; +using SmartStore.Web.Framework.Theming.Assets; namespace SmartStore.Web.Framework.UI { @@ -30,13 +30,13 @@ public class BundleBuilder : IBundleBuilder { private readonly IStoreContext _storeContext; private readonly IWorkContext _workContext; - private readonly IThemeContext _themeContext; + private readonly IThemeContext _themeContext; public BundleBuilder(IStoreContext storeContext, IWorkContext workContext, IThemeContext themeContext) { _storeContext = storeContext; _workContext = workContext; - _themeContext = themeContext; + _themeContext = themeContext; } public string Build(BundleType type, IEnumerable files) @@ -53,14 +53,14 @@ public string Build(BundleType type, IEnumerable files) bundleFor = BundleTable.Bundles.GetBundleFor(bundleVirtualPath); if (bundleFor == null) { - var nullOrderer = new NullOrderer(); + var nullOrderer = new NullOrderer(); - Bundle bundle = (type == BundleType.Script) ? + Bundle bundle = (type == BundleType.Script) ? new CustomScriptBundle(bundleVirtualPath) as Bundle : new SmartStyleBundle(bundleVirtualPath) as Bundle; - bundle.Orderer = nullOrderer; + bundle.Orderer = nullOrderer; - bundle.Include(files.ToArray()); + bundle.Include(files.ToArray()); BundleTable.Bundles.Add(bundle); } @@ -68,13 +68,13 @@ public string Build(BundleType type, IEnumerable files) } if (type == BundleType.Script) - { - return Scripts.Render(bundleVirtualPath).ToString(); + { + return Scripts.Render(bundleVirtualPath).ToString(); - //// Uncomment this if you want to bypass asset caching on mobile browsers - //return Scripts.RenderFormat("", - // files.Select(x => VirtualPathUtility.ToAppRelative(x)).ToArray()).ToString(); - } + //// Uncomment this if you want to bypass asset caching on mobile browsers + //return Scripts.RenderFormat("", + // files.Select(x => VirtualPathUtility.ToAppRelative(x)).ToArray()).ToString(); + } return Styles.Render(bundleVirtualPath).ToString(); } @@ -92,8 +92,8 @@ protected virtual string GetBundleVirtualPath(BundleType type, IEnumerable x.EndsWith(".scss", StringComparison.OrdinalIgnoreCase))) { hash += "-s" + _storeContext.CurrentStore.Id; - hash += "-t" + _themeContext.CurrentTheme.ThemeName; + hash += "-t" + _themeContext.CurrentTheme.ThemeName; } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceItemModel.cs b/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceItemModel.cs index 6811ceac29..79721cb527 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceItemModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceItemModel.cs @@ -1,21 +1,20 @@ -using System; -using SmartStore.Web.Framework.Modelling; +using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Framework.UI.Choices { - public abstract class ChoiceItemModel : EntityModelBase - { - public string Name { get; set; } - public string SeName { get; set; } - public string Alias { get; set; } - public string Color { get; set; } - public string PriceAdjustment { get; set; } - public decimal PriceAdjustmentValue { get; set; } - public int QuantityInfo { get; set; } - public bool IsPreSelected { get; set; } - public bool IsDisabled { get; set; } - public string ImageUrl { get; set; } + public abstract class ChoiceItemModel : EntityModelBase + { + public string Name { get; set; } + public string SeName { get; set; } + public string Alias { get; set; } + public string Color { get; set; } + public string PriceAdjustment { get; set; } + public decimal PriceAdjustmentValue { get; set; } + public int QuantityInfo { get; set; } + public bool IsPreSelected { get; set; } + public bool IsDisabled { get; set; } + public string ImageUrl { get; set; } - public abstract string GetItemLabel(); - } + public abstract string GetItemLabel(); + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs b/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs index 0b4b689452..fc026010be 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs @@ -1,91 +1,90 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Web.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Framework.UI.Choices { - public abstract class ChoiceModel : EntityModelBase - { - protected ChoiceModel() - { - this.AllowedFileExtensions = new List(); - this.Values = new List(); - } - - public AttributeControlType AttributeControlType { get; set; } - - public string Alias { get; set; } - - public string Name { get; set; } - - public string Description { get; set; } - - public string TextPrompt { get; set; } - - public bool IsRequired { get; set; } - - public bool IsDisabled { get; set; } - - /// - /// Allowed file extensions for customer uploaded files - /// - public IList AllowedFileExtensions { get; set; } - - /// - /// Selected value for textboxes - /// - public string TextValue { get; set; } - /// - /// Selected day value for datepicker - /// - public int? SelectedDay { get; set; } - /// - /// Selected month value for datepicker - /// - public int? SelectedMonth { get; set; } - /// - /// Selected year value for datepicker - /// - public int? SelectedYear { get; set; } - /// - /// Begin year for datepicker - /// - public int? BeginYear { get; set; } - /// - /// End year for datepicker - /// - public int? EndYear { get; set; } - - public string UploadedFileGuid { get; set; } - public string UploadedFileName { get; set; } - - public virtual IList Values { get; set; } - - public abstract string BuildControlId(); - - public virtual string GetLabel() - { - return TextPrompt.NullEmpty() ?? Name; - } - - public virtual string GetDescription() - { - var containsImg = Description.IsEmpty() ? false : Description.Contains("(); + this.Values = new List(); + } + + public AttributeControlType AttributeControlType { get; set; } + + public string Alias { get; set; } + + public string Name { get; set; } + + public string Description { get; set; } + + public string TextPrompt { get; set; } + + public bool IsRequired { get; set; } + + public bool IsDisabled { get; set; } + + /// + /// Allowed file extensions for customer uploaded files + /// + public IList AllowedFileExtensions { get; set; } + + /// + /// Selected value for textboxes + /// + public string TextValue { get; set; } + /// + /// Selected day value for datepicker + /// + public int? SelectedDay { get; set; } + /// + /// Selected month value for datepicker + /// + public int? SelectedMonth { get; set; } + /// + /// Selected year value for datepicker + /// + public int? SelectedYear { get; set; } + /// + /// Begin year for datepicker + /// + public int? BeginYear { get; set; } + /// + /// End year for datepicker + /// + public int? EndYear { get; set; } + + public string UploadedFileGuid { get; set; } + public string UploadedFileName { get; set; } + + public virtual IList Values { get; set; } + + public abstract string BuildControlId(); + + public virtual string GetLabel() + { + return TextPrompt.NullEmpty() ?? Name; + } + + public virtual string GetDescription() + { + var containsImg = Description.IsEmpty() ? false : Description.Contains(" _controlIdFn; - - public GenericChoiceModel(Func controlIdFn) - { - Guard.NotNull(controlIdFn, nameof(controlIdFn)); - - _controlIdFn = controlIdFn; - } - - public override string BuildControlId() - { - return _controlIdFn(this); - } - } - - public class GenericChoiceItemModel : ChoiceItemModel - { - private readonly Func _itemLabelFn; - - public GenericChoiceItemModel(Func itemLabelFn) - { - Guard.NotNull(itemLabelFn, nameof(itemLabelFn)); - - _itemLabelFn = itemLabelFn; - } - - public override string GetItemLabel() - { - return _itemLabelFn(this); - } - } + public class GenericChoiceModel : ChoiceModel + { + private readonly Func _controlIdFn; + + public GenericChoiceModel(Func controlIdFn) + { + Guard.NotNull(controlIdFn, nameof(controlIdFn)); + + _controlIdFn = controlIdFn; + } + + public override string BuildControlId() + { + return _controlIdFn(this); + } + } + + public class GenericChoiceItemModel : ChoiceItemModel + { + private readonly Func _itemLabelFn; + + public GenericChoiceItemModel(Func itemLabelFn) + { + Guard.NotNull(itemLabelFn, nameof(itemLabelFn)); + + _itemLabelFn = itemLabelFn; + } + + public override string GetItemLabel() + { + return _itemLabelFn(this); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/BoxSpacing.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/BoxSpacing.cs index 8b72005580..c447470207 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/BoxSpacing.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/BoxSpacing.cs @@ -1,26 +1,24 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using Newtonsoft.Json; namespace SmartStore.Web.Framework.UI { - public class BoxSpacing - { - [Range(0, 6)] - [JsonProperty("t")] - public byte? Top { get; set; } + public class BoxSpacing + { + [Range(0, 6)] + [JsonProperty("t")] + public byte? Top { get; set; } - [Range(0, 6)] - [JsonProperty("r")] - public byte? Right { get; set; } + [Range(0, 6)] + [JsonProperty("r")] + public byte? Right { get; set; } - [Range(0, 6)] - [JsonProperty("b")] - public byte? Bottom { get; set; } + [Range(0, 6)] + [JsonProperty("b")] + public byte? Bottom { get; set; } - [Range(0, 6)] - [JsonProperty("l")] - public byte? Left { get; set; } - } + [Range(0, 6)] + [JsonProperty("l")] + public byte? Left { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs index 10806732cb..c983dee479 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs @@ -1,8 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Web.Routing; -namespace SmartStore.Web.Framework.UI +namespace SmartStore.Web.Framework.UI { public abstract class Component : IUiComponent { @@ -13,16 +12,10 @@ protected Component() public string Id { - get - { - return !this.HtmlAttributes.ContainsKey("id") - ? this.Name + get => !this.HtmlAttributes.ContainsKey("id") + ? this.Name : (this.HtmlAttributes["id"] as string); - } - set - { - this.HtmlAttributes["id"] = value; - } + set => this.HtmlAttributes["id"] = value; } public string Name @@ -31,7 +24,7 @@ public string Name set; } - public IDictionary HtmlAttributes + public IDictionary HtmlAttributes { get; private set; @@ -39,12 +32,6 @@ public IDictionary HtmlAttributes - public virtual bool NameIsRequired - { - get - { - return false; - } - } - } + public virtual bool NameIsRequired => false; + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs index bb034c7061..e6029660ad 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Web; -using SmartStore.Utilities; -using SmartStore.Core.Infrastructure; using System.Web.Mvc; +using SmartStore.Core.Infrastructure; +using SmartStore.Utilities; namespace SmartStore.Web.Framework.UI { - public abstract class ComponentBuilder : IHtmlString, IHideObjectMembers + public abstract class ComponentBuilder : IHtmlString, IHideObjectMembers where TComponent : Component where TBuilder : ComponentBuilder { @@ -17,7 +17,7 @@ protected ComponentBuilder(TComponent component, HtmlHelper htmlHelper) { Guard.NotNull(component, nameof(component)); Guard.NotNull(htmlHelper, nameof(htmlHelper)); - + this.Component = component; this.HtmlHelper = htmlHelper; } @@ -68,39 +68,39 @@ private void EnrichRenderer(ComponentRenderer renderer) renderer.ViewData = this.HtmlHelper.ViewData; } - public TBuilder WithRenderer(ComponentRenderer instance) - { - Guard.NotNull(instance, nameof(instance)); + public TBuilder WithRenderer(ComponentRenderer instance) + { + Guard.NotNull(instance, nameof(instance)); - return this.WithRenderer>(instance); - } + return this.WithRenderer>(instance); + } - public TBuilder WithRenderer(ComponentRenderer instance) + public TBuilder WithRenderer(ComponentRenderer instance) where T : ComponentRenderer { Guard.NotNull(instance, nameof(instance)); - this.Renderer = instance; - return this as TBuilder; - } + this.Renderer = instance; + return this as TBuilder; + } - public TBuilder WithRenderer() - where T : ComponentRenderer - { - return this.WithRenderer(typeof(T)); - } + public TBuilder WithRenderer() + where T : ComponentRenderer + { + return this.WithRenderer(typeof(T)); + } - public TBuilder WithRenderer(Type rendererType) + public TBuilder WithRenderer(Type rendererType) { Guard.NotNull(rendererType, nameof(rendererType)); Guard.Implements>(rendererType); - if (Activator.CreateInstance(rendererType) is ComponentRenderer renderer) - { - this.Renderer = renderer; - } + if (Activator.CreateInstance(rendererType) is ComponentRenderer renderer) + { + this.Renderer = renderer; + } - return this as TBuilder; + return this as TBuilder; } public virtual TBuilder Name(string name) @@ -109,7 +109,7 @@ public virtual TBuilder Name(string name) return this as TBuilder; } - public virtual TBuilder HtmlAttributes(object attributes) + public virtual TBuilder HtmlAttributes(object attributes) { return this.HtmlAttributes(CommonHelper.ObjectToDictionary(attributes)); } @@ -120,24 +120,24 @@ public virtual TBuilder HtmlAttributes(IDictionary attributes) return this as TBuilder; } - public virtual TBuilder HtmlAttribute(string name, object value) - { - Guard.NotEmpty(name, nameof(name)); - Guard.NotNull(value, nameof(value)); + public virtual TBuilder HtmlAttribute(string name, object value) + { + Guard.NotEmpty(name, nameof(name)); + Guard.NotNull(value, nameof(value)); - this.Component.HtmlAttributes[name] = value; - return this as TBuilder; - } + this.Component.HtmlAttributes[name] = value; + return this as TBuilder; + } - public virtual TBuilder AddCssClass(string cssClass) - { - Guard.NotEmpty(cssClass, nameof(cssClass)); + public virtual TBuilder AddCssClass(string cssClass) + { + Guard.NotEmpty(cssClass, nameof(cssClass)); - this.Component.HtmlAttributes.AppendCssClass(cssClass); - return this as TBuilder; - } + this.Component.HtmlAttributes.AppendCssClass(cssClass); + return this as TBuilder; + } - public string ToHtmlString() + public string ToHtmlString() { return this.Renderer.ToHtmlString(); } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentFactory.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentFactory.cs index 455b58f2f3..a429f6128f 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentFactory.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentFactory.cs @@ -60,21 +60,21 @@ public virtual PagerBuilder Pager(IPageable model) return new PagerBuilder(new Pager(), this.HtmlHelper).Model(model); } - public virtual EntityPickerBuilder EntityPicker() - { - return new EntityPickerBuilder(new EntityPicker(), this.HtmlHelper); - } + public virtual EntityPickerBuilder EntityPicker() + { + return new EntityPickerBuilder(new EntityPicker(), this.HtmlHelper); + } - public virtual FileUploaderBuilder FileUploader() - { - return new FileUploaderBuilder(new FileUploader(), this.HtmlHelper); - } + public virtual FileUploaderBuilder FileUploader() + { + return new FileUploaderBuilder(new FileUploader(), this.HtmlHelper); + } public virtual MenuBuilder Menu() { return new MenuBuilder(new Menu(), this.HtmlHelper).WithRenderer(new MenuRenderer()); } - #endregion - } + #endregion + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs index 36d21bec1a..115ab3ca81 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs @@ -1,11 +1,11 @@ using System; -using System.Web.Mvc; +using System.IO; using System.Web; +using System.Web.Mvc; using System.Web.UI; -using System.IO; namespace SmartStore.Web.Framework.UI -{ +{ public abstract class ComponentRenderer : IHtmlString where TComponent : Component { protected ComponentRenderer() @@ -51,40 +51,40 @@ public virtual void VerifyState() } } - protected string SanitizeId(string id) - { - return id.SanitizeHtmlId(); - } + protected string SanitizeId(string id) + { + return id.SanitizeHtmlId(); + } - public virtual void Render() + public virtual void Render() { - WriteHtml(ViewContext.Writer); - } + WriteHtml(ViewContext.Writer); + } public virtual string ToHtmlString() { using (var stringWriter = new StringWriter()) { - WriteHtml(stringWriter); - var str = stringWriter.ToString(); - return str; - } - } + WriteHtml(stringWriter); + var str = stringWriter.ToString(); + return str; + } + } - protected void WriteHtml(TextWriter writer) - { - this.VerifyState(); - this.Component.Id = SanitizeId(this.Component.Id); + protected void WriteHtml(TextWriter writer) + { + this.VerifyState(); + this.Component.Id = SanitizeId(this.Component.Id); - using (var htmlWriter = new HtmlTextWriter(writer)) - { - WriteHtmlCore(htmlWriter); - } - } + using (var htmlWriter = new HtmlTextWriter(writer)) + { + WriteHtmlCore(htmlWriter); + } + } - protected virtual void WriteHtmlCore(HtmlTextWriter writer) - { - throw new NotImplementedException(); - } + protected virtual void WriteHtmlCore(HtmlTextWriter writer) + { + throw new NotImplementedException(); + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRendererUtils.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRendererUtils.cs index 4916e25252..9e10d5c572 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRendererUtils.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRendererUtils.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; namespace SmartStore.Web.Framework.UI -{ +{ public static class ComponentRendererUtils { public static IDictionary AppendCssClass(this IDictionary attributes, Func cssClass) diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPicker.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPicker.cs index fcca6a595b..12ed0951cb 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPicker.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPicker.cs @@ -2,48 +2,48 @@ { public class EntityPicker : Component { - public EntityPicker() + public EntityPicker() { - EntityType = "product"; - IconCssClass = "fa fa-search"; - HtmlAttributes["type"] = "button"; - HtmlAttributes.AppendCssClass("btn btn-secondary"); - HighlightSearchTerm = true; - AppendMode = true; - Delimiter = ","; - FieldName = "id"; - } - - public string EntityType { get; set; } + EntityType = "product"; + IconCssClass = "fa fa-search"; + HtmlAttributes["type"] = "button"; + HtmlAttributes.AppendCssClass("btn btn-secondary"); + HighlightSearchTerm = true; + AppendMode = true; + Delimiter = ","; + FieldName = "id"; + } + + public string EntityType { get; set; } public int LanguageId { get; set; } public string TargetInputSelector - { - get { return HtmlAttributes["data-target"] as string; } - set { HtmlAttributes["data-target"] = value; } - } - - public string Caption { get; set; } - public string IconCssClass { get; set; } - - public string DialogTitle { get; set; } - public string DialogUrl { get; set; } - - public bool DisableGroupedProducts { get; set; } - public bool DisableBundleProducts { get; set; } - public int[] DisabledEntityIds { get; set; } - public string[] Selected { get; set; } - - public bool EnableThumbZoomer { get; set; } - public bool HighlightSearchTerm { get; set; } - - public int MaxItems { get; set; } - public bool AppendMode { get; set; } - public string Delimiter { get; set; } - public string FieldName { get; set; } - - public string OnDialogLoadingHandlerName { get; set; } - public string OnDialogLoadedHandlerName { get; set; } - public string OnSelectionCompletedHandlerName { get; set; } - } + { + get => HtmlAttributes["data-target"] as string; + set => HtmlAttributes["data-target"] = value; + } + + public string Caption { get; set; } + public string IconCssClass { get; set; } + + public string DialogTitle { get; set; } + public string DialogUrl { get; set; } + + public bool DisableGroupedProducts { get; set; } + public bool DisableBundleProducts { get; set; } + public int[] DisabledEntityIds { get; set; } + public string[] Selected { get; set; } + + public bool EnableThumbZoomer { get; set; } + public bool HighlightSearchTerm { get; set; } + + public int MaxItems { get; set; } + public bool AppendMode { get; set; } + public string Delimiter { get; set; } + public string FieldName { get; set; } + + public string OnDialogLoadingHandlerName { get; set; } + public string OnDialogLoadedHandlerName { get; set; } + public string OnSelectionCompletedHandlerName { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs index 78b3d4867b..842771f5d5 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs @@ -10,22 +10,22 @@ public class EntityPickerBuilder : ComponentBuilder htmlHelper) : base(component, htmlHelper) { - WithRenderer(new ViewBasedComponentRenderer("EntityPicker")); - DialogUrl(UrlHelper.GenerateUrl( - null, - "Picker", - "Entity", - new RouteValueDictionary { { "area", "" } }, - RouteTable.Routes, - htmlHelper.ViewContext.RequestContext, - false)); - } - - public EntityPickerBuilder EntityType(string value) - { - base.Component.EntityType = value; - return this; - } + WithRenderer(new ViewBasedComponentRenderer("EntityPicker")); + DialogUrl(UrlHelper.GenerateUrl( + null, + "Picker", + "Entity", + new RouteValueDictionary { { "area", "" } }, + RouteTable.Routes, + htmlHelper.ViewContext.RequestContext, + false)); + } + + public EntityPickerBuilder EntityType(string value) + { + base.Component.EntityType = value; + return this; + } public EntityPickerBuilder LanguageId(int value) { @@ -34,128 +34,128 @@ public EntityPickerBuilder LanguageId(int value) } public EntityPickerBuilder Caption(string value) - { - base.Component.Caption = value; - return this; - } - - public EntityPickerBuilder IconCssClass(string value) - { - base.Component.IconCssClass = value; - return this; - } - - public EntityPickerBuilder Tooltip(string value) - { - base.Component.HtmlAttributes["title"] = value; - return this; - } - - public EntityPickerBuilder DialogTitle(string value) - { - base.Component.DialogTitle = value; - return this; - } - - public EntityPickerBuilder DialogUrl(string value) - { - base.Component.DialogUrl = value; - return this; - } - - - public EntityPickerBuilder For(Expression> expression) - { - Guard.NotNull(expression, nameof(expression)); - - return For(ExpressionHelper.GetExpressionText(expression)); - } - - public EntityPickerBuilder For(string expression) - { - base.Component.TargetInputSelector = "#" + this.HtmlHelper.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldId(expression); - return this; - } - - - public EntityPickerBuilder DisableGroupedProducts(bool value) - { - base.Component.DisableGroupedProducts = value; - return this; - } - - public EntityPickerBuilder DisableBundleProducts(bool value) - { - base.Component.DisableBundleProducts = value; - return this; - } - - public EntityPickerBuilder DisabledEntityIds(params int[] values) - { - base.Component.DisabledEntityIds = values; - return this; - } - - public EntityPickerBuilder Selected(params string[] values) - { - base.Component.Selected = values; - return this; - } - - public EntityPickerBuilder EnableThumbZoomer(bool value) - { - base.Component.EnableThumbZoomer = value; - return this; - } - - public EntityPickerBuilder HighlightSearchTerm(bool value) - { - base.Component.HighlightSearchTerm = value; - return this; - } - - - public EntityPickerBuilder MaxItems(int value) - { - base.Component.MaxItems = value; - return this; - } - - public EntityPickerBuilder AppendMode(bool value) - { - base.Component.AppendMode = value; - return this; - } - - public EntityPickerBuilder Delimiter(string value) - { - base.Component.Delimiter = value; - return this; - } - - public EntityPickerBuilder FieldName(string value) - { - base.Component.FieldName = value; - return this; - } - - - public EntityPickerBuilder OnDialogLoading(string handlerName) - { - base.Component.OnDialogLoadingHandlerName = handlerName; - return this; - } - - public EntityPickerBuilder OnDialogLoaded(string handlerName) - { - base.Component.OnDialogLoadedHandlerName = handlerName; - return this; - } - - public EntityPickerBuilder OnSelectionCompleted(string handlerName) - { - base.Component.OnSelectionCompletedHandlerName = handlerName; - return this; - } - } + { + base.Component.Caption = value; + return this; + } + + public EntityPickerBuilder IconCssClass(string value) + { + base.Component.IconCssClass = value; + return this; + } + + public EntityPickerBuilder Tooltip(string value) + { + base.Component.HtmlAttributes["title"] = value; + return this; + } + + public EntityPickerBuilder DialogTitle(string value) + { + base.Component.DialogTitle = value; + return this; + } + + public EntityPickerBuilder DialogUrl(string value) + { + base.Component.DialogUrl = value; + return this; + } + + + public EntityPickerBuilder For(Expression> expression) + { + Guard.NotNull(expression, nameof(expression)); + + return For(ExpressionHelper.GetExpressionText(expression)); + } + + public EntityPickerBuilder For(string expression) + { + base.Component.TargetInputSelector = "#" + this.HtmlHelper.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldId(expression); + return this; + } + + + public EntityPickerBuilder DisableGroupedProducts(bool value) + { + base.Component.DisableGroupedProducts = value; + return this; + } + + public EntityPickerBuilder DisableBundleProducts(bool value) + { + base.Component.DisableBundleProducts = value; + return this; + } + + public EntityPickerBuilder DisabledEntityIds(params int[] values) + { + base.Component.DisabledEntityIds = values; + return this; + } + + public EntityPickerBuilder Selected(params string[] values) + { + base.Component.Selected = values; + return this; + } + + public EntityPickerBuilder EnableThumbZoomer(bool value) + { + base.Component.EnableThumbZoomer = value; + return this; + } + + public EntityPickerBuilder HighlightSearchTerm(bool value) + { + base.Component.HighlightSearchTerm = value; + return this; + } + + + public EntityPickerBuilder MaxItems(int value) + { + base.Component.MaxItems = value; + return this; + } + + public EntityPickerBuilder AppendMode(bool value) + { + base.Component.AppendMode = value; + return this; + } + + public EntityPickerBuilder Delimiter(string value) + { + base.Component.Delimiter = value; + return this; + } + + public EntityPickerBuilder FieldName(string value) + { + base.Component.FieldName = value; + return this; + } + + + public EntityPickerBuilder OnDialogLoading(string handlerName) + { + base.Component.OnDialogLoadingHandlerName = handlerName; + return this; + } + + public EntityPickerBuilder OnDialogLoaded(string handlerName) + { + base.Component.OnDialogLoadedHandlerName = handlerName; + return this; + } + + public EntityPickerBuilder OnSelectionCompleted(string handlerName) + { + base.Component.OnSelectionCompletedHandlerName = handlerName; + return this; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Enums.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Enums.cs index 75bb64220f..96094d1808 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Enums.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Enums.cs @@ -1,29 +1,27 @@ -using System; - -namespace SmartStore.Web.Framework.UI -{ +namespace SmartStore.Web.Framework.UI +{ public enum BadgeStyle { - Secondary, - Primary, - Success, - Info, - Warning, + Secondary, + Primary, + Success, + Info, + Warning, Danger, - Light, - Dark - } + Light, + Dark + } - public enum ButtonStyle - { - Secondary, - Primary, - Success, - Info, - Warning, - Danger, - Light, - Dark, - Link - } + public enum ButtonStyle + { + Secondary, + Primary, + Success, + Info, + Warning, + Danger, + Light, + Dark, + Link + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploader.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploader.cs index c89fb7b428..12eb04dd6d 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploader.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploader.cs @@ -8,56 +8,56 @@ namespace SmartStore.Web.Framework.UI { public class FileUploader : Component { - public FileUploader() - : this(EngineContext.Current.Resolve()) - { - } + public FileUploader() + : this(EngineContext.Current.Resolve()) + { + } - public FileUploader(Localizer localizer) + public FileUploader(Localizer localizer) { - HtmlAttributes.AppendCssClass("fu-fileupload"); - HtmlAttributes.Add("data-accept", "gif,jpeg,jpg,png"); - HtmlAttributes.Add("data-show-remove-after-upload", "false"); - - if (localizer != null) - { - UploadText = localizer("Common.Fileuploader.Upload"); - } - } + HtmlAttributes.AppendCssClass("fu-fileupload"); + HtmlAttributes.Add("data-accept", "gif,jpeg,jpg,png"); + HtmlAttributes.Add("data-show-remove-after-upload", "false"); + + if (localizer != null) + { + UploadText = localizer("Common.Fileuploader.Upload"); + } + } - public string Path { get; set; } = SystemAlbumProvider.Files; + public string Path { get; set; } = SystemAlbumProvider.Files; - public string UploadUrl - { - get { return HtmlAttributes["data-upload-url"] as string; } - set { HtmlAttributes["data-upload-url"] = value; } - } + public string UploadUrl + { + get => HtmlAttributes["data-upload-url"] as string; + set => HtmlAttributes["data-upload-url"] = value; + } - public string UploadText { get; set; } - public bool ShowRemoveButton { get; set; } - public bool ShowRemoveButtonAfterUpload { get; set; } - public bool ShowBrowseMedia { get; set; } - public bool HasTemplatePreview { get; set; } - public string ClickableElement { get; set; } - public bool DownloadEnabled{ get; set; } + public string UploadText { get; set; } + public bool ShowRemoveButton { get; set; } + public bool ShowRemoveButtonAfterUpload { get; set; } + public bool ShowBrowseMedia { get; set; } + public bool HasTemplatePreview { get; set; } + public string ClickableElement { get; set; } + public bool DownloadEnabled { get; set; } - public bool Multifile { get; set; } - public string TypeFilter { get; set; } - public string PreviewContainerId { get; set; } - public int? MainFileId { get; set; } - public long? MaxFileSize { get; set; } - public string EntityType { get; set; } - public int EntityId { get; set; } - public string DeleteUrl { get; set; } - public string SortUrl { get; set; } - public string EntityAssignmentUrl { get; set; } - public IEnumerable UploadedFiles { get; set; } - public string OnUploadingHandlerName { get; set; } - public string OnUploadCompletedHandlerName { get; set; } - public string OnErrorHandlerName { get; set; } - public string OnFileRemoveHandlerName { get; set; } - public string OnAbortedHandlerName { get; set; } - public string OnCompletedHandlerName { get; set; } - public string OnMediaSelectedHandlerName { get; set; } - } + public bool Multifile { get; set; } + public string TypeFilter { get; set; } + public string PreviewContainerId { get; set; } + public int? MainFileId { get; set; } + public long? MaxFileSize { get; set; } + public string EntityType { get; set; } + public int EntityId { get; set; } + public string DeleteUrl { get; set; } + public string SortUrl { get; set; } + public string EntityAssignmentUrl { get; set; } + public IEnumerable UploadedFiles { get; set; } + public string OnUploadingHandlerName { get; set; } + public string OnUploadCompletedHandlerName { get; set; } + public string OnErrorHandlerName { get; set; } + public string OnFileRemoveHandlerName { get; set; } + public string OnAbortedHandlerName { get; set; } + public string OnCompletedHandlerName { get; set; } + public string OnMediaSelectedHandlerName { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs index 488f51a753..e2d5dfb4a6 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs @@ -12,181 +12,181 @@ public class FileUploaderBuilder : ComponentBuilder htmlHelper) : base(component, htmlHelper) { - WithRenderer(new ViewBasedComponentRenderer("FileUploader")); - TypeFilter("*"); - } - - public FileUploaderBuilder Path(string value) - { - base.Component.Path = value; - return this; - } - - public FileUploaderBuilder UploadUrl(string value) - { - base.Component.UploadUrl = value; - return this; - } - - public FileUploaderBuilder ShowRemoveButton(bool value) - { - base.Component.ShowRemoveButton = value; - return this; - } - - public FileUploaderBuilder ShowRemoveButtonAfterUpload(bool value) - { - base.Component.HtmlAttributes["data-show-remove-after-upload"] = value.ToString().ToLower(); - base.Component.ShowRemoveButtonAfterUpload = value; - return this; - } - - public FileUploaderBuilder ShowBrowseMedia(bool value) - { - base.Component.ShowBrowseMedia = value; - return this; - } - - public FileUploaderBuilder HasTemplatePreview(bool value) - { - base.Component.HasTemplatePreview = value; - return this; - } - - public FileUploaderBuilder DownloadEnabled(bool value) - { - base.Component.DownloadEnabled = value; - return this; - } - - public FileUploaderBuilder ClickableElement(string value) - { - base.Component.ClickableElement = value; - return this; - } - - public FileUploaderBuilder Multifile(bool value) - { - base.Component.Multifile = value; - return this; - } - - public FileUploaderBuilder TypeFilter(string value) - { - var mediaTypeResolver = EngineContext.Current.Resolve(); - var extensions = mediaTypeResolver.ParseTypeFilter(value); - - base.Component.HtmlAttributes["data-accept"] = "." + String.Join(",.", extensions); - base.Component.TypeFilter = value; - - return this; - } - - public FileUploaderBuilder PreviewContainerId(string value) - { - base.Component.PreviewContainerId = value; - return this; - } - - public FileUploaderBuilder MainFileId(int? value) - { - base.Component.MainFileId = value; - return this; - } - - /// - /// Sets the maximum file size. - /// Use "0" for an unlimited file size and "null" for the default size (MediaSettings.MaxUploadFileSize). - /// - /// Maximum file size in KB. - public FileUploaderBuilder MaxFileSize(long? value) - { - base.Component.MaxFileSize = value; - return this; - } - - public FileUploaderBuilder UploadedFiles(IEnumerable value) - { - base.Component.UploadedFiles = value; - return this; - } - - public FileUploaderBuilder EntityType(string value) - { - base.Component.EntityType = value; - return this; - } - - public FileUploaderBuilder EntityId(int value) - { - base.Component.EntityId = value; - return this; - } - - public FileUploaderBuilder DeleteUrl(string value) - { - base.Component.DeleteUrl = value; - return this; - } - - public FileUploaderBuilder SortUrl(string value) - { - base.Component.SortUrl = value; - return this; - } - - public FileUploaderBuilder EntityAssignmentUrl(string value) - { - base.Component.EntityAssignmentUrl = value; - return this; - } - - public FileUploaderBuilder UploadText(string value) - { - base.Component.UploadText = value; - return this; - } - - public FileUploaderBuilder OnUploadingHandlerName(string handlerName) - { - base.Component.OnUploadingHandlerName = handlerName; - return this; - } - - public FileUploaderBuilder OnUploadCompletedHandlerName(string handlerName) - { - base.Component.OnUploadCompletedHandlerName = handlerName; - return this; - } - - public FileUploaderBuilder OnErrorHandlerName(string handlerName) - { - base.Component.OnErrorHandlerName = handlerName; - return this; - } - - public FileUploaderBuilder OnFileRemoveHandlerName(string handlerName) - { - base.Component.OnFileRemoveHandlerName = handlerName; - return this; - } - - public FileUploaderBuilder OnAbortedHandlerName(string handlerName) - { - base.Component.OnAbortedHandlerName = handlerName; - return this; - } - - public FileUploaderBuilder OnCompletedHandlerName(string handlerName) - { - base.Component.OnCompletedHandlerName = handlerName; - return this; - } - - public FileUploaderBuilder OnMediaSelectedHandlerName(string handlerName) - { - base.Component.OnMediaSelectedHandlerName = handlerName; - return this; - } - } + WithRenderer(new ViewBasedComponentRenderer("FileUploader")); + TypeFilter("*"); + } + + public FileUploaderBuilder Path(string value) + { + base.Component.Path = value; + return this; + } + + public FileUploaderBuilder UploadUrl(string value) + { + base.Component.UploadUrl = value; + return this; + } + + public FileUploaderBuilder ShowRemoveButton(bool value) + { + base.Component.ShowRemoveButton = value; + return this; + } + + public FileUploaderBuilder ShowRemoveButtonAfterUpload(bool value) + { + base.Component.HtmlAttributes["data-show-remove-after-upload"] = value.ToString().ToLower(); + base.Component.ShowRemoveButtonAfterUpload = value; + return this; + } + + public FileUploaderBuilder ShowBrowseMedia(bool value) + { + base.Component.ShowBrowseMedia = value; + return this; + } + + public FileUploaderBuilder HasTemplatePreview(bool value) + { + base.Component.HasTemplatePreview = value; + return this; + } + + public FileUploaderBuilder DownloadEnabled(bool value) + { + base.Component.DownloadEnabled = value; + return this; + } + + public FileUploaderBuilder ClickableElement(string value) + { + base.Component.ClickableElement = value; + return this; + } + + public FileUploaderBuilder Multifile(bool value) + { + base.Component.Multifile = value; + return this; + } + + public FileUploaderBuilder TypeFilter(string value) + { + var mediaTypeResolver = EngineContext.Current.Resolve(); + var extensions = mediaTypeResolver.ParseTypeFilter(value); + + base.Component.HtmlAttributes["data-accept"] = "." + String.Join(",.", extensions); + base.Component.TypeFilter = value; + + return this; + } + + public FileUploaderBuilder PreviewContainerId(string value) + { + base.Component.PreviewContainerId = value; + return this; + } + + public FileUploaderBuilder MainFileId(int? value) + { + base.Component.MainFileId = value; + return this; + } + + /// + /// Sets the maximum file size. + /// Use "0" for an unlimited file size and "null" for the default size (MediaSettings.MaxUploadFileSize). + /// + /// Maximum file size in KB. + public FileUploaderBuilder MaxFileSize(long? value) + { + base.Component.MaxFileSize = value; + return this; + } + + public FileUploaderBuilder UploadedFiles(IEnumerable value) + { + base.Component.UploadedFiles = value; + return this; + } + + public FileUploaderBuilder EntityType(string value) + { + base.Component.EntityType = value; + return this; + } + + public FileUploaderBuilder EntityId(int value) + { + base.Component.EntityId = value; + return this; + } + + public FileUploaderBuilder DeleteUrl(string value) + { + base.Component.DeleteUrl = value; + return this; + } + + public FileUploaderBuilder SortUrl(string value) + { + base.Component.SortUrl = value; + return this; + } + + public FileUploaderBuilder EntityAssignmentUrl(string value) + { + base.Component.EntityAssignmentUrl = value; + return this; + } + + public FileUploaderBuilder UploadText(string value) + { + base.Component.UploadText = value; + return this; + } + + public FileUploaderBuilder OnUploadingHandlerName(string handlerName) + { + base.Component.OnUploadingHandlerName = handlerName; + return this; + } + + public FileUploaderBuilder OnUploadCompletedHandlerName(string handlerName) + { + base.Component.OnUploadCompletedHandlerName = handlerName; + return this; + } + + public FileUploaderBuilder OnErrorHandlerName(string handlerName) + { + base.Component.OnErrorHandlerName = handlerName; + return this; + } + + public FileUploaderBuilder OnFileRemoveHandlerName(string handlerName) + { + base.Component.OnFileRemoveHandlerName = handlerName; + return this; + } + + public FileUploaderBuilder OnAbortedHandlerName(string handlerName) + { + base.Component.OnAbortedHandlerName = handlerName; + return this; + } + + public FileUploaderBuilder OnCompletedHandlerName(string handlerName) + { + base.Component.OnCompletedHandlerName = handlerName; + return this; + } + + public FileUploaderBuilder OnMediaSelectedHandlerName(string handlerName) + { + base.Component.OnMediaSelectedHandlerName = handlerName; + return this; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs index 9d37f832f1..21a87bc743 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using System.Web; using System.Web.Mvc; using SmartStore.Utilities.ObjectPools; @@ -15,45 +14,45 @@ public static ComponentFactory SmartStore(this HtmlHelper(helper); } - public static IHtmlString Attrs(this HtmlHelper html, IDictionary attrs, params string[] exclude) - { - var sb = PooledStringBuilder.Rent(); + public static IHtmlString Attrs(this HtmlHelper html, IDictionary attrs, params string[] exclude) + { + var sb = PooledStringBuilder.Rent(); - using (var writer = new StringWriter(sb)) - { - RenderAttrs(attrs, writer, exclude); - } + using (var writer = new StringWriter(sb)) + { + RenderAttrs(attrs, writer, exclude); + } - return MvcHtmlString.Create(sb.ToStringAndReturn()); - } + return MvcHtmlString.Create(sb.ToStringAndReturn()); + } - public static void RenderAttrs(this HtmlHelper html, IDictionary attrs, params string[] exclude) - { - RenderAttrs(attrs, html.ViewContext.Writer, exclude); - } + public static void RenderAttrs(this HtmlHelper html, IDictionary attrs, params string[] exclude) + { + RenderAttrs(attrs, html.ViewContext.Writer, exclude); + } - private static void RenderAttrs(IDictionary attrs, TextWriter output, params string[] exclude) - { - Guard.NotNull(attrs, nameof(attrs)); + private static void RenderAttrs(IDictionary attrs, TextWriter output, params string[] exclude) + { + Guard.NotNull(attrs, nameof(attrs)); - if (attrs.Count == 0) - { - return; - } + if (attrs.Count == 0) + { + return; + } - var first = true; + var first = true; - foreach (var kvp in attrs) - { + foreach (var kvp in attrs) + { if (exclude.Contains(kvp.Key)) continue; - - if (!first) - { - output.Write(" "); - } - first = false; + if (!first) + { + output.Write(" "); + } + + first = false; output.Write(kvp.Key); @@ -63,7 +62,7 @@ private static void RenderAttrs(IDictionary attrs, TextWriter ou HttpUtility.HtmlAttributeEncode(kvp.Value.ToString(), output); output.Write("\""); } - } - } - } + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs index 2f2753acfb..f252990485 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Web.WebPages; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/IHtmlAttributesContainer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/IHtmlAttributesContainer.cs index 31974274b4..e2e2135aa2 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/IHtmlAttributesContainer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/IHtmlAttributesContainer.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/IUiComponent.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/IUiComponent.cs index 7352829014..ad697d1bb7 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/IUiComponent.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/IUiComponent.cs @@ -1,6 +1,4 @@ -using System; - -namespace SmartStore.Web.Framework.UI +namespace SmartStore.Web.Framework.UI { public interface IUiComponent : IHtmlAttributesContainer { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/AdminMenuProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/AdminMenuProvider.cs index ccbc2fbbd6..a62bfc760c 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/AdminMenuProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/AdminMenuProvider.cs @@ -1,27 +1,20 @@ -using System; -using SmartStore.Collections; +using SmartStore.Collections; namespace SmartStore.Web.Framework.UI { - public abstract class AdminMenuProvider : IMenuProvider - { - public void BuildMenu(TreeNode rootNode) - { - var pluginsNode = rootNode.SelectNodeById("plugins"); - BuildMenuCore(pluginsNode); - } + public abstract class AdminMenuProvider : IMenuProvider + { + public void BuildMenu(TreeNode rootNode) + { + var pluginsNode = rootNode.SelectNodeById("plugins"); + BuildMenuCore(pluginsNode); + } - protected abstract void BuildMenuCore(TreeNode pluginsNode); + protected abstract void BuildMenuCore(TreeNode pluginsNode); - public string MenuName - { - get { return "admin"; } - } + public string MenuName => "admin"; - public virtual int Ordinal - { - get { return 0; } - } + public virtual int Ordinal => 0; - } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/CatalogMenuProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/CatalogMenuProvider.cs index 4c3e8f10f3..b3e9177e82 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/CatalogMenuProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/CatalogMenuProvider.cs @@ -1,21 +1,14 @@ -using System; -using SmartStore.Collections; +using SmartStore.Collections; namespace SmartStore.Web.Framework.UI { - public abstract class CatalogMenuProvider : IMenuProvider - { - public abstract void BuildMenu(TreeNode rootNode); + public abstract class CatalogMenuProvider : IMenuProvider + { + public abstract void BuildMenu(TreeNode rootNode); - public string MenuName - { - get { return "catalog"; } - } + public string MenuName => "catalog"; - public virtual int Ordinal - { - get { return 0; } - } + public virtual int Ordinal => 0; - } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/IMenuProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/IMenuProvider.cs index d48441cc0d..6ce5cb41c4 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/IMenuProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/IMenuProvider.cs @@ -1,19 +1,18 @@ -using System; -using SmartStore.Collections; +using SmartStore.Collections; namespace SmartStore.Web.Framework.UI { - /// - /// Enables (plugins) developers to inject menu items to menus - /// - public interface IMenuProvider : IOrdered + /// + /// Enables (plugins) developers to inject menu items to menus + /// + public interface IMenuProvider : IOrdered { void BuildMenu(TreeNode rootNode); - /// - /// Gets the menu name to inject the menu items into (e.g. admin, catalog etc.) - /// - string MenuName { get; } + /// + /// Gets the menu name to inject the menu items into (e.g. admin, catalog etc.) + /// + string MenuName { get; } } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/Menu.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/Menu.cs index f17eae41e2..aa1088693e 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/Menu.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/Menu.cs @@ -6,6 +6,6 @@ public class Menu : Component public string Template { get; set; } - public RouteInfo Route { get; set; } + public RouteInfo Route { get; set; } } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuBuilder.cs index d3b2e75f5e..1703ee3988 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuBuilder.cs @@ -11,16 +11,16 @@ public MenuBuilder(Menu component, HtmlHelper htmlHelper) public MenuBuilder Template(string value) { - Component.Route = null; - Component.Template = value; + Component.Route = null; + Component.Template = value; return this; } - public MenuBuilder Template(string action, string controller, object routeValues = null) - { - Component.Template = null; - Component.Route = new RouteInfo(action, controller, routeValues); - return this; - } - } + public MenuBuilder Template(string action, string controller, object routeValues = null) + { + Component.Template = null; + Component.Route = new RouteInfo(action, controller, routeValues); + return this; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuExtensions.cs index 432460ef32..7a49919a7c 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuExtensions.cs @@ -12,15 +12,15 @@ namespace SmartStore.Web.Framework.UI { public static class MenuExtensions - { - public static IEnumerable> GetBreadcrumb(this TreeNode node) - { - Guard.NotNull(node, nameof(node)); + { + public static IEnumerable> GetBreadcrumb(this TreeNode node) + { + Guard.NotNull(node, nameof(node)); - return node.Trail.Where(x => !x.IsRoot); - } + return node.Trail.Where(x => !x.IsRoot); + } - public static string GetItemText(this TreeNode node, Localizer localizer) + public static string GetItemText(this TreeNode node, Localizer localizer) { string result = null; @@ -37,62 +37,62 @@ public static string GetItemText(this TreeNode node, Localizer localiz return result; } - /// - /// Gets the state of node within the passed currentPath, which is the navigation breadcrumb. - /// - /// The node to get the state for - /// The current path/breadcrumb - /// - /// enumeration indicating whether the node is in the current path (Selected or Expanded) - /// and whether it has children (Parent) - /// - public static NodePathState GetNodePathState(this TreeNode node, IEnumerable> currentPath) - { - return GetNodePathState(node, currentPath.Select(x => x.Value).ToList()); - } - - /// - /// Gets the state of node within the passed currentPath, which is the navigation breadcrumb. - /// - /// The node to get the state for - /// The current path/breadcrumb - /// - /// enumeration indicating whether the node is in the current path (Selected or Expanded) - /// and whether it has children (Parent) - /// - public static NodePathState GetNodePathState(this TreeNode node, IList currentPath) - { - Guard.NotNull(currentPath, nameof(currentPath)); - - var state = NodePathState.Unknown; - - if (node.HasChildren) - { - state = state | NodePathState.Parent; - } - - var lastInPath = currentPath.LastOrDefault(); - - if (currentPath.Count > 0) - { - if (node.Value.Equals(lastInPath)) - { - state = state | NodePathState.Selected; - } - else - { - if (node.Depth - 1 < currentPath.Count) - { - if (currentPath[node.Depth - 1].Equals(node.Value)) - { - state = state | NodePathState.Expanded; - } - } - } - } - - return state; - } + /// + /// Gets the state of node within the passed currentPath, which is the navigation breadcrumb. + /// + /// The node to get the state for + /// The current path/breadcrumb + /// + /// enumeration indicating whether the node is in the current path (Selected or Expanded) + /// and whether it has children (Parent) + /// + public static NodePathState GetNodePathState(this TreeNode node, IEnumerable> currentPath) + { + return GetNodePathState(node, currentPath.Select(x => x.Value).ToList()); + } + + /// + /// Gets the state of node within the passed currentPath, which is the navigation breadcrumb. + /// + /// The node to get the state for + /// The current path/breadcrumb + /// + /// enumeration indicating whether the node is in the current path (Selected or Expanded) + /// and whether it has children (Parent) + /// + public static NodePathState GetNodePathState(this TreeNode node, IList currentPath) + { + Guard.NotNull(currentPath, nameof(currentPath)); + + var state = NodePathState.Unknown; + + if (node.HasChildren) + { + state = state | NodePathState.Parent; + } + + var lastInPath = currentPath.LastOrDefault(); + + if (currentPath.Count > 0) + { + if (node.Value.Equals(lastInPath)) + { + state = state | NodePathState.Selected; + } + else + { + if (node.Depth - 1 < currentPath.Count) + { + if (currentPath[node.Depth - 1].Equals(node.Value)) + { + state = state | NodePathState.Expanded; + } + } + } + } + + return state; + } /// /// Applies serialized route informations to a tree node. @@ -136,7 +136,7 @@ public static MenuModel CreateModel(this IMenu menu, string template, Controller var model = new MenuModel { Name = menu.Name, - Template = template ?? menu.Name, + Template = template ?? menu.Name, Root = menu.Root, SelectedNode = menu.ResolveCurrentNode(context) }; @@ -194,7 +194,7 @@ void AddChildItems(TreeNode parentNode, int parentItemId) var entities = itemMap.ContainsKey(parentItemId) ? itemMap[parentItemId].OrderBy(x => x.DisplayOrder) : Enumerable.Empty(); - + foreach (var entity in entities) { if (!string.IsNullOrEmpty(entity.ProviderName) && itemProviders.TryGetValue(entity.ProviderName, out var provider)) diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItem.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItem.cs index 0988079da8..eded7876f0 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItem.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItem.cs @@ -11,12 +11,12 @@ public class MenuItem : NavigationItem, ICloneable public MenuItem() { this.Attributes = new Dictionary(StringComparer.OrdinalIgnoreCase); - } + } - /// - /// If this menu item refers to an entity, the id of the backed entity (like category, products e.g.) - /// - public int EntityId { get; set; } + /// + /// If this menu item refers to an entity, the id of the backed entity (like category, products e.g.) + /// + public int EntityId { get; set; } public string EntityName { get; set; } public int MenuItemId { get; set; } @@ -40,10 +40,7 @@ public string Id return _id; } - set - { - _id = value; - } + set => _id = value; } public string ResKey { get; set; } @@ -54,7 +51,7 @@ public string Id public IDictionary Attributes { get; set; } - public MenuItemBuilder ToBuilder() + public MenuItemBuilder ToBuilder() { return new MenuItemBuilder(this); } @@ -64,14 +61,14 @@ public static implicit operator MenuItemBuilder(MenuItem menuItem) return menuItem.ToBuilder(); } - public MenuItem Clone() - { - return (MenuItem)this.MemberwiseClone(); - } + public MenuItem Clone() + { + return (MenuItem)this.MemberwiseClone(); + } - object ICloneable.Clone() - { - return this.Clone(); - } + object ICloneable.Clone() + { + return this.Clone(); + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItemBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItemBuilder.cs index 785aa05415..cda64e9c12 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItemBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItemBuilder.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuModel.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuModel.cs index 428f65ea31..3fddbd9200 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuModel.cs @@ -5,28 +5,28 @@ namespace SmartStore.Web.Framework.UI { public class MenuModel - { - private TreeNode _selectedNode; - private bool _seekedSelectedNode; + { + private TreeNode _selectedNode; + private bool _seekedSelectedNode; public string Name { get; set; } - public string Template { get; set; } + public string Template { get; set; } - public TreeNode Root { get; set; } - public IList> Path { get; set; } + public TreeNode Root { get; set; } + public IList> Path { get; set; } - public TreeNode SelectedNode - { - get - { - if (!_seekedSelectedNode) - { - _selectedNode = Path?.LastOrDefault() ?? Root; - _seekedSelectedNode = true; - } + public TreeNode SelectedNode + { + get + { + if (!_seekedSelectedNode) + { + _selectedNode = Path?.LastOrDefault() ?? Root; + _seekedSelectedNode = true; + } - return _selectedNode ?? Root; - } + return _selectedNode ?? Root; + } set { _selectedNode = value; @@ -36,6 +36,6 @@ public TreeNode SelectedNode _seekedSelectedNode = true; } - } - } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuPublisher.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuPublisher.cs index 4078ca66fd..82609d838d 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuPublisher.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuPublisher.cs @@ -1,60 +1,57 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using SmartStore.Collections; using SmartStore.Core.Caching; using SmartStore.Core.Infrastructure; namespace SmartStore.Web.Framework.UI { - public interface IMenuPublisher - { - void RegisterMenus(TreeNode rootNode, string menuName); - } - - public class MenuPublisher : IMenuPublisher - { - private readonly ITypeFinder _typeFinder; - private readonly IRequestCache _requestCache; - - public MenuPublisher(ITypeFinder typeFinder, IRequestCache requestCache) - { - _typeFinder = typeFinder; - _requestCache = requestCache; - } - - public void RegisterMenus(TreeNode rootNode, string menuName) - { - Guard.NotNull(rootNode, nameof(rootNode)); - Guard.NotEmpty(menuName, nameof(menuName)); - - var providers = _requestCache.Get("sm.menu.providers.{0}".FormatInvariant(menuName), () => - { - var allInstances = _requestCache.Get("sm.menu.allproviders", () => - { - var instances = new List(); - var providerTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); - - foreach (var type in providerTypes) - { - try - { - var provider = EngineContext.Current.ContainerManager.ResolveUnregistered(type) as IMenuProvider; - instances.Add(provider); - } - catch { } - } - - return instances; - }); - - return allInstances.Where(x => x.MenuName.IsCaseInsensitiveEqual(menuName)).OrderBy(x => x.Ordinal).ToList(); - }); - - providers.Each(x => x.BuildMenu(rootNode)); - } - - } + public interface IMenuPublisher + { + void RegisterMenus(TreeNode rootNode, string menuName); + } + + public class MenuPublisher : IMenuPublisher + { + private readonly ITypeFinder _typeFinder; + private readonly IRequestCache _requestCache; + + public MenuPublisher(ITypeFinder typeFinder, IRequestCache requestCache) + { + _typeFinder = typeFinder; + _requestCache = requestCache; + } + + public void RegisterMenus(TreeNode rootNode, string menuName) + { + Guard.NotNull(rootNode, nameof(rootNode)); + Guard.NotEmpty(menuName, nameof(menuName)); + + var providers = _requestCache.Get("sm.menu.providers.{0}".FormatInvariant(menuName), () => + { + var allInstances = _requestCache.Get("sm.menu.allproviders", () => + { + var instances = new List(); + var providerTypes = _typeFinder.FindClassesOfType(ignoreInactivePlugins: true); + + foreach (var type in providerTypes) + { + try + { + var provider = EngineContext.Current.ContainerManager.ResolveUnregistered(type) as IMenuProvider; + instances.Add(provider); + } + catch { } + } + + return instances; + }); + + return allInstances.Where(x => x.MenuName.IsCaseInsensitiveEqual(menuName)).OrderBy(x => x.Ordinal).ToList(); + }); + + providers.Each(x => x.BuildMenu(rootNode)); + } + + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs index bccc0d5ef1..668233de1d 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs @@ -1,61 +1,57 @@ -using System.Collections.Generic; -using System.Linq; -using System.Web.Mvc.Html; +using System.Web.Mvc.Html; using System.Web.UI; -using SmartStore.Collections; -using SmartStore.Core.Infrastructure; namespace SmartStore.Web.Framework.UI { public class MenuRenderer : ComponentRenderer { - protected override void WriteHtmlCore(HtmlTextWriter writer) - { - var route = Component.Route; + protected override void WriteHtmlCore(HtmlTextWriter writer) + { + var route = Component.Route; - if (route != null) - { - HtmlHelper.RenderAction(route.Action, route.Controller, route.RouteValues); - } - else - { - HtmlHelper.RenderAction("Menu", "Menu", new - { - area = "", - name = Component.Name, - template = Component.Template - }); - } - } + if (route != null) + { + HtmlHelper.RenderAction(route.Action, route.Controller, route.RouteValues); + } + else + { + HtmlHelper.RenderAction("Menu", "Menu", new + { + area = "", + name = Component.Name, + template = Component.Template + }); + } + } - public override void Render() - { - var c = Component; - var route = c.Route; + public override void Render() + { + var c = Component; + var route = c.Route; - if (route != null) - { - HtmlHelper.RenderAction(route.Action, route.Controller, route.RouteValues); - } - else - { - HtmlHelper.RenderAction("Menu", "Menu", new { area = "", name = c.Name, template = c.Template }); - } - } + if (route != null) + { + HtmlHelper.RenderAction(route.Action, route.Controller, route.RouteValues); + } + else + { + HtmlHelper.RenderAction("Menu", "Menu", new { area = "", name = c.Name, template = c.Template }); + } + } - public override string ToHtmlString() - { - var c = Component; - var route = c.Route; + public override string ToHtmlString() + { + var c = Component; + var route = c.Route; - if (route != null) - { - return HtmlHelper.Action(route.Action, route.Controller, route.RouteValues).ToHtmlString(); - } - else - { - return HtmlHelper.Action("Menu", "Menu", new { area = "", name = c.Name, template = c.Template }).ToHtmlString(); - } - } - } + if (route != null) + { + return HtmlHelper.Action(route.Action, route.Controller, route.RouteValues).ToHtmlString(); + } + else + { + return HtmlHelper.Action("Menu", "Menu", new { area = "", name = c.Name, template = c.Template }).ToHtmlString(); + } + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/NodePathState.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/NodePathState.cs index a567712ac5..076d3b6839 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/NodePathState.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/NodePathState.cs @@ -1,14 +1,13 @@ using System; -using System.Collections.Generic; namespace SmartStore.Web.Framework.UI { - [Flags] - public enum NodePathState - { - Unknown = 0, - Parent = 1, - Expanded = 2, - Selected = 4 - } + [Flags] + public enum NodePathState + { + Unknown = 0, + Parent = 1, + Expanded = 2, + Selected = 4 + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponent.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponent.cs index e3982af7fe..18cb948efb 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponent.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponent.cs @@ -1,84 +1,71 @@ -using System; -using System.Web.Routing; +using System.Web.Routing; namespace SmartStore.Web.Framework.UI { - public abstract class NavigatableComponent : Component, INavigatable - { - private string _actionName; - private string _controllerName; - private string _routeName; - private string _url; + public abstract class NavigatableComponent : Component, INavigatable + { + private string _actionName; + private string _controllerName; + private string _routeName; + private string _url; - protected NavigatableComponent() - { - this.RouteValues = new RouteValueDictionary(); - } + protected NavigatableComponent() + { + this.RouteValues = new RouteValueDictionary(); + } - public string ActionName - { - get - { - return _actionName; - } - set - { - _actionName = value; - _routeName = (string)(_url = null); - } - } + public string ActionName + { + get => _actionName; + set + { + _actionName = value; + _routeName = (string)(_url = null); + } + } - public string ControllerName - { - get - { - return _controllerName; - } - set - { - _controllerName = value; - _routeName = (string)(_url = null); - } - } + public string ControllerName + { + get => _controllerName; + set + { + _controllerName = value; + _routeName = (string)(_url = null); + } + } - public string RouteName - { - get - { - return _routeName; - } - set - { - _routeName = value; - _controllerName = _actionName = (string)(_url = null); - } - } + public string RouteName + { + get => _routeName; + set + { + _routeName = value; + _controllerName = _actionName = (string)(_url = null); + } + } - public RouteValueDictionary RouteValues - { - get; - set; - } + public RouteValueDictionary RouteValues + { + get; + set; + } - public string Url - { - get - { - return _url; - } - set - { - _url = value; - _routeName = _controllerName = (string)(_actionName = null); - this.RouteValues.Clear(); + public string Url + { + get => _url; + set + { + _url = value; + _routeName = _controllerName = (string)(_actionName = null); + this.RouteValues.Clear(); - } - } + } + } - public ModifiedParameter ModifiedParam - { - get; - protected set; - } - } + public ModifiedParameter ModifiedParam + { + get; + protected set; + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs index 5f6a13e8aa..4822affcce 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs @@ -3,7 +3,6 @@ using System.Web.Mvc; using System.Web.Routing; using System.Web.WebPages; -using SmartStore.Core; using SmartStore.Utilities; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs index be5583d549..dfc5cb4ba3 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs @@ -6,8 +6,8 @@ namespace SmartStore.Web.Framework.UI { - [Serializable] - public abstract class NavigationItem : IHtmlAttributesContainer, INavigatable, IHideObjectMembers + [Serializable] + public abstract class NavigationItem : IHtmlAttributesContainer, INavigatable, IHideObjectMembers { private bool _selected; private bool _enabled; @@ -48,23 +48,23 @@ public IDictionary GetCombinedAttributes() { combined.Merge(LinkHtmlAttributes); } - + return combined; } public string ImageUrl { get; set; } - public int? ImageId { get; set; } + public int? ImageId { get; set; } - public string Icon { get; set; } + public string Icon { get; set; } public string Text { get; set; } - public bool Rtl { get; set; } + public bool Rtl { get; set; } - public string Summary { get; set; } + public string Summary { get; set; } - public string BadgeText { get; set; } + public string BadgeText { get; set; } public BadgeStyle BadgeStyle { get; set; } @@ -74,10 +74,7 @@ public IDictionary GetCombinedAttributes() public bool Selected { - get - { - return _selected; - } + get => _selected; set { _selected = value; @@ -90,10 +87,7 @@ public bool Selected public bool Enabled { - get - { - return _enabled; - } + get => _enabled; set { _enabled = value; @@ -105,78 +99,66 @@ public bool Enabled } - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public string ActionName + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public string ActionName { - get - { - return _actionName; - } + get => _actionName; set { - if (_actionName != value) - { - _actionName = value; - _routeName = (string)(_url = null); - } + if (_actionName != value) + { + _actionName = value; + _routeName = (string)(_url = null); + } } } - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public string ControllerName + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public string ControllerName { - get - { - return _controllerName; - } + get => _controllerName; set { - if (_controllerName != value) - { - _controllerName = value; - _routeName = (string)(_url = null); - } + if (_controllerName != value) + { + _controllerName = value; + _routeName = (string)(_url = null); + } } } - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public string RouteName + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public string RouteName { - get - { - return _routeName; - } + get => _routeName; set { - if (_routeName != value) - { - _routeName = value; - _controllerName = _actionName = (string)(_url = null); - } + if (_routeName != value) + { + _routeName = value; + _controllerName = _actionName = (string)(_url = null); + } } } public RouteValueDictionary RouteValues { get; set; } - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public string Url { - get - { - return _url; - } + get => _url; set { - if (_url != value) - { - _url = value; - _routeName = _controllerName = (string)(_actionName = null); - this.RouteValues.Clear(); - } + if (_url != value) + { + _url = value; + _routeName = _controllerName = (string)(_actionName = null); + this.RouteValues.Clear(); + } } } - [JsonIgnore] + [JsonIgnore] public ModifiedParameter ModifiedParam { get; @@ -187,9 +169,9 @@ public ModifiedParameter ModifiedParam /// Checks whether action/controller or routeName or url has been specified. /// public bool HasRoute() - { - return _actionName != null || _routeName != null || _url != null; - } + { + return _actionName != null || _routeName != null || _url != null; + } /// /// Checks whether url has been specified with '#' or 'javascript:void()' or empty string. @@ -218,7 +200,7 @@ public NavigationItemWithContent() this.ContentHtmlAttributes = new RouteValueDictionary(); } - public bool Ajax { get; set; } + public bool Ajax { get; set; } public IDictionary ContentHtmlAttributes { get; set; } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs index 4479edac15..7242fec0a5 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs @@ -1,12 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Web.Mvc; using System.Web.Mvc.Html; using System.Web.Routing; using System.Web.WebPages; -using SmartStore.Core; using SmartStore.Utilities; namespace SmartStore.Web.Framework.UI @@ -36,20 +33,20 @@ public TBuilder Action(RouteValueDictionary routeValues) return (this as TBuilder); } - public TBuilder Action(string actionName) - { - return this.Action(actionName, null, null); - } + public TBuilder Action(string actionName) + { + return this.Action(actionName, null, null); + } - public TBuilder Action(string actionName, object routeValues) - { - return this.Action(actionName, null, routeValues); - } + public TBuilder Action(string actionName, object routeValues) + { + return this.Action(actionName, null, routeValues); + } - public TBuilder Action(string actionName, RouteValueDictionary routeValues) - { - return this.Action(actionName, null, routeValues); - } + public TBuilder Action(string actionName, RouteValueDictionary routeValues) + { + return this.Action(actionName, null, routeValues); + } public TBuilder Action(string actionName, string controllerName) { @@ -127,13 +124,13 @@ public TBuilder ImageUrl(string value) return (this as TBuilder); } - public TBuilder ImageId(int? value) - { - this.Item.ImageId = value; - return (this as TBuilder); - } + public TBuilder ImageId(int? value) + { + this.Item.ImageId = value; + return (this as TBuilder); + } - public TBuilder Icon(string value) + public TBuilder Icon(string value) { this.Item.Icon = value; return (this as TBuilder); @@ -145,13 +142,13 @@ public TBuilder Text(string value) return (this as TBuilder); } - public TBuilder Summary(string value) - { - this.Item.Summary = value; - return (this as TBuilder); - } + public TBuilder Summary(string value) + { + this.Item.Summary = value; + return (this as TBuilder); + } - public TBuilder Badge(string value, BadgeStyle style = BadgeStyle.Secondary, bool condition = true) + public TBuilder Badge(string value, BadgeStyle style = BadgeStyle.Secondary, bool condition = true) { if (condition) { @@ -210,29 +207,29 @@ protected HtmlHelper HtmlHelper private set; } - /// - /// Specifies whether the content should be loaded per AJAX into the content pane. - /// - /// value - /// builder - /// - /// This setting has no effect when no route is specified OR - /// static content was set. - /// - public TBuilder Ajax(bool value = true) - { - this.Item.Ajax = value; - return (this as TBuilder); - } + /// + /// Specifies whether the content should be loaded per AJAX into the content pane. + /// + /// value + /// builder + /// + /// This setting has no effect when no route is specified OR + /// static content was set. + /// + public TBuilder Ajax(bool value = true) + { + this.Item.Ajax = value; + return (this as TBuilder); + } public TBuilder Content(string value) { - if (value.IsEmpty()) - { - // do nothing - return (this as TBuilder); - } - return this.Content(x => new HelperResult(writer => writer.Write(value))); + if (value.IsEmpty()) + { + // do nothing + return (this as TBuilder); + } + return this.Content(x => new HelperResult(writer => writer.Write(value))); } public TBuilder Content(Func value) @@ -255,7 +252,7 @@ public TBuilder Content(HelperResult value) /// builder instance public TBuilder Content(string action, string controller, object routeValues) { - return Content(action, controller, new RouteValueDictionary(routeValues)); + return Content(action, controller, new RouteValueDictionary(routeValues)); } /// @@ -267,7 +264,7 @@ public TBuilder Content(string action, string controller, object routeValues) /// builder instance public TBuilder Content(string action, string controller, RouteValueDictionary routeValues) { - return this.Content(x => new HelperResult(writer => + return this.Content(x => new HelperResult(writer => { var value = this.HtmlHelper.Action(action, controller, routeValues); writer.Write(value); diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/ForumTopicPagerRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/ForumTopicPagerRenderer.cs index aabeef178d..2d36674971 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/ForumTopicPagerRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/ForumTopicPagerRenderer.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; namespace SmartStore.Web.Framework.UI { - + public class ForumTopicPagerRenderer : PagerRenderer { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/Pager.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/Pager.cs index d023c08cb5..dcc932017a 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/Pager.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/Pager.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.Routing; -using SmartStore.Core; +using SmartStore.Core; using SmartStore.Core.Infrastructure; using SmartStore.Services.Localization; @@ -11,8 +6,8 @@ namespace SmartStore.Web.Framework.UI { public enum PagerSize { - Mini, - Small, + Mini, + Small, Medium, Large } @@ -46,7 +41,7 @@ public Pager() } public Pager(ILocalizationService localizationService) - : base() + : base() { _localizationService = localizationService; @@ -82,16 +77,10 @@ public Pager(ILocalizationService localizationService) /// public string FirstButtonText { - get - { - return (!string.IsNullOrEmpty(_firstButtonText)) ? + get => (!string.IsNullOrEmpty(_firstButtonText)) ? _firstButtonText : _localizationService.GetResource("Pager.First"); - } - set - { - _firstButtonText = value; - } + set => _firstButtonText = value; } /// @@ -99,16 +88,10 @@ public string FirstButtonText /// public string LastButtonText { - get - { - return (!string.IsNullOrEmpty(_lastButtonText)) ? + get => (!string.IsNullOrEmpty(_lastButtonText)) ? _lastButtonText : _localizationService.GetResource("Pager.Last"); - } - set - { - _lastButtonText = value; - } + set => _lastButtonText = value; } /// @@ -116,16 +99,10 @@ public string LastButtonText /// public string NextButtonText { - get - { - return (!string.IsNullOrEmpty(_nextButtonText)) ? + get => (!string.IsNullOrEmpty(_nextButtonText)) ? _nextButtonText : _localizationService.GetResource("Pager.Next"); - } - set - { - _nextButtonText = value; - } + set => _nextButtonText = value; } /// @@ -133,16 +110,10 @@ public string NextButtonText /// public string PreviousButtonText { - get - { - return (!string.IsNullOrEmpty(_previousButtonText)) ? + get => (!string.IsNullOrEmpty(_previousButtonText)) ? _previousButtonText : _localizationService.GetResource("Pager.Previous"); - } - set - { - _previousButtonText = value; - } + set => _previousButtonText = value; } /// @@ -150,16 +121,10 @@ public string PreviousButtonText /// public string CurrentPageText { - get - { - return (!string.IsNullOrEmpty(_currentPageText)) ? + get => (!string.IsNullOrEmpty(_currentPageText)) ? _currentPageText : _localizationService.GetResource("Pager.CurrentPage"); - } - set - { - _currentPageText = value; - } + set => _currentPageText = value; } } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerBuilder.cs index 1164c9fa3c..06601ae7f7 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerBuilder.cs @@ -1,5 +1,4 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; using SmartStore.Core; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerItem.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerItem.cs index ec9a8f6af4..608ba01265 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerItem.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerItem.cs @@ -54,13 +54,7 @@ public PagerItem(string text, string url, PagerItemType itemType, PagerItemState public PagerItemType Type { get; set; } public string ExtraData { get; set; } - public bool IsNavButton - { - get - { - return (Type == PagerItemType.FirstPage || Type == PagerItemType.PreviousPage || Type == PagerItemType.NextPage || Type == PagerItemType.LastPage); - } - } + public bool IsNavButton => (Type == PagerItemType.FirstPage || Type == PagerItemType.PreviousPage || Type == PagerItemType.NextPage || Type == PagerItemType.LastPage); } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs index 7e024d559d..6d770bf586 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs @@ -1,10 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Web.UI; +using System.Collections.Generic; using System.Web.Routing; +using System.Web.UI; namespace SmartStore.Web.Framework.UI -{ +{ public class PagerRenderer : ComponentRenderer { public PagerRenderer() @@ -175,20 +174,20 @@ protected override void WriteHtmlCore(HtmlTextWriter writer) var items = CreateItemList(); - // Alignment - if (pager.Alignment == PagerAlignment.Right) - { - pager.HtmlAttributes.AppendCssClass("text-right"); - } - else if (pager.Alignment == PagerAlignment.Centered) - { - pager.HtmlAttributes.AppendCssClass("text-center"); - } - - writer.AddAttributes(pager.HtmlAttributes); + // Alignment + if (pager.Alignment == PagerAlignment.Right) + { + pager.HtmlAttributes.AppendCssClass("text-right"); + } + else if (pager.Alignment == PagerAlignment.Centered) + { + pager.HtmlAttributes.AppendCssClass("text-center"); + } + + writer.AddAttributes(pager.HtmlAttributes); writer.AddAttribute("id", pager.Id); - writer.AddAttribute("aria-label", "Page navigation"); - writer.RenderBeginTag("nav"); + writer.AddAttribute("aria-label", "Page navigation"); + writer.RenderBeginTag("nav"); if (pager.ShowSummary && pager.Model.TotalPages > 1) { @@ -198,36 +197,36 @@ protected override void WriteHtmlCore(HtmlTextWriter writer) writer.RenderEndTag(); // div } - var ulAttrs = new RouteValueDictionary(); - - ulAttrs.AppendCssClass(pager.Style == PagerStyle.Pagination ? "pagination" : "pagination" /* formerly "pager" */); // TODO: (mc) Seems there's no "pager" in BS4 anymore - - // Size - if (pager.Size == PagerSize.Large) - { - ulAttrs.AppendCssClass("pagination-lg"); - } - else if (pager.Size == PagerSize.Small) - { - ulAttrs.AppendCssClass("pagination-sm"); - } - else if (pager.Size == PagerSize.Mini) - { - ulAttrs.AppendCssClass("pagination-xs"); - } - - // BS 4 alignment - if (pager.Alignment == PagerAlignment.Centered) - { - ulAttrs.AppendCssClass("justify-content-center"); - } - else if (pager.Alignment == PagerAlignment.Right) - { - ulAttrs.AppendCssClass("justify-content-end"); - } - - writer.AddAttributes(ulAttrs); - writer.RenderBeginTag("ul"); + var ulAttrs = new RouteValueDictionary(); + + ulAttrs.AppendCssClass(pager.Style == PagerStyle.Pagination ? "pagination" : "pagination" /* formerly "pager" */); // TODO: (mc) Seems there's no "pager" in BS4 anymore + + // Size + if (pager.Size == PagerSize.Large) + { + ulAttrs.AppendCssClass("pagination-lg"); + } + else if (pager.Size == PagerSize.Small) + { + ulAttrs.AppendCssClass("pagination-sm"); + } + else if (pager.Size == PagerSize.Mini) + { + ulAttrs.AppendCssClass("pagination-xs"); + } + + // BS 4 alignment + if (pager.Alignment == PagerAlignment.Centered) + { + ulAttrs.AppendCssClass("justify-content-center"); + } + else if (pager.Alignment == PagerAlignment.Right) + { + ulAttrs.AppendCssClass("justify-content-end"); + } + + writer.AddAttributes(ulAttrs); + writer.RenderBeginTag("ul"); foreach (var item in items) { @@ -244,26 +243,26 @@ protected virtual void RenderItem(HtmlTextWriter writer, PagerItem item) if (item.State == PagerItemState.Disabled) { - attrs.AppendCssClass("disabled"); + attrs.AppendCssClass("disabled"); } else if (item.State == PagerItemState.Selected) { - attrs.AppendCssClass("active"); + attrs.AppendCssClass("active"); } if (item.Type == PagerItemType.Text) { - attrs.AppendCssClass("shrinked"); + attrs.AppendCssClass("shrinked"); } if (Component.Style == PagerStyle.Blog && item.IsNavButton) { - // TODO: (mg) BS4 doesn't seem to support this anymore - attrs.AppendCssClass((item.Type == PagerItemType.PreviousPage || item.Type == PagerItemType.FirstPage) ? "previous" : "next"); + // TODO: (mg) BS4 doesn't seem to support this anymore + attrs.AppendCssClass((item.Type == PagerItemType.PreviousPage || item.Type == PagerItemType.FirstPage) ? "previous" : "next"); } - attrs.AppendCssClass("page-item"); - + attrs.AppendCssClass("page-item"); + writer.AddAttributes(attrs); writer.RenderBeginTag("li"); @@ -274,9 +273,9 @@ protected virtual void RenderItem(HtmlTextWriter writer, PagerItem item) if (item.IsNavButton) { writer.AddAttribute("title", item.Text.AttributeEncode()); - writer.AddAttribute("aria-label", item.Text.AttributeEncode()); - writer.AddAttribute("tab-index", "-1"); - if (Component.Style != PagerStyle.Blog) + writer.AddAttribute("aria-label", item.Text.AttributeEncode()); + writer.AddAttribute("tab-index", "-1"); + if (Component.Style != PagerStyle.Blog) { writer.AddAttribute("rel", "tooltip"); writer.AddAttribute("class", "page-link page-nav"); @@ -298,9 +297,9 @@ protected virtual void RenderItem(HtmlTextWriter writer, PagerItem item) } else { - // write span - writer.AddAttribute("class", "page-link"); - writer.RenderBeginTag("span"); + // write span + writer.AddAttribute("class", "page-link"); + writer.RenderBeginTag("span"); } this.RenderItemInnerContent(writer, item); @@ -320,13 +319,13 @@ protected virtual void RenderItemInnerContent(HtmlTextWriter writer, PagerItem i writer.AddAttribute("class", "fa fa-angle-double-left"); break; case PagerItemType.PreviousPage: - writer.AddAttribute("class", "fa fa-angle-left"); + writer.AddAttribute("class", "fa fa-angle-left"); break; case PagerItemType.NextPage: - writer.AddAttribute("class", "fa fa-angle-right"); + writer.AddAttribute("class", "fa fa-angle-right"); break; case PagerItemType.LastPage: - writer.AddAttribute("class", "fa fa-angle-double-right"); + writer.AddAttribute("class", "fa fa-angle-double-right"); break; default: writer.WriteEncodedText(item.Text); diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/Tab.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/Tab.cs index 6b0cc233a0..8ce19a5f8b 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/Tab.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/Tab.cs @@ -1,16 +1,13 @@ using System; -using System.Collections.Generic; -using System.Web.Routing; -using System.Web.WebPages; namespace SmartStore.Web.Framework.UI { - [Serializable] - public class SelectedTabInfo - { - public string TabId { get; set; } - public string Path { get; set; } - } + [Serializable] + public class SelectedTabInfo + { + public string TabId { get; set; } + public string Path { get; set; } + } public enum TabPull { @@ -22,8 +19,8 @@ public class Tab : NavigationItemWithContent { public Tab() { - // [...] - } + // [...] + } public string Name { @@ -36,5 +33,5 @@ public TabPull Pull get; set; } - } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabBuilder.cs index 48443f9690..ebb7545bc8 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabBuilder.cs @@ -20,5 +20,5 @@ public TabBuilder Pull(TabPull value) this.Item.Pull = value; return this; } - } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabFactory.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabFactory.cs index 7fee6c00af..ba149e2de2 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabFactory.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabFactory.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using System.Web.Mvc; namespace SmartStore.Web.Framework.UI -{ +{ public class TabFactory : IHideObjectMembers { private readonly IList _items; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStrip.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStrip.cs index cb8961fef4..670bcf4856 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStrip.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStrip.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using System.Web.WebPages; namespace SmartStore.Web.Framework.UI @@ -18,7 +15,7 @@ public enum TabsStyle { Tabs, Pills, - Material + Material } public class TabStrip : Component @@ -28,7 +25,7 @@ public TabStrip() this.Items = new List(); this.Fade = true; this.SmartTabSelection = true; - this.Breakpoint = " Items @@ -37,7 +34,7 @@ public List Items private set; } - public bool IsResponsive + public bool IsResponsive { get; set; @@ -50,18 +47,18 @@ public bool HideSingleItem } public string Breakpoint - { - get; - set; - } - - public HelperResult TabContentHeaderContent - { - get; - set; - } - - public TabsPosition Position + { + get; + set; + } + + public HelperResult TabContentHeaderContent + { + get; + set; + } + + public TabsPosition Position { get; set; @@ -85,37 +82,31 @@ public bool SmartTabSelection set; } - public string OnAjaxBegin - { - get; - set; - } - - public string OnAjaxSuccess - { - get; - set; - } - - public string OnAjaxFailure - { - get; - set; - } - - public string OnAjaxComplete - { - get; - set; - } - - public override bool NameIsRequired + public string OnAjaxBegin + { + get; + set; + } + + public string OnAjaxSuccess + { + get; + set; + } + + public string OnAjaxFailure + { + get; + set; + } + + public string OnAjaxComplete { - get - { - return true; - } + get; + set; } + + public override bool NameIsRequired => true; } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs index 849762032a..b0a1cfdf26 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs @@ -3,7 +3,7 @@ using System.Web.WebPages; namespace SmartStore.Web.Framework.UI -{ +{ public class TabStripBuilder : ComponentBuilder, TModel> { public TabStripBuilder(TabStrip Component, HtmlHelper htmlHelper) @@ -18,42 +18,42 @@ public TabStripBuilder Items(Action addAction) return this; } - public TabStripBuilder Responsive(bool value, string breakpoint = " HideSingleItem(bool value) - { - base.Component.HideSingleItem = value; - return this; - } - - public TabStripBuilder TabContentHeaderContent(string value) - { - if (value.IsEmpty()) - { - // do nothing - return this; - } - - return this.TabContentHeaderContent(x => new HelperResult(writer => writer.Write(value))); - } - - public TabStripBuilder TabContentHeaderContent(Func value) - { - return this.TabContentHeaderContent(value(null)); - } - - public TabStripBuilder TabContentHeaderContent(HelperResult value) - { - base.Component.TabContentHeaderContent = value; - return this; - } - - public TabStripBuilder Position(TabsPosition value) + public TabStripBuilder Responsive(bool value, string breakpoint = " HideSingleItem(bool value) + { + base.Component.HideSingleItem = value; + return this; + } + + public TabStripBuilder TabContentHeaderContent(string value) + { + if (value.IsEmpty()) + { + // do nothing + return this; + } + + return this.TabContentHeaderContent(x => new HelperResult(writer => writer.Write(value))); + } + + public TabStripBuilder TabContentHeaderContent(Func value) + { + return this.TabContentHeaderContent(value(null)); + } + + public TabStripBuilder TabContentHeaderContent(HelperResult value) + { + base.Component.TabContentHeaderContent = value; + return this; + } + + public TabStripBuilder Position(TabsPosition value) { base.Component.Position = value; return this; @@ -77,28 +77,28 @@ public TabStripBuilder SmartTabSelection(bool value) return this; } - public TabStripBuilder OnAjaxBegin(string value) - { - base.Component.OnAjaxBegin = value; - return this; - } - - public TabStripBuilder OnAjaxSuccess(string value) - { - base.Component.OnAjaxSuccess = value; - return this; - } - - public TabStripBuilder OnAjaxFailure(string value) - { - base.Component.OnAjaxFailure = value; - return this; - } - - public TabStripBuilder OnAjaxComplete(string value) - { - base.Component.OnAjaxComplete = value; - return this; - } + public TabStripBuilder OnAjaxBegin(string value) + { + base.Component.OnAjaxBegin = value; + return this; + } + + public TabStripBuilder OnAjaxSuccess(string value) + { + base.Component.OnAjaxSuccess = value; + return this; + } + + public TabStripBuilder OnAjaxFailure(string value) + { + base.Component.OnAjaxFailure = value; + return this; + } + + public TabStripBuilder OnAjaxComplete(string value) + { + base.Component.OnAjaxComplete = value; + return this; + } } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs index ad568b119a..7a77fc0320 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs @@ -2,168 +2,167 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Text; -using System.Web.UI; using System.Web.Mvc; +using System.Web.UI; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Framework.UI -{ +{ public class TabStripRenderer : ComponentRenderer { public TabStripRenderer() - { + { } - [SuppressMessage("ReSharper", "Mvc.AreaNotResolved")] - protected override void WriteHtmlCore(HtmlTextWriter writer) - { - var tab = base.Component; + [SuppressMessage("ReSharper", "Mvc.AreaNotResolved")] + protected override void WriteHtmlCore(HtmlTextWriter writer) + { + var tab = base.Component; MoveSpecialTabToEnd(tab.Items); var hasContent = tab.Items.Any(x => x.Content != null || x.Ajax); - var isTabbable = tab.Position != TabsPosition.Top; - var isStacked = tab.Position == TabsPosition.Left || tab.Position == TabsPosition.Right; - var urlHelper = new UrlHelper(this.ViewContext.RequestContext); - - if (tab.Items.Count == 0) - return; - - tab.HtmlAttributes.AppendCssClass("tabbable"); - - if (isTabbable) - { - tab.HtmlAttributes.AppendCssClass("tabs-{0}".FormatInvariant(tab.Position.ToString().ToLower())); - } - - if (tab.SmartTabSelection) - { - tab.HtmlAttributes.AppendCssClass("tabs-autoselect"); - tab.HtmlAttributes.Add("data-tabselector-href", urlHelper.Action("SetSelectedTab", "Common", new { area = "admin" })); - } - - if (isStacked) - { - tab.HtmlAttributes.AppendCssClass("row"); - } - - if (tab.OnAjaxBegin.HasValue()) - { - tab.HtmlAttributes.Add("data-ajax-onbegin", tab.OnAjaxBegin); - } - - if (tab.OnAjaxSuccess.HasValue()) - { - tab.HtmlAttributes.Add("data-ajax-onsuccess", tab.OnAjaxSuccess); - } - - if (tab.OnAjaxFailure.HasValue()) - { - tab.HtmlAttributes.Add("data-ajax-onfailure", tab.OnAjaxFailure); - } - - if (tab.OnAjaxComplete.HasValue()) - { - tab.HtmlAttributes.Add("data-ajax-oncomplete", tab.OnAjaxComplete); - } - - if (tab.IsResponsive) - { - tab.HtmlAttributes.AppendCssClass("nav-responsive"); - tab.HtmlAttributes.Add("data-breakpoint", tab.Breakpoint); - } - - writer.AddAttributes(tab.HtmlAttributes); - - writer.RenderBeginTag("div"); // root div - { - if (tab.Position == TabsPosition.Below && hasContent) - RenderTabContent(writer); - - if (isStacked) - { - writer.AddAttribute("class", "col-lg-auto nav-aside"); - writer.RenderBeginTag("aside"); // opening left/right tabs col - } - - // Tabs - var ulAttrs = new Dictionary(); - ulAttrs.AppendCssClass("nav"); - - if (tab.Style == TabsStyle.Tabs) - { - ulAttrs.AppendCssClass("nav-tabs"); - } - else if (tab.Style == TabsStyle.Pills) - { - ulAttrs.AppendCssClass("nav-pills"); - } - else if (tab.Style == TabsStyle.Material) - { - ulAttrs.AppendCssClass("nav-tabs nav-tabs-line"); - } - - if (tab.HideSingleItem && tab.Items.Count == 1) + var isTabbable = tab.Position != TabsPosition.Top; + var isStacked = tab.Position == TabsPosition.Left || tab.Position == TabsPosition.Right; + var urlHelper = new UrlHelper(this.ViewContext.RequestContext); + + if (tab.Items.Count == 0) + return; + + tab.HtmlAttributes.AppendCssClass("tabbable"); + + if (isTabbable) + { + tab.HtmlAttributes.AppendCssClass("tabs-{0}".FormatInvariant(tab.Position.ToString().ToLower())); + } + + if (tab.SmartTabSelection) + { + tab.HtmlAttributes.AppendCssClass("tabs-autoselect"); + tab.HtmlAttributes.Add("data-tabselector-href", urlHelper.Action("SetSelectedTab", "Common", new { area = "admin" })); + } + + if (isStacked) + { + tab.HtmlAttributes.AppendCssClass("row"); + } + + if (tab.OnAjaxBegin.HasValue()) + { + tab.HtmlAttributes.Add("data-ajax-onbegin", tab.OnAjaxBegin); + } + + if (tab.OnAjaxSuccess.HasValue()) + { + tab.HtmlAttributes.Add("data-ajax-onsuccess", tab.OnAjaxSuccess); + } + + if (tab.OnAjaxFailure.HasValue()) + { + tab.HtmlAttributes.Add("data-ajax-onfailure", tab.OnAjaxFailure); + } + + if (tab.OnAjaxComplete.HasValue()) + { + tab.HtmlAttributes.Add("data-ajax-oncomplete", tab.OnAjaxComplete); + } + + if (tab.IsResponsive) + { + tab.HtmlAttributes.AppendCssClass("nav-responsive"); + tab.HtmlAttributes.Add("data-breakpoint", tab.Breakpoint); + } + + writer.AddAttributes(tab.HtmlAttributes); + + writer.RenderBeginTag("div"); // root div + { + if (tab.Position == TabsPosition.Below && hasContent) + RenderTabContent(writer); + + if (isStacked) { - ulAttrs.AppendCssClass("d-none"); + writer.AddAttribute("class", "col-lg-auto nav-aside"); + writer.RenderBeginTag("aside"); // opening left/right tabs col } - if (isStacked) - { - ulAttrs.AppendCssClass("flex-row flex-lg-column"); - } - writer.AddAttributes(ulAttrs); - - string selector = null; - var loadedTabs = new List(); - writer.RenderBeginTag("ul"); - { - // enable smart tab selection - if (tab.SmartTabSelection) - { - selector = TrySelectRememberedTab(); - } - - int i = 1; - foreach (var item in tab.Items) - { - var loadedTabName = this.RenderItemLink(writer, item, i); - if (loadedTabName.HasValue()) - { - loadedTabs.Add(loadedTabName); - } - i++; - } - - writer.RenderEndTag(); // ul - } - - if (isStacked) - { - writer.RenderEndTag(); // closing left/right tabs col - } - - // TODO: (mc) render right positioned tabs also - if (tab.Position != TabsPosition.Below && hasContent) - { - if (isStacked) - { - writer.AddAttribute("class", "col-lg nav-content"); - writer.RenderBeginTag("div"); // opening left/right content col - } - - RenderTabContent(writer); - - if (isStacked) - { - writer.RenderEndTag(); // closing left/right content col - } - } - - if (selector != null) - { - writer.WriteLine( + // Tabs + var ulAttrs = new Dictionary(); + ulAttrs.AppendCssClass("nav"); + + if (tab.Style == TabsStyle.Tabs) + { + ulAttrs.AppendCssClass("nav-tabs"); + } + else if (tab.Style == TabsStyle.Pills) + { + ulAttrs.AppendCssClass("nav-pills"); + } + else if (tab.Style == TabsStyle.Material) + { + ulAttrs.AppendCssClass("nav-tabs nav-tabs-line"); + } + + if (tab.HideSingleItem && tab.Items.Count == 1) + { + ulAttrs.AppendCssClass("d-none"); + } + + if (isStacked) + { + ulAttrs.AppendCssClass("flex-row flex-lg-column"); + } + writer.AddAttributes(ulAttrs); + + string selector = null; + var loadedTabs = new List(); + writer.RenderBeginTag("ul"); + { + // enable smart tab selection + if (tab.SmartTabSelection) + { + selector = TrySelectRememberedTab(); + } + + int i = 1; + foreach (var item in tab.Items) + { + var loadedTabName = this.RenderItemLink(writer, item, i); + if (loadedTabName.HasValue()) + { + loadedTabs.Add(loadedTabName); + } + i++; + } + + writer.RenderEndTag(); // ul + } + + if (isStacked) + { + writer.RenderEndTag(); // closing left/right tabs col + } + + // TODO: (mc) render right positioned tabs also + if (tab.Position != TabsPosition.Below && hasContent) + { + if (isStacked) + { + writer.AddAttribute("class", "col-lg nav-content"); + writer.RenderBeginTag("div"); // opening left/right content col + } + + RenderTabContent(writer); + + if (isStacked) + { + writer.RenderEndTag(); // closing left/right content col + } + } + + if (selector != null) + { + writer.WriteLine( @"".FormatInvariant(selector)); - } - - if (loadedTabs.Count > 0) - { - foreach (var tabName in loadedTabs) - { - writer.WriteLine("", tabName); - } - } - - writer.RenderEndTag(); // div.tabbable - - if (tab.IsResponsive /* && tab.TabContentHeaderContent != null*/) - { - writer.WriteLine(@"".FormatInvariant(tab.Id)); - } - } - } + } + + if (loadedTabs.Count > 0) + { + foreach (var tabName in loadedTabs) + { + writer.WriteLine("", tabName); + } + } + + writer.RenderEndTag(); // div.tabbable + + if (tab.IsResponsive /* && tab.TabContentHeaderContent != null*/) + { + writer.WriteLine(@"".FormatInvariant(tab.Id)); + } + } + } private void MoveSpecialTabToEnd(List tabs) { @@ -203,84 +202,84 @@ private void MoveSpecialTabToEnd(List tabs) // returns a query selector private string TrySelectRememberedTab() - { - var tab = this.Component; - - if (tab.Id.IsEmpty()) - return null; - - if (ViewContext.ViewData.Model is EntityModelBase model && model.Id == 0) - { - // it's a "create" operation: don't select - return null; - } - - var rememberedTab = (SelectedTabInfo)ViewContext.TempData["SelectedTab." + tab.Id]; - if (rememberedTab != null && rememberedTab.Path.Equals(ViewContext.HttpContext.Request.RawUrl, StringComparison.OrdinalIgnoreCase)) - { - // get tab to select - var tabToSelect = GetTabById(rememberedTab.TabId); - - if (tabToSelect != null) - { - // unselect former selected tab(s) - tab.Items.Each(x => x.Selected = false); - - // select the new tab - tabToSelect.Selected = true; - - // persist again for the next request - ViewContext.TempData["SelectedTab." + tab.Id] = rememberedTab; - - if (tabToSelect.Ajax && tabToSelect.Content == null) - { - return ".nav a[data-ajax-url][href='#{0}']".FormatInvariant(rememberedTab.TabId); - } - } - } - - return null; - } - - private Tab GetTabById(string tabId) - { - int i = 1; - foreach (var item in Component.Items) - { - var id = BuildItemId(item, i); - if (id == tabId) - { - if (!item.Visible || !item.Enabled) - break; - - return item; - } - i++; - } - - return null; - } + { + var tab = this.Component; + + if (tab.Id.IsEmpty()) + return null; + + if (ViewContext.ViewData.Model is EntityModelBase model && model.Id == 0) + { + // it's a "create" operation: don't select + return null; + } + + var rememberedTab = (SelectedTabInfo)ViewContext.TempData["SelectedTab." + tab.Id]; + if (rememberedTab != null && rememberedTab.Path.Equals(ViewContext.HttpContext.Request.RawUrl, StringComparison.OrdinalIgnoreCase)) + { + // get tab to select + var tabToSelect = GetTabById(rememberedTab.TabId); + + if (tabToSelect != null) + { + // unselect former selected tab(s) + tab.Items.Each(x => x.Selected = false); + + // select the new tab + tabToSelect.Selected = true; + + // persist again for the next request + ViewContext.TempData["SelectedTab." + tab.Id] = rememberedTab; + + if (tabToSelect.Ajax && tabToSelect.Content == null) + { + return ".nav a[data-ajax-url][href='#{0}']".FormatInvariant(rememberedTab.TabId); + } + } + } + + return null; + } + + private Tab GetTabById(string tabId) + { + int i = 1; + foreach (var item in Component.Items) + { + var id = BuildItemId(item, i); + if (id == tabId) + { + if (!item.Visible || !item.Enabled) + break; + + return item; + } + i++; + } + + return null; + } protected virtual void RenderTabContent(HtmlTextWriter writer) { var tab = base.Component; - + writer.AddAttribute("class", "tab-content"); writer.RenderBeginTag("div"); - // Tab content header - if (tab.IsResponsive && tab.TabContentHeaderContent != null) - { - //writer.WriteLine(item.Content.ToHtmlString()); - writer.AddAttribute("class", "tab-content-header"); - writer.RenderBeginTag("div"); - { - writer.WriteLine(tab.TabContentHeaderContent.ToHtmlString()); - } - writer.RenderEndTag(); // div.tab-content-header - } - - // All tab items + // Tab content header + if (tab.IsResponsive && tab.TabContentHeaderContent != null) + { + //writer.WriteLine(item.Content.ToHtmlString()); + writer.AddAttribute("class", "tab-content-header"); + writer.RenderBeginTag("div"); + { + writer.WriteLine(tab.TabContentHeaderContent.ToHtmlString()); + } + writer.RenderEndTag(); // div.tab-content-header + } + + // All tab items int i = 1; foreach (var item in tab.Items) { @@ -292,162 +291,162 @@ protected virtual void RenderTabContent(HtmlTextWriter writer) } protected virtual string RenderItemLink(HtmlTextWriter writer, Tab item, int index) - { - string temp = ""; - string loadedTabName = null; + { + string temp = ""; + string loadedTabName = null; //
  • {text}
    • item.HtmlAttributes.AppendCssClass("nav-item"); // .active for BS2 - if (!item.Selected && !item.Visible) - { - item.HtmlAttributes.AppendCssClass("d-none"); - } - - if (item.Pull == TabPull.Right) - { - item.HtmlAttributes.AppendCssClass("float-right"); - } - - writer.AddAttributes(item.HtmlAttributes); - - writer.RenderBeginTag("li"); - { - var itemId = "#" + BuildItemId(item, index); - - writer.AddAttribute("class", "nav-link" + (item.Selected ? " active" : "")); - - if (item.Content != null) - { - writer.AddAttribute("href", itemId); - writer.AddAttribute("data-toggle", "tab"); - writer.AddAttribute("data-loaded", "true"); - loadedTabName = GetTabName(item) ?? itemId; - } - else - { - // no content, create real link instead - var url = item.GenerateUrl(base.ViewContext.RequestContext).NullEmpty(); - - if (url == null) - { - writer.AddAttribute("href", "#"); - } - else - { - if (item.Ajax) - { - writer.AddAttribute("href", itemId); - writer.AddAttribute("data-ajax-url", url); - writer.AddAttribute("data-toggle", "tab"); + if (!item.Selected && !item.Visible) + { + item.HtmlAttributes.AppendCssClass("d-none"); + } + + if (item.Pull == TabPull.Right) + { + item.HtmlAttributes.AppendCssClass("float-right"); + } + + writer.AddAttributes(item.HtmlAttributes); + + writer.RenderBeginTag("li"); + { + var itemId = "#" + BuildItemId(item, index); + + writer.AddAttribute("class", "nav-link" + (item.Selected ? " active" : "")); + + if (item.Content != null) + { + writer.AddAttribute("href", itemId); + writer.AddAttribute("data-toggle", "tab"); + writer.AddAttribute("data-loaded", "true"); + loadedTabName = GetTabName(item) ?? itemId; + } + else + { + // no content, create real link instead + var url = item.GenerateUrl(base.ViewContext.RequestContext).NullEmpty(); + + if (url == null) + { + writer.AddAttribute("href", "#"); + } + else + { + if (item.Ajax) + { + writer.AddAttribute("href", itemId); + writer.AddAttribute("data-ajax-url", url); + writer.AddAttribute("data-toggle", "tab"); + } + else + { + writer.AddAttribute("href", url); } - else - { - writer.AddAttribute("href", url); - } - } - } - - if (item.BadgeText.HasValue()) - { - item.LinkHtmlAttributes.AppendCssClass("clearfix"); - } - - writer.AddAttributes(item.LinkHtmlAttributes); - writer.RenderBeginTag("a"); - { - // Tab Icon - if (item.Icon.HasValue()) - { - writer.AddAttribute("class", item.Icon); - writer.RenderBeginTag("i"); - writer.RenderEndTag(); // i - } - else if (item.ImageUrl.HasValue()) - { - var url = new UrlHelper(this.ViewContext.RequestContext); - writer.AddAttribute("src", url.Content(item.ImageUrl)); - writer.AddAttribute("alt", "Icon"); - writer.RenderBeginTag("img"); - writer.RenderEndTag(); // img - } - - // Caption - writer.AddAttribute("class", "tab-caption"); - writer.RenderBeginTag("span"); - writer.WriteEncodedText(item.Text); - writer.RenderEndTag(); - - // Badge - if (item.BadgeText.HasValue()) - { - // Label/badge - temp = "ml-2 badge"; - temp += " badge-" + item.BadgeStyle.ToString().ToLower(); - if (base.Component.Position == TabsPosition.Left) - { - temp += " float-right"; // looks nicer - } - writer.AddAttribute("class", temp); - writer.RenderBeginTag("span"); - writer.WriteEncodedText(item.BadgeText); - writer.RenderEndTag(); // span > badge - } - - // Nav link short summary for collapsed state - if (this.Component.IsResponsive && item.Summary.HasValue()) - { - writer.AddAttribute("class", "nav-link-summary"); - writer.RenderBeginTag("span"); - writer.WriteEncodedText(item.Summary); - writer.RenderEndTag(); - } - - writer.RenderEndTag(); // a - } - writer.RenderEndTag(); // li - } - - return loadedTabName; - } - - private string GetTabName(Tab tab) - { - if (tab.LinkHtmlAttributes.TryGetValue("data-tab-name", out object value)) - { - return value.ToString(); - } - return null; - } + } + } + + if (item.BadgeText.HasValue()) + { + item.LinkHtmlAttributes.AppendCssClass("clearfix"); + } + + writer.AddAttributes(item.LinkHtmlAttributes); + writer.RenderBeginTag("a"); + { + // Tab Icon + if (item.Icon.HasValue()) + { + writer.AddAttribute("class", item.Icon); + writer.RenderBeginTag("i"); + writer.RenderEndTag(); // i + } + else if (item.ImageUrl.HasValue()) + { + var url = new UrlHelper(this.ViewContext.RequestContext); + writer.AddAttribute("src", url.Content(item.ImageUrl)); + writer.AddAttribute("alt", "Icon"); + writer.RenderBeginTag("img"); + writer.RenderEndTag(); // img + } + + // Caption + writer.AddAttribute("class", "tab-caption"); + writer.RenderBeginTag("span"); + writer.WriteEncodedText(item.Text); + writer.RenderEndTag(); + + // Badge + if (item.BadgeText.HasValue()) + { + // Label/badge + temp = "ml-2 badge"; + temp += " badge-" + item.BadgeStyle.ToString().ToLower(); + if (base.Component.Position == TabsPosition.Left) + { + temp += " float-right"; // looks nicer + } + writer.AddAttribute("class", temp); + writer.RenderBeginTag("span"); + writer.WriteEncodedText(item.BadgeText); + writer.RenderEndTag(); // span > badge + } + + // Nav link short summary for collapsed state + if (this.Component.IsResponsive && item.Summary.HasValue()) + { + writer.AddAttribute("class", "nav-link-summary"); + writer.RenderBeginTag("span"); + writer.WriteEncodedText(item.Summary); + writer.RenderEndTag(); + } + + writer.RenderEndTag(); // a + } + writer.RenderEndTag(); // li + } + + return loadedTabName; + } + + private string GetTabName(Tab tab) + { + if (tab.LinkHtmlAttributes.TryGetValue("data-tab-name", out object value)) + { + return value.ToString(); + } + return null; + } protected virtual void RenderItemContent(HtmlTextWriter writer, Tab item, int index) - { - //
    {content}
    - item.ContentHtmlAttributes.AppendCssClass("tab-pane"); - item.ContentHtmlAttributes.Add("role", "tabpanel"); - if (base.Component.Fade) - { - item.ContentHtmlAttributes.AppendCssClass("fade"); - } - if (item.Selected) - { - if (base.Component.Fade) - { - item.ContentHtmlAttributes.AppendCssClass("show"); - } - item.ContentHtmlAttributes.AppendCssClass("active"); - } - writer.AddAttributes(item.ContentHtmlAttributes); - writer.AddAttribute("id", BuildItemId(item, index)); - writer.RenderBeginTag("div"); - { + { + //
    {content}
    + item.ContentHtmlAttributes.AppendCssClass("tab-pane"); + item.ContentHtmlAttributes.Add("role", "tabpanel"); + if (base.Component.Fade) + { + item.ContentHtmlAttributes.AppendCssClass("fade"); + } + if (item.Selected) + { + if (base.Component.Fade) + { + item.ContentHtmlAttributes.AppendCssClass("show"); + } + item.ContentHtmlAttributes.AppendCssClass("active"); + } + writer.AddAttributes(item.ContentHtmlAttributes); + writer.AddAttribute("id", BuildItemId(item, index)); + writer.RenderBeginTag("div"); + { if (item.Content != null) - { - writer.WriteLine(item.Content.ToHtmlString()); - } - } - writer.RenderEndTag(); // div - } + { + writer.WriteLine(item.Content.ToHtmlString()); + } + } + writer.RenderEndTag(); // div + } private string BuildItemId(Tab item, int index) { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ViewBasedComponentRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ViewBasedComponentRenderer.cs index 0ef84c00a0..1a5cd76277 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ViewBasedComponentRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ViewBasedComponentRenderer.cs @@ -3,20 +3,20 @@ namespace SmartStore.Web.Framework.UI { public class ViewBasedComponentRenderer : ComponentRenderer where TComponent : Component - { - private readonly string _viewName; + { + private readonly string _viewName; - public ViewBasedComponentRenderer() - : this(typeof(TComponent).Name) - { - } + public ViewBasedComponentRenderer() + : this(typeof(TComponent).Name) + { + } public ViewBasedComponentRenderer(string viewName) - { - Guard.NotEmpty(viewName, nameof(viewName)); + { + Guard.NotEmpty(viewName, nameof(viewName)); - _viewName = viewName; - } + _viewName = viewName; + } protected virtual string GetViewName() { @@ -24,13 +24,13 @@ protected virtual string GetViewName() } public override void Render() - { - HtmlHelper.RenderPartial(GetViewName(), Component); - } + { + HtmlHelper.RenderPartial(GetViewName(), Component); + } - public override string ToHtmlString() - { - return HtmlHelper.Partial(GetViewName(), Component).ToString(); - } - } + public override string ToHtmlString() + { + return HtmlHelper.Partial(GetViewName(), Component).ToString(); + } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs index 154a7e57d3..29463fd2d7 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs @@ -1,43 +1,39 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Web.Routing; using System.Web.WebPages; namespace SmartStore.Web.Framework.UI { - public enum WindowSize - { - Small, - Medium, - Large, - Flex, - FlexSmall - } - - public class Window : Component + public enum WindowSize + { + Small, + Medium, + Large, + Flex, + FlexSmall + } + + public class Window : Component { public Window() { - this.Size = WindowSize.Medium; - this.Fade = true; - this.Focus = true; + this.Size = WindowSize.Medium; + this.Fade = true; + this.Focus = true; this.BackDrop = true; this.ShowClose = true; - this.Show = true; + this.Show = true; this.CloseOnEscapePress = true; - this.CloseOnBackdropClick = true; - this.RenderAtPageEnd = true; - this.BodyHtmlAttributes = new RouteValueDictionary(); - } - - public override bool NameIsRequired - { - get { return true; } + this.CloseOnBackdropClick = true; + this.RenderAtPageEnd = true; + this.BodyHtmlAttributes = new RouteValueDictionary(); } - public WindowSize Size { get; set; } + public override bool NameIsRequired => true; + + public WindowSize Size { get; set; } - public string Title { get; set; } + public string Title { get; set; } public HelperResult Content { get; set; } @@ -47,22 +43,22 @@ public override bool NameIsRequired public bool Fade { get; set; } - public bool Focus { get; set; } + public bool Focus { get; set; } - public bool Show { get; set; } + public bool Show { get; set; } - public bool BackDrop { get; set; } + public bool BackDrop { get; set; } public bool ShowClose { get; set; } - public bool CenterVertically { get; set; } + public bool CenterVertically { get; set; } - public bool CloseOnEscapePress { get; set; } + public bool CloseOnEscapePress { get; set; } - public bool CloseOnBackdropClick { get; set; } + public bool CloseOnBackdropClick { get; set; } - public bool RenderAtPageEnd { get; set; } + public bool RenderAtPageEnd { get; set; } - public IDictionary BodyHtmlAttributes { get; set; } - } + public IDictionary BodyHtmlAttributes { get; set; } + } } diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs index 0b8e9d938b..ea685065a5 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs @@ -13,13 +13,13 @@ public WindowBuilder(Window Component, HtmlHelper htmlHelper) { } - public WindowBuilder Size(WindowSize value) - { - base.Component.Size = value; - return this; - } + public WindowBuilder Size(WindowSize value) + { + base.Component.Size = value; + return this; + } - public WindowBuilder Title(string value) + public WindowBuilder Title(string value) { base.Component.Title = value; return this; @@ -81,52 +81,52 @@ public WindowBuilder ShowClose(bool value) return this; } - public WindowBuilder Focus(bool value) - { - base.Component.Focus = value; - return this; - } + public WindowBuilder Focus(bool value) + { + base.Component.Focus = value; + return this; + } - public WindowBuilder CenterVertically(bool value) - { - base.Component.CenterVertically = value; - return this; - } + public WindowBuilder CenterVertically(bool value) + { + base.Component.CenterVertically = value; + return this; + } - public WindowBuilder Show(bool value) - { - base.Component.Show = value; - return this; - } + public WindowBuilder Show(bool value) + { + base.Component.Show = value; + return this; + } - public WindowBuilder CloseOnEscapePress(bool value) + public WindowBuilder CloseOnEscapePress(bool value) { base.Component.CloseOnEscapePress = value; return this; } - public WindowBuilder CloseOnBackdropClick(bool value) - { - base.Component.CloseOnBackdropClick = value; - return this; - } - - public WindowBuilder RenderAtPageEnd(bool value) - { - base.Component.RenderAtPageEnd = value; - return this; - } - - public WindowBuilder BodyHtmlAttributes(object attributes) - { - return this.BodyHtmlAttributes(CommonHelper.ObjectToDictionary(attributes)); - } - - public WindowBuilder BodyHtmlAttributes(IDictionary attributes) - { - base.Component.BodyHtmlAttributes.Clear(); - base.Component.BodyHtmlAttributes.Merge(attributes); - return this; - } - } + public WindowBuilder CloseOnBackdropClick(bool value) + { + base.Component.CloseOnBackdropClick = value; + return this; + } + + public WindowBuilder RenderAtPageEnd(bool value) + { + base.Component.RenderAtPageEnd = value; + return this; + } + + public WindowBuilder BodyHtmlAttributes(object attributes) + { + return this.BodyHtmlAttributes(CommonHelper.ObjectToDictionary(attributes)); + } + + public WindowBuilder BodyHtmlAttributes(IDictionary attributes) + { + base.Component.BodyHtmlAttributes.Clear(); + base.Component.BodyHtmlAttributes.Merge(attributes); + return this; + } + } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs index 86d49ab9eb..6ba1c06b7c 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs @@ -1,117 +1,116 @@ -using System; -using System.Web.UI; +using System.Web.UI; namespace SmartStore.Web.Framework.UI { - // TODO: (mc) make modal window renderer BS4 ready (after backend has been updated to BS4) - public class WindowRenderer : ComponentRenderer + // TODO: (mc) make modal window renderer BS4 ready (after backend has been updated to BS4) + public class WindowRenderer : ComponentRenderer { - public override void Render() - { - if (Component.RenderAtPageEnd) - { - using (this.HtmlHelper.BeginZoneContent("end")) - { - base.Render(); - } - } - else - { - base.Render(); - } - } - - protected override void WriteHtmlCore(HtmlTextWriter writer) + public override void Render() + { + if (Component.RenderAtPageEnd) + { + using (this.HtmlHelper.BeginZoneContent("end")) + { + base.Render(); + } + } + else + { + base.Render(); + } + } + + protected override void WriteHtmlCore(HtmlTextWriter writer) { var win = base.Component; win.HtmlAttributes.AppendCssClass("modal"); - win.HtmlAttributes["role"] = "dialog"; - win.HtmlAttributes["tabindex"] = "-1"; - win.HtmlAttributes["aria-hidden"] = "true"; - win.HtmlAttributes["aria-labelledby"] = win.Id + "Label"; + win.HtmlAttributes["role"] = "dialog"; + win.HtmlAttributes["tabindex"] = "-1"; + win.HtmlAttributes["aria-hidden"] = "true"; + win.HtmlAttributes["aria-labelledby"] = win.Id + "Label"; - if (win.Fade) + if (win.Fade) { win.HtmlAttributes.AppendCssClass("fade"); } - // Other options - win.HtmlAttributes["data-keyboard"] = win.CloseOnEscapePress.ToString().ToLower(); - win.HtmlAttributes["data-show"] = win.Show.ToString().ToLower(); - win.HtmlAttributes["data-focus"] = win.Focus.ToString().ToLower(); - win.HtmlAttributes["data-backdrop"] = win.BackDrop - ? (win.CloseOnBackdropClick ? "true" : "static") - : "false"; + // Other options + win.HtmlAttributes["data-keyboard"] = win.CloseOnEscapePress.ToString().ToLower(); + win.HtmlAttributes["data-show"] = win.Show.ToString().ToLower(); + win.HtmlAttributes["data-focus"] = win.Focus.ToString().ToLower(); + win.HtmlAttributes["data-backdrop"] = win.BackDrop + ? (win.CloseOnBackdropClick ? "true" : "static") + : "false"; writer.AddAttributes(win.HtmlAttributes); - writer.RenderBeginTag("div"); // div.modal - { - var className = "modal-dialog"; - switch (win.Size) - { - case WindowSize.Small: - className += " modal-sm"; - break; - case WindowSize.Large: - className += " modal-lg"; - break; - case WindowSize.Flex: - className += " modal-flex"; - break; - case WindowSize.FlexSmall: - className += " modal-flex modal-flex-sm"; - break; - } - - if (win.CenterVertically) - { - className += " modal-dialog-centered"; - } - - writer.AddAttribute("class", className); - win.HtmlAttributes["role"] = "document"; - writer.RenderBeginTag("div"); // div.modal-dialog - { - writer.AddAttribute("class", "modal-content"); - writer.RenderBeginTag("div"); // div.modal-content - { - // HEADER - if (win.ShowClose && win.Title.HasValue()) - { - this.RenderHeader(writer); - } - - // BODY - this.RenderBody(writer); - - // FOOTER - if (win.FooterContent != null) - { - this.RenderFooter(writer); - } - } - writer.RenderEndTag(); // div.modal-content - } - writer.RenderEndTag(); // div.modal-dialog - } + writer.RenderBeginTag("div"); // div.modal + { + var className = "modal-dialog"; + switch (win.Size) + { + case WindowSize.Small: + className += " modal-sm"; + break; + case WindowSize.Large: + className += " modal-lg"; + break; + case WindowSize.Flex: + className += " modal-flex"; + break; + case WindowSize.FlexSmall: + className += " modal-flex modal-flex-sm"; + break; + } + + if (win.CenterVertically) + { + className += " modal-dialog-centered"; + } + + writer.AddAttribute("class", className); + win.HtmlAttributes["role"] = "document"; + writer.RenderBeginTag("div"); // div.modal-dialog + { + writer.AddAttribute("class", "modal-content"); + writer.RenderBeginTag("div"); // div.modal-content + { + // HEADER + if (win.ShowClose && win.Title.HasValue()) + { + this.RenderHeader(writer); + } + + // BODY + this.RenderBody(writer); + + // FOOTER + if (win.FooterContent != null) + { + this.RenderFooter(writer); + } + } + writer.RenderEndTag(); // div.modal-content + } + writer.RenderEndTag(); // div.modal-dialog + } writer.RenderEndTag(); // div.modal } protected virtual void RenderHeader(HtmlTextWriter writer) { var win = base.Component; - + writer.AddAttribute("class", "modal-header"); writer.RenderBeginTag("div"); - if (win.Title.HasValue()) - { - writer.Write("".FormatCurrent(win.Id + "Label", win.Title)); - } + if (win.Title.HasValue()) + { + writer.Write("".FormatCurrent(win.Id + "Label", win.Title)); + } - if (win.ShowClose) + if (win.ShowClose) { writer.Write(""); } @@ -123,18 +122,18 @@ protected virtual void RenderBody(HtmlTextWriter writer) { var win = base.Component; - win.BodyHtmlAttributes.PrependCssClass("modal-body"); - writer.AddAttributes(win.BodyHtmlAttributes); + win.BodyHtmlAttributes.PrependCssClass("modal-body"); + writer.AddAttributes(win.BodyHtmlAttributes); writer.RenderBeginTag("div"); - if (win.Content != null) - { - win.Content.WriteTo(writer); - } - else if (win.ContentUrl.HasValue()) - { - writer.Write("