From d7439e5aa099aa434bca8609f26c52dca831ed1d Mon Sep 17 00:00:00 2001
From: vc-ci <ci@virtocommerce.com>
Date: Wed, 18 Sep 2024 15:41:46 +0000
Subject: [PATCH 1/2] 3.828.0

---
 Directory.Build.props                              | 2 +-
 src/VirtoCommerce.OrdersModule.Web/module.manifest | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 @@
 <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/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 @@
 <?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>

From d7631b5174596ea2b3ef3d1f293df35bafe9c83c Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Tue, 24 Sep 2024 13:47:58 +0200
Subject: [PATCH 2/2] VCST-1856: Search by keyword use relevance sorting by
 default (#432)

feat: Implemented default relevance sorting for keyword searches. This enhancement ensures that search results are more relevant to the user's query. The next click in the grid enables custom sorting for the search results.
---
 .../Scripts/blades/customerOrder-list.js            | 13 ++++++++++---
 .../Scripts/blades/customerOrder-list.tpl.html      |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

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 @@
         </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>