Index: APPS/common/impl/Validator.cls.xml
===================================================================
diff -u -r45436 -r46621
--- APPS/common/impl/Validator.cls.xml	(.../Validator.cls.xml)	(revision 45436)
+++ APPS/common/impl/Validator.cls.xml	(.../Validator.cls.xml)	(revision 46621)
@@ -8,11 +8,6 @@
 <Description>
 Smijt exceptie adhv resultaat IsGeldig</Description>
 <Abstract>1</Abstract>
-<Implementation><![CDATA[
-	If '..IsGeldig() {
-		Do ..ThrowError()
-	}
-]]></Implementation>
 </Method>
 
 <Method name="IsGeldig">
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/Test.cls.xml
===================================================================
diff -u -r45477 -r46621
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 45477)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 46621)
@@ -55,7 +55,7 @@
 	Do ..VerkoopServiceMock.VerwachtMethodCall("ZetTotaalBedragWebshop", "DummyID", 10).ExactAantalKeer(1).DanDoeNiks()
 	Do ..CheckoutTypeBepalerMock.VerwachtMethodCall("Bepaal", "PersonalityId","KlantId").DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
 	Do ..TransportServiceMock.VerwachtMethodCall("ZetGekozenVerzendingMogelijkheid","DummyID","VerzendingMogelijkheidID","OptieKeuze").ExactAantalKeer(1).DanDoeNiks()
