libeufin

commit e7b3ed81061507985eca53dd67b07b4406ade989
parent 17c7306a4543afa733d1710099124bd9eaddfd20
Author: Florian Dold <florian.dold@gmail.com>
Date:   Mon, 22 Jun 2020 20:35:11 +0530

produce correct pain

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
@@ -322,13 +322,13 @@ fun createPain001document(paymentData: NexusPaymentInitiationData): String {
                     }
                     element("CdtTrfTxInf") {
                         element("PmtId") {
+                            paymentData.instructionId?.let {
+                                element("InstrId") { text(it) }
+                            }
                             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") {
                             attribute("Ccy", paymentData.currency)