Index: DOM/common/PersonalityVisitor.cls.xml
===================================================================
diff -u -r36060 -r46643
--- DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 36060)
+++ DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 46643)
@@ -60,6 +60,11 @@
 <Abstract>1</Abstract>
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 </Method>
+
+<Method name="VerwerkSeefelder">
+<Abstract>1</Abstract>
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+</Method>
 </Class>
 
 
Index: APPS/EC/Transport/Service.cls.xml
===================================================================
diff -u -r46515 -r46643
--- APPS/EC/Transport/Service.cls.xml	(.../Service.cls.xml)	(revision 46515)
+++ APPS/EC/Transport/Service.cls.xml	(.../Service.cls.xml)	(revision 46643)
@@ -183,7 +183,9 @@
 
 	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
 	#dim VerzendingMogelijkheid As APPS.EC.Transport.data.VerzendingMogelijkheid
+
 	Set VerzendingMogelijkheid = ..VerzendingMogelijkheidRepository.GeefViaOfferteIDEnVerzendingMogelijkheidID(..GeefOrigineleOfferte(Offerte).GeefID(),VerzendingMogelijkheidID) 
+
 	Do Offerte.ZetVerzendingItem($$ConstructClone^vhLib.Class(VerzendingMogelijkheid.Verzending,##class(APPS.VKP.impl.Offerte.VerzendingItem).%ClassName(1)))
 	
 	#dim GeselecteerdeOptie As APPS.EC.Transport.dto.Selectie = ..GeefGeselecteerdeOptie(VerzendingMogelijkheid, OptieKeuze)
@@ -200,10 +202,10 @@
 <Private>1</Private>
 <ReturnType>APPS.VKP.Offerte</ReturnType>
 <Implementation><![CDATA[
- 	If $$$Not($IsObject(Offerte.GeefOfferteVanHandel())) {
+ 	If $$$Not($IsObject(Offerte.OfferteVanHandel)) {
 		Quit Offerte
  	}
- 	Quit ..GeefOrigineleOfferte(Offerte.GeefOfferteVanHandel())
+ 	Quit ..GeefOrigineleOfferte(Offerte.OfferteVanHandel)
 ]]></Implementation>
 </Method>
 
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar.cls.xml
===================================================================
diff -u -r46621 -r46643
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar.cls.xml	(.../BestelWinkelkar.cls.xml)	(revision 46621)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar.cls.xml	(.../BestelWinkelkar.cls.xml)	(revision 46643)
@@ -63,21 +63,19 @@
 	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 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 KlantId As %String = ..WinkelkarServiceHelper.GeefKlantPartijID(BestelWinkelkarRequest.Header.KlantId,BestelWinkelkarRequest.Header.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, KlantId) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() {
 			Do ..TransportService.ZetGekozenVerzendingMogelijkheid(OfferteID, BestelWinkelkarRequest.VerzendingMogelijkheidID, BestelWinkelkarRequest.OptieKeuze)	
 		}
 		
-		Do ..VerkoopService.BestelOfferte(OfferteID, KlantPartijID, PersonalityId)
+		Do ..VerkoopService.BestelOfferte(OfferteID, KlantId, BestelWinkelkarRequest.Header.PersonalityId)
 		
 	} Catch {
 		Lock -^Vhisie4.Winkelkar(BestelWinkelkarRequest.Winkelkar.Id)
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/AutoComplete.cls.xml
===================================================================
diff -u -r43587 -r46643
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 43587)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 46643)
@@ -16,10 +16,12 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<StreamLocation>^WSimpl.Unisho701F.AutoCompleteS</StreamLocation>
-</Storage>
+<Property name="Seefelder">
+<Type>%String</Type>
+<InitialExpression>"13"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper/GeefKlantPartijID/Test.cls.xml
===================================================================
diff -u -r45873 -r46643
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper/GeefKlantPartijID/Test.cls.xml	(.../Test.cls.xml)	(revision 45873)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper/GeefKlantPartijID/Test.cls.xml	(.../Test.cls.xml)	(revision 46643)
@@ -3,85 +3,30 @@
 <Class name="vhUnitTest.WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper.GeefKlantPartijID.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Geen Personality, wel KlantPartijID -&gt; LegacyPartijApi gebruiken">
-<Implementation><![CDATA[
-	#dim KlantId = "K||1234"
-	
-	Set LegacyPartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijApiMock.VerwachtMethodCall("IsKlantPartijID",KlantId).DanReturn($$$True)
-	
-	Set Helper = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New(LegacyPartijApiMock)
-	
-	#dim AntwoordKlantId = Helper.GeefKlantPartijID(KlantId, "")
-	
-	Do $$$AssertEquals(AntwoordKlantId,KlantId)
-	
-	Do LegacyPartijApiMock.Verifieer()
-]]></Implementation>
-</Method>
-
-<Method name="Test: Geen Personality, geen KlantPartijID -&gt; LegacyPartijApi gebruiken">
-<Implementation><![CDATA[
-	#dim KlantId = "K||1234"
-	
-	Set LegacyPartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijApiMock.IndienMethodCall("IsKlantPartijID",KlantId).DanReturn($$$False)
-	Do LegacyPartijApiMock.VerwachtMethodCall("GeefKlantPartijID",KlantId).ExactAantalKeer(1)
-	
-	Set Helper = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New(LegacyPartijApiMock)
-	
-	#dim AntwoordKlantId = Helper.GeefKlantPartijID(KlantId, "")
-	
-	Do LegacyPartijApiMock.Verifieer()
-]]></Implementation>
-</Method>
-
 <Method name="Test: Personality VanHoecke, wel KlantPartijID -&gt; LegacyPartijApi gebruiken">
 <Implementation><![CDATA[
-	#dim KlantId = "K||1234"
-	
 	Set LegacyPartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijApiMock.VerwachtMethodCall("IsKlantPartijID",KlantId).DanReturn($$$True)
+	Do LegacyPartijApiMock.IndienMethodCall("IsKlantPartijID","1234").DanReturn($$$False)
+	Do LegacyPartijApiMock.VerwachtMethodCall("GeefKlantPartijID","1234").ExactAantalKeer(1).DanReturn("K||1234")
 	
 	Set Helper = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New(LegacyPartijApiMock)
 	
-	#dim AntwoordKlantId = Helper.GeefKlantPartijID(KlantId, ##class(DOM.common.enu.Personality).VanHoecke())
+	Do $$$AssertEquals(Helper.GeefKlantPartijID(1234, ##class(DOM.common.enu.Personality).VanHoecke()),"K||1234")
 	
-	Do $$$AssertEquals(AntwoordKlantId,KlantId)
-	
 	Do LegacyPartijApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Personality VanHoecke, geen KlantPartijID -&gt; LegacyPartijApi gebruiken">
-<Implementation><![CDATA[
-	#dim KlantId = "K||1234"
-	
-	Set LegacyPartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijApiMock.IndienMethodCall("IsKlantPartijID",KlantId).DanReturn($$$False)
-	Do LegacyPartijApiMock.VerwachtMethodCall("GeefKlantPartijID",KlantId).ExactAantalKeer(1)
-	
-	Set Helper = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New(LegacyPartijApiMock)
-	
-	Do Helper.GeefKlantPartijID(KlantId, ##class(DOM.common.enu.Personality).VanHoecke())
-	
-	Do LegacyPartijApiMock.Verifieer()
-]]></Implementation>
-</Method>
-
 <Method name="Test: andere Personality -&gt; SettingsManager oproepen">
 <Implementation><![CDATA[
-	#dim KlantId = "K||1234"
-	#dim PersonalityId = ##class(DOM.common.enu.Personality).Daro()
-	
 	Set HandelPersonality = ##class(vhTest.Mock.DOM.common.HandelPersonality).%New()
-	Do HandelPersonality.IndienMethodCall("GeefPrefix").DanReturn(##class(DOM.common.enu.Personality).Daro())
+	Do HandelPersonality.IndienMethodCall("GeefPrefix").DanReturn("pers_")
 	Set HandelPersonalityRepoMock = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelPersonalityRepoMock.VerwachtMethodCall("GeefViaID", PersonalityId).DanReturn(HandelPersonality)
+	Do HandelPersonalityRepoMock.VerwachtMethodCall("GeefViaID", "PersonalityId").DanReturn(HandelPersonality)
 	
 	Set Helper = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New(,HandelPersonalityRepoMock)
 	
-	Do Helper.GeefKlantPartijID(KlantId, ##class(DOM.common.enu.Personality).Daro())
+	Do $$$AssertEquals(Helper.GeefKlantPartijID(1234, "PersonalityId"),"pers_1234")
 	
 	Do HandelPersonalityRepoMock.Verifieer()
 ]]></Implementation>
Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r46621 -r46643
--- WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 46621)
+++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 46643)
@@ -8,11 +8,6 @@
 <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>
@@ -46,7 +41,6 @@
 <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>
@@ -82,100 +76,118 @@
 ]]></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 ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersSFS).%New(),SFSPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersSFS).%New(),SFSPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleBE).%New(),HaefeleBEPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleBE).%New(),HaefeleBEPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleNL).%New(),HaefeleNLPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleNL).%New(),HaefeleNLPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),VanRaemdonckPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),VanRaemdonckPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),KischPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),KischPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkDaro">
 <FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..HandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),DaroPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),DaroPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..HandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(),DestilPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(),DestilPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkDupont">
 <FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..HandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(),DupontPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(),DupontPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..HandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(), HeinPersonality)
