Index: APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r59689 -r72373
--- APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 59689)
+++ APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 72373)
@@ -28,8 +28,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VerzendDataRepository">
+<Type>APPS.TRANSP.Transsmart.data.VerzendDataRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="",ResponseControleur:APPS.TRANSP.Transsmart.impl.ResponseControleur=""</FormalSpec>
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="",ResponseControleur:APPS.TRANSP.Transsmart.impl.ResponseControleur="",VerzendDataRepository:APPS.TRANSP.Transsmart.data.VerzendDataRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -42,8 +47,8 @@
 		Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
 		Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 	}
-	else {
-		if ..ProjectSettingsAPI.GebruikTranssmartAcceptOmgeving()
+	Else {
+		If ..ProjectSettingsAPI.GebruikTranssmartAcceptOmgeving()
 		{ 
 			Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
 			Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
@@ -52,9 +57,9 @@
 		}
 	}
 	Do ..SetSSLConfiguration("Transsmart")
-	Do ..ZetAuthenticationHeader()
 	Set ..RequestBouwer = $$$Inject(RequestBouwer,##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New())
 	Set ..ResponseControleur = $$$Inject(ResponseControleur,##class(APPS.TRANSP.Transsmart.impl.ResponseControleur).%New())
+	Set ..VerzendDataRepository = $$$Inject(VerzendDataRepository,##class(APPS.TRANSP.Transsmart.data.VerzendDataRepository).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -69,14 +74,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetAuthenticationHeader">
-<Implementation><![CDATA[	Do ..TranssmartWSClient.HeadersOut.SetAt( ..TranssmartWSClient.GeefAuthenticationHeader(),1)
-]]></Implementation>
-</Method>
-
 <Method name="SetSSLConfiguration">
 <FormalSpec>SSLConfiguration:%String</FormalSpec>
-<Implementation><![CDATA[	Set ..TranssmartWSClient.SSLConfiguration = SSLConfiguration
+<Implementation><![CDATA[	Do ..TranssmartWSClient.ZetSSLConfiguration(SSLConfiguration)
 ]]></Implementation>
 </Method>
 
@@ -89,7 +89,7 @@
 
 <Method name="ThrowError">
 <Final>1</Final>
-<FormalSpec>Error:WS.Transsmart.tns.getStatusResponse,VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
+<FormalSpec>Error:APPS.TRANSP.Transsmart.Error,VerzendData:APPS.TRANSP.Transsmart.data.VerzendData=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim BerichtVoorGebruiker As %String = ""
@@ -100,22 +100,6 @@
 		
 		Set BerichtVoorGebruiker = Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_"Gelieve zelf of via OV actie te ondernemen."
 		Do ##class(vhLib.Logger).%New("Transsmart").Warning(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
-	/*		
-	}ElseIf(Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).FoutmeldingTeMeldenAanGebruiker()){
-
-		Set BerichtVoorGebruiker = Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_"Gelieve zelf of via OV actie te ondernemen."
-		Do ##class(vhLib.Logger).%New("GLS").Warning(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
-		
-	}ElseIf(Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).InterneWaarschuwing()){
-		
-		Set BerichtVoorGebruiker = Error.Niveau_$C(13,10)_"Dit is enkel een waarschuwing. Code en data zijn correct."
-		Do ##class(vhLib.Logger).%New("GLS").WarningMail(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
-		
-	}ElseIf(Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).PleaseRetryError()){
-		
-		Set BerichtVoorGebruiker = "Niet gelukt. Gelieve opnieuw te proberen."
-		Do ##class(vhLib.Logger).%New("GLS").WarningMail(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
-	*/	
 	}Else{
 		Set BerichtVoorGebruiker = Error.Niveau_$$$CRLF_"Dit probleem moet door ICT opgelost worden."		
 		Do ##class(vhLib.Logger).%New("Transsmart").ErrorMail(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
@@ -133,10 +117,20 @@
 <Private>1</Private>
 <ReturnType>WS.Transsmart.tns.getStatusResponse</ReturnType>
 <Implementation><![CDATA[
+	
 	do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,Request.%ClassName(1))
-	Quit:(Request.%ClassName(1) = "WS.Transsmart.tns.doBooking") ..TranssmartWSClient.doBooking(Request)
-	Quit:(Request.%ClassName(1) = "WS.Transsmart.tns.doDelete") ..TranssmartWSClient.doDelete(Request)
-	;invalid requesttype
+	#dim Response as %String ="" ; WS.Transsmart.tns.getStatusResponse =""
+	Try {
+		Set:(Request.%IsA(##class(WS.Transsmart.tns.doBooking).%ClassName(1))) Response = ..TranssmartWSClient.doBooking(Request)
+		Set:(Request.%IsA(##class(WS.Transsmart.tns.doDelete).%ClassName(1))) Response = ..TranssmartWSClient.doDelete(Request)
+		Set:(Request.%IsA(##class(WS.Transsmart.tns.doManifest).%ClassName(1))) Response = ..TranssmartWSClient.doManifest(Request)
+		Set:(Request.%IsA(##class(WS.Transsmart.tns.getStatusHistoryByQuery).%ClassName(1))) Response = ..TranssmartWSClient.getStatusHistoryByQuery(Request)
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ##class(vhLib.Logger).LogEnMailExceptie(Exception)
+		Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
+	}	
+	Quit Response
 ]]></Implementation>
 </Method>
 
@@ -146,11 +140,11 @@
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
 <Implementation><![CDATA[
-	#Dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData
-	if $length(ID) {
-	  	set VerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).OpenId(ID)
-	} else {
-	  	set VerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).%New()		
+	#dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData
+	If $length(ID) {
+		Set VerzendData = ..VerzendDataRepository.GeefViaID(ID)
+	} Else {
+	  	Set VerzendData = ..VerzendDataRepository.Maak()
 	}
 	Quit VerzendData
 ]]></Implementation>
@@ -160,9 +154,7 @@
 <FormalSpec>Error:APPS.TRANSP.Transsmart.Error</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#Dim BerichtVoorICT As %String = $$$CRLF_Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_$$$CRLF
-	Quit BerichtVoorICT
+<Implementation><![CDATA[	Quit $$$CRLF_Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_$$$CRLF
 ]]></Implementation>
 </Method>
 
@@ -186,7 +178,18 @@
 <FormalSpec>Response:WS.Transsmart.tns.getStatusResponse</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit Response.shipmentInfo.trackingUrl
+<Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	
+	#dim Url as %String = Response.shipmentInfo.trackingUrl
+	If (Url = "TEST") { // ERKA geeft dit om de een de ander reden terug als url.
+		Set Url = ""
+	}
+	If (Response.shipmentInfo.carrier = Transporteur.Schenker) {
+		Set Url = "https://www.dbschenker.com/app/tracking-public/?refNumber=" _ Response.shipmentInfo.reference _ "&refType=ShippersRefNo"	
+	}
+	
+	Quit Url
 ]]></Implementation>
 </Method>