Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler.cls.xml
===================================================================
diff -u -r45829 -r45882
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 45829)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 45882)
@@ -8,25 +8,19 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SettingsManager">
-<Type>WSimpl.Vhisie4.SettingsManager</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="WebshopSessionService">
 <Type>APPS.EC.WebshopSessionService</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository,SettingsManager:WSimpl.Vhisie4.SettingsManager,WebshopSessionService:APPS.EC.WebshopSessionService</FormalSpec>
+<FormalSpec>HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository,WebshopSessionService:APPS.EC.WebshopSessionService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepository,##class(DOM.VKP.impl.HandelKlantDataRepository).%New())
-	Set ..SettingsManager = $$$Inject(SettingsManager,##class(WSimpl.Vhisie4.SettingsManager).%New())
 	Set ..WebshopSessionService = $$$Inject(WebshopSessionService,##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService())
 	
 	Quit $$$OK
@@ -42,21 +36,21 @@
 	
 	If (RegistreerContactGegevensRequest.Header.PersonalityId = ##class(DOM.common.enu.Personality).Hein()){
 		If $$$HasLength(RegistreerContactGegevensRequest.Header.KlantId) {
-			Set KlantId = ..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_RegistreerContactGegevensRequest.Header.KlantId
+			Set KlantId = HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId
 			Set KlantData = ..MaakHandelKlantData(KlantId,RegistreerContactGegevensRequest)
 		} Else {
 			Do ##class(TECH.Exceptions.InvalidInputException).Throw("KlantID moet ingevuld zijn")
 		}
 	} Else {
 		If ((RegistreerContactGegevensRequest.Header.PersonalityId = ##class(DOM.common.enu.Personality).Hein() && $$$HasLength(RegistreerContactGegevensRequest.Header.KlantId))){
-			Set KlantId = ..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_RegistreerContactGegevensRequest.Header.KlantId
+			Set KlantId = HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId
 			Set KlantData = ..MaakHandelKlantData(KlantId,RegistreerContactGegevensRequest)
 		} ElseIf (RegistreerContactGegevensRequest.Header.KlantId = "") {
-			Set KlantId = ..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_..WebshopSessionService.GeefVolgendeKlantID(RegistreerContactGegevensRequest.Header.PersonalityId)
+			Set KlantId = HandelPersonality.GeefPrefix()_..WebshopSessionService.GeefVolgendeKlantID(RegistreerContactGegevensRequest.Header.PersonalityId)
 			Set KlantData = ..MaakHandelKlantData(KlantId,RegistreerContactGegevensRequest)
 		} Else {
 			Try {
-				Set KlantData = ..HandelKlantDataRepository.GeefViaID(..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_RegistreerContactGegevensRequest.Header.KlantId)
+				Set KlantData = ..HandelKlantDataRepository.GeefViaID(HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId)
 			} Catch {
 				Do ##class(TECH.Exceptions.InvalidInputException).Throw("Kon geen klantdata openen met id '"_RegistreerContactGegevensRequest.Header.KlantId_"'")
 			}		
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u -r45829 -r45882
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 45829)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 45882)
@@ -9,6 +9,7 @@
 	
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.HandelPersonality).%New()
 	Do HandelPersonalityStub.IndienMethodCall("Accept",$$$ElkeWaarde).DanDoeNiks()
+	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro_")
 	
 	#dim HandelKlantDataDummy As DOM.VKP.impl.HandelKlantData = ##class(vhTest.Utils.DOM.VKP.HandelKlantData).StandaardHandelKlantData()
 	Set HandelKlantDataDummy.ID = "daro_42"
@@ -19,16 +20,12 @@
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelPersonalityRepositoryStub.IndienMethodCall("GeefViaID",RegistreerContactGegevensRequestStub.Header.PersonalityId).DanReturn(HandelPersonalityStub)
 	
-	Set SettingsManagerMock = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerMock.VerwachtMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
-	
 	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 	
-	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,SettingsManagerMock,WebshopSessionServiceDummy)
+	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,WebshopSessionServiceDummy)
 	#dim HandelKlantData As DOM.VKP.impl.HandelKlantData =  Bepaler.Bepaal(RegistreerContactGegevensRequestStub,HandelPersonalityStub)
 	
 	Do $$$AssertEquals(HandelKlantData.ID,"daro_42")
