Index: APPS/EC/Webshop/impl/UrlBepaler.cls.xml
===================================================================
diff -u -r46609 -r52184
--- APPS/EC/Webshop/impl/UrlBepaler.cls.xml	(.../UrlBepaler.cls.xml)	(revision 46609)
+++ APPS/EC/Webshop/impl/UrlBepaler.cls.xml	(.../UrlBepaler.cls.xml)	(revision 52184)
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.Webshop.impl.UrlBepaler">
-<Super>TECH.RegisteredObject,APPS.EC.Webshop.UrlBepaler</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="CommonApi">
 <Type>DOM.common.CommonAPI</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>CommonApi:DOM.common.CommonAPI</FormalSpec>
+<FormalSpec>CommonApi:DOM.common.CommonAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..CommonApi = $$$Inject(CommonApi,##class(DOM.DomeinContext).Instance().GeefCommonAPI())
+	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>
+<FormalSpec>PersonalityId:DOM.common.enu.Personality="",WebshopVersie:APPS.EC.enu.WebshopVersie=##class(APPS.EC.enu.WebshopVersie).V3()</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	if '$length(PersonalityID) set PersonalityID = ##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID()
+	If $$$Not($length(PersonalityId)) {
+		Set PersonalityId = ##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID()	
+	}
 	
-	quit ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_"_WebshopVersie_"_"_..CommonApi.GeefPersonality(PersonalityID).GeefCode())
+	Quit ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.EC.impl.Webshop.UrlBepaler_" _ WebshopVersie _ "_" _ ..CommonApi.GeefPersonality(PersonalityId).GeefCode())
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r52169 -r52184
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 52169)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 52184)
@@ -19,7 +19,7 @@
 </Property>
 
 <Property name="UrlBepaler">
-<Type>APPS.EC.Webshop.UrlBepaler</Type>
+<Type>APPS.EC.Webshop.impl.UrlBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -59,7 +59,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler="",HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository="",HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository="",WebshopSessionService:APPS.EC.WebshopSessionService="",LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder="",UrlBepaler:APPS.EC.Webshop.UrlBepaler="",HandelToegelatenLadetypesBepaler:DOM.VKP.impl.HandelToegelatenLadetypesBepaler="",KlantDataBewaarder:APPS.VKP.impl.KlantDataBewaarder="",KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",Logger:vhLib.Logger</FormalSpec>
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler="",HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository="",HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository="",WebshopSessionService:APPS.EC.WebshopSessionService="",LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder="",UrlBepaler:APPS.EC.Webshop.impl.UrlBepaler="",HandelToegelatenLadetypesBepaler:DOM.VKP.impl.HandelToegelatenLadetypesBepaler="",KlantDataBewaarder:APPS.VKP.impl.KlantDataBewaarder="",KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",Logger:vhLib.Logger</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
Index: vhTest/Fake/APPS/EC/Webshop/impl/UrlBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/EC/Webshop/impl/UrlBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/EC/Webshop/impl/UrlBepaler.cls.xml	(revision 52184)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.EC.Webshop.impl.UrlBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+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.impl.UrlBepaler</Super>
+
+<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[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 52184 refers to a dead (removed) revision in file `vhTest/Mock/APPS/EC/Webshop/UrlBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml
===================================================================
diff -u -r51948 -r52184
--- APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 51948)
+++ APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 52184)
@@ -4,7 +4,7 @@
 <Super>TECH.Mockable</Super>
 
 <Property name="UrlBepaler">
-<Type>APPS.EC.Webshop.UrlBepaler</Type>
+<Type>APPS.EC.Webshop.impl.UrlBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -24,13 +24,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>UrlBepaler:APPS.EC.Webshop.UrlBepaler</FormalSpec>
+<FormalSpec>UrlBepaler:APPS.EC.Webshop.impl.UrlBepaler</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..UrlBepaler = $$$Implementation(UrlBepaler, ##class(APPS.EC.Webshop.impl.UrlBepaler).%New())
+	Set ..UrlBepaler = $$$Inject(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()
+	Set ..WebshopService = ##class(APPS.EC.impl.WebshopService).%New()
+	Set ..RefSessieDataBepaler = ##class(APPS.EC.impl.RefSessieDataBepaler).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -51,29 +51,28 @@
 <ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = Offerte.GeefPersonality()
-
 	#dim WebshopVersie As APPS.EC.enu.WebshopVersie = Offerte.GeefWebshopVersie()
-	
 	#dim Url As TECH.String
 	
-	If WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V3() {
-		Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie)
+	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(){
 		#dim Taalcode As %String = ..ConverteerTaal(Personality.GeefTaal())
 		If ..MoetOrderviewTonen(Personality.GeefID())  {
-			Set Url = ..UrlBepaler.GeefUrl(Offerte.GeefOfferteVanHandel().GeefPersonalityID(),WebshopVersie)
+			Set Url = ..UrlBepaler.GeefUrl(Offerte.GeefOfferteVanHandel().GeefPersonalityID(), WebshopVersie)
 			Set Url = Url_"/user/login?destination="_Taalcode_"/cart/orderview/"_Offerte.GeefExterneId()
 		} Else {
 			Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie)
 			Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination="_Taalcode_"/cart"
 		}
 	} Else {
-		do ##class(TECH.Exceptions.IllegalUsageException).Throw("Url kan niet bepaald worden voor webshopversie '"_WebshopVersie_"' en personality '"_Personality.GeefNaam()_"'.")
+		Do ##class(TECH.Exceptions.IllegalUsageException).Throw("Url kan niet bepaald worden voor webshopversie '"_WebshopVersie_"' en personality '"_Personality.GeefNaam()_"'.")
 	}
+	
 	Quit Url
 ]]></Implementation>
 </Method>
FishEye: Tag 52184 refers to a dead (removed) revision in file `vhTest/Fake/APPS/EC/Webshop/UrlBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r51202 -r52184
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 51202)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 52184)
@@ -19,7 +19,7 @@
 </Property>
 
 <Property name="UrlBepalerStub">