+<Implementation><![CDATA[	Do ..VerwerkHandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(), HeinPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
-<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
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkHandelZonderVerificatie(##class(WSimpl.Unishop.Login.ParametersHandel).%New(), SeefelderPersonality.GeefPrefix())
 ]]></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>
+<Method name="VerwerkHandelMetVerificatie">
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,PrefixHandel:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do ..VulInLoginParameters(LoginParameters,Personality)
+	Do ..VulInLoginParameters(LoginParameters,PrefixHandel)
 	set LoginParameters.KlantNaam = ..KlantSessieData.KlantNaam	
 	set ..LoginParameters = LoginParameters
 ]]></Implementation>
 </Method>
 
-<Method name="HandelZonderVerificatie">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel,Personality:DOM.common.Personality</FormalSpec>
+<Method name="VerwerkHandelZonderVerificatie">
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel,PrefixHandel:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	If ..KlantSessieData.KlantID '= "" {
-		Do ..GebruikKlantSessieDataVoorLoginParameters(LoginParameters,Personality)
+		Do ..GebruikKlantSessieDataVoorLoginParameters(LoginParameters,PrefixHandel)
 	}
 	
 	/// in login is dit niet belangrijk, na updateSessieMetContactGegevens worden deze allemaal ingevuld.
@@ -191,10 +203,10 @@
 </Method>
 
 <Method name="VulInLoginParameters">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,Personality:DOM.common.Personality</FormalSpec>
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,KlantIDPrefix:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	set LoginParameters.KlantID = ..PersonalityService.GeefKlantIdViaKlantCode(Personality,..KlantSessieData.KlantID)
+	set LoginParameters.KlantID = KlantIDPrefix_..KlantSessieData.KlantID
 	
 	set LoginParameters.GebruikerID = LoginParameters.KlantID
 	if ( $length(..KlantSessieData.GebruikerID) ) {
@@ -206,49 +218,37 @@
 </Method>
 
 <Method name="GebruikKlantSessieDataVoorLoginParameters">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,Personality:DOM.common.Personality</FormalSpec>
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters,KlantIDPrefix:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	set LoginParameters.KlantID = ..KlantSessieData.KlantID
 	set LoginParameters.GebruikerID = ..KlantSessieData.GebruikerID
 ]]></Implementation>
 </Method>
 
