Skip to content

Commit f83081a

Browse files
vc-civc-ci
committed
Merge branch 'release/3.824.0'
2 parents 558b271 + 1cc64dc commit f83081a

31 files changed

+2954
-75
lines changed

‎.github/workflows/module-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.10
2-
# https://virtocommerce.atlassian.net/browse/VCST-1738
1+
# v3.800.11
2+
# bump-ubuntu-version
33
name: Module CI
44

55
on:
@@ -33,7 +33,7 @@ jobs:
3333
if: ${{ github.actor != 'dependabot[bot]' &&
3434
(github.event.pull_request.head.repo.full_name == github.repository ||
3535
github.event.pull_request.head.repo.full_name == '') }} # Check that PR not from forked repo and not from Dependabot
36-
runs-on: ubuntu-20.04
36+
runs-on: ubuntu-24.04
3737
env:
3838
CLOUD_INSTANCE_BASE_URL: ${{secrets.CLOUD_INSTANCE_BASE_URL}}
3939
CLIENT_ID: ${{secrets.CLIENT_ID}}
@@ -241,7 +241,7 @@ jobs:
241241
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
242242
(github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
243243
needs: 'ci'
244-
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.10
244+
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.11
245245

246246
with:
247247
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
@@ -260,7 +260,7 @@ jobs:
260260
deploy-cloud:
261261
if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
262262
needs: ci
263-
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.10
263+
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.11
264264
with:
265265
releaseSource: module
266266
moduleId: ${{ needs.ci.outputs.moduleId }}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.10
2-
# https://virtocommerce.atlassian.net/browse/VCST-1738
1+
# v3.800.11
2+
# bump-ubuntu-version
33
name: Release hotfix
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.11
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.11
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -28,7 +28,7 @@ jobs:
2828
envPAT: ${{ secrets.REPO_TOKEN }}
2929

3030
get-metadata:
31-
runs-on: ubuntu-20.04
31+
runs-on: ubuntu-24.04
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
3434
outputs:
@@ -46,7 +46,7 @@ jobs:
4646
publish-github-release:
4747
needs:
4848
[build, test, get-metadata]
49-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10
49+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.11
5050
with:
5151
fullKey: ${{ needs.build.outputs.packageFullKey }}
5252
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'
@@ -61,7 +61,7 @@ jobs:
6161
needs:
6262
[publish-github-release]
6363
if: ${{ github.event.inputs.incrementPatch == 'true' }}
64-
runs-on: ubuntu-20.04
64+
runs-on: ubuntu-24.04
6565
steps:
6666
- name: Checkout
6767
uses: actions/checkout@v4

‎.github/workflows/publish-nugets.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.10
2-
# https://virtocommerce.atlassian.net/browse/VCST-1738
1+
# v3.800.11
2+
# bump-ubuntu-version
33
name: Publish nuget
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.11
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.11
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
2929
publish-nuget:
3030
needs:
3131
[build, test]
32-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10
32+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.11
3333
with:
3434
fullKey: ${{ needs.build.outputs.packageFullKey }}
3535
forceGithub: false

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# v3.800.10
2-
# https://virtocommerce.atlassian.net/browse/VCST-1738
1+
# v3.800.11
2+
# bump-ubuntu-version
33
name: Release
44

55
on:
66
workflow_dispatch:
77

88
jobs:
99
release:
10-
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.10
10+
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.11
1111
secrets:
1212
envPAT: ${{ secrets.REPO_TOKEN }}

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<!-- These properties will be shared for all projects -->
44
<PropertyGroup>
5-
<VersionPrefix>3.823.0</VersionPrefix>
5+
<VersionPrefix>3.824.0</VersionPrefix>
66
<VersionSuffix>
77
</VersionSuffix>
88
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

‎README.md

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,33 @@
22

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)
44

5-
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.
5+
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.
66

7-
## Key features:
7+
## Key features
88

9-
1. Сontacts arrangement in hierarchical structure;
10-
1. Module extensibility with custom contact types;
11-
1. "Organization", "Employee", "Customer" and "Vendor" contact types supported out of the box.
9+
* Сontacts arrangement in hierarchical structure
10+
* Module extensibility with custom contact types
11+
* "Organization", "Employee", "Customer" and "Vendor" contact types supported out of the box
1212

1313
## Documentation
1414

