Index: APPS/TBXWeb/impl/HFLEOrderHandler.cls.xml =================================================================== diff -u -r2 -r727 --- APPS/TBXWeb/impl/HFLEOrderHandler.cls.xml (.../HFLEOrderHandler.cls.xml) (revision 2) +++ APPS/TBXWeb/impl/HFLEOrderHandler.cls.xml (.../HFLEOrderHandler.cls.xml) (revision 727) @@ -6,12 +6,12 @@ 0 -0 +1 %String - @@ -27,31 +27,80 @@ ]]> - -Destination -%List + +%Status " - Set ServerPrefix="" -#Else - Set lbTo=$LB($$$EMailOVHfleTEST) ; """Hafele OV."" <$$$EMailOVHfleTEST>" - Set ServerPrefix="["_$$$Server_"] " -#EndIf + Set flagTest = $$$Not(##class(TECH.Config.ConfigMgr).Instance().GetBoolean("APPS.TBXWeb.impl.HFLEOrderHandler_PostHttpRequest")) + + // Opbouwen van de XML voor de Orderbevestiging + Set blProxy=##class(BL.Prod.GAData.TBXLadeXML).Instantiate() ; instantiate BL object + Set blProxy.blnShowVKP = 1 ; parameters prijzen tonen opzetten ; + Set blProxy.blnShowAKP = 1 ; parameters prijzen tonen opzetten ; + + Set pxOrder= blProxy.BuildProxyDoc(..WSOrd,"EDI",.stBuildProxyDoc) + + If ($$$ISERR(stBuildProxyDoc)) Do Quit stBuildProxyDoc + . Do ..Logger.Error("HFLE_BUILD_PROXY_FAILED",$$ParseStatus^vhLib.System(stBuildProxyDoc)) + + Do blProxy.Close() + Set blProxy="" + + Set Stream = ##class(%GlobalCharacterStream).%New() + + Set TopTag="TBOX_ORDER_EDI" + Set blnIndentTags=1 + Set AllowEmptyProxy=0 + Set stProxyToXMLStream=$$ProxyToXMLStream^vhLib(pxOrder,.Stream, .TopTag, blnIndentTags, AllowEmptyProxy) + + If $$$ISERR(stProxyToXMLStream) Do Quit stProxyToXMLStream + . Do ..Logger.Error("HFLE_PROXYTOSTREAM_FAILED","wsID = "_..WSOrd.mID_" Error = "_$$ParseStatus^vhLib.System(stProxyToXMLStream)) + + + // Verzenden van de xml-stream via HTTP-post (of SendMiniMail in Testmode, i.e. flagTest=1) + Set HttpRequest = ##class(%Net.HttpRequest).%New() + ;Set:$$$Not(flagTest) HttpRequest.Server="192.168.24.10" ; ip-adres van netwerk-tunnel naar hafele-server (dit i.p.v. een domeinnaam); Testserver IP = "192.168.25.31" + Set:$$$Not(flagTest) HttpRequest.Server="192.168.25.31" ; tunnel naar de testserver + Set:$$$Not(flagTest) HttpRequest.Port=15000 - Quit lbTo -]]> - + Set HttpRequest.ContentType = "text/xml" + Set HttpRequest.ContentEncoding = "UTF-8" + Do HttpRequest.EntityBody.CopyFrom(Stream) + + Set lbExtras="" + Set lbExtras=lbExtras_$LB("HttpPostServer"_HttpRequest.Server) + Set:($L(..WSOrd.Opmerking1)) lbExtras=lbExtras_$LB("MailComment="_..WSOrd.Opmerking1) + Do ##class(cspBasis.GAProdTBox).AddToLog("SUBMIT_ORDER",..GeefOrderDomein(),..WSOrd.KLNummer,"shop="_..Shop,..WSOrd.mID,..Requester,..Taal,,lbExtras) - -%Status - - + If $$$Not(flagTest) Set stPost = HttpRequest.Post("/",0) + Else Set stPost=$$SendMiniMail^vhLib("""HFLE_POSTER"" ",$lb("ICT_SupportTBX@vanhoecke.be"),"HFLE POST for WSid : "_..WSOrd.%Id(),Stream,1) + + If $$$ISERR(stPost) Do Quit stPost + . Do ..Logger.Error("HFLE_POST_FAILED","wsID = "_..WSOrd.mID_" Error = "_$$ParseStatus^vhLib.System(stPost)) + - -%String -