[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] branch master updated: handle missing debtor BIC according to
From: |
gnunet |
Subject: |
[libeufin] branch master updated: handle missing debtor BIC according to standard |
Date: |
Thu, 18 Jun 2020 21:04:35 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository libeufin.
The following commit(s) were added to refs/heads/master by this push:
new 6bc1fa5 handle missing debtor BIC according to standard
6bc1fa5 is described below
commit 6bc1fa55c1b1363908a958aad46f1264d55e2920
Author: Florian Dold <florian.dold@gmail.com>
AuthorDate: Fri Jun 19 00:34:28 2020 +0530
handle missing debtor BIC according to standard
---
nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
index ffba9f4..840a4f9 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
@@ -225,13 +225,14 @@ data class NexusPaymentInitiationData(
val debtorName: String,
val messageId: String,
val paymentInformationId: String,
+ val endToEndId: String?,
val amount: String,
val currency: String,
val subject: String,
val preparationTimestamp: Long,
val creditorName: String,
val creditorIban: String,
- val instructionId: String
+ val instructionId: String?
)
/**
@@ -307,19 +308,21 @@ fun createPain001document(paymentData:
NexusPaymentInitiationData): String {
element("DbtrAcct/Id/IBAN") {
text(paymentData.debtorIban)
}
- paymentData.debtorBic?.let {
- element("DbtrAgt/FinInstnId/BIC") {
- text(paymentData.debtorBic)
- }
+ when (val b = paymentData.debtorBic) {
+ null -> element("DbtrAgt/FinInstnId/Othr/Id") {
text("NOTPROVIDED") }
+ else -> element("DbtrAgt/FinInstnId/BIC") { text(b) }
}
element("ChrgBr") {
text("SLEV")
}
element("CdtTrfTxInf") {
element("PmtId") {
- element("EndToEndId") {
- // text(pain001Entity.id.value.toString())
- text("NOTPROVIDED")
+ when (val eeid = paymentData.endToEndId) {
+ null -> element("EndToEndId") {
text("NOTPROVIDED") }
+ else -> element("EndToEndId") { text(eeid) }
+ }
+ paymentData.instructionId?.let {
+ element("InstrId") { text(it) }
}
}
element("Amt/InstdAmt") {
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libeufin] branch master updated: handle missing debtor BIC according to standard,
gnunet <=