Index: vhUnitTest/WS/EC/TestInterneWinkelkarService.cls.xml
===================================================================
diff -u -r33279 -r33393
--- vhUnitTest/WS/EC/TestInterneWinkelkarService.cls.xml	(.../TestInterneWinkelkarService.cls.xml)	(revision 33279)
+++ vhUnitTest/WS/EC/TestInterneWinkelkarService.cls.xml	(.../TestInterneWinkelkarService.cls.xml)	(revision 33393)
@@ -28,7 +28,7 @@
 	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
 	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	
-	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
 	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 ]]></Implementation>
 </Method>
Index: APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml
===================================================================
diff -u -r33392 -r33393
--- APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 33392)
+++ APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 33393)
@@ -28,6 +28,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="WebshopModus">
+<Type>APPS.EC.enu.WebshopModus.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>VerkoopPrijsBepaler:APPS.EC.VerkoopPrijsBepaler=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
@@ -51,49 +56,55 @@
 		#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)
 			
 		Do Personality.Accept(##this)
+		Do ..PasAanPrijzen(..WebshopSessionService.GeefSessie(..SessieID))
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkSFS">
-<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
+<Method name="PasAanPrijzen">
+<FormalSpec>Sessie:APPS.EC.WebshopSessie</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim SFSWebshopSessie As APPS.EC.impl.SFSWebshopSessie = ..WebshopSessionService.GeefHandelSessie(..SessieID)	
-	If (SFSWebshopSessie.GeefWebshopModus() = ##class(APPS.EC.enu.WebshopModus).FictievePrijs()) && (..WinkelkarLijn.%Extends(##class(APPS.EC.Winkelkar.dto.MaatwerkLijn).%ClassName(1)) ){
-		#Dim MaatwerkLijn As APPS.EC.Winkelkar.dto.MaatwerkLijn = ..WinkelkarLijn
-		Set MaatwerkLijn.EenheidPrijs = 99.99
-		Set MaatwerkLijn.TotaalPrijs = 99.99
+	If (Sessie.GeefWebshopModus() = ..WebshopModus.AdviesPrijs) {
+		Do ..ZetAdviesPrijs()	
+	} ElseIf ((Sessie.GeefWebshopModus() = ..WebshopModus.FictievePrijs) && (..WinkelkarLijn.%Extends(##class(APPS.EC.Winkelkar.dto.MaatwerkLijn).%ClassName($$$True)))) {
+		Do ..ZetFictievePrijs()	
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkHaefeleBE">
-<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
-</Method>
-
-<Method name="VerwerkVanHoecke">
-<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+<Method name="ZetAdviesPrijs">
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim VanHoeckeWebshopSessie As APPS.EC.VanHoeckeWebshopSessie = ..WebshopSessionService.GeefVanHoeckeSessie(..SessieID)	
-	Do ..ZetAdviesPrijsIndienNodig(VanHoeckeWebshopSessie.GeefWebshopModus())
+	#dim AdviesPrijsInstellenOpWinkelkar As APPS.EC.Winkelkar.impl.AdviesPrijsInstellenOpWinkelkar = ##class(APPS.EC.Winkelkar.impl.AdviesPrijsInstellenOpWinkelkar).%New(..KlantID, ..VerkoopPrijsBepaler)
+	Do AdviesPrijsInstellenOpWinkelkar.StelInAdviesPrijs(..WinkelkarLijn)
 ]]></Implementation>
 </Method>
 
-<Method name="ZetAdviesPrijsIndienNodig">
-<FormalSpec>WebshopModus:APPS.EC.enu.WebshopModus</FormalSpec>
+<Method name="ZetFictievePrijs">
 <Private>1</Private>
 <Implementation><![CDATA[
-	If WebshopModus = ##class(APPS.EC.enu.WebshopModus).AdviesPrijs() {
-		Set AdviesPrijsInstellenOpWinkelkar = ##class(APPS.EC.Winkelkar.impl.AdviesPrijsInstellenOpWinkelkar).%New(..KlantID,..VerkoopPrijsBepaler)
-		Do AdviesPrijsInstellenOpWinkelkar.StelInAdviesPrijs(..WinkelkarLijn)
-	}
+	#dim MaatwerkLijn As APPS.EC.Winkelkar.dto.MaatwerkLijn = ..WinkelkarLijn
+	
+	Set MaatwerkLijn.EenheidPrijs = 99.99
+	Set MaatwerkLijn.TotaalPrijs = 99.99
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkSFS">
+<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleBE">
+<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkVanHoecke">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkVanHoeckeVoorHalux">
 <FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkVanHoecke(VanHoeckVoorHaluxPersonality)
-]]></Implementation>
 </Method>
 
 <Method name="VerwerkDestil">
Index: vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml
===================================================================
diff -u -r33337 -r33393
--- vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml	(.../Base.cls.xml)	(revision 33337)
+++ vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml	(.../Base.cls.xml)	(revision 33393)
@@ -146,9 +146,8 @@
 	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	
 	Do WebshopSessionServiceStub.IndienMethodCall("GeefWebshopModus").DanReturn(##class(APPS.EC.enu.WebshopModus).Normaal())
-	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", $$$DummySessieID).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
-	Do WebshopSessionServiceStub.IndienMethodCall("GeefSFSSessie", "").DanReturn(##class(APPS.EC.impl.SFSWebshopSessie).%New($$$DummyString))
-	Do WebshopSessionServiceStub.IndienMethodCall("BestaatWebshopSessie", $$$DummySessieID).DanReturn(1)
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefSessie", $$$DummySessieID).DanReturn(##class(APPS.EC.impl.WebshopSessie).%New($$$DummyString))
+	Do WebshopSessionServiceStub.IndienMethodCall("BestaatWebshopSessie", $$$DummySessieID).DanReturn($$$True)
 	
 	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 
Index: APPS/EC/impl/WebshopSessionService.cls.xml
===================================================================
diff -u -r33392 -r33393
--- APPS/EC/impl/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33392)
+++ APPS/EC/impl/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33393)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.impl.WebshopSessionService">
-<Super>TECH.Mockable,APPS.EC.WebshopSessionService</Super>
+<Super>TECH.RegisteredObject,APPS.EC.WebshopSessionService</Super>
 
 <Method name="Login">
 <FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters</FormalSpec>
@@ -24,20 +24,13 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVanHoeckeSessie">
+<Method name="GeefSessie">
 <FormalSpec>SessieID:%String</FormalSpec>
-<ReturnType>APPS.EC.VanHoeckeWebshopSessie</ReturnType>
+<ReturnType>APPS.EC.WebshopSessie</ReturnType>
 <Implementation><![CDATA[	Quit ##class(APPS.EC.impl.WebshopSessie).OpenId(SessieID)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefHandelSessie">
-<FormalSpec>SessieID:%String</FormalSpec>
-<ReturnType>APPS.EC.HandelWebshopSessie</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.EC.impl.WebshopSessie).OpenId(SessieID)
-]]></Implementation>
-</Method>
-
 <Method name="GeefPersonalityIDVoorDomeinVerwerker">
 <FormalSpec>DomeinVerwerker:APPS.EC.enu.WebShopVerwerker</FormalSpec>
 <ReturnType>DOM.common.enu.Personality</ReturnType>
Index: APPS/EC/WebshopSessionService.cls.xml
===================================================================
diff -u -r33392 -r33393
--- APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33392)
+++ APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33393)
@@ -24,19 +24,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="GeefVanHoeckeSessie">
+<Method name="GeefSessie">
 <Abstract>1</Abstract>
 <FormalSpec>SessieID:%String</FormalSpec>