-	Do ..WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","KlantId","").DanReturn("KlantId")
+	Do ..WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","KlantId","PersonalityId").DanReturn("KlantId")
 	
 	Do ..SynchroniseerMock.IndienMethodCall("Synchroniseer", $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 
@@ -162,20 +162,20 @@
 	Do ..VerkoopServiceMock.IndienMethodCall("BestelOfferte",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
 	Do ..VerkoopServiceMock.IndienMethodCall("ZetTotaalBedragWebshop", $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 	Do ..CheckoutTypeBepalerMock.IndienMethodCall("Bepaal", $$$ElkeWaarde,$$$ElkeWaarde).DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
-	Do ..WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","","").DanReturn("KlantId")
+	Do ..WinkelkarServiceHelperMock.IndienMethodCall("GeefKlantPartijID",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn("KlantId")
 
-	Do ..WinkelkarRepositoryMock.VerwachtMethodCall("GeefOfferteIDViaID", "WinkelkarId").DanReturn("DummyID")
+	Do ..WinkelkarRepositoryMock.VerwachtMethodCall("GeefOfferteIDViaID", "WinkelkarExterneId").DanReturn("InterneId")
 
 	Do ..SynchroniseerMock.IndienMethodCall("Synchroniseer", $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 
 	Set Service = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.BestelWinkelkar).%New(..VerkoopServiceMock, ..WinkelkarRepositoryMock, ,..CheckoutTypeBepalerMock, ..WinkelkarServiceHelperMock, ..SynchroniseerMock)
 
-	#dim BestelWinkelkarRequest As WS.Vhisie4.Winkelkar.BestelWinkelkarRequest
-	Set BestelWinkelkarRequest = ##class(vhTest.Utils.WS.Vhisie4.Winkelkar.BestelWinkelkarRequest).StandaardBestelWinkelkarRequest()
+	#dim BestelWinkelkarRequest As WS.Vhisie4.Winkelkar.BestelWinkelkarRequest = ##class(vhTest.Utils.WS.Vhisie4.Winkelkar.BestelWinkelkarRequest).StandaardBestelWinkelkarRequest()
+	Set BestelWinkelkarRequest.Winkelkar.Id = "WinkelkarExterneId"
+	
 	Do Service.BestelWinkelkar(BestelWinkelkarRequest)
 
 	Do ..WinkelkarRepositoryMock.Verifieer()
-	Do ..WinkelkarServiceHelperMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar.cls.xml
===================================================================
diff -u -r46511 -r46621
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar.cls.xml	(.../BestelWinkelkar.cls.xml)	(revision 46511)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar.cls.xml	(.../BestelWinkelkar.cls.xml)	(revision 46621)
@@ -63,20 +63,21 @@
 	Lock +^Vhisie4.Winkelkar(BestelWinkelkarRequest.Winkelkar.Id):0 Else  Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.LockedException).%New("Winkelkar '" _BestelWinkelkarRequest.Winkelkar.Id _"' is gelocked door een andere webservice call. Probeer later opnieuw."))
 	
 	Try {
-		#dim KlantPartijID As %String = ..WinkelkarServiceHelper.GeefKlantPartijID(BestelWinkelkarRequest.Header.KlantId)
+		#dim PersonalityId As %String = $$$If($Length(BestelWinkelkarRequest.Header.PersonalityId),BestelWinkelkarRequest.Header.PersonalityId,##class(DOM.common.enu.Personality).VanHoecke())
+		
+		#dim KlantPartijID As %String = ..WinkelkarServiceHelper.GeefKlantPartijID(BestelWinkelkarRequest.Header.KlantId,PersonalityId)
 		#dim OfferteID As %String = ..WinkelkarRepository.GeefOfferteIDViaID(BestelWinkelkarRequest.Winkelkar.Id)
 
 		Do ..Synchroniseer.Synchroniseer(BestelWinkelkarRequest.Winkelkar, ..#AlleTypes)
 
 		Do ..VerkoopService.ZetTotaalBedragWebshop(OfferteID, ..BerekenTotaalPrijs(BestelWinkelkarRequest))
 		Do ..VerkoopService.ZetOfferteHoofding(OfferteID, ..MaakHoofding(BestelWinkelkarRequest))
 		
-		If ..CheckoutTypeBepaler.Bepaal(BestelWinkelkarRequest.Header.PersonalityId, KlantPartijID) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() 
-		{
+		If ..CheckoutTypeBepaler.Bepaal(BestelWinkelkarRequest.Header.PersonalityId, KlantPartijID) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() {
 			Do ..TransportService.ZetGekozenVerzendingMogelijkheid(OfferteID, BestelWinkelkarRequest.VerzendingMogelijkheidID, BestelWinkelkarRequest.OptieKeuze)	
 		}
 		
-		Do ..VerkoopService.BestelOfferte(OfferteID, KlantPartijID, BestelWinkelkarRequest.Header.PersonalityId)
+		Do ..VerkoopService.BestelOfferte(OfferteID, KlantPartijID, PersonalityId)
 		
 	} Catch {
 		Lock -^Vhisie4.Winkelkar(BestelWinkelkarRequest.Winkelkar.Id)
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r46618 -r46621
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 46618)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 46621)
@@ -170,6 +170,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..Mail.VoegToeOntvanger("christian.zierer@seefelder.net")
+]]></Implementation>
+</Method>
+
 <Method name="GeefVertaling">
 <FormalSpec>Sleutel:TECH.String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestVanRaemdonck.cls.xml
===================================================================
diff -u -r46561 -r46621
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 46561)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 46621)
@@ -65,6 +65,12 @@
 <Implementation><![CDATA[	Quit "http://unittest.vanraemdonck.eu/getofferte?REF=_ZZ3_7DWKJOIXw_lSmDjw9/5WfKmkE3Hib29CUqVi3_NLcyBlQvaFmo/PZvk3qPuJGXgaNuvw0O_1AhGo0cMLw--&DATAOPT=&Taal=N"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefWebshopVersie">
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebshopVersie).V3()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r45862 -r46621
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 45862)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 46621)
@@ -89,10 +89,16 @@
 
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelZonderVerificatie(HeinPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatieEnEmail(HeinPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatieEnEmail(SeefelderPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDaro">
 <FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatieEnEmail(DaroPersonality)
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestSeefelder.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestSeefelder.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestSeefelder.cls.xml	(revision 46621)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EC.impl.HandelRapporteur.Rapporteer.TestSeefelder">
+<Super>vhUnitTest.APPS.EC.impl.HandelRapporteur.Rapporteer.Base</Super>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Seefelder", "http://webshopV4.seefelder.de", ..#Applicatie)
+]]></Implementation>
+</Method>
+
+<Method name="GeefPersonalityID">
+<Private>1</Private>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.enu.Personality).Seefelder()
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerwachteOntvangers">
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	#Dim Lijst As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	
+	Do Lijst.Insert("christian.zierer@seefelder.net")
+	
+	Quit Lijst
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantData">
+<Private>1</Private>
+<ReturnType>DOM.common.dto.KlantData</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhTest.Utils.DOM.common.dto.HandelKlantData).SeefelderBijHein()
+]]></Implementation>
+</Method>
+
+<Method name="AssertKlantReferentie">
+<FormalSpec>KlantDataReferentie:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do $$$AssertEquals(KlantDataReferentie, "<BR>")
+]]></Implementation>
+</Method>
+
+<Method name="GeefRef">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "_jgiCCJ8M9xBEJ7mAmIS3P_7s6mscs8oKNqN2rwEYGZJ2lgtjeod1BK2fSu7Km4d"    ; encrypt van "VHEPN\23968\\Vrijgave\NIET VAN TOEPASSING"
+]]></Implementation>
+</Method>
+
+<Method name="GeefLink">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "http://unittest.daro.com/getofferte?REF=nu8N6NjGA2Dm8ZHhk4VrY9/5WfKmkE3Hib29CUqVi3_NLcyBlQvaFmo/PZvk3qPuJGXgaNuvw0O_1AhGo0cMLw--&DATAOPT=&Taal=E"
+]]></Implementation>
+</Method>
+
+<Method name="GeefWebshopVersie">
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebshopVersie).V4()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/common/impl/PersonalityService.cls.xml
===================================================================
diff -u -r46607 -r46621
--- DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 46607)
+++ DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 46621)
@@ -21,41 +21,67 @@
 </Method>
 
 <Method name="IsKlantBij">
