Admin - GetActiveStore - Minor changes

grandnode · Jan 11, 2022 · d141950 · d141950
1 parent 6d40a58
commit d141950
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/src/Web/Grand.Web.Admin/Components/StoreScope.cs b/src/Web/Grand.Web.Admin/Components/StoreScope.cs
@@ -8,6 +8,8 @@
 using System.Threading.Tasks;
 using Grand.Business.Common.Interfaces.Directory;
 using System.Linq;
+using System.Collections.Generic;
+using Grand.Domain.Stores;
 
 namespace Grand.Web.Admin.Components
 {
@@ -52,22 +54,22 @@ public async Task<IViewComponentResult> InvokeAsync()
                     Name = s.Shortcut
                 });
             }
-            model.StoreId = await GetActiveStore(_storeService, _workContext);
+            model.StoreId = await GetActiveStore(allStores);
             return View(model);
         }
 
         #endregion
 
         #region Methods
 
-        private async Task<string> GetActiveStore(IStoreService storeService, IWorkContext workContext)
+        private async Task<string> GetActiveStore(IList<Store> stores)
         {
             //ensure that we have 2 (or more) stores
-            if ((await storeService.GetAllStores()).Count < 2)
-                return string.Empty;
+            if (stores.Count < 2)
+                return stores.FirstOrDefault().Id;
 
-            var storeId = workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.AdminAreaStoreScopeConfiguration);
-            var store = await storeService.GetStoreById(storeId);
+            var storeId = _workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.AdminAreaStoreScopeConfiguration);
+            var store = await _storeService.GetStoreById(storeId);
 
             return store != null ? store.Id : "";
         }

diff --git a/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs b/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using Grand.Business.Common.Interfaces.Directory;
 
 namespace Grand.Web.Admin.Controllers
 {
@@ -66,15 +67,25 @@ protected virtual async Task<string> GetActiveStore()
         {
             var storeService = HttpContext.RequestServices.GetRequiredService<IStoreService>();
             var workContext = HttpContext.RequestServices.GetRequiredService<IWorkContext>();
+            var groupService = HttpContext.RequestServices.GetRequiredService<IGroupService>();
 
             var stores = await storeService.GetAllStores();
             if (stores.Count < 2)
                 return stores.FirstOrDefault().Id;
 
-            var storeId = workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.AdminAreaStoreScopeConfiguration);
-            var store = await storeService.GetStoreById(storeId);
+            if (await groupService.IsStaff(workContext.CurrentCustomer))
+            {
+                return workContext.CurrentCustomer.StaffStoreId;
+            }
 
-            return store != null ? store.Id : workContext.CurrentStore.Id;
+            var storeId = workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.AdminAreaStoreScopeConfiguration);
+            if (!string.IsNullOrEmpty(storeId))
+            {
+                var store = await storeService.GetStoreById(storeId);
+                if (store != null)
+                    return store.Id;
+            }
+            return stores.FirstOrDefault().Id;
         }
         /// <summary>
         /// Creates a <see cref="T:System.Web.Mvc.JsonResult"/> object that serializes the specified object to JavaScript Object Notation (JSON) format using the content type, content encoding, and the JSON request behavior.