Index: WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml
===================================================================
diff -u -r50322 -r50354
--- WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 50322)
+++ WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 50354)
@@ -42,8 +42,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductIdConverter">
-<Type>WSimpl.Vhisie4.ProductIdConverter</Type>
+<Property name="Translator">
+<Type>AX.Uitgaand.EC.DataAX.impl.Translator</Type>
 <Private>1</Private>
 </Property>
 
@@ -57,6 +57,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Connected2AX">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="WebsiteAXIds">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="ModeAX">
+<Type>%String</Type>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -66,10 +78,13 @@
 	Set ..HeaderValidator = ##class(WSimpl.Vhisie4.HeaderValidator).%New()
 	Set ..SessionManager = ##class(WSimpl.Vhisie4.SessionManager).%New()
 	Set ..KlantIdConverter = ##class(AXimpl.Utils.KlantIdConverter).%New()
-	Set ..ProductIdConverter = ##class(WSimpl.Vhisie4.ProductIdConverter).%New()
 	Set ..OrderBeperker = ##class(WSimpl.Vhisie4.OrderBeperker).%New()
 	Set ..Logger = ##class(vhLib.Logger).%New()
 	
+	Set ..ModeAX=##class(TECH.Config.ConfigMgr).Instance().GetString("AX_vHisie4_Fase")
+	Set ..Connected2AX=(..ModeAX?1(1"PRE_2A",1"2A"))
+	Set ..WebsiteAXIds=(..ModeAX="2A")
+	Set ..Translator = ##class(AX.Uitgaand.EC.DataAX.impl.Translator).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -87,26 +102,22 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefVerkoopHistoriekResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	Set:..WebsiteAXIds Request.Header.KlantId = ..Translator.GeefKLNrForAdmin(Request.Header.KlantId)
 	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
 	
 	#dim Response As WS.Vhisie4.KlantDocument.GeefVerkoopHistoriekResponse
 	
-	Set:$$$Not(..#RunAX) Response = ##class(AX.Uitgaand.EC.Data.impl.HistoriekOphalen).%New(Request).GeefResponse()
-	Set:..#RunAX Response = ##class(AX.Uitgaand.EC.DataAX.impl.HistoriekOphalen).%New(Request).GeefResponse()
-	
-	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
-	
-	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
-		#dim HistoriekGroepIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Response.Lijst)
-	
-		While (HistoriekGroepIterator.HasNext()) {
-			#dim HistoriekGroep As WS.Vhisie4.KlantDocument.dto.HistoriekGroep = HistoriekGroepIterator.Next()	
-			Set HistoriekGroep.Producten = ..ProductIdConverter.ConvertProductInfoToAx(HistoriekGroep.Producten)
-		}
+	If ..WebsiteAXIds
+	{
+		Set Response = ##class(AX.Uitgaand.EC.DataAX.impl.HistoriekOphalen).%New(Request).GeefResponse()
+		Set Response.KlantId = ..Translator.GeefCustomerIDForAX(Response.KlantId)
 	}
+	Else
+	{
+		Set Response = ##class(AX.Uitgaand.EC.Data.impl.HistoriekOphalen).%New(Request).GeefResponse()
+	}
 	
 	Quit Response
 ]]></Implementation>
@@ -126,28 +137,22 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefOrdersResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	Set:..WebsiteAXIds Request.Header.KlantId = ..Translator.GeefKLNrForAdmin(Request.Header.KlantId)
 	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
 	
 	#dim Response As WS.Vhisie4.KlantDocument.GeefOrdersResponse
 	
