Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59700 -r60520
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59700)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 60520)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI="",EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer=""</FormalSpec>
+<FormalSpec>EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r60393 -r60520
--- APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 60393)
+++ APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 60520)
@@ -3,11 +3,6 @@
 <Class name="APPS.TRANSP.Transsmart.impl.EtiketService">
 <Super>TECH.Mockable</Super>
 
-<Property name="TransportAPI">
-<Type>APPS.TRANSP.TransportAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="EtiketPrinter">
 <Type>APPS.TRANSP.Transsmart.impl.EtiketPrinter</Type>
 <Private>1</Private>
@@ -34,34 +29,29 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI="",EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer=""</FormalSpec>
+<FormalSpec>EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..TransportAPI = $$$Inject(TransportAPI,##class(DOM.DomeinContext).Instance().GeefTransportAPI())
 	Set ..EtiketPrinter = $$$Inject(EtiketPrinter,##class(APPS.TRANSP.Transsmart.impl.EtiketPrinter).%New())
 	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
-	
 	Set ..ProjectSettingsAPI = $$$Inject(ProjectSettingsAPI, ##class(DOM.common.impl.ProjectSettingsAPI).%New())
 
 	If ..ConfigMgr.GeefOmgeving()="PROD" {
 		Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
-		Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 	}
 	else {
-		if ..ProjectSettingsAPI.GebruikTranssmartAcceptOmgeving()
-		{ 
+		if ..ProjectSettingsAPI.GebruikTranssmartAcceptOmgeving(){
 			Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
-			Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 		} else {		
-			Set ..TranssmartWSClient=##class(WS.Transsmart.impl.LoggingTboxServicePort).%New()		
+			Set ..TranssmartWSClient=$$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.LoggingTboxServicePort).%New())
 		}
 	}
+	Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 	Do ..SetSSLConfiguration("Transsmart")
 	Set ..RequestBouwer = $$$Inject(RequestBouwer,##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New())
-
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -73,7 +63,7 @@
 
 <Method name="SetSSLConfiguration">
 <FormalSpec>SSLConfiguration:%String</FormalSpec>
-<Implementation><![CDATA[	Set ..TranssmartWSClient.SSLConfiguration = SSLConfiguration
+<Implementation><![CDATA[	Do ..TranssmartWSClient.ZetSSLConfiguration(SSLConfiguration)
 ]]></Implementation>
 </Method>
 
@@ -120,10 +110,8 @@
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Implementation><![CDATA[
 	#dim Etiketten as List of %String = ..GeefEtiketten(Levering)
-
 	#dim Computernaam As %String = $Piece(##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam(),".",1)
 	Set Computernaam = ##class(TECH.StringUtils).ToUpper(Computernaam)	
-	
 	Do ..EtiketPrinter.PrintEtiketten(Etiketten,Computernaam,"TRANSSMART_ZPL")
 ]]></Implementation>
 </Method>
@@ -133,14 +121,10 @@
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	quit:$$$Not(..IsActief()) ##class(%ListOfDataTypes).%New()
-		
 	#dim ShipmentInfoReference As %String = ..GeefShipmentInfoReference(Levering)
 	#dim Request as WS.Transsmart.tns.getDocs = ..RequestBouwer.MaakgetDocsRequest(ShipmentInfoReference)
-	
 	#dim Response As WS.Transsmart.tns.getDocsResponse = ..GeefDocs(Request)
-	
 	#dim ZlpEtiketten As %ListOfObjects = ..MaakEtikettenLijst(Response)
-	
 	Quit ZlpEtiketten
 ]]></Implementation>
 </Method>