Index: APPS/VKP/Offerte/OfferteRepository.cls.xml
===================================================================
diff -u -r33738 -r36838
--- APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 33738)
+++ APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 36838)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="APPS.VKP.Offerte.OfferteRepository">
 <Abstract>1</Abstract>
-<Super>TECH.Interface</Super>
+<Super>TECH.Persistentie.Repository</Super>
 </Class>
 
 
Index: APPS/EC/Verkoop/impl/Interne/VerkoopService.cls.xml
===================================================================
diff -u -r36785 -r36838
--- APPS/EC/Verkoop/impl/Interne/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 36785)
+++ APPS/EC/Verkoop/impl/Interne/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 36838)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.Verkoop.impl.Interne.VerkoopService">
-<Super>TECH.RegisteredObject</Super>
+<Super>APPS.EC.Verkoop.impl.VerkoopService,APPS.EC.Verkoop.InterneVerkoopService</Super>
 
 <Method name="AnnuleerIngaveIntern">
 <FormalSpec>Applicatie:APPS.common.dto.Applicatie,WinkelkarID:%String,ParameterID:%String</FormalSpec>
Index: APPS/EC/Verkoop/impl/OfferteHerberekenaar.cls.xml
===================================================================
diff -u -r36801 -r36838
--- APPS/EC/Verkoop/impl/OfferteHerberekenaar.cls.xml	(.../OfferteHerberekenaar.cls.xml)	(revision 36801)
+++ APPS/EC/Verkoop/impl/OfferteHerberekenaar.cls.xml	(.../OfferteHerberekenaar.cls.xml)	(revision 36838)
@@ -34,7 +34,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Vertaler:Res.Vertaling="",WinkelkarPrijsUpdater:APPS.EC.impl.WinkelkarPrijsUpdater="",ActieWijzigingenBepaler:APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening.ActieWijzigingenBepaler=""</FormalSpec>
+<FormalSpec>Vertaler:Res.Vertaling="",WinkelkarPrijsUpdater:APPS.EC.impl.WinkelkarPrijsUpdater="",ActieWijzigingenBepaler:APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening.ActieWijzigingenBepaler="",WinkelkarService:APPS.EC.Winkelkar.WinkelkarService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -45,7 +45,7 @@
 	set ..ActieWijzigingenBepaler = $$$Implementation(ActieWijzigingenBepaler,##class(APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening.ActieWijzigingenBepaler).%New())
 	set ..RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
 	set ..OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
-	Set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.ExterneWinkelkarService).%New()
+	Set ..WinkelkarService = $$$Inject(WinkelkarService,##class(APPS.EC.Winkelkar.impl.ExterneWinkelkarService).%New())
 
 	Quit $$$OK
 ]]></Implementation>
Index: APPS/EC/Verkoop/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r36788 -r36838
--- APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 36788)
+++ APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 36838)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.Verkoop.ExterneVerkoopService">
 <Abstract>1</Abstract>
-<Super>TECH.Interface</Super>
+<Super>APPS.EC.Verkoop.VerkoopService</Super>
 
 <Method name="GeefOfferteEnHerberekenIndienNodig">
 <Abstract>1</Abstract>
Index: vhTest/Mock/APPS/VKP/Offerte/OfferteRepository.cls.xml
===================================================================
diff -u -r33738 -r36838
--- vhTest/Mock/APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 33738)
+++ vhTest/Mock/APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 36838)
@@ -6,7 +6,7 @@
 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>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.VKP.Offerte.OfferteRepository,Tools.Mock.MockClassBase</Super>
+<Super>APPS.VKP.Offerte.OfferteRepository,vhTest.Mock.TECH.Persistentie.Repository</Super>
 <Inheritance>right</Inheritance>
 </Class>
 
Index: APPS/EC/Verkoop/impl/VerkoopService.cls.xml
===================================================================
diff -u -r36788 -r36838
--- APPS/EC/Verkoop/impl/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 36788)
+++ APPS/EC/Verkoop/impl/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 36838)
@@ -3,6 +3,41 @@
 <Class name="APPS.EC.Verkoop.impl.VerkoopService">
 <Super>TECH.RegisteredObject,APPS.EC.Verkoop.VerkoopService</Super>
 