-<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonalty:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Quit:(KlantPersonality.GeefID() = LeverancierPersonalty.GeefID()) $$$False
+	Quit:(KlantPersonality.GeefID() = LeverancierPersonality.GeefID()) $$$False
 	Quit:$$$Not($Length(KlantPersonality.GeefLeverancierData().PersonalityId)) $$$False
 
 	#dim IsKlantBij As %Boolean = $$$False
 	
 	If 'IsKlantBij && $Length(KlantPersonality.GeefLeverancierData().PersonalityId) {
-		set IsKlantBij = ( KlantPersonality.GeefLeverancierData().PersonalityId = LeverancierPersonalty.GeefID() )
+		set IsKlantBij = ( KlantPersonality.GeefLeverancierData().PersonalityId = LeverancierPersonality.GeefID() )
 	}
 	
 	Quit IsKlantBij
 ]]></Implementation>
 </Method>
 
 <Method name="IsOnrechtstreeksKlantBij">
-<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonalty:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Quit:(KlantPersonality.GeefID() = LeverancierPersonalty.GeefID()) $$$False
+	Quit:(KlantPersonality.GeefID() = LeverancierPersonality.GeefID()) $$$False
 	Quit:$$$Not($Length(KlantPersonality.GeefLeverancierData().PersonalityId)) $$$False
 	
-	Quit:..IsKlantBij(KlantPersonality,LeverancierPersonalty) $$$False
+	Quit:..IsKlantBij(KlantPersonality,LeverancierPersonality) $$$False
 	
 	#dim IsOnrechtstreeksKlantBij As %Boolean = $$$False
 	Set KlantPersonality = ..PersonalityRepo.GeefViaID(KlantPersonality.GeefLeverancierData().PersonalityId)
-	while 'IsOnrechtstreeksKlantBij && $Length(KlantPersonality.GeefLeverancierData().PersonalityId) {
-		set IsOnrechtstreeksKlantBij = ( KlantPersonality.GeefLeverancierData().PersonalityId = LeverancierPersonalty.GeefID() )
+	while $$$Not(IsOnrechtstreeksKlantBij) && $Length(KlantPersonality.GeefLeverancierData().PersonalityId) {
+		set IsOnrechtstreeksKlantBij = ( KlantPersonality.GeefLeverancierData().PersonalityId = LeverancierPersonality.GeefID() )
 		set KlantPersonality = ..PersonalityRepo.GeefViaID(KlantPersonality.GeefLeverancierData().PersonalityId)
 	}
 	
 	quit IsOnrechtstreeksKlantBij
 ]]></Implementation>
 </Method>
