Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48522 -r48545
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48522)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48545)
@@ -23,28 +23,23 @@
 <Private>1</Private>
 </Property>
 
-<Property name="LeverAdresFactory">
-<Type>DOM.VKP.impl.LeverAdresFactory</Type>
+<Property name="LandRepository">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="LeveradresRepository">
-<Type>DOM.VKP.impl.LeverAdresRepository</Type>
+<Property name="LeverAdresUtils">
+<Type>AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils</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,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,Logger:vhLib.Logger,LeverAdresFactory:DOM.VKP.impl.LeverAdresFactory,LeveradresRepository:DOM.VKP.impl.LeverAdresRepository</FormalSpec>
+<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,LeverAdresUtils:AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils,Logger:vhLib.Logger</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -54,9 +49,8 @@
 	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 ..LeverAdresFactory = $$$Inject(LeverAdresFactory,##class(DOM.VKP.impl.LeverAdresFactory).%New())
 	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
-	Set ..LeveradresRepository = $$$Inject(LeveradresRepository,##class(DOM.VKP.impl.LeverAdresRepository).%New())
+	Set ..LeverAdresUtils = $$$Inject(LeverAdresUtils,##class(AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils).%New())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
 	Quit $$$OK
 ]]></Implementation>
@@ -92,14 +86,14 @@
 	Do KlantPartij.ZetToenaam(..GeefKlantToenaam(Cust))
 	Do KlantPartij.ZetTaal(..GeefTaal(Cust))
 	Do KlantPartij.ZetTelefoon1(..GeefTelefoon1(Cust))
-	#dim PrimairAdres As DOM.VKP.LeverAdres = ..GeefPrimairAdres(Cust, "Update")
+	#dim PrimairAdres As DOM.VKP.LeverAdres = ..LeverAdresUtils.GeefPrimairAdres(Cust, "Update")
 	;Do KlantPartij.Zet ??? (..GeefFax(Cust)) geen zetbare property op klant of partij
 	Do KlantPartij.ZetAdres(PrimairAdres)
 	Do KlantPartij.Save()
 	
 	Do:($$$Not(""=PrimairAdres.GeefVerzendingWijze())) Klant.ZetVerzendingWijze(PrimairAdres.GeefVerzendingWijze())
 	Do Klant.Save()
-	Do ..ZetLeverAdressenBestaandeKlant(Klant, Cust)
+	Do ..LeverAdresUtils.ZetLeverAdressenBestaandeKlant(Klant, Cust)
 ]]></Implementation>
 </Method>
 
@@ -126,13 +120,13 @@
 	; Set dtoKlant.Opmerking1 = ???
 	; Set dtoKlant.FrequentieAanbrengerCommissie = ???
 
-	Set dtoKlant.Adres = ..GeefPrimairAdres(Cust, "Insert")
+	Set dtoKlant.Adres = ..LeverAdresUtils.GeefPrimairAdres(Cust, "Insert")
 	#dim PartijID As DOM.common.PartijID = ..KlantLevenCyclusService.MaakKlant(dtoKlant,TypeTemplateKlant)
 	
 	#Dim Klant as DOM.VKP.VanHoeckeKlant = ..VerkoopApi.GeefKlant(PartijID)	
 	Do Klant.ZetVerzendingWijze(dtoKlant.Adres.GeefVerzendingWijze())
 	Do Klant.Save()
-	Do ..ZetLeverAdressenNieuweKlant(Klant, Cust)
+	Do ..LeverAdresUtils.ZetLeverAdressenNieuweKlant(Klant, Cust)
 ]]></Implementation>
 </Method>
 
@@ -166,25 +160,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPrimairAdres">
-<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.VKP.LeverAdres</ReturnType>
-<Implementation><![CDATA[
-	
-	#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.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" ){
-			Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
-			Do Adres.ZetType("")
-		}
-	}
-	Quit Adres
-]]></Implementation>
-</Method>
-
 <Method name="MaakVerzendingWijze">
 <FormalSpec>DlvMode:%String,CustAccount:%String,InsertOfUpdate:%String</FormalSpec>
 <Private>1</Private>
@@ -252,20 +227,6 @@
 ]]></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>
@@ -294,8 +255,7 @@
 		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") && (Address.IsPrimary="Yes") && $$$Not(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
@@ -312,105 +272,6 @@
 <Implementation><![CDATA[	Quit ..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId)
 ]]></Implementation>
 </Method>
