Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler/Test.cls.xml
===================================================================
diff -u -r37103 -r37312
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37103)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37312)
@@ -11,12 +11,12 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 		
-	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New()
 	
-	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(PersonalityID, Klant.GeefID())
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID()))
 	Do $$$AssertEquals(ConfiguratorTypes.Count(),2)
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(APPS.EC.Unishop.enu.ConfiguratorType).LBX())
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(2),##class(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).LBX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(2),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).TAX())
 ]]></Implementation>
 </Method>
 
@@ -27,13 +27,13 @@
 
 	do ..PushKlant(Klant)
 	
-	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New()
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 	
-	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(PersonalityID, Klant.GeefID())
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID()))
 	Do $$$AssertEquals(ConfiguratorTypes.Count(),1)
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).TAX())
 ]]></Implementation>
 </Method>
 
@@ -45,12 +45,12 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Hein()
 
-	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New()
 	
-	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(PersonalityID, Klant.GeefID())
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID()))
 	Do $$$AssertEquals(ConfiguratorTypes.Count(),2)
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(APPS.EC.Unishop.enu.ConfiguratorType).LBX())
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(2),##class(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).LBX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(2),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).TAX())
 ]]></Implementation>
 </Method>
 
@@ -62,12 +62,12 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Daro()
 
-	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New()
 	
-	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(PersonalityID, Klant.GeefID())
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID()))
 	Do $$$AssertEquals(ConfiguratorTypes.Count(),2)
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(APPS.EC.Unishop.enu.ConfiguratorType).LBX())
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(2),##class(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).LBX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(2),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).TAX())
 ]]></Implementation>
 </Method>
 
@@ -81,12 +81,12 @@
 
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 
-	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New()
 	
-	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(PersonalityID, Klant.GeefID())
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID()))
 	Do $$$AssertEquals(ConfiguratorTypes.Count(),2)
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(APPS.EC.Unishop.enu.ConfiguratorType).LBX())
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(2),##class(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).LBX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(2),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).TAX())
 ]]></Implementation>
 </Method>
 
@@ -100,14 +100,29 @@
 
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 
-	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New()
 	
-	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(PersonalityID, Klant.GeefID())
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID()))
 	Do $$$AssertEquals(ConfiguratorTypes.Count(),1)
-	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).TAX())
 ]]></Implementation>
 </Method>
 
