fix EBICS dialectdev/antoine/gls-wip

3 files changed, 6 insertions, 4 deletions

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
index 950b7852..a06e9fe7 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
@@ -82,7 +82,7 @@ fun createPain001(
     return XmlBuilder.toBytes("Document") {
         attr("xmlns", "urn:iso:std:iso:20022:tech:xsd:pain.001.001.$version")
         attr("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance")
-        attr("xsi:schemaLocation", "urn:iso:std:iso:20022:tech:xsd:pain.001.001.$version pain.001.001.09_GBIC_4.xsd") // TODO: remove _GBIC_4 if not nescessary
+        attr("xsi:schemaLocation", "urn:iso:std:iso:20022:tech:xsd:pain.001.001.$version pain.001.001.$version.xsd") // TODO: remove _GBIC_4 if not nescessary
         el("CstmrCdtTrfInitn") {
             el("GrpHdr") {
                 el("MsgId", requestUid)
@@ -92,7 +92,7 @@ fun createPain001(
                 el("InitgPty/Nm", debitAccount.name)
             }
             el("PmtInf") {
-                el("PmtInfId", "TEST_1234_PROVIDED")
+                el("PmtInfId", "NOTPROVIDED")
                 el("PmtMtd", "TRF")
                 el("BtchBookg", "true")
                 el("NbOfTxs", "1")
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsBTS.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsBTS.kt
index 9210f4cc..cf00c90c 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsBTS.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsBTS.kt
@@ -270,7 +270,9 @@ class EbicsBTS(
     private fun XmlBuilder.service(order: EbicsOrder.V3) {
         el("Service") {
             el("ServiceName", order.name!!)
-            el("Scope", order.scope!!)
+            if (order.scope != null) {
+                el("Scope", order.scope)
+            }
             if (order.option != null) {
                 el("ServiceOption", order.option)
             }
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsOrder.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsOrder.kt
index ba63a115..d6cced05 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsOrder.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsOrder.kt
@@ -75,7 +75,7 @@ enum class Dialect {
     fun directDebit(): EbicsOrder {
         return when (this) {
             postfinance -> EbicsOrder.V3("BTU", "MCT", "CH", "pain.001", "09")
-            gls -> EbicsOrder.V3("BTU", "SCT", "DE", "pain.001", null, "XML")
+            gls -> EbicsOrder.V3("BTU", "SCT", null, "pain.001")
         }
     }
 }
\ No newline at end of file