Merge branch 'feat/VCST-1454' of https://github.com/VirtoCommerce/vc-…

…module-customer into feat/VCST-1454
VirtoCommerce · Sep 27, 2024 · ae5fed8 · ae5fed8
2 parents 25ae085 + 9a680c1
commit ae5fed8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.815.0</VersionPrefix>
+    <VersionPrefix>3.816.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.CustomerModule.Web/Scripts/blades/member-list.js b/src/VirtoCommerce.CustomerModule.Web/Scripts/blades/member-list.js
@@ -198,6 +198,11 @@ angular.module('virtoCommerce.customerModule')
             // simple and advanced filtering
             var filter = blade.filter = { keyword: null };
 
+            filter.filterByKeyword = function () {
+                filter.ignoreSortingForRelevance = uiGridHelper.getSortExpression($scope);
+                filter.criteriaChanged();
+            };
+
             filter.criteriaChanged = function () {
                 if (filter.keyword === null) {
                     blade.memberType = undefined;
@@ -225,12 +230,14 @@ angular.module('virtoCommerce.customerModule')
             };
 
             function getSearchCriteria() {
+                var sortCriteria = uiGridHelper.getSortExpression($scope);
+
                 var searchCriteria = {
                     memberType: blade.memberType,
                     memberId: blade.currentEntity.id,
                     keyword: filter.keyword ? filter.keyword : undefined,
                     deepSearch: filter.keyword ? true : false,
-                    sort: uiGridHelper.getSortExpression($scope),
+                    sort: filter.keyword && filter.ignoreSortingForRelevance == sortCriteria ? '' : sortCriteria,
                     skip: ($scope.pageSettings.currentPage - 1) * $scope.pageSettings.itemsPerPageCount,
                     take: $scope.pageSettings.itemsPerPageCount,
                     objectType: 'Member'

diff --git a/src/VirtoCommerce.CustomerModule.Web/Scripts/directives/customerSearch.tpl.html b/src/VirtoCommerce.CustomerModule.Web/Scripts/directives/customerSearch.tpl.html
@@ -8,7 +8,7 @@
         </li>
     </ul>
     <div class="form-input" style="flex-grow: 1;">
-        <input ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" placeholder="{{'platform.placeholders.search-keyword' | translate}}">
+        <input ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.filterByKeyword()" placeholder="{{'platform.placeholders.search-keyword' | translate}}">
         <button class="btn __other" style="position: relative;right: 45px;" ng-click="filter.current=null;filter.change()">
             <i class="btn-ico fa fa-remove" title="Clear"></i>
         </button>

diff --git a/src/VirtoCommerce.CustomerModule.Web/module.manifest b/src/VirtoCommerce.CustomerModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Customer</id>
-  <version>3.815.0</version>
+  <version>3.816.0</version>
   <version-tag />
 
   <platformVersion>3.851.0</platformVersion>