Index: APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml
===================================================================
diff -u -r55803 -r56115
--- APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 55803)
+++ APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 56115)
@@ -62,13 +62,8 @@
 		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 = Url_"/user/login?destination="_Taalcode_"/cart/orderview/"_Offerte.GeefExterneId()
-		} Else {
-			Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie)
-			Set Url = Url_"/user/login?destination="_Taalcode_"/cart/switch/"_Offerte.GeefExterneId()_"?destination="_Taalcode_"/cart"
-		}
+		Set Url = ..UrlBepaler.GeefUrl(Offerte.GeefOfferteVanHandel().GeefPersonalityID(), WebshopVersie)
+		Set Url = Url_"/user/login?destination="_Taalcode_"/cart/orderview/"_Offerte.GeefExterneId()
 	} Else {
 		Do ##class(TECH.Exceptions.IllegalUsageException).Throw("Url kan niet bepaald worden voor webshopversie '"_WebshopVersie_"' en personality '"_Personality.GeefNaam()_"'.")
 	}
@@ -121,16 +116,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="MoetOrderviewTonen">
-<FormalSpec>PersonalityId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	Quit:PersonalityId=##class(DOM.common.enu.Personality).Dupont() $$$False
-	Quit $$$True
-]]></Implementation>
-</Method>
-
 <Method name="ConverteerTaal">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Taal:DOM.enu.Taal</FormalSpec>
Index: vhTest/Mock/APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml
===================================================================
diff -u -r46241 -r56115
--- vhTest/Mock/APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 46241)
+++ vhTest/Mock/APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 56115)
@@ -8,6 +8,13 @@
 <Super>APPS.EC.Webshop.impl.OfferteUrlBepaler,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="%OnNew">
+<FormalSpec>UrlBepaler:APPS.EC.Webshop.impl.UrlBepaler</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefURL">
 <FormalSpec>Offerte:APPS.VKP.Offerte,Modus:APPS.EC.enu.WebshopModus</FormalSpec>
 <ReturnType>TECH.String</ReturnType>