Index: WS/TBX/HAEFELE/ConfirmOrderResult.cls.xml
===================================================================
diff -u -r60364 -r60491
--- WS/TBX/HAEFELE/ConfirmOrderResult.cls.xml	(.../ConfirmOrderResult.cls.xml)	(revision 60364)
+++ WS/TBX/HAEFELE/ConfirmOrderResult.cls.xml	(.../ConfirmOrderResult.cls.xml)	(revision 60491)
@@ -21,13 +21,6 @@
 <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>
Index: WS/TBX/HAEFELE/impl/OrderService.cls.xml
===================================================================
diff -u -r60377 -r60491
--- WS/TBX/HAEFELE/impl/OrderService.cls.xml	(.../OrderService.cls.xml)	(revision 60377)
+++ WS/TBX/HAEFELE/impl/OrderService.cls.xml	(.../OrderService.cls.xml)	(revision 60491)
@@ -120,8 +120,9 @@
 <Private>1</Private>
 <ReturnType>WS.TBX.HAEFELE.ConfirmOrderResult</ReturnType>
 <Implementation><![CDATA[
-	#dim ConfirmOrderInternalResult As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult
 	Quit:(..OrderGeregistreerdAlsConfirmed("Unishop")) ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(..EdiNr)
+	
+	#dim ConfirmOrderInternalResult As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult
 
 	Set ConfirmOrderInternalResult = ..ConfirmOrderHaefele(..EdiNr, UnishopVerwerker, ..HaefeleBestelRef, DeliveryDate)
 	Quit ##class(WS.TBX.HAEFELE.ConfirmOrderResult).%New(ConfirmOrderInternalResult.EDINr)
@@ -171,8 +172,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 
-	#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)) {
+	If ($$$Not($$$LCase(..User) = "haefelebe")) {
 		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:""))
 	}
Index: WS/UNI/SFS/impl/OrderService.cls.xml
===================================================================
diff -u -r60361 -r60491
--- WS/UNI/SFS/impl/OrderService.cls.xml	(.../OrderService.cls.xml)	(revision 60361)
+++ WS/UNI/SFS/impl/OrderService.cls.xml	(.../OrderService.cls.xml)	(revision 60491)
@@ -110,7 +110,7 @@
 <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)) {
+	If ($$$Not($$$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:""))
 	}
@@ -132,13 +132,13 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	quit:($$$UCase(DeliveryDate) = "ASAP") $$$True   ; ASAP is altijd zuste :D
+	
 	#dim result As %Boolean
+		
+	Set result = $L(DeliveryDate) ; date is required 
+	If result set result = $$IsValidEuropeanDate^vhLib.DateTime($$YYYYMMDD2EuropeanDate^vhLib.DateTime(DeliveryDate)) ;
 	
-	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>
@@ -152,7 +152,6 @@
 	
 	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"
 	}