From 04f2180e217e367da6c1769ed5776163f8729391 Mon Sep 17 00:00:00 2001 From: Vitaliy Roshcupkin Date: Mon, 1 Jun 2020 15:55:29 +0500 Subject: [PATCH 1/7] add draft of PaidFeatureInfo contract --- .../Types/Parties/PaidFeatureInfo.cs | 25 +++++++++++++++++++ EdiApi.Client/Types/Parties/PartyInfo.cs | 4 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 EdiApi.Client/Types/Parties/PaidFeatureInfo.cs diff --git a/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs b/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs new file mode 100644 index 0000000..669d90b --- /dev/null +++ b/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs @@ -0,0 +1,25 @@ +using System; + +namespace SkbKontur.EdiApi.Client.Types.Parties +{ + public class PaidFeatureInfo + { + public string BillingAccountId { get; set; } + public PaidFeatureType PaidFeatureType { get; set; } + public PaidPeriod[] PaidPeriods { get; set; } + public DateTime? GracePeriodEnd { get; set; } + } + + public enum PaidFeatureType + { + Unknown = 0, + Module1C = 1, + FtpTransport = 2 + } + + public class PaidPeriod + { + public DateTime? StartDate { get; set; } + public DateTime? EndDate { get; set; } + } +} \ No newline at end of file diff --git a/EdiApi.Client/Types/Parties/PartyInfo.cs b/EdiApi.Client/Types/Parties/PartyInfo.cs index ab3de09..0189f19 100644 --- a/EdiApi.Client/Types/Parties/PartyInfo.cs +++ b/EdiApi.Client/Types/Parties/PartyInfo.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SkbKontur.EdiApi.Client.Types.Parties { @@ -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; } } } \ No newline at end of file From f9fcecf5a2fb6265b534103fccd6688f9f4630f0 Mon Sep 17 00:00:00 2001 From: Vitaliy Roshcupkin Date: Thu, 3 Sep 2020 14:07:14 +0500 Subject: [PATCH 2/7] BillingAccountId in PaidFeatures is always Guid --- EdiApi.Client/Types/Parties/PaidFeatureInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs b/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs index 669d90b..a1d625b 100644 --- a/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs +++ b/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs @@ -4,7 +4,7 @@ namespace SkbKontur.EdiApi.Client.Types.Parties { public class PaidFeatureInfo { - public string BillingAccountId { get; set; } + public Guid BillingAccountId { get; set; } public PaidFeatureType PaidFeatureType { get; set; } public PaidPeriod[] PaidPeriods { get; set; } public DateTime? GracePeriodEnd { get; set; } From 95338162b8efad2a676f5d8b621afaa3bf1294df Mon Sep 17 00:00:00 2001 From: Vitaliy Roshcupkin Date: Thu, 3 Sep 2020 14:09:25 +0500 Subject: [PATCH 3/7] bump version.json --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 94bc2be..5da6ce8 100644 --- a/version.json +++ b/version.json @@ -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-pre", "assemblyVersion": { "precision": "build" }, From d5034ceec863cf1ce3b858a923ed57b367fcde87 Mon Sep 17 00:00:00 2001 From: Vitaliy Roshcupkin Date: Thu, 3 Sep 2020 15:59:50 +0500 Subject: [PATCH 4/7] move classes to separate files --- EdiApi.Client/Types/Parties/PaidFeatureInfo.cs | 13 ------------- EdiApi.Client/Types/Parties/PaidFeatureType.cs | 9 +++++++++ EdiApi.Client/Types/Parties/PaidPeriod.cs | 10 ++++++++++ 3 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 EdiApi.Client/Types/Parties/PaidFeatureType.cs create mode 100644 EdiApi.Client/Types/Parties/PaidPeriod.cs diff --git a/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs b/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs index a1d625b..5610b18 100644 --- a/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs +++ b/EdiApi.Client/Types/Parties/PaidFeatureInfo.cs @@ -9,17 +9,4 @@ public class PaidFeatureInfo public PaidPeriod[] PaidPeriods { get; set; } public DateTime? GracePeriodEnd { get; set; } } - - public enum PaidFeatureType - { - Unknown = 0, - Module1C = 1, - FtpTransport = 2 - } - - public class PaidPeriod - { - public DateTime? StartDate { get; set; } - public DateTime? EndDate { get; set; } - } } \ No newline at end of file diff --git a/EdiApi.Client/Types/Parties/PaidFeatureType.cs b/EdiApi.Client/Types/Parties/PaidFeatureType.cs new file mode 100644 index 0000000..08308e7 --- /dev/null +++ b/EdiApi.Client/Types/Parties/PaidFeatureType.cs @@ -0,0 +1,9 @@ +namespace SkbKontur.EdiApi.Client.Types.Parties +{ + public enum PaidFeatureType + { + Unknown = 0, + Module1C = 1, + FtpTransport = 2 + } +} \ No newline at end of file diff --git a/EdiApi.Client/Types/Parties/PaidPeriod.cs b/EdiApi.Client/Types/Parties/PaidPeriod.cs new file mode 100644 index 0000000..4336f81 --- /dev/null +++ b/EdiApi.Client/Types/Parties/PaidPeriod.cs @@ -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; } + } +} \ No newline at end of file From 5d5349aadcc755d73c63ccf3af34c6a88e3d8f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=8B=D0=BA=D0=B0=D0=BB=D0=BE=D0=B2=20=D0=93=D0=BB?= =?UTF-8?q?=D0=B5=D0=B1=20=D0=90=D0=BD=D0=B0=D1=82=D0=BE=D0=BB=D1=8C=D0=B5?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= Date: Tue, 13 Oct 2020 14:18:38 +0500 Subject: [PATCH 5/7] add EdiApi to PaidFeatureType --- EdiApi.Client/Types/Parties/PaidFeatureType.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EdiApi.Client/Types/Parties/PaidFeatureType.cs b/EdiApi.Client/Types/Parties/PaidFeatureType.cs index 08308e7..def2ae0 100644 --- a/EdiApi.Client/Types/Parties/PaidFeatureType.cs +++ b/EdiApi.Client/Types/Parties/PaidFeatureType.cs @@ -4,6 +4,7 @@ public enum PaidFeatureType { Unknown = 0, Module1C = 1, - FtpTransport = 2 + FtpTransport = 2, + EdiApi = 3, } } \ No newline at end of file From 53af746dafc8f130f3fcc364e5773c67cc539600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=8B=D0=BA=D0=B0=D0=BB=D0=BE=D0=B2=20=D0=93=D0=BB?= =?UTF-8?q?=D0=B5=D0=B1=20=D0=90=D0=BD=D0=B0=D1=82=D0=BE=D0=BB=D1=8C=D0=B5?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= Date: Wed, 21 Oct 2020 17:11:08 +0500 Subject: [PATCH 6/7] remove EdiApi from PaidFeatureType --- EdiApi.Client/Types/Parties/PaidFeatureType.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/EdiApi.Client/Types/Parties/PaidFeatureType.cs b/EdiApi.Client/Types/Parties/PaidFeatureType.cs index def2ae0..b94740b 100644 --- a/EdiApi.Client/Types/Parties/PaidFeatureType.cs +++ b/EdiApi.Client/Types/Parties/PaidFeatureType.cs @@ -5,6 +5,5 @@ public enum PaidFeatureType Unknown = 0, Module1C = 1, FtpTransport = 2, - EdiApi = 3, } } \ No newline at end of file From 248164a2a26bf792fdfddf21af3ca4907aed0c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=8B=D0=BA=D0=B0=D0=BB=D0=BE=D0=B2=20=D0=93=D0=BB?= =?UTF-8?q?=D0=B5=D0=B1=20=D0=90=D0=BD=D0=B0=D1=82=D0=BE=D0=BB=D1=8C=D0=B5?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= Date: Wed, 28 Oct 2020 12:15:39 +0500 Subject: [PATCH 7/7] change version: 1.7-pre -> 1.7, add release info to CHANGELOG --- CHANGELOG.md | 4 ++++ version.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72ea4aa..aee9f4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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`, обозначающее тип организации Провайдер. diff --git a/version.json b/version.json index 5da6ce8..79e0430 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.7-pre", + "version": "1.7", "assemblyVersion": { "precision": "build" },