Index: vhUnitTest/APPS/TBXWeb/OrderVerwerkServiceMock.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/TBXWeb/OrderVerwerkServiceMock.cls.xml (revision 0) +++ vhUnitTest/APPS/TBXWeb/OrderVerwerkServiceMock.cls.xml (revision 253) @@ -0,0 +1,15 @@ + + + +1 +APPS.TBXWeb.OrderVerwerkService +0 + + +WebGroepOrder:WS.TBX.GroepOrder,WebOrder:WS.TBX.Order +%ListOfDataTypes + + + + Index: vhUnitTest/APPS/TBXWeb/TestOrderVerwerkService.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/TBXWeb/TestOrderVerwerkService.cls.xml (revision 0) +++ vhUnitTest/APPS/TBXWeb/TestOrderVerwerkService.cls.xml (revision 253) @@ -0,0 +1,30 @@ + + + +1 +vhUnitTest.TestCase +0 + + + DomeinX") + do $$$AssertEquals(Bezwaren.GetAt(2),"klant is verschillend : 1001 <> 1000") + + } +]]> + + + Index: cspBasis/GAProdTBox/tmpDev.mac.rou =================================================================== diff -u -r228 -r253 --- cspBasis/GAProdTBox/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 228) +++ cspBasis/GAProdTBox/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 253) @@ -151,10 +151,9 @@ */ -WSOrdToAdmin(wsID,OFFToAdmin) +VerwerkWebOrder(wsID,OFFToAdmin) #define SoapMethod 1 - ; #define SoapLoc "cache01\ADMIN1" - #define SoapLoc "cache02\DEV-ADMIN1" + #define SoapLoc "cache02\DEV-ADMIN1" New %RemoteIP,WSOrd,msg,sc,SoapErrorMsg,Opties,DestLoc,lbResult ; ,SaveOK,blnCalcPrs,blnFixed,OptiePRS,PreCalcID Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR")) @@ -168,55 +167,38 @@ Quit:('$IsObject(WSOrd)) $LB("","Unable to open WSOrder object") Quit:('$$otaBonTypeAllowed(.msg)) $LB("",msg) ;Quit:(WSOrd.BonType'?1(1"BBON",1"INKP")) $LB("","BonType should be 'BBON' or 'INKP'") Set sc=$$$OK - Do otaTransferWS - ;s lbResult=$LB($P($H,",",2),"TEST") ; + set lbResult = $$otaTransferWS() If $L($LG(lbResult,1)) Do . Do WSOrd.AddToTransferLog($LG(lbResult,1),$G(DestLoc),$LG(lbResult,2)) . Set:(WSOrd.BonType="OFF") WSOrd.BonType=OFFToAdmin . Set sc=WSOrd.%Save() Do otaAddToLog Set WSOrd="" ; Close Quit:($$$ISERR(sc)) $LB("",sc) - Quit lbResult + Quit $lb(Result) otaBonTypeAllowed(msg) ; msg als .local doorgeven Kill msg Quit:(WSOrd.BonType="OFF")&&($G(OFFToAdmin)?1(1"BBON",1"INKP")) 1 ; Change BonType after TransferWS() Quit:(WSOrd.BonType?1(1"BBON",1"INKP")) 1 - ; Else Set msg="BonType should be 'BBON' or 'INKP'" Quit 0 -otaTransferWS + +otaTransferWS() Set Opties="" - If $$otaUseSoapMsg Do - . ;Set SoapErrorMsg="" - . Set lbResult=$$otaTransferViaSoapMsg(Opties) - Else Do - . ; Uitvoeren in huidige namespace: - . Set DestLoc="-" - . If $$$SoapMethod Do - .. Set lbResult=$$otaTransferViaSoapMethod(Opties) - . Else Do - .. Set lbResult=##class(BL.PR.GA.TandemBox).WSOrdToAdmin(WSOrd,Opties) - Quit -otaTransferViaSoapMethod(Opties) - Quit ##class(WS.TBX.Calc).WSOrdToAdmin(WSOrd,.Opties) ; Class Method, returns $LB -otaUseSoapMsg() - Quit ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("cspBasis.GAProdTBox_OrderImportIntoAdminViaSoapMsg") -otaTransferViaSoapMsg(Opties) Set lbResult="" - Do otaTransferViaSoapMsgSub("WS.TBX.CalcSoap","WSOrdToAdmin") + Do otaTransferViaSoapMsgSub("WS.TBX.CalcSoap","VerwerkWebOrder") Quit lbResult + otaTransferViaSoapMsgSub(SoapClass,method) New Client,Result,lbLocations,locNdx Set Client=$System.OBJ.New(SoapClass) - Set Result=Client.PrepareWSOrdToAdmin(.lbLocations,.locNdx) ; No PeekServer, only one location - ;d WL^vhDBG("PeekServer (PrepareWSOrdToAdmin) finished ==> locNdx="_$G(locNdx)) + Set Result=Client.PrepareVerwerkWebOrder(.lbLocations,.locNdx) ; No PeekServer, only one location Do:(locNdx<0) otaSoapAddToLog ; Problem: no location Set DestLoc=Client.Location Quit:('Result) Do:(locNdx>1) otaSoapAddToLog ; Not the first location Set $ZTRAP="otaSoapErrorTransfer" - Set lbResult=Client.WSOrdToAdmin(WSOrd,.Opties,$G(%RemoteIP)) + Set Result = Client.VerwerkWebOrder(WSOrd) Set $ZTRAP="" Quit otaSoapAddToLog @@ -228,7 +210,6 @@ New CustomMsg Do . Quit:($G(%objlasterror,1)) - . // Hyperevent JS error messagebox . New msg,blnOnServer . Set blnOnServer=($$$GETERRORCODE(%objlasterror)=$$$SOAPFaultReceived) . Set msg="'TransferToADMIN Failed."_"\n\n"_"SOAP message: '"_"+"_##class(%CSP.Page).QuoteJS($S(blnOnServer:"the SOAP server returned a SOAP fault.", 1:$$ParseStatus^vhLib(%objlasterror))) @@ -237,7 +218,7 @@ Set CustomMsg="WSOrd: ID="_wsID_" : TransferToADMIN Failed." Do SOAPErrorMail^cspBasis.SOAPlib("TBX_ERR",,CustomMsg,,Client) Set $ZE="" - Quit + Quit $lb("","Een error has occured") otaAddToLog Do oxxAddToLog("TRANSF") Quit @@ -255,7 +236,6 @@ . Set %request="" k %request Else Do . Do ##class(cspBasis.GAProdTBox).AddToLog(Actie,$G(%session.Data("DOMAIN")),$G(%session.Data("KLNR")),$G(%session.Data("MODE")),wsID,$G(%session.Data("VERW")),,,lbExtras) - ;Do ##class(cspBasis.GAProdTBox).AddToLog(Actie,Domain,KLNr,WizMode,wsID,Verwerker,Taal,VhisieLogin,lbExtras) Quit FishEye: Tag 253 refers to a dead (removed) revision in file `WS/TBX/CalcSoap/WSOrdToAdmin.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: WS/TBX/CalcSoap.cls.xml =================================================================== diff -u -r27 -r253 --- WS/TBX/CalcSoap.cls.xml (.../CalcSoap.cls.xml) (revision 27) +++ WS/TBX/CalcSoap.cls.xml (.../CalcSoap.cls.xml) (revision 253) @@ -27,16 +27,26 @@ ]]> - + WSOrder To Admin -WSOrd:WS.TBX.Order,Opties:%String,ClientAddress:%String -%List +WebOrder:WS.TBX.Order +%String 1 - + + +WSOrder To Admin +WebGroepOrder:WS.TBX.GroepOrder +%String +1 + + + 1 %String @@ -60,29 +70,14 @@ ]]> - + %Boolean - - - - Index: APPS/TBXWeb/OrderVerwerkService.cls.xml =================================================================== diff -u --- APPS/TBXWeb/OrderVerwerkService.cls.xml (revision 0) +++ APPS/TBXWeb/OrderVerwerkService.cls.xml (revision 253) @@ -0,0 +1,112 @@ + + + +vhLib.Macro +1 +%RegisteredObject +0 + + +WebOrder:WS.TBX.Order + + + + +WebGroepOrder:WS.TBX.GroepOrder + + + +WebOrder:WS.TBX.Order + + + + +WebGroepOrder:WS.TBX.GroepOrder + + + +WebGroepOrder:WS.TBX.Order,WebOrderID:%String + + + + +WebGroepOrder:WS.TBX.GroepOrder,WebOrder:WS.TBX.Order +1 +%ListOfDataTypes + " _ WebOrder.WebDomain ) + if WebGroepOrder.KLNummer '= WebOrder.KLNummer do Bezwaren.Insert("klant is verschillend : "_WebGroepOrder.KLNummer_ " <> " _ WebOrder.KLNummer ) + + quit Bezwaren +]]> + + + +WebGroepOrder:WS.TBX.GroepOrder,WebOrder:WS.TBX.Order +1 + + + + Index: BL/PR/GA/TandemBox.cls.xml =================================================================== diff -u -r226 -r253 --- BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 226) +++ BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 253) @@ -1838,28 +1838,6 @@ ]]> - - -Omzetten van WSOrder data naar Offerte.Hoofding+Lijnen -Geeft als resultaat $LB(OffID,"") terug -De Kenmerken en enkele properties zijn reeds ingevuld, maar de producten (GAData+KPR) zijn nog NIET berekend. -1 -WSOrder:%String,Opties:%String,ClientAddress:%String -1 -%List - - - WSOrdToWWW stuurt een WS.TBX.Order object naar de server. Index: cspBasis/GAProdTBox.cls.xml =================================================================== diff -u -r230 -r253 --- cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 230) +++ cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 253) @@ -927,15 +927,15 @@ ]]> - + Transfer van een WSOrder naar ADMIN via WEB-SERVICE. Creƫert daar een Flow.Offerte.Hoofding+Lijnen Geeft $LB(oHfd.ID,"info...") terug. 1 wsID:%String,OFFToAdmin:%String 1 %List - Index: BL/Prod/GAData/TBXLadeXML/pxEDIOrder.cls.xml =================================================================== diff -u -r2 -r253 --- BL/Prod/GAData/TBXLadeXML/pxEDIOrder.cls.xml (.../pxEDIOrder.cls.xml) (revision 2) +++ BL/Prod/GAData/TBXLadeXML/pxEDIOrder.cls.xml (.../pxEDIOrder.cls.xml) (revision 253) @@ -179,29 +179,5 @@ - - - -