15-
1. [Customer Module Document](/docs/index.md)
16-
1. [View on Github](https://github.com/VirtoCommerce/vc-module-customer)
17-
18-
1. Developer guide: <a href="https://virtocommerce.com/docs/vc2devguide/extending-commerce/extending-members-domain-types" target="_blank">Extending Members domain types</a>
19-
20-
## Installation
21-
22-
1. Automatically: in VC Manager go to More -> Modules -> Customer management module -> Install;
23-
24-
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.
15+
* [Customer module user documentation](https://docs.virtocommerce.org/platform/user-guide/contacts/overview/)
16+
* [REST API](https://virtostart-demo-admin.govirto.com/docs/index.html?urls.primaryName=VirtoCommerce.Customer)
17+
* [View on Github](https://github.com/VirtoCommerce/vc-module-customer)
18+
* [Developer guide](https://docs.virtocommerce.org/platform/developer-guide/Tutorials-and-How-tos/Tutorials/extending-domain-models/)
2519

2620
## References
2721

28-
1. Deploy: https://virtocommerce.com/docs/latest/developer-guide/deploy-module-from-source-code/
29-
1. Installation: https://www.virtocommerce.com/docs/latest/user-guide/modules/
30-
1. Home: https://virtocommerce.com
31-
1. Community: https://www.virtocommerce.org
32-
1. [Download Latest Release](https://github.com/VirtoCommerce/vc-module-customer/releases/tag/3.2.0)
22+
* [Deployment](https://docs.virtocommerce.org/platform/developer-guide/Tutorials-and-How-tos/Tutorials/deploy-module-from-source-code/)
23+
* [Installation](https://docs.virtocommerce.org/platform/user-guide/modules-installation/)
24+
* [Home](https://virtocommerce.com)
25+
* [Community](https://www.virtocommerce.org)
26+
* [Download latest release](https://github.com/VirtoCommerce/vc-module-customer/releases/latest)
3327

3428
## Available resources
3529

36-
1. Module related service implementations as a <a href="https://www.nuget.org/packages/VirtoCommerce.CustomerModule.Data" target="_blank">NuGet package</a>
37-
1. API client as a <a href="https://www.nuget.org/packages/VirtoCommerce.CustomerModule.Client" target="_blank">NuGet package</a>
38-
1. API client documentation http://demo.virtocommerce.com/admin/docs/ui/index#!/Customer_management_module
30+
* Module related service implementations as a <a href="https://www.nuget.org/packages/VirtoCommerce.CustomerModule.Data" target="_blank">NuGet package</a>
31+
* API client as a <a href="https://www.nuget.org/packages/VirtoCommerce.CustomerModule.Client" target="_blank">NuGet package</a>
3932

4033
## License
4134

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
44
<noWarn>1591</noWarn>
55
<IsPackable>False</IsPackable>
66
<OutputType>Library</OutputType>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.853.0" />
13+
<PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.879.0" />
1414
</ItemGroup>
1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\VirtoCommerce.CustomerModule.Core\VirtoCommerce.CustomerModule.Core.csproj" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace VirtoCommerce.CustomerModule.Core.Model
77
{
8-
public class Contact : Member, IHasSecurityAccounts, IHasPersonName
8+
public class Contact : Member, IHasSecurityAccounts, IHasPersonName, IHasOrganizations
99
{
1010
public Contact()
1111
{
@@ -26,6 +26,7 @@ public Contact()
2626
public IList<string> Organizations { get; set; }
2727
public IList<string> AssociatedOrganizations { get; set; }
2828
public string DefaultOrganizationId { get; set; }
29+
public string CurrentOrganizationId { get; set; }
2930

3031
public string TaxPayerId { get; set; }
3132
public string PreferredDelivery { get; set; }

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace VirtoCommerce.CustomerModule.Core.Model
66
{
7-
public class Employee : Member, IHasSecurityAccounts, IHasPersonName
7+
public class Employee : Member, IHasSecurityAccounts, IHasPersonName, IHasOrganizations
88
{
99
public Employee()
1010
{
@@ -22,6 +22,7 @@ public Employee()
2222
public string TimeZone { get; set; }
2323
public IList<string> Organizations { get; set; }
2424
public string DefaultOrganizationId { get; set; }
25+
public string CurrentOrganizationId { get; set; }
2526

2627
/// <summary>
2728
/// Employee type

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System.Collections.Generic;
2+
3+
namespace VirtoCommerce.CustomerModule.Core.Model;
4+
5+
public interface IHasOrganizations
6+
{
7+
IList<string> Organizations { get; set; }
8+
string DefaultOrganizationId { get; set; }
9+
string CurrentOrganizationId { get; set; }
10+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.0" />
1414
<PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.809.0" />
1515
<PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.804.0" />
16-
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.853.0" />
16+
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.879.0" />
1717
</ItemGroup>
1818
</Project>

0 commit comments

Comments
 (0)