Grand.Web.Store – A Store Management Module #570

Author: KrzysztofPajak

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ develop ]
   pull_request:
-    branches: [ main ]
+    branches: [ develop ]
   schedule:
     - cron: '0 3 * * 1'
 

.github/workflows/docker-image-pr.yml

@@ -2,9 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "develop" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "develop" ]
 
 jobs:
   build:

.github/workflows/grandnode.yml

@@ -1,7 +1,7 @@
 name: Build and deploy .NET Core app to Linux WebApp grandnode
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "develop" ]
 
 env:
   AZURE_WEBAPP_NAME: grandnode-dev

.gitignore

@@ -374,4 +374,10 @@ src/Web/Grand.Web.Vendor/App_Data/Settings.cfg
 src/Web/Grand.Web.Vendor/Plugins/*
 src/Web/Grand.Web.Vendor/Modules/*
 src/Web/Grand.Web.Vendor/App_Data/DataProtectionKeys/*
-src/Web/Grand.Web.Vendor/wwwroot/assets/images/thumbs/*.**
+src/Web/Grand.Web.Vendor/wwwroot/assets/images/thumbs/*.**
+src/Web/Grand.Web.Store/App_Data/InstalledPlugins.cfg
+src/Web/Grand.Web.Store/App_Data/Settings.cfg
+src/Web/Grand.Web.Store/Plugins/*
+src/Web/Grand.Web.Store/Modules/*
+src/Web/Grand.Web.Store/App_Data/DataProtectionKeys/*
+src/Web/Grand.Web.Store/wwwroot/assets/images/thumbs/*.**

GrandNode.sln

@@ -24,16 +24,12 @@ steps:
     script: |
       dotnet workload install aspire
 
-- task: NuGetToolInstaller@1
-  displayName: 'Install NuGet >=6.3.0-0'
-  inputs:
-    versionSpec: '>=6.3.0-0'
-    checkLatest: true
-
-- task: NuGetCommand@2
+# Replaced NuGet tasks with dotnet CLI commands to fix Ubuntu 24.04 compatibility
+- task: DotNetCoreCLI@2
+  displayName: 'dotnet restore'
   inputs:
-    command: 'restore'  
-    restoreSolution: '**/*.sln'
+    command: 'restore'
+    projects: '**/*.sln'
     feedsToUse: 'select'
 
 - task: DotNetCoreCLI@2

azure-pipelines.yml

@@ -145,7 +145,7 @@ public virtual async Task<bool> IsInCustomerGroup(Customer customer,
         bool? isSystem = null)
     {
         ArgumentNullException.ThrowIfNull(customer);
-        ArgumentNullException.ThrowIfNullOrEmpty(customerGroupSystemName);
+        ArgumentException.ThrowIfNullOrEmpty(customerGroupSystemName);
 
         var customerGroup = await GetCustomerGroupBySystemName(customerGroupSystemName);
         if (customerGroup == null)
@@ -160,9 +160,9 @@ public virtual async Task<bool> IsInCustomerGroup(Customer customer,
         return result;
     }
 
-    public Task<bool> IsStaff(Customer customer)
+    public Task<bool> IsStoreManager(Customer customer)
     {
-        return IsInCustomerGroup(customer, SystemCustomerGroupNames.Staff, true, true);
+        return IsInCustomerGroup(customer, SystemCustomerGroupNames.StoreManager, true, true);
     }
 
     public Task<bool> IsAdmin(Customer customer)

src/Business/Grand.Business.Common/Services/Directory/GroupService.cs

@@ -11,6 +11,7 @@ public virtual IEnumerable<Permission> GetPermissions()
         return [
             StandardPermission.ManageAccessAdminPanel,
             StandardPermission.ManageAccessVendorPanel,
+            StandardPermission.ManageAccessStoreManagerPanel,
             StandardPermission.AllowCustomerImpersonation,
             StandardPermission.ManageProducts,
             StandardPermission.ManageCategories,
@@ -195,9 +196,9 @@ public virtual IEnumerable<DefaultPermission> GetDefaultPermissions()
                 ]
             },
             new DefaultPermission {
-                CustomerGroupSystemName = SystemCustomerGroupNames.Staff,
+                CustomerGroupSystemName = SystemCustomerGroupNames.StoreManager,
                 Permissions = [
-                    StandardPermission.ManageAccessAdminPanel,
+                    StandardPermission.ManageAccessStoreManagerPanel,
                     StandardPermission.ManageProducts,
                     StandardPermission.ManageFiles,
                     StandardPermission.ManagePictures,

src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs

@@ -23,7 +23,7 @@ Task<bool> IsInCustomerGroup(Customer customer,
     /// </summary>
     /// <param name="customer">Customer</param>
     /// <returns>Result</returns>
-    Task<bool> IsStaff(Customer customer);
+    Task<bool> IsStoreManager(Customer customer);
 
     /// <summary>
     ///     Gets a value indicating whether customer is administrator

src/Business/Grand.Business.Core/Interfaces/Common/Directory/IGroupService.cs

@@ -387,22 +387,12 @@ public class CatalogSettings : ISettings
     /// <summary>
     ///     Gets or sets the default value to use for Category page size options (for new categories)
     /// </summary>
-    public string DefaultCategoryPageSizeOptions { get; set; }
+    public string DefaultPageSizeOptions { get; set; }
 
     /// <summary>
     ///     Gets or sets the default value to use for Category page size (for new categories)
     /// </summary>
-    public int DefaultCategoryPageSize { get; set; }
-
-    /// <summary>
-    ///     Gets or sets the default value to use for Collection page size options (for new collections)
-    /// </summary>
-    public string DefaultCollectionPageSizeOptions { get; set; }
-
-    /// <summary>
-    ///     Gets or sets the default value to use for Collection page size (for new collections)
-    /// </summary>
-    public int DefaultCollectionPageSize { get; set; }
+    public int DefaultPageSize { get; set; }
 
     /// <summary>
     ///     Gets or sets the default value to use show extra field quantity on catalog pages