-<ReturnType>APPS.EC.VanHoeckeWebshopSessie</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<ReturnType>APPS.EC.WebshopSessie</ReturnType>
 </Method>
 
-<Method name="GeefHandelSessie">
-<Abstract>1</Abstract>
-<FormalSpec>SessieID:%String</FormalSpec>
-<ReturnType>APPS.EC.HandelWebshopSessie</ReturnType>
-</Method>
-
 <Method name="GeefWebshopModus">
 <Abstract>1</Abstract>
 <ReturnType>APPS.EC.enu.WebshopModus</ReturnType>
FishEye: Tag 33393 refers to a dead (removed) revision in file `vhTest/Mock/APPS/EC/impl/WebshopSessionService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhTest/Mock/APPS/EC/WebshopSessionService.cls.xml
===================================================================
diff -u -r33392 -r33393
--- vhTest/Mock/APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33392)
+++ vhTest/Mock/APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33393)
@@ -22,24 +22,17 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefHandelSessie">
-<FormalSpec>SessieID:%String</FormalSpec>
-<ReturnType>APPS.EC.HandelWebshopSessie</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefHandelSessie",SessieID)
-]]></Implementation>
-</Method>
-
 <Method name="GeefPersonalityIDVoorDomeinVerwerker">
 <FormalSpec>DomeinVerwerker:APPS.EC.enu.WebShopVerwerker</FormalSpec>
 <ReturnType>DOM.common.enu.Personality</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPersonalityIDVoorDomeinVerwerker",DomeinVerwerker)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVanHoeckeSessie">
+<Method name="GeefSessie">
 <FormalSpec>SessieID:%String</FormalSpec>
-<ReturnType>APPS.EC.VanHoeckeWebshopSessie</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVanHoeckeSessie",SessieID)
+<ReturnType>APPS.EC.WebshopSessie</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefSessie",SessieID)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml
===================================================================
diff -u -r33279 -r33393
--- vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml	(.../TestVanHoecke.cls.xml)	(revision 33279)
+++ vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml	(.../TestVanHoecke.cls.xml)	(revision 33393)
@@ -65,7 +65,7 @@
 	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
 	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	
-	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
 	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 		
 	#dim MailAPI As vhUnitTest.TECH.Mail.impl.MailAPIMock = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).MockInstance()
Index: vhUnitTest/APPS/VKP/TestVerkoopService.cls.xml
===================================================================
diff -u -r33279 -r33393
--- vhUnitTest/APPS/VKP/TestVerkoopService.cls.xml	(.../TestVerkoopService.cls.xml)	(revision 33279)
+++ vhUnitTest/APPS/VKP/TestVerkoopService.cls.xml	(.../TestVerkoopService.cls.xml)	(revision 33393)
@@ -16,7 +16,7 @@
 	#dim WebshopSessionServiceStub = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
 	
-	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(VanHoeckeWebshopSessie)		
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(VanHoeckeWebshopSessie)
 	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 	
 	Set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
Index: vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestHandel.cls.xml
===================================================================
diff -u -r32363 -r33393
--- vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestHandel.cls.xml	(.../TestHandel.cls.xml)	(revision 32363)
+++ vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestHandel.cls.xml	(.../TestHandel.cls.xml)	(revision 33393)
@@ -49,10 +49,12 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
-	#dim ECommerceAPIMock As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
-	Set WebshopSessionServiceFake = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
-	Do WebshopSessionServiceFake.IndienMethodCall("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
-	Do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
+	
+	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()
+	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 ]]></Implementation>
 </Method>
 
@@ -81,7 +83,7 @@
 	Set SFSFictievePrijsSessie = ##class(APPS.EC.impl.SFSWebshopSessie).%New( $$$DummyString )
 	Do SFSFictievePrijsSessie.ZetWebshopModus( ##class(APPS.EC.enu.WebshopModus).FictievePrijs() )
 	#Dim WebshopSessionServiceFake As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService()
-	Do WebshopSessionServiceFake.IndienMethodCall( "GeefSFSSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID() ).DanReturn( SFSFictievePrijsSessie )
+	Do WebshopSessionServiceFake.IndienMethodCall( "GeefHandelSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID() ).DanReturn( SFSFictievePrijsSessie )
 	Do WebshopSessionServiceFake.IndienMethodCall( "BestaatWebshopSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID() ).DanReturn( 1 )
 	
 	#dim Lijn As DOM.EC.Winkelkar.MaatwerkLijn = ##class(DOM.EC.Winkelkar.MaatwerkLijn).%New()
Index: APPS/EC/enu/WebshopModus/AutoComplete.cls.xml
===================================================================
diff -u
--- APPS/EC/enu/WebshopModus/AutoComplete.cls.xml	(revision 0)
+++ APPS/EC/enu/WebshopModus/AutoComplete.cls.xml	(revision 33393)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.enu.WebshopModus.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="AdviesPrijs">
+<Type>APPS.EC.enu.WebshopModus</Type>
+<InitialExpression>"AdviesPrijs"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="AlleenLezen">
+<Type>APPS.EC.enu.WebshopModus</Type>
+<InitialExpression>"AlleenLezen"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="FictievePrijs">
+<Type>APPS.EC.enu.WebshopModus</Type>
+<InitialExpression>"FictievePrijs"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="Normaal">
+<Type>APPS.EC.enu.WebshopModus</Type>
+<InitialExpression>"Normaal"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="Tandembox">
+<Type>APPS.EC.enu.WebshopModus</Type>
+<InitialExpression>"START"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="Vrijgave">
+<Type>APPS.EC.enu.WebshopModus</Type>
+<InitialExpression>"Vrijgave"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/EC/impl/WebshopSessie.cls.xml
===================================================================
diff -u -r29059 -r33393
--- APPS/EC/impl/WebshopSessie.cls.xml	(.../WebshopSessie.cls.xml)	(revision 29059)
+++ APPS/EC/impl/WebshopSessie.cls.xml	(.../WebshopSessie.cls.xml)	(revision 33393)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.impl.WebshopSessie">
-<Abstract>1</Abstract>
 <ClassType>persistent</ClassType>
 <Super>TECH.Persistent,APPS.EC.WebshopSessie</Super>
 
FishEye: Tag 33393 refers to a dead (removed) revision in file `vhTest/Fake/APPS/EC/impl/WebshopSessionService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/EC/enu/WebshopModus.cls.xml
===================================================================
diff -u -r29059 -r33393
--- APPS/EC/enu/WebshopModus.cls.xml	(.../WebshopModus.cls.xml)	(revision 29059)
+++ APPS/EC/enu/WebshopModus.cls.xml	(.../WebshopModus.cls.xml)	(revision 33393)
@@ -3,7 +3,7 @@
 <Class name="APPS.EC.enu.WebshopModus">
 <ClassType>datatype</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%String</Super>
