Index: WS/TBX/HAEFELE/Client/GeefTbxOrderInfoResult.cls.xml
===================================================================
diff -u
--- WS/TBX/HAEFELE/Client/GeefTbxOrderInfoResult.cls.xml	(revision 0)
+++ WS/TBX/HAEFELE/Client/GeefTbxOrderInfoResult.cls.xml	(revision 60364)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.TBX.HAEFELE.Client.GeefTbxOrderInfoResult">
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLNAME">
+<Default>GeefTbxOrderInfoResult</Default>
+</Parameter>
+
+<Parameter name="XMLSEQUENCE">
+<Default>1</Default>
+</Parameter>
+
+<Property name="TbxHandel">
+<Type>%String</Type>
+<Required>1</Required>
+<Parameter name="XMLNAME" value="TbxHandel"/>
+</Property>
+</Class>
+
+
+</Export>
Index: WS/TBX/HAEFELE/ConfirmOrderResult.cls.xml
===================================================================
diff -u
--- WS/TBX/HAEFELE/ConfirmOrderResult.cls.xml	(revision 0)
+++ WS/TBX/HAEFELE/ConfirmOrderResult.cls.xml	(revision 60364)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.TBX.HAEFELE.ConfirmOrderResult">
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLNAME">
+<Default>ConfirmOrderResult</Default>
+</Parameter>
+
+<Parameter name="XMLSEQUENCE">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="XMLIGNORENULL">
+<Default>1</Default>
+</Parameter>
+
+<Property name="EDINr">
+<Type>%Integer</Type>
+<Required>1</Required>
+<Parameter name="XMLNAME" value="EDINr"/>
+</Property>
+
+<UDLText name="T">
+<Content><![CDATA[
+// Property ProductionDays As %Integer(XMLNAME = "ProductionDays") [ Required ];
+
+]]></Content>
+</UDLText>
+
+<Method name="%OnNew">
+<FormalSpec>EDINr:%Integer</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..EDINr = EDINr
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/TBX/HAEFELE/Logger.cls.xml
===================================================================
diff -u
--- WS/TBX/HAEFELE/Logger.cls.xml	(revision 0)
+++ WS/TBX/HAEFELE/Logger.cls.xml	(revision 60364)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.TBX.HAEFELE.Logger">
+<IncludeCode>vhLib.Macro</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhLib.Logger</Super>
+
+<Method name="GetMailFields">
+<Description>
+Do ##class(VHSys.Logging).GetMailFields(.From,.lbTo,.Subj, "Error")</Description>
+<FormalSpec><![CDATA[&From:%String,&lbTo:%List,&Subj:%String,SubjInfo:%String="Error"]]></FormalSpec>
+<Implementation><![CDATA[
+ 	Set From="""HAEFELE WS.TBX Admin"" <AdminTBX@vanhoecke.be>"
+	Set lbTo=$LB("ICT_WS.TBXSysOp@vanhoecke.be")
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<FormalSpec>Groep:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit ##super("WS_TBX_HAEFELE")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/TBX/HAEFELE/impl/OrderService.cls.xml
===================================================================
diff -u
--- WS/TBX/HAEFELE/impl/OrderService.cls.xml	(revision 0)
+++ WS/TBX/HAEFELE/impl/OrderService.cls.xml	(revision 60364)
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.TBX.HAEFELE.impl.OrderService">
+<IncludeCode>vhLib.Macro</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+
+<Property name="SoapServiceName">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Logger">
+<Type>WS.TBX.HAEFELE.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="EdiNr">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RequestedDeliveryDate">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HaefeleBestelRef">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="User">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>SoapServiceName:%String="HAEFELE.OrderService"</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..SoapServiceName = SoapServiceName
+	Set ..Logger = ##Class(WS.TBX.HAEFELE.Logger).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ConfirmOrder">
+<FormalSpec>EdiNr:%String,RequestedDeliveryDate:%String="",HaefeleBestelRef:%String=""</FormalSpec>
+<ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
+<Implementation><![CDATA[
+	Set ..EdiNr = $$$Trim(EdiNr)
+	Set ..RequestedDeliveryDate = $$$Trim(RequestedDeliveryDate)
+	Set ..HaefeleBestelRef = $$$Trim(HaefeleBestelRef)
+	Set ..User = ..GeefGebruiker()
+	
+	Do ..Logger.Info("Call IN", ..GeefLogDetail())
+	
+	Do ..ValideerGegevens()
+	Set ConfirmOrderResult = ..ConfirmOrderIntern()
+	
+	Do ..Logger.Info("Call OUT", ..GeefLogDetail())
+	
+	Quit ConfirmOrderResult
+]]></Implementation>
+</Method>
+
+<Method name="ConfirmOrderIntern">
+<Private>1</Private>
+<ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
+<Implementation><![CDATA[
+	#define EdiTestPrefix   "VHTST"
+		
+	// Datum converteren naar dd.mm.jjjj 
+	If $$$UCase(..RequestedDeliveryDate) = "ASAP" {
+		Set DeliveryDate = "ASAP"
+	}
+	Else {
+		Set DeliveryDate = $$YYYYMMDD2EuropeanDate^vhLib.DateTime(..RequestedDeliveryDate)
+	}
+	
+	Set TbxOrderInfo = ..GeefTbxOrderInfo()
+	Set ConfirmType = $S(TbxOrderInfo.TbxHandel?1(1"HFLE",1"HFLB") : "TBX", 1:"Unishop")
+
+	Do ..Logger.Info("Internal WS", ..GeefLogDetail("Confirm via "_ConfirmType_"-order")_$$$CRLF_" (TbxOrderInfo.TbxHandel="_TbxOrderInfo.TbxHandel_")")
+
+	If ConfirmType = "TBX" {
+		Set ConfirmOrderResult = ..ConfirmOrderTbxIntern(DeliveryDate)
+	}
+	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)
+		}
+	}
+	
+	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[
+	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=""
+	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>
+
+<Method name="ConfirmOrderUniInternTEST">
+<FormalSpec>DeliveryDate:%String,UnishopVerwerker:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
+<Implementation><![CDATA[
+	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=""
+	Quit ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(ConfirmOrderInternalResult.EDINr)
+
+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
+]]></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"))
+	If IsConfirmed Do ..Logger.Info("IsConfirmed", ..GeefLogDetail("Order is geregistreerd als confirmed "))
+	Quit IsConfirmed
+]]></Implementation>
+</Method>
+
+<Method name="GeefUnishopVerwerker">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit "HFLE"   ; Voorlopig nog geen WebService nodig.  
+				  ; Uit te breiden wanneer Haefele.NL ook unishop bestellingen gaat doen. Maar tegen dan is deze implementatie vermoedelijk al deprecated.
+]]></Implementation>
+</Method>
+
+<Method name="ValideerGegevens">
+<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)
+	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:""))
+	}
+	
+	If (..EdiNr="") {
+		Do ..Logger.Warning("EDInr not provided", ..GeefLogDetail())
+		Do ..ReturnFaultMessage("EDInr is required")
+	}
+	
+	If $$$Not(..IsValidDeliveryDate(..RequestedDeliveryDate))
+	{	Do ..Logger.Warning("RequestedDeliveryDate not valid", ..GeefLogDetail())
+		Do ..ReturnFaultMessage("RequestedDeliveryDate not valid "_..RequestedDeliveryDate) 
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsValidDeliveryDate">
+<FormalSpec>DeliveryDate:%String=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	quit:($$$UCase(DeliveryDate) = "ASAP") 1   ; ASAP is altijd zuste :D 
+	
+	set result = $L(DeliveryDate) ; date is required 
+	if result set result = $$IsValidEuropeanDate^vhLib.DateTime($$YYYYMMDD2EuropeanDate^vhLib.DateTime(DeliveryDate)) ;
+	
+	quit result
+]]></Implementation>
+</Method>
+
+<Method name="GeefGebruiker">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Gebruiker = ""
+	If $IsObject($G(%request)) {
+		Set Gebruiker = $G(%request.CgiEnvs("REMOTE_USER"))
+	}
+
+	If Gebruiker = "" {
+		Set Gebruiker = "SYS_WSS"
+		Set ClientHost = $G(%request.CgiEnvs("REMOTE_HOST"))
+		If ClientHost?1"192.168.".E {
+			Set Gebruiker = "SYS_WSS_INTERN"
+		}
+	}
+
+	Quit Gebruiker
+]]></Implementation>
+</Method>
+
+<Method name="GeefLogDetail">
+<FormalSpec>MethodNaam:%String="ConfirmOrder"</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set ClientHost = ""
+	If $IsObject($G(%request)) {
+		Set ClientHost = $G(%request.CgiEnvs("REMOTE_HOST"))
+		// Set %ClientIP = $G(%request.CgiEnvs("REMOTE_ADDR"))
+	}
+	Quit MethodNaam_"("_..EdiNr_","_..RequestedDeliveryDate_",Ref:"_..HaefeleBestelRef_");User:"_..User_";Client:"_ClientHost
+]]></Implementation>
+</Method>
+
+<Method name="ReturnFaultMessage">
+<FormalSpec>Message:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do ..ReturnFault(##class(WS.WSClientFault).%New(Message, ..SoapServiceName, "CO"))
+]]></Implementation>
+</Method>
+
+<Method name="ReturnFault">
+<FormalSpec>fault:%SOAP.Fault</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do ##class(%SOAP.WebService).ReturnFault(fault)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>