Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r33366 -r33478
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 33366)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 33478)
@@ -27,9 +27,7 @@
 	Quit:(WebshopSessie.PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke()) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
 	
 	#dim Land As DOM.common.impl.Land = ..LocatieAPI.GeefLandVoorLandCode(WebshopSessie.LandCode)
-	Quit:Land.IsBENELUX() ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
-	Quit:Land.IsLidVanEU() ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
-	Quit:##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
+	Quit $$$If(Land.IsBENELUX(),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard(),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u -r33341 -r33478
--- vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33341)
+++ vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33478)
@@ -7,6 +7,7 @@
 <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).VanHoecke()
 	Set WebshopSessie.LandCode = "BE"
 	
 	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
@@ -17,8 +18,8 @@
 <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.LandCode = "DE"
 	Set WebshopSessie.PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
+	Set WebshopSessie.LandCode = "DE"
 	
 	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
 ]]></Implementation>