[libeufin] branch master updated: produce correct pain

[gnunet]

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 e7b3ed8  produce correct pain
e7b3ed8 is described below

commit e7b3ed81061507985eca53dd67b07b4406ade989
Author: Florian Dold <florian.dold@gmail.com>
AuthorDate: Mon Jun 22 20:35:11 2020 +0530

    produce correct pain
---
 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
index 40460ba..c7e4394 100644
--- 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)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.