FishEye: Tag 36785 refers to a dead (removed) revision in file `APPS/EC/InterneVerkoopService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/EC/Verkoop/VerkoopService.cls.xml
===================================================================
diff -u
--- APPS/EC/Verkoop/VerkoopService.cls.xml	(revision 0)
+++ APPS/EC/Verkoop/VerkoopService.cls.xml	(revision 36785)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Verkoop.VerkoopService">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="GeefOfferte">
+<Abstract>1</Abstract>
+<FormalSpec>OfferteID:%String</FormalSpec>
+<ReturnType>APPS.EC.dto.Offerte</ReturnType>
+</Method>
+
+<Method name="WisOfferte">
+<Abstract>1</Abstract>
+<FormalSpec>OfferteID:%String</FormalSpec>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Mock.cls.xml
===================================================================
diff -u -r29059 -r36785
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Mock.cls.xml	(.../Mock.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Mock.cls.xml	(.../Mock.cls.xml)	(revision 36785)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.EC.impl.ExterneVerkoopService.GeefOfferteSamenvattingenVoorKlant.Mock">
-<Super>APPS.EC.impl.ExterneVerkoopService,Tools.Mock.MockClassBase</Super>
+<Super>APPS.EC.Verkoop.impl.Externe.VerkoopService,Tools.Mock.MockClassBase</Super>
 
 <Method name="IsTAORBOX">
 <Private>1</Private>
Index: vhPowerTools/APPS/EC/ExterneVerkoopService/OfferteHerberekenaar.cls.xml
===================================================================
diff -u -r29059 -r36785
--- vhPowerTools/APPS/EC/ExterneVerkoopService/OfferteHerberekenaar.cls.xml	(.../OfferteHerberekenaar.cls.xml)	(revision 29059)
+++ vhPowerTools/APPS/EC/ExterneVerkoopService/OfferteHerberekenaar.cls.xml	(.../OfferteHerberekenaar.cls.xml)	(revision 36785)
@@ -5,7 +5,7 @@
 
 <Method name="HerberekenOfferte">
 <Implementation><![CDATA[
-	set Service = ##class(APPS.EC.impl.ExterneVerkoopService).%New()
+	set Service = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New()
 
 	#dim Query As %String = "select ID from APPS_VKP_impl.Offerte where personalityID = 1 and BestelStatus = 'Offerte' And PrijsBerekeningDatum > "_(+$H-31)
 	#dim ResultSet As %String = ##class(TECH.Context).Instance().GeefQueryAPI().GetDynamicResultSet(Query)
Index: APPS/EC/Verkoop/impl/Interne/InterneVerkoopService.cls.xml
===================================================================
diff -u -r36763 -r36785
--- APPS/EC/Verkoop/impl/Interne/InterneVerkoopService.cls.xml	(.../InterneVerkoopService.cls.xml)	(revision 36763)
+++ APPS/EC/Verkoop/impl/Interne/InterneVerkoopService.cls.xml	(.../Verkoop/impl/Interne/VerkoopService.cls.xml)	(revision 36785)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.EC.InterneVerkoopService">
+<Class name="APPS.EC.Verkoop.impl.Interne.VerkoopService">
 <Super>TECH.RegisteredObject</Super>
 
 <Method name="AnnuleerIngaveIntern">
Index: vhUnitTest/APPS/EC/impl/TestAuthorisatieControleur.cls.xml
===================================================================
diff -u -r29059 -r36785
--- vhUnitTest/APPS/EC/impl/TestAuthorisatieControleur.cls.xml	(.../TestAuthorisatieControleur.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/EC/impl/TestAuthorisatieControleur.cls.xml	(.../TestAuthorisatieControleur.cls.xml)	(revision 36785)
@@ -70,7 +70,7 @@
 
 <Method name="TestWerkenMetOfferte">
 <Implementation><![CDATA[
-	Set EVS = ##class(APPS.EC.impl.ExterneVerkoopService).%New()
+	Set EVS = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New()
 	#dim OfferteEnWinkelkar1 As APPS.EC.dto.OfferteIDEnWinkelkarID = EVS.MaakOfferte(..KlantID,##class(DOM.common.enu.Personality).VanHoecke())
 	#dim OfferteEnWinkelkar2 As APPS.EC.dto.OfferteIDEnWinkelkarID = EVS.MaakOfferte(##class(DOM.VKP.enu.Klant).SFS(),##class(DOM.common.enu.Personality).VanHoecke())
 		
Index: APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml
===================================================================
diff -u -r36620 -r36785
--- APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml	(.../UnishopBesteller.cls.xml)	(revision 36620)
+++ APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml	(.../UnishopBesteller.cls.xml)	(revision 36785)
@@ -30,7 +30,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..ExterneVerkoopService = $$$Inject(ExterneVerkoopService,##class(APPS.EC.impl.ExterneVerkoopService).%New())
+	Set ..ExterneVerkoopService = $$$Inject(ExterneVerkoopService,##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New())
 	Set ..ProductConverter = $$$Inject(ProductConverter,##class(APPS.EDI.common.impl.ProductConverter).%New())
 	Set ..OfferteService = $$$Inject(OfferteService, ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
 	Quit $$$OK
Index: vhTest/Integratie/Unishop/PurchaseOrderService001/Service/Test.cls.xml
===================================================================
diff -u -r36360 -r36785
--- vhTest/Integratie/Unishop/PurchaseOrderService001/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 36360)
+++ vhTest/Integratie/Unishop/PurchaseOrderService001/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 36785)
@@ -18,7 +18,7 @@
 	do ##super()
 	
 	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer() 
-	set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New()
+	set ..ExterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New()
 ]]></Implementation>
 </Method>
 
Index: WS/EC/SessieLozeExterneVerkoopService.cls.xml
===================================================================
diff -u -r31560 -r36785
--- WS/EC/SessieLozeExterneVerkoopService.cls.xml	(.../SessieLozeExterneVerkoopService.cls.xml)	(revision 31560)
+++ WS/EC/SessieLozeExterneVerkoopService.cls.xml	(.../SessieLozeExterneVerkoopService.cls.xml)	(revision 36785)
@@ -39,7 +39,7 @@
 	
 	#dim WebshopSessionService As APPS.EC.WebshopSessionService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService()
 	#dim PersonalityID As DOM.common.enu.Personality = WebshopSessionService.GeefPersonalityIDVoorDomeinVerwerker(RefSessieData.Verwerker)		
-	#dim Bestelling As APPS.EC.dto.Bestelling = ##class(APPS.EC.impl.ExterneVerkoopService).%New().GeefBestelling(RefSessieData.OfferteID,RefSessieData.KlantID,PersonalityID)
+	#dim Bestelling As APPS.EC.dto.Bestelling = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().GeefBestelling(RefSessieData.OfferteID,RefSessieData.KlantID,PersonalityID)
 	
 	Quit Bestelling
 ]]></Implementation>
Index: vhUnitTest/WS/EC/impl/TestAuthorisatieControleur.cls.xml
===================================================================
diff -u -r29059 -r36785
--- vhUnitTest/WS/EC/impl/TestAuthorisatieControleur.cls.xml	(.../TestAuthorisatieControleur.cls.xml)	(revision 29059)
+++ vhUnitTest/WS/EC/impl/TestAuthorisatieControleur.cls.xml	(.../TestAuthorisatieControleur.cls.xml)	(revision 36785)
@@ -70,7 +70,7 @@
 
 <Method name="TestWerkenMetOfferte">
 <Implementation><![CDATA[
-	Set EVS = ##class(APPS.EC.impl.ExterneVerkoopService).%New()
+	Set EVS = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New()
 	#dim OfferteEnWinkelkar1 As APPS.EC.dto.OfferteIDEnWinkelkarID = EVS.MaakOfferte(..KlantID,##class(DOM.common.enu.Personality).VanHoecke())
 	#dim OfferteEnWinkelkar2 As APPS.EC.dto.OfferteIDEnWinkelkarID = EVS.MaakOfferte(##class(DOM.VKP.enu.Klant).SFS(),##class(DOM.common.enu.Personality).VanHoecke())
 		
Index: vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml
===================================================================
diff -u -r33393 -r36785
--- vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml	(.../Base.cls.xml)	(revision 33393)
+++ vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml	(.../Base.cls.xml)	(revision 36785)
@@ -14,7 +14,7 @@
 </Property>
 
 <Property name="ExterneVerkoopService">
-<Type>APPS.EC.impl.ExterneVerkoopService</Type>
+<Type>APPS.EC.Verkoop.impl.Externe.VerkoopService</Type>
 <Private>1</Private>
 </Property>
 
@@ -28,7 +28,7 @@
 	do ##super()
 	do ##class(TECH.Context.RuntimeContext).Instance().ZetTaal("N")
 	
-	set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New()
+	set ..ExterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New()
 	
 	#dim Query As %String = "Delete APPS_VKP_impl.Offerte where BestelOpmerking = ?"
 	do ExecDynQuery^vhLib.Query(Query,$LB("UnitTestOpmerking"))
Index: APPS/EC/Verkoop/impl/VerkoopService.cls.xml
===================================================================
diff -u
--- APPS/EC/Verkoop/impl/VerkoopService.cls.xml	(revision 0)
+++ APPS/EC/Verkoop/impl/VerkoopService.cls.xml	(revision 36785)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Verkoop.impl.VerkoopService">
+<Super>TECH.RegisteredObject,APPS.EC.Verkoop.VerkoopService</Super>
+
+<Method name="GeefOfferte">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<ReturnType>APPS.EC.dto.Offerte</ReturnType>
+</Method>
+
+<Method name="WisOfferte">
+<FormalSpec>OfferteID:%String</FormalSpec>
+</Method>
+</Class>
+
+
+</Export>
Index: AMF/EC/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r29059 -r36785
--- AMF/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 29059)
+++ AMF/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 36785)
@@ -14,16 +14,16 @@
 
 <Method name="GeefExterneVerkoopService">
 <Private>1</Private>
-<ReturnType>APPS.EC.impl.ExterneVerkoopService</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.EC.impl.ExterneVerkoopService).%New()
+<ReturnType>APPS.EC.Verkoop.impl.Externe.VerkoopService</ReturnType>
+<Implementation><![CDATA[	quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New()
 ]]></Implementation>
 </Method>
 
 <Method name="BestelOfferte">
 <FormalSpec>OfferteID:%String,KlantID:%String,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Implementation><![CDATA[
 	Try{
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		do ExterneVerkoopService.BestelOfferte(OfferteID,KlantID,PersonalityID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -38,7 +38,7 @@
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	Try {
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		#dim GeefMogelijkeLeverdatums As %ListOfDataTypes= ExterneVerkoopService.GeefMogelijkeLeverdatums(OfferteID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -54,7 +54,7 @@
 <ReturnType>APPS.EC.dto.Offerte</ReturnType>
 <Implementation><![CDATA[
 	Try{
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		#dim GeefOfferteEnHerberekenIndienNodig As APPS.EC.dto.Offerte = ExterneVerkoopService.GeefOfferteEnHerberekenIndienNodig(OfferteID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -70,7 +70,7 @@
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	Try {
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		#dim GeefOfferteSamenvattingenVoorKlant As %ListOfObjects = ExterneVerkoopService.GeefOfferteSamenvattingenVoorKlant(KlantID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -86,7 +86,7 @@
 <ReturnType>APPS.EC.dto.Offerte</ReturnType>
 <Implementation><![CDATA[
 	Try {
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		#dim GeefOfferteZonderHerberekening As APPS.EC.dto.Offerte = ExterneVerkoopService.GeefOfferteZonderHerberekening(OfferteID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -102,7 +102,7 @@
 <ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
 <Implementation><![CDATA[
 	Try {
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		#dim MaakOfferte As APPS.EC.dto.OfferteIDEnWinkelkarID =  ExterneVerkoopService.MaakOfferte(KlantID,PersonalityID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -118,7 +118,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Try {
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		#dim MagWinkelkarInHistoriek as %Boolean = ExterneVerkoopService.MagWinkelkarInHistoriek(Winkelkar)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -133,7 +133,7 @@
 <FormalSpec>OfferteID:%String</FormalSpec>
 <Implementation><![CDATA[
 	Try {
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		do ExterneVerkoopService.WisOfferte(OfferteID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -147,7 +147,7 @@
 <FormalSpec>OfferteID:%String,HoofdingDto:APPS.EC.dto.Hoofding</FormalSpec>
 <Implementation><![CDATA[
 	Try {
-		#dim ExterneVerkoopService As APPS.EC.impl.ExterneVerkoopService = ..GeefExterneVerkoopService()
+		#dim ExterneVerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ..GeefExterneVerkoopService()
 		do ExterneVerkoopService.ZetOfferteHoofding(OfferteID,HoofdingDto)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
Index: APPS/EC/Verkoop/impl/Externe/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r32131 -r36785
--- APPS/EC/Verkoop/impl/Externe/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 32131)
+++ APPS/EC/Verkoop/impl/Externe/ExterneVerkoopService.cls.xml	(.../Verkoop/impl/Externe/VerkoopService.cls.xml)	(revision 36785)
@@ -1,88 +1,343 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.EC.ExterneVerkoopService">
-<Abstract>1</Abstract>
-<Super>TECH.Interface</Super>
+<Class name="APPS.EC.Verkoop.impl.Externe.VerkoopService">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.RegisteredObject,APPS.EC.ExterneVerkoopService</Super>
 
+<Property name="OfferteService">
+<Type>APPS.VKP.OfferteService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OfferteHerberekening">
+<Type>APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="GeldigheidVermeldingBepaler">
+<Type>APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler</Type>
+<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>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	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.impl.ExterneVerkoopService.OfferteHerberekening).%New()
+	Set ..GeldigheidVermeldingBepaler = ##class(APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler).%New()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefOfferteEnHerberekenIndienNodig">
-<Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>APPS.EC.dto.Offerte</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[	quit ..OfferteHerberekening.GeefOfferteEnHerberekenIndienNodig(OfferteID)
+]]></Implementation>
 </Method>
 
+<Method name="HerrekenOfferte">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Implementation><![CDATA[	do ..OfferteHerberekening.HerrekenOfferte(Offerte)
+]]></Implementation>
+</Method>
+
 <Method name="GeefOfferteZonderHerberekening">
-<Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>APPS.EC.dto.Offerte</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[	quit ..OfferteHerberekening.GeefOfferteZonderHerberekening(OfferteID)
+]]></Implementation>
 </Method>
 
 <Method name="MaakOfferte">
-<Abstract>1</Abstract>
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	#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
+	Set Offerte.LeverAdres = ..GeefStandaardLeverAdres(Offerte)
+	
+	Do Offerte.Save()
+	
+	Set EventData = ##class(APPS.VKP.event.OfferteGemaaktEventData).%New(Offerte.GeefID())
+	Set Event = ##class(APPS.VKP.event.OfferteGemaaktEvent).%New(EventData)
+	Do ##class(TECH.Context).Instance().GeefPubSubAPI().GeefEventRaiser().RaiseEventSync(Event)
+	
+	Set OfferteIDenWinkelkarID = ##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New()
+	Set OfferteIDenWinkelkarID.OfferteID = Offerte.%Id()
+	Set OfferteIDenWinkelkarID.WinkelkarID = Offerte.WinkelkarID
+	Quit OfferteIDenWinkelkarID
+]]></Implementation>
 </Method>
 
+<Method name="StelInStandaardLeveradres">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Implementation><![CDATA[	Set Offerte.LeverAdres = ..GeefStandaardLeverAdres(Offerte)
+]]></Implementation>
+</Method>
+
+<Method name="GeefStandaardLeverAdres">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.common.impl.VH.Adres</ReturnType>
+<Implementation><![CDATA[
+	#Dim Adres As DOM.common.Adres = ##class(APPS.EC.ExterneVerkoopService.impl.AdresBepaler).%New().GeefAdres(Offerte.GeefPersonality(),Offerte.GeefKlantID())
+	Quit ##class(DOM.common.impl.AdresUtils).MaakPersistentAdresVanAdres(Adres)
+]]></Implementation>
+</Method>
+
 <Method name="WisOfferte">
-<Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String</FormalSpec>
-</Method>
+<Implementation><![CDATA[
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
 
-<Method name="VoegToeMaatwerk">
-<Abstract>1</Abstract>
-<FormalSpec>OfferteID:%String,IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%String,ProjectReferentie:%String=""</FormalSpec>
-<ReturnType>%String</ReturnType>
+	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">
-<Abstract>1</Abstract>
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="APPS.EC.dto.OfferteSamenvatting"</ReturnTypeParams>
+<Implementation><![CDATA[
+	Set OfferteSamenvattingen = ##class(%ListOfObjects).%New()
+	
+	#dim MagOfferteInSamenvattingenBepaler As APPS.EC.impl.MagOfferteInSamenvattingenBepaler = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefMagOfferteInSamenvattingenBepaler()
+	
+	#dim OfferteSelectieCriteriaBepaler As APPS.EC.OfferteSelectieCriteriaBepaler = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefOfferteSelectieCriteriaBepaler()
+	#dim SelectieCriteria As APPS.VKP.Offerte.dto.SelectieCriteria = OfferteSelectieCriteriaBepaler.BepaalSelectieCriteria(KlantID)
+	
+	#dim Offertes As %ListOfDataTypes = ..OfferteService.GeefOffertes(SelectieCriteria)
+	
+	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 = ..WinkelkarService.OpenWinkelkar(Offerte.GeefWinkelkarID())
+		If (Winkelkar.GeefLijnIterator().HasNext() && MagOfferteInSamenvattingenBepaler.MagOfferteInSamenvattingen( Offerte ))
+		{
+			#dim OfferteSamenvatting As APPS.EC.dto.OfferteSamenvatting = ..GeefOfferteSamenvatting(Offerte)
+			Do OfferteSamenvattingen.Insert(OfferteSamenvatting)
+		}
+	}
+	Quit OfferteSamenvattingen
+]]></Implementation>
 </Method>
 
-<Method name="MagWinkelkarInHistoriek">
-<Abstract>1</Abstract>
-<FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Method name="GeefOfferteSamenvatting">
+<FormalSpec>Offerte:APPS.VKP.impl.Offerte</FormalSpec>
+<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 Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.GeefWinkelkarSamenvatting(Offerte.GeefWinkelkarID())
+	
+	Set OfferteSamenvatting.AantalLijnen = Winkelkar.AantalProductLijnen
+	Set OfferteSamenvatting.AantalProducten = Winkelkar.AantalProducten
+	Set OfferteSamenvatting.CreatieTijdstip = Offerte.GeefAangemaaktOp()
+	Set OfferteSamenvatting.OfferteID = Offerte.GeefID()
+	
+	#dim KlantDataReferentie As %String = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefKlantDataReferentieBepaler().GeefKlantDataReferentie(Offerte)
+	Set:$Length(KlantDataReferentie)>0 KlantDataReferentie = " ("_KlantDataReferentie_")"
+	
+	If ..OfferteService.HeeftOfferteVanHandel(Offerte) {
+		#dim OfferteVanHandel As APPS.VKP.Offerte = ..OfferteService.GeefOfferteVanHandel(Offerte)
+		Set OfferteSamenvatting.OrderReferentie = "EDInr: "_OfferteVanHandel.GeefID()_" - "
+	}
+	
+	Set OfferteSamenvatting.OrderReferentie = OfferteSamenvatting.OrderReferentie_Offerte.DocumentReferenties.OrderReferentie_KlantDataReferentie
+	
+	If (Offerte.IsBesteld()) {
+		Set OfferteSamenvatting.Status = "Besteld"
+	} Else {
+		Set OfferteSamenvatting.Status = "Niet besteld"
+	}
+	
+	Set OfferteSamenvatting.WinkelkarID = Offerte.GeefWinkelkarID()
+	Set OfferteSamenvatting.GeldigheidVermelding = ..GeldigheidVermeldingBepaler.BepaalVermelding(Offerte)
+	Set OfferteSamenvatting.IsGeldig = 'Offerte.ZijnPrijzenVervallen()
+	Set OfferteSamenvatting.TotaalPrijsExclusiefBTW = Winkelkar.TotaalPrijs
+	
+	Quit OfferteSamenvatting
+]]></Implementation>
 </Method>
 
 <Method name="BestelOfferte">
-<Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	#Dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)
+	#Dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefKlantInstellingenService(Personality)
+	#Dim OfferteBesteller As APPS.EC.impl.ExterneVerkoopService.OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(..OfferteService, KlantInstellingenService)
+	
+	Do ##class(vhLib.Logger).%New().Info("BestelOfferte","Bestel Offerte '"_OfferteID_"' voor klant '"_KlantID_"' (van "_Personality.GeefNaam()_" ("_PersonalityID_").")
+	
+	Do OfferteBesteller.BestelOfferte(OfferteID, KlantID, PersonalityID)
+]]></Implementation>
 </Method>
 
+<Method name="ControleerHeeftToegangTotOfferte">
+<FormalSpec>Offerte:APPS.VKP.Offerte,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do:($L(Offerte.GeefKlantID()) && (Offerte.GeefKlantID()'=KlantID)) ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("De klantID, "_KlantID_", is niet geldig voor deze offerte (ID: "_Offerte.GeefID()_")"))	
+	Do:Offerte.GeefPersonalityID()'=PersonalityID ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("De PersonalityID, "_PersonalityID_", is niet geldig voor deze offerte (ID: "_Offerte.GeefID()_")"))
+]]></Implementation>
+</Method>
+
 <Method name="ZetOfferteHoofding">
-<Abstract>1</Abstract>
-<FormalSpec>OfferteID:%String,HoofdingDto:APPS.EC.dto.Hoofding</FormalSpec>
+<FormalSpec>OfferteID:%String,Hoofding:APPS.EC.dto.Hoofding</FormalSpec>
+<Implementation><![CDATA[
+	#Dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
+	#Dim LeverAdresConvertor As APPS.common.impl.LeverAdresConvertor = ##class(APPS.common.impl.LeverAdresConvertor).%New()
+	
+	If ($IsObject(Hoofding.LeveringDetail)) {
+		Do:($$$Not(Hoofding.LeveringDetail.Datum = "")) Offerte.ZetLeverDatum(Hoofding.LeveringDetail.Datum)
+		Do:($$$Not(Hoofding.LeveringDetail.WensDatum = "")) Offerte.ZetWensLeverDatum(Hoofding.LeveringDetail.WensDatum)
+		Do:($IsObject(Hoofding.LeveringDetail.Adres)) Offerte.ZetLeverAdres(LeverAdresConvertor.NaarObject(Hoofding.LeveringDetail.Adres)) 	
+	}
+		
+	Set Offerte.BestelOpmerking = ..GeefOpgekuisteTekst(Hoofding.BestelOpmerking)
+	Set Offerte.DocumentReferenties.OrderReferentie = ..GeefOpgekuisteTekst(Hoofding.Referentie.OrderReferentie)
+	Set Offerte.DocumentReferenties.KlantOrderNummer = ..GeefOpgekuisteTekst(Hoofding.Referentie.KlantOrderNummer)
+	Set Offerte.DocumentReferenties.CommissieReferentie = ..GeefOpgekuisteTekst(Hoofding.Referentie.CommissieReferentie)
+	
+	Do Offerte.Save()
+]]></Implementation>
 </Method>
 
+<Method name="GeefOpgekuisteTekst">
+<FormalSpec>Tekst:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim AdminTekstUtils As APPS.common.AdminTekstUtils = ##class(APPS.ApplicatieContext).Instance().GeefCommonAPI().GeefAdminTekstUtils()	
+	#dim OpgekuisteTekst As %String = ##class(TECH.StringUtils).Trim(AdminTekstUtils.MaakTekstAdminVriendelijk(Tekst))
+	Set OpgekuisteTekst = ##class(TECH.StringUtils).Replace(OpgekuisteTekst,$C(160),"")
+	Quit OpgekuisteTekst
+]]></Implementation>
+</Method>
+
 <Method name="GeefMogelijkeLeverdatums">
-<Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="%Date"</ReturnTypeParams>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
+	Quit ..WinkelkarService.GeefMogelijkeLeverdatums(Offerte.WinkelkarID)
+]]></Implementation>
 </Method>
 
+<Method name="VoegToeMaatwerk">
+<FormalSpec>OfferteID:%String,IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%String,ProjectReferentie:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..OfferteService.VoegToeMaatwerk(..OfferteService.GeefOfferte(OfferteID),IngegevenKenmerken,Aantal,ProjectReferentie).%Id()
+]]></Implementation>
+</Method>
+
 <Method name="GeefMogelijkeLeverAdressen">
-<Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
-<ReturnTypeParams>ELEMENTTYPE="APPS.common.dto.LeverAdres"</ReturnTypeParams>
-<Implementation><![CDATA[]]></Implementation>
+<ReturnTypeParams>ELEMENTTYPE="APPS.common.dto.Adres"</ReturnTypeParams>
+<Implementation><![CDATA[
+	#Dim MogelijkeLeverAdressen As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#Dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)	
+	#Dim Klant As DOM.VKP.Klant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(Offerte.GeefKlantID())
+	#Dim Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(Klant.GeefLeverAdressen())
+	#Dim AdresConvertor As APPS.common.impl.AdresConvertor =  ##class(APPS.common.impl.AdresConvertor).%New()
+
+	While (Iterator.HasNext()) {
+		#Dim Adres As DOM.VKP.LeverAdres = Iterator.Next()
+		#Dim AdresDto As APPS.common.dto.Adres = AdresConvertor.NaarDataTransferObject(Adres)
+		
+		Do MogelijkeLeverAdressen.Insert(AdresDto)
+	}
+	
+	If (MogelijkeLeverAdressen.Count() = 0) {
+		#Dim HoofdAdres As DOM.VKP.LeverAdres = ##class(APPS.EC.ExterneVerkoopService.impl.AdresBepaler).%New().GeefAdres(Offerte.GeefPersonality(), Offerte.GeefKlantID())
+		#Dim HoofdAdresDto As APPS.common.dto.Adres = AdresConvertor.NaarDataTransferObject(HoofdAdres)
+			
+		Do MogelijkeLeverAdressen.Insert(HoofdAdresDto)	
+	}
+
+	Quit MogelijkeLeverAdressen
+]]></Implementation>
 </Method>
 
 <Method name="GeefBestelling">
-<Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>APPS.EC.dto.Bestelling</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)	
+	Do ..ControleerHeeftToegangTotOfferte(Offerte,KlantID,PersonalityID)
+	
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(PersonalityID)
+
+	Set Bestelling = ##class(APPS.EC.dto.Bestelling).%New()
+	Set Bestelling.Offerte = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().GeefOfferteZonderHerberekening(OfferteID)
+	Set Bestelling.Personality = ##class(APPS.ApplicatieContext).Instance().GeefCommonAPI().GeefDataService().GeefPersonalityData(Bestelling.Offerte.Winkelkar.Personality.ID)
+	Set Bestelling.Taal = ##class(TECH.Context.RuntimeContext).Instance().GeefTaal()
+	Quit Bestelling
+]]></Implementation>
 </Method>
+
+<Method name="GeefApplicatie">
+<Private>1</Private>
+<ReturnType>APPS.common.dto.Applicatie</ReturnType>
+<Implementation><![CDATA[
+	#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>
+
+<Method name="DupliceerOfferte">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
+<Implementation><![CDATA[
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
+	#dim GekopieerdeOfferte As APPS.VKP.Offerte = ..OfferteService.KopieerOfferte(Offerte)
+	//eventueel bestelstatus naar offerte zetten, datum?
+	Do GekopieerdeOfferte.ZetLeverDatum("")
+	Do GekopieerdeOfferte.ZetWensLeverDatum("")
+	Do GekopieerdeOfferte.ZetOrderID("")
+	Do GekopieerdeOfferte.ZetPrijsBerekeningDatum("")
+	Do ..HerrekenOfferte(GekopieerdeOfferte)
+	Do GekopieerdeOfferte.Save()
+	
+	Set OfferteIDEnWinkelkarID = ##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New()
+	Set OfferteIDEnWinkelkarID.OfferteID = GekopieerdeOfferte.GeefID()
+	Set OfferteIDEnWinkelkarID.WinkelkarID = GekopieerdeOfferte.GeefWinkelkarID()
+	Quit OfferteIDEnWinkelkarID
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/PM/Maatwerk/impl/IngegevenKenmerkenConverter.cls.xml
===================================================================
diff -u -r30198 -r36785
--- APPS/PM/Maatwerk/impl/IngegevenKenmerkenConverter.cls.xml	(.../IngegevenKenmerkenConverter.cls.xml)	(revision 30198)
+++ APPS/PM/Maatwerk/impl/IngegevenKenmerkenConverter.cls.xml	(.../IngegevenKenmerkenConverter.cls.xml)	(revision 36785)
@@ -34,6 +34,8 @@
 	#dim DtoNaarKenmerkVisitor As APPS.PM.Maatwerk.impl.DtoNaarKenmerkVisitor = ##class(APPS.PM.Maatwerk.impl.DtoNaarKenmerkVisitor).%New()
 	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = DtoNaarKenmerkVisitor.GeefIngegevenKenmerken(IngegevenKenmerkenDto)
 	
+	If ##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID()
+	
 	if (..IngegevenKenmerkenTypeAPI.IsSpoelbaklade(IngegevenKenmerken)) {
 		try { 
 			set IngegevenKenmerken.SpoelbakKenmerken = ..SpoelbakKenmerkenBepaler.BepaalSpoelbakKenmerken(IngegevenKenmerken)
Index: WS/EC/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r36569 -r36785
--- WS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 36569)
+++ WS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 36785)
@@ -18,7 +18,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteID)
-	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New().GeefOfferteEnHerberekenIndienNodig(OfferteID)
+	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().GeefOfferteEnHerberekenIndienNodig(OfferteID)
 ]]></Implementation>
 </Method>
 
@@ -35,7 +35,7 @@
 		Do ##class(WS.EC.Unishop.InternationaleZending.Service).%New().BerekenPalletGegevens(OfferteID)
 	}
 	
-	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New().GeefOfferteEnHerberekenIndienNodig(OfferteID)
+	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().GeefOfferteEnHerberekenIndienNodig(OfferteID)
 ]]></Implementation>
 </Method>
 
@@ -45,7 +45,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteID)
-	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New().GeefOfferteZonderHerberekening(OfferteID)
+	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().GeefOfferteZonderHerberekening(OfferteID)
 ]]></Implementation>
 </Method>
 
@@ -55,7 +55,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetKlant(KlantID)
-	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New().MaakOfferte(KlantID, ..GeefPersonalityID())
+	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().MaakOfferte(KlantID, ..GeefPersonalityID())
 ]]></Implementation>
 </Method>
 
@@ -66,7 +66,7 @@
 <ReturnTypeParams>ELEMENTTYPE="%Date"</ReturnTypeParams>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteID)
-	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New().GeefMogelijkeLeverdatums(OfferteID)
+	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().GeefMogelijkeLeverdatums(OfferteID)
 ]]></Implementation>
 </Method>
 
@@ -77,7 +77,7 @@
 <ReturnTypeParams>ELEMENTTYPE="APPS.common.dto.Adres"</ReturnTypeParams>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteID)	
-	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New().GeefMogelijkeLeverAdressen(OfferteID)
+	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().GeefMogelijkeLeverAdressen(OfferteID)
 ]]></Implementation>
 </Method>
 
@@ -86,7 +86,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteID)
-	Do ##class(APPS.EC.impl.ExterneVerkoopService).%New().ZetOfferteHoofding(OfferteID,HoofdingDto)
+	Do ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().ZetOfferteHoofding(OfferteID,HoofdingDto)
 ]]></Implementation>
 </Method>
 
@@ -97,7 +97,7 @@
 <ReturnTypeParams>ELEMENTTYPE="APPS.EC.dto.OfferteSamenvatting"</ReturnTypeParams>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetKlant(KlantID)
-	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New().GeefOfferteSamenvattingenVoorKlant(KlantID)
+	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().GeefOfferteSamenvattingenVoorKlant(KlantID)
 ]]></Implementation>
 </Method>
 
@@ -108,7 +108,7 @@
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteID)	
 	Do ##class(APPS.EC.impl.WebshopSessieBestelValidator).%New().Valideer()
 
-	Do ##class(APPS.EC.impl.ExterneVerkoopService).%New().BestelOfferte(OfferteID,..GeefKlantID(),..GeefPersonalityID())
+	Do ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().BestelOfferte(OfferteID,..GeefKlantID(),..GeefPersonalityID())
 	
 	Do ##class(WSimpl.EC.ExterneVerkoop.VerzendingMogelijkheidRepository).%New().VerwijderViaOfferteID(OfferteID)
 	Do ##class(WS.EC.Unishop.InternationaleZending.Service).%New().VerzendBerekenFoutenIndienNodig(OfferteID)
@@ -120,7 +120,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteID)
-	Do ##class(APPS.EC.impl.ExterneVerkoopService).%New().WisOfferte(OfferteID)
+	Do ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().WisOfferte(OfferteID)
 ]]></Implementation>
 </Method>
 
@@ -130,7 +130,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteID)	
-	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New().DupliceerOfferte(OfferteID)
+	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().DupliceerOfferte(OfferteID)
 ]]></Implementation>
 </Method>
 
Index: APPS/EC/impl/ECommerceAPI.cls.xml
===================================================================
diff -u -r36326 -r36785
--- APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 36326)
+++ APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 36785)
@@ -40,7 +40,7 @@
 
 <Method name="GeefExterneVerkoopService">
 <ReturnType>APPS.EC.ExterneVerkoopService</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.EC.impl.ExterneVerkoopService).%New()
+<Implementation><![CDATA[	Quit ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New()
 ]]></Implementation>
 </Method>
 
Index: zTryout/JBL/Unishop/OfferteMaker.cls.xml
===================================================================
diff -u -r32370 -r36785
--- zTryout/JBL/Unishop/OfferteMaker.cls.xml	(.../OfferteMaker.cls.xml)	(revision 32370)
+++ zTryout/JBL/Unishop/OfferteMaker.cls.xml	(.../OfferteMaker.cls.xml)	(revision 36785)
@@ -69,7 +69,7 @@
 		
 	Do ExterneVerkoopService.ZetOfferteHoofding(OfferteID, OfferteHoofding)
 		
-	Do ##class(APPS.EC.impl.ExterneVerkoopService).%New().BestelOfferte(OfferteID, ..KlantID,##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID())
+	Do ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().BestelOfferte(OfferteID, ..KlantID,##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID())
 	
 	Write !,"Klant: "_..KlantID
 	Write !,"Offerte: "_OfferteID
Index: AMF/EC/InterneVerkoopService.cls.xml
===================================================================
diff -u -r29059 -r36785
--- AMF/EC/InterneVerkoopService.cls.xml	(.../InterneVerkoopService.cls.xml)	(revision 29059)
+++ AMF/EC/InterneVerkoopService.cls.xml	(.../InterneVerkoopService.cls.xml)	(revision 36785)
@@ -14,8 +14,8 @@
 
 <Method name="GeefInterneVerkoopService">
 <Private>1</Private>
-<ReturnType>APPS.EC.InterneVerkoopService</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.EC.InterneVerkoopService).%New()
+<ReturnType>APPS.EC.Verkoop.impl.Interne.VerkoopService</ReturnType>
+<Implementation><![CDATA[	quit ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New()
 ]]></Implementation>
 </Method>
 
@@ -27,7 +27,7 @@
 <Implementation><![CDATA[
 	Try {
 		#dim Parameters As APPS.VKP.Maatwerk.impl.AdminSessieParameters = ##class(APPS.VKP.Maatwerk.impl.AdminSessieParameters).%OpenId(ParameterID)
-		Do ##class(APPS.EC.InterneVerkoopService).%New().AnnuleerIngaveIntern(..GeefApplicatie(), Parameters.GeefWinkelkarID(), ParameterID)
+		Do ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New().AnnuleerIngaveIntern(..GeefApplicatie(), Parameters.GeefWinkelkarID(), ParameterID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(vhLib.Logger).LogExceptie(Exceptie)
@@ -42,7 +42,7 @@
 <Implementation><![CDATA[
 	Try {
 		#dim Parameters As APPS.VKP.Maatwerk.impl.AdminSessieParameters = ##class(APPS.VKP.Maatwerk.impl.AdminSessieParameters).%OpenId(ParameterID)
-		Do ##class(APPS.EC.InterneVerkoopService).%New().BestelWinkelkarIntern(..GeefApplicatie(), Parameters.GeefWinkelkarID(), Parameters.GeefDocumentType(), Parameters.GeefDocumentID())
+		Do ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New().BestelWinkelkarIntern(..GeefApplicatie(), Parameters.GeefWinkelkarID(), Parameters.GeefDocumentType(), Parameters.GeefDocumentID())
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(vhLib.Logger).LogExceptie(Exceptie)
@@ -57,7 +57,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Try{
-		#dim GeefParameters As APPS.VKP.Maatwerk.dto.ConfiguratorParameters = ##class(APPS.EC.InterneVerkoopService).%New().GeefParameters(ParameterID)
+		#dim GeefParameters As APPS.VKP.Maatwerk.dto.ConfiguratorParameters = ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New().GeefParameters(ParameterID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(vhLib.Logger).LogExceptie(Exceptie)
@@ -72,7 +72,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Try{
-		Do ##class(APPS.EC.InterneVerkoopService).%New().UpdateWinkelkarLijn(..GeefApplicatie(), WinkelkarID, DocumentType, DocumentID, LijnID)
+		Do ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New().UpdateWinkelkarLijn(..GeefApplicatie(), WinkelkarID, DocumentType, DocumentID, LijnID)
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(vhLib.Logger).LogExceptie(Exceptie)
Index: vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml
===================================================================
diff -u -r33644 -r36785
--- vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml	(.../TestVanHoecke.cls.xml)	(revision 33644)
+++ vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml	(.../TestVanHoecke.cls.xml)	(revision 36785)
@@ -385,7 +385,7 @@
 <Method name="TestWisWinkelkarMagNietVoorExterneOffertes">
 <Implementation><![CDATA[
 	// Setup
-	#dim OfferteIDenWinkelkarID As APPS.EC.dto.OfferteIDEnWinkelkarID = ##class(APPS.EC.impl.ExterneVerkoopService).%New().MaakOfferte( ..KlantID , ..Personality)
+	#dim OfferteIDenWinkelkarID As APPS.EC.dto.OfferteIDEnWinkelkarID = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New().MaakOfferte( ..KlantID , ..Personality)
 		
 	Try {
 		// Actie
Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/DupliceerOfferte/ExterneVerkoopServiceMock.cls.xml
===================================================================
diff -u -r29059 -r36785
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/DupliceerOfferte/ExterneVerkoopServiceMock.cls.xml	(.../ExterneVerkoopServiceMock.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/DupliceerOfferte/ExterneVerkoopServiceMock.cls.xml	(.../ExterneVerkoopServiceMock.cls.xml)	(revision 36785)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.EC.impl.ExterneVerkoopService.DupliceerOfferte.ExterneVerkoopServiceMock">
-<Super>APPS.EC.impl.ExterneVerkoopService,Tools.Mock.MockClassBase</Super>
+<Super>APPS.EC.Verkoop.impl.Externe.VerkoopService,Tools.Mock.MockClassBase</Super>
 
 <Method name="HerrekenOfferte">
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
Index: vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml
===================================================================
diff -u -r35709 -r36785
--- vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml	(.../Test2.cls.xml)	(revision 35709)
+++ vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml	(.../Test2.cls.xml)	(revision 36785)
@@ -61,7 +61,7 @@
 <Private>1</Private>
 <ReturnType>APPS.EC.UNI.SFS.impl.OrderServiceInternal</ReturnType>
 <Implementation><![CDATA[
-	Set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New(OfferteService)
+	Set ..ExterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New(OfferteService)
 	Quit ##class(vhUnitTest.APPS.EC.UNI.SFS.impl.OrderServiceInternal.ConfirmOrder.OrderServiceInternalMock).%New(OfferteService, ..ExterneVerkoopService)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml
===================================================================
diff -u -r33279 -r36785
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml	(.../Base.cls.xml)	(revision 33279)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml	(.../Base.cls.xml)	(revision 36785)
@@ -29,7 +29,7 @@
 </Parameter>
 
 <Property name="ExterneVerkoopService">
-<Type>APPS.EC.impl.ExterneVerkoopService</Type>
+<Type>APPS.EC.Verkoop.impl.Externe.VerkoopService</Type>
 <Private>1</Private>
 </Property>
 
@@ -129,7 +129,7 @@
 	Do APPSWinkelkarServiceStub.IndienMethodCall("GeefWinkelkarSamenvatting", "DummyWinkelkarID").DanReturn(WinkelkarDummy)
 	Do APPSWinkelkarServiceStub.IndienMethodCall("OpenWinkelkar", "DummyWinkelkarID").DanReturn(WinkelkarStub)
 	
-	Set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New(OfferteServiceStub, APPSWinkelkarServiceStub)
+	Set ..ExterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New(OfferteServiceStub, APPSWinkelkarServiceStub)
 ]]></Implementation>
 </Method>
 
FishEye: Tag 36785 refers to a dead (removed) revision in file `APPS/EC/ExterneVerkoopService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/EC/TestInterneVerkoopService.cls.xml
===================================================================
diff -u -r36713 -r36785
--- vhUnitTest/APPS/EC/TestInterneVerkoopService.cls.xml	(.../TestInterneVerkoopService.cls.xml)	(revision 36713)
+++ vhUnitTest/APPS/EC/TestInterneVerkoopService.cls.xml	(.../TestInterneVerkoopService.cls.xml)	(revision 36785)
@@ -54,7 +54,7 @@
 	
 	Set Parameters = "" // unswizzle
 	
