From c26a9ce93edb4fd956295e189a22aa1953cd7f40 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Wed, 9 Mar 2016 10:58:58 +0100 Subject: [PATCH 01/49] Fixed #856 Return 404 only when topic is rendered as widget --- .../SmartStore.Web/Controllers/TopicController.cs | 5 +++-- src/Presentation/SmartStore.Web/Models/Topics/TopicModel.cs | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Controllers/TopicController.cs index 5821d1658f..7c4be750a3 100644 --- a/src/Presentation/SmartStore.Web/Controllers/TopicController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/TopicController.cs @@ -66,7 +66,8 @@ protected TopicModel PrepareTopicModel(string systemName) MetaDescription = topic.GetLocalized(x => x.MetaDescription), MetaTitle = topic.GetLocalized(x => x.MetaTitle), TitleTag = titleTag, - }; + RenderAsWidget = topic.RenderAsWidget + }; return model; } @@ -79,7 +80,7 @@ public ActionResult TopicDetails(string systemName) var cacheKey = string.Format(ModelCacheEventConsumer.TOPIC_MODEL_KEY, systemName, _workContext.WorkingLanguage.Id, _storeContext.CurrentStore.Id); var cacheModel = _cacheManager.Get(cacheKey, () => PrepareTopicModel(systemName)); - if (cacheModel == null || !cacheModel.IncludeInSitemap) + if (cacheModel == null || (cacheModel.RenderAsWidget && !cacheModel.IncludeInSitemap)) return HttpNotFound(); return View("TopicDetails", cacheModel); diff --git a/src/Presentation/SmartStore.Web/Models/Topics/TopicModel.cs b/src/Presentation/SmartStore.Web/Models/Topics/TopicModel.cs index a2806157c9..96548a4559 100644 --- a/src/Presentation/SmartStore.Web/Models/Topics/TopicModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Topics/TopicModel.cs @@ -21,5 +21,7 @@ public partial class TopicModel : EntityModelBase public string MetaTitle { get; set; } public string TitleTag { get; set; } - } + + public bool RenderAsWidget { get; set; } + } } \ No newline at end of file From d609477d04412eda23dd6c0864d7c423b3977f8e Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Thu, 31 Mar 2016 16:39:58 +0900 Subject: [PATCH 02/49] Fix 'occurred' typo Fix 'occurred' typo --- src/Presentation/SmartStore.Web/500.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/500.html b/src/Presentation/SmartStore.Web/500.html index f9eaa260f1..741ebbcab5 100644 --- a/src/Presentation/SmartStore.Web/500.html +++ b/src/Presentation/SmartStore.Web/500.html @@ -41,7 +41,7 @@

- We apologize, an error ocurred while handling your request, this is not a problem with your computer or internet connection. + We apologize, an error occurred while handling your request, this is not a problem with your computer or internet connection. The details have been sent to our support team and we will investigate the issue very soon.

