From 5023988990b56662d617c01d4312e821793faf7f Mon Sep 17 00:00:00 2001 From: Per Gunsarfs Date: Tue, 28 Mar 2017 09:31:57 +0200 Subject: [PATCH] Quicksilver release version 10.4.3 --- Sources/AssemblyVersionAuto.cs | 6 +- .../CommerceManager.sv.resx | 14 ++--- .../Order/OrderStrings.sv.resx | 2 +- .../App_GlobalResources/SharedStrings.sv.resx | 2 +- .../Apps/Web.config | 2 +- ...PiServer.Reference.Commerce.Manager.csproj | 56 +++++++++--------- .../packages.config | 4 +- .../web.config | 36 +++++------ ...EPiServer.Reference.Commerce.Shared.csproj | 40 ++++++------- .../packages.config | 2 +- ...erver.Reference.Commerce.Site.Tests.csproj | 44 +++++++------- .../Cart/Controllers/CartControllerTests.cs | 2 +- .../Controllers/WishListControllerTests.cs | 2 +- .../Cart/Services/CartServiceTests.cs | 28 +++++++++ .../CartViewModelFactoryTests.cs | 34 +++++++++-- .../Controllers/ProductControllerTests.cs | 2 +- .../packages.config | 6 +- .../EPiServer.Reference.Commerce.Site.csproj | 50 ++++++++-------- .../Features/Cart/Services/CartService.cs | 7 ++- .../CartViewModelFactory.cs | 29 +++++---- .../ShipmentViewModelFactory.cs | 7 ++- .../Product/Controllers/ProductController.cs | 2 +- .../CatalogEntryViewModelFactory.cs | 4 +- .../Views/Navigation/Index.cshtml | 2 +- .../Web.config | 44 +++++++------- .../modules/_protected/Commerce/Commerce.zip | Bin 67389 -> 67389 bytes ...rver.Commerce.Shell.ManagerIntegration.zip | Bin 2756 -> 2756 bytes .../EPiServer.Commerce.Shell.zip | Bin 535825 -> 535954 bytes .../packages.config | 12 ++-- 29 files changed, 252 insertions(+), 187 deletions(-) diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs index 9e0bc88d..582ac496 100644 --- a/Sources/AssemblyVersionAuto.cs +++ b/Sources/AssemblyVersionAuto.cs @@ -2,6 +2,6 @@ -[assembly: AssemblyVersion("10.4.2.0")] -[assembly: AssemblyInformationalVersion("10.4.2")] -[assembly: AssemblyFileVersion("10.4.2.2273")] +[assembly: AssemblyVersion("10.4.3.0")] +[assembly: AssemblyInformationalVersion("10.4.3")] +[assembly: AssemblyFileVersion("10.4.3.2285")] diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/CommerceManager.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/CommerceManager.sv.resx index 96dd9704..7aecc952 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/CommerceManager.sv.resx +++ b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/CommerceManager.sv.resx @@ -2236,7 +2236,7 @@ lägg till/redigera klasser - Beställning + Sortering Rabatt @@ -2980,7 +2980,7 @@ System'Namn' får inte lämnas tomt. - Beställning + Sortering Visa för kund som alternativ @@ -4147,7 +4147,7 @@ lägg till/redigera klasser - Beställning + Sortering Mall för virtuell sida @@ -4723,7 +4723,7 @@ Namn - Beställning + Sortering Pris @@ -5104,7 +5104,7 @@ Felaktigt pris - Beställning + Sortering Är skattepliktig @@ -6022,7 +6022,7 @@ Beskrivning - Beställning + Sortering Alternativ @@ -6034,7 +6034,7 @@ Beskrivning - Beställning + Sortering Category diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx index f47d25cc..51fbaf96 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx +++ b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx @@ -535,7 +535,7 @@ OrderGroupAddressId - Beställning + Sortering Eget namn diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.sv.resx index fb1bb141..ed9aad42 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.sv.resx +++ b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.sv.resx @@ -949,7 +949,7 @@ Ny leverans - Beställning + Sortering konfigurerade betalningsmetoder, vilka normalt motsvarar betalningsprocessorer diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Web.config b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Web.config index 74b44d54..20c254d6 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Web.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Web.config @@ -8,7 +8,7 @@ --> - + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj index b0c77b9f..bc74161e 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj +++ b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj @@ -431,109 +431,109 @@ - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\Mediachase.ConsoleManager.dll + ..\..\packages\EPiServer.CommerceManager.10.4.3\lib\net45\Mediachase.ConsoleManager.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\ComponentArt.Web.UI.dll + ..\..\packages\EPiServer.CommerceManager.10.4.3\lib\net45\ComponentArt.Web.UI.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\nsoftware.IBizPay.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\nsoftware.IBizPay.dll True - ..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\RssToolkit.dll + ..\..\packages\EPiServer.CommerceManager.10.4.3\lib\net45\RssToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\Validators.dll + ..\..\packages\EPiServer.CommerceManager.10.4.3\lib\net45\Validators.dll True - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/packages.config b/Sources/EPiServer.Reference.Commerce.Manager/packages.config index 611844d9..70ff0095 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/packages.config @@ -32,6 +32,6 @@ - - + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/web.config b/Sources/EPiServer.Reference.Commerce.Manager/web.config index 8720bb24..37e94bd6 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/web.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/web.config @@ -550,75 +550,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj index ff213052..fb6ac82b 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj +++ b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj @@ -290,83 +290,83 @@ --> - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\nsoftware.IBizPay.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\nsoftware.IBizPay.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Shared/packages.config b/Sources/EPiServer.Reference.Commerce.Shared/packages.config index e201293d..9588e81c 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Shared/packages.config @@ -30,5 +30,5 @@ - + diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj b/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj index 57b2ea91..9ea79a68 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj @@ -411,91 +411,91 @@ --> - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Recommendations.1.1.0\lib\net45\EPiServer.Recommendations.dll + ..\..\packages\EPiServer.Recommendations.1.1.1\lib\net45\EPiServer.Recommendations.dll True - ..\..\packages\EPiServer.Recommendations.Commerce.10.4.2\lib\net45\EPiServer.Recommendations.Commerce.dll + ..\..\packages\EPiServer.Recommendations.Commerce.10.4.3\lib\net45\EPiServer.Recommendations.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\nsoftware.IBizPay.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\nsoftware.IBizPay.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Controllers/CartControllerTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Controllers/CartControllerTests.cs index 8dca2d1b..b795fc7a 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Controllers/CartControllerTests.cs +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Controllers/CartControllerTests.cs @@ -78,7 +78,7 @@ public void AddToCart_WhenFailedToAdd_ShouldNotSaveCart() public CartControllerTests() { _cartServiceMock = new Mock(); - _cartViewModelFactoryMock = new Mock(null, null, null, null); + _cartViewModelFactoryMock = new Mock(null, null, null, null, null); _orderRepositoryMock = new Mock(); _cartServiceMock .Setup(x => x.AddToCart(It.IsAny(), "Code 1", It.IsAny())) diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Controllers/WishListControllerTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Controllers/WishListControllerTests.cs index 1924813b..6f7d1c21 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Controllers/WishListControllerTests.cs +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Controllers/WishListControllerTests.cs @@ -88,7 +88,7 @@ public WishListControllerTests() { _marketMock = new Mock(); _cartServiceMock = new Mock(); - _cartViewModelFactoryMock = new Mock(null, null, null, null); + _cartViewModelFactoryMock = new Mock(null, null, null, null, null); _orderRepositoryMock = new Mock(); _contentLoaderMock = new Mock(); diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Services/CartServiceTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Services/CartServiceTests.cs index 8082a1d2..47d28dd6 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Services/CartServiceTests.cs +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/Services/CartServiceTests.cs @@ -259,6 +259,34 @@ public void ChangeCartItem_WhenQuantityIsZero_ShouldRemoveLineItem() Assert.Empty(_cart.GetAllLineItems()); } + [Fact] + public void ChangeCartItemForMultiShipment_WhenQuantityIsZeroInOneShipment_ShouldRemoveTheCorrespondantLineItem() + { + var quantity = 0; + var size = "small"; + var code = "EAN"; + var newSize = "small"; + var lineItem = new InMemoryLineItem + { + Quantity = 2, + Code = code + }; + + var removedLineItem = new InMemoryLineItem + { + Quantity = 3, + Code = code + }; + + _cart.GetFirstShipment().LineItems.Add(lineItem); + var shipment = new FakeShipment(); + shipment.LineItems.Add(removedLineItem); + _cart.AddShipment(shipment, _orderGroupFactoryMock.Object); + _subject.ChangeCartItem(_cart, shipment.ShipmentId, code, quantity, size, newSize); + + Assert.False(_cart.GetFirstForm().Shipments.Any(s => s.ShipmentId == shipment.ShipmentId && s.LineItems.Any(l => l.Code == code))); + } + [Fact] public void ChangeCartItem_WhenLineItemToChangeToDoesNotExists_ShouldUpdateLineItem() { diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/ViewModelFactories/CartViewModelFactoryTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/ViewModelFactories/CartViewModelFactoryTests.cs index 06b5ae1c..16c41316 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/ViewModelFactories/CartViewModelFactoryTests.cs +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Cart/ViewModelFactories/CartViewModelFactoryTests.cs @@ -14,6 +14,7 @@ using System.Globalization; using System.Linq; using EPiServer.Globalization; +using Mediachase.Commerce.Catalog; using Xunit; namespace EPiServer.Reference.Commerce.Site.Tests.Features.Cart.ViewModelFactories @@ -36,6 +37,24 @@ public void CreateMiniCartViewModel_ShouldCreateViewModel() viewModel.ShouldBeEquivalentTo(expectedViewModel); } + [Fact] + public void CreateMiniCartViewModel_WhenItemIsDeleted_ShouldNotCountIt() + { + _cart.Forms.Single().Shipments.Single().LineItems.Add(new InMemoryLineItem { Code = "Deleted", Quantity = 1, PlacedPrice = 100 }); + _referenceConverterMock.Setup(c => c.GetContentLink(It.Is(code => code == "Deleted"))).Returns(ContentReference.EmptyReference); + var viewModel = _subject.CreateMiniCartViewModel(_cart); + + var expectedViewModel = new MiniCartViewModel + { + ItemCount = 1, + CheckoutPage = _startPage.CheckoutPage, + Shipments = new[] { new ShipmentViewModel { CartItems = _cartItems } }, + Total = _totals.SubTotal + }; + + viewModel.ShouldBeEquivalentTo(expectedViewModel); + } + [Fact] public void CreateMiniCartViewModel_WhenCartIsNull_ShouldCreateViewModel() { @@ -150,11 +169,12 @@ public void CreateWishListMiniCartViewModel_WhenCartIsNull_ShouldCreateViewModel private readonly ICart _cart; private readonly OrderGroupTotals _totals; private readonly Money _orderDiscountTotal; + private readonly Mock _referenceConverterMock; public CartViewModelFactoryTests() { _cart = new FakeCart(new MarketImpl(MarketId.Default), Currency.USD); - _cart.Forms.Single().Shipments.Single().LineItems.Add(new InMemoryLineItem { Quantity = 1, PlacedPrice = 105, LineItemDiscountAmount = 5}); + _cart.Forms.Single().Shipments.Single().LineItems.Add(new InMemoryLineItem { Quantity = 1, PlacedPrice = 105, LineItemDiscountAmount = 5 }); _startPage = new StartPage() { CheckoutPage = new ContentReference(1), WishListPage = new ContentReference(1) }; var contentLoaderMock = new Mock(); @@ -162,9 +182,12 @@ public CartViewModelFactoryTests() var languageResolverMock = new Mock(); languageResolverMock.Setup(x => x.GetPreferredCulture()).Returns(CultureInfo.InvariantCulture); - var shipmentViewModelFactoryMock = new Mock(null,null,null,null,null,null,languageResolverMock.Object); - _cartItems = new List {new CartItemViewModel {DiscountedPrice = new Money(100, Currency.USD), Quantity = 1} }; - shipmentViewModelFactoryMock.Setup(x => x.CreateShipmentsViewModel(It.IsAny())).Returns(() => new[] { new ShipmentViewModel {CartItems = _cartItems} }); + var shipmentViewModelFactoryMock = new Mock(null, null, null, null, null, null, languageResolverMock.Object); + _cartItems = new List { new CartItemViewModel { DiscountedPrice = new Money(100, Currency.USD), Quantity = 1 } }; + shipmentViewModelFactoryMock.Setup(x => x.CreateShipmentsViewModel(It.IsAny())).Returns(() => new[] { new ShipmentViewModel { CartItems = _cartItems } }); + + _referenceConverterMock = new Mock(null, null); + _referenceConverterMock.Setup(c => c.GetContentLink(It.IsAny())).Returns(new ContentReference(1)); var currencyServiceMock = new Mock(); currencyServiceMock.Setup(x => x.GetCurrentCurrency()).Returns(Currency.USD); @@ -188,7 +211,8 @@ public CartViewModelFactoryTests() contentLoaderMock.Object, currencyServiceMock.Object, orderGroupCalculatorMock.Object, - shipmentViewModelFactoryMock.Object); + shipmentViewModelFactoryMock.Object, + _referenceConverterMock.Object); } } } diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Product/Controllers/ProductControllerTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Product/Controllers/ProductControllerTests.cs index ad1d07ff..7da13e51 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Product/Controllers/ProductControllerTests.cs +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Product/Controllers/ProductControllerTests.cs @@ -66,7 +66,7 @@ public void SelectVariant_WhenFoundBySizeOrColor_ShouldReturnCorrectRouteValue() var result = CreateController().SelectVariant(new FashionProduct(), "red", "small"); - var selectedCode = ((RedirectToRouteResult)result).RouteValues["variantCode"] as string; + var selectedCode = ((RedirectToRouteResult)result).RouteValues["variationCode"] as string; Assert.Equal("redsmall", selectedCode); } diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config index 76b97398..6f183a1e 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config @@ -41,7 +41,7 @@ - - - + + + diff --git a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj index cb6d3dbb..0005ce3e 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj +++ b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj @@ -1007,103 +1007,103 @@ - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.UI.10.4.2\lib\net45\EPiServer.Commerce.Shell.dll + ..\..\packages\EPiServer.Commerce.UI.10.4.3\lib\net45\EPiServer.Commerce.Shell.dll True - ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.10.4.2\lib\net45\EPiServer.Commerce.Shell.ManagerIntegration.dll + ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.10.4.3\lib\net45\EPiServer.Commerce.Shell.ManagerIntegration.dll True - ..\..\packages\EPiServer.Commerce.UI.10.4.2\lib\net45\EPiServer.Commerce.UI.dll + ..\..\packages\EPiServer.Commerce.UI.10.4.3\lib\net45\EPiServer.Commerce.UI.dll True - ..\..\packages\EPiServer.Recommendations.1.1.0\lib\net45\EPiServer.Recommendations.dll + ..\..\packages\EPiServer.Recommendations.1.1.1\lib\net45\EPiServer.Recommendations.dll True - ..\..\packages\EPiServer.Recommendations.Commerce.10.4.2\lib\net45\EPiServer.Recommendations.Commerce.dll + ..\..\packages\EPiServer.Recommendations.Commerce.10.4.3\lib\net45\EPiServer.Recommendations.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\nsoftware.IBizPay.dll + ..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\nsoftware.IBizPay.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Services/CartService.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Services/CartService.cs index 6d205a6d..c0613371 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Services/CartService.cs +++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Services/CartService.cs @@ -319,7 +319,8 @@ public void RemoveCouponCode(ICart cart, string couponCode) private void RemoveLineItem(ICart cart, int shipmentId, string code) { - var shipment = cart.GetFirstForm().Shipments.First(s => s.ShipmentId == shipmentId || shipmentId <= 0); + //gets the shipment for shipment id or for wish list shipment id as a parameter is always equal zero( wish list). + var shipment = cart.GetFirstForm().Shipments.First(s => s.ShipmentId == shipmentId || shipmentId == 0); var lineItem = shipment.LineItems.FirstOrDefault(l => l.Code == code); if (lineItem != null) @@ -360,7 +361,7 @@ private void UpdateLineItemSku(ICart cart, int shipmentId, string oldCode, strin var newLineItem = GetFirstLineItem(cart, newCode); if (newLineItem != null) { - var shipment = cart.GetFirstForm().Shipments.First(s => s.ShipmentId == shipmentId || shipmentId <= 0); + var shipment = cart.GetFirstForm().Shipments.First(s => s.ShipmentId == shipmentId || shipmentId == 0); cart.UpdateLineItemQuantity(shipment, newLineItem, newLineItem.Quantity + quantity); } else @@ -385,7 +386,7 @@ private void ChangeQuantity(ICart cart, int shipmentId, string code, decimal qua { RemoveLineItem(cart, shipmentId, code); } - var shipment = cart.GetFirstForm().Shipments.First(s => s.ShipmentId == shipmentId || shipmentId <= 0); + var shipment = cart.GetFirstForm().Shipments.First(s => s.ShipmentId == shipmentId); var lineItem = shipment.LineItems.FirstOrDefault(x => x.Code == code); if (lineItem == null) { diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/ViewModelFactories/CartViewModelFactory.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/ViewModelFactories/CartViewModelFactory.cs index 6cacba31..c7f49fe7 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/ViewModelFactories/CartViewModelFactory.cs +++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/ViewModelFactories/CartViewModelFactory.cs @@ -6,27 +6,31 @@ using EPiServer.Reference.Commerce.Site.Features.Start.Pages; using EPiServer.ServiceLocation; using Mediachase.Commerce; +using Mediachase.Commerce.Catalog; namespace EPiServer.Reference.Commerce.Site.Features.Cart.ViewModelFactories { [ServiceConfiguration(typeof(CartViewModelFactory), Lifecycle = ServiceInstanceScope.Singleton)] - public class CartViewModelFactory + public class CartViewModelFactory { private readonly IContentLoader _contentLoader; private readonly ICurrencyService _currencyService; - readonly IOrderGroupCalculator _orderGroupCalculator; - readonly ShipmentViewModelFactory _shipmentViewModelFactory; + private readonly IOrderGroupCalculator _orderGroupCalculator; + private readonly ShipmentViewModelFactory _shipmentViewModelFactory; + private readonly ReferenceConverter _referenceConverter; public CartViewModelFactory( - IContentLoader contentLoader, - ICurrencyService currencyService, - IOrderGroupCalculator orderGroupCalculator, - ShipmentViewModelFactory shipmentViewModelFactory) + IContentLoader contentLoader, + ICurrencyService currencyService, + IOrderGroupCalculator orderGroupCalculator, + ShipmentViewModelFactory shipmentViewModelFactory, + ReferenceConverter referenceConverter) { _contentLoader = contentLoader; _currencyService = currencyService; _orderGroupCalculator = orderGroupCalculator; _shipmentViewModelFactory = shipmentViewModelFactory; + _referenceConverter = referenceConverter; } public virtual MiniCartViewModel CreateMiniCartViewModel(ICart cart) @@ -66,9 +70,9 @@ public virtual LargeCartViewModel CreateLargeCartViewModel(ICart cart) return new LargeCartViewModel { - Shipments = _shipmentViewModelFactory.CreateShipmentsViewModel(cart), - TotalDiscount = new Money(cart.GetAllLineItems().Sum(x => x.GetEntryDiscount()), cart.Currency), - Total = _orderGroupCalculator.GetSubTotal(cart) + Shipments = _shipmentViewModelFactory.CreateShipmentsViewModel(cart), + TotalDiscount = new Money(cart.GetAllLineItems().Sum(x => x.GetEntryDiscount()), cart.Currency), + Total = _orderGroupCalculator.GetSubTotal(cart) }; } @@ -116,7 +120,10 @@ public virtual WishListMiniCartViewModel CreateWishListMiniCartViewModel(ICart c private decimal GetLineItemsTotalQuantity(ICart cart) { - return cart.GetAllLineItems().Sum(x => x.Quantity); + var cartItems = cart + .GetAllLineItems() + .Where(c => !ContentReference.IsNullOrEmpty(_referenceConverter.GetContentLink(c.Code))); + return cartItems.Sum(x => x.Quantity); } } } \ No newline at end of file diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/ViewModelFactories/ShipmentViewModelFactory.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/ViewModelFactories/ShipmentViewModelFactory.cs index d1764ac6..45ffd0f7 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/ViewModelFactories/ShipmentViewModelFactory.cs +++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/ViewModelFactories/ShipmentViewModelFactory.cs @@ -67,7 +67,12 @@ public virtual IEnumerable CreateShipmentsViewModel(ICart car foreach (var lineItem in shipment.LineItems) { - var entry = entries.Single(x => x.Code == lineItem.Code); + var entry = entries.FirstOrDefault(x => x.Code == lineItem.Code); + if (entry == null) + { + //Entry was deleted, skip processing. + continue; + } shipmentModel.CartItems.Add(_cartItemViewModelFactory.CreateCartItemViewModel(cart, lineItem, entry)); } diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/ProductController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/ProductController.cs index 17abcb17..d50c019b 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/ProductController.cs +++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/ProductController.cs @@ -54,7 +54,7 @@ public ActionResult SelectVariant(FashionProduct currentContent, string color, s var variant = _viewModelFactory.SelectVariant(currentContent, color, size); if (variant != null) { - return RedirectToAction("Index", new { variantCode = variant.Code, useQuickview = useQuickview }); + return RedirectToAction("Index", new { variationCode = variant.Code, useQuickview = useQuickview }); } return HttpNotFound(); diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/ViewModelFactories/CatalogEntryViewModelFactory.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/ViewModelFactories/CatalogEntryViewModelFactory.cs index dd600c4d..5a93b7d3 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/ViewModelFactories/CatalogEntryViewModelFactory.cs +++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/ViewModelFactories/CatalogEntryViewModelFactory.cs @@ -59,12 +59,12 @@ public CatalogEntryViewModelFactory( _languageResolver = languageResolver; } - public virtual FashionProductViewModel Create(FashionProduct currentContent, string variantCode) + public virtual FashionProductViewModel Create(FashionProduct currentContent, string variationCode) { var variants = GetVariants(currentContent).ToList(); FashionVariant variant; - if (!TryGetFashionVariant(variants, variantCode, out variant)) + if (!TryGetFashionVariant(variants, variationCode, out variant)) { return new FashionProductViewModel { diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/Navigation/Index.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/Navigation/Index.cshtml index b7d0c0d1..f6c33814 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Views/Navigation/Index.cshtml +++ b/Sources/EPiServer.Reference.Commerce.Site/Views/Navigation/Index.cshtml @@ -39,7 +39,7 @@
- +