Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r47190 -r48261
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 47190)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48261)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="AxToAdminUtils">
 <Type>AXimpl.AxToAdminUtils</Type>
@@ -18,8 +18,23 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KlantLevenCyclusService">
+<Type>APPS.KlantBeheer.KlantLevenCyclusService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LandRepository">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI</FormalSpec>
+<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,Logger:vhLib.Logger</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -28,24 +43,23 @@
 	Set ..PartijApi = $$$Inject(PartijApi,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
 	Set ..VerkoopApi = $$$Inject(VerkoopApi,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	Set ..AxToAdminUtils = ##class(AXimpl.AxToAdminUtils).%New()
+	Set ..KlantLevenCyclusService = $$$Inject(KlantLevenCyclusService,##class(APPS.KlantBeheer.KlantLevenCyclusService).%New())
+	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
+	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Convert">
-<FormalSpec>Message:AXif.Dynamics.CustomerIn.Envelope</FormalSpec>
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
 <Implementation><![CDATA[
-	#dim CustOutQuery As AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery = Message.Body.MessageParts.MessagePart
-	Set AxdEntityCustIterator = ##class(TECH.ListIterator).%New(CustOutQuery.Cust)
-	While AxdEntityCustIterator.HasNext() {
-		#dim Cust as AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = AxdEntityCustIterator.Next()
-		#dim KlantId As %String = ..AxToAdminUtils.ConvertCustomerID(Cust.CustAccount)
-		
-		If (..VerkoopApi.BestaatKlant(KlantId)) {
-			Do ..UpdateKlant(Cust, KlantId)
-		} Else {
-			Do ..CreëerKlant(Cust)
-		}
+	#dim KlantId As %String = ..AxToAdminUtils.ConvertCustomerID(Cust.CustAccount)
+	If (..VerkoopApi.BestaatKlant(KlantId)) {
+		Do ..Logger.Info("Klant synchronizatie AX - Admin","Update van klant '"_Cust.Name_"' met CustAccount " _ Cust.CustAccount)
+		Do ..UpdateKlant(Cust, KlantId)
+	} Else {
+		Do ..Logger.Info("Klant synchronizatie AX - Admin","Aanmaken van klant '"_Cust.Name_"' met CustAccount " _ Cust.CustAccount)
+		Do ..MaakKlant(Cust)
 	}
 ]]></Implementation>
 </Method>
@@ -54,24 +68,169 @@
 <FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,KlantId:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	/*
 	#dim Klant As DOM.PARTIJ.Partij = ..PartijApi.GeefPartij(KlantId)
 	
 	Do Klant.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
-	Do Klant.ZetBTWNr(..ZetBTWNr(Cust))
+	Do Klant.ZetBTWNr(..GeefBTWNummer(Cust))
 	
 	Do Klant.Save()
+	*/
 ]]></Implementation>
 </Method>
 
-<Method name="CreëerKlant">
+<Method name="MaakKlant">
 <FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
 <Private>1</Private>
+<Implementation><![CDATA[
+	Set dtoKlant = ##class(DOM.common.dto.Partij).%New()
+	; nog te bepalen -> mss een template in de data ipv in de code
+	#dim TypeTemplateKlant as DOM.CRM.enu.TypeTemplateKlant = ##class(DOM.CRM.enu.TypeTemplateKlant).Onderneming() ; Consument/Medewerker
+		
+	Set dtoKlant.KlantNummer = + Cust.CustAccount
+	Set dtoKlant.Aanspreking = ..GeefAanspreking(Cust)
+	Set dtoKlant.KlantNaam = ..GeefKlantNaam(Cust)
+	
+	;Set ?? = Cust.PriceException
+	;Set dtoKlant.Toenaam = ??
+	Set dtoKlant.Taal = ..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId)
+	Set dtoKlant.Telefoon1 = ..GeefTelefoon1(Cust)
+	Set dtoKlant.Fax = ..GeefFax(Cust)
+	Set dtoKlant.BTWNummer = ..GeefBTWNummer(Cust)
+	Set dtoKlant.Email = ..GeefEmailAddress(Cust)
+	Set dtoKlant.Muntcode ="EUR"
+	; Set dtoKlant.Prijsklase = ???
+	; Set dtoKlant.Opmerking1 = ???
+	; Set dtoKlant.FrequentieAanbrengerCommissie = ???
+
+	Set dtoKlant.Adres = ..GeefPrimairAdres(Cust)
+		
+	#dim PartijID As DOM.common.PartijID = ..KlantLevenCyclusService.MaakKlant(dtoKlant,TypeTemplateKlant)
+]]></Implementation>
 </Method>
 
-<Method name="ZetBTWNr">
+<Method name="GeefKlantNaam">
 <FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
 <Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	#dim Aanspreking as %String = ..GeefAanspreking(Cust)
+	Quit:$Length(Aanspreking) ##class(TECH.StringUtils).Replace(Cust.Name,Aanspreking,"")
+	Quit Cust.Name
+]]></Implementation>
+</Method>
+
+<Method name="GeefAanspreking">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim LaatsteWoord = ##class(TECH.StringUtils).GetLastPart(Cust.Name," ")
+	Quit:##class(APPS.common.enu.JuridischeVorm).IsValid(LaatsteWoord) LaatsteWoord
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrimairAdres">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	
+	Set Adres =  ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()		
+	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
+	While PostalAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
+		if (Address.IsPrimary = "Yes") && ..RolesContains(Address.Role ,"Business" ){
+			Do Adres.ZetAanspreking(Address.Description)
+			Do Adres.ZetGemeente(Address.City)
+			Do Adres.ZetLandNr(..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID())
+			;??? Do Adres.ZetNaam("AdresNaam")
+			Do Adres.ZetPostcode(Address.ZipCode)
+			Do Adres.ZetStraat(Address.Street)
+			Do Adres.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
+			;??? Do Adres.ZetToenaam("AdresToenaam")
+			Do Adres.ZetType("")
+		}
+	}
+	Quit Adres
+]]></Implementation>
+</Method>
+
+<Method name="GeefFax">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefElectronicAddressLocator(Cust,"Fax","Fax","Business")
+]]></Implementation>
+</Method>
+
+<Method name="GeefEmailAddress">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefElectronicAddressLocator(Cust,"Email","E-mail","Business")
+]]></Implementation>
+</Method>
+
+<Method name="GeefTelefoon1">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefElectronicAddressLocator(Cust,"Phone","Telefoon 1","Business")
+]]></Implementation>
+</Method>
+
+<Method name="GeefElectronicAddressLocator">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,Type:%String,Description:%String,Role:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Result as %String = ""
+	Set ElectronicAddressIterator = ##class(TECH.ListIterator).%New(Cust.ElectronicAddress)
+	While ElectronicAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress = ElectronicAddressIterator.Next()
+		If ((Address.Type = Type) && (Address.Description = Description) && ..ElecRolesContains(Address.ElecRole,Role )){
+			Set Result = Address.Locator
+			Quit			
+		}
+	}
+	Quit Result
+]]></Implementation>
+</Method>
+
+<Method name="RolesContains">
+<FormalSpec>Roles:%ListOfDataTypes,Name:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Result as %Boolean = $$$False
+	Set RoleIterator = ##class(TECH.ListIterator).%New(Roles)
+	While (RoleIterator.HasNext() && $$$Not(Result)) {
+		#dim Role as  AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole = RoleIterator.Next()
+		Set:(Role.Name = Name) Result = $$$True
+	}
+	Quit Result
+]]></Implementation>
+</Method>
+
+<Method name="ElecRolesContains">
+<FormalSpec>ElecRoles:%ListOfDataTypes,Role:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Result as %Boolean = $$$False
+	Set ElecRoleIterator = ##class(TECH.ListIterator).%New(ElecRoles)
+	While (ElecRoleIterator.HasNext() && $$$Not(Result)) {
+		#dim ElecRole as  AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElecRole = ElecRoleIterator.Next()
+		Set:(ElecRole.Name = Role) Result = $$$True
+	}
+	Quit Result
+]]></Implementation>
+</Method>
+
+<Method name="GeefBTWNummer">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
 	#dim CountryRegionId As %String = ""
 	#dim VATNum As %String = Cust.VATNum
 	
@@ -81,14 +240,14 @@
 		Set RoleIterator = ##class(TECH.ListIterator).%New(Address.Role)
 		While RoleIterator.HasNext() {
 			#dim Role As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole = RoleIterator.Next()
-			If ((Role.Name = "Business") && $$$Not(Address.CountryRegionId = "")) {
-				Set CountryRegionId = Address.CountryRegionId
+			If ((Role.Name = "Business") && (Address.IsPrimary="Yes") && $$$Not(Address.CountryRegionId = "")) {
+				
+				Set CountryRegionId = ..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefCode()
 			} Else {
 				// Error wegens geen Role = "Business" of geen CountryRegionId
 			}
 		}
-	}
-	
+	}	
 	Quit ##class(AXimpl.Formatter).%New().FormatVATNumToCache(VATNum,CountryRegionId)
 ]]></Implementation>
 </Method>