Index: APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml
===================================================================
diff -u -r46561 -r46609
--- APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 46561)
+++ APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 46609)
@@ -13,12 +13,24 @@
 <Private>1</Private>
 </Property>
 
+<Property name="WebshopService">
+<Type>APPS.EC.impl.WebshopService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RefSessieDataBepaler">
+<Type>APPS.EC.impl.RefSessieDataBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>UrlBepaler:APPS.EC.Webshop.UrlBepaler</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..UrlBepaler = $$$Implementation(UrlBepaler, ##class(APPS.EC.Webshop.impl.UrlBepaler).%New())
 	Set ..DomeinVerwerkerBepaler = ##class(APPS.EC.impl.DomeinVerwerkerBepaler).%New()
+	set ..WebshopService = ##class(APPS.EC.impl.WebshopService).%New()
+	set ..RefSessieDataBepaler = ##class(APPS.EC.impl.RefSessieDataBepaler).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -28,55 +40,55 @@
 <FormalSpec>Offerte:APPS.VKP.Offerte,Modus:APPS.EC.enu.WebshopModus</FormalSpec>
 <ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
-	#Dim URL As TECH.String = ""
-	
-	Set:(Modus = ##class(APPS.EC.enu.WebshopModus).AlleenLezen()) URL = ..GeefAlleenLezenURL(Offerte, Modus)
-	Set:(Modus = ##class(APPS.EC.enu.WebshopModus).Vrijgave()) URL = ..GeefVerwerkBestellingURL(Offerte, Modus)
-	
-	Quit URL
+	Quit:(Modus = ##class(APPS.EC.enu.WebshopModus).AlleenLezen()) ..GeefAlleenLezenUrl(Offerte, Modus)
+	Quit:(Modus = ##class(APPS.EC.enu.WebshopModus).Vrijgave()) ..GeefVerwerkBestellingUrl(Offerte, Modus)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAlleenLezenURL">
+<Method name="GeefAlleenLezenUrl">
 <FormalSpec>Offerte:APPS.VKP.Offerte,Modus:APPS.EC.enu.WebshopModus</FormalSpec>
 <Private>1</Private>
 <ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
-	#Dim Taal As TECH.String = Offerte.GeefPersonality().GeefTaal()
-	#Dim PersonalityID As DOM.common.enu.Personality = Offerte.GeefPersonality().GeefID()
-	
-	#Dim Ref As TECH.String = ..GeefRef(Offerte.GeefKlantID(), PersonalityID, Modus, Offerte.GeefID())
-	#Dim URL As TECH.String = ..UrlBepaler.GeefUrl(PersonalityID,Offerte.GeefWebshopVersie())
+	#dim Personality As DOM.common.Personality = Offerte.GeefPersonality()
 
-	Set URL = URL _ "/getofferte"	
-	Set URL = URL _ "?REF=" _ Ref
-	Set URL = URL _ "&DATAOPT="
+	#dim WebshopVersie As APPS.EC.enu.WebshopVersie = Offerte.GeefWebshopVersie()
 	
-	Set:($$$Not(Taal = "")) URL = URL _ "&Taal=" _ Taal
+	#dim Url As TECH.String
 	
-	If PersonalityID = ##class(DOM.common.enu.Personality).Hein() {
-		Set URL = "http://hein.website.testing.vanhoecke.be/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination=/cart"
+	if WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V3() {
+		Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie)
+		Set Url = Url _ "/getofferte"	
+		Set Url = Url _ "?REF=" _ ..GeefRef(Offerte.GeefKlantID(), Personality.GeefID(), Modus, Offerte.GeefID())
+		Set Url = Url _ "&DATAOPT="
+		Set:($$$Not(Personality.GeefTaal() = "")) Url = Url _ "&Taal=" _ Personality.GeefTaal()
+	} elseif WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V4(){
+		Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie)
+		Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination=/cart"	
+	} else {
+		do ##class(TECH.Exceptions.IllegalUsageException).Throw("Url kan niet bepaald worden voor webshopversie '"_WebshopVersie_"' en personality '"_Personality.GeefNaam()_"'.")
 	}
-		
-	Quit URL
+	Quit Url
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVerwerkBestellingURL">
+<Method name="GeefVerwerkBestellingUrl">
 <FormalSpec>Offerte:APPS.VKP.Offerte,Modus:APPS.EC.enu.WebshopModus</FormalSpec>
 <Private>1</Private>
 <ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
-	#Dim KlantID As DOM.VKP.VanHoeckeKlantID = Offerte.GeefPersonality().GeefKlantID()
-	#Dim Personality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
-	#Dim Ref As TECH.String = ..GeefRef(KlantID, Personality.GeefID(), Modus, Offerte.GeefID())	
-	#Dim URL As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("VhisieURL")
-
-	If Personality.GeefID() = ##class(DOM.common.enu.Personality).Hein() {
-		Set URL = "http://website.testing.vanhoecke.be/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination=/cart"
+	#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())	
+	} elseif WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V4() {
+		Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie)
+		Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination=/cart"
+	} else {
+		do ##class(TECH.Exceptions.IllegalUsageException).Throw("Url kan niet bepaald worden voor webshopversie '"_WebshopVersie_"' en personality '"_Personality.GeefNaam()_"'.")
 	}
-	
-	Quit URL _ "?REF=" _ Ref
+	Quit Url
 ]]></Implementation>
 </Method>
 
@@ -85,14 +97,14 @@
 <Private>1</Private>
 <ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
