Merge branch 'release/3.419.0'

VirtoCommerce · Nov 7, 2023 · 6041e10 · 6041e10
2 parents 6b6fc2b + 3587be7
commit 6041e10
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 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.418.0</VersionPrefix>
+    <VersionPrefix>3.419.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.js
@@ -4,6 +4,7 @@ function ($rootScope, $scope, $localStorage, customerOrders, bladeUtils, dialogS
     var blade = $scope.blade;
     var bladeNavigationService = bladeUtils.bladeNavigationService;
     $scope.uiGridConstants = uiGridConstants;
+    $scope.useIndexedSearch = false;
 
     $scope.getPricesVisibility = () => authService.checkPermission('order:read_prices');
 
@@ -70,7 +71,9 @@ function ($rootScope, $scope, $localStorage, customerOrders, bladeUtils, dialogS
                 angular.extend(criteria, filter.current);
             }
 
-            customerOrders.search(criteria, function (data) {
+            var endpoint = $scope.useIndexedSearch ? customerOrders.indexedSearch : customerOrders.search;
+
+            endpoint(criteria, function (data) {
                 blade.isLoading = false;
 
                 $scope.pageSettings.totalItems = data.totalCount;
@@ -229,6 +232,10 @@ function ($rootScope, $scope, $localStorage, customerOrders, bladeUtils, dialogS
         return gridOptions;
     };
 
+    customerOrders.indexedSearchEnabled(function (data) {
+        $scope.useIndexedSearch = data.result;
+    });
+
 
     // actions on load
     //No need to call this because page 'pageSettings.currentPage' is watched!!! It would trigger subsequent duplicated req...

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.418.0</version>
+  <version>3.419.0</version>
   <version-tag />
   <platformVersion>3.413.0</platformVersion>
   <dependencies>