Index: APPS/TBXWeb/OrderService.cls.xml =================================================================== diff -u -r409 -r413 --- APPS/TBXWeb/OrderService.cls.xml (.../OrderService.cls.xml) (revision 409) +++ APPS/TBXWeb/OrderService.cls.xml (.../OrderService.cls.xml) (revision 413) @@ -151,9 +151,11 @@ onError set $zt="" set Exception = ##class(TECH.ExceptionHandler).Catch() - Set SoapClientLocation=$S($IsObject($G(SoapClient)):SoapClient.Location, 1:"") - do WebOrder.AddToTransferLog(0,SoapClientLocation,Exception.GeefOmschrijving()) - do ##class(vhLib.Logger).%New("TBXWeb").ErrorMail("onErrorSoap: "_WebOrder.mID_" ("_SoapClientLocation_ ")",Exception.ToString()) + If Exception.GeefExceptionCode()'=##class(TECH.enu.ExceptionCode).InvalidInput() { + Set SoapClientLocation=$S($IsObject($G(SoapClient)):SoapClient.Location, 1:"") + do WebOrder.AddToTransferLog(0,SoapClientLocation,Exception.GeefOmschrijving()) + do ##class(vhLib.Logger).%New("TBXWeb").ErrorMail("onErrorSoap: "_WebOrder.mID_" ("_SoapClientLocation_ ")",Exception.ToString()) + } do ##class(TECH.ExceptionHandler).Rethrow(Exception) quit ]]> Index: csp/vhisie/TBX/Main/tmpDev.mac.rou =================================================================== diff -u -r390 -r413 --- csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 390) +++ csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 413) @@ -619,11 +619,21 @@ onTransferError set $ztrap="" new Exception set Exception = ##class(TECH.ExceptionHandler).Catch() - ;new + new TransfStatus - do ##class(vhLib.Logger).%New("TBXWeb").ErrorMail("Error bij Transfereer (=OrderToAdmin) "_$G(wsID)_". ",Exception.ToString()) - Do oxxAddToLog("!TRANSF!") + + If Exception.GeefExceptionCode()=##class(TECH.enu.ExceptionCode).InvalidInput() { + do ##class(vhLib.Logger).%New("TBXWeb").WarningMail("Exceptie bij Transfereer (=OrderToAdmin) "_$G(wsID)_". ",Exception.ToString()) + Set TransfStatus="DONE" + } + Else { + do ##class(vhLib.Logger).%New("TBXWeb").ErrorMail("Error bij Transfereer (=OrderToAdmin) "_$G(wsID)_". ",Exception.ToString()) + Set TransfStatus="ERROR" + } + Set %session.Data("TransfStatus")=TransfStatus + Set scStatus=##class(WS.TBX.Order).TransfStatusSetByID($G(wsID),"") + set arJSExec(1)="alert("_$$$QuoteJS("Transfer to ADMIN:")_"+'\n'+"_$$$QuoteJS(Exception.GeefOmschrijving())_");" set arJSExec(2)="document.location.replace("_$$$QuoteJS("main.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr))_");" quit