From 6b2501eaa824d7f4694ec96d8a79c3d92ec2ec9a Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 24 Jun 2017 03:32:45 +0200 Subject: [PATCH 03/49] 'Relaxed' MediaStorageData migration --- .../201608110948010_MediaStorageData.cs | 94 ++++++++++--------- .../Orders/CheckoutAttributeParser.cs | 37 -------- 2 files changed, 48 insertions(+), 83 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Migrations/201608110948010_MediaStorageData.cs b/src/Libraries/SmartStore.Data/Migrations/201608110948010_MediaStorageData.cs index d17d600e81..e254602331 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201608110948010_MediaStorageData.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201608110948010_MediaStorageData.cs @@ -6,6 +6,7 @@ namespace SmartStore.Data.Migrations using System.IO; using System.Linq; using Core; + using Core.Data; using Core.Domain.Configuration; using Core.Domain.Media; using Core.Domain.Messages; @@ -14,37 +15,7 @@ namespace SmartStore.Data.Migrations public partial class MediaStorageData : DbMigration, ILocaleResourcesProvider, IDataSeeder { - private const int PAGE_SIZE = 1000; - - private void PageEntities( - SmartObjectContext context, - DbSet mediaStorages, - IOrderedQueryable query, - Action moveEntity) where TEntity : BaseEntity, IHasMedia - { - var pageIndex = 0; - IPagedList entities = null; - - do - { - if (entities != null) - { - // detach all entities from previous page to save memory - context.DetachAll(false); - entities.Clear(); - entities = null; - } - - // load max 1000 entities at once - entities = new PagedList(query, pageIndex++, PAGE_SIZE); - - entities.Each(x => moveEntity(x)); - - // save the current batch to database - context.SaveChanges(); - } - while (entities.HasNextPage); - } + private const int PAGE_SIZE = 200; private string GetFileName(int id, string extension, string mimeType) { @@ -118,12 +89,17 @@ public bool RollbackOnFailure public void Seed(SmartObjectContext context) { +#pragma warning disable 612, 618 context.MigrateLocaleResources(MigrateLocaleResources); var mediaStorages = context.Set(); var fileSystem = new LocalFileSystem(); + var mediaBasePath = $"Media\\{DataSettings.Current.TenantName}"; var storeMediaInDb = true; + fileSystem.TryCreateFolder(Path.Combine(mediaBasePath, "Downloads")); + fileSystem.TryCreateFolder(Path.Combine(mediaBasePath, "QueuedEmailAttachment")); + { var settings = context.Set(); @@ -153,14 +129,12 @@ public void Seed(SmartObjectContext context) { PageEntities(context, mediaStorages, context.Set().OrderBy(x => x.Id), picture => { -#pragma warning disable 612, 618 + if (picture.PictureBinary != null && picture.PictureBinary.LongLength > 0) { - var mediaStorage = new MediaStorage { Data = picture.PictureBinary }; - picture.MediaStorage = mediaStorage; + picture.MediaStorage = new MediaStorage { Data = picture.PictureBinary }; picture.PictureBinary = null; } -#pragma warning restore 612, 618 }); } @@ -170,28 +144,25 @@ public void Seed(SmartObjectContext context) PageEntities(context, mediaStorages, context.Set().OrderBy(x => x.Id), download => { -#pragma warning disable 612, 618 if (download.DownloadBinary != null && download.DownloadBinary.LongLength > 0) { if (storeMediaInDb) { // move binary data - var mediaStorage = new MediaStorage { Data = download.DownloadBinary }; - download.MediaStorage = mediaStorage; + download.MediaStorage = new MediaStorage { Data = download.DownloadBinary }; } else { // move to file system. it's necessary because from now on DownloadService depends on current storage provider - // and it would not find the binary data anymore if do not move it. + // and it would not find the binary data anymore if not moved. var fileName = GetFileName(download.Id, download.Extension, download.ContentType); - var path = fileSystem.Combine(@"Media\Downloads", fileName); + var path = fileSystem.Combine(fileSystem.Combine(mediaBasePath, "Downloads"), fileName); fileSystem.WriteAllBytes(path, download.DownloadBinary); } download.DownloadBinary = null; } -#pragma warning restore 612, 618 }); #endregion @@ -204,31 +175,62 @@ public void Seed(SmartObjectContext context) PageEntities(context, mediaStorages, attachmentQuery, attachment => { -#pragma warning disable 612, 618 if (attachment.Data != null && attachment.Data.LongLength > 0) { if (storeMediaInDb) { // move binary data - var mediaStorage = new MediaStorage { Data = attachment.Data }; - attachment.MediaStorage = mediaStorage; + attachment.MediaStorage = new MediaStorage { Data = attachment.Data }; } else { // move to file system. it's necessary because from now on QueuedEmailService depends on current storage provider // and it would not find the binary data anymore if do not move it. var fileName = GetFileName(attachment.Id, Path.GetExtension(attachment.Name.EmptyNull()), attachment.MimeType); - var path = fileSystem.Combine(@"Media\QueuedEmailAttachment", fileName); + var path = fileSystem.Combine(fileSystem.Combine(mediaBasePath, "QueuedEmailAttachment"), fileName); fileSystem.WriteAllBytes(path, attachment.Data); } attachment.Data = null; } -#pragma warning restore 612, 618 }); #endregion + +#pragma warning restore 612, 618 + } + + private void PageEntities( + SmartObjectContext context, + DbSet mediaStorages, + IOrderedQueryable query, + Action moveEntity) where TEntity : BaseEntity, IHasMedia + { + var pageIndex = 0; + IPagedList entities = null; + + do + { + if (entities != null) + { + // detach all entities from previous page to save memory + context.DetachAll(false); + entities.Clear(); + entities = null; + } + + GC.Collect(); + + // load max 1000 entities at once + entities = new PagedList(query, pageIndex++, PAGE_SIZE); + + entities.Each(x => moveEntity(x)); + + // save the current batch to database + context.SaveChanges(); + } + while (entities.HasNextPage); } public void MigrateLocaleResources(LocaleResourcesBuilder builder) diff --git a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeParser.cs b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeParser.cs index 213c1bd07c..8cb16e7959 100644 --- a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeParser.cs +++ b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeParser.cs @@ -6,9 +6,6 @@ namespace SmartStore.Services.Orders { - ///

- /// Checkout attribute parser - /// public partial class CheckoutAttributeParser : ICheckoutAttributeParser { private readonly ICheckoutAttributeService _checkoutAttributeService; @@ -18,11 +15,6 @@ public CheckoutAttributeParser(ICheckoutAttributeService checkoutAttributeServic this._checkoutAttributeService = checkoutAttributeService; } - /// - /// Gets selected checkout attribute identifiers - /// - /// Attributes - /// Selected checkout attribute identifiers public IList ParseCheckoutAttributeIds(string attributes) { var ids = new List(); @@ -55,11 +47,6 @@ public IList ParseCheckoutAttributeIds(string attributes) return ids; } - /// - /// Gets selected checkout attributes - /// - /// Attributes - /// Selected checkout attributes public IList ParseCheckoutAttributes(string attributes) { var caCollection = new List(); @@ -75,11 +62,6 @@ public IList ParseCheckoutAttributes(string attributes) return caCollection; } - /// - /// Get checkout attribute values - /// - /// Attributes - /// Checkout attribute values public IList ParseCheckoutAttributeValues(string attributes) { var caValues = new List(); @@ -107,12 +89,6 @@ public IList ParseCheckoutAttributeValues(string attribu return caValues; } - /// - /// Gets selected checkout attribute value - /// - /// Attributes - /// Checkout attribute identifier - /// Checkout attribute value public IList ParseValues(string attributes, int checkoutAttributeId) { var selectedCheckoutAttributeValues = new List(); @@ -155,13 +131,6 @@ public IList ParseValues(string attributes, int checkoutAttributeId) return selectedCheckoutAttributeValues; } - /// - /// Adds an attribute - /// - /// Attributes - /// Checkout attribute - /// Value - /// Attributes public string AddCheckoutAttribute(string attributes, CheckoutAttribute ca, string value) { string result = string.Empty; @@ -223,12 +192,6 @@ public string AddCheckoutAttribute(string attributes, CheckoutAttribute ca, stri return result; } - /// - /// Removes checkout attributes which cannot be applied to the current cart and returns an update attributes in XML format - /// - /// Attributes in XML format - /// Shopping cart items - /// Updated attributes in XML format public virtual string EnsureOnlyActiveAttributes(string attributes, IList cart) { if (String.IsNullOrEmpty(attributes)) From 0d3ebde54a2aecc128c162ffc6b16d4ab14120cb Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Mon, 3 Jul 2017 23:24:43 +0200 Subject: [PATCH 04/49] Added area parameter to action urls else the view couldn't be used by plugins --- .../Shared/Partials/Product.List.Item.Buttons.cshtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Views/Shared/Partials/Product.List.Item.Buttons.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/Partials/Product.List.Item.Buttons.cshtml index bdd6569d18..906a55c2ac 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/Partials/Product.List.Item.Buttons.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/Partials/Product.List.Item.Buttons.cshtml @@ -17,7 +17,7 @@ } if (!Model.Price.CallForPrice) { - var addToCartUrl = Url.Action("AddProductSimple", "ShoppingCart", new { productId = Model.Id, forceredirection = Model.Parent.ForceRedirectionAfterAddingToCart }); + var addToCartUrl = Url.Action("AddProductSimple", "ShoppingCart", new { productId = Model.Id, forceredirection = Model.Parent.ForceRedirectionAfterAddingToCart, area = "" }); var title = (Model.Price.AvailableForPreOrder ? T("ShoppingCart.PreOrder") : T("ShoppingCart.AddToCart")); Date: Sat, 22 Jul 2017 12:06:29 +0200 Subject: [PATCH 05/49] Fixes wrong date in several backend grids --- .../SmartStore.Web.Framework/Filters/JsonNetAttribute.cs | 6 ++++-- .../Modelling/Results/JsonNetResult.cs | 5 ++--- .../SmartStore.Web/Administration/Views/Log/List.cshtml | 9 ++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs index 78d68534c3..1c706ee2f2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs @@ -23,11 +23,11 @@ public void OnActionExecuted(ActionExecutedContext filterContext) if (filterContext == null || filterContext.HttpContext == null || filterContext.HttpContext.Request == null) return; - // don't apply filter to child methods + // Don't apply filter to child methods. if (filterContext.IsChildAction) return; - // handle JsonResult only + // Hndle JsonResult only. if (filterContext.Result.GetType() != typeof(JsonResult)) return; @@ -37,6 +37,8 @@ public void OnActionExecuted(ActionExecutedContext filterContext) MissingMemberHandling = MissingMemberHandling.Ignore, TypeNameHandling = TypeNameHandling.Objects, ReferenceLoopHandling = ReferenceLoopHandling.Ignore, + DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind, + DateFormatHandling = DateFormatHandling.MicrosoftDateFormat, // We cannot ignore null. Client template of several Telerik grids would fail. //NullValueHandling = NullValueHandling.Ignore, diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs index ddcfa3e716..d1478076e2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs @@ -52,6 +52,8 @@ public override void ExecuteResult(ControllerContext context) TypeNameHandling = TypeNameHandling.Objects, ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Ignore, + DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind, + DateFormatHandling = DateFormatHandling.MicrosoftDateFormat, // Limit the object graph we'll consume to a fixed depth. This prevents stackoverflow exceptions // from deserialization errors that might occur from deeply nested objects. @@ -60,9 +62,6 @@ public override void ExecuteResult(ControllerContext context) if (_settings == null) { - serializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind; - serializerSettings.DateFormatHandling = DateFormatHandling.MicrosoftDateFormat; - var utcDateTimeConverter = new UTCDateTimeConverter(_dateTimeHelper, new JavaScriptDateTimeConverter()); serializerSettings.Converters.Add(utcDateTimeConverter); } diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Log/List.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Log/List.cshtml index 42a2a72a82..ce07e7cbfd 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Log/List.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Log/List.cshtml @@ -91,11 +91,12 @@ .HtmlAttributes(new { style = "text-align:center" }) .HeaderHtmlAttributes(new { style = "text-align:center" }); columns.Bound(x => x.Logger) - .Width(100) + .Width(120) .ClientTemplate("<#= LoggerShort #>"); columns.Bound(x => x.ShortMessage) .ClientTemplate("<#= LogLevel #>\"><#= ShortMessage #>"); - columns.Bound(x => x.UserName).Width(50); + columns.Bound(x => x.UserName) + .Width(120); columns.Bound(x => x.CreatedOn) .Width(160); }) @@ -154,7 +155,7 @@ $('.checkboxGroups').attr('checked', false).change(); selectedIds = []; }, - error:function (xhr, ajaxOptions, thrownError){ + error: function (xhr, ajaxOptions, thrownError){ alert(thrownError); }, traditional: true @@ -199,8 +200,6 @@ LogLevelId: $('#@Html.FieldIdFor(model => model.LogLevelId)').val() }; e.data = searchModel; - - console.log(searchModel); } From 6e394988eea7f9c6e36a0f1a054a03bcf1d775ac Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Mon, 18 Sep 2017 10:47:23 +0200 Subject: [PATCH 06/49] Reverted developer test code --- .../SmartStore.Web/Views/Catalog/ManufacturerAll.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Views/Catalog/ManufacturerAll.cshtml b/src/Presentation/SmartStore.Web/Views/Catalog/ManufacturerAll.cshtml index c57d6f9e73..20d6072006 100644 --- a/src/Presentation/SmartStore.Web/Views/Catalog/ManufacturerAll.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Catalog/ManufacturerAll.cshtml @@ -23,7 +23,7 @@ @{ Html.RenderWidget("manufacturers_all_top"); } - @if (true /* catalogSettings.SortManufacturersAlphabetically*/) + @if (catalogSettings.SortManufacturersAlphabetically) {
    From 9b7bbddcad1604d6e7205796c48e61b4e0263379 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 15 Sep 2017 21:14:25 +0200 Subject: [PATCH 07/49] Fixes #1261: Moving product from cart to wish list or vice versa throws an exception --- src/Libraries/SmartStore.Core/Caching/RequestCache.cs | 2 +- .../SmartStore.Services/Orders/ShoppingCartService.cs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs index fe900f985b..e4936c2837 100644 --- a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs +++ b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs @@ -81,7 +81,7 @@ public void RemoveByPattern(string pattern) foreach (string key in keysToRemove) { - items.Remove(key); + items.Remove(BuildKey(key)); } } diff --git a/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs b/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs index 78204a6b2b..8e099e89df 100644 --- a/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs +++ b/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs @@ -213,8 +213,11 @@ public virtual void DeleteShoppingCartItem( // delete item _sciRepository.Delete(shoppingCartItem); - // validate checkout attributes - if (ensureOnlyActiveCheckoutAttributes && shoppingCartItem.ShoppingCartType == ShoppingCartType.ShoppingCart) + // cache busting + _requestCache.RemoveByPattern(CARTITEMS_PATTERN_KEY); + + // validate checkout attributes + if (ensureOnlyActiveCheckoutAttributes && shoppingCartItem.ShoppingCartType == ShoppingCartType.ShoppingCart) { var cart = GetCartItems(customer, ShoppingCartType.ShoppingCart, storeId); @@ -238,8 +241,6 @@ public virtual void DeleteShoppingCartItem( DeleteShoppingCartItem(cartItem, resetCheckoutData, ensureOnlyActiveCheckoutAttributes, false); } } - - _requestCache.RemoveByPattern(CARTITEMS_PATTERN_KEY); } public virtual void DeleteShoppingCartItem( From 4e3e3d9eef99b90d762a7cda4e20f6d7bbe408d8 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Mon, 18 Sep 2017 22:01:13 +0200 Subject: [PATCH 08/49] Minor UI fix: Chrome 60+ shows scrollbars CKEditor parent container --- .../Content/editors/ckeditor/skins/smartstore/editor.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Content/editors/ckeditor/skins/smartstore/editor.css b/src/Presentation/SmartStore.Web/Content/editors/ckeditor/skins/smartstore/editor.css index 762f9bda76..c8fdbee2ce 100644 --- a/src/Presentation/SmartStore.Web/Content/editors/ckeditor/skins/smartstore/editor.css +++ b/src/Presentation/SmartStore.Web/Content/editors/ckeditor/skins/smartstore/editor.css @@ -893,7 +893,6 @@ a.cke_button_off:hover, a.cke_button_off:focus, a.cke_button_off:active { outline: 0; border: 0; color: #4c4c4c; - /*text-shadow: 0 1px 0 #fff;*/ font-weight: bold; font-size: 11px; } @@ -952,4 +951,7 @@ legend.cke_voice_label { } - +.cke_chrome { + /* Chrome 60+ overflow auto scrollbar fix */ + position: relative; +} \ No newline at end of file From f2a5bebfd708803bfc9864e29989a62a58910831 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Wed, 20 Sep 2017 17:39:58 +0200 Subject: [PATCH 09/49] Fixes price display bug for certain tax display types --- .../SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs index d5a0f0b565..754f60309f 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs @@ -718,10 +718,12 @@ private decimal MapSummaryItemPrice(Product product, ref Product contextProduct, priceModel.HasDiscount = (finalPriceBase != oldPriceBase && oldPriceBase != decimal.Zero); // product was discounted by a discount plugin - if (finalPriceBase != product.Price) + var hasDiscount = _priceCalculationService.GetDiscountAmount(product, _services.WorkContext.CurrentCustomer) > 0; + if (hasDiscount) { priceModel.HasDiscount = true; - oldPrice = product.Price; + oldPrice = _priceCalculationService.GetFinalPrice(product, null, ctx.Customer, decimal.Zero, false, 1, null, ctx.BatchContext); + oldPrice = _taxService.GetProductPrice(product, oldPrice, out taxRate); } if (displayFromMessage) From 7bbc82e366ec25dc1435be0ec3a9e18916efb011 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Tue, 24 Apr 2018 09:44:54 +0200 Subject: [PATCH 10/49] Fixes System.ArgumentException: Expression 'x => x.AccessKey.TrimSafe()' refers to a method, not a property. Fixes AmazonPay access data must be saved as multi-store settings --- .../Controllers/AmazonPayController.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs index 80298839db..3c2bfebf94 100644 --- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs +++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs @@ -70,6 +70,12 @@ public ActionResult Configure(ConfigurationModel model, FormCollection form) return Configure(settings); ModelState.Clear(); + + model.AccessKey = model.AccessKey.TrimSafe(); + model.ClientId = model.ClientId.TrimSafe(); + model.SecretKey = model.SecretKey.TrimSafe(); + model.SellerId = model.SellerId.TrimSafe(); + MiniMapper.Map(model, settings); using (Services.Settings.BeginScope()) @@ -81,10 +87,6 @@ public ActionResult Configure(ConfigurationModel model, FormCollection form) { Services.Settings.SaveSetting(settings, x => x.DataFetching, 0, false); Services.Settings.SaveSetting(settings, x => x.PollingMaxOrderCreationDays, 0, false); - Services.Settings.SaveSetting(settings, x => x.AccessKey.TrimSafe(), 0, false); - Services.Settings.SaveSetting(settings, x => x.ClientId.TrimSafe(), 0, false); - Services.Settings.SaveSetting(settings, x => x.SecretKey.TrimSafe(), 0, false); - Services.Settings.SaveSetting(settings, x => x.SellerId.TrimSafe(), 0, false); } var task = _scheduleTaskService.Value.GetTaskByType(); From 9d93000e983f1319df3df0113d6ef63adcdb7f7b Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Tue, 24 Apr 2018 10:02:38 +0200 Subject: [PATCH 11/49] Fixes relative product URLs in message templates --- .../SmartStore.Services/Messages/MessageModelProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index 1d9bae0708..bcded46051 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -450,7 +450,7 @@ protected virtual object CreateModelPart(Product part, MessageContext messageCon var currency = _services.WorkContext.WorkingCurrency; var additionalShippingCharge = _services.Resolve().ConvertFromPrimaryStoreCurrency(part.AdditionalShippingCharge, currency); var additionalShippingChargeFormatted = _services.Resolve().FormatPrice(additionalShippingCharge, false, currency.CurrencyCode, false, messageContext.Language); - var url = productUrlHelper.GetProductUrl(part.Id, part.GetSeName(messageContext.Language.Id), attributesXml); + var url = WebHelper.GetAbsoluteUrl(productUrlHelper.GetProductUrl(part.Id, part.GetSeName(messageContext.Language.Id), attributesXml), _urlHelper.RequestContext.HttpContext.Request); var pictureInfo = GetPictureFor(part, null); var name = part.GetLocalized(x => x.Name, messageContext.Language.Id).Value; var alt = T("Media.Product.ImageAlternateTextFormat", messageContext.Language.Id, name).Text; From 00ba2400bfdd4d6ec72db05cf305495d3776483b Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Tue, 24 Apr 2018 19:22:13 +0200 Subject: [PATCH 12/49] In the context of message templates the BuildUrl method should be used instead of WebHelper.GetAbsoluteUrl --- .../SmartStore.Services/Messages/MessageModelProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index bcded46051..8d9210f84a 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -450,7 +450,7 @@ protected virtual object CreateModelPart(Product part, MessageContext messageCon var currency = _services.WorkContext.WorkingCurrency; var additionalShippingCharge = _services.Resolve().ConvertFromPrimaryStoreCurrency(part.AdditionalShippingCharge, currency); var additionalShippingChargeFormatted = _services.Resolve().FormatPrice(additionalShippingCharge, false, currency.CurrencyCode, false, messageContext.Language); - var url = WebHelper.GetAbsoluteUrl(productUrlHelper.GetProductUrl(part.Id, part.GetSeName(messageContext.Language.Id), attributesXml), _urlHelper.RequestContext.HttpContext.Request); + var url = BuildUrl(productUrlHelper.GetProductUrl(part.Id, part.GetSeName(messageContext.Language.Id), attributesXml), messageContext); var pictureInfo = GetPictureFor(part, null); var name = part.GetLocalized(x => x.Name, messageContext.Language.Id).Value; var alt = T("Media.Product.ImageAlternateTextFormat", messageContext.Language.Id, name).Text; From c52ac95e934fccb4dd71e15dac10137cf50a15d7 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 27 Apr 2018 21:37:31 +0200 Subject: [PATCH 13/49] Retry filesystem media migration per "/admin/picture/movefsmedia" --- .../Migrations/201711222311112_MoveFsMedia.cs | 55 +------------ .../SmartStore.Data/Utilities/DataMigrator.cs | 77 +++++++++++++++++++ .../Controllers/PictureController.cs | 11 ++- 3 files changed, 89 insertions(+), 54 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs index c8dd751181..ea06806e50 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs @@ -13,6 +13,7 @@ namespace SmartStore.Data.Migrations using System.Text.RegularExpressions; using System.IO; using Core.Data; + using SmartStore.Data.Utilities; public partial class MoveFsMedia : DbMigration, IDataSeeder { @@ -39,58 +40,8 @@ public void Seed(SmartObjectContext context) // Move the whole media folder to new location at first MoveMediaFolder(); - // Check whether FS storage provider is active... - var setting = context.Set().FirstOrDefault(x => x.Name == "Media.Storage.Provider"); - if (setting == null || !setting.Value.IsCaseInsensitiveEqual("MediaStorage.SmartStoreFileSystem")) - { - // DB provider is active: no need to move anything. - return; - } - - // What a huge, fucking hack! > IMediaFileSystem is defined in an - // assembly which we don't reference from here. But it also implements - // IFileSystem, which we can cast to. - var fsType = Type.GetType("SmartStore.Services.Media.IMediaFileSystem, SmartStore.Services"); - var fs = EngineContext.Current.Resolve(fsType) as IFileSystem; - - // Pattern for file matching. E.g. matches 0000234-0.png - var rg = new Regex(@"^([0-9]{7})-0[.](.{3,4})$", RegexOptions.Compiled | RegexOptions.Singleline); - - var subfolders = new Dictionary(); - - // Get root files - var files = fs.ListFiles("").ToList(); - foreach (var chunk in files.Slice(500)) - { - foreach (var file in chunk) - { - var match = rg.Match(file.Name); - if (match.Success) - { - var name = match.Groups[1].Value; - var ext = match.Groups[2].Value; - // The new file name without trailing -0 - var newName = string.Concat(name, ".", ext); - // The subfolder name, e.g. 0024, when file name is 0024893.png - var dirName = name.Substring(0, DirMaxLength); - - string subfolder = null; - if (!subfolders.TryGetValue(dirName, out subfolder)) - { - // Create subfolder "Storage/0000" - subfolder = fs.Combine("Storage", dirName); - fs.TryCreateFolder(subfolder); - subfolders[dirName] = subfolder; - } - - // Build destination path - var destinationPath = fs.Combine(subfolder, newName); - - // Move the file now! - fs.RenameFile(file.Path, destinationPath); - } - } - } + // Reorganize files (root > Storage/{subfolder}) + DataMigrator.MoveFsMedia(context); } private void MoveMediaFolder() diff --git a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs index 3cb6a0781c..0d0d007817 100644 --- a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs +++ b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs @@ -12,6 +12,10 @@ using SmartStore.Utilities; using System.IO; using System.Xml.Linq; +using SmartStore.Core.Domain.Configuration; +using SmartStore.Core.Infrastructure; +using SmartStore.Core.IO; +using System.Text.RegularExpressions; namespace SmartStore.Data.Utilities { @@ -161,6 +165,79 @@ group pp by pp.ProductId into g #endregion + #region MoveFsMedia (V3.1) + + /// + /// Reorganizes media files in subfolders for V3.1 + /// + /// + /// + public static int MoveFsMedia(IDbContext context) + { + var ctx = context as SmartObjectContext; + if (ctx == null) + throw new ArgumentException("Passed context must be an instance of type '{0}'.".FormatInvariant(typeof(SmartObjectContext)), nameof(context)); + + int dirMaxLength = 4; + + // Check whether FS storage provider is active... + var setting = context.Set().FirstOrDefault(x => x.Name == "Media.Storage.Provider"); + if (setting == null || !setting.Value.IsCaseInsensitiveEqual("MediaStorage.SmartStoreFileSystem")) + { + // DB provider is active: no need to move anything. + return 0; + } + + // What a huge, fucking hack! > IMediaFileSystem is defined in an + // assembly which we don't reference from here. But it also implements + // IFileSystem, which we can cast to. + var fsType = Type.GetType("SmartStore.Services.Media.IMediaFileSystem, SmartStore.Services"); + var fs = EngineContext.Current.Resolve(fsType) as IFileSystem; + + // Pattern for file matching. E.g. matches 0000234-0.png + var rg = new Regex(@"^([0-9]{7})-0[.](.{3,4})$", RegexOptions.Compiled | RegexOptions.Singleline); + var subfolders = new Dictionary(); + int i = 0; + + // Get root files + var files = fs.ListFiles(""); + foreach (var chunk in files.Slice(500)) + { + foreach (var file in chunk) + { + var match = rg.Match(file.Name); + if (match.Success) + { + var name = match.Groups[1].Value; + var ext = match.Groups[2].Value; + // The new file name without trailing -0 + var newName = string.Concat(name, ".", ext); + // The subfolder name, e.g. 0024, when file name is 0024893.png + var dirName = name.Substring(0, dirMaxLength); + + if (!subfolders.TryGetValue(dirName, out string subfolder)) + { + // Create subfolder "Storage/0000" + subfolder = fs.Combine("Storage", dirName); + fs.TryCreateFolder(subfolder); + subfolders[dirName] = subfolder; + } + + // Build destination path + var destinationPath = fs.Combine(subfolder, newName); + + // Move the file now! + fs.RenameFile(file.Path, destinationPath); + i++; + } + } + } + + return i; + } + + #endregion + #region Address Formats public static int ImportAddressFormats(IDbContext context) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PictureController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PictureController.cs index c957a3f867..2b8c3601b1 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/PictureController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PictureController.cs @@ -1,5 +1,6 @@ using System.Web.Mvc; using SmartStore.Core.Domain.Media; +using SmartStore.Data.Utilities; using SmartStore.Services.Media; using SmartStore.Services.Security; using SmartStore.Web.Framework.Controllers; @@ -16,8 +17,8 @@ public class PictureController : AdminControllerBase public PictureController( IPictureService pictureService, - IPermissionService permissionService, - MediaSettings mediaSettings) + IPermissionService permissionService, + MediaSettings mediaSettings) { _pictureService = pictureService; _permissionService = permissionService; @@ -44,5 +45,11 @@ public ActionResult AsyncUpload(bool isTransient = false, bool validate = true) imageUrl = _pictureService.GetUrl(picture, _mediaSettings.ProductThumbPictureSize, host: "") }); } + + public ActionResult MoveFsMedia() + { + var count = DataMigrator.MoveFsMedia(Services.DbContext); + return Content("Moved and reorganized {0} media files.".FormatInvariant(count)); + } } } From a4578cdac38d691b409e171aa6379c833be11300 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 28 Apr 2018 00:08:40 +0200 Subject: [PATCH 14/49] Migration: take all same-named message templates into account --- changelog.md | 14 +++++++ .../Extensions/EnumerableExtensions.cs | 35 ++++++++++------ .../Utilities/MessageTemplateConverter.cs | 21 ++++++---- .../Messages/MessageTemplateService.cs | 41 ++++++++----------- 4 files changed, 66 insertions(+), 45 deletions(-) diff --git a/changelog.md b/changelog.md index cc4d544685..66192dfe40 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,19 @@ # Release Notes +## 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 +* 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 ### Breaking changes * Message template customizations are lost due to the new template engine. You have to customize the templates again. No automatic migration, sorry :-( diff --git a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs index 87abdd2e99..8d4ab03455 100644 --- a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs @@ -295,25 +295,34 @@ public static Multimap ToMultimap( Func keySelector, Func valueSelector) { - Guard.NotNull(source, nameof(source)); - Guard.NotNull(keySelector, nameof(keySelector)); - Guard.NotNull(valueSelector, nameof(valueSelector)); + return source.ToMultimap(keySelector, valueSelector, null); + } - var map = new Multimap(); + public static Multimap ToMultimap( + this IEnumerable source, + Func keySelector, + Func valueSelector, + IEqualityComparer comparer) + { + Guard.NotNull(source, nameof(source)); + Guard.NotNull(keySelector, nameof(keySelector)); + Guard.NotNull(valueSelector, nameof(valueSelector)); - foreach (var item in source) - { - map.Add(keySelector(item), valueSelector(item)); - } + var map = new Multimap(comparer); - return map; - } + foreach (var item in source) + { + map.Add(keySelector(item), valueSelector(item)); + } - #endregion + return map; + } + + #endregion - #region NameValueCollection + #region NameValueCollection - public static void AddRange(this NameValueCollection initial, NameValueCollection other) + public static void AddRange(this NameValueCollection initial, NameValueCollection other) { Guard.NotNull(initial, "initial"); diff --git a/src/Libraries/SmartStore.Data/Utilities/MessageTemplateConverter.cs b/src/Libraries/SmartStore.Data/Utilities/MessageTemplateConverter.cs index 40071eced8..8ab6a2d800 100644 --- a/src/Libraries/SmartStore.Data/Utilities/MessageTemplateConverter.cs +++ b/src/Libraries/SmartStore.Data/Utilities/MessageTemplateConverter.cs @@ -121,21 +121,24 @@ public void ImportAll(Language language) var sourceTemplates = LoadAll(language); var dbTemplatesMap = table .ToList() - .ToDictionarySafe(x => x.Name, StringComparer.OrdinalIgnoreCase); + .ToMultimap(x => x.Name, x => x, StringComparer.OrdinalIgnoreCase); foreach (var source in sourceTemplates) { - if (dbTemplatesMap.TryGetValue(source.Name, out var target)) + if (dbTemplatesMap.ContainsKey(source.Name)) { - if (source.To.HasValue()) target.To = source.To; - if (source.ReplyTo.HasValue()) target.ReplyTo = source.ReplyTo; - if (source.Subject.HasValue()) target.Subject = source.Subject; - if (source.ModelTypes.HasValue()) target.ModelTypes = source.ModelTypes; - if (source.Body.HasValue()) target.Body = source.Body; + foreach (var target in dbTemplatesMap[source.Name]) + { + if (source.To.HasValue()) target.To = source.To; + if (source.ReplyTo.HasValue()) target.ReplyTo = source.ReplyTo; + if (source.Subject.HasValue()) target.Subject = source.Subject; + if (source.ModelTypes.HasValue()) target.ModelTypes = source.ModelTypes; + if (source.Body.HasValue()) target.Body = source.Body; + } } else { - target = new MessageTemplate + var template = new MessageTemplate { Name = source.Name, To = source.To, @@ -147,7 +150,7 @@ public void ImportAll(Language language) EmailAccountId = (_defaultEmailAccount?.Id).GetValueOrDefault(), }; - table.Add(target); + table.Add(template); } } diff --git a/src/Libraries/SmartStore.Services/Messages/MessageTemplateService.cs b/src/Libraries/SmartStore.Services/Messages/MessageTemplateService.cs index 2ab1bfa2b1..e9e25c6677 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageTemplateService.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageTemplateService.cs @@ -34,23 +34,22 @@ public MessageTemplateService( IRepository messageTemplateRepository, IEventPublisher eventPublisher) { - this._requestCache = requestCache; - this._storeMappingRepository = storeMappingRepository; - this._languageService = languageService; - this._localizedEntityService = localizedEntityService; - this._storeMappingService = storeMappingService; - this._messageTemplateRepository = messageTemplateRepository; - this._eventPublisher = eventPublisher; - - this.QuerySettings = DbQuerySettings.Default; + _requestCache = requestCache; + _storeMappingRepository = storeMappingRepository; + _languageService = languageService; + _localizedEntityService = localizedEntityService; + _storeMappingService = storeMappingService; + _messageTemplateRepository = messageTemplateRepository; + _eventPublisher = eventPublisher; + + QuerySettings = DbQuerySettings.Default; } public DbQuerySettings QuerySettings { get; set; } public virtual void DeleteMessageTemplate(MessageTemplate messageTemplate) { - if (messageTemplate == null) - throw new ArgumentNullException("messageTemplate"); + Guard.NotNull(messageTemplate, nameof(messageTemplate)); _messageTemplateRepository.Delete(messageTemplate); @@ -59,20 +58,18 @@ public virtual void DeleteMessageTemplate(MessageTemplate messageTemplate) public virtual void InsertMessageTemplate(MessageTemplate messageTemplate) { - if (messageTemplate == null) - throw new ArgumentNullException("messageTemplate"); + Guard.NotNull(messageTemplate, nameof(messageTemplate)); - _messageTemplateRepository.Insert(messageTemplate); + _messageTemplateRepository.Insert(messageTemplate); _requestCache.RemoveByPattern(MESSAGETEMPLATES_PATTERN_KEY); } public virtual void UpdateMessageTemplate(MessageTemplate messageTemplate) { - if (messageTemplate == null) - throw new ArgumentNullException("messageTemplate"); + Guard.NotNull(messageTemplate, nameof(messageTemplate)); - _messageTemplateRepository.Update(messageTemplate); + _messageTemplateRepository.Update(messageTemplate); _requestCache.RemoveByPattern(MESSAGETEMPLATES_PATTERN_KEY); } @@ -87,8 +84,7 @@ public virtual MessageTemplate GetMessageTemplateById(int messageTemplateId) public virtual MessageTemplate GetMessageTemplateByName(string messageTemplateName, int storeId) { - if (string.IsNullOrWhiteSpace(messageTemplateName)) - throw new ArgumentException("messageTemplateName"); + Guard.NotEmpty(messageTemplateName, nameof(messageTemplateName)); string key = string.Format(MESSAGETEMPLATES_BY_NAME_KEY, messageTemplateName, storeId); return _requestCache.Get(key, () => @@ -117,7 +113,7 @@ public virtual IList GetAllMessageTemplates(int storeId) var query = _messageTemplateRepository.Table; query = query.OrderBy(t => t.Name); - //Store mapping + // Store mapping if (storeId > 0 && !QuerySettings.IgnoreMultiStore) { query = from t in query @@ -127,7 +123,7 @@ from sm in t_sm.DefaultIfEmpty() where !t.LimitedToStores || storeId == sm.StoreId select t; - //only distinct items (group by ID) + // Only distinct items (group by ID) query = from t in query group t by t.Id into tGroup orderby tGroup.Key @@ -141,8 +137,7 @@ orderby tGroup.Key public virtual MessageTemplate CopyMessageTemplate(MessageTemplate messageTemplate) { - if (messageTemplate == null) - throw new ArgumentNullException("messageTemplate"); + Guard.NotNull(messageTemplate, nameof(messageTemplate)); var mtCopy = new MessageTemplate { From 81bd1e0666c0930445e1e6187ba5af93834960ba Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 28 Apr 2018 00:32:49 +0200 Subject: [PATCH 15/49] Messaging: OrderPlaced e-mail templates show main product image even when an attribute combination with a custom image has been selected --- changelog.md | 1 + .../SmartStore.Services/Messages/MessageModelProvider.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 66192dfe40..4528a67454 100644 --- a/changelog.md +++ b/changelog.md @@ -8,6 +8,7 @@ ### 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 diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index 8d9210f84a..8275fd3671 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -451,7 +451,7 @@ protected virtual object CreateModelPart(Product part, MessageContext messageCon var additionalShippingCharge = _services.Resolve().ConvertFromPrimaryStoreCurrency(part.AdditionalShippingCharge, currency); var additionalShippingChargeFormatted = _services.Resolve().FormatPrice(additionalShippingCharge, false, currency.CurrencyCode, false, messageContext.Language); var url = BuildUrl(productUrlHelper.GetProductUrl(part.Id, part.GetSeName(messageContext.Language.Id), attributesXml), messageContext); - var pictureInfo = GetPictureFor(part, null); + var pictureInfo = GetPictureFor(part, attributesXml); var name = part.GetLocalized(x => x.Name, messageContext.Language.Id).Value; var alt = T("Media.Product.ImageAlternateTextFormat", messageContext.Language.Id, name).Text; From 93d799489bbb667dbaf74c17c20f34b128d8fea4 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 24 Apr 2018 20:37:04 +0200 Subject: [PATCH 16/49] MessageTemplateConverter: VirtualRootPath for templates can be passed now. --- .../Utilities/MessageTemplateConverter.cs | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Libraries/SmartStore.Data/Utilities/MessageTemplateConverter.cs b/src/Libraries/SmartStore.Data/Utilities/MessageTemplateConverter.cs index 8ab6a2d800..310aa4a220 100644 --- a/src/Libraries/SmartStore.Data/Utilities/MessageTemplateConverter.cs +++ b/src/Libraries/SmartStore.Data/Utilities/MessageTemplateConverter.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.IO; using SmartStore.Core.Data; using SmartStore.Core.Domain.Localization; @@ -33,13 +31,14 @@ public MessageTemplateConverter(IDbContext context) /// /// Name of template without extension, e.g. 'GiftCard.Notification' /// Language + /// The virtual root path of templates to load, e.g. "~/Plugins/MyPlugins/EmailTemplates". Default is "~/App_Data/EmailTemplates". /// Deserialized template xml - public MessageTemplate Load(string templateName, Language language) + public MessageTemplate Load(string templateName, Language language, string virtualRootPath = null) { Guard.NotEmpty(templateName, nameof(templateName)); Guard.NotNull(language, nameof(language)); - var dir = ResolveTemplateDirectory(language); + var dir = ResolveTemplateDirectory(language, virtualRootPath); var fullPath = Path.Combine(dir.FullName, templateName + ".xml"); if (!File.Exists(fullPath)) @@ -54,12 +53,13 @@ public MessageTemplate Load(string templateName, Language language) /// Loads all message templates from disk (~/App_Data/EmailTemplates/) /// /// Language + /// The virtual root path of templates to load, e.g. "~/Plugins/MyPlugins/EmailTemplates". Default is "~/App_Data/EmailTemplates". /// List of deserialized template xml - public IEnumerable LoadAll(Language language) + public IEnumerable LoadAll(Language language, string virtualRootPath = null) { Guard.NotNull(language, nameof(language)); - var dir = ResolveTemplateDirectory(language); + var dir = ResolveTemplateDirectory(language, virtualRootPath); var files = dir.EnumerateFiles("*.xml", SearchOption.TopDirectoryOnly); foreach (var file in files) @@ -114,11 +114,12 @@ public XmlDocument Save(MessageTemplate template, Language language) /// /// Imports all template xml files to MessageTemplate table /// - public void ImportAll(Language language) + /// The virtual root path of templates to import, e.g. "~/Plugins/MyPlugins/EmailTemplates". Default is "~/App_Data/EmailTemplates". + public void ImportAll(Language language, string virtualRootPath = null) { var table = _ctx.Set(); - var sourceTemplates = LoadAll(language); + var sourceTemplates = LoadAll(language, virtualRootPath); var dbTemplatesMap = table .ToList() .ToMultimap(x => x.Name, x => x, StringComparer.OrdinalIgnoreCase); @@ -157,10 +158,10 @@ public void ImportAll(Language language) _ctx.SaveChanges(); } - private DirectoryInfo ResolveTemplateDirectory(Language language) + private DirectoryInfo ResolveTemplateDirectory(Language language, string virtualRootPath = null) { - var rootPath = CommonHelper.MapPath("~/App_Data/EmailTemplates/"); - var testPaths = new[] + var rootPath = CommonHelper.MapPath(virtualRootPath.NullEmpty() ?? "~/App_Data/EmailTemplates/"); + var testPaths = new[] { language.LanguageCulture, language.GetTwoLetterISOLanguageName(), @@ -174,7 +175,7 @@ private DirectoryInfo ResolveTemplateDirectory(Language language) return new DirectoryInfo(path); } } - + throw new DirectoryNotFoundException($"Could not obtain an email templates path for language {language.LanguageCulture}. Fallback to 'en' failed, because directory does not exist."); } @@ -187,7 +188,7 @@ private MessageTemplate DeserializeDocument(XDocument doc) { var root = doc.Root; var result = new MessageTemplate(); - + foreach (var node in root.Nodes().OfType()) { var value = node.Value.Trim(); From 9aa97bc972f074e3e218640ab4ad5aa78fd7d667 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 30 Apr 2018 15:15:15 +0200 Subject: [PATCH 17/49] Fixes tracking number in shipment details was not saved --- .../Administration/Views/Order/ShipmentDetails.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Order/ShipmentDetails.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Order/ShipmentDetails.cshtml index 80b1cc3f9c..0872b1b569 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Order/ShipmentDetails.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Order/ShipmentDetails.cshtml @@ -35,7 +35,7 @@
    @Html.EditorFor(model => model.TrackingNumber) - From e19d3b19c4832f9e4c451d51bf2106e8a1658923 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Mon, 30 Apr 2018 15:55:49 +0200 Subject: [PATCH 18/49] Fixes no bundle item thumbnail displayed in bundle summary if item is not individually visible --- .../Product/Partials/Product.Bundle.cshtml | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Bundle.cshtml b/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Bundle.cshtml index 7d7d6c6a7a..1851b8c8a4 100644 --- a/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Bundle.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Bundle.cshtml @@ -23,13 +23,24 @@ }
      - @for (int i = 0; i < items.Count; i++) + @foreach (var item in items) { - var item = items[i]; + var hasThumbnail = item.DetailsPictureModel.DefaultPictureModel.ThumbImageUrl.HasValue();
    • + @if (item.BundleItem.Quantity > 1) + { + if (hasThumbnail) + { + @(item.BundleItem.Quantity)× + } + else + { + @(item.BundleItem.Quantity)× + } + } @if (item.VisibleIndividually) { - if (item.DetailsPictureModel.DefaultPictureModel.ThumbImageUrl.HasValue()) + if (hasThumbnail) { @item.Name @@ -39,18 +50,17 @@ { @item.Name } - if (item.BundleItem.Quantity > 1) - { - @(item.BundleItem.Quantity)× - } } else { - if (item.BundleItem.Quantity > 1) + if (hasThumbnail) + { + @item.Name + } + else { - @(item.BundleItem.Quantity)× + @item.Name } - @item.Name }
      • } From 4d64942ddf2f315f97f13c0a6f524b8483287070 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Thu, 3 May 2018 14:20:27 +0200 Subject: [PATCH 19/49] Recaptcha: Should not validate against API if captcha is disabled --- .../UI/Captcha/CaptchaValidatorAttribute.cs | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Captcha/CaptchaValidatorAttribute.cs b/src/Presentation/SmartStore.Web.Framework/UI/Captcha/CaptchaValidatorAttribute.cs index 17b06c4570..af16de1281 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Captcha/CaptchaValidatorAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Captcha/CaptchaValidatorAttribute.cs @@ -31,32 +31,35 @@ public override void OnActionExecuting(ActionExecutingContext filterContext) try { var captchaSettings = CaptchaSettings.Value; - var verifyUrl = CommonHelper.GetAppSetting("g:RecaptchaVerifyUrl"); - var recaptchaResponse = filterContext.HttpContext.Request.Form["g-recaptcha-response"]; + if (captchaSettings.Enabled && captchaSettings.ReCaptchaPrivateKey.HasValue()) + { + var verifyUrl = CommonHelper.GetAppSetting("g:RecaptchaVerifyUrl"); + var recaptchaResponse = filterContext.HttpContext.Request.Form["g-recaptcha-response"]; - var url = "{0}?secret={1}&response={2}".FormatInvariant( - verifyUrl, - HttpUtility.UrlEncode(captchaSettings.ReCaptchaPrivateKey), - HttpUtility.UrlEncode(recaptchaResponse) - ); + var url = "{0}?secret={1}&response={2}".FormatInvariant( + verifyUrl, + HttpUtility.UrlEncode(captchaSettings.ReCaptchaPrivateKey), + HttpUtility.UrlEncode(recaptchaResponse) + ); - using (var client = new WebClient()) - { - var jsonResponse = client.DownloadString(url); - using (var memoryStream = new MemoryStream(Encoding.Unicode.GetBytes(jsonResponse))) + using (var client = new WebClient()) { - var serializer = new DataContractJsonSerializer(typeof(GoogleRecaptchaApiResponse)); - var result = serializer.ReadObject(memoryStream) as GoogleRecaptchaApiResponse; - - if (result == null) - { - Logger.Error(LocalizationService.Value.GetResource("Common.CaptchaUnableToVerify")); - } - else + var jsonResponse = client.DownloadString(url); + using (var memoryStream = new MemoryStream(Encoding.Unicode.GetBytes(jsonResponse))) { - if (result.ErrorCodes == null) + var serializer = new DataContractJsonSerializer(typeof(GoogleRecaptchaApiResponse)); + var result = serializer.ReadObject(memoryStream) as GoogleRecaptchaApiResponse; + + if (result == null) + { + Logger.Error(LocalizationService.Value.GetResource("Common.CaptchaUnableToVerify")); + } + else { - valid = result.Success; + if (result.ErrorCodes == null) + { + valid = result.Success; + } } } } From 8cf0128b988761c93d23d8afdd4664f767a0307f Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 4 May 2018 21:43:56 +0200 Subject: [PATCH 20/49] Fixed SSL certificate validation problem --- src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs | 2 -- src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs | 4 ---- src/Plugins/SmartStore.PayPal/Services/PayPalService.cs | 2 -- src/Presentation/SmartStore.Web/Global.asax.cs | 4 ++++ 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs index 0444d1c9cc..10b9c1ecd4 100644 --- a/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs @@ -17,8 +17,6 @@ public static string GetPayPalUrl(this PayPalSettingsBase settings) public static HttpWebRequest GetPayPalWebRequest(this PayPalSettingsBase settings) { - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; - var request = (HttpWebRequest)WebRequest.Create(GetPayPalUrl(settings)); return request; } diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs index 1c3469dae1..10cf99276b 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs @@ -59,8 +59,6 @@ public override bool SupportVoid protected PayPalAPIAASoapBinding GetApiAaService(TSetting settings) { - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; - var service = new PayPalAPIAASoapBinding(); service.Url = settings.UseSandbox ? "https://api-3t.sandbox.paypal.com/2.0/" : "https://api-3t.paypal.com/2.0/"; @@ -72,8 +70,6 @@ protected PayPalAPIAASoapBinding GetApiAaService(TSetting settings) protected PayPalAPISoapBinding GetApiService(TSetting settings) { - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; - var service = new PayPalAPISoapBinding(); service.Url = settings.UseSandbox ? "https://api-3t.sandbox.paypal.com/2.0/" : "https://api-3t.paypal.com/2.0/"; diff --git a/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs b/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs index 8038099afd..41a41d9448 100644 --- a/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs +++ b/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs @@ -481,8 +481,6 @@ public PayPalResponse CallApi(string method, string path, string accessToken, Pa if (method.IsCaseInsensitiveEqual("GET") && data.HasValue()) url = url.EnsureEndsWith("?") + data; - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; - var request = (HttpWebRequest)WebRequest.Create(url); request.Method = method; request.Accept = "application/json"; diff --git a/src/Presentation/SmartStore.Web/Global.asax.cs b/src/Presentation/SmartStore.Web/Global.asax.cs index 0f3abd1142..46ebe851df 100644 --- a/src/Presentation/SmartStore.Web/Global.asax.cs +++ b/src/Presentation/SmartStore.Web/Global.asax.cs @@ -25,6 +25,7 @@ using SmartStore.Web.Framework.Theming; using SmartStore.Web.Framework.Theming.Assets; using SmartStore.Web.Framework.Validators; +using System.Net; namespace SmartStore.Web { @@ -93,6 +94,9 @@ public static void RegisterJsEngines() protected void Application_Start() { + ServicePointManager.ServerCertificateValidationCallback += delegate { return true; }; + ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; + // we use our own mobile devices support (".Mobile" is reserved). that's why we disable it. var mobileDisplayMode = DisplayModeProvider.Instance.Modes.FirstOrDefault(x => x.DisplayModeId == DisplayModeProvider.MobileDisplayModeId); if (mobileDisplayMode != null) From 687d32738e2149354339ceeb12d43ebfebb323f6 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 5 May 2018 00:49:49 +0200 Subject: [PATCH 21/49] Resolved SSL/TLS issues --- .../Administration/Controllers/LanguageController.cs | 4 ++-- src/Presentation/SmartStore.Web/Global.asax.cs | 7 ++++--- src/Presentation/SmartStore.Web/Web.config | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs index 474dd62622..ef48f234c7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs @@ -219,10 +219,10 @@ private async Task CheckAvailableResources(bool e } } } - catch (Exception exception) + catch (Exception ex) { NotifyError(T("Admin.Configuration.Languages.CheckAvailableLanguagesFailed")); - Logger.ErrorsAll(exception); + Logger.ErrorsAll(ex); } } diff --git a/src/Presentation/SmartStore.Web/Global.asax.cs b/src/Presentation/SmartStore.Web/Global.asax.cs index 46ebe851df..0bf1d2efb0 100644 --- a/src/Presentation/SmartStore.Web/Global.asax.cs +++ b/src/Presentation/SmartStore.Web/Global.asax.cs @@ -94,9 +94,10 @@ public static void RegisterJsEngines() protected void Application_Start() { - ServicePointManager.ServerCertificateValidationCallback += delegate { return true; }; - ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; - + // SSL & TLS + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; + ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, errors) => true; + // we use our own mobile devices support (".Mobile" is reserved). that's why we disable it. var mobileDisplayMode = DisplayModeProvider.Instance.Modes.FirstOrDefault(x => x.DisplayModeId == DisplayModeProvider.MobileDisplayModeId); if (mobileDisplayMode != null) diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index 3f00dd55d7..8a2c76321f 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -38,7 +38,7 @@ - +