libeufin

commit 96b5026a26fafea09d738de1814205db4b341992
parent a205b0821dcd4c137bc3c74ef2358c020496f84e
Author: Marcello Stanisci <ms@taler.net>
Date:   Thu, 30 Apr 2020 18:57:41 +0200

Fix amount format.

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
 | 
1
+
M
sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
 | 
3
+--

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -702,6 +702,7 @@ fun main() {
                          * at all.
                          */
                         response.orderData.unzipWithLambda {
+                            logger.debug("C53 entry: ${it.second}")
                             val fileName = it.first
                             val camt53doc = XMLUtil.parseStringIntoDom(it.second)
                             transaction {
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
@@ -452,7 +452,6 @@ private fun handleCct(paymentRequest: String, ebicsSubscriber: EbicsSubscriberEn
     val creditorIban = painDoc.pickString("//*[local-name()='CdtrAcct']//*[local-name()='IBAN']")
     val debitorIban = painDoc.pickString("//*[local-name()='DbtrAcct']//*[local-name()='IBAN']")
     val subject = painDoc.pickString("//*[local-name()='Ustrd']")
-    val currency = painDoc.pickString("//*[local-name()='InstdAmt']/@ccy")
     val amount = painDoc.pickString("//*[local-name()='InstdAmt']")
 
     transaction {
@@ -460,7 +459,7 @@ private fun handleCct(paymentRequest: String, ebicsSubscriber: EbicsSubscriberEn
             this.creditorIban = creditorIban
             this.debitorIban = debitorIban
             this.subject = subject
-            this.amount = "${currency}:${amount}"
+            this.amount = amount
             this.ebicsSubscriber = ebicsSubscriber
             this.date = DateTime.now().millis
         }