-	Do SettingsManagerMock.Verifieer()
 	Do HandelKlantDataRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -51,14 +48,10 @@
 	Set WebshopSessionServiceStub = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	Do WebshopSessionServiceStub.IndienMethodCall("GeefVolgendeKlantID",RegistreerContactGegevensRequestStub.Header.PersonalityId).DanReturn("1")
 	
-	Set SettingsManagerMock = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerMock.VerwachtMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
-	
-	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,SettingsManagerMock,WebshopSessionServiceStub)
+	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,WebshopSessionServiceStub)
 	#dim HandelKlantData As DOM.VKP.impl.HandelKlantData = Bepaler.Bepaal(RegistreerContactGegevensRequestStub,HandelPersonalityStub)
 	
 	Do $$$AssertEquals(HandelKlantData.ID,"daro_1")
-	Do SettingsManagerMock.Verifieer()
 	Do HandelKlantDataRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -70,23 +63,20 @@
 	
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.HandelPersonality).%New()
 	Do HandelPersonalityStub.IndienMethodCall("Accept",$$$ElkeWaarde).DanDoeNiks()
+	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("hein_")
 	
 	#dim HandelKlantDataDummy As DOM.VKP.impl.HandelKlantData = ##class(vhTest.Utils.DOM.VKP.HandelKlantData).StandaardHandelKlantData()
 	Set HandelKlantDataRepositoryMock = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelKlantDataRepositoryMock.VerwachtMethodCall("Maak").ExactAantalKeer(1).DanReturn(HandelKlantDataDummy)
 	Do HandelKlantDataRepositoryMock.VerwachtMethodCall("GeefViaID","hein_"_RegistreerContactGegevensRequestStub.Header.KlantId).ExactAantalKeer(0)
 	
-	Set SettingsManagerMock = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerMock.VerwachtMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("hein_")
-	
 	Set WebshopSessionServiceMock = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	Do WebshopSessionServiceMock.VerwachtMethodCall("GeefVolgendeKlantID",RegistreerContactGegevensRequestStub.Header.PersonalityId).ExactAantalKeer(0)
 	
-	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,SettingsManagerMock,WebshopSessionServiceMock)
+	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,WebshopSessionServiceMock)
 	#dim HandelKlantData As DOM.VKP.impl.HandelKlantData = Bepaler.Bepaal(RegistreerContactGegevensRequestStub,HandelPersonalityStub)
 	
 	Do $$$AssertEquals(HandelKlantData.ID,"hein_5")
-	Do SettingsManagerMock.Verifieer()
 	Do HandelKlantDataRepositoryMock.Verifieer()
 	Do WebshopSessionServiceMock.Verifieer()
 ]]></Implementation>
@@ -106,20 +96,16 @@
 	Do HandelKlantDataRepositoryMock.VerwachtMethodCall("Maak").ExactAantalKeer(1).DanReturn(HandelKlantDataDummy)
 	Do HandelKlantDataRepositoryMock.VerwachtMethodCall("GeefViaID","hein_"_RegistreerContactGegevensRequestStub.Header.KlantId).ExactAantalKeer(0)
 	
-	Set SettingsManagerMock = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerMock.VerwachtMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("hein_")
-	
 	Set WebshopSessionServiceMock = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	Do WebshopSessionServiceMock.VerwachtMethodCall("GeefVolgendeKlantID",RegistreerContactGegevensRequestStub.Header.PersonalityId).ExactAantalKeer(0)
 
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("KlantID moet ingevuld zijn")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.InvalidInputException).%ClassName(1),Substrings))
 	
-	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,SettingsManagerMock,WebshopSessionServiceMock)
+	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,WebshopSessionServiceMock)
 	#dim HandelKlantData As DOM.VKP.impl.HandelKlantData = Bepaler.Bepaal(RegistreerContactGegevensRequestStub,HandelPersonalityStub)
 	
 	Do $$$AssertEquals(HandelKlantData.ID,"hein_5")
-	Do SettingsManagerMock.Verifieer()
 	Do HandelKlantDataRepositoryMock.Verifieer()
 	Do WebshopSessionServiceMock.Verifieer()
 ]]></Implementation>