Index: WS/UNI/SFS/impl/OrderService.cls.xml
===================================================================
diff -u
--- WS/UNI/SFS/impl/OrderService.cls.xml	(revision 0)
+++ WS/UNI/SFS/impl/OrderService.cls.xml	(revision 60361)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.UNI.SFS.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.UNI.SFS.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="KlantBestelRef">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="User">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>SoapServiceName:%String="SFS.OrderServiceUNI"</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..SoapServiceName = SoapServiceName
+	Set ..SoapServiceName = "OrderServiceUNI"   ; Tijdelijk (development) om backward-compatible te zijn. Geen idee of SFS hierop rekent. 
+	Set ..Logger = ##Class(WS.UNI.SFS.Logger).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ConfirmOrder">
+<FormalSpec>EdiNr:%String,RequestedDeliveryDate:%String="",KlantBestelRef:%String=""</FormalSpec>
+<ReturnType>WS.UNI.SFS.ConfirmOrderResult</ReturnType>
+<Implementation><![CDATA[
+	Set ..EdiNr = $$$Trim($TR(EdiNr,$C(0),""))
+	Set ..RequestedDeliveryDate = $$$Trim(RequestedDeliveryDate)
+	Set ..KlantBestelRef = $$$Trim(KlantBestelRef)
+	Set ..User = ..GeefGebruiker()
+	
+	Do ..Logger.Info("Call IN", ..GeefLogDetail())
+	
+	Do ..ValideerGegevens()
+	#dim ConfirmOrderResult As WS.UNI.SFS.ConfirmOrderResult = ..ConfirmOrderIntern()
+	
+	Do ..Logger.Info("Call OUT", ..GeefLogDetail())
+	
+	Quit ConfirmOrderResult
+]]></Implementation>
+</Method>
+
+<Method name="ConfirmOrderIntern">
+<Private>1</Private>
+<ReturnType>WS.UNI.SFS.ConfirmOrderResult</ReturnType>
+<Implementation><![CDATA[
+	#dim DeliveryDate As %String
+	#dim ConfirmOrderInternalResult As WS.EC.UNI.SFS.ConfirmOrderResult
+	
+	// Datum converteren naar dd.mm.jjjj 
+	If $$$UCase(..RequestedDeliveryDate) = "ASAP" {
+		Set DeliveryDate = "ASAP"
+	}
+	Else {
+		Set DeliveryDate = $$YYYYMMDD2EuropeanDate^vhLib.DateTime(..RequestedDeliveryDate)
+	}
+	
+	Set ConfirmOrderInternalResult = ..ConfirmOrderSFS(..EdiNr, ..KlantBestelRef , DeliveryDate )
+	Quit ##class(WS.UNI.SFS.ConfirmOrderResult).%New(ConfirmOrderInternalResult.EDINr, ConfirmOrderInternalResult.ProductionDays)
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrderServiceInternal">
+<Private>1</Private>
+<ReturnType>WSimpl.EC.Unishop.OrderConfirmation.Service</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WSimpl.EC.Unishop.OrderConfirmation.Service).%New()
+]]></Implementation>
+</Method>
+
+<Method name="ConfirmOrderSFS">
+<FormalSpec>EDInr:%Integer,sfsref:%String,sfsDeliveryDate:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.EC.UNI.SFS.ConfirmOrderResult</ReturnType>
+<Implementation><![CDATA[
+	#dim UnishopConfirmOrderResult As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal().ConfirmOrder(EDInr,##class(APPS.EC.enu.UniShopVerwerker).SFS(),sfsref,sfsDeliveryDate)	
+	Quit ##class(WS.EC.UNI.SFS.ConfirmOrderResult).%New(UnishopConfirmOrderResult.EDINr, UnishopConfirmOrderResult.ProductionDays)
+]]></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 
+	#dim IsInterneGebruikerToegelaten As %Boolean= (..User = "SYS_WSS_INTERN") && ($H < 64368)   ; Toelating geldig tot 26/03/2017 (ingesteld op 08/02/2017)
+	If ($$$LCase(..User) '= "sfs") && ($$$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[
+	#dim result As %Boolean
+	
+	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[
+	#dim Gebruiker As %String = ""
+	#dim ClientHost As %String 
+	
+	If $IsObject($G(%request)) {
+		Set Gebruiker = $P($G(%request.CgiEnvs("REMOTE_USER")), "\", 2)
+		; If Gebruiker '= "sfs"  Do LogInfo("Gebruiker <> 'sfs';  CgiEnvs = "_$G(%request.CgiEnvs("REMOTE_USER")))
+		Set Gebruiker = "sfs"
+	}
+
+	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="UNI-ConfirmOrder"</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ClientHost = ""
+	
+	If $IsObject($G(%request)) {
+		Set ClientHost = $G(%request.CgiEnvs("REMOTE_HOST"))
+		// Set %ClientIP = $G(%request.CgiEnvs("REMOTE_ADDR"))
+	}
+	Quit MethodNaam_"("_..EdiNr_","_..RequestedDeliveryDate_",Ref:"_..KlantBestelRef_");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>
Index: WS/UNI/SFS/Logger.cls.xml
===================================================================
diff -u
--- WS/UNI/SFS/Logger.cls.xml	(revision 0)
+++ WS/UNI/SFS/Logger.cls.xml	(revision 60361)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.UNI.SFS.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="""SFS WS.UNI Admin"" <AdminTBX@vanhoecke.be>"
+	Set lbTo=$LB("ICT_SFS.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_UNI_SFS")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/UNI/SFS/OrderServiceInternal.cls.xml
===================================================================
diff -u -r60355 -r60361
--- WS/EC/UNI/SFS/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 60355)
+++ WS/EC/UNI/SFS/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 60361)
@@ -6,19 +6,21 @@
 <Super>WS.OngeauthenticeerdeWebService</Super>
 
 <Parameter name="SERVICENAME">
+<Description>
+Deze klasse is eigenlijk niet meer nodig na de overgang naar Kemp-Proxy?</Description>
 <Default>OrderServiceInternal</Default>
 </Parameter>
 
 <Parameter name="NAMESPACE">
 <Default>http://www.vanhoecke.be/SFS</Default>
 </Parameter>
 
-<Method name="ConfirmOrderOud">
+<Method name="ConfirmOrder">
 <FormalSpec>EDInr:%Integer,sfsref:%String,sfsDeliveryDate:%String</FormalSpec>
 <ReturnType>WS.EC.UNI.SFS.ConfirmOrderResult</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	#dim UnishopConfirmOrderResult As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal().ConfirmOrderOud(EDInr,##class(APPS.EC.enu.UniShopVerwerker).SFS(),sfsref,sfsDeliveryDate)	
+	#dim UnishopConfirmOrderResult As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal().ConfirmOrder(EDInr,##class(APPS.EC.enu.UniShopVerwerker).SFS(),sfsref,sfsDeliveryDate)	
 	Quit ##class(WS.EC.UNI.SFS.ConfirmOrderResult).%New(UnishopConfirmOrderResult.EDINr, UnishopConfirmOrderResult.ProductionDays)
 ]]></Implementation>
 </Method>
Index: WS/UNI/SFS/ConfirmOrderResult.cls.xml
===================================================================
diff -u
--- WS/UNI/SFS/ConfirmOrderResult.cls.xml	(revision 0)
+++ WS/UNI/SFS/ConfirmOrderResult.cls.xml	(revision 60361)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.UNI.SFS.ConfirmOrderResult">
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLNAME">
+<Default>ConfirmOrderResult</Default>
+</Parameter>
+
+<Parameter name="XMLSEQUENCE">
+<Default>1</Default>
+</Parameter>
+
+<Property name="EDINr">
+<Type>%Integer</Type>
+<Required>1</Required>
+<Parameter name="XMLNAME" value="EDINr"/>
+</Property>
+
+<Property name="ProductionDays">
+<Type>%Integer</Type>
+<Required>1</Required>
+<Parameter name="XMLNAME" value="ProductionDays"/>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>EDINr:%Integer,ProductionDays:%Integer</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..EDINr = EDINr
+	Set ..ProductionDays = ProductionDays
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r60355 -r60361
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 60355)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 60361)
@@ -75,7 +75,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ConfirmOrderOud">
+<Method name="ConfirmOrder">
 <FormalSpec>EDInr:%Integer,Shop:APPS.EC.enu.UniShopVerwerker,BestelReferentie:%String,GevraagdeLeverdatum:%String</FormalSpec>
 <ReturnType>WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult</ReturnType>
 <Implementation><![CDATA[
Index: WS/UNI/SFS/OrderService.cls.xml
===================================================================
diff -u
--- WS/UNI/SFS/OrderService.cls.xml	(revision 0)
+++ WS/UNI/SFS/OrderService.cls.xml	(revision 60361)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.UNI.SFS.OrderService">
+<Description>
+Web service for SFS to confirm orders.  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>OrderServiceUNI</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Description>
+SOAP Namespace for the WebService</Description>
+<Default>http://www.vanhoecke.be/SFS</Default>
+</Parameter>
+
+<Method name="ConfirmOrder">
+<FormalSpec>EDInr:%Integer,sfsref:%String,sfsDeliveryDate:%String=""</FormalSpec>
+<ReturnType>WS.UNI.SFS.ConfirmOrderResult</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(WS.UNI.SFS.impl.OrderService).%New().ConfirmOrder(EDInr, sfsDeliveryDate, $G(sfsref))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>