+<Method name="MaakWebshopSessie">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EC.dto.WebshopSessie</ReturnType>
+<Implementation><![CDATA[
+	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
+	Set WebshopSessie.PersonalityID = PersonalityID
+	Set WebshopSessie.VhintraSessie = ##class(APPS.algemeen.VhintraShell.dto.VhintraSessie).%New()
+	Set WebshopSessie.VhintraSessie.GebruikerData = ##class(DOM.common.dto.GebruikerData).%New()
+	Set WebshopSessie.VhintraSessie.GebruikerData.KlantData = ##class(DOM.common.dto.GebruikerData).%New()
+	Set WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID = KlantID
+	Quit WebshopSessie
+]]></Implementation>
+</Method>
+
 <Method name="PushKlant">
 <FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
 <Implementation><![CDATA[
FishEye: Tag 37312 refers to a dead (removed) revision in file `APPS/EC/Unishop/enu/KleurenSchema.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/EC/dto/WebshopSessieSettings.cls.xml
===================================================================
diff -u -r37097 -r37312
--- APPS/EC/dto/WebshopSessieSettings.cls.xml	(.../WebshopSessieSettings.cls.xml)	(revision 37097)
+++ APPS/EC/dto/WebshopSessieSettings.cls.xml	(.../WebshopSessieSettings.cls.xml)	(revision 37312)
@@ -8,11 +8,11 @@
 </Property>
 
 <Property name="KleurenSchema">
-<Type>APPS.EC.Unishop.enu.KleurenSchema</Type>
+<Type>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema</Type>
 </Property>
 
 <Property name="ConfiguratorTypes">
-<Type>APPS.EC.Unishop.enu.ConfiguratorType</Type>
+<Type>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType</Type>
 <Collection>list</Collection>
 </Property>
 </Class>
Index: vhTest/Mock/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(revision 37312)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Bepaal">
+<FormalSpec>WebshopSessie:APPS.EC.dto.WebshopSessie</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Bepaal",WebshopSessie)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 37312 refers to a dead (removed) revision in file `vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 37312 refers to a dead (removed) revision in file `vhTest/Mock/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler/Test.cls.xml
===================================================================
diff -u -r37181 -r37312
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37181)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37312)
@@ -11,9 +11,9 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 		
-	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
+	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New()
 	
-	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Licht())
+	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID())),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Licht())
 ]]></Implementation>
 </Method>
 
@@ -24,11 +24,11 @@
 
 	do ..PushKlant(Klant)
 	
-	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
+	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New()
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 	
-	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Donker())
+	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID())),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Donker())
 ]]></Implementation>
 </Method>
 
@@ -40,9 +40,9 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Hein()
 
-	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
+	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New()
 	
-	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Licht())
+	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID())),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Licht())
 ]]></Implementation>
 </Method>
 
@@ -54,9 +54,9 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Daro()
 
-	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
+	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New()
 	
-	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Donker())
+	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID())),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Donker())
 ]]></Implementation>
 </Method>
 
@@ -68,9 +68,9 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).SFS()
 
-	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
+	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New()
 	
-	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Licht())
+	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID())),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Licht())
 ]]></Implementation>
 </Method>
 
@@ -84,9 +84,9 @@
 
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 
-	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
+	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New()
 	
-	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Licht())
+	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID())),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Licht())
 ]]></Implementation>
 </Method>
 
@@ -100,14 +100,30 @@
 
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 
-	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
+	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New()
 	
-	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Donker())
+	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(..MaakWebshopSessie(PersonalityID, Klant.GeefID())),##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Donker())
 ]]></Implementation>
 </Method>
 
+<Method name="MaakWebshopSessie">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EC.dto.WebshopSessie</ReturnType>
+<Implementation><![CDATA[
+	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
+	Set WebshopSessie.PersonalityID = PersonalityID
+	Set WebshopSessie.VhintraSessie = ##class(APPS.algemeen.VhintraShell.dto.VhintraSessie).%New()
+	Set WebshopSessie.VhintraSessie.GebruikerData = ##class(DOM.common.dto.GebruikerData).%New()
+	Set WebshopSessie.VhintraSessie.GebruikerData.KlantData = ##class(DOM.common.dto.GebruikerData).%New()
+	Set WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID = KlantID
+	Quit WebshopSessie
+]]></Implementation>
+</Method>
+
 <Method name="PushKlant">
 <FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	#dim VerkoopAPI As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
 	do VerkoopAPI.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(Klant)
FishEye: Tag 37312 refers to a dead (removed) revision in file `APPS/EC/Unishop/enu/ConfiguratorType.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhTest/Fake/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(revision 37312)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler</Super>
+
+<Method name="Bepaal">
+<FormalSpec>WebshopSessie:APPS.EC.dto.WebshopSessie</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 37312 refers to a dead (removed) revision in file `APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 37312 refers to a dead (removed) revision in file `APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/ConfiguratorType.cls.xml
===================================================================
diff -u -r37097 -r37312
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/ConfiguratorType.cls.xml	(.../APPS/EC/Unishop/enu/ConfiguratorType.cls.xml)	(revision 37097)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/ConfiguratorType.cls.xml	(.../WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/ConfiguratorType.cls.xml)	(revision 37312)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.EC.Unishop.enu.ConfiguratorType">
+<Class name="WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType">
 <ClassType>datatype</ClassType>
 <Super>TECH.Enumeration</Super>
 
@@ -14,14 +14,14 @@
 
 <Method name="LBX">
 <ClassMethod>1</ClassMethod>
-<ReturnType>APPS.EC.Unishop.enu.ConfiguratorType</ReturnType>
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType</ReturnType>
 <Implementation><![CDATA[	Quit "LBX"
 ]]></Implementation>
 </Method>
 
 <Method name="TAX">
 <ClassMethod>1</ClassMethod>
-<ReturnType>APPS.EC.Unishop.enu.ConfiguratorType</ReturnType>
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType</ReturnType>
 <Implementation><![CDATA[	Quit "TAX"
 ]]></Implementation>
 </Method>
FishEye: Tag 37312 refers to a dead (removed) revision in file `vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml
===================================================================
diff -u -r37181 -r37312
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(.../ConfiguratorTypeBepaler.cls.xml)	(revision 37181)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(.../ConfiguratorTypeBepaler.cls.xml)	(revision 37312)
@@ -3,29 +3,80 @@
 <Class name="WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="ConfiguratorTypeBepaler">
-<Type>APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler</Type>
+<Property name="VerkoopAPI">
+<Type>DOM.VKP.VerkoopAPI</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ConfiguratorTypeBepaler:APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..ConfiguratorTypeBepaler = $$$Inject(ConfiguratorTypeBepaler,##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New())
-	Quit $$$OK
+	Set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
+	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Bepaal">
 <FormalSpec>WebshopSessie:APPS.EC.dto.WebshopSessie</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
-<Implementation><![CDATA[	Quit ..ConfiguratorTypeBepaler.Bepaal(WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
+<Implementation><![CDATA[
+	Quit:..IsGeenVanHoeckePersonality(WebshopSessie.PersonalityID) ..GeefAlleConfiguratorTypes()
+
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
+	#dim Land As DOM.common.impl.Land = Klant.GeefAdres().GeefLand()
+	
+	Quit:..IsStandaardKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID) ..GeefAlleConfiguratorTypes()
+	
+	Quit:Land.IsBENELUX() ..GeefAlleConfiguratorTypes()
+	
+	Quit:..TAXExportNietActief() ..GeefAlleConfiguratorTypes()
+
+	Quit ..GeefConfiguratorTypeTAX()
 ]]></Implementation>
 </Method>
+
+<Method name="GeefConfiguratorTypeTAX">
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	#dim ConfiguratorTypes As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do ConfiguratorTypes.Insert(##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).TAX())
+	Quit ConfiguratorTypes
+]]></Implementation>
+</Method>
+
+<Method name="GeefAlleConfiguratorTypes">
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.ConfiguratorType).ValueList()
+]]></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="TAXExportNietActief">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (##class(TECH.Config.ConfigMgr).Instance().GeefString("ActivatieVlagTAXExport") = "0")
+]]></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>
 
 
FishEye: Tag 37312 refers to a dead (removed) revision in file `vhTest/Fake/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/KleurenSchema.cls.xml
===================================================================
diff -u -r37095 -r37312
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/KleurenSchema.cls.xml	(.../APPS/EC/Unishop/enu/KleurenSchema.cls.xml)	(revision 37095)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/KleurenSchema.cls.xml	(.../WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/KleurenSchema.cls.xml)	(revision 37312)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.EC.Unishop.enu.KleurenSchema">
+<Class name="WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema">
 <ClassType>datatype</ClassType>
 <Super>TECH.Enumeration</Super>
 
@@ -14,14 +14,14 @@
 
 <Method name="Licht">
 <ClassMethod>1</ClassMethod>
-<ReturnType>APPS.EC.Unishop.enu.KleurenSchema</ReturnType>
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema</ReturnType>
 <Implementation><![CDATA[	Quit "Licht"
 ]]></Implementation>
 </Method>
 
 <Method name="Donker">
 <ClassMethod>1</ClassMethod>
-<ReturnType>APPS.EC.Unishop.enu.KleurenSchema</ReturnType>
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema</ReturnType>
 <Implementation><![CDATA[	Quit "Donker"
 ]]></Implementation>
 </Method>
FishEye: Tag 37312 refers to a dead (removed) revision in file `vhTest/Fake/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml
===================================================================
diff -u -r37181 -r37312
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37181)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37312)
@@ -3,29 +3,73 @@
 <Class name="WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="KleurenSchemaBepaler">
-<Type>APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler</Type>
+<Property name="VerkoopAPI">
+<Type>DOM.VKP.VerkoopAPI</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>KleurenSchemaBepaler:APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..KleurenSchemaBepaler = $$$Inject(KleurenSchemaBepaler,##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New())
-	Quit $$$OK
+	Set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
+	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Bepaal">
 <FormalSpec>WebshopSessie:APPS.EC.dto.WebshopSessie</FormalSpec>
-<ReturnType>APPS.EC.Unishop.enu.KleurenSchema</ReturnType>
-<Implementation><![CDATA[	Quit ..KleurenSchemaBepaler.Bepaal(WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema</ReturnType>
+<Implementation><![CDATA[
+	Quit:..IsDaroPersonality(WebshopSessie.PersonalityID) ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Donker() 	
+	
+	Quit:..IsGeenVanHoeckePersonality(WebshopSessie.PersonalityID) ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Licht() 	
+
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
+	#dim Land As DOM.common.impl.Land = Klant.GeefAdres().GeefLand()
+	
+	Quit:..IsStandaardKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID) ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Licht()
+	
+	Quit:Land.IsBENELUX() ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Licht()
+	
+	Quit:..TAXExportNietActief() ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Licht()
+
+	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.KleurenSchema).Donker()
 ]]></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="TAXExportNietActief">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (##class(TECH.Config.ConfigMgr).Instance().GeefString("ActivatieVlagTAXExport") = "0")
+]]></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>
+
+<Method name="IsDaroPersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (PersonalityID = ##class(DOM.common.enu.Personality).Daro())
+]]></Implementation>
+</Method>
 </Class>
 
 
FishEye: Tag 37312 refers to a dead (removed) revision in file `vhTest/Mock/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 37312 refers to a dead (removed) revision in file `APPS/EC/Unishop/enu/ConfiguratorType/AutoComplete.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 37312 refers to a dead (removed) revision in file `APPS/EC/Unishop/enu/ConfiguratorType/Verwerker.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 37312 refers to a dead (removed) revision in file `APPS/EC/Unishop/enu/KleurenSchema/Verwerker.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 37312 refers to a dead (removed) revision in file `APPS/EC/Unishop/enu/KleurenSchema/AutoComplete.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?