Index: APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59849 -r60393
--- APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59849)
+++ APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 60393)
@@ -60,7 +60,6 @@
 		}
 	}
 	Do ..SetSSLConfiguration("Transsmart")
-	Do ..ZetAuthenticationHeader()
 	Set ..RequestBouwer = $$$Inject(RequestBouwer,##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New())
 
 	Quit $$$OK
Index: vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml
===================================================================
diff -u -r59699 -r60393
--- vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 59699)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60393)
@@ -9,9 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="MaakdoBookingRequest">
-<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
 <ReturnType>WS.Transsmart.tns.doBooking</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakdoBookingRequest",LeveringInfo)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakdoBookingRequest",LeveringInfo,Rit)
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/Template.cls.xml
===================================================================
diff -u -r59728 -r60393
--- APPS/TRANSP/Transsmart/impl/CommunicatieService/Template.cls.xml	(.../Template.cls.xml)	(revision 59728)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService/Template.cls.xml	(.../Template.cls.xml)	(revision 60393)
@@ -34,13 +34,13 @@
 </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="",VerzendWijzeBepaler:APPS.TRANSP.Transsmart.VerzendWijzeBepaler="",Rit:DOM.TRANSP.Rit,Levering:DOM.TRANSP.Levering</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="",VerzendWijzeBepaler:APPS.TRANSP.Transsmart.VerzendWijzeBepaler="",Rit:DOM.TRANSP.Rit,Levering:DOM.TRANSP.Levering</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ##super(ConfigMgr,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur)
+	Do ##super(ConfigMgr,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur,VerzendDataRepository)
 	Set ..VerzendWijzeBepaler = $$$Inject(VerzendWijzeBepaler,##class(APPS.TRANSP.Transsmart.impl.VerzendWijzeBepaler).%New())
 	Set ..Rit = Rit
 	Set ..Levering = Levering
Index: WS/Transsmart/impl/TboxServicePort.cls.xml
===================================================================
diff -u -r60352 -r60393
--- WS/Transsmart/impl/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 60352)
+++ WS/Transsmart/impl/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 60393)
@@ -49,6 +49,7 @@
 <Implementation><![CDATA[
 	Do ##super(Logger)
 	Set ..Timeout = 45
+	Do ..HeadersOut.SetAt(..GeefAuthenticationHeader(),1)
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -59,6 +60,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetSSLConfiguration">
+<FormalSpec>SSLConfiguration:%String</FormalSpec>
+<Implementation><![CDATA[	Set ..SSLConfiguration = SSLConfiguration
+]]></Implementation>
+</Method>
+
 <Method name="doBooking">
 <Final>1</Final>
 <FormalSpec>doBooking:WS.Transsmart.tns.doBooking</FormalSpec>
Index: vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml
===================================================================
diff -u -r59578 -r60393
--- vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 59578)
+++ vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 60393)
@@ -14,6 +14,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetSSLConfiguration">
+<FormalSpec>SSLConfiguration:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetSSLConfiguration",SSLConfiguration)
+]]></Implementation>
+</Method>
+
 <Method name="doBooking">
 <FormalSpec>doBooking:WS.Transsmart.tns.doBooking</FormalSpec>
 <ReturnType>WS.Transsmart.tns.getStatusResponse</ReturnType>
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml
===================================================================
diff -u -r60003 -r60393
--- APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml	(.../RegistreerLevering.cls.xml)	(revision 60003)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml	(.../RegistreerLevering.cls.xml)	(revision 60393)
@@ -3,6 +3,24 @@
 <Class name="APPS.TRANSP.Transsmart.impl.CommunicatieService.RegistreerLevering">
 <Super>APPS.TRANSP.Transsmart.impl.CommunicatieService.Template</Super>
 