+
+<Method name="IsGeldigKlantId">
+<FormalSpec>Personality:DOM.common.Personality,KlantId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:(Personality.GeefID()=##class(DOM.common.enu.Personality).VanHoecke()) ##class(TECH.StringUtils).StartsWith(KlantId,"K||")
+	
+	Quit:(Personality.GeefID()=##class(DOM.common.enu.Personality).VanHoeckeVoorHalux()) ##class(TECH.StringUtils).StartsWith(KlantId,"K||")
+	
+	Quit ##class(TECH.StringUtils).StartsWith(KlantId,Personality.GeefPrefix())
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantCodeViaKlantId">
+<FormalSpec>Personality:DOM.common.Personality,KlantId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).StripFirstPart(KlantId,Personality.GeefPrefix())
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantIdViaKlantCode">
+<FormalSpec>Personality:DOM.common.Personality,KlantCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit Personality.GeefPrefix()_KlantCode
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/DOM/common/PersonalityService.cls.xml
===================================================================
diff -u -r46607 -r46621
--- vhTest/Mock/DOM/common/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 46607)
+++ vhTest/Mock/DOM/common/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 46621)
@@ -8,17 +8,38 @@
 <Super>DOM.common.PersonalityService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="GeefKlantCodeViaKlantId">
+<FormalSpec>Personality:DOM.common.Personality,KlantId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKlantCodeViaKlantId",Personality,KlantId)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantIdViaKlantCode">
+<FormalSpec>Personality:DOM.common.Personality,KlantCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKlantIdViaKlantCode",Personality,KlantCode)
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigKlantId">
+<FormalSpec>Personality:DOM.common.Personality,KlantId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsGeldigKlantId",Personality,KlantId)
+]]></Implementation>
+</Method>
+
 <Method name="IsKlantBij">
-<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonalty:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsKlantBij",KlantPersonality,LeverancierPersonalty)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsKlantBij",KlantPersonality,LeverancierPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="IsOnrechtstreeksKlantBij">
-<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonalty:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsOnrechtstreeksKlantBij",KlantPersonality,LeverancierPersonalty)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsOnrechtstreeksKlantBij",KlantPersonality,LeverancierPersonality)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDestil.cls.xml
===================================================================
diff -u -r46561 -r46621
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDestil.cls.xml	(.../TestDestil.cls.xml)	(revision 46561)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDestil.cls.xml	(.../TestDestil.cls.xml)	(revision 46621)
@@ -59,6 +59,12 @@
 <Implementation><![CDATA[	Quit "http://unittest.destil.nl/getofferte?REF=XWNdo2ESmZ_JXJC2meh5HIzUyAkyWtjcjMgkoAuzU6s0lkB62mmsWoB3pu2eXcRyNiHvMpxqTG15ersXbFMJDA--&DATAOPT=&Taal=N"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefWebshopVersie">
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebshopVersie).V3()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml
===================================================================
diff -u -r44842 -r46621
--- vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 44842)
+++ vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 46621)
@@ -9,8 +9,8 @@
 <Inheritance>right</Inheritance>
 
 <Method name="GeefKlantPartijID">
-<FormalSpec>KlantId:%String,PersonalityId:%String=""</FormalSpec>
-<ReturnType>DOM.VKP.VanHoeckeKlantID</ReturnType>
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<ReturnType>DOM.VKP.KlantID</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKlantPartijID",KlantId,PersonalityId)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml
===================================================================
diff -u -r46561 -r46621
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml	(.../TestDupont.cls.xml)	(revision 46561)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml	(.../TestDupont.cls.xml)	(revision 46621)
@@ -58,6 +58,12 @@
 <Implementation><![CDATA[	Quit "http://unittest.du-pont.be/getofferte?REF=SGGxQsV3YcvUpnlkMtZORx2mVUNwBhiBIAuPCKAE1qfOoVTd2ixLjsCa92L2FtDegMeUHmC1EWSDgE7gfL5p7w--&DATAOPT=&Taal=N"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefWebshopVersie">
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebshopVersie).V3()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml
===================================================================
diff -u -r46561 -r46621
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 46561)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 46621)
@@ -65,6 +65,12 @@
 <Implementation><![CDATA[	Quit "http://unittest.daro.com/getofferte?REF=nu8N6NjGA2Dm8ZHhk4VrY9/5WfKmkE3Hib29CUqVi3_NLcyBlQvaFmo/PZvk3qPuJGXgaNuvw0O_1AhGo0cMLw--&DATAOPT=&Taal=E"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefWebshopVersie">
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebshopVersie).V3()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r42992 -r46621
--- WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 42992)
+++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 46621)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PersonalityService">
+<Type>DOM.common.PersonalityService</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="LoginParameters">
 <Type>WSimpl.Unishop.Login.Parameters</Type>
 <Private>1</Private>