-<Method name="ConverteerDataOptNaarKlantSessieData">
-<FormalSpec>DataOpt:%String</FormalSpec>
-<Private>1</Private>
+<Method name="VerwerkVanHoecke">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <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"))	
+	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="ConverteerRefNaarRefSessieData">
-<FormalSpec>Ref:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[	Set ..RefSessieData = ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefRefSessieData(Ref)
+<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="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: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r45880 -r46643
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45880)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 46643)
@@ -71,7 +71,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test Standaardgedrag">
+<Method name="aTest Standaardgedrag">
 <Implementation><![CDATA[
 	Set ..DecrypteerRequestStub.Header.PersonalityId = ##class(DOM.common.enu.Personality).Daro()
 	
@@ -174,7 +174,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: enkel TBX en LBX voor Destil">
+<Method name="aTest: enkel TBX en LBX voor Destil">
 <Implementation><![CDATA[
 	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Destil()
 	
@@ -208,7 +208,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: enkel TBX en LBX voor Kisch">
+<Method name="aTest: enkel TBX en LBX voor Kisch">
 <Implementation><![CDATA[
 	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Kisch()
 	
@@ -242,7 +242,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: enkel LBX en TAX voor Daro">
+<Method name="aTest: enkel LBX en TAX voor Daro">
 <Implementation><![CDATA[
 	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
 	
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/Sender.cls.xml
===================================================================
diff -u -r42436 -r46643
--- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/Sender.cls.xml	(.../Sender.cls.xml)	(revision 42436)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/Sender.cls.xml	(.../Sender.cls.xml)	(revision 46643)
@@ -73,7 +73,9 @@
 <ReturnType>%Stream</ReturnType>
 <Implementation><![CDATA[
 	#dim WinkelkarStream As %GlobalCharacterStream
+	
 	do Winkelkar.XMLExportToStream(.WinkelkarStream,,"literal,indent")
+	do ##class(vhLib.Logger).%New().Info("IntractoInformeerder",WinkelkarStream)
 	quit WinkelkarStream
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r45092 -r46643
--- vhTest/Mock/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 45092)
+++ vhTest/Mock/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 46643)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="BestelOfferte">
-<FormalSpec>OfferteID:%String,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<FormalSpec>OfferteID:%String,KlantID:DOM.VKP.KlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("BestelOfferte",OfferteID,KlantID,PersonalityID)
 ]]></Implementation>
 </Method>
Index: APPS/EC/impl/KlantInstellingenServiceSeefelder.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/KlantInstellingenServiceSeefelder.cls.xml	(revision 0)
+++ APPS/EC/impl/KlantInstellingenServiceSeefelder.cls.xml	(revision 46643)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.KlantInstellingenServiceSeefelder">
+<Super>APPS.common.impl.KlantInstellingenService</Super>
+
+<Method name="MagKlantLBXVerpakkingTypeBestellen">
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ((VerpakkingType = ##class(DOM.PM.enu.LBXVerpakkingType).V1()) || (VerpakkingType = ##class(DOM.PM.enu.LBXVerpakkingType).Probox()))
+]]></Implementation>
+</Method>
+
+<Method name="MagKlantTAORVerpakkingTypeBestellen">
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.TAORVerpakkingType</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ((VerpakkingType = ##class(DOM.PM.enu.TAORVerpakkingType).V1()) || (VerpakkingType = ##class(DOM.PM.enu.TAORVerpakkingType).Probox()))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r45886 -r46643
--- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 45886)
+++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 46643)
@@ -83,6 +83,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Seefelder()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).VanRaemdonck()
Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r41628 -r46643
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 41628)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 46643)
@@ -102,10 +102,20 @@
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HeinPersonality)
 	
 	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, HeinPersonality)
-	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
+	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, SeefelderPersonality)
+	
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, SeefelderPersonality)
+	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r45436 -r46643
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 45436)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 46643)
@@ -187,6 +187,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerReedsBesteld()
+	Do ..ControleerToegangEnPrijzen()
+]]></Implementation>
+</Method>
+
 <Method name="ControleerToegangEnPrijzen">
 <Private>1</Private>
 <Implementation><![CDATA[
Index: APPS/EC/Verkoop/impl/OfferteConverter.cls.xml
===================================================================
diff -u -r46535 -r46643
--- APPS/EC/Verkoop/impl/OfferteConverter.cls.xml	(.../OfferteConverter.cls.xml)	(revision 46535)
+++ APPS/EC/Verkoop/impl/OfferteConverter.cls.xml	(.../OfferteConverter.cls.xml)	(revision 46643)
@@ -53,8 +53,10 @@
 	Set Resultaat.GeldigheidVermelding = ..GeldigheidVermeldingBepaler.BepaalVermelding(Offerte)
 	Set Resultaat.PrijzenGeldigTotEnMetDatum = Offerte.GeefPrijzenGeldigTotEnMetDatum()
 	Set Resultaat.Status = Offerte.GeefBestelStatus()
+	
 	If $IsObject(Offerte.GeefVerzendingItem()) {
 		Set Resultaat.VerzendingMogelijkheid = $$ConstructClone^vhLib.Class(Offerte.GeefVerzendingItem(),"APPS.EC.dto.OfferteVerzendingMogelijkheid")
+		Set Resultaat.VerzendingMogelijkheid.TransportKost = Offerte.GeefVerzendingItem().VerkoopPrijs
 	}
 	
 	If ..OfferteService.HeeftOfferteVanVH(Offerte) {
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/SeefelderPrijsFactorBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/SeefelderPrijsFactorBepaler.cls.xml	(revision 0)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/SeefelderPrijsFactorBepaler.cls.xml	(revision 46643)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.SeefelderPrijsFactorBepaler">
+<Super>TECH.RegisteredObject,APPS.EC.Winkelkar.WinkelkarService.PrijsFactorBepaler</Super>
+
+<Parameter name="Factor">
+<Type>%Numeric</Type>
+<Default>1</Default>
+</Parameter>
+
+<Method name="GeefPrijsFactor">
+<FormalSpec>MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[	Quit ..#Factor
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler.cls.xml
===================================================================
diff -u -r46231 -r46643
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 46231)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 46643)
@@ -34,28 +34,18 @@
 	#dim KlantData As DOM.VKP.impl.HandelKlantData
 	#dim KlantId As %String = ""
 	
-	If (RegistreerContactGegevensRequest.Header.PersonalityId = ##class(DOM.common.enu.Personality).Hein()){
-		If $$$HasLength(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")
-		}
+	If ##class(TECH.StringUtils).Equals(RegistreerContactGegevensRequest.Header.PersonalityId,##class(DOM.common.enu.Personality).Hein(),##class(DOM.common.enu.Personality).Seefelder()) && $$$HasLength(RegistreerContactGegevensRequest.Header.KlantId){
+		Set KlantId = HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId
+		Set KlantData = ..MaakHandelKlantData(KlantId,RegistreerContactGegevensRequest)
+	} ElseIf (RegistreerContactGegevensRequest.Header.KlantId = "") {
+		Set KlantId = HandelPersonality.GeefPrefix()_..WebshopSessionService.GeefVolgendeKlantID(RegistreerContactGegevensRequest.Header.PersonalityId)
+		Set KlantData = ..MaakHandelKlantData(KlantId,RegistreerContactGegevensRequest)
 	} Else {
-		If ((RegistreerContactGegevensRequest.Header.PersonalityId = ##class(DOM.common.enu.Personality).Hein() && $$$HasLength(RegistreerContactGegevensRequest.Header.KlantId))){
-			Set KlantId = HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId
-			Set KlantData = ..MaakHandelKlantData(KlantId,RegistreerContactGegevensRequest)
-		} ElseIf (RegistreerContactGegevensRequest.Header.KlantId = "") {
-			Set KlantId = HandelPersonality.GeefPrefix()_..WebshopSessionService.GeefVolgendeKlantID(RegistreerContactGegevensRequest.Header.PersonalityId)
-			Set KlantData = ..MaakHandelKlantData(KlantId,RegistreerContactGegevensRequest)
-		} Else {
-			Try {
-				Set KlantData = ..HandelKlantDataRepository.GeefViaID(HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId)
-				Set KlantData.KlantId = HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId
-			} Catch {
-				Do ##class(TECH.Exceptions.InvalidInputException).Throw("Kon geen klantdata openen met id '"_RegistreerContactGegevensRequest.Header.KlantId_"'")
-			}		
-		}
+		Try {
+			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_"'")
+		}		
 	}
 		
 	Quit KlantData
@@ -70,6 +60,7 @@
 	#dim HandelKlantData As DOM.VKP.impl.HandelKlantData = ..HandelKlantDataRepository.Maak()
 	
 	Set HandelKlantData.ID = KlantId
+	Set HandelKlantData.KlantId = KlantId
 	Set HandelKlantData.EmailAdres = RegistreerContactGegevensRequest.EmailAdres
 	Set HandelKlantData.FaxNummer = RegistreerContactGegevensRequest.FaxNummer
 	Set HandelKlantData.Gemeente = RegistreerContactGegevensRequest.Gemeente
Index: APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r39869 -r46643
--- APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 39869)
+++ APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 46643)
@@ -17,6 +17,24 @@
 <FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
 <ReturnType>APPS.VKP.VerzendWijze</ReturnType>
 <Implementation><![CDATA[
+	if Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).VanHoecke() {
+		quit ..GeefVerzendWijzeVanKlantID(Winkelkar.GeefKlantID())
+	} else {
+		if Winkelkar.GeefPersonality().GeefLeverancierData().PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke() {
+			quit ..GeefVerzendWijzeVanKlantID(Winkelkar.GeefPersonality().GeefLeverancierData().EigenKlantId)
+		} else {
+			#dim Hein As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant("K||7833")
+			#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij("K||7833")
+			quit ##class(APPS.VKP.VerzendWijze).%New(7833,Hein.GeefVerzendingWijze(),Partij.GeefAdres().GeefLand().GeefCode(),Partij.GeefAdres().GeefPostcode())
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="aGeefVerzendWijze">
+<FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
+<ReturnType>APPS.VKP.VerzendWijze</ReturnType>
+<Implementation><![CDATA[
 	Set ..Winkelkar=Winkelkar
 	Do ..Winkelkar.GeefPersonality().Accept($this)
 	Quit ..VerzendWijze
Index: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r45862 -r46643
--- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 45862)
+++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 46643)
@@ -69,6 +69,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkSeefelder",SeefelderPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkVanHoecke",VanHoeckePersonality)
Index: APPS/EC/Verkoop/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r45092 -r46643
--- APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 45092)
+++ APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 46643)
@@ -60,7 +60,7 @@
 
 <Method name="BestelOfferte">
 <Abstract>1</Abstract>
