From fe8f704c54f2ac6916f0deeb59d9a6280419aae4 Mon Sep 17 00:00:00 2001 From: Sergei Lugovykh Date: Wed, 19 Jun 2024 13:34:43 +0500 Subject: [PATCH 1/2] add GlnStatus and GlnExpirationDate to Party and Organization --- EdiApi.Client/Types/Common/GlnStatus.cs | 15 +++++++++++++++ EdiApi.Client/Types/Organization/PartyInfo.cs | 12 +++++++++++- EdiApi.Client/Types/Parties/PartyInfo.cs | 8 ++++++++ version.json | 2 +- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 EdiApi.Client/Types/Common/GlnStatus.cs diff --git a/EdiApi.Client/Types/Common/GlnStatus.cs b/EdiApi.Client/Types/Common/GlnStatus.cs new file mode 100644 index 0000000..976b01b --- /dev/null +++ b/EdiApi.Client/Types/Common/GlnStatus.cs @@ -0,0 +1,15 @@ +namespace SkbKontur.EdiApi.Client.Types.Common +{ + /// Статус GLN + public enum GlnStatus + { + /// Действующий + Valid, + + /// Срок действия истек + Invalid, + + /// Этот GLN выдан другой организации + GlnIssuedForAnotherInn, + } +} \ No newline at end of file diff --git a/EdiApi.Client/Types/Organization/PartyInfo.cs b/EdiApi.Client/Types/Organization/PartyInfo.cs index 8d232ca..cda1a6a 100644 --- a/EdiApi.Client/Types/Organization/PartyInfo.cs +++ b/EdiApi.Client/Types/Organization/PartyInfo.cs @@ -1,4 +1,8 @@ -namespace SkbKontur.EdiApi.Client.Types.Organization +using System; + +using SkbKontur.EdiApi.Client.Types.Common; + +namespace SkbKontur.EdiApi.Client.Types.Organization { /// Реквизиты и адрес организации или точки доставки/отгрузки public class PartyInfo @@ -47,5 +51,11 @@ public class PartyInfo /// Применяется ли УСН public bool UsesSimplifiedTaxSystem { get; set; } + + /// Статус GLN + public GlnStatus? GlnStatus { get; set; } + + /// Дата окончания оплаченного срока действия GLN + public DateTime? GlnExpirationDate { 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 4cec3e5..8c4bf4c 100644 --- a/EdiApi.Client/Types/Parties/PartyInfo.cs +++ b/EdiApi.Client/Types/Parties/PartyInfo.cs @@ -1,5 +1,7 @@ using System; +using SkbKontur.EdiApi.Client.Types.Common; + namespace SkbKontur.EdiApi.Client.Types.Parties { /// Реквизиты организации @@ -38,6 +40,12 @@ public class PartyInfo /// Стратегия маршрутизации сообщений поставщика public SupplierBoxSelectionStrategy SupplierBoxSelectionStrategy { get; set; } + /// Статус GLN + public GlnStatus? GlnStatus { get; set; } + + /// Дата окончания оплаченного срока действия GLN + public DateTime? GlnExpirationDate { get; set; } + /// /// Список платных услуг. В API эта информация доступна только сотрудникам организации, для остальных список будет пустой /// diff --git a/version.json b/version.json index 6eb54a0..d675718 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": "2.4", + "version": "2.5-pre.5.1", "assemblyVersion": { "precision": "build" }, From b2e71de41dcfc20f5ac0c4edc9c1c2d57c6a29a2 Mon Sep 17 00:00:00 2001 From: Sergei Lugovykh Date: Thu, 22 Aug 2024 14:33:25 +0500 Subject: [PATCH 2/2] change version: 2.5-pre.5.1 -> 2.5 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index d675718..c697d86 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": "2.5-pre.5.1", + "version": "2.5", "assemblyVersion": { "precision": "build" },