Index: DOM/common/PersonalityVisitor.cls.xml
===================================================================
diff -u -r46643 -r49902
--- DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 46643)
+++ DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 49902)
@@ -5,14 +5,17 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Method name="VerwerkSFS">
+<Abstract>1</Abstract>
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 </Method>
 
 <Method name="VerwerkVanHoecke">
+<Abstract>1</Abstract>
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 </Method>
 
 <Method name="VerwerkVanHoeckeVoorHalux">
+<Abstract>1</Abstract>
 <FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
 </Method>
 
Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml	(revision 49902)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.VKP.impl.HandelToegelatenLadetypesBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="PersonalityEnum">
+<Type>DOM.common.enu.Personality.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HandelToegelatenLadetypesBepaler">
+<Type>DOM.VKP.impl.HandelToegelatenLadetypesBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	
+	Set ..HandelToegelatenLadetypesBepaler = ##class(DOM.VKP.impl.HandelToegelatenLadetypesBepaler).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Personalities waarvoor de default ladetypes LBX, TAX en TBX toegelaten zijn">
+<Implementation><![CDATA[
+	#dim VerwachteLadetypes As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("LBX", "TAX", "TBX")
+	
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Dupont, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleBE, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleNL, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Hein, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Noteborn, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Seefelder, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.SFS, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.VanHoecke, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.VanRaemdonck, VerwachteLadetypes)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Voor Personality Daro worden ladetypes LBX en TAX toegelaten">
+<Implementation><![CDATA[
+	#dim VerwachteLadetypes As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("LBX", "TAX")
+	
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Daro, VerwachteLadetypes)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Voor Personalities Destil en Kisch worden ladetypes LBX en TBX toegelaten">
+<Implementation><![CDATA[
+	#dim VerwachteLadetypes As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("LBX", "TBX")
+	
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Destil, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Kisch, VerwachteLadetypes)
+]]></Implementation>
+</Method>
+
+<Method name="AssertToegelatenLadeTypes">
+<FormalSpec>Personality:DOM.common.enu.Personality,VerwachteLadeTypes:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim ToegelatenLadetypes As %ListOfDataTypes = ..HandelToegelatenLadetypesBepaler.Bepaal(Personality)
+	
+	Do $$$AssertEqualsList(ToegelatenLadetypes, VerwachteLadeTypes)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r46643 -r49902
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 46643)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 49902)
@@ -38,19 +38,25 @@
 <Private>1</Private>
 </Property>
 
+<Property name="HandelToegelatenLadetypesBepaler">
+<Type>DOM.VKP.impl.HandelToegelatenLadetypesBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository,HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository,WebshopSessionService:APPS.EC.WebshopSessionService,LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder,UrlBepaler:APPS.EC.Webshop.UrlBepaler</FormalSpec>
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler="",HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository="",HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository="",WebshopSessionService:APPS.EC.WebshopSessionService="",LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder="",UrlBepaler:APPS.EC.Webshop.UrlBepaler="",HandelToegelatenLadetypesBepaler:DOM.VKP.impl.HandelToegelatenLadetypesBepaler=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..LoginParameterBepaler = $$$Inject(LoginParameterBepaler, ##class(WSimpl.Unishop.Login.ParameterBepaler).%New())
-	Set ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepository,##class(DOM.VKP.impl.HandelKlantDataRepository).%New())
-	Set ..HandelPersonalityRepository = $$$Inject(HandelPersonalityRepository,##class(DOM.common.impl.HandelPersonalityRepository).%New())
-	Set ..WebshopSessionService = $$$Inject(WebshopSessionService,##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService())
-	Set ..KortingBewaarder = $$$Inject(LoginKortingBewaarder,##class(WSimpl.Unishop.Login.KortingBewaarder).%New())
-	Set ..UrlBepaler = $$$Inject(UrlBepaler,##class(APPS.EC.Webshop.impl.UrlBepaler).%New())
+	Set ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepository, ##class(DOM.VKP.impl.HandelKlantDataRepository).%New())
+	Set ..HandelPersonalityRepository = $$$Inject(HandelPersonalityRepository, ##class(DOM.common.impl.HandelPersonalityRepository).%New())
+	Set ..WebshopSessionService = $$$Inject(WebshopSessionService, ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService())
+	Set ..KortingBewaarder = $$$Inject(LoginKortingBewaarder, ##class(WSimpl.Unishop.Login.KortingBewaarder).%New())
+	Set ..UrlBepaler = $$$Inject(UrlBepaler, ##class(APPS.EC.Webshop.impl.UrlBepaler).%New())
+	Set ..HandelToegelatenLadetypesBepaler = $$$Inject(HandelToegelatenLadetypesBepaler, ##class(DOM.VKP.impl.HandelToegelatenLadetypesBepaler).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -89,7 +95,6 @@
 	#dim Resultaat As %Boolean = $$$False
 	
 	If (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname),"hein","seefelder")) && (DecrypteerRequest.Ref = "") && ((DecrypteerRequest.DataOpt = "")){
-		Set ..Response.IsGeldig = 1
 		If ##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname) [ "hein" {
 			Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Hein()
 			Set ..Response.IsLoginFormulierNodig = 1
@@ -114,12 +119,6 @@
 		Set Resultaat = $$$True
 	}
 	
-	Do ..Response.ToegelatenLadetypes.Clear()
-	
-	Do ..Response.ToegelatenLadetypes.Insert("LBX")
-	Do ..Response.ToegelatenLadetypes.Insert("TBX")
-	Do ..Response.ToegelatenLadetypes.Insert("TAX")
-	
 	Quit Resultaat
 ]]></Implementation>
 </Method>
@@ -147,20 +146,15 @@
 	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(LoginParameters.PersonalityID)
 	Set ..Response.KlantId = ##class(TECH.StringUtils).Replace(KlantData.ID,HandelPersonality.GeefPrefix(),"")
 	Set ..Response.KlantNaam = KlantData.Naam
+	
 	If $$$HasLength(DecrypteerRequest.DataOpt) {
 		Set ..Response.GebruikerId = 1
 	}
+	
 	Set ..Response.GebruikerNaam = ""
 	Set ..Response.Taal = LoginParameters.Taal
-	Do ..Response.ToegelatenLadetypes.Insert("LBX")
-	If $$$Not(##class(TECH.StringUtils).Equals(LoginParameters.PersonalityID,##class(DOM.common.enu.Personality).Kisch(), ##class(DOM.common.enu.Personality).Destil())) {
-		Do ..Response.ToegelatenLadetypes.Insert("TAX")
-	}
-	If $$$Not(LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()) {
-		Do ..Response.ToegelatenLadetypes.Insert("TBX")
-	}
-	
-	Set ..Response.IsGeldig = 1
+	Set ..Response.ToegelatenLadetypes = ..HandelToegelatenLadetypesBepaler.Bepaal(LoginParameters.PersonalityID)	
+	Set ..Response.IsGeldig = $$$True
 ]]></Implementation>
 </Method>
 
Index: DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(revision 0)
+++ DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(revision 49902)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.HandelToegelatenLadetypesBepaler">
+<Super>TECH.RegisteredObject,DOM.common.PersonalityVisitor</Super>
+
+<Property name="ToegelatenLadetypes">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HandelPersonalityRepository">
+<Type>DOM.common.impl.HandelPersonalityRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..HandelPersonalityRepository = $$$Inject(HandelPersonalityRepository, ##class(DOM.common.impl.HandelPersonalityRepository).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bepaal">
+<FormalSpec>Personality:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Set ..ToegelatenLadetypes = ..GeefDefaultToegelatenLadetypes()
+	
+	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(Personality)
+	Do HandelPersonality.Accept($this)
+	
+	Quit ..ToegelatenLadetypes
+]]></Implementation>
+</Method>
+
+<Method name="GeefDefaultToegelatenLadetypes">
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	#dim ToegelatenLadetypes As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	
+	Do ToegelatenLadetypes.Insert("LBX")
+	Do ToegelatenLadetypes.Insert("TAX")
+	Do ToegelatenLadetypes.Insert("TBX")
+	
+	Quit ToegelatenLadetypes
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDaro">
+<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..ToegelatenLadetypes = ##class(%ListOfDataTypes).%New()
+	
+	Do ..ToegelatenLadetypes.Insert("LBX")
+	Do ..ToegelatenLadetypes.Insert("TAX")
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDestil">
+<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..ToegelatenLadetypes = ##class(%ListOfDataTypes).%New()
+	
+	Do ..ToegelatenLadetypes.Insert("LBX")
+	Do ..ToegelatenLadetypes.Insert("TBX")
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDupont">
+<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleBE">
+<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleNL">
+<FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHein">
+<FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkKisch">
+<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..ToegelatenLadetypes = ##class(%ListOfDataTypes).%New()
+	
+	Do ..ToegelatenLadetypes.Insert("LBX")
+	Do ..ToegelatenLadetypes.Insert("TBX")
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkNoteborn">
+<FormalSpec>NotebornPersonality:DOM.common.NotebornPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkSFS">
+<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkVanHoecke">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkVanRaemdonck">
+<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
+</Method>
+</Class>
+
+
+<Package name="DOM.VKP.impl" sqlname="DOM_VKP_impl"/>
+</Export>