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>