Index: vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u -r33320 -r33341
--- vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33320)
+++ vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33341)
@@ -5,32 +5,32 @@
 
 <Method name="Test: CheckoutTypeBepaler voor Benelux geeft Standaard Checkouttype ">
 <Implementation><![CDATA[
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller).%New()
+	#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 = "BE"
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.CheckoutTypeBepaler(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: CheckoutTypeBepaler buiten Benelux geeft MetTransportKeuze Checkouttype ">
 <Implementation><![CDATA[
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller).%New()
+	#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()
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.CheckoutTypeBepaler(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: CheckoutTypeBepaler zonder vanhoecke personality geeft Standaard Checkouttype ">
 <Implementation><![CDATA[
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller).%New()
+	#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).Daro()
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.CheckoutTypeBepaler(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml
===================================================================
diff -u -r33320 -r33341
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml	(.../WebshopSessieSettingsInvuller.cls.xml)	(revision 33320)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml	(.../WebshopSessieSettingsInvuller.cls.xml)	(revision 33341)
@@ -3,33 +3,24 @@
 <Class name="WSimpl.Unishop.Login.WebshopSessieSettingsInvuller">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="LocatieAPI">
-<Type>DOM.common.impl.LocatieAPI</Type>
+<Property name="CheckoutTypeBepaler">
+<Type>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler</Type>
 <Private>1</Private>
 </Property>
 
-<Method name="%OnNew">
-<FormalSpec>LocatieAPI:DOM.common.impl.LocatieAPI</FormalSpec>
+<Method name="CheckoutTypeBepalerGet">
 <Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler</ReturnType>
 <Implementation><![CDATA[
-	Set ..LocatieAPI = $$$Inject(LocatieAPI,##class(DOM.DomeinContext).%New().GeefLocatieAPI())
-	quit $$$OK
+	set r%CheckoutTypeBepaler = $$$LazyLoad(r%CheckoutTypeBepaler, ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New())
+	quit r%CheckoutTypeBepaler
 ]]></Implementation>
 </Method>
 
-<Method name="CheckoutTypeBepaler">
-<FormalSpec>WebshopSessie:APPS.EC.dto.WebshopSessie</FormalSpec>
+<Method name="VulIn">
+<FormalSpec><![CDATA[&WebshopSessie:APPS.EC.dto.WebshopSessie]]></FormalSpec>
 <ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
-<Implementation><![CDATA[
-	#dim Land As DOM.common.impl.Land = ..LocatieAPI.GeefLandVoorLandCode(WebshopSessie.LandCode)
-	
-	Quit:(WebshopSessie.PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke()) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
-	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()
+<Implementation><![CDATA[	Set WebshopSessie.Settings.CheckOutType = ..CheckoutTypeBepaler.Bepaal(WebshopSessie)
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(revision 0)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(revision 33341)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="LocatieAPI">
+<Type>DOM.common.impl.LocatieAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LocatieAPI:DOM.common.impl.LocatieAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..LocatieAPI = $$$Inject(LocatieAPI,##class(DOM.DomeinContext).%New().GeefLocatieAPI())
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bepaal">
+<FormalSpec>WebshopSessie:APPS.EC.dto.WebshopSessie</FormalSpec>
+<ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
+<Implementation><![CDATA[
+	#dim Land As DOM.common.impl.Land = ..LocatieAPI.GeefLandVoorLandCode(WebshopSessie.LandCode)
+	
+	Quit:(WebshopSessie.PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke()) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
+	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()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>