Index: WS/EC/WebShopProxy.cls.xml
===================================================================
diff -u -r2 -r7
--- WS/EC/WebShopProxy.cls.xml	(.../WebShopProxy.cls.xml)	(revision 2)
+++ WS/EC/WebShopProxy.cls.xml	(.../WebShopProxy.cls.xml)	(revision 7)
@@ -3,7 +3,7 @@
 <Class name="WS.EC.WebShopProxy">
 <IncludeCode>BL.EC.Common</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SOAP.WebService</Super>
+<Super>WS.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="SERVICENAME">
@@ -19,22 +19,6 @@
 <Default>http://vhisie.vanhoecke.be</Default>
 </Parameter>
 
-<Parameter name="LOCATION">
-<Description>
-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" ;</Description>
-<Default>http://iserv.vanhoecke.be/csp/demo</Default>
-</Parameter>
-
-<Parameter name="LOCATIONxxxWWW01xxxHADEV">
-<Default>http://iserv.vanhoecke.be/csp/hadev</Default>
-</Parameter>
-
-<Parameter name="LOCATIONxxxWWW01xxxDEMO">
-<Default>http://iserv.vanhoecke.be/csp/demo</Default>
-</Parameter>
-
 <Parameter name="errInternalError">
 <Default>InternalError</Default>
 </Parameter>
@@ -48,7 +32,7 @@
 <nbsp>Type : "DynaLog"<br>
 <nbsp>Data : is een LargeObject (<32K) dat de ganse te transferen data bevat. Eventueel geplaatst tussen [CDATA ...]] tags]]></Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>GebruikersNaam,WachtWoordEncrypt,Type,Optie,Data:%GlobalCharacterStream,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein=""</FormalSpec>
+<FormalSpec>GebruikersNaam,WachtWoordEncrypt,Type,Optie,Data:%GlobalCharacterStream,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein="",KlantNummer=""</FormalSpec>
 <ReturnType>BL.EC.pxDynaPlug</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
@@ -59,8 +43,9 @@
 	Set $ZTRAP="OnSoapError"
 	
 	;Transfer
-	Set WSClient=$System.OBJ.New("WS.EC.WebShopClient")
-	Set Result=WSClient.Transfer(.GebruikersNaam,.WachtWoordEncrypt,.Type,.Optie,.Data,.Taal,.DynaplugVersion,.DynalogVersion,ClientIP,Domein)
+	Set WSClient=##class(WS.EC.WebShopClient).%New()
+	if '$length(ClientIP) Set ClientIP = $get(%request.CgiEnvs("REMOTE_ADDR"))
+	Set Result=WSClient.Transfer(.GebruikersNaam,.WachtWoordEncrypt,.Type,.Optie,.Data,.Taal,.DynaplugVersion,.DynalogVersion,ClientIP,Domein,KlantNummer)
 
 	Set $ZTRAP=""
 
@@ -75,7 +60,7 @@
 	If $D(WSClient) Do
 	. 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 Data.Rewind()
 	Do SOAPErrorMail^cspBasis.SOAPlib("WSH_DP_ERR",,"ERROR : "_$ZE_" USER: "_GebruikersNaam_", TAAL: "_Taal_", CLIENTIP: "_ClientIP_$C(13,10,13,10)_Data.Read(Data.Size))
@@ -86,6 +71,45 @@
 ]]></Implementation>
 </Method>
 
+<Method name="MeerdereKlanten">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>GebruikersNaam,WachtWoordEncrypt,Type,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein=""</FormalSpec>
+<ReturnType>BL.EC.pxDynaPlug</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[
+	Set Taal=$S($G(Taal)="":"E",1:Taal)
+	Set %Taal=Taal
+	
+	Set $ZTRAP="OnSoapError"
+	
+	;Transfer
+	Set WSClient=##class(WS.EC.WebShopClient).%New()
+	if '$length(ClientIP) Set ClientIP = $get(%request.CgiEnvs("REMOTE_ADDR"))
+	Set Result=WSClient.MeerdereKlanten(.GebruikersNaam,.WachtWoordEncrypt,.Type,.Taal,.DynaplugVersion,.DynalogVersion,ClientIP,Domein)
+
+	Set $ZTRAP=""
+
+	Quit Result
+	
+	;------------------------------
+	;Error handler:
+OnSoapError
+	Set $ZTRAP=""
+	;Mail verzenden met error-boodschap
+	
+	If $D(WSClient) Do
+	. Set SoapFault=WSClient.GetSoapFault()
+	. If $IsObject(SoapFault) Do
+	. . ;$$$AddErrorToLog("EDI DynaPlug","SoapFault",$$$ERROR($$$GeneralError,SoapFault.AsString()))
+    
+	Do SOAPErrorMail^cspBasis.SOAPlib("WSH_DP_ERR",,"ERROR : "_$ZE_" USER: "_GebruikersNaam_", TAAL: "_Taal_", CLIENTIP: "_ClientIP)
+	;Statuscode teruggeven	
+	Set Result=$$$dpStatusERR(..#errInternalError)
+
+	Quit Result
+]]></Implementation>
+</Method>
+
 <Method name="UpdateTBXOrder">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>SessionID:%String,pxTBXOrder:BL.EC.sub.pxTBXOrder</FormalSpec>
@@ -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 @@
 <ReturnType>BL.EC.pxDynaPlug</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
 	Set $ZTRAP="OnSoapError"
 
-	Set WSClient = $System.OBJ.New("WS.EC.WebShopClient")
+	Set WSClient = ##class(WS.EC.WebShopClient).%New()
 	Set Result = WSClient.Confirm(SessionID,pxDynaPlug) 
 	
 	Quit Result
@@ -143,17 +166,60 @@
 	
 	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
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekKlant">
+<Description><![CDATA[
+Opzoeken van een klant die voldoet aan het criteria.<br>
+Alleen die klanten toegelaten tot de sessie worden opgenomen in de dataset<br>
+Criteria : Te zoeken waarde<b>
+ZoekType :<br>
+&nbsp; Leeg = DerdeNaam of DerdeNr<br>
+&nbsp; "W" = Woonplaats<br>
+&nbsp; "P" = Postkode<br>
+&nbsp; "S" = Straat]]></Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>SessionID:%String,ZoekString:%String="",ZoekType:WS.EC.enu.ZoekType=""</FormalSpec>
+<ReturnType>BL.EC.pxDynaPlug</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[
+	Set $ZTRAP="OnSoapError"
+
+	Set WSClient = ##class(WS.EC.WebShopClient).%New()
+	Set Result = WSClient.ZoekKlant(SessionID,ZoekString,ZoekType) 
+	
+	Quit Result
+	
+	;------------------------------
+	;Error handler:
+OnSoapError
+	Set $ZTRAP=""
+	;Mail verzenden met error-boodschap
+	
+	Set SoapFault=WSClient.GetSoapFault()
+	If $IsObject(SoapFault) Do
+	. ;$$$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
+]]></Implementation>
+</Method>
+
 <Method name="CancelAll">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>SessionID:%String,pxDynaPlug:BL.EC.pxDynaPlug</FormalSpec>
@@ -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