-<FormalSpec>OfferteID:%String,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<FormalSpec>OfferteID:%String,KlantID:DOM.VKP.KlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r42917 -r46643
--- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 42917)
+++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 46643)
@@ -19,6 +19,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml
===================================================================
diff -u -r46474 -r46643
--- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml	(.../Converter.cls.xml)	(revision 46474)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml	(.../Converter.cls.xml)	(revision 46643)
@@ -44,6 +44,7 @@
 	set Winkelkar.Referentie = Offerte.Hoofding.Referentie.OrderReferentie
 	Set Winkelkar.Status = Offerte.Status
 	Set Winkelkar.PersonalityId = Offerte.Winkelkar.Personality.ID
+	Set Winkelkar.Leveradres = Offerte.Leveradres
 
 	set Winkelkar.VerzendMogelijkheid = $$ConstructClone^vhLib.Class(Offerte.VerzendingMogelijkheid,"WS.Vhisie4.WinkelkarExport.dto.VerzendingMogelijkheid")
 	
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u -r46013 -r46643
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 46013)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder/KlantDataBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 46643)
@@ -82,25 +82,23 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Hein heeft KlantId niet ingevuld: error">
+<Method name="Test: Hein heeft KlantId niet ingevuld: nieuw nummer genereren">
 <Implementation><![CDATA[
 	#dim RegistreerContactGegevensRequestStub As WS.Vhisie4.Auth.RegistreerContactGegevensRequest = ##class(vhTest.Utils.WS.Vhisie4.Auth.RegistreerContactGegevensRequest).StandaardRegistreerContactGegevensRequest()
 	Set RegistreerContactGegevensRequestStub.Header.PersonalityId = ##class(DOM.common.enu.Personality).Hein()
 	Set RegistreerContactGegevensRequestStub.Header.KlantId = ""
 	
 	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 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))