+<Property name="OfferteService">
+<Type>APPS.VKP.OfferteService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WinkelkarService">
+<Type>APPS.EC.Winkelkar.WinkelkarService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WinkelkarRepository">
+<Type>DOM.EC.Winkelkar.impl.WinkelkarRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OfferteRepository">
+<Type>APPS.VKP.Offerte.impl.OfferteRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OfferteService:APPS.VKP.OfferteService,WinkelkarService:APPS.EC.Winkelkar.WinkelkarService,WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository,OfferteRepository:APPS.VKP.Offerte.impl.OfferteRepository</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..OfferteService = $$$Inject(OfferteService, ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
+	Set ..WinkelkarRepository = $$$Inject(WinkelkarRepository, ##class(DOM.EC.Winkelkar.impl.WinkelkarRepository).%New())
+	Set ..OfferteRepository = $$$Inject(OfferteRepository, ##class(APPS.VKP.Offerte.impl.OfferteRepository).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefOfferte">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>APPS.EC.dto.Offerte</ReturnType>
@@ -12,6 +47,16 @@
 
 <Method name="WisOfferte">
 <FormalSpec>OfferteID:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
+
+	If (Offerte.IsBesteld()) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidUserInputException).%New("De offerte '"_OfferteID_"' is reeds besteld, en mag daarom niet gewist worden."))	
+	} Else {
+		Do ..WinkelkarRepository.VerwijderViaID(Offerte.GeefWinkelkarID())
+		Do ..OfferteRepository.VerwijderViaID(OfferteID)
+	}
+]]></Implementation>
 </Method>
 </Class>
 
