Merge branch 'release/3.824.0'

.github/workflows/module-ci.yml

@@ -1,5 +1,5 @@
-# v3.800.10
-# https://virtocommerce.atlassian.net/browse/VCST-1738
+# v3.800.11
+# bump-ubuntu-version
 name: Module CI
 
 on:
@@ -33,7 +33,7 @@ jobs:
     if: ${{ github.actor != 'dependabot[bot]' && 
         (github.event.pull_request.head.repo.full_name == github.repository || 
         github.event.pull_request.head.repo.full_name == '') }}  # Check that PR not from forked repo and not from Dependabot
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       CLOUD_INSTANCE_BASE_URL: ${{secrets.CLOUD_INSTANCE_BASE_URL}}
       CLIENT_ID: ${{secrets.CLIENT_ID}}
@@ -241,7 +241,7 @@ jobs:
     if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
         (github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
     needs: 'ci'
-    uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.10
+    uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.11
 
     with:
       katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
@@ -260,7 +260,7 @@ jobs:
   deploy-cloud:
     if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
     needs: ci
-    uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.10
+    uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.11
     with:
       releaseSource: module
       moduleId: ${{ needs.ci.outputs.moduleId }}

.github/workflows/module-release-hotfix.yml

@@ -1,5 +1,5 @@
-# v3.800.10
-# https://virtocommerce.atlassian.net/browse/VCST-1738
+# v3.800.11
+# bump-ubuntu-version
 name: Release hotfix
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10
+    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.11
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10    
+    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.11    
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -28,7 +28,7 @@ jobs:
       envPAT: ${{ secrets.REPO_TOKEN }}
 
   get-metadata:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
     outputs:
@@ -46,7 +46,7 @@ jobs:
   publish-github-release:
     needs:
       [build, test, get-metadata]
-    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10
+    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.11
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       changeLog: '${{ needs.get-metadata.outputs.changeLog }}'
@@ -61,7 +61,7 @@ jobs:
     needs:
       [publish-github-release]
     if: ${{ github.event.inputs.incrementPatch == 'true' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout
       uses: actions/checkout@v4

.github/workflows/publish-nugets.yml

@@ -1,5 +1,5 @@
-# v3.800.10
-# https://virtocommerce.atlassian.net/browse/VCST-1738
+# v3.800.11
+# bump-ubuntu-version
 name: Publish nuget
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10    
+    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.11    
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10    
+    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.11    
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
   publish-nuget:
     needs:
       [build, test]
-    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10    
+    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.11    
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       forceGithub: false

.github/workflows/release.yml

@@ -1,12 +1,12 @@
-# v3.800.10
-# https://virtocommerce.atlassian.net/browse/VCST-1738
+# v3.800.11
+# bump-ubuntu-version
 name: Release
 
 on:
   workflow_dispatch:
 
 jobs:
   release:
-    uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.10    
+    uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.11    
     secrets:
       envPAT: ${{ secrets.REPO_TOKEN }}

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.823.0</VersionPrefix>
+    <VersionPrefix>3.824.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

README.md

@@ -2,40 +2,33 @@
 
 [![CI status](https://github.com/VirtoCommerce/vc-module-customer/workflows/Module%20CI/badge.svg?branch=dev)](https://github.com/VirtoCommerce/vc-module-customer/actions?query=workflow%3A"Module+CI") [![Quality gate](https://sonarcloud.io/api/project_badges/measure?project=VirtoCommerce_vc-module-customer&metric=alert_status&branch=dev)](https://sonarcloud.io/dashboard?id=VirtoCommerce_vc-module-customer) [![Reliability rating](https://sonarcloud.io/api/project_badges/measure?project=VirtoCommerce_vc-module-customer&metric=reliability_rating&branch=dev)](https://sonarcloud.io/dashboard?id=VirtoCommerce_vc-module-customer) [![Security rating](https://sonarcloud.io/api/project_badges/measure?project=VirtoCommerce_vc-module-customer&metric=security_rating&branch=dev)](https://sonarcloud.io/dashboard?id=VirtoCommerce_vc-module-customer) [![Sqale rating](https://sonarcloud.io/api/project_badges/measure?project=VirtoCommerce_vc-module-customer&metric=sqale_rating&branch=dev)](https://sonarcloud.io/dashboard?id=VirtoCommerce_vc-module-customer)
 
-VirtoCommerce.Customer module represents contacts management system. The main purpose of this functionality is to keep the users contact information. The VC Customer Module helps to view, search and edit contact information.
+The Virto Commerce Customer module represents contacts management system. The main purpose of this functionality is to keep the users contact information. The VC Customer Module helps to view, search and edit contact information.
 
-## Key features:
+## Key features
 
-1. Сontacts arrangement in hierarchical structure;
-1. Module extensibility with custom contact types;
-1. "Organization", "Employee", "Customer" and "Vendor" contact types supported out of the box.
+* Сontacts arrangement in hierarchical structure
+* Module extensibility with custom contact types
+* "Organization", "Employee", "Customer" and "Vendor" contact types supported out of the box
 
 ## Documentation
 
-1. [Customer Module Document](/docs/index.md)
-1. [View on Github](https://github.com/VirtoCommerce/vc-module-customer)
-
-1. Developer guide: <a href="https://virtocommerce.com/docs/vc2devguide/extending-commerce/extending-members-domain-types" target="_blank">Extending Members domain types</a>
-
-## Installation
-
-1. Automatically: in VC Manager go to More -> Modules -> Customer management module -> Install;
-
-1. Manually: download module zip package from https://github.com/VirtoCommerce/vc-module-customer/releases. In VC Manager go to More -> Modules -> Advanced -> upload module package -> Install.
+* [Customer module user documentation](https://docs.virtocommerce.org/platform/user-guide/contacts/overview/)
+* [REST API](https://virtostart-demo-admin.govirto.com/docs/index.html?urls.primaryName=VirtoCommerce.Customer)
+* [View on Github](https://github.com/VirtoCommerce/vc-module-customer)
+* [Developer guide](https://docs.virtocommerce.org/platform/developer-guide/Tutorials-and-How-tos/Tutorials/extending-domain-models/)
 
 ## References
 
-1. Deploy: https://virtocommerce.com/docs/latest/developer-guide/deploy-module-from-source-code/
-1. Installation: https://www.virtocommerce.com/docs/latest/user-guide/modules/
-1. Home: https://virtocommerce.com
-1. Community: https://www.virtocommerce.org
-1. [Download Latest Release](https://github.com/VirtoCommerce/vc-module-customer/releases/tag/3.2.0)
+* [Deployment](https://docs.virtocommerce.org/platform/developer-guide/Tutorials-and-How-tos/Tutorials/deploy-module-from-source-code/)
+* [Installation](https://docs.virtocommerce.org/platform/user-guide/modules-installation/)
+* [Home](https://virtocommerce.com)
+* [Community](https://www.virtocommerce.org)
+* [Download latest release](https://github.com/VirtoCommerce/vc-module-customer/releases/latest)
 
 ## Available resources
 
-1. Module related service implementations as a <a href="https://www.nuget.org/packages/VirtoCommerce.CustomerModule.Data" target="_blank">NuGet package</a>
-1. API client as a <a href="https://www.nuget.org/packages/VirtoCommerce.CustomerModule.Client" target="_blank">NuGet package</a>
-1. API client documentation http://demo.virtocommerce.com/admin/docs/ui/index#!/Customer_management_module
+* Module related service implementations as a <a href="https://www.nuget.org/packages/VirtoCommerce.CustomerModule.Data" target="_blank">NuGet package</a>
+* API client as a <a href="https://www.nuget.org/packages/VirtoCommerce.CustomerModule.Client" target="_blank">NuGet package</a>
 
 ## License
 

samples/VirtoCommerce.CustomerSampleModule.Web/VirtoCommerce.CustomerSampleModule.Web.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <noWarn>1591</noWarn>
     <IsPackable>False</IsPackable>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.853.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.879.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.CustomerModule.Core\VirtoCommerce.CustomerModule.Core.csproj" />

src/VirtoCommerce.CustomerModule.Core/Model/Contact.cs

@@ -5,7 +5,7 @@
 
 namespace VirtoCommerce.CustomerModule.Core.Model
 {
-    public class Contact : Member, IHasSecurityAccounts, IHasPersonName
+    public class Contact : Member, IHasSecurityAccounts, IHasPersonName, IHasOrganizations
     {
         public Contact()
         {
@@ -26,6 +26,7 @@ public Contact()
         public IList<string> Organizations { get; set; }
         public IList<string> AssociatedOrganizations { get; set; }
         public string DefaultOrganizationId { get; set; }
+        public string CurrentOrganizationId { get; set; }
 
         public string TaxPayerId { get; set; }
         public string PreferredDelivery { get; set; }

src/VirtoCommerce.CustomerModule.Core/Model/Employee.cs

@@ -4,7 +4,7 @@
 
 namespace VirtoCommerce.CustomerModule.Core.Model
 {
-    public class Employee : Member, IHasSecurityAccounts, IHasPersonName
+    public class Employee : Member, IHasSecurityAccounts, IHasPersonName, IHasOrganizations
     {
         public Employee()
         {
@@ -22,6 +22,7 @@ public Employee()
         public string TimeZone { get; set; }
         public IList<string> Organizations { get; set; }
         public string DefaultOrganizationId { get; set; }
+        public string CurrentOrganizationId { get; set; }
 
         /// <summary>
         /// Employee type

src/VirtoCommerce.CustomerModule.Core/Model/IHasOrganizations.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace VirtoCommerce.CustomerModule.Core.Model;
+
+public interface IHasOrganizations
+{
+    IList<string> Organizations { get; set; }
+    string DefaultOrganizationId { get; set; }
+    string CurrentOrganizationId { get; set; }
+}

src/VirtoCommerce.CustomerModule.Core/VirtoCommerce.CustomerModule.Core.csproj

@@ -13,6 +13,6 @@
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.809.0" />
     <PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.804.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.853.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.879.0" />
   </ItemGroup>
 </Project>