Index: WS/EC/Unishop/InternationaleZending/Hein/impl/LandenBepaler.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/Hein/impl/LandenBepaler.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/Hein/impl/LandenBepaler.cls.xml	(revision 37277)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler">
+<Super>WS.EC.Unishop.InternationaleZending.LandenBepaler</Super>
+
+<Method name="GeefLandCodes">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListbuildIterator).%New($ListBuild("DE"))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(revision 37277)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory">
+<Super>TECH.Mockable</Super>
+
+<Method name="GeefLandenBepaler">
+<FormalSpec>PersonalityID:%String,KlantID:DOM.common.PartijID</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.LandenBepaler</ReturnType>
+<Implementation><![CDATA[
+	If (..IsHeinPersonality(PersonalityID) || ..IsHeinKlant(KlantID)) {
+		Quit ##class(WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler).%New()
+	} else {
+		Quit ##class(WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler).%New()
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsHeinPersonality">
+<FormalSpec>PersonalityID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (PersonalityID = ##class(DOM.common.enu.Personality).Hein())
+]]></Implementation>
+</Method>
+
+<Method name="IsHeinKlant">
+<FormalSpec>KlantID:DOM.common.PartijID</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (KlantID = ##class(DOM.VKP.enu.Klant).Hein())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml	(revision 37277)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory.GeefLandenBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: geeft LandenBepaler hein als de context personality hein is">
+<Implementation><![CDATA[
+	Set LandenBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(##class(DOM.common.enu.Personality).Hein(),"").%ClassName(1),"WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler")
+]]></Implementation>
+</Method>
+
+<Method name="Test: geeft LandenBepaler hein als de klant hein is">
+<Implementation><![CDATA[
+	Set LandenBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).Hein()).%ClassName(1),"WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler")
+]]></Implementation>
+</Method>
+
+<Method name="Test: geeft LandenBepaler vanhoecke als het geen hein klant en geen hein personality is">
+<Implementation><![CDATA[
+	Set LandenBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(##class(DOM.common.enu.Personality).VanHoecke(),"").%ClassName(1),"WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u -r36775 -r37277
--- vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 36775)
+++ vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 37277)
@@ -5,59 +5,89 @@
 
 <Method name="Test: Bepaal geeft landen aan de hand van beschikbare landcodes ">
 <Implementation><![CDATA[
-	#Dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
-	#Dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
+	#dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
+	#dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
 	
-	#Dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
+	#dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
 	Do VertaalAPIStub.IndienMethodCall("GeefVertaler",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VertalerStub)
 	
-	#Dim NietBeneluxLandenMock As vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden = ##class(vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New()
-	Do NietBeneluxLandenMock.VerwachtMethodCall("GeefBeschikbareLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
+	#dim LandenBepalerMock As vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler).%New()
+	Do LandenBepalerMock.VerwachtMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
+
+	#dim LandenBepalerFactoryMock As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+	Do LandenBepalerFactoryMock.IndienMethodCall("GeefLandenBepaler","","").DanReturn(LandenBepalerMock)
 	
-	#Dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(NietBeneluxLandenMock, VertaalAPIStub)
-	#Dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryMock, VertaalAPIStub)
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
 
-	Do NietBeneluxLandenMock.Verifieer()
+	Do LandenBepalerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Bepaal geeft landen aan de hand van de opgegeven PersonalityID en KlantID ">
+<Implementation><![CDATA[
+	#dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
+	#dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
+	
+	#dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
+	Do VertaalAPIStub.IndienMethodCall("GeefVertaler",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VertalerStub)
+	
+	#dim LandenBepalerMock As vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler).%New()
+	Do LandenBepalerMock.IndienMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
+
+	#dim LandenBepalerFactoryMock As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+	Do LandenBepalerFactoryMock.VerwachtMethodCall("GeefLandenBepaler","DummyPersonalityID","DummyKlantID").DanReturn(LandenBepalerMock)
+	
+	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryMock, VertaalAPIStub)
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal","DummyPersonalityID","DummyKlantID")
+
+	Do LandenBepalerFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Bepaal geeft landen die vertaald zijn naar de opgegeven taal">
 <Implementation><![CDATA[
-	#Dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
-	#Dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
+	#dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
+	#dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
 	
-	#Dim VertaalAPIMock As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
+	#dim VertaalAPIMock As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
 	Do VertaalAPIMock.VerwachtMethodCall("GeefVertaler","DummyTaal","Unishop","ALG","LAND").DanReturn(VertalerStub)
 	
-	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden = ##class(vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New()
-	Do NietBeneluxLandenStub.IndienMethodCall("GeefBeschikbareLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
+	#dim LandenBepalerStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler).%New()
+	Do LandenBepalerStub.IndienMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
+
+	#dim LandenBepalerFactoryStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler","","").DanReturn(LandenBepalerStub)
 	
-	#Dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(NietBeneluxLandenStub, VertaalAPIMock)
-	#Dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryStub, VertaalAPIMock)
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
 
 	Do VertaalAPIMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Bepaal geeft landen in alfabetisch gesorteerde volgorde">
 <Implementation><![CDATA[
-	#Dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
-	#Dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
+	#dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
+	#dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
 	
-	#Dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
+	#dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
 	Do VertaalAPIStub.IndienMethodCall("GeefVertaler",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VertalerStub)
 	
-	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden = ##class(vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New()
-	Do NietBeneluxLandenStub.IndienMethodCall("GeefBeschikbareLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG")))
+	#dim LandenBepalerStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler).%New()
+	Do LandenBepalerStub.IndienMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG")))
 
-	#Dim BeschikbareLandenList As WS.EC.ExterneVerkoop.dto.Landen = ##class(WS.EC.ExterneVerkoop.dto.Landen).%New()
+	#dim LandenBepalerFactoryStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler","","").DanReturn(LandenBepalerStub)
+
+	#dim BeschikbareLandenList As WS.EC.ExterneVerkoop.dto.Landen = ##class(WS.EC.ExterneVerkoop.dto.Landen).%New()
 	Do BeschikbareLandenList.Insert(##class(WS.EC.ExterneVerkoop.dto.Land).%New("BG","[BG]"))
-	#Dim DataTransferObjectListMatcher As Tools.Mock.ArgumentMatchers.DataTransferObjectListMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectListMatcher).%New(BeschikbareLandenList)
+	#dim DataTransferObjectListMatcher As Tools.Mock.ArgumentMatchers.DataTransferObjectListMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectListMatcher).%New(BeschikbareLandenList)
 
-	#Dim SorterSpy As vhTest.Spy.WSimpl.Unishop.BeschikbareLandenSort = ##class(vhTest.Spy.WSimpl.Unishop.BeschikbareLandenSort).%New()
+	#dim SorterSpy As vhTest.Spy.WSimpl.Unishop.BeschikbareLandenSort = ##class(vhTest.Spy.WSimpl.Unishop.BeschikbareLandenSort).%New()
 	
-	#Dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(NietBeneluxLandenStub, VertaalAPIStub, SorterSpy)
-	#Dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryStub, VertaalAPIStub, SorterSpy)
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
 
 	Do $$$AssertTrue(SorterSpy.IsSortOpgeroepen)
 	Do $$$AssertTrue(SorterSpy.IsBeschikbareLandenComparatorGebruikt)
@@ -66,18 +96,21 @@
 
 <Method name="Test: Bepaal geeft een lijst met vertaalde en alfabetisch gesorteerde landen weer aan de hand van de beschikbare landcodes en opgegeven taal">
 <Implementation><![CDATA[
-	#Dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
-	#Dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
+	#dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
+	#dim VertalerStub As vhTest.Utils.Vertaler = ##class(vhTest.Utils.Vertaler).%New("", Taal)
 	
-	#Dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
+	#dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
 	Do VertaalAPIStub.IndienMethodCall("GeefVertaler",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VertalerStub)
 	
-	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden = ##class(vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New()
-	Do NietBeneluxLandenStub.IndienMethodCall("GeefBeschikbareLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG")))
+	#dim LandenBepalerStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler).%New()
+	Do LandenBepalerStub.IndienMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG")))
 	
-	#Dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(NietBeneluxLandenStub, VertaalAPIStub)
-	#Dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+	#dim LandenBepalerFactoryStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler","","").DanReturn(LandenBepalerStub)
 
+	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryStub, VertaalAPIStub)
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+
 	Do $$$AssertEquals(EuropeseLanden.GetAt(1).Code,"BG")
 	Do $$$AssertEquals(EuropeseLanden.GetAt(1).Naam,"[BG]")
 ]]></Implementation>
Index: WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml
===================================================================
diff -u -r36775 -r37277
--- WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml	(.../BeschikbareLandenBepaler.cls.xml)	(revision 36775)
+++ WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml	(.../BeschikbareLandenBepaler.cls.xml)	(revision 37277)
@@ -13,8 +13,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="NietBeneluxLanden">
-<Type>APPS.TRANSP.OfferteService.data.BeschikbareLanden</Type>
+<Property name="LandenBepalerFactory">
+<Type>WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,13 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>NietBeneluxLanden:APPS.TRANSP.OfferteService.data.BeschikbareLanden,VertaalAPI:DOM.common.Transl.VertaalAPI,Sorter:WSimpl.Unishop.BeschikbareLandenSort</FormalSpec>
+<FormalSpec>LandenBepalerFactory:WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory,VertaalAPI:DOM.common.Transl.VertaalAPI,Sorter:WSimpl.Unishop.BeschikbareLandenSort</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..NietBeneluxLanden = $$$Inject(NietBeneluxLanden,##class(APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New())
+	Set ..LandenBepalerFactory = $$$Inject(LandenBepalerFactory,##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New())
 	Set ..VertaalAPI = $$$Inject(VertaalAPI,##class(DOM.DomeinContext).Instance().GeefVertaalAPI())
 	Set ..Sorter = $$$Inject(Sorter,##class(WSimpl.Unishop.BeschikbareLandenSort).%New())
 	Set ..Comparator = ##class(WSimpl.Unishop.BeschikbareLandenComparator).%New()
@@ -51,12 +51,12 @@
 </Method>
 
 <Method name="Bepaal">
-<FormalSpec>Taal:DOM.enu.Taal</FormalSpec>
+<FormalSpec>Taal:DOM.enu.Taal,PersonalityID:%String="",KlantID:DOM.common.PartijID=""</FormalSpec>
 <ReturnType>WS.EC.ExterneVerkoop.dto.Landen</ReturnType>
 <Implementation><![CDATA[
 	Do ..ZetVertaler(Taal)
 	#dim Landen As WS.EC.ExterneVerkoop.dto.Landen = ##class(WS.EC.ExterneVerkoop.dto.Landen).%New()
-	#dim BeschikbareLandCodes As TECH.Iterator = ..NietBeneluxLanden.GeefBeschikbareLandCodes()
+	#dim BeschikbareLandCodes As TECH.Iterator = ..LandenBepalerFactory.GeefLandenBepaler(PersonalityID, KlantID).GeefLandCodes()
 	
 	While BeschikbareLandCodes.HasNext()
 	{	
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Hein/impl/LandenBepaler/GeefLandCodes/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/Hein/impl/LandenBepaler/GeefLandCodes/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Hein/impl/LandenBepaler/GeefLandCodes/Test.cls.xml	(revision 37277)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler.GeefLandCodes.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: GeefLandCodes voor Hein geeft enkel DE weer">
+<Implementation><![CDATA[
+	Set LandenBepaler = ##class(WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler).%New()
+	#dim LandCodes As TECH.ListIterator = LandenBepaler.GeefLandCodes()
+	
+	Do $$$AssertEquals(LandCodes.Next(),"DE")
+	Do $$$AssertFalse(LandCodes.HasNext())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/VanHoecke/impl/LandenBepaler/GeefLandCodes/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/VanHoecke/impl/LandenBepaler/GeefLandCodes/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/VanHoecke/impl/LandenBepaler/GeefLandCodes/Test.cls.xml	(revision 37277)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler.GeefLandCodes.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: GeefLandCodes voor VanHoecke geeft enkel DE weer">
+<Implementation><![CDATA[
+	Set LandenBepaler = ##class(WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler).%New()
+	#dim LandCodes As TECH.ListIterator = LandenBepaler.GeefLandCodes()
+	
+	Do $$$AssertEquals(LandCodes.Next(),"BG") 
+	Do $$$AssertEquals(LandCodes.Next(),"CY") 
+	Do $$$AssertEquals(LandCodes.Next(),"DK") 
+	Do $$$AssertEquals(LandCodes.Next(),"DE") 
+	Do $$$AssertEquals(LandCodes.Next(),"EE") 
+	Do $$$AssertEquals(LandCodes.Next(),"FI") 
+	Do $$$AssertEquals(LandCodes.Next(),"FR") 
+	Do $$$AssertEquals(LandCodes.Next(),"GR") 
+	Do $$$AssertEquals(LandCodes.Next(),"HU") 
+	Do $$$AssertEquals(LandCodes.Next(),"IE") 
+	Do $$$AssertEquals(LandCodes.Next(),"IT") 
+	Do $$$AssertEquals(LandCodes.Next(),"HR") 
+	Do $$$AssertEquals(LandCodes.Next(),"LV") 
+	Do $$$AssertEquals(LandCodes.Next(),"LT") 
+	Do $$$AssertEquals(LandCodes.Next(),"MT") 
+	Do $$$AssertEquals(LandCodes.Next(),"AT") 
+	Do $$$AssertEquals(LandCodes.Next(),"PL") 
+	Do $$$AssertEquals(LandCodes.Next(),"PT") 
+	Do $$$AssertEquals(LandCodes.Next(),"RO") 
+	Do $$$AssertEquals(LandCodes.Next(),"SI") 
+	Do $$$AssertEquals(LandCodes.Next(),"SK") 
+	Do $$$AssertEquals(LandCodes.Next(),"ES") 
+	Do $$$AssertEquals(LandCodes.Next(),"CZ") 
+	Do $$$AssertEquals(LandCodes.Next(),"GB") 
+	Do $$$AssertEquals(LandCodes.Next(),"SE")
+	Do $$$AssertFalse(LandCodes.HasNext())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml	(revision 37277)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.LandenBepaler">
+<Abstract>1</Abstract>
+<Super>TECH.Mockable</Super>
+
+<Method name="GeefLandCodes">
+<Abstract>1</Abstract>
+<ReturnType>TECH.Iterator</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/Unishop/InternationaleZending/VanHoecke/impl/LandenBepaler.cls.xml
===================================================================
diff -u
--- WS/EC/Unishop/InternationaleZending/VanHoecke/impl/LandenBepaler.cls.xml	(revision 0)
+++ WS/EC/Unishop/InternationaleZending/VanHoecke/impl/LandenBepaler.cls.xml	(revision 37277)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler">
+<Super>WS.EC.Unishop.InternationaleZending.LandenBepaler</Super>
+
+<Method name="GeefLandCodes">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListbuildIterator).%New($ListBuild("BG","CY","DK","DE","EE","FI","FR","GR","HU","IE","IT","HR","LV","LT","MT","AT","PL","PT","RO","SI","SK","ES","CZ","GB","SE"))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u -r37238 -r37277
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37238)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37277)
@@ -17,7 +17,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: geeft TransportFirmaBepaler vanhoecke als het geen hein klant en geen hien personality is">
+<Method name="Test: geeft TransportFirmaBepaler vanhoecke als het geen hein klant en geen hein personality is">
 <Implementation><![CDATA[
 	Set TransportFirmaBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.TransportFirmaBepalerFactory).%New()
 	Do $$$AssertEquals(TransportFirmaBepalerFactory.GeefTransportFirmaBepaler(##class(DOM.common.enu.Personality).VanHoecke(),"").%ClassName(1),"WS.EC.Unishop.InternationaleZending.VanHoecke.impl.TransportFirmaBepaler")
Index: vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(revision 0)
+++ vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(revision 37277)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory</Super>
+
+<Method name="GeefLandenBepaler">
+<FormalSpec>PersonalityID:%String,KlantID:DOM.common.PartijID</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.LandenBepaler</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/EC/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r37245 -r37277
--- WS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 37245)
+++ WS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 37277)
@@ -165,7 +165,7 @@
 <Method name="GeefBeschikbareLanden">
 <ReturnType>WS.EC.ExterneVerkoop.dto.Landen</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New().Bepaal(..GeefTaal())
+<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New().Bepaal(..GeefTaal(),..GeefPersonalityID() ,..GeefKlantID())
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml	(revision 37277)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WS.EC.Unishop.InternationaleZending.LandenBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.EC.Unishop.InternationaleZending.LandenBepaler</Super>
+
+<Method name="GeefBeschikbareLandCodes">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefLandCodes">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/WS/EC/Unishop/InternationaleZending/LandenBepaler.cls.xml	(revision 37277)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WS.EC.Unishop.InternationaleZending.LandenBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.EC.Unishop.InternationaleZending.LandenBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefLandCodes">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLandCodes")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(revision 0)
+++ vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(revision 37277)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefLandenBepaler">
+<FormalSpec>PersonalityID:%String,KlantID:DOM.common.PartijID</FormalSpec>
+<ReturnType>WS.EC.Unishop.InternationaleZending.LandenBepaler</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLandenBepaler",PersonalityID,KlantID)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>