Skip to content

Commit

Permalink
Merge branch 'AddPaidFeatureInfoToPartyInfo'
Browse files Browse the repository at this point in the history
  • Loading branch information
Рыкалов Глеб Анатольевич committed Oct 28, 2020
2 parents 9daad82 + 248164a commit 59472dc
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# История изменений

## v1.7 - 2020.10.28
- Добавлены: `enum PaidFeatureType`, `class PaidPeriod`, `class PaidFeatureInfo`.
- В `class PartyInfo` добавлено свойство `PaidFeatures`, обозначающее информацию о платных услугах для организации.

## v1.6 - 2020.06.15
- В `enum PartyType` добавлено значение `Provider`, обозначающее тип организации Провайдер.

Expand Down
12 changes: 12 additions & 0 deletions EdiApi.Client/Types/Parties/PaidFeatureInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;

namespace SkbKontur.EdiApi.Client.Types.Parties
{
public class PaidFeatureInfo
{
public Guid BillingAccountId { get; set; }
public PaidFeatureType PaidFeatureType { get; set; }
public PaidPeriod[] PaidPeriods { get; set; }
public DateTime? GracePeriodEnd { get; set; }
}
}
9 changes: 9 additions & 0 deletions EdiApi.Client/Types/Parties/PaidFeatureType.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace SkbKontur.EdiApi.Client.Types.Parties
{
public enum PaidFeatureType
{
Unknown = 0,
Module1C = 1,
FtpTransport = 2,
}
}
10 changes: 10 additions & 0 deletions EdiApi.Client/Types/Parties/PaidPeriod.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System;

namespace SkbKontur.EdiApi.Client.Types.Parties
{
public class PaidPeriod
{
public DateTime? StartDate { get; set; }
public DateTime? EndDate { get; set; }
}
}
4 changes: 3 additions & 1 deletion EdiApi.Client/Types/Parties/PartyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;

namespace SkbKontur.EdiApi.Client.Types.Parties
{
Expand All @@ -15,5 +15,7 @@ public class PartyInfo
public bool LicenseAgreementAccepted { get; set; }
public BuyerBoxSelectionStrategy BuyerBoxSelectionStrategy { get; set; }
public SupplierBoxSelectionStrategy SupplierBoxSelectionStrategy { get; set; }

public PaidFeatureInfo[] PaidFeatures { get; set; }
}
}
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.6",
"version": "1.7",
"assemblyVersion": {
"precision": "build"
},
Expand Down

0 comments on commit 59472dc

Please sign in to comment.