From d4ca1eb26a41d3d1b109467e25196fcc9466dc01 Mon Sep 17 00:00:00 2001
From: Marcel Bourseau <marcel.bourseau@aareon.nl>
Date: Wed, 24 Jan 2018 18:32:52 +0000
Subject: [PATCH] MARX#51794: Factuur/statusbericht response bericht volgens
 ketenstandaard MessageService

svn path=/Website/branches/v2017.2/; revision=36716
---
 CUST/MARX/xsl/F_PutOpdrachtSIDB_MS24.xsl | 20 ++++++++---
 CUST/MARX/xsl/F_PutOpdrachtSIDB_MS30.xsl |  2 ++
 CUST/MARX/xsl/F_PutOpdrachtSIDB_MS31.xsl |  2 ++
 CUST/MARX/xsl/F_ResponseFactuur_MS24.xsl | 42 ++++++++++++++++++++++++
 CUST/MARX/xsl/F_ResponseFactuur_MS30.xsl | 42 ++++++++++++++++++++++++
 CUST/MARX/xsl/F_ResponseFactuur_MS31.xsl | 42 ++++++++++++++++++++++++
 6 files changed, 146 insertions(+), 4 deletions(-)
 create mode 100644 CUST/MARX/xsl/F_ResponseFactuur_MS24.xsl
 create mode 100644 CUST/MARX/xsl/F_ResponseFactuur_MS30.xsl
 create mode 100644 CUST/MARX/xsl/F_ResponseFactuur_MS31.xsl

diff --git a/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS24.xsl b/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS24.xsl
index 5942aba8e2..bd68de8a6b 100644
--- a/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS24.xsl
+++ b/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS24.xsl
@@ -14,14 +14,26 @@
   <xsl:template name="SidB_responsemessage">
     <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
       <soap:Body>
-        <mes24:MessageResponse>
-            <mes24:MessageResult>
+        <xsl:if test="returncode!='0'">
+        <soap:Fault>
+            <faultcode>soap:Server</faultcode>
+            <faultstring>Server error</faultstring>
+            <detail>
+                <FaultDetails>
+                    <ErrorCode>900</ErrorCode>
+                    <Message xml:lang='nl'>Statusbericht op opdracht MAR<xsl:value-of select="@key"/> levert op <xsl:value-of select="datum"/> volgende fout/error: <xsl:value-of select="returntekst"/></Message>
+                 </FaultDetails>
+           </detail>
+        </soap:Fault>
+        </xsl:if>
+        <mes24:PostMessageResponse>
+            <mes24:PostMessageResult>
                 <xsl:choose>
                     <xsl:when test="returncode='0'">true</xsl:when>
                     <xsl:otherwise>false</xsl:otherwise>
                 </xsl:choose>
-            </mes24:MessageResult>
-        </mes24:MessageResponse>
+            </mes24:PostMessageResult>
+        </mes24:PostMessageResponse>
       </soap:Body>
     </soap:Envelope>
   </xsl:template>
diff --git a/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS30.xsl b/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS30.xsl
index 7e8d67c575..83ed70361c 100644
--- a/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS30.xsl
+++ b/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS30.xsl
@@ -14,6 +14,7 @@
   <xsl:template name="SidB_responsemessage">
     <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
       <soap:Body>
+        <xsl:if test="returncode!='0'">
         <soap:Fault>
             <faultcode>soap:Server</faultcode>
             <faultstring>Server error</faultstring>
@@ -24,6 +25,7 @@
                  </FaultDetails>
            </detail>
         </soap:Fault>
+        </xsl:if>
         <mes30:MessageResponse>
             <MessageResult>
                 <xsl:choose>
diff --git a/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS31.xsl b/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS31.xsl
index 0ccab5c7e0..7411cd8ef1 100644
--- a/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS31.xsl
+++ b/CUST/MARX/xsl/F_PutOpdrachtSIDB_MS31.xsl
@@ -14,6 +14,7 @@
   <xsl:template name="SidB_responsemessage">
     <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
       <soap:Body>
+        <xsl:if test="returncode!='0'">
         <soap:Fault>
             <faultcode>soap:Server</faultcode>
             <faultstring>Server error</faultstring>
@@ -24,6 +25,7 @@
                  </FaultDetails>
            </detail>
         </soap:Fault>
+        </xsl:if>
         <mes31:MessageResponse>
             <MessageResult>
                 <xsl:choose>