-	Set:$$$Not(..#RunAX) Response = ##class(AX.Uitgaand.EC.Data.impl.OrdersOphalen).%New(Request).GeefResponse()
-	Set:..#RunAX Response = ##class(AX.Uitgaand.EC.DataAX.impl.OrdersOphalen).%New(Request).GeefResponse()
-	
-	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
-		Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
-		Set Response.Lijst = ..OrderBeperker.GeefBeperkteLijst(Response.Lijst, ##class(WSimpl.Vhisie4.OrderBeperker.Filter).%New())
-	
-		#dim HoofdingIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Response.Lijst)
-	
-		While (HoofdingIterator.HasNext()) {
-			#dim Hoofding As WS.Vhisie4.KlantDocument.dto.OrderHoofding = HoofdingIterator.Next()	
-			Set Hoofding.Lijnen = ..ProductIdConverter.ConvertProductInfoToAx(Hoofding.Lijnen)
-		}
+	If ..Connected2AX
+	{
+		Set Response = ##class(AX.Uitgaand.EC.DataAX.impl.OrdersOphalen).%New(Request,..ModeAX).GeefResponse()
+		Set:..WebsiteAXIds Response.KlantId = ..Translator.GeefCustomerIDForAX(Response.KlantId)
 	}
-	
+	Else
+	{
+		Set Response = ##class(AX.Uitgaand.EC.Data.impl.OrdersOphalen).%New(Request).GeefResponse()
+	}
 	Quit Response
 ]]></Implementation>
 </Method>
@@ -165,27 +170,25 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefFacturenResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	Set:..WebsiteAXIds Request.Header.KlantId = ..Translator.GeefKLNrForAdmin(Request.Header.KlantId)
 	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
 	
 	#dim Response As WS.Vhisie4.KlantDocument.GeefFacturenResponse 
-	
-	Set:$$$Not(..#RunAX) Response = ##class(AX.Uitgaand.EC.Data.impl.FacturenOphalen).%New(Request).GeefResponse()
-	Set:..#RunAX Response = ##class(AX.Uitgaand.EC.DataAX.impl.FacturenOphalen).%New(Request).GeefResponse()
-	
-	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
-		Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
-	
-		#dim HoofdingIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Response.Lijst)
-	
-		While (HoofdingIterator.HasNext()) {
-			#dim Hoofding As WS.Vhisie4.KlantDocument.dto.FactuurHoofding = HoofdingIterator.Next()	
-			Set Hoofding.Lijnen = ..ProductIdConverter.ConvertProductInfoToAx(Hoofding.Lijnen)
-		}
+	#dim FacturenOld As %ListOfObjects
+	If ..Connected2AX
+	{
+		Set Response = ##class(AX.Uitgaand.EC.Data.impl.FacturenOphalen).%New(Request,..ModeAX).GeefResponse()
+		Set FacturenOld=Response.Lijst
+		Set Response = ##class(AX.Uitgaand.EC.DataAX.impl.FacturenOphalen).%New(Request,..ModeAX).GeefResponse()
+		Do ..AppendList(Response.Lijst,FacturenOld)
+		Set:..WebsiteAXIds Response.KlantId = ..Translator.GeefCustomerIDForAX(Response.KlantId)
 	}
-	
+	Else
+	{
+		Set Response = ##class(AX.Uitgaand.EC.Data.impl.FacturenOphalen).%New(Request).GeefResponse()
+	}
 	Quit Response
 ]]></Implementation>
 </Method>
@@ -202,27 +205,22 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefOffertesResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	Set:..WebsiteAXIds Request.Header.KlantId = ..Translator.GeefKLNrForAdmin(Request.Header.KlantId)
 	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
 	
 	#dim Response As WS.Vhisie4.KlantDocument.GeefOffertesResponse 
 	