-	#Dim InterneVerkoopService As APPS.EC.InterneVerkoopService = ##class(APPS.EC.InterneVerkoopService).%New()
+	#Dim InterneVerkoopService As APPS.EC.InterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New()
 	Set Parameters = InterneVerkoopService.GeefParameters(ParameterID)
 	
 	Do $$$AssertTrue($IsObject(Parameters),"Het parameter object werd teruggegeven")
@@ -83,7 +83,7 @@
 	
 	Set Parameters = "" // unswizzle
 	
-	Set InterneVerkoopService = ##class(APPS.EC.InterneVerkoopService).%New()
+	Set InterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New()
 	Set Parameters = InterneVerkoopService.GeefParameters(ParameterID)
 	
 	Do $$$AssertTrue($IsObject(Parameters),"Het parameter object werd teruggegeven")
@@ -109,7 +109,7 @@
 
 <Method name="TestBestelWinkelkarIntern">
 <Implementation><![CDATA[
-	#Dim InterneVerkoopService As APPS.EC.InterneVerkoopService = ##class(APPS.EC.InterneVerkoopService).%New()
+	#Dim InterneVerkoopService As APPS.EC.InterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New()
 	#Dim ConfiguratorService As APPS.VKP.Maatwerk.ConfiguratorService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefMaatwerkConfiguratorService()
 	
 	#Dim WinkelkarID As %Integer = ..MaakWinkelkar()
@@ -150,7 +150,7 @@
 
 <Method name="TestUpdateWinkelkarLijn">
 <Implementation><![CDATA[
-	#Dim InterneVerkoopService As APPS.EC.InterneVerkoopService = ##class(APPS.EC.InterneVerkoopService).%New()
+	#Dim InterneVerkoopService As APPS.EC.InterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New()
 	#Dim ConfiguratorService As APPS.VKP.Maatwerk.ConfiguratorService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefMaatwerkConfiguratorService()
 	#Dim WinkelkarID As %String = ..MaakWinkelkar()
 	
Index: WS/EC/InterneVerkoopService.cls.xml
===================================================================
diff -u -r36772 -r36785
--- WS/EC/InterneVerkoopService.cls.xml	(.../InterneVerkoopService.cls.xml)	(revision 36772)
+++ WS/EC/InterneVerkoopService.cls.xml	(.../InterneVerkoopService.cls.xml)	(revision 36785)
@@ -20,7 +20,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	#dim Parameters As APPS.VKP.Maatwerk.impl.AdminSessieParameters = ##class(APPS.VKP.Maatwerk.impl.AdminSessieParameters).%OpenId(ParameterID)
-	Do ##class(APPS.EC.InterneVerkoopService).%New().AnnuleerIngaveIntern(..GeefApplicatie(), Parameters.GeefWinkelkarID(), ParameterID)
+	Do ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New().AnnuleerIngaveIntern(..GeefApplicatie(), Parameters.GeefWinkelkarID(), ParameterID)
 ]]></Implementation>
 </Method>
 
@@ -29,22 +29,22 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	#dim Parameters As APPS.VKP.Maatwerk.impl.AdminSessieParameters = ##class(APPS.VKP.Maatwerk.impl.AdminSessieParameters).%OpenId(ParameterID)
-	Do ##class(APPS.EC.InterneVerkoopService).%New().BestelWinkelkarIntern(..GeefApplicatie(), Parameters.GeefWinkelkarID(), Parameters.GeefDocumentType(), Parameters.GeefDocumentID())
+	Do ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New().BestelWinkelkarIntern(..GeefApplicatie(), Parameters.GeefWinkelkarID(), Parameters.GeefDocumentType(), Parameters.GeefDocumentID())
 ]]></Implementation>
 </Method>
 
 <Method name="GeefParameters">
 <FormalSpec>ParameterID:%String</FormalSpec>
 <ReturnType>APPS.VKP.Maatwerk.dto.ConfiguratorParameters</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.EC.InterneVerkoopService).%New().GeefParameters(ParameterID)
+<Implementation><![CDATA[	Quit ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New().GeefParameters(ParameterID)
 ]]></Implementation>
 </Method>
 
 <Method name="UpdateWinkelkarLijn">
 <FormalSpec>WinkelkarID:%String,DocumentType:APPS.VKP.Maatwerk.enu.DocumentType,DocumentID:%String,LijnID:%String</FormalSpec>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Do ##class(APPS.EC.InterneVerkoopService).%New().UpdateWinkelkarLijn(..GeefApplicatie(), WinkelkarID, DocumentType, DocumentID, LijnID)
+<Implementation><![CDATA[	Do ##class(APPS.EC.Verkoop.impl.Interne.VerkoopService).%New().UpdateWinkelkarLijn(..GeefApplicatie(), WinkelkarID, DocumentType, DocumentID, LijnID)
 ]]></Implementation>
 </Method>
 
@@ -59,6 +59,7 @@
 <Method name="WisOfferte">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <WebMethod>1</WebMethod>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefApplicatie">