Index: APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml
===================================================================
diff -u -r50940 -r50952
--- APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml	(.../OfferteBesteller.cls.xml)	(revision 50940)
+++ APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml	(.../OfferteBesteller.cls.xml)	(revision 50952)
@@ -23,8 +23,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PubSubApi">
+<Type>TECH.PubSub.PubSubAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService="",KlantInstellingenService:APPS.common.impl.KlantInstellingenService="",OfferteVoorBestellingValidator:APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator="",WinkelkarControleur:APPS.EC.Winkelkar.WinkelkarControleur="",BestelStatusUpdater:APPS.VKP.Offerte.BestelStatusUpdater=""</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",KlantInstellingenService:APPS.common.impl.KlantInstellingenService="",OfferteVoorBestellingValidator:APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator="",WinkelkarControleur:APPS.EC.Winkelkar.WinkelkarControleur="",BestelStatusUpdater:APPS.VKP.Offerte.BestelStatusUpdater="",PubSubApi:TECH.PubSub.PubSubAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -34,6 +39,7 @@
 	Set ..OfferteVoorBestellingValidator = $$$Inject(OfferteVoorBestellingValidator, ##class(APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New())
 	Set ..WinkelkarControleur = $$$Inject(WinkelkarControleur, ##class(APPS.EC.Winkelkar.impl.WinkelkarControleur).%New(KlantInstellingenService))
 	Set ..BestelStatusUpdater = $$$Inject(BestelStatusUpdater, ..OfferteService.GeefBestelStatusUpdater())
+	Set ..PubSubApi = $$$Inject(PubSubApi, ##class(TECH.PubSub.impl.PubSubAPI).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -44,26 +50,24 @@
 <Implementation><![CDATA[
 	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
 	
-	Set KlantID = Offerte.GeefKlantID()
-	
 	Try {	
 		Do ..OfferteVoorBestellingValidator.Valideer(Offerte, KlantID, PersonalityID)
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		If $$$Not( Exception.%Extends(##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%ClassName(1)) && Offerte.IsVhisie4()) {
 			Do ##class(TECH.ExceptionHandler).Throw(Exception)
 		} Else {
-			Do ##class(vhLib.Logger).%New().WarningMail("Offerte met vervallen prijzen wordt besteld.", Exception.ToString())
+			Do ##class(vhLib.Logger).%New().WarningMail("De prijzen van de offerte zijn vervallen. De offerte wordt toch besteld.", Exception.ToString())
 		}
 	}	
 
 	Do ..WinkelkarControleur.ControleerWinkelkarViaID(Offerte.GeefWinkelkarID())
 	Do ..BestelStatusUpdater.ZetStatusBesteld(Offerte)
 	
-	Set EventData = ##class(APPS.VKP.event.OfferteBesteldEventData).%New(OfferteID)
-	Set Event = ##class(APPS.VKP.event.OfferteBesteldEvent).%New(EventData)
+	#dim EventData As APPS.VKP.event.OfferteBesteldEventData = ##class(APPS.VKP.event.OfferteBesteldEventData).%New(OfferteID)
+	#dim Event As TECH.PubSub.Event = ##class(APPS.VKP.event.OfferteBesteldEvent).%New(EventData)
 	
-	Do ##class(TECH.Context).Instance().GeefPubSubAPI().GeefEventRaiser().RaiseEventSync(Event)
+	Do ..PubSubApi.GeefEventRaiser().RaiseEventSync(Event)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r50940 -r50952
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 50940)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 50952)
@@ -38,15 +38,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="CommonApi">
+<Type>DOM.common.CommonAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler=""</FormalSpec>
+<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler="",CommonApi:DOM.common.CommonAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..WinkelkarService = $$$Inject(WinkelkarService, ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
 	Set ..CheckoutTypeBepaler = $$$Inject(CheckoutTypeBepaler,##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New())
+	Set ..CommonApi = $$$Inject(CommonApi, ##class(DOM.common.impl.CommonAPI).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -61,7 +67,7 @@
 	Set ..PersonalityID = PersonalityID
 	Set ..Meldingen = ##class(%ListOfObjects).%New()
 	
-	#dim Personality AS DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)	
+	#dim Personality AS DOM.common.Personality = ..CommonApi.GeefPersonality(PersonalityID)	
 	Do Personality.Accept($this)
 	
 	Quit (..Meldingen.Count() = 0)
Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml
===================================================================
diff -u -r50940 -r50952
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml	(.../Test.cls.xml)	(revision 50940)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml	(.../Test.cls.xml)	(revision 50952)
@@ -3,55 +3,79 @@
 <Class name="vhUnitTest.APPS.EC.impl.ExterneVerkoopService.OfferteBesteller.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="OnAfterOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	Do ##class(vhTest.Dummy.TECH.PubSub.impl.PubSubAPI).MockInstance()
-]]></Implementation>
-</Method>
-
 <Method name="Test: BestelOfferte geeft foutmelding offerte">
 <Implementation><![CDATA[
-	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteMock.IndienMethodCall("GeefKlantID").DanReturn("DummyKlantID")
+	#dim RandomOfferteId As %String = "RandomOfferteId"
+	#dim RandomKlantId As %String = "RandomKlantId"
+	#dim RandomPersonalityId As %String = "RandomPersonalityId"
 	
-	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", $$$ElkeWaarde).DanReturn(OfferteMock)
-	Do OfferteServiceMock.IndienMethodCall("GeefBestelStatusUpdater").DanReturn("")
+	#dim OfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn(RandomKlantId)
 	
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte", RandomOfferteId).DanReturn(OfferteStub)
+	
 	#dim OfferteVoorBestellingValidatorStub As vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator = ##class(vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New()
-	Do OfferteVoorBestellingValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException($$$DummyException)
+	Do OfferteVoorBestellingValidatorStub.IndienMethodCall("Valideer", OfferteStub, RandomKlantId, RandomPersonalityId).DanException($$$DummyException)
 	
 	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyException")
-	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
 
-	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock, "", OfferteVoorBestellingValidatorStub)
-	Do OfferteBesteller.BestelOfferte("DummyOfferteID","DummyKlantID", "DummyPersonalityID")
+	#dim BestelStatusUpdaterStub As vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater = ##class(vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater).%New()
+
+	#dim OfferteBesteller As APPS.EC.impl.ExterneVerkoopService.OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceStub, "", OfferteVoorBestellingValidatorStub, "", BestelStatusUpdaterStub)
+	Do OfferteBesteller.BestelOfferte(RandomOfferteId, RandomKlantId, RandomPersonalityId)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Ongeldige vhisie4 offerte geeft geen foutmelding">
+<Method name="Test: Vhisie4 offerte met vervallen prijzen wordt toch verwerkt">
 <Implementation><![CDATA[
-	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteMock.IndienMethodCall("GeefKlantID").DanReturn("DummyKlantID")
-	Do OfferteMock.IndienMethodCall("GeefWinkelkarID").DanReturn("DummyWinkelkarID")
+	#dim RandomOfferteId As %String = "RandomOfferteId"
+	#dim RandomKlantId As %String = "RandomKlantId"
+	#dim RandomPersonalityId As %String = "RandomPersonalityId"
+	#dim RandomPersonality As DOM.common.Personality = ##class(DOM.common.HeinPersonality).Instance()
+	#dim RandomWinkelkarId As %String = "RandomWinkelkarId"
 	
-	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", $$$ElkeWaarde).DanReturn(OfferteMock)
-	Do OfferteServiceMock.IndienMethodCall("GeefBestelStatusUpdater").DanReturn("")
+	#dim OfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteStub.IndienMethodCall("IsBesteld").DanReturn($$$False)
+	Do OfferteStub.IndienMethodCall("GeefWinkelkarID").DanReturn(RandomWinkelkarId)
+	Do OfferteStub.IndienMethodCall("ZijnPrijzenVervallen").DanReturn($$$True)
+	Do OfferteStub.IndienMethodCall("GeefID").DanReturn(RandomOfferteId)
+	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn(RandomKlantId)
+	Do OfferteStub.IndienMethodCall("GeefPersonalityID").DanReturn(RandomPersonality)
+	Do OfferteStub.IndienMethodCall("IsVhisie4").DanReturn($$$True)
 	
-	#dim OfferteVoorBestellingValidatorStub As vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator = ##class(vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New()
-	Do OfferteVoorBestellingValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%ClassName(1))
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte", RandomOfferteId).DanReturn(OfferteStub)
 	
-	Set WinkelkarControleurMock = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarControleur).%New()
-	Do WinkelkarControleurMock.IndienMethodCall("ControleerWinkelkarViaID","DummyWinkelkarID").DanDoeNiks()
+	#dim RandomMaatwerkLijnen As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("MaatwerkLijn1", "MaatwerkLijn2")
 	
-	Set BestelStatusUpdaterMock = ##class(vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater).%New()
-	Do BestelStatusUpdaterMock.IndienMethodCall("ZetStatusBesteld", $$$ElkeWaarde).DanDoeNiks()
+	#dim WinkelkarServiceStub As vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService).%New()
+	Do WinkelkarServiceStub.IndienMethodCall("GeefMaatwerkLijnen", RandomWinkelkarId).DanReturn(RandomMaatwerkLijnen)
 	
-	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock, "", OfferteVoorBestellingValidatorStub, WinkelkarControleurMock, BestelStatusUpdaterMock)
-	Do OfferteBesteller.BestelOfferte("DummyOfferteID","DummyKlantID", "DummyPersonalityID")
+	#dim CommonApiStub As vhTest.Mock.DOM.common.CommonAPI = ##class(vhTest.Mock.DOM.common.CommonAPI).%New()
+	Do CommonApiStub.IndienMethodCall("GeefPersonality", RandomPersonalityId).DanReturn(RandomPersonality)
+	
+	#dim Validator As APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator = ##class(APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New(WinkelkarServiceStub, "", CommonApiStub)
+	
+	#dim WinkelkarControleurMock As vhTest.Mock.APPS.EC.Winkelkar.WinkelkarControleur = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarControleur).%New()
+	Do WinkelkarControleurMock.VerwachtMethodCall("ControleerWinkelkarViaID", RandomWinkelkarId).ExactAantalKeer(1)
+	
+	#dim BestelStatusUpdaterMock As vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater = ##class(vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater).%New()
+	Do BestelStatusUpdaterMock.VerwachtMethodCall("ZetStatusBesteld", OfferteStub).ExactAantalKeer(1)
+	
+	#dim EventRaiserStub As vhTest.Mock.TECH.PubSub.EventRaiser = ##class(vhTest.Mock.TECH.PubSub.EventRaiser).%New()
+	Do EventRaiserStub.IndienMethodCall("RaiseEventSync", $$$ElkeWaarde).DanDoeNiks()
+	
+	#dim PubSubApiMock As vhTest.Mock.TECH.PubSub.PubSubAPI = ##class(vhTest.Mock.TECH.PubSub.PubSubAPI).%New()
+	Do PubSubApiMock.VerwachtMethodCall("GeefEventRaiser").DanReturn(EventRaiserStub).ExactAantalKeer(1)
+	
+	#dim OfferteBesteller As APPS.EC.impl.ExterneVerkoopService.OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceStub, "", Validator, WinkelkarControleurMock, BestelStatusUpdaterMock, PubSubApiMock)
+	Do OfferteBesteller.BestelOfferte(RandomOfferteId, RandomKlantId, RandomPersonalityId)
+	
+	Do WinkelkarControleurMock.Verifieer()
+	Do BestelStatusUpdaterMock.Verifieer()
+	Do PubSubApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>