-<Type>vhTest.Mock.APPS.EC.Webshop.UrlBepaler</Type>
+<Type>vhTest.Mock.APPS.EC.Webshop.impl.UrlBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -61,8 +61,8 @@
 	Set ..KlantData.ID = "5"
 	Set ..KlantData.Naam = "Een Naam"
 	
-	Set ..UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
-	Do ..UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
+	Set ..UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.impl.UrlBepaler).%New()
+	Do ..UrlBepalerStub.IndienMethodCall("GeefUrl", $$$ElkeWaarde).DanReturn("example.com")
 	
 	Set ..WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 	Set ..HandelPersonalityRepositoryDummy = ##class(vhTest.Dummy.DOM.common.impl.HandelPersonalityRepository).%New()
@@ -352,8 +352,7 @@
 	Set LoginParameterBepalerMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock, ..HandelKlantDataRepositoryDummy, HandelPersonalityRepositoryStub, ..WebshopSessionServiceDummy, ..KortingBewaarderStub, ..UrlBepalerStub,, KlantDataBewaarderStub)
-	
+	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock, ..HandelKlantDataRepositoryDummy, HandelPersonalityRepositoryStub, ..WebshopSessionServiceDummy, ..KortingBewaarderStub, ..UrlBepalerStub,, KlantDataBewaarderStub)
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertFalse(Response.IsGeldig)
@@ -370,14 +369,13 @@
 	Set ..DecrypteerRequestStub.Hostname = "eenFouteHostname"
 	Set ..DecrypteerRequestStub.Ref = ""
 	
-	Set LoginParameterBepalerMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
+	#dim LoginParameterBepalerMock As vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
-	Set UrlBepalerMock = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
+	#dim UrlBepalerMock As vhTest.Mock.APPS.EC.Webshop.impl.UrlBepaler = ##class(vhTest.Mock.APPS.EC.Webshop.impl.UrlBepaler).%New()
 	Do UrlBepalerMock.VerwachtMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com").ExactAantalKeer(0)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock, ..HandelKlantDataRepositoryDummy, ..HandelPersonalityRepositoryDummy, ..WebshopSessionServiceDummy, ..KortingBewaarderStub, UrlBepalerMock)
-	
+	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock, ..HandelKlantDataRepositoryDummy, ..HandelPersonalityRepositoryDummy, ..WebshopSessionServiceDummy, ..KortingBewaarderStub, UrlBepalerMock)
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do UrlBepalerMock.Verifieer()
FishEye: Tag 52184 refers to a dead (removed) revision in file `APPS/EC/Webshop/UrlBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhTest/Mock/APPS/EC/Webshop/impl/UrlBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/EC/Webshop/impl/UrlBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/EC/Webshop/impl/UrlBepaler.cls.xml	(revision 52184)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.EC.Webshop.impl.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</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.EC.Webshop.impl.UrlBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<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[	quit ..VerwerkMethodCall("GeefUrl",PersonalityId,WebshopVersie)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>