Index: APPS/EC/Unishop/enu/ConfiguratorType/AutoComplete.cls.xml
===================================================================
diff -u
--- APPS/EC/Unishop/enu/ConfiguratorType/AutoComplete.cls.xml	(revision 0)
+++ APPS/EC/Unishop/enu/ConfiguratorType/AutoComplete.cls.xml	(revision 37097)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Unishop.enu.ConfiguratorType.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="LBX">
+<Type>%String</Type>
+<InitialExpression>"LBX"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="TAX">
+<Type>%String</Type>
+<InitialExpression>"TAX"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/EC/Unishop/enu/ConfiguratorType.cls.xml
===================================================================
diff -u
--- APPS/EC/Unishop/enu/ConfiguratorType.cls.xml	(revision 0)
+++ APPS/EC/Unishop/enu/ConfiguratorType.cls.xml	(revision 37097)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Unishop.enu.ConfiguratorType">
+<ClassType>datatype</ClassType>
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="DISPLAYLIST">
+<Default>;LBX;TAX</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>;LBX;TAX</Default>
+</Parameter>
+
+<Method name="LBX">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.Unishop.enu.ConfiguratorType</ReturnType>
+<Implementation><![CDATA[	Quit "LBX"
+]]></Implementation>
+</Method>
+
+<Method name="TAX">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.Unishop.enu.ConfiguratorType</ReturnType>
+<Implementation><![CDATA[	Quit "TAX"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt
===================================================================
diff -u -r36062 -r37097
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 36062)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 37097)
@@ -113,6 +113,8 @@
             <s:complexType name="WebshopSessieSettings">
                 <s:sequence>
                     <s:element minOccurs="0" name="CheckOutType" type="s0:CheckoutType"/>
+                    <s:element minOccurs="0" name="KleurenSchema" type="s0:KleurenSchema"/>
+                    <s:element minOccurs="0" name="ConfiguratorTypes" type="s0:ArrayOfConfiguratorTypeConfiguratorType"/>
                 </s:sequence>
             </s:complexType>
             <s:simpleType name="CheckoutType">
@@ -122,6 +124,25 @@
                     <s:enumeration value="MetTransportKeuze"/>
                 </s:restriction>
             </s:simpleType>
+            <s:simpleType name="KleurenSchema">
+                <s:restriction base="s:string">
+                    <s:maxLength value="50"/>
+                    <s:enumeration value="Licht"/>
+                    <s:enumeration value="Donker"/>
+                </s:restriction>
+            </s:simpleType>
+            <s:complexType name="ArrayOfConfiguratorTypeConfiguratorType">
+                <s:sequence>
+                    <s:element maxOccurs="unbounded" minOccurs="0" name="ConfiguratorType" nillable="true" type="s0:ConfiguratorType"/>
+                </s:sequence>
+            </s:complexType>
+            <s:simpleType name="ConfiguratorType">
+                <s:restriction base="s:string">
+                    <s:maxLength value="50"/>
+                    <s:enumeration value="LBX"/>
+                    <s:enumeration value="TAX"/>
+                </s:restriction>
+            </s:simpleType>
             <s:element name="LoginMetEncryptedParameters">
                 <s:complexType>
                     <s:sequence>
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml
===================================================================
diff -u
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(revision 0)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(revision 37097)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="ConfiguratorTypeBepaler">
+<Type>APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LocatieAPI:DOM.common.impl.LocatieAPI,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
+]]></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>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/dto/WebshopSessieSettings.cls.xml
===================================================================
diff -u -r37095 -r37097
--- APPS/EC/dto/WebshopSessieSettings.cls.xml	(.../WebshopSessieSettings.cls.xml)	(revision 37095)
+++ APPS/EC/dto/WebshopSessieSettings.cls.xml	(.../WebshopSessieSettings.cls.xml)	(revision 37097)
@@ -10,6 +10,11 @@
 <Property name="KleurenSchema">
 <Type>APPS.EC.Unishop.enu.KleurenSchema</Type>
 </Property>
