Index: vhTest/Dummy/DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r33947 -r33981
--- vhTest/Dummy/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 33947)
+++ vhTest/Dummy/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 33981)
@@ -8,6 +8,26 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Adres">
+<Type>DOM.VKP.LeverAdres</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantID">
+<Type>DOM.common.PartijID</Type>
+<InitialExpression>"1234"</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Method name="AdresGet">
+<Private>1</Private>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	Set:$$$Not($IsObject(r%Adres)) r%Adres = ##class(vhTest.Dummy.DOM.VKP.LeverAdres).%New()
+	Quit r%Adres
+]]></Implementation>
+</Method>
+
 <Method name="GeefCode">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit "Dummycode1234"
@@ -34,10 +54,16 @@
 
 <Method name="GeefID">
 <ReturnType>DOM.common.PartijID</ReturnType>
-<Implementation><![CDATA[	quit "1234"
+<Implementation><![CDATA[	quit ..KlantID
 ]]></Implementation>
 </Method>
 
+<Method name="ZetID">
+<FormalSpec>KlantID:DOM.common.PartijID</FormalSpec>
+<Implementation><![CDATA[	Set ..KlantID = KlantID
+]]></Implementation>
+</Method>
+
 <Method name="GeefRegio">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit "DummyRegio"
@@ -58,7 +84,7 @@
 
 <Method name="GeefAdres">
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
-<Implementation><![CDATA[	quit ##class(vhTest.Dummy.DOM.VKP.LeverAdres).%New()
+<Implementation><![CDATA[	quit ..Adres
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml	(revision 33981)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: CheckoutTypeBepaler voor Benelux geeft Standaard Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	
+	do ..PushKlant(Klant)
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+		
+	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+]]></Implementation>
+</Method>
+
+<Method name="Test: CheckoutTypeBepaler buiten Benelux geeft MetTransportKeuze Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+
+	do ..PushKlant(Klant)
+	
+	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+	
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+]]></Implementation>
+</Method>
+
+<Method name="Test: CheckoutTypeBepaler zonder vanhoecke personality geeft Standaard Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+
+	do ..PushKlant(Klant)
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Daro()
+
+	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+]]></Implementation>
+</Method>
+
+<Method name="Test: CheckoutTypeBepaler met klantuitzondering geeft Standaard Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+	Do Klant.ZetID(##class(DOM.VKP.enu.Klant).DaroFactors())
+	
+	do ..PushKlant(Klant)
+
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+
+	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+]]></Implementation>
+</Method>
+
+<Method name="Test: CheckoutTypeBepaler met klant buiten benelux geeft MetTransportKeuze Checkouttype ">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+	Do Klant.ZetID(..GeefNietBeneluxKlantID())
+	
+	do ..PushKlant(Klant)
+
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+
+	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+]]></Implementation>
+</Method>
+
+<Method name="PushKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Implementation><![CDATA[
+	#dim VerkoopAPI As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
+	do VerkoopAPI.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(Klant)
+]]></Implementation>
+</Method>
+
+<Method name="GeefNietBeneluxKlantID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim NietBeneluxKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakNietBENELUXOnderneming()
+	Quit NietBeneluxKlant.GeefID()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>