Index: APPS/OV/impl/TrackAndTraceService.cls.xml
===================================================================
diff -u -r50576 -r59732
--- APPS/OV/impl/TrackAndTraceService.cls.xml	(.../TrackAndTraceService.cls.xml)	(revision 50576)
+++ APPS/OV/impl/TrackAndTraceService.cls.xml	(.../TrackAndTraceService.cls.xml)	(revision 59732)
@@ -20,6 +20,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Transporteur">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -38,8 +43,11 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim URL As %String = ""
-	If ..IsTransportViaGLS(BonID) {
-		#dim Levering As DOM.TRANSP.Levering = ..GeefLeveringVoorBon(BonID)
+	#dim Levering As DOM.TRANSP.Levering = ..GeefLeveringVoorBon(BonID)
+
+	If ..IsTransportViaTranssmart(BonID){
+		Set URL = ##class(APPS.OV.impl.TranssmartTrackAndTrace).%New().GeefPrivateTrackAndTraceURL(Levering,..GeefTaal(BonID), ..Transporteur)
+	} ElseIf ..IsTransportViaGLS(BonID) {
 		If (Levering.GeefDistributeurDataIDs().Count()>0){
 			Set URL = ##class(APPS.OV.impl.GLSTrackAndTrace).%New().GeefPrivateTrackAndTraceURL(Levering,..GeefTaal(BonID))
 		}Else{
@@ -56,9 +64,11 @@
 <Implementation><![CDATA[
 	#dim URL As %String = ""
 	#dim Taal As %String = ..GeefTaal(BonID)
-	
-	If ..IsTransportViaGLS(BonID){		
 	#dim Levering As DOM.TRANSP.Levering = ..GeefLeveringVoorBon(BonID)
+	
+	If ..IsTransportViaTranssmart(BonID){
+		Set URL = ##class(APPS.OV.impl.TranssmartTrackAndTrace).%New().GeefPubliekeTrackAndTraceURL(Levering,..GeefTaal(BonID), ..Transporteur)		
+	} ElseIf ..IsTransportViaGLS(BonID){		
 		If (Levering.GeefDistributeurDataIDs().Count()>0){		
 			Set URL = ##class(APPS.OV.impl.GLSTrackAndTrace).%New().GeefPubliekeTrackAndTraceURL(Levering,Taal)
 		}Else{
@@ -69,18 +79,41 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefTransporteurVoorBonId">
+<FormalSpec>BonID:%String</FormalSpec>
+<ReturnType>DOM.TRANSP.enu.Transporteur</ReturnType>
+<Implementation><![CDATA[
+	#dim Bon As DOM.VKP.Bon = ..OrderApi.GeefBon(BonID)
+	#dim Rit As DOM.TRANSP.Rit = ..TransportApi.GeefRit(Bon.GeefRitID())
+
+	Set ..Transporteur = Rit.GeefTransporteur()
+
+	Quit ..Transporteur
+]]></Implementation>
+</Method>
+
 <Method name="IsTransportViaGLS">
 <FormalSpec>BonID:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim Bon As DOM.VKP.Bon = ..OrderApi.GeefBon(BonID)
-	#dim Rit As DOM.TRANSP.Rit = ..TransportApi.GeefRit(Bon.GeefRitID())
-	
-	Quit ..TransportApi.IsGLS(Rit.GeefTransporteur())
+	Set TransporteurID = ..GeefTransporteurVoorBonId(BonID)
+	#dim IsTransportGLS As %Boolean = ##class(TECH.StringUtils).Equals(TransporteurID , ##class(DOM.TRANSP.enu.Transporteur).GLSBelgiumFreight(), ##class(DOM.TRANSP.enu.Transporteur).GLSBelgiumParcel())
+	Quit IsTransportGLS
 ]]></Implementation>
 </Method>
 
+<Method name="IsTransportViaTranssmart">
+<FormalSpec>BonID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set TransporteurID = ..GeefTransporteurVoorBonId(BonID)
+	#dim IsTransportGLS As %Boolean = ##class(TECH.StringUtils).Equals(TransporteurID , ##class(DOM.TRANSP.enu.Transporteur).VRD(), ##class(DOM.TRANSP.enu.Transporteur).DHL())
+	Quit IsTransportGLS
+]]></Implementation>
+</Method>
+
 <Method name="GeefLeveringVoorBon">
 <FormalSpec>BonID:%String</FormalSpec>
 <Private>1</Private>