diff --git a/CUST/MARX/xsl/F_ResponseFactuur_MS24.xsl b/CUST/MARX/xsl/F_ResponseFactuur_MS24.xsl
new file mode 100644
index 0000000000..5cd9e46b74
--- /dev/null
+++ b/CUST/MARX/xsl/F_ResponseFactuur_MS24.xsl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"              
+                xmlns:mes24="http://etim.nl/xmlschemas/messageservice/2.40" version="1.0">
+  <xsl:output method="xml" indent="yes" encoding="utf-8"/>
+  <xsl:decimal-format name="european" decimal-separator="," grouping-separator="."/>
+  <xsl:param name="mode"/>
+  <xsl:variable name="Rev">
+    <!-- Revision van deze cust.xsl -->
+    <xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
+  </xsl:variable>
+  
+  <xsl:template match="/">
+    <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+      <soap:Body>
+      <xsl:if test="count(//details/detail[status='W' or status='E']) != 0">
+            <soap:Fault>
+                <faultcode>soap:Server</faultcode>
+                <faultstring>Server error</faultstring>
+                <detail>
+                    <FaultDetails>
+                        <ErrorCode>900</ErrorCode>
+                        <Message xml:lang='nl'>
+                        <xsl:for-each select="//details/detail[status='W' or status='E']"><xsl:value-of select="omschrijving"/>.
+</xsl:for-each>
+                        </Message>
+                     </FaultDetails>
+               </detail>
+            </soap:Fault>
+        </xsl:if>
+        <mes24:PostMessageResponse>
+            <mes24:PostMessageResult>
+                <xsl:choose>
+                    <xsl:when test="count(//details/detail[status='W' or status='E']) = 0">true</xsl:when>
+                    <xsl:otherwise>false</xsl:otherwise>
+                </xsl:choose>
+            </mes24:PostMessageResult>
+        </mes24:PostMessageResponse>
+      </soap:Body>
+    </soap:Envelope>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/CUST/MARX/xsl/F_ResponseFactuur_MS30.xsl b/CUST/MARX/xsl/F_ResponseFactuur_MS30.xsl
new file mode 100644
index 0000000000..0fc60b5bcb
--- /dev/null
+++ b/CUST/MARX/xsl/F_ResponseFactuur_MS30.xsl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"              
+                xmlns:mes30="https://www.ketenstandaard.nl/WS/MessageService/3.0" version="1.0">
+  <xsl:output method="xml" indent="yes" encoding="utf-8"/>
+  <xsl:decimal-format name="european" decimal-separator="," grouping-separator="."/>
+  <xsl:param name="mode"/>
+  <xsl:variable name="Rev">
+    <!-- Revision van deze cust.xsl -->
+    <xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
+  </xsl:variable>
+  
+  <xsl:template match="/">
+    <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+      <soap:Body>
+        <xsl:if test="count(//details/detail[status='W' or status='E']) != 0">
+            <soap:Fault>
+                <faultcode>soap:Server</faultcode>
+                <faultstring>Server error</faultstring>
+                <detail>
+                    <FaultDetails>
+                        <ErrorCode>900</ErrorCode>
+                        <Message xml:lang='nl'>
+                        <xsl:for-each select="//details/detail[status='W' or status='E']"><xsl:value-of select="omschrijving"/>.
+</xsl:for-each>
+                        </Message>
+                     </FaultDetails>
+               </detail>
+            </soap:Fault>
+        </xsl:if>                
+        <mes30:MessageResponse>
+            <MessageResult>
+                <xsl:choose>
+                    <xsl:when test="count(//details/detail[status='W' or status='E']) = 0">true</xsl:when>
+                    <xsl:otherwise>false</xsl:otherwise>
+                </xsl:choose>
+            </MessageResult>
+        </mes30:MessageResponse>
+      </soap:Body>
+    </soap:Envelope>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/CUST/MARX/xsl/F_ResponseFactuur_MS31.xsl b/CUST/MARX/xsl/F_ResponseFactuur_MS31.xsl
new file mode 100644
index 0000000000..022df2582d
--- /dev/null
+++ b/CUST/MARX/xsl/F_ResponseFactuur_MS31.xsl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"              
+                xmlns:mes31="https://www.ketenstandaard.nl/WS/MessageService/3.1" version="1.0">
+  <xsl:output method="xml" indent="yes" encoding="utf-8"/>
+  <xsl:decimal-format name="european" decimal-separator="," grouping-separator="."/>
+  <xsl:param name="mode"/>
+  <xsl:variable name="Rev">
+    <!-- Revision van deze cust.xsl -->
+    <xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
+  </xsl:variable>
+  
+  <xsl:template match="/">
+    <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+      <soap:Body>
+        <xsl:if test="count(//details/detail[status='W' or status='E']) != 0">
+            <soap:Fault>
+                <faultcode>soap:Server</faultcode>
+                <faultstring>Server error</faultstring>
+                <detail>
+                    <FaultDetails>
+                        <ErrorCode>900</ErrorCode>
+                        <Message xml:lang='nl'>
+                        <xsl:for-each select="//details/detail[status='W' or status='E']"><xsl:value-of select="omschrijving"/>.
+</xsl:for-each>
+                        </Message>
+                     </FaultDetails>
+               </detail>
+            </soap:Fault>
+        </xsl:if>                
+        <mes31:MessageResponse>
+            <MessageResult>
+                <xsl:choose>
+                    <xsl:when test="count(//details/detail[status='W' or status='E']) = 0">true</xsl:when>
+                    <xsl:otherwise>false</xsl:otherwise>
+                </xsl:choose>
+            </MessageResult>
+        </mes31:MessageResponse>
+      </soap:Body>
+    </soap:Envelope>
+  </xsl:template>
+
+</xsl:stylesheet>