Index: APPS/EC/dto/OfferteIDEnWinkelkarID.cls.xml
===================================================================
diff -u -r29059 -r32082
--- APPS/EC/dto/OfferteIDEnWinkelkarID.cls.xml	(.../OfferteIDEnWinkelkarID.cls.xml)	(revision 29059)
+++ APPS/EC/dto/OfferteIDEnWinkelkarID.cls.xml	(.../OfferteIDEnWinkelkarID.cls.xml)	(revision 32082)
@@ -13,6 +13,19 @@
 <Property name="WinkelkarID">
 <Type>%String</Type>
 </Property>
+
+<Method name="%OnNew">
+<FormalSpec>OfferteID:%String="",WinkelkarID:%String=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..OfferteID = OfferteID
+	set ..WinkelkarID = WinkelkarID
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/Test.cls.xml
===================================================================
diff -u -r32078 -r32082
--- vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 32078)
+++ vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 32082)
@@ -8,33 +8,34 @@
 <Default>1000</Default>
 </Parameter>
 
-<Method name="Test: Maak offerte">
+<Method name="Test: Maak offerte indien geen problemen wordt de offerte besteld">
 <Implementation><![CDATA[
-	set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	do OfferteServiceMock.VerwachtMethodCall("MaakNieuwOfferte",..#KlantID,..#PersonalityID)
+	set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.ExterneVerkoopService).%New()
+	do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	do ExterneVerkoopServiceMock.VerwachtMethodCall("BestelOfferte","OfferteID",..#KlantID,..#PersonalityID)
 	
-	set OfferteService = ##class(APPS.EDI.Offerte.impl.OfferteService).%New(OfferteServiceMock)
+	set OfferteService = ##class(APPS.EDI.Offerte.impl.OfferteService).%New(ExterneVerkoopServiceMock)
 	#dim Resultaat As APPS.EDI.Offerte.dto.Resultaat = OfferteService.MaakOfferte(..GeefAanvraag())
 	
 	do $$$AssertEquals(Resultaat.Exceptie,"")
 	
-	do OfferteServiceMock.Verifieer()
+	do ExterneVerkoopServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Indien er een probleem is bij de verwerking wordt verwijder offerte opgeroepen en bevat het resultaat een exceptie">
+<Method name="Test: Indien er een probleem is bij de verwerking wordt verwijder offerte opgeroepen en bevat het resultaat een exceptie, natuurlijk wordt de offerte dan niet besteld">
 <Implementation><![CDATA[
-	set Offerte = ##class(vhTest.Dummy.APPS.VKP.Offerte).%New()
-	set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	do OfferteServiceMock.IndienMethodCall("MaakNieuwOfferte",..#KlantID,##class(DOM.common.enu.Personality).VanHoecke()).DanReturn(Offerte)
-	do OfferteServiceMock.VerwachtMethodCall("VerwijderOfferte",Offerte)
-	
-	set FalendeOfferteService = ##class(vhUnitTest.APPS.EDI.Offerte.impl.OfferteService.MaakOfferte.FalendeOfferteService).%New(OfferteServiceMock)
+	set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.ExterneVerkoopService).%New()
+	do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	do ExterneVerkoopServiceMock.VerwachtMethodCall("BestelOfferte","OfferteID",..#KlantID,..#PersonalityID).ExactAantalKeer(0)
+	do ExterneVerkoopServiceMock.VerwachtMethodCall("WisOfferte","OfferteID")
+		
+	set FalendeOfferteService = ##class(vhUnitTest.APPS.EDI.Offerte.impl.OfferteService.MaakOfferte.FalendeOfferteService).%New(ExterneVerkoopServiceMock)
 	#dim Resultaat As APPS.EDI.Offerte.dto.Resultaat = FalendeOfferteService.MaakOfferte(..GeefAanvraag())
 	
 	do $$$AssertNotEquals(Resultaat.Exceptie,"")
 	
-	do OfferteServiceMock.Verifieer()
+	do ExterneVerkoopServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: APPS/EDI/Offerte/impl/OfferteService.cls.xml
===================================================================
diff -u -r32078 -r32082
--- APPS/EDI/Offerte/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 32078)
+++ APPS/EDI/Offerte/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 32082)
@@ -3,19 +3,19 @@
 <Class name="APPS.EDI.Offerte.impl.OfferteService">
 <Super>APPS.EDI.Offerte.OfferteService,TECH.RegisteredObject</Super>
 
-<Property name="OfferteService">
-<Type>APPS.VKP.OfferteService</Type>
+<Property name="ExterneVerkoopService">
+<Type>APPS.EC.ExterneVerkoopService</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService</FormalSpec>
+<FormalSpec>ExterneVerkoopService:APPS.EC.ExterneVerkoopService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.VKP.impl.OfferteService).%New())
+	set ..ExterneVerkoopService = $$$Implementation(ExterneVerkoopService,##class(APPS.EC.impl.ExterneVerkoopService).%New())
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -26,15 +26,19 @@
 <Implementation><![CDATA[
 	set Resultaat = ##class(APPS.EDI.Offerte.dto.Resultaat).%New()
 	
-	#dim Offerte As APPS.VKP.Offerte= ..OfferteService.MaakNieuwOfferte(Aanvraag.KlantID,Aanvraag.PersonalityID)
+	#dim Offerte As APPS.EC.dto.OfferteIDEnWinkelkarID = ..ExterneVerkoopService.MaakOfferte(Aanvraag.KlantID,Aanvraag.PersonalityID)
 	try {
 		do ..VoegToeLijnen(Offerte,Aanvraag.Lijnen)
+		do ..ExterneVerkoopService.BestelOfferte(Offerte.OfferteID,Aanvraag.KlantID,Aanvraag.PersonalityID)
 	} catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		do ..OfferteService.VerwijderOfferte(Offerte)
+		do ..ExterneVerkoopService.WisOfferte(Offerte.OfferteID)
 		set Resultaat.Exceptie = Exception
 	}
 	
+	
+	
+	
 	quit Resultaat
 ]]></Implementation>
 </Method>