+	Do WebshopSessionServiceMock.VerwachtMethodCall("GeefVolgendeKlantID",RegistreerContactGegevensRequestStub.Header.PersonalityId).ExactAantalKeer(1).DanReturn(5)
 	
 	Set Bepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New(HandelKlantDataRepositoryMock,WebshopSessionServiceMock)
 	#dim HandelKlantData As DOM.VKP.impl.HandelKlantData = Bepaler.Bepaal(RegistreerContactGegevensRequestStub,HandelPersonalityStub)
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r44518 -r46643
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 44518)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 46643)
@@ -21,6 +21,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r45864 -r46643
--- DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 45864)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 46643)
@@ -76,6 +76,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
+	
+	#dim KlantData As DOM.VKP.impl.SeefelderKlantData = ..OpenKlantData(..KlantID, SeefelderPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, SeefelderPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening.cls.xml
===================================================================
diff -u -r45514 -r46643
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening.cls.xml	(.../StartVerpakkingBerekening.cls.xml)	(revision 45514)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening.cls.xml	(.../StartVerpakkingBerekening.cls.xml)	(revision 46643)
@@ -46,7 +46,7 @@
 	
 	Try {
 
-		#dim KlantPartijID As %String = ..WinkelkarServiceHelper.GeefKlantPartijID(StartVerpakkingBerekeningRequest.Header.KlantId)
+		#dim KlantPartijID As %String = ..WinkelkarServiceHelper.GeefKlantPartijID(StartVerpakkingBerekeningRequest.Header.KlantId, StartVerpakkingBerekeningRequest.Header.PersonalityId)
 		If ..CheckoutTypeBepaler.Bepaal(StartVerpakkingBerekeningRequest.Header.PersonalityId, KlantPartijID) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() 
 		{
 			#dim OfferteID As %String = ..WinkelkarRepository.GeefOfferteIDViaID(StartVerpakkingBerekeningRequest.WinkelkarId)
Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml
===================================================================
diff -u -r36060 -r46643
--- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 36060)
+++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 46643)
@@ -79,6 +79,12 @@
 <Implementation><![CDATA[	Do ..VerwerkAnderePersonality(HeinPersonality)
 ]]></Implementation>
 </Method>
+
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkAnderePersonality(SeefelderPersonality)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml
===================================================================
diff -u -r46423 -r46643
--- APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 46423)
+++ APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 46643)
@@ -208,7 +208,7 @@
 </Method>
 
 <Method name="BestelOfferte">
-<FormalSpec>OfferteID:%String,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<FormalSpec>OfferteID:%String,KlantID:DOM.VKP.KlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Implementation><![CDATA[
 	#Dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)
 	#Dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefKlantInstellingenService(Personality)
Index: WS/Vhisie4/RequestHeader.cls.xml
===================================================================
diff -u -r41439 -r46643
--- WS/Vhisie4/RequestHeader.cls.xml	(.../RequestHeader.cls.xml)	(revision 41439)
+++ WS/Vhisie4/RequestHeader.cls.xml	(.../RequestHeader.cls.xml)	(revision 46643)
@@ -43,6 +43,14 @@
 <Parameter name="XMLNAME" value="PersonalityID"/>
 </Property>
 
+<Method name="PersonalityIdGet">
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[
+	Quit:(i%PersonalityId="") ##class(DOM.common.enu.Personality).VanHoecke()
+	Quit i%PersonalityId
+]]></Implementation>
+</Method>
+
 <Property name="Taal">
 <Type>TECH.String</Type>
 <Required>1</Required>
Index: vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r45886 -r46643
--- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 45886)
+++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 46643)
@@ -68,6 +68,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r42991 -r46643
--- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 42991)
+++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 46643)
@@ -63,6 +63,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkSeefelder",SeefelderPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkVanHoecke",VanHoeckePersonality)
Index: APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r46512 -r46643
--- APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 46512)
+++ APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 46643)
@@ -80,7 +80,6 @@
 	Try {
 		#dim Palletten As APPS.TRANSP.OfferteService.dto.Palletten = ..StapelingBepaler.Bepaal(..BerekenInput)
 		Set ..AantalPalletten = Palletten.Count()
-
 		If ..AantalPalletten=0 {
 			Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Er zijn (nog) geen palletten berekend voor DHL of het berekende aantal is 0 voor berekeninput referentie " _..BerekenInput.Referentie)
 		}
Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r42916 -r46643
--- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 42916)
+++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 46643)
@@ -19,6 +19,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r44518 -r46643
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 44518)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 46643)
@@ -63,6 +63,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkSeefelder",SeefelderPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkVanHoecke",VanHoeckePersonality)
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling.cls.xml
===================================================================
diff -u -r45514 -r46643
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling.cls.xml	(.../BereidVoorBestelling.cls.xml)	(revision 45514)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling.cls.xml	(.../BereidVoorBestelling.cls.xml)	(revision 46643)
@@ -64,7 +64,7 @@
 
 		Do ..VerkoopService.ZetOfferteHoofding(OfferteID, ..MaakHoofding(BereidVoorBestellingRequest))
 