@@ -41,6 +46,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..KlantSessieDataBepaler = $$$Implementation(KlantSessieDataBepaler,##class(APPS.EC.impl.KlantSessieDataBepaler).%New())
+	set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
 	set ..KlantSessieData = ##class(APPS.EC.dto.KlantSessieData).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -76,112 +82,100 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ConverteerDataOptNaarKlantSessieData">
-<FormalSpec>DataOpt:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set ..KlantSessieData = ..KlantSessieDataBepaler.GeefKlantSessieData(DataOpt,..DomeinVerwerker)
-
-	if '$length(..KlantSessieData.KlantID) {
-		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("KlantSessieData is niet volledig"))	
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConverteerRefNaarRefSessieData">
-<FormalSpec>Ref:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[	Set ..RefSessieData = ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefRefSessieData(Ref)
-]]></Implementation>
-</Method>
-
-<Method name="GeefConverteerTaalStringNaarTaalEnu">
-<FormalSpec>Taal:%String=""</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim TaalEnu As DOM.enu.Taal
-	If ( Taal '= "" ) && ( ##class(DOM.enu.Taal).IsValid(Taal) ) {
-		Set TaalEnu = Taal
-	} Else {
-		set TaalEnu = ..KlantSessieData.Taal
-	}
-	if ( TaalEnu = "" ) || ( '##class(DOM.enu.Taal).IsValid(TaalEnu) ) {
-		set TaalEnu = ..Personality.GeefTaal()
-	}
-	Quit TaalEnu
-]]></Implementation>
-</Method>
-
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersSFS).%New(),SFSPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersSFS).%New(),SFSPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleBE).%New(),HaefeleBEPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleBE).%New(),HaefeleBEPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleNL).%New(),HaefeleNLPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleNL).%New(),HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),VanRaemdonckPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),VanRaemdonckPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),KischPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),KischPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkDaro">
 <FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),DaroPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),DaroPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(),DestilPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(),DestilPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkDupont">
 <FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(),DupontPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(),DupontPersonality)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkHandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(), HeinPersonality.GeefPrefix())
+<Implementation><![CDATA[	Do ..HandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(), HeinPersonality)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkHandelMetVerificatie">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,PrefixHandel:%String</FormalSpec>
+<Method name="VerwerkVanHoecke">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+<Implementation><![CDATA[
+	set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersVanHoecke).%New()
+	Set LoginParameters.KlantID = ..RefSessieData.KlantID
+	
+	#dim DerdeToegangID As %String = ##class(TECH.StringUtils).GetLastPart(..KlantSessieData.GebruikerID,"||")
+	set Gebruiker = ##class(Derde.EC.Toegang).%OpenId(DerdeToegangID)
+	if $IsObject(Gebruiker) {
+		set LoginParameters.EncryptedWachtwoord = Gebruiker.WachtWoordIntern
+		set LoginParameters.GebruikerNaam = Gebruiker.UserNaam	
+	}
+	
+	Set LoginParameters.GebruikerID = ..KlantSessieData.GebruikerID
+	set ..LoginParameters  = LoginParameters
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoeckeVoorHalux">
+<FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Personality VanHoeckeVoorHalux wordt niet gebruikt"))
+]]></Implementation>
+</Method>
+
+<Method name="HandelMetVerificatie">
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,Personality:DOM.common.Personality</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do ..VulInLoginParameters(LoginParameters,PrefixHandel)
+	Do ..VulInLoginParameters(LoginParameters,Personality)
 	set LoginParameters.KlantNaam = ..KlantSessieData.KlantNaam	
 	set ..LoginParameters = LoginParameters
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkHandelZonderVerificatie">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel,PrefixHandel:%String</FormalSpec>
+<Method name="HandelZonderVerificatie">
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel,Personality:DOM.common.Personality</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	If ..KlantSessieData.KlantID '= "" {
-		Do ..GebruikKlantSessieDataVoorLoginParameters(LoginParameters,PrefixHandel)
+		Do ..GebruikKlantSessieDataVoorLoginParameters(LoginParameters,Personality)
 	}
 	
 	/// in login is dit niet belangrijk, na updateSessieMetContactGegevens worden deze allemaal ingevuld.
