Index: vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/EncryptDecryptKlantSessieData/Test.cls.xml
===================================================================
diff -u -r32199 -r36117
--- vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/EncryptDecryptKlantSessieData/Test.cls.xml	(.../Test.cls.xml)	(revision 32199)
+++ vhUnitTest/APPS/EC/impl/KlantSessieDataBepaler/EncryptDecryptKlantSessieData/Test.cls.xml	(.../Test.cls.xml)	(revision 36117)
@@ -81,14 +81,14 @@
 
 	Set KSD = ##class(APPS.EC.dto.KlantSessieData).%New()
 	Set KSD.Email = "haefele@belgie.be"
-	Set KSD.GebruikerID = "Heafele-Dummy"
+	Set KSD.GebruikerID = "Haefele-Dummy"
 	Set KSD.KlantID = "BE12345"
 	Set KSD.KlantNaam = "Haefele belgie"
 	Set KSD.Korting = "0"
 	Set KSD.Taal = "N"
 	
-	#dim VerwachteEncryptedKlantSessieData As %String = "CTi_8MYVag/7KwJPUmSWYKH21X29ICwOeYvkCJeWYHCzYgwd6ICqnW3luGXXDVI1wT0WmDbFdE5KOvagkdDRow--"
-
+	#dim VerwachteEncryptedKlantSessieData As %String = "CTi_8MYVag/7KwJPUmSWYKH21X29ICwOeYvkCJeWYHAQtmbW6GF52dRrTs35L4JKwT0WmDbFdE5KOvagkdDRow--"
+	
 	Do ..AssertEncryptDecryptKlantSessieData(KSD,DomeinVerwerker,VerwachteEncryptedKlantSessieData)
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/APPS/EC/WebshopSessionService.cls.xml
===================================================================
diff -u -r33393 -r36117
--- vhTest/Mock/APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33393)
+++ vhTest/Mock/APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 36117)
@@ -16,6 +16,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefDomein">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefDomein",PersonalityID)
+]]></Implementation>
+</Method>
+
 <Method name="GeefDomeinVerwerkerVoorPersonality">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("GeefDomeinVerwerkerVoorPersonality",PersonalityID)
@@ -56,12 +63,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefWebshopUrl">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWebshopUrl")
-]]></Implementation>
-</Method>
-
 <Method name="GeefWebshopUrlMetIngelogdeGebruiker">
 <FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData,GebruikerID:%String,Taal:DOM.enu.Taal</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: APPS/EC/impl/WebshopSessionService.cls.xml
===================================================================
diff -u -r33403 -r36117
--- APPS/EC/impl/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33403)
+++ APPS/EC/impl/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 36117)
@@ -55,22 +55,22 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefWebshopUrl">
-<FormalSpec>PersonalityID:DOM.common.enu.Personality=""</FormalSpec>
+<Method name="GeefDomein">
+<FormalSpec>PersonalityId:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.EC.Webshop.impl.UrlBepaler).%New().GeefUrl(PersonalityID)
+<Implementation><![CDATA[	Quit ##class(APPS.EC.Webshop.impl.UrlBepaler).%New().GeefUrl(PersonalityId)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefWebshopUrlMetIngelogdeGebruiker">
 <FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData,GebruikerID:%String,Taal:DOM.enu.Taal</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim URL As %String = ..GeefWebshopUrl()	
+	#dim Url As %String = ..GeefDomein()	
 	#dim DataOpt As %String = ..GeefDataOpt(RefSessieData, GebruikerID, Taal)
 	#dim EncryptedRef As %String = ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefEncryptedRefSessieData(RefSessieData)
 	
-	Quit URL _ "/login?Taal=" _ Taal _ "&REF=" _ EncryptedRef _ "&DATAOPT=" _ DataOpt
+	Quit Url _ "/login?Taal=" _ Taal _ "&REF=" _ EncryptedRef _ "&DATAOPT=" _ DataOpt
 ]]></Implementation>
 </Method>
 
