Index: vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u -r33822 -r33947
--- vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33822)
+++ vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33947)
@@ -3,19 +3,34 @@
 <Class name="vhUnitTest.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<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="Test: CheckoutTypeBepaler voor Benelux geeft Standaard Checkouttype ">
 <Implementation><![CDATA[
+	do ..PushKlant(##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%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).VanHoecke()
 	Set WebshopSessie.LandCode = "BE"
-	
+		
 	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[
+	set Klant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
+	#dim Adres As DOM.VKP.LeverAdres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid()
+	do Klant.IndienMethodCall("GeefAdres").DanReturn(Adres)
+	do ..PushKlant(Klant)
+	
 	#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()
Index: APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(revision 0)
+++ APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(revision 33947)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="VerkoopAPI">
+<Type>DOM.VKP.VerkoopAPI</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 ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bepaal">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
+<Implementation><![CDATA[
+	Quit:..IsGeenVanHoeckePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
+
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(KlantID)
+	#dim Land As DOM.common.impl.Land = Klant.GeefAdres().GeefLand()
+	
+	Quit:..IsStandaardKlant(KlantID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
+	
+	Quit:Land.IsBENELUX() ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
+	
+	Quit ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
+]]></Implementation>
+</Method>
+
+<Method name="IsStandaardKlant">
+<FormalSpec>KlantID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant).IsValid(KlantID)
+]]></Implementation>
+</Method>
+
+<Method name="IsGeenVanHoeckePersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaWinkelkarToepasser.cls.xml
===================================================================
diff -u -r32374 -r33947
--- APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaWinkelkarToepasser.cls.xml	(.../MaatwerkDefaultsViaWinkelkarToepasser.cls.xml)	(revision 32374)
+++ APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaWinkelkarToepasser.cls.xml	(.../MaatwerkDefaultsViaWinkelkarToepasser.cls.xml)	(revision 33947)
@@ -21,12 +21,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="CheckoutTypeBepaler">
+<Type>APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Winkelkar:APPS.EC.Winkelkar.dto.Winkelkar,WinkelkarService:DOM.EC.Winkelkar.impl.WinkelkarService=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..Winkelkar = Winkelkar
 	Set ..WinkelkarService = $$$Implementation(WinkelkarService, ##class(DOM.EC.Winkelkar.impl.WinkelkarService).%New())
+	Set ..CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -84,6 +90,10 @@
 		Set KenmerkenDefaults.GekoppeldeIngegevenKenmerken = ##class(TECH.ListUtils).CopyArrayOfObjects(LaatstGewijzigdeKenmerken.GekoppeldeIngegevenKenmerken)
 		Do ..KopieerWaardenVanGekoppeldeIngegevenKenmerken(TAORKenmerken.GekoppeldeIngegevenKenmerken, KenmerkenDefaults.GekoppeldeIngegevenKenmerken)
 	}
+	
+	If ..CheckoutTypeBepaler.Bepaal(..Winkelkar.Personality.ID, ..Winkelkar.KlantID()) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() {
+		Set KenmerkenDefaults.VerpakkingType = ##class(DOM.PM.enu.TAORVerpakkingType).FlatpackV1()
+	}
 ]]></Implementation>
 </Method>
 
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml
===================================================================
diff -u -r33351 -r33947
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml	(.../WebshopSessieSettingsInvuller.cls.xml)	(revision 33351)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml	(.../WebshopSessieSettingsInvuller.cls.xml)	(revision 33947)
@@ -19,7 +19,6 @@
 
 <Method name="VulIn">
 <FormalSpec><![CDATA[&WebshopSessie:APPS.EC.dto.WebshopSessie]]></FormalSpec>
-<ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
 <Implementation><![CDATA[	Set WebshopSessie.Settings.CheckOutType = ..CheckoutTypeBepaler.Bepaal(WebshopSessie)
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml
===================================================================
diff -u -r33351 -r33947
--- vhTest/Mock/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml	(.../WebshopSessieSettingsInvuller.cls.xml)	(revision 33351)
+++ vhTest/Mock/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml	(.../WebshopSessieSettingsInvuller.cls.xml)	(revision 33947)
@@ -11,8 +11,7 @@
 
 <Method name="VulIn">
 <FormalSpec><![CDATA[&WebshopSessie:APPS.EC.dto.WebshopSessie]]></FormalSpec>
-<ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("VulIn",.WebshopSessie)
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VulIn",.WebshopSessie)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Dummy/DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r29059 -r33947
--- vhTest/Dummy/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 29059)
+++ vhTest/Dummy/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 33947)
@@ -55,6 +55,12 @@
 <Implementation><![CDATA[	quit ##class(DOM.VKP.enu.VerzendWijze).OnzeDiensten3()
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAdres">
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[	quit ##class(vhTest.Dummy.DOM.VKP.LeverAdres).%New()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r33815 -r33947
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 33815)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 33947)
@@ -3,8 +3,8 @@
 <Class name="WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="LocatieAPI">
-<Type>DOM.common.impl.LocatieAPI</Type>
+<Property name="CheckoutTypeBepaler">
+<Type>APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -15,40 +15,17 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..LocatieAPI = $$$Inject(LocatieAPI,##class(DOM.DomeinContext).%New().GeefLocatieAPI())
+	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[
-	#dim Land As DOM.common.impl.Land = ..LocatieAPI.GeefLandVoorLandCode(WebshopSessie.LandCode)
-
-	Quit:..IsStandaardKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
-	Quit:..IsGeenVanHoeckePersonality(WebshopSessie.PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
-	Quit:Land.IsBENELUX() ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
-	
-	Quit ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
+<Implementation><![CDATA[	quit ..CheckoutTypeBepaler.Bepaal(WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
 ]]></Implementation>
 </Method>
-
-<Method name="IsStandaardKlant">
-<FormalSpec>KlantID:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant).IsValid(KlantID)
-]]></Implementation>
-</Method>
-
-<Method name="IsGeenVanHoeckePersonality">
-<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke())
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml
===================================================================
diff -u -r33944 -r33947
--- APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml	(.../WebshopKenmerkDomeinPostProcessor.cls.xml)	(revision 33944)
+++ APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml	(.../WebshopKenmerkDomeinPostProcessor.cls.xml)	(revision 33947)
@@ -10,6 +10,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="CheckoutTypeBepaler">
+<Type>APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -19,6 +24,7 @@
 	Do ##super()
 	
 	Set ..IsActiefValidator = ##class(APPS.EC.UnishopConfigurator.impl.IsActiefValidator).%New(##class(APPS.common.enu.ApplicatieType).Extern())
+	Set ..CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -157,6 +163,10 @@
 	}
 	
 	Do ..KenmerkMogelijkheden.VerwijderMogelijkeWaarden(..TAOREnum.KenmerkNaam.RugHoogte)
+	
+	If ..CheckoutTypeBepaler.Bepaal(..Personality.GeefID(), ..KlantIDVanEindklant) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() {
+		Do ..KenmerkMogelijkheden.VerwijderMogelijkeWaarden(..TAOREnum.KenmerkNaam.VerpakkingType)
+	}
 ]]></Implementation>
 </Method>