+
+<Property name="ConfiguratorTypes">
+<Type>APPS.EC.Unishop.enu.ConfiguratorType</Type>
+<Collection>list</Collection>
+</Property>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler/Test.cls.xml	(revision 37097)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test : ConfiguratorTypeBepaler haalt de configuratortypes op voor de aangemelde personality en klant">
+<Implementation><![CDATA[
+	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ..MaakWebshopSessieVanHoecke(..GeefNietBeneluxKlantID())
+
+	#dim ConfiguratorTypeBepalerMock As vhTest.Mock.APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler 
+	Set ConfiguratorTypeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+
+	Do ConfiguratorTypeBepalerMock.VerwachtMethodCall("Bepaal",WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID).DanDoeNiks()
+	
+	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New(,ConfiguratorTypeBepalerMock)
+	
+	Do ConfiguratorTypeBepaler.Bepaal(WebshopSessie)
+	
+	Do ConfiguratorTypeBepalerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="MaakWebshopSessieVanHoecke">
+<FormalSpec>KlantID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EC.dto.WebshopSessie</ReturnType>
+<Implementation><![CDATA[
+	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%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 = "DE"
+	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.VanHoeckeKlantData).%New()
+	Set WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID = KlantID
+	Quit WebshopSessie
+]]></Implementation>
+</Method>
+
+<Method name="GeefNietBeneluxKlantID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim NietBeneluxKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakNietBENELUXOnderneming()
+	Quit NietBeneluxKlant.GeefID()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml
===================================================================
diff -u -r37095 -r37097
--- APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37095)
+++ APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37097)
@@ -48,6 +48,7 @@
 </Method>
 
 <Method name="TAXExportNietActief">
+<Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit (##class(TECH.Config.ConfigMgr).Instance().GeefString("ActivatieVlagTAXExport") = "0")
 ]]></Implementation>
Index: vhTest/Mock/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml
===================================================================
diff -u -r37095 -r37097
--- vhTest/Mock/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37095)
+++ vhTest/Mock/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37097)
@@ -15,12 +15,6 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("Bepaal",PersonalityID,KlantID)
 ]]></Implementation>
 </Method>
-
-<Method name="TAXExportNietActief">
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("TAXExportNietActief")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml	(revision 37097)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.EC.impl.ConfiguratorService.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>APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler</Super>
+
+<Method name="Bepaal">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefAlleConfiguratorTypes">
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefConfiguratorTypeTAX">
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml
===================================================================
diff -u -r37095 -r37097
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml	(.../WebshopSessieSettingsInvuller.cls.xml)	(revision 37095)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller.cls.xml	(.../WebshopSessieSettingsInvuller.cls.xml)	(revision 37097)
@@ -31,11 +31,26 @@
 ]]></Implementation>
 </Method>
 
