Index: AX/Uitgaand/Klant/impl/AifConverter.cls.xml =================================================================== diff -u -r33554 -r33557 --- AX/Uitgaand/Klant/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 33554) +++ AX/Uitgaand/Klant/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 33557) @@ -23,12 +23,23 @@ set Custable.WebSalesOrderDisplay = "All" - set DirParty = ##class(AXaif.Customer.AxdEntityDirPartyDirPartyTable).%New() + set DirParty = ##class(AXaif.Customer.AxdEntityDirPartyDirOrganization).%New() set DirParty.LanguageId = ..FormatLanuageId(Partij.GeefTaal()) set DirParty.Name = Partij.GeefNaam()_$$$IfLength(Partij.GeefToenaam()," ","") + set OrganizationName = ##class(AXaif.Customer.AxdEntityOrganizationName).%New() + set OrganizationName.Name = DirParty.Name + do DirParty.OrganizationName.Insert(OrganizationName) + do DirParty.DirPartyPostalAddressView.Insert(..ConvertPostalAddress(Partij)) + do:$length(Partij.GeefTelefoon1()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Telefoon 1",Partij.GeefTelefoon1(),"Phone")) + do:$length(Partij.GeefTelefoon2()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Telefoon 2",Partij.GeefTelefoon2(),"Phone")) + do:$length(Partij.GeefGsm()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Gsm",Partij.GeefGsm(),"Phone")) + do:$length(Partij.GeefTelefax()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Fax",Partij.GeefTelefax(),"Fax")) + do:$length(Partij.GeefEmail()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("E-mail",Partij.GeefEmail(),"Email")) + do:$length(Partij.GeefWebstek()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("URL",Partij.GeefWebstek(),"URL")) + do Custable.DirParty.Insert(DirParty) do AxKlant.CustTable.Insert(Custable) @@ -37,6 +48,19 @@ ]]> + +LocationName:%String,Locator:%String,Type:%String +1 +AXaif.Customer.AxdEntityDirPartyContactInfoView + + + Partij:DOM.PARTIJ.Partij 1 Index: vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml =================================================================== diff -u -r33554 -r33557 --- vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml (.../Test.cls.xml) (revision 33554) +++ vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml (.../Test.cls.xml) (revision 33557) @@ -27,6 +27,13 @@ do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Dummy.DOM.VKP.LeverAdres).%New()) do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Nederlands()) + do ..Partij.IndienMethodCall("GeefTelefoon1").DanReturn("") + do ..Partij.IndienMethodCall("GeefTelefoon2").DanReturn("") + do ..Partij.IndienMethodCall("GeefTelefax").DanReturn("") + do ..Partij.IndienMethodCall("GeefGsm").DanReturn("") + do ..Partij.IndienMethodCall("GeefEmail").DanReturn("") + do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("") + set ..Klant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New() do ..Klant.IndienMethodCall("GeefID").DanReturn("K||1234") do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3) @@ -56,7 +63,7 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) #dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1) do $$$AssertEquals(PostalAddres.IsPrimary,"Yes") @@ -77,7 +84,7 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) #dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1) do $$$AssertEquals(PostalAddres.ZipCode,"1234 AA") @@ -94,7 +101,7 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) #dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1) do $$$AssertEquals(PostalAddres.ZipCode,"NL1234 AA") @@ -111,7 +118,7 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) #dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1) do $$$AssertEquals(PostalAddres.ZipCode,"1234-AA") @@ -127,9 +134,10 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) do $$$AssertEquals(Party.Name,"Klantnaam") + do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam") ]]> @@ -142,9 +150,10 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) do $$$AssertEquals(Party.Name,"Klantnaam Toenaam") + do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam Toenaam") ]]> @@ -156,7 +165,7 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) do $$$AssertEquals(Party.LanguageId,"nl-be") ]]> @@ -170,7 +179,7 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) do $$$AssertEquals(Party.LanguageId,"fr") ]]> @@ -184,7 +193,7 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) do $$$AssertEquals(Party.LanguageId,"de") ]]> @@ -198,7 +207,7 @@ #dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant) #dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1) - #dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1) + #dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1) do $$$AssertEquals(Party.LanguageId,"en-us") ]]> @@ -384,6 +393,168 @@ do $$$AssertEquals(CustTable.TaxGroup,"BX") ]]> + + + + + + + + + + + + + + + + + + + + + + + +