From 6ce87dc8413206707a334f66777012a7176f8c8b Mon Sep 17 00:00:00 2001 From: Artem Dudarev Date: Thu, 28 Aug 2025 19:21:01 +0200 Subject: [PATCH 1/5] Open member orders in a new blade --- .../Scripts/widgets/customerOrder-list-widget.js | 1 + src/VirtoCommerce.OrdersModule.Web/module.manifest | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/widgets/customerOrder-list-widget.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/widgets/customerOrder-list-widget.js index f2a35b62d..05fc4d897 100644 --- a/src/VirtoCommerce.OrdersModule.Web/Scripts/widgets/customerOrder-list-widget.js +++ b/src/VirtoCommerce.OrdersModule.Web/Scripts/widgets/customerOrder-list-widget.js @@ -43,6 +43,7 @@ angular.module('virtoCommerce.orderModule') var newBlade = { id: 'orders', + navigationGroup: 'member_orders', title: 'orders.blades.customerOrder-list.title', searchCriteria: searchCriteria, controller: 'virtoCommerce.orderModule.customerOrderListController', diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest index 0c9b6c180..79d294d66 100644 --- a/src/VirtoCommerce.OrdersModule.Web/module.manifest +++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest @@ -4,7 +4,7 @@ 3.855.0 - 3.891.0 + 3.904.0 From 3a268c8ab61d71f652f7ce9cab4a52516205fa8a Mon Sep 17 00:00:00 2001 From: Artem Dudarev Date: Thu, 28 Aug 2025 19:58:23 +0200 Subject: [PATCH 2/5] Fix dependencies --- .../VirtoCommerce.OrdersModule2.Web.csproj | 2 +- src/VirtoCommerce.OrdersModule.Core/Model/CustomerOrder.cs | 3 +-- .../VirtoCommerce.OrdersModule.Core.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.MySql.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.PostgreSql.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.SqlServer.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.csproj | 6 +++--- .../VirtoCommerce.OrdersModule.Web.csproj | 2 +- src/VirtoCommerce.OrdersModule.Web/module.manifest | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj index 3dab9063a..9de9bed17 100644 --- a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj +++ b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj @@ -9,7 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Core/Model/CustomerOrder.cs b/src/VirtoCommerce.OrdersModule.Core/Model/CustomerOrder.cs index 88db4318e..756c46e2c 100644 --- a/src/VirtoCommerce.OrdersModule.Core/Model/CustomerOrder.cs +++ b/src/VirtoCommerce.OrdersModule.Core/Model/CustomerOrder.cs @@ -4,13 +4,12 @@ using VirtoCommerce.CoreModule.Core.Common; using VirtoCommerce.CoreModule.Core.Tax; using VirtoCommerce.Platform.Core.Common; -using VirtoCommerce.Platform.Core.Domain; using VirtoCommerce.Platform.Core.Security; using VirtoCommerce.SearchModule.Core.Model; namespace VirtoCommerce.OrdersModule.Core.Model { - public class CustomerOrder : OrderOperation, IHasTaxDetalization, ISupportSecurityScopes, ITaxable, IHasLanguage, IHasDiscounts, ICloneable, IHasFeesDetalization, IHasRelevanceScore + public class CustomerOrder : OrderOperation, IHasTaxDetalization, ISupportSecurityScopes, ITaxable, IHasLanguageCode, IHasDiscounts, IHasFeesDetalization, IHasRelevanceScore { public byte[] RowVersion { get; set; } diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj index 3a70ad2f7..10c154724 100644 --- a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj +++ b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj b/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj index b1411c0c8..690b5da23 100644 --- a/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj @@ -13,7 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj b/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj index 69ebed939..ee204cbc0 100644 --- a/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj @@ -12,7 +12,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj b/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj index 4bc841fe8..1d85a402a 100644 --- a/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj @@ -13,7 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj index 68b690b53..6ea35d9a9 100644 --- a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj +++ b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj b/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj index ca5a313a6..5f8ace3a2 100644 --- a/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj +++ b/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest index 79d294d66..d2a25ba76 100644 --- a/src/VirtoCommerce.OrdersModule.Web/module.manifest +++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest @@ -4,7 +4,7 @@ 3.855.0 - 3.904.0 + 3.904.0-alpha.13123-vcst-1537-navigation-group From f1aa32e4377e8753814fe3c58461da41555586ab Mon Sep 17 00:00:00 2001 From: Artem Dudarev Date: Fri, 29 Aug 2025 17:18:48 +0200 Subject: [PATCH 3/5] Use member ID as a navigation group --- .../Scripts/blades/customerOrder-detail.js | 1 + .../Scripts/widgets/customerOrder-list-widget.js | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.js index 4c12185c4..260cb1bca 100644 --- a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.js +++ b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.js @@ -31,6 +31,7 @@ angular.module('virtoCommerce.orderModule') if (foundTemplate) { var newBlade = angular.copy(foundTemplate.detailBlade); newBlade.currentEntity = member; + newBlade.navigationGroup = member.id; bladeNavigationService.showBlade(newBlade, blade); } else { dialogService.showNotificationDialog({ diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/widgets/customerOrder-list-widget.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/widgets/customerOrder-list-widget.js index 05fc4d897..1bedf4abf 100644 --- a/src/VirtoCommerce.OrdersModule.Web/Scripts/widgets/customerOrder-list-widget.js +++ b/src/VirtoCommerce.OrdersModule.Web/Scripts/widgets/customerOrder-list-widget.js @@ -17,10 +17,12 @@ angular.module('virtoCommerce.orderModule') } } + const memberId = searchCriteria.organizationId || searchCriteria.customerId; + function refresh() { $scope.ordersCount = '...'; - if (!searchCriteria.organizationId && !searchCriteria.customerId) { + if (!memberId) { return; } @@ -37,13 +39,13 @@ angular.module('virtoCommerce.orderModule') } $scope.openBlade = function () { - if (!searchCriteria.organizationId && !searchCriteria.customerId) { + if (!memberId) { return; } var newBlade = { id: 'orders', - navigationGroup: 'member_orders', + navigationGroup: memberId, title: 'orders.blades.customerOrder-list.title', searchCriteria: searchCriteria, controller: 'virtoCommerce.orderModule.customerOrderListController', From 3ac93e2e1fb82b5752e52ed4d479cd22d5db8b35 Mon Sep 17 00:00:00 2001 From: Artem Dudarev Date: Fri, 29 Aug 2025 17:18:56 +0200 Subject: [PATCH 4/5] Update dependencies --- .../VirtoCommerce.OrdersModule2.Web.csproj | 2 +- .../VirtoCommerce.OrdersModule.Core.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.MySql.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.PostgreSql.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.SqlServer.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.csproj | 8 ++++---- src/VirtoCommerce.OrdersModule.Web/module.manifest | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj index 9de9bed17..787dd9370 100644 --- a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj +++ b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj @@ -9,7 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj index 10c154724..3b3f0bfe8 100644 --- a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj +++ b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj b/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj index 690b5da23..dddf30261 100644 --- a/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj @@ -13,7 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj b/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj index ee204cbc0..f826999f6 100644 --- a/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj @@ -12,7 +12,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj b/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj index 1d85a402a..ede4f826a 100644 --- a/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj @@ -13,7 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj index 6ea35d9a9..dedf69e41 100644 --- a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj +++ b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj @@ -1,4 +1,4 @@ - + net8.0 true @@ -19,9 +19,9 @@ - - - + + + diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest index d2a25ba76..f9cac046a 100644 --- a/src/VirtoCommerce.OrdersModule.Web/module.manifest +++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest @@ -4,7 +4,7 @@ 3.855.0 - 3.904.0-alpha.13123-vcst-1537-navigation-group + 3.904.0-alpha.13124-vcst-1537-navigation-group From 88bbe0841015516eda860050d7751820c7e9eec7 Mon Sep 17 00:00:00 2001 From: Artem Dudarev Date: Wed, 3 Sep 2025 17:16:17 +0200 Subject: [PATCH 5/5] Update dependencies --- .../VirtoCommerce.OrdersModule2.Web.csproj | 2 +- .../VirtoCommerce.OrdersModule.Core.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.MySql.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.PostgreSql.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.SqlServer.csproj | 2 +- .../VirtoCommerce.OrdersModule.Data.csproj | 6 +++--- src/VirtoCommerce.OrdersModule.Web/module.manifest | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj index 787dd9370..55f9c010e 100644 --- a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj +++ b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj @@ -9,7 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj index 3b3f0bfe8..61204546a 100644 --- a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj +++ b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj b/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj index dddf30261..eed2f8a8b 100644 --- a/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj @@ -13,7 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj b/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj index f826999f6..fe3153a16 100644 --- a/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj @@ -12,7 +12,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj b/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj index ede4f826a..85992c8af 100644 --- a/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj @@ -13,7 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj index dedf69e41..51d3685fd 100644 --- a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj +++ b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest index f9cac046a..79d294d66 100644 --- a/src/VirtoCommerce.OrdersModule.Web/module.manifest +++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest @@ -4,7 +4,7 @@ 3.855.0 - 3.904.0-alpha.13124-vcst-1537-navigation-group + 3.904.0