Index: WSimpl/Vhisie4/HeaderValidator.cls.xml
===================================================================
diff -u -r41609 -r46658
--- WSimpl/Vhisie4/HeaderValidator.cls.xml	(.../HeaderValidator.cls.xml)	(revision 41609)
+++ WSimpl/Vhisie4/HeaderValidator.cls.xml	(.../HeaderValidator.cls.xml)	(revision 46658)
@@ -3,40 +3,54 @@
 <Class name="WSimpl.Vhisie4.HeaderValidator">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="VerkoopApi">
-<Type>DOM.VKP.VerkoopAPI</Type>
+<Property name="PersonalityService">
+<Type>DOM.common.PersonalityService</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="KlantValidator">
+<Type>APPS.CRM.KlantIDValidator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PersonalityRepository">
+<Type>DOM.common.impl.HandelPersonalityRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>VerkoopApi:DOM.VKP.VerkoopAPI</FormalSpec>
+<FormalSpec>PersonalityService:DOM.common.PersonalityService,KlantValidator:APPS.CRM.KlantIDValidator,PersonalityRepository:DOM.common.impl.HandelPersonalityRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..VerkoopApi = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
+	Set ..PersonalityService = $$$Inject(PersonalityService, ##class(DOM.common.impl.PersonalityService).%New())
+	Set ..KlantValidator = $$$Inject(KlantValidator, ##class(APPS.CRM.impl.KlantIDValidator).%New())
+	Set ..PersonalityRepository = $$$Inject(PersonalityRepository, ##class(DOM.common.impl.PersonalityRepository).%New())
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="ValidateHeader">
 <FormalSpec>Header:WS.Vhisie4.RequestHeader</FormalSpec>
 <Implementation><![CDATA[
+	Do ..ValidatePersonality(Header.PersonalityId)
 	Do ..ValidateKlant(Header)
-	;Do ..ValidatePersonality(Header.PersonalityId)
 ]]></Implementation>
 </Method>
 
 <Method name="ValidateKlant">
 <FormalSpec>Header:WS.Vhisie4.RequestHeader</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If ((Header.PersonalityId = "") || (Header.PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
-		#dim VanHoeckeKlantId As %String = "K||"_Header.KlantId
-		If $$$Not(..VerkoopApi.BestaatKlant(VanHoeckeKlantId)) {
-			do ##class(TECH.Exceptions.InvalidInputException).Throw("Klant met id '"_Header.KlantId_"' bestaat niet")	
-		}
+	#dim Personality As DOM.common.Personality = ..PersonalityRepository.GeefViaID(Header.PersonalityId)
+	
+	#dim KlantId As %String = ..PersonalityService.GeefKlantIdViaKlantCode(Personality, Header.KlantId)
+	
+	If $$$Not(..KlantValidator.IsGeldig(KlantId, Personality)) {
+		do ##class(TECH.Exceptions.InvalidInputException).Throw("Klant met id '"_Header.KlantId_"' bestaat niet")	
 	}
 ]]></Implementation>
 </Method>
Index: APPS/CRM/impl/KlantIDValidator.cls.xml
===================================================================
diff -u -r46638 -r46658
--- APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46638)
+++ APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46658)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="HandelKlantDataRepository">
+<Type>DOM.VKP.impl.HandelKlantDataRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="KlantID">
 <Type>%String</Type>
 <Private>1</Private>
@@ -31,6 +36,8 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
+	Set ..HandelKlantDataRepository = ##class(DOM.VKP.impl.HandelKlantDataRepository).%New() 
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -77,10 +84,7 @@
 <Method name="VerwerkAnderePersonality">
 <FormalSpec>Personality:DOM.common.Personality</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	Set ..IsGeldigKlantID = $$$True
-	
-	; hier moeten we effectief controleren of de klant bestaat in de klantdata ;
+<Implementation><![CDATA[	Set ..IsGeldigKlantID = ..HandelKlantDataRepository.BestaatViaID(..KlantID)
 ]]></Implementation>
 </Method>
 </Class>