+<Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
 <Default>,Normaal,AdviesPrijs,AlleenLezen,START,Vrijgave,FictievePrijs</Default>
@@ -15,37 +15,42 @@
 
 <Method name="AdviesPrijs">
 <ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebshopModus</ReturnType>
 <Implementation><![CDATA[	Quit "AdviesPrijs"
 ]]></Implementation>
 </Method>
 
 <Method name="Normaal">
 <ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebshopModus</ReturnType>
 <Implementation><![CDATA[	Quit "Normaal"
 ]]></Implementation>
 </Method>
 
 <Method name="AlleenLezen">
 <ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebshopModus</ReturnType>
 <Implementation><![CDATA[	Quit "AlleenLezen"
 ]]></Implementation>
 </Method>
 
 <Method name="Tandembox">
 <ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebshopModus</ReturnType>
 <Implementation><![CDATA[	Quit "START"
 ]]></Implementation>
 </Method>
 
 <Method name="Vrijgave">
 <ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebshopModus</ReturnType>
 <Implementation><![CDATA[	Quit "Vrijgave"
 ]]></Implementation>
 </Method>
 
 <Method name="FictievePrijs">
 <ClassMethod>1</ClassMethod>
-<ReturnType>%String</ReturnType>
+<ReturnType>APPS.EC.enu.WebshopModus</ReturnType>
 <Implementation><![CDATA[	Quit "FictievePrijs"
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/EC/TestInterneVerkoopService.cls.xml
===================================================================
diff -u -r33337 -r33393
--- vhUnitTest/APPS/EC/TestInterneVerkoopService.cls.xml	(.../TestInterneVerkoopService.cls.xml)	(revision 33337)
+++ vhUnitTest/APPS/EC/TestInterneVerkoopService.cls.xml	(.../TestInterneVerkoopService.cls.xml)	(revision 33393)
@@ -24,15 +24,15 @@
 <Implementation><![CDATA[
 	Do ##super(aTestName)
 	
-	#Dim ECommerceAPIMock As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
-	#Dim WebshopSessionServiceFake As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
+	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetTaal("N")
 
-	Do WebshopSessionServiceFake.IndienMethodCall("GeefWebshopModus").DanReturn(##class(APPS.EC.enu.WebshopModus).Normaal())
-	Do WebshopSessionServiceFake.IndienMethodCall("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefWebshopModus").DanReturn(##class(APPS.EC.enu.WebshopModus).Normaal())
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
 	
-	Do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
+	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml
===================================================================
diff -u -r33279 -r33393
--- vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml	(.../Base.cls.xml)	(revision 33279)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml	(.../Base.cls.xml)	(revision 33393)
@@ -41,7 +41,7 @@
 	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
 	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	
-	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
 	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 ]]></Implementation>
 </Method>
Index: APPS/EC/enu/WebshopModus/Verwerker.cls.xml
===================================================================
diff -u
--- APPS/EC/enu/WebshopModus/Verwerker.cls.xml	(revision 0)
+++ APPS/EC/enu/WebshopModus/Verwerker.cls.xml	(revision 33393)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.enu.WebshopModus.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>WebshopModus:APPS.EC.enu.WebshopModus</FormalSpec>
+<Implementation><![CDATA[
+	If WebshopModus = "AdviesPrijs" {
+		Do ..VerwerkAdviesPrijs()
+	} ElseIf WebshopModus = "AlleenLezen" {
+		Do ..VerwerkAlleenLezen()
+	} ElseIf WebshopModus = "FictievePrijs" {
+		Do ..VerwerkFictievePrijs()
+	} ElseIf WebshopModus = "Normaal" {
+		Do ..VerwerkNormaal()
+	} ElseIf WebshopModus = "START" {
+		Do ..VerwerkTandembox()
+	} ElseIf WebshopModus = "Vrijgave" {
+		Do ..VerwerkVrijgave()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(WebshopModus,"APPS.EC.enu.WebshopModus",$classname())
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAdviesPrijs">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlleenLezen">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkFictievePrijs">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkNormaal">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkTandembox">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkVrijgave">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>