+<Property name="ConfiguratorTypeBepaler">
+<Type>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="ConfiguratorTypeBepalerGet">
+<Private>1</Private>
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler</ReturnType>
+<Implementation><![CDATA[
+	set r%ConfiguratorTypeBepaler = $$$LazyLoad(r%ConfiguratorTypeBepaler, ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New())
+	quit r%ConfiguratorTypeBepaler
+]]></Implementation>
+</Method>
+
 <Method name="VulIn">
 <FormalSpec><![CDATA[&WebshopSessie:APPS.EC.dto.WebshopSessie]]></FormalSpec>
 <Implementation><![CDATA[
 	Set WebshopSessie.Settings.CheckOutType = ..CheckoutTypeBepaler.Bepaal(WebshopSessie)
 	Set WebshopSessie.Settings.KleurenSchema = ..KleurenSchemaBepaler.Bepaal(WebshopSessie)
+	Set WebshopSessie.Settings.ConfiguratorTypes = ..ConfiguratorTypeBepaler.Bepaal(WebshopSessie)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml	(revision 0)
+++ APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml	(revision 37097)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler">
+<Super>TECH.Mockable</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>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Quit:..IsGeenVanHoeckePersonality(PersonalityID) ..GeefAlleConfiguratorTypes()
+
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(KlantID)
+	#dim Land As DOM.common.impl.Land = Klant.GeefAdres().GeefLand()
+	
+	Quit:..IsStandaardKlant(KlantID) ..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(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+	Quit ConfiguratorTypes
+]]></Implementation>
+</Method>
+
+<Method name="GeefAlleConfiguratorTypes">
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.Unishop.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>
+
+
+</Export>
Index: vhTest/Mock/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler.cls.xml	(revision 37097)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.EC.impl.ConfiguratorService.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>APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Bepaal">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Bepaal",PersonalityID,KlantID)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/ConfiguratorTypeBepaler/Test.cls.xml	(revision 37097)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: ConfiguratorTypeBepaler voor Benelux geeft configuratortypes LBX en TAX">
+<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).VanHoecke()
+		
+	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(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())
+]]></Implementation>
+</Method>
+
+<Method name="Test: ConfiguratorTypeBepaler buiten Benelux geeft ConfiguratorType TAX">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+
+	do ..PushKlant(Klant)
+	
+	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+	
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(PersonalityID, Klant.GeefID())
+	Do $$$AssertEquals(ConfiguratorTypes.Count(),1)
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+]]></Implementation>
+</Method>
+
+<Method name="Test: ConfiguratorTypeBepaler zonder vanhoecke personality geeft ConfiguratorTypes TAX en LBX">
+<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).Daro()
+
+	#dim ConfiguratorTypeBepaler As APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler).%New()
+	
+	#dim ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(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())
+]]></Implementation>
+</Method>
+
+<Method name="Test: ConfiguratorTypeBepaler met klantuitzondering geeft ConfiguratorTypes TAX en LBX">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+	Do Klant.ZetID(##class(DOM.VKP.enu.Klant).DaroFactors())
+	
+	do ..PushKlant(Klant)
+
+	#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 ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(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())
+]]></Implementation>
+</Method>
+
+<Method name="Test: ConfiguratorTypeBepaler met klant buiten benelux geeft ConfiguratorType TAX">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	Do Klant.GeefAdres().ZetLandNr("DE")
+	Do Klant.ZetID(..GeefNietBeneluxKlantID())
+	
+	do ..PushKlant(Klant)
+
+	#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 ConfiguratorTypes As %ListOfObjects = ConfiguratorTypeBepaler.Bepaal(PersonalityID, Klant.GeefID())
+	Do $$$AssertEquals(ConfiguratorTypes.Count(),1)
+	Do $$$AssertEquals(ConfiguratorTypes.GetAt(1),##class(APPS.EC.Unishop.enu.ConfiguratorType).TAX())
+]]></Implementation>
+</Method>
+
+<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="GeefNietBeneluxKlantID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim NietBeneluxKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakNietBENELUXOnderneming()
+	Quit NietBeneluxKlant.GeefID()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r36128 -r37097
--- APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 36128)
+++ APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37097)
@@ -48,6 +48,7 @@
 </Method>
 
 <Method name="TAXExportNietActief">
+<Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit (##class(TECH.Config.ConfigMgr).Instance().GeefString("ActivatieVlagTAXExport") = "0")
 ]]></Implementation>
Index: APPS/EC/Unishop/enu/ConfiguratorType/Verwerker.cls.xml
===================================================================
diff -u
--- APPS/EC/Unishop/enu/ConfiguratorType/Verwerker.cls.xml	(revision 0)
+++ APPS/EC/Unishop/enu/ConfiguratorType/Verwerker.cls.xml	(revision 37097)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Unishop.enu.ConfiguratorType.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>ConfiguratorType:APPS.EC.Unishop.enu.ConfiguratorType</FormalSpec>
+<Implementation><![CDATA[
+	If ConfiguratorType = "LBX" {
+		Do ..VerwerkLBX()
+	} ElseIf ConfiguratorType = "TAX" {
+		Do ..VerwerkTAX()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(ConfiguratorType,"APPS.EC.Unishop.enu.ConfiguratorType",$classname())
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLBX">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkTAX">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>