@@ -197,10 +191,10 @@
 </Method>
 
 <Method name="VulInLoginParameters">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,KlantIDPrefix:%String</FormalSpec>
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,Personality:DOM.common.Personality</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	set LoginParameters.KlantID = KlantIDPrefix_..KlantSessieData.KlantID
+	set LoginParameters.KlantID = ..PersonalityService.GeefKlantIdViaKlantCode(Personality,..KlantSessieData.KlantID)
 	
 	set LoginParameters.GebruikerID = LoginParameters.KlantID
 	if ( $length(..KlantSessieData.GebruikerID) ) {
@@ -212,37 +206,49 @@
 </Method>
 
 <Method name="GebruikKlantSessieDataVoorLoginParameters">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,KlantIDPrefix:%String</FormalSpec>
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,Personality:DOM.common.Personality</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	set LoginParameters.KlantID = ..KlantSessieData.KlantID
 	set LoginParameters.GebruikerID = ..KlantSessieData.GebruikerID
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkVanHoecke">
-<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+<Method name="ConverteerDataOptNaarKlantSessieData">
+<FormalSpec>DataOpt:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersVanHoecke).%New()
-	Set LoginParameters.KlantID = ..RefSessieData.KlantID
-	
-	#dim DerdeToegangID As %String = ##class(TECH.StringUtils).GetLastPart(..KlantSessieData.GebruikerID,"||")
-	set Gebruiker = ##class(Derde.EC.Toegang).%OpenId(DerdeToegangID)
-	if $IsObject(Gebruiker) {
-		set LoginParameters.EncryptedWachtwoord = Gebruiker.WachtWoordIntern
-		set LoginParameters.GebruikerNaam = Gebruiker.UserNaam	
+	Set ..KlantSessieData = ..KlantSessieDataBepaler.GeefKlantSessieData(DataOpt,..DomeinVerwerker)
+
+	if '$length(..KlantSessieData.KlantID) {
+		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("KlantSessieData is niet volledig"))	
 	}