Index: APPS/EC/WebshopSessionService.cls.xml
===================================================================
diff -u -r33393 -r36117
--- APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33393)
+++ APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 36117)
@@ -43,10 +43,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="GeefWebshopUrl">
+<Method name="GeefDomein">
 <Abstract>1</Abstract>
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefWebshopUrlMetIngelogdeGebruiker">
Index: WS/EC/WebshopSessionService.cls.xml
===================================================================
diff -u
--- WS/EC/WebshopSessionService.cls.xml	(revision 0)
+++ WS/EC/WebshopSessionService.cls.xml	(revision 36117)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.EC.WebshopSessionService">
+<Super>vhLib.WebService</Super>
+
+<Parameter name="SERVICENAME">
+<Default>WebshopSessionService</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://www.vanhoecke.be/WS/EC/Webshop</Default>
+</Parameter>
+
+<Property name="WebshopSessionService">
+<Type>APPS.EC.WebshopSessionService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..WebshopSessionService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GenereerRef">
+<Description><![CDATA[
+- <b>PersonalityId:</b> DOM.common.enu.Personality <br/>
+- <b>Modus:</b> APPS.EC.enu.WebshopModus <br/>]]></Description>
+<FormalSpec>PersonalityId:%String,Modus:%String="Normaal"</FormalSpec>
+<ReturnType>%String</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[
+	#dim DomeinVerwerker As APPS.EC.enu.UniShopVerwerker = ..WebshopSessionService.GeefDomeinVerwerkerVoorPersonality(PersonalityId)
+	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityId)
+	#dim RefSessieData As APPS.EC.dto.RefSessieData = ##class(APPS.EC.dto.RefSessieData).%New()
+	
+	Set RefSessieData.KlantID = Personality.GeefKlantID()
+	Set RefSessieData.Verwerker = DomeinVerwerker
+	Set RefSessieData.WebshopModus = Modus
+	
+	Quit ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefEncryptedRefSessieData(RefSessieData)
+]]></Implementation>
+</Method>
+
+<Method name="GenereerDataOpt">
+<Description><![CDATA[
+- <b>PersonalityId:</b> DOM.common.enu.Personality <br/>
+- <b>GebruikerId:</b> String <br/>
+- <b>Email:</b> String <br/>
+- <b>Taal:</b> DOM.enu.Taal <br/>]]></Description>
+<FormalSpec>PersonalityId:%String,GebruikerId:%String,Email:%String="ict_development@vanhoecke.be",Taal:%String="N"</FormalSpec>
+<ReturnType>%String</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityId)
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Personality.GeefKlantID()
+	#dim DomeinVerwerker As APPS.EC.enu.UniShopVerwerker = ..WebshopSessionService.GeefDomeinVerwerkerVoorPersonality(PersonalityId)
+	#dim KlantSessieDataBepaler As APPS.EC.KlantSessieDataBepaler = ##class(APPS.EC.impl.KlantSessieDataBepaler).%New()
+	#dim KlantSessieData As APPS.EC.dto.KlantSessieData = ##class(APPS.EC.dto.KlantSessieData).%New()
+	
+	Set KlantSessieData.Email = Email
+	Set KlantSessieData.GebruikerID = GebruikerId
+	Set KlantSessieData.KlantID = Personality.GeefKlantID()
+	Set KlantSessieData.KlantNaam = Personality.GeefNaam()
+	Set KlantSessieData.Korting = ""
+	Set KlantSessieData.Taal = Taal
+	
+	Quit KlantSessieDataBepaler.GeefEncryptedKlantSessieData(KlantSessieData, DomeinVerwerker)
+]]></Implementation>
+</Method>
+
+<Method name="GeefUrl">
+<Description><![CDATA[
+- <b>PersonalityId:</b> DOM.common.enu.Personality <br/>
+- <b>GebruikerId:</b> String <br/>
+- <b>Email:</b> String <br/>
+- <b>Taal:</b> DOM.enu.Taal <br/>
+- <b>Modus:</b> APPS.EC.enu.WebshopModus <br/>]]></Description>
+<FormalSpec>PersonalityId:%String,GebruikerId:%String,Email:%String="ict_development@vanhoecke.be",Taal:%String="N",Modus:%String="Normaal"</FormalSpec>
+<ReturnType>%String</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ..GeefDomein(PersonalityId) _ ..GenereerLoginQueryString(PersonalityId, GebruikerId, Email, Taal)
+]]></Implementation>
+</Method>
+
+<Method name="GeefDomein">
+<Description><![CDATA[
+- <b>PersonalityId:</b> DOM.common.enu.Personality <br/>]]></Description>
+<FormalSpec>PersonalityId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ..WebshopSessionService.GeefDomein(PersonalityId)
+]]></Implementation>
+</Method>
+
+<Method name="GenereerLoginQueryString">
+<FormalSpec>PersonalityId:%String,GebruikerId:%String,Email:%String="ict_development@vanhoecke.be",Taal:%String="N",Modus:%String="Normaal"</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "/login?TAAL=" _ Taal _ "&REF=" _ ..GenereerRef(PersonalityId, Modus) _ "&DATAOPT=" _ ..GenereerDataOpt(PersonalityId, GebruikerId, Email, Taal)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>