From 4c6bd12e7aa9b243bc0c2e7683130c3dd75f86c5 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 21 Jan 2022 11:39:39 +0100 Subject: [PATCH 01/43] Closes #470 The off-canvas cart does not show the tier price (instead of the unit price) when the quantity changes --- .../SmartStore.Web/Controllers/ShoppingCartController.cs | 7 ++++++- .../SmartStore.Web/Scripts/public.offcanvas-cart.js | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs index 103eebeac3..d88a441095 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs @@ -2289,6 +2289,7 @@ public ActionResult UpdateCartItem(int sciItemId, int newQuantity, bool isCartPa var cartHtml = string.Empty; var totalsHtml = string.Empty; + var newItemPrice = string.Empty; if (isCartPage) { @@ -2306,6 +2307,9 @@ public ActionResult UpdateCartItem(int sciItemId, int newQuantity, bool isCartPa PrepareShoppingCartModel(model, cart); cartHtml = this.RenderPartialViewToString("CartItems", model); totalsHtml = this.InvokeAction("OrderTotals", routeValues: new RouteValueDictionary(new { isEditable = true })).ToString(); + + var sci = model.Items.Where(x => x.Id == sciItemId).FirstOrDefault(); + newItemPrice = sci.UnitPrice; } } @@ -2316,7 +2320,8 @@ public ActionResult UpdateCartItem(int sciItemId, int newQuantity, bool isCartPa message = warnings, cartHtml, totalsHtml, - displayCheckoutButtons = true + displayCheckoutButtons = true, + newItemPrice }); } diff --git a/src/Presentation/SmartStore.Web/Scripts/public.offcanvas-cart.js b/src/Presentation/SmartStore.Web/Scripts/public.offcanvas-cart.js index c13fffc21a..5456f933b8 100644 --- a/src/Presentation/SmartStore.Web/Scripts/public.offcanvas-cart.js +++ b/src/Presentation/SmartStore.Web/Scripts/public.offcanvas-cart.js @@ -203,6 +203,9 @@ $(function () { var type = el.data("type"); ShopBar.loadSummary(type, true); el.closest('.tab-pane').find('.sub-total').html(data.SubTotal); + if (data.newItemPrice != "") { + el.closest(".offcanvas-cart-item").find(".unit-price").html(data.newItemPrice); + } } else { $(data.message).each(function (index, value) { From 98c131b1df9b21856cf8a1f9c3ae9609b90ec238 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 21 Jan 2022 16:13:59 +0100 Subject: [PATCH 02/43] Fixed display problem with saved IP addresses --- .../Administration/Controllers/CustomerController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs index 0ab6f35bd4..846cc0ce01 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs @@ -259,7 +259,7 @@ protected virtual void PrepareCustomerModelForEdit(CustomerModel model, Customer model.VatNumberStatusNote = ((VatNumberStatus)customer.VatNumberStatusId).GetLocalizedEnum(Services.Localization, Services.WorkContext); model.CreatedOn = Services.DateTimeHelper.ConvertToUserTime(customer.CreatedOnUtc, DateTimeKind.Utc); model.LastActivityDate = Services.DateTimeHelper.ConvertToUserTime(customer.LastActivityDateUtc, DateTimeKind.Utc); - model.LastIpAddress = model.LastIpAddress; + model.LastIpAddress = customer.LastIpAddress; model.LastVisitedPage = customer.GetAttribute(SystemCustomerAttributeNames.LastVisitedPage); foreach (var tzi in Services.DateTimeHelper.GetSystemTimeZones()) From 38c4680a216e2e908c9a93e604db24398b54f06c Mon Sep 17 00:00:00 2001 From: mgesing Date: Tue, 25 Jan 2022 22:11:56 +0100 Subject: [PATCH 03/43] Fixes stackoverflow when sending NewReturnRequestStoreOwnerNotification --- .../Messages/MessageModelProvider.cs | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index 6fb1b6a323..cbc11c33a9 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -1152,7 +1152,7 @@ private TreeNode BuildModelTreePart(string modelName, object in return node; } - private IEnumerable> BuildModelTreePartForClass(object instance) + private IEnumerable> BuildModelTreePartForClass(object instance, HashSet instanceLookup = null) { var type = instance?.GetType(); @@ -1179,9 +1179,21 @@ private IEnumerable> BuildModelTreePartForClass(object } else { - var node = new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Complex }); - node.AppendRange(BuildModelTreePartForClass(prop.GetValue(instance))); - yield return node; + if (instanceLookup == null) + { + instanceLookup = new HashSet(ReferenceEqualityComparer.Default); + } + + var exists = !type.IsValueType && instanceLookup.Contains(instance); + + if (!exists) + { + instanceLookup.Add(instance); + + var node = new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Complex }); + node.AppendRange(BuildModelTreePartForClass(prop.GetValue(instance), instanceLookup)); + yield return node; + } } } } From dc3b6178e8968f6c9e9ce459fbdd760d20e73c10 Mon Sep 17 00:00:00 2001 From: mgesing Date: Thu, 27 Jan 2022 10:07:13 +0100 Subject: [PATCH 04/43] MessageModelProvider review --- .../Messages/MessageModelProvider.cs | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index cbc11c33a9..37045b041f 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -1177,22 +1177,24 @@ private IEnumerable> BuildModelTreePartForClass(object { yield return new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Collection }); } - else + else if (pi.PropertyType.IsClass) { if (instanceLookup == null) { - instanceLookup = new HashSet(ReferenceEqualityComparer.Default); + instanceLookup = new HashSet(ReferenceEqualityComparer.Default) { instance }; } - var exists = !type.IsValueType && instanceLookup.Contains(instance); - - if (!exists) + var childInstance = prop.GetValue(instance); + if (childInstance != null) { - instanceLookup.Add(instance); + if (!instanceLookup.Contains(childInstance)) + { + instanceLookup.Add(childInstance); - var node = new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Complex }); - node.AppendRange(BuildModelTreePartForClass(prop.GetValue(instance), instanceLookup)); - yield return node; + var node = new TreeNode(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Complex }); + node.AppendRange(BuildModelTreePartForClass(childInstance, instanceLookup)); + yield return node; + } } } } From 5640fef0d2ca6c0b096c448324d4384483080990 Mon Sep 17 00:00:00 2001 From: mgesing Date: Thu, 27 Jan 2022 20:57:19 +0100 Subject: [PATCH 05/43] Ignore selected attributes that are not of type list from finding an associated attribute combination --- .../Catalog/ProductAttributeParser.cs | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeParser.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeParser.cs index d6de776ade..6fb44522a1 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeParser.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeParser.cs @@ -180,6 +180,11 @@ public virtual void ClearCachedAttributeValues() } public virtual Multimap DeserializeProductVariantAttributes(string attributesXml) + { + return DeserializeAttributesXml(attributesXml, null); + } + + private Multimap DeserializeAttributesXml(string attributesXml, int[] includeAttributesIds = null) { var attrs = new Multimap(); if (String.IsNullOrEmpty(attributesXml)) @@ -195,7 +200,8 @@ public virtual Multimap DeserializeProductVariantAttributes(string string sid = node1.Attribute("ID").Value; if (sid.HasValue()) { - if (int.TryParse(sid, out var id)) + if (int.TryParse(sid, out var id) && + (includeAttributesIds == null || includeAttributesIds.Contains(id))) { // ProductVariantAttributeValue/Value foreach (var node2 in node1.Descendants("Value")) @@ -326,6 +332,11 @@ public virtual bool AreProductAttributesEqual(string attributeXml1, string attri var attributes1 = DeserializeProductVariantAttributes(attributeXml1); var attributes2 = DeserializeProductVariantAttributes(attributeXml2); + return AreProductAttributesEqual(attributes1, attributes2); + } + + private bool AreProductAttributesEqual(Multimap attributes1, Multimap attributes2) + { if (attributes1.Count != attributes2.Count) return false; @@ -383,9 +394,14 @@ public virtual ProductVariantAttributeCombination FindProductVariantAttributeCom if (combinations.Count == 0) return null; + var listTypeValues = ParseProductVariantAttributeValues(attributesXml); + var listTypeAttributesIds = listTypeValues.Select(x => x.ProductVariantAttributeId).ToArray(); + var listTypeAttributesMap = DeserializeAttributesXml(attributesXml, listTypeAttributesIds); + foreach (var combination in combinations) { - bool attributesEqual = AreProductAttributesEqual(combination.AttributesXml, attributesXml); + var combinationAttributesMap = DeserializeProductVariantAttributes(combination.AttributesXml); + bool attributesEqual = AreProductAttributesEqual(combinationAttributesMap, listTypeAttributesMap); if (attributesEqual) return _productAttributeService.GetProductVariantAttributeCombinationById(combination.Id); } From 7b7fcdbc3f3d111a27d958434868c4bf760e897e Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Mon, 31 Jan 2022 16:14:14 +0100 Subject: [PATCH 06/43] Minor fix --- .../en/RecurringPaymentCancelled.StoreOwnerNotification.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/en/RecurringPaymentCancelled.StoreOwnerNotification.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/en/RecurringPaymentCancelled.StoreOwnerNotification.xml index d3ee97313d..e14856fd6f 100644 --- a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/en/RecurringPaymentCancelled.StoreOwnerNotification.xml +++ b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/en/RecurringPaymentCancelled.StoreOwnerNotification.xml @@ -15,7 +15,7 @@