-	
-	Set LoginParameters.GebruikerID = ..KlantSessieData.GebruikerID
-	set ..LoginParameters  = LoginParameters
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkVanHoeckeVoorHalux">
-<FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Personality VanHoeckeVoorHalux wordt niet gebruikt"))
+<Method name="ConverteerRefNaarRefSessieData">
+<FormalSpec>Ref:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..RefSessieData = ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefRefSessieData(Ref)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefConverteerTaalStringNaarTaalEnu">
+<FormalSpec>Taal:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim TaalEnu As DOM.enu.Taal
+	If ( Taal '= "" ) && ( ##class(DOM.enu.Taal).IsValid(Taal) ) {
+		Set TaalEnu = Taal
+	} Else {
+		set TaalEnu = ..KlantSessieData.Taal
+	}
+	if ( TaalEnu = "" ) || ( '##class(DOM.enu.Taal).IsValid(TaalEnu) ) {
+		set TaalEnu = ..Personality.GeefTaal()
+	}
+	Quit TaalEnu
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml
===================================================================
diff -u -r46609 -r46621
--- APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 46609)
+++ APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 46621)
@@ -77,12 +77,14 @@
 <Private>1</Private>
 <ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality
 	#dim WebshopVersie As APPS.EC.enu.WebshopVersie = Offerte.GeefWebshopVersie()
 	if WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V3() {
-		#Dim KlantID As DOM.VKP.VanHoeckeKlantID = Offerte.GeefPersonality().GeefKlantID()
-		#Dim Personality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
-		#Dim Url As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("VhisieURL")_"?REF=" _ ..GeefRef(KlantID, Personality.GeefID(), Modus, Offerte.GeefID())	
+		#dim KlantID As DOM.VKP.VanHoeckeKlantID = Offerte.GeefPersonality().GeefKlantID()
+		Set Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
+		#dim Url As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("VhisieURL")_"?REF=" _ ..GeefRef(KlantID, Personality.GeefID(), Modus, Offerte.GeefID())	
 	} elseif WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V4() {
+		Set Personality = Offerte.GeefPersonality()
 		Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie)
 		Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination=/cart"
 	} else {
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml
===================================================================
diff -u -r46618 -r46621
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml	(.../Base.cls.xml)	(revision 46618)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml	(.../Base.cls.xml)	(revision 46621)
@@ -66,7 +66,8 @@
 	Do OfferteStub.IndienMethodCall("GeefWensLeverDatum").DanReturn(..#ZomaarEenWensLeverdatum)
 	Do OfferteStub.IndienMethodCall("GeefDocumentReferenties").DanReturn(DocumentReferenties)
 	Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Geen())
-	Do OfferteStub.IndienMethodCall("GeefWebshopVersie").DanReturn(##class(APPS.EC.enu.WebshopVersie).V3())
+	Do OfferteStub.IndienMethodCall("GeefWebshopVersie").DanReturn(..GeefWebshopVersie())
+	Do OfferteStub.IndienMethodCall("GeefExterneId").DanReturn(789654)
 	
 	Set MailApi = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).%New()
 	
@@ -86,6 +87,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWebshopVersie">
+<Abstract>1</Abstract>
+<Private>1</Private>
+</Method>
+
 <Method name="AssertMail">
 <FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
 <Private>1</Private>
Index: vhTest/Utils/DOM/common/dto/HandelKlantData.cls.xml
===================================================================
diff -u
--- vhTest/Utils/DOM/common/dto/HandelKlantData.cls.xml	(revision 0)
+++ vhTest/Utils/DOM/common/dto/HandelKlantData.cls.xml	(revision 46621)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.DOM.common.dto.HandelKlantData">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="SeefelderBijHein">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.dto.KlantData</ReturnType>
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.common.dto.HandelKlantData).%New()
+	
+	Set Klant.Naam = "Seefelder"
+	Set Klant.ID = "hein_10135"
+	Set Klant.Code = "10135"
+	Set Klant.Taal = "D"
+	Set Klant.EmailAdres = "Seefelder@seefelder.net"
+	
+	Quit Klant
+]]></Implementation>
+</Method>
+
+<Method name="Seefelder">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.dto.KlantData</ReturnType>
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.common.dto.HandelKlantData).%New()
+	
+	Set Klant.Naam = "schneiderei Hanz"
+	Set Klant.ID = "seef_1234"
+	Set Klant.Code = "1234"
+	Set Klant.Taal = "D"
+	Set Klant.EmailAdres = "schneidereiHanz@germany.de"
+	
+	Quit Klant
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/CRM/impl/KlantIDValidator.cls.xml
===================================================================
diff -u -r45436 -r46621
--- APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 45436)
+++ APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46621)
@@ -3,6 +3,11 @@
 <Class name="APPS.CRM.impl.KlantIDValidator">
 <Super>DOM.common.VanHoeckeOfAnderePersonalityVisitor,APPS.CRM.KlantIDValidator,APPS.common.impl.Validator</Super>
 
+<Property name="PersonalityService">
+<Type>DOM.common.PersonalityService</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="KlantID">
 <Type>%String</Type>
 <Private>1</Private>
@@ -18,19 +23,29 @@
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="IsGeldig">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality=""</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set ..KlantID = KlantID
-	if '$IsObject(Personality) {
-		set Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID())
-	}
+	Set:$$$Not($IsObject(Personality)) Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID())
 	
-	set ..PersonalityID = Personality.GeefID()
+	Quit:$$$Not(..PersonalityService.IsGeldigKlantId(Personality, ..KlantID)) $$$False
 	
+	set ..PersonalityID = Personality.GeefID()
 	Do Personality.Accept($this)
