Index: APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59659 -r59700
--- APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59659)
+++ APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59700)
@@ -8,48 +8,190 @@
 <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>
+</Property>
 
+<Property name="TranssmartWSClient">
+<Type>WS.Transsmart.TboxServicePort</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProjectSettingsAPI">
+<Type>DOM.common.impl.ProjectSettingsAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RequestBouwer">
+<Type>APPS.TRANSP.Transsmart.RequestDataBouwer</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI,EtiketPrinter:APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter</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" {
+		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())
+
 	Quit $$$OK
 ]]></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>
+</Method>
+
+<Method name="IsActief">
+<Implementation><![CDATA[	Quit ..ProjectSettingsAPI.IsTranssmartActive()
+]]></Implementation>
+</Method>
+
+<Method name="GeefBerichtVoorICT">
+<FormalSpec>Error:APPS.TRANSP.Transsmart.Error</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim BerichtVoorICT As %String = $$$CRLF_Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_$$$CRLF
+	Quit BerichtVoorICT
+]]></Implementation>
+</Method>
+
+<Method name="ThrowError">
+<Final>1</Final>
+<FormalSpec>Error:WS.Transsmart.tns.getStatusResponse</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim BerichtVoorGebruiker As %String = ""
+	#dim Calling As %List = ##class(TECH.ClassUtils).GetCallingMethod()
+	#dim CallingMethod As %String = $listget(Calling,1)_" -> "_$listget(Calling,2)
+    
+	If (Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).Waarschuwing()) {
+		
+		Set BerichtVoorGebruiker = Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_"Gelieve zelf of via OV actie te ondernemen."
+		Do ##class(vhLib.Logger).%New("Transsmart").Warning(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
+	}Else{
+		Set BerichtVoorGebruiker = Error.Niveau_$$$CRLF_"Dit probleem moet door ICT opgelost worden."		
+		Do ##class(vhLib.Logger).%New("Transsmart").ErrorMail(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
+	}
+	
+	If (Error.Niveau '= ##class(TECH.Exceptions.enu.Niveau).InterneWaarschuwing()){
+		Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Transsmart.Exceptions.CommunicatieException).%New(BerichtVoorGebruiker))
+	}
+]]></Implementation>
+</Method>
+
 <Method name="PrintEtikettenVoorLevering">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Implementation><![CDATA[
-	Do ##class(Tools.Wlip).%New(207).String("Printen etiketten levering " _ Levering.GeefID())
-	
-	/*
+	#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(Etiketten,Computernaam,"TRANSSMART_ZPL")
+]]></Implementation>
+</Method>
+
+<Method name="GeefEtiketten">
+<FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
+<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>
+
+<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
+]]></Implementation>
+</Method>
+
+<Method name="GeefDocs">
+<FormalSpec>Request:WS.Transsmart.tns.getDocs</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.Transsmart.tns.getDocsResponse</ReturnType>
+<Implementation><![CDATA[
+	Try {
+		do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,Request.%ClassName(1))
+		#dim Response As WS.Transsmart.tns.getDocsResponse = ..TranssmartWSClient.getDocs(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)
 	}
-	Do ..EtiketPrinter.PrintEtiketten(Responses,Computernaam,"TRANSP_DI1")
-	*/
+		
+	quit Response
 ]]></Implementation>
 </Method>
+
+<Method name="MaakEtikettenLijst">
+<FormalSpec>Response:WS.Transsmart.tns.getDocsResponse</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	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>
 </Class>