Index: AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml =================================================================== diff -u -r49925 -r50012 --- AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml (.../DocumentOphalen.cls.xml) (revision 49925) +++ AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml (.../DocumentOphalen.cls.xml) (revision 50012) @@ -43,10 +43,24 @@ 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 Bestandsnaam As %String = ##class(AXimpl.Dynamics.DocumentLocationOut.DocumentLocationService).%New().GeefBestandslocatie(..Request.DocumentId, ..Request.DocumentType) - Set ..DocURL = ##class(BL.EC.Data).%New().GetDocumentURLDirect(..Request.Header.SessieId,Bestandsnaam) + 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 Bestandsnaam As %String = ##class(AXimpl.Dynamics.DocumentLocationOut.DocumentLocationService).%New().GeefBestandslocatie(..Request.DocumentId, ..Request.DocumentType) + //If $$$HasLength(Bestandsnaam){ + // Set ..DocURL = ##class(BL.EC.Data).%New().GetDocumentURLDirect(..Request.Header.SessieId,Bestandsnaam) + //} Else { + #dim Prefix As %String = $Select(..Request.DocumentType="Factuur":"Factuur", ..Request.DocumentType="Order":"OrderBvs", 1:"") + If Prefix '= "" { + Do GETFILES^vhDEV("\\FOP\fop\AX_PROD\",.files,Prefix_"_"_..Request.DocumentId_"*","F") + #dim DocUrl As %String = $Order(files(""), $Select(..Request.DocumentType="Factuur":1,1:-1)) + + 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) }