-	Set:$$$Not(..#RunAX) Response = ##class(AX.Uitgaand.EC.Data.impl.OffertesOphalen).%New(Request).GeefResponse()
-	Set:..#RunAX Response = ##class(AX.Uitgaand.EC.DataAX.impl.OffertesOphalen).%New(Request).GeefResponse()
-	
-	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
-		Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
-	
-		#dim HoofdingIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Response.Lijst)
-	
-		While (HoofdingIterator.HasNext()) {
-			#dim Hoofding As WS.Vhisie4.KlantDocument.dto.OfferteHoofding = HoofdingIterator.Next()	
-			Set Hoofding.Lijnen = ..ProductIdConverter.ConvertProductInfoToAx(Hoofding.Lijnen)
-		}
+	If ..Connected2AX
+	{
+		Set Response="" ; geen offertes in fase 2A
 	}
-	
+	Else
+	{
+		Set Response = ##class(AX.Uitgaand.EC.Data.impl.OffertesOphalen).%New(Request).GeefResponse()
+	}
+		
 	Quit Response
 ]]></Implementation>
 </Method>
@@ -240,26 +238,24 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefLeveringenResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	Set:..WebsiteAXIds Request.Header.KlantId = ..Translator.GeefKLNrForAdmin(Request.Header.KlantId)
 	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
 	
 	#dim Response As WS.Vhisie4.KlantDocument.GeefLeveringenResponse 
 	
-	Set Response = ##class(AX.Uitgaand.EC.Data.impl.LeveringenOphalen).%New(Request).GeefResponse()
-	
-	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
-		Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response)
-	
-		#dim HoofdingIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Response.Lijst)
-	
-		While (HoofdingIterator.HasNext()) {
-			#dim Hoofding As WS.Vhisie4.KlantDocument.dto.LeveringHoofding = HoofdingIterator.Next()	
-			Set Hoofding.Lijnen = ..ProductIdConverter.ConvertProductInfoToAx(Hoofding.Lijnen)
-		}
+	If ..WebsiteAXIds
+	{
+		Set Response = ##class(AX.Uitgaand.EC.DataAX.impl.LeveringenOphalen).%New(Request).GeefResponse()
+		Set Response.KlantId = ..Translator.GeefCustomerIDForAX(Response.KlantId)
 	}
+	Else
+	{
+		Set Response = ##class(AX.Uitgaand.EC.Data.impl.LeveringenOphalen).%New(Request).GeefResponse()
+	}
 	
+	
 	Quit Response
 ]]></Implementation>
 </Method>
@@ -269,24 +265,36 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefDocumentResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
-		Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
-	}
-	;Do ..HeaderValidator.ValidateHeader(Request.Header)
-	;Do ..Logger.Debug("GeefDocument - ValidateHeader ok", Request.DocumentId)
-	;Do ..SessionManager.RegisterSession(Request.Header)
-	;Do ..Logger.Debug("GeefDocument - RegisterSession ok", Request.DocumentId)
+	Do ##class(Tools.Wlip).%New(127).String("start")
 	
+	Set:..WebsiteAXIds Request.Header.KlantId = ..Translator.GeefKLNrForAdmin(Request.Header.KlantId)
+	
+	Do ..HeaderValidator.ValidateHeader(Request.Header)
+	Do ..SessionManager.RegisterSession(Request.Header)
+	
 	#dim Response As WS.Vhisie4.KlantDocument.GeefDocumentResponse
-
 	Set Response = ##class(AX.Uitgaand.EC.Data.impl.DocumentOphalen).%New(Request).GeefResponse()
-	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
-
-		Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response)
+	
+	Do ##class(Tools.Wlip).%New(127).ObjToXML(Response)
+	
+	If ..Connected2AX
+	{
+	Do ##class(Tools.Wlip).%New(127).String("connected to ax")
+		Set:..WebsiteAXIds Response.KlantId = ..Translator.GeefCustomerIDForAX(Response.KlantId)
 	}
 	Quit Response
 ]]></Implementation>
 </Method>
+
+<Method name="AppendList">
+<FormalSpec>List:%ListOfObjects,ListAdd:%ListOfObjects</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	For I=1:1:ListAdd.Count() {
+		Do List.Insert(ListAdd.GetAt(I))
+	}
+]]></Implementation>
+</Method>
 </Class>