-		#dim KlantPartijID As %String = ..WinkelkarServiceHelper.GeefKlantPartijID(BereidVoorBestellingRequest.Header.KlantId)
+		#dim KlantPartijID As %String = ..WinkelkarServiceHelper.GeefKlantPartijID(BereidVoorBestellingRequest.Header.KlantId,BereidVoorBestellingRequest.Header.PersonalityId)
 		#dim CheckoutType As APPS.EC.Unishop.enu.CheckoutType = ..CheckoutTypeBepaler.Bepaal(BereidVoorBestellingRequest.Header.PersonalityId, KlantPartijID)
 		
 		If (CheckoutType = ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()) {
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality.cls.xml
===================================================================
diff -u -r37223 -r46643
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality.cls.xml	(.../CheckoutTypeMetTransportKeuzePersonality.cls.xml)	(revision 37223)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality.cls.xml	(.../CheckoutTypeMetTransportKeuzePersonality.cls.xml)	(revision 46643)
@@ -5,12 +5,12 @@
 
 <Parameter name="DISPLAYLIST">
 <Type>%String</Type>
-<Default>,11</Default>
+<Default>,11,13</Default>
 </Parameter>
 
 <Parameter name="VALUELIST">
 <Type>%String</Type>
-<Default>,11</Default>
+<Default>,11,13</Default>
 </Parameter>
 
 <Method name="Hein">
@@ -19,6 +19,13 @@
 <Implementation><![CDATA[	Quit ##class(DOM.common.enu.Personality).Hein()
 ]]></Implementation>
 </Method>
+
+<Method name="Seefelder">
+<ClassMethod>1</ClassMethod>
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeMetTransportKeuzePersonality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.enu.Personality).Seefelder()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/Test.cls.xml
===================================================================
diff -u -r44846 -r46643
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 44846)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 46643)
@@ -13,7 +13,7 @@
 	
 	Set VerzendingServiceMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.BereidVoorBestelling.VerzendingService).%New()
 	Do VerzendingServiceMock.IndienMethodCall("GeefMogelijkeLeverDatums", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(..GeefEenMogelijkeLeverdatum())
-	Do VerzendingServiceMock.VerwachtMethodCall("GeefIsAsapMogelijk",BereidVoorBestellingRequest, "K||1000").DanReturn($$$False) 
+	Do VerzendingServiceMock.VerwachtMethodCall("GeefIsAsapMogelijk",BereidVoorBestellingRequest, "K||1234").DanReturn($$$False) 
 		
 	Set VerkoopServiceStub = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
 	Do VerkoopServiceStub.IndienMethodCall("ZetOfferteHoofding", $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
@@ -41,7 +41,7 @@
 	
 	Set VerzendingServiceMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.BereidVoorBestelling.VerzendingService).%New()
 	Do VerzendingServiceMock.IndienMethodCall("GeefMogelijkeLeverDatums", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(..GeefTweeMogelijkeLeverdatums())
-	Do VerzendingServiceMock.VerwachtMethodCall("GeefIsAsapMogelijk",BereidVoorBestellingRequest, "K||1000").DanReturn($$$True) 
+	Do VerzendingServiceMock.VerwachtMethodCall("GeefIsAsapMogelijk",BereidVoorBestellingRequest, "K||1234").DanReturn($$$True) 
 		
 	Set VerkoopServiceStub = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
 	Do VerkoopServiceStub.IndienMethodCall("ZetOfferteHoofding", $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
@@ -65,14 +65,14 @@
 	Set BereidVoorBestellingRequest = ##class(vhTest.Utils.WS.Vhisie4.Winkelkar.BereidVoorBestellingRequest).StandaardRequest()
 	
 	Set VerzendingServiceMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.BereidVoorBestelling.VerzendingService).%New()
-	Do VerzendingServiceMock.VerwachtMethodCall("GeefMogelijkeLeverDatums", BereidVoorBestellingRequest, "K||1000").DanReturn(..GeefTweeMogelijkeLeverdatums())
-	Do VerzendingServiceMock.VerwachtMethodCall("GeefIsAsapMogelijk",BereidVoorBestellingRequest, "K||1000").DanDoeNiks()
+	Do VerzendingServiceMock.VerwachtMethodCall("GeefMogelijkeLeverDatums", BereidVoorBestellingRequest, "K||1234").DanReturn(..GeefTweeMogelijkeLeverdatums())
+	Do VerzendingServiceMock.VerwachtMethodCall("GeefIsAsapMogelijk",BereidVoorBestellingRequest, "K||1234").DanDoeNiks()
 
 	Set WinkelkarRepositoryMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarRepository).%New()
 	Do WinkelkarRepositoryMock.VerwachtMethodCall("GeefOfferteIDViaID", 1).DanReturn("InterneId")
 	
 	Set WinkelkarServiceHelperMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New()
-	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","K||1000","").DanReturn("K||1000")
+	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","1234",##class(DOM.common.enu.Personality).VanHoecke()).DanReturn("K||1234")
 		
 	#Dim Hoofding as APPS.EC.dto.Hoofding = ..GeefHoofding()
 	
@@ -106,9 +106,9 @@
 	Do VerkoopServiceDummy.IndienMethodCall("ZetOfferteHoofding",$$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 	
 	Set CheckoutTypeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
-	Do CheckoutTypeBepalerMock.VerwachtMethodCall("Bepaal", "1","K||1000").DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+	Do CheckoutTypeBepalerMock.VerwachtMethodCall("Bepaal", "1","K||1234").DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
 
-	#dim KlantIdentificatie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(1,"K||1000")
+	#dim KlantIdentificatie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(1,"K||1234")
 	Set WebshopSessieMatcher = ##class(Tools.Mock.ArgumentMatchers.ObjectMatcher).%New(KlantIdentificatie)
 
 	#dim VerzendingMogelijkheden = ##class(vhTest.Utils.APPS.EC.Transport.dto.VerzendingMogelijkheden).StandaardVerzendingMogelijkheden()
@@ -158,7 +158,7 @@
 	Do VerkoopServiceDummy.IndienMethodCall("ZetOfferteHoofding",$$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 	
 	Set CheckoutTypeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
-	Do CheckoutTypeBepalerMock.IndienMethodCall("Bepaal", "1","K||1000").DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+	Do CheckoutTypeBepalerMock.IndienMethodCall("Bepaal", "1","K||1234").DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 
 	Set TransportServiceMock = ##class(vhTest.Mock.APPS.EC.Transport.Service).%New()
 	Do TransportServiceMock.VerwachtMethodCall("GeefMogelijkeZendingen",$$$ElkeWaarde,$$$ElkeWaarde, $$$ElkeWaarde).Nooit()
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r46473 -r46643
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 46473)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 46643)
@@ -92,14 +92,17 @@
 		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
 		} Else {
-			Set ..Response.PersonalityId = 13
+			Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Seefelder()
+			Set ..Response.IsContactGegevensFormulierNodig = 0
+			Set ..Response.IsLoginFormulierNodig = 0
 		}
