Index: TECH/Files.cls.xml =================================================================== diff -u -r2 -r7 --- TECH/Files.cls.xml (.../Files.cls.xml) (revision 2) +++ TECH/Files.cls.xml (.../Files.cls.xml) (revision 7) @@ -1,6 +1,7 @@ +vhLib.Macro 1 %RegisteredObject 0 @@ -9,14 +10,35 @@ %ListOfObjects + +1 +Directory:%String,Filename:%String + + + + +1 +Directory:%String,SubPath:%String + + + Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0 %ListOfObjects BL.EC.Common 1 -%SOAP.WebService +WS.WebService 0 @@ -19,22 +19,6 @@ http://vhisie.vanhoecke.be - - -URL for invoking the WebService. - location on www (Hadev): "http://iserv.vanhoecke.be/csp/hadev"; - location on www (Demo ): "http://iserv.vanhoecke.be/csp/demo" ; -http://iserv.vanhoecke.be/csp/demo - - - -http://iserv.vanhoecke.be/csp/hadev - - - -http://iserv.vanhoecke.be/csp/demo - - InternalError @@ -48,7 +32,7 @@ Type : "DynaLog"
Data : is een LargeObject (<32K) dat de ganse te transferen data bevat. Eventueel geplaatst tussen [CDATA ...]] tags]]> 1 -GebruikersNaam,WachtWoordEncrypt,Type,Optie,Data:%GlobalCharacterStream,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein="" +GebruikersNaam,WachtWoordEncrypt,Type,Optie,Data:%GlobalCharacterStream,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein="",KlantNummer="" BL.EC.pxDynaPlug 1 + +1 +GebruikersNaam,WachtWoordEncrypt,Type,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein="" +BL.EC.pxDynaPlug +1 + + + 1 SessionID:%String,pxTBXOrder:BL.EC.sub.pxTBXOrder @@ -95,7 +119,7 @@ Set $ZTRAP="OnSoapError" - Set WSClient = $System.OBJ.New("WS.EC.WebShopClient") + Set WSClient = ##class(WS.EC.WebShopClient).%New() Set Result = WSClient.UpdateTBXOrder(SessionID,pxTBXOrder) Quit Result @@ -106,14 +130,14 @@ Set $ZTRAP="" ;Mail verzenden met error-boodschap - Set SoapFault=WSClient.GetSoapFault() If $IsObject(SoapFault) Do - . $$$AddErrorToLog("EDI DynaPlug","SoapFault",$$$ERROR($$$GeneralError,SoapFault.AsString())) + . ;$$$AddErrorToLog("EDI DynaPlug","SoapFault",$$$ERROR($$$GeneralError,SoapFault.AsString())) Do SOAPErrorMail^cspBasis.SOAPlib("WSH_DP_ERR",,$ZE) ;Statuscode teruggeven + Set %Taal = "N" Set Result=$$$dpStatusERR(..#errInternalError) Quit Result @@ -126,10 +150,9 @@ BL.EC.pxDynaPlug 1 + + +Alleen die klanten toegelaten tot de sessie worden opgenomen in de dataset
+Criteria : Te zoeken waarde +ZoekType :
+  Leeg = DerdeNaam of DerdeNr
+  "W" = Woonplaats
+  "P" = Postkode
+  "S" = Straat]]> +1 +SessionID:%String,ZoekString:%String="",ZoekType:WS.EC.enu.ZoekType="" +BL.EC.pxDynaPlug +1 + + + 1 SessionID:%String,pxDynaPlug:BL.EC.pxDynaPlug @@ -163,7 +229,7 @@ Set $ZTRAP="OnSoapError" - Set WSClient = $System.OBJ.New("WS.EC.WebShopClient") + Set WSClient = ##class(WS.EC.WebShopClient).%New() Set Result = WSClient.CancelAll(SessionID,pxDynaPlug) Quit Result @@ -177,11 +243,11 @@ Set SoapFault=WSClient.GetSoapFault() If $IsObject(SoapFault) Do - . $$$AddErrorToLog("EDI DynaPlug","SoapFault",$$$ERROR($$$GeneralError,SoapFault.AsString())) + . ;$$$AddErrorToLog("EDI DynaPlug","SoapFault",$$$ERROR($$$GeneralError,SoapFault.AsString())) Do SOAPErrorMail^cspBasis.SOAPlib("WSH_DP_ERR",,$ZE) ;Statuscode teruggeven - + Set %Taal = "N" Set Result=$$$dpStatusERR(..#errInternalError) Quit Result Index: BL/EC/pxDynaPlug.cls.xml =================================================================== diff -u -r2 -r7 --- BL/EC/pxDynaPlug.cls.xml (.../pxDynaPlug.cls.xml) (revision 2) +++ BL/EC/pxDynaPlug.cls.xml (.../pxDynaPlug.cls.xml) (revision 7) @@ -1,7 +1,7 @@ -%VHMacro +vhLib.Macro 1 %RegisteredObject,%XML.Adaptor 0 @@ -24,6 +24,11 @@ list + +BL.EC.sub.pxKlantInfo +list + + %String @@ -36,6 +41,10 @@ %String + +%Boolean + + 1 Status,Omschrijving @@ -50,16 +59,18 @@ -Test method for ..FillTBXDesignOptions() +Test method for ..FillTBXDesignOptions() +do ##class(BL.EC.pxDynaPlug).TestFillDO() 1 Taal:%String="" Index: BL/EC/sub/pxKlantInfo.cls.xml =================================================================== diff -u --- BL/EC/sub/pxKlantInfo.cls.xml (revision 0) +++ BL/EC/sub/pxKlantInfo.cls.xml (revision 7) @@ -0,0 +1,20 @@ + + + +1 +%RegisteredObject,%XML.Adaptor +0 + + +%String + + + +%String + + + +%String + + + Index: _csp/www/DynaPlugReport.csp =================================================================== diff -u -r3 -r7 --- _csp/www/DynaPlugReport.csp (.../DynaPlugReport.csp) (revision 3) +++ _csp/www/DynaPlugReport.csp (.../DynaPlugReport.csp) (revision 7) @@ -270,7 +270,7 @@ - + Index: BL/EC/pxKlantInfoAdres.cls.xml =================================================================== diff -u -r2 -r7 --- BL/EC/pxKlantInfoAdres.cls.xml (.../pxKlantInfoAdres.cls.xml) (revision 2) +++ BL/EC/pxKlantInfoAdres.cls.xml (.../pxKlantInfoAdres.cls.xml) (revision 7) @@ -40,6 +40,9 @@ Quit:($$$Not(##class(TECH.Config.ConfigMgr).Instance().GetBoolean("BL.EC.pxKlantInfoAdres_MagVHInterneKlantenDataOphalen"))) // Do not execute this method on WWW-server !!! + #if ##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()["DMZ" + #else + /// Execute this code only on Internal servers !!! Set SkipMainAddress=$G(SkipMainAddress,0) @@ -70,6 +73,8 @@ . . Do pxAdres.Fill(Aanspreking, Naam, ToeNaam, StraatNrBus, PostCode, WoonPlaats, LandCode) . Do Array.SetAt(pxAdres,$I(VolgNr)) &sql(CLOSE FAP) + + #endif ]]> Index: TECH/Enumeration.cls.xml =================================================================== diff -u -r2 -r7 --- TECH/Enumeration.cls.xml (.../Enumeration.cls.xml) (revision 2) +++ TECH/Enumeration.cls.xml (.../Enumeration.cls.xml) (revision 7) @@ -9,6 +9,7 @@ 1 %ListOfDataTypes +1 + +1 +%List +1 + + + 1 TECH.ListIterator +1 + + +datatype +1 +TECH.Enumeration +0 + + +,NaamOfNummer,Woonplaats,Postcode,Straat + + + +1 + + + + +1 + + + + +1 + + + + +1 + + + + Index: WS/EC/WebShopClient.cls.xml =================================================================== diff -u -r2 -r7 --- WS/EC/WebShopClient.cls.xml (.../WebShopClient.cls.xml) (revision 2) +++ WS/EC/WebShopClient.cls.xml (.../WebShopClient.cls.xml) (revision 7) @@ -4,22 +4,6 @@ %SOAP.WebClient,WS.SOAPClientExt 0 - - -This is the URL used to access the web service. - Location van Cache01/Admin1 : "http://195.130.157.5:88/csp/admin1/WS.EC.WebShopServer.cls"; - Location van Cache02/DevAdmin1 : "http://195.130.157.6/csp/admin1/WS.EC.WebShopServer.cls"; -http://195.130.157.5:88/csp/admin1/WS.EC.WebShopServer.cls - - - -http://195.130.157.5:88/csp/admin1/WS.EC.WebShopServer.cls - - - -http://195.130.157.6/csp/admin1/WS.EC.WebShopServer.cls - - This is the namespace used by the Service @@ -44,6 +28,18 @@ ]]> + +1 +SessionID:%String,ZoekString:%String,ZoekType:WS.EC.enu.ZoekType="" +1 +BL.EC.pxDynaPlug +1 +document +literal + + + 1 SessionID:%String @@ -58,16 +54,28 @@ 1 -GebruikersNaam:%String,WachtWoordEncrypt:%String,Type:%String,Optie:%String,Data:%GlobalCharacterStream,Taal:%String,DynaplugVersion:%String,DynalogVersion:%String,ClientIP:%String,Domein:%String +GebruikersNaam:%String,WachtWoordEncrypt:%String,Type:%String,Optie:%String,Data:%GlobalCharacterStream,Taal:%String,DynaplugVersion:%String,DynalogVersion:%String,ClientIP:%String,Domein:%String,KlantNummer:%String 1 BL.EC.pxDynaPlug 1 document literal - + +1 +GebruikersNaam:%String,WachtWoordEncrypt:%String,Type:%String,Taal:%String,DynaplugVersion:%String,DynalogVersion:%String,ClientIP:%String,Domein:%String +1 +BL.EC.pxDynaPlug +1 +document +literal + + + 1 SessionID:%String,pxTBXOrder:BL.EC.sub.pxTBXOrder @@ -139,5 +147,27 @@ + + +1 +1 +%String +1 +document +literal + + + + +1 +1 +%Status + + FishEye: Tag 7 refers to a dead (removed) revision in file `WS/EC/WebShopProxy/Transfer.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 7 refers to a dead (removed) revision in file `WS/EC/WebShopProxy/CancelAll.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 7 refers to a dead (removed) revision in file `WS/EC/WebShopProxy/UpdateTBXOrder.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 7 refers to a dead (removed) revision in file `WS/EC/WebShopProxy/Confirm.cls.xml'. FishEye: No comparison available. Pass `N' to diff?
#(##class(Res.Vertaling).GetVertalingPlus("DP","EDINr","L",Taal))# : #(pxWebShop.WebShopID)# #(##class(Res.Vertaling).GetVertalingPlus("DP","Reference","L",Taal))#: #(pxWebShop.CommReferentie)#