Index: APPS/EC/impl/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r32535 -r33279
--- APPS/EC/impl/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 32535)
+++ APPS/EC/impl/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 33279)
@@ -20,16 +20,29 @@
 <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</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[
-	set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
-	set ..OfferteHerberekening = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening).%New()
-	set ..GeldigheidVermeldingBepaler = ##class(APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler).%New()
+	Set ..Applicatie = ..GeefApplicatie()
+	Set ..OfferteService = $$$Inject(OfferteService, ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
+	Set ..WinkelkarService = $$$Inject(WinkelkarService, ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
+	Set ..OfferteHerberekening = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening).%New()
+	Set ..GeldigheidVermeldingBepaler = ##class(APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler).%New()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -58,8 +71,8 @@
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
 <Implementation><![CDATA[
-	#Dim Offerte As APPS.VKP.impl.Offerte = ##class(APPS.VKP.impl.Offerte).%New(KlantID)
-	#Dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().MaakWinkelkar(..GeefApplicatie(),KlantID, PersonalityID)
+	#dim Offerte As APPS.VKP.impl.Offerte = ##class(APPS.VKP.impl.Offerte).%New(KlantID)
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.MaakWinkelkar(..Applicatie, KlantID, PersonalityID)
 	
 	Set Offerte.WinkelkarID = Winkelkar.WinkelkarID
 	Set Offerte.PersonalityID = PersonalityID
@@ -125,7 +138,7 @@
 	Set OfferteIterator = ##class(TECH.ListIterator).%New(Offertes)
 	While OfferteIterator.HasNext(){
 		#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteIterator.Next())
-		#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().OpenWinkelkar(Offerte.GeefWinkelkarID())
+		#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ..WinkelkarService.OpenWinkelkar(Offerte.GeefWinkelkarID())
 		If (Winkelkar.GeefLijnIterator().HasNext() && MagOfferteInSamenvattingenBepaler.MagOfferteInSamenvattingen( Offerte ))
 		{
 			#dim OfferteSamenvatting As APPS.EC.dto.OfferteSamenvatting = ..GeefOfferteSamenvatting(Offerte)
@@ -141,9 +154,8 @@
 <Private>1</Private>
 <ReturnType>APPS.EC.dto.OfferteSamenvatting</ReturnType>
 <Implementation><![CDATA[
-	#Dim OfferteSamenvatting As APPS.EC.dto.OfferteSamenvatting = ##class(APPS.EC.dto.OfferteSamenvatting).%New()
-	#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
-	#Dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = WinkelkarService.GeefWinkelkarSamenvatting(Offerte.GeefWinkelkarID())
+	#dim OfferteSamenvatting As APPS.EC.dto.OfferteSamenvatting = ##class(APPS.EC.dto.OfferteSamenvatting).%New()
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.GeefWinkelkarSamenvatting(Offerte.GeefWinkelkarID())
 	
 	Set OfferteSamenvatting.AantalLijnen = Winkelkar.AantalProductLijnen
 	Set OfferteSamenvatting.AantalProducten = Winkelkar.AantalProducten
@@ -236,7 +248,7 @@
 <ReturnTypeParams>ELEMENTTYPE="%Date"</ReturnTypeParams>
 <Implementation><![CDATA[
 	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
-	Quit ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().GeefMogelijkeLeverdatums(Offerte.WinkelkarID)
+	Quit ..WinkelkarService.GeefMogelijkeLeverdatums(Offerte.WinkelkarID)
 ]]></Implementation>
 </Method>
 
@@ -297,9 +309,11 @@
 <Private>1</Private>
 <ReturnType>APPS.common.dto.Applicatie</ReturnType>
 <Implementation><![CDATA[
-	Set Applicatie = ##class(APPS.common.dto.Applicatie).%New()
+	#dim Applicatie As APPS.common.dto.Applicatie = ##class(APPS.common.dto.Applicatie).%New()
+	
 	Set Applicatie.Naam = "Uni_Webshop"
 	Set Applicatie.Type = ##class(APPS.common.enu.ApplicatieType).Extern()
+	
 	Quit Applicatie
 ]]></Implementation>
 </Method>