-	#Dim RefSessieData As APPS.EC.dto.RefSessieData = ##class(APPS.EC.dto.RefSessieData).%New()
+	Set RefSessieData = ##class(APPS.EC.dto.RefSessieData).%New()
 
 	Set RefSessieData.KlantID = KlantID
 	Set RefSessieData.Verwerker = ..DomeinVerwerkerBepaler.GeefDomeinVerwerker(PersonalityID)
 	Set RefSessieData.WebshopModus = Modus
 	Set RefSessieData.OfferteID = OfferteID
 	
-	Quit ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefEncryptedRefSessieData(RefSessieData)
+	Quit ..RefSessieDataBepaler.GeefEncryptedRefSessieData(RefSessieData)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EC/Webshop/UrlBepaler.cls.xml
===================================================================
diff -u -r32333 -r46609
--- APPS/EC/Webshop/UrlBepaler.cls.xml	(.../UrlBepaler.cls.xml)	(revision 32333)
+++ APPS/EC/Webshop/UrlBepaler.cls.xml	(.../UrlBepaler.cls.xml)	(revision 46609)
@@ -6,7 +6,7 @@
 
 <Method name="GeefUrl">
 <Abstract>1</Abstract>
-<FormalSpec>PersonalityID:DOM.common.enu.Personality=""</FormalSpec>
+<FormalSpec>PersonalityID:DOM.common.enu.Personality="",WebshopVersie:APPS.EC.enu.WebshopVersie</FormalSpec>
 <ReturnType>%String</ReturnType>
 </Method>
 </Class>
Index: APPS/EC/Webshop/impl/UrlBepaler.cls.xml
===================================================================
diff -u -r46561 -r46609
--- APPS/EC/Webshop/impl/UrlBepaler.cls.xml	(.../UrlBepaler.cls.xml)	(revision 46561)
+++ APPS/EC/Webshop/impl/UrlBepaler.cls.xml	(.../UrlBepaler.cls.xml)	(revision 46609)
@@ -1,96 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.Webshop.impl.UrlBepaler">
-<Super>DOM.common.PersonalityUnishopVisitor,APPS.EC.Webshop.UrlBepaler</Super>
+<Super>TECH.RegisteredObject,APPS.EC.Webshop.UrlBepaler</Super>
 
-<Property name="Url">
-<Type>%String</Type>
+<Property name="CommonApi">
+<Type>DOM.common.CommonAPI</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="WebshopVersie">
-<Type>APPS.EC.enu.WebshopVersie</Type>
+<Method name="%OnNew">
+<FormalSpec>CommonApi:DOM.common.CommonAPI</FormalSpec>
 <Private>1</Private>
-</Property>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..CommonApi = $$$Inject(CommonApi,##class(DOM.DomeinContext).Instance().GeefCommonAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
 
 <Method name="GeefUrl">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality="",WebshopVersie:APPS.EC.enu.WebshopVersie=##class(APPS.EC.enu.WebshopVersie).V3()</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set ..WebshopVersie = WebshopVersie
 	if '$length(PersonalityID) set PersonalityID = ##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID()
-	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)
-	Do Personality.Accept($this)
 	
-	Quit ..Url
+	quit ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_WebshopVersie_"_"_..CommonApi.GeefPersonality(PersonalityID).GeefCode())
 ]]></Implementation>
 </Method>
-
-<Method name="VerwerkSFS">
-<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_SFS")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkVanHoecke">
-<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_VanHoecke")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkVanHoeckeVoorHalux">
-<FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_VanHoecke")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkHaefeleBE">
-<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_HaefeleBE")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkHaefeleNL">
-<FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_HaefeleNL")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkDestil">
-<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_Destil")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkDupont">
-<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_Dupont")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkKisch">
-<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_Kisch")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkVanRaemdonck">
-<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_VanRaemdonck")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkDaro">
-<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_Daro")
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkHein">
-<FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..Url = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_..WebshopVersie_"_Hein")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/EC/Webshop/UrlBepaler.cls.xml
===================================================================
diff -u -r32330 -r46609
--- vhTest/Mock/APPS/EC/Webshop/UrlBepaler.cls.xml	(.../UrlBepaler.cls.xml)	(revision 32330)
+++ vhTest/Mock/APPS/EC/Webshop/UrlBepaler.cls.xml	(.../UrlBepaler.cls.xml)	(revision 46609)
@@ -3,16 +3,15 @@
 <Class name="vhTest.Mock.APPS.EC.Webshop.UrlBepaler">
 <Description>
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
-Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.EC.Webshop.UrlBepaler,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="GeefUrl">
-<FormalSpec>PersonalityID:DOM.common.enu.Personality=""</FormalSpec>
+<FormalSpec>PersonalityID:DOM.common.enu.Personality="",WebshopVersie:APPS.EC.enu.WebshopVersie</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefUrl",PersonalityID)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefUrl",PersonalityID,WebshopVersie)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml
===================================================================
diff -u -r46561 -r46609
--- vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml	(.../Test.cls.xml)	(revision 46561)
+++ vhUnitTest/APPS/EC/impl/OfferteUrlBepaler/AlleenLezen/Test.cls.xml	(.../Test.cls.xml)	(revision 46609)
@@ -99,7 +99,7 @@
 	Do OfferteMock.IndienMethodCall("GeefKlantID").DanReturn(KlantID)
 	Do OfferteMock.IndienMethodCall("GeefID").DanReturn(1234)
 	Do OfferteMock.IndienMethodCall("GeefPersonality").DanReturn(##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID))
-	Do OfferteMock.IndienMethodCall("GeefWebshopVersie").DanReturn("V3")
+	Do OfferteMock.IndienMethodCall("GeefWebshopVersie").DanReturn(##class(APPS.EC.enu.WebshopVersie).V3())
 	
 	#Dim URL As TECH.String = ..OfferteUrlBepaler.GeefURL(OfferteMock, ##class(APPS.EC.enu.WebshopModus).AlleenLezen())