Index: WS/TBX/SFS/OrderServiceInternal.cls.xml
===================================================================
diff -u -r17 -r33
--- WS/TBX/SFS/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 17)
+++ WS/TBX/SFS/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 33)
@@ -24,61 +24,60 @@
 <Method name="ConfirmOrder">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>SecureKey:%String,EDInr:%Integer,sfsref:%String,sfsDeliveryDate:%String</FormalSpec>
-<ReturnType>ConfirmOrderResult</ReturnType>
+<ReturnType>WS.TBX.SFS.ConfirmOrderResult</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
-	Set oLogger = ##class(WS.TBX.SFS.Logger).%New()
 
-	Set SecureKey = $G(SecureKey)
-	If SecureKey'=$P($H,",",1) Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("Not Authorized call", ..#SERVICENAME, "CO")) 
-	. Do oLogger.ErrorMail("CHK_KEY_wsORD","Invalid securekey provided : "_SecureKey) 
+	Set $ZTrap="ConfirmOrderError"
 	
-	if '$length(EDInr) Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("EDI not provided", ..#SERVICENAME, "CO")) 
-	. Do oLogger.Error("CHK_EDI","EDI not provided")
-	
-	Set wsID = ##class(WS.TBX.Order).IDViaEDINr(EDInr)
+	Set OHRequester=##class(APPS.TBXWeb.enu.TBXHandel).SFS()
+	Set Logger = ##class(WS.TBX.OrderService.Logger).%New("WS_TBX_SFS")
+	Set OrderServiceHelper=##class(WS.TBX.OrderService.Verwerker).%New(OHRequester,Logger)
 
-	Set wsOrd = ##class(WS.TBX.Order).%OpenId(wsID)
-	If '$IsObject(wsOrd) Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("EDI not existing", ..#SERVICENAME, "CO")) 
-	. Do oLogger.Error("OPEN_wsORD","EDI "_EDInr_" not existing")
-	Do oLogger.Info("wsORD_OPEN","EDI opened "_EDInr)
-		
-	// Controle op Test klant SFS --> zoniet fout genereren.
-	;If wsOrd.KLNummer '= "55946" Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("Test customer not valid", ..#SERVICENAME, "CO")) 
-	;. Do oLogger.ErrorMail("CHK_CUST_wsORD","Customer "_wsOrd.KLNummer_" not valid") 
+	Do OrderServiceHelper.ControleerSecureKey(SecureKey)
+	Set wsOrder=OrderServiceHelper.OpenWSOrder(EDInr)
 	
+ ;	// Controle op Test klant SFS (KLNr=55946) --> zoniet fout genereren.
+ ;	If wsOrder.KLNummer '= "55946" {
+ ;		Do Logger.ErrorMail("CHK_CUST_wsORD","Customer "_wsOrder.KLNummer_" not valid") 
+ ;		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Test customer not valid")) 
+ ;	}
+	
 	set sfsref = $get(sfsref)
-	If $piece(wsOrd.Opmerking1,$$$CRLF) '= sfsref Do
-	. Set wsOrd.Opmerking1 = $get(sfsref)_ $$$CRLF _wsOrd.Opmerking1
-
-	Set wsOrd.LeverTijd = $g(sfsDeliveryDate)
+	If $piece(wsOrder.Opmerking1,$$$CRLF) '= sfsref {
+		Set wsOrder.Opmerking1 = $get(sfsref)_ $$$CRLF _wsOrder.Opmerking1
+	}
 	
-	Do oLogger.Info("SFS_ORDER","EDINr: "_EDInr_" sfsref : "_sfsref _ " Levertijd : "_$g(sfsDeliveryDate))
+	Set wsOrder.LeverTijd = $get(sfsDeliveryDate)
+	
+	Do Logger.Info("SFS_ORDER","EDINr: "_EDInr_" sfsref : "_sfsref _ " Levertijd : "_$Get(sfsDeliveryDate))
 
-	Set scSaved = wsOrd.%Save()
-	If 'scSaved Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("Order not saved", ..#SERVICENAME, "CO")) 
-	. Do oLogger.Error("SAVE_wsORD","EDInr: "_EDInr_" not saved : "_$$ParseStatus^vhLib.System(scSaved))
+	;Do OrderServiceHelper.SaveWSOrder(wsOrder)   ; Deze Save() is overbodig als de SubmitWSOrder() in ditzelfde caché-process wordt afgehandeld. 
+	Do OrderServiceHelper.SubmitWSOrder(wsOrder)
 
-	Set scOrdered = ##class(APPS.TBXWeb.OrderHandling).Order(wsID,"VHEPN","SFS")
-	If 'scOrdered Do  Do ..ReturnFault(##class(WS.WSServerFault).%New(SFSMessage, ..#SERVICENAME, "CO")) 
-	. Set SFSMessage = ..GetSFSMessage(scOrdered)
-	. Do oLogger.Error("wsORD_ORDER","Order not confirmed : "_$$ParseStatus^vhLib.System(scOrdered))
+	Do Logger.Info("wsORD_ORDER","Order "_EDInr_" ordered")
 	
-	Do oLogger.Info("wsORD_ORDER","Order "_EDInr_" ordered")
+	// Return EDI number
+	Set OrderResult=##class(WS.TBX.SFS.ConfirmOrderResult).%New(EDInr,3)   ; .%New(EDInr,$$ProductieDagen^FLOWHALUX())
+	Quit OrderResult
 	
-	// Return EDI number for testing purposes
-	Quit ##class(ConfirmOrderResult).%New(EDInr,3)
-	//Quit ##class(ConfirmOrderResult).%New(EDInr,$$ProductieDagen^FLOWHALUX())
+	
+ConfirmOrderError
+	Set $ZTrap=""
+	Set Exception=##class(TECH.ExceptionHandler).Catch()
+	Set ErrorMessage=""
+	If (Exception.%Extends("WS.TBX.OrderService.VerwerkingException")) { 
+		// Deze specifieke exceptions zijn reeds gelogd. Hier enkel de SoapFault opzetten 
+		Set ErrorMessage=Exception.GeefOmschrijving()
+	}
+	Else
+	{
+		// Alle andere exceptions en caché-errors worden hier gelogd+gemaild naar ICT 
+		Set ErrorMessage="Error in confirmation of order "_EDInr_".  Van Hoecke ICT has been notified."
+		Do Logger.ErrorMail("HAEFELE_ORDER",ErrorMessage_$$$CRLF_Exception.GeefOmschrijving()_"  "_Exception.ToString())
+	}
+	Do ..ReturnFault(##class(WS.WSServerFault).%New(ErrorMessage, ..#SERVICENAME, "CO"))
 ]]></Implementation>
 </Method>
-
-<Method name="GetSFSMessage">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>Status:%Status</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit $select($$$GETERRORCODE(Status)=$$$errStartTypeIncorrect:"Order already confirmed",1:"Order not confirmed")
-]]></Implementation>
-</Method>
 </Class>
 </Export>