Index: APPS/EC/Verkoop/InterneVerkoopService.cls.xml
===================================================================
diff -u
--- APPS/EC/Verkoop/InterneVerkoopService.cls.xml	(revision 0)
+++ APPS/EC/Verkoop/InterneVerkoopService.cls.xml	(revision 36838)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Verkoop.InterneVerkoopService">
+<Super>APPS.EC.Verkoop.VerkoopService</Super>
+
+<Method name="AnnuleerIngaveIntern">
+<FormalSpec>Applicatie:APPS.common.dto.Applicatie,WinkelkarID:%String,ParameterID:%String</FormalSpec>
+</Method>
+
+<Method name="GeefParameters">
+<FormalSpec>ParameterID:%String</FormalSpec>
+<ReturnType>APPS.VKP.Maatwerk.dto.ConfiguratorParameters</ReturnType>
+</Method>
+
+<Method name="OpenParameters">
+<FormalSpec>ParameterID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.VKP.Maatwerk.impl.ConfiguratorParameters</ReturnType>
+</Method>
+
+<Method name="BestelWinkelkarIntern">
+<FormalSpec>Applicatie:APPS.common.dto.Applicatie,WinkelkarID:%String,DocumentType:APPS.VKP.Maatwerk.enu.DocumentType,DocumentID:%String</FormalSpec>
+</Method>
+
+<Method name="UpdateWinkelkarLijn">
+<FormalSpec>Applicatie:APPS.common.dto.Applicatie,WinkelkarID:%String,DocumentType:APPS.VKP.Maatwerk.enu.DocumentType,DocumentID:%String,LijnID:%String</FormalSpec>
+</Method>
+
+<Method name="VerwijderAdminSessieParametersMetWinkelkar">
+<FormalSpec>WinkelkarID:%String</FormalSpec>
+<Private>1</Private>
+</Method>
+
+<Method name="OpenWinkelkar">
+<FormalSpec>Applicatie:APPS.common.dto.Applicatie,WinkelkarID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.EC.Winkelkar.Winkelkar</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/VKP/Offerte/OfferteRepository.cls.xml
===================================================================
diff -u -r33748 -r36838
--- vhTest/Fake/APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 33748)
+++ vhTest/Fake/APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 36838)
@@ -5,6 +5,7 @@
 
 <Method name="GeefViaID">
 <FormalSpec>OfferteID:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
 <Implementation><![CDATA[
 	#dim Offerte AS vhTest.Fake.APPS.VKP.Offerte = ##class(vhTest.Fake.APPS.VKP.Offerte).%New()
 	Quit Offerte
Index: vhUnitTest/APPS/EC/Verkoop/impl/VerkoopService/WisOfferte.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EC/Verkoop/impl/VerkoopService/WisOfferte.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EC/Verkoop/impl/VerkoopService/WisOfferte.cls.xml	(revision 36838)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EC.Verkoop.impl.VerkoopService.WisOfferte">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="DummyOrderID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DummyDatum">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+ 	 Do ##super()
+ 	 Set ..DummyDatum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+ 	 Set ..DummyOrderID = "UT_12345"
+]]></Implementation>
+</Method>
+
+<Method name="Test: Offerte die reeds besteld is wissen">
+<Implementation><![CDATA[
+	#dim Offerte As vhTest.Fake.APPS.VKP.Offerte = ..GeefOfferte()
+	Do Offerte.ZetIsBesteld($$$True)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("De offerte 'DummyID' is reeds besteld, en mag daarom niet gewist worden.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(..E.InvalidUserInputException, Substrings))
+	
+	#dim OfferteServiceStub As vhTest.Mock.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",Offerte.GeefID()).DanReturn(Offerte)
+	
+	Set VerkoopService = ##class(APPS.EC.Verkoop.impl.VerkoopService).%New(OfferteServiceStub)
+	
+	Do VerkoopService.WisOfferte(Offerte.GeefID())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Offerte die nog niet besteld is wissen">
+<Implementation><![CDATA[
+	#dim Offerte As vhTest.Fake.APPS.VKP.Offerte = ..GeefOfferte()
+	Do Offerte.ZetIsBesteld($$$False)
+	
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",Offerte.GeefID()).DanReturn(Offerte)
+	
+	#dim WinkelkarRepositoryMock As vhTest.Mock.DOM.EC.Winkelkar.impl.WinkelkarRepository = ##class(vhTest.Mock.DOM.EC.Winkelkar.impl.WinkelkarRepository).%New()
+	Do WinkelkarRepositoryMock.VerwachtMethodCall("VerwijderViaID",Offerte.GeefWinkelkarID())
+	
+	#dim OfferteRepositoryMock As vhTest.Mock.APPS.VKP.Offerte.OfferteRepository = ##class(vhTest.Mock.APPS.VKP.Offerte.OfferteRepository).%New()
+	Do OfferteRepositoryMock.VerwachtMethodCall("VerwijderViaID",Offerte.GeefID())
+	
+	Set VerkoopService = ##class(APPS.EC.Verkoop.impl.VerkoopService).%New(OfferteServiceStub, ,WinkelkarRepositoryMock,OfferteRepositoryMock)
+	
+	Do VerkoopService.WisOfferte(Offerte.GeefID())
+	
+	Do WinkelkarRepositoryMock.Verifieer()
+	Do OfferteRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefOfferte">
+<Private>1</Private>
+<ReturnType>APPS.VKP.Offerte</ReturnType>
+<Implementation><![CDATA[
+	Set Offerte = ##class(vhTest.Fake.APPS.VKP.Offerte).%New()
+	Quit Offerte
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/BestelOfferte/TestSFS.cls.xml
===================================================================
diff -u -r36817 -r36838
--- vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/BestelOfferte/TestSFS.cls.xml	(.../TestSFS.cls.xml)	(revision 36817)
+++ vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/BestelOfferte/TestSFS.cls.xml	(.../TestSFS.cls.xml)	(revision 36838)
@@ -20,7 +20,7 @@
 	Set Offerte = ##class(APPS.VKP.impl.Offerte).OpenId(..OfferteIDenWinkelkarID.OfferteID)
 	Do $$$AssertTrue(Offerte.IsBesteld())
 	Do $$$AssertTrue(Offerte.GeefBestelDatum(),##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
-	Do $$$AssertFalse($L(Offerte.OrderID),"OrderID is nog niet ingevuld, dit gebeurd maar als OV de offerte importeerd.")
+	Do $$$AssertFalse($L(Offerte.OrderID),"OrderID is nog niet ingevuld, dit gebeurt maar als OV de offerte importeert.")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/APPS/VKP/Offerte.cls.xml
===================================================================
diff -u -r33991 -r36838
--- vhTest/Fake/APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 33991)
+++ vhTest/Fake/APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 36838)
@@ -16,6 +16,10 @@
 <Type>%Integer</Type>
 </Property>
 
+<Property name="IsBesteld">
+<Type>%Boolean</Type>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Personality:DOM.common.Personality=##class(DOM.common.VanHoeckePersonality).Instance(),AantalDagenPrijzenGeldig:%Integer=30</FormalSpec>
 <Private>1</Private>
@@ -27,6 +31,7 @@
 	Set ..AantalDagenPrijzenGeldig = AantalDagenPrijzenGeldig
 	Set ..DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
 	Set ..DocumentReferenties.OrderReferentie = "DummyOrderReferentie"
+	Set ..IsBesteld = $$$True
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -63,7 +68,7 @@
 
 <Method name="IsBesteld">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $$$True
+<Implementation><![CDATA[	Quit ..IsBesteld
 ]]></Implementation>
 </Method>
 
@@ -100,6 +105,12 @@
 <Method name="ZetLeverDatum">
 <FormalSpec>LeverDatum:%Date</FormalSpec>
 </Method>
+
+<Method name="ZetIsBesteld">
+<FormalSpec>Value:%Boolean</FormalSpec>
+<Implementation><![CDATA[	Set ..IsBesteld = Value
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml
===================================================================
diff -u -r36804 -r36838
--- APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 36804)
+++ APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 36838)
@@ -3,13 +3,8 @@
 <Class name="APPS.EC.Verkoop.impl.Externe.VerkoopService">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.RegisteredObject,APPS.EC.Verkoop.ExterneVerkoopService</Super>
+<Super>APPS.EC.Verkoop.impl.VerkoopService,APPS.EC.Verkoop.ExterneVerkoopService</Super>
 
-<Property name="OfferteService">
-<Type>APPS.VKP.OfferteService</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="OfferteHerberekening">
 <Type>APPS.EC.Verkoop.impl.OfferteHerberekenaar</Type>
 <Private>1</Private>
@@ -20,27 +15,22 @@
 <Private>1</Private>
 </Property>
 
-<Property name="WinkelkarService">
-<Type>APPS.EC.Winkelkar.WinkelkarService</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="Applicatie">
 <Type>APPS.common.dto.Applicatie</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService,WinkelkarService:APPS.EC.Winkelkar.WinkelkarService=""</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",WinkelkarService:APPS.EC.Winkelkar.WinkelkarService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Do ##super(OfferteService, WinkelkarService)
 	Set ..Applicatie = ..GeefApplicatie()
-	Set ..OfferteService = $$$Inject(OfferteService, ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
 	Set ..WinkelkarService = $$$Inject(WinkelkarService, ##class(APPS.EC.Winkelkar.impl.ExterneWinkelkarService).%New())
-	Set ..OfferteHerberekening = ##class(APPS.EC.Verkoop.impl.OfferteHerberekenaar).%New()
+	Set ..OfferteHerberekening = ##class(APPS.EC.Verkoop.impl.OfferteHerberekenaar).%New(,,,..WinkelkarService)
 	Set ..GeldigheidVermeldingBepaler = ##class(APPS.EC.Verkoop.impl.GeldigheidVermeldingBepaler).%New()
 	
 	Quit $$$OK
@@ -107,20 +97,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="WisOfferte">
-<FormalSpec>OfferteID:%String</FormalSpec>
-<Implementation><![CDATA[
-	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
-
-	If (Offerte.IsBesteld()) {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidUserInputException).%New("De offerte '"_OfferteID_"' is reeds besteld, en mag daarom niet gewist worden."))	
-	} Else {
-		Do ##class(DOM.EC.Winkelkar.Winkelkar).DeleteId( Offerte.WinkelkarID )
-		Do ##class(APPS.VKP.impl.Offerte).DeleteId( OfferteID )
-	}
-]]></Implementation>
-</Method>
-
 <Method name="GeefOfferteSamenvattingenVoorKlant">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>