+<Property name="EtiketService">
+<Type>APPS.TRANSP.Transsmart.impl.EtiketService</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="",VerzendDataRepository:APPS.TRANSP.Transsmart.data.VerzendDataRepository="",VerzendWijzeBepaler:APPS.TRANSP.Transsmart.VerzendWijzeBepaler="",Rit:DOM.TRANSP.Rit,Levering:DOM.TRANSP.Levering,EtiketService:APPS.TRANSP.Transsmart.impl.EtiketService=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do ##super(ConfigMgr,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur,VerzendDataRepository,VerzendWijzeBepaler,Rit,Levering)
+	Set ..EtiketService = $$$Inject(EtiketService,##class(APPS.TRANSP.Transsmart.impl.EtiketService).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="VoerUit">
 <Implementation><![CDATA[
 	quit:$$$Not(..IsActief())	
@@ -24,17 +42,17 @@
 	#dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData = ..GeefVerzendData(Request.GeefVerzendDataID())
 	
 	#dim IsNieuweVerzendData As %Boolean = ( VerzendData.%Id() = "" )
-	if IsNieuweVerzendData {
-		set VerzendData.Reference = ..BepaalReference(Request)
-		set VerzendData.Carrier = ..BepaalCarrier(Request)
+	If IsNieuweVerzendData {
+		Set VerzendData.Reference = ..BepaalReference(Request)
+		Set VerzendData.Carrier = ..BepaalCarrier(Request)
 		Set VerzendData.UnitID = VerzendData.Reference
-		set VerzendData.VerzendWijze = ..VerzendWijze
+		Set VerzendData.VerzendWijze = ..VerzendWijze
 	}
 	
-	set VerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Registratie()
-	set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
+	Set VerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Registratie()
+	Set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
 	Do Request.XMLExportToStream(VerzendData.RequestAsStream)
-	do VerzendData.Save()
+	Do ..VerzendDataRepository.Bewaar(VerzendData)
 		
 	if IsNieuweVerzendData Do ..VerwerkVerzendDataID(VerzendData.%Id())
 	
@@ -55,7 +73,7 @@
 	
 	If ..ResponseControleur.ResponseBevatFout(Response) {
 		set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Failed()
-		do VerzendData.Save()
+		Do ..VerzendDataRepository.Bewaar(VerzendData)
 		Set Error = ..ResponseControleur.GeefFoutInResponse(Response)
 		do ..ThrowError(Error, VerzendData)
 	}
@@ -64,7 +82,7 @@
 	Set VerzendData.TrackAndTraceID = ..BepaalTrackAndTraceID(Response)
 	
 	set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Finished()
-	do VerzendData.Save()
+	Do ..VerzendDataRepository.Bewaar(VerzendData)
 	quit VerzendData
 ]]></Implementation>
 </Method>
@@ -100,9 +118,7 @@
 <Method name="PrintEtiketten">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	Set EtiketService = ##class(APPS.TRANSP.Transsmart.impl.EtiketService).%New()
-	Do EtiketService.PrintEtikettenVoorLevering(Levering)
+<Implementation><![CDATA[	Do ..EtiketService.PrintEtikettenVoorLevering(Levering)
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r59933 -r60393
--- APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 59933)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 60393)
@@ -27,7 +27,7 @@
 	do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,"RitID " _ RitID _ " LeveringID " _ LeveringID)
 	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID)
 	#dim Levering As DOM.TRANSP.Levering = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(RitID,LeveringID)
-	set RegistreerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.RegistreerLevering).%New(,,,,,,Rit,Levering)
+	set RegistreerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.RegistreerLevering).%New(,,,,,,,Rit,Levering)
 	do RegistreerLevering.VoerUit()
 ]]></Implementation>
 </Method>
@@ -39,7 +39,7 @@
 	do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,"RitID " _ RitID _ " LeveringID " _ LeveringID)
 	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID)
 	#dim Levering As DOM.TRANSP.Levering = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(RitID,LeveringID)
-	set AnnuleerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.AnnuleerLevering).%New(,,,,,,Rit,Levering)
+	set AnnuleerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.AnnuleerLevering).%New(,,,,,,,Rit,Levering)
 	do AnnuleerLevering.VoerUit()
 ]]></Implementation>
 </Method>
Index: WS/Transsmart/TboxServicePort.cls.xml
===================================================================
diff -u -r59578 -r60393
--- WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 59578)
+++ WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 60393)
@@ -4,11 +4,6 @@
 <Abstract>1</Abstract>
 <Super>TECH.Interface</Super>
 
-<Method name="ZetLocationVoorOmgeving">
-<Abstract>1</Abstract>
-<FormalSpec>Omgeving:%String</FormalSpec>
-</Method>
-
 <Method name="doBooking">
 <Abstract>1</Abstract>
 <FormalSpec>doBooking:WS.Transsmart.tns.doBooking</FormalSpec>
@@ -37,6 +32,16 @@
 <ReturnTypeParams>XMLNAME="getLabelResponse"</ReturnTypeParams>
 </Method>
 
+<Method name="ZetLocationVoorOmgeving">
+<Abstract>1</Abstract>
+<FormalSpec>Omgeving:%String</FormalSpec>
+</Method>
+
+<Method name="ZetSSLConfiguration">
+<Abstract>1</Abstract>
+<FormalSpec>SSLConfiguration:%String</FormalSpec>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 /*
Index: APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r59862 -r60393
--- APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 59862)
+++ APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 60393)
@@ -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>
@@ -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>
 
@@ -156,9 +156,11 @@
 <Implementation><![CDATA[
 	#Dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData
 	if $length(ID) {
-	  	set VerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).OpenId(ID)
+		;set VerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).OpenId(ID)
+		Set VerzendData = ..VerzendDataRepository.GeefViaID(ID)
 	} else {
-	  	set VerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).%New()		
+	  	;set VerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).%New()		
+	  	Set VerzendData = ..VerzendDataRepository.Maak()
 	}
 	Quit VerzendData
 ]]></Implementation>
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/AnnuleerLevering.cls.xml
===================================================================
diff -u -r60003 -r60393
--- APPS/TRANSP/Transsmart/impl/CommunicatieService/AnnuleerLevering.cls.xml	(.../AnnuleerLevering.cls.xml)	(revision 60003)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService/AnnuleerLevering.cls.xml	(.../AnnuleerLevering.cls.xml)	(revision 60393)
@@ -11,10 +11,11 @@
 	while itLijstVerzendData.HasNext() {
 		#dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData = itLijstVerzendData.Next()
 		#dim Request as WS.Transsmart.tns.doDeleteBooking = ..RequestBouwer.MaakdoDeleteRequest(VerzendData) // moet de reference gaan bepalen.
-		
+		Do ##class(Tools.Wlip).%New(207).String("1")
 		do ..VerwerkRequest(Request)
-
+		Do ##class(Tools.Wlip).%New(207).String("2")
 		Do ..Levering.VerwijderEnBewaarDistributeurDataID(VerzendData.GeefID())
+		Do ##class(Tools.Wlip).%New(207).String("3")
 	}
 ]]></Implementation>
 </Method>
@@ -28,7 +29,9 @@
 	set VerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Annulatie()
 	set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
 	Do Request.XMLExportToStream(VerzendData.RequestAsStream)
+	Do ##class(Tools.Wlip).%New(207).String("1")
 	do VerzendData.Save()
+	Do ##class(Tools.Wlip).%New(207).String("2")
 
 	Try {
 		#dim Response As WS.Transsmart.tns.getStatusResponse = ..VerzendBericht(Request)
Index: APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml
===================================================================
diff -u -r59697 -r60393
--- APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 59697)
+++ APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60393)
@@ -6,7 +6,7 @@
 
 <Method name="MaakdoBookingRequest">
 <Abstract>1</Abstract>
-<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
 <ReturnType>WS.Transsmart.tns.doBooking</ReturnType>
 </Method>
 
Index: WS/Transsmart/impl/TboxServicePortBase.cls.xml
===================================================================
diff -u -r60348 -r60393
--- WS/Transsmart/impl/TboxServicePortBase.cls.xml	(.../TboxServicePortBase.cls.xml)	(revision 60348)
+++ WS/Transsmart/impl/TboxServicePortBase.cls.xml	(.../TboxServicePortBase.cls.xml)	(revision 60393)
@@ -43,18 +43,8 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAuthenticationHeaderDemo">
-<ReturnType>WS.Transsmart.tns.authentication</ReturnType>
-<Implementation><![CDATA[
-	Set Header = ##class(WS.Transsmart.tns.authentication).%New()
-	Set Header.userId="jo.willems@vanhoecke.be"
-	set Header.password = "Vanhoecke#21"
-	set Header.customerId = "DVANHOECK"
-	Quit Header
-]]></Implementation>
-</Method>
-
 <Method name="GeefAuthenticationHeader">
+<Private>1</Private>
 <ReturnType>WS.Transsmart.tns.authentication</ReturnType>
 <Implementation><![CDATA[
 	Set Header = ##class(WS.Transsmart.tns.authentication).%New()