HH

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

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<object>
+ {
+ 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);
+ }
+}

src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs

@@ -18,6 +18,7 @@ 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:";
 
  /// <summary>
  /// Gets a value which indicates whether the HTTP connection uses secure sockets (HTTPS protocol). 
@@ -140,7 +141,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<T>(this Cache cache, string key, Func<T> acquirer, TimeSpan? duration = null)
@@ -208,22 +209,27 @@ public static T GetItem<T>(this HttpContextBase httpContext, string key, Func<T>
 
  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<DictionaryEntry>()
  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));
 

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);

src/Libraries/SmartStore.Core/SmartStore.Core.csproj

@@ -182,6 +182,7 @@
  <Compile Include="Collections\TopologicalSorter.cs" />
  <Compile Include="Collections\TreeNodeBase.cs" />
  <Compile Include="ComponentModel\MiniMapper.cs" />
+ <Compile Include="Collections\ReferenceEqualityComparer.cs" />
  <Compile Include="ComponentModel\TypeConversion\BooleanConverter.cs" />
  <Compile Include="ComponentModel\TypeConversion\DictionaryConverter.cs" />
  <Compile Include="ComponentModel\TypeConversion\EmailAddressConverter.cs" />

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<object> 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<object>(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;
+ }
  }
 }

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) =>
  {

src/Libraries/SmartStore.Data/Caching/CachingCommand.cs

@@ -353,9 +353,7 @@ public async override Task<object> 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;
  }

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

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<string> de
 
  public void Clear()
  {
- _cache.RemoveByPattern(KEYPREFIX);
- _requestCache.Value.RemoveByPattern(KEYPREFIX);
+ _cache.RemoveByPattern(KEYPREFIX + "*");
+ _requestCache.Value.RemoveByPattern(KEYPREFIX + "*");
  }
 
  public virtual void InvalidateSets(IEnumerable<string> entitySets)

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,14 +538,16 @@ public virtual IList<ProductCategory> 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 &&
  (showHidden || c.Published)
  orderby pc.DisplayOrder
  select pc;
 
+ query = query.Include(x => x.Category);
+
  var allProductCategories = query.ToList();
  var result = new List<ProductCategory>();
  if (!showHidden)
@@ -571,12 +574,14 @@ orderby pc.DisplayOrder
  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);

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<ProductManufacturer> 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 @@ orderby mGroup.Key
  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)

src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs

@@ -539,7 +539,6 @@ public virtual decimal GetFinalPrice(Product product, Customer customer, bool in
  //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);