diff --git a/changelog.md b/changelog.md index 478b4fc8c9..d268faa034 100644 --- a/changelog.md +++ b/changelog.md @@ -60,6 +60,21 @@ * Fixes the delivery time in the order notifications may differ from delivery time on the product detail page +## SmartStore.NET 3.1.5 +### New Features + +### Improvements +* Added double opt-in feature for newsletter subscriptions during checkout (confirm order) + +### Bugfixes +* Migration: take all same-named message templates into account +* Messaging: OrderPlaced e-mail templates show main product image even when an attribute combination with a custom image has been selected +* Theming: fix broken product review voting +* Theming: added missing bottom space to .html-editor-content +* Theming: Language switcher is not displayed if no currency options are available + + + ## SmartStore.NET 3.1.0 ### Highlights diff --git a/src/Libraries/SmartStore.Core/Collections/ReferenceEqualityComparer.cs b/src/Libraries/SmartStore.Core/Collections/ReferenceEqualityComparer.cs new file mode 100644 index 0000000000..b70b4302d2 --- /dev/null +++ b/src/Libraries/SmartStore.Core/Collections/ReferenceEqualityComparer.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Runtime.CompilerServices; + +namespace SmartStore.ComponentModel +{ + public sealed class ReferenceEqualityComparer : IEqualityComparer, IEqualityComparer + { + public static ReferenceEqualityComparer Default { get; } = new ReferenceEqualityComparer(); + + public new bool Equals(object x, object y) => ReferenceEquals(x, y); + public int GetHashCode(object obj) => RuntimeHelpers.GetHashCode(obj); + } +} diff --git a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs index 7810a19b12..bd62cd79ee 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs @@ -18,6 +18,18 @@ public static class HttpExtensions { private const string HTTP_CLUSTER_VAR = "HTTP_CLUSTER_HTTPS"; private const string HTTP_XFWDPROTO_VAR = "HTTP_X_FORWARDED_PROTO"; + private const string CACHE_REGION_NAME = "SmartStoreNET:"; + + private static readonly List> _sslHeaders = new List> + { + new Tuple("HTTP_CLUSTER_HTTPS", "on"), + 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") + }; + /// /// Gets a value which indicates whether the HTTP connection uses secure sockets (HTTPS protocol). @@ -27,10 +39,23 @@ public static class HttpExtensions /// public static bool IsSecureConnection(this HttpRequestBase request) { - return (request.IsSecureConnection - || (request.ServerVariables[HTTP_CLUSTER_VAR] != null || request.ServerVariables[HTTP_CLUSTER_VAR] == "on") - || (request.ServerVariables[HTTP_XFWDPROTO_VAR] != null || request.ServerVariables[HTTP_XFWDPROTO_VAR] == "https")); - } + 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; + + } /// @@ -140,7 +165,7 @@ private static void CopyCookie(HttpWebRequest webRequest, HttpRequestBase source public static string BuildScopedKey(this Cache cache, string key) { - return key.HasValue() ? "SmartStoreNET:" + key : null; + return key.HasValue() ? CACHE_REGION_NAME + key : null; } public static T GetOrAdd(this Cache cache, string key, Func acquirer, TimeSpan? duration = null) @@ -208,22 +233,27 @@ public static T GetItem(this HttpContextBase httpContext, string key, Func public static void RemoveByPattern(this Cache cache, string pattern) { - var regionName = "SmartStoreNET:"; + var keys = cache.AllKeys(pattern); - pattern = pattern == "*" ? regionName : pattern; + foreach (var key in keys.ToArray()) + { + cache.Remove(key); + } + } + + public static string[] AllKeys(this Cache cache, string pattern) + { + pattern = pattern == "*" ? CACHE_REGION_NAME : pattern; var keys = from entry in HttpRuntime.Cache.AsParallel().Cast() let key = entry.Key.ToString() where key.StartsWith(pattern, StringComparison.OrdinalIgnoreCase) select key; - foreach (var key in keys.ToArray()) - { - cache.Remove(key); - } + return keys.ToArray(); } - public static ControllerContext GetMasterControllerContext(this ControllerContext controllerContext) + public static ControllerContext GetMasterControllerContext(this ControllerContext controllerContext) { Guard.NotNull(controllerContext, nameof(controllerContext)); diff --git a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs index 91657a7900..0d50f65851 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs @@ -9,10 +9,8 @@ namespace SmartStore.Core.Packaging { - public static class PackagingUtils - { - + { public static string GetExtensionPrefix(string extensionType) { return string.Format("SmartStore.{0}.", extensionType); @@ -23,8 +21,6 @@ public static string BuildPackageId(string extensionName, string extensionType) return GetExtensionPrefix(extensionType) + extensionName; } - - internal static bool IsTheme(this IPackage package) { return IsTheme(package.Id); diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index af8037319d..6cca140a83 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -182,6 +182,7 @@ + diff --git a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs index a6d0649e24..1c8aaad909 100644 --- a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs @@ -10,6 +10,9 @@ using System.Web.Hosting; using System.Web.Mvc; using SmartStore.ComponentModel; +using System.Text; +using Newtonsoft.Json; +using System.Runtime.Serialization.Formatters.Binary; namespace SmartStore.Utilities { @@ -265,5 +268,99 @@ public static bool IsTruthy(object value) 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 + { + DateFormatHandling = DateFormatHandling.IsoDateFormat, + DateTimeZoneHandling = DateTimeZoneHandling.Utc, + MaxDepth = 10, + ReferenceLoopHandling = ReferenceLoopHandling.Ignore + }); + size = Encoding.Default.GetByteCount(json); + } + } + + return size; + } } } diff --git a/src/Libraries/SmartStore.Core/WebHelper.cs b/src/Libraries/SmartStore.Core/WebHelper.cs index c3bb24f849..b80f0e9381 100644 --- a/src/Libraries/SmartStore.Core/WebHelper.cs +++ b/src/Libraries/SmartStore.Core/WebHelper.cs @@ -612,7 +612,7 @@ public static string MakeAllUrlsAbsolute(string html, string protocol, string ho Guard.NotEmpty(protocol, nameof(protocol)); Guard.NotEmpty(host, nameof(host)); - string baseUrl = string.Format("{0}://{1}", protocol, host.TrimEnd('/')); + string baseUrl = protocol.EnsureEndsWith("://") + host.TrimEnd('/'); MatchEvaluator evaluator = (match) => { @@ -640,7 +640,7 @@ public static string GetAbsoluteUrl(string url, HttpRequestBase request) return url; } - if (url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) || url.StartsWith("https://", StringComparison.OrdinalIgnoreCase)) + if (url.Contains("://") || url.StartsWith("//")) { return url; } diff --git a/src/Libraries/SmartStore.Data/Caching/CachingCommand.cs b/src/Libraries/SmartStore.Data/Caching/CachingCommand.cs index 82fe3e4492..93dda75187 100644 --- a/src/Libraries/SmartStore.Data/Caching/CachingCommand.cs +++ b/src/Libraries/SmartStore.Data/Caching/CachingCommand.cs @@ -353,9 +353,7 @@ public async override Task ExecuteScalarAsync(CancellationToken cancella var key = CreateKey(); - object value; - - if (_cacheTransactionInterceptor.GetItem(Transaction, key, out value)) + if (_cacheTransactionInterceptor.GetItem(Transaction, key, out var value)) { return value; } diff --git a/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs b/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs index 08feb99172..9dae29bd05 100644 --- a/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs +++ b/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs @@ -57,7 +57,6 @@ public partial class DbCachingPolicy typeof(ShippingMethod).Name, typeof(StateProvince).Name, typeof(Store).Name, - typeof(StoreMapping).Name, typeof(TaxCategory).Name, typeof(ThemeVariable).Name, typeof(Topic).Name diff --git a/src/Libraries/SmartStore.Data/Caching/EfDbCache.cs b/src/Libraries/SmartStore.Data/Caching/EfDbCache.cs index ea10af6d3b..c25f7953f2 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfDbCache.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfDbCache.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Security.Cryptography; using System.Text; -using System.Threading.Tasks; using SmartStore.Core.Caching; using SmartStore.Core.Domain.Logging; using SmartStore.Core.Domain.Messages; @@ -23,7 +22,7 @@ public partial class EfDbCache : IDbCache typeof(QueuedEmail).Name }; - private const string KEYPREFIX = "efcache:*"; + private const string KEYPREFIX = "efcache:"; private readonly object _lock = new object(); private bool _enabled; @@ -248,8 +247,8 @@ public virtual DbCacheEntry Put(string key, object value, IEnumerable de public void Clear() { - _cache.RemoveByPattern(KEYPREFIX); - _requestCache.Value.RemoveByPattern(KEYPREFIX); + _cache.RemoveByPattern(KEYPREFIX + "*"); + _requestCache.Value.RemoveByPattern(KEYPREFIX + "*"); } public virtual void InvalidateSets(IEnumerable entitySets) diff --git a/src/Libraries/SmartStore.Data/Migrations/201609201852449_log4net.cs b/src/Libraries/SmartStore.Data/Migrations/201609201852449_log4net.cs index a1ddb8c90a..4dda98a5f8 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201609201852449_log4net.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201609201852449_log4net.cs @@ -14,9 +14,14 @@ public override void Up() // Custom START if (DataSettings.Current.IsSqlServer) { - //DropIndex("dbo.Log", "IX_Log_ContentHash"); Sql("IF EXISTS (SELECT * FROM sys.indexes WHERE name='IX_Log_ContentHash' AND object_id = OBJECT_ID('[dbo].[Log]')) DROP INDEX [IX_Log_ContentHash] ON [dbo].[Log];"); - Sql(@"Truncate Table [Log]"); + Sql(@"TRUNCATE Table [Log]"); + } + else + { + Sql(@"SET LOCK_TIMEOUT 20000;"); + DropIndex("Log", "IX_Log_ContentHash"); + Sql(@"DELETE FROM Log;"); } // Custom END diff --git a/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs b/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs index ffa4f3d83a..819de75e53 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Data.Entity; using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Caching; @@ -537,7 +538,7 @@ public virtual IList GetProductCategoriesByProductId(int produc string key = string.Format(PRODUCTCATEGORIES_ALLBYPRODUCTID_KEY, showHidden, productId, _workContext.CurrentCustomer.Id, _storeContext.CurrentStore.Id); return _requestCache.Get(key, () => { - var query = from pc in _productCategoryRepository.Table.Expand(x => x.Category) + var query = from pc in _productCategoryRepository.Table join c in _categoryRepository.Table on pc.CategoryId equals c.Id where pc.ProductId == productId && !c.Deleted && @@ -545,6 +546,8 @@ join c in _categoryRepository.Table on pc.CategoryId equals c.Id orderby pc.DisplayOrder select pc; + query = query.Include(x => x.Category); + var allProductCategories = query.ToList(); var result = new List(); if (!showHidden) @@ -571,12 +574,14 @@ public virtual Multimap GetProductCategoriesByProductIds(i Guard.NotNull(productIds, nameof(productIds)); var query = - from pc in _productCategoryRepository.TableUntracked.Expand(x => x.Category).Expand(x => x.Category.Picture) + from pc in _productCategoryRepository.TableUntracked join c in _categoryRepository.Table on pc.CategoryId equals c.Id where productIds.Contains(pc.ProductId) && !c.Deleted && (showHidden || c.Published) orderby pc.DisplayOrder select pc; + query = query.Include(x => x.Category.Picture); + if (hasDiscountsApplied.HasValue) { query = query.Where(x => x.Category.HasDiscountsApplied == hasDiscountsApplied); diff --git a/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs b/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs index 98f8628659..b99f8fbd8c 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Importer/ProductImporter.cs @@ -385,7 +385,6 @@ protected virtual int ProcessProducts( 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.QuantiyControlType); row.SetProperty(context.Result, (x) => x.HideQuantityControl); row.SetProperty(context.Result, (x) => x.AllowedQuantities); row.SetProperty(context.Result, (x) => x.DisableBuyButton); @@ -426,6 +425,11 @@ protected virtual int ProcessProducts( row.SetProperty(context.Result, (x) => x.CustomsTariffNumber); row.SetProperty(context.Result, (x) => x.CountryOfOriginId); + if (row.TryGetDataValue("QuantiyControlType", out int qct)) + { + product.QuantiyControlType = (QuantityControlType)qct; + } + string tvp; if (row.TryGetDataValue("ProductTemplateViewPath", out tvp, row.IsTransient)) { diff --git a/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs b/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs index b425eb7bf9..3daed078af 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Data.Entity; using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Caching; @@ -216,15 +217,14 @@ public virtual IList GetProductManufacturersByProductId(int string key = string.Format(PRODUCTMANUFACTURERS_ALLBYPRODUCTID_KEY, showHidden, productId, _workContext.CurrentCustomer.Id, _storeContext.CurrentStore.Id); return _requestCache.Get(key, () => { - var query = from pm in _productManufacturerRepository.Table.Expand(x => x.Manufacturer.Picture) - join m in _manufacturerRepository.Table on - pm.ManufacturerId equals m.Id - where pm.ProductId == productId && - !m.Deleted && - (showHidden || m.Published) + 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) orderby pm.DisplayOrder select pm; + query = query.Include(x => x.Manufacturer.Picture); + if (!showHidden) { if (!QuerySettings.IgnoreMultiStore) @@ -274,11 +274,13 @@ public virtual Multimap GetProductManufacturersByProdu Guard.NotNull(productIds, nameof(productIds)); var query = - from pm in _productManufacturerRepository.TableUntracked.Expand(x => x.Manufacturer).Expand(x => x.Manufacturer.Picture) + 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 = query.Include(x => x.Manufacturer.Picture); + var map = query .OrderBy(x => x.ProductId) .ThenBy(x => x.DisplayOrder) diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs index 91b71df230..7c0556775b 100644 --- a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs @@ -539,7 +539,6 @@ public virtual decimal GetFinalPrice( //tier prices if (product.HasTierPrices && !bundleItem.IsValid() && includeDiscounts) { - decimal? tierPrice = GetMinimumTierPrice(product, customer, quantity, context); Discount appliedDiscountTest = null; decimal discountAmountTest = GetDiscountAmount(product, customer, additionalCharge, quantity, out appliedDiscountTest, bundleItem); diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs index 948d027fee..6c6c95eae0 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Data.Entity; using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Caching; @@ -401,12 +402,14 @@ public virtual IEnumerable GetProductVariantAttrib (int)AttributeControlType.Boxes }; - var query = from x in _productVariantAttributeValueRepository.Table.Expand(y => y.ProductVariantAttribute.ProductAttribute) + 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(); }); } diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductService.cs index 451c30faf2..ce67b25993 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductService.cs @@ -606,8 +606,9 @@ public virtual Multimap GetProductTagsByProductIds(int[] produc }); var map = new Multimap(); + var list = query.ToList(); - foreach (var item in query.ToList()) + foreach (var item in list) { foreach (var tag in item.Tags) map.Add(item.ProductId, tag); @@ -1033,7 +1034,7 @@ join p in _productRepository.Table on pbi.ProductId equals p.Id orderby pbi.DisplayOrder select pbi; - query = query.Expand(x => x.Product); + query = query.Include(x => x.Product); var bundleItemData = new List(); @@ -1053,7 +1054,7 @@ where productIds.Contains(pbi.BundleProductId) && !p.Deleted && !p.IsSystemProdu orderby pbi.DisplayOrder select pbi; - var map = query.Expand(x => x.Product) + var map = query.Include(x => x.Product) .ToList() .ToMultimap(x => x.BundleProductId, x => x); diff --git a/src/Libraries/SmartStore.Services/Catalog/SpecificationAttributeService.cs b/src/Libraries/SmartStore.Services/Catalog/SpecificationAttributeService.cs index b8f94ad350..e6d3ed5d8a 100644 --- a/src/Libraries/SmartStore.Services/Catalog/SpecificationAttributeService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/SpecificationAttributeService.cs @@ -179,7 +179,7 @@ public virtual IList GetProductSpecificationAttri // Note: Join or Expand of SpecificationAttribute, both provides the same SQL. var joinedQuery = from psa in _productSpecificationAttributeRepository.Table - join sao in _specificationAttributeOptionRepository.Table.Expand(x => x.SpecificationAttribute) on psa.SpecificationAttributeOptionId equals sao.Id + join sao in _specificationAttributeOptionRepository.Table on psa.SpecificationAttributeOptionId equals sao.Id where psa.ProductId == productId select new { @@ -221,7 +221,6 @@ public virtual Multimap GetProductSpecificat Guard.NotNull(productIds, nameof(productIds)); var query = _productSpecificationAttributeRepository.TableUntracked - .Expand(x => x.SpecificationAttributeOption) .Expand(x => x.SpecificationAttributeOption.SpecificationAttribute) .Where(x => productIds.Contains(x.ProductId)); diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs index 7bcf0e43fb..d15757d4e6 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs @@ -644,7 +644,10 @@ private dynamic ToDynamic(DataExporterContext ctx, Product product, bool isParen if (productContext.Combination != null) { var pictureIds = productContext.Combination.GetAssignedPictureIds(); - productPictures = productPictures.Where(x => pictureIds.Contains(x.PictureId)); + if (pictureIds.Any()) + { + productPictures = productPictures.Where(x => pictureIds.Contains(x.PictureId)); + } attributesXml = productContext.Combination.AttributesXml; variantAttributes = _productAttributeParser.Value.DeserializeProductVariantAttributes(attributesXml); diff --git a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs index 1e68306f3b..6fd1ec511a 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs @@ -383,7 +383,7 @@ private void ValidateMessageContext(MessageContext ctx, ref object[] modelParts) parts = bagParts.Concat(parts.Except(bagParts)); } - modelParts = parts.ToArray(); + modelParts = parts.Where(x => x != null).ToArray(); } protected EmailAccount GetEmailAccountOfMessageTemplate(MessageTemplate messageTemplate, int languageId) diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs index cf45d0db3b..d7c837199c 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs @@ -30,22 +30,22 @@ private void ApplyCustomerContentPart(IDictionary model, Custome private string BuildUrl(string url, MessageContext ctx) { - return ctx.BaseUri.ToString().TrimEnd('/') + url; + return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + url.EnsureStartsWith("/"); } private string BuildRouteUrl(object routeValues, MessageContext ctx) { - return ctx.BaseUri.ToString().TrimEnd('/') + _urlHelper.RouteUrl(routeValues); + return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.RouteUrl(routeValues); } private string BuildRouteUrl(string routeName, object routeValues, MessageContext ctx) { - return ctx.BaseUri.ToString().TrimEnd('/') + _urlHelper.RouteUrl(routeName, routeValues); + return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.RouteUrl(routeName, routeValues); } private string BuildActionUrl(string action, string controller, object routeValues, MessageContext ctx) { - return ctx.BaseUri.ToString().TrimEnd('/') + _urlHelper.Action(action, controller, routeValues); + return ctx.BaseUri.GetLeftPart(UriPartial.Authority) + _urlHelper.Action(action, controller, routeValues); } private void PublishModelPartCreatedEvent(T source, dynamic part) where T : class @@ -74,7 +74,7 @@ private object GetTopic(string topicSystemName, MessageContext ctx) var topicService = _services.Resolve(); // Load by store - var topic = topicService.GetTopicBySystemName(topicSystemName); + var topic = topicService.GetTopicBySystemName(topicSystemName, ctx.StoreId ?? 0); string body = topic?.GetLocalized(x => x.Body, ctx.Language); if (body.HasValue()) diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index 545b365f76..006645c02e 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -566,7 +566,7 @@ protected virtual object CreateModelPart(Product part, MessageContext messageCon if (shoppingCartSettings.ShowDeliveryTimes && part.IsShipEnabled) { - if (deliveryTimeService.GetDeliveryTime(part) is DeliveryTime dt) + if (deliveryTimeService.GetDeliveryTimeById(part.DeliveryTimeId ?? 0) is DeliveryTime dt) { m["DeliveryTime"] = new Dictionary { @@ -714,7 +714,7 @@ protected virtual object CreateModelPart(Campaign part, MessageContext messageCo Guard.NotNull(part, nameof(part)); var protocol = messageContext.BaseUri.Scheme; - var host = messageContext.BaseUri.Authority; + var host = messageContext.BaseUri.Authority + messageContext.BaseUri.AbsolutePath; var body = HtmlUtils.RelativizeFontSizes(part.Body.EmptyNull()); // We must render the body separately diff --git a/src/Libraries/SmartStore.Services/Search/Modelling/CatalogSearchQueryAliasMapper.cs b/src/Libraries/SmartStore.Services/Search/Modelling/CatalogSearchQueryAliasMapper.cs index 42562c44c6..7003982f0d 100644 --- a/src/Libraries/SmartStore.Services/Search/Modelling/CatalogSearchQueryAliasMapper.cs +++ b/src/Libraries/SmartStore.Services/Search/Modelling/CatalogSearchQueryAliasMapper.cs @@ -297,8 +297,7 @@ protected virtual IDictionary GetVariantIdByAliasMappings() options.Clear(); var optionIdMappings = _productVariantAttributeValueRepository.TableUntracked - .Expand(x => x.ProductVariantAttribute) - .Expand("ProductVariantAttribute.ProductAttribute") + .Expand(x => x.ProductVariantAttribute.ProductAttribute) .Select(x => new { OptionId = x.Id, diff --git a/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs b/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs index dd6a04b8e2..21f0ce5fb0 100644 --- a/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs +++ b/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs @@ -10,7 +10,6 @@ using SmartStore.Services.Localization; using SmartStore.Utilities; using SmartStore.Core.Localization; -using SmartStore.Core.Domain.Topics; namespace SmartStore.Services.Seo { diff --git a/src/Libraries/SmartStore.Services/Stores/StoreService.cs b/src/Libraries/SmartStore.Services/Stores/StoreService.cs index 75e7f86528..68a7280116 100644 --- a/src/Libraries/SmartStore.Services/Stores/StoreService.cs +++ b/src/Libraries/SmartStore.Services/Stores/StoreService.cs @@ -1,29 +1,21 @@ using System; using System.Collections.Generic; using System.Linq; -using SmartStore.Data; using SmartStore.Core.Data; using SmartStore.Core.Domain.Stores; -using SmartStore.Core.Events; using SmartStore.Data.Caching; -using SmartStore.Services.Media; -using SmartStore.Core.Domain.Security; namespace SmartStore.Services.Stores { public partial class StoreService : IStoreService { private readonly IRepository _storeRepository; - private readonly IEventPublisher _eventPublisher; - private readonly SecuritySettings _securitySettings; private bool? _isSingleStoreMode = null; - public StoreService(IRepository storeRepository, IEventPublisher eventPublisher, SecuritySettings securitySettings) + public StoreService(IRepository storeRepository) { _storeRepository = storeRepository; - _eventPublisher = eventPublisher; - _securitySettings = securitySettings; } public virtual void DeleteStore(Store store) diff --git a/src/Libraries/SmartStore.Services/Topics/TopicService.cs b/src/Libraries/SmartStore.Services/Topics/TopicService.cs index 88e2203677..89e5dfa85e 100644 --- a/src/Libraries/SmartStore.Services/Topics/TopicService.cs +++ b/src/Libraries/SmartStore.Services/Topics/TopicService.cs @@ -53,21 +53,22 @@ public virtual Topic GetTopicBySystemName(string systemName, int storeId = 0) if (systemName.IsEmpty()) return null; - var topic = _topicRepository.Table - .Where(x => x.SystemName == systemName) - .OrderBy(x => x.Id) - .FirstOrDefaultCached("db.topic.bysysname-" + systemName); + var query = GetAllTopicsQuery(systemName, storeId); + var result = query.FirstOrDefaultCached("db.topic.bysysname-{0}-{1}".FormatInvariant(systemName, storeId)); - if (storeId > 0 && topic != null && !_storeMappingService.Authorize(topic)) - { - topic = null; - } - - return topic; + return result; } public virtual IList GetAllTopics(int storeId = 0) { + var query = GetAllTopicsQuery(null, storeId); + var result = query.ToListCached("db.topic.all-" + storeId); + + return result; + } + + protected virtual IQueryable GetAllTopicsQuery(string systemName, int storeId) + { var query = _topicRepository.Table; // Store mapping @@ -87,9 +88,14 @@ orderby tGroup.Key select tGroup.FirstOrDefault(); } + if (systemName.HasValue()) + { + query = query.Where(x => x.SystemName == systemName); + } + query = query.OrderBy(t => t.Priority).ThenBy(t => t.SystemName); - return query.ToListCached("db.topic.all-" + storeId); + return query; } public virtual void InsertTopic(Topic topic) diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs index 0c44f89540..30fcf453b6 100644 --- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs +++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs @@ -79,8 +79,16 @@ public ActionResult PaymentMethod() [HttpPost] public ActionResult PaymentMethod(FormCollection form) { + // Display biling address on confirm page. _apiService.GetBillingAddress(); + var customer = Services.WorkContext.CurrentCustomer; + if (customer.BillingAddress == null) + { + NotifyError(T("Plugins.Payments.AmazonPay.MissingBillingAddress")); + return RedirectToAction("Cart", "ShoppingCart", new { area = "" }); + } + return RedirectToAction("Confirm", "Checkout", new { area = "" }); } diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs index 3c2bfebf94..bce38ebbd0 100644 --- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs +++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs @@ -164,15 +164,16 @@ public ActionResult AuthenticationPublicInfo() public ActionResult AuthenticationButtonHandler() { + var returnUrl = Session["AmazonAuthReturnUrl"] as string; + var processor = _openAuthenticationService.Value.LoadExternalAuthenticationMethodBySystemName(AmazonPayPlugin.SystemName, Services.StoreContext.CurrentStore.Id); if (processor == null || !processor.IsMethodActive(_externalAuthenticationSettings.Value)) { - throw new SmartException(T("Plugins.Payments.AmazonPay.AuthenticationNotActive")); + NotifyError(T("Plugins.Payments.AmazonPay.AuthenticationNotActive")); + return new RedirectResult(Url.LogOn(returnUrl)); } - var returnUrl = Session["AmazonAuthReturnUrl"] as string; var result = _apiService.Authorize(returnUrl); - switch (result.AuthenticationStatus) { case OpenAuthenticationStatus.Error: diff --git a/src/Plugins/SmartStore.AmazonPay/Localization/resources.de-de.xml b/src/Plugins/SmartStore.AmazonPay/Localization/resources.de-de.xml index 48f3a91396..3ec171cd79 100644 --- a/src/Plugins/SmartStore.AmazonPay/Localization/resources.de-de.xml +++ b/src/Plugins/SmartStore.AmazonPay/Localization/resources.de-de.xml @@ -99,7 +99,7 @@ Textvorschläge:
    Eine Verschlüsselung von Zugangsdaten wird nicnt unterstützt. - Die Amazon Rechnungsanschrift des Kunden fehlt. + Die Amazon Rechnungsanschrift fehlt. Bitte hinterlegen Sie eine Rechnungsanschrift bei Amazon oder wählen Sie eine andere Zahlart. Daten von Amazon wurden verarbeitet diff --git a/src/Plugins/SmartStore.AmazonPay/Localization/resources.en-us.xml b/src/Plugins/SmartStore.AmazonPay/Localization/resources.en-us.xml index ee608940ed..bc510fac8e 100644 --- a/src/Plugins/SmartStore.AmazonPay/Localization/resources.en-us.xml +++ b/src/Plugins/SmartStore.AmazonPay/Localization/resources.en-us.xml @@ -99,7 +99,7 @@ Text suggestions:
      Encryption of access data is not supported. - Missing Amazon billing address of the customer. + Missing Amazon billing address of the customer. Please enter a billing address at Amazon or choose another payment method. Data from Amazon has been processed diff --git a/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs b/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs index 9e41299d53..f18a90c673 100644 --- a/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs +++ b/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs @@ -777,7 +777,7 @@ public void CloseOrderReference(AmazonPaySettings settings, Order order) // You can still perform captures against any open authorizations, but you cannot create any new authorizations on the // Order Reference object. You can still execute refunds against the Order Reference object. var orderAttribute = DeserializeOrderAttribute(order); - if (!orderAttribute.OrderReferenceClosed) + if (!orderAttribute.OrderReferenceClosed && orderAttribute.OrderReferenceId.HasValue()) { var client = CreateClient(settings); var closeRequest = new CloseOrderReferenceRequest() @@ -884,7 +884,7 @@ public void GetBillingAddress() // We must ignore countryAllowsBilling because the customer cannot choose another billing address in Amazon checkout. //if (!countryAllowsBilling) - // return false; + // return; var existingAddress = customer.Addresses.ToList().FindAddress(address, true); if (existingAddress == null) @@ -915,7 +915,7 @@ public void GetBillingAddress() } else { - Logger.Error(new Exception(getOrderResponse.GetJson()), T("Plugins.Payments.AmazonPay.MissingBillingAddress")); + // No billing address at Amazon? We cannot proceed. } } else @@ -1004,12 +1004,6 @@ public PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest request) return result; } } - - var confirmRequest = new ConfirmOrderReferenceRequest() - .WithMerchantId(settings.SellerId) - .WithAmazonOrderReferenceId(state.OrderReferenceId); - - client.ConfirmOrderReference(confirmRequest); } catch (Exception exception) { @@ -1046,6 +1040,13 @@ public ProcessPaymentResult ProcessPayment(ProcessPaymentRequest request) informCustomerAboutErrors = settings.InformCustomerAboutErrors; informCustomerAddErrors = settings.InformCustomerAddErrors; + // Confirm order. This already generates the payment object at Amazon. + var confirmRequest = new ConfirmOrderReferenceRequest() + .WithMerchantId(settings.SellerId) + .WithAmazonOrderReferenceId(state.OrderReferenceId); + + client.ConfirmOrderReference(confirmRequest); + // Authorize. if (settings.AuthorizeMethod == AmazonPayAuthorizeMethod.Omnichronous) { @@ -1200,12 +1201,30 @@ public void PostProcessPayment(PostProcessPaymentRequest request) try { var state = _httpContext.GetAmazonPayState(_services.Localization); - var orderAttribute = new AmazonPayOrderAttribute { OrderReferenceId = state.OrderReferenceId }; + if (request.Order.PaymentStatus == PaymentStatus.Paid) + { + var settings = _services.Settings.LoadSetting(request.Order.StoreId); + var client = CreateClient(settings); + var closeRequest = new CloseOrderReferenceRequest() + .WithMerchantId(settings.SellerId) + .WithAmazonOrderReferenceId(orderAttribute.OrderReferenceId); + + var closeResponse = client.CloseOrderReference(closeRequest); + if (closeResponse.GetSuccess()) + { + orderAttribute.OrderReferenceClosed = true; + } + else + { + LogError(closeResponse, true); + } + } + SerializeOrderAttribute(orderAttribute, request.Order); } catch (Exception exception) @@ -1216,7 +1235,7 @@ public void PostProcessPayment(PostProcessPaymentRequest request) public CapturePaymentResult Capture(CapturePaymentRequest request) { - var result = new CapturePaymentResult() + var result = new CapturePaymentResult { NewPaymentStatus = request.Order.PaymentStatus }; diff --git a/src/Plugins/SmartStore.AmazonPay/Views/AmazonPayCheckout/PaymentMethod.cshtml b/src/Plugins/SmartStore.AmazonPay/Views/AmazonPayCheckout/PaymentMethod.cshtml index a736fed4e8..233d0251c7 100644 --- a/src/Plugins/SmartStore.AmazonPay/Views/AmazonPayCheckout/PaymentMethod.cshtml +++ b/src/Plugins/SmartStore.AmazonPay/Views/AmazonPayCheckout/PaymentMethod.cshtml @@ -57,7 +57,7 @@ try { new OffAmazonPayments.Widgets.Wallet({ sellerId: '@Model.SellerId', - scope: '', + scope: 'profile payments:widget payments:shipping_address payments:billing_address', amazonOrderReferenceId: '@Model.OrderReferenceId', design: { designMode: 'responsive' diff --git a/src/Plugins/SmartStore.DevTools/DevToolsPlugin.cs b/src/Plugins/SmartStore.DevTools/DevToolsPlugin.cs index 5a02f6aefa..6001b8b582 100644 --- a/src/Plugins/SmartStore.DevTools/DevToolsPlugin.cs +++ b/src/Plugins/SmartStore.DevTools/DevToolsPlugin.cs @@ -6,8 +6,6 @@ using SmartStore.Core.Plugins; using SmartStore.Data; using SmartStore.Data.Setup; -using SmartStore.Services.Cms; -using SmartStore.Services.Common; using SmartStore.Services.Configuration; using SmartStore.Core.Caching; @@ -16,7 +14,7 @@ namespace SmartStore.DevTools [DisplayOrder(10)] [SystemName("Widgets.DevToolsDemo")] [FriendlyName("Dev-Tools Demo Widget")] - public class DevToolsPlugin : BasePlugin, IConfigurable, IWidget + public class DevToolsPlugin : BasePlugin, IConfigurable //, IWidget { private readonly ISettingService _settingService; private readonly ICacheableRouteRegistrar _cacheableRouteRegistrar; @@ -32,19 +30,19 @@ public DevToolsPlugin(ISettingService settingService, public ILogger Logger { get; set; } - public IList GetWidgetZones() => new List { "home_page_top" }; + //public IList GetWidgetZones() => new List { "home_page_top" }; - public void GetDisplayWidgetRoute(string widgetZone, object model, int storeId, out string actionName, out string controllerName, out RouteValueDictionary routeValues) - { - actionName = "MyDemoWidget"; - controllerName = "DevTools"; + //public void GetDisplayWidgetRoute(string widgetZone, object model, int storeId, out string actionName, out string controllerName, out RouteValueDictionary routeValues) + //{ + // actionName = "MyDemoWidget"; + // controllerName = "DevTools"; - routeValues = new RouteValueDictionary - { - { "Namespaces", "SmartStore.DevTools.Controllers" }, - { "area", "SmartStore.DevTools" } - }; - } + // routeValues = new RouteValueDictionary + // { + // { "Namespaces", "SmartStore.DevTools.Controllers" }, + // { "area", "SmartStore.DevTools" } + // }; + //} public void GetConfigurationRoute(out string actionName, out string controllerName, out RouteValueDictionary routeValues) { diff --git a/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs b/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs index 2ba3b446a8..bd0551c79b 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs +++ b/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs @@ -14,7 +14,6 @@ using SmartStore.Web.Framework.Controllers; using SmartStore.Web.Framework.Security; using SmartStore.Web.Framework.Settings; -using SmartStore.Core.Localization; namespace SmartStore.GoogleAnalytics.Controllers { @@ -38,12 +37,8 @@ public WidgetsGoogleAnalyticsController( _settingService = settingService; _orderService = orderService; _categoryService = categoryService; - - T = NullLocalizer.Instance; } - public Localizer T { get; set; } - [AdminAuthorize, ChildActionOnly, LoadSetting] public ActionResult Configure(GoogleAnalyticsSettings settings) { diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs index e6a478ffc0..84c27f6cf7 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs @@ -30,7 +30,6 @@ namespace SmartStore.GoogleMerchantCenter.Providers ExportFeatures.CanProjectDescription | ExportFeatures.UsesSkuAsMpnFallback | ExportFeatures.OffersBrandFallback | - ExportFeatures.CanIncludeMainPicture | ExportFeatures.UsesSpecialPrice | ExportFeatures.UsesAttributeCombination)] public class GmcXmlExportProvider : ExportProviderBase @@ -312,7 +311,6 @@ protected override void Export(ExportExecuteContext context) { string category = (gmc == null ? null : gmc.Taxonomy); string productType = product._CategoryPath; - string mainImageUrl = product._MainPictureUrl; var price = (decimal)product.Price; var uniqueId = (string)product._UniqueId; var isParent = (bool)product._IsParent; @@ -320,6 +318,11 @@ protected override void Export(ExportExecuteContext context) string gtin = product.Gtin; string mpn = product.ManufacturerPartNumber; var availability = defaultAvailability; + List productPictures = product.ProductPictures; + var pictureUrls = productPictures + .Select(x => (string)x.Picture._FullSizeImageUrl) + .Where(x => x.HasValue()) + .ToList(); var attributeValues = !isParent && product._AttributeCombinationValues != null ? ((ICollection)product._AttributeCombinationValues).ToMultimap(x => x.ProductVariantAttribute.ProductAttributeId, x => x) @@ -366,20 +369,19 @@ protected override void Export(ExportExecuteContext context) writer.WriteElementString("link", (string)product._DetailUrl); - if (mainImageUrl.HasValue()) + if (pictureUrls.Any()) { - WriteString(writer, "image_link", mainImageUrl); - } + WriteString(writer, "image_link", pictureUrls.First()); - if (config.AdditionalImages) - { - var imageCount = 0; - foreach (dynamic productPicture in product.ProductPictures) + if (config.AdditionalImages) { - string pictureUrl = productPicture.Picture._ImageUrl; - if (pictureUrl.HasValue() && (mainImageUrl.IsEmpty() || !mainImageUrl.IsCaseInsensitiveEqual(pictureUrl)) && ++imageCount <= 10) + var imageCount = 0; + foreach (var url in pictureUrls.Skip(1)) { - WriteString(writer, "additional_image_link", pictureUrl); + if (++imageCount <= 10) + { + WriteString(writer, "additional_image_link", url); + } } } } diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs index 2fa248cf27..60320c45d9 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.IO; using System.Linq; +using System.Net; using System.Text; using System.Web; using System.Web.Mvc; @@ -100,10 +101,9 @@ protected PaymentStatus GetPaymentStatus(string paymentStatus, string pendingRea protected bool VerifyIPN(PayPalSettingsBase settings, string formString, out Dictionary values) { - // settings: multistore context not possible here. we need the custom value to determine what store it is. - - var request = settings.GetPayPalWebRequest(); - request.Method = "POST"; + // Settings: multistore context not possible here. we need the custom value to determine what store it is. + var request = (HttpWebRequest)WebRequest.Create(settings.GetPayPalUrl()); + request.Method = "POST"; request.ContentType = "application/x-www-form-urlencoded"; request.UserAgent = Request.UserAgent; diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs index be143a6dfd..e27d8e98c7 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs @@ -4,6 +4,7 @@ using System.Text; using System.Web; using System.Web.Mvc; +using Newtonsoft.Json; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Stores; @@ -248,7 +249,8 @@ public ActionResult PaymentWall() var pppProvider = _paymentService.LoadPaymentMethodBySystemName(PayPalPlusProvider.SystemName, false, store.Id); var methods = _paymentService.LoadActivePaymentMethods(customer, cart, store.Id, null, false); - var session = _httpContext.GetPayPalSessionData(); + var session = _httpContext.GetPayPalState(PayPalPlusProvider.SystemName); + var redirectToConfirm = false; var model = new PayPalPlusCheckoutModel(); model.ThirdPartyPaymentMethods = new List(); @@ -287,7 +289,7 @@ public ActionResult PaymentWall() model.ThirdPartyFees = sb.ToString(); - // we must create a new paypal payment each time the payment wall is rendered because otherwise patch payment can fail + // We must create a new paypal payment each time the payment wall is rendered because otherwise patch payment can fail // with "Item amount must add up to specified amount subtotal (or total if amount details not specified)". session.PaymentId = null; session.ApprovalUrl = null; @@ -302,10 +304,10 @@ public ActionResult PaymentWall() result = PayPalService.CreatePayment(settings, session, cart, PayPalPlusProvider.SystemName, returnUrl, cancelUrl); if (result == null) { - return RedirectToAction("Confirm", "Checkout", new { area = "" }); + // No payment required. + redirectToConfirm = true; } - - if (result.Success && result.Json != null) + else if (result.Success && result.Json != null) { foreach (var link in result.Json.links) { @@ -329,7 +331,18 @@ public ActionResult PaymentWall() model.ApprovalUrl = session.ApprovalUrl; - if (session.SessionExpired) + // There have been cases where the token was lost for unexplained reasons, so it is additionally stored in the database. + var sessionData = session.AccessToken.HasValue() && session.PaymentId.HasValue() + ? JsonConvert.SerializeObject(session) + : null; + _genericAttributeService.SaveAttribute(customer, PayPalPlusProvider.SystemName + ".SessionData", sessionData, store.Id); + + if (redirectToConfirm) + { + return RedirectToAction("Confirm", "Checkout", new { area = "" }); + } + + if (session.SessionExpired) { // Customer has been redirected because the session expired. session.SessionExpired = false; @@ -342,7 +355,10 @@ public ActionResult PaymentWall() [HttpPost] public ActionResult PatchShipping() { - var session = HttpContext.GetPayPalSessionData(); + var store = Services.StoreContext.CurrentStore; + var customer = Services.WorkContext.CurrentCustomer; + var session = _httpContext.GetPayPalState(PayPalPlusProvider.SystemName, customer, store.Id, _genericAttributeService); + if (session.AccessToken.IsEmpty() || session.PaymentId.IsEmpty()) { // Session expired. Reload payment wall and create new payment (we need the payment id). @@ -351,8 +367,6 @@ public ActionResult PatchShipping() return new JsonResult { Data = new { success = false, error = string.Empty, reload = true } }; } - var store = Services.StoreContext.CurrentStore; - var customer = Services.WorkContext.CurrentCustomer; var settings = Services.Settings.LoadSetting(store.Id); var cart = customer.GetCartItems(ShoppingCartType.ShoppingCart, store.Id); @@ -369,9 +383,13 @@ public ActionResult PatchShipping() public ActionResult CheckoutCompleted() { - var instruct = _httpContext.Session[PayPalPlusProvider.CheckoutCompletedKey] as string; + var store = Services.StoreContext.CurrentStore; + var customer = Services.WorkContext.CurrentCustomer; + + _genericAttributeService.SaveAttribute(customer, PayPalPlusProvider.SystemName + ".SessionData", (string)null, store.Id); - if (instruct.HasValue()) + var instruct = _httpContext.Session[PayPalPlusProvider.CheckoutCompletedKey] as string; + if (instruct.HasValue()) { return Content(instruct); } @@ -382,13 +400,13 @@ public ActionResult CheckoutCompleted() [ValidateInput(false)] public ActionResult CheckoutReturn(string systemName, string paymentId, string PayerID) { - // Request.QueryString: - // paymentId: PAY-0TC88803RP094490KK4KM6AI, token (not the access token): EC-5P379249AL999154U, PayerID: 5L9K773HHJLPN + // Request.QueryString: + // paymentId: PAY-0TC88803RP094490KK4KM6AI, token (not the access token): EC-5P379249AL999154U, PayerID: 5L9K773HHJLPN - var customer = Services.WorkContext.CurrentCustomer; - var store = Services.StoreContext.CurrentStore; + var store = Services.StoreContext.CurrentStore; + var customer = Services.WorkContext.CurrentCustomer; var settings = Services.Settings.LoadSetting(store.Id); - var session = _httpContext.GetPayPalSessionData(); + var session = _httpContext.GetPayPalState(PayPalPlusProvider.SystemName); if (systemName.IsEmpty()) systemName = PayPalPlusProvider.SystemName; diff --git a/src/Plugins/SmartStore.PayPal/Description.txt b/src/Plugins/SmartStore.PayPal/Description.txt index 51da3aae73..b23fa90c94 100644 --- a/src/Plugins/SmartStore.PayPal/Description.txt +++ b/src/Plugins/SmartStore.PayPal/Description.txt @@ -2,7 +2,7 @@ Description: Provides the PayPal payment methods PayPal Standard, PayPal Direct, PayPal Express and PayPal PLUS. SystemName: SmartStore.PayPal Group: Payment -Version: 3.1.5 +Version: 3.1.5.2 MinAppVersion: 3.1.5 DisplayOrder: 1 FileName: SmartStore.PayPal.dll diff --git a/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs index 10b9c1ecd4..13e6e80e1a 100644 --- a/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs @@ -1,12 +1,13 @@ -using System.Net; -using System.Web; +using System.Web; +using Newtonsoft.Json; +using SmartStore.Core.Domain.Customers; using SmartStore.PayPal.Services; using SmartStore.PayPal.Settings; -using SmartStore.Services.Orders; +using SmartStore.Services.Common; namespace SmartStore.PayPal { - internal static class MiscExtensions + internal static class MiscExtensions { public static string GetPayPalUrl(this PayPalSettingsBase settings) { @@ -15,21 +16,54 @@ public static string GetPayPalUrl(this PayPalSettingsBase settings) "https://www.paypal.com/cgi-bin/webscr"; } - public static HttpWebRequest GetPayPalWebRequest(this PayPalSettingsBase settings) + public static PayPalSessionData GetPayPalState(this HttpContextBase httpContext, string key) { - var request = (HttpWebRequest)WebRequest.Create(GetPayPalUrl(settings)); - return request; - } + Guard.NotEmpty(key, nameof(key)); - public static PayPalSessionData GetPayPalSessionData(this HttpContextBase httpContext, CheckoutState state = null) - { - if (state == null) - state = httpContext.GetCheckoutState(); + var state = httpContext.GetCheckoutState(); - if (!state.CustomProperties.ContainsKey(PayPalPlusProvider.SystemName)) - state.CustomProperties.Add(PayPalPlusProvider.SystemName, new PayPalSessionData()); + if (!state.CustomProperties.ContainsKey(key)) + { + state.CustomProperties.Add(key, new PayPalSessionData()); + } - return state.CustomProperties.Get(PayPalPlusProvider.SystemName) as PayPalSessionData; + var session = state.CustomProperties.Get(key) as PayPalSessionData; + return session; } - } + + public static PayPalSessionData GetPayPalState( + this HttpContextBase httpContext, + string key, + Customer customer, + int storeId, + IGenericAttributeService genericAttributeService) + { + Guard.NotNull(httpContext, nameof(httpContext)); + Guard.NotNull(customer, nameof(customer)); + Guard.NotNull(genericAttributeService, nameof(genericAttributeService)); + + var session = httpContext.GetPayPalState(key); + + if (session.AccessToken.IsEmpty() || session.PaymentId.IsEmpty()) + { + try + { + var str = customer.GetAttribute(key + ".SessionData", genericAttributeService, storeId); + if (str.HasValue()) + { + var storedSessionData = JsonConvert.DeserializeObject(str); + if (storedSessionData != null) + { + // Only token and paymentId required. + session.AccessToken = storedSessionData.AccessToken; + session.PaymentId = storedSessionData.PaymentId; + } + } + } + catch { } + } + + return session; + } + } } \ No newline at end of file diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs index 935f71b337..29a9f38bb3 100644 --- a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs +++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs @@ -1,20 +1,15 @@ using System; -using System.Web; using System.Web.Mvc; using SmartStore.Web.Framework.UI; namespace SmartStore.PayPal.Filters { - public class PayPalPlusWidgetZoneFilter : IActionFilter, IResultFilter + public class PayPalPlusWidgetZoneFilter : IActionFilter, IResultFilter { - private readonly Lazy _httpContext; private readonly Lazy _widgetProvider; - public PayPalPlusWidgetZoneFilter( - Lazy httpContext, - Lazy widgetProvider) + public PayPalPlusWidgetZoneFilter(Lazy widgetProvider) { - _httpContext = httpContext; _widgetProvider = widgetProvider; } @@ -31,7 +26,7 @@ public void OnResultExecuting(ResultExecutingContext filterContext) if (filterContext.IsChildAction) return; - // should only run on a full view rendering result + // Should only run on a full view rendering result. var result = filterContext.Result as ViewResultBase; if (result == null) return; @@ -41,12 +36,7 @@ public void OnResultExecuting(ResultExecutingContext filterContext) if (action.IsCaseInsensitiveEqual("Completed") && controller.IsCaseInsensitiveEqual("Checkout")) { - var instruct = _httpContext.Value.Session[PayPalPlusProvider.CheckoutCompletedKey] as string; - - if (instruct.HasValue()) - { - _widgetProvider.Value.RegisterAction("checkout_completed_top", "CheckoutCompleted", "PayPalPlus", new { area = Plugin.SystemName }); - } + _widgetProvider.Value.RegisterAction("checkout_completed_top", "CheckoutCompleted", "PayPalPlus", new { area = Plugin.SystemName }); } } diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalPlusProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalPlusProvider.cs index 45e251d2d0..95ab5d5cbd 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalPlusProvider.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalPlusProvider.cs @@ -11,18 +11,14 @@ namespace SmartStore.PayPal [DisplayOrder(1)] public partial class PayPalPlusProvider : PayPalRestApiProviderBase { - public static string SystemName - { - get { return "Payments.PayPalPlus"; } - } + public PayPalPlusProvider() + : base(SystemName) + { + } - public override PaymentMethodType PaymentMethodType - { - get - { - return PaymentMethodType.StandardAndRedirection; - } - } + public static string SystemName => "Payments.PayPalPlus"; + + public override PaymentMethodType PaymentMethodType => PaymentMethodType.StandardAndRedirection; public override Type GetControllerType() { diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs index 80712abf29..2be1950593 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; using System.Web.Routing; using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Orders; @@ -11,15 +10,22 @@ using SmartStore.PayPal.Services; using SmartStore.PayPal.Settings; using SmartStore.Services; +using SmartStore.Services.Common; using SmartStore.Services.Orders; using SmartStore.Services.Payments; namespace SmartStore.PayPal { - public abstract class PayPalRestApiProviderBase : PaymentMethodBase, IConfigurable where TSetting : PayPalApiSettingsBase, ISettings, new() + public abstract class PayPalRestApiProviderBase : PaymentMethodBase, IConfigurable where TSetting : PayPalApiSettingsBase, ISettings, new() { - protected PayPalRestApiProviderBase() + private readonly string _providerSystemName; + + protected PayPalRestApiProviderBase(string providerSystemName) { + Guard.NotEmpty(providerSystemName, nameof(providerSystemName)); + + _providerSystemName = providerSystemName; + Logger = NullLogger.Instance; } @@ -28,14 +34,15 @@ protected PayPalRestApiProviderBase() public ICommonServices Services { get; set; } public IOrderService OrderService { get; set; } public IOrderTotalCalculationService OrderTotalCalculationService { get; set; } - public IPayPalService PayPalService { get; set; } + public IGenericAttributeService GenericAttributeService { get; set; } + public IPayPalService PayPalService { get; set; } protected string GetControllerName() { return GetControllerType().Name.EmptyNull().Replace("Controller", ""); } - public static string CheckoutCompletedKey + public static string CheckoutCompletedKey { get { return "PayPalCheckoutCompleted"; } } @@ -75,7 +82,7 @@ public override decimal GetAdditionalHandlingFee(IList(processPaymentRequest.StoreId); - var session = HttpContext.GetPayPalSessionData(); + var storeId = processPaymentRequest.StoreId; + var customer = Services.WorkContext.CurrentCustomer; + var session = HttpContext.GetPayPalState(_providerSystemName, customer, storeId, GenericAttributeService); if (session.AccessToken.IsEmpty() || session.PaymentId.IsEmpty()) { - session.SessionExpired = true; - - // Do not place order because we cannot execute the payment. - result.AddError(T("Plugins.SmartStore.PayPal.SessionExpired")); + // Do not place order because we cannot execute the payment. + session.SessionExpired = true; + result.AddError(T("Plugins.SmartStore.PayPal.SessionExpired")); - // Redirect to payment wall and create new payment (we need the payment id). - var response = HttpContext.Response; - var urlHelper = new UrlHelper(HttpContext.Request.RequestContext); - var isSecure = Services.WebHelper.IsCurrentConnectionSecured(); + // Redirect to payment wall and create new payment (we need the payment id). + HttpContext.Response.RedirectToRoute(new { Controller = "Checkout", Action = "PaymentMethod", Area = "" }); - response.Status = "302 Found"; - response.RedirectLocation = urlHelper.Action("PaymentMethod", "Checkout", new { area = "" }, isSecure ? "https" : "http"); - response.End(); - - return result; + return result; } processPaymentRequest.OrderGuid = session.OrderGuid; - var apiResult = PayPalService.ExecutePayment(settings, session); + var settings = Services.Settings.LoadSetting(storeId); + var apiResult = PayPalService.ExecutePayment(settings, session); if (apiResult.Success && apiResult.Json != null) { @@ -159,7 +161,7 @@ public override ProcessPaymentResult ProcessPayment(ProcessPaymentRequest proces state = (string)relatedObject.state; reasonCode = (string)relatedObject.reason_code; - // see PayPalService.Refund() + // See PayPalService.Refund(). result.AuthorizationTransactionResult = "{0} ({1})".FormatInvariant(state.NaIfEmpty(), intent.NaIfEmpty()); result.AuthorizationTransactionId = (string)relatedObject.id; @@ -190,7 +192,10 @@ public override ProcessPaymentResult ProcessPayment(ProcessPaymentRequest proces public override void PostProcessPayment(PostProcessPaymentRequest postProcessPaymentRequest) { - var instruction = PayPalService.CreatePaymentInstruction(HttpContext.GetPayPalSessionData().PaymentInstruction); + var storeId = postProcessPaymentRequest.Order.StoreId; + var customer = Services.WorkContext.CurrentCustomer; + var session = HttpContext.GetPayPalState(_providerSystemName, customer, storeId, GenericAttributeService); + var instruction = PayPalService.CreatePaymentInstruction(session.PaymentInstruction); if (instruction.HasValue()) { @@ -198,7 +203,7 @@ public override void PostProcessPayment(PostProcessPaymentRequest postProcessPay OrderService.AddOrderNote(postProcessPaymentRequest.Order, instruction, true); } - } + } public override CapturePaymentResult Capture(CapturePaymentRequest capturePaymentRequest) { diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs index 2fc2a7356e..5ff39c0bfb 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.IO; using System.Linq; +using System.Net; using System.Text; using System.Web; using System.Web.Routing; @@ -331,7 +332,7 @@ public override decimal GetAdditionalHandlingFee(IListResult public bool GetPDTDetails(string tx, PayPalStandardPaymentSettings settings, out Dictionary values, out string response) { - var request = settings.GetPayPalWebRequest(); + var request = (HttpWebRequest)WebRequest.Create(settings.GetPayPalUrl()); request.Method = "POST"; request.ContentType = "application/x-www-form-urlencoded"; diff --git a/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs b/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs index 41a41d9448..0289f48f6f 100644 --- a/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs +++ b/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs @@ -680,7 +680,7 @@ public PayPalResponse EnsureAccessToken(PayPalSessionData session, PayPalApiSett { session.AccessToken = (string)result.Json.access_token; - var expireSeconds = ((string)result.Json.expires_in).ToInt(5 * 60); + var expireSeconds = ((string)result.Json.expires_in).ToInt(30 * 60); session.TokenExpiration = DateTime.UtcNow.AddSeconds(expireSeconds); } else @@ -1165,7 +1165,21 @@ public PayPalSessionData() public string ApprovalUrl { get; set; } public Guid OrderGuid { get; private set; } public PayPalPaymentInstruction PaymentInstruction { get; set; } - } + + public override string ToString() + { + var sb = new StringBuilder(); + sb.AppendLine("SessionExpired: " + SessionExpired.ToString()); + sb.AppendLine("AccessToken: " + AccessToken.EmptyNull()); + sb.AppendLine("TokenExpiration: " + TokenExpiration.ToString()); + sb.AppendLine("PaymentId: " + PaymentId.EmptyNull()); + sb.AppendLine("PayerId: " + PayerId.EmptyNull()); + sb.AppendLine("ApprovalUrl: " + ApprovalUrl.EmptyNull()); + sb.AppendLine("OrderGuid: " + OrderGuid.ToString()); + sb.AppendLine("PaymentInstruction: " + (PaymentInstruction != null).ToString()); + return sb.ToString(); + } + } [Serializable] public class PayPalPaymentInstruction diff --git a/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs b/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs index 3fb6bc563f..878899e9a3 100644 --- a/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs +++ b/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs @@ -105,10 +105,15 @@ public PayPalExpressPaymentSettings() public class PayPalPlusPaymentSettings : PayPalApiSettingsBase, ISettings { - /// - /// Specifies other payment methods to be offered in payment wall - /// - public List ThirdPartyPaymentMethods { get; set; } + public PayPalPlusPaymentSettings() + { + TransactMode = TransactMode.AuthorizeAndCapture; + } + + /// + /// Specifies other payment methods to be offered in payment wall + /// + public List ThirdPartyPaymentMethods { get; set; } /// /// Specifies whether to display the logo of a third party payment method diff --git a/src/Plugins/SmartStore.PayPal/changelog.md b/src/Plugins/SmartStore.PayPal/changelog.md index 9f641a1d08..0bb04e4692 100644 --- a/src/Plugins/SmartStore.PayPal/changelog.md +++ b/src/Plugins/SmartStore.PayPal/changelog.md @@ -1,6 +1,15 @@ #Release Notes +##Paypal 3.1.5.2 +###Improvements +* PayPal PLUS: additionally store access data in the database. + +##Paypal 3.1.5.1 +###Bugfixes +* PayPal Express: Checkout attributes were always ignored. + ##Paypal 3.0.0.3 +###Bugfixes * PayPal PLUS: Fixed #1200 Invalid request if the order amount is zero. "Amount cannot be zero" still occurred. ##Paypal 3.0.0.2 diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs index 7dd3dd3e8d..3e3d884333 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs @@ -504,9 +504,7 @@ public static IHtmlString LanguageAttributes(this HtmlHelper html, bool omitLTR public static IHtmlString LanguageAttributes(this HtmlHelper html, LocalizedValue localizedValue) { - Guard.NotNull(localizedValue, nameof(localizedValue)); - - if (!localizedValue.BidiOverride) + if (localizedValue == null || !localizedValue.BidiOverride) { return MvcHtmlString.Empty; } diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs index 8599cbaf8b..fe64e6fca5 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs @@ -70,7 +70,7 @@ public static string TopicUrl(this UrlHelper urlHelper, string systemName, bool public static string TopicSeName(this UrlHelper urlHelper, string systemName) { var workContext = EngineContext.Current.Resolve(); - var storeId = EngineContext.Current.Resolve().CurrentStoreIdIfMultiStoreMode; + var storeId = EngineContext.Current.Resolve().CurrentStore.Id; var cache = EngineContext.Current.Resolve(); var cacheKey = string.Format(FrameworkCacheConsumer.TOPIC_SENAME_BY_SYSTEMNAME, systemName.ToLower(), workContext.WorkingLanguage.Id, storeId); diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs index d1d757a5fc..b76bf74857 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs @@ -32,7 +32,7 @@ public void OnActionExecuting(ActionExecutingContext filterContext) var customer = Services.Value.WorkContext.CurrentCustomer; var hasConsentedToGdpr = filterContext.HttpContext.Request.Form["GdprConsent"]; - if (filterContext.HttpContext.Request.HttpMethod.Equals("POST") && hasConsentedToGdpr != null) + 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")); diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs index 5a0ee27515..47c24c873a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs @@ -1,9 +1,7 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Web.Mvc; using System.Web.Routing; -using SmartStore.Web.Framework.Seo; namespace SmartStore.Web.Framework.Localization { diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs index e6e7a71315..6d3934989a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs @@ -7,6 +7,7 @@ namespace SmartStore.Web.Framework.Modelling { + [Serializable] public sealed class CustomPropertiesDictionary : Dictionary { } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs index 96066d3bf2..8ab2be3441 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs @@ -80,10 +80,10 @@ public override string ToString() { var sb = new StringBuilder(); - sb.AppendLine(string.Format("PublicKey: ", PublicKey)); - sb.AppendLine(string.Format("Url: ", Url)); - sb.AppendLine(string.Format("HttpMethod: ", HttpMethod)); - sb.AppendLine(string.Format("HttpAcceptType: ", HttpAcceptType)); + sb.AppendLine("PublicKey: " + PublicKey.EmptyNull()); + sb.AppendLine("Url: " + Url.EmptyNull()); + sb.AppendLine("HttpMethod: " + HttpMethod.EmptyNull()); + sb.AppendLine("HttpAcceptType: " + HttpAcceptType.EmptyNull()); return sb.ToString(); } diff --git a/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs b/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs index d47480ea84..51a901bd26 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs @@ -4,6 +4,9 @@ using SmartStore.Core; using SmartStore.Core.Domain.Stores; using SmartStore.Services.Stores; +using SmartStore.Core.Infrastructure.DependencyManagement; +using SmartStore.Services; +using SmartStore.Core.Fakes; namespace SmartStore.Web.Framework { @@ -14,17 +17,17 @@ public partial class WebStoreContext : IStoreContext { internal const string OverriddenStoreIdKey = "OverriddenStoreId"; - private readonly IStoreService _storeService; + private readonly Work _storeService; private readonly IWebHelper _webHelper; private readonly HttpContextBase _httpContext; private Store _currentStore; - public WebStoreContext(IStoreService storeService, IWebHelper webHelper, HttpContextBase httpContext) + public WebStoreContext(Work storeService) { _storeService = storeService; - _webHelper = webHelper; - _httpContext = httpContext; + _httpContext = HttpContext.Current != null ? (HttpContextBase)new HttpContextWrapper(HttpContext.Current) : new FakeHttpContext("~/"); + _webHelper = new WebHelper(_httpContext); } public void SetRequestStore(int? storeId) @@ -109,14 +112,14 @@ public Store CurrentStore if (storeOverride.HasValue) { // the store to be used can be overwritten on request basis (e.g. for theme preview, editing etc.) - _currentStore = _storeService.GetStoreById(storeOverride.Value); + _currentStore = _storeService.Value.GetStoreById(storeOverride.Value); } if (_currentStore == null) { // ty to determine the current store by HTTP_HOST var host = _webHelper.ServerVariables("HTTP_HOST"); - var allStores = _storeService.GetAllStores(); + var allStores = _storeService.Value.GetAllStores(); var store = allStores.FirstOrDefault(s => s.ContainsHostValue(host)); if (store == null) @@ -125,10 +128,7 @@ public Store CurrentStore store = allStores.FirstOrDefault(); } - if (store == null) - throw new Exception("No store could be loaded"); - - _currentStore = store; + _currentStore = store ?? throw new Exception("No store could be loaded"); } } @@ -147,7 +147,7 @@ public int CurrentStoreIdIfMultiStoreMode { get { - return _storeService.IsSingleStoreMode() ? 0 : CurrentStore.Id; + return _storeService.Value.IsSingleStoreMode() ? 0 : CurrentStore.Id; } } diff --git a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs index 842c230ce9..92d4ee5b6d 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs @@ -243,10 +243,17 @@ public Language WorkingLanguage if (customer != null) { - customerLangId = customer.GetAttribute( - SystemCustomerAttributeNames.LanguageId, - _attrService, - _storeContext.CurrentStore.Id); + if (customer.IsSystemAccount) + { + customerLangId = _httpContext.Request.QueryString["lid"].ToInt(); + } + else + { + customerLangId = customer.GetAttribute( + SystemCustomerAttributeNames.LanguageId, + _attrService, + _storeContext.CurrentStore.Id); + } } if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled && _httpContext.Request != null) @@ -335,6 +342,9 @@ public Language WorkingLanguage private void SetCustomerLanguage(int languageId, int storeId) { + if (this.CurrentCustomer.IsSystemAccount) + return; + _attrService.SaveAttribute( this.CurrentCustomer, SystemCustomerAttributeNames.LanguageId, diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs index 2831ed73ac..b382b0e371 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -9,11 +10,14 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Security.Principal; +using System.Text; using System.Threading.Tasks; +using System.Web; using System.Web.Hosting; using System.Web.Mvc; using Newtonsoft.Json; using SmartStore.Admin.Models.Common; +using SmartStore.ComponentModel; using SmartStore.Core; using SmartStore.Core.Async; using SmartStore.Core.Data; @@ -330,6 +334,7 @@ public ActionResult SystemInfo() model.UtcTime = DateTime.UtcNow; model.HttpHost = _services.WebHelper.ServerVariables("HTTP_HOST"); + // DB size & used RAM try { var mbSize = _services.DbContext.SqlQuery("Select Sum(size)/128.0 From sysfiles").FirstOrDefault(); @@ -339,6 +344,7 @@ public ActionResult SystemInfo() } catch { } + // DB settings try { if (DataSettings.Current.IsValid()) @@ -349,6 +355,7 @@ public ActionResult SystemInfo() } catch { } + // Loaded assemblies try { var assembly = Assembly.GetExecutingAssembly(); @@ -366,9 +373,61 @@ public ActionResult SystemInfo() //Location = assembly.Location }); } - return View(model); + + // MemCache stats + model.MemoryCacheStats = GetMemoryCacheStats(); + + return View(model); } + /// + /// Counts the size of all objects in both IMemoryCache and ASP.NET cache + /// + private IDictionary GetMemoryCacheStats() + { + var stats = new Dictionary(); + var cache = _services.Cache; + var instanceLookups = new HashSet(ReferenceEqualityComparer.Default); + + // HttpRuntine cache + var keys = HttpRuntime.Cache.Cast().Select(x => x.Key.ToString()).ToArray(); + foreach (var key in keys) + { + var value = HttpRuntime.Cache.Get(key); + var size = GetObjectSize(value); + + stats.Add("AspNetCache:" + key.Replace(':', '_'), size + Encoding.Default.GetByteCount(key)); + } + + + // Memory cache + if (!cache.IsDistributedCache) + { + keys = cache.Keys("*").ToArray(); + foreach (var key in keys) + { + var value = cache.Get(key); + var size = GetObjectSize(value); + + stats.Add(key, size + Encoding.Default.GetByteCount(key)); + } + } + + return stats; + + long GetObjectSize(object obj) + { + try + { + return CommonHelper.GetObjectSizeInBytes(obj, instanceLookups); + } + catch + { + return 0; + } + } + } + private long GetPrivateBytes() { GC.Collect(); diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs index bef18e6a27..4d48007845 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs @@ -383,9 +383,12 @@ public ActionResult Edit(int id) { item.Selected = true; } - } + + } + + model.DomainEndingsArray = model.DomainEndings.SplitSafe(",").ToArray(); - PrepareCurrencyModel(model, currency, false); + PrepareCurrencyModel(model, currency, false); return View(model); } @@ -403,8 +406,9 @@ public ActionResult Edit(CurrencyModel model, bool continueEditing) if (ModelState.IsValid) { currency = model.ToEntity(currency); + currency.DomainEndings = string.Join(",", model.DomainEndingsArray ?? new string[0]); - if (!IsAttachedToStore(currency, _services.StoreService.GetAllStores(), false)) + if (!IsAttachedToStore(currency, _services.StoreService.GetAllStores(), false)) { _currencyService.UpdateCurrency(currency); diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs index 1498bb2691..b1cf23b75d 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs @@ -84,7 +84,7 @@ public void UpdateLocales(Topic topic, TopicModel model) localized.MetaTitle, localized.LanguageId); - var seName = topic.ValidateSeName(localized.SeName, localized.Title, false); + var seName = topic.ValidateSeName(localized.SeName, localized.Title, false, localized.LanguageId); _urlRecordService.SaveSlug(topic, seName, localized.LanguageId); } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Common/SystemInfoModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Common/SystemInfoModel.cs index 4d0cc0fc4d..4326633994 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Common/SystemInfoModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Common/SystemInfoModel.cs @@ -68,7 +68,9 @@ public string UsedMemorySizeString public bool ShrinkDatabaseEnabled { get; set; } - public class LoadedAssembly : ModelBase + public IDictionary MemoryCacheStats { get; set; } + + public class LoadedAssembly : ModelBase { public string FullName { get; set; } public string Location { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs index e75713f534..b13edc92e3 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs @@ -67,7 +67,8 @@ public CurrencyModel() [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.DomainEndings")] public string DomainEndings { get; set; } - public IList AvailableDomainEndings { get; set; } + public string[] DomainEndingsArray { get; set; } + public IList AvailableDomainEndings { get; set; } public IList Locales { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Common/SystemInfo.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Common/SystemInfo.cshtml index 1aac0d375e..532873df27 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Common/SystemInfo.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Common/SystemInfo.cshtml @@ -1,7 +1,23 @@ @model SystemInfoModel +@using SmartStore.Collections + @{ - ViewBag.Title = T("Admin.System.SystemInfo").Text; + ViewBag.Title = T("Admin.System.SystemInfo").Text; + + var cacheStats = Model.MemoryCacheStats; + var cacheSize = cacheStats.Values.Sum(x => x); + + var cacheSummary = new Multimap(StringComparer.OrdinalIgnoreCase); + foreach (var kvp in cacheStats) + { + var lidx = kvp.Key.LastIndexOf(':'); + if (lidx > - 1) + { + var subKey = kvp.Key.Substring(0, lidx); + cacheSummary.Add(subKey, kvp.Value); + } + } }