diff --git a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj
index 3dab9063a..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/Model/CustomerOrder.cs b/src/VirtoCommerce.OrdersModule.Core/Model/CustomerOrder.cs
index e6ffbcbef..20866225d 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..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 b1411c0c8..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 69ebed939..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 4bc841fe8..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 653aeb26a..a056b3bce 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/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 f2a35b62d..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,12 +39,13 @@ angular.module('virtoCommerce.orderModule')
}
$scope.openBlade = function () {
- if (!searchCriteria.organizationId && !searchCriteria.customerId) {
+ if (!memberId) {
return;
}
var newBlade = {
id: 'orders',
+ navigationGroup: memberId,
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 b2e2930b6..f167c8aef 100644
--- a/src/VirtoCommerce.OrdersModule.Web/module.manifest
+++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -4,7 +4,7 @@
3.856.0
- 3.891.0
+ 3.904.0