Merge branch 'release/3.828.0'

VirtoCommerce · Sep 24, 2024 · a3ae0ea · a3ae0ea
2 parents dab1980 + d7631b5
commit a3ae0ea
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 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.827.0</VersionPrefix>
+    <VersionPrefix>3.828.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git 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
@@ -10,7 +10,7 @@
         </ul>
 
         <div class="form-input" style="flex-grow: 1; flex-grow: 1; max-width: 400px">
-          <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.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.827.0</version>
+  <version>3.828.0</version>
   <version-tag />
 
   <platformVersion>3.851.0</platformVersion>