Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r37181 -r37204
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37181)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37204)
@@ -14,17 +14,28 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
-	quit $$$OK
+	Set ..CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Bepaal">
 <FormalSpec>WebshopSessie:APPS.EC.dto.WebshopSessie</FormalSpec>
 <ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
-<Implementation><![CDATA[	quit ..CheckoutTypeBepaler.Bepaal(WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
+<Implementation><![CDATA[
+	Quit:..IsHeinPersonality(WebshopSessie.PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() 	
+
+	Quit ..CheckoutTypeBepaler.Bepaal(WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
 ]]></Implementation>
 </Method>
+
+<Method name="IsHeinPersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (PersonalityID = ##class(DOM.common.enu.Personality).Hein())
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u -r33947 -r37204
--- vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33947)
+++ vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37204)
@@ -11,6 +11,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: CheckoutTypeBepaler met Hein personality geeft MetTransportKeuze Checkouttype ">
+<Implementation><![CDATA[
+	
+	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New()
+	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
+	Set WebshopSessie.PersonalityID = ##class(DOM.common.enu.Personality).Hein()
+	
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+]]></Implementation>
+</Method>
+
 <Method name="Test: CheckoutTypeBepaler voor Benelux geeft Standaard Checkouttype ">
 <Implementation><![CDATA[
 	do ..PushKlant(##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New())
Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u -r37103 -r37204
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37103)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37204)
@@ -32,20 +32,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: CheckoutTypeBepaler met Hein personality geeft MetTransportKeuze 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).Hein()
-
-	#dim CheckoutTypeBepaler As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
-	
-	Do $$$AssertEquals(CheckoutTypeBepaler.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()
Index: APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r37103 -r37204
--- APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37103)
+++ APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37204)
@@ -24,8 +24,6 @@
 <FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
 <ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
 <Implementation><![CDATA[
-	Quit:..IsHeinPersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() 	
-
 	Quit:..IsGeenVanHoeckePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
 
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(KlantID)
@@ -63,14 +61,6 @@
 <Implementation><![CDATA[	Quit (PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke())
 ]]></Implementation>
 </Method>
-
-<Method name="IsHeinPersonality">
-<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (PersonalityID = ##class(DOM.common.enu.Personality).Hein())
-]]></Implementation>
-</Method>
 </Class>