From 417ff9220655d0af69e70cf215070030f5a93351 Mon Sep 17 00:00:00 2001 From: Thomas Kohler Date: Tue, 18 Jul 2023 09:23:42 +0200 Subject: [PATCH] - new version 3.0.4 - added UnstructuredRemittanceInformation and AdditionalRemittanceInformation to TransactionIBANandSCOR --- iso20022-generator/generator-test/GeneratorTest.cs | 6 +++--- .../iso20022-generator/Pain001Generator.cs | 13 +++++++++++++ iso20022-generator/iso20022-generator/README.md | 4 ++++ .../iso20022-generator/entity/Initialization.cs | 2 +- .../entity/Transactions/TransactionIBANandSCOR.cs | 4 ++++ .../iso20022-generator/iso20022-generator.csproj | 6 +++--- 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/iso20022-generator/generator-test/GeneratorTest.cs b/iso20022-generator/generator-test/GeneratorTest.cs index 21a5acc..4821c81 100644 --- a/iso20022-generator/generator-test/GeneratorTest.cs +++ b/iso20022-generator/generator-test/GeneratorTest.cs @@ -15,7 +15,7 @@ public void InitGenerator() { UniqueDocumentId = Guid.NewGuid().ToString().Substring(0, 34), // Must be unique for the bank within 90 days ContactDetailsName = "enio AG", - ContactDetailsOther = "3.0.3", + ContactDetailsOther = "3.0.4", AutoCalculateControlSum = true // SenderBic = "ZKBKCHZZ80A" //ZKB }, @@ -93,7 +93,7 @@ public void InitGenerator() { UniqueDocumentId = Guid.NewGuid().ToString().Substring(0, 34), // Must be unique for the bank within 90 days ContactDetailsName = "enio AG", - ContactDetailsOther = "3.0.3", + ContactDetailsOther = "3.0.4", AutoCalculateControlSum = true // SenderBic = "ZKBKCHZZ80A" //ZKB }, @@ -132,7 +132,7 @@ public void InitGenerator() { UniqueDocumentId = Guid.NewGuid().ToString().Substring(0, 34), // Must be unique for the bank within 90 days ContactDetailsName = "enio AG", - ContactDetailsOther = "3.0.3", + ContactDetailsOther = "3.0.4", AutoCalculateControlSum = true }, new Sender() diff --git a/iso20022-generator/iso20022-generator/Pain001Generator.cs b/iso20022-generator/iso20022-generator/Pain001Generator.cs index e3a5541..4ac8f6f 100644 --- a/iso20022-generator/iso20022-generator/Pain001Generator.cs +++ b/iso20022-generator/iso20022-generator/Pain001Generator.cs @@ -253,6 +253,19 @@ public void AddTransaction(PaymentInstructionInformation3CH pmtInf, Receiver rec } } }; + + if (transactionIbaNandSCOR.AdditionalRemittanceInformation?.Length > 0) + { + rmtInf.Strd.AddtlRmtInf = transactionIbaNandSCOR.AdditionalRemittanceInformation; + } + } else + { + if (!string.IsNullOrWhiteSpace(transactionIbaNandSCOR.UnstructuredRemittanceInformation)) + { + var rmtInf = new RemittanceInformation5CH(); + cdtTrfTxInf.RmtInf = rmtInf; + rmtInf.Ustrd = transactionIbaNandSCOR.UnstructuredRemittanceInformation; + } } } diff --git a/iso20022-generator/iso20022-generator/README.md b/iso20022-generator/iso20022-generator/README.md index 8a20aaa..39e210b 100644 --- a/iso20022-generator/iso20022-generator/README.md +++ b/iso20022-generator/iso20022-generator/README.md @@ -66,6 +66,10 @@ https://www.six-group.com/dam/download/banking-services/interbank-clearing/de/st | IBAN/QRR | 3 | TransactionIBANandQRR | | | IBAN/SCOR | 3 | TransactionIBANandSCOR | | +# Version Information +## 3.0.4 (2023-07-18) +- added UnstructuredRemittanceInformation and AdditionalRemittanceInformation to TransactionIBANandSCOR + # Version Information ## 3.0.3 (2023-05-08) - added boolean value batchBookingSpezified to enable export of pmtInf.BtchBookg flag properly diff --git a/iso20022-generator/iso20022-generator/entity/Initialization.cs b/iso20022-generator/iso20022-generator/entity/Initialization.cs index fabed9c..f26fdb3 100644 --- a/iso20022-generator/iso20022-generator/entity/Initialization.cs +++ b/iso20022-generator/iso20022-generator/entity/Initialization.cs @@ -7,7 +7,7 @@ public class Initialization private decimal _controlSum; private string _contactDetailsName = "iso20022-Generator / enio AG"; - private string _contactDetailsOther = "3.0.3"; + private string _contactDetailsOther = "3.0.4"; public decimal ControlSum { diff --git a/iso20022-generator/iso20022-generator/entity/Transactions/TransactionIBANandSCOR.cs b/iso20022-generator/iso20022-generator/entity/Transactions/TransactionIBANandSCOR.cs index 0330b4e..372881c 100644 --- a/iso20022-generator/iso20022-generator/entity/Transactions/TransactionIBANandSCOR.cs +++ b/iso20022-generator/iso20022-generator/entity/Transactions/TransactionIBANandSCOR.cs @@ -7,6 +7,10 @@ public class TransactionIBANandSCOR : TransactionBase private string _receiverIban; private string _scorNumber; + public string UnstructuredRemittanceInformation { get; set; } + + public string[] AdditionalRemittanceInformation { get; set; } + public string ReceiverIban { get => _receiverIban; diff --git a/iso20022-generator/iso20022-generator/iso20022-generator.csproj b/iso20022-generator/iso20022-generator/iso20022-generator.csproj index aabcbc5..ae115e6 100644 --- a/iso20022-generator/iso20022-generator/iso20022-generator.csproj +++ b/iso20022-generator/iso20022-generator/iso20022-generator.csproj @@ -10,11 +10,11 @@ iso20022Generator iso20022Generator - 3.0.3 + 3.0.4 enio AG This generator library helps you building iso 20022 artifacts with the minimum amount of information you need to set up valid documents. Currently pain.001 files are only supported. - 3.0.3.0 - 3.0.3.0 + 3.0.4.0 + 3.0.4.0 LICENSE.md README.md