Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.TBX.HAEFELE.OrderService.txt
===================================================================
diff -u
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.TBX.HAEFELE.OrderService.txt	(revision 0)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.TBX.HAEFELE.OrderService.txt	(revision 60369)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="http://www.vanhoecke.be/HAEFELE" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" targetNamespace="http://www.vanhoecke.be/HAEFELE">
+    <types>
+        <s:schema elementFormDefault="qualified" targetNamespace="http://www.vanhoecke.be/HAEFELE">
+            <s:element name="ConfirmOrder">
+                <s:complexType>
+                    <s:sequence>
+                        <s:element minOccurs="0" name="EDInr" type="s:string"/>
+                        <s:element minOccurs="0" name="RequestedDeliveryDate" type="s:string"/>
+                        <s:element minOccurs="0" name="HaefeleBestelRef" type="s:string"/>
+                    </s:sequence>
+                </s:complexType>
+            </s:element>
+            <s:element name="ConfirmOrderResponse">
+                <s:complexType>
+                    <s:sequence>
+                        <s:element name="ConfirmOrderResult" type="s0:ConfirmOrderResult"/>
+                    </s:sequence>
+                </s:complexType>
+            </s:element>
+            <s:complexType name="ConfirmOrderResult">
+                <s:sequence>
+                    <s:element name="EDINr" type="s:long"/>
+                </s:sequence>
+            </s:complexType>
+        </s:schema>
+    </types>
+    <message name="ConfirmOrderSoapIn">
+        <part name="parameters" element="s0:ConfirmOrder"/>
+    </message>
+    <message name="ConfirmOrderSoapOut">
+        <part name="parameters" element="s0:ConfirmOrderResponse"/>
+    </message>
+    <portType name="OrderServiceSoap">
+        <operation name="ConfirmOrder">
+            <input message="s0:ConfirmOrderSoapIn"/>
+            <output message="s0:ConfirmOrderSoapOut"/>
+        </operation>
+    </portType>
+    <binding name="OrderServiceSoap" type="s0:OrderServiceSoap">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <operation name="ConfirmOrder">
+            <soap:operation soapAction="http://www.vanhoecke.be/HAEFELE/WS.TBX.HAEFELE.OrderService.ConfirmOrder" style="document"/>
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="OrderService">
+        <port name="OrderServiceSoap" binding="s0:OrderServiceSoap">
+            <soap:address location="http://localhost/csp/[namespace]/WS.TBX.HAEFELE.OrderService.cls"/>
+        </port>
+    </service>
+</definitions>
\ No newline at end of file
Index: WS/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r38390 -r60369
--- WS/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 38390)
+++ WS/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 60369)
@@ -6,6 +6,8 @@
 <Super>WS.OngeauthenticeerdeWebService</Super>
 
 <Parameter name="NAMESPACE">