-
-<Method name="ZetLeverAdressenNieuweKlant">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
-<Implementation><![CDATA[
-	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
-	While PostalAddressIterator.HasNext() {
-		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
-		If ..RolesContains(Address.Role ,"Delivery" ) {
-			#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
-			#dim InsertOfUpdate As %String = "Insert"
-			Do ..ZetNieuwLeverAdres(Adres, Address, Cust, InsertOfUpdate)
-			Do Klant.VoegToeLeverAdres(Adres)
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ZetLeverAdressenBestaandeKlant">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
-<Implementation><![CDATA[
-	#dim CacheLeverAdresLijst As %ListOfObjects = Klant.GeefLeverAdressen()
-	Set CacheIdLeverAdresLijst = ##class(%ListOfDataTypes).%New()
-	#dim N As %Integer
-	#dim CacheIdLeverAdresCount As %Integer = 0
-	For N=1:1:CacheLeverAdresLijst.Count() {
-		Set CacheIdLeverAdresCount = CacheIdLeverAdresCount + 1
-		#dim CacheIdLeverAdres As DOM.VKP.LeverAdres = CacheLeverAdresLijst.GetAt(CacheIdLeverAdresCount)
-		Do CacheIdLeverAdresLijst.Insert(CacheIdLeverAdres.ID)
-	}
-	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
-	While PostalAddressIterator.HasNext() {
-		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
-		If ..RolesContains(Address.Role ,"Delivery" ) {
-			#dim CacheLeverAdresId As %String = ##class(TECH.StringUtils).LeftTrim($Extract($Piece(Address.TransporterAuth,"$$##",2),2,*))
-			#dim IsNieuwLeverAdres As %Boolean
-			#dim InsertOfUpdate As %String
-			Set IsNieuwLeverAdres = $$$If($$$Not(##class(TECH.ListUtils).Contains(CacheIdLeverAdresLijst,CacheLeverAdresId)),$$$True,$$$False)
-			If IsNieuwLeverAdres {
-				#dim NieuwAdres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
-				Set InsertOfUpdate = "Insert"
-				Do ..ZetNieuwLeverAdres(NieuwAdres, Address, Cust, InsertOfUpdate)
-				Do Klant.VoegToeLeverAdres(NieuwAdres)
-			} Else {
-				#Dim Node As %String = "L"_##class(TECH.StringUtils).AddLeadingSpace(CacheLeverAdresId,3)
-				#dim BestaandLeverAdres As DOM.VKP.LeverAdres = Klant.GeefSpecifiekAdres(Node)
-				#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
-				Set InsertOfUpdate = "Update"
-				Do Adres.ZetNaam($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",1),BestaandLeverAdres.GeefNaam()))
-				Do Adres.ZetAanspreking($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",2),BestaandLeverAdres.GeefAanspreking()))
-				Do Adres.ZetStraat($$$If($$$HasLength(Address.Street),Address.Street,BestaandLeverAdres.GeefStraat()))
-				Do Adres.ZetPostcode($$$If($$$HasLength(Address.ZipCode),Address.ZipCode,BestaandLeverAdres.GeefPostcode()))
-				Do Adres.ZetGemeente($$$If($$$HasLength(Address.City),Address.City,BestaandLeverAdres.GeefGemeente()))
-				Do Adres.ZetLandNr($$$If($$$HasLength(Address.CountryRegionId),..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID(),BestaandLeverAdres.GeefLandNr()))
-				Do Adres.ZetTaal($$$If($$$HasLength(Cust.LanguageId),..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId),Klant.GeefTaal()))
-				Do Adres.ZetVerzendingWijze($$$If($$$HasLength(Address.DlvModeId),..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, InsertOfUpdate),BestaandLeverAdres.GeefVerzendingWijze()))
-				Do Adres.ZetOpmerking1($$$If($$$HasLength(Address.Nota1External),Address.Nota1External,BestaandLeverAdres.GeefOpmerking1()))
-				Do Adres.ZetOpmerking2($$$If($$$HasLength(Address.Nota2External),Address.Nota2External,BestaandLeverAdres.GeefOpmerking2()))
-				Do Adres.ZetType($$$If($$$HasLength(Address.Role),..AxToAdminUtils.ConvertLeverAdresType(Address.Role),BestaandLeverAdres.GeefType()))
-				Do Adres.ZetAxLeveradresId($$$If($$$HasLength(Address.LocationId),Address.LocationId,BestaandLeverAdres.GeefAxLeveradresId()))
-				Do Adres.ZetVolmacht($$$If($$$HasLength(Address.TransporterAuth),$Piece(Address.TransporterAuth,"$$##",1),BestaandLeverAdres.GeefVolmacht()))
-				Set Adres.ID = CacheLeverAdresId
-				Do ..LeveradresRepository.Bewaar(Klant, Adres)
-			}
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ZetNieuwLeverAdres">
-<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.VKP.LeverAdres</ReturnType>
-<Implementation><![CDATA[
-	Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
-	Do Adres.ZetOpmerking1(Address.Nota1External)
-	Do Adres.ZetOpmerking2(Address.Nota2External)
-	Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Address.Role))
-	Do Adres.ZetAxLeveradresId(Address.LocationId)
-	Do Adres.ZetVolmacht($Piece(Address.TransporterAuth,"$$##",1))
-	Quit Adres
-]]></Implementation>
-</Method>
-
-<Method name="ZetGemeenschappelijkePropertiesOpAdres">
-<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.VKP.LeverAdres</ReturnType>
-<Implementation><![CDATA[
-	Do Adres.ZetNaam($Piece(Address.Description," ",1))
-	Do Adres.ZetAanspreking($Piece(Address.Description," ",2))
-	Do Adres.ZetStraat(Address.Street)
-	Do Adres.ZetPostcode(Address.ZipCode)
-	Do Adres.ZetGemeente(Address.City)
-	Do Adres.ZetLandNr(..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID())
-	Do Adres.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
-	Do Adres.ZetVerzendingWijze(..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, InsertOfUpdate))
-	Quit Adres
-]]></Implementation>
-</Method>
 </Class>