-	
 	Quit ..IsGeldigKlantID
 ]]></Implementation>
 </Method>
@@ -55,14 +70,14 @@
 
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..IsGeldigKlantID = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().BestaatKlant(..KlantID)
+<Implementation><![CDATA[	Set ..IsGeldigKlantID = (##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().BestaatKlant(..KlantID))
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkAnderePersonality">
 <FormalSpec>Personality:DOM.common.Personality</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Set ..IsGeldigKlantID = ##class(TECH.StringUtils).StartsWith(..KlantID,Personality.GeefPrefix())
+<Implementation><![CDATA[	; hier moeten we effectief controleren of de klant bestaat in de klantdata ;
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml
===================================================================
diff -u -r45873 -r46621
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 45873)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 46621)
@@ -13,6 +13,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PersonalityService">
+<Type>DOM.common.PersonalityService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>LegacyPartijAPI:DOM.PARTIJ.LegacyPartijAPI,HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository</FormalSpec>
 <Private>1</Private>
@@ -22,20 +27,21 @@
 <Implementation><![CDATA[
 	Set ..LegacyPartijAPI = $$$Inject(LegacyPartijAPI, ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI())
 	Set ..HandelPersonalityRepository = $$$Inject(HandelPersonalityRepository, ##class(DOM.common.impl.HandelPersonalityRepository).%New())
+	Set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKlantPartijID">
-<FormalSpec>KlantId:%String,PersonalityId:%String=""</FormalSpec>
-<ReturnType>DOM.VKP.VanHoeckeKlantID</ReturnType>
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<ReturnType>DOM.VKP.KlantID</ReturnType>
 <Implementation><![CDATA[
-	If ((PersonalityId = "") || (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
+	If (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke()) {
 		Quit:..LegacyPartijAPI.IsKlantPartijID(KlantId) KlantId	
 		Quit ..LegacyPartijAPI.GeefKlantPartijID(KlantId)
 	} Else {
-		Quit ..HandelPersonalityRepository.GeefViaID(PersonalityId).GeefPrefix()_KlantId
+		Quit ..PersonalityService.GeefKlantIdViaKlantCode(..HandelPersonalityRepository.GeefViaID(PersonalityId),KlantId)
 	}
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml
===================================================================
diff -u -r46561 -r46621
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 46561)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 46621)
@@ -64,6 +64,12 @@
 <Implementation><![CDATA[	Quit "http://unittest.kisch.nl/getofferte?REF=3k0E89wh6Evrtrp3YF9pFB2mVUNwBhiBIAuPCKAE1qfOoVTd2ixLjsCa92L2FtDegMeUHmC1EWSDgE7gfL5p7w--&DATAOPT=&Taal=N"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefWebshopVersie">
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebshopVersie).V3()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/common/PersonalityService.cls.xml
===================================================================
diff -u -r46607 -r46621
--- DOM/common/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 46607)
+++ DOM/common/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 46621)
@@ -6,15 +6,33 @@
 
 <Method name="IsKlantBij">
 <Abstract>1</Abstract>
-<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonalty:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 </Method>
 
 <Method name="IsOnrechtstreeksKlantBij">
 <Abstract>1</Abstract>
-<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonalty:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantPersonality:DOM.common.Personality,LeverancierPersonality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 </Method>
+
+<Method name="GeefKlantCodeViaKlantId">
+<Abstract>1</Abstract>
+<FormalSpec>Personality:DOM.common.Personality,KlantId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="GeefKlantIdViaKlantCode">
+<Abstract>1</Abstract>
+<FormalSpec>Personality:DOM.common.Personality,KlantCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="IsGeldigKlantId">
+<Abstract>1</Abstract>
+<FormalSpec>Personality:DOM.common.Personality,KlantId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+</Method>
 </Class>
 
 
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml
===================================================================
diff -u -r46555 -r46621
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 46555)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 46621)
@@ -117,6 +117,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..MailVerzenderHandel.Rapporteer(..Offerte)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoeckeVoorHalux">
 <FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ##class(TECH.Exceptions.InvalidInputException).Throw("Bestelde Offerte voor personality ""VanHoeckeVoorHaluxPersonality"" is niet mogelijk.")