+<Description>
+Deze klasse mag verwijderd worden na de overgang naar Kemp-proxy?</Description>
 <Default>http://www.vanhoecke.be/UNI</Default>
 </Parameter>
 
Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r60361 -r60369
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 60361)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 60369)
@@ -79,6 +79,8 @@
 <FormalSpec>EDInr:%Integer,Shop:APPS.EC.enu.UniShopVerwerker,BestelReferentie:%String,GevraagdeLeverdatum:%String</FormalSpec>
 <ReturnType>WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult</ReturnType>
 <Implementation><![CDATA[
+	Do ##class(Tools.Wlip).%New(110).String("ConfOrder in WSImpl")
+	;Do ##class(Tools.Wlip).%New(110).Stack()
 	#dim MagOrderMaken As %Boolean = $$$False
 	Try {
 		Set ..Shop = Shop 
@@ -88,6 +90,7 @@
 		
 		#dim OfferteVanHandel As APPS.VKP.Offerte = ..GeefOfferteVanHandel(EDInr)
 		If (..Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleNederland()) {
+			Do ##class(Tools.Wlip).%New(110).String("In HaefeleNederland")
 			// De ConfirmOrder() webservice bij Haefele wordt altijd doorgegeven via "Shop=HaefeleNederland" (want deze is gekoppeld aan de user van de secure webservice in WWW-WSS) 
 			Do ..PasAanShopVoorHaefele(OfferteVanHandel)
 		}
Index: WS/TBX/HAEFELE/OrderService.cls.xml
===================================================================
diff -u
--- WS/TBX/HAEFELE/OrderService.cls.xml	(revision 0)
+++ WS/TBX/HAEFELE/OrderService.cls.xml	(revision 60369)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.TBX.HAEFELE.OrderService">
+<Description>
+Web service for Haefele (BE + NL) to confirm orders (TBX + Unishop).  This is the external version.</Description>
+<IncludeCode>vhLib.Macro</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SOAP.WebService</Super>
+
+<Parameter name="SERVICENAME">
+<Description>
+Name of the WebService.</Description>
+<Default>OrderService</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Description>
+SOAP Namespace for the WebService</Description>
+<Default>http://www.vanhoecke.be/HAEFELE</Default>
+</Parameter>
+
+<Method name="ConfirmOrder">
+<FormalSpec>EDInr:%String,RequestedDeliveryDate:%String="",HaefeleBestelRef:%String=""</FormalSpec>
+<ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(WS.TBX.HAEFELE.impl.OrderService).%New().ConfirmOrder(EDInr, RequestedDeliveryDate, HaefeleBestelRef)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/TBX/HAEFELE/impl/OrderService.cls.xml
===================================================================
diff -u -r60364 -r60369
--- WS/TBX/HAEFELE/impl/OrderService.cls.xml	(.../OrderService.cls.xml)	(revision 60364)
+++ WS/TBX/HAEFELE/impl/OrderService.cls.xml	(.../OrderService.cls.xml)	(revision 60369)
@@ -51,6 +51,8 @@
 <FormalSpec>EdiNr:%String,RequestedDeliveryDate:%String="",HaefeleBestelRef:%String=""</FormalSpec>
 <ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
 <Implementation><![CDATA[
+	#dim ConfirmOrderResult As WS.TBX.HAEFELE.ConfirmOrderResult
+	
 	Set ..EdiNr = $$$Trim(EdiNr)
 	Set ..RequestedDeliveryDate = $$$Trim(RequestedDeliveryDate)
 	Set ..HaefeleBestelRef = $$$Trim(HaefeleBestelRef)
@@ -72,6 +74,8 @@
 <ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
 <Implementation><![CDATA[
 	#define EdiTestPrefix   "VHTST"
+	#dim DeliveryDate, ConfirmType, UnishopVerwerker As %String
+	#dim ConfirmOrderResult As WS.TBX.HAEFELE.ConfirmOrderResult
 		
 	// Datum converteren naar dd.mm.jjjj 
 	If $$$UCase(..RequestedDeliveryDate) = "ASAP" {
@@ -81,94 +85,33 @@
 		Set DeliveryDate = $$YYYYMMDD2EuropeanDate^vhLib.DateTime(..RequestedDeliveryDate)
 	}
 	
-	Set TbxOrderInfo = ..GeefTbxOrderInfo()
-	Set ConfirmType = $S(TbxOrderInfo.TbxHandel?1(1"HFLE",1"HFLB") : "TBX", 1:"Unishop")
+	Set ConfirmType = "Unishop"
 
-	Do ..Logger.Info("Internal WS", ..GeefLogDetail("Confirm via "_ConfirmType_"-order")_$$$CRLF_" (TbxOrderInfo.TbxHandel="_TbxOrderInfo.TbxHandel_")")
+	Do ..Logger.Info("Internal WS", ..GeefLogDetail("Confirm via "_ConfirmType_"-order"))
 
-	If ConfirmType = "TBX" {
-		Set ConfirmOrderResult = ..ConfirmOrderTbxIntern(DeliveryDate)
+	Set UnishopVerwerker = ..GeefUnishopVerwerker()
+	If ##class(TECH.StringUtils).StartsWith(..EdiNr, $$$EdiTestPrefix) {
+		Set ..EdiNr = ##class(TECH.StringUtils).Replace(..EdiNr, $$$EdiTestPrefix, "")
+		Set ConfirmOrderResult = ..ConfirmOrderUniInternTEST(DeliveryDate,UnishopVerwerker)
 	}
 	Else {
-		Set UnishopVerwerker = ..GeefUnishopVerwerker()
-		If ##class(TECH.StringUtils).StartsWith(..EdiNr, $$$EdiTestPrefix) {
-			Set ..EdiNr = ##class(TECH.StringUtils).Replace(..EdiNr, $$$EdiTestPrefix, "")
-			Set ConfirmOrderResult = ..ConfirmOrderUniInternTEST(DeliveryDate,UnishopVerwerker)
-		}
-		Else {
-			Set ConfirmOrderResult = ..ConfirmOrderUniIntern(DeliveryDate,UnishopVerwerker)
-		}
-	}
+		Set ConfirmOrderResult = ..ConfirmOrderUniIntern(DeliveryDate,UnishopVerwerker)
+	}	
 	
 	Quit ConfirmOrderResult
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTbxOrderInfo">
-<Private>1</Private>
-<ReturnType>WS.TBX.HAEFELE.Client.GeefTbxOrderInfoResult</ReturnType>
-<Implementation><![CDATA[
-	Quit:($$$Not($IsValidNum(..EdiNr))) ##class(WS.TBX.HAEFELE.Client.GeefTbxOrderInfoResult).%New()
-
-	Set WsTbxClient = ##class(WS.TBX.HAEFELE.Client.OrderServiceInternalSoap).%New()
-	Set SecureKey = $P($H,",",1)
-	Set $ZTRAP="OnSoapErrorGeefTbxOrderInfo"
-	Set TbxOrderInfoResult = WsTbxClient.GeefTbxOrderInfo(SecureKey, ..EdiNr)
-	Set $ZTRAP=""
-	Quit TbxOrderInfoResult
-	
-OnSoapErrorGeefTbxOrderInfo
-	Set $ZTRAP=""
-	Set fault = WsTbxClient.SoapFault
-	Do ..Logger.ErrorMail("Internal WS TBX", ..GeefLogDetail("GeefTbxOrderInfo")_$C(13,10)_$S($IsObject(fault):fault.AsString(), 1:""))
-	Do ..ReturnFault(fault)
-	Quit 0
-]]></Implementation>
-</Method>
-
-<Method name="ConfirmOrderTbxIntern">
-<FormalSpec>DeliveryDate:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
-<Implementation><![CDATA[
-	Quit:(..OrderGeregistreerdAlsConfirmed("TBX")) ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(..EdiNr)
-	
-	Set WsTbxClient = ##class(WS.TBX.HAEFELE.Client.OrderServiceInternalSoap).%New()
-	Set SecureKey = $P($H,",",1)
-	Set $ZTRAP="OnSoapErrorConfirmOrderTbx"
-	Set ConfirmOrderInternalResult = WsTbxClient.ConfirmOrder(SecureKey, ..EdiNr, DeliveryDate, ..HaefeleBestelRef)
-	Set $ZTRAP=""
-	Quit ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(ConfirmOrderInternalResult.EDINr)
-
-OnSoapErrorConfirmOrderTbx
-	Set $ZTRAP=""
-	Set fault = WsTbxClient.SoapFault
-	Do ..Logger.ErrorMail("Internal WS TBX",..GeefLogDetail("ConfirmOrderTbx")_$C(13,10)_$S($IsObject(fault):fault.AsString(), 1:""))
-	Do ..ReturnFault(fault)
-	Quit 0
-]]></Implementation>
-</Method>
-
 <Method name="ConfirmOrderUniIntern">
 <FormalSpec>DeliveryDate:%String,UnishopVerwerker:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
 <Implementation><![CDATA[
+	#dim ConfirmOrderInternalResult As WS.TBX.HAEFELE.ConfirmOrderResult
 	Quit:(..OrderGeregistreerdAlsConfirmed("Unishop")) ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(..EdiNr)
 
-	// Forward the call
-	Set WsUniClient = ##class(WSimpl.EC.Unishop.OrderConfirmation.Client).%New()
-	Set $ZTRAP="OnSoapErrorConfirmOrderUni"
-	Set ConfirmOrderInternalResult = WsUniClient.ConfirmOrder(..EdiNr, UnishopVerwerker, ..HaefeleBestelRef, DeliveryDate)
-	Set $ZTRAP=""
+	Set ConfirmOrderInternalResult = ..ConfirmOrderHaefele(..EdiNr, UnishopVerwerker, ..HaefeleBestelRef, DeliveryDate)
 	Quit ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(ConfirmOrderInternalResult.EDINr)   ; ConfirmOrderInternalResult.ProductionDays)
-
-OnSoapErrorConfirmOrderUni
-	Set $ZTRAP=""
-	Set fault = WsUniClient.SoapFault
-	Do ..Logger.ErrorMail("Internal WS UNI",..GeefLogDetail("ConfirmOrderUni")_$C(13,10)_$S($IsObject(fault):fault.AsString(), 1:""))
-	Do ..ReturnFault(fault)
-	Quit 0
 ]]></Implementation>
 </Method>
 
@@ -177,31 +120,39 @@
 <Private>1</Private>
 <ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
 <Implementation><![CDATA[
+	#dim ConfirmOrderInternalResult As WS.TBX.HAEFELE.ConfirmOrderResult
 	Quit:(..OrderGeregistreerdAlsConfirmed("Unishop")) ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(..EdiNr)
 
-	// Forward the call
-	Set WsUniClient = ##class(WSimpl.EC.Unishop.OrderConfirmation.ClientTEST).%New()
-	Set $ZTRAP="OnSoapErrorConfirmOrderUniTEST"
-	Set ConfirmOrderInternalResult = WsUniClient.ConfirmOrder(..EdiNr, UnishopVerwerker, ..HaefeleBestelRef, DeliveryDate)
-	Set $ZTRAP=""
+	Set ConfirmOrderInternalResult = ..ConfirmOrderHaefele(..EdiNr, UnishopVerwerker, ..HaefeleBestelRef, DeliveryDate)
 	Quit ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(ConfirmOrderInternalResult.EDINr)
+]]></Implementation>
+</Method>
 
-OnSoapErrorConfirmOrderUniTEST
-	Set $ZTRAP=""
-	Set fault = WsUniClient.SoapFault
-	Do ..Logger.ErrorMail("Internal WS UNI",..GeefLogDetail("ConfirmOrderUni")_ " TEST-omgeving. " _$C(13,10)_$S($IsObject(fault):fault.AsString(), 1:""))
-	Do ..ReturnFault(fault)
-	Quit 0
+<Method name="ConfirmOrderHaefele">
+<FormalSpec>EDInr:%Integer,Shop:%String,BestelReferentie:%String,GevraagdeLeverdatum:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult</ReturnType>
+<Implementation><![CDATA[
+	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderConfirmationService().ConfirmOrder(EDInr,Shop,BestelReferentie,GevraagdeLeverdatum)
+	Quit BestelOfferteResultaat
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOrderConfirmationService">
+<Private>1</Private>
+<ReturnType>WSimpl.EC.Unishop.OrderConfirmation.Service</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WSimpl.EC.Unishop.OrderConfirmation.Service).%New()
+]]></Implementation>
+</Method>
+
 <Method name="OrderGeregistreerdAlsConfirmed">
 <FormalSpec>ConfirmType:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Set EdiNr = ..EdiNr
-	Set IsConfirmed = (EdiNr?1(1"1319364",1"1319369",1"1319026"))
+	#dim EdiNr As %String = ..EdiNr	
+	#dim IsConfirmed As %Boolean = (EdiNr?1(1"1319364",1"1319369",1"1319026"))
+	
 	If IsConfirmed Do ..Logger.Info("IsConfirmed", ..GeefLogDetail("Order is geregistreerd als confirmed "))
 	Quit IsConfirmed
 ]]></Implementation>
@@ -220,7 +171,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	// Authorization based on the Windows user which is determined through the client certificate that was used for the request 
-	Set IsInterneGebruikerToegelaten = (..User = "SYS_WSS_INTERN") && ($H < 64368)   ; Toelating geldig tot 26/03/2017 (ingesteld op 08/02/2017)
+	#dim IsInterneGebruikerToegelaten As %Boolean = (..User = "SYS_WSS_INTERN") && ($H < 64368)   ; Toelating geldig tot 26/03/2017 (ingesteld op 08/02/2017)
 	If ($$$LCase(..User) '= "haefelebe") && ($$$Not(IsInterneGebruikerToegelaten)) {
 		Do ..Logger.Warning("AUTH fail", ..GeefLogDetail())
 		Do ..ReturnFaultMessage("Auth problem "_..User_$S(..User = "SYS_WSS_INTERN":" TIJDELIJKE WORK-AROUND IS VERLOPEN (geldig tot 26/03/2017)", 1:""))
@@ -245,7 +196,7 @@
 <Implementation><![CDATA[
 	quit:($$$UCase(DeliveryDate) = "ASAP") 1   ; ASAP is altijd zuste :D 
 	
-	set result = $L(DeliveryDate) ; date is required 
+	#dim result As %Boolean = $L(DeliveryDate) ; date is required 
 	if result set result = $$IsValidEuropeanDate^vhLib.DateTime($$YYYYMMDD2EuropeanDate^vhLib.DateTime(DeliveryDate)) ;
 	
 	quit result
@@ -256,14 +207,14 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Gebruiker = ""
+	#dim Gebruiker As %String= ""
 	If $IsObject($G(%request)) {
 		Set Gebruiker = $G(%request.CgiEnvs("REMOTE_USER"))
 	}
 
 	If Gebruiker = "" {
 		Set Gebruiker = "SYS_WSS"
-		Set ClientHost = $G(%request.CgiEnvs("REMOTE_HOST"))
+		#dim ClientHost As %String = $G(%request.CgiEnvs("REMOTE_HOST"))
 		If ClientHost?1"192.168.".E {
 			Set Gebruiker = "SYS_WSS_INTERN"
 		}
@@ -278,7 +229,7 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set ClientHost = ""
+	#dim ClientHost As %String = ""
 	If $IsObject($G(%request)) {
 		Set ClientHost = $G(%request.CgiEnvs("REMOTE_HOST"))
 		// Set %ClientIP = $G(%request.CgiEnvs("REMOTE_ADDR"))