Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml
===================================================================
diff -u -r48528 -r48553
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml	(.../LeverAdresMaker.cls.xml)	(revision 48528)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml	(.../LeverAdresMaker.cls.xml)	(revision 48553)
@@ -3,8 +3,61 @@
 <Class name="AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProjectSettingsApi">
+<Type>DOM.common.ProjectSettingsAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LeverAdresRepository">
+<Type>DOM.VKP.impl.LeverAdresRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProjectSettingsApi:DOM.common.ProjectSettingsAPI,LeverAdresRepository:DOM.VKP.impl.LeverAdresRepository</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..Logger = ##class(vhLib.Logger).%New()
+	Set ..ProjectSettingsApi = $$$Inject(ProjectSettingsApi,##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI())
+	Set ..LeverAdresRepository = $$$Inject(LeverAdresRepository,##class(DOM.VKP.impl.LeverAdresRepository).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="MaakLeverAdres">
 <FormalSpec>OrderHeader:AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader</FormalSpec>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	Do ..Logger.Debug("SalesOrderIn - Leveringsadres aanmaken", "Leveringsadres gemaakt voor SalesId '" _OrderHeader.SalesId _"'")
+	Set LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetGemeente(OrderHeader.DlvAddrCity)
+	Do LeverAdres.ZetPostcode(OrderHeader.DlvAddrZipCode)
+	Do LeverAdres.ZetStraat(OrderHeader.DlvAddrStreet1)
+	Do LeverAdres.ZetLandNr(OrderHeader.DlvAddrCountry)
+	Do LeverAdres.ZetNaam(OrderHeader.DeliveryName)
+		
+	If ($$$HasLength(OrderHeader.LocationId) && (..ProjectSettingsApi.IsActiefAxLeverancierId())){
+		If ..LeverAdresRepository.BestaatViaAXLeverAdresId(OrderHeader.LocationId) {
+			Set LeverAdres = ..LeverAdresRepository.GeefViaAXLeverAdresId(OrderHeader.LocationId)
+		}
+		Do LeverAdres.ZetID("")
+		Do LeverAdres.ZetAxLeveradresId(OrderHeader.LocationId)
+	}
+	
+	If LeverAdres.GeefTelefoon() = "" {
+		Do LeverAdres.ZetTelefoon("+3237601900")
+	}
+	
+	Quit LeverAdres
+]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml
===================================================================
diff -u -r48538 -r48553
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml	(.../Test.cls.xml)	(revision 48538)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml	(.../Test.cls.xml)	(revision 48553)
@@ -2,6 +2,107 @@
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker.MaakLeverAdres.Test">
 <Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="AXLeverAdresId">
+<Default>AXID1234</Default>
+</Parameter>
+
+<Method name="Test: Geen AXLeverAdresId ingevuld -&gt; gegevens uit header overnemen">
+<Implementation><![CDATA[
+	#dim StandaardOrder As AXif.Dynamics.SalesOrderIn.Envelope = ##class(vhTest.Utils.AXif.Dynamics.SalesOrderIn.Envelope).StandaardOrder()
+	#dim StandaardOrderHeader As AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader = StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1)
+	Set StandaardOrderHeader.LocationId = ""
+	
+	Set ProjectSettingsApiStub = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).%New()
+	Do ProjectSettingsApiStub.IndienMethodCall("IsActiefAxLeverancierId").DanReturn($$$True)
+	
+	Set LeverAdresMaker = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New()
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeverAdresMaker.MaakLeverAdres(StandaardOrderHeader)
+	
+	Do $$$AssertEquals(LeverAdres.Gemeente,StandaardOrderHeader.DlvAddrCity)
+	Do $$$AssertEquals(LeverAdres.Postcode,StandaardOrderHeader.DlvAddrZipCode)
+	Do $$$AssertEquals(LeverAdres.Straat,StandaardOrderHeader.DlvAddrStreet1)
+	Do $$$AssertEquals(LeverAdres.LandNr,StandaardOrderHeader.DlvAddrCountry)
+	Do $$$AssertEquals(LeverAdres.Naam,StandaardOrderHeader.DeliveryName)
+	Do $$$AssertEquals(LeverAdres.Telefoon,"+3237601900")
+	Do $$$AssertEquals(LeverAdres.AxLeveradresId,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: IsActiefAxLeverancierId() false -&gt; gegevens uit header overnemen, AxLeveradresId leeg maken">
+<Implementation><![CDATA[
+	#dim StandaardOrder As AXif.Dynamics.SalesOrderIn.Envelope = ##class(vhTest.Utils.AXif.Dynamics.SalesOrderIn.Envelope).StandaardOrder()
+	#dim StandaardOrderHeader As AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader = StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1)
+	Set StandaardOrderHeader.LocationId = ..#AXLeverAdresId
+	
+	Set ProjectSettingsApiStub = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).%New()
+	Do ProjectSettingsApiStub.IndienMethodCall("IsActiefAxLeverancierId").DanReturn($$$False)
+	
+	Set LeverAdresMaker = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New(ProjectSettingsApiStub)
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeverAdresMaker.MaakLeverAdres(StandaardOrderHeader)
+	
+	Do $$$AssertEquals(LeverAdres.Gemeente,StandaardOrderHeader.DlvAddrCity)
+	Do $$$AssertEquals(LeverAdres.Postcode,StandaardOrderHeader.DlvAddrZipCode)
+	Do $$$AssertEquals(LeverAdres.Straat,StandaardOrderHeader.DlvAddrStreet1)
+	Do $$$AssertEquals(LeverAdres.LandNr,StandaardOrderHeader.DlvAddrCountry)
+	Do $$$AssertEquals(LeverAdres.Naam,StandaardOrderHeader.DeliveryName)
+	Do $$$AssertEquals(LeverAdres.Telefoon,"+3237601900")
+	Do $$$AssertEquals(LeverAdres.AxLeveradresId,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: AXLeverAdresId ingevuld en nog niet gekend -&gt; gegevens uit header overnemen">
+<Implementation><![CDATA[
+	#dim StandaardOrder As AXif.Dynamics.SalesOrderIn.Envelope = ##class(vhTest.Utils.AXif.Dynamics.SalesOrderIn.Envelope).StandaardOrder()
+	#dim StandaardOrderHeader As AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader = StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1)
+	Set StandaardOrderHeader.LocationId = ..#AXLeverAdresId
+	
+	Set ProjectSettingsApiStub = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).%New()
+	Do ProjectSettingsApiStub.IndienMethodCall("IsActiefAxLeverancierId").DanReturn($$$True)
+	
+	Set LeverAdresRepositoryStub = ##class(vhTest.Mock.DOM.VKP.impl.LeverAdresRepository).%New()
+	Do LeverAdresRepositoryStub.IndienMethodCall("BestaatViaAXLeverAdresId",..#AXLeverAdresId).DanReturn($$$False)
+	
+	Set LeverAdresMaker = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New(ProjectSettingsApiStub,LeverAdresRepositoryStub)
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeverAdresMaker.MaakLeverAdres(StandaardOrderHeader)
+	
+	Do $$$AssertEquals(LeverAdres.Gemeente,StandaardOrderHeader.DlvAddrCity)
+	Do $$$AssertEquals(LeverAdres.Postcode,StandaardOrderHeader.DlvAddrZipCode)
+	Do $$$AssertEquals(LeverAdres.Straat,StandaardOrderHeader.DlvAddrStreet1)
+	Do $$$AssertEquals(LeverAdres.LandNr,StandaardOrderHeader.DlvAddrCountry)
+	Do $$$AssertEquals(LeverAdres.Naam,StandaardOrderHeader.DeliveryName)
+	Do $$$AssertEquals(LeverAdres.Telefoon,"+3237601900")
+	Do $$$AssertEquals(LeverAdres.AxLeveradresId,..#AXLeverAdresId)
+]]></Implementation>
+</Method>
+
+<Method name="Test: AXLeverAdresId ingevuld en gekend -&gt; gegevens uit Caché opvissen en id leegmaken">
+<Implementation><![CDATA[
+	#dim StandaardOrder As AXif.Dynamics.SalesOrderIn.Envelope = ##class(vhTest.Utils.AXif.Dynamics.SalesOrderIn.Envelope).StandaardOrder()
+	#dim StandaardOrderHeader As AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader = StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1)
+	Set StandaardOrderHeader.LocationId = ..#AXLeverAdresId
+	
+	Set ProjectSettingsApiStub = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).%New()
+	Do ProjectSettingsApiStub.IndienMethodCall("IsActiefAxLeverancierId").DanReturn($$$True)
+	
+	Set LeverAdresRepositoryStub = ##class(vhTest.Mock.DOM.VKP.impl.LeverAdresRepository).%New()
+	Do LeverAdresRepositoryStub.IndienMethodCall("BestaatViaAXLeverAdresId",..#AXLeverAdresId).DanReturn($$$True)
+	Do LeverAdresRepositoryStub.IndienMethodCall("GeefViaAXLeverAdresId",..#AXLeverAdresId).DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
+	
+	Set LeverAdresMaker = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New(ProjectSettingsApiStub,LeverAdresRepositoryStub)
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeverAdresMaker.MaakLeverAdres(StandaardOrderHeader)
+	
+	Do $$$AssertEquals(LeverAdres.ID,"")
+	
+	Do $$$AssertEquals(LeverAdres.Gemeente,StandaardOrderHeader.DlvAddrCity)
+	Do $$$AssertEquals(LeverAdres.Postcode,StandaardOrderHeader.DlvAddrZipCode)
+	Do $$$AssertEquals(LeverAdres.Straat,StandaardOrderHeader.DlvAddrStreet1)
+	Do $$$AssertEquals(LeverAdres.LandNr,StandaardOrderHeader.DlvAddrCountry)
+	Do $$$AssertEquals(LeverAdres.Naam,StandaardOrderHeader.DeliveryName)
+	Do $$$AssertEquals(LeverAdres.Telefoon,"+3237601900")
+	Do $$$AssertEquals(LeverAdres.AxLeveradresId,..#AXLeverAdresId)
+]]></Implementation>
+</Method>
 </Class>