+		Set ..Response.IsGeldig = 1
 		Set ..Response.Taal = "D"
-		Set ..Response.IsLoginFormulierNodig = 1
 	} ElseIf (DecrypteerRequest.Hostname = "") {
 		Set ..Response.IsGeldig = 0
-	} ElseIf ((DecrypteerRequest.Ref = "") && $$$Not(DecrypteerRequest.Header.PersonalityId = ##class(DOM.common.enu.Personality).Hein())) {
+	} ElseIf ((DecrypteerRequest.Ref = "") && $$$Not(##class(TECH.StringUtils).Equals(DecrypteerRequest.Header.PersonalityId,##class(DOM.common.enu.Personality).Hein(),##class(DOM.common.enu.Personality).Seefelder()))) {
 		Set ..Response.IsGeldig = 0
 	} ElseIf (DecrypteerRequest.DataOpt = "") {
 		Set ..Response.IsContactGegevensFormulierNodig = 1
@@ -111,6 +114,12 @@
 		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>
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/Verwerker.cls.xml
===================================================================
diff -u -r37223 -r46643
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 37223)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeMetTransportKeuzePersonality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 46643)
@@ -14,6 +14,8 @@
 <Implementation><![CDATA[
 	If CheckoutTypeMetTransportKeuzePersonality = "11" {
 		Do ..VerwerkHein()
+	} ElseIf CheckoutTypeMetTransportKeuzePersonality = "13" {
+		Do ..VerwerkSeefelder()
 	} Else {
 		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(CheckoutTypeMetTransportKeuzePersonality,"WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeMetTransportKeuzePersonality",$classname())
 		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
@@ -26,6 +28,12 @@
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
+
+<Method name="VerwerkSeefelder">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Utils/WS/Vhisie4/RequestHeader.cls.xml
===================================================================
diff -u -r41305 -r46643
--- vhTest/Utils/WS/Vhisie4/RequestHeader.cls.xml	(.../RequestHeader.cls.xml)	(revision 41305)
+++ vhTest/Utils/WS/Vhisie4/RequestHeader.cls.xml	(.../RequestHeader.cls.xml)	(revision 46643)
@@ -8,8 +8,8 @@
 <ReturnType>WS.Vhisie4.RequestHeader</ReturnType>
 <Implementation><![CDATA[
 	set Header = ##class(WS.Vhisie4.RequestHeader).%New()
-	set Header.KlantId = "K||1000"
-	set Header.GebruikerId = "K||1000||1"
+	set Header.KlantId = 1234
+	set Header.GebruikerId = "someone@example.com"
 	set Header.GebruikerIp = "127.0.0.1"
 	set Header.RequestId = "1234"
 	set Header.SessieId = "4567"
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r44518 -r46643
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 44518)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 46643)
@@ -171,6 +171,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+	set ..AankoopPrijs = 99
+	set ..VerkoopPrijs = 199
+]]></Implementation>
+</Method>
+
 <Method name="GeefAantal">
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r45886 -r46643
--- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 45886)
+++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 46643)
@@ -69,6 +69,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkSeefelder",SeefelderPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkVanHoecke",VanHoeckePersonality)
Index: APPS/EC/impl/ECommerceAPI.cls.xml
===================================================================
diff -u -r44518 -r46643
--- APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 44518)
+++ APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 46643)
@@ -100,6 +100,8 @@
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceDaro).%New()
 	} ElseIf (Personality.GeefID() = ..Personality.Hein) {
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHein).%New()
+	} ElseIf (Personality.GeefID() = ..Personality.Seefelder) {
+		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceSeefelder).%New()
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor Personality '" _ $Select($IsObject(Personality):Personality.GeefID(),1:"[geen object]") _ "' bestaat geen KlantInstellingenService."))
 	}
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder.cls.xml
===================================================================
diff -u -r46006 -r46643
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder.cls.xml	(.../ContactGegevensRegistreerder.cls.xml)	(revision 46006)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/ContactGegevensRegistreerder.cls.xml	(.../ContactGegevensRegistreerder.cls.xml)	(revision 46643)
@@ -38,6 +38,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PersonalityService">
+<Type>DOM.common.PersonalityService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository,KlantDataBewaarder:APPS.VKP.KlantDataBewaarder,WebshopVerwerkerBepaler:WSimpl.Vhisie4.SettingsManager.WebshopVerwerkerBepaler,KortingService:DOM.VKP.KortingService,KlantSessieDataBepaler:APPS.EC.KlantSessieDataBepaler,KlantDataBepaler:WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler</FormalSpec>
 <Private>1</Private>
