Merge branch 'dev' into fix/VCST-1631

VirtoCommerce · Aug 15, 2024 · 736e03e · 736e03e
2 parents 2d87d9f + 3b03c33
commit 736e03e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 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.824.0</VersionPrefix>
+    <VersionPrefix>3.825.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/order.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/order.js
@@ -569,18 +569,6 @@ angular.module(moduleName, [
                     isVisible: function (blade) { return !checkPermissionToViewDashboard(); }
                 }, 'mainDashboard');
 
-                customerOrders.indexedSearchEnabled(function (data) {
-                    if (data.result) {
-                        var customerOrderIndexWidget = {
-                            documentType: 'CustomerOrder',
-                            controller: 'virtoCommerce.searchModule.indexWidgetController',
-                            template: 'Modules/$(VirtoCommerce.Search)/Scripts/widgets/index-widget.tpl.html',
-                            isVisible: function (blade) { return !blade.isNew; }
-                        };
-                        widgetService.registerWidget(customerOrderIndexWidget, 'customerOrderDetailWidgets');
-                    }
-                });
-
                 $http.get('Modules/$(VirtoCommerce.Orders)/Scripts/widgets/dashboard/statistics-templates.html').then(function (response) {
                     // compile the response, which will put stuff into the cache
                     $compile(response.data);
@@ -655,6 +643,20 @@ angular.module(moduleName, [
                 scopeResolver.register(responsibleOrderScope);
 
                 $rootScope.$on('loginStatusChanged', function (event, authContext) {
+                    if (authContext.isAuthenticated) {
+                        customerOrders.indexedSearchEnabled(function (data) {
+                            if (data.result) {
+                                var customerOrderIndexWidget = {
+                                    documentType: 'CustomerOrder',
+                                    controller: 'virtoCommerce.searchModule.indexWidgetController',
+                                    template: 'Modules/$(VirtoCommerce.Search)/Scripts/widgets/index-widget.tpl.html',
+                                    isVisible: function (blade) { return !blade.isNew; }
+                                };
+                                widgetService.registerWidget(customerOrderIndexWidget, 'customerOrderDetailWidgets');
+                            }
+                        });
+                    }
+
                     $localStorage.ordersDashboardStatistics = null;
 
                     if (authContext.isAuthenticated &&

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.824.0</version>
+  <version>3.825.0</version>
   <version-tag />
   <platformVersion>3.825.0</platformVersion>
   <dependencies>