diff --git a/Directory.Build.props b/Directory.Build.props index e7dd620d..293ff3bf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 3.29.0 + 3.30.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.MarketingModule.Core/VirtoCommerce.MarketingModule.Core.csproj b/src/VirtoCommerce.MarketingModule.Core/VirtoCommerce.MarketingModule.Core.csproj index cb8b4c7b..6f11f253 100644 --- a/src/VirtoCommerce.MarketingModule.Core/VirtoCommerce.MarketingModule.Core.csproj +++ b/src/VirtoCommerce.MarketingModule.Core/VirtoCommerce.MarketingModule.Core.csproj @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/src/VirtoCommerce.MarketingModule.Data/VirtoCommerce.MarketingModule.Data.csproj b/src/VirtoCommerce.MarketingModule.Data/VirtoCommerce.MarketingModule.Data.csproj index cb4d79d6..219f8ff7 100644 --- a/src/VirtoCommerce.MarketingModule.Data/VirtoCommerce.MarketingModule.Data.csproj +++ b/src/VirtoCommerce.MarketingModule.Data/VirtoCommerce.MarketingModule.Data.csproj @@ -30,8 +30,8 @@ - - + + diff --git a/src/VirtoCommerce.MarketingModule.Web/Controllers/Api/MarketingModulePromotionController.cs b/src/VirtoCommerce.MarketingModule.Web/Controllers/Api/MarketingModulePromotionController.cs index 863880c8..d2718e48 100644 --- a/src/VirtoCommerce.MarketingModule.Web/Controllers/Api/MarketingModulePromotionController.cs +++ b/src/VirtoCommerce.MarketingModule.Web/Controllers/Api/MarketingModulePromotionController.cs @@ -15,7 +15,7 @@ using VirtoCommerce.MarketingModule.Data.Authorization; using VirtoCommerce.MarketingModule.Data.Repositories; using VirtoCommerce.MarketingModule.Web.ExportImport; -using VirtoCommerce.Platform.Core.Assets; +using VirtoCommerce.AssetsModule.Core.Assets; using VirtoCommerce.Platform.Core.Common; using VirtoCommerce.Platform.Core.ExportImport; using VirtoCommerce.Platform.Core.PushNotifications; diff --git a/src/VirtoCommerce.MarketingModule.Web/Scripts/dynamicContent/blades/placeholders/placeholder-details.js b/src/VirtoCommerce.MarketingModule.Web/Scripts/dynamicContent/blades/placeholders/placeholder-details.js index 96a4f862..8faf3019 100644 --- a/src/VirtoCommerce.MarketingModule.Web/Scripts/dynamicContent/blades/placeholders/placeholder-details.js +++ b/src/VirtoCommerce.MarketingModule.Web/Scripts/dynamicContent/blades/placeholders/placeholder-details.js @@ -12,7 +12,7 @@ angular.module('virtoCommerce.marketingModule') var uploader = $scope.uploader = new FileUploader({ scope: $scope, headers: { Accept: 'application/json' }, - url: 'api/platform/assets?folderUrl=placeholders-images', + url: 'api/assets?folderUrl=placeholders-images', autoUpload: true, removeAfterUpload: true }); diff --git a/src/VirtoCommerce.MarketingModule.Web/Scripts/promotion/blades/coupon-import.js b/src/VirtoCommerce.MarketingModule.Web/Scripts/promotion/blades/coupon-import.js index 6911477f..b8f7e5d9 100644 --- a/src/VirtoCommerce.MarketingModule.Web/Scripts/promotion/blades/coupon-import.js +++ b/src/VirtoCommerce.MarketingModule.Web/Scripts/promotion/blades/coupon-import.js @@ -8,7 +8,7 @@ angular.module('virtoCommerce.marketingModule') var uploader = $scope.uploader = new FileUploader({ scope: $scope, headers: { Accept: 'application/json' }, - url: 'api/platform/assets?folderUrl=tmp', + url: 'api/assets?folderUrl=tmp', method: 'POST', autoUpload: true, removeAfterUpload: true diff --git a/src/VirtoCommerce.MarketingModule.Web/VirtoCommerce.MarketingModule.Web.csproj b/src/VirtoCommerce.MarketingModule.Web/VirtoCommerce.MarketingModule.Web.csproj index b189d7a7..bc5c1a2f 100644 --- a/src/VirtoCommerce.MarketingModule.Web/VirtoCommerce.MarketingModule.Web.csproj +++ b/src/VirtoCommerce.MarketingModule.Web/VirtoCommerce.MarketingModule.Web.csproj @@ -21,7 +21,8 @@ - + + diff --git a/src/VirtoCommerce.MarketingModule.Web/module.manifest b/src/VirtoCommerce.MarketingModule.Web/module.manifest index 9cc8d014..9589af73 100644 --- a/src/VirtoCommerce.MarketingModule.Web/module.manifest +++ b/src/VirtoCommerce.MarketingModule.Web/module.manifest @@ -1,9 +1,9 @@  VirtoCommerce.Marketing - 3.29.0 + 3.30.0 - 3.61.0-alpha.11922 + 3.81.0 Marketing module Marketing system with dynamic contents and promotions management @@ -26,6 +26,7 @@ + commerce diff --git a/tests/VirtoCommerce.MarketingModule.Test/MarketingModulePromotionControllerTests.cs b/tests/VirtoCommerce.MarketingModule.Test/MarketingModulePromotionControllerTests.cs index 146201df..1a7bdca5 100644 --- a/tests/VirtoCommerce.MarketingModule.Test/MarketingModulePromotionControllerTests.cs +++ b/tests/VirtoCommerce.MarketingModule.Test/MarketingModulePromotionControllerTests.cs @@ -12,7 +12,7 @@ using System.Security.Claims; using VirtoCommerce.MarketingModule.Core.Services; using VirtoCommerce.Platform.Core.PushNotifications; -using VirtoCommerce.Platform.Core.Assets; +using VirtoCommerce.AssetsModule.Core.Assets; using System.Collections.Generic; using System.Linq; using FluentAssertions;