@@ -51,6 +56,7 @@
 	Set ..KlantSessieDataBepaler = $$$Inject(KlantSessieDataBepaler,##class(APPS.EC.impl.KlantSessieDataBepaler).%New())
 	Set ..KlantDataBepaler = $$$Inject(KlantDataBepaler,##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.ContactGegevensRegistreerder.KlantDataBepaler).%New())
 	Set ..WebshopVerwerkerBepaler = $$$Inject(WebshopVerwerkerBepaler,##class(WSimpl.Vhisie4.SettingsManager.WebshopVerwerkerBepaler).%New())
+	Set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -78,13 +84,13 @@
 		Set KlantData.Gemeente = RegistreerContactGegevensRequest.Gemeente
 		Set KlantData.TelefoonNummer = RegistreerContactGegevensRequest.TelefoonNummer
 		Set KlantData.FaxNummer = RegistreerContactGegevensRequest.FaxNummer
-		Set KlantData.KlantId = HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.KlantId
+		Set:$$$HasLength(RegistreerContactGegevensRequest.KlantId) KlantData.KlantId = ..PersonalityService.GeefKlantIdViaKlantCode(HandelPersonality,RegistreerContactGegevensRequest.KlantId)
 		Set KlantData.GebruikerId = KlantData.KlantId_"_"_RegistreerContactGegevensRequest.GebruikerId
 		Set KlantData.KortingPercentage = RegistreerContactGegevensRequest.KortingPercentage
 		
 		Do ..BewaarKlant(HandelPersonality,KlantData)
 
-		Set Response.KlantId = ##class(TECH.StringUtils).Replace(KlantData.KlantId,HandelPersonality.GeefPrefix(),"")
+		Set Response.KlantId = ..PersonalityService.GeefKlantCodeViaKlantId(HandelPersonality,KlantData.KlantId)
 		Set Response.GebruikerId = RegistreerContactGegevensRequest.GebruikerId
 		Set Response.GebruikerNaam = ""
 		Set Response.KlantNaam = KlantData.Naam
@@ -133,7 +139,7 @@
 	Set KortingSpecificatie.Variant = Variant
 	Set KortingSpecificatie.PersonalityID = Personality.GeefID()
 	Set KortingSpecificatie.KlantID = KlantData.KlantId
-	Do ..KortingService.StelInKorting(KortingSpecificatie,KlantData.KortingPercentage)
+	Do ..KortingService.StelInKorting(KortingSpecificatie,+KlantData.KortingPercentage)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteKopieerder.cls.xml
===================================================================
diff -u -r45816 -r46643
--- APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteKopieerder.cls.xml	(.../KlantBestellingNaarLeverancierOfferteKopieerder.cls.xml)	(revision 45816)
+++ APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteKopieerder.cls.xml	(.../KlantBestellingNaarLeverancierOfferteKopieerder.cls.xml)	(revision 46643)
@@ -74,7 +74,7 @@
 <FormalSpec>GeconverteerdeOfferte:APPS.VKP.Offerte,Bestelling:APPS.VKP.Offerte</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If (Bestelling.GeefPersonalityID() '= ##class(DOM.common.enu.Personality).Hein()) {
+	If $$$Not((Bestelling.GeefPersonalityID() = ##class(DOM.common.enu.Personality).Hein()) || (Bestelling.GeefPersonalityID() = ##class(DOM.common.enu.Personality).Seefelder())) {
 		Do ..ExterneVerkoopService.StelInStandaardLeveradres(GeconverteerdeOfferte)
 	}
 ]]></Implementation>
Index: DOM/VKP/impl/SeefelderKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/SeefelderKlantData.cls.xml	(revision 0)
+++ DOM/VKP/impl/SeefelderKlantData.cls.xml	(revision 46643)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.SeefelderKlantData">
+<Super>DOM.VKP.impl.HandelKlantData</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+<Package name="DOM.VKP.impl" sqlname="DOM_VKP_impl"/>
+</Export>
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening/Test.cls.xml
===================================================================
diff -u -r44845 -r46643
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening/Test.cls.xml	(.../Test.cls.xml)	(revision 44845)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/StartVerpakkingBerekening/Test.cls.xml	(.../Test.cls.xml)	(revision 46643)
@@ -14,10 +14,10 @@
 	Do WinkelkarRepositoryMock.VerwachtMethodCall("GeefOfferteIDViaID","1").DanReturn("DummyOfferteId")
 	
 	Set CheckoutTypeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
-	Do CheckoutTypeBepalerMock.VerwachtMethodCall("Bepaal","1","K||1000" ).DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+	Do CheckoutTypeBepalerMock.VerwachtMethodCall("Bepaal","1","K||1234" ).DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
 
 	Set WinkelkarServiceHelperMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New()
-	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","K||1000","").DanReturn("K||1000")
+	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","1234",##class(DOM.common.enu.Personality).VanHoecke()).DanReturn("K||1234")
 	
 	Set StartVerpakkingBerekening = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.StartVerpakkingBerekening).%New(WinkelkarRepositoryMock, CheckoutTypeBepalerMock, TransportServiceMock, WinkelkarServiceHelperMock)
 	Do StartVerpakkingBerekening.StartVerpakkingBerekening(StartVerpakkingBerekeningRequest)
@@ -43,7 +43,7 @@
 	Do CheckoutTypeBepalerStub.IndienMethodCall("Bepaal","1",$$$ElkeWaarde).DanReturn(##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 	
 	Set WinkelkarServiceHelperMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New()
-	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","K||1000","").DanReturn("K||1000")
+	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefKlantPartijID","1234",##class(DOM.common.enu.Personality).VanHoecke()).DanReturn("K||1234")
 	
 	Set StartVerpakkingBerekening = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.StartVerpakkingBerekening).%New(WinkelkarRepositoryMock, CheckoutTypeBepalerStub, TransportServiceMock, WinkelkarServiceHelperMock)
 	Do StartVerpakkingBerekening.StartVerpakkingBerekening(StartVerpakkingBerekeningRequest)