- View payment + View payment

From db1307ff1d93404b9100409e638ff409c0d4454a Mon Sep 17 00:00:00 2001 From: mgesing Date: Wed, 2 Feb 2022 21:40:22 +0100 Subject: [PATCH 07/43] Minor fix when adding a product variant attribute --- .../Administration/Controllers/ProductController.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs index a195f095ed..4128b0ef51 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs @@ -2970,18 +2970,21 @@ public ActionResult ProductVariantAttributeInsert(GridCommand command, ProductMo { ProductId = model.ProductId, // Use ProductAttribute property (not ProductAttributeId) because appropriate property is stored in it. - ProductAttributeId = int.Parse(model.ProductAttribute), + ProductAttributeId = model.ProductAttribute.ToInt(), TextPrompt = model.TextPrompt, CustomData = model.CustomData, IsRequired = model.IsRequired, // Use AttributeControlType property (not AttributeControlTypeId) because appropriate property is stored in it. - AttributeControlTypeId = int.Parse(model.AttributeControlType), + AttributeControlTypeId = model.AttributeControlType.ToInt((int)AttributeControlType.DropdownList), DisplayOrder = model.DisplayOrder1 }; try { - _productAttributeService.InsertProductVariantAttribute(pva); + if (pva.ProductAttributeId != 0) + { + _productAttributeService.InsertProductVariantAttribute(pva); + } } catch (Exception ex) { From acb9eed4907f9b82436859a98f97da2e8e9020ca Mon Sep 17 00:00:00 2001 From: mgesing Date: Mon, 14 Feb 2022 20:18:56 +0100 Subject: [PATCH 08/43] Fixes browse-file-button in link builder out of function --- .../SmartStore.Web/Views/Shared/EditorTemplates/Link.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Link.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Link.cshtml index 694a1a0788..41d0b05cdb 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Link.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/EditorTemplates/Link.cshtml @@ -118,7 +118,7 @@ @if (allowedTypes.Contains(LinkType.File)) {

- + @(T("Common.BrowseFiles"))… From 9defbb0905048e31e55dc6ac818b98c50f068161 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 18 Feb 2022 13:34:09 +0100 Subject: [PATCH 09/43] Minor fix for Google structured data --- .../Product/Partials/Product.Info.cshtml | 93 +++++++++---------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Info.cshtml b/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Info.cshtml index 7e725b92d4..0c67a62bb8 100644 --- a/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Info.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Info.cshtml @@ -7,60 +7,59 @@ }
- - @if (brand != null) - { -
- - @if (brand.Picture != null && brand.Picture.ImageUrl.HasValue() && brand.Picture.PictureId != 0) + @if (Model.Sku.HasValue()) + { + + } + + @if (Model.Gtin.HasValue()) + { + + } + + @if (Model.ManufacturerPartNumber.HasValue()) + { + + } + + @if (brand != null) + { +
+ + @if (brand.Picture != null && brand.Picture.ImageUrl.HasValue() && brand.Picture.PictureId != 0) + { + @brand.Picture.AlternateText + } + else + { + @brand.Name + } + + +
+ } + + +
+

+ @if (Model.IsAssociatedProduct && Model.VisibleIndividually) { - @brand.Picture.AlternateText + @Model.Name } else { - @brand.Name + @Model.Name } - - - - @if (Model.Sku.HasValue()) - { - - } - - @if (Model.Gtin.HasValue()) - { - - } - - @if (Model.ManufacturerPartNumber.HasValue()) - { - - } +

- } - - -
-

- @if (Model.IsAssociatedProduct && Model.VisibleIndividually) - { - @Model.Name - } - else - { - @Model.Name - } -

-
- - @if (Model.ShortDescription.Value.HasValue()) - { -
- @Html.Raw(Model.ShortDescription) -
- } + + @if (Model.ShortDescription.Value.HasValue()) + { +
+ @Html.Raw(Model.ShortDescription) +
+ }
From 1d1b6549230eb3c882e59fc55b27efe9aeca1325 Mon Sep 17 00:00:00 2001 From: mgesing Date: Mon, 21 Feb 2022 19:33:47 +0100 Subject: [PATCH 10/43] Minor fix --- .../SmartStore.Web/Administration/Models/News/NewsItemModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs index 46d8fc82af..f48c5c8843 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs @@ -42,7 +42,7 @@ public NewsItemModel() public int? PictureId { get; set; } [UIHint("Media"), AdditionalMetadata("album", "content")] - [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.PreviewPictureId")] + [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.PreviewPicture")] public int? PreviewPictureId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.AllowComments")] From 538c39ee2929668f69aad4b79244adffb13beca6 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Thu, 24 Feb 2022 20:59:48 +0100 Subject: [PATCH 11/43] Test fix --- .../Security/EncryptionServiceTests.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/Tests/SmartStore.Services.Tests/Security/EncryptionServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Security/EncryptionServiceTests.cs index 3fe556b0b6..b195d29501 100644 --- a/src/Tests/SmartStore.Services.Tests/Security/EncryptionServiceTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Security/EncryptionServiceTests.cs @@ -16,7 +16,8 @@ public class EncryptionServiceTests : ServiceTest { _securitySettings = new SecuritySettings() { - EncryptionKey = "273ece6f97dd844d" + //EncryptionKey = "273ece6f97dd844d", + EncryptionKey = "3742404997253102" }; _encryptionService = new EncryptionService(_securitySettings); } @@ -39,5 +40,19 @@ public void Can_encrypt_and_decrypt() var decryptedPassword = _encryptionService.DecryptText(encryptedPassword); decryptedPassword.ShouldEqual(password); } + + [Test] + public void Can_encrypt_and_decrypt2() + { + var test = "3345786499234591"; + + var encrypted = _encryptionService.EncryptText(test); + var decrypted = _encryptionService.DecryptText(encrypted); + + decrypted.ShouldEqual(test); + + encrypted = "zY0jkmIwNfU="; + decrypted = _encryptionService.DecryptText(encrypted); + } } } From 19063dd3954fe9208b4eab6f44408fa7dd545d7d Mon Sep 17 00:00:00 2001 From: mgesing Date: Fri, 4 Mar 2022 16:22:25 +0100 Subject: [PATCH 12/43] Minor message template fix --- .../de/NewVATSubmitted.StoreOwnerNotification.xml | 2 +- .../en/NewVATSubmitted.StoreOwnerNotification.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/NewVATSubmitted.StoreOwnerNotification.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/NewVATSubmitted.StoreOwnerNotification.xml index 727dd8dd31..4f292369a7 100644 --- a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/NewVATSubmitted.StoreOwnerNotification.xml +++ b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/NewVATSubmitted.StoreOwnerNotification.xml @@ -12,7 +12,7 @@

- {{ Customer.FullName }} ({{ Customer.Email }}) hat eine neue Umsatzsteuer-ID übermittelt. + {{ Customer.FullName }} ({{ Customer.Email }}) hat eine neue Umsatzsteuer-ID übermittelt.

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/en/NewVATSubmitted.StoreOwnerNotification.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/en/NewVATSubmitted.StoreOwnerNotification.xml index f6b1987502..e776118c97 100644 --- a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/en/NewVATSubmitted.StoreOwnerNotification.xml +++ b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/en/NewVATSubmitted.StoreOwnerNotification.xml @@ -12,7 +12,7 @@

- {{ Customer.FullName }} ({{ Customer.Email }}) has submitted a new VAT number. + {{ Customer.FullName }} ({{ Customer.Email }}) has submitted a new VAT number.

From 227fc0553895c4169e09b488359bd742200c1fd4 Mon Sep 17 00:00:00 2001 From: mgesing Date: Fri, 11 Mar 2022 15:22:11 +0100 Subject: [PATCH 13/43] Minor fixes --- .../Domain/Messages/MessageTemplateNames.cs | 1 + .../SmartStore.Services/Messages/MessageFactory.cs | 8 ++++++++ .../Administration/Controllers/CustomerController.cs | 4 ++-- .../SmartStore.Web/Controllers/CustomerController.cs | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplateNames.cs b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplateNames.cs index db219751cb..83f2dfe962 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplateNames.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplateNames.cs @@ -33,5 +33,6 @@ public class MessageTemplateNames public const string BackInStockCustomer = "Customer.BackInStock"; public const string SystemCampaign = "System.Campaign"; public const string SystemContactUs = "System.ContactUs"; + public const string SystemGeneric = "System.Generic"; } } diff --git a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs index aa657d8b32..7c2ab26c7b 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs @@ -515,6 +515,14 @@ public virtual object[] GetTestModels(MessageContext messageContext) ["Address"] = "VatAddress" }); break; + case MessageTemplateNames.SystemGeneric: + result.Add(new NamedModelPart("Generic") + { + ["Email"] = "john@doe.com", + ["Subject"] = "Subject", + ["Body"] = LoremIpsum + }); + break; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs index 846cc0ce01..8a3190a579 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs @@ -496,7 +496,7 @@ public ActionResult Create(CustomerModel model, bool continueEditing, FormCollec var numberExists = _customerService.SearchCustomers(new CustomerSearchQuery { CustomerNumber = model.CustomerNumber }).SourceQuery.Any(); if (numberExists) { - NotifyError("Common.CustomerNumberAlreadyExists"); + NotifyError(T("Common.CustomerNumberAlreadyExists")); } else { @@ -680,7 +680,7 @@ public ActionResult Edit(CustomerModel model, bool continueEditing, FormCollecti var numberExists = _customerService.SearchCustomers(new CustomerSearchQuery { CustomerNumber = model.CustomerNumber }).SourceQuery.Any(); if (model.CustomerNumber != customer.CustomerNumber && numberExists) { - NotifyError("Common.CustomerNumberAlreadyExists"); + NotifyError(T("Common.CustomerNumberAlreadyExists")); } else { diff --git a/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs b/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs index fe1356e497..0ab8fa9da2 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs @@ -1031,7 +1031,7 @@ public ActionResult Info(CustomerInfoModel model) var numberExists = _customerService.SearchCustomers(new CustomerSearchQuery { CustomerNumber = model.CustomerNumber }).SourceQuery.Any(); if (model.CustomerNumber != customer.CustomerNumber && numberExists) { - NotifyError("Common.CustomerNumberAlreadyExists"); + NotifyError(T("Common.CustomerNumberAlreadyExists")); } else { From 44ab9b38a82a571482f12193f3aff45bc7124953 Mon Sep 17 00:00:00 2001 From: mgesing Date: Thu, 7 Apr 2022 14:13:13 +0200 Subject: [PATCH 14/43] Minor button fix --- .../Views/Order/_Edit.BillingAndShipment.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Order/_Edit.BillingAndShipment.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Order/_Edit.BillingAndShipment.cshtml index 11a88b645f..219e5e5d01 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Order/_Edit.BillingAndShipment.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Order/_Edit.BillingAndShipment.cshtml @@ -8,7 +8,7 @@

@T("Order.BillingAddress")
@RenderAddress(Model.BillingAddress)
-
+
@T("Admin.Common.Edit") @@ -23,7 +23,7 @@
@T("Order.ShippingAddress")
@RenderAddress(Model.ShippingAddress)
-
+
@T("Admin.Common.Edit") From cc140b95eb7daf1ed480f207c3e9cb00c0a6b32e Mon Sep 17 00:00:00 2001 From: Michael-Herzog Date: Tue, 12 Apr 2022 11:09:13 +0200 Subject: [PATCH 15/43] Announcement: Smartstore 5 Beta is now available! --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index acf1060718..f90ccbf79c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -|
:information_source: **[Announcement: Porting Smartstore to cross-platform ASP.NET Core 5!](https://github.com/smartstore/Smartstore)**
| +|
:information_source: **[Announcement: Smartstore 5 Beta is now available!](https://github.com/smartstore/Smartstore)**
| | --- | -| We are currently working hard on porting Smartstore from classic ASP.NET MVC to ASP.NET Core 5. For best code quality we decided to port class by class and adapt the existing code to the new environment. Therefore we have created a **[new repository](https://github.com/smartstore/Smartstore)** where we do all the work. Of course, work in this repository continues as usual. **Give our new repository a star** to stay up-to-date, get involved or just watch how we're doing. Learn all about the latest development, participate actively and last but not least, don't miss the day of release. | +| We are thrilled to announce that we've published the first release of Smartstore 5, one of the fastest full-featured e-commerce solutions of the world. Smartstore 5 is a port of Smartstore 4 - which is based on the classic .NET Framework 4.7.2 – to the new ASP.NET Core 6 platform. To try it out head over to our **[new repository](https://github.com/smartstore/Smartstore)** and download the first release. **Give our new repository a star** to stay up-to-date, get involved or just watch how we're doing. Learn all about the latest development, participate actively and last but not least, don't miss the day of the first stable release.|
From dde48a26a1dc8e53372b4eaf92d5c744b667c168 Mon Sep 17 00:00:00 2001 From: mgesing Date: Tue, 12 Apr 2022 22:13:38 +0200 Subject: [PATCH 16/43] Link resolver: minor improvement. Save an URL as-is. --- src/Libraries/SmartStore.Services/Cms/LinkResolver.cs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs index ae89d1d75b..21844241cf 100644 --- a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs +++ b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs @@ -86,16 +86,7 @@ public virtual LinkResolverResult Resolve(string linkExpression, IEnumerable Date: Wed, 13 Apr 2022 17:33:10 +0200 Subject: [PATCH 17/43] Reverts last commit --- src/Libraries/SmartStore.Services/Cms/LinkResolver.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs index 21844241cf..ae89d1d75b 100644 --- a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs +++ b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs @@ -86,7 +86,16 @@ public virtual LinkResolverResult Resolve(string linkExpression, IEnumerable Date: Fri, 29 Apr 2022 17:29:40 +0200 Subject: [PATCH 18/43] Respect order setting DisplayOrdersOfAllStores --- .../SmartStore.Web/Controllers/OrderController.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Controllers/OrderController.cs b/src/Presentation/SmartStore.Web/Controllers/OrderController.cs index a333bd87d8..88fc181453 100644 --- a/src/Presentation/SmartStore.Web/Controllers/OrderController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/OrderController.cs @@ -42,6 +42,7 @@ public partial class OrderController : PublicControllerBase private readonly IPaymentService _paymentService; private readonly IShippingService _shippingService; private readonly ICountryService _countryService; + private readonly OrderSettings _orderSettings; #endregion @@ -57,7 +58,8 @@ public OrderController( IOrderProcessingService orderProcessingService, IPaymentService paymentService, IShippingService shippingService, - ICountryService countryService) + ICountryService countryService, + OrderSettings orderSettings) { _dateTimeHelper = dateTimeHelper; _pdfConverter = pdfConverter; @@ -69,6 +71,7 @@ public OrderController( _paymentService = paymentService; _shippingService = shippingService; _countryService = countryService; + _orderSettings = orderSettings; } #endregion @@ -366,6 +369,11 @@ private bool IsNonExistentOrder(Order order) if (!Services.Permissions.Authorize(Permissions.Order.Read)) { result = result || (order.StoreId != 0 && order.StoreId != Services.StoreContext.CurrentStore.Id); + + if (_orderSettings.DisplayOrdersOfAllStores) + { + result = false; + } } return result; From d8a2a4ecca6637f7438b2b4748316c5141545b98 Mon Sep 17 00:00:00 2001 From: mgesing Date: Sat, 30 Apr 2022 11:25:07 +0200 Subject: [PATCH 19/43] Resolves #492 Product details page: unnecessary leading comma in label "Free Shipping" (below price) --- .../SmartStore.Web/Controllers/CatalogHelper.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index 14e0084cac..8069973c0a 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs @@ -1148,10 +1148,9 @@ public ProductDetailsModel PrepareProductDetailModel( if (!product.IsShipEnabled || (addShippingPrice == 0 && product.IsFreeShipping)) { - model.LegalInfo += "{0} {1}, {2}".FormatInvariant( - product.IsTaxExempt ? "" : taxInfo, - product.IsTaxExempt ? "" : defaultTaxRate, - T("Common.FreeShipping")); + model.LegalInfo += product.IsTaxExempt + ? T("Common.FreeShipping") + : "{0} {1}, {2}".FormatInvariant(taxInfo, defaultTaxRate, T("Common.FreeShipping")); } else { @@ -1174,6 +1173,8 @@ public ProductDetailsModel PrepareProductDetailModel( } } + model.LegalInfo = model.LegalInfo.TrimSafe(); + var dimension = _measureService.GetMeasureDimensionById(_measureSettings.BaseDimensionId)?.SystemKeyword ?? string.Empty; model.WeightValue = product.Weight; From 5573cc721be8adaa5ed7c9b05408a9dedcff2da2 Mon Sep 17 00:00:00 2001 From: mgesing Date: Fri, 27 May 2022 10:42:23 +0200 Subject: [PATCH 20/43] Fixes rare exception when using GetLocalizedPropertyCollection with large entity IDs array --- .../Localization/LocalizedEntityService.cs | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs index b5a92c3263..2371b71bc7 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizedEntityService.cs @@ -218,6 +218,7 @@ protected virtual LocalizedPropertyCollection GetLocalizedPropertyCollectionInte where x.LocaleKeyGroup == localeKeyGroup select x; + var splitEntityIds = false; var requestedSet = entityIds; if (entityIds != null && entityIds.Length > 0) @@ -243,7 +244,15 @@ protected virtual LocalizedPropertyCollection GetLocalizedPropertyCollectionInte else { requestedSet = entityIds; - query = query.Where(x => entityIds.Contains(x.EntityId)); + + if (entityIds.Length > 5000) + { + splitEntityIds = true; + } + else + { + query = query.Where(x => entityIds.Contains(x.EntityId)); + } } } @@ -252,7 +261,20 @@ protected virtual LocalizedPropertyCollection GetLocalizedPropertyCollectionInte query = query.Where(x => x.LanguageId == languageId); } - return new LocalizedPropertyCollection(localeKeyGroup, requestedSet, query.ToList()); + if (splitEntityIds) + { + var items = new List(); + foreach (var chunk in entityIds.Slice(5000)) + { + items.AddRange(query.Where(x => chunk.Contains(x.EntityId)).ToList()); + } + + return new LocalizedPropertyCollection(localeKeyGroup, requestedSet, items); + } + else + { + return new LocalizedPropertyCollection(localeKeyGroup, requestedSet, query.ToList()); + } } } From 321e800b7905baa5ce7109b5015b3f3aa5385d7d Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Tue, 31 May 2022 10:20:56 +0200 Subject: [PATCH 21/43] Don't round shop admin input for measures & weights --- .../SmartStore.Services/Catalog/ProductExtensions.cs | 2 +- .../SmartStore.Web/Controllers/CatalogHelper.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs index 52ffd8cd80..8ecf7912c0 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs @@ -377,7 +377,7 @@ public static string GetBasePriceInfo(this Product product, { var value = Convert.ToDecimal((productPrice / product.BasePriceAmount) * product.BasePriceBaseAmount); var valueFormatted = priceFormatter.FormatPrice(value, true, currency); - var amountFormatted = Math.Round(product.BasePriceAmount.Value, 2).ToString("G29"); + var amountFormatted = product.BasePriceAmount.Value.ToString("G29"); var infoTemplate = localizationService.GetResource("Products.BasePriceInfo"); var result = infoTemplate.FormatInvariant( diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index 8069973c0a..2db4cb1ce5 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs @@ -1193,10 +1193,10 @@ public ProductDetailsModel PrepareProductDetailModel( } } - model.Weight = (model.WeightValue > 0) ? "{0} {1}".FormatCurrent(model.WeightValue.ToString("N2"), _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId).SystemKeyword) : ""; - model.Height = (product.Height > 0) ? "{0} {1}".FormatCurrent(product.Height.ToString("N2"), dimension) : ""; - model.Length = (product.Length > 0) ? "{0} {1}".FormatCurrent(product.Length.ToString("N2"), dimension) : ""; - model.Width = (product.Width > 0) ? "{0} {1}".FormatCurrent(product.Width.ToString("N2"), dimension) : ""; + model.Weight = (model.WeightValue > 0) ? "{0} {1}".FormatCurrent(model.WeightValue.ToString("G29"), _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId).SystemKeyword) : ""; + model.Height = (product.Height > 0) ? "{0} {1}".FormatCurrent(product.Height.ToString("G29"), dimension) : ""; + model.Length = (product.Length > 0) ? "{0} {1}".FormatCurrent(product.Length.ToString("G29"), dimension) : ""; + model.Width = (product.Width > 0) ? "{0} {1}".FormatCurrent(product.Width.ToString("G29"), dimension) : ""; if (productBundleItem != null) { From 2c19c43491ad43d5cc5b2fe60e8623838b5df907 Mon Sep 17 00:00:00 2001 From: mgesing Date: Sat, 4 Jun 2022 10:40:53 +0200 Subject: [PATCH 22/43] Resolves #2241 Missing permission check at RegisteredCustomersDashboardReport --- .../Administration/Controllers/CustomerController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs index 8a3190a579..de3b8b4ea6 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs @@ -1403,6 +1403,7 @@ public void SetCustomerReportData(List reports, DateT /// Evaluates and displays customer registrations of this year as line chart /// /// Customers registrations chart + [Permission(Permissions.Customer.Read, false)] public ActionResult RegisteredCustomersDashboardReport() { // Get customers of at least last 28 days (if year is younger) From 0a96a70d9fc22f6954b78c470569fd3b01e65ae6 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Tue, 14 Jun 2022 21:22:21 +0200 Subject: [PATCH 23/43] Bugfix for vanished media setting allowedextrathumbnailsizes when saving media settings in admin area --- .../Administration/Controllers/SettingController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs index 724cd4774c..348079b7e2 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs @@ -913,7 +913,7 @@ public ActionResult Media(MediaSettings mediaSettings) [Permission(Permissions.Configuration.Setting.Update)] [ValidateAntiForgeryToken] [HttpPost, FormValueRequired("save")] - [SaveSetting(UpdateParameterFromStore = false)] + [SaveSetting] public ActionResult Media(MediaSettings settings, MediaSettingsModel model) { if (!ModelState.IsValid) @@ -922,7 +922,7 @@ public ActionResult Media(MediaSettings settings, MediaSettingsModel model) } ModelState.Clear(); - settings = model.ToEntity(); + model.ToEntity(settings); return NotifyAndRedirect("Media"); } From 428a0d9132b465a41c2fa3e92955e3d193a3017d Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Thu, 30 Jun 2022 20:23:01 +0200 Subject: [PATCH 24/43] Fixed problem for offcancas cart where the body element shifts over the whole page and nothing can be seen or clicked anymore. --- .../SmartStore.Web/Scripts/public.offcanvas-cart.js | 5 +++++ .../SmartStore.Web/Themes/Flex/Content/_misc.scss | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/Presentation/SmartStore.Web/Scripts/public.offcanvas-cart.js b/src/Presentation/SmartStore.Web/Scripts/public.offcanvas-cart.js index 5456f933b8..5dfe90fbc3 100644 --- a/src/Presentation/SmartStore.Web/Scripts/public.offcanvas-cart.js +++ b/src/Presentation/SmartStore.Web/Scripts/public.offcanvas-cart.js @@ -396,6 +396,11 @@ var ShopBar = (function ($) { cnt.find('.offcanvas-cart-footer').remove(); cnt.find('.offcanvas-cart-external-checkout').remove(); cnt.prepend(data); + + // INFO: Hack to force redrawing for edge on androids. Else the body element shifts over the whole page and nothing can be seen or clicked anymore. + if (Modernizr.touchevents && /Edg/.test(navigator.userAgent)) { + $('#footer').toggleClass('force-redraw'); + } }, complete: function (jqXHR, textStatus) { tool.removeClass("loading").addClass("loaded"); diff --git a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss index c852650d6a..0a78aee148 100644 --- a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss +++ b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss @@ -160,6 +160,11 @@ display: -webkit-box !important; display: -ms-flexbox !important; } + +.force-redraw::before { + content: "" +} + // // Vars // ------------------------------------------------- From 62677b4739520b5eafebf0b58850670ed2849110 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Thu, 30 Jun 2022 20:26:24 +0200 Subject: [PATCH 25/43] Fixed VS autocomplete error --- src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss index 0a78aee148..c2513fffaa 100644 --- a/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss +++ b/src/Presentation/SmartStore.Web/Themes/Flex/Content/_misc.scss @@ -161,7 +161,7 @@ display: -ms-flexbox !important; } -.force-redraw::before { +.force-redraw:before { content: "" } From fdc4ac3dd3f5fe150fee6fd6b404f45d5138c476 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Tue, 12 Jul 2022 23:49:06 +0200 Subject: [PATCH 26/43] Updated some base library packages --- .../SmartStore.Core/SmartStore.Core.csproj | 16 +- src/Libraries/SmartStore.Core/app.config | 12 ++ src/Libraries/SmartStore.Core/packages.config | 8 +- .../SmartStore.Data/SmartStore.Data.csproj | 16 +- src/Libraries/SmartStore.Data/app.config | 12 ++ src/Libraries/SmartStore.Data/packages.config | 8 +- .../SmartStore.Services.csproj | 18 +- src/Libraries/SmartStore.Services/app.config | 14 +- .../SmartStore.Services/packages.config | 8 +- .../SmartStore.AmazonPay.csproj | 20 +-- .../SmartStore.AmazonPay/packages.config | 8 +- src/Plugins/SmartStore.AmazonPay/web.config | 26 ++- .../SmartStore.Clickatell.csproj | 5 +- .../SmartStore.Clickatell/packages.config | 2 +- src/Plugins/SmartStore.Clickatell/web.config | 160 +++++++++-------- .../SmartStore.DevTools.csproj | 39 ++-- src/Plugins/SmartStore.DevTools/Web.config | 34 +++- .../SmartStore.DevTools/packages.config | 15 +- .../SmartStore.FacebookAuth.csproj | 20 +-- .../SmartStore.FacebookAuth/packages.config | 8 +- .../SmartStore.FacebookAuth/web.config | 168 ++++++++++-------- .../SmartStore.GoogleAnalytics/web.config | 160 +++++++++-------- .../SmartStore.GoogleMerchantCenter.csproj | 20 +-- .../packages.config | 8 +- .../web.config | 160 +++++++++-------- .../SmartStore.OfflinePayment.csproj | 20 +-- .../SmartStore.OfflinePayment/packages.config | 8 +- .../SmartStore.OfflinePayment/web.config | 160 +++++++++-------- .../SmartStore.PayPal.csproj | 20 +-- src/Plugins/SmartStore.PayPal/packages.config | 8 +- src/Plugins/SmartStore.PayPal/web.config | 26 ++- .../SmartStore.Shipping.csproj | 15 +- .../SmartStore.Shipping/packages.config | 6 +- src/Plugins/SmartStore.Shipping/web.config | 160 +++++++++-------- .../SmartStore.ShippingByWeight.csproj | 15 +- .../packages.config | 6 +- .../SmartStore.ShippingByWeight/web.config | 160 +++++++++-------- .../SmartStore.Tax/SmartStore.Tax.csproj | 20 +-- src/Plugins/SmartStore.Tax/packages.config | 8 +- src/Plugins/SmartStore.Tax/web.config | 160 +++++++++-------- .../SmartStore.WebApi.csproj | 20 +-- src/Plugins/SmartStore.WebApi/packages.config | 8 +- src/Plugins/SmartStore.WebApi/web.config | 22 ++- .../SmartStore.Web.Framework.csproj | 20 +-- .../SmartStore.Web.Framework/app.config | 18 +- .../SmartStore.Web.Framework/packages.config | 10 +- .../Administration/SmartStore.Admin.csproj | 16 +- .../SmartStore.Web/Administration/Web.config | 18 +- .../Administration/packages.config | 8 +- .../SmartStore.Web/SmartStore.Web.csproj | 41 +++-- src/Presentation/SmartStore.Web/Web.config | 24 ++- .../SmartStore.Web/packages.config | 18 +- src/Tests/SmartStore.Core.Tests/App.config | 14 +- .../SmartStore.Core.Tests.csproj | 16 +- .../SmartStore.Core.Tests/packages.config | 8 +- src/Tests/SmartStore.Data.Tests/App.config | 14 +- .../SmartStore.Services.Tests/App.config | 14 +- src/Tests/SmartStore.Tests/App.config | 14 +- .../SmartStore.Tests/SmartStore.Tests.csproj | 12 +- src/Tests/SmartStore.Tests/packages.config | 6 +- src/Tests/SmartStore.Web.MVC.Tests/App.config | 22 ++- src/Tools/SmartStore.Packager/App.config | 12 ++ .../SmartStore.WebApi.Client.csproj | 4 +- .../SmartStore.WebApi.Client/packages.config | 2 +- 64 files changed, 1248 insertions(+), 870 deletions(-) diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index f2738cabc8..cd84ae4268 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -86,8 +86,8 @@ ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll True - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll True @@ -96,8 +96,8 @@ ..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll @@ -118,13 +118,13 @@ - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/src/Libraries/SmartStore.Core/app.config b/src/Libraries/SmartStore.Core/app.config index 9657a5deb1..67916a0819 100644 --- a/src/Libraries/SmartStore.Core/app.config +++ b/src/Libraries/SmartStore.Core/app.config @@ -14,6 +14,18 @@ + + + + + + + + + + + + diff --git a/src/Libraries/SmartStore.Core/packages.config b/src/Libraries/SmartStore.Core/packages.config index 0c8d7ea5ba..efb4850fdf 100644 --- a/src/Libraries/SmartStore.Core/packages.config +++ b/src/Libraries/SmartStore.Core/packages.config @@ -9,13 +9,13 @@ - + - + - - + + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index 928105317a..fb594ed6a4 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -82,8 +82,8 @@ ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll True - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll True @@ -97,8 +97,8 @@ True ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Smo.dll - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -108,11 +108,11 @@ True ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/src/Libraries/SmartStore.Data/app.config b/src/Libraries/SmartStore.Data/app.config index 68a1994474..a625161735 100644 --- a/src/Libraries/SmartStore.Data/app.config +++ b/src/Libraries/SmartStore.Data/app.config @@ -14,6 +14,18 @@ + + + + + + + + + + + + diff --git a/src/Libraries/SmartStore.Data/packages.config b/src/Libraries/SmartStore.Data/packages.config index d2fafe90f4..bc852168b3 100644 --- a/src/Libraries/SmartStore.Data/packages.config +++ b/src/Libraries/SmartStore.Data/packages.config @@ -3,10 +3,10 @@ - + - - - + + + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 072564b9fb..377945466a 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -104,8 +104,8 @@ ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -119,8 +119,8 @@ ..\..\packages\ncrontab.3.3.0\lib\net35\NCrontab.dll True - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\packages\NReco.PdfGenerator.1.2.0\lib\net45\NReco.PdfGenerator.dll @@ -144,14 +144,14 @@ ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/src/Libraries/SmartStore.Services/app.config b/src/Libraries/SmartStore.Services/app.config index 252642d5ed..446c32df9a 100644 --- a/src/Libraries/SmartStore.Services/app.config +++ b/src/Libraries/SmartStore.Services/app.config @@ -34,7 +34,19 @@ - + + + + + + + + + + + + + diff --git a/src/Libraries/SmartStore.Services/packages.config b/src/Libraries/SmartStore.Services/packages.config index 79508508e8..4046ac6a7f 100644 --- a/src/Libraries/SmartStore.Services/packages.config +++ b/src/Libraries/SmartStore.Services/packages.config @@ -14,17 +14,17 @@ - + - + - - + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj index aa30c693c3..90e38591eb 100644 --- a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj +++ b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj @@ -93,9 +93,8 @@ ..\..\packages\Common.Logging.2.0.0\lib\2.0\Common.Logging.dll True - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -105,22 +104,19 @@ ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - False + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - False + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/src/Plugins/SmartStore.AmazonPay/packages.config b/src/Plugins/SmartStore.AmazonPay/packages.config index 36f4b6da90..bfadbe9d06 100644 --- a/src/Plugins/SmartStore.AmazonPay/packages.config +++ b/src/Plugins/SmartStore.AmazonPay/packages.config @@ -7,10 +7,10 @@ - + - - - + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.AmazonPay/web.config b/src/Plugins/SmartStore.AmazonPay/web.config index 46a5771064..e3e561e6ca 100644 --- a/src/Plugins/SmartStore.AmazonPay/web.config +++ b/src/Plugins/SmartStore.AmazonPay/web.config @@ -62,7 +62,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -160,6 +160,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -167,4 +187,4 @@ - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj index 6913511e9e..a7ccb144e0 100644 --- a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj +++ b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj @@ -93,9 +93,8 @@ ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/src/Plugins/SmartStore.Clickatell/packages.config b/src/Plugins/SmartStore.Clickatell/packages.config index 362bbd54e5..0470997544 100644 --- a/src/Plugins/SmartStore.Clickatell/packages.config +++ b/src/Plugins/SmartStore.Clickatell/packages.config @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/src/Plugins/SmartStore.Clickatell/web.config b/src/Plugins/SmartStore.Clickatell/web.config index 1ae1189cd0..06bf37d3c2 100644 --- a/src/Plugins/SmartStore.Clickatell/web.config +++ b/src/Plugins/SmartStore.Clickatell/web.config @@ -1,9 +1,9 @@ - + - - + + - - + + - - + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + - + - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj index 752242a26f..b392fe891f 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -93,9 +93,8 @@ ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll False - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - False + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -105,21 +104,18 @@ ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - False + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - False + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/src/Plugins/SmartStore.OfflinePayment/packages.config b/src/Plugins/SmartStore.OfflinePayment/packages.config index d772d4d4ca..1e0b785b88 100644 --- a/src/Plugins/SmartStore.OfflinePayment/packages.config +++ b/src/Plugins/SmartStore.OfflinePayment/packages.config @@ -5,10 +5,10 @@ - + - - - + + + \ No newline at end of file diff --git a/src/Plugins/SmartStore.OfflinePayment/web.config b/src/Plugins/SmartStore.OfflinePayment/web.config index 1ae1189cd0..06bf37d3c2 100644 --- a/src/Plugins/SmartStore.OfflinePayment/web.config +++ b/src/Plugins/SmartStore.OfflinePayment/web.config @@ -1,9 +1,9 @@ - + - - + + - - + +