Index: AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml
===================================================================
diff -u -r58238 -r58276
--- AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml	(.../DocumentOphalen.cls.xml)	(revision 58238)
+++ AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml	(.../DocumentOphalen.cls.xml)	(revision 58276)
@@ -18,13 +18,20 @@
 <Type>BL.EC.pxDocLink</Type>
 </Property>
 
+<Property name="DocumentLocationService">
+<Type>AXimpl.Dynamics.DocumentLocationOut.DocumentLocationService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Description>
 DocType : Factuur, Levering, Order, Offerte, PrijsLijst, Rappel
 GenerateType : PDF, XML</Description>
 <FormalSpec>Request:WS.Vhisie4.KlantDocument.GeefDocumentRequest</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Set ..DocumentLocationService = ##class(AXimpl.Dynamics.DocumentLocationOut.DocumentLocationService).%New()
+	
 	Set Timer=##class(TECH.Timing.Timer).%New("")
 	Do Timer.Start()
 
@@ -43,40 +50,76 @@
 	Set %Taal=..Request.Header.Taal
 	Set %ECSession=##class(Derde.EC.Session).%New()
 	Set %ECSession.Taal=%Taal
-	If ((..Request.DocumentType = "Factuur") && (##class(TECH.StringUtils).StartsWith(..Request.DocumentId,"VF")||##class(TECH.StringUtils).StartsWith(..Request.DocumentId,"VC"))) || ((..Request.DocumentType = "Order")&& (##class(TECH.StringUtils).StartsWith(..Request.DocumentId,"VO"))){
-				
-				#dim DocumentType As AXimpl.Dynamics.DocumentLocationOut.enu.DocumentType = "" 
-				Set DocumentType = ##class(AXimpl.Dynamics.DocumentLocationOut.enu.DocumentType).GeefValueViaDisplayValue(..Request.DocumentType)
+	#dim DocUrl As %String = ""
+	
+	If ..IsFactuur() {
+		Do ..ZetDocUrl(..DocumentLocationService.GeefBestandslocatie(..Request.DocumentId, ..GeefDocumentType() ))
+	} ElseIf ..IsOrder() {
+		Do ..ZetDocUrl(..GeefOrderBestandslocatie())
+	} Else {
+		Set ..DocURL = ##class(BL.EC.Data).%New().GetDocumentURL(..Request.Header.SessieId,..GeefRecordType(),..GeefResultaatType(),..Request.DocumentId,..Request.Header.KlantId)
+	}
+]]></Implementation>
+</Method>
 
-				Set DocumentLocationService = ##class(AXimpl.Dynamics.DocumentLocationOut.DocumentLocationService).%New()
-				#dim DocUrl As %String = DocumentLocationService.GeefBestandslocatie(..Request.DocumentId, DocumentType )
+<Method name="GeefOrderBestandslocatie">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim files As TECH.MultiDim
+	Do GETFILES^vhDEV("\\FOP\fop\AX_PROD\",.files,"OrderBvs_" _..Request.DocumentId _"*", "F")
+	Quit $Order(files(""), -1)
+]]></Implementation>
+</Method>
 
-				If DocUrl="" {
-					Set ..DocURL = ##class(BL.EC.pxDocLink).Create("","","https://www.vanhoecke.be/sites/default/files/uploads/DocNotAvailable" _ $Select(..Request.Header.Taal="F":"FR",1:"")_".pdf")
-				} else {
-					Set ..DocURL = ##class(BL.EC.Data).%New().GetDocumentURLDirect(..Request.Header.SessieId,DocUrl)
-				}
-	} Else {
-		Set ..DocURL = ##class(BL.EC.Data).%New().GetDocumentURL(..Request.Header.SessieId,..GeefDocumentType(),..GeefResultaatType(),..Request.DocumentId,..Request.Header.KlantId)
+<Method name="GeefDocumentType">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ##class(AXimpl.Dynamics.DocumentLocationOut.enu.DocumentType).GeefValueViaDisplayValue(..Request.DocumentType)
+]]></Implementation>
+</Method>
+
+<Method name="ZetDocUrl">
+<FormalSpec>DocUrl:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If DocUrl="" {
+		Set ..DocURL = ##class(BL.EC.pxDocLink).Create("","","https://www.vanhoecke.be/sites/default/files/uploads/DocNotAvailable" _ $Select(..Request.Header.Taal="F":"FR",1:"")_".pdf")
+	} else {
+		Set ..DocURL = ##class(BL.EC.Data).%New().GetDocumentURLDirect(..Request.Header.SessieId,DocUrl)
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="IsFactuur">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ((..Request.DocumentType = "Factuur") && (##class(TECH.StringUtils).StartsWith(..Request.DocumentId,"VF") || ##class(TECH.StringUtils).StartsWith(..Request.DocumentId,"VC")))
+]]></Implementation>
+</Method>
+
+<Method name="IsOrder">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ((..Request.DocumentType = "Order") && ##class(TECH.StringUtils).StartsWith(..Request.DocumentId,"VO"))
+]]></Implementation>
+</Method>
+
 <Method name="GeefResultaatType">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..Request.ResultaatType
 ]]></Implementation>
 </Method>
 
-<Method name="GeefDocumentType">
+<Method name="GeefRecordType">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Type=..Request.DocumentType
-	Quit:Type="Factuur" $$$tgFactuur
-	Quit:Type="Order" $$$tgOrder
-	Quit:Type="Levering" $$$tgUitlevering
-	Quit:Type="Offerte" $$$tgOfferte
-	Quit:Type="Prijslijst" $$$tgPrijsLijst
+	Quit:(..Request.DocumentType="Factuur") $$$tgFactuur
+	Quit:(..Request.DocumentType="Order") $$$tgOrder
+	Quit:(..Request.DocumentType="Levering") $$$tgUitlevering
+	Quit:(..Request.DocumentType="Offerte") $$$tgOfferte
+	Quit:(..Request.DocumentType="Prijslijst") $$$tgPrijsLijst
+	Quit ""
 ]]></Implementation>
 </Method>