Index: APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59693 -r59700
--- APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59693)
+++ APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59700)
@@ -8,13 +8,11 @@
 <Private>1</Private>
 </Property>
 
-<UDLText name="T">
-<Content><![CDATA[
-// Property EtiketPrinter As APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter [ Private ];
+<Property name="EtiketPrinter">
+<Type>APPS.TRANSP.Transsmart.impl.EtiketPrinter</Type>
+<Private>1</Private>
+</Property>
 
-]]></Content>
-</UDLText>
-
 <Property name="ConfigMgr">
 <Type>TECH.Config.ConfigMgr</Type>
 <Private>1</Private>
@@ -36,15 +34,16 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI,EtiketPrinter:APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter,ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer=""</FormalSpec>
+<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>
 <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.GLS.GLSv1.impl.EtiketPrinter).%New())
+	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" {
@@ -121,42 +120,24 @@
 <Method name="PrintEtikettenVoorLevering">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Implementation><![CDATA[
-	Do ##class(Tools.Wlip).%New(207).String("Printen etiketten levering " _ Levering.GeefID())
-	// ophalen zpl - LAura 
-	Set Etiketten = ..GeefEtiketten(Levering)
-	// bepalen device
-	// dump zpl to device
-	
-	
-	/*
+	#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)
+	Set Computernaam = ##class(TECH.StringUtils).ToUpper(Computernaam)	
 	
-	Set Responses = ##class(%ListOfObjects).%New()
-	#dim DistributeurDataIDs As %ListOfDataTypes = Levering.GeefDistributeurDataIDs()
-	Set DistributeurDataIDIt = ##class(TECH.ListIterator).%New(DistributeurDataIDs)
-	While DistributeurDataIDIt.HasNext()
-	{
-		#Dim DistributeurDataID as %String = DistributeurDataIDIt.Next()
-		#dim DistributeurData As APPS.TRANSP.GLS.GLSv1.data.VerzendData = ..TransportAPI.GeefDistributeurData(DistributeurDataID)
-		Do Responses.Insert(DistributeurData.Response)
-	}
-	Do ..EtiketPrinter.PrintEtiketten(Responses,Computernaam,"TRANSP_DI1")
-	*/
+	Do ..EtiketPrinter.PrintEtiketten(Etiketten,Computernaam,"TRANSSMART_ZPL")
 ]]></Implementation>
 </Method>
 
 <Method name="GeefEtiketten">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	quit:$$$Not(..IsActief())	
+	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
@@ -172,7 +153,6 @@
 	#dim RitID As %String = $$$Trim(Levering.GeefRitID())
 	#dim Uitlevering As %String = $$$Trim(Levering.GeefID())
 	#dim Reference As %String = RitID_ConcatineerSymboolReference_Uitlevering
-	
 	Quit Reference
 ]]></Implementation>
 </Method>
@@ -199,16 +179,16 @@
 <Method name="MaakEtikettenLijst">
 <FormalSpec>Response:WS.Transsmart.tns.getDocsResponse</FormalSpec>
 <Private>1</Private>
-<ReturnType>%ListOfObjects</ReturnType>
+<ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	Set ZlpEtiketten = ##class(%ListOfObjects).%New()
-	set itLijstPackages = ##class(TECH.ListIterator).%New(Response.packages) // opgelet packages is lowercase dus zo behouden
-	
-	while itLijstPackages.HasNext() {
-		#dim ZlpLabelData As %String = itLijstPackages.Next()
+	Set ZlpEtiketten = ##class(%ListOfDataTypes).%New()
+	set PackageIterator = ##class(TECH.ListIterator).%New(Response.packages) // opgelet packages is lowercase dus zo behouden
+	#dim Package as WS.Transsmart.tns.GetDocsResponsePackageLabel =""
+	while PackageIterator.HasNext() {
+		Set Package = PackageIterator.Next()
+		#dim ZlpLabelData As %String = Package.labelData
 		Do ZlpEtiketten.Insert(ZlpLabelData)
 	}
-	
 	Quit ZlpEtiketten
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59693 -r59700
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59693)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59700)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI,EtiketPrinter:APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter,ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer=""</FormalSpec>
+<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>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59693 -r59700
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59693)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59700)
@@ -20,19 +20,16 @@
 </Method>
 
 <Method name="IsActief">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="SetSSLConfiguration">
 <FormalSpec>SSLConfiguration:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="ZetAuthenticationHeader">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>