diff --git a/Directory.Build.props b/Directory.Build.props index 274e248d..d5709a90 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.827.0 + 3.828.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.js index 1c139e73..4244828e 100644 --- a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.js +++ b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.js @@ -34,10 +34,12 @@ angular.module('virtoCommerce.orderModule') }); blade.refresh = function () { + var sortCriteria = uiGridHelper.getSortExpression($scope); + var criteria = { responseGroup: "WithPrices", keyword: filter.keyword, - sort: uiGridHelper.getSortExpression($scope), + sort: filter.keyword && filter.ignoreSortingForRelevance == sortCriteria ? '' : sortCriteria, skip: ($scope.pageSettings.currentPage - 1) * $scope.pageSettings.itemsPerPageCount, take: $scope.pageSettings.itemsPerPageCount }; @@ -121,7 +123,7 @@ angular.module('virtoCommerce.orderModule') $scope.filterBy = function(field, value) { filter.keyword = `${field}:"${value}"`; - blade.refresh(); + filter.criteriaChanged(); }; $scope.deleteList = function (list) { @@ -218,7 +220,12 @@ angular.module('virtoCommerce.orderModule') }; angular.extend(newBlade, bladeData); bladeNavigationService.showBlade(newBlade, blade); - } + } + + filter.filterByKeyword = function () { + filter.ignoreSortingForRelevance = uiGridHelper.getSortExpression($scope); + filter.criteriaChanged(); + }; filter.criteriaChanged = function () { if ($scope.pageSettings.currentPage > 1) { diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.tpl.html index f5e07091..4561312a 100644 --- a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.tpl.html +++ b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.tpl.html @@ -10,7 +10,7 @@
- + diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest index ba0733f9..15c75e15 100644 --- a/src/VirtoCommerce.OrdersModule.Web/module.manifest +++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest @@ -1,7 +1,7 @@ VirtoCommerce.Orders - 3.827.0 + 3.828.0 3.851.0