diff --git a/Setup/aspnet_identity.sql b/Setup/aspnet_identity.sql index 81e53056..0ed6ef3b 100644 --- a/Setup/aspnet_identity.sql +++ b/Setup/aspnet_identity.sql @@ -127,7 +127,7 @@ CREATE PROCEDURE AddUserAccount AS BEGIN DECLARE @UserId AS UNIQUEIDENTIFIER = NEWID(); - INSERT INTO AspNetUsers (ID, email, EmailConfirmed, PasswordHash, SecurityStamp, UserName, LockoutEnabled, AccessFailedCount, PhoneNumberConfirmed, TwoFactorEnabled, NewsLetter, CreationDate, IsApproved, IsLockedOut) + INSERT INTO AspNetUsers (Id, Email, EmailConfirmed, PasswordHash, SecurityStamp, UserName, LockoutEnabled, AccessFailedCount, PhoneNumberConfirmed, TwoFactorEnabled, NewsLetter, CreationDate, IsApproved, IsLockedOut) VALUES (@UserId, @Email, 0, 'AAwsxpbbay95Ig5UUtJfqrz5QQZDWbbJShgza2BVP9sZAEaDvoC+UZ6HP1ER3b94FQ==', '989acc4f-30bd-425d-9b20-7c7f85bee15b', @Email, 0, 0, 0, 0, 0, GETDATE(), 1, 0); INSERT INTO AspNetUserRoles (RoleId, UserId) VALUES (@RoleId, @UserId); END diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs index 4cf730da..70a197d7 100644 --- a/Sources/AssemblyVersionAuto.cs +++ b/Sources/AssemblyVersionAuto.cs @@ -2,7 +2,7 @@ -[assembly: AssemblyCopyright("Copyright ? 2019 Episerver")] -[assembly: AssemblyVersion("13.14.0.0")] -[assembly: AssemblyInformationalVersion("13.14.0")] -[assembly: AssemblyFileVersion("13.14.0.3896")] +[assembly: AssemblyCopyright("Copyright ? 2020 Episerver")] +[assembly: AssemblyVersion("13.15.0.0")] +[assembly: AssemblyInformationalVersion("13.15.0")] +[assembly: AssemblyFileVersion("13.15.0.3942")] 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 752cf2cc..3c4b100b 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj +++ b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj @@ -407,109 +407,109 @@ - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Commerce.Reporting.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Commerce.Reporting.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.CommerceManager.13.14.0\lib\net461\Mediachase.ConsoleManager.dll + ..\..\packages\EPiServer.CommerceManager.13.15.0\lib\net461\Mediachase.ConsoleManager.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.13.14.0\lib\net461\ComponentArt.Web.UI.dll + ..\..\packages\EPiServer.CommerceManager.13.15.0\lib\net461\ComponentArt.Web.UI.dll True - ..\..\packages\EPiServer.CommerceManager.13.14.0\lib\net461\RssToolkit.dll + ..\..\packages\EPiServer.CommerceManager.13.15.0\lib\net461\RssToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.13.14.0\lib\net461\Validators.dll + ..\..\packages\EPiServer.CommerceManager.13.15.0\lib\net461\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 7fb19d87..a9a3334e 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/packages.config @@ -45,6 +45,6 @@ - - + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/web.config b/Sources/EPiServer.Reference.Commerce.Manager/web.config index 3d4c821f..0acd24f1 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/web.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/web.config @@ -540,79 +540,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 930326da..372d8d42 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj +++ b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj @@ -267,79 +267,79 @@ --> - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Shared/packages.config b/Sources/EPiServer.Reference.Commerce.Shared/packages.config index 5b1fa5b9..d4f7947c 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Shared/packages.config @@ -39,5 +39,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 b0336a51..7f74fd54 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 @@ -397,91 +397,91 @@ --> - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Commerce.Reporting.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Commerce.Reporting.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Tracking.Commerce.3.2.6\lib\net461\EPiServer.Tracking.Commerce.dll + ..\..\packages\EPiServer.Tracking.Commerce.3.2.8\lib\net461\EPiServer.Tracking.Commerce.dll True - ..\..\packages\EPiServer.Personalization.Commerce.3.2.6\lib\net461\EPiServer.Personalization.Commerce.dll + ..\..\packages\EPiServer.Personalization.Commerce.3.2.8\lib\net461\EPiServer.Personalization.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config index 840aeeb2..866fb024 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config @@ -55,7 +55,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 fd23b1cc..bd3c0b09 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj +++ b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj @@ -1030,107 +1030,107 @@ - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.UI.13.14.0\lib\net461\EPiServer.Commerce.Shell.dll + ..\..\packages\EPiServer.Commerce.UI.13.15.0\lib\net461\EPiServer.Commerce.Shell.dll True - ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.13.14.0\lib\net461\EPiServer.Commerce.Shell.ManagerIntegration.dll + ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.13.15.0\lib\net461\EPiServer.Commerce.Shell.ManagerIntegration.dll True - ..\..\packages\EPiServer.Commerce.UI.13.14.0\lib\net461\EPiServer.Commerce.UI.dll + ..\..\packages\EPiServer.Commerce.UI.13.15.0\lib\net461\EPiServer.Commerce.UI.dll True - ..\..\packages\EPiServer.Commerce.UI.CustomerService.13.14.0\lib\net461\EPiServer.Commerce.UI.CustomerService.dll + ..\..\packages\EPiServer.Commerce.UI.CustomerService.13.15.0\lib\net461\EPiServer.Commerce.UI.CustomerService.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\EPiServer.Commerce.Reporting.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\EPiServer.Commerce.Reporting.dll True - ..\..\packages\EPiServer.Tracking.Commerce.3.2.6\lib\net461\EPiServer.Tracking.Commerce.dll + ..\..\packages\EPiServer.Tracking.Commerce.3.2.8\lib\net461\EPiServer.Tracking.Commerce.dll True - ..\..\packages\EPiServer.Personalization.Commerce.3.2.6\lib\net461\EPiServer.Personalization.Commerce.dll + ..\..\packages\EPiServer.Personalization.Commerce.3.2.8\lib\net461\EPiServer.Personalization.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.14.0\lib\net461\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.13.15.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/Bundle/Index.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/Bundle/Index.cshtml index 5bd7573b..db0fbc70 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Views/Bundle/Index.cshtml +++ b/Sources/EPiServer.Reference.Commerce.Site/Views/Bundle/Index.cshtml @@ -90,10 +90,12 @@ var refCode = '@Model.Bundle.Code'; var productName = '@Model.Bundle.Name'; var productTrackingData = TrackingDataFactory.createProductTrackingData(refCode, productName); - var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]')? '0': '@Request.QueryString["recommendationId"]'); + + var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]') ? '0' : '@Request.QueryString["recommendationId"]'); if (recommendationId > 0) { productTrackingData["recommendationId"] = recommendationId; } + productTrackingData["customAttributes"] = { 'marketId': Market.getSelectedMarketId() }; epiRecommendations.track(productTrackingData, null, 'web', Recommendations.render, { sectionMappings: [{ area: "productAlternativesWidget", selector: ".recommendations-right", numberOfItemsToRender: 2 }, { area: "productCrossSellsWidget", selector: ".recommendations-bottom" }] }); diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/Bundle/_Quickview.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/Bundle/_Quickview.cshtml index 23abacee..8b9c97dd 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Views/Bundle/_Quickview.cshtml +++ b/Sources/EPiServer.Reference.Commerce.Site/Views/Bundle/_Quickview.cshtml @@ -52,6 +52,11 @@ var productName = '@Model.Bundle.Name'; var productTrackingData = TrackingDataFactory.createProductTrackingData(refCode, productName); + var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]') ? '0' : '@Request.QueryString["recommendationId"]'); + if (recommendationId > 0) { + productTrackingData["recommendationId"] = recommendationId; + } + productTrackingData["SkipRecommendations"] = true; productTrackingData["customAttributes"] = { 'marketId': Market.getSelectedMarketId() }; diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/Package/Index.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/Package/Index.cshtml index 41e53572..eba67720 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Views/Package/Index.cshtml +++ b/Sources/EPiServer.Reference.Commerce.Site/Views/Package/Index.cshtml @@ -111,10 +111,12 @@ var refCode = '@Model.Package.Code'; var productName = '@Model.Package.Name'; var productTrackingData = TrackingDataFactory.createProductTrackingData(refCode, productName); - var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]')? '0': '@Request.QueryString["recommendationId"]'); + + var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]') ? '0' : '@Request.QueryString["recommendationId"]'); if (recommendationId > 0) { productTrackingData["recommendationId"] = recommendationId; } + productTrackingData["customAttributes"] = { 'marketId': Market.getSelectedMarketId() }; epiRecommendations.track(productTrackingData, null, 'web', Recommendations.render, { sectionMappings: [{ area: "productAlternativesWidget", selector: ".recommendations-right", numberOfItemsToRender: 2 }, { area: "productCrossSellsWidget", selector: ".recommendations-bottom" }] }); diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/Package/_Quickview.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/Package/_Quickview.cshtml index 2a976e14..4234fffc 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Views/Package/_Quickview.cshtml +++ b/Sources/EPiServer.Reference.Commerce.Site/Views/Package/_Quickview.cshtml @@ -65,7 +65,12 @@ var refCode = '@Model.Package.Code'; var productName = '@Model.Package.Name'; var productTrackingData = TrackingDataFactory.createProductTrackingData(refCode, productName); - + + var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]') ? '0' : '@Request.QueryString["recommendationId"]'); + if (recommendationId > 0) { + productTrackingData["recommendationId"] = recommendationId; + } + productTrackingData["SkipRecommendations"] = true; productTrackingData["customAttributes"] = { 'marketId': Market.getSelectedMarketId() }; diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/Product/Index.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/Product/Index.cshtml index 717ab170..bf203a50 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Views/Product/Index.cshtml +++ b/Sources/EPiServer.Reference.Commerce.Site/Views/Product/Index.cshtml @@ -132,10 +132,12 @@ var refCode = '@Model.Product.Code'; var productName = '@Model.Product.Name'; var productTrackingData = TrackingDataFactory.createProductTrackingData(refCode, productName); - var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]')? '0': '@Request.QueryString["recommendationId"]'); + + var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]') ? '0' : '@Request.QueryString["recommendationId"]'); if (recommendationId > 0) { productTrackingData["recommendationId"] = recommendationId; } + productTrackingData["customAttributes"] = { 'marketId': Market.getSelectedMarketId() }; epiRecommendations.track(productTrackingData, null, 'web', Recommendations.render, { sectionMappings: [{ area: "productAlternativesWidget", selector: ".recommendations-right", numberOfItemsToRender: 3 }, { area: "productCrossSellsWidget", selector: ".recommendations-bottom" }] }) diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/Product/_Quickview.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/Product/_Quickview.cshtml index 177ec740..2b1a4a12 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Views/Product/_Quickview.cshtml +++ b/Sources/EPiServer.Reference.Commerce.Site/Views/Product/_Quickview.cshtml @@ -79,11 +79,13 @@ var refCode = '@Model.Product.Code'; var productName = '@Model.Product.Name'; var productTrackingData = TrackingDataFactory.createProductTrackingData(refCode, productName); - productTrackingData["SkipRecommendations"] = true; - var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]')? '0': '@Request.QueryString["recommendationId"]'); + + var recommendationId = parseInt(isNaN('@Request.QueryString["recommendationId"]') ? '0' : '@Request.QueryString["recommendationId"]'); if (recommendationId > 0) { productTrackingData["recommendationId"] = recommendationId; } + + productTrackingData["SkipRecommendations"] = true; productTrackingData["customAttributes"] = { 'marketId': Market.getSelectedMarketId() }; epiRecommendations.track(productTrackingData); diff --git a/Sources/EPiServer.Reference.Commerce.Site/Web.config b/Sources/EPiServer.Reference.Commerce.Site/Web.config index 71f0221a..38f1e818 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Web.config +++ b/Sources/EPiServer.Reference.Commerce.Site/Web.config @@ -229,15 +229,15 @@ - + - + - + @@ -253,95 +253,95 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip index 2127d7d4..602d97c9 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip index e91e3e20..a528df62 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip index 87c364f2..64134812 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.UI.CustomerService/EPiServer.Commerce.UI.CustomerService.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.UI.CustomerService/EPiServer.Commerce.UI.CustomerService.zip index 272d969a..734dbd52 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.UI.CustomerService/EPiServer.Commerce.UI.CustomerService.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.UI.CustomerService/EPiServer.Commerce.UI.CustomerService.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/packages.config b/Sources/EPiServer.Reference.Commerce.Site/packages.config index 394394e6..97de2f15 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site/packages.config @@ -74,11 +74,11 @@ - - - - - - - + + + + + + +