Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml
===================================================================
diff -u -r59676 -r59682
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59676)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59682)
@@ -12,11 +12,37 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="GeeftShipmentInfoReference">
+<FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="IsActief">
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="MaakEtikettenLijst">
+<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="SetSSLConfiguration">
 <FormalSpec>SSLConfiguration:%String</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkRequest">
+<FormalSpec>Request:WS.Transsmart.tns.getDocs</FormalSpec>
+<ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="ZetAuthenticationHeader">
 <Implementation><![CDATA[]]></Implementation>
 </Method>
Index: APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r59667 -r59682
--- APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 59667)
+++ APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 59682)
@@ -136,6 +136,7 @@
 	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)
+	Quit:(Request.%ClassName(1) = "WS.Transsmart.tns.getDocs") ..TranssmartWSClient.getDocs(Request)
 	;invalid requesttype
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/Transsmart/impl/Etiket.cls.xml
===================================================================
diff -u -r59676 -r59682
--- APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59676)
+++ APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59682)
@@ -1,85 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.Transsmart.impl.Etiket">
-<Super>TECH.Mockable</Super>
+<Super>APPS.TRANSP.Transsmart.impl.CommunicatieService.Template</Super>
 
-<Property name="ConfigMgr">
-<Type>TECH.Config.ConfigMgr</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="ProjectSettingsAPI">
-<Type>DOM.common.impl.ProjectSettingsAPI</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="TranssmartWSClient">
-<Type>WS.Transsmart.TboxServicePort</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="RequestBouwer">
-<Type>APPS.TRANSP.Transsmart.RequestDataBouwer</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="ResponseControleur">
-<Type>APPS.TRANSP.Transsmart.impl.ResponseControleur</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="Zbl">
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
 
-<Method name="%OnNew">
-<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort=""</FormalSpec>
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
+<Method name="GeefEtiketten">
+<FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
+<ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	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()
-		{ 
-			Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
-			Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
-		} else {		
-			Set ..TranssmartWSClient=##class(WS.Transsmart.impl.LoggingTboxServicePort).%New()		
-		}
-	}
-	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())
-	Quit $$$OK
+	quit:$$$Not(..IsActief())	
+		
+	#dim ShipmentInfoReference As %String = GeefShipmentInfoReference(Levering)
+	#dim Request as WS.Transsmart.tns.getDocs = ..RequestBouwer.MaakgetDocsRequest(ShipmentInfoReference)
+	
+	#dim ResponseVerzendData As APPS.TRANSP.Transsmart.data.VerzendData = ..VerwerkRequest(Request)
+	
+	#dim ZlpEtiketten As %ListOfObjects = ..MaakEtikettenLijst(ResponseVerzendData)
+	
+	Quit ZlpEtiketten
 ]]></Implementation>
 </Method>
 
-<Method name="ZetAuthenticationHeader">
-<Implementation><![CDATA[	Do ..TranssmartWSClient.HeadersOut.SetAt( ..TranssmartWSClient.GeefAuthenticationHeader(),1)
+<Method name="GeefShipmentInfoReference">
+<FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ConcatineerSymboolReference As %String = "X"
+	#dim RitID As %String = $$$Trim(Levering.GeefRitID())
+	#dim Uitlevering As %String = $$$Trim(Levering.GeefID())
+	#dim Reference As %String = RitID_ConcatineerSymboolReference_Uitlevering
+	
+	Quit Reference
+	///Quit "24851X303698"
 ]]></Implementation>
 </Method>
 
-<Method name="SetSSLConfiguration">
-<FormalSpec>SSLConfiguration:%String</FormalSpec>
-<Implementation><![CDATA[	Set ..TranssmartWSClient.SSLConfiguration = SSLConfiguration
+<Method name="VerwerkRequest">
+<FormalSpec>Request:WS.Transsmart.tns.getDocs</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
+<Implementation><![CDATA[
+	#dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData = ..GeefVerzendData(Request.GeefVerzendDataID())
+	
+	#dim IsNieuweVerzendData As %Boolean = ( VerzendData.%Id() = "" )
+	if IsNieuweVerzendData {
+		set VerzendData.Reference = ..BepaalReference(Request)
+	}
+	// TODO Nodig
+	//set VerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Annulatie()
+	set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
+	do VerzendData.Save()
+
+	Try {
+		#dim Response As WS.Transsmart.tns.getStatusResponse = ..VerzendBericht(Request)
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ##class(vhLib.Logger).%New("Transsmart").ErrorMail("VerwerkRequest","Verzenden bericht mislukt."_$C(13,10)_$C(13,10)_Exception.ToString())
+		Set Error =##class(APPS.TRANSP.Transsmart.Error).%New("VH99",Exception.GeefOmschrijving())
+		do ..ThrowError(Error,VerzendData)
+	}
+
+	set VerzendData.Response = Response
+	
+	If ..ResponseControleur.ResponseBevatFout(Response) {
+		set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Failed()
+		do VerzendData.Save()
+		Set Error = ..ResponseControleur.GeefFoutInResponse(Response)
+		do ..ThrowError(Error, VerzendData)
+	}
+		
+	set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Finished()
+	do VerzendData.Save()
+	quit VerzendData
 ]]></Implementation>
 </Method>
 
-<Method name="GeefEtiketten">
+<Method name="MaakEtikettenLijst">
+<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
+<Private>1</Private>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	//%ListOfObjects(ELEMENTTYPE="WSdata.EC.ExterneVerkoop.VerzendingMogelijkheid.Selectie")
 	Set ZlpEtiketten = ##class(%ListOfObjects).%New()
+	set itLijstPackages = ##class(TECH.ListIterator).%New(VerzendData.Response.packages) // opgelet packages is lowercase dus zo behouden
+	
+	Do ##class(Tools.Wlip).%New(43).String("count ZlpEtiketten " _ ZlpEtiketten.Count())
+	
+	while itLijstPackages.HasNext() {
+		#dim ZlpLabelData As %String = itLijstPackages.Next()
+		Do ##class(Tools.Wlip).%New(43).String(ZlpLabelData)
+		Do ZlpEtiketten.Insert(ZlpLabelData)
+	}
+	
 	Quit ZlpEtiketten
 ]]></Implementation>
 </Method>
Index: WS/Transsmart/tns/getDocs.cls.xml
===================================================================
diff -u -r59489 -r59682
--- WS/Transsmart/tns/getDocs.cls.xml	(.../getDocs.cls.xml)	(revision 59489)
+++ WS/Transsmart/tns/getDocs.cls.xml	(.../getDocs.cls.xml)	(revision 59682)
@@ -6,7 +6,7 @@
 <ClassType>serial</ClassType>
 <CompileAfter/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SerialObject,%XML.Adaptor</Super>
+<Super>WS.Transsmart.tns.RequestBase,%SerialObject,%XML.Adaptor</Super>
 <Inheritance>right</Inheritance>
 
 <Parameter name="ELEMENTQUALIFIED">
@@ -47,6 +47,9 @@
 <Value name="2">
 <Value>actionInfo</Value>
 </Value>
+<Value name="3">
+<Value>VerzendDataID</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59673 -r59682
--- APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59673)
+++ APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59682)
@@ -32,10 +32,13 @@
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Implementation><![CDATA[
 	Do ##class(Tools.Wlip).%New(207).String("Printen etiketten levering " _ Levering.GeefID())
-	// ophalen zpl
+	// ophalen zpl - LAura 
+	Set EtiketBouwer = ##class(APPS.TRANSP.Transsmart.impl.Etiket).%New()
+	Set Etiketten = EtiketBouwer.GeefEtiketten(Levering)
 	// bepalen device
 	// dump zpl to device
 	
+	
 	/*
 	#dim Computernaam As %String = $Piece(##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam(),".",1)
 	Set Computernaam = ##class(TECH.StringUtils).ToUpper(Computernaam)
Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml
===================================================================
diff -u -r59676 -r59682
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59676)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59682)
@@ -15,9 +15,22 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefEtiketten">
+<Method name="GeeftShipmentInfoReference">
+<FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeeftShipmentInfoReference",Levering)
+]]></Implementation>
+</Method>
+
+<Method name="IsActief">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("IsActief")
+]]></Implementation>
+</Method>
+
+<Method name="MaakEtikettenLijst">
+<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEtiketten")
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakEtikettenLijst",VerzendData)
 ]]></Implementation>
 </Method>
 
@@ -27,6 +40,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkRequest">
+<FormalSpec>Request:WS.Transsmart.tns.getDocs</FormalSpec>
+<ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("VerwerkRequest",Request)
+]]></Implementation>
+</Method>
+
 <Method name="ZetAuthenticationHeader">
